From eecaca80bdcf9060a5dd06a835a2c1752b4fec01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Fri, 28 Sep 2012 13:11:19 +0100 Subject: [PATCH 001/863] WaE: some warnings on RHEL-6 gcc Change-Id: I7d852595fbe0395bc29aba86b2e110ffb5c28823 --- boost/boost.6397.warnings.patch | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/boost/boost.6397.warnings.patch b/boost/boost.6397.warnings.patch index 82e3b5e88ee9..9c4c1ecb1b8c 100644 --- a/boost/boost.6397.warnings.patch +++ b/boost/boost.6397.warnings.patch @@ -255,3 +255,18 @@ }; +--- misc/boost_1_44_0/boost/multi_array.hpp 2012-09-28 13:06:44.796521371 +0100 ++++ misc/build/boost_1_44_0/boost/multi_array.hpp 2012-09-28 13:07:25.119002500 +0100 +@@ -423,9 +423,9 @@ + // Build index_gen objects to create views with the same shape + + // these need to be separate to handle non-zero index bases +- typedef detail::multi_array::index_gen index_gen; +- index_gen old_idxes; +- index_gen new_idxes; ++ typedef detail::multi_array::index_gen lcl_index_gen; ++ lcl_index_gen old_idxes; ++ lcl_index_gen new_idxes; + + std::transform(new_array.index_base_list_.begin(), + new_array.index_base_list_.end(), From d26118611f108b12815a5e5735992cd591abd87b Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 26 Sep 2012 21:36:02 +0200 Subject: [PATCH 002/863] chart2: remove obsolete gcc 3.0.4 workaround Change-Id: I61e17cf9c7a96ddf251154e4590420ae4b4fdf27 --- chart2/Library_chartcontroller.mk | 8 -------- 1 file changed, 8 deletions(-) diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk index 19220da8b5f9..7a0ea6fdbcb9 100644 --- a/chart2/Library_chartcontroller.mk +++ b/chart2/Library_chartcontroller.mk @@ -35,14 +35,6 @@ $(eval $(call gb_Library_set_include,chartcontroller,\ $(eval $(call gb_Library_use_sdk_api,chartcontroller)) -# TODO: is this still necessary? -# (from chart2/source/controller/dialogs/makefile.mk) -# # i26518 the gcc-3.0.4 requires to enhance the template-depth -# # this seems to be a compiler issue, so we recommend not to use 3.0.x anymore -# .IF "$(COM)"=="GCC" -# CFLAGS+=-ftemplate-depth-128 -# .ENDIF - $(eval $(call gb_Library_use_libraries,chartcontroller,\ basegfx \ chartcore \ From 2e677c39818f3a6479ac9103ac9c7e8ef985eeb0 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 26 Sep 2012 23:45:28 +0200 Subject: [PATCH 003/863] gbuild: split uwinapi out of gb_STDLIBS Change-Id: I53316e0b9369d806197bccb42cf22d3497af43e7 --- Library_merged.mk | 1 + UnoControls/Library_ctl.mk | 1 + accessibility/Library_acc.mk | 1 + accessibility/Library_java_uno_accessbridge.mk | 1 + animations/Library_animcore.mk | 1 + avmedia/Library_avmedia.mk | 1 + avmedia/Library_avmediaQuickTime.mk | 1 + avmedia/Library_avmediagst.mk | 1 + avmedia/Library_avmediagst_0_10.mk | 1 + avmedia/Library_avmediawin.mk | 1 + basctl/Library_basctl.mk | 1 + basebmp/CppunitTest_basebmp.mk | 1 + basebmp/Library_basebmp.mk | 1 + basebmp/StaticLibrary_basebmp.mk | 1 + basegfx/CppunitTest_basegfx.mk | 1 + basegfx/Library_basegfx.mk | 1 + basic/CppunitTest_basic_enable.mk | 1 + basic/CppunitTest_basic_nested_struct.mk | 1 + basic/CppunitTest_basic_scanner.mk | 1 + basic/Library_sb.mk | 1 + bean/Library_officebean.mk | 1 + binaryurp/CppunitTest_binaryurp_test-cache.mk | 1 + binaryurp/CppunitTest_binaryurp_test-unmarshal.mk | 1 + binaryurp/Library_binaryurp.mk | 1 + bridges/Library_java_uno.mk | 1 + canvas/Library_cairocanvas.mk | 1 + canvas/Library_canvasfactory.mk | 1 + canvas/Library_canvastools.mk | 1 + canvas/Library_directx9canvas.mk | 1 + canvas/Library_gdipluscanvas.mk | 1 + canvas/Library_nullcanvas.mk | 1 + canvas/Library_simplecanvas.mk | 1 + canvas/Library_vclcanvas.mk | 1 + chart2/Library_chartcontroller.mk | 1 + chart2/Library_chartcore.mk | 1 + cli_ure/Executable_climaker.mk | 1 + comphelper/CppunitTest_comphelper_test.mk | 1 + comphelper/Library_comphelper.mk | 1 + configmgr/Library_configmgr.mk | 1 + connectivity/Library_ado.mk | 1 + connectivity/Library_calc.mk | 1 + connectivity/Library_dbase.mk | 1 + connectivity/Library_dbpool2.mk | 1 + connectivity/Library_dbtools.mk | 1 + connectivity/Library_evoab.mk | 1 + connectivity/Library_file.mk | 1 + connectivity/Library_flat.mk | 1 + connectivity/Library_hsqldb.mk | 1 + connectivity/Library_jdbc.mk | 1 + connectivity/Library_mork.mk | 1 + connectivity/Library_mozab.mk | 1 + connectivity/Library_mozabdrv.mk | 1 + connectivity/Library_mozbootstrap.mk | 1 + connectivity/Library_mysql.mk | 1 + connectivity/Library_odbc.mk | 1 + connectivity/Library_odbcbase.mk | 1 + connectivity/Library_postgresql-sdbc-impl.mk | 1 + connectivity/Library_postgresql-sdbc.mk | 1 + connectivity/Library_sdbc2.mk | 1 + cppcanvas/Library_cppcanvas.mk | 1 + cppcanvas/Library_mtfrenderer.mk | 1 + cppu/CppunitTest_cppu_checkapi.mk | 1 + cppu/CppunitTest_cppu_qa_any.mk | 1 + cppu/CppunitTest_cppu_qa_recursion.mk | 1 + cppu/CppunitTest_cppu_qa_reference.mk | 1 + cppu/CppunitTest_cppu_qa_unotype.mk | 1 + cppu/CppunitTest_cppu_test_cppumaker.mk | 1 + cppu/Library_affine_uno.mk | 1 + cppu/Library_cppu.mk | 1 + cppu/Library_log_uno.mk | 1 + cppu/Library_purpenvhelper.mk | 1 + cppu/Library_unsafe_uno.mk | 1 + cppuhelper/CppunitTest_cppuhelper_checkapi.mk | 1 + cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk | 1 + cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk | 1 + cppuhelper/CppunitTest_cppuhelper_qa_weak.mk | 1 + cppuhelper/Library_cppuhelper.mk | 1 + cpputools/Executable_regcomp.mk | 1 + cpputools/Executable_regsingleton.mk | 1 + cpputools/Executable_uno.mk | 1 + cui/Library_cui.mk | 1 + dbaccess/CppunitTest_dbaccess_macros_test.mk | 1 + dbaccess/Executable_odbcconfig.mk | 1 + dbaccess/Library_dba.mk | 1 + dbaccess/Library_dbaxml.mk | 1 + dbaccess/Library_dbmm.mk | 1 + dbaccess/Library_dbu.mk | 1 + dbaccess/Library_sdbt.mk | 1 + desktop/Executable_crashrep.com.mk | 1 + desktop/Executable_officeloader.mk | 1 + desktop/Executable_quickstart.mk | 1 + desktop/Executable_sbase.mk | 1 + desktop/Executable_scalc.mk | 1 + desktop/Executable_sdraw.mk | 1 + desktop/Executable_simpress.mk | 1 + desktop/Executable_smath.mk | 1 + desktop/Executable_soffice.bin.mk | 1 + desktop/Executable_soffice.mk | 1 + desktop/Executable_soffice_bin.mk | 1 + desktop/Executable_sweb.mk | 1 + desktop/Executable_swriter.mk | 1 + desktop/Executable_unopkg.bin.mk | 1 + desktop/Library_deployment.mk | 1 + desktop/Library_deploymentgui.mk | 1 + desktop/Library_deploymentmisc.mk | 1 + desktop/Library_migrationoo2.mk | 1 + desktop/Library_migrationoo3.mk | 1 + desktop/Library_offacc.mk | 1 + desktop/Library_sofficeapp.mk | 1 + desktop/Library_spl.mk | 1 + desktop/Library_unopkgapp.mk | 1 + drawinglayer/Library_drawinglayer.mk | 1 + dtrans/Library_dnd.mk | 1 + dtrans/Library_dtrans.mk | 1 + dtrans/Library_ftransl.mk | 1 + dtrans/Library_mcnttype.mk | 1 + dtrans/Library_sysdtrans.mk | 1 + editeng/CppunitTest_editeng_borderline.mk | 1 + editeng/CppunitTest_editeng_core.mk | 1 + editeng/CppunitTest_editeng_lookuptree.mk | 1 + editeng/Library_editeng.mk | 1 + embeddedobj/Library_embobj.mk | 1 + embeddedobj/Library_emboleobj.mk | 1 + embedserv/Library_emser.mk | 1 + embedserv/Library_inprocserv.mk | 1 + eventattacher/Library_evtatt.mk | 1 + extensions/CppunitTest_extensions_test_update.mk | 1 + extensions/Library_abp.mk | 1 + extensions/Library_bib.mk | 1 + extensions/Library_dbp.mk | 1 + extensions/Library_log.mk | 1 + extensions/Library_pcr.mk | 1 + extensions/Library_pl.mk | 1 + extensions/Library_res.mk | 1 + extensions/Library_scn.mk | 1 + fileaccess/Library_fileacc.mk | 1 + filter/CppunitTest_filter_pict_test.mk | 1 + filter/CppunitTest_filter_tga_test.mk | 1 + filter/CppunitTest_filter_tiff_test.mk | 1 + filter/Executable_svg2odf.mk | 1 + filter/Library_PptImporter.mk | 1 + filter/Library_egi.mk | 1 + filter/Library_eme.mk | 1 + filter/Library_epb.mk | 1 + filter/Library_epg.mk | 1 + filter/Library_epp.mk | 1 + filter/Library_eps.mk | 1 + filter/Library_ept.mk | 1 + filter/Library_era.mk | 1 + filter/Library_eti.mk | 1 + filter/Library_exp.mk | 1 + filter/Library_filterconfig.mk | 1 + filter/Library_flash.mk | 1 + filter/Library_icd.mk | 1 + filter/Library_icg.mk | 1 + filter/Library_idx.mk | 1 + filter/Library_ime.mk | 1 + filter/Library_ipb.mk | 1 + filter/Library_ipd.mk | 1 + filter/Library_ips.mk | 1 + filter/Library_ipt.mk | 1 + filter/Library_ipx.mk | 1 + filter/Library_ira.mk | 1 + filter/Library_itg.mk | 1 + filter/Library_iti.mk | 1 + filter/Library_msfilter.mk | 1 + filter/Library_odfflatxml.mk | 1 + filter/Library_pdffilter.mk | 1 + filter/Library_placeware.mk | 1 + filter/Library_svgfilter.mk | 1 + filter/Library_t602filter.mk | 1 + filter/Library_textfd.mk | 1 + filter/Library_xmlfa.mk | 1 + filter/Library_xmlfd.mk | 1 + filter/Library_xsltdlg.mk | 1 + filter/Library_xsltfilter.mk | 3 ++- forms/Library_frm.mk | 1 + formula/Library_for.mk | 1 + formula/Library_forui.mk | 1 + fpicker/Library_fpicker.mk | 1 + fpicker/Library_fps.mk | 1 + fpicker/Library_fps_odma.mk | 1 + fpicker/Library_fps_office.mk | 1 + framework/Library_fwe.mk | 1 + framework/Library_fwi.mk | 1 + framework/Library_fwk.mk | 1 + framework/Library_fwl.mk | 1 + framework/Library_fwm.mk | 1 + hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk | 1 + hwpfilter/Library_hwp.mk | 1 + i18npool/CppunitTest_i18npool_test_breakiterator.mk | 1 + i18npool/CppunitTest_i18npool_test_characterclassification.mk | 1 + i18npool/CppunitTest_i18npool_test_languagetag.mk | 1 + i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk | 1 + i18npool/Executable_gencoll_rule.mk | 1 + i18npool/Executable_genconv_dict.mk | 1 + i18npool/Executable_gendict.mk | 1 + i18npool/Executable_genindex_data.mk | 1 + i18npool/Executable_saxparser.mk | 1 + i18npool/Library_collator_data.mk | 1 + i18npool/Library_dict_ja.mk | 1 + i18npool/Library_dict_zh.mk | 1 + i18npool/Library_i18nisolang1.mk | 1 + i18npool/Library_i18npool.mk | 1 + i18npool/Library_i18nsearch.mk | 1 + i18npool/Library_index_data.mk | 1 + i18npool/Library_localedata_en.mk | 1 + i18npool/Library_localedata_es.mk | 1 + i18npool/Library_localedata_euro.mk | 1 + i18npool/Library_localedata_others.mk | 1 + i18npool/Library_textconv_dict.mk | 1 + i18nutil/Library_i18nutil.mk | 1 + idl/Executable_svidl.mk | 1 + io/Library_acceptor.mk | 1 + io/Library_connector.mk | 1 + io/Library_streams.mk | 1 + io/Library_textinstream.mk | 1 + io/Library_textoutstream.mk | 1 + javaunohelper/Library_juh.mk | 1 + javaunohelper/Library_juhx.mk | 1 + jurt/Library_jpipe.mk | 1 + jurt/Library_jpipx.mk | 1 + jvmaccess/Library_jvmaccess.mk | 1 + jvmfwk/Executable_javaldx.mk | 1 + jvmfwk/Library_jvmfwk.mk | 1 + jvmfwk/Library_sunjavaplugin.mk | 1 + l10ntools/Executable_ulfconv.mk | 1 + lingucomponent/Library_guesslang.mk | 3 ++- lingucomponent/Library_hyphen.mk | 3 ++- lingucomponent/Library_lnth.mk | 3 ++- lingucomponent/Library_spell.mk | 3 ++- linguistic/Library_lng.mk | 1 + lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk | 1 + lotuswordpro/Library_lwpft.mk | 1 + o3tl/CppunitTest_o3tl_tests.mk | 1 + officecfg/CppunitTest_officecfg_cppheader_test.mk | 1 + oox/Library_oox.mk | 1 + package/Library_package2.mk | 1 + package/Library_xstor.mk | 1 + padmin/Executable_spadmin.bin.mk | 1 + padmin/Library_spa.mk | 1 + regexp/Library_regexp.mk | 1 + registry/Library_reg.mk | 1 + remotebridges/Library_uuresolver.mk | 1 + reportdesign/Library_rpt.mk | 1 + reportdesign/Library_rptui.mk | 1 + reportdesign/Library_rptxml.mk | 1 + rsc/Executable_rsc.mk | 1 + sal/CppunitTest_Module_DLL.mk | 1 + sal/CppunitTest_sal_bytesequence.mk | 1 + sal/CppunitTest_sal_checkapi.mk | 1 + sal/CppunitTest_sal_osl_condition.mk | 1 + sal/CppunitTest_sal_osl_file.mk | 1 + sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk | 1 + sal/CppunitTest_sal_osl_module.mk | 1 + sal/CppunitTest_sal_osl_mutex.mk | 1 + sal/CppunitTest_sal_osl_old_test_file.mk | 1 + sal/CppunitTest_sal_osl_pipe.mk | 1 + sal/CppunitTest_sal_osl_process.mk | 1 + sal/CppunitTest_sal_osl_profile.mk | 1 + sal/CppunitTest_sal_osl_security.mk | 1 + sal/CppunitTest_sal_osl_setthreadname.mk | 1 + sal/CppunitTest_sal_osl_thread.mk | 1 + sal/CppunitTest_sal_rtl_alloc.mk | 1 + sal/CppunitTest_sal_rtl_cipher.mk | 1 + sal/CppunitTest_sal_rtl_crc32.mk | 1 + sal/CppunitTest_sal_rtl_doublelock.mk | 1 + sal/CppunitTest_sal_rtl_locale.mk | 1 + sal/CppunitTest_sal_rtl_math.mk | 1 + sal/CppunitTest_sal_rtl_ostringbuffer.mk | 1 + sal/CppunitTest_sal_rtl_oustringbuffer.mk | 1 + sal/CppunitTest_sal_rtl_strings.mk | 1 + sal/CppunitTest_sal_rtl_uri.mk | 1 + sal/CppunitTest_sal_rtl_uuid.mk | 1 + sal/CppunitTest_sal_tcwf.mk | 1 + sal/CppunitTest_sal_types.mk | 1 + sal/Executable_cppunittester.mk | 1 + sal/Executable_osl_process_child.mk | 1 + sal/Library_sal.mk | 1 + sal/Library_sal_textenc.mk | 1 + salhelper/CppunitTest_salhelper_checkapi.mk | 1 + salhelper/Library_salhelper.mk | 1 + sax/CppunitTest_sax.mk | 1 + sax/Library_expwrap.mk | 1 + sax/Library_fastsax.mk | 1 + sax/Library_sax.mk | 1 + sc/CppunitTest_sc_annotationshapeobj.mk | 1 + sc/CppunitTest_sc_cellrangeobj.mk | 1 + sc/CppunitTest_sc_chart_regression_test.mk | 1 + sc/CppunitTest_sc_databaserangeobj.mk | 1 + sc/CppunitTest_sc_datapilotfieldobj.mk | 1 + sc/CppunitTest_sc_datapilottableobj.mk | 1 + sc/CppunitTest_sc_editfieldobj_cell.mk | 1 + sc/CppunitTest_sc_editfieldobj_header.mk | 1 + sc/CppunitTest_sc_filters_test.mk | 1 + sc/CppunitTest_sc_macros_test.mk | 1 + sc/CppunitTest_sc_modelobj.mk | 1 + sc/CppunitTest_sc_namedrangeobj.mk | 1 + sc/CppunitTest_sc_namedrangesobj.mk | 1 + sc/CppunitTest_sc_rangelst_test.mk | 1 + sc/CppunitTest_sc_subsequent_filters_test.mk | 1 + sc/CppunitTest_sc_tableautoformatfield.mk | 1 + sc/CppunitTest_sc_tablesheetobj.mk | 1 + sc/CppunitTest_sc_tablesheetsobj.mk | 1 + sc/CppunitTest_sc_ucalc.mk | 1 + sc/Library_sc.mk | 1 + sc/Library_scd.mk | 1 + sc/Library_scfilt.mk | 1 + sc/Library_scui.mk | 1 + sc/Library_vbaobj.mk | 1 + scaddins/Library_analysis.mk | 1 + scaddins/Library_date.mk | 1 + sccomp/Library_solver.mk | 1 + scripting/Library_basprov.mk | 1 + scripting/Library_dlgprov.mk | 1 + scripting/Library_protocolhandler.mk | 1 + scripting/Library_scriptframe.mk | 1 + scripting/Library_stringresource.mk | 1 + scripting/Library_vbaevents.mk | 1 + sd/CppunitTest_sd_filters_test.mk | 1 + sd/CppunitTest_sd_regression_test.mk | 1 + sd/CppunitTest_sd_uimpress.mk | 1 + sd/Library_sd.mk | 1 + sd/Library_sdd.mk | 1 + sd/Library_sdfilt.mk | 1 + sd/Library_sdui.mk | 1 + sdext/CppunitTest_pdfimport.mk | 1 + sfx2/CppunitTest_sfx2_metadatable.mk | 1 + sfx2/Library_qstart.mk | 1 + sfx2/Library_sfx.mk | 1 + shell/Executable_lngconvex.mk | 1 + shell/Library_cmdmail.mk | 1 + shell/Library_desktopbe.mk | 1 + shell/Library_localebe.mk | 1 + shell/Library_recentfile.mk | 1 + shell/Library_syssh.mk | 1 + shell/Library_syssh_win.mk | 1 + shell/Library_wininetbe.mk | 1 + slideshow/CppunitTest_slideshow.mk | 1 + slideshow/Executable_demoshow.mk | 1 + slideshow/Library_OGLTrans.mk | 1 + slideshow/Library_slideshow.mk | 1 + solenv/gbuild/platform/WNT_INTEL_GCC.mk | 1 - solenv/gbuild/platform/WNT_INTEL_MSC.mk | 1 - solenv/gbuild/platform/windows.mk | 1 + sot/CppunitTest_sot_test_sot.mk | 1 + sot/Library_sot.mk | 1 + starmath/CppunitTest_starmath_qa_cppunit.mk | 1 + starmath/Library_sm.mk | 1 + starmath/Library_smd.mk | 1 + stoc/Library_bootstrap.mk | 1 + stoc/Library_introspection.mk | 1 + stoc/Library_invocadapt.mk | 1 + stoc/Library_invocation.mk | 1 + stoc/Library_javaloader.mk | 1 + stoc/Library_javavm.mk | 1 + stoc/Library_namingservice.mk | 1 + stoc/Library_proxyfac.mk | 1 + stoc/Library_reflection.mk | 1 + stoc/Library_stocservices.mk | 1 + store/Library_store.mk | 1 + svl/CppunitTest_svl_lngmisc.mk | 1 + svl/CppunitTest_svl_urihelper.mk | 1 + svl/Library_fsstorage.mk | 1 + svl/Library_passwordcontainer.mk | 1 + svl/Library_svl.mk | 1 + svtools/CppunitTest_svtools_filters_test.mk | 1 + svtools/Executable_bmp.mk | 1 + svtools/Executable_bmpsum.mk | 1 + svtools/Executable_g2g.mk | 1 + svtools/Executable_langsupport.mk | 1 + svtools/Library_hatchwindowfactory.mk | 1 + svtools/Library_svt.mk | 1 + svx/Executable_gengal.bin.mk | 1 + svx/Library_svx.mk | 1 + svx/Library_svxcore.mk | 1 + svx/Library_textconversiondlgs.mk | 1 + sw/CppunitTest_sw_filters_test.mk | 1 + sw/CppunitTest_sw_layout_test.mk | 1 + sw/CppunitTest_sw_macros_test.mk | 1 + sw/CppunitTest_sw_regression_test.mk | 1 + sw/CppunitTest_sw_subsequent_odfexport.mk | 1 + sw/CppunitTest_sw_subsequent_odfimport.mk | 1 + sw/CppunitTest_sw_subsequent_ooxmlexport.mk | 1 + sw/CppunitTest_sw_subsequent_ooxmlimport.mk | 1 + sw/CppunitTest_sw_subsequent_rtfexport.mk | 1 + sw/CppunitTest_sw_subsequent_rtfimport.mk | 1 + sw/CppunitTest_sw_subsequent_ww8export.mk | 1 + sw/CppunitTest_sw_subsequent_ww8import.mk | 1 + sw/CppunitTest_sw_swdoc_test.mk | 1 + sw/Library_msword.mk | 1 + sw/Library_sw.mk | 1 + sw/Library_swd.mk | 1 + sw/Library_swui.mk | 1 + sw/Library_vbaswobj.mk | 1 + test/Library_subsequenttest.mk | 1 + test/Library_test.mk | 1 + toolkit/Library_tk.mk | 1 + tools/CppunitTest_tools_test.mk | 1 + tools/Executable_bestreversemap.mk | 1 + tools/Executable_mkunroll.mk | 1 + tools/Executable_rscdep.mk | 1 + tools/Executable_so_checksum.mk | 1 + tools/Library_tl.mk | 1 + tubes/CppunitTest_tubes_test.mk | 1 + tubes/Library_tubes.mk | 3 ++- ucb/Library_cached1.mk | 1 + ucb/Library_srtrs1.mk | 1 + ucb/Library_ucb1.mk | 1 + ucb/Library_ucpcmis1.mk | 1 + ucb/Library_ucpdav1.mk | 1 + ucb/Library_ucpexpand1.mk | 1 + ucb/Library_ucpext.mk | 1 + ucb/Library_ucpfile1.mk | 1 + ucb/Library_ucpftp1.mk | 1 + ucb/Library_ucphier1.mk | 1 + ucb/Library_ucpodma1.mk | 1 + ucb/Library_ucppkg1.mk | 1 + ucb/Library_ucptdoc1.mk | 1 + ucbhelper/Library_ucbhelper.mk | 1 + unotest/Library_unobootstrapprotector.mk | 1 + unotest/Library_unoexceptionprotector.mk | 1 + unotest/Library_unotest.mk | 1 + unotools/Library_utl.mk | 1 + unoxml/Library_unordf.mk | 1 + unoxml/Library_unoxml.mk | 1 + uui/Library_uui.mk | 1 + vbahelper/Library_msforms.mk | 1 + vbahelper/Library_vbahelper.mk | 1 + vcl/Library_vcl.mk | 1 + writerfilter/CppunitTest_writerfilter_doctok.mk | 1 + writerfilter/CppunitTest_writerfilter_rtftok.mk | 1 + writerfilter/Library_writerfilter.mk | 1 + writerfilter/Library_writerfilter_uno.mk | 1 + writerperfect/Library_wpftdraw.mk | 1 + writerperfect/Library_wpftwriter.mk | 1 + xmloff/Library_xo.mk | 1 + xmloff/Library_xof.mk | 1 + xmlreader/Library_xmlreader.mk | 1 + xmlscript/Library_xmlscript.mk | 1 + xmlsecurity/CppunitTest_qa_certext.mk | 1 + xmlsecurity/Library_xmlsecurity.mk | 1 + xmlsecurity/Library_xsec_fw.mk | 1 + xmlsecurity/Library_xsec_xmlsec.mk | 1 + 444 files changed, 448 insertions(+), 8 deletions(-) diff --git a/Library_merged.mk b/Library_merged.mk index c08fb9f1c7ec..0c6cb408fd46 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,merged,\ tl \ ucbhelper \ xmlreader \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/UnoControls/Library_ctl.mk b/UnoControls/Library_ctl.mk index 0727c5f2780e..e5ac6d72ce4e 100644 --- a/UnoControls/Library_ctl.mk +++ b/UnoControls/Library_ctl.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,ctl,\ cppuhelper \ sal \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/accessibility/Library_acc.mk b/accessibility/Library_acc.mk index 9693ddf8e151..7da687e3695c 100644 --- a/accessibility/Library_acc.mk +++ b/accessibility/Library_acc.mk @@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,acc,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/accessibility/Library_java_uno_accessbridge.mk b/accessibility/Library_java_uno_accessbridge.mk index 40f209fe2966..5e0b98fad2ee 100644 --- a/accessibility/Library_java_uno_accessbridge.mk +++ b/accessibility/Library_java_uno_accessbridge.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_libraries,java_uno_accessbridge,\ salhelper \ tl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/animations/Library_animcore.mk b/animations/Library_animcore.mk index 013704d37a68..370e1855a9ba 100644 --- a/animations/Library_animcore.mk +++ b/animations/Library_animcore.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,animcore,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk index 03f0441d7ac7..2eed8e188686 100644 --- a/avmedia/Library_avmedia.mk +++ b/avmedia/Library_avmedia.mk @@ -56,6 +56,7 @@ $(eval $(call gb_Library_use_libraries,avmedia,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/avmedia/Library_avmediaQuickTime.mk b/avmedia/Library_avmediaQuickTime.mk index 3b40326dc954..4f367776207d 100644 --- a/avmedia/Library_avmediaQuickTime.mk +++ b/avmedia/Library_avmediaQuickTime.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,avmediaQuickTime,\ sal \ tl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk index 528960bfa1b1..20261158c4b1 100644 --- a/avmedia/Library_avmediagst.mk +++ b/avmedia/Library_avmediagst.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,avmediagst,\ sal \ tl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/avmedia/Library_avmediagst_0_10.mk b/avmedia/Library_avmediagst_0_10.mk index 84b5ad469ac8..dace38183760 100644 --- a/avmedia/Library_avmediagst_0_10.mk +++ b/avmedia/Library_avmediagst_0_10.mk @@ -51,6 +51,7 @@ $(eval $(call gb_Library_use_libraries,avmediagst_0_10,\ sal \ tl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/avmedia/Library_avmediawin.mk b/avmedia/Library_avmediawin.mk index 9bca5f1fa89a..3eb9fe2e4962 100644 --- a/avmedia/Library_avmediawin.mk +++ b/avmedia/Library_avmediawin.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,avmediawin,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk index 3e7db4cd7da8..f83840635926 100644 --- a/basctl/Library_basctl.mk +++ b/basctl/Library_basctl.mk @@ -60,6 +60,7 @@ $(eval $(call gb_Library_use_libraries,basctl,\ ucbhelper \ vcl \ xmlscript \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/basebmp/CppunitTest_basebmp.mk b/basebmp/CppunitTest_basebmp.mk index f11b46297e30..fc7275a64801 100644 --- a/basebmp/CppunitTest_basebmp.mk +++ b/basebmp/CppunitTest_basebmp.mk @@ -27,6 +27,7 @@ endif $(eval $(call gb_CppunitTest_use_libraries,basebmp_cpputest,\ basegfx \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk index 95230ba646a5..661f5aa2bd22 100644 --- a/basebmp/Library_basebmp.mk +++ b/basebmp/Library_basebmp.mk @@ -18,6 +18,7 @@ $(eval $(call gb_Library_use_external,basebmp,vigra_headers)) $(eval $(call gb_Library_use_libraries,basebmp,\ basegfx \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/basebmp/StaticLibrary_basebmp.mk b/basebmp/StaticLibrary_basebmp.mk index 07f4f0359dd3..25b923df532b 100644 --- a/basebmp/StaticLibrary_basebmp.mk +++ b/basebmp/StaticLibrary_basebmp.mk @@ -18,6 +18,7 @@ $(eval $(call gb_StaticLibrary_use_external,basebmp,vigra_headers)) $(eval $(call gb_StaticLibrary_use_libraries,basebmp,\ basegfx \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/basegfx/CppunitTest_basegfx.mk b/basegfx/CppunitTest_basegfx.mk index 8b72a3782ad1..121faf6af57c 100644 --- a/basegfx/CppunitTest_basegfx.mk +++ b/basegfx/CppunitTest_basegfx.mk @@ -19,6 +19,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basegfx_cpputest,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk index 60f81a815ca6..e3b11aecfd97 100644 --- a/basegfx/Library_basegfx.mk +++ b/basegfx/Library_basegfx.mk @@ -21,6 +21,7 @@ $(eval $(call gb_Library_use_libraries,basegfx,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/basic/CppunitTest_basic_enable.mk b/basic/CppunitTest_basic_enable.mk index 76a9ecd02664..3bd2bc87337a 100644 --- a/basic/CppunitTest_basic_enable.mk +++ b/basic/CppunitTest_basic_enable.mk @@ -28,6 +28,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_enable, \ vcl \ xmlscript \ test \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/basic/CppunitTest_basic_nested_struct.mk b/basic/CppunitTest_basic_nested_struct.mk index 098840c5cd54..fcadba3b0c84 100644 --- a/basic/CppunitTest_basic_nested_struct.mk +++ b/basic/CppunitTest_basic_nested_struct.mk @@ -29,6 +29,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_nested_struct, \ vcl \ xmlscript \ test \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/basic/CppunitTest_basic_scanner.mk b/basic/CppunitTest_basic_scanner.mk index 1c248b6f95d7..af058148e32f 100644 --- a/basic/CppunitTest_basic_scanner.mk +++ b/basic/CppunitTest_basic_scanner.mk @@ -29,6 +29,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \ utl \ vcl \ xmlscript \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk index fa0e8201e941..de50d0c70f9f 100644 --- a/basic/Library_sb.mk +++ b/basic/Library_sb.mk @@ -49,6 +49,7 @@ $(eval $(call gb_Library_use_libraries,sb,\ utl \ vcl \ xmlscript \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk index 8cafec328542..78cc7dba7297 100644 --- a/bean/Library_officebean.mk +++ b/bean/Library_officebean.mk @@ -48,6 +48,7 @@ ifeq ($(GUI),WNT) $(eval $(call gb_Library_use_libraries,officebean,\ jawt \ + $(gb_UWINAPI) \ )) else diff --git a/binaryurp/CppunitTest_binaryurp_test-cache.mk b/binaryurp/CppunitTest_binaryurp_test-cache.mk index 8e7a441d5614..7818b21b9163 100644 --- a/binaryurp/CppunitTest_binaryurp_test-cache.mk +++ b/binaryurp/CppunitTest_binaryurp_test-cache.mk @@ -30,6 +30,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,binaryurp_test-cache)) $(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-cache,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk index 57036ed59c82..2c8c907fa7e1 100644 --- a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk +++ b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk @@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-unmarshal,\ cppuhelper \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/binaryurp/Library_binaryurp.mk b/binaryurp/Library_binaryurp.mk index 2b936fb85d1d..879025b84606 100644 --- a/binaryurp/Library_binaryurp.mk +++ b/binaryurp/Library_binaryurp.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Library_use_libraries,binaryurp,\ cppuhelper \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/bridges/Library_java_uno.mk b/bridges/Library_java_uno.mk index 2d6f59579108..3bee8a12e679 100644 --- a/bridges/Library_java_uno.mk +++ b/bridges/Library_java_uno.mk @@ -31,6 +31,7 @@ $(eval $(call gb_Library_use_libraries,java_uno,\ jvmaccess \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk index 9f59fef1e4e8..74ded07486cf 100644 --- a/canvas/Library_cairocanvas.mk +++ b/canvas/Library_cairocanvas.mk @@ -68,6 +68,7 @@ $(eval $(call gb_Library_use_libraries,cairocanvas,\ tl \ i18nisolang1 \ canvastools \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk index 8ee787685098..974231a039a1 100644 --- a/canvas/Library_canvasfactory.mk +++ b/canvas/Library_canvasfactory.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,canvasfactory,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk index 156608221eda..4e70f654c6ad 100644 --- a/canvas/Library_canvastools.mk +++ b/canvas/Library_canvastools.mk @@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,canvastools,\ tk \ tl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk index 1a01475e263e..08ffdf4017fe 100644 --- a/canvas/Library_directx9canvas.mk +++ b/canvas/Library_directx9canvas.mk @@ -55,6 +55,7 @@ $(eval $(call gb_Library_use_libraries,directx9canvas,\ tl \ utl \ i18nisolang1 \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk index da8ffa62552a..6ae93a809466 100644 --- a/canvas/Library_gdipluscanvas.mk +++ b/canvas/Library_gdipluscanvas.mk @@ -61,6 +61,7 @@ $(eval $(call gb_Library_use_libraries,gdipluscanvas,\ tl \ utl \ i18nisolang1 \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/canvas/Library_nullcanvas.mk b/canvas/Library_nullcanvas.mk index 689bd7eef377..a130dfb39fbe 100644 --- a/canvas/Library_nullcanvas.mk +++ b/canvas/Library_nullcanvas.mk @@ -45,6 +45,7 @@ $(eval $(call gb_Library_use_libraries,nullcanvas,\ cppuhelper \ sal \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/canvas/Library_simplecanvas.mk b/canvas/Library_simplecanvas.mk index 470a99314db3..d5edd33bbfbe 100644 --- a/canvas/Library_simplecanvas.mk +++ b/canvas/Library_simplecanvas.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,simplecanvas,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk index 911858385b44..922e5ca45dfc 100644 --- a/canvas/Library_vclcanvas.mk +++ b/canvas/Library_vclcanvas.mk @@ -49,6 +49,7 @@ $(eval $(call gb_Library_use_libraries,vclcanvas,\ tk \ tl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk index 7a0ea6fdbcb9..3baaee9b5713 100644 --- a/chart2/Library_chartcontroller.mk +++ b/chart2/Library_chartcontroller.mk @@ -55,6 +55,7 @@ $(eval $(call gb_Library_use_libraries,chartcontroller,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk index fe63ec80c010..6ca04479fad0 100644 --- a/chart2/Library_chartcore.mk +++ b/chart2/Library_chartcore.mk @@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,chartcore,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cli_ure/Executable_climaker.mk b/cli_ure/Executable_climaker.mk index 9e67d66a1a26..bdea302bb619 100644 --- a/cli_ure/Executable_climaker.mk +++ b/cli_ure/Executable_climaker.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Executable_use_libraries,climaker,\ ,msvcmrt \ ) \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/comphelper/CppunitTest_comphelper_test.mk b/comphelper/CppunitTest_comphelper_test.mk index 942539ba6b5d..f77cf84ee57c 100644 --- a/comphelper/CppunitTest_comphelper_test.mk +++ b/comphelper/CppunitTest_comphelper_test.mk @@ -41,6 +41,7 @@ $(eval $(call gb_CppunitTest_use_libraries,comphelper_test, \ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk index 76c75f1f2ee2..71d03cc9894c 100644 --- a/comphelper/Library_comphelper.mk +++ b/comphelper/Library_comphelper.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,comphelper,\ sal \ salhelper \ ucbhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/configmgr/Library_configmgr.mk b/configmgr/Library_configmgr.mk index 68f9306f6991..588ddd819c86 100644 --- a/configmgr/Library_configmgr.mk +++ b/configmgr/Library_configmgr.mk @@ -72,6 +72,7 @@ $(eval $(call gb_Library_use_libraries,configmgr, \ sal \ salhelper \ xmlreader \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk index d9d120f88594..4bd5d78cc247 100644 --- a/connectivity/Library_ado.mk +++ b/connectivity/Library_ado.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,ado,\ uuid \ dbtools \ comphelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_calc.mk b/connectivity/Library_calc.mk index 93431fcf3b4b..ffd3f71640fe 100644 --- a/connectivity/Library_calc.mk +++ b/connectivity/Library_calc.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,calc,\ dbtools \ file \ comphelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_dbase.mk b/connectivity/Library_dbase.mk index 5dd69321af53..68f4ea449d80 100644 --- a/connectivity/Library_dbase.mk +++ b/connectivity/Library_dbase.mk @@ -49,6 +49,7 @@ $(eval $(call gb_Library_use_libraries,dbase,\ file \ utl \ comphelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_dbpool2.mk b/connectivity/Library_dbpool2.mk index 127a3e7cfad9..e128c937ee41 100644 --- a/connectivity/Library_dbpool2.mk +++ b/connectivity/Library_dbpool2.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,dbpool2,\ dbtools \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk index c82e568e780d..1cce1c6e246f 100644 --- a/connectivity/Library_dbtools.mk +++ b/connectivity/Library_dbtools.mk @@ -55,6 +55,7 @@ $(eval $(call gb_Library_use_libraries,dbtools,\ tl \ comphelper \ i18nisolang1 \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_evoab.mk b/connectivity/Library_evoab.mk index 882cdb0da054..78cf2d73957e 100644 --- a/connectivity/Library_evoab.mk +++ b/connectivity/Library_evoab.mk @@ -53,6 +53,7 @@ $(eval $(call gb_Library_use_libraries,evoab,\ salhelper \ dbtools \ file \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_file.mk b/connectivity/Library_file.mk index 74186792ece6..8c21f99fed5e 100644 --- a/connectivity/Library_file.mk +++ b/connectivity/Library_file.mk @@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,file,\ dbtools \ utl \ comphelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_flat.mk b/connectivity/Library_flat.mk index a69d0f221ae9..601f96f06b4f 100644 --- a/connectivity/Library_flat.mk +++ b/connectivity/Library_flat.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,flat,\ dbtools \ file \ comphelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_hsqldb.mk b/connectivity/Library_hsqldb.mk index a3aef6d8906f..1ffd932298dd 100644 --- a/connectivity/Library_hsqldb.mk +++ b/connectivity/Library_hsqldb.mk @@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,hsqldb,\ sal \ tl \ utl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_jdbc.mk b/connectivity/Library_jdbc.mk index 70e553d0d3b8..704f050b6755 100644 --- a/connectivity/Library_jdbc.mk +++ b/connectivity/Library_jdbc.mk @@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,jdbc,\ utl \ jvmfwk \ comphelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_mork.mk b/connectivity/Library_mork.mk index 9a73cd09b447..c2b95a0416db 100644 --- a/connectivity/Library_mork.mk +++ b/connectivity/Library_mork.mk @@ -27,6 +27,7 @@ $(eval $(call gb_Library_use_libraries,mork, \ dbtools \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_mozab.mk b/connectivity/Library_mozab.mk index afde265bf630..7872b26932db 100644 --- a/connectivity/Library_mozab.mk +++ b/connectivity/Library_mozab.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,mozab2,\ cppuhelper \ dbtools \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_mozabdrv.mk b/connectivity/Library_mozabdrv.mk index b1c29ee0f811..0e4c541ea6c4 100644 --- a/connectivity/Library_mozabdrv.mk +++ b/connectivity/Library_mozabdrv.mk @@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,mozabdrv,\ dbtools \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_mozbootstrap.mk b/connectivity/Library_mozbootstrap.mk index aab40dcc030b..649f9907c06a 100644 --- a/connectivity/Library_mozbootstrap.mk +++ b/connectivity/Library_mozbootstrap.mk @@ -45,6 +45,7 @@ $(eval $(call gb_Library_use_libraries,mozbootstrap,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_mysql.mk b/connectivity/Library_mysql.mk index 5e17042fd5e0..388af52f2263 100644 --- a/connectivity/Library_mysql.mk +++ b/connectivity/Library_mysql.mk @@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,mysql,\ sal \ dbtools \ comphelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_odbc.mk b/connectivity/Library_odbc.mk index d6c3dc547cf6..4b0e61baa48b 100644 --- a/connectivity/Library_odbc.mk +++ b/connectivity/Library_odbc.mk @@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,odbc,\ cppuhelper \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_odbcbase.mk b/connectivity/Library_odbcbase.mk index 4d25b1c9fdd4..9655773afa00 100644 --- a/connectivity/Library_odbcbase.mk +++ b/connectivity/Library_odbcbase.mk @@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,odbcbase,\ salhelper \ dbtools \ comphelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index b77f16c80702..439524882f8d 100644 --- a/connectivity/Library_postgresql-sdbc-impl.mk +++ b/connectivity/Library_postgresql-sdbc-impl.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\ cppuhelper \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_postgresql-sdbc.mk b/connectivity/Library_postgresql-sdbc.mk index 202614dd52ff..7646af16ef12 100644 --- a/connectivity/Library_postgresql-sdbc.mk +++ b/connectivity/Library_postgresql-sdbc.mk @@ -39,6 +39,7 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_sdbc2.mk b/connectivity/Library_sdbc2.mk index eb8789caacd6..032937a81e6e 100644 --- a/connectivity/Library_sdbc2.mk +++ b/connectivity/Library_sdbc2.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,sdbc2,\ dbtools \ utl \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cppcanvas/Library_cppcanvas.mk b/cppcanvas/Library_cppcanvas.mk index 7b9ff2ff6557..283ad64dda71 100644 --- a/cppcanvas/Library_cppcanvas.mk +++ b/cppcanvas/Library_cppcanvas.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,cppcanvas,\ svt \ tl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cppcanvas/Library_mtfrenderer.mk b/cppcanvas/Library_mtfrenderer.mk index 4c4575d2763a..e86b99303fd4 100644 --- a/cppcanvas/Library_mtfrenderer.mk +++ b/cppcanvas/Library_mtfrenderer.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Library_use_libraries,mtfrenderer,\ comphelper \ cppcanvas \ basegfx \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cppu/CppunitTest_cppu_checkapi.mk b/cppu/CppunitTest_cppu_checkapi.mk index 98832d086fb0..e68cc5cd5241 100644 --- a/cppu/CppunitTest_cppu_checkapi.mk +++ b/cppu/CppunitTest_cppu_checkapi.mk @@ -49,6 +49,7 @@ $(call gb_CxxObject_get_target,cppu/qa/checkapi/strings) :| \ $(eval $(call gb_CppunitTest_use_libraries,cppu_checkapi,\ cppu \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cppu/CppunitTest_cppu_qa_any.mk b/cppu/CppunitTest_cppu_qa_any.mk index 200abe92a144..04f33de964ba 100644 --- a/cppu/CppunitTest_cppu_qa_any.mk +++ b/cppu/CppunitTest_cppu_qa_any.mk @@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_any, \ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_any, \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cppu/CppunitTest_cppu_qa_recursion.mk b/cppu/CppunitTest_cppu_qa_recursion.mk index 9ff9af3c9bd6..671bd7f4eccf 100644 --- a/cppu/CppunitTest_cppu_qa_recursion.mk +++ b/cppu/CppunitTest_cppu_qa_recursion.mk @@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_recursion, \ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_recursion, \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cppu/CppunitTest_cppu_qa_reference.mk b/cppu/CppunitTest_cppu_qa_reference.mk index a49d546d61c8..4eef2ae78385 100644 --- a/cppu/CppunitTest_cppu_qa_reference.mk +++ b/cppu/CppunitTest_cppu_qa_reference.mk @@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_reference, \ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_reference, \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cppu/CppunitTest_cppu_qa_unotype.mk b/cppu/CppunitTest_cppu_qa_unotype.mk index 9e4619c1aac0..963ace47a15b 100644 --- a/cppu/CppunitTest_cppu_qa_unotype.mk +++ b/cppu/CppunitTest_cppu_qa_unotype.mk @@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_unotype, \ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_unotype, \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cppu/CppunitTest_cppu_test_cppumaker.mk b/cppu/CppunitTest_cppu_test_cppumaker.mk index a3bb717dbdee..41da8e269314 100644 --- a/cppu/CppunitTest_cppu_test_cppumaker.mk +++ b/cppu/CppunitTest_cppu_test_cppumaker.mk @@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_test_cppumaker, \ $(eval $(call gb_CppunitTest_use_libraries,cppu_test_cppumaker, \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cppu/Library_affine_uno.mk b/cppu/Library_affine_uno.mk index 68cf8d9b5b7c..2103eb49b77b 100644 --- a/cppu/Library_affine_uno.mk +++ b/cppu/Library_affine_uno.mk @@ -32,6 +32,7 @@ $(eval $(call gb_Library_use_sdk_api,affine_uno)) $(eval $(call gb_Library_use_libraries,affine_uno,\ purpenvhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cppu/Library_cppu.mk b/cppu/Library_cppu.mk index 3a2ed529b3dd..de47490923b5 100644 --- a/cppu/Library_cppu.mk +++ b/cppu/Library_cppu.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Library_add_defs,cppu,\ $(eval $(call gb_Library_use_libraries,cppu,\ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cppu/Library_log_uno.mk b/cppu/Library_log_uno.mk index b0fa63ed720f..04d9b7d8d588 100644 --- a/cppu/Library_log_uno.mk +++ b/cppu/Library_log_uno.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,log_uno,\ cppu \ purpenvhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cppu/Library_purpenvhelper.mk b/cppu/Library_purpenvhelper.mk index db2a90e54909..05606523a758 100644 --- a/cppu/Library_purpenvhelper.mk +++ b/cppu/Library_purpenvhelper.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_sdk_api,purpenvhelper)) $(eval $(call gb_Library_use_libraries,purpenvhelper,\ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cppu/Library_unsafe_uno.mk b/cppu/Library_unsafe_uno.mk index be343aa2e99a..afeb4cc6af22 100644 --- a/cppu/Library_unsafe_uno.mk +++ b/cppu/Library_unsafe_uno.mk @@ -32,6 +32,7 @@ $(eval $(call gb_Library_use_sdk_api,unsafe_uno)) $(eval $(call gb_Library_use_libraries,unsafe_uno,\ purpenvhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cppuhelper/CppunitTest_cppuhelper_checkapi.mk b/cppuhelper/CppunitTest_cppuhelper_checkapi.mk index 60a66b6e9cf5..4369cfc2ea33 100644 --- a/cppuhelper/CppunitTest_cppuhelper_checkapi.mk +++ b/cppuhelper/CppunitTest_cppuhelper_checkapi.mk @@ -49,6 +49,7 @@ $(call gb_CxxObject_get_target,cppuhelper/qa/checkapi/strings) :| \ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_checkapi,\ cppuhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk b/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk index 3432a83797d8..726c220ff4ea 100644 --- a/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk +++ b/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk @@ -39,6 +39,7 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_cppu_ifcontainer,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk b/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk index 658afbcc0b56..2d6c943ecc30 100644 --- a/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk +++ b/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk @@ -35,6 +35,7 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_cppu_unourl,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk b/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk index 455ea6d9ee20..391c13e4ac74 100644 --- a/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk +++ b/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk @@ -39,6 +39,7 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_qa_weak,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cppuhelper/Library_cppuhelper.mk b/cppuhelper/Library_cppuhelper.mk index 964135bb9db0..705bd7cdc921 100644 --- a/cppuhelper/Library_cppuhelper.mk +++ b/cppuhelper/Library_cppuhelper.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,cppuhelper,\ sal \ salhelper \ xmlreader \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cpputools/Executable_regcomp.mk b/cpputools/Executable_regcomp.mk index 75653d01e4ee..4743fdef91ae 100644 --- a/cpputools/Executable_regcomp.mk +++ b/cpputools/Executable_regcomp.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Executable_use_libraries,regcomp,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cpputools/Executable_regsingleton.mk b/cpputools/Executable_regsingleton.mk index 0bc2a393d176..64892fd28696 100644 --- a/cpputools/Executable_regsingleton.mk +++ b/cpputools/Executable_regsingleton.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Executable_use_libraries,regsingleton,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cpputools/Executable_uno.mk b/cpputools/Executable_uno.mk index 252de3fc1a65..1b2a878951be 100644 --- a/cpputools/Executable_uno.mk +++ b/cpputools/Executable_uno.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Executable_use_libraries,uno,\ cppuhelper \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index bfde9e1a75cf..3ed7c2508731 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -68,6 +68,7 @@ $(eval $(call gb_Library_use_libraries,cui,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk index c35ebd5a5d14..6a28adaf748f 100644 --- a/dbaccess/CppunitTest_dbaccess_macros_test.mk +++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk @@ -68,6 +68,7 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_macros_test, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/dbaccess/Executable_odbcconfig.mk b/dbaccess/Executable_odbcconfig.mk index 1e0f87eaa062..fb4a0d87211a 100644 --- a/dbaccess/Executable_odbcconfig.mk +++ b/dbaccess/Executable_odbcconfig.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Executable_set_include,odbcconfig,\ $(eval $(call gb_Library_use_sdk_api,odbcconfig)) $(eval $(call gb_Executable_use_libraries,odbcconfig,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk index e32b93dca420..863bcbbaba5e 100644 --- a/dbaccess/Library_dba.mk +++ b/dbaccess/Library_dba.mk @@ -63,6 +63,7 @@ $(eval $(call gb_Library_use_libraries,dba,\ utl \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk index e8b063a7b6c2..0d38f503aa85 100644 --- a/dbaccess/Library_dbaxml.mk +++ b/dbaccess/Library_dbaxml.mk @@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,dbaxml,\ utl \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/dbaccess/Library_dbmm.mk b/dbaccess/Library_dbmm.mk index 393349f93364..89d9c0e83920 100644 --- a/dbaccess/Library_dbmm.mk +++ b/dbaccess/Library_dbmm.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,dbmm,\ utl \ vcl \ xmlscript \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk index 80d32b19ccff..7e0fe1cfaa15 100644 --- a/dbaccess/Library_dbu.mk +++ b/dbaccess/Library_dbu.mk @@ -70,6 +70,7 @@ $(eval $(call gb_Library_use_libraries,dbu,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk index 3e5aca5e54ce..ee61c037f875 100644 --- a/dbaccess/Library_sdbt.mk +++ b/dbaccess/Library_sdbt.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,sdbt,\ sal \ tl \ utl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_crashrep.com.mk b/desktop/Executable_crashrep.com.mk index 96ed6f76cc60..d75f80614d29 100644 --- a/desktop/Executable_crashrep.com.mk +++ b/desktop/Executable_crashrep.com.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Executable_add_defs,crashrep_com,\ )) $(eval $(call gb_Executable_use_libraries,crashrep_com,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_officeloader.mk b/desktop/Executable_officeloader.mk index e3a766f2dd27..08c413a53387 100644 --- a/desktop/Executable_officeloader.mk +++ b/desktop/Executable_officeloader.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Executable_set_include,officeloader,\ $(eval $(call gb_Executable_use_libraries,officeloader,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk index b3fbde1eaaf1..8500b1decd4a 100644 --- a/desktop/Executable_quickstart.mk +++ b/desktop/Executable_quickstart.mk @@ -39,6 +39,7 @@ $(eval $(call gb_Executable_use_libraries,quickstart,\ ole32 \ oleaut32 \ shell32 \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk index 375cba33385f..7a517aa8f06e 100644 --- a/desktop/Executable_sbase.mk +++ b/desktop/Executable_sbase.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,sbase,\ )) $(eval $(call gb_Executable_use_libraries,sbase,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk index ce90099a532b..7ba226e06146 100644 --- a/desktop/Executable_scalc.mk +++ b/desktop/Executable_scalc.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,scalc,\ )) $(eval $(call gb_Executable_use_libraries,scalc,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk index 4642445173b4..558b8d340a8b 100644 --- a/desktop/Executable_sdraw.mk +++ b/desktop/Executable_sdraw.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,sdraw,\ )) $(eval $(call gb_Executable_use_libraries,sdraw,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk index c3026435e3f4..66002ce86f4f 100644 --- a/desktop/Executable_simpress.mk +++ b/desktop/Executable_simpress.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,simpress,\ )) $(eval $(call gb_Executable_use_libraries,simpress,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk index 4c7c4afb8232..3315f718b1e5 100644 --- a/desktop/Executable_smath.mk +++ b/desktop/Executable_smath.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,smath,\ )) $(eval $(call gb_Executable_use_libraries,smath,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index d1c6aec55939..126f728cea36 100644 --- a/desktop/Executable_soffice.bin.mk +++ b/desktop/Executable_soffice.bin.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Executable_set_include,soffice.bin,\ $(eval $(call gb_Executable_use_libraries,soffice.bin,\ sal \ sofficeapp \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk index 18efbbdf8770..17ac2d07cd8d 100644 --- a/desktop/Executable_soffice.mk +++ b/desktop/Executable_soffice.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Executable_use_libraries,soffice,\ advapi32 \ shell32 \ shlwapi \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_soffice_bin.mk b/desktop/Executable_soffice_bin.mk index e87b8a041d2b..efddda2f1fc0 100644 --- a/desktop/Executable_soffice_bin.mk +++ b/desktop/Executable_soffice_bin.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Executable_set_include,soffice_bin,\ $(eval $(call gb_Executable_use_libraries,soffice_bin,\ sal \ sofficeapp \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk index 870cf7d6c86a..1a62d5db772e 100644 --- a/desktop/Executable_sweb.mk +++ b/desktop/Executable_sweb.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,sweb,\ )) $(eval $(call gb_Executable_use_libraries,sweb,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk index acd299b641ca..68047ecdac1d 100644 --- a/desktop/Executable_swriter.mk +++ b/desktop/Executable_swriter.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,swriter,\ )) $(eval $(call gb_Executable_use_libraries,swriter,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk index 9303eefeefb1..ab71f1d1a56d 100644 --- a/desktop/Executable_unopkg.bin.mk +++ b/desktop/Executable_unopkg.bin.mk @@ -45,6 +45,7 @@ $(eval $(call gb_Executable_use_libraries,$(desktop_UNOPKGBIN),\ sal \ tl \ unopkgapp \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk index 3910fb910757..f5fb20e062f0 100644 --- a/desktop/Library_deployment.mk +++ b/desktop/Library_deployment.mk @@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,deployment,\ ucbhelper \ utl \ xmlscript \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk index f5f48e47d118..865add0e01a3 100644 --- a/desktop/Library_deploymentgui.mk +++ b/desktop/Library_deploymentgui.mk @@ -53,6 +53,7 @@ $(eval $(call gb_Library_use_libraries,deploymentgui,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk index 72ac02bd7c2a..93f66de60f26 100644 --- a/desktop/Library_deploymentmisc.mk +++ b/desktop/Library_deploymentmisc.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,deploymentmisc,\ ucbhelper \ utl \ xmlscript \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk index 838b475da267..3187188728af 100644 --- a/desktop/Library_migrationoo2.mk +++ b/desktop/Library_migrationoo2.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,migrationoo2,\ sal \ tl \ utl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Library_migrationoo3.mk b/desktop/Library_migrationoo3.mk index d39497e32ea3..fd7201f4321c 100644 --- a/desktop/Library_migrationoo3.mk +++ b/desktop/Library_migrationoo3.mk @@ -39,6 +39,7 @@ $(eval $(call gb_Library_use_libraries,migrationoo3,\ sal \ tl \ utl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Library_offacc.mk b/desktop/Library_offacc.mk index f75728dab7bc..18653a3fca65 100644 --- a/desktop/Library_offacc.mk +++ b/desktop/Library_offacc.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Library_use_libraries,offacc,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index 9e4fa379374b..ea039d4a8f8a 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -60,6 +60,7 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Library_spl.mk b/desktop/Library_spl.mk index 0d45c5991078..a950d31438c1 100644 --- a/desktop/Library_spl.mk +++ b/desktop/Library_spl.mk @@ -43,6 +43,7 @@ $(eval $(call gb_Library_use_libraries,spl,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Library_unopkgapp.mk b/desktop/Library_unopkgapp.mk index 081fee923a33..0d6222ab0e3d 100644 --- a/desktop/Library_unopkgapp.mk +++ b/desktop/Library_unopkgapp.mk @@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,unopkgapp,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk index 41c75093f599..518fe885b45c 100644 --- a/drawinglayer/Library_drawinglayer.mk +++ b/drawinglayer/Library_drawinglayer.mk @@ -62,6 +62,7 @@ $(eval $(call gb_Library_use_libraries,drawinglayer,\ tk \ tl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/dtrans/Library_dnd.mk b/dtrans/Library_dnd.mk index 8331586779a3..dd15f23d33c0 100644 --- a/dtrans/Library_dnd.mk +++ b/dtrans/Library_dnd.mk @@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,dnd,\ shell32 \ uuid \ uwinapi \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/dtrans/Library_dtrans.mk b/dtrans/Library_dtrans.mk index 79f18d82dfed..307bf030d865 100644 --- a/dtrans/Library_dtrans.mk +++ b/dtrans/Library_dtrans.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,dtrans,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/dtrans/Library_ftransl.mk b/dtrans/Library_ftransl.mk index 1b9e8735aef9..83d91bb76066 100644 --- a/dtrans/Library_ftransl.mk +++ b/dtrans/Library_ftransl.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,ftransl,\ ole32 \ sal \ uwinapi \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/dtrans/Library_mcnttype.mk b/dtrans/Library_mcnttype.mk index 04ae079e6672..80ad2bd23525 100644 --- a/dtrans/Library_mcnttype.mk +++ b/dtrans/Library_mcnttype.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,mcnttype,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/dtrans/Library_sysdtrans.mk b/dtrans/Library_sysdtrans.mk index 1b87a60417c5..ef358cf7c40f 100644 --- a/dtrans/Library_sysdtrans.mk +++ b/dtrans/Library_sysdtrans.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,sysdtrans,\ shell32 \ uuid \ uwinapi \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/editeng/CppunitTest_editeng_borderline.mk b/editeng/CppunitTest_editeng_borderline.mk index 368073ce0966..32eea423ea6c 100644 --- a/editeng/CppunitTest_editeng_borderline.mk +++ b/editeng/CppunitTest_editeng_borderline.mk @@ -52,6 +52,7 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_borderline, \ salhelper \ i18nisolang1 \ i18nutil \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/editeng/CppunitTest_editeng_core.mk b/editeng/CppunitTest_editeng_core.mk index 90117c8d386d..cc12b6df0e4a 100644 --- a/editeng/CppunitTest_editeng_core.mk +++ b/editeng/CppunitTest_editeng_core.mk @@ -57,6 +57,7 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_core, \ utl \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/editeng/CppunitTest_editeng_lookuptree.mk b/editeng/CppunitTest_editeng_lookuptree.mk index a69999ee235a..8911f87d8cec 100644 --- a/editeng/CppunitTest_editeng_lookuptree.mk +++ b/editeng/CppunitTest_editeng_lookuptree.mk @@ -52,6 +52,7 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_lookuptree, \ salhelper \ i18nisolang1 \ i18nutil \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk index 91f7e4a53cfc..f65f2eb1d35b 100644 --- a/editeng/Library_editeng.mk +++ b/editeng/Library_editeng.mk @@ -151,6 +151,7 @@ $(eval $(call gb_Library_use_libraries,editeng,\ salhelper \ i18nisolang1 \ i18nutil \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/embeddedobj/Library_embobj.mk b/embeddedobj/Library_embobj.mk index 58e3f02a74af..d4e57c034fa0 100644 --- a/embeddedobj/Library_embobj.mk +++ b/embeddedobj/Library_embobj.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,embobj,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/embeddedobj/Library_emboleobj.mk b/embeddedobj/Library_emboleobj.mk index 97801d9bc798..3b280bc8e33a 100644 --- a/embeddedobj/Library_emboleobj.mk +++ b/embeddedobj/Library_emboleobj.mk @@ -43,6 +43,7 @@ $(eval $(call gb_Library_use_libraries,emboleobj,\ sal \ tl \ utl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/embedserv/Library_emser.mk b/embedserv/Library_emser.mk index 8628a05af104..50a80d613b45 100644 --- a/embedserv/Library_emser.mk +++ b/embedserv/Library_emser.mk @@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,emser,\ oleaut32 \ sal \ uuid \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/embedserv/Library_inprocserv.mk b/embedserv/Library_inprocserv.mk index 85ee9dac95c3..256871f62686 100644 --- a/embedserv/Library_inprocserv.mk +++ b/embedserv/Library_inprocserv.mk @@ -36,6 +36,7 @@ $(eval $(call gb_Library_use_libraries,inprocserv,\ gdi32 \ ole32 \ uuid \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/eventattacher/Library_evtatt.mk b/eventattacher/Library_evtatt.mk index 02363a0e81b2..06eb7948e832 100644 --- a/eventattacher/Library_evtatt.mk +++ b/eventattacher/Library_evtatt.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Library_use_libraries,evtatt,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk index b59d5ca32b70..ad617f690582 100644 --- a/extensions/CppunitTest_extensions_test_update.mk +++ b/extensions/CppunitTest_extensions_test_update.mk @@ -39,6 +39,7 @@ $(eval $(call gb_CppunitTest_use_libraries,extensions_test_update, \ sal \ test \ unotest \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/extensions/Library_abp.mk b/extensions/Library_abp.mk index 92f0848491cb..708d89f5a7b6 100644 --- a/extensions/Library_abp.mk +++ b/extensions/Library_abp.mk @@ -83,6 +83,7 @@ $(eval $(call gb_Library_use_libraries,abp,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/extensions/Library_bib.mk b/extensions/Library_bib.mk index 5ce36cddc0de..aa4e368942a4 100644 --- a/extensions/Library_bib.mk +++ b/extensions/Library_bib.mk @@ -67,6 +67,7 @@ $(eval $(call gb_Library_use_libraries,bib,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/extensions/Library_dbp.mk b/extensions/Library_dbp.mk index cb52f4d32e6f..1f9c76917c72 100644 --- a/extensions/Library_dbp.mk +++ b/extensions/Library_dbp.mk @@ -69,6 +69,7 @@ $(eval $(call gb_Library_use_libraries,dbp,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/extensions/Library_log.mk b/extensions/Library_log.mk index 4e7e0d0f6be3..9fd561c884db 100644 --- a/extensions/Library_log.mk +++ b/extensions/Library_log.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,log,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/extensions/Library_pcr.mk b/extensions/Library_pcr.mk index 3504126847ef..847ba21c5604 100644 --- a/extensions/Library_pcr.mk +++ b/extensions/Library_pcr.mk @@ -55,6 +55,7 @@ $(eval $(call gb_Library_use_libraries,pcr,\ cppu \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk index c1451f8c3519..e6c5f0d7e1cf 100644 --- a/extensions/Library_pl.mk +++ b/extensions/Library_pl.mk @@ -130,6 +130,7 @@ $(eval $(call gb_Library_use_libraries,pl,\ cppu \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/extensions/Library_res.mk b/extensions/Library_res.mk index bc3de6021b89..cd7bc522b424 100644 --- a/extensions/Library_res.mk +++ b/extensions/Library_res.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,res,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk index 4dd0044941c8..7cca92e09eed 100644 --- a/extensions/Library_scn.mk +++ b/extensions/Library_scn.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,scn,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/fileaccess/Library_fileacc.mk b/fileaccess/Library_fileacc.mk index 2b44b1618cc1..ea8336544d78 100644 --- a/fileaccess/Library_fileacc.mk +++ b/fileaccess/Library_fileacc.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,fileacc,\ tl \ ucbhelper \ utl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/CppunitTest_filter_pict_test.mk b/filter/CppunitTest_filter_pict_test.mk index 59a3244824e9..20cbe8613239 100644 --- a/filter/CppunitTest_filter_pict_test.mk +++ b/filter/CppunitTest_filter_pict_test.mk @@ -19,6 +19,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_pict_test, \ tl \ unotest \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/CppunitTest_filter_tga_test.mk b/filter/CppunitTest_filter_tga_test.mk index b8e1e3d04f76..fc05c5b68ac8 100644 --- a/filter/CppunitTest_filter_tga_test.mk +++ b/filter/CppunitTest_filter_tga_test.mk @@ -38,6 +38,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_tga_test, \ tl \ unotest \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/CppunitTest_filter_tiff_test.mk b/filter/CppunitTest_filter_tiff_test.mk index 7f0852f6d568..4da2def1178f 100644 --- a/filter/CppunitTest_filter_tiff_test.mk +++ b/filter/CppunitTest_filter_tiff_test.mk @@ -38,6 +38,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_tiff_test, \ tl \ unotest \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Executable_svg2odf.mk b/filter/Executable_svg2odf.mk index 8f1fb73e6782..bc22022a7d9a 100644 --- a/filter/Executable_svg2odf.mk +++ b/filter/Executable_svg2odf.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Executable_use_libraries,svg2odf,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_PptImporter.mk b/filter/Library_PptImporter.mk index abd5af774dc4..dc676fc1eb04 100644 --- a/filter/Library_PptImporter.mk +++ b/filter/Library_PptImporter.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_libraries,PptImporter,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_egi.mk b/filter/Library_egi.mk index d7537892529c..76f996ec5a5b 100644 --- a/filter/Library_egi.mk +++ b/filter/Library_egi.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_libraries,egi,\ tl \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_eme.mk b/filter/Library_eme.mk index efd589924959..fc67818d2918 100644 --- a/filter/Library_eme.mk +++ b/filter/Library_eme.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_libraries,eme,\ tl \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_epb.mk b/filter/Library_epb.mk index 63f630c3c1df..d9ab41e401d0 100644 --- a/filter/Library_epb.mk +++ b/filter/Library_epb.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_libraries,epb,\ tl \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_epg.mk b/filter/Library_epg.mk index 51666771c8f9..dd5aba2718e6 100644 --- a/filter/Library_epg.mk +++ b/filter/Library_epg.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_libraries,epg,\ tl \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_epp.mk b/filter/Library_epp.mk index 83469263cd83..545522dae843 100644 --- a/filter/Library_epp.mk +++ b/filter/Library_epp.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_libraries,epp,\ tl \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_eps.mk b/filter/Library_eps.mk index 2ba9b40a7051..a1d80c7c8605 100644 --- a/filter/Library_eps.mk +++ b/filter/Library_eps.mk @@ -31,6 +31,7 @@ $(eval $(call gb_Library_use_libraries,eps,\ tl \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_ept.mk b/filter/Library_ept.mk index c1d9267ec555..2c8f8a406742 100644 --- a/filter/Library_ept.mk +++ b/filter/Library_ept.mk @@ -31,6 +31,7 @@ $(eval $(call gb_Library_use_libraries,ept,\ basegfx \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_era.mk b/filter/Library_era.mk index 5035ab350a7f..9c37c67e6b6b 100644 --- a/filter/Library_era.mk +++ b/filter/Library_era.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_libraries,era,\ tl \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_eti.mk b/filter/Library_eti.mk index 3d634045ecf1..e1f3eefe6b40 100644 --- a/filter/Library_eti.mk +++ b/filter/Library_eti.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_libraries,eti,\ tl \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_exp.mk b/filter/Library_exp.mk index b447fdbf4134..8c2c06a8d136 100644 --- a/filter/Library_exp.mk +++ b/filter/Library_exp.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_libraries,exp,\ tl \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_filterconfig.mk b/filter/Library_filterconfig.mk index 3dd322a7ad69..b6404a177ba9 100644 --- a/filter/Library_filterconfig.mk +++ b/filter/Library_filterconfig.mk @@ -36,6 +36,7 @@ $(eval $(call gb_Library_use_libraries,filterconfig,\ cppu \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_flash.mk b/filter/Library_flash.mk index 77668e02bd38..808f7a57172f 100644 --- a/filter/Library_flash.mk +++ b/filter/Library_flash.mk @@ -36,6 +36,7 @@ $(eval $(call gb_Library_use_libraries,flash,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_icd.mk b/filter/Library_icd.mk index e38f7451fbf7..bee43bbe7ceb 100644 --- a/filter/Library_icd.mk +++ b/filter/Library_icd.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Library_use_libraries,icd,\ vcl \ tl \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_icg.mk b/filter/Library_icg.mk index 0e319abf9ec3..7d9241fe9e2e 100644 --- a/filter/Library_icg.mk +++ b/filter/Library_icg.mk @@ -32,6 +32,7 @@ $(eval $(call gb_Library_use_libraries,icg,\ tl \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_idx.mk b/filter/Library_idx.mk index 62fb96d71d40..6040d65538d2 100644 --- a/filter/Library_idx.mk +++ b/filter/Library_idx.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Library_use_libraries,idx,\ vcl \ tl \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_ime.mk b/filter/Library_ime.mk index 65927bb255b2..d93303030f58 100644 --- a/filter/Library_ime.mk +++ b/filter/Library_ime.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Library_use_libraries,ime,\ vcl \ tl \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_ipb.mk b/filter/Library_ipb.mk index 281d832bfa08..813954141b66 100644 --- a/filter/Library_ipb.mk +++ b/filter/Library_ipb.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Library_use_libraries,ipb,\ vcl \ tl \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_ipd.mk b/filter/Library_ipd.mk index c81aeb264354..6f87872d92eb 100644 --- a/filter/Library_ipd.mk +++ b/filter/Library_ipd.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Library_use_libraries,ipd,\ vcl \ tl \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_ips.mk b/filter/Library_ips.mk index 19a908e0f1a1..face1d7f1fb3 100644 --- a/filter/Library_ips.mk +++ b/filter/Library_ips.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Library_use_libraries,ips,\ vcl \ tl \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_ipt.mk b/filter/Library_ipt.mk index 5924518751b2..768af3940040 100644 --- a/filter/Library_ipt.mk +++ b/filter/Library_ipt.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Library_use_libraries,ipt,\ tl \ basegfx \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_ipx.mk b/filter/Library_ipx.mk index 8382b1aec39d..5cea98191964 100644 --- a/filter/Library_ipx.mk +++ b/filter/Library_ipx.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Library_use_libraries,ipx,\ vcl \ tl \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_ira.mk b/filter/Library_ira.mk index 31d689cda70c..914c53e19cfd 100644 --- a/filter/Library_ira.mk +++ b/filter/Library_ira.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Library_use_libraries,ira,\ vcl \ tl \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_itg.mk b/filter/Library_itg.mk index 5ce1c045892a..2a9a03e15f1f 100644 --- a/filter/Library_itg.mk +++ b/filter/Library_itg.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Library_use_libraries,itg,\ vcl \ tl \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_iti.mk b/filter/Library_iti.mk index 85a4ac75354d..e736ffafe2e0 100644 --- a/filter/Library_iti.mk +++ b/filter/Library_iti.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Library_use_libraries,iti,\ vcl \ tl \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_msfilter.mk b/filter/Library_msfilter.mk index c7eebae6df41..0de501dfeb09 100644 --- a/filter/Library_msfilter.mk +++ b/filter/Library_msfilter.mk @@ -51,6 +51,7 @@ $(eval $(call gb_Library_use_libraries,msfilter,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_odfflatxml.mk b/filter/Library_odfflatxml.mk index a3d28afe39e2..3df371a63c8c 100644 --- a/filter/Library_odfflatxml.mk +++ b/filter/Library_odfflatxml.mk @@ -43,6 +43,7 @@ $(eval $(call gb_Library_use_libraries,odfflatxml,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_pdffilter.mk b/filter/Library_pdffilter.mk index 46e9973c4e4e..77be3737a741 100644 --- a/filter/Library_pdffilter.mk +++ b/filter/Library_pdffilter.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,pdffilter,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_placeware.mk b/filter/Library_placeware.mk index 4bb4ef1d29d3..e4d6684a26c1 100644 --- a/filter/Library_placeware.mk +++ b/filter/Library_placeware.mk @@ -31,6 +31,7 @@ $(eval $(call gb_Library_use_libraries,placeware,\ cppu \ sal \ sax \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk index f2927556848f..886882cf18fe 100644 --- a/filter/Library_svgfilter.mk +++ b/filter/Library_svgfilter.mk @@ -49,6 +49,7 @@ $(eval $(call gb_Library_use_libraries,svgfilter,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_t602filter.mk b/filter/Library_t602filter.mk index 8bf24468a019..082601caf7e0 100644 --- a/filter/Library_t602filter.mk +++ b/filter/Library_t602filter.mk @@ -32,6 +32,7 @@ $(eval $(call gb_Library_use_libraries,t602filter,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_textfd.mk b/filter/Library_textfd.mk index 9ab5a7c45572..594ce61f7456 100644 --- a/filter/Library_textfd.mk +++ b/filter/Library_textfd.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,textfd,\ cppu \ sal \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_xmlfa.mk b/filter/Library_xmlfa.mk index f9260d57f8c2..acb109aee92e 100644 --- a/filter/Library_xmlfa.mk +++ b/filter/Library_xmlfa.mk @@ -32,6 +32,7 @@ $(eval $(call gb_Library_use_libraries,xmlfa,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_xmlfd.mk b/filter/Library_xmlfd.mk index 19f0509f44fa..b42e79ee2c70 100644 --- a/filter/Library_xmlfd.mk +++ b/filter/Library_xmlfd.mk @@ -31,6 +31,7 @@ $(eval $(call gb_Library_use_libraries,xmlfd,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_xsltdlg.mk b/filter/Library_xsltdlg.mk index ba4f0435ea5b..805e0e71f3cb 100644 --- a/filter/Library_xsltdlg.mk +++ b/filter/Library_xsltdlg.mk @@ -39,6 +39,7 @@ $(eval $(call gb_Library_use_libraries,xsltdlg,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/filter/Library_xsltfilter.mk b/filter/Library_xsltfilter.mk index 94fca8145310..293c28b0af20 100644 --- a/filter/Library_xsltfilter.mk +++ b/filter/Library_xsltfilter.mk @@ -35,8 +35,9 @@ $(eval $(call gb_Library_use_libraries,xsltfilter,\ ucbhelper \ cppuhelper \ cppu \ + salhelper \ sal \ - salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk index 126bc5f339f2..2b4361fde1ca 100644 --- a/forms/Library_frm.mk +++ b/forms/Library_frm.mk @@ -57,6 +57,7 @@ $(eval $(call gb_Library_use_libraries,frm,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/formula/Library_for.mk b/formula/Library_for.mk index ce93f1695e7a..4678e9f4aeda 100644 --- a/formula/Library_for.mk +++ b/formula/Library_for.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,for,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/formula/Library_forui.mk b/formula/Library_forui.mk index 5aaea81d65b7..3090ed411160 100644 --- a/formula/Library_forui.mk +++ b/formula/Library_forui.mk @@ -51,6 +51,7 @@ $(eval $(call gb_Library_use_libraries,forui,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/fpicker/Library_fpicker.mk b/fpicker/Library_fpicker.mk index 780a28a4fd88..fdba80e5e721 100644 --- a/fpicker/Library_fpicker.mk +++ b/fpicker/Library_fpicker.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_libraries,fpicker,\ svl \ svt \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk index 431fc279fe00..95e315743eca 100644 --- a/fpicker/Library_fps.mk +++ b/fpicker/Library_fps.mk @@ -60,6 +60,7 @@ $(eval $(call gb_Library_use_libraries,fps,\ oleaut32 \ shell32 \ uuid \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/fpicker/Library_fps_odma.mk b/fpicker/Library_fps_odma.mk index 1eae7a8585f9..08eff663bfac 100644 --- a/fpicker/Library_fps_odma.mk +++ b/fpicker/Library_fps_odma.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,fps_odma,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/fpicker/Library_fps_office.mk b/fpicker/Library_fps_office.mk index fb48ef2edda7..2db54954bdeb 100644 --- a/fpicker/Library_fps_office.mk +++ b/fpicker/Library_fps_office.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,fps_office,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk index 5c87ddb46812..3d3598c6d1c2 100644 --- a/framework/Library_fwe.mk +++ b/framework/Library_fwe.mk @@ -51,6 +51,7 @@ $(eval $(call gb_Library_use_libraries,fwe,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk index 5d51f55caa4f..b33194267453 100644 --- a/framework/Library_fwi.mk +++ b/framework/Library_fwi.mk @@ -54,6 +54,7 @@ $(eval $(call gb_Library_use_libraries,fwi,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk index b312d88dad76..348812634bbf 100644 --- a/framework/Library_fwk.mk +++ b/framework/Library_fwk.mk @@ -54,6 +54,7 @@ $(eval $(call gb_Library_use_libraries,fwk,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk index 155af1aec42d..f02de16d2026 100644 --- a/framework/Library_fwl.mk +++ b/framework/Library_fwl.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,fwl,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk index 5043a3d121d1..bd656521ea40 100644 --- a/framework/Library_fwm.mk +++ b/framework/Library_fwm.mk @@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,fwm,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk index aa5903bd8317..834c9ae1212a 100644 --- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk +++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk @@ -42,6 +42,7 @@ $(eval $(call gb_CppunitTest_use_libraries,hwpfilter_test_hwpfilter, \ sal \ test \ unotest \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/hwpfilter/Library_hwp.mk b/hwpfilter/Library_hwp.mk index 1fa67d21d2d7..612a124e7ccd 100644 --- a/hwpfilter/Library_hwp.mk +++ b/hwpfilter/Library_hwp.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_libraries,hwp,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/CppunitTest_i18npool_test_breakiterator.mk b/i18npool/CppunitTest_i18npool_test_breakiterator.mk index 3a7855d8e3f4..0fe4577ecff0 100644 --- a/i18npool/CppunitTest_i18npool_test_breakiterator.mk +++ b/i18npool/CppunitTest_i18npool_test_breakiterator.mk @@ -38,6 +38,7 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_breakiterator,\ cppuhelper \ sal \ unotest \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/CppunitTest_i18npool_test_characterclassification.mk b/i18npool/CppunitTest_i18npool_test_characterclassification.mk index b4e0a81cd826..9c6b549da697 100644 --- a/i18npool/CppunitTest_i18npool_test_characterclassification.mk +++ b/i18npool/CppunitTest_i18npool_test_characterclassification.mk @@ -38,6 +38,7 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_characterclassification cppuhelper \ sal \ unotest \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/CppunitTest_i18npool_test_languagetag.mk b/i18npool/CppunitTest_i18npool_test_languagetag.mk index fd7c6047644d..cdb846894122 100644 --- a/i18npool/CppunitTest_i18npool_test_languagetag.mk +++ b/i18npool/CppunitTest_i18npool_test_languagetag.mk @@ -20,6 +20,7 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_languagetag,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk b/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk index 68e5076099c6..a2ea6f51430e 100644 --- a/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk +++ b/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk @@ -19,6 +19,7 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_ordinalsuffix,\ cppuhelper \ sal \ unotest \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Executable_gencoll_rule.mk b/i18npool/Executable_gencoll_rule.mk index b1d0bd46b1a4..5999b06466b8 100644 --- a/i18npool/Executable_gencoll_rule.mk +++ b/i18npool/Executable_gencoll_rule.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Executable_set_include,gencoll_rule,\ $(eval $(call gb_Executable_use_libraries,gencoll_rule,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Executable_genconv_dict.mk b/i18npool/Executable_genconv_dict.mk index 85a49b15e655..58a3011afb16 100644 --- a/i18npool/Executable_genconv_dict.mk +++ b/i18npool/Executable_genconv_dict.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Executable_set_include,genconv_dict,\ $(eval $(call gb_Executable_use_libraries,genconv_dict,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Executable_gendict.mk b/i18npool/Executable_gendict.mk index 3941b10a09f0..a49f2eb4c726 100644 --- a/i18npool/Executable_gendict.mk +++ b/i18npool/Executable_gendict.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Executable_set_include,gendict,\ $(eval $(call gb_Executable_use_libraries,gendict,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Executable_genindex_data.mk b/i18npool/Executable_genindex_data.mk index 3665f44e9aec..c1279d00964b 100644 --- a/i18npool/Executable_genindex_data.mk +++ b/i18npool/Executable_genindex_data.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Executable_set_include,genindex_data,\ $(eval $(call gb_Executable_use_libraries,genindex_data,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Executable_saxparser.mk b/i18npool/Executable_saxparser.mk index 5e61b3280270..eb4efdf838a7 100644 --- a/i18npool/Executable_saxparser.mk +++ b/i18npool/Executable_saxparser.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Executable_use_libraries,saxparser,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_collator_data.mk b/i18npool/Library_collator_data.mk index bd6ee6048f1c..507a3455c9b6 100644 --- a/i18npool/Library_collator_data.mk +++ b/i18npool/Library_collator_data.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Library_Library,collator_data)) $(eval $(call gb_Library_use_libraries,collator_data,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_dict_ja.mk b/i18npool/Library_dict_ja.mk index 89784694b4f7..658d8334cf6c 100644 --- a/i18npool/Library_dict_ja.mk +++ b/i18npool/Library_dict_ja.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Library_Library,dict_ja)) $(eval $(call gb_Library_use_libraries,dict_ja,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_dict_zh.mk b/i18npool/Library_dict_zh.mk index 2a910e502136..c21addb7f2cb 100644 --- a/i18npool/Library_dict_zh.mk +++ b/i18npool/Library_dict_zh.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Library_Library,dict_zh)) $(eval $(call gb_Library_use_libraries,dict_zh,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_i18nisolang1.mk b/i18npool/Library_i18nisolang1.mk index 72134c2d87b5..4ff6fff4331a 100644 --- a/i18npool/Library_i18nisolang1.mk +++ b/i18npool/Library_i18nisolang1.mk @@ -43,6 +43,7 @@ $(eval $(call gb_Library_add_defs,i18nisolang1,\ $(eval $(call gb_Library_use_libraries,i18nisolang1,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk index bdd0fd66087a..73d38e954cb3 100644 --- a/i18npool/Library_i18npool.mk +++ b/i18npool/Library_i18npool.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,i18npool,\ i18nisolang1 \ i18nutil \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_i18nsearch.mk b/i18npool/Library_i18nsearch.mk index bfe6450c5899..b55f8cdfe731 100644 --- a/i18npool/Library_i18nsearch.mk +++ b/i18npool/Library_i18nsearch.mk @@ -43,6 +43,7 @@ $(eval $(call gb_Library_use_libraries,i18nsearch,\ cppuhelper \ i18nregexp \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_index_data.mk b/i18npool/Library_index_data.mk index 9a7270c82c1f..c5bf1f4004ac 100644 --- a/i18npool/Library_index_data.mk +++ b/i18npool/Library_index_data.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Library_Library,index_data)) $(eval $(call gb_Library_use_libraries,index_data,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_localedata_en.mk b/i18npool/Library_localedata_en.mk index fe944a792350..4cd77fc77448 100644 --- a/i18npool/Library_localedata_en.mk +++ b/i18npool/Library_localedata_en.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Library_Library,localedata_en)) $(eval $(call gb_Library_use_libraries,localedata_en,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_localedata_es.mk b/i18npool/Library_localedata_es.mk index 0d8f1ea77283..145123225e2c 100644 --- a/i18npool/Library_localedata_es.mk +++ b/i18npool/Library_localedata_es.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Library_Library,localedata_es)) $(eval $(call gb_Library_use_libraries,localedata_es,\ localedata_en \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_localedata_euro.mk b/i18npool/Library_localedata_euro.mk index 96a823e3efd0..c1b4569d01d9 100644 --- a/i18npool/Library_localedata_euro.mk +++ b/i18npool/Library_localedata_euro.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Library_Library,localedata_euro)) $(eval $(call gb_Library_use_libraries,localedata_euro,\ localedata_en \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_localedata_others.mk b/i18npool/Library_localedata_others.mk index 08f38bf1c775..d331b8906506 100644 --- a/i18npool/Library_localedata_others.mk +++ b/i18npool/Library_localedata_others.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Library_Library,localedata_others)) $(eval $(call gb_Library_use_libraries,localedata_others,\ localedata_en \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_textconv_dict.mk b/i18npool/Library_textconv_dict.mk index e98a4525bf6f..e274c549e850 100644 --- a/i18npool/Library_textconv_dict.mk +++ b/i18npool/Library_textconv_dict.mk @@ -36,6 +36,7 @@ $(eval $(call gb_Library_set_include,textconv_dict,\ $(eval $(call gb_Library_use_sdk_api,textconv_dict)) $(eval $(call gb_Library_use_libraries,textconv_dict,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/i18nutil/Library_i18nutil.mk b/i18nutil/Library_i18nutil.mk index 84f33c0451b9..b9cbbdcc151e 100644 --- a/i18nutil/Library_i18nutil.mk +++ b/i18nutil/Library_i18nutil.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_libraries,i18nutil,\ comphelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/idl/Executable_svidl.mk b/idl/Executable_svidl.mk index 4eb371c60c88..bdf0aa40e124 100644 --- a/idl/Executable_svidl.mk +++ b/idl/Executable_svidl.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Executable_use_sdk_api,svidl)) $(eval $(call gb_Executable_use_libraries,svidl,\ tl \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/io/Library_acceptor.mk b/io/Library_acceptor.mk index 80062249654c..a07da5d58765 100644 --- a/io/Library_acceptor.mk +++ b/io/Library_acceptor.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,acceptor,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/io/Library_connector.mk b/io/Library_connector.mk index c2147e7d3f31..2bbe7257e922 100644 --- a/io/Library_connector.mk +++ b/io/Library_connector.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,connector,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/io/Library_streams.mk b/io/Library_streams.mk index 696bc4716c77..bb79154ff61a 100644 --- a/io/Library_streams.mk +++ b/io/Library_streams.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,streams,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/io/Library_textinstream.mk b/io/Library_textinstream.mk index d9c67a245fc1..b921a206792d 100644 --- a/io/Library_textinstream.mk +++ b/io/Library_textinstream.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Library_use_libraries,textinstream,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/io/Library_textoutstream.mk b/io/Library_textoutstream.mk index 0fdaf7ffd9c9..17fe1ec591a3 100644 --- a/io/Library_textoutstream.mk +++ b/io/Library_textoutstream.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Library_use_libraries,textoutstream,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/javaunohelper/Library_juh.mk b/javaunohelper/Library_juh.mk index 13364691be1a..ecacfd9978d0 100644 --- a/javaunohelper/Library_juh.mk +++ b/javaunohelper/Library_juh.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_internal_comprehensive_api,juh,\ $(eval $(call gb_Library_use_libraries,juh,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/javaunohelper/Library_juhx.mk b/javaunohelper/Library_juhx.mk index 7f1f604e7f1b..ce8ac747934e 100644 --- a/javaunohelper/Library_juhx.mk +++ b/javaunohelper/Library_juhx.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Library_use_libraries,juhx,\ jvmaccess \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/jurt/Library_jpipe.mk b/jurt/Library_jpipe.mk index 16707557f8f7..eb9656737b3a 100644 --- a/jurt/Library_jpipe.mk +++ b/jurt/Library_jpipe.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Library_Library,jpipe)) $(eval $(call gb_Library_use_libraries,jpipe,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/jurt/Library_jpipx.mk b/jurt/Library_jpipx.mk index 21087c2d291f..c36dce20b949 100644 --- a/jurt/Library_jpipx.mk +++ b/jurt/Library_jpipx.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Library_Library,jpipx)) $(eval $(call gb_Library_use_libraries,jpipx,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/jvmaccess/Library_jvmaccess.mk b/jvmaccess/Library_jvmaccess.mk index d4227a78c259..2a957ee006ce 100644 --- a/jvmaccess/Library_jvmaccess.mk +++ b/jvmaccess/Library_jvmaccess.mk @@ -45,6 +45,7 @@ $(eval $(call gb_Library_use_libraries,jvmaccess,\ cppu \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/jvmfwk/Executable_javaldx.mk b/jvmfwk/Executable_javaldx.mk index 9f5e080d6c81..177947cd0b15 100644 --- a/jvmfwk/Executable_javaldx.mk +++ b/jvmfwk/Executable_javaldx.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Executable_Executable,javaldx)) $(eval $(call gb_Executable_use_libraries,javaldx,\ jvmfwk \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk index 4dc9c092e792..c4a459728324 100644 --- a/jvmfwk/Library_jvmfwk.mk +++ b/jvmfwk/Library_jvmfwk.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_api,jvmfwk,\ $(eval $(call gb_Library_use_libraries,jvmfwk,\ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk index 694cecc31fdf..517892fa8e8e 100644 --- a/jvmfwk/Library_sunjavaplugin.mk +++ b/jvmfwk/Library_sunjavaplugin.mk @@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,sunjavaplugin,\ cppuhelper \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/l10ntools/Executable_ulfconv.mk b/l10ntools/Executable_ulfconv.mk index 8ed5bb0e5f2c..7a92c2edd596 100644 --- a/l10ntools/Executable_ulfconv.mk +++ b/l10ntools/Executable_ulfconv.mk @@ -11,6 +11,7 @@ $(eval $(call gb_Executable_Executable,ulfconv)) $(eval $(call gb_Executable_use_libraries,ulfconv,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/lingucomponent/Library_guesslang.mk b/lingucomponent/Library_guesslang.mk index a2e3ad8bbbc3..bfd8ffa7a805 100644 --- a/lingucomponent/Library_guesslang.mk +++ b/lingucomponent/Library_guesslang.mk @@ -32,12 +32,13 @@ $(eval $(call gb_Library_set_componentfile,guesslang,lingucomponent/source/langu $(eval $(call gb_Library_use_sdk_api,guesslang)) $(eval $(call gb_Library_use_libraries,guesslang,\ - $(gb_STDLIBS) \ cppu \ cppuhelper \ sal \ tl \ utl \ + $(gb_UWINAPI) \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_use_externals,guesslang,\ diff --git a/lingucomponent/Library_hyphen.mk b/lingucomponent/Library_hyphen.mk index 1fd9e79aaa61..ce28dd9e9b67 100644 --- a/lingucomponent/Library_hyphen.mk +++ b/lingucomponent/Library_hyphen.mk @@ -37,7 +37,6 @@ $(eval $(call gb_Library_set_include,hyphen,\ $(eval $(call gb_Library_use_sdk_api,hyphen)) $(eval $(call gb_Library_use_libraries,hyphen,\ - $(gb_STDLIBS) \ cppu \ cppuhelper \ i18nisolang1 \ @@ -45,6 +44,8 @@ $(eval $(call gb_Library_use_libraries,hyphen,\ sal \ tl \ utl \ + $(gb_UWINAPI) \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_use_static_libraries,hyphen,\ diff --git a/lingucomponent/Library_lnth.mk b/lingucomponent/Library_lnth.mk index a406d83ada5b..96a57d04e246 100644 --- a/lingucomponent/Library_lnth.mk +++ b/lingucomponent/Library_lnth.mk @@ -37,7 +37,6 @@ $(eval $(call gb_Library_set_include,lnth,\ $(eval $(call gb_Library_use_sdk_api,lnth)) $(eval $(call gb_Library_use_libraries,lnth,\ - $(gb_STDLIBS) \ comphelper \ cppu \ cppuhelper \ @@ -46,6 +45,8 @@ $(eval $(call gb_Library_use_libraries,lnth,\ sal \ tl \ utl \ + $(gb_UWINAPI) \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_use_static_libraries,lnth,\ diff --git a/lingucomponent/Library_spell.mk b/lingucomponent/Library_spell.mk index a9349e089ca6..2868b3e0d8ce 100644 --- a/lingucomponent/Library_spell.mk +++ b/lingucomponent/Library_spell.mk @@ -37,7 +37,6 @@ $(eval $(call gb_Library_set_include,spell,\ $(eval $(call gb_Library_use_sdk_api,spell)) $(eval $(call gb_Library_use_libraries,spell,\ - $(gb_STDLIBS) \ cppu \ cppuhelper \ i18nisolang1 \ @@ -45,6 +44,8 @@ $(eval $(call gb_Library_use_libraries,spell,\ sal \ tl \ utl \ + $(gb_UWINAPI) \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_use_static_libraries,spell,\ diff --git a/linguistic/Library_lng.mk b/linguistic/Library_lng.mk index d451348f460b..3e9900ba0f21 100644 --- a/linguistic/Library_lng.mk +++ b/linguistic/Library_lng.mk @@ -55,6 +55,7 @@ $(eval $(call gb_Library_use_libraries,lng,\ utl \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk index 3a089135415b..c96fbbcf148c 100644 --- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk +++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk @@ -42,6 +42,7 @@ $(eval $(call gb_CppunitTest_use_libraries,lotuswordpro_test_lotuswordpro, \ test \ unotest \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk index 5d6ffb2e99d1..676446b8fe42 100644 --- a/lotuswordpro/Library_lwpft.mk +++ b/lotuswordpro/Library_lwpft.mk @@ -46,6 +46,7 @@ $(eval $(call gb_Library_use_libraries,lwpft,\ ucbhelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/o3tl/CppunitTest_o3tl_tests.mk b/o3tl/CppunitTest_o3tl_tests.mk index 29e1ff8a6a1f..30de08e70d06 100644 --- a/o3tl/CppunitTest_o3tl_tests.mk +++ b/o3tl/CppunitTest_o3tl_tests.mk @@ -32,6 +32,7 @@ $(eval $(call gb_CppunitTest_use_package,o3tl_tests,o3tl_inc)) $(eval $(call gb_CppunitTest_use_libraries,o3tl_tests,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/officecfg/CppunitTest_officecfg_cppheader_test.mk b/officecfg/CppunitTest_officecfg_cppheader_test.mk index 886888bc21c4..af41d6fdceb1 100644 --- a/officecfg/CppunitTest_officecfg_cppheader_test.mk +++ b/officecfg/CppunitTest_officecfg_cppheader_test.mk @@ -30,6 +30,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,officecfg_cppheader_test)) $(eval $(call gb_CppunitTest_use_libraries,officecfg_cppheader_test,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index 7c70c1821d45..56443e46671a 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -75,6 +75,7 @@ $(eval $(call gb_Library_use_libraries,oox,\ vcl \ xo \ xmlscript \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/package/Library_package2.mk b/package/Library_package2.mk index e5b5023de7a8..a453af4a9a5b 100644 --- a/package/Library_package2.mk +++ b/package/Library_package2.mk @@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,package2,\ sal \ sax \ ucbhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/package/Library_xstor.mk b/package/Library_xstor.mk index a91533f98f87..15c2cb47dd98 100644 --- a/package/Library_xstor.mk +++ b/package/Library_xstor.mk @@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,xstor,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/padmin/Executable_spadmin.bin.mk b/padmin/Executable_spadmin.bin.mk index 04f301ed3844..3bcf1989c3bc 100644 --- a/padmin/Executable_spadmin.bin.mk +++ b/padmin/Executable_spadmin.bin.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Executable_use_libraries,spadmin.bin,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/padmin/Library_spa.mk b/padmin/Library_spa.mk index 7644c19fd99f..6ee2ef230ae6 100644 --- a/padmin/Library_spa.mk +++ b/padmin/Library_spa.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Library_use_libraries,spa,\ i18nisolang1 \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/regexp/Library_regexp.mk b/regexp/Library_regexp.mk index e7714c4bddd3..1b3b73197f8f 100644 --- a/regexp/Library_regexp.mk +++ b/regexp/Library_regexp.mk @@ -39,6 +39,7 @@ $(eval $(call gb_Library_add_defs,i18nregexp,\ $(eval $(call gb_Library_use_libraries,i18nregexp,\ sal \ i18nutil \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/registry/Library_reg.mk b/registry/Library_reg.mk index 4dd10b76a895..2701c472dfd2 100644 --- a/registry/Library_reg.mk +++ b/registry/Library_reg.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Library_add_defs,reg,\ $(eval $(call gb_Library_use_libraries,reg,\ sal \ store \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/remotebridges/Library_uuresolver.mk b/remotebridges/Library_uuresolver.mk index a289b6499eca..d8079bac6860 100644 --- a/remotebridges/Library_uuresolver.mk +++ b/remotebridges/Library_uuresolver.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Library_use_libraries,uuresolver,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk index ae4318ffea52..300874c586d0 100644 --- a/reportdesign/Library_rpt.mk +++ b/reportdesign/Library_rpt.mk @@ -59,6 +59,7 @@ $(eval $(call gb_Library_use_libraries,rpt,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/reportdesign/Library_rptui.mk b/reportdesign/Library_rptui.mk index 3755165032b1..4949dea74ea2 100644 --- a/reportdesign/Library_rptui.mk +++ b/reportdesign/Library_rptui.mk @@ -59,6 +59,7 @@ $(eval $(call gb_Library_use_libraries,rptui,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/reportdesign/Library_rptxml.mk b/reportdesign/Library_rptxml.mk index bdc3cdaeda02..c1ee286f9d65 100644 --- a/reportdesign/Library_rptxml.mk +++ b/reportdesign/Library_rptxml.mk @@ -53,6 +53,7 @@ $(eval $(call gb_Library_use_libraries,rptxml,\ utl \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/rsc/Executable_rsc.mk b/rsc/Executable_rsc.mk index 6382f8545a4b..25af0b595ea1 100644 --- a/rsc/Executable_rsc.mk +++ b/rsc/Executable_rsc.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Executable_use_libraries,rsc,\ comphelper \ sal \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_Module_DLL.mk b/sal/CppunitTest_Module_DLL.mk index f74e84753a89..d2f5079723e3 100644 --- a/sal/CppunitTest_Module_DLL.mk +++ b/sal/CppunitTest_Module_DLL.mk @@ -36,6 +36,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,Module_DLL,\ $(eval $(call gb_CppunitTest_use_libraries,Module_DLL,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_bytesequence.mk b/sal/CppunitTest_sal_bytesequence.mk index 6ceb12af917c..cdb62c7e4334 100644 --- a/sal/CppunitTest_sal_bytesequence.mk +++ b/sal/CppunitTest_sal_bytesequence.mk @@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_bytesequence,\ $(eval $(call gb_CppunitTest_use_libraries,sal_bytesequence,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_checkapi.mk b/sal/CppunitTest_sal_checkapi.mk index 280fd7306acb..8b7ca18c9339 100644 --- a/sal/CppunitTest_sal_checkapi.mk +++ b/sal/CppunitTest_sal_checkapi.mk @@ -44,6 +44,7 @@ $(call gb_CxxObject_get_target,sal/qa/checkapi/strings) :| \ $(eval $(call gb_CppunitTest_use_libraries,sal_checkapi,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_osl_condition.mk b/sal/CppunitTest_sal_osl_condition.mk index 9ea1a2a7c2e7..4c90de256844 100644 --- a/sal/CppunitTest_sal_osl_condition.mk +++ b/sal/CppunitTest_sal_osl_condition.mk @@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_condition,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_condition,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_osl_file.mk b/sal/CppunitTest_sal_osl_file.mk index ff46564c855e..dfd5d592f999 100644 --- a/sal/CppunitTest_sal_osl_file.mk +++ b/sal/CppunitTest_sal_osl_file.mk @@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_file,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_file,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk b/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk index cfbb95d89e25..199f94cc3fc1 100644 --- a/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk +++ b/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk @@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_getsystempathfromfile $(eval $(call gb_CppunitTest_use_libraries,sal_osl_getsystempathfromfileurl,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_osl_module.mk b/sal/CppunitTest_sal_osl_module.mk index d64498a561cc..7b75f8a3e0fc 100644 --- a/sal/CppunitTest_sal_osl_module.mk +++ b/sal/CppunitTest_sal_osl_module.mk @@ -37,6 +37,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_module,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_module,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_osl_mutex.mk b/sal/CppunitTest_sal_osl_mutex.mk index cfc92f5e3253..131761d1d078 100644 --- a/sal/CppunitTest_sal_osl_mutex.mk +++ b/sal/CppunitTest_sal_osl_mutex.mk @@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_mutex, \ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_mutex, \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_osl_old_test_file.mk b/sal/CppunitTest_sal_osl_old_test_file.mk index 0e92b707b972..3828b7784b9a 100644 --- a/sal/CppunitTest_sal_osl_old_test_file.mk +++ b/sal/CppunitTest_sal_osl_old_test_file.mk @@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_old_test_file,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_old_test_file,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_osl_pipe.mk b/sal/CppunitTest_sal_osl_pipe.mk index 8e6b5bfe796e..4aa70952531b 100644 --- a/sal/CppunitTest_sal_osl_pipe.mk +++ b/sal/CppunitTest_sal_osl_pipe.mk @@ -35,6 +35,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_pipe, \ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_pipe, \ sal \ unotest \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_osl_process.mk b/sal/CppunitTest_sal_osl_process.mk index 60c728ab40ff..6a53add92dae 100644 --- a/sal/CppunitTest_sal_osl_process.mk +++ b/sal/CppunitTest_sal_osl_process.mk @@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_process,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_process,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_osl_profile.mk b/sal/CppunitTest_sal_osl_profile.mk index 7eb2b9dc087a..1195b7d55eb1 100644 --- a/sal/CppunitTest_sal_osl_profile.mk +++ b/sal/CppunitTest_sal_osl_profile.mk @@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_profile, \ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_profile, \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_osl_security.mk b/sal/CppunitTest_sal_osl_security.mk index 1e2aac169e06..a583b7c423dc 100644 --- a/sal/CppunitTest_sal_osl_security.mk +++ b/sal/CppunitTest_sal_osl_security.mk @@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_security,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_security,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_osl_setthreadname.mk b/sal/CppunitTest_sal_osl_setthreadname.mk index 69a350254365..6d6f8df52238 100644 --- a/sal/CppunitTest_sal_osl_setthreadname.mk +++ b/sal/CppunitTest_sal_osl_setthreadname.mk @@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_setthreadname, \ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_setthreadname, \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_osl_thread.mk b/sal/CppunitTest_sal_osl_thread.mk index 22fdb6831355..b014c83e46ba 100644 --- a/sal/CppunitTest_sal_osl_thread.mk +++ b/sal/CppunitTest_sal_osl_thread.mk @@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_thread,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_thread,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_rtl_alloc.mk b/sal/CppunitTest_sal_rtl_alloc.mk index 5ed812526d60..e6a52823b2a9 100644 --- a/sal/CppunitTest_sal_rtl_alloc.mk +++ b/sal/CppunitTest_sal_rtl_alloc.mk @@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_alloc,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_alloc,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_rtl_cipher.mk b/sal/CppunitTest_sal_rtl_cipher.mk index aee5f0fe1cb7..78cca6b7b39a 100644 --- a/sal/CppunitTest_sal_rtl_cipher.mk +++ b/sal/CppunitTest_sal_rtl_cipher.mk @@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_cipher,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_cipher,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_rtl_crc32.mk b/sal/CppunitTest_sal_rtl_crc32.mk index 32da6ec443c6..1c5b6d19c71d 100644 --- a/sal/CppunitTest_sal_rtl_crc32.mk +++ b/sal/CppunitTest_sal_rtl_crc32.mk @@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_crc32,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_crc32,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_rtl_doublelock.mk b/sal/CppunitTest_sal_rtl_doublelock.mk index aeaa91b4f588..9c11d796de49 100644 --- a/sal/CppunitTest_sal_rtl_doublelock.mk +++ b/sal/CppunitTest_sal_rtl_doublelock.mk @@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_doublelock,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_doublelock,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_rtl_locale.mk b/sal/CppunitTest_sal_rtl_locale.mk index 96d11fe389e3..613251ef6c13 100644 --- a/sal/CppunitTest_sal_rtl_locale.mk +++ b/sal/CppunitTest_sal_rtl_locale.mk @@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_locale,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_locale,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_rtl_math.mk b/sal/CppunitTest_sal_rtl_math.mk index 09856b7d686a..df570a552b0d 100644 --- a/sal/CppunitTest_sal_rtl_math.mk +++ b/sal/CppunitTest_sal_rtl_math.mk @@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_math, \ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_math, \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_rtl_ostringbuffer.mk b/sal/CppunitTest_sal_rtl_ostringbuffer.mk index 721996298bb3..f0ea74c7ca97 100644 --- a/sal/CppunitTest_sal_rtl_ostringbuffer.mk +++ b/sal/CppunitTest_sal_rtl_ostringbuffer.mk @@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_ostringbuffer,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_ostringbuffer,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_rtl_oustringbuffer.mk b/sal/CppunitTest_sal_rtl_oustringbuffer.mk index 570717eb559b..f2384f709cdc 100644 --- a/sal/CppunitTest_sal_rtl_oustringbuffer.mk +++ b/sal/CppunitTest_sal_rtl_oustringbuffer.mk @@ -37,6 +37,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_oustringbuffer,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_oustringbuffer,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_rtl_strings.mk b/sal/CppunitTest_sal_rtl_strings.mk index 2762133e24f3..bdab2fb48987 100644 --- a/sal/CppunitTest_sal_rtl_strings.mk +++ b/sal/CppunitTest_sal_rtl_strings.mk @@ -40,6 +40,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_strings,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_strings,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_rtl_uri.mk b/sal/CppunitTest_sal_rtl_uri.mk index 1da1b1b55bb6..69e701b794ab 100644 --- a/sal/CppunitTest_sal_rtl_uri.mk +++ b/sal/CppunitTest_sal_rtl_uri.mk @@ -22,6 +22,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_uri,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_uri,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_rtl_uuid.mk b/sal/CppunitTest_sal_rtl_uuid.mk index 9a92af246696..8be994595e1f 100644 --- a/sal/CppunitTest_sal_rtl_uuid.mk +++ b/sal/CppunitTest_sal_rtl_uuid.mk @@ -21,6 +21,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_uuid,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_uuid,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_tcwf.mk b/sal/CppunitTest_sal_tcwf.mk index d96f57c688f3..7efbad135f36 100644 --- a/sal/CppunitTest_sal_tcwf.mk +++ b/sal/CppunitTest_sal_tcwf.mk @@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_tcwf,\ $(eval $(call gb_CppunitTest_use_libraries,sal_tcwf,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_types.mk b/sal/CppunitTest_sal_types.mk index bc904e23c23e..720f5ee3cf0b 100644 --- a/sal/CppunitTest_sal_types.mk +++ b/sal/CppunitTest_sal_types.mk @@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_types,\ $(eval $(call gb_CppunitTest_use_libraries,sal_types,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/Executable_cppunittester.mk b/sal/Executable_cppunittester.mk index e9d4170b58fe..c8d8f4756222 100644 --- a/sal/Executable_cppunittester.mk +++ b/sal/Executable_cppunittester.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Executable_set_include,cppunit/cppunittester,\ $(eval $(call gb_Executable_use_libraries,cppunit/cppunittester,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/Executable_osl_process_child.mk b/sal/Executable_osl_process_child.mk index 90548762fb52..d43400d6d86f 100644 --- a/sal/Executable_osl_process_child.mk +++ b/sal/Executable_osl_process_child.mk @@ -31,6 +31,7 @@ $(eval $(call gb_Executable_Executable,osl_process_child)) $(eval $(call gb_Executable_use_libraries,osl_process_child,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index 4da0e3b6653c..653aa0bdafad 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -81,6 +81,7 @@ $(eval $(call gb_Library_use_libraries,sal,\ $(if $(filter $(OS),ANDROID), \ lo-bootstrap \ ) \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sal/Library_sal_textenc.mk b/sal/Library_sal_textenc.mk index 3ad5dbfb8832..94f69911cebc 100644 --- a/sal/Library_sal_textenc.mk +++ b/sal/Library_sal_textenc.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Library_Library,sal_textenc)) $(eval $(call gb_Library_use_libraries,sal_textenc,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/salhelper/CppunitTest_salhelper_checkapi.mk b/salhelper/CppunitTest_salhelper_checkapi.mk index 92a876866f3e..6ebc52ef5b19 100644 --- a/salhelper/CppunitTest_salhelper_checkapi.mk +++ b/salhelper/CppunitTest_salhelper_checkapi.mk @@ -44,6 +44,7 @@ $(call gb_CxxObject_get_target,salhelper/qa/checkapi/strings) :| \ $(eval $(call gb_CppunitTest_use_libraries,salhelper_checkapi,\ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/salhelper/Library_salhelper.mk b/salhelper/Library_salhelper.mk index c9f7c8a1c49e..2787529cf2ae 100644 --- a/salhelper/Library_salhelper.mk +++ b/salhelper/Library_salhelper.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Library_add_defs,salhelper,\ $(eval $(call gb_Library_use_libraries,salhelper,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sax/CppunitTest_sax.mk b/sax/CppunitTest_sax.mk index fd8fb5e9fd45..0e889e2418b1 100644 --- a/sax/CppunitTest_sax.mk +++ b/sax/CppunitTest_sax.mk @@ -19,6 +19,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sax_cpputest, \ sal \ comphelper \ cppu \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk index 39b83b7c4816..6007467b11cc 100644 --- a/sax/Library_expwrap.mk +++ b/sax/Library_expwrap.mk @@ -26,6 +26,7 @@ $(eval $(call gb_Library_use_libraries,expwrap,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk index f87a22cc6656..b28b653e4bfd 100644 --- a/sax/Library_fastsax.mk +++ b/sax/Library_fastsax.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Library_use_libraries,fastsax,\ cppuhelper \ sal \ sax \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk index 3dc8942795a1..4c72db00051b 100644 --- a/sax/Library_sax.mk +++ b/sax/Library_sax.mk @@ -25,6 +25,7 @@ $(eval $(call gb_Library_use_libraries,sax,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_annotationshapeobj.mk b/sc/CppunitTest_sc_annotationshapeobj.mk index d707bc8f33c9..a33164371afe 100644 --- a/sc/CppunitTest_sc_annotationshapeobj.mk +++ b/sc/CppunitTest_sc_annotationshapeobj.mk @@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_annonationshapeobj, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk index b6b71a0b4514..c91923061d58 100644 --- a/sc/CppunitTest_sc_cellrangeobj.mk +++ b/sc/CppunitTest_sc_cellrangeobj.mk @@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_cellrangesbase, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk index 7d67779ee0b4..c7fbb6731750 100644 --- a/sc/CppunitTest_sc_chart_regression_test.mk +++ b/sc/CppunitTest_sc_chart_regression_test.mk @@ -65,6 +65,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_chart_regression_test, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk index 6c3f4a0c013c..b7d1fb6be404 100644 --- a/sc/CppunitTest_sc_databaserangeobj.mk +++ b/sc/CppunitTest_sc_databaserangeobj.mk @@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_databaserangeobj, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk index 6a4b89ba6897..f0788fb0fd6b 100644 --- a/sc/CppunitTest_sc_datapilotfieldobj.mk +++ b/sc/CppunitTest_sc_datapilotfieldobj.mk @@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datapilotfieldobj, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk index 40e3f83df1eb..1636112f43b0 100644 --- a/sc/CppunitTest_sc_datapilottableobj.mk +++ b/sc/CppunitTest_sc_datapilottableobj.mk @@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datapilottableobj, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_editfieldobj_cell.mk b/sc/CppunitTest_sc_editfieldobj_cell.mk index 7b3e45b2696b..6e5fa7076955 100644 --- a/sc/CppunitTest_sc_editfieldobj_cell.mk +++ b/sc/CppunitTest_sc_editfieldobj_cell.mk @@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_cell, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_editfieldobj_header.mk b/sc/CppunitTest_sc_editfieldobj_header.mk index 56378223778c..7b47240e0138 100644 --- a/sc/CppunitTest_sc_editfieldobj_header.mk +++ b/sc/CppunitTest_sc_editfieldobj_header.mk @@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_header, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk index ef47365af404..c61b4a2fbbf6 100644 --- a/sc/CppunitTest_sc_filters_test.mk +++ b/sc/CppunitTest_sc_filters_test.mk @@ -77,6 +77,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_filters_test, \ $(if $(filter $(OS),ANDROID), \ lo-bootstrap \ ) \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk index 839c9e39c38b..a24f391b9c09 100644 --- a/sc/CppunitTest_sc_macros_test.mk +++ b/sc/CppunitTest_sc_macros_test.mk @@ -65,6 +65,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_macros_test, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_modelobj.mk b/sc/CppunitTest_sc_modelobj.mk index 44ac9f51af3c..42a48f870730 100644 --- a/sc/CppunitTest_sc_modelobj.mk +++ b/sc/CppunitTest_sc_modelobj.mk @@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_modelobj, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk index 666181118538..ff9ad582d92e 100644 --- a/sc/CppunitTest_sc_namedrangeobj.mk +++ b/sc/CppunitTest_sc_namedrangeobj.mk @@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangeobj, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk index 99a215dbebff..192bbbd70c08 100644 --- a/sc/CppunitTest_sc_namedrangesobj.mk +++ b/sc/CppunitTest_sc_namedrangesobj.mk @@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangesobj, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_rangelst_test.mk b/sc/CppunitTest_sc_rangelst_test.mk index 67762d9e0c80..6933c2583da0 100644 --- a/sc/CppunitTest_sc_rangelst_test.mk +++ b/sc/CppunitTest_sc_rangelst_test.mk @@ -65,6 +65,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_rangelst_test, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk index ecb4bf74bdca..982ec6e4b35a 100644 --- a/sc/CppunitTest_sc_subsequent_filters_test.mk +++ b/sc/CppunitTest_sc_subsequent_filters_test.mk @@ -71,6 +71,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_filters_test, \ $(if $(filter $(OS),ANDROID), \ lo-bootstrap \ ) \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk index ece36aae60c3..b72bb005305f 100644 --- a/sc/CppunitTest_sc_tableautoformatfield.mk +++ b/sc/CppunitTest_sc_tableautoformatfield.mk @@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_tableautoformatfield, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk index d904e745a830..2bacb8f2725c 100644 --- a/sc/CppunitTest_sc_tablesheetobj.mk +++ b/sc/CppunitTest_sc_tablesheetobj.mk @@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_spreadsheetobj, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk index 1e097a02434f..c7b7fcd827cf 100644 --- a/sc/CppunitTest_sc_tablesheetsobj.mk +++ b/sc/CppunitTest_sc_tablesheetsobj.mk @@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_spreadsheetsobj, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk index 6710f8a523f7..3948bcfb04ec 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -76,6 +76,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_ucalc, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index bbbab8f84bb0..96cb69132a70 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -83,6 +83,7 @@ $(eval $(call gb_Library_use_libraries,sc,\ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/Library_scd.mk b/sc/Library_scd.mk index 6b74917f62f6..4c39cf1f40d3 100644 --- a/sc/Library_scd.mk +++ b/sc/Library_scd.mk @@ -43,6 +43,7 @@ $(eval $(call gb_Library_use_libraries,scd,\ tl \ ucbhelper \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk index 8816bc3db13a..d38d40b97027 100644 --- a/sc/Library_scfilt.mk +++ b/sc/Library_scfilt.mk @@ -60,6 +60,7 @@ $(eval $(call gb_Library_use_libraries,scfilt,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk index 6d67de093be3..7f94c6193f5e 100644 --- a/sc/Library_scui.mk +++ b/sc/Library_scui.mk @@ -53,6 +53,7 @@ $(eval $(call gb_Library_use_libraries,scui,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk index 37dfd24178ca..30eb16d059ff 100644 --- a/sc/Library_vbaobj.mk +++ b/sc/Library_vbaobj.mk @@ -58,6 +58,7 @@ $(eval $(call gb_Library_use_libraries,vbaobj,\ utl \ vbahelper \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/scaddins/Library_analysis.mk b/scaddins/Library_analysis.mk index 7a4c361f3a20..e1fe08c217b5 100644 --- a/scaddins/Library_analysis.mk +++ b/scaddins/Library_analysis.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,analysis,\ cppuhelper \ sal \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/scaddins/Library_date.mk b/scaddins/Library_date.mk index 57820806fc97..f224c80f7a8a 100644 --- a/scaddins/Library_date.mk +++ b/scaddins/Library_date.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,date,\ cppuhelper \ sal \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk index 2db18f5c22dd..42a4fa3d72e8 100644 --- a/sccomp/Library_solver.mk +++ b/sccomp/Library_solver.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_libraries,solver,\ cppuhelper \ sal \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/scripting/Library_basprov.mk b/scripting/Library_basprov.mk index a71e3e61dcee..5debc0acd8e5 100644 --- a/scripting/Library_basprov.mk +++ b/scripting/Library_basprov.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,basprov,\ tl \ ucbhelper \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/scripting/Library_dlgprov.mk b/scripting/Library_dlgprov.mk index 7e91ed87d391..c9e3b2140e94 100644 --- a/scripting/Library_dlgprov.mk +++ b/scripting/Library_dlgprov.mk @@ -53,6 +53,7 @@ $(eval $(call gb_Library_use_libraries,dlgprov,\ vbahelper \ vcl \ xmlscript \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/scripting/Library_protocolhandler.mk b/scripting/Library_protocolhandler.mk index 35e47be7047a..d99f60fd4fe1 100644 --- a/scripting/Library_protocolhandler.mk +++ b/scripting/Library_protocolhandler.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,protocolhandler,\ sal \ sfx \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/scripting/Library_scriptframe.mk b/scripting/Library_scriptframe.mk index ee5f420e9e08..86d6a05bc894 100644 --- a/scripting/Library_scriptframe.mk +++ b/scripting/Library_scriptframe.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,scriptframe,\ sal \ tl \ ucbhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/scripting/Library_stringresource.mk b/scripting/Library_stringresource.mk index faca2a0f660c..eeb11a1c8668 100644 --- a/scripting/Library_stringresource.mk +++ b/scripting/Library_stringresource.mk @@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,stringresource,\ cppuhelper \ sal \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/scripting/Library_vbaevents.mk b/scripting/Library_vbaevents.mk index 83ec86c505c7..45c35ff163ac 100644 --- a/scripting/Library_vbaevents.mk +++ b/scripting/Library_vbaevents.mk @@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,vbaevents,\ sfx \ sb \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk index 439423076efb..99a19042cb21 100644 --- a/sd/CppunitTest_sd_filters_test.mk +++ b/sd/CppunitTest_sd_filters_test.mk @@ -70,6 +70,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_filters_test, \ utl \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sd/CppunitTest_sd_regression_test.mk b/sd/CppunitTest_sd_regression_test.mk index af34ec512982..e0a5000359de 100644 --- a/sd/CppunitTest_sd_regression_test.mk +++ b/sd/CppunitTest_sd_regression_test.mk @@ -65,6 +65,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_regression_test, \ utl \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk index baba9fa72f95..5209b6445001 100644 --- a/sd/CppunitTest_sd_uimpress.mk +++ b/sd/CppunitTest_sd_uimpress.mk @@ -71,6 +71,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_uimpress,\ utl \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 6eda34578214..b0535d506bbd 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -103,6 +103,7 @@ $(eval $(call gb_Library_use_libraries,sd,\ utl \ vcl \ xmlsecurity \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sd/Library_sdd.mk b/sd/Library_sdd.mk index 68d6b6dd8b64..404ea819e63a 100644 --- a/sd/Library_sdd.mk +++ b/sd/Library_sdd.mk @@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,sdd,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk index 3250fbfa114b..2402116a33e2 100644 --- a/sd/Library_sdfilt.mk +++ b/sd/Library_sdfilt.mk @@ -65,6 +65,7 @@ $(eval $(call gb_Library_use_libraries,sdfilt,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk index 35bdede5b41a..7fcf0b01bae2 100644 --- a/sd/Library_sdui.mk +++ b/sd/Library_sdui.mk @@ -64,6 +64,7 @@ $(eval $(call gb_Library_use_libraries,sdui,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sdext/CppunitTest_pdfimport.mk b/sdext/CppunitTest_pdfimport.mk index 26f6835e3a9b..1ea6bc6c22f1 100644 --- a/sdext/CppunitTest_pdfimport.mk +++ b/sdext/CppunitTest_pdfimport.mk @@ -53,6 +53,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sdext_pdfimport,\ sal \ test \ unotest \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sfx2/CppunitTest_sfx2_metadatable.mk b/sfx2/CppunitTest_sfx2_metadatable.mk index ae2132d05915..6c1d68d8c189 100644 --- a/sfx2/CppunitTest_sfx2_metadatable.mk +++ b/sfx2/CppunitTest_sfx2_metadatable.mk @@ -28,6 +28,7 @@ $(eval $(call gb_CppunitTest_use_sdk_api,sfx2_metadatable)) $(eval $(call gb_CppunitTest_use_libraries,sfx2_metadatable, \ sal \ sfx \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk index ccd254c889f5..12c1812a96b4 100644 --- a/sfx2/Library_qstart.mk +++ b/sfx2/Library_qstart.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,qstart_gtk,\ utl \ vcl \ sfx \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index 3ed3a02ce483..5e01c7d01f70 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -67,6 +67,7 @@ $(eval $(call gb_Library_use_libraries,sfx,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/shell/Executable_lngconvex.mk b/shell/Executable_lngconvex.mk index edc88da25dbf..9ed4dd0f01e8 100644 --- a/shell/Executable_lngconvex.mk +++ b/shell/Executable_lngconvex.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Executable_use_libraries,lngconvex,\ i18nisolang1 \ sal \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/shell/Library_cmdmail.mk b/shell/Library_cmdmail.mk index 1b74fa595264..0ae262bee72c 100644 --- a/shell/Library_cmdmail.mk +++ b/shell/Library_cmdmail.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,cmdmail,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/shell/Library_desktopbe.mk b/shell/Library_desktopbe.mk index 90821f6c1822..fbc05a0e318c 100644 --- a/shell/Library_desktopbe.mk +++ b/shell/Library_desktopbe.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,desktopbe1,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/shell/Library_localebe.mk b/shell/Library_localebe.mk index 02cdeb7835a1..008a00481008 100644 --- a/shell/Library_localebe.mk +++ b/shell/Library_localebe.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,localebe1,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/shell/Library_recentfile.mk b/shell/Library_recentfile.mk index 758829962040..c6c25e89a5b2 100644 --- a/shell/Library_recentfile.mk +++ b/shell/Library_recentfile.mk @@ -46,6 +46,7 @@ endif $(eval $(call gb_Library_use_libraries,recentfile,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/shell/Library_syssh.mk b/shell/Library_syssh.mk index 9a08ca481439..252aa827d7c4 100644 --- a/shell/Library_syssh.mk +++ b/shell/Library_syssh.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,syssh,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/shell/Library_syssh_win.mk b/shell/Library_syssh_win.mk index 61810d714142..481728a3c4a8 100644 --- a/shell/Library_syssh_win.mk +++ b/shell/Library_syssh_win.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Library_use_libraries,syssh,\ ole32 \ sal \ shell32 \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/shell/Library_wininetbe.mk b/shell/Library_wininetbe.mk index 9853c2cba6f6..d02c6cc5027b 100644 --- a/shell/Library_wininetbe.mk +++ b/shell/Library_wininetbe.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,wininetbe1,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/slideshow/CppunitTest_slideshow.mk b/slideshow/CppunitTest_slideshow.mk index bf1c0b5cad5d..42be84b0d0f6 100644 --- a/slideshow/CppunitTest_slideshow.mk +++ b/slideshow/CppunitTest_slideshow.mk @@ -66,6 +66,7 @@ $(eval $(call gb_CppunitTest_use_libraries,slideshow,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/slideshow/Executable_demoshow.mk b/slideshow/Executable_demoshow.mk index f658f7f1eb9c..86d14c4b3106 100644 --- a/slideshow/Executable_demoshow.mk +++ b/slideshow/Executable_demoshow.mk @@ -60,6 +60,7 @@ $(eval $(call gb_Executable_use_libraries,demoshow,\ tl \ ucbhelper \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk index 51e9bbdffe16..199699fd24cd 100644 --- a/slideshow/Library_OGLTrans.mk +++ b/slideshow/Library_OGLTrans.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,OGLTrans,\ cppuhelper \ sal \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk index 68c940aa21ca..22b6f5d6bfd6 100644 --- a/slideshow/Library_slideshow.mk +++ b/slideshow/Library_slideshow.mk @@ -62,6 +62,7 @@ $(eval $(call gb_Library_use_libraries,slideshow,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index 308200e6f613..a59782c6dd75 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -109,7 +109,6 @@ endif gb_STDLIBS := \ mingwthrd \ mingw32 \ - uwinapi \ mingwex \ diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 3e375ba4c142..9deca874330a 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -188,7 +188,6 @@ gb_CXXFLAGS := \ -Zm500 \ gb_STDLIBS := \ - uwinapi \ advapi32 \ ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE) diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index f33029f83edf..4d019f80359f 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -38,5 +38,6 @@ gb_OSDEFS := \ -DWNT \ -DNOMINMAX \ +gb_UWINAPI := uwinapi # vim:set noexpandtab: diff --git a/sot/CppunitTest_sot_test_sot.mk b/sot/CppunitTest_sot_test_sot.mk index 22143e1b7bb6..da79a6556c8b 100644 --- a/sot/CppunitTest_sot_test_sot.mk +++ b/sot/CppunitTest_sot_test_sot.mk @@ -44,6 +44,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sot_test_sot, \ sot \ tl \ unotest \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk index ddb21b2ce9a6..50a80db23884 100644 --- a/sot/Library_sot.mk +++ b/sot/Library_sot.mk @@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,sot,\ tl \ ucbhelper \ utl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk index 959d3d66f297..892af74daa71 100644 --- a/starmath/CppunitTest_starmath_qa_cppunit.mk +++ b/starmath/CppunitTest_starmath_qa_cppunit.mk @@ -60,6 +60,7 @@ $(eval $(call gb_CppunitTest_use_libraries,starmath_qa_cppunit,\ utl \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk index 17c6c7a6dd9a..2ecb8d8e7ed3 100644 --- a/starmath/Library_sm.mk +++ b/starmath/Library_sm.mk @@ -55,6 +55,7 @@ $(eval $(call gb_Library_use_libraries,sm,\ utl \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk index 86d4fb28f8ed..3ab12ab75593 100644 --- a/starmath/Library_smd.mk +++ b/starmath/Library_smd.mk @@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,smd,\ tl \ ucbhelper \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/stoc/Library_bootstrap.mk b/stoc/Library_bootstrap.mk index 2676d47ae8e4..e1ef1806ae64 100644 --- a/stoc/Library_bootstrap.mk +++ b/stoc/Library_bootstrap.mk @@ -53,6 +53,7 @@ $(eval $(call gb_Library_use_libraries,bootstrap,\ sal \ salhelper \ xmlreader \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/stoc/Library_introspection.mk b/stoc/Library_introspection.mk index d94330dec5b9..2f2f07d4c926 100644 --- a/stoc/Library_introspection.mk +++ b/stoc/Library_introspection.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Library_use_libraries,introspection,\ cppuhelper \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/stoc/Library_invocadapt.mk b/stoc/Library_invocadapt.mk index fc9cb7238964..38dd68b657f0 100644 --- a/stoc/Library_invocadapt.mk +++ b/stoc/Library_invocadapt.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,invocadapt,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/stoc/Library_invocation.mk b/stoc/Library_invocation.mk index 00288ebd3074..df8d3c78d468 100644 --- a/stoc/Library_invocation.mk +++ b/stoc/Library_invocation.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,invocation,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/stoc/Library_javaloader.mk b/stoc/Library_javaloader.mk index 816bb621674b..e0ff05a968df 100644 --- a/stoc/Library_javaloader.mk +++ b/stoc/Library_javaloader.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Library_use_libraries,javaloader,\ jvmaccess \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/stoc/Library_javavm.mk b/stoc/Library_javavm.mk index edf394e16e29..d8b5b464f44e 100644 --- a/stoc/Library_javavm.mk +++ b/stoc/Library_javavm.mk @@ -36,6 +36,7 @@ $(eval $(call gb_Library_use_libraries,javavm,\ jvmfwk \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/stoc/Library_namingservice.mk b/stoc/Library_namingservice.mk index 10debb0abdbf..124bfaa3055c 100644 --- a/stoc/Library_namingservice.mk +++ b/stoc/Library_namingservice.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,namingservice,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/stoc/Library_proxyfac.mk b/stoc/Library_proxyfac.mk index 6e13d58b761f..cf87b477597d 100644 --- a/stoc/Library_proxyfac.mk +++ b/stoc/Library_proxyfac.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,proxyfac,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/stoc/Library_reflection.mk b/stoc/Library_reflection.mk index 2d383e55619c..644f9f28f1b3 100644 --- a/stoc/Library_reflection.mk +++ b/stoc/Library_reflection.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,reflection,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/stoc/Library_stocservices.mk b/stoc/Library_stocservices.mk index 02a9ecfb5eb2..8f4ec53dd618 100644 --- a/stoc/Library_stocservices.mk +++ b/stoc/Library_stocservices.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_libraries,stocservices,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/store/Library_store.mk b/store/Library_store.mk index 804901c15e23..39029be71fe5 100644 --- a/store/Library_store.mk +++ b/store/Library_store.mk @@ -39,6 +39,7 @@ $(eval $(call gb_Library_add_defs,store,\ $(eval $(call gb_Library_use_libraries,store,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/svl/CppunitTest_svl_lngmisc.mk b/svl/CppunitTest_svl_lngmisc.mk index fd090143c092..c356f403a56b 100644 --- a/svl/CppunitTest_svl_lngmisc.mk +++ b/svl/CppunitTest_svl_lngmisc.mk @@ -39,6 +39,7 @@ $(eval $(call gb_CppunitTest_use_libraries,svl_lngmisc, \ sal \ salhelper \ svl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/svl/CppunitTest_svl_urihelper.mk b/svl/CppunitTest_svl_urihelper.mk index 3586a42b29bd..b0cbcd0e6a35 100644 --- a/svl/CppunitTest_svl_urihelper.mk +++ b/svl/CppunitTest_svl_urihelper.mk @@ -48,6 +48,7 @@ $(eval $(call gb_CppunitTest_use_libraries,svl_urihelper, \ svl \ tl \ utl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk index fc65cb13aa8a..86c00f45418f 100644 --- a/svl/Library_fsstorage.mk +++ b/svl/Library_fsstorage.mk @@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,fsstorage,\ tl \ ucbhelper \ utl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk index b9d5dc0e2a09..1b89ea3ed3da 100644 --- a/svl/Library_passwordcontainer.mk +++ b/svl/Library_passwordcontainer.mk @@ -46,6 +46,7 @@ $(eval $(call gb_Library_use_libraries,passwordcontainer,\ comphelper \ ucbhelper \ utl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk index 768f2db56a0f..8f7940d2b76b 100644 --- a/svl/Library_svl.mk +++ b/svl/Library_svl.mk @@ -59,6 +59,7 @@ $(eval $(call gb_Library_use_libraries,svl,\ tl \ ucbhelper \ utl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/svtools/CppunitTest_svtools_filters_test.mk b/svtools/CppunitTest_svtools_filters_test.mk index 96a1a8d551a4..65b4e1bea3ab 100644 --- a/svtools/CppunitTest_svtools_filters_test.mk +++ b/svtools/CppunitTest_svtools_filters_test.mk @@ -41,6 +41,7 @@ $(eval $(call gb_CppunitTest_use_libraries,svtools_filters_test, \ tl \ unotest \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/svtools/Executable_bmp.mk b/svtools/Executable_bmp.mk index 4a4ccb8bf8f4..f8fee180d891 100644 --- a/svtools/Executable_bmp.mk +++ b/svtools/Executable_bmp.mk @@ -42,6 +42,7 @@ $(eval $(call gb_Executable_use_libraries,bmp,\ comphelper \ tl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/svtools/Executable_bmpsum.mk b/svtools/Executable_bmpsum.mk index c341d4730ca9..a00b928bd39a 100644 --- a/svtools/Executable_bmpsum.mk +++ b/svtools/Executable_bmpsum.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Executable_use_libraries,bmpsum,\ comphelper \ tl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/svtools/Executable_g2g.mk b/svtools/Executable_g2g.mk index d3c5bd024d2f..0936abd454cf 100644 --- a/svtools/Executable_g2g.mk +++ b/svtools/Executable_g2g.mk @@ -42,6 +42,7 @@ $(eval $(call gb_Executable_use_libraries,g2g,\ svt \ tl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/svtools/Executable_langsupport.mk b/svtools/Executable_langsupport.mk index a16e12cda2eb..532b78bbecb6 100644 --- a/svtools/Executable_langsupport.mk +++ b/svtools/Executable_langsupport.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Executable_use_libraries,langsupport,\ tl \ ucbhelper \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/svtools/Library_hatchwindowfactory.mk b/svtools/Library_hatchwindowfactory.mk index 52ab67c58d82..1c7cb22309d7 100644 --- a/svtools/Library_hatchwindowfactory.mk +++ b/svtools/Library_hatchwindowfactory.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,hatchwindowfactory,\ tk \ tl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index cfdadd9be371..7a2379b8c2cd 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -62,6 +62,7 @@ $(eval $(call gb_Library_use_libraries,svt,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk index 7b06bad00624..11aad40f4d46 100644 --- a/svx/Executable_gengal.bin.mk +++ b/svx/Executable_gengal.bin.mk @@ -57,6 +57,7 @@ $(eval $(call gb_Executable_use_libraries,$(svx_GENGALBIN),\ cppuhelper \ vcl \ svxcore \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index a26c1c38e6a7..a939a086a82a 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -65,6 +65,7 @@ $(eval $(call gb_Library_use_libraries,svx,\ vcl \ xo \ xmlscript \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index 89983fdd7966..f94e359aa6a6 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -82,6 +82,7 @@ $(eval $(call gb_Library_use_libraries,svxcore,\ utl \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk index 50b5074adbb7..9b2fdff4b386 100644 --- a/svx/Library_textconversiondlgs.mk +++ b/svx/Library_textconversiondlgs.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,textconversiondlgs,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk index 5a02e31872f9..47d7a35e3075 100644 --- a/sw/CppunitTest_sw_filters_test.mk +++ b/sw/CppunitTest_sw_filters_test.mk @@ -55,6 +55,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_filters_test, \ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk index 6d0b024ef5c5..080bd6aeb1d7 100644 --- a/sw/CppunitTest_sw_layout_test.mk +++ b/sw/CppunitTest_sw_layout_test.mk @@ -66,6 +66,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_layout_test, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk index c8d94e795018..e42eb0c9276b 100644 --- a/sw/CppunitTest_sw_macros_test.mk +++ b/sw/CppunitTest_sw_macros_test.mk @@ -67,6 +67,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_macros_test, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sw/CppunitTest_sw_regression_test.mk b/sw/CppunitTest_sw_regression_test.mk index d4e28d66bc71..538542b37ef7 100644 --- a/sw/CppunitTest_sw_regression_test.mk +++ b/sw/CppunitTest_sw_regression_test.mk @@ -67,6 +67,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_regression_test, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sw/CppunitTest_sw_subsequent_odfexport.mk b/sw/CppunitTest_sw_subsequent_odfexport.mk index a59be4022800..10e7ab20769f 100644 --- a/sw/CppunitTest_sw_subsequent_odfexport.mk +++ b/sw/CppunitTest_sw_subsequent_odfexport.mk @@ -44,6 +44,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odfexport, \ unotest \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sw/CppunitTest_sw_subsequent_odfimport.mk b/sw/CppunitTest_sw_subsequent_odfimport.mk index cba3ebd24779..aceaa697b7e6 100644 --- a/sw/CppunitTest_sw_subsequent_odfimport.mk +++ b/sw/CppunitTest_sw_subsequent_odfimport.mk @@ -43,6 +43,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odfimport, \ unotest \ vcl \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sw/CppunitTest_sw_subsequent_ooxmlexport.mk b/sw/CppunitTest_sw_subsequent_ooxmlexport.mk index eafc644b6a5f..5a9587948a21 100644 --- a/sw/CppunitTest_sw_subsequent_ooxmlexport.mk +++ b/sw/CppunitTest_sw_subsequent_ooxmlexport.mk @@ -43,6 +43,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmlexport, \ unotest \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sw/CppunitTest_sw_subsequent_ooxmlimport.mk b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk index c06de2a849da..8fc2dfedecaa 100644 --- a/sw/CppunitTest_sw_subsequent_ooxmlimport.mk +++ b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk @@ -42,6 +42,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmlimport, \ unotest \ sw \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sw/CppunitTest_sw_subsequent_rtfexport.mk b/sw/CppunitTest_sw_subsequent_rtfexport.mk index fb787a3c4cea..1609b6f41ffc 100644 --- a/sw/CppunitTest_sw_subsequent_rtfexport.mk +++ b/sw/CppunitTest_sw_subsequent_rtfexport.mk @@ -42,6 +42,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtfexport, \ unotest \ utl \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sw/CppunitTest_sw_subsequent_rtfimport.mk b/sw/CppunitTest_sw_subsequent_rtfimport.mk index 3f4747c7cd7d..7ce087e36e40 100644 --- a/sw/CppunitTest_sw_subsequent_rtfimport.mk +++ b/sw/CppunitTest_sw_subsequent_rtfimport.mk @@ -43,6 +43,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtfimport, \ unotest \ vcl \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sw/CppunitTest_sw_subsequent_ww8export.mk b/sw/CppunitTest_sw_subsequent_ww8export.mk index 4595de555c2b..9f4677b5b29e 100644 --- a/sw/CppunitTest_sw_subsequent_ww8export.mk +++ b/sw/CppunitTest_sw_subsequent_ww8export.mk @@ -44,6 +44,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8export, \ utl \ sw \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sw/CppunitTest_sw_subsequent_ww8import.mk b/sw/CppunitTest_sw_subsequent_ww8import.mk index 6e70c9ddad60..16c36843407a 100644 --- a/sw/CppunitTest_sw_subsequent_ww8import.mk +++ b/sw/CppunitTest_sw_subsequent_ww8import.mk @@ -41,6 +41,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8import, \ test \ unotest \ sw \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk index 74bb52a7f834..8b53bdf32009 100644 --- a/sw/CppunitTest_sw_swdoc_test.mk +++ b/sw/CppunitTest_sw_swdoc_test.mk @@ -67,6 +67,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_swdoc_test, \ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk index 54bb731aee69..365c69096b96 100644 --- a/sw/Library_msword.mk +++ b/sw/Library_msword.mk @@ -67,6 +67,7 @@ $(eval $(call gb_Library_use_libraries,msword,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index 1d1801345a5e..b58f71a72b3e 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -76,6 +76,7 @@ $(eval $(call gb_Library_use_libraries,sw,\ vbahelper \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk index a96018ee57b8..73f5fb857781 100644 --- a/sw/Library_swd.mk +++ b/sw/Library_swd.mk @@ -57,6 +57,7 @@ $(eval $(call gb_Library_use_libraries,swd,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk index 86c7372b2eee..4de06513c59a 100644 --- a/sw/Library_swui.mk +++ b/sw/Library_swui.mk @@ -67,6 +67,7 @@ $(eval $(call gb_Library_use_libraries,swui,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk index e77dc7823d43..310a90f4dbff 100644 --- a/sw/Library_vbaswobj.mk +++ b/sw/Library_vbaswobj.mk @@ -63,6 +63,7 @@ $(eval $(call gb_Library_use_libraries,vbaswobj,\ utl \ vbahelper \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk index aad5ebac3fb9..1eca2f36e502 100644 --- a/test/Library_subsequenttest.mk +++ b/test/Library_subsequenttest.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,subsequenttest,\ utl \ unotest \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/test/Library_test.mk b/test/Library_test.mk index cea736feffa1..e730c8b944fa 100644 --- a/test/Library_test.mk +++ b/test/Library_test.mk @@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,test,\ utl \ unotest \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index 72df762e19a9..0388f3cb62bd 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,tk,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/tools/CppunitTest_tools_test.mk b/tools/CppunitTest_tools_test.mk index 13c663afc7cd..ba876eab4a8c 100644 --- a/tools/CppunitTest_tools_test.mk +++ b/tools/CppunitTest_tools_test.mk @@ -46,6 +46,7 @@ $(eval $(call gb_CppunitTest_use_api,tools_test, \ $(eval $(call gb_CppunitTest_use_libraries,tools_test, \ sal \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/tools/Executable_bestreversemap.mk b/tools/Executable_bestreversemap.mk index 4f12051d4d76..a30b5e5e0fe2 100644 --- a/tools/Executable_bestreversemap.mk +++ b/tools/Executable_bestreversemap.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Executable_set_include,bestreversemap,\ $(eval $(call gb_Executable_use_libraries,bestreversemap,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk index 43d436ca9d6b..e97405bec6dc 100644 --- a/tools/Executable_mkunroll.mk +++ b/tools/Executable_mkunroll.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Executable_use_libraries,mkunroll,\ basegfx \ sal \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk index c3d778335aef..12635cd3a7b5 100644 --- a/tools/Executable_rscdep.mk +++ b/tools/Executable_rscdep.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Executable_use_libraries,rscdep,\ comphelper \ sal \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/tools/Executable_so_checksum.mk b/tools/Executable_so_checksum.mk index e384ad57f067..260607035582 100644 --- a/tools/Executable_so_checksum.mk +++ b/tools/Executable_so_checksum.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Executable_set_include,so_checksum,\ $(eval $(call gb_Executable_use_libraries,so_checksum,\ sal \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) # used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 vos3gcc3 - seems to be superficial diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index 23d534fa02c3..b588874d04ca 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,tl,\ i18nisolang1 \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/tubes/CppunitTest_tubes_test.mk b/tubes/CppunitTest_tubes_test.mk index f60a1b0fd174..1a54526c9872 100644 --- a/tubes/CppunitTest_tubes_test.mk +++ b/tubes/CppunitTest_tubes_test.mk @@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_use_libraries,tubes_test, \ sal \ tubes \ utl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/tubes/Library_tubes.mk b/tubes/Library_tubes.mk index 5ef4cb407980..b077841a25d6 100644 --- a/tubes/Library_tubes.mk +++ b/tubes/Library_tubes.mk @@ -41,7 +41,6 @@ $(eval $(call gb_Library_add_defs,tubes,\ )) $(eval $(call gb_Library_use_libraries,tubes,\ - $(gb_STDLIBS) \ comphelper \ cppu \ sal \ @@ -50,6 +49,8 @@ $(eval $(call gb_Library_use_libraries,tubes,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_use_externals,tubes,\ diff --git a/ucb/Library_cached1.mk b/ucb/Library_cached1.mk index 85b1fc29c596..93ac31c15548 100644 --- a/ucb/Library_cached1.mk +++ b/ucb/Library_cached1.mk @@ -36,6 +36,7 @@ $(eval $(call gb_Library_use_libraries,cached1,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/ucb/Library_srtrs1.mk b/ucb/Library_srtrs1.mk index 7beb741e7465..c349e1cec703 100644 --- a/ucb/Library_srtrs1.mk +++ b/ucb/Library_srtrs1.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Library_use_libraries,srtrs1,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/ucb/Library_ucb1.mk b/ucb/Library_ucb1.mk index a501f877a184..109cf2a55be6 100644 --- a/ucb/Library_ucb1.mk +++ b/ucb/Library_ucb1.mk @@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,ucb1,\ cppuhelper \ sal \ ucbhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/ucb/Library_ucpcmis1.mk b/ucb/Library_ucpcmis1.mk index 1fb12264652a..d7fac5b45f89 100644 --- a/ucb/Library_ucpcmis1.mk +++ b/ucb/Library_ucpcmis1.mk @@ -39,6 +39,7 @@ $(eval $(call gb_Library_use_libraries,ucpcmis1,\ salhelper \ ucbhelper \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk index 91b3a975c1ce..3f8e2f42cb0e 100644 --- a/ucb/Library_ucpdav1.mk +++ b/ucb/Library_ucpdav1.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_libraries,ucpdav1,\ sal \ salhelper \ ucbhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/ucb/Library_ucpexpand1.mk b/ucb/Library_ucpexpand1.mk index 51c79e703c5c..dda77b3e430a 100644 --- a/ucb/Library_ucpexpand1.mk +++ b/ucb/Library_ucpexpand1.mk @@ -36,6 +36,7 @@ $(eval $(call gb_Library_use_libraries,ucpexpand1,\ cppuhelper \ sal \ ucbhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/ucb/Library_ucpext.mk b/ucb/Library_ucpext.mk index 9e730003d3e9..eb436aee0a6c 100644 --- a/ucb/Library_ucpext.mk +++ b/ucb/Library_ucpext.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_libraries,ucpext,\ sal \ salhelper \ ucbhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/ucb/Library_ucpfile1.mk b/ucb/Library_ucpfile1.mk index ed68c8938fb1..4f729b1dec08 100644 --- a/ucb/Library_ucpfile1.mk +++ b/ucb/Library_ucpfile1.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Library_use_libraries,ucpfile1,\ cppuhelper \ sal \ ucbhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/ucb/Library_ucpftp1.mk b/ucb/Library_ucpftp1.mk index e588649e2f30..8b197d56b72c 100644 --- a/ucb/Library_ucpftp1.mk +++ b/ucb/Library_ucpftp1.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Library_use_libraries,ucpftp1,\ cppuhelper \ sal \ ucbhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/ucb/Library_ucphier1.mk b/ucb/Library_ucphier1.mk index ac33d001c686..9d33231e23fa 100644 --- a/ucb/Library_ucphier1.mk +++ b/ucb/Library_ucphier1.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Library_use_libraries,ucphier1,\ sal \ salhelper \ ucbhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/ucb/Library_ucpodma1.mk b/ucb/Library_ucpodma1.mk index d531b5494fad..e67f9aa84660 100644 --- a/ucb/Library_ucpodma1.mk +++ b/ucb/Library_ucpodma1.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_libraries,ucpodma1,\ sal \ salhelper \ ucbhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/ucb/Library_ucppkg1.mk b/ucb/Library_ucppkg1.mk index 8b0e8ec0fe12..f1212d0f629a 100644 --- a/ucb/Library_ucppkg1.mk +++ b/ucb/Library_ucppkg1.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_libraries,ucppkg1,\ sal \ salhelper \ ucbhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/ucb/Library_ucptdoc1.mk b/ucb/Library_ucptdoc1.mk index 82b8aba0fc37..97c18b33505b 100644 --- a/ucb/Library_ucptdoc1.mk +++ b/ucb/Library_ucptdoc1.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_libraries,ucptdoc1,\ sal \ salhelper \ ucbhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/ucbhelper/Library_ucbhelper.mk b/ucbhelper/Library_ucbhelper.mk index e5a61fd7a01b..f394025ac0f8 100644 --- a/ucbhelper/Library_ucbhelper.mk +++ b/ucbhelper/Library_ucbhelper.mk @@ -18,6 +18,7 @@ $(eval $(call gb_Library_use_libraries,ucbhelper,\ cppuhelper \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/unotest/Library_unobootstrapprotector.mk b/unotest/Library_unobootstrapprotector.mk index 0119fbdea40a..4fba9a027607 100644 --- a/unotest/Library_unobootstrapprotector.mk +++ b/unotest/Library_unobootstrapprotector.mk @@ -36,6 +36,7 @@ $(eval $(call gb_Library_use_libraries,unobootstrapprotector,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/unotest/Library_unoexceptionprotector.mk b/unotest/Library_unoexceptionprotector.mk index 1f5a584d11b6..f7d50c76a9b7 100644 --- a/unotest/Library_unoexceptionprotector.mk +++ b/unotest/Library_unoexceptionprotector.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Library_use_libraries,unoexceptionprotector,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/unotest/Library_unotest.mk b/unotest/Library_unotest.mk index f4dd2222a007..809968835707 100644 --- a/unotest/Library_unotest.mk +++ b/unotest/Library_unotest.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,unotest,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk index 97e1d70f35fd..0b7eef7b73fb 100644 --- a/unotools/Library_utl.mk +++ b/unotools/Library_utl.mk @@ -60,6 +60,7 @@ $(eval $(call gb_Library_use_libraries,utl,\ salhelper \ tl \ ucbhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/unoxml/Library_unordf.mk b/unoxml/Library_unordf.mk index efab7a8f62e8..f9395a83d160 100644 --- a/unoxml/Library_unordf.mk +++ b/unoxml/Library_unordf.mk @@ -32,6 +32,7 @@ $(eval $(call gb_Library_use_libraries,unordf,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/unoxml/Library_unoxml.mk b/unoxml/Library_unoxml.mk index 81ecfef4f776..3dccdccaec18 100644 --- a/unoxml/Library_unoxml.mk +++ b/unoxml/Library_unoxml.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Library_use_libraries,unoxml,\ cppuhelper \ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/uui/Library_uui.mk b/uui/Library_uui.mk index 87cff350a831..e9030b96fe6e 100644 --- a/uui/Library_uui.mk +++ b/uui/Library_uui.mk @@ -43,6 +43,7 @@ $(eval $(call gb_Library_use_libraries,uui,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/vbahelper/Library_msforms.mk b/vbahelper/Library_msforms.mk index 1b0e56526cf7..9a5493c12cb8 100644 --- a/vbahelper/Library_msforms.mk +++ b/vbahelper/Library_msforms.mk @@ -62,6 +62,7 @@ $(eval $(call gb_Library_use_libraries,msforms,\ tl \ vbahelper \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/vbahelper/Library_vbahelper.mk b/vbahelper/Library_vbahelper.mk index a18f06e6a482..8bbe47457870 100644 --- a/vbahelper/Library_vbahelper.mk +++ b/vbahelper/Library_vbahelper.mk @@ -65,6 +65,7 @@ $(eval $(call gb_Library_use_libraries,vbahelper,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 86435a2ba352..df68439c72c1 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -84,6 +84,7 @@ $(eval $(call gb_Library_use_libraries,vcl,\ cppu \ sal \ xmlreader \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/writerfilter/CppunitTest_writerfilter_doctok.mk b/writerfilter/CppunitTest_writerfilter_doctok.mk index fd2fe872b30f..cf48c49851cf 100644 --- a/writerfilter/CppunitTest_writerfilter_doctok.mk +++ b/writerfilter/CppunitTest_writerfilter_doctok.mk @@ -37,6 +37,7 @@ $(eval $(call gb_CppunitTest_use_libraries,writerfilter_doctok, \ cppuhelper \ sal \ writerfilter \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk index 6e583e9227f5..78f2a008abc6 100644 --- a/writerfilter/CppunitTest_writerfilter_rtftok.mk +++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk @@ -43,6 +43,7 @@ $(eval $(call gb_CppunitTest_use_libraries,writerfilter_rtftok, \ unotest \ vcl \ writerfilter \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index c0088eac61f3..83006badc658 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -80,6 +80,7 @@ $(eval $(call gb_Library_use_libraries,writerfilter,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/writerfilter/Library_writerfilter_uno.mk b/writerfilter/Library_writerfilter_uno.mk index 1eeccd538349..d7a72fc4c0c8 100644 --- a/writerfilter/Library_writerfilter_uno.mk +++ b/writerfilter/Library_writerfilter_uno.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,writerfilter_uno,\ cppuhelper \ sal \ writerfilter \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/writerperfect/Library_wpftdraw.mk b/writerperfect/Library_wpftdraw.mk index 57b48a045f54..412b0c982430 100644 --- a/writerperfect/Library_wpftdraw.mk +++ b/writerperfect/Library_wpftdraw.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Library_use_libraries,wpftdraw,\ tl \ utl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk index 25f77c40673c..a4295a5019b6 100644 --- a/writerperfect/Library_wpftwriter.mk +++ b/writerperfect/Library_wpftwriter.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,wpftwriter,\ ucbhelper \ utl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk index 468f966a90f5..73be015cb824 100644 --- a/xmloff/Library_xo.mk +++ b/xmloff/Library_xo.mk @@ -55,6 +55,7 @@ $(eval $(call gb_Library_use_libraries,xo,\ svl \ tl \ utl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk index 4efd62b0ff72..15e65da4c325 100644 --- a/xmloff/Library_xof.mk +++ b/xmloff/Library_xof.mk @@ -45,6 +45,7 @@ $(eval $(call gb_Library_use_libraries,xof,\ salhelper \ sax \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/xmlreader/Library_xmlreader.mk b/xmlreader/Library_xmlreader.mk index e254b197b22b..7035278e9c44 100644 --- a/xmlreader/Library_xmlreader.mk +++ b/xmlreader/Library_xmlreader.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Library_add_defs,xmlreader,\ $(eval $(call gb_Library_use_libraries,xmlreader,\ cppu \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) # cppu is only needed due to the cppumaker -C hack diff --git a/xmlscript/Library_xmlscript.mk b/xmlscript/Library_xmlscript.mk index 2ca986a385aa..3f83379ba8b3 100644 --- a/xmlscript/Library_xmlscript.mk +++ b/xmlscript/Library_xmlscript.mk @@ -23,6 +23,7 @@ $(eval $(call gb_Library_use_libraries,xmlscript,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/xmlsecurity/CppunitTest_qa_certext.mk b/xmlsecurity/CppunitTest_qa_certext.mk index 7fd7af10deb3..7501f23cc110 100644 --- a/xmlsecurity/CppunitTest_qa_certext.mk +++ b/xmlsecurity/CppunitTest_qa_certext.mk @@ -44,6 +44,7 @@ $(eval $(call gb_CppunitTest_use_libraries,xmlsecurity_qa_certext,\ svl \ test \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/xmlsecurity/Library_xmlsecurity.mk b/xmlsecurity/Library_xmlsecurity.mk index aae123bd8c47..09766bc188f4 100644 --- a/xmlsecurity/Library_xmlsecurity.mk +++ b/xmlsecurity/Library_xmlsecurity.mk @@ -51,6 +51,7 @@ $(eval $(call gb_Library_use_libraries,xmlsecurity,\ utl \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/xmlsecurity/Library_xsec_fw.mk b/xmlsecurity/Library_xsec_fw.mk index 4ea0768b4d51..99b393f532de 100644 --- a/xmlsecurity/Library_xsec_fw.mk +++ b/xmlsecurity/Library_xsec_fw.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,xsec_fw,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index e2048f60454a..5195db72d41a 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -65,6 +65,7 @@ $(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ svl \ tl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) From b85c34978356eb01311f197f00f4dd5f808e3664 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 27 Sep 2012 00:49:12 +0200 Subject: [PATCH 004/863] gbuild: replace direct gb_STDLIBS use with ... ... new gb_LinkTarget_add_standard_system_libs Change-Id: Ib2bc843098db3d8c6822b45a3d21724e67f57d69 --- Library_merged.mk | 3 ++- UnoControls/Library_ctl.mk | 3 ++- accessibility/Library_acc.mk | 3 ++- accessibility/Library_java_uno_accessbridge.mk | 3 ++- animations/Library_animcore.mk | 3 ++- avmedia/Library_avmedia.mk | 3 ++- avmedia/Library_avmediaQuickTime.mk | 3 ++- avmedia/Library_avmediagst.mk | 3 ++- avmedia/Library_avmediagst_0_10.mk | 3 ++- avmedia/Library_avmediawin.mk | 3 ++- basctl/Library_basctl.mk | 3 ++- basebmp/CppunitTest_basebmp.mk | 3 ++- basebmp/Library_basebmp.mk | 3 ++- basebmp/StaticLibrary_basebmp.mk | 1 - basegfx/CppunitTest_basegfx.mk | 3 ++- basegfx/Library_basegfx.mk | 3 ++- basic/CppunitTest_basic_enable.mk | 3 ++- basic/CppunitTest_basic_nested_struct.mk | 3 ++- basic/CppunitTest_basic_scanner.mk | 3 ++- basic/Library_sb.mk | 3 ++- bean/Library_officebean.mk | 4 +--- binaryurp/CppunitTest_binaryurp_test-cache.mk | 3 ++- binaryurp/CppunitTest_binaryurp_test-unmarshal.mk | 3 ++- binaryurp/Library_binaryurp.mk | 3 ++- bridges/Library_gcc3_linux_arm.mk | 3 ++- bridges/Library_gcc3_linux_intel.mk | 3 ++- bridges/Library_gcc3_linux_mips.mk | 3 ++- bridges/Library_java_uno.mk | 3 ++- canvas/Library_cairocanvas.mk | 3 ++- canvas/Library_canvasfactory.mk | 3 ++- canvas/Library_canvastools.mk | 3 ++- canvas/Library_directx9canvas.mk | 3 ++- canvas/Library_gdipluscanvas.mk | 3 ++- canvas/Library_nullcanvas.mk | 3 ++- canvas/Library_simplecanvas.mk | 3 ++- canvas/Library_vclcanvas.mk | 3 ++- chart2/Library_chartcontroller.mk | 3 ++- chart2/Library_chartcore.mk | 3 ++- cli_ure/Executable_climaker.mk | 3 ++- clucene/Library_clucene.mk | 5 +---- comphelper/CppunitTest_comphelper_test.mk | 3 ++- comphelper/Library_comphelper.mk | 3 ++- configmgr/Library_configmgr.mk | 3 ++- connectivity/Library_ado.mk | 3 ++- connectivity/Library_calc.mk | 3 ++- connectivity/Library_dbase.mk | 3 ++- connectivity/Library_dbpool2.mk | 3 ++- connectivity/Library_dbtools.mk | 3 ++- connectivity/Library_evoab.mk | 3 ++- connectivity/Library_file.mk | 3 ++- connectivity/Library_flat.mk | 3 ++- connectivity/Library_hsqldb.mk | 3 ++- connectivity/Library_jdbc.mk | 3 ++- connectivity/Library_kab1.mk | 3 ++- connectivity/Library_kabdrv1.mk | 3 ++- connectivity/Library_macab1.mk | 3 ++- connectivity/Library_macabdrv1.mk | 3 ++- connectivity/Library_mork.mk | 3 ++- connectivity/Library_mozab.mk | 3 ++- connectivity/Library_mozabdrv.mk | 3 ++- connectivity/Library_mozbootstrap.mk | 3 ++- connectivity/Library_mysql.mk | 3 ++- connectivity/Library_odbc.mk | 3 ++- connectivity/Library_odbcbase.mk | 3 ++- connectivity/Library_postgresql-sdbc-impl.mk | 3 ++- connectivity/Library_postgresql-sdbc.mk | 3 ++- connectivity/Library_sdbc2.mk | 3 ++- connectivity/Library_tdeab1.mk | 3 ++- connectivity/Library_tdeabdrv1.mk | 3 ++- cppcanvas/Library_cppcanvas.mk | 3 ++- cppcanvas/Library_mtfrenderer.mk | 3 ++- cppu/CppunitTest_cppu_checkapi.mk | 3 ++- cppu/CppunitTest_cppu_qa_any.mk | 3 ++- cppu/CppunitTest_cppu_qa_recursion.mk | 3 ++- cppu/CppunitTest_cppu_qa_reference.mk | 3 ++- cppu/CppunitTest_cppu_qa_unotype.mk | 3 ++- cppu/CppunitTest_cppu_test_cppumaker.mk | 3 ++- cppu/Library_affine_uno.mk | 3 ++- cppu/Library_cppu.mk | 3 ++- cppu/Library_log_uno.mk | 3 ++- cppu/Library_purpenvhelper.mk | 3 ++- cppu/Library_unsafe_uno.mk | 3 ++- cppuhelper/CppunitTest_cppuhelper_checkapi.mk | 3 ++- cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk | 3 ++- cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk | 3 ++- cppuhelper/CppunitTest_cppuhelper_qa_weak.mk | 3 ++- cppuhelper/Library_cppuhelper.mk | 3 ++- cpputools/Executable_regcomp.mk | 3 ++- cpputools/Executable_regsingleton.mk | 3 ++- cpputools/Executable_uno.mk | 3 ++- cui/Library_cui.mk | 3 ++- dbaccess/CppunitTest_dbaccess_macros_test.mk | 3 ++- dbaccess/Executable_odbcconfig.mk | 3 ++- dbaccess/Library_dba.mk | 3 ++- dbaccess/Library_dbaxml.mk | 3 ++- dbaccess/Library_dbmm.mk | 3 ++- dbaccess/Library_dbu.mk | 3 ++- dbaccess/Library_sdbt.mk | 3 ++- desktop/Executable_crashrep.com.mk | 3 ++- desktop/Executable_officeloader.mk | 3 ++- desktop/Executable_oosplash.mk | 3 ++- desktop/Executable_quickstart.mk | 3 ++- desktop/Executable_sbase.mk | 3 ++- desktop/Executable_scalc.mk | 3 ++- desktop/Executable_sdraw.mk | 3 ++- desktop/Executable_simpress.mk | 3 ++- desktop/Executable_smath.mk | 3 ++- desktop/Executable_soffice.bin.mk | 3 ++- desktop/Executable_soffice.mk | 3 ++- desktop/Executable_soffice_bin.mk | 3 ++- desktop/Executable_sweb.mk | 3 ++- desktop/Executable_swriter.mk | 3 ++- desktop/Executable_unopkg.bin.mk | 3 ++- desktop/Library_deployment.mk | 3 ++- desktop/Library_deploymentgui.mk | 3 ++- desktop/Library_deploymentmisc.mk | 3 ++- desktop/Library_migrationoo2.mk | 3 ++- desktop/Library_migrationoo3.mk | 3 ++- desktop/Library_offacc.mk | 3 ++- desktop/Library_sofficeapp.mk | 3 ++- desktop/Library_spl.mk | 3 ++- desktop/Library_spl_unx.mk | 3 ++- desktop/Library_unopkgapp.mk | 3 ++- drawinglayer/Library_drawinglayer.mk | 3 ++- dtrans/Library_dnd.mk | 3 ++- dtrans/Library_dtrans.mk | 3 ++- dtrans/Library_ftransl.mk | 3 ++- dtrans/Library_mcnttype.mk | 3 ++- dtrans/Library_sysdtrans.mk | 3 ++- editeng/CppunitTest_editeng_borderline.mk | 3 ++- editeng/CppunitTest_editeng_core.mk | 3 ++- editeng/CppunitTest_editeng_lookuptree.mk | 3 ++- editeng/Library_editeng.mk | 3 ++- embeddedobj/Library_embobj.mk | 3 ++- embeddedobj/Library_emboleobj.mk | 3 ++- embedserv/Library_emser.mk | 3 ++- embedserv/Library_inprocserv.mk | 3 ++- eventattacher/Library_evtatt.mk | 3 ++- extensions/CppunitTest_extensions_test_update.mk | 3 ++- extensions/Library_abp.mk | 3 ++- extensions/Library_bib.mk | 3 ++- extensions/Library_dbp.mk | 3 ++- extensions/Library_log.mk | 3 ++- extensions/Library_pcr.mk | 3 ++- extensions/Library_pl.mk | 3 ++- extensions/Library_res.mk | 3 ++- extensions/Library_scn.mk | 3 ++- fileaccess/Library_fileacc.mk | 3 ++- filter/CppunitTest_filter_pict_test.mk | 3 ++- filter/CppunitTest_filter_tga_test.mk | 3 ++- filter/CppunitTest_filter_tiff_test.mk | 3 ++- filter/Executable_svg2odf.mk | 3 ++- filter/Library_PptImporter.mk | 3 ++- filter/Library_egi.mk | 3 ++- filter/Library_eme.mk | 3 ++- filter/Library_epb.mk | 3 ++- filter/Library_epg.mk | 3 ++- filter/Library_epp.mk | 3 ++- filter/Library_eps.mk | 3 ++- filter/Library_ept.mk | 3 ++- filter/Library_era.mk | 3 ++- filter/Library_eti.mk | 3 ++- filter/Library_exp.mk | 3 ++- filter/Library_filterconfig.mk | 3 ++- filter/Library_flash.mk | 3 ++- filter/Library_icd.mk | 3 ++- filter/Library_icg.mk | 3 ++- filter/Library_idx.mk | 3 ++- filter/Library_ime.mk | 3 ++- filter/Library_ipb.mk | 3 ++- filter/Library_ipd.mk | 3 ++- filter/Library_ips.mk | 3 ++- filter/Library_ipt.mk | 3 ++- filter/Library_ipx.mk | 3 ++- filter/Library_ira.mk | 3 ++- filter/Library_itg.mk | 3 ++- filter/Library_iti.mk | 3 ++- filter/Library_msfilter.mk | 3 ++- filter/Library_odfflatxml.mk | 3 ++- filter/Library_pdffilter.mk | 3 ++- filter/Library_placeware.mk | 3 ++- filter/Library_svgfilter.mk | 3 ++- filter/Library_t602filter.mk | 3 ++- filter/Library_textfd.mk | 3 ++- filter/Library_xmlfa.mk | 3 ++- filter/Library_xmlfd.mk | 3 ++- filter/Library_xsltdlg.mk | 3 ++- filter/Library_xsltfilter.mk | 3 ++- forms/Library_frm.mk | 3 ++- formula/Library_for.mk | 3 ++- formula/Library_forui.mk | 3 ++- fpicker/Library_fpicker.mk | 3 ++- fpicker/Library_fps.mk | 3 ++- fpicker/Library_fps_aqua.mk | 3 ++- fpicker/Library_fps_odma.mk | 3 ++- fpicker/Library_fps_office.mk | 3 ++- framework/Library_fwe.mk | 3 ++- framework/Library_fwi.mk | 3 ++- framework/Library_fwk.mk | 3 ++- framework/Library_fwl.mk | 3 ++- framework/Library_fwm.mk | 3 ++- framework/Library_lomenubar.mk | 3 ++- hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk | 3 ++- hwpfilter/Library_hwp.mk | 3 ++- i18npool/CppunitTest_i18npool_test_breakiterator.mk | 3 ++- .../CppunitTest_i18npool_test_characterclassification.mk | 3 ++- i18npool/CppunitTest_i18npool_test_languagetag.mk | 3 ++- i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk | 3 ++- i18npool/Executable_gencoll_rule.mk | 3 ++- i18npool/Executable_genconv_dict.mk | 3 ++- i18npool/Executable_gendict.mk | 3 ++- i18npool/Executable_genindex_data.mk | 3 ++- i18npool/Executable_saxparser.mk | 3 ++- i18npool/Library_collator_data.mk | 3 ++- i18npool/Library_dict_ja.mk | 3 ++- i18npool/Library_dict_zh.mk | 3 ++- i18npool/Library_i18nisolang1.mk | 3 ++- i18npool/Library_i18npool.mk | 3 ++- i18npool/Library_i18nsearch.mk | 3 ++- i18npool/Library_index_data.mk | 3 ++- i18npool/Library_localedata_en.mk | 3 ++- i18npool/Library_localedata_es.mk | 3 ++- i18npool/Library_localedata_euro.mk | 3 ++- i18npool/Library_localedata_others.mk | 3 ++- i18npool/Library_textconv_dict.mk | 3 ++- i18nutil/Library_i18nutil.mk | 3 ++- idl/Executable_svidl.mk | 3 ++- io/Library_acceptor.mk | 3 ++- io/Library_connector.mk | 3 ++- io/Library_streams.mk | 3 ++- io/Library_textinstream.mk | 3 ++- io/Library_textoutstream.mk | 3 ++- javaunohelper/Library_juh.mk | 3 ++- javaunohelper/Library_juhx.mk | 3 ++- jurt/Library_jpipe.mk | 3 ++- jurt/Library_jpipx.mk | 3 ++- jvmaccess/Library_jvmaccess.mk | 3 ++- jvmfwk/Executable_javaldx.mk | 3 ++- jvmfwk/Library_jvmfwk.mk | 3 ++- jvmfwk/Library_sunjavaplugin.mk | 3 ++- l10ntools/Executable_ulfconv.mk | 3 ++- lingucomponent/Library_MacOSXSpell.mk | 3 ++- lingucomponent/Library_guesslang.mk | 3 ++- lingucomponent/Library_hyphen.mk | 3 ++- lingucomponent/Library_lnth.mk | 3 ++- lingucomponent/Library_spell.mk | 3 ++- linguistic/Library_lng.mk | 3 ++- .../CppunitTest_lotuswordpro_test_lotuswordpro.mk | 3 ++- lotuswordpro/Library_lwpft.mk | 3 ++- o3tl/CppunitTest_o3tl_tests.mk | 3 ++- officecfg/CppunitTest_officecfg_cppheader_test.mk | 3 ++- oox/Library_oox.mk | 3 ++- package/Library_package2.mk | 3 ++- package/Library_xstor.mk | 3 ++- padmin/Executable_spadmin.bin.mk | 3 ++- padmin/Library_spa.mk | 3 ++- regexp/Library_regexp.mk | 3 ++- registry/Library_reg.mk | 3 ++- remotebridges/Library_uuresolver.mk | 3 ++- reportdesign/Library_rpt.mk | 3 ++- reportdesign/Library_rptui.mk | 3 ++- reportdesign/Library_rptxml.mk | 3 ++- rsc/Executable_rsc.mk | 3 ++- sal/CppunitTest_Module_DLL.mk | 3 ++- sal/CppunitTest_sal_bytesequence.mk | 3 ++- sal/CppunitTest_sal_checkapi.mk | 3 ++- sal/CppunitTest_sal_osl_condition.mk | 3 ++- sal/CppunitTest_sal_osl_file.mk | 3 ++- sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk | 3 ++- sal/CppunitTest_sal_osl_module.mk | 3 ++- sal/CppunitTest_sal_osl_mutex.mk | 3 ++- sal/CppunitTest_sal_osl_old_test_file.mk | 3 ++- sal/CppunitTest_sal_osl_pipe.mk | 3 ++- sal/CppunitTest_sal_osl_process.mk | 7 +++++-- sal/CppunitTest_sal_osl_profile.mk | 3 ++- sal/CppunitTest_sal_osl_security.mk | 3 ++- sal/CppunitTest_sal_osl_setthreadname.mk | 3 ++- sal/CppunitTest_sal_osl_thread.mk | 3 ++- sal/CppunitTest_sal_rtl_alloc.mk | 3 ++- sal/CppunitTest_sal_rtl_cipher.mk | 3 ++- sal/CppunitTest_sal_rtl_crc32.mk | 3 ++- sal/CppunitTest_sal_rtl_doublelock.mk | 3 ++- sal/CppunitTest_sal_rtl_locale.mk | 3 ++- sal/CppunitTest_sal_rtl_math.mk | 3 ++- sal/CppunitTest_sal_rtl_ostringbuffer.mk | 3 ++- sal/CppunitTest_sal_rtl_oustringbuffer.mk | 3 ++- sal/CppunitTest_sal_rtl_strings.mk | 3 ++- sal/CppunitTest_sal_rtl_uri.mk | 3 ++- sal/CppunitTest_sal_rtl_uuid.mk | 3 ++- sal/CppunitTest_sal_tcwf.mk | 3 ++- sal/CppunitTest_sal_types.mk | 3 ++- sal/Executable_cppunittester.mk | 3 ++- sal/Executable_osl_process_child.mk | 3 ++- sal/Library_sal.mk | 3 ++- sal/Library_sal_textenc.mk | 3 ++- sal/Library_uwinapi.mk | 3 ++- salhelper/CppunitTest_salhelper_checkapi.mk | 3 ++- salhelper/Library_salhelper.mk | 3 ++- sax/CppunitTest_sax.mk | 3 ++- sax/Library_expwrap.mk | 3 ++- sax/Library_fastsax.mk | 3 ++- sax/Library_sax.mk | 3 ++- sc/CppunitTest_sc_annotationshapeobj.mk | 3 ++- sc/CppunitTest_sc_cellrangeobj.mk | 3 ++- sc/CppunitTest_sc_chart_regression_test.mk | 3 ++- sc/CppunitTest_sc_databaserangeobj.mk | 3 ++- sc/CppunitTest_sc_datapilotfieldobj.mk | 3 ++- sc/CppunitTest_sc_datapilottableobj.mk | 3 ++- sc/CppunitTest_sc_editfieldobj_cell.mk | 3 ++- sc/CppunitTest_sc_editfieldobj_header.mk | 3 ++- sc/CppunitTest_sc_filters_test.mk | 3 ++- sc/CppunitTest_sc_macros_test.mk | 3 ++- sc/CppunitTest_sc_modelobj.mk | 3 ++- sc/CppunitTest_sc_namedrangeobj.mk | 3 ++- sc/CppunitTest_sc_namedrangesobj.mk | 3 ++- sc/CppunitTest_sc_rangelst_test.mk | 3 ++- sc/CppunitTest_sc_subsequent_filters_test.mk | 3 ++- sc/CppunitTest_sc_tableautoformatfield.mk | 3 ++- sc/CppunitTest_sc_tablesheetobj.mk | 3 ++- sc/CppunitTest_sc_tablesheetsobj.mk | 3 ++- sc/CppunitTest_sc_ucalc.mk | 3 ++- sc/Library_sc.mk | 3 ++- sc/Library_scd.mk | 3 ++- sc/Library_scfilt.mk | 3 ++- sc/Library_scui.mk | 3 ++- sc/Library_vbaobj.mk | 3 ++- scaddins/Library_analysis.mk | 3 ++- scaddins/Library_date.mk | 3 ++- sccomp/Library_solver.mk | 3 ++- scripting/Library_basprov.mk | 3 ++- scripting/Library_dlgprov.mk | 3 ++- scripting/Library_protocolhandler.mk | 3 ++- scripting/Library_scriptframe.mk | 3 ++- scripting/Library_stringresource.mk | 3 ++- scripting/Library_vbaevents.mk | 3 ++- sd/CppunitTest_sd_filters_test.mk | 3 ++- sd/CppunitTest_sd_regression_test.mk | 3 ++- sd/CppunitTest_sd_uimpress.mk | 3 ++- sd/Library_sd.mk | 3 ++- sd/Library_sdd.mk | 3 ++- sd/Library_sdfilt.mk | 3 ++- sd/Library_sdui.mk | 3 ++- sdext/CppunitTest_pdfimport.mk | 3 ++- sfx2/CppunitTest_sfx2_metadatable.mk | 3 ++- sfx2/Library_qstart.mk | 3 ++- sfx2/Library_sfx.mk | 3 ++- shell/Executable_lngconvex.mk | 3 ++- shell/Library_cmdmail.mk | 3 ++- shell/Library_desktopbe.mk | 3 ++- shell/Library_gconfbe.mk | 3 ++- shell/Library_kde4be.mk | 3 ++- shell/Library_kdebe.mk | 3 ++- shell/Library_localebe.mk | 3 ++- shell/Library_macbe.mk | 3 ++- shell/Library_recentfile.mk | 3 ++- shell/Library_syssh.mk | 3 ++- shell/Library_syssh_win.mk | 3 ++- shell/Library_tdebe.mk | 3 ++- shell/Library_wininetbe.mk | 3 ++- slideshow/CppunitTest_slideshow.mk | 3 ++- slideshow/Executable_demoshow.mk | 3 ++- slideshow/Library_OGLTrans.mk | 3 ++- slideshow/Library_slideshow.mk | 3 ++- solenv/gbuild/CppunitTest.mk | 1 + solenv/gbuild/Executable.mk | 1 + solenv/gbuild/Library.mk | 1 + solenv/gbuild/LinkTarget.mk | 7 +++++++ solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk | 2 +- solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk | 2 +- solenv/gbuild/platform/WNT_INTEL_GCC.mk | 6 +++--- solenv/gbuild/platform/WNT_INTEL_MSC.mk | 2 +- solenv/gbuild/platform/android.mk | 2 +- solenv/gbuild/platform/solaris.mk | 6 +++--- sot/CppunitTest_sot_test_sot.mk | 3 ++- sot/Library_sot.mk | 3 ++- starmath/CppunitTest_starmath_qa_cppunit.mk | 3 ++- starmath/Library_sm.mk | 3 ++- starmath/Library_smd.mk | 3 ++- stoc/Library_bootstrap.mk | 3 ++- stoc/Library_introspection.mk | 3 ++- stoc/Library_invocadapt.mk | 3 ++- stoc/Library_invocation.mk | 3 ++- stoc/Library_javaloader.mk | 3 ++- stoc/Library_javavm.mk | 3 ++- stoc/Library_namingservice.mk | 3 ++- stoc/Library_proxyfac.mk | 3 ++- stoc/Library_reflection.mk | 3 ++- stoc/Library_stocservices.mk | 3 ++- store/Library_store.mk | 3 ++- svl/CppunitTest_svl_lngmisc.mk | 3 ++- svl/CppunitTest_svl_urihelper.mk | 3 ++- svl/Library_fsstorage.mk | 3 ++- svl/Library_passwordcontainer.mk | 3 ++- svl/Library_svl.mk | 3 ++- svtools/CppunitTest_svtools_filters_test.mk | 3 ++- svtools/Executable_bmp.mk | 3 ++- svtools/Executable_bmpsum.mk | 3 ++- svtools/Executable_g2g.mk | 3 ++- svtools/Executable_langsupport.mk | 3 ++- svtools/Library_hatchwindowfactory.mk | 3 ++- svtools/Library_svt.mk | 3 ++- svx/Executable_gengal.bin.mk | 3 ++- svx/Library_svx.mk | 3 ++- svx/Library_svxcore.mk | 3 ++- svx/Library_textconversiondlgs.mk | 3 ++- sw/CppunitTest_sw_filters_test.mk | 3 ++- sw/CppunitTest_sw_layout_test.mk | 3 ++- sw/CppunitTest_sw_macros_test.mk | 3 ++- sw/CppunitTest_sw_regression_test.mk | 3 ++- sw/CppunitTest_sw_subsequent_odfexport.mk | 3 ++- sw/CppunitTest_sw_subsequent_odfimport.mk | 3 ++- sw/CppunitTest_sw_subsequent_ooxmlexport.mk | 3 ++- sw/CppunitTest_sw_subsequent_ooxmlimport.mk | 3 ++- sw/CppunitTest_sw_subsequent_rtfexport.mk | 3 ++- sw/CppunitTest_sw_subsequent_rtfimport.mk | 3 ++- sw/CppunitTest_sw_subsequent_ww8export.mk | 3 ++- sw/CppunitTest_sw_subsequent_ww8import.mk | 3 ++- sw/CppunitTest_sw_swdoc_test.mk | 3 ++- sw/Library_msword.mk | 3 ++- sw/Library_sw.mk | 3 ++- sw/Library_swd.mk | 3 ++- sw/Library_swui.mk | 3 ++- sw/Library_vbaswobj.mk | 3 ++- test/Library_subsequenttest.mk | 3 ++- test/Library_test.mk | 3 ++- toolkit/Library_tk.mk | 3 ++- tools/CppunitTest_tools_test.mk | 3 ++- tools/Executable_bestreversemap.mk | 3 ++- tools/Executable_mkunroll.mk | 3 ++- tools/Executable_rscdep.mk | 3 ++- tools/Executable_so_checksum.mk | 3 ++- tools/Library_tl.mk | 3 ++- touch/Library_libotouch.mk | 3 ++- tubes/CppunitTest_tubes_test.mk | 3 ++- tubes/Library_tubes.mk | 3 ++- ucb/Library_cached1.mk | 3 ++- ucb/Library_srtrs1.mk | 3 ++- ucb/Library_ucb1.mk | 3 ++- ucb/Library_ucpcmis1.mk | 3 ++- ucb/Library_ucpdav1.mk | 3 ++- ucb/Library_ucpexpand1.mk | 3 ++- ucb/Library_ucpext.mk | 3 ++- ucb/Library_ucpfile1.mk | 3 ++- ucb/Library_ucpftp1.mk | 3 ++- ucb/Library_ucpgio1.mk | 3 ++- ucb/Library_ucpgvfs1.mk | 3 ++- ucb/Library_ucphier1.mk | 3 ++- ucb/Library_ucpodma1.mk | 3 ++- ucb/Library_ucppkg1.mk | 3 ++- ucb/Library_ucptdoc1.mk | 3 ++- ucbhelper/Library_ucbhelper.mk | 3 ++- unotest/Library_unobootstrapprotector.mk | 3 ++- unotest/Library_unoexceptionprotector.mk | 3 ++- unotest/Library_unotest.mk | 3 ++- unotools/Library_utl.mk | 3 ++- unoxml/Library_unordf.mk | 3 ++- unoxml/Library_unoxml.mk | 3 ++- uui/Library_uui.mk | 3 ++- vbahelper/Library_msforms.mk | 3 ++- vbahelper/Library_vbahelper.mk | 3 ++- vcl/Executable_kdefilepicker.mk | 3 ++- vcl/Executable_tdefilepicker.mk | 3 ++- vcl/Library_desktop_detector.mk | 3 ++- vcl/Library_vcl.mk | 3 ++- vcl/Library_vclplug_gen.mk | 3 ++- vcl/Library_vclplug_gtk.mk | 3 ++- vcl/Library_vclplug_gtk3.mk | 3 ++- vcl/Library_vclplug_kde.mk | 3 ++- vcl/Library_vclplug_kde4.mk | 3 ++- vcl/Library_vclplug_svp.mk | 3 ++- vcl/Library_vclplug_tde.mk | 3 ++- writerfilter/CppunitTest_writerfilter_doctok.mk | 3 ++- writerfilter/CppunitTest_writerfilter_rtftok.mk | 3 ++- writerfilter/Library_writerfilter.mk | 3 ++- writerfilter/Library_writerfilter_uno.mk | 3 ++- writerperfect/Library_wpftdraw.mk | 3 ++- writerperfect/Library_wpftwriter.mk | 3 ++- xml2cmp/Executable_xml2cmp.mk | 8 +++----- xmloff/Library_xo.mk | 3 ++- xmloff/Library_xof.mk | 3 ++- xmlreader/Library_xmlreader.mk | 3 ++- xmlscript/Library_xmlscript.mk | 3 ++- xmlsecurity/CppunitTest_qa_certext.mk | 3 ++- xmlsecurity/Library_xmlsecurity.mk | 3 ++- xmlsecurity/Library_xsec_fw.mk | 3 ++- xmlsecurity/Library_xsec_xmlsec.mk | 3 ++- 486 files changed, 972 insertions(+), 496 deletions(-) diff --git a/Library_merged.mk b/Library_merged.mk index 0c6cb408fd46..8914e598e5fc 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,merged,\ ucbhelper \ xmlreader \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,merged)) + $(eval $(call gb_Library_use_externals,merged,\ cups \ icui18n \ diff --git a/UnoControls/Library_ctl.mk b/UnoControls/Library_ctl.mk index e5ac6d72ce4e..fd7e1736962a 100644 --- a/UnoControls/Library_ctl.mk +++ b/UnoControls/Library_ctl.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,ctl,\ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ctl)) + $(eval $(call gb_Library_set_componentfile,ctl,UnoControls/util/ctl)) $(eval $(call gb_Library_add_exception_objects,ctl,\ diff --git a/accessibility/Library_acc.mk b/accessibility/Library_acc.mk index 7da687e3695c..667dcc30e09e 100644 --- a/accessibility/Library_acc.mk +++ b/accessibility/Library_acc.mk @@ -48,9 +48,10 @@ $(eval $(call gb_Library_use_libraries,acc,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,acc)) + $(eval $(call gb_Library_add_exception_objects,acc,\ accessibility/source/extended/AccessibleBrowseBox \ accessibility/source/extended/AccessibleBrowseBoxBase \ diff --git a/accessibility/Library_java_uno_accessbridge.mk b/accessibility/Library_java_uno_accessbridge.mk index 5e0b98fad2ee..1579f8a35e3a 100644 --- a/accessibility/Library_java_uno_accessbridge.mk +++ b/accessibility/Library_java_uno_accessbridge.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,java_uno_accessbridge,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,java_uno_accessbridge)) + $(eval $(call gb_Library_add_exception_objects,java_uno_accessbridge,\ accessibility/bridge/source/java/WindowsAccessBridgeAdapter \ )) diff --git a/animations/Library_animcore.mk b/animations/Library_animcore.mk index 370e1855a9ba..f4ada9c4f3af 100644 --- a/animations/Library_animcore.mk +++ b/animations/Library_animcore.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,animcore,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,animcore)) + $(eval $(call gb_Library_add_exception_objects,animcore,\ animations/source/animcore/animcore \ animations/source/animcore/factreg \ diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk index 2eed8e188686..f597bb35647d 100644 --- a/avmedia/Library_avmedia.mk +++ b/avmedia/Library_avmedia.mk @@ -57,9 +57,10 @@ $(eval $(call gb_Library_use_libraries,avmedia,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,avmedia)) + $(eval $(call gb_Library_add_exception_objects,avmedia,\ avmedia/source/framework/mediacontrol \ avmedia/source/framework/mediaitem \ diff --git a/avmedia/Library_avmediaQuickTime.mk b/avmedia/Library_avmediaQuickTime.mk index 4f367776207d..1daa4aafbe10 100644 --- a/avmedia/Library_avmediaQuickTime.mk +++ b/avmedia/Library_avmediaQuickTime.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,avmediaQuickTime,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,avmediaQuickTime)) + $(eval $(call gb_Library_use_externals,avmediaQuickTime,\ cocoa \ qtkit \ diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk index 20261158c4b1..394873f04a16 100644 --- a/avmedia/Library_avmediagst.mk +++ b/avmedia/Library_avmediagst.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,avmediagst,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,avmediagst)) + $(eval $(call gb_Library_add_exception_objects,avmediagst,\ avmedia/source/gstreamer/gstmanager \ avmedia/source/gstreamer/gstplayer \ diff --git a/avmedia/Library_avmediagst_0_10.mk b/avmedia/Library_avmediagst_0_10.mk index dace38183760..3369dbf57833 100644 --- a/avmedia/Library_avmediagst_0_10.mk +++ b/avmedia/Library_avmediagst_0_10.mk @@ -52,9 +52,10 @@ $(eval $(call gb_Library_use_libraries,avmediagst_0_10,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,avmediagst_0_10)) + $(eval $(call gb_Library_add_libs,avmediagst_0_10,\ $(GSTREAMER_0_10_LIBS) \ -lgstinterfaces-0.10 \ diff --git a/avmedia/Library_avmediawin.mk b/avmedia/Library_avmediawin.mk index 3eb9fe2e4962..64750496d43c 100644 --- a/avmedia/Library_avmediawin.mk +++ b/avmedia/Library_avmediawin.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Library_use_libraries,avmediawin,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,avmediawin)) + $(eval $(call gb_Library_add_libs,avmediawin,\ strmiids.lib \ )) diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk index f83840635926..6cd860ee73f9 100644 --- a/basctl/Library_basctl.mk +++ b/basctl/Library_basctl.mk @@ -61,9 +61,10 @@ $(eval $(call gb_Library_use_libraries,basctl,\ vcl \ xmlscript \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,basctl)) + $(eval $(call gb_Library_add_exception_objects,basctl,\ basctl/source/accessibility/accessibledialogcontrolshape \ basctl/source/accessibility/accessibledialogwindow \ diff --git a/basebmp/CppunitTest_basebmp.mk b/basebmp/CppunitTest_basebmp.mk index fc7275a64801..5747cb6b59c8 100644 --- a/basebmp/CppunitTest_basebmp.mk +++ b/basebmp/CppunitTest_basebmp.mk @@ -28,9 +28,10 @@ $(eval $(call gb_CppunitTest_use_libraries,basebmp_cpputest,\ basegfx \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,basebmp_cpputest)) + $(eval $(call gb_CppunitTest_add_exception_objects,basebmp_cpputest,\ basebmp/test/basictest \ basebmp/test/bmpmasktest \ diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk index 661f5aa2bd22..fd385a8b1eb5 100644 --- a/basebmp/Library_basebmp.mk +++ b/basebmp/Library_basebmp.mk @@ -19,9 +19,10 @@ $(eval $(call gb_Library_use_libraries,basebmp,\ basegfx \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,basebmp)) + $(eval $(call gb_Library_set_include,basebmp,\ -I$(SRCDIR)/basebmp/inc/ \ $$(INCLUDE) \ diff --git a/basebmp/StaticLibrary_basebmp.mk b/basebmp/StaticLibrary_basebmp.mk index 25b923df532b..200f46e96f58 100644 --- a/basebmp/StaticLibrary_basebmp.mk +++ b/basebmp/StaticLibrary_basebmp.mk @@ -19,7 +19,6 @@ $(eval $(call gb_StaticLibrary_use_libraries,basebmp,\ basegfx \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) $(eval $(call gb_StaticLibrary_set_include,basebmp,\ diff --git a/basegfx/CppunitTest_basegfx.mk b/basegfx/CppunitTest_basegfx.mk index 121faf6af57c..a531848951b8 100644 --- a/basegfx/CppunitTest_basegfx.mk +++ b/basegfx/CppunitTest_basegfx.mk @@ -20,9 +20,10 @@ $(eval $(call gb_CppunitTest_use_libraries,basegfx_cpputest,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,basegfx_cpputest)) + $(eval $(call gb_CppunitTest_add_exception_objects,basegfx_cpputest,\ basegfx/test/basegfx1d \ basegfx/test/basegfx2d \ diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk index e3b11aecfd97..6d974ec6395a 100644 --- a/basegfx/Library_basegfx.mk +++ b/basegfx/Library_basegfx.mk @@ -22,9 +22,10 @@ $(eval $(call gb_Library_use_libraries,basegfx,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,basegfx)) + $(eval $(call gb_Library_set_include,basegfx,\ -I$(SRCDIR)/basegfx/inc \ -I$(SRCDIR)/basegfx/source/inc \ diff --git a/basic/CppunitTest_basic_enable.mk b/basic/CppunitTest_basic_enable.mk index 3bd2bc87337a..c09080ce2276 100644 --- a/basic/CppunitTest_basic_enable.mk +++ b/basic/CppunitTest_basic_enable.mk @@ -29,9 +29,10 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_enable, \ xmlscript \ test \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,basic_enable)) + ifeq ($(GUI),WNT) $(eval $(call gb_CppunitTest_use_libraries,basic_enable, \ oleaut32 \ diff --git a/basic/CppunitTest_basic_nested_struct.mk b/basic/CppunitTest_basic_nested_struct.mk index fcadba3b0c84..e43404a27094 100644 --- a/basic/CppunitTest_basic_nested_struct.mk +++ b/basic/CppunitTest_basic_nested_struct.mk @@ -30,9 +30,10 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_nested_struct, \ xmlscript \ test \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,basic_nested_struct)) + ifeq ($(GUI),WNT) $(eval $(call gb_CppunitTest_use_libraries,basic_nested_struct, \ oleaut32 \ diff --git a/basic/CppunitTest_basic_scanner.mk b/basic/CppunitTest_basic_scanner.mk index af058148e32f..36806d0e276d 100644 --- a/basic/CppunitTest_basic_scanner.mk +++ b/basic/CppunitTest_basic_scanner.mk @@ -30,9 +30,10 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \ vcl \ xmlscript \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,basic_scanner)) + ifeq ($(GUI),WNT) $(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \ oleaut32 \ diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk index de50d0c70f9f..c29a58c4b366 100644 --- a/basic/Library_sb.mk +++ b/basic/Library_sb.mk @@ -50,9 +50,10 @@ $(eval $(call gb_Library_use_libraries,sb,\ vcl \ xmlscript \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sb)) + ifneq ($(DISABLE_SCRIPTING),TRUE) $(eval $(call gb_Library_add_exception_objects,sb,\ diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk index 78cc7dba7297..2b8e2164f045 100644 --- a/bean/Library_officebean.mk +++ b/bean/Library_officebean.mk @@ -64,8 +64,6 @@ $(eval $(call gb_Library_add_ldflags,officebean,\ endif -$(eval $(call gb_Library_use_libraries,officebean,\ - $(gb_STDLIBS) \ -)) +$(eval $(call gb_Library_add_standard_system_libs,officebean)) # vim: set noet sw=4 ts=4: diff --git a/binaryurp/CppunitTest_binaryurp_test-cache.mk b/binaryurp/CppunitTest_binaryurp_test-cache.mk index 7818b21b9163..ecde720b9f58 100644 --- a/binaryurp/CppunitTest_binaryurp_test-cache.mk +++ b/binaryurp/CppunitTest_binaryurp_test-cache.mk @@ -31,9 +31,10 @@ $(eval $(call gb_CppunitTest_CppunitTest,binaryurp_test-cache)) $(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-cache,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,binaryurp_test-cache)) + $(eval $(call gb_CppunitTest_add_exception_objects,binaryurp_test-cache,\ binaryurp/qa/test-cache \ )) diff --git a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk index 2c8c907fa7e1..aed5a30d78a3 100644 --- a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk +++ b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk @@ -34,9 +34,10 @@ $(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-unmarshal,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,binaryurp_test-unmarshal)) + $(eval $(call gb_CppunitTest_use_library_objects,binaryurp_test-unmarshal,\ binaryurp \ )) diff --git a/binaryurp/Library_binaryurp.mk b/binaryurp/Library_binaryurp.mk index 879025b84606..99e223a68d22 100644 --- a/binaryurp/Library_binaryurp.mk +++ b/binaryurp/Library_binaryurp.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,binaryurp,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,binaryurp)) + $(eval $(call gb_Library_add_exception_objects,binaryurp,\ binaryurp/source/binaryany \ binaryurp/source/bridge \ diff --git a/bridges/Library_gcc3_linux_arm.mk b/bridges/Library_gcc3_linux_arm.mk index c37275a02dba..ae0df1bad934 100644 --- a/bridges/Library_gcc3_linux_arm.mk +++ b/bridges/Library_gcc3_linux_arm.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,gcc3_uno,\ dl \ ) \ sal \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,gcc3_uno)) + $(eval $(call gb_Library_add_exception_objects,gcc3_uno,\ bridges/source/cpp_uno/shared/bridge \ bridges/source/cpp_uno/shared/component \ diff --git a/bridges/Library_gcc3_linux_intel.mk b/bridges/Library_gcc3_linux_intel.mk index 503eb462b3df..526a1c95b322 100644 --- a/bridges/Library_gcc3_linux_intel.mk +++ b/bridges/Library_gcc3_linux_intel.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,gcc3_uno,\ dl \ ) \ sal \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,gcc3_uno)) + $(eval $(call gb_Library_add_asmobjects,gcc3_uno,\ bridges/source/cpp_uno/gcc3_linux_intel/call \ )) diff --git a/bridges/Library_gcc3_linux_mips.mk b/bridges/Library_gcc3_linux_mips.mk index f03752ac74c5..4cd01957c3dd 100644 --- a/bridges/Library_gcc3_linux_mips.mk +++ b/bridges/Library_gcc3_linux_mips.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,gcc3_uno,\ dl \ ) \ sal \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,gcc3_uno)) + $(eval $(call gb_Library_add_exception_objects,gcc3_uno,\ bridges/source/cpp_uno/gcc3_linux_mips/except \ bridges/source/cpp_uno/shared/bridge \ diff --git a/bridges/Library_java_uno.mk b/bridges/Library_java_uno.mk index 3bee8a12e679..df834277c41d 100644 --- a/bridges/Library_java_uno.mk +++ b/bridges/Library_java_uno.mk @@ -32,9 +32,10 @@ $(eval $(call gb_Library_use_libraries,java_uno,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,java_uno)) + $(eval $(call gb_Library_add_exception_objects,java_uno,\ bridges/source/jni_uno/jni_bridge \ bridges/source/jni_uno/jni_data \ diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk index 74ded07486cf..85ea94cda4ed 100644 --- a/canvas/Library_cairocanvas.mk +++ b/canvas/Library_cairocanvas.mk @@ -69,9 +69,10 @@ $(eval $(call gb_Library_use_libraries,cairocanvas,\ i18nisolang1 \ canvastools \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,cairocanvas)) + $(eval $(call gb_Library_add_exception_objects,cairocanvas,\ canvas/source/cairo/cairo_cachedbitmap \ canvas/source/cairo/cairo_cairo \ diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk index 974231a039a1..1b66f16a6b57 100644 --- a/canvas/Library_canvasfactory.mk +++ b/canvas/Library_canvasfactory.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,canvasfactory,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,canvasfactory)) + $(eval $(call gb_Library_add_exception_objects,canvasfactory,\ canvas/source/factory/cf_service \ )) diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk index 4e70f654c6ad..d08d76934fac 100644 --- a/canvas/Library_canvastools.mk +++ b/canvas/Library_canvastools.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,canvastools,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,canvastools)) + $(eval $(call gb_Library_add_exception_objects,canvastools,\ canvas/source/tools/cachedprimitivebase \ canvas/source/tools/canvascustomspritehelper \ diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk index 08ffdf4017fe..fb2a28b6a928 100644 --- a/canvas/Library_directx9canvas.mk +++ b/canvas/Library_directx9canvas.mk @@ -56,9 +56,10 @@ $(eval $(call gb_Library_use_libraries,directx9canvas,\ utl \ i18nisolang1 \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,directx9canvas)) + $(eval $(call gb_Library_use_libraries,directx9canvas,\ d3d9 \ gdi32 \ diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk index 6ae93a809466..cfe70a926995 100644 --- a/canvas/Library_gdipluscanvas.mk +++ b/canvas/Library_gdipluscanvas.mk @@ -62,9 +62,10 @@ $(eval $(call gb_Library_use_libraries,gdipluscanvas,\ utl \ i18nisolang1 \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,gdipluscanvas)) + $(eval $(call gb_Library_use_libraries,gdipluscanvas,\ gdi32 \ gdiplus \ diff --git a/canvas/Library_nullcanvas.mk b/canvas/Library_nullcanvas.mk index a130dfb39fbe..ea7376e41bf5 100644 --- a/canvas/Library_nullcanvas.mk +++ b/canvas/Library_nullcanvas.mk @@ -46,9 +46,10 @@ $(eval $(call gb_Library_use_libraries,nullcanvas,\ sal \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,nullcanvas)) + $(eval $(call gb_Library_add_exception_objects,nullcanvas,\ canvas/source/null/null_canvasbitmap \ canvas/source/null/null_canvascustomsprite \ diff --git a/canvas/Library_simplecanvas.mk b/canvas/Library_simplecanvas.mk index d5edd33bbfbe..1fa62e75d91c 100644 --- a/canvas/Library_simplecanvas.mk +++ b/canvas/Library_simplecanvas.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,simplecanvas,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,simplecanvas)) + $(eval $(call gb_Library_add_exception_objects,simplecanvas,\ canvas/source/simplecanvas/simplecanvasimpl \ )) diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk index 922e5ca45dfc..53599b5555bf 100644 --- a/canvas/Library_vclcanvas.mk +++ b/canvas/Library_vclcanvas.mk @@ -50,9 +50,10 @@ $(eval $(call gb_Library_use_libraries,vclcanvas,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vclcanvas)) + $(eval $(call gb_Library_add_exception_objects,vclcanvas,\ canvas/source/vcl/backbuffer \ canvas/source/vcl/bitmapbackbuffer \ diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk index 3baaee9b5713..d5d4ec39e4f1 100644 --- a/chart2/Library_chartcontroller.mk +++ b/chart2/Library_chartcontroller.mk @@ -56,9 +56,10 @@ $(eval $(call gb_Library_use_libraries,chartcontroller,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,chartcontroller)) + $(eval $(call gb_Library_set_componentfile,chartcontroller,chart2/source/controller/chartcontroller)) $(eval $(call gb_Library_add_exception_objects,chartcontroller,\ diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk index 6ca04479fad0..429416d6a955 100644 --- a/chart2/Library_chartcore.mk +++ b/chart2/Library_chartcore.mk @@ -43,9 +43,10 @@ $(eval $(call gb_Library_use_libraries,chartcore,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,chartcore)) + $(eval $(call gb_Library_set_componentfile,chartcore,chart2/source/chartcore)) # view pieces ... diff --git a/cli_ure/Executable_climaker.mk b/cli_ure/Executable_climaker.mk index bdea302bb619..e6abcf5f55bf 100644 --- a/cli_ure/Executable_climaker.mk +++ b/cli_ure/Executable_climaker.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Executable_use_libraries,climaker,\ ) \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,climaker)) + $(eval $(call gb_Executable_add_exception_objects,climaker,\ cli_ure/source/climaker/climaker_app \ cli_ure/source/climaker/climaker_emit \ diff --git a/clucene/Library_clucene.mk b/clucene/Library_clucene.mk index 39ef5ca79b34..d80af92de302 100644 --- a/clucene/Library_clucene.mk +++ b/clucene/Library_clucene.mk @@ -50,10 +50,7 @@ $(eval $(call gb_Library_add_defs,clucene,\ $(LFS_CFLAGS) \ )) -# clucene does not depend on sal nor needs uwinapi here -$(eval $(call gb_Library_use_libraries,clucene,\ - $(filter-out uwinapi,$(gb_STDLIBS)) \ -)) +$(eval $(call gb_Library_add_standard_system_libs,clucene)) ifeq ($(OS),LINUX) $(eval $(call gb_Library_use_libraries,clucene,\ diff --git a/comphelper/CppunitTest_comphelper_test.mk b/comphelper/CppunitTest_comphelper_test.mk index f77cf84ee57c..11592b7cc976 100644 --- a/comphelper/CppunitTest_comphelper_test.mk +++ b/comphelper/CppunitTest_comphelper_test.mk @@ -42,9 +42,10 @@ $(eval $(call gb_CppunitTest_use_libraries,comphelper_test, \ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,comphelper_test)) + $(eval $(call gb_CppunitTest_set_include,comphelper_test,\ -I$(SRCDIR)/comphelper/inc \ $$(INCLUDE) \ diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk index 71d03cc9894c..c54d59d85339 100644 --- a/comphelper/Library_comphelper.mk +++ b/comphelper/Library_comphelper.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,comphelper,\ salhelper \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,comphelper)) + $(eval $(call gb_Library_use_sdk_api,comphelper)) $(eval $(call gb_Library_add_exception_objects,comphelper,\ diff --git a/configmgr/Library_configmgr.mk b/configmgr/Library_configmgr.mk index 588ddd819c86..7dd348d45562 100644 --- a/configmgr/Library_configmgr.mk +++ b/configmgr/Library_configmgr.mk @@ -73,7 +73,8 @@ $(eval $(call gb_Library_use_libraries,configmgr, \ salhelper \ xmlreader \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,configmgr)) + $(eval $(call gb_Library_set_componentfile,configmgr,configmgr/source/configmgr)) diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk index 4bd5d78cc247..bd24464a5331 100644 --- a/connectivity/Library_ado.mk +++ b/connectivity/Library_ado.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,ado,\ dbtools \ comphelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ado)) + $(eval $(call gb_Library_add_exception_objects,ado,\ connectivity/source/drivers/ado/ADatabaseMetaDataImpl \ connectivity/source/drivers/ado/Aolevariant \ diff --git a/connectivity/Library_calc.mk b/connectivity/Library_calc.mk index ffd3f71640fe..489542bbe743 100644 --- a/connectivity/Library_calc.mk +++ b/connectivity/Library_calc.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Library_use_libraries,calc,\ file \ comphelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,calc)) + $(eval $(call gb_Library_add_exception_objects,calc,\ connectivity/source/drivers/calc/CResultSet \ connectivity/source/drivers/calc/CStatement \ diff --git a/connectivity/Library_dbase.mk b/connectivity/Library_dbase.mk index 68f4ea449d80..14c61ec5fcd8 100644 --- a/connectivity/Library_dbase.mk +++ b/connectivity/Library_dbase.mk @@ -50,9 +50,10 @@ $(eval $(call gb_Library_use_libraries,dbase,\ utl \ comphelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dbase)) + $(eval $(call gb_Library_add_exception_objects,dbase,\ connectivity/source/drivers/dbase/DCode \ connectivity/source/drivers/dbase/DResultSet \ diff --git a/connectivity/Library_dbpool2.mk b/connectivity/Library_dbpool2.mk index e128c937ee41..ac008feb4bac 100644 --- a/connectivity/Library_dbpool2.mk +++ b/connectivity/Library_dbpool2.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,dbpool2,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dbpool2)) + $(eval $(call gb_Library_add_exception_objects,dbpool2,\ connectivity/source/cpool/ZConnectionWrapper \ connectivity/source/cpool/ZDriverWrapper \ diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk index 1cce1c6e246f..74d8fea6058e 100644 --- a/connectivity/Library_dbtools.mk +++ b/connectivity/Library_dbtools.mk @@ -56,9 +56,10 @@ $(eval $(call gb_Library_use_libraries,dbtools,\ comphelper \ i18nisolang1 \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dbtools)) + ifeq ($(filter-out NETBSD MACOSX,$(OS)),) $(eval $(call gb_Library_use_libraries,dbtools,\ ucbhelper \ diff --git a/connectivity/Library_evoab.mk b/connectivity/Library_evoab.mk index 78cf2d73957e..4606b8865e1d 100644 --- a/connectivity/Library_evoab.mk +++ b/connectivity/Library_evoab.mk @@ -54,9 +54,10 @@ $(eval $(call gb_Library_use_libraries,evoab,\ dbtools \ file \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,evoab)) + $(eval $(call gb_Library_add_exception_objects,evoab,\ connectivity/source/drivers/evoab2/NDriver \ connectivity/source/drivers/evoab2/NTable \ diff --git a/connectivity/Library_file.mk b/connectivity/Library_file.mk index 8c21f99fed5e..c3326b4af484 100644 --- a/connectivity/Library_file.mk +++ b/connectivity/Library_file.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,file,\ utl \ comphelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,file)) + $(eval $(call gb_Library_add_exception_objects,file,\ connectivity/source/drivers/file/FCatalog \ connectivity/source/drivers/file/FColumns \ diff --git a/connectivity/Library_flat.mk b/connectivity/Library_flat.mk index 601f96f06b4f..84345d803895 100644 --- a/connectivity/Library_flat.mk +++ b/connectivity/Library_flat.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Library_use_libraries,flat,\ file \ comphelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,flat)) + $(eval $(call gb_Library_add_exception_objects,flat,\ connectivity/source/drivers/flat/EResultSet \ connectivity/source/drivers/flat/EStatement \ diff --git a/connectivity/Library_hsqldb.mk b/connectivity/Library_hsqldb.mk index 1ffd932298dd..b8b0e0f4372d 100644 --- a/connectivity/Library_hsqldb.mk +++ b/connectivity/Library_hsqldb.mk @@ -48,9 +48,10 @@ $(eval $(call gb_Library_use_libraries,hsqldb,\ tl \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,hsqldb)) + $(eval $(call gb_Library_set_componentfile,hsqldb,connectivity/source/drivers/hsqldb/hsqldb)) $(eval $(call gb_Library_add_exception_objects,hsqldb,\ diff --git a/connectivity/Library_jdbc.mk b/connectivity/Library_jdbc.mk index 704f050b6755..71edd85d90d5 100644 --- a/connectivity/Library_jdbc.mk +++ b/connectivity/Library_jdbc.mk @@ -48,9 +48,10 @@ $(eval $(call gb_Library_use_libraries,jdbc,\ jvmfwk \ comphelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,jdbc)) + $(eval $(call gb_Library_add_exception_objects,jdbc,\ connectivity/source/drivers/jdbc/Array \ connectivity/source/drivers/jdbc/Blob \ diff --git a/connectivity/Library_kab1.mk b/connectivity/Library_kab1.mk index 86f713d15ef9..8f2c04ee1263 100644 --- a/connectivity/Library_kab1.mk +++ b/connectivity/Library_kab1.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,kab1,\ dbtools \ sal \ salhelper \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,kab1)) + $(eval $(call gb_Library_add_exception_objects,kab1,\ connectivity/source/drivers/kab/KDriver \ connectivity/source/drivers/kab/KServices \ diff --git a/connectivity/Library_kabdrv1.mk b/connectivity/Library_kabdrv1.mk index 6a0f16c427f0..097848e6e567 100644 --- a/connectivity/Library_kabdrv1.mk +++ b/connectivity/Library_kabdrv1.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,kabdrv1,\ salhelper \ dbtools \ comphelper \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,kabdrv1)) + $(eval $(call gb_Library_add_exception_objects,kabdrv1,\ connectivity/source/drivers/kab/KColumns \ connectivity/source/drivers/kab/KTable \ diff --git a/connectivity/Library_macab1.mk b/connectivity/Library_macab1.mk index 842394c40bfa..7058eb553ae6 100644 --- a/connectivity/Library_macab1.mk +++ b/connectivity/Library_macab1.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_libraries,macab1,\ dbtools \ sal \ salhelper \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,macab1)) + $(eval $(call gb_Library_set_include,macab1,\ $$(INCLUDE) \ -I$(SRCDIR)/connectivity/inc \ diff --git a/connectivity/Library_macabdrv1.mk b/connectivity/Library_macabdrv1.mk index 471c6c777ff3..bfb78473a161 100644 --- a/connectivity/Library_macabdrv1.mk +++ b/connectivity/Library_macabdrv1.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,macabdrv1,\ dbtools \ sal \ salhelper \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,macabdrv1)) + $(eval $(call gb_Library_set_include,macabdrv1,\ $$(INCLUDE) \ -I$(SRCDIR)/connectivity/inc \ diff --git a/connectivity/Library_mork.mk b/connectivity/Library_mork.mk index c2b95a0416db..009a3c79b01f 100644 --- a/connectivity/Library_mork.mk +++ b/connectivity/Library_mork.mk @@ -28,9 +28,10 @@ $(eval $(call gb_Library_use_libraries,mork, \ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,mork)) + $(eval $(call gb_Library_use_sdk_api,mork)) $(eval $(call gb_Library_add_exception_objects,mork, \ diff --git a/connectivity/Library_mozab.mk b/connectivity/Library_mozab.mk index 7872b26932db..394d227ea51f 100644 --- a/connectivity/Library_mozab.mk +++ b/connectivity/Library_mozab.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,mozab2,\ dbtools \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,mozab2)) + $(eval $(call gb_Library_add_exception_objects,mozab2,\ connectivity/source/drivers/mozab/MDriver \ connectivity/source/drivers/mozab/MServices \ diff --git a/connectivity/Library_mozabdrv.mk b/connectivity/Library_mozabdrv.mk index 0e4c541ea6c4..b7f95a811fa0 100644 --- a/connectivity/Library_mozabdrv.mk +++ b/connectivity/Library_mozabdrv.mk @@ -43,9 +43,10 @@ $(eval $(call gb_Library_use_libraries,mozabdrv,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,mozabdrv)) + $(eval $(call gb_Library_use_externals,mozabdrv,\ mozilla \ )) diff --git a/connectivity/Library_mozbootstrap.mk b/connectivity/Library_mozbootstrap.mk index 649f9907c06a..edfb4986d943 100644 --- a/connectivity/Library_mozbootstrap.mk +++ b/connectivity/Library_mozbootstrap.mk @@ -46,9 +46,10 @@ $(eval $(call gb_Library_use_libraries,mozbootstrap,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,mozbootstrap)) + $(eval $(call gb_Library_add_exception_objects,mozbootstrap,\ connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap \ connectivity/source/drivers/mozab/bootstrap/MNSFolders \ diff --git a/connectivity/Library_mysql.mk b/connectivity/Library_mysql.mk index 388af52f2263..71bdd14bec67 100644 --- a/connectivity/Library_mysql.mk +++ b/connectivity/Library_mysql.mk @@ -43,9 +43,10 @@ $(eval $(call gb_Library_use_libraries,mysql,\ dbtools \ comphelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,mysql)) + $(eval $(call gb_Library_add_exception_objects,mysql,\ connectivity/source/drivers/mysql/YDriver \ connectivity/source/drivers/mysql/YTables \ diff --git a/connectivity/Library_odbc.mk b/connectivity/Library_odbc.mk index 4b0e61baa48b..32961f472a61 100644 --- a/connectivity/Library_odbc.mk +++ b/connectivity/Library_odbc.mk @@ -48,9 +48,10 @@ $(eval $(call gb_Library_use_libraries,odbc,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,odbc)) + $(eval $(call gb_Library_add_exception_objects,odbc,\ connectivity/source/drivers/odbc/oservices \ connectivity/source/drivers/odbc/ORealDriver \ diff --git a/connectivity/Library_odbcbase.mk b/connectivity/Library_odbcbase.mk index 9655773afa00..f2b2d41d5b12 100644 --- a/connectivity/Library_odbcbase.mk +++ b/connectivity/Library_odbcbase.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,odbcbase,\ dbtools \ comphelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,odbcbase)) + $(eval $(call gb_Library_add_exception_objects,odbcbase,\ connectivity/source/drivers/odbcbase/OPreparedStatement \ connectivity/source/drivers/odbcbase/OStatement \ diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index 439524882f8d..50900b1b7f66 100644 --- a/connectivity/Library_postgresql-sdbc-impl.mk +++ b/connectivity/Library_postgresql-sdbc-impl.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,postgresql-sdbc-impl)) + ifeq ($(OS),WNT) $(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\ shell32 \ diff --git a/connectivity/Library_postgresql-sdbc.mk b/connectivity/Library_postgresql-sdbc.mk index 7646af16ef12..60fbfc97f9f7 100644 --- a/connectivity/Library_postgresql-sdbc.mk +++ b/connectivity/Library_postgresql-sdbc.mk @@ -40,9 +40,10 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,postgresql-sdbc)) + $(eval $(call gb_Library_set_componentfile,postgresql-sdbc,connectivity/source/drivers/postgresql/postgresql-sdbc)) $(eval $(call gb_Library_add_exception_objects,postgresql-sdbc,\ diff --git a/connectivity/Library_sdbc2.mk b/connectivity/Library_sdbc2.mk index 032937a81e6e..60db324099f8 100644 --- a/connectivity/Library_sdbc2.mk +++ b/connectivity/Library_sdbc2.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,sdbc2,\ utl \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sdbc2)) + $(eval $(call gb_Library_add_exception_objects,sdbc2,\ connectivity/source/manager/mdrivermanager \ connectivity/source/manager/mregistration \ diff --git a/connectivity/Library_tdeab1.mk b/connectivity/Library_tdeab1.mk index 9cc62e2433f1..8c402457d7fc 100644 --- a/connectivity/Library_tdeab1.mk +++ b/connectivity/Library_tdeab1.mk @@ -47,9 +47,10 @@ $(eval $(call gb_Library_use_libraries,tdeab1,\ dbtools \ sal \ salhelper \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,tdeab1)) + $(eval $(call gb_Library_add_exception_objects,tdeab1,\ connectivity/source/drivers/kab/KDriver \ connectivity/source/drivers/kab/KServices \ diff --git a/connectivity/Library_tdeabdrv1.mk b/connectivity/Library_tdeabdrv1.mk index b2ceb087b798..40601d7cf416 100644 --- a/connectivity/Library_tdeabdrv1.mk +++ b/connectivity/Library_tdeabdrv1.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Library_use_libraries,tdeabdrv1,\ salhelper \ dbtools \ comphelper \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,tdeabdrv1)) + $(eval $(call gb_Library_add_exception_objects,tdeabdrv1,\ connectivity/source/drivers/kab/KColumns \ connectivity/source/drivers/kab/KTable \ diff --git a/cppcanvas/Library_cppcanvas.mk b/cppcanvas/Library_cppcanvas.mk index 283ad64dda71..a37d36e0ab70 100644 --- a/cppcanvas/Library_cppcanvas.mk +++ b/cppcanvas/Library_cppcanvas.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,cppcanvas,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,cppcanvas)) + $(eval $(call gb_Library_add_exception_objects,cppcanvas,\ cppcanvas/source/mtfrenderer/bitmapaction \ cppcanvas/source/mtfrenderer/cachedprimitivebase \ diff --git a/cppcanvas/Library_mtfrenderer.mk b/cppcanvas/Library_mtfrenderer.mk index e86b99303fd4..eb7dbc43f161 100644 --- a/cppcanvas/Library_mtfrenderer.mk +++ b/cppcanvas/Library_mtfrenderer.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,mtfrenderer,\ cppcanvas \ basegfx \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,mtfrenderer)) + $(eval $(call gb_Library_use_sdk_api,mtfrenderer)) $(eval $(call gb_Library_add_exception_objects,mtfrenderer,\ diff --git a/cppu/CppunitTest_cppu_checkapi.mk b/cppu/CppunitTest_cppu_checkapi.mk index e68cc5cd5241..af9e7ea16b48 100644 --- a/cppu/CppunitTest_cppu_checkapi.mk +++ b/cppu/CppunitTest_cppu_checkapi.mk @@ -50,7 +50,8 @@ $(call gb_CxxObject_get_target,cppu/qa/checkapi/strings) :| \ $(eval $(call gb_CppunitTest_use_libraries,cppu_checkapi,\ cppu \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_checkapi)) + # vim: set noet sw=4 ts=4: diff --git a/cppu/CppunitTest_cppu_qa_any.mk b/cppu/CppunitTest_cppu_qa_any.mk index 04f33de964ba..2b5f4653ee32 100644 --- a/cppu/CppunitTest_cppu_qa_any.mk +++ b/cppu/CppunitTest_cppu_qa_any.mk @@ -35,9 +35,10 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_any, \ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_qa_any)) + $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_any, \ cppu \ udkapi \ diff --git a/cppu/CppunitTest_cppu_qa_recursion.mk b/cppu/CppunitTest_cppu_qa_recursion.mk index 671bd7f4eccf..dffd187d01a1 100644 --- a/cppu/CppunitTest_cppu_qa_recursion.mk +++ b/cppu/CppunitTest_cppu_qa_recursion.mk @@ -35,9 +35,10 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_recursion, \ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_qa_recursion)) + $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_recursion, \ cppu \ udkapi \ diff --git a/cppu/CppunitTest_cppu_qa_reference.mk b/cppu/CppunitTest_cppu_qa_reference.mk index 4eef2ae78385..d2b59a27d5f9 100644 --- a/cppu/CppunitTest_cppu_qa_reference.mk +++ b/cppu/CppunitTest_cppu_qa_reference.mk @@ -35,9 +35,10 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_reference, \ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_qa_reference)) + $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_reference, \ cppu \ udkapi \ diff --git a/cppu/CppunitTest_cppu_qa_unotype.mk b/cppu/CppunitTest_cppu_qa_unotype.mk index 963ace47a15b..ddc84583ff05 100644 --- a/cppu/CppunitTest_cppu_qa_unotype.mk +++ b/cppu/CppunitTest_cppu_qa_unotype.mk @@ -35,9 +35,10 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_unotype, \ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_qa_unotype)) + $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_unotype, \ cppu \ udkapi \ diff --git a/cppu/CppunitTest_cppu_test_cppumaker.mk b/cppu/CppunitTest_cppu_test_cppumaker.mk index 41da8e269314..7472a3619da2 100644 --- a/cppu/CppunitTest_cppu_test_cppumaker.mk +++ b/cppu/CppunitTest_cppu_test_cppumaker.mk @@ -35,9 +35,10 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_test_cppumaker, \ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_test_cppumaker)) + $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_test_cppumaker, \ cppu \ udkapi \ diff --git a/cppu/Library_affine_uno.mk b/cppu/Library_affine_uno.mk index 2103eb49b77b..644c82054e85 100644 --- a/cppu/Library_affine_uno.mk +++ b/cppu/Library_affine_uno.mk @@ -33,9 +33,10 @@ $(eval $(call gb_Library_use_libraries,affine_uno,\ purpenvhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,affine_uno)) + $(eval $(call gb_Library_add_exception_objects,affine_uno,\ cppu/source/AffineBridge/AffineBridge \ )) diff --git a/cppu/Library_cppu.mk b/cppu/Library_cppu.mk index de47490923b5..4bdbb01d2565 100644 --- a/cppu/Library_cppu.mk +++ b/cppu/Library_cppu.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,cppu,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,cppu)) + $(eval $(call gb_Library_add_cobjects,cppu,\ cppu/source/uno/EnvDcp \ )) diff --git a/cppu/Library_log_uno.mk b/cppu/Library_log_uno.mk index 04d9b7d8d588..aacb8ed73495 100644 --- a/cppu/Library_log_uno.mk +++ b/cppu/Library_log_uno.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,log_uno,\ purpenvhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,log_uno)) + $(eval $(call gb_Library_add_exception_objects,log_uno,\ cppu/source/LogBridge/LogBridge \ )) diff --git a/cppu/Library_purpenvhelper.mk b/cppu/Library_purpenvhelper.mk index 05606523a758..de60f76c5ce0 100644 --- a/cppu/Library_purpenvhelper.mk +++ b/cppu/Library_purpenvhelper.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,purpenvhelper,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,purpenvhelper)) + $(eval $(call gb_Library_add_exception_objects,purpenvhelper,\ cppu/source/helper/purpenv/helper_purpenv_Environment \ cppu/source/helper/purpenv/helper_purpenv_Mapping \ diff --git a/cppu/Library_unsafe_uno.mk b/cppu/Library_unsafe_uno.mk index afeb4cc6af22..9b3eb68418f4 100644 --- a/cppu/Library_unsafe_uno.mk +++ b/cppu/Library_unsafe_uno.mk @@ -33,9 +33,10 @@ $(eval $(call gb_Library_use_libraries,unsafe_uno,\ purpenvhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,unsafe_uno)) + $(eval $(call gb_Library_add_exception_objects,unsafe_uno,\ cppu/source/UnsafeBridge/UnsafeBridge \ )) diff --git a/cppuhelper/CppunitTest_cppuhelper_checkapi.mk b/cppuhelper/CppunitTest_cppuhelper_checkapi.mk index 4369cfc2ea33..e5ef4b2b895c 100644 --- a/cppuhelper/CppunitTest_cppuhelper_checkapi.mk +++ b/cppuhelper/CppunitTest_cppuhelper_checkapi.mk @@ -50,7 +50,8 @@ $(call gb_CxxObject_get_target,cppuhelper/qa/checkapi/strings) :| \ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_checkapi,\ cppuhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,cppuhelper_checkapi)) + # vim: set noet sw=4 ts=4: diff --git a/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk b/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk index 726c220ff4ea..7b50f334646d 100644 --- a/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk +++ b/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk @@ -40,7 +40,8 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_cppu_ifcontainer,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,cppuhelper_cppu_ifcontainer)) + # vim: set noet sw=4 ts=4: diff --git a/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk b/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk index 2d6c943ecc30..ee832217dd03 100644 --- a/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk +++ b/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk @@ -36,7 +36,8 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_cppu_unourl,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,cppuhelper_cppu_unourl)) + # vim: set noet sw=4 ts=4: diff --git a/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk b/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk index 391c13e4ac74..6dd88b393cb1 100644 --- a/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk +++ b/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk @@ -40,7 +40,8 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_qa_weak,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,cppuhelper_qa_weak)) + # vim: set noet sw=4 ts=4: diff --git a/cppuhelper/Library_cppuhelper.mk b/cppuhelper/Library_cppuhelper.mk index 705bd7cdc921..fcb37211671f 100644 --- a/cppuhelper/Library_cppuhelper.mk +++ b/cppuhelper/Library_cppuhelper.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Library_use_libraries,cppuhelper,\ salhelper \ xmlreader \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,cppuhelper)) + $(eval $(call gb_Library_add_cobjects,cppuhelper,\ cppuhelper/source/findsofficepath \ )) diff --git a/cpputools/Executable_regcomp.mk b/cpputools/Executable_regcomp.mk index 4743fdef91ae..017a8d6332c7 100644 --- a/cpputools/Executable_regcomp.mk +++ b/cpputools/Executable_regcomp.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_use_libraries,regcomp,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,regcomp)) + $(eval $(call gb_Executable_add_exception_objects,regcomp,\ cpputools/source/registercomponent/registercomponent \ )) diff --git a/cpputools/Executable_regsingleton.mk b/cpputools/Executable_regsingleton.mk index 64892fd28696..19d507fe6a81 100644 --- a/cpputools/Executable_regsingleton.mk +++ b/cpputools/Executable_regsingleton.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_use_libraries,regsingleton,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,regsingleton)) + $(eval $(call gb_Executable_add_exception_objects,regsingleton,\ cpputools/source/regsingleton/regsingleton \ )) diff --git a/cpputools/Executable_uno.mk b/cpputools/Executable_uno.mk index 1b2a878951be..65280c0b2269 100644 --- a/cpputools/Executable_uno.mk +++ b/cpputools/Executable_uno.mk @@ -36,9 +36,10 @@ $(eval $(call gb_Executable_use_libraries,uno,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,uno)) + $(eval $(call gb_Executable_use_externals,uno,\ libxml2 \ )) diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index 3ed7c2508731..059044fcafc4 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -69,9 +69,10 @@ $(eval $(call gb_Library_use_libraries,cui,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,cui)) + $(eval $(call gb_Library_use_externals,cui,\ icuuc \ )) diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk index 6a28adaf748f..06ac3147070c 100644 --- a/dbaccess/CppunitTest_dbaccess_macros_test.mk +++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk @@ -69,9 +69,10 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_macros_test, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,dbaccess_macros_test)) + $(eval $(call gb_CppunitTest_set_include,dbaccess_macros_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/dbaccess/Executable_odbcconfig.mk b/dbaccess/Executable_odbcconfig.mk index fb4a0d87211a..809832fad7a3 100644 --- a/dbaccess/Executable_odbcconfig.mk +++ b/dbaccess/Executable_odbcconfig.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_sdk_api,odbcconfig)) $(eval $(call gb_Executable_use_libraries,odbcconfig,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,odbcconfig)) + $(eval $(call gb_Executable_add_exception_objects,odbcconfig,\ dbaccess/win32/source/odbcconfig/odbcconfig \ )) diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk index 863bcbbaba5e..8ec7dcd47e35 100644 --- a/dbaccess/Library_dba.mk +++ b/dbaccess/Library_dba.mk @@ -64,9 +64,10 @@ $(eval $(call gb_Library_use_libraries,dba,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dba)) + $(eval $(call gb_Library_set_componentfile,dba,dbaccess/util/dba)) $(eval $(call gb_Library_add_exception_objects,dba,\ diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk index 0d38f503aa85..e9db12444e8d 100644 --- a/dbaccess/Library_dbaxml.mk +++ b/dbaccess/Library_dbaxml.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,dbaxml,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dbaxml)) + $(eval $(call gb_Library_set_componentfile,dbaxml,dbaccess/source/filter/xml/dbaxml)) $(eval $(call gb_Library_add_exception_objects,dbaxml,\ diff --git a/dbaccess/Library_dbmm.mk b/dbaccess/Library_dbmm.mk index 89d9c0e83920..3da15cfea101 100644 --- a/dbaccess/Library_dbmm.mk +++ b/dbaccess/Library_dbmm.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,dbmm,\ vcl \ xmlscript \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dbmm)) + $(eval $(call gb_Library_set_componentfile,dbmm,dbaccess/source/ext/macromigration/dbmm)) $(eval $(call gb_Library_add_exception_objects,dbmm,\ diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk index 7e0fe1cfaa15..579deb6618ba 100644 --- a/dbaccess/Library_dbu.mk +++ b/dbaccess/Library_dbu.mk @@ -71,9 +71,10 @@ $(eval $(call gb_Library_use_libraries,dbu,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dbu)) + ifeq ($(GUI),WNT) $(eval $(call gb_Library_use_libraries,dbu,\ ole32 \ diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk index ee61c037f875..306b9ec99075 100644 --- a/dbaccess/Library_sdbt.mk +++ b/dbaccess/Library_sdbt.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Library_use_libraries,sdbt,\ tl \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sdbt)) + $(eval $(call gb_Library_set_componentfile,sdbt,dbaccess/util/sdbt)) $(eval $(call gb_Library_add_exception_objects,sdbt,\ diff --git a/desktop/Executable_crashrep.com.mk b/desktop/Executable_crashrep.com.mk index d75f80614d29..1c712acd537b 100644 --- a/desktop/Executable_crashrep.com.mk +++ b/desktop/Executable_crashrep.com.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Executable_add_defs,crashrep_com,\ $(eval $(call gb_Executable_use_libraries,crashrep_com,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,crashrep_com)) + $(eval $(call gb_Executable_add_exception_objects,crashrep_com,\ desktop/win32/source/guistdio/guistdio \ )) diff --git a/desktop/Executable_officeloader.mk b/desktop/Executable_officeloader.mk index 08c413a53387..d881087c969c 100644 --- a/desktop/Executable_officeloader.mk +++ b/desktop/Executable_officeloader.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Executable_set_include,officeloader,\ $(eval $(call gb_Executable_use_libraries,officeloader,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,officeloader)) + # I'm not suer wht was the intent, but that break the link #$(eval $(call gb_Executable_set_ldflags,officeloader,\ # $(filter -bind_at_load,$$(LDFLAGS)) \ diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk index a4451f3d4325..0cded218f54f 100644 --- a/desktop/Executable_oosplash.mk +++ b/desktop/Executable_oosplash.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_set_include,oosplash,\ $(eval $(call gb_Executable_use_libraries,oosplash,\ sal \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,oosplash)) + $(eval $(call gb_Executable_add_cobjects,oosplash,\ desktop/unx/source/args \ desktop/unx/source/file_image_unx \ diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk index 8500b1decd4a..8e2bc84ad6ef 100644 --- a/desktop/Executable_quickstart.mk +++ b/desktop/Executable_quickstart.mk @@ -40,9 +40,10 @@ $(eval $(call gb_Executable_use_libraries,quickstart,\ oleaut32 \ shell32 \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,quickstart)) + ifeq ($(COM),GCC) $(eval $(call gb_Executable_use_libraries,quickstart,\ diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk index 7a517aa8f06e..2da4803c9f31 100644 --- a/desktop/Executable_sbase.mk +++ b/desktop/Executable_sbase.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_add_defs,sbase,\ $(eval $(call gb_Executable_use_libraries,sbase,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,sbase)) + $(eval $(call gb_Executable_add_libs,sbase,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk index 7ba226e06146..9d8c906240f7 100644 --- a/desktop/Executable_scalc.mk +++ b/desktop/Executable_scalc.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_add_defs,scalc,\ $(eval $(call gb_Executable_use_libraries,scalc,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,scalc)) + $(eval $(call gb_Executable_add_libs,scalc,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk index 558b8d340a8b..37605330bfb8 100644 --- a/desktop/Executable_sdraw.mk +++ b/desktop/Executable_sdraw.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_add_defs,sdraw,\ $(eval $(call gb_Executable_use_libraries,sdraw,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,sdraw)) + $(eval $(call gb_Executable_add_libs,sdraw,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk index 66002ce86f4f..da674755db7e 100644 --- a/desktop/Executable_simpress.mk +++ b/desktop/Executable_simpress.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_add_defs,simpress,\ $(eval $(call gb_Executable_use_libraries,simpress,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,simpress)) + $(eval $(call gb_Executable_add_libs,simpress,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk index 3315f718b1e5..261fada2d03c 100644 --- a/desktop/Executable_smath.mk +++ b/desktop/Executable_smath.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_add_defs,smath,\ $(eval $(call gb_Executable_use_libraries,smath,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,smath)) + $(eval $(call gb_Executable_add_libs,smath,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index 126f728cea36..98271c98d55b 100644 --- a/desktop/Executable_soffice.bin.mk +++ b/desktop/Executable_soffice.bin.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Executable_use_libraries,soffice.bin,\ sal \ sofficeapp \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,soffice.bin)) + $(eval $(call gb_Executable_add_cobjects,soffice.bin,\ desktop/source/app/main \ )) diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk index 17ac2d07cd8d..afe746dc01d9 100644 --- a/desktop/Executable_soffice.mk +++ b/desktop/Executable_soffice.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Executable_use_libraries,soffice,\ shell32 \ shlwapi \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,soffice)) + $(eval $(call gb_Executable_use_static_libraries,soffice,\ ooopathutils \ winextendloaderenv \ diff --git a/desktop/Executable_soffice_bin.mk b/desktop/Executable_soffice_bin.mk index efddda2f1fc0..83c725701c27 100644 --- a/desktop/Executable_soffice_bin.mk +++ b/desktop/Executable_soffice_bin.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Executable_use_libraries,soffice_bin,\ sal \ sofficeapp \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,soffice_bin)) + $(eval $(call gb_Executable_add_cobjects,soffice_bin,\ desktop/source/app/main \ )) diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk index 1a62d5db772e..2bade4a68e1e 100644 --- a/desktop/Executable_sweb.mk +++ b/desktop/Executable_sweb.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_add_defs,sweb,\ $(eval $(call gb_Executable_use_libraries,sweb,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,sweb)) + $(eval $(call gb_Executable_add_libs,sweb,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk index 68047ecdac1d..2e9d22fb1e9d 100644 --- a/desktop/Executable_swriter.mk +++ b/desktop/Executable_swriter.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_add_defs,swriter,\ $(eval $(call gb_Executable_use_libraries,swriter,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,swriter)) + $(eval $(call gb_Executable_add_libs,swriter,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk index ab71f1d1a56d..d2ff1a3db48b 100644 --- a/desktop/Executable_unopkg.bin.mk +++ b/desktop/Executable_unopkg.bin.mk @@ -46,9 +46,10 @@ $(eval $(call gb_Executable_use_libraries,$(desktop_UNOPKGBIN),\ tl \ unopkgapp \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,$(desktop_UNOPKGBIN))) + $(eval $(call gb_Executable_add_cobjects,$(desktop_UNOPKGBIN),\ desktop/source/pkgchk/unopkg/unopkg_main \ )) diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk index f5fb20e062f0..9937fdf0abe5 100644 --- a/desktop/Library_deployment.mk +++ b/desktop/Library_deployment.mk @@ -48,9 +48,10 @@ $(eval $(call gb_Library_use_libraries,deployment,\ utl \ xmlscript \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,deployment)) + ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Library_use_externals,deployment,\ berkeleydb \ diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk index 865add0e01a3..f81be8c52f41 100644 --- a/desktop/Library_deploymentgui.mk +++ b/desktop/Library_deploymentgui.mk @@ -54,9 +54,10 @@ $(eval $(call gb_Library_use_libraries,deploymentgui,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,deploymentgui)) + ifeq ($(OS),WNT) $(eval $(call gb_Library_use_libraries,deploymentgui,\ diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk index 93f66de60f26..e5b179abc38d 100644 --- a/desktop/Library_deploymentmisc.mk +++ b/desktop/Library_deploymentmisc.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Library_use_libraries,deploymentmisc,\ utl \ xmlscript \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,deploymentmisc)) + ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Library_use_externals,deploymentmisc,\ berkeleydb \ diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk index 3187188728af..8c803522193b 100644 --- a/desktop/Library_migrationoo2.mk +++ b/desktop/Library_migrationoo2.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,migrationoo2,\ tl \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,migrationoo2)) + $(eval $(call gb_Library_use_externals,migrationoo2,\ berkeleydb \ )) diff --git a/desktop/Library_migrationoo3.mk b/desktop/Library_migrationoo3.mk index fd7201f4321c..41bc2c1b4a07 100644 --- a/desktop/Library_migrationoo3.mk +++ b/desktop/Library_migrationoo3.mk @@ -40,9 +40,10 @@ $(eval $(call gb_Library_use_libraries,migrationoo3,\ tl \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,migrationoo3)) + $(eval $(call gb_Library_use_externals,migrationoo3,\ berkeleydb \ )) diff --git a/desktop/Library_offacc.mk b/desktop/Library_offacc.mk index 18653a3fca65..769cf5a56945 100644 --- a/desktop/Library_offacc.mk +++ b/desktop/Library_offacc.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,offacc,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,offacc)) + $(eval $(call gb_Library_set_componentfile,offacc,desktop/source/offacc/offacc)) $(eval $(call gb_Library_add_exception_objects,offacc,\ diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index ea039d4a8f8a..af9f39f7d72c 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -61,9 +61,10 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sofficeapp)) + ifeq ($(GUIBASE),cocoatouch) $(eval $(call gb_Library_add_cflags,sofficeapp,\ $(gb_OBJCFLAGS) \ diff --git a/desktop/Library_spl.mk b/desktop/Library_spl.mk index a950d31438c1..97c0cbf67dac 100644 --- a/desktop/Library_spl.mk +++ b/desktop/Library_spl.mk @@ -44,9 +44,10 @@ $(eval $(call gb_Library_use_libraries,spl,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,spl)) + $(eval $(call gb_Library_set_componentfile,spl,desktop/source/splash/spl)) $(eval $(call gb_Library_add_exception_objects,spl,\ diff --git a/desktop/Library_spl_unx.mk b/desktop/Library_spl_unx.mk index 08412d5ac192..92059c690010 100644 --- a/desktop/Library_spl_unx.mk +++ b/desktop/Library_spl_unx.mk @@ -33,9 +33,10 @@ $(eval $(call gb_Library_use_libraries,spl_unx,\ cppu \ cppuhelper \ sal \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,spl_unx)) + $(eval $(call gb_Library_set_componentfile,spl_unx,desktop/unx/splash/splash)) $(eval $(call gb_Library_add_exception_objects,spl_unx,\ diff --git a/desktop/Library_unopkgapp.mk b/desktop/Library_unopkgapp.mk index 0d6222ab0e3d..4958c6fa47ca 100644 --- a/desktop/Library_unopkgapp.mk +++ b/desktop/Library_unopkgapp.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,unopkgapp,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,unopkgapp)) + $(eval $(call gb_Library_add_exception_objects,unopkgapp,\ desktop/source/pkgchk/unopkg/unopkg_app \ desktop/source/pkgchk/unopkg/unopkg_cmdenv \ diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk index 518fe885b45c..0b0a62cab133 100644 --- a/drawinglayer/Library_drawinglayer.mk +++ b/drawinglayer/Library_drawinglayer.mk @@ -63,9 +63,10 @@ $(eval $(call gb_Library_use_libraries,drawinglayer,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,drawinglayer)) + $(eval $(call gb_Library_add_exception_objects,drawinglayer,\ drawinglayer/source/animation/animationtiming \ drawinglayer/source/attribute/fillbitmapattribute \ diff --git a/dtrans/Library_dnd.mk b/dtrans/Library_dnd.mk index dd15f23d33c0..7b6f08621c23 100644 --- a/dtrans/Library_dnd.mk +++ b/dtrans/Library_dnd.mk @@ -48,9 +48,10 @@ $(eval $(call gb_Library_use_libraries,dnd,\ uuid \ uwinapi \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dnd)) + $(eval $(call gb_Library_use_static_libraries,dnd,\ dtobj \ )) diff --git a/dtrans/Library_dtrans.mk b/dtrans/Library_dtrans.mk index 307bf030d865..e6e48bebd32b 100644 --- a/dtrans/Library_dtrans.mk +++ b/dtrans/Library_dtrans.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,dtrans,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dtrans)) + $(eval $(call gb_Library_add_exception_objects,dtrans,\ dtrans/source/generic/clipboardmanager \ dtrans/source/generic/dtrans \ diff --git a/dtrans/Library_ftransl.mk b/dtrans/Library_ftransl.mk index 83d91bb76066..ae12a2bee575 100644 --- a/dtrans/Library_ftransl.mk +++ b/dtrans/Library_ftransl.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,ftransl,\ sal \ uwinapi \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ftransl)) + $(eval $(call gb_Library_use_static_libraries,ftransl,\ dtobj \ )) diff --git a/dtrans/Library_mcnttype.mk b/dtrans/Library_mcnttype.mk index 80ad2bd23525..aa112dc51705 100644 --- a/dtrans/Library_mcnttype.mk +++ b/dtrans/Library_mcnttype.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,mcnttype,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,mcnttype)) + $(eval $(call gb_Library_add_exception_objects,mcnttype,\ dtrans/source/cnttype/mcnttfactory \ dtrans/source/cnttype/mcnttype \ diff --git a/dtrans/Library_sysdtrans.mk b/dtrans/Library_sysdtrans.mk index ef358cf7c40f..698b9d605936 100644 --- a/dtrans/Library_sysdtrans.mk +++ b/dtrans/Library_sysdtrans.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,sysdtrans,\ uuid \ uwinapi \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sysdtrans)) + $(eval $(call gb_Library_use_static_libraries,sysdtrans,\ dtobj \ )) diff --git a/editeng/CppunitTest_editeng_borderline.mk b/editeng/CppunitTest_editeng_borderline.mk index 32eea423ea6c..6b513bba5388 100644 --- a/editeng/CppunitTest_editeng_borderline.mk +++ b/editeng/CppunitTest_editeng_borderline.mk @@ -53,9 +53,10 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_borderline, \ i18nisolang1 \ i18nutil \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,editeng_borderline)) + $(eval $(call gb_CppunitTest_use_externals,editeng_borderline,\ icuuc \ )) diff --git a/editeng/CppunitTest_editeng_core.mk b/editeng/CppunitTest_editeng_core.mk index cc12b6df0e4a..561effdb67da 100644 --- a/editeng/CppunitTest_editeng_core.mk +++ b/editeng/CppunitTest_editeng_core.mk @@ -58,9 +58,10 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_core, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,editeng_core)) + $(eval $(call gb_CppunitTest_use_externals,editeng_core,\ icuuc \ )) diff --git a/editeng/CppunitTest_editeng_lookuptree.mk b/editeng/CppunitTest_editeng_lookuptree.mk index 8911f87d8cec..a61c85495baa 100644 --- a/editeng/CppunitTest_editeng_lookuptree.mk +++ b/editeng/CppunitTest_editeng_lookuptree.mk @@ -53,9 +53,10 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_lookuptree, \ i18nisolang1 \ i18nutil \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,editeng_lookuptree)) + $(eval $(call gb_CppunitTest_use_externals,editeng_lookuptree,\ icuuc \ )) diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk index f65f2eb1d35b..308e7595de12 100644 --- a/editeng/Library_editeng.mk +++ b/editeng/Library_editeng.mk @@ -152,9 +152,10 @@ $(eval $(call gb_Library_use_libraries,editeng,\ i18nisolang1 \ i18nutil \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,editeng)) + $(eval $(call gb_Library_use_external,editeng,icuuc)) # Runtime dependency for unit-tests diff --git a/embeddedobj/Library_embobj.mk b/embeddedobj/Library_embobj.mk index d4e57c034fa0..083166c77c1c 100644 --- a/embeddedobj/Library_embobj.mk +++ b/embeddedobj/Library_embobj.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,embobj,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,embobj)) + $(eval $(call gb_Library_add_exception_objects,embobj,\ embeddedobj/source/commonembedding/embedobj \ embeddedobj/source/commonembedding/inplaceobj \ diff --git a/embeddedobj/Library_emboleobj.mk b/embeddedobj/Library_emboleobj.mk index 3b280bc8e33a..d3ca7501e8cd 100644 --- a/embeddedobj/Library_emboleobj.mk +++ b/embeddedobj/Library_emboleobj.mk @@ -44,9 +44,10 @@ $(eval $(call gb_Library_use_libraries,emboleobj,\ tl \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,emboleobj)) + $(eval $(call gb_Library_add_exception_objects,emboleobj,\ embeddedobj/source/msole/closepreventer \ embeddedobj/source/msole/oleembed \ diff --git a/embedserv/Library_emser.mk b/embedserv/Library_emser.mk index 50a80d613b45..617458b94b1e 100644 --- a/embedserv/Library_emser.mk +++ b/embedserv/Library_emser.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,emser,\ sal \ uuid \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,emser)) + ifeq ($(USE_DEBUG_RUNTIME),) $(eval $(call gb_Library_add_libs,emser,\ $(ATL_LIB)/atls.lib \ diff --git a/embedserv/Library_inprocserv.mk b/embedserv/Library_inprocserv.mk index 256871f62686..122858ed9413 100644 --- a/embedserv/Library_inprocserv.mk +++ b/embedserv/Library_inprocserv.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_libraries,inprocserv,\ ole32 \ uuid \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,inprocserv)) + ifeq ($(COM),MSC) $(eval $(call gb_Library_add_ldflags,inprocserv,\ /EXPORT:DllCanUnloadNow \ diff --git a/eventattacher/Library_evtatt.mk b/eventattacher/Library_evtatt.mk index 06eb7948e832..3ea419418096 100644 --- a/eventattacher/Library_evtatt.mk +++ b/eventattacher/Library_evtatt.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,evtatt,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,evtatt)) + $(eval $(call gb_Library_add_exception_objects,evtatt,\ eventattacher/source/eventattacher \ )) diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk index ad617f690582..766552e29396 100644 --- a/extensions/CppunitTest_extensions_test_update.mk +++ b/extensions/CppunitTest_extensions_test_update.mk @@ -40,9 +40,10 @@ $(eval $(call gb_CppunitTest_use_libraries,extensions_test_update, \ test \ unotest \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,extensions_test_update)) + ifeq ($(OS),WNT) $(eval $(call gb_CppunitTest_use_libraries,extensions_test_update,\ shell32 \ diff --git a/extensions/Library_abp.mk b/extensions/Library_abp.mk index 708d89f5a7b6..82ac86bef87d 100644 --- a/extensions/Library_abp.mk +++ b/extensions/Library_abp.mk @@ -84,7 +84,8 @@ $(eval $(call gb_Library_use_libraries,abp,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,abp)) + # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Library_bib.mk b/extensions/Library_bib.mk index aa4e368942a4..6ba529538ad3 100644 --- a/extensions/Library_bib.mk +++ b/extensions/Library_bib.mk @@ -68,7 +68,8 @@ $(eval $(call gb_Library_use_libraries,bib,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,bib)) + # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Library_dbp.mk b/extensions/Library_dbp.mk index 1f9c76917c72..caf72dc5114a 100644 --- a/extensions/Library_dbp.mk +++ b/extensions/Library_dbp.mk @@ -70,7 +70,8 @@ $(eval $(call gb_Library_use_libraries,dbp,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dbp)) + # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Library_log.mk b/extensions/Library_log.mk index 9fd561c884db..a366362cfea3 100644 --- a/extensions/Library_log.mk +++ b/extensions/Library_log.mk @@ -53,7 +53,8 @@ $(eval $(call gb_Library_use_libraries,log,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,log)) + # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Library_pcr.mk b/extensions/Library_pcr.mk index 847ba21c5604..974701566838 100644 --- a/extensions/Library_pcr.mk +++ b/extensions/Library_pcr.mk @@ -56,9 +56,10 @@ $(eval $(call gb_Library_use_libraries,pcr,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,pcr)) + $(eval $(call gb_Library_add_exception_objects,pcr,\ extensions/source/propctrlr/MasterDetailLinkDialog \ extensions/source/propctrlr/browserline \ diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk index e6c5f0d7e1cf..45b1b75d58b7 100644 --- a/extensions/Library_pl.mk +++ b/extensions/Library_pl.mk @@ -131,9 +131,10 @@ $(eval $(call gb_Library_use_libraries,pl,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,pl)) + $(eval $(call gb_Library_add_exception_objects,pl,\ extensions/source/plugin/base/context \ extensions/source/plugin/base/evtlstnr \ diff --git a/extensions/Library_res.mk b/extensions/Library_res.mk index cd7bc522b424..22587cc65e9c 100644 --- a/extensions/Library_res.mk +++ b/extensions/Library_res.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,res,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,res)) + $(eval $(call gb_Library_add_exception_objects,res,\ extensions/source/resource/ResourceIndexAccess \ extensions/source/resource/oooresourceloader \ diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk index 7cca92e09eed..75872b73465f 100644 --- a/extensions/Library_scn.mk +++ b/extensions/Library_scn.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,scn,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,scn)) + $(eval $(call gb_Library_add_exception_objects,scn,\ extensions/source/scanner/scnserv \ extensions/source/scanner/scanner \ diff --git a/fileaccess/Library_fileacc.mk b/fileaccess/Library_fileacc.mk index ea8336544d78..01a54320119a 100644 --- a/fileaccess/Library_fileacc.mk +++ b/fileaccess/Library_fileacc.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,fileacc,\ ucbhelper \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fileacc)) + $(eval $(call gb_Library_set_componentfile,fileacc,fileaccess/source/fileacc)) $(eval $(call gb_Library_add_exception_objects,fileacc,fileaccess/source/FileAccess)) diff --git a/filter/CppunitTest_filter_pict_test.mk b/filter/CppunitTest_filter_pict_test.mk index 20cbe8613239..a84cffa41506 100644 --- a/filter/CppunitTest_filter_pict_test.mk +++ b/filter/CppunitTest_filter_pict_test.mk @@ -20,9 +20,10 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_pict_test, \ unotest \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,filter_pict_test)) + $(eval $(call gb_CppunitTest_use_api,filter_pict_test,\ udkapi \ offapi \ diff --git a/filter/CppunitTest_filter_tga_test.mk b/filter/CppunitTest_filter_tga_test.mk index fc05c5b68ac8..597cd2cbfa55 100644 --- a/filter/CppunitTest_filter_tga_test.mk +++ b/filter/CppunitTest_filter_tga_test.mk @@ -39,9 +39,10 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_tga_test, \ unotest \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,filter_tga_test)) + $(eval $(call gb_CppunitTest_use_api,filter_tga_test,\ udkapi \ offapi \ diff --git a/filter/CppunitTest_filter_tiff_test.mk b/filter/CppunitTest_filter_tiff_test.mk index 4da2def1178f..ce29bb29c6f8 100644 --- a/filter/CppunitTest_filter_tiff_test.mk +++ b/filter/CppunitTest_filter_tiff_test.mk @@ -39,9 +39,10 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_tiff_test, \ unotest \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,filter_tiff_test)) + $(eval $(call gb_CppunitTest_use_api,filter_tiff_test,\ udkapi \ offapi \ diff --git a/filter/Executable_svg2odf.mk b/filter/Executable_svg2odf.mk index bc22022a7d9a..ad38d5eba6fd 100644 --- a/filter/Executable_svg2odf.mk +++ b/filter/Executable_svg2odf.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Executable_use_libraries,svg2odf,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,svg2odf)) + $(eval $(call gb_Executable_add_exception_objects,svg2odf,\ filter/source/svg/test/svg2odf \ filter/source/svg/test/odfserializer \ diff --git a/filter/Library_PptImporter.mk b/filter/Library_PptImporter.mk index dc676fc1eb04..22e613952383 100644 --- a/filter/Library_PptImporter.mk +++ b/filter/Library_PptImporter.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_use_libraries,PptImporter,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,PptImporter)) + $(eval $(call gb_Library_add_exception_objects,PptImporter,\ filter/source/msfilter/powerpoint/pptimporter \ filter/source/msfilter/powerpoint/pptimporteruno \ diff --git a/filter/Library_egi.mk b/filter/Library_egi.mk index 76f996ec5a5b..68c45f9f1adb 100644 --- a/filter/Library_egi.mk +++ b/filter/Library_egi.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_use_libraries,egi,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,egi)) + $(eval $(call gb_Library_add_exception_objects,egi,\ filter/source/graphicfilter/egif/egif \ filter/source/graphicfilter/egif/giflzwc \ diff --git a/filter/Library_eme.mk b/filter/Library_eme.mk index fc67818d2918..aed74813581c 100644 --- a/filter/Library_eme.mk +++ b/filter/Library_eme.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_use_libraries,eme,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,eme)) + $(eval $(call gb_Library_add_exception_objects,eme,\ filter/source/graphicfilter/eos2met/eos2met \ )) diff --git a/filter/Library_epb.mk b/filter/Library_epb.mk index d9ab41e401d0..dabe92c4d75c 100644 --- a/filter/Library_epb.mk +++ b/filter/Library_epb.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_use_libraries,epb,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,epb)) + $(eval $(call gb_Library_add_exception_objects,epb,\ filter/source/graphicfilter/epbm/epbm \ )) diff --git a/filter/Library_epg.mk b/filter/Library_epg.mk index dd5aba2718e6..cf1ab1f69b65 100644 --- a/filter/Library_epg.mk +++ b/filter/Library_epg.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_use_libraries,epg,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,epg)) + $(eval $(call gb_Library_add_exception_objects,epg,\ filter/source/graphicfilter/epgm/epgm \ )) diff --git a/filter/Library_epp.mk b/filter/Library_epp.mk index 545522dae843..9ca7ff0d0c4d 100644 --- a/filter/Library_epp.mk +++ b/filter/Library_epp.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_use_libraries,epp,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,epp)) + $(eval $(call gb_Library_add_exception_objects,epp,\ filter/source/graphicfilter/eppm/eppm \ )) diff --git a/filter/Library_eps.mk b/filter/Library_eps.mk index a1d80c7c8605..7ce9d29b04a4 100644 --- a/filter/Library_eps.mk +++ b/filter/Library_eps.mk @@ -32,9 +32,10 @@ $(eval $(call gb_Library_use_libraries,eps,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,eps)) + $(eval $(call gb_Library_add_exception_objects,eps,\ filter/source/graphicfilter/eps/eps \ )) diff --git a/filter/Library_ept.mk b/filter/Library_ept.mk index 2c8f8a406742..5281662571a4 100644 --- a/filter/Library_ept.mk +++ b/filter/Library_ept.mk @@ -32,9 +32,10 @@ $(eval $(call gb_Library_use_libraries,ept,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ept)) + $(eval $(call gb_Library_add_exception_objects,ept,\ filter/source/graphicfilter/epict/epict \ )) diff --git a/filter/Library_era.mk b/filter/Library_era.mk index 9c37c67e6b6b..b558d014c8dd 100644 --- a/filter/Library_era.mk +++ b/filter/Library_era.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_use_libraries,era,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,era)) + $(eval $(call gb_Library_add_exception_objects,era,\ filter/source/graphicfilter/eras/eras \ )) diff --git a/filter/Library_eti.mk b/filter/Library_eti.mk index e1f3eefe6b40..45c1aa1a9fd8 100644 --- a/filter/Library_eti.mk +++ b/filter/Library_eti.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_use_libraries,eti,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,eti)) + $(eval $(call gb_Library_add_exception_objects,eti,\ filter/source/graphicfilter/etiff/etiff \ )) diff --git a/filter/Library_exp.mk b/filter/Library_exp.mk index 8c2c06a8d136..de4e0873178c 100644 --- a/filter/Library_exp.mk +++ b/filter/Library_exp.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_use_libraries,exp,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,exp)) + $(eval $(call gb_Library_add_exception_objects,exp,\ filter/source/graphicfilter/expm/expm \ )) diff --git a/filter/Library_filterconfig.mk b/filter/Library_filterconfig.mk index b6404a177ba9..accb75de4a39 100644 --- a/filter/Library_filterconfig.mk +++ b/filter/Library_filterconfig.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_libraries,filterconfig,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,filterconfig)) + $(eval $(call gb_Library_add_exception_objects,filterconfig,\ filter/source/config/cache/basecontainer \ diff --git a/filter/Library_flash.mk b/filter/Library_flash.mk index 808f7a57172f..13843bd93578 100644 --- a/filter/Library_flash.mk +++ b/filter/Library_flash.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_libraries,flash,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,flash)) + $(eval $(call gb_Library_use_externals,flash,zlib)) $(eval $(call gb_Library_add_exception_objects,flash,\ diff --git a/filter/Library_icd.mk b/filter/Library_icd.mk index bee43bbe7ceb..ca60b884d51b 100644 --- a/filter/Library_icd.mk +++ b/filter/Library_icd.mk @@ -30,9 +30,10 @@ $(eval $(call gb_Library_use_libraries,icd,\ tl \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,icd)) + $(eval $(call gb_Library_add_exception_objects,icd,\ filter/source/graphicfilter/ipcd/ipcd \ )) diff --git a/filter/Library_icg.mk b/filter/Library_icg.mk index 7d9241fe9e2e..614107ef2be3 100644 --- a/filter/Library_icg.mk +++ b/filter/Library_icg.mk @@ -33,9 +33,10 @@ $(eval $(call gb_Library_use_libraries,icg,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,icg)) + $(eval $(call gb_Library_add_exception_objects,icg,\ filter/source/graphicfilter/icgm/actimpr \ filter/source/graphicfilter/icgm/bitmap \ diff --git a/filter/Library_idx.mk b/filter/Library_idx.mk index 6040d65538d2..6cd2083284b9 100644 --- a/filter/Library_idx.mk +++ b/filter/Library_idx.mk @@ -29,9 +29,10 @@ $(eval $(call gb_Library_use_libraries,idx,\ tl \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,idx)) + $(eval $(call gb_Library_add_exception_objects,idx,\ filter/source/graphicfilter/idxf/dxf2mtf \ filter/source/graphicfilter/idxf/dxfblkrd \ diff --git a/filter/Library_ime.mk b/filter/Library_ime.mk index d93303030f58..8aa08162ddb6 100644 --- a/filter/Library_ime.mk +++ b/filter/Library_ime.mk @@ -29,9 +29,10 @@ $(eval $(call gb_Library_use_libraries,ime,\ tl \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ime)) + $(eval $(call gb_Library_add_exception_objects,ime,\ filter/source/graphicfilter/ios2met/ios2met \ )) diff --git a/filter/Library_ipb.mk b/filter/Library_ipb.mk index 813954141b66..34db6b034768 100644 --- a/filter/Library_ipb.mk +++ b/filter/Library_ipb.mk @@ -29,9 +29,10 @@ $(eval $(call gb_Library_use_libraries,ipb,\ tl \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ipb)) + $(eval $(call gb_Library_add_exception_objects,ipb,\ filter/source/graphicfilter/ipbm/ipbm \ )) diff --git a/filter/Library_ipd.mk b/filter/Library_ipd.mk index 6f87872d92eb..d84768c10561 100644 --- a/filter/Library_ipd.mk +++ b/filter/Library_ipd.mk @@ -29,9 +29,10 @@ $(eval $(call gb_Library_use_libraries,ipd,\ tl \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ipd)) + $(eval $(call gb_Library_add_exception_objects,ipd,\ filter/source/graphicfilter/ipsd/ipsd \ )) diff --git a/filter/Library_ips.mk b/filter/Library_ips.mk index face1d7f1fb3..01226fc530db 100644 --- a/filter/Library_ips.mk +++ b/filter/Library_ips.mk @@ -29,9 +29,10 @@ $(eval $(call gb_Library_use_libraries,ips,\ tl \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ips)) + $(eval $(call gb_Library_add_exception_objects,ips,\ filter/source/graphicfilter/ieps/ieps \ )) diff --git a/filter/Library_ipt.mk b/filter/Library_ipt.mk index 768af3940040..f6047a0c2460 100644 --- a/filter/Library_ipt.mk +++ b/filter/Library_ipt.mk @@ -30,9 +30,10 @@ $(eval $(call gb_Library_use_libraries,ipt,\ basegfx \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ipt)) + $(eval $(call gb_Library_add_exception_objects,ipt,\ filter/source/graphicfilter/ipict/ipict \ filter/source/graphicfilter/ipict/shape \ diff --git a/filter/Library_ipx.mk b/filter/Library_ipx.mk index 5cea98191964..b266f3b39879 100644 --- a/filter/Library_ipx.mk +++ b/filter/Library_ipx.mk @@ -29,9 +29,10 @@ $(eval $(call gb_Library_use_libraries,ipx,\ tl \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ipx)) + $(eval $(call gb_Library_add_exception_objects,ipx,\ filter/source/graphicfilter/ipcx/ipcx \ )) diff --git a/filter/Library_ira.mk b/filter/Library_ira.mk index 914c53e19cfd..d1f2b8a14cc1 100644 --- a/filter/Library_ira.mk +++ b/filter/Library_ira.mk @@ -29,9 +29,10 @@ $(eval $(call gb_Library_use_libraries,ira,\ tl \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ira)) + $(eval $(call gb_Library_add_exception_objects,ira,\ filter/source/graphicfilter/iras/iras \ )) diff --git a/filter/Library_itg.mk b/filter/Library_itg.mk index 2a9a03e15f1f..fb7ae312fc3f 100644 --- a/filter/Library_itg.mk +++ b/filter/Library_itg.mk @@ -29,9 +29,10 @@ $(eval $(call gb_Library_use_libraries,itg,\ tl \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,itg)) + $(eval $(call gb_Library_add_exception_objects,itg,\ filter/source/graphicfilter/itga/itga \ )) diff --git a/filter/Library_iti.mk b/filter/Library_iti.mk index e736ffafe2e0..895b2cd172e7 100644 --- a/filter/Library_iti.mk +++ b/filter/Library_iti.mk @@ -29,9 +29,10 @@ $(eval $(call gb_Library_use_libraries,iti,\ tl \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,iti)) + $(eval $(call gb_Library_add_exception_objects,iti,\ filter/source/graphicfilter/itiff/ccidecom \ filter/source/graphicfilter/itiff/itiff \ diff --git a/filter/Library_msfilter.mk b/filter/Library_msfilter.mk index 0de501dfeb09..2061f571015e 100644 --- a/filter/Library_msfilter.mk +++ b/filter/Library_msfilter.mk @@ -52,9 +52,10 @@ $(eval $(call gb_Library_use_libraries,msfilter,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,msfilter)) + $(eval $(call gb_Library_add_exception_objects,msfilter,\ filter/source/msfilter/countryid \ filter/source/msfilter/escherex \ diff --git a/filter/Library_odfflatxml.mk b/filter/Library_odfflatxml.mk index 3df371a63c8c..b7a99a4568e8 100644 --- a/filter/Library_odfflatxml.mk +++ b/filter/Library_odfflatxml.mk @@ -44,9 +44,10 @@ $(eval $(call gb_Library_use_libraries,odfflatxml,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,odfflatxml)) + $(eval $(call gb_Library_add_exception_objects,odfflatxml,\ filter/source/odfflatxml/OdfFlatXml \ )) diff --git a/filter/Library_pdffilter.mk b/filter/Library_pdffilter.mk index 77be3737a741..1801ccf6086f 100644 --- a/filter/Library_pdffilter.mk +++ b/filter/Library_pdffilter.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,pdffilter,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,pdffilter)) + $(eval $(call gb_Library_add_exception_objects,pdffilter,\ filter/source/pdf/impdialog \ filter/source/pdf/pdfdialog \ diff --git a/filter/Library_placeware.mk b/filter/Library_placeware.mk index e4d6684a26c1..eee399f1b859 100644 --- a/filter/Library_placeware.mk +++ b/filter/Library_placeware.mk @@ -32,9 +32,10 @@ $(eval $(call gb_Library_use_libraries,placeware,\ sal \ sax \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,placeware)) + $(eval $(call gb_Library_add_exception_objects,placeware,\ filter/source/placeware/exporter \ filter/source/placeware/filter \ diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk index 886882cf18fe..c3b752e4d0f2 100644 --- a/filter/Library_svgfilter.mk +++ b/filter/Library_svgfilter.mk @@ -50,9 +50,10 @@ $(eval $(call gb_Library_use_libraries,svgfilter,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,svgfilter)) + $(eval $(call gb_Library_use_externals,svgfilter,libxml2)) $(eval $(call gb_Library_add_exception_objects,svgfilter,\ diff --git a/filter/Library_t602filter.mk b/filter/Library_t602filter.mk index 082601caf7e0..b3d649db3ad2 100644 --- a/filter/Library_t602filter.mk +++ b/filter/Library_t602filter.mk @@ -33,9 +33,10 @@ $(eval $(call gb_Library_use_libraries,t602filter,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,t602filter)) + $(eval $(call gb_Library_add_exception_objects,t602filter,\ filter/source/t602/filterenv \ filter/source/t602/t602filter \ diff --git a/filter/Library_textfd.mk b/filter/Library_textfd.mk index 594ce61f7456..3acc160d3954 100644 --- a/filter/Library_textfd.mk +++ b/filter/Library_textfd.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,textfd,\ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,textfd)) + $(eval $(call gb_Library_add_exception_objects,textfd,\ filter/source/textfilterdetect/fdcomp \ filter/source/textfilterdetect/filterdetect \ diff --git a/filter/Library_xmlfa.mk b/filter/Library_xmlfa.mk index acb109aee92e..5cd70bb6ab76 100644 --- a/filter/Library_xmlfa.mk +++ b/filter/Library_xmlfa.mk @@ -33,9 +33,10 @@ $(eval $(call gb_Library_use_libraries,xmlfa,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,xmlfa)) + $(eval $(call gb_Library_add_exception_objects,xmlfa,\ filter/source/xmlfilteradaptor/XmlFilterAdaptor \ filter/source/xmlfilteradaptor/genericfilter \ diff --git a/filter/Library_xmlfd.mk b/filter/Library_xmlfd.mk index b42e79ee2c70..99c6a8e91a62 100644 --- a/filter/Library_xmlfd.mk +++ b/filter/Library_xmlfd.mk @@ -32,9 +32,10 @@ $(eval $(call gb_Library_use_libraries,xmlfd,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,xmlfd)) + $(eval $(call gb_Library_add_exception_objects,xmlfd,\ filter/source/xmlfilterdetect/fdcomp \ filter/source/xmlfilterdetect/filterdetect \ diff --git a/filter/Library_xsltdlg.mk b/filter/Library_xsltdlg.mk index 805e0e71f3cb..2f87b27acfa7 100644 --- a/filter/Library_xsltdlg.mk +++ b/filter/Library_xsltdlg.mk @@ -40,9 +40,10 @@ $(eval $(call gb_Library_use_libraries,xsltdlg,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,xsltdlg)) + $(eval $(call gb_Library_add_exception_objects,xsltdlg,\ filter/source/xsltdialog/typedetectionexport \ filter/source/xsltdialog/typedetectionimport \ diff --git a/filter/Library_xsltfilter.mk b/filter/Library_xsltfilter.mk index 293c28b0af20..3dec5645a86f 100644 --- a/filter/Library_xsltfilter.mk +++ b/filter/Library_xsltfilter.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,xsltfilter,\ salhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,xsltfilter)) + $(eval $(call gb_Library_use_externals,xsltfilter,\ libxml2 \ libxslt \ diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk index 2b4361fde1ca..809bef707b6e 100644 --- a/forms/Library_frm.mk +++ b/forms/Library_frm.mk @@ -58,9 +58,10 @@ $(eval $(call gb_Library_use_libraries,frm,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,frm)) + ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Library_use_externals,frm,\ icuin \ diff --git a/formula/Library_for.mk b/formula/Library_for.mk index 4678e9f4aeda..4e392b7fa15c 100644 --- a/formula/Library_for.mk +++ b/formula/Library_for.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,for,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,for)) + $(eval $(call gb_Library_set_componentfile,for,formula/util/for)) $(eval $(call gb_Library_add_exception_objects,for,\ diff --git a/formula/Library_forui.mk b/formula/Library_forui.mk index 3090ed411160..b92cf91da298 100644 --- a/formula/Library_forui.mk +++ b/formula/Library_forui.mk @@ -52,9 +52,10 @@ $(eval $(call gb_Library_use_libraries,forui,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,forui)) + $(eval $(call gb_Library_add_exception_objects,forui,\ formula/source/ui/dlg/formula \ formula/source/ui/dlg/FormulaHelper \ diff --git a/fpicker/Library_fpicker.mk b/fpicker/Library_fpicker.mk index fdba80e5e721..c18687564d4d 100644 --- a/fpicker/Library_fpicker.mk +++ b/fpicker/Library_fpicker.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,fpicker,\ svt \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fpicker)) + ifeq ($(OS),WNT) $(eval $(call gb_Library_use_static_libraries,fpicker,\ odma_lib \ diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk index 95e315743eca..05f84ea2b1ba 100644 --- a/fpicker/Library_fps.mk +++ b/fpicker/Library_fps.mk @@ -61,9 +61,10 @@ $(eval $(call gb_Library_use_libraries,fps,\ shell32 \ uuid \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fps)) + ifeq ($(COM),MSC) $(eval $(call gb_Library_add_libs,fps,\ Delayimp.lib /DELAYLOAD:shell32.dll \ diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk index cb7e1a9e7c77..2c7665855779 100644 --- a/fpicker/Library_fps_aqua.mk +++ b/fpicker/Library_fps_aqua.mk @@ -46,9 +46,10 @@ $(eval $(call gb_Library_use_libraries,fps_aqua,\ sal \ tl \ vcl \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fps_aqua)) + $(eval $(call gb_Library_add_objcxxobjects,fps_aqua,\ fpicker/source/aqua/AquaFilePickerDelegate \ fpicker/source/aqua/CFStringUtilities \ diff --git a/fpicker/Library_fps_odma.mk b/fpicker/Library_fps_odma.mk index 08eff663bfac..dbb1fe382339 100644 --- a/fpicker/Library_fps_odma.mk +++ b/fpicker/Library_fps_odma.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,fps_odma,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fps_odma)) + ifeq ($(OS),WNT) $(eval $(call gb_Library_use_static_libraries,fps_odma,\ odma_lib \ diff --git a/fpicker/Library_fps_office.mk b/fpicker/Library_fps_office.mk index 2db54954bdeb..5582ffb076e2 100644 --- a/fpicker/Library_fps_office.mk +++ b/fpicker/Library_fps_office.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Library_use_libraries,fps_office,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fps_office)) + $(eval $(call gb_Library_add_exception_objects,fps_office,\ fpicker/source/office/asyncfilepicker \ fpicker/source/office/commonpicker \ diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk index 3d3598c6d1c2..fcc35cc1fecc 100644 --- a/framework/Library_fwe.mk +++ b/framework/Library_fwe.mk @@ -52,9 +52,10 @@ $(eval $(call gb_Library_use_libraries,fwe,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fwe)) + $(eval $(call gb_Library_add_exception_objects,fwe,\ framework/source/fwe/classes/actiontriggercontainer \ framework/source/fwe/classes/actiontriggerpropertyset \ diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk index b33194267453..ac51b15602a6 100644 --- a/framework/Library_fwi.mk +++ b/framework/Library_fwi.mk @@ -55,9 +55,10 @@ $(eval $(call gb_Library_use_libraries,fwi,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fwi)) + $(eval $(call gb_Library_add_exception_objects,fwi,\ framework/source/fwi/classes/converter \ framework/source/fwi/classes/propertysethelper \ diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk index 348812634bbf..3a4ed045cae0 100644 --- a/framework/Library_fwk.mk +++ b/framework/Library_fwk.mk @@ -55,9 +55,10 @@ $(eval $(call gb_Library_use_libraries,fwk,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fwk)) + $(eval $(call gb_Library_add_exception_objects,fwk,\ framework/source/accelerators/acceleratorcache \ framework/source/accelerators/acceleratorconfiguration \ diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk index f02de16d2026..45c605663651 100644 --- a/framework/Library_fwl.mk +++ b/framework/Library_fwl.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,fwl,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fwl)) + $(eval $(call gb_Library_add_exception_objects,fwl,\ framework/source/classes/fwlresid \ framework/source/dispatch/mailtodispatcher \ diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk index bd656521ea40..bc0daca7caff 100644 --- a/framework/Library_fwm.mk +++ b/framework/Library_fwm.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,fwm,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fwm)) + $(eval $(call gb_Library_add_exception_objects,fwm,\ framework/source/dispatch/systemexec \ framework/source/jobs/helponstartup \ diff --git a/framework/Library_lomenubar.mk b/framework/Library_lomenubar.mk index 3536625dbac0..b9f8c5fef6fa 100644 --- a/framework/Library_lomenubar.mk +++ b/framework/Library_lomenubar.mk @@ -44,9 +44,10 @@ $(eval $(call gb_Library_use_libraries,lomenubar,\ cppuhelper \ comphelper \ X11 \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,lomenubar)) + $(eval $(call gb_Library_add_exception_objects,lomenubar,\ framework/source/lomenubar/MenuItemInfo \ framework/source/lomenubar/AwtKeyToDbusmenuString \ diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk index 834c9ae1212a..f4a269873d5e 100644 --- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk +++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk @@ -43,9 +43,10 @@ $(eval $(call gb_CppunitTest_use_libraries,hwpfilter_test_hwpfilter, \ test \ unotest \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,hwpfilter_test_hwpfilter)) + $(eval $(call gb_CppunitTest_use_api,hwpfilter_test_hwpfilter,\ offapi \ udkapi \ diff --git a/hwpfilter/Library_hwp.mk b/hwpfilter/Library_hwp.mk index 612a124e7ccd..5ca70188fcf3 100644 --- a/hwpfilter/Library_hwp.mk +++ b/hwpfilter/Library_hwp.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,hwp,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,hwp)) + $(eval $(call gb_Library_use_external,hwp,zlib)) ifeq ($(OS),WNT) diff --git a/i18npool/CppunitTest_i18npool_test_breakiterator.mk b/i18npool/CppunitTest_i18npool_test_breakiterator.mk index 0fe4577ecff0..c51f0a1630ce 100644 --- a/i18npool/CppunitTest_i18npool_test_breakiterator.mk +++ b/i18npool/CppunitTest_i18npool_test_breakiterator.mk @@ -39,9 +39,10 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_breakiterator,\ sal \ unotest \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,i18npool_test_breakiterator)) + $(eval $(call gb_CppunitTest_add_exception_objects,i18npool_test_breakiterator,\ i18npool/qa/cppunit/test_breakiterator \ )) diff --git a/i18npool/CppunitTest_i18npool_test_characterclassification.mk b/i18npool/CppunitTest_i18npool_test_characterclassification.mk index 9c6b549da697..086dec586d1f 100644 --- a/i18npool/CppunitTest_i18npool_test_characterclassification.mk +++ b/i18npool/CppunitTest_i18npool_test_characterclassification.mk @@ -39,9 +39,10 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_characterclassification sal \ unotest \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,i18npool_test_characterclassification)) + $(eval $(call gb_CppunitTest_add_exception_objects,i18npool_test_characterclassification,\ i18npool/qa/cppunit/test_characterclassification \ )) diff --git a/i18npool/CppunitTest_i18npool_test_languagetag.mk b/i18npool/CppunitTest_i18npool_test_languagetag.mk index cdb846894122..7043f320c028 100644 --- a/i18npool/CppunitTest_i18npool_test_languagetag.mk +++ b/i18npool/CppunitTest_i18npool_test_languagetag.mk @@ -21,9 +21,10 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_languagetag,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,i18npool_test_languagetag)) + ifeq ($(ENABLE_LIBLANGTAG),YES) $(eval $(call gb_CppunitTest_use_externals,i18npool_test_languagetag,\ liblangtag \ diff --git a/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk b/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk index a2ea6f51430e..ed943389e970 100644 --- a/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk +++ b/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk @@ -20,9 +20,10 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_ordinalsuffix,\ sal \ unotest \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,i18npool_test_ordinalsuffix)) + $(eval $(call gb_CppunitTest_add_exception_objects,i18npool_test_ordinalsuffix,\ i18npool/qa/cppunit/test_ordinalsuffix \ )) diff --git a/i18npool/Executable_gencoll_rule.mk b/i18npool/Executable_gencoll_rule.mk index 5999b06466b8..82aafdb4cea0 100644 --- a/i18npool/Executable_gencoll_rule.mk +++ b/i18npool/Executable_gencoll_rule.mk @@ -36,9 +36,10 @@ $(eval $(call gb_Executable_set_include,gencoll_rule,\ $(eval $(call gb_Executable_use_libraries,gencoll_rule,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,gencoll_rule)) + ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Executable_use_externals,gencoll_rule,\ icudt \ diff --git a/i18npool/Executable_genconv_dict.mk b/i18npool/Executable_genconv_dict.mk index 58a3011afb16..22ea9c5d54d1 100644 --- a/i18npool/Executable_genconv_dict.mk +++ b/i18npool/Executable_genconv_dict.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_set_include,genconv_dict,\ $(eval $(call gb_Executable_use_libraries,genconv_dict,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,genconv_dict)) + $(eval $(call gb_Executable_add_exception_objects,genconv_dict,\ i18npool/source/textconversion/genconv_dict \ )) diff --git a/i18npool/Executable_gendict.mk b/i18npool/Executable_gendict.mk index a49f2eb4c726..38aae75eb138 100644 --- a/i18npool/Executable_gendict.mk +++ b/i18npool/Executable_gendict.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_set_include,gendict,\ $(eval $(call gb_Executable_use_libraries,gendict,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,gendict)) + $(eval $(call gb_Executable_add_exception_objects,gendict,\ i18npool/source/breakiterator/gendict \ )) diff --git a/i18npool/Executable_genindex_data.mk b/i18npool/Executable_genindex_data.mk index c1279d00964b..c6b532192466 100644 --- a/i18npool/Executable_genindex_data.mk +++ b/i18npool/Executable_genindex_data.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_set_include,genindex_data,\ $(eval $(call gb_Executable_use_libraries,genindex_data,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,genindex_data)) + ifeq ($(OS),WNT) $(eval $(call gb_Executable_use_externals,gencoll_rule,\ icudt \ diff --git a/i18npool/Executable_saxparser.mk b/i18npool/Executable_saxparser.mk index eb4efdf838a7..b61799d690d1 100644 --- a/i18npool/Executable_saxparser.mk +++ b/i18npool/Executable_saxparser.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Executable_use_libraries,saxparser,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,saxparser)) + $(eval $(call gb_Executable_add_exception_objects,saxparser,\ i18npool/source/localedata/LocaleNode \ i18npool/source/localedata/filewriter \ diff --git a/i18npool/Library_collator_data.mk b/i18npool/Library_collator_data.mk index 507a3455c9b6..a136cef873e0 100644 --- a/i18npool/Library_collator_data.mk +++ b/i18npool/Library_collator_data.mk @@ -30,9 +30,10 @@ $(eval $(call gb_Library_Library,collator_data)) $(eval $(call gb_Library_use_libraries,collator_data,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,collator_data)) + $(eval $(call gb_Library_add_generated_exception_objects,collator_data,\ $(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/collator/data/*.txt),\ CustomTarget/i18npool/collator/collator_$(notdir $(basename $(txt)))) \ diff --git a/i18npool/Library_dict_ja.mk b/i18npool/Library_dict_ja.mk index 658d8334cf6c..a22555b231f5 100644 --- a/i18npool/Library_dict_ja.mk +++ b/i18npool/Library_dict_ja.mk @@ -30,9 +30,10 @@ $(eval $(call gb_Library_Library,dict_ja)) $(eval $(call gb_Library_use_libraries,dict_ja,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dict_ja)) + $(eval $(call gb_Library_add_generated_exception_objects,dict_ja,\ CustomTarget/i18npool/breakiterator/dict_ja \ )) diff --git a/i18npool/Library_dict_zh.mk b/i18npool/Library_dict_zh.mk index c21addb7f2cb..8b80f193de23 100644 --- a/i18npool/Library_dict_zh.mk +++ b/i18npool/Library_dict_zh.mk @@ -30,9 +30,10 @@ $(eval $(call gb_Library_Library,dict_zh)) $(eval $(call gb_Library_use_libraries,dict_zh,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dict_zh)) + $(eval $(call gb_Library_add_generated_exception_objects,dict_zh,\ CustomTarget/i18npool/breakiterator/dict_zh \ )) diff --git a/i18npool/Library_i18nisolang1.mk b/i18npool/Library_i18nisolang1.mk index 4ff6fff4331a..422d9cde94f6 100644 --- a/i18npool/Library_i18nisolang1.mk +++ b/i18npool/Library_i18nisolang1.mk @@ -44,9 +44,10 @@ $(eval $(call gb_Library_add_defs,i18nisolang1,\ $(eval $(call gb_Library_use_libraries,i18nisolang1,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,i18nisolang1)) + $(eval $(call gb_Library_add_exception_objects,i18nisolang1,\ i18npool/source/isolang/insys \ i18npool/source/isolang/isolang \ diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk index 73d38e954cb3..81486613da42 100644 --- a/i18npool/Library_i18npool.mk +++ b/i18npool/Library_i18npool.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,i18npool,\ i18nutil \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,i18npool)) + ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Library_use_externals,i18npool,\ icuin \ diff --git a/i18npool/Library_i18nsearch.mk b/i18npool/Library_i18nsearch.mk index b55f8cdfe731..828ec2ba37ca 100644 --- a/i18npool/Library_i18nsearch.mk +++ b/i18npool/Library_i18nsearch.mk @@ -44,9 +44,10 @@ $(eval $(call gb_Library_use_libraries,i18nsearch,\ i18nregexp \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,i18nsearch)) + $(eval $(call gb_Library_add_exception_objects,i18nsearch,\ i18npool/source/search/levdis \ i18npool/source/search/textsearch \ diff --git a/i18npool/Library_index_data.mk b/i18npool/Library_index_data.mk index c5bf1f4004ac..79f1cd93a64b 100644 --- a/i18npool/Library_index_data.mk +++ b/i18npool/Library_index_data.mk @@ -30,9 +30,10 @@ $(eval $(call gb_Library_Library,index_data)) $(eval $(call gb_Library_use_libraries,index_data,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,index_data)) + $(eval $(call gb_Library_add_generated_exception_objects,index_data,\ $(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/indexentry/data/*.txt),\ CustomTarget/i18npool/indexentry/$(notdir $(basename $(txt)))) \ diff --git a/i18npool/Library_localedata_en.mk b/i18npool/Library_localedata_en.mk index 4cd77fc77448..a5cf7a780676 100644 --- a/i18npool/Library_localedata_en.mk +++ b/i18npool/Library_localedata_en.mk @@ -30,9 +30,10 @@ $(eval $(call gb_Library_Library,localedata_en)) $(eval $(call gb_Library_use_libraries,localedata_en,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,localedata_en)) + $(eval $(call gb_Library_add_generated_exception_objects,localedata_en,\ CustomTarget/i18npool/localedata/localedata_en_AU \ CustomTarget/i18npool/localedata/localedata_en_BZ \ diff --git a/i18npool/Library_localedata_es.mk b/i18npool/Library_localedata_es.mk index 145123225e2c..75ba17341a33 100644 --- a/i18npool/Library_localedata_es.mk +++ b/i18npool/Library_localedata_es.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_Library,localedata_es)) $(eval $(call gb_Library_use_libraries,localedata_es,\ localedata_en \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,localedata_es)) + $(eval $(call gb_Library_add_generated_exception_objects,localedata_es,\ CustomTarget/i18npool/localedata/localedata_es_AR \ CustomTarget/i18npool/localedata/localedata_es_BO \ diff --git a/i18npool/Library_localedata_euro.mk b/i18npool/Library_localedata_euro.mk index c1b4569d01d9..ad3ebc679071 100644 --- a/i18npool/Library_localedata_euro.mk +++ b/i18npool/Library_localedata_euro.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_Library,localedata_euro)) $(eval $(call gb_Library_use_libraries,localedata_euro,\ localedata_en \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,localedata_euro)) + $(eval $(call gb_Library_add_generated_exception_objects,localedata_euro,\ CustomTarget/i18npool/localedata/localedata_an_ES \ CustomTarget/i18npool/localedata/localedata_ast_ES \ diff --git a/i18npool/Library_localedata_others.mk b/i18npool/Library_localedata_others.mk index d331b8906506..b18593db55bf 100644 --- a/i18npool/Library_localedata_others.mk +++ b/i18npool/Library_localedata_others.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_Library,localedata_others)) $(eval $(call gb_Library_use_libraries,localedata_others,\ localedata_en \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,localedata_others)) + $(eval $(call gb_Library_add_generated_exception_objects,localedata_others,\ CustomTarget/i18npool/localedata/localedata_af_NA \ CustomTarget/i18npool/localedata/localedata_af_ZA \ diff --git a/i18npool/Library_textconv_dict.mk b/i18npool/Library_textconv_dict.mk index e274c549e850..a568534c0a97 100644 --- a/i18npool/Library_textconv_dict.mk +++ b/i18npool/Library_textconv_dict.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_sdk_api,textconv_dict)) $(eval $(call gb_Library_use_libraries,textconv_dict,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,textconv_dict)) + $(eval $(call gb_Library_add_generated_exception_objects,textconv_dict,\ $(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/textconversion/data/*.dic),\ CustomTarget/i18npool/textconversion/$(notdir $(basename $(txt)))) \ diff --git a/i18nutil/Library_i18nutil.mk b/i18nutil/Library_i18nutil.mk index b9cbbdcc151e..fab587956517 100644 --- a/i18nutil/Library_i18nutil.mk +++ b/i18nutil/Library_i18nutil.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_use_libraries,i18nutil,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,i18nutil)) + $(eval $(call gb_Library_add_exception_objects,i18nutil,\ i18nutil/source/utility/casefolding \ i18nutil/source/utility/oneToOneMapping \ diff --git a/idl/Executable_svidl.mk b/idl/Executable_svidl.mk index bdf0aa40e124..fdde856cd925 100644 --- a/idl/Executable_svidl.mk +++ b/idl/Executable_svidl.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Executable_use_libraries,svidl,\ tl \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,svidl)) + $(eval $(call gb_Executable_add_exception_objects,svidl,\ idl/source/cmptools/hash \ idl/source/cmptools/lex \ diff --git a/io/Library_acceptor.mk b/io/Library_acceptor.mk index a07da5d58765..f00e15bed383 100644 --- a/io/Library_acceptor.mk +++ b/io/Library_acceptor.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,acceptor,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,acceptor)) + $(eval $(call gb_Library_set_componentfile,acceptor,io/source/acceptor/acceptor)) $(eval $(call gb_Library_add_exception_objects,acceptor,\ diff --git a/io/Library_connector.mk b/io/Library_connector.mk index 2bbe7257e922..826b074507c3 100644 --- a/io/Library_connector.mk +++ b/io/Library_connector.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,connector,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,connector)) + $(eval $(call gb_Library_set_componentfile,connector,io/source/connector/connector)) $(eval $(call gb_Library_add_exception_objects,connector,\ diff --git a/io/Library_streams.mk b/io/Library_streams.mk index bb79154ff61a..8bf18f4db6d2 100644 --- a/io/Library_streams.mk +++ b/io/Library_streams.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,streams,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,streams)) + $(eval $(call gb_Library_set_componentfile,streams,io/source/stm/streams)) $(eval $(call gb_Library_add_exception_objects,streams,\ diff --git a/io/Library_textinstream.mk b/io/Library_textinstream.mk index b921a206792d..80ada3ef8d17 100644 --- a/io/Library_textinstream.mk +++ b/io/Library_textinstream.mk @@ -36,9 +36,10 @@ $(eval $(call gb_Library_use_libraries,textinstream,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,textinstream)) + $(eval $(call gb_Library_set_componentfile,textinstream,io/source/TextInputStream/textinstream)) $(eval $(call gb_Library_add_exception_objects,textinstream,\ diff --git a/io/Library_textoutstream.mk b/io/Library_textoutstream.mk index 17fe1ec591a3..b6b0ff2bf899 100644 --- a/io/Library_textoutstream.mk +++ b/io/Library_textoutstream.mk @@ -36,9 +36,10 @@ $(eval $(call gb_Library_use_libraries,textoutstream,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,textoutstream)) + $(eval $(call gb_Library_set_componentfile,textoutstream,io/source/TextOutputStream/textoutstream)) $(eval $(call gb_Library_add_exception_objects,textoutstream,\ diff --git a/javaunohelper/Library_juh.mk b/javaunohelper/Library_juh.mk index ecacfd9978d0..dd1644f4005a 100644 --- a/javaunohelper/Library_juh.mk +++ b/javaunohelper/Library_juh.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_internal_comprehensive_api,juh,\ $(eval $(call gb_Library_use_libraries,juh,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,juh)) + ifneq ($(DISABLE_DYNLOADING),TRUE) $(eval $(call gb_Library_add_exception_objects,juh,\ javaunohelper/source/preload \ diff --git a/javaunohelper/Library_juhx.mk b/javaunohelper/Library_juhx.mk index ce8ac747934e..eeef545357b7 100644 --- a/javaunohelper/Library_juhx.mk +++ b/javaunohelper/Library_juhx.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,juhx,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,juhx)) + $(eval $(call gb_Library_add_exception_objects,juhx,\ javaunohelper/source/bootstrap \ javaunohelper/source/javaunohelper \ diff --git a/jurt/Library_jpipe.mk b/jurt/Library_jpipe.mk index eb9656737b3a..3f50e7a34a8e 100644 --- a/jurt/Library_jpipe.mk +++ b/jurt/Library_jpipe.mk @@ -29,9 +29,10 @@ $(eval $(call gb_Library_Library,jpipe)) $(eval $(call gb_Library_use_libraries,jpipe,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,jpipe)) + ifeq ($(OS),WNT) # The real library is called jpipx on Windows. We build only a wrapper diff --git a/jurt/Library_jpipx.mk b/jurt/Library_jpipx.mk index c36dce20b949..14d91cb9b839 100644 --- a/jurt/Library_jpipx.mk +++ b/jurt/Library_jpipx.mk @@ -30,9 +30,10 @@ $(eval $(call gb_Library_Library,jpipx)) $(eval $(call gb_Library_use_libraries,jpipx,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,jpipx)) + $(eval $(call gb_Library_add_cobjects,jpipx,\ jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection \ )) diff --git a/jvmaccess/Library_jvmaccess.mk b/jvmaccess/Library_jvmaccess.mk index 2a957ee006ce..6e8578dd0147 100644 --- a/jvmaccess/Library_jvmaccess.mk +++ b/jvmaccess/Library_jvmaccess.mk @@ -46,9 +46,10 @@ $(eval $(call gb_Library_use_libraries,jvmaccess,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,jvmaccess)) + $(eval $(call gb_Library_add_exception_objects,jvmaccess,\ jvmaccess/source/classpath \ jvmaccess/source/unovirtualmachine \ diff --git a/jvmfwk/Executable_javaldx.mk b/jvmfwk/Executable_javaldx.mk index 177947cd0b15..aedb7dbc0b3a 100644 --- a/jvmfwk/Executable_javaldx.mk +++ b/jvmfwk/Executable_javaldx.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Executable_use_libraries,javaldx,\ jvmfwk \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,javaldx)) + $(eval $(call gb_Executable_add_exception_objects,javaldx,\ jvmfwk/plugins/sunmajor/javaenvsetup/javaldx \ )) diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk index c4a459728324..73a2e6bd5e5c 100644 --- a/jvmfwk/Library_jvmfwk.mk +++ b/jvmfwk/Library_jvmfwk.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,jvmfwk,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,jvmfwk)) + ifeq ($(OS),WNT) $(eval $(call gb_Library_use_libraries,jvmfwk,\ advapi32 \ diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk index 517892fa8e8e..e25d993fac2d 100644 --- a/jvmfwk/Library_sunjavaplugin.mk +++ b/jvmfwk/Library_sunjavaplugin.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,sunjavaplugin,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sunjavaplugin)) + ifeq ($(OS),ANDROID) $(eval $(call gb_Library_use_libraries,sunjavaplugin,\ lo-bootstrap \ diff --git a/l10ntools/Executable_ulfconv.mk b/l10ntools/Executable_ulfconv.mk index 7a92c2edd596..b981e56e2e59 100644 --- a/l10ntools/Executable_ulfconv.mk +++ b/l10ntools/Executable_ulfconv.mk @@ -12,9 +12,10 @@ $(eval $(call gb_Executable_Executable,ulfconv)) $(eval $(call gb_Executable_use_libraries,ulfconv,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,ulfconv)) + $(eval $(call gb_Executable_add_exception_objects,ulfconv,\ l10ntools/source/ulfconv/ulfconv \ )) diff --git a/lingucomponent/Library_MacOSXSpell.mk b/lingucomponent/Library_MacOSXSpell.mk index f3f37e2f7b69..57d5a65568d1 100644 --- a/lingucomponent/Library_MacOSXSpell.mk +++ b/lingucomponent/Library_MacOSXSpell.mk @@ -37,7 +37,6 @@ $(eval $(call gb_Library_set_include,MacOSXSpell,\ $(eval $(call gb_Library_use_sdk_api,MacOSXSpell)) $(eval $(call gb_Library_use_libraries,MacOSXSpell,\ - $(gb_STDLIBS) \ cppu \ cppuhelper \ lng \ @@ -48,6 +47,8 @@ $(eval $(call gb_Library_use_libraries,MacOSXSpell,\ utl \ )) +$(eval $(call gb_Library_add_standard_system_libs,MacOSXSpell)) + $(eval $(call gb_Library_use_externals,MacOSXSpell,\ cocoa \ hunspell \ diff --git a/lingucomponent/Library_guesslang.mk b/lingucomponent/Library_guesslang.mk index bfd8ffa7a805..73bfcb648061 100644 --- a/lingucomponent/Library_guesslang.mk +++ b/lingucomponent/Library_guesslang.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,guesslang,\ tl \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,guesslang)) + $(eval $(call gb_Library_use_externals,guesslang,\ libexttextcat \ )) diff --git a/lingucomponent/Library_hyphen.mk b/lingucomponent/Library_hyphen.mk index ce28dd9e9b67..ed316051e1ed 100644 --- a/lingucomponent/Library_hyphen.mk +++ b/lingucomponent/Library_hyphen.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,hyphen,\ tl \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,hyphen)) + $(eval $(call gb_Library_use_static_libraries,hyphen,\ ulingu \ )) diff --git a/lingucomponent/Library_lnth.mk b/lingucomponent/Library_lnth.mk index 96a57d04e246..98e2eeeed8db 100644 --- a/lingucomponent/Library_lnth.mk +++ b/lingucomponent/Library_lnth.mk @@ -46,9 +46,10 @@ $(eval $(call gb_Library_use_libraries,lnth,\ tl \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,lnth)) + $(eval $(call gb_Library_use_static_libraries,lnth,\ ulingu \ )) diff --git a/lingucomponent/Library_spell.mk b/lingucomponent/Library_spell.mk index 2868b3e0d8ce..5b8d7b142d0b 100644 --- a/lingucomponent/Library_spell.mk +++ b/lingucomponent/Library_spell.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,spell,\ tl \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,spell)) + $(eval $(call gb_Library_use_static_libraries,spell,\ ulingu \ )) diff --git a/linguistic/Library_lng.mk b/linguistic/Library_lng.mk index 3e9900ba0f21..bf26844f67dc 100644 --- a/linguistic/Library_lng.mk +++ b/linguistic/Library_lng.mk @@ -56,9 +56,10 @@ $(eval $(call gb_Library_use_libraries,lng,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,lng)) + $(eval $(call gb_Library_use_external,lng,icuuc)) $(eval $(call gb_Library_add_exception_objects,lng,\ diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk index c96fbbcf148c..6f4b3b62ff73 100644 --- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk +++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk @@ -43,9 +43,10 @@ $(eval $(call gb_CppunitTest_use_libraries,lotuswordpro_test_lotuswordpro, \ unotest \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,lotuswordpro_test_lotuswordpro)) + $(eval $(call gb_CppunitTest_use_api,lotuswordpro_test_lotuswordpro,\ offapi \ udkapi \ diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk index 676446b8fe42..4620f6c819c2 100644 --- a/lotuswordpro/Library_lwpft.mk +++ b/lotuswordpro/Library_lwpft.mk @@ -47,9 +47,10 @@ $(eval $(call gb_Library_use_libraries,lwpft,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,lwpft)) + ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Library_use_externals,lwpft,\ icuin \ diff --git a/o3tl/CppunitTest_o3tl_tests.mk b/o3tl/CppunitTest_o3tl_tests.mk index 30de08e70d06..eed591bfdc81 100644 --- a/o3tl/CppunitTest_o3tl_tests.mk +++ b/o3tl/CppunitTest_o3tl_tests.mk @@ -33,9 +33,10 @@ $(eval $(call gb_CppunitTest_use_package,o3tl_tests,o3tl_inc)) $(eval $(call gb_CppunitTest_use_libraries,o3tl_tests,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,o3tl_tests)) + $(eval $(call gb_CppunitTest_add_exception_objects,o3tl_tests,\ o3tl/qa/cow_wrapper_clients \ o3tl/qa/test-cow_wrapper \ diff --git a/officecfg/CppunitTest_officecfg_cppheader_test.mk b/officecfg/CppunitTest_officecfg_cppheader_test.mk index af41d6fdceb1..47c14a001172 100644 --- a/officecfg/CppunitTest_officecfg_cppheader_test.mk +++ b/officecfg/CppunitTest_officecfg_cppheader_test.mk @@ -31,9 +31,10 @@ $(eval $(call gb_CppunitTest_CppunitTest,officecfg_cppheader_test)) $(eval $(call gb_CppunitTest_use_libraries,officecfg_cppheader_test,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,officecfg_cppheader_test)) + $(eval $(call gb_CppunitTest_add_exception_objects,officecfg_cppheader_test, \ officecfg/qa/cppheader \ )) diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index 56443e46671a..d97fa4aac2ac 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -76,9 +76,10 @@ $(eval $(call gb_Library_use_libraries,oox,\ xo \ xmlscript \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,oox)) + $(eval $(call gb_Library_use_external,oox,openssl)) $(eval $(call gb_Library_set_componentfile,oox,oox/util/oox)) diff --git a/package/Library_package2.mk b/package/Library_package2.mk index a453af4a9a5b..c56a1863fa6c 100644 --- a/package/Library_package2.mk +++ b/package/Library_package2.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,package2,\ sax \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,package2)) + $(eval $(call gb_Library_use_externals,package2,\ zlib \ )) diff --git a/package/Library_xstor.mk b/package/Library_xstor.mk index 15c2cb47dd98..498f35d0fe8b 100644 --- a/package/Library_xstor.mk +++ b/package/Library_xstor.mk @@ -43,9 +43,10 @@ $(eval $(call gb_Library_use_libraries,xstor,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,xstor)) + $(eval $(call gb_Library_add_exception_objects,xstor,\ package/source/xstor/disposelistener \ package/source/xstor/ocompinstream \ diff --git a/padmin/Executable_spadmin.bin.mk b/padmin/Executable_spadmin.bin.mk index 3bcf1989c3bc..d699894b33fd 100644 --- a/padmin/Executable_spadmin.bin.mk +++ b/padmin/Executable_spadmin.bin.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Executable_use_libraries,spadmin.bin,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,spadmin.bin)) + $(eval $(call gb_Executable_add_exception_objects,spadmin.bin,\ padmin/source/desktopcontext \ padmin/source/pamain \ diff --git a/padmin/Library_spa.mk b/padmin/Library_spa.mk index 6ee2ef230ae6..1db89d5f6ce8 100644 --- a/padmin/Library_spa.mk +++ b/padmin/Library_spa.mk @@ -36,9 +36,10 @@ $(eval $(call gb_Library_use_libraries,spa,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,spa)) + $(eval $(call gb_Library_add_exception_objects,spa,\ padmin/source/adddlg \ diff --git a/regexp/Library_regexp.mk b/regexp/Library_regexp.mk index 1b3b73197f8f..0b3e6021d138 100644 --- a/regexp/Library_regexp.mk +++ b/regexp/Library_regexp.mk @@ -40,9 +40,10 @@ $(eval $(call gb_Library_use_libraries,i18nregexp,\ sal \ i18nutil \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,i18nregexp)) + $(eval $(call gb_Library_add_exception_objects,i18nregexp,\ regexp/source/reclass \ )) diff --git a/registry/Library_reg.mk b/registry/Library_reg.mk index 2701c472dfd2..c6b1cd96fae1 100644 --- a/registry/Library_reg.mk +++ b/registry/Library_reg.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,reg,\ sal \ store \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,reg)) + $(eval $(call gb_Library_add_exception_objects,reg,\ registry/source/keyimpl \ registry/source/reflread \ diff --git a/remotebridges/Library_uuresolver.mk b/remotebridges/Library_uuresolver.mk index d8079bac6860..cf8c0083d5c5 100644 --- a/remotebridges/Library_uuresolver.mk +++ b/remotebridges/Library_uuresolver.mk @@ -36,9 +36,10 @@ $(eval $(call gb_Library_use_libraries,uuresolver,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,uuresolver)) + $(eval $(call gb_Library_add_exception_objects,uuresolver,\ remotebridges/source/unourl_resolver/unourl_resolver \ )) diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk index 300874c586d0..deb1b13bf9b6 100644 --- a/reportdesign/Library_rpt.mk +++ b/reportdesign/Library_rpt.mk @@ -60,9 +60,10 @@ $(eval $(call gb_Library_use_libraries,rpt,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,rpt)) + $(eval $(call gb_Library_set_componentfile,rpt,reportdesign/util/rpt)) $(eval $(call gb_Library_add_exception_objects,rpt,\ diff --git a/reportdesign/Library_rptui.mk b/reportdesign/Library_rptui.mk index 4949dea74ea2..7e5d9f197fdf 100644 --- a/reportdesign/Library_rptui.mk +++ b/reportdesign/Library_rptui.mk @@ -60,9 +60,10 @@ $(eval $(call gb_Library_use_libraries,rptui,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,rptui)) + $(eval $(call gb_Library_set_componentfile,rptui,reportdesign/util/rptui)) $(eval $(call gb_Library_add_exception_objects,rptui,\ diff --git a/reportdesign/Library_rptxml.mk b/reportdesign/Library_rptxml.mk index c1ee286f9d65..b0fc1bacc198 100644 --- a/reportdesign/Library_rptxml.mk +++ b/reportdesign/Library_rptxml.mk @@ -54,9 +54,10 @@ $(eval $(call gb_Library_use_libraries,rptxml,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,rptxml)) + $(eval $(call gb_Library_set_componentfile,rptxml,reportdesign/util/rptxml)) $(eval $(call gb_Library_add_exception_objects,rptxml,\ diff --git a/rsc/Executable_rsc.mk b/rsc/Executable_rsc.mk index 25af0b595ea1..3dd0feca4add 100644 --- a/rsc/Executable_rsc.mk +++ b/rsc/Executable_rsc.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Executable_use_libraries,rsc,\ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,rsc)) + $(eval $(call gb_Executable_add_grammars,rsc,\ rsc/source/parser/rscyacc \ )) diff --git a/sal/CppunitTest_Module_DLL.mk b/sal/CppunitTest_Module_DLL.mk index d2f5079723e3..fe58e255a2df 100644 --- a/sal/CppunitTest_Module_DLL.mk +++ b/sal/CppunitTest_Module_DLL.mk @@ -37,7 +37,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,Module_DLL,\ $(eval $(call gb_CppunitTest_use_libraries,Module_DLL,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,Module_DLL)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_bytesequence.mk b/sal/CppunitTest_sal_bytesequence.mk index cdb62c7e4334..222f77a7b53c 100644 --- a/sal/CppunitTest_sal_bytesequence.mk +++ b/sal/CppunitTest_sal_bytesequence.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_bytesequence,\ $(eval $(call gb_CppunitTest_use_libraries,sal_bytesequence,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_bytesequence)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_checkapi.mk b/sal/CppunitTest_sal_checkapi.mk index 8b7ca18c9339..b61a739dbe2c 100644 --- a/sal/CppunitTest_sal_checkapi.mk +++ b/sal/CppunitTest_sal_checkapi.mk @@ -45,7 +45,8 @@ $(call gb_CxxObject_get_target,sal/qa/checkapi/strings) :| \ $(eval $(call gb_CppunitTest_use_libraries,sal_checkapi,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_checkapi)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_condition.mk b/sal/CppunitTest_sal_osl_condition.mk index 4c90de256844..0dad649efa4c 100644 --- a/sal/CppunitTest_sal_osl_condition.mk +++ b/sal/CppunitTest_sal_osl_condition.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_condition,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_condition,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_condition)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_file.mk b/sal/CppunitTest_sal_osl_file.mk index dfd5d592f999..ea64e55daca7 100644 --- a/sal/CppunitTest_sal_osl_file.mk +++ b/sal/CppunitTest_sal_osl_file.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_file,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_file,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_file)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk b/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk index 199f94cc3fc1..af121a42f62e 100644 --- a/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk +++ b/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_getsystempathfromfile $(eval $(call gb_CppunitTest_use_libraries,sal_osl_getsystempathfromfileurl,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_getsystempathfromfileurl)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_module.mk b/sal/CppunitTest_sal_osl_module.mk index 7b75f8a3e0fc..93a24b4fdd8d 100644 --- a/sal/CppunitTest_sal_osl_module.mk +++ b/sal/CppunitTest_sal_osl_module.mk @@ -38,7 +38,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_module,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_module,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_module)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_mutex.mk b/sal/CppunitTest_sal_osl_mutex.mk index 131761d1d078..7768b1e5ce99 100644 --- a/sal/CppunitTest_sal_osl_mutex.mk +++ b/sal/CppunitTest_sal_osl_mutex.mk @@ -35,7 +35,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_mutex, \ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_mutex, \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_mutex)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_old_test_file.mk b/sal/CppunitTest_sal_osl_old_test_file.mk index 3828b7784b9a..3b9040c2f519 100644 --- a/sal/CppunitTest_sal_osl_old_test_file.mk +++ b/sal/CppunitTest_sal_osl_old_test_file.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_old_test_file,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_old_test_file,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_old_test_file)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_pipe.mk b/sal/CppunitTest_sal_osl_pipe.mk index 4aa70952531b..a71937b15342 100644 --- a/sal/CppunitTest_sal_osl_pipe.mk +++ b/sal/CppunitTest_sal_osl_pipe.mk @@ -36,7 +36,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_pipe, \ sal \ unotest \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_pipe)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_process.mk b/sal/CppunitTest_sal_osl_process.mk index 6a53add92dae..4ee7e3f6eba6 100644 --- a/sal/CppunitTest_sal_osl_process.mk +++ b/sal/CppunitTest_sal_osl_process.mk @@ -20,7 +20,9 @@ # For minor contributions see the git repository. # # Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +#se_libraries,sal_osl_process,\ + sal \ + $(g either the GNU General Public License Version 3 or later (the "GPLv3+"), or # the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. @@ -34,9 +36,10 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_process,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_process,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_process)) + # Depend on to be tested executable $(call gb_CppunitTest_get_target,sal_osl_process) : \ $(call gb_Executable_get_target,osl_process_child) diff --git a/sal/CppunitTest_sal_osl_profile.mk b/sal/CppunitTest_sal_osl_profile.mk index 1195b7d55eb1..87d587f6632f 100644 --- a/sal/CppunitTest_sal_osl_profile.mk +++ b/sal/CppunitTest_sal_osl_profile.mk @@ -35,7 +35,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_profile, \ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_profile, \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_profile)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_security.mk b/sal/CppunitTest_sal_osl_security.mk index a583b7c423dc..edb6a96ed88c 100644 --- a/sal/CppunitTest_sal_osl_security.mk +++ b/sal/CppunitTest_sal_osl_security.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_security,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_security,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_security)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_setthreadname.mk b/sal/CppunitTest_sal_osl_setthreadname.mk index 6d6f8df52238..f7024cae6f07 100644 --- a/sal/CppunitTest_sal_osl_setthreadname.mk +++ b/sal/CppunitTest_sal_osl_setthreadname.mk @@ -35,7 +35,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_setthreadname, \ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_setthreadname, \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_setthreadname)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_thread.mk b/sal/CppunitTest_sal_osl_thread.mk index b014c83e46ba..6feb7d59b584 100644 --- a/sal/CppunitTest_sal_osl_thread.mk +++ b/sal/CppunitTest_sal_osl_thread.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_thread,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_thread,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_thread)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_alloc.mk b/sal/CppunitTest_sal_rtl_alloc.mk index e6a52823b2a9..83405ab0a8b6 100644 --- a/sal/CppunitTest_sal_rtl_alloc.mk +++ b/sal/CppunitTest_sal_rtl_alloc.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_alloc,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_alloc,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_alloc)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_cipher.mk b/sal/CppunitTest_sal_rtl_cipher.mk index 78cca6b7b39a..ce2cc1da5a19 100644 --- a/sal/CppunitTest_sal_rtl_cipher.mk +++ b/sal/CppunitTest_sal_rtl_cipher.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_cipher,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_cipher,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_cipher)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_crc32.mk b/sal/CppunitTest_sal_rtl_crc32.mk index 1c5b6d19c71d..1a2390f5fd2e 100644 --- a/sal/CppunitTest_sal_rtl_crc32.mk +++ b/sal/CppunitTest_sal_rtl_crc32.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_crc32,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_crc32,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_crc32)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_doublelock.mk b/sal/CppunitTest_sal_rtl_doublelock.mk index 9c11d796de49..e4fd8f2bf4b4 100644 --- a/sal/CppunitTest_sal_rtl_doublelock.mk +++ b/sal/CppunitTest_sal_rtl_doublelock.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_doublelock,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_doublelock,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_doublelock)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_locale.mk b/sal/CppunitTest_sal_rtl_locale.mk index 613251ef6c13..ce1f0ab9ce1c 100644 --- a/sal/CppunitTest_sal_rtl_locale.mk +++ b/sal/CppunitTest_sal_rtl_locale.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_locale,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_locale,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_locale)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_math.mk b/sal/CppunitTest_sal_rtl_math.mk index df570a552b0d..c502ab226659 100644 --- a/sal/CppunitTest_sal_rtl_math.mk +++ b/sal/CppunitTest_sal_rtl_math.mk @@ -35,7 +35,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_math, \ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_math, \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_math)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_ostringbuffer.mk b/sal/CppunitTest_sal_rtl_ostringbuffer.mk index f0ea74c7ca97..8c38783b7a93 100644 --- a/sal/CppunitTest_sal_rtl_ostringbuffer.mk +++ b/sal/CppunitTest_sal_rtl_ostringbuffer.mk @@ -35,7 +35,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_ostringbuffer,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_ostringbuffer,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_ostringbuffer)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_oustringbuffer.mk b/sal/CppunitTest_sal_rtl_oustringbuffer.mk index f2384f709cdc..bb316eeda619 100644 --- a/sal/CppunitTest_sal_rtl_oustringbuffer.mk +++ b/sal/CppunitTest_sal_rtl_oustringbuffer.mk @@ -38,7 +38,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_oustringbuffer,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_oustringbuffer,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_oustringbuffer)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_strings.mk b/sal/CppunitTest_sal_rtl_strings.mk index bdab2fb48987..67299a3ab9d2 100644 --- a/sal/CppunitTest_sal_rtl_strings.mk +++ b/sal/CppunitTest_sal_rtl_strings.mk @@ -41,9 +41,10 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_strings,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_strings,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_strings)) + # The test uses O(U)String capabilities that dlopen this lib ifneq ($(OS),ANDROID) # Except that on Android we don't build it separately diff --git a/sal/CppunitTest_sal_rtl_uri.mk b/sal/CppunitTest_sal_rtl_uri.mk index 69e701b794ab..67ce1eab2732 100644 --- a/sal/CppunitTest_sal_rtl_uri.mk +++ b/sal/CppunitTest_sal_rtl_uri.mk @@ -23,9 +23,10 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_uri,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_uri,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_uri)) + # The test uses O(U)String capabilities that dlopen this lib ifneq ($(OS),ANDROID) # Except that on Android we don't build it separately diff --git a/sal/CppunitTest_sal_rtl_uuid.mk b/sal/CppunitTest_sal_rtl_uuid.mk index 8be994595e1f..74ea9e057f6c 100644 --- a/sal/CppunitTest_sal_rtl_uuid.mk +++ b/sal/CppunitTest_sal_rtl_uuid.mk @@ -22,7 +22,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_uuid,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_uuid,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_uuid)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_tcwf.mk b/sal/CppunitTest_sal_tcwf.mk index 7efbad135f36..fd202e2adec8 100644 --- a/sal/CppunitTest_sal_tcwf.mk +++ b/sal/CppunitTest_sal_tcwf.mk @@ -35,7 +35,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_tcwf,\ $(eval $(call gb_CppunitTest_use_libraries,sal_tcwf,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_tcwf)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_types.mk b/sal/CppunitTest_sal_types.mk index 720f5ee3cf0b..942e8f318c35 100644 --- a/sal/CppunitTest_sal_types.mk +++ b/sal/CppunitTest_sal_types.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_types,\ $(eval $(call gb_CppunitTest_use_libraries,sal_types,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_types)) + # vim: set noet sw=4 ts=4: diff --git a/sal/Executable_cppunittester.mk b/sal/Executable_cppunittester.mk index c8d8f4756222..9cf275e91476 100644 --- a/sal/Executable_cppunittester.mk +++ b/sal/Executable_cppunittester.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_set_include,cppunit/cppunittester,\ $(eval $(call gb_Executable_use_libraries,cppunit/cppunittester,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,cppunit/cppunittester)) + $(eval $(call gb_Executable_use_external,cppunit/cppunittester,cppunit)) $(eval $(call gb_Executable_add_exception_objects,cppunit/cppunittester,\ diff --git a/sal/Executable_osl_process_child.mk b/sal/Executable_osl_process_child.mk index d43400d6d86f..3f3cce24c160 100644 --- a/sal/Executable_osl_process_child.mk +++ b/sal/Executable_osl_process_child.mk @@ -32,9 +32,10 @@ $(eval $(call gb_Executable_Executable,osl_process_child)) $(eval $(call gb_Executable_use_libraries,osl_process_child,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,osl_process_child)) + $(eval $(call gb_Executable_add_exception_objects,osl_process_child,\ sal/qa/osl/process/osl_process_child \ )) diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index 653aa0bdafad..f5b3b3d4e689 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -82,9 +82,10 @@ $(eval $(call gb_Library_use_libraries,sal,\ lo-bootstrap \ ) \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sal)) + ifeq ($(OS),MACOSX) $(eval $(call gb_Library_use_externals,sal,\ carbon \ diff --git a/sal/Library_sal_textenc.mk b/sal/Library_sal_textenc.mk index 94f69911cebc..c50fa94ce6e4 100644 --- a/sal/Library_sal_textenc.mk +++ b/sal/Library_sal_textenc.mk @@ -30,9 +30,10 @@ $(eval $(call gb_Library_Library,sal_textenc)) $(eval $(call gb_Library_use_libraries,sal_textenc,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sal_textenc)) + $(eval $(call gb_Library_add_defs,sal_textenc,\ $(LFS_CFLAGS) \ )) diff --git a/sal/Library_uwinapi.mk b/sal/Library_uwinapi.mk index aa06e116f93a..c5356c9f00d0 100644 --- a/sal/Library_uwinapi.mk +++ b/sal/Library_uwinapi.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Library_use_libraries,uwinapi,\ user32 \ version \ ) \ - $(filter-out uwinapi,$(gb_STDLIBS)) \ )) +$(eval $(call gb_Library_add_standard_system_libs,uwinapi)) + $(eval $(call gb_Library_add_defs,uwinapi,\ $(if $(filter $(COM),GCC), \ -Wno-unused-parameter -Wno-return-type) \ diff --git a/salhelper/CppunitTest_salhelper_checkapi.mk b/salhelper/CppunitTest_salhelper_checkapi.mk index 6ebc52ef5b19..fb2361db4fa4 100644 --- a/salhelper/CppunitTest_salhelper_checkapi.mk +++ b/salhelper/CppunitTest_salhelper_checkapi.mk @@ -45,7 +45,8 @@ $(call gb_CxxObject_get_target,salhelper/qa/checkapi/strings) :| \ $(eval $(call gb_CppunitTest_use_libraries,salhelper_checkapi,\ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,salhelper_checkapi)) + # vim: set noet sw=4 ts=4: diff --git a/salhelper/Library_salhelper.mk b/salhelper/Library_salhelper.mk index 2787529cf2ae..b416cc82c589 100644 --- a/salhelper/Library_salhelper.mk +++ b/salhelper/Library_salhelper.mk @@ -36,9 +36,10 @@ $(eval $(call gb_Library_add_defs,salhelper,\ $(eval $(call gb_Library_use_libraries,salhelper,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,salhelper)) + $(eval $(call gb_Library_add_exception_objects,salhelper,\ salhelper/source/condition \ salhelper/source/dynload \ diff --git a/sax/CppunitTest_sax.mk b/sax/CppunitTest_sax.mk index 0e889e2418b1..3cfa8cacfdd5 100644 --- a/sax/CppunitTest_sax.mk +++ b/sax/CppunitTest_sax.mk @@ -20,9 +20,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sax_cpputest, \ comphelper \ cppu \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sax_cpputest)) + $(eval $(call gb_CppunitTest_add_exception_objects,sax_cpputest, \ sax/qa/cppunit/test_converter \ )) diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk index 6007467b11cc..e7028b450435 100644 --- a/sax/Library_expwrap.mk +++ b/sax/Library_expwrap.mk @@ -27,9 +27,10 @@ $(eval $(call gb_Library_use_libraries,expwrap,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,expwrap)) + $(eval $(call gb_Library_use_static_libraries,expwrap,\ sax_shared \ )) diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk index b28b653e4bfd..d7465316c1c3 100644 --- a/sax/Library_fastsax.mk +++ b/sax/Library_fastsax.mk @@ -29,9 +29,10 @@ $(eval $(call gb_Library_use_libraries,fastsax,\ sal \ sax \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fastsax)) + $(eval $(call gb_Library_use_static_libraries,fastsax,\ sax_shared \ )) diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk index 4c72db00051b..93cd25c66e62 100644 --- a/sax/Library_sax.mk +++ b/sax/Library_sax.mk @@ -26,9 +26,10 @@ $(eval $(call gb_Library_use_libraries,sax,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sax)) + $(eval $(call gb_Library_add_defs,sax,\ -DSAX_DLLIMPLEMENTATION \ )) diff --git a/sc/CppunitTest_sc_annotationshapeobj.mk b/sc/CppunitTest_sc_annotationshapeobj.mk index a33164371afe..b6bdef73cddb 100644 --- a/sc/CppunitTest_sc_annotationshapeobj.mk +++ b/sc/CppunitTest_sc_annotationshapeobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_annonationshapeobj, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_annonationshapeobj)) + $(eval $(call gb_CppunitTest_set_include,sc_annonationshapeobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk index c91923061d58..195dea16e5d0 100644 --- a/sc/CppunitTest_sc_cellrangeobj.mk +++ b/sc/CppunitTest_sc_cellrangeobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_cellrangesbase, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_cellrangesbase)) + $(eval $(call gb_CppunitTest_set_include,sc_cellrangesbase,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk index c7fbb6731750..4eeb3645c745 100644 --- a/sc/CppunitTest_sc_chart_regression_test.mk +++ b/sc/CppunitTest_sc_chart_regression_test.mk @@ -66,9 +66,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_chart_regression_test, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_chart_regression_test)) + $(eval $(call gb_CppunitTest_set_include,sc_chart_regression_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk index b7d1fb6be404..b09b0318b1da 100644 --- a/sc/CppunitTest_sc_databaserangeobj.mk +++ b/sc/CppunitTest_sc_databaserangeobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_databaserangeobj, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_databaserangeobj)) + $(eval $(call gb_CppunitTest_set_include,sc_databaserangeobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk index f0788fb0fd6b..f8988749dbb0 100644 --- a/sc/CppunitTest_sc_datapilotfieldobj.mk +++ b/sc/CppunitTest_sc_datapilotfieldobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datapilotfieldobj, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_datapilotfieldobj)) + $(eval $(call gb_CppunitTest_set_include,sc_datapilotfieldobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk index 1636112f43b0..31832f2364ab 100644 --- a/sc/CppunitTest_sc_datapilottableobj.mk +++ b/sc/CppunitTest_sc_datapilottableobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datapilottableobj, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_datapilottableobj)) + $(eval $(call gb_CppunitTest_set_include,sc_datapilottableobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_editfieldobj_cell.mk b/sc/CppunitTest_sc_editfieldobj_cell.mk index 6e5fa7076955..1826fb887bd5 100644 --- a/sc/CppunitTest_sc_editfieldobj_cell.mk +++ b/sc/CppunitTest_sc_editfieldobj_cell.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_cell, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_editfieldobj_cell)) + $(eval $(call gb_CppunitTest_set_include,sc_editfieldobj_cell,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_editfieldobj_header.mk b/sc/CppunitTest_sc_editfieldobj_header.mk index 7b47240e0138..009aa66f1fb8 100644 --- a/sc/CppunitTest_sc_editfieldobj_header.mk +++ b/sc/CppunitTest_sc_editfieldobj_header.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_header, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_editfieldobj_header)) + $(eval $(call gb_CppunitTest_set_include,sc_editfieldobj_header,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk index c61b4a2fbbf6..09df0f2a96b5 100644 --- a/sc/CppunitTest_sc_filters_test.mk +++ b/sc/CppunitTest_sc_filters_test.mk @@ -78,9 +78,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_filters_test, \ lo-bootstrap \ ) \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_filters_test)) + $(eval $(call gb_CppunitTest_set_include,sc_filters_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk index a24f391b9c09..3fc1b7c77df6 100644 --- a/sc/CppunitTest_sc_macros_test.mk +++ b/sc/CppunitTest_sc_macros_test.mk @@ -66,9 +66,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_macros_test, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_macros_test)) + $(eval $(call gb_CppunitTest_set_include,sc_macros_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_modelobj.mk b/sc/CppunitTest_sc_modelobj.mk index 42a48f870730..cb8f0a53cf9d 100644 --- a/sc/CppunitTest_sc_modelobj.mk +++ b/sc/CppunitTest_sc_modelobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_modelobj, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_modelobj)) + $(eval $(call gb_CppunitTest_set_include,sc_modelobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk index ff9ad582d92e..9d30c411f359 100644 --- a/sc/CppunitTest_sc_namedrangeobj.mk +++ b/sc/CppunitTest_sc_namedrangeobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangeobj, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_namedrangeobj)) + $(eval $(call gb_CppunitTest_set_include,sc_namedrangeobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk index 192bbbd70c08..893abdf5ea9a 100644 --- a/sc/CppunitTest_sc_namedrangesobj.mk +++ b/sc/CppunitTest_sc_namedrangesobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangesobj, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_namedrangesobj)) + $(eval $(call gb_CppunitTest_set_include,sc_namedrangesobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_rangelst_test.mk b/sc/CppunitTest_sc_rangelst_test.mk index 6933c2583da0..9bd621db1f74 100644 --- a/sc/CppunitTest_sc_rangelst_test.mk +++ b/sc/CppunitTest_sc_rangelst_test.mk @@ -66,9 +66,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_rangelst_test, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_rangelst_test)) + $(eval $(call gb_CppunitTest_set_include,sc_rangelst_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk index 982ec6e4b35a..2f5dd35a7ae1 100644 --- a/sc/CppunitTest_sc_subsequent_filters_test.mk +++ b/sc/CppunitTest_sc_subsequent_filters_test.mk @@ -72,9 +72,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_filters_test, \ lo-bootstrap \ ) \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_subsequent_filters_test)) + $(eval $(call gb_CppunitTest_set_include,sc_subsequent_filters_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk index b72bb005305f..e526b1750618 100644 --- a/sc/CppunitTest_sc_tableautoformatfield.mk +++ b/sc/CppunitTest_sc_tableautoformatfield.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_tableautoformatfield, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_tableautoformatfield)) + $(eval $(call gb_CppunitTest_set_include,sc_tableautoformatfield,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk index 2bacb8f2725c..0c9220419fd0 100644 --- a/sc/CppunitTest_sc_tablesheetobj.mk +++ b/sc/CppunitTest_sc_tablesheetobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_spreadsheetobj, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_spreadsheetobj)) + $(eval $(call gb_CppunitTest_set_include,sc_spreadsheetobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk index c7b7fcd827cf..2f9cb97fd71d 100644 --- a/sc/CppunitTest_sc_tablesheetsobj.mk +++ b/sc/CppunitTest_sc_tablesheetsobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_spreadsheetsobj, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_spreadsheetsobj)) + $(eval $(call gb_CppunitTest_set_include,sc_spreadsheetsobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk index 3948bcfb04ec..24cc9b7e50c7 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -77,9 +77,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_ucalc, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_ucalc)) + $(eval $(call gb_CppunitTest_set_include,sc_ucalc,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/source/core/inc \ diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index 96cb69132a70..ed74a69202b6 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -84,9 +84,10 @@ $(eval $(call gb_Library_use_libraries,sc,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sc)) + $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/core/data/attarray \ sc/source/core/data/attrib \ diff --git a/sc/Library_scd.mk b/sc/Library_scd.mk index 4c39cf1f40d3..b22f0c0eaca1 100644 --- a/sc/Library_scd.mk +++ b/sc/Library_scd.mk @@ -44,9 +44,10 @@ $(eval $(call gb_Library_use_libraries,scd,\ ucbhelper \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,scd)) + $(eval $(call gb_Library_add_exception_objects,scd,\ sc/source/ui/unoobj/detreg \ sc/source/ui/unoobj/scdetect \ diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk index d38d40b97027..8a8e6fe0d183 100644 --- a/sc/Library_scfilt.mk +++ b/sc/Library_scfilt.mk @@ -61,9 +61,10 @@ $(eval $(call gb_Library_use_libraries,scfilt,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,scfilt)) + $(eval $(call gb_Library_use_externals,scfilt,\ orcus \ )) diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk index 7f94c6193f5e..86f7f8c4d0f8 100644 --- a/sc/Library_scui.mk +++ b/sc/Library_scui.mk @@ -54,9 +54,10 @@ $(eval $(call gb_Library_use_libraries,scui,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,scui)) + $(eval $(call gb_Library_add_exception_objects,scui,\ sc/source/ui/attrdlg/attrdlg \ sc/source/ui/attrdlg/scdlgfact \ diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk index 30eb16d059ff..e0e71a0da812 100644 --- a/sc/Library_vbaobj.mk +++ b/sc/Library_vbaobj.mk @@ -59,9 +59,10 @@ $(eval $(call gb_Library_use_libraries,vbaobj,\ vbahelper \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vbaobj)) + $(eval $(call gb_Library_add_exception_objects,vbaobj,\ sc/source/ui/vba/excelvbahelper \ sc/source/ui/vba/service \ diff --git a/scaddins/Library_analysis.mk b/scaddins/Library_analysis.mk index e1fe08c217b5..78b7bea0676c 100644 --- a/scaddins/Library_analysis.mk +++ b/scaddins/Library_analysis.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,analysis,\ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,analysis)) + $(eval $(call gb_Library_add_exception_objects,analysis,\ scaddins/source/analysis/analysis \ scaddins/source/analysis/analysishelper \ diff --git a/scaddins/Library_date.mk b/scaddins/Library_date.mk index f224c80f7a8a..d5db83125da3 100644 --- a/scaddins/Library_date.mk +++ b/scaddins/Library_date.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,date,\ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,date)) + $(eval $(call gb_Library_add_exception_objects,date,\ scaddins/source/datefunc/datefunc \ )) diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk index 42a4fa3d72e8..013855cbd344 100644 --- a/sccomp/Library_solver.mk +++ b/sccomp/Library_solver.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,solver,\ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,solver)) + $(eval $(call gb_Library_use_external,solver,lpsolve55)) $(eval $(call gb_Library_add_exception_objects,solver,\ diff --git a/scripting/Library_basprov.mk b/scripting/Library_basprov.mk index 5debc0acd8e5..8941931b7ee4 100644 --- a/scripting/Library_basprov.mk +++ b/scripting/Library_basprov.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Library_use_libraries,basprov,\ ucbhelper \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,basprov)) + $(eval $(call gb_Library_add_exception_objects,basprov,\ scripting/source/basprov/baslibnode \ scripting/source/basprov/basmethnode \ diff --git a/scripting/Library_dlgprov.mk b/scripting/Library_dlgprov.mk index c9e3b2140e94..6ffb4fe0d029 100644 --- a/scripting/Library_dlgprov.mk +++ b/scripting/Library_dlgprov.mk @@ -54,9 +54,10 @@ $(eval $(call gb_Library_use_libraries,dlgprov,\ vcl \ xmlscript \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dlgprov)) + $(eval $(call gb_Library_add_exception_objects,dlgprov,\ scripting/source/dlgprov/DialogModelProvider \ scripting/source/dlgprov/dlgevtatt \ diff --git a/scripting/Library_protocolhandler.mk b/scripting/Library_protocolhandler.mk index d99f60fd4fe1..a9ca47acfd26 100644 --- a/scripting/Library_protocolhandler.mk +++ b/scripting/Library_protocolhandler.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,protocolhandler,\ sfx \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,protocolhandler)) + $(eval $(call gb_Library_add_exception_objects,protocolhandler,\ scripting/source/protocolhandler/scripthandler \ )) diff --git a/scripting/Library_scriptframe.mk b/scripting/Library_scriptframe.mk index 86d6a05bc894..025c5952cd8d 100644 --- a/scripting/Library_scriptframe.mk +++ b/scripting/Library_scriptframe.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,scriptframe,\ tl \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,scriptframe)) + $(eval $(call gb_Library_add_exception_objects,scriptframe,\ scripting/source/provider/ActiveMSPList \ scripting/source/provider/BrowseNodeFactoryImpl \ diff --git a/scripting/Library_stringresource.mk b/scripting/Library_stringresource.mk index eeb11a1c8668..3ec938c4cb52 100644 --- a/scripting/Library_stringresource.mk +++ b/scripting/Library_stringresource.mk @@ -43,9 +43,10 @@ $(eval $(call gb_Library_use_libraries,stringresource,\ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,stringresource)) + $(eval $(call gb_Library_add_exception_objects,stringresource,\ scripting/source/stringresource/stringresource \ )) diff --git a/scripting/Library_vbaevents.mk b/scripting/Library_vbaevents.mk index 45c35ff163ac..e469d786e4e0 100644 --- a/scripting/Library_vbaevents.mk +++ b/scripting/Library_vbaevents.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,vbaevents,\ sb \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vbaevents)) + $(eval $(call gb_Library_add_exception_objects,vbaevents,\ scripting/source/vbaevents/eventhelper \ scripting/source/vbaevents/service \ diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk index 99a19042cb21..1d9f6fb297ce 100644 --- a/sd/CppunitTest_sd_filters_test.mk +++ b/sd/CppunitTest_sd_filters_test.mk @@ -71,9 +71,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_filters_test, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sd_filters_test)) + $(eval $(call gb_CppunitTest_set_include,sd_filters_test,\ -I$(SRCDIR)/sd/source/ui/inc \ -I$(SRCDIR)/sd/inc \ diff --git a/sd/CppunitTest_sd_regression_test.mk b/sd/CppunitTest_sd_regression_test.mk index e0a5000359de..85ea7eb91f1b 100644 --- a/sd/CppunitTest_sd_regression_test.mk +++ b/sd/CppunitTest_sd_regression_test.mk @@ -66,9 +66,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_regression_test, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sd_regression_test)) + $(eval $(call gb_CppunitTest_set_include,sd_regression_test,\ -I$(SRCDIR)/sd/source/ui/inc \ -I$(SRCDIR)/sd/inc \ diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk index 5209b6445001..70f742949bc4 100644 --- a/sd/CppunitTest_sd_uimpress.mk +++ b/sd/CppunitTest_sd_uimpress.mk @@ -72,9 +72,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_uimpress,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sd_uimpress)) + ifeq ($(OS),WNT) $(eval $(call gb_CppunitTest_use_libraries,sd_uimpress,\ ws2_32 \ diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index b0535d506bbd..3ac73b8f0857 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -104,9 +104,10 @@ $(eval $(call gb_Library_use_libraries,sd,\ vcl \ xmlsecurity \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sd)) + $(eval $(call gb_Library_use_externals,sd,\ libxml2 \ dbus \ diff --git a/sd/Library_sdd.mk b/sd/Library_sdd.mk index 404ea819e63a..c668637a588c 100644 --- a/sd/Library_sdd.mk +++ b/sd/Library_sdd.mk @@ -48,9 +48,10 @@ $(eval $(call gb_Library_use_libraries,sdd,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sdd)) + $(eval $(call gb_Library_set_componentfile,sdd,sd/util/sdd)) $(eval $(call gb_Library_add_exception_objects,sdd,\ diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk index 2402116a33e2..b0b0d967731e 100644 --- a/sd/Library_sdfilt.mk +++ b/sd/Library_sdfilt.mk @@ -66,9 +66,10 @@ $(eval $(call gb_Library_use_libraries,sdfilt,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sdfilt)) + $(eval $(call gb_Library_set_componentfile,sdfilt,sd/util/sdfilt)) $(eval $(call gb_Library_add_exception_objects,sdfilt,\ diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk index 7fcf0b01bae2..7949f732e34e 100644 --- a/sd/Library_sdui.mk +++ b/sd/Library_sdui.mk @@ -65,9 +65,10 @@ $(eval $(call gb_Library_use_libraries,sdui,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sdui)) + $(eval $(call gb_Library_add_exception_objects,sdui,\ sd/source/filter/html/htmlattr \ sd/source/filter/html/pubdlg \ diff --git a/sdext/CppunitTest_pdfimport.mk b/sdext/CppunitTest_pdfimport.mk index 1ea6bc6c22f1..8d40f2431493 100644 --- a/sdext/CppunitTest_pdfimport.mk +++ b/sdext/CppunitTest_pdfimport.mk @@ -54,9 +54,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sdext_pdfimport,\ test \ unotest \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sdext_pdfimport)) + $(eval $(call gb_CppunitTest_use_static_libraries,sdext_pdfimport,\ pdfimport_s \ )) diff --git a/sfx2/CppunitTest_sfx2_metadatable.mk b/sfx2/CppunitTest_sfx2_metadatable.mk index 6c1d68d8c189..81706c523065 100644 --- a/sfx2/CppunitTest_sfx2_metadatable.mk +++ b/sfx2/CppunitTest_sfx2_metadatable.mk @@ -29,9 +29,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sfx2_metadatable, \ sal \ sfx \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sfx2_metadatable)) + $(eval $(call gb_CppunitTest_set_include,sfx2_metadatable,\ $$(INCLUDE) \ )) diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk index 12c1812a96b4..22925b03f315 100644 --- a/sfx2/Library_qstart.mk +++ b/sfx2/Library_qstart.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,qstart_gtk,\ vcl \ sfx \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,qstart_gtk)) + $(eval $(call gb_Library_use_externals,qstart_gtk,\ gio \ gtk \ diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index 5e01c7d01f70..23badc19286e 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -68,9 +68,10 @@ $(eval $(call gb_Library_use_libraries,sfx,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sfx)) + $(eval $(call gb_Library_use_external,sfx,libxml2)) $(eval $(call gb_Library_add_exception_objects,sfx,\ diff --git a/shell/Executable_lngconvex.mk b/shell/Executable_lngconvex.mk index 9ed4dd0f01e8..b32ba7e89b97 100644 --- a/shell/Executable_lngconvex.mk +++ b/shell/Executable_lngconvex.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Executable_use_libraries,lngconvex,\ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,lngconvex)) + $(eval $(call gb_Executable_add_exception_objects,lngconvex,\ shell/source/tools/lngconvex/cmdline \ shell/source/tools/lngconvex/lngconvex \ diff --git a/shell/Library_cmdmail.mk b/shell/Library_cmdmail.mk index 0ae262bee72c..58c13032f883 100644 --- a/shell/Library_cmdmail.mk +++ b/shell/Library_cmdmail.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,cmdmail,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,cmdmail)) + $(eval $(call gb_Library_set_componentfile,cmdmail,shell/source/cmdmail/cmdmail)) $(eval $(call gb_Library_add_exception_objects,cmdmail,\ diff --git a/shell/Library_desktopbe.mk b/shell/Library_desktopbe.mk index fbc05a0e318c..28a0e8760ab0 100644 --- a/shell/Library_desktopbe.mk +++ b/shell/Library_desktopbe.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,desktopbe1,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,desktopbe1)) + $(eval $(call gb_Library_set_componentfile,desktopbe1,shell/source/backends/desktopbe/desktopbe1)) $(eval $(call gb_Library_add_exception_objects,desktopbe1,\ diff --git a/shell/Library_gconfbe.mk b/shell/Library_gconfbe.mk index 5e513237caba..d2deb022d20d 100644 --- a/shell/Library_gconfbe.mk +++ b/shell/Library_gconfbe.mk @@ -43,9 +43,10 @@ $(eval $(call gb_Library_use_libraries,gconfbe1,\ cppu \ cppuhelper \ sal \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,gconfbe1)) + $(eval $(call gb_Library_set_componentfile,gconfbe1,shell/source/backends/gconfbe/gconfbe1)) $(eval $(call gb_Library_add_exception_objects,gconfbe1,\ diff --git a/shell/Library_kde4be.mk b/shell/Library_kde4be.mk index c31fb68afea8..c20863655d9f 100644 --- a/shell/Library_kde4be.mk +++ b/shell/Library_kde4be.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_libraries,kde4be1,\ cppu \ cppuhelper \ sal \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,kde4be1)) + $(eval $(call gb_Library_set_componentfile,kde4be1,shell/source/backends/kde4be/kde4be1)) $(eval $(call gb_Library_add_exception_objects,kde4be1,\ diff --git a/shell/Library_kdebe.mk b/shell/Library_kdebe.mk index a367c8d62bf8..8637341d6ff0 100644 --- a/shell/Library_kdebe.mk +++ b/shell/Library_kdebe.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,kdebe1,\ cppu \ cppuhelper \ sal \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,kdebe1)) + $(eval $(call gb_Library_set_componentfile,kdebe1,shell/source/backends/kdebe/kdebe1)) $(eval $(call gb_Library_add_exception_objects,kdebe1,\ diff --git a/shell/Library_localebe.mk b/shell/Library_localebe.mk index 008a00481008..96022b731a24 100644 --- a/shell/Library_localebe.mk +++ b/shell/Library_localebe.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,localebe1,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,localebe1)) + $(eval $(call gb_Library_set_componentfile,localebe1,shell/source/backends/localebe/localebe1)) $(eval $(call gb_Library_add_exception_objects,localebe1,\ diff --git a/shell/Library_macbe.mk b/shell/Library_macbe.mk index 9057373a51a4..236cc6ce6e0a 100644 --- a/shell/Library_macbe.mk +++ b/shell/Library_macbe.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,macbe1,\ cppu \ cppuhelper \ sal \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,macbe1)) + $(eval $(call gb_Library_set_componentfile,macbe1,shell/source/backends/macbe/macbe1)) $(eval $(call gb_Library_add_objcxxobjects,macbe1,\ diff --git a/shell/Library_recentfile.mk b/shell/Library_recentfile.mk index c6c25e89a5b2..c95b2d1ee343 100644 --- a/shell/Library_recentfile.mk +++ b/shell/Library_recentfile.mk @@ -47,9 +47,10 @@ endif $(eval $(call gb_Library_use_libraries,recentfile,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,recentfile)) + $(eval $(call gb_Library_use_static_libraries,recentfile,\ shell_xmlparser \ )) diff --git a/shell/Library_syssh.mk b/shell/Library_syssh.mk index 252aa827d7c4..e16e957b7986 100644 --- a/shell/Library_syssh.mk +++ b/shell/Library_syssh.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,syssh,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,syssh)) + $(eval $(call gb_Library_use_static_libraries,syssh,\ shell_xmlparser \ )) diff --git a/shell/Library_syssh_win.mk b/shell/Library_syssh_win.mk index 481728a3c4a8..b6ba2b4333fa 100644 --- a/shell/Library_syssh_win.mk +++ b/shell/Library_syssh_win.mk @@ -36,9 +36,10 @@ $(eval $(call gb_Library_use_libraries,syssh,\ sal \ shell32 \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,syssh)) + $(eval $(call gb_Library_set_componentfile,syssh,shell/source/win32/syssh)) $(eval $(call gb_Library_add_exception_objects,syssh,\ diff --git a/shell/Library_tdebe.mk b/shell/Library_tdebe.mk index a6ca92b2e391..a9472456af73 100644 --- a/shell/Library_tdebe.mk +++ b/shell/Library_tdebe.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,tdebe1,\ cppu \ cppuhelper \ sal \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,tdebe1)) + $(eval $(call gb_Library_set_componentfile,tdebe1,shell/source/backends/kdebe/tdebe1)) $(eval $(call gb_Library_add_exception_objects,tdebe1,\ diff --git a/shell/Library_wininetbe.mk b/shell/Library_wininetbe.mk index d02c6cc5027b..c2dbd1341e30 100644 --- a/shell/Library_wininetbe.mk +++ b/shell/Library_wininetbe.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,wininetbe1,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,wininetbe1)) + $(eval $(call gb_Library_set_componentfile,wininetbe1,shell/source/backends/wininetbe/wininetbe1)) $(eval $(call gb_Library_add_exception_objects,wininetbe1,\ diff --git a/slideshow/CppunitTest_slideshow.mk b/slideshow/CppunitTest_slideshow.mk index 42be84b0d0f6..133ae060e6fa 100644 --- a/slideshow/CppunitTest_slideshow.mk +++ b/slideshow/CppunitTest_slideshow.mk @@ -67,9 +67,10 @@ $(eval $(call gb_CppunitTest_use_libraries,slideshow,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,slideshow)) + $(eval $(call gb_CppunitTest_add_exception_objects,slideshow,\ slideshow/test/slidetest \ slideshow/test/testshape \ diff --git a/slideshow/Executable_demoshow.mk b/slideshow/Executable_demoshow.mk index 86d14c4b3106..3ed481ed774f 100644 --- a/slideshow/Executable_demoshow.mk +++ b/slideshow/Executable_demoshow.mk @@ -61,9 +61,10 @@ $(eval $(call gb_Executable_use_libraries,demoshow,\ ucbhelper \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,demoshow)) + $(eval $(call gb_Executable_add_exception_objects,demoshow,\ slideshow/test/demoshow \ )) diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk index 199699fd24cd..380f935d9e0e 100644 --- a/slideshow/Library_OGLTrans.mk +++ b/slideshow/Library_OGLTrans.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,OGLTrans,\ sal \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,OGLTrans)) + $(eval $(call gb_Library_use_external,OGLTrans,mesa_headers)) $(eval $(call gb_Library_set_componentfile,OGLTrans,slideshow/source/engine/OGLTrans/ogltrans)) diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk index 22b6f5d6bfd6..d065532a696c 100644 --- a/slideshow/Library_slideshow.mk +++ b/slideshow/Library_slideshow.mk @@ -63,9 +63,10 @@ $(eval $(call gb_Library_use_libraries,slideshow,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,slideshow)) + $(eval $(call gb_Library_set_componentfile,slideshow,slideshow/util/slideshow)) $(eval $(call gb_Library_add_exception_objects,slideshow,\ diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 5de9b9320c25..ee844de24330 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -341,6 +341,7 @@ $(eval $(foreach method,\ add_ldflags \ set_ldflags \ add_libs \ + add_standard_system_libs \ use_sdk_api \ use_udk_api \ use_internal_api \ diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index db901f079512..1ddedfdad41b 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -105,6 +105,7 @@ $(eval $(foreach method,\ add_ldflags \ set_ldflags \ add_libs \ + add_standard_system_libs \ set_library_path_flags \ add_api \ use_api \ diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 01ee922935ae..10ca542b58c5 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -185,6 +185,7 @@ $(eval $(foreach method,\ set_ldflags \ set_x64 \ add_libs \ + add_standard_system_libs \ set_library_path_flags \ add_api \ use_api \ diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 8dddeb390402..5b953005ef24 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -648,6 +648,13 @@ define gb_LinkTarget_add_libs $(call gb_LinkTarget_get_target,$(1)) : LIBS += $(2) endef +# add platform specific standard libraries to linker command for linktarget $(1) +# there are currently 94 Libraries/Executables/CppunitTests not using +# gb_STDLIBS... probably this should need to be added explicitly +define gb_LinkTarget_add_standard_system_libs +$(call gb_LinkTarget_get_target,$(1)) : LIBS += $(gb_STDLIBS) +endef + define gb_LinkTarget_add_api $$(call gb_Output_error,\ gb_LinkTarget_add_api: use gb_LinkTarget_use_api instead.) diff --git a/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk b/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk index acebb04da5e6..50267d307251 100644 --- a/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk +++ b/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk @@ -29,7 +29,7 @@ gb_CPUDEFS := -DX86 gb_COMPILERDEFAULTOPTFLAGS := -O2 -gb_STDLIBS := pthread +gb_STDLIBS := $(PTHREAD_LIBS) include $(GBUILDDIR)/platform/unxgcc.mk diff --git a/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk b/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk index 5eaa617bd6b3..34f35a36f7fd 100644 --- a/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk +++ b/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk @@ -28,7 +28,7 @@ #please make generic modifications to unxgcc.mk gb_COMPILERDEFAULTOPTFLAGS := -O2 -gb_STDLIBS := pthread +gb_STDLIBS := $(PTHREAD_LIBS) include $(GBUILDDIR)/platform/unxgcc.mk diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index a59782c6dd75..d2e53537d2e9 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -107,9 +107,9 @@ gb_LinkTarget_LDFLAGS += -shared-libgcc endif gb_STDLIBS := \ - mingwthrd \ - mingw32 \ - mingwex \ + -lmingwthrd \ + -lmingw32 \ + -lmingwex \ # LinkTarget class diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 9deca874330a..739427e65659 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -188,7 +188,7 @@ gb_CXXFLAGS := \ -Zm500 \ gb_STDLIBS := \ - advapi32 \ + advapi32.lib \ ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE) gb_CFLAGS_WERROR := -WX -DLIBO_WERROR diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk index cb071aee1865..f32fcc5bcb3e 100644 --- a/solenv/gbuild/platform/android.mk +++ b/solenv/gbuild/platform/android.mk @@ -9,7 +9,7 @@ # Link almost everything with -lgnustl_shared gb_STDLIBS := \ - gnustl_shared + -lgnustl_shared \ gb_Library_PLAINLIBS_NONE := \ android \ diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 6c77d71247f0..be54115de350 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -237,9 +237,9 @@ gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT) gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT) gb_STDLIBS := \ - m \ - nsl \ - socket \ + -lm \ + -lnsl \ + -lsocket \ gb_Library_PLAINLIBS_NONE += \ dl \ diff --git a/sot/CppunitTest_sot_test_sot.mk b/sot/CppunitTest_sot_test_sot.mk index da79a6556c8b..0941434cf7f0 100644 --- a/sot/CppunitTest_sot_test_sot.mk +++ b/sot/CppunitTest_sot_test_sot.mk @@ -45,9 +45,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sot_test_sot, \ tl \ unotest \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sot_test_sot)) + $(eval $(call gb_CppunitTest_use_api,sot_test_sot,\ offapi \ udkapi \ diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk index 50a80db23884..c11af837e39f 100644 --- a/sot/Library_sot.mk +++ b/sot/Library_sot.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,sot,\ ucbhelper \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sot)) + $(eval $(call gb_Library_add_exception_objects,sot,\ sot/source/unoolestorage/xolesimplestorage \ sot/source/unoolestorage/register \ diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk index 892af74daa71..df89cdb9dd9d 100644 --- a/starmath/CppunitTest_starmath_qa_cppunit.mk +++ b/starmath/CppunitTest_starmath_qa_cppunit.mk @@ -61,9 +61,10 @@ $(eval $(call gb_CppunitTest_use_libraries,starmath_qa_cppunit,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,starmath_qa_cppunit)) + $(eval $(call gb_CppunitTest_add_exception_objects,starmath_qa_cppunit,\ starmath/qa/cppunit/test_nodetotextvisitors \ starmath/qa/cppunit/test_starmath \ diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk index 2ecb8d8e7ed3..554b49ce16e0 100644 --- a/starmath/Library_sm.mk +++ b/starmath/Library_sm.mk @@ -56,9 +56,10 @@ $(eval $(call gb_Library_use_libraries,sm,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sm)) + $(eval $(call gb_Library_add_exception_objects,sm,\ starmath/source/accessibility \ starmath/source/action \ diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk index 3ab12ab75593..0837c2db16f3 100644 --- a/starmath/Library_smd.mk +++ b/starmath/Library_smd.mk @@ -43,9 +43,10 @@ $(eval $(call gb_Library_use_libraries,smd,\ ucbhelper \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,smd)) + $(eval $(call gb_Library_add_exception_objects,smd,\ starmath/source/detreg \ starmath/source/smdetect \ diff --git a/stoc/Library_bootstrap.mk b/stoc/Library_bootstrap.mk index e1ef1806ae64..46d72b7633d9 100644 --- a/stoc/Library_bootstrap.mk +++ b/stoc/Library_bootstrap.mk @@ -54,9 +54,10 @@ $(eval $(call gb_Library_use_libraries,bootstrap,\ salhelper \ xmlreader \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,bootstrap)) + $(eval $(call gb_Library_set_componentfile,bootstrap,stoc/util/bootstrap)) $(eval $(call gb_Library_add_exception_objects,bootstrap,\ diff --git a/stoc/Library_introspection.mk b/stoc/Library_introspection.mk index 2f2f07d4c926..a1e058c86304 100644 --- a/stoc/Library_introspection.mk +++ b/stoc/Library_introspection.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Library_use_libraries,introspection,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,introspection)) + $(eval $(call gb_Library_set_componentfile,introspection,stoc/source/inspect/introspection)) $(eval $(call gb_Library_add_exception_objects,introspection,\ diff --git a/stoc/Library_invocadapt.mk b/stoc/Library_invocadapt.mk index 38dd68b657f0..7fe31573d480 100644 --- a/stoc/Library_invocadapt.mk +++ b/stoc/Library_invocadapt.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,invocadapt,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,invocadapt)) + $(eval $(call gb_Library_set_componentfile,invocadapt,stoc/source/invocation_adapterfactory/invocadapt)) $(eval $(call gb_Library_add_exception_objects,invocadapt,\ diff --git a/stoc/Library_invocation.mk b/stoc/Library_invocation.mk index df8d3c78d468..b2544c77372b 100644 --- a/stoc/Library_invocation.mk +++ b/stoc/Library_invocation.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,invocation,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,invocation)) + $(eval $(call gb_Library_set_componentfile,invocation,stoc/source/invocation/invocation)) $(eval $(call gb_Library_add_exception_objects,invocation,\ diff --git a/stoc/Library_javaloader.mk b/stoc/Library_javaloader.mk index e0ff05a968df..2303d92c0195 100644 --- a/stoc/Library_javaloader.mk +++ b/stoc/Library_javaloader.mk @@ -36,9 +36,10 @@ $(eval $(call gb_Library_use_libraries,javaloader,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,javaloader)) + $(eval $(call gb_Library_set_componentfile,javaloader,stoc/source/javaloader/javaloader)) $(eval $(call gb_Library_add_exception_objects,javaloader,\ diff --git a/stoc/Library_javavm.mk b/stoc/Library_javavm.mk index d8b5b464f44e..a0fc87853263 100644 --- a/stoc/Library_javavm.mk +++ b/stoc/Library_javavm.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_libraries,javavm,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,javavm)) + $(eval $(call gb_Library_set_componentfile,javavm,stoc/source/javavm/javavm)) $(eval $(call gb_Library_add_exception_objects,javavm,\ diff --git a/stoc/Library_namingservice.mk b/stoc/Library_namingservice.mk index 124bfaa3055c..ed115ed30c42 100644 --- a/stoc/Library_namingservice.mk +++ b/stoc/Library_namingservice.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,namingservice,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,namingservice)) + $(eval $(call gb_Library_set_componentfile,namingservice,stoc/source/namingservice/namingservice)) $(eval $(call gb_Library_add_exception_objects,namingservice,\ diff --git a/stoc/Library_proxyfac.mk b/stoc/Library_proxyfac.mk index cf87b477597d..8eb08e55265d 100644 --- a/stoc/Library_proxyfac.mk +++ b/stoc/Library_proxyfac.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,proxyfac,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,proxyfac)) + $(eval $(call gb_Library_set_componentfile,proxyfac,stoc/source/proxy_factory/proxyfac)) $(eval $(call gb_Library_add_exception_objects,proxyfac,\ diff --git a/stoc/Library_reflection.mk b/stoc/Library_reflection.mk index 644f9f28f1b3..aa5198a84bdd 100644 --- a/stoc/Library_reflection.mk +++ b/stoc/Library_reflection.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,reflection,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,reflection)) + $(eval $(call gb_Library_set_componentfile,reflection,stoc/source/corereflection/reflection)) $(eval $(call gb_Library_add_exception_objects,reflection,\ diff --git a/stoc/Library_stocservices.mk b/stoc/Library_stocservices.mk index 8f4ec53dd618..2a8b7b8f31e5 100644 --- a/stoc/Library_stocservices.mk +++ b/stoc/Library_stocservices.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,stocservices,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,stocservices)) + $(eval $(call gb_Library_set_componentfile,stocservices,stoc/util/stocservices)) $(eval $(call gb_Library_add_exception_objects,stocservices,\ diff --git a/store/Library_store.mk b/store/Library_store.mk index 39029be71fe5..43d81da71f0a 100644 --- a/store/Library_store.mk +++ b/store/Library_store.mk @@ -40,9 +40,10 @@ $(eval $(call gb_Library_add_defs,store,\ $(eval $(call gb_Library_use_libraries,store,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,store)) + $(eval $(call gb_Library_add_exception_objects,store,\ store/source/object \ store/source/lockbyte \ diff --git a/svl/CppunitTest_svl_lngmisc.mk b/svl/CppunitTest_svl_lngmisc.mk index c356f403a56b..791f2716e659 100644 --- a/svl/CppunitTest_svl_lngmisc.mk +++ b/svl/CppunitTest_svl_lngmisc.mk @@ -40,9 +40,10 @@ $(eval $(call gb_CppunitTest_use_libraries,svl_lngmisc, \ salhelper \ svl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,svl_lngmisc)) + ifeq ($(GUI),WNT) $(eval $(call gb_CppunitTest_use_libraries,svl_lngmisc, \ oleaut32 \ diff --git a/svl/CppunitTest_svl_urihelper.mk b/svl/CppunitTest_svl_urihelper.mk index b0cbcd0e6a35..ef2f3f040ce5 100644 --- a/svl/CppunitTest_svl_urihelper.mk +++ b/svl/CppunitTest_svl_urihelper.mk @@ -49,7 +49,8 @@ $(eval $(call gb_CppunitTest_use_libraries,svl_urihelper, \ tl \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,svl_urihelper)) + $(eval $(call gb_CppunitTest_use_ure,svl_urihelper)) diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk index 86c00f45418f..558dc60d7eac 100644 --- a/svl/Library_fsstorage.mk +++ b/svl/Library_fsstorage.mk @@ -48,9 +48,10 @@ $(eval $(call gb_Library_use_libraries,fsstorage,\ ucbhelper \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fsstorage)) + $(eval $(call gb_Library_add_exception_objects,fsstorage,\ svl/source/fsstor/fsfactory \ svl/source/fsstor/fsstorage \ diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk index 1b89ea3ed3da..a7c9886d925e 100644 --- a/svl/Library_passwordcontainer.mk +++ b/svl/Library_passwordcontainer.mk @@ -47,9 +47,10 @@ $(eval $(call gb_Library_use_libraries,passwordcontainer,\ ucbhelper \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,passwordcontainer)) + $(eval $(call gb_Library_add_exception_objects,passwordcontainer,\ svl/source/passwordcontainer/passwordcontainer \ svl/source/passwordcontainer/syscreds \ diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk index 8f7940d2b76b..46af0f9970ca 100644 --- a/svl/Library_svl.mk +++ b/svl/Library_svl.mk @@ -60,9 +60,10 @@ $(eval $(call gb_Library_use_libraries,svl,\ ucbhelper \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,svl)) + $(eval $(call gb_Library_add_exception_objects,svl,\ svl/source/config/asiancfg \ svl/source/config/cjkoptions \ diff --git a/svtools/CppunitTest_svtools_filters_test.mk b/svtools/CppunitTest_svtools_filters_test.mk index 65b4e1bea3ab..aff901c79df6 100644 --- a/svtools/CppunitTest_svtools_filters_test.mk +++ b/svtools/CppunitTest_svtools_filters_test.mk @@ -42,9 +42,10 @@ $(eval $(call gb_CppunitTest_use_libraries,svtools_filters_test, \ unotest \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,svtools_filters_test)) + $(eval $(call gb_CppunitTest_use_api,svtools_filters_test,\ udkapi \ offapi \ diff --git a/svtools/Executable_bmp.mk b/svtools/Executable_bmp.mk index f8fee180d891..e837abd32d58 100644 --- a/svtools/Executable_bmp.mk +++ b/svtools/Executable_bmp.mk @@ -43,9 +43,10 @@ $(eval $(call gb_Executable_use_libraries,bmp,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,bmp)) + $(eval $(call gb_Executable_add_exception_objects,bmp,\ svtools/bmpmaker/bmp \ svtools/bmpmaker/bmpcore \ diff --git a/svtools/Executable_bmpsum.mk b/svtools/Executable_bmpsum.mk index a00b928bd39a..7ae8dbf46dd3 100644 --- a/svtools/Executable_bmpsum.mk +++ b/svtools/Executable_bmpsum.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Executable_use_libraries,bmpsum,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,bmpsum)) + $(eval $(call gb_Executable_add_exception_objects,bmpsum,\ svtools/bmpmaker/bmpsum \ )) diff --git a/svtools/Executable_g2g.mk b/svtools/Executable_g2g.mk index 0936abd454cf..3dace37d6c7f 100644 --- a/svtools/Executable_g2g.mk +++ b/svtools/Executable_g2g.mk @@ -43,9 +43,10 @@ $(eval $(call gb_Executable_use_libraries,g2g,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,g2g)) + $(eval $(call gb_Executable_add_exception_objects,g2g,\ svtools/bmpmaker/g2g \ )) diff --git a/svtools/Executable_langsupport.mk b/svtools/Executable_langsupport.mk index 532b78bbecb6..704e51b636ee 100644 --- a/svtools/Executable_langsupport.mk +++ b/svtools/Executable_langsupport.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Executable_use_libraries,langsupport,\ ucbhelper \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,langsupport)) + $(eval $(call gb_Executable_add_exception_objects,langsupport,\ svtools/langsupport/langsupport \ )) diff --git a/svtools/Library_hatchwindowfactory.mk b/svtools/Library_hatchwindowfactory.mk index 1c7cb22309d7..1827cb1ae389 100644 --- a/svtools/Library_hatchwindowfactory.mk +++ b/svtools/Library_hatchwindowfactory.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,hatchwindowfactory,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,hatchwindowfactory)) + $(eval $(call gb_Library_add_exception_objects,hatchwindowfactory,\ svtools/source/hatchwindow/documentcloser \ svtools/source/hatchwindow/hatchwindow \ diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index 7a2379b8c2cd..1f40a65b5001 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -63,9 +63,10 @@ $(eval $(call gb_Library_use_libraries,svt,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,svt)) + $(eval $(call gb_Library_use_externals,svt,\ icuuc \ jpeg \ diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk index 11aad40f4d46..696212b9d6c7 100644 --- a/svx/Executable_gengal.bin.mk +++ b/svx/Executable_gengal.bin.mk @@ -58,9 +58,10 @@ $(eval $(call gb_Executable_use_libraries,$(svx_GENGALBIN),\ vcl \ svxcore \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,$(svx_GENGALBIN))) + $(eval $(call gb_Executable_add_exception_objects,$(svx_GENGALBIN),\ svx/source/gengal/gengal \ )) diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index a939a086a82a..796aa222aac1 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -66,9 +66,10 @@ $(eval $(call gb_Library_use_libraries,svx,\ xo \ xmlscript \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,svx)) + $(eval $(call gb_Library_use_external,svx,icuuc)) $(eval $(call gb_Library_add_exception_objects,svx,\ diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index f94e359aa6a6..929c8cf49ae6 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -83,9 +83,10 @@ $(eval $(call gb_Library_use_libraries,svxcore,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,svxcore)) + $(eval $(call gb_Library_use_external,svxcore,icuuc)) $(eval $(call gb_Library_add_exception_objects,svxcore,\ diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk index 9b2fdff4b386..13a11c1c1937 100644 --- a/svx/Library_textconversiondlgs.mk +++ b/svx/Library_textconversiondlgs.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Library_use_libraries,textconversiondlgs,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,textconversiondlgs)) + $(eval $(call gb_Library_add_exception_objects,textconversiondlgs,\ svx/source/unodialogs/textconversiondlgs/services \ svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog \ diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk index 47d7a35e3075..53d990751bb5 100644 --- a/sw/CppunitTest_sw_filters_test.mk +++ b/sw/CppunitTest_sw_filters_test.mk @@ -56,9 +56,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_filters_test, \ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_filters_test)) + $(eval $(call gb_CppunitTest_set_include,sw_filters_test,\ -I$(SRCDIR)/sw/source/ui/inc \ -I$(SRCDIR)/sw/inc \ diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk index 080bd6aeb1d7..ccbe8cd678ce 100644 --- a/sw/CppunitTest_sw_layout_test.mk +++ b/sw/CppunitTest_sw_layout_test.mk @@ -67,9 +67,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_layout_test, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_layout_test)) + $(eval $(call gb_CppunitTest_set_include,sw_layout_test,\ -I$(SRCDIR)/sw/source/ui/inc \ -I$(SRCDIR)/sw/inc \ diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk index e42eb0c9276b..30915f2ae77f 100644 --- a/sw/CppunitTest_sw_macros_test.mk +++ b/sw/CppunitTest_sw_macros_test.mk @@ -68,9 +68,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_macros_test, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_macros_test)) + $(eval $(call gb_CppunitTest_set_include,sw_macros_test,\ -I$(SRCDIR)/sw/source/ui/inc \ -I$(SRCDIR)/sw/inc \ diff --git a/sw/CppunitTest_sw_regression_test.mk b/sw/CppunitTest_sw_regression_test.mk index 538542b37ef7..69c10d366a67 100644 --- a/sw/CppunitTest_sw_regression_test.mk +++ b/sw/CppunitTest_sw_regression_test.mk @@ -68,9 +68,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_regression_test, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_regression_test)) + $(eval $(call gb_CppunitTest_set_include,sw_regression_test,\ -I$(SRCDIR)/sw/source/ui/inc \ -I$(SRCDIR)/sw/inc \ diff --git a/sw/CppunitTest_sw_subsequent_odfexport.mk b/sw/CppunitTest_sw_subsequent_odfexport.mk index 10e7ab20769f..03af297f98d9 100644 --- a/sw/CppunitTest_sw_subsequent_odfexport.mk +++ b/sw/CppunitTest_sw_subsequent_odfexport.mk @@ -45,9 +45,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odfexport, \ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_odfexport)) + $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_odfexport,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_odfimport.mk b/sw/CppunitTest_sw_subsequent_odfimport.mk index aceaa697b7e6..7d52f510aed5 100644 --- a/sw/CppunitTest_sw_subsequent_odfimport.mk +++ b/sw/CppunitTest_sw_subsequent_odfimport.mk @@ -44,9 +44,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odfimport, \ vcl \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_odfimport)) + $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_odfimport,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_ooxmlexport.mk b/sw/CppunitTest_sw_subsequent_ooxmlexport.mk index 5a9587948a21..1523e5ca4f52 100644 --- a/sw/CppunitTest_sw_subsequent_ooxmlexport.mk +++ b/sw/CppunitTest_sw_subsequent_ooxmlexport.mk @@ -44,9 +44,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmlexport, \ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_ooxmlexport)) + $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ooxmlexport,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_ooxmlimport.mk b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk index 8fc2dfedecaa..30d793c32c76 100644 --- a/sw/CppunitTest_sw_subsequent_ooxmlimport.mk +++ b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk @@ -43,9 +43,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmlimport, \ sw \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_ooxmlimport)) + $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ooxmlimport,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_rtfexport.mk b/sw/CppunitTest_sw_subsequent_rtfexport.mk index 1609b6f41ffc..e9c721ec5611 100644 --- a/sw/CppunitTest_sw_subsequent_rtfexport.mk +++ b/sw/CppunitTest_sw_subsequent_rtfexport.mk @@ -43,9 +43,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtfexport, \ utl \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_rtfexport)) + $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_rtfexport,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_rtfimport.mk b/sw/CppunitTest_sw_subsequent_rtfimport.mk index 7ce087e36e40..6e9339e37a18 100644 --- a/sw/CppunitTest_sw_subsequent_rtfimport.mk +++ b/sw/CppunitTest_sw_subsequent_rtfimport.mk @@ -44,9 +44,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtfimport, \ vcl \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_rtfimport)) + $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_rtfimport,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_ww8export.mk b/sw/CppunitTest_sw_subsequent_ww8export.mk index 9f4677b5b29e..35a6af3814ce 100644 --- a/sw/CppunitTest_sw_subsequent_ww8export.mk +++ b/sw/CppunitTest_sw_subsequent_ww8export.mk @@ -45,9 +45,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8export, \ sw \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_ww8export)) + $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ww8export,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_ww8import.mk b/sw/CppunitTest_sw_subsequent_ww8import.mk index 16c36843407a..f4bf71c30725 100644 --- a/sw/CppunitTest_sw_subsequent_ww8import.mk +++ b/sw/CppunitTest_sw_subsequent_ww8import.mk @@ -42,9 +42,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8import, \ unotest \ sw \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_ww8import)) + $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ww8import,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk index 8b53bdf32009..268a620e9161 100644 --- a/sw/CppunitTest_sw_swdoc_test.mk +++ b/sw/CppunitTest_sw_swdoc_test.mk @@ -68,9 +68,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_swdoc_test, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_swdoc_test)) + $(eval $(call gb_CppunitTest_use_externals,sw_swdoc_test,\ icuuc \ libxml2 \ diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk index 365c69096b96..f1f3a8c7a9b6 100644 --- a/sw/Library_msword.mk +++ b/sw/Library_msword.mk @@ -68,9 +68,10 @@ $(eval $(call gb_Library_use_libraries,msword,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,msword)) + $(eval $(call gb_Library_use_externals,msword,\ icuuc \ libxml2 \ diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index b58f71a72b3e..5dd22de249c2 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -77,9 +77,10 @@ $(eval $(call gb_Library_use_libraries,sw,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sw)) + $(eval $(call gb_Library_use_externals,sw,\ icuuc \ libxml2 \ diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk index 73f5fb857781..780b069f4bfd 100644 --- a/sw/Library_swd.mk +++ b/sw/Library_swd.mk @@ -58,9 +58,10 @@ $(eval $(call gb_Library_use_libraries,swd,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,swd)) + $(eval $(call gb_Library_add_exception_objects,swd,\ sw/source/filter/basflt/iodetect \ sw/source/ui/uno/detreg \ diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk index 4de06513c59a..040717b7900a 100644 --- a/sw/Library_swui.mk +++ b/sw/Library_swui.mk @@ -68,9 +68,10 @@ $(eval $(call gb_Library_use_libraries,swui,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,swui)) + $(eval $(call gb_Library_add_exception_objects,swui,\ sw/source/ui/chrdlg/break \ sw/source/ui/chrdlg/chardlg \ diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk index 310a90f4dbff..aeed2a85a0ff 100644 --- a/sw/Library_vbaswobj.mk +++ b/sw/Library_vbaswobj.mk @@ -64,9 +64,10 @@ $(eval $(call gb_Library_use_libraries,vbaswobj,\ vbahelper \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vbaswobj)) + $(eval $(call gb_Library_use_externals,vbaswobj,\ libxml2 \ )) diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk index 1eca2f36e502..886702d022d7 100644 --- a/test/Library_subsequenttest.mk +++ b/test/Library_subsequenttest.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,subsequenttest,\ unotest \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,subsequenttest)) + ifeq ($(GUIBASE),unx) $(call gb_Library_get_target,subsequenttest) : \ $(call gb_Library_get_target,desktop_detector) \ diff --git a/test/Library_test.mk b/test/Library_test.mk index e730c8b944fa..61579bf8d0a3 100644 --- a/test/Library_test.mk +++ b/test/Library_test.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,test,\ unotest \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,test)) + ifeq ($(GUIBASE),unx) $(call gb_Library_get_target,test) : \ $(call gb_Library_get_target,desktop_detector) \ diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index 0388f3cb62bd..20f97124e355 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,tk,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,tk)) + $(eval $(call gb_Library_add_exception_objects,tk,\ toolkit/source/awt/asynccallback \ toolkit/source/awt/stylesettings \ diff --git a/tools/CppunitTest_tools_test.mk b/tools/CppunitTest_tools_test.mk index ba876eab4a8c..6fce0cdcbf4a 100644 --- a/tools/CppunitTest_tools_test.mk +++ b/tools/CppunitTest_tools_test.mk @@ -47,9 +47,10 @@ $(eval $(call gb_CppunitTest_use_libraries,tools_test, \ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,tools_test)) + $(eval $(call gb_CppunitTest_use_static_libraries,tools_test, \ ooopathutils \ )) diff --git a/tools/Executable_bestreversemap.mk b/tools/Executable_bestreversemap.mk index a30b5e5e0fe2..5fae14f4f6e4 100644 --- a/tools/Executable_bestreversemap.mk +++ b/tools/Executable_bestreversemap.mk @@ -29,9 +29,10 @@ $(eval $(call gb_Executable_set_include,bestreversemap,\ $(eval $(call gb_Executable_use_libraries,bestreversemap,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,bestreversemap)) + $(eval $(call gb_Executable_add_exception_objects,bestreversemap,\ tools/source/reversemap/bestreversemap \ )) diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk index e97405bec6dc..c92e01296759 100644 --- a/tools/Executable_mkunroll.mk +++ b/tools/Executable_mkunroll.mk @@ -30,9 +30,10 @@ $(eval $(call gb_Executable_use_libraries,mkunroll,\ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,mkunroll)) + $(eval $(call gb_Executable_add_exception_objects,mkunroll,\ tools/bootstrp/mkunroll/mkunroll \ )) diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk index 12635cd3a7b5..b408da57beb4 100644 --- a/tools/Executable_rscdep.mk +++ b/tools/Executable_rscdep.mk @@ -30,9 +30,10 @@ $(eval $(call gb_Executable_use_libraries,rscdep,\ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,rscdep)) + $(eval $(call gb_Executable_use_sdk_api,rscdep)) $(eval $(call gb_Executable_add_exception_objects,rscdep,\ diff --git a/tools/Executable_so_checksum.mk b/tools/Executable_so_checksum.mk index 260607035582..c7cfd90e695a 100644 --- a/tools/Executable_so_checksum.mk +++ b/tools/Executable_so_checksum.mk @@ -29,10 +29,11 @@ $(eval $(call gb_Executable_use_libraries,so_checksum,\ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) # used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 vos3gcc3 - seems to be superficial +$(eval $(call gb_Executable_add_standard_system_libs,so_checksum)) + $(eval $(call gb_Executable_add_exception_objects,so_checksum,\ tools/bootstrp/md5 \ tools/bootstrp/so_checksum \ diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index b588874d04ca..3981bac35735 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,tl,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,tl)) + $(eval $(call gb_Library_add_exception_objects,tl,\ tools/source/datetime/datetime \ diff --git a/touch/Library_libotouch.mk b/touch/Library_libotouch.mk index fda47419328f..261d305f3ffe 100644 --- a/touch/Library_libotouch.mk +++ b/touch/Library_libotouch.mk @@ -20,9 +20,10 @@ $(eval $(call gb_Library_use_internal_comprehensive_api,libotouch,\ )) $(eval $(call gb_Library_use_libraries,libotouch,\ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,libotouch)) + $(eval $(call gb_Library_add_exception_objects,libotouch,\ touch/source/uno/Document \ touch/source/generic/libotouch \ diff --git a/tubes/CppunitTest_tubes_test.mk b/tubes/CppunitTest_tubes_test.mk index 1a54526c9872..728067ddb4c3 100644 --- a/tubes/CppunitTest_tubes_test.mk +++ b/tubes/CppunitTest_tubes_test.mk @@ -35,9 +35,10 @@ $(eval $(call gb_CppunitTest_use_libraries,tubes_test, \ tubes \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,tubes_test)) + $(eval $(call gb_CppunitTest_use_externals,tubes_test,\ telepathy \ )) diff --git a/tubes/Library_tubes.mk b/tubes/Library_tubes.mk index b077841a25d6..fd1d2a1685a7 100644 --- a/tubes/Library_tubes.mk +++ b/tubes/Library_tubes.mk @@ -50,9 +50,10 @@ $(eval $(call gb_Library_use_libraries,tubes,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,tubes)) + $(eval $(call gb_Library_use_externals,tubes,\ gtk \ telepathy \ diff --git a/ucb/Library_cached1.mk b/ucb/Library_cached1.mk index 93ac31c15548..e5f4b858179e 100644 --- a/ucb/Library_cached1.mk +++ b/ucb/Library_cached1.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_libraries,cached1,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,cached1)) + $(eval $(call gb_Library_add_exception_objects,cached1,\ ucb/source/cacher/cachedcontentresultset \ ucb/source/cacher/cachedcontentresultsetstub \ diff --git a/ucb/Library_srtrs1.mk b/ucb/Library_srtrs1.mk index c349e1cec703..38a48be65839 100644 --- a/ucb/Library_srtrs1.mk +++ b/ucb/Library_srtrs1.mk @@ -36,9 +36,10 @@ $(eval $(call gb_Library_use_libraries,srtrs1,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,srtrs1)) + $(eval $(call gb_Library_add_exception_objects,srtrs1,\ ucb/source/sorter/sortdynres \ ucb/source/sorter/sortmain \ diff --git a/ucb/Library_ucb1.mk b/ucb/Library_ucb1.mk index 109cf2a55be6..5b04efbc31b7 100644 --- a/ucb/Library_ucb1.mk +++ b/ucb/Library_ucb1.mk @@ -43,9 +43,10 @@ $(eval $(call gb_Library_use_libraries,ucb1,\ sal \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucb1)) + $(eval $(call gb_Library_add_exception_objects,ucb1,\ ucb/source/core/cmdenv \ ucb/source/core/identify \ diff --git a/ucb/Library_ucpcmis1.mk b/ucb/Library_ucpcmis1.mk index d7fac5b45f89..6d3a61a37174 100644 --- a/ucb/Library_ucpcmis1.mk +++ b/ucb/Library_ucpcmis1.mk @@ -40,9 +40,10 @@ $(eval $(call gb_Library_use_libraries,ucpcmis1,\ ucbhelper \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucpcmis1)) + $(eval $(call gb_Library_use_externals,ucpcmis1,\ cmis \ curl \ diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk index 3f8e2f42cb0e..e0b9801e2672 100644 --- a/ucb/Library_ucpdav1.mk +++ b/ucb/Library_ucpdav1.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,ucpdav1,\ salhelper \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucpdav1)) + $(eval $(call gb_Library_use_externals,ucpdav1,\ libxml2 \ neon \ diff --git a/ucb/Library_ucpexpand1.mk b/ucb/Library_ucpexpand1.mk index dda77b3e430a..ade70cf4b568 100644 --- a/ucb/Library_ucpexpand1.mk +++ b/ucb/Library_ucpexpand1.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_libraries,ucpexpand1,\ sal \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucpexpand1)) + $(eval $(call gb_Library_add_exception_objects,ucpexpand1,\ ucb/source/ucp/expand/ucpexpand \ )) diff --git a/ucb/Library_ucpext.mk b/ucb/Library_ucpext.mk index eb436aee0a6c..4a1de1b2460f 100644 --- a/ucb/Library_ucpext.mk +++ b/ucb/Library_ucpext.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,ucpext,\ salhelper \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucpext)) + $(eval $(call gb_Library_add_exception_objects,ucpext,\ ucb/source/ucp/ext/ucpext_content \ ucb/source/ucp/ext/ucpext_datasupplier \ diff --git a/ucb/Library_ucpfile1.mk b/ucb/Library_ucpfile1.mk index 4f729b1dec08..532e5802de59 100644 --- a/ucb/Library_ucpfile1.mk +++ b/ucb/Library_ucpfile1.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,ucpfile1,\ sal \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucpfile1)) + $(eval $(call gb_Library_add_exception_objects,ucpfile1,\ ucb/source/ucp/file/bc \ ucb/source/ucp/file/filcmd \ diff --git a/ucb/Library_ucpftp1.mk b/ucb/Library_ucpftp1.mk index 8b197d56b72c..aa37b20a71af 100644 --- a/ucb/Library_ucpftp1.mk +++ b/ucb/Library_ucpftp1.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,ucpftp1,\ sal \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucpftp1)) + $(eval $(call gb_Library_use_externals,ucpftp1,\ curl \ zlib \ diff --git a/ucb/Library_ucpgio1.mk b/ucb/Library_ucpgio1.mk index d986f2c3737c..e863fc7602fe 100644 --- a/ucb/Library_ucpgio1.mk +++ b/ucb/Library_ucpgio1.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_libraries,ucpgio1,\ sal \ salhelper \ ucbhelper \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucpgio1)) + $(eval $(call gb_Library_use_externals,ucpgio1,\ gio \ )) diff --git a/ucb/Library_ucpgvfs1.mk b/ucb/Library_ucpgvfs1.mk index 577b65d6eec1..42f0dc663741 100644 --- a/ucb/Library_ucpgvfs1.mk +++ b/ucb/Library_ucpgvfs1.mk @@ -47,9 +47,10 @@ $(eval $(call gb_Library_use_libraries,ucpgvfs1,\ sal \ salhelper \ ucbhelper \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucpgvfs1)) + $(eval $(call gb_Library_add_exception_objects,ucpgvfs1,\ ucb/source/ucp/gvfs/gvfs_content \ ucb/source/ucp/gvfs/gvfs_directory \ diff --git a/ucb/Library_ucphier1.mk b/ucb/Library_ucphier1.mk index 9d33231e23fa..4f4325bc5b20 100644 --- a/ucb/Library_ucphier1.mk +++ b/ucb/Library_ucphier1.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,ucphier1,\ salhelper \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucphier1)) + $(eval $(call gb_Library_add_exception_objects,ucphier1,\ ucb/source/ucp/hierarchy/dynamicresultset \ ucb/source/ucp/hierarchy/hierarchycontentcaps \ diff --git a/ucb/Library_ucpodma1.mk b/ucb/Library_ucpodma1.mk index e67f9aa84660..d11376325a3a 100644 --- a/ucb/Library_ucpodma1.mk +++ b/ucb/Library_ucpodma1.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,ucpodma1,\ salhelper \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucpodma1)) + $(eval $(call gb_Library_use_static_libraries,ucpodma1,\ odma_lib \ )) diff --git a/ucb/Library_ucppkg1.mk b/ucb/Library_ucppkg1.mk index f1212d0f629a..40983cf0b43b 100644 --- a/ucb/Library_ucppkg1.mk +++ b/ucb/Library_ucppkg1.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,ucppkg1,\ salhelper \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucppkg1)) + $(eval $(call gb_Library_add_exception_objects,ucppkg1,\ ucb/source/ucp/package/pkgcontentcaps \ ucb/source/ucp/package/pkgcontent \ diff --git a/ucb/Library_ucptdoc1.mk b/ucb/Library_ucptdoc1.mk index 97c18b33505b..9138ca2af3eb 100644 --- a/ucb/Library_ucptdoc1.mk +++ b/ucb/Library_ucptdoc1.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,ucptdoc1,\ salhelper \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucptdoc1)) + $(eval $(call gb_Library_add_exception_objects,ucptdoc1,\ ucb/source/ucp/tdoc/tdoc_contentcaps \ ucb/source/ucp/tdoc/tdoc_content \ diff --git a/ucbhelper/Library_ucbhelper.mk b/ucbhelper/Library_ucbhelper.mk index f394025ac0f8..d6e32e8effbd 100644 --- a/ucbhelper/Library_ucbhelper.mk +++ b/ucbhelper/Library_ucbhelper.mk @@ -19,9 +19,10 @@ $(eval $(call gb_Library_use_libraries,ucbhelper,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucbhelper)) + $(eval $(call gb_Library_add_defs,ucbhelper,\ -DUCBHELPER_DLLIMPLEMENTATION \ )) diff --git a/unotest/Library_unobootstrapprotector.mk b/unotest/Library_unobootstrapprotector.mk index 4fba9a027607..1da0fd52ccb1 100644 --- a/unotest/Library_unobootstrapprotector.mk +++ b/unotest/Library_unobootstrapprotector.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_libraries,unobootstrapprotector,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,unobootstrapprotector)) + $(eval $(call gb_Library_use_externals,unobootstrapprotector,\ cppunit \ )) diff --git a/unotest/Library_unoexceptionprotector.mk b/unotest/Library_unoexceptionprotector.mk index f7d50c76a9b7..ca5f9c064242 100644 --- a/unotest/Library_unoexceptionprotector.mk +++ b/unotest/Library_unoexceptionprotector.mk @@ -36,9 +36,10 @@ $(eval $(call gb_Library_use_libraries,unoexceptionprotector,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,unoexceptionprotector)) + $(eval $(call gb_Library_use_externals,unoexceptionprotector,\ cppunit \ )) diff --git a/unotest/Library_unotest.mk b/unotest/Library_unotest.mk index 809968835707..3c851a3cee54 100644 --- a/unotest/Library_unotest.mk +++ b/unotest/Library_unotest.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,unotest,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,unotest)) + $(eval $(call gb_Library_use_externals,unotest,\ cppunit \ )) diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk index 0b7eef7b73fb..ef33f7f5c48f 100644 --- a/unotools/Library_utl.mk +++ b/unotools/Library_utl.mk @@ -61,9 +61,10 @@ $(eval $(call gb_Library_use_libraries,utl,\ tl \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,utl)) + # add all source files that shall be compiled with exceptions enabled # the name is relative to $(SRCROOT) and must not contain an extension $(eval $(call gb_Library_add_exception_objects,utl,\ diff --git a/unoxml/Library_unordf.mk b/unoxml/Library_unordf.mk index f9395a83d160..bc8aef2e2f3f 100644 --- a/unoxml/Library_unordf.mk +++ b/unoxml/Library_unordf.mk @@ -33,9 +33,10 @@ $(eval $(call gb_Library_use_libraries,unordf,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,unordf)) + $(eval $(call gb_Library_use_externals,unordf,librdf)) $(eval $(call gb_Library_use_externals,unordf,libxslt)) $(eval $(call gb_Library_use_externals,unordf,libxml2)) diff --git a/unoxml/Library_unoxml.mk b/unoxml/Library_unoxml.mk index 3dccdccaec18..8d47855670e7 100644 --- a/unoxml/Library_unoxml.mk +++ b/unoxml/Library_unoxml.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Library_use_libraries,unoxml,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,unoxml)) + $(eval $(call gb_Library_use_external,unoxml,libxml2)) $(eval $(call gb_Library_add_exception_objects,unoxml,\ diff --git a/uui/Library_uui.mk b/uui/Library_uui.mk index e9030b96fe6e..797f8eaf0512 100644 --- a/uui/Library_uui.mk +++ b/uui/Library_uui.mk @@ -44,9 +44,10 @@ $(eval $(call gb_Library_use_libraries,uui,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,uui)) + $(eval $(call gb_Library_add_exception_objects,uui,\ uui/source/alreadyopen \ uui/source/filechanged \ diff --git a/vbahelper/Library_msforms.mk b/vbahelper/Library_msforms.mk index 9a5493c12cb8..e8c009b3e59f 100644 --- a/vbahelper/Library_msforms.mk +++ b/vbahelper/Library_msforms.mk @@ -63,9 +63,10 @@ $(eval $(call gb_Library_use_libraries,msforms,\ vbahelper \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,msforms)) + # add all source files that shall be compiled with exceptions enabled # the name is relative to $(SRCROOT) and must not contain an extension $(eval $(call gb_Library_add_exception_objects,msforms,\ diff --git a/vbahelper/Library_vbahelper.mk b/vbahelper/Library_vbahelper.mk index 8bbe47457870..06a146904a5c 100644 --- a/vbahelper/Library_vbahelper.mk +++ b/vbahelper/Library_vbahelper.mk @@ -66,9 +66,10 @@ $(eval $(call gb_Library_use_libraries,vbahelper,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vbahelper)) + # add all source files that shall be compiled with exceptions enabled # the name is relative to $(SRCROOT) and must not contain an extension $(eval $(call gb_Library_add_exception_objects,vbahelper,\ diff --git a/vcl/Executable_kdefilepicker.mk b/vcl/Executable_kdefilepicker.mk index 9e185e155544..c0adf2735b6f 100644 --- a/vcl/Executable_kdefilepicker.mk +++ b/vcl/Executable_kdefilepicker.mk @@ -33,9 +33,10 @@ $(eval $(call gb_Executable_add_defs,kdefilepicker,\ $(eval $(call gb_Executable_use_libraries,kdefilepicker,\ sal \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,kdefilepicker)) + $(eval $(call gb_Executable_add_libs,kdefilepicker,\ $(KDE_LIBS) \ -lkio -lX11 \ diff --git a/vcl/Executable_tdefilepicker.mk b/vcl/Executable_tdefilepicker.mk index a92bb5ede1cb..7458f4197b2c 100644 --- a/vcl/Executable_tdefilepicker.mk +++ b/vcl/Executable_tdefilepicker.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Executable_set_include,tdefilepicker,\ $(eval $(call gb_Executable_use_libraries,tdefilepicker,\ sal \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,tdefilepicker)) + $(eval $(call gb_Executable_add_libs,tdefilepicker,\ $(TDE_LIBS) \ -lkio -lX11 \ diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk index 91438e9c2d54..af8578988c34 100644 --- a/vcl/Library_desktop_detector.mk +++ b/vcl/Library_desktop_detector.mk @@ -59,9 +59,10 @@ $(eval $(call gb_Library_use_libraries,desktop_detector,\ Xext \ SM \ ICE \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,desktop_detector)) + $(eval $(call gb_Library_use_externals,desktop_detector,\ icule \ icuuc \ diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index df68439c72c1..a7ee6ca8e3d9 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -85,9 +85,10 @@ $(eval $(call gb_Library_use_libraries,vcl,\ sal \ xmlreader \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vcl)) + ifeq ($(OS),MACOSX) $(eval $(call gb_Library_use_libraries,vcl,\ objc \ diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 88e997b0c7a8..0261c036465b 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,vclplug_gen,\ Xext \ SM \ ICE \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vclplug_gen)) + $(eval $(call gb_Library_use_externals,vclplug_gen,\ cairo \ icule \ diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index 4684aa18f474..2d3b46eaa686 100644 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -61,9 +61,10 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk,\ Xext \ SM \ ICE \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vclplug_gtk)) + $(eval $(call gb_Library_use_externals,vclplug_gtk,\ dbus \ gtk \ diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk index 187773c6b719..138904a0a004 100644 --- a/vcl/Library_vclplug_gtk3.mk +++ b/vcl/Library_vclplug_gtk3.mk @@ -73,9 +73,10 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk3,\ Xext \ SM \ ICE \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vclplug_gtk3)) + $(eval $(call gb_Library_use_externals,vclplug_gtk3,\ dbus \ )) diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk index 5f405cc6f47a..7aa5ee5e230b 100644 --- a/vcl/Library_vclplug_kde.mk +++ b/vcl/Library_vclplug_kde.mk @@ -62,9 +62,10 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde,\ Xext \ SM \ ICE \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vclplug_kde)) + $(eval $(call gb_Library_use_externals,vclplug_kde,\ icule \ icuuc \ diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk index 057ea274354a..3fbb80319a80 100644 --- a/vcl/Library_vclplug_kde4.mk +++ b/vcl/Library_vclplug_kde4.mk @@ -60,9 +60,10 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde4,\ Xext \ SM \ ICE \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vclplug_kde4)) + $(eval $(call gb_Library_use_externals,vclplug_kde4,\ icule \ icuuc \ diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk index f859b1ef4104..63c9d725af73 100644 --- a/vcl/Library_vclplug_svp.mk +++ b/vcl/Library_vclplug_svp.mk @@ -58,9 +58,10 @@ $(eval $(call gb_Library_use_libraries,vclplug_svp,\ jvmaccess \ cppu \ sal \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vclplug_svp)) + $(eval $(call gb_Library_use_externals,vclplug_svp,\ icule \ icuuc \ diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk index b698cb45552f..5e61c6315d7a 100644 --- a/vcl/Library_vclplug_tde.mk +++ b/vcl/Library_vclplug_tde.mk @@ -67,9 +67,10 @@ $(eval $(call gb_Library_use_libraries,vclplug_tde,\ Xext \ SM \ ICE \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vclplug_tde)) + $(eval $(call gb_Library_use_externals,vclplug_tde,\ icule \ icuuc \ diff --git a/writerfilter/CppunitTest_writerfilter_doctok.mk b/writerfilter/CppunitTest_writerfilter_doctok.mk index cf48c49851cf..b5b8e7e928b8 100644 --- a/writerfilter/CppunitTest_writerfilter_doctok.mk +++ b/writerfilter/CppunitTest_writerfilter_doctok.mk @@ -38,9 +38,10 @@ $(eval $(call gb_CppunitTest_use_libraries,writerfilter_doctok, \ sal \ writerfilter \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,writerfilter_doctok)) + $(eval $(call gb_CppunitTest_set_include,writerfilter_doctok,\ $$(INCLUDE) \ -I$(SRCDIR)/writerfilter/inc \ diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk index 78f2a008abc6..a50d72151a30 100644 --- a/writerfilter/CppunitTest_writerfilter_rtftok.mk +++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk @@ -44,9 +44,10 @@ $(eval $(call gb_CppunitTest_use_libraries,writerfilter_rtftok, \ vcl \ writerfilter \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,writerfilter_rtftok)) + $(eval $(call gb_CppunitTest_use_api,writerfilter_rtftok,\ offapi \ udkapi \ diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index 83006badc658..5429ea7af4c6 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -81,9 +81,10 @@ $(eval $(call gb_Library_use_libraries,writerfilter,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,writerfilter)) + $(eval $(call gb_Library_use_external,writerfilter,libxml2)) $(eval $(call gb_Library_add_exception_objects,writerfilter,\ diff --git a/writerfilter/Library_writerfilter_uno.mk b/writerfilter/Library_writerfilter_uno.mk index d7a72fc4c0c8..bc0bd83c9205 100644 --- a/writerfilter/Library_writerfilter_uno.mk +++ b/writerfilter/Library_writerfilter_uno.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,writerfilter_uno,\ sal \ writerfilter \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,writerfilter_uno)) + $(eval $(call gb_Library_use_external,writerfilter_uno,libxml2)) $(eval $(call gb_Library_add_exception_objects,writerfilter_uno,\ diff --git a/writerperfect/Library_wpftdraw.mk b/writerperfect/Library_wpftdraw.mk index 412b0c982430..38e961df7ebf 100644 --- a/writerperfect/Library_wpftdraw.mk +++ b/writerperfect/Library_wpftdraw.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,wpftdraw,\ utl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,wpftdraw)) + $(eval $(call gb_Library_use_static_libraries,wpftdraw,\ writerperfect \ )) diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk index a4295a5019b6..3752308b6fa3 100644 --- a/writerperfect/Library_wpftwriter.mk +++ b/writerperfect/Library_wpftwriter.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,wpftwriter,\ utl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,wpftwriter)) + $(eval $(call gb_Library_use_static_libraries,wpftwriter,\ writerperfect \ )) diff --git a/xml2cmp/Executable_xml2cmp.mk b/xml2cmp/Executable_xml2cmp.mk index 878e9e20fe53..9704b7642b3e 100644 --- a/xml2cmp/Executable_xml2cmp.mk +++ b/xml2cmp/Executable_xml2cmp.mk @@ -46,8 +46,6 @@ $(eval $(call gb_Executable_add_exception_objects,xml2cmp,\ xml2cmp/source/xcd/dependy \ )) -#uwinapi is part of STDLIBS on windows, but it is created in sal, which -#depends on this module. -$(eval $(call gb_Executable_use_libraries,xml2cmp,\ - $(filter-out uwinapi,$(gb_STDLIBS)) \ -)) +$(eval $(call gb_Executable_add_standard_system_libs,xml2cmp)) + +# vim: set noet sw=4 ts=4: diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk index 73be015cb824..d51a29352829 100644 --- a/xmloff/Library_xo.mk +++ b/xmloff/Library_xo.mk @@ -56,9 +56,10 @@ $(eval $(call gb_Library_use_libraries,xo,\ tl \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,xo)) + $(eval $(call gb_Library_add_exception_objects,xo,\ xmloff/source/chart/ColorPropertySet \ xmloff/source/chart/PropertyMaps \ diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk index 15e65da4c325..e1870a4d6029 100644 --- a/xmloff/Library_xof.mk +++ b/xmloff/Library_xof.mk @@ -46,9 +46,10 @@ $(eval $(call gb_Library_use_libraries,xof,\ sax \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,xof)) + $(eval $(call gb_Library_add_exception_objects,xof,\ xmloff/source/transform/ChartOASISTContext \ xmloff/source/transform/ChartOOoTContext \ diff --git a/xmlreader/Library_xmlreader.mk b/xmlreader/Library_xmlreader.mk index 7035278e9c44..b3cd8f704aff 100644 --- a/xmlreader/Library_xmlreader.mk +++ b/xmlreader/Library_xmlreader.mk @@ -38,10 +38,11 @@ $(eval $(call gb_Library_use_libraries,xmlreader,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) # cppu is only needed due to the cppumaker -C hack +$(eval $(call gb_Library_add_standard_system_libs,xmlreader)) + $(eval $(call gb_Library_add_exception_objects,xmlreader,\ xmlreader/source/pad \ xmlreader/source/span \ diff --git a/xmlscript/Library_xmlscript.mk b/xmlscript/Library_xmlscript.mk index 3f83379ba8b3..00353edc75e2 100644 --- a/xmlscript/Library_xmlscript.mk +++ b/xmlscript/Library_xmlscript.mk @@ -24,9 +24,10 @@ $(eval $(call gb_Library_use_libraries,xmlscript,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,xmlscript)) + $(eval $(call gb_Library_set_include,xmlscript,\ -I$(SRCDIR)/xmlscript/source/inc \ $$(INCLUDE) \ diff --git a/xmlsecurity/CppunitTest_qa_certext.mk b/xmlsecurity/CppunitTest_qa_certext.mk index 7501f23cc110..201b8bf540cb 100644 --- a/xmlsecurity/CppunitTest_qa_certext.mk +++ b/xmlsecurity/CppunitTest_qa_certext.mk @@ -45,9 +45,10 @@ $(eval $(call gb_CppunitTest_use_libraries,xmlsecurity_qa_certext,\ test \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,xmlsecurity_qa_certext)) + $(eval $(call gb_CppunitTest_add_exception_objects,xmlsecurity_qa_certext,\ xmlsecurity/qa/certext/SanCertExt \ )) diff --git a/xmlsecurity/Library_xmlsecurity.mk b/xmlsecurity/Library_xmlsecurity.mk index 09766bc188f4..3333e21f5fce 100644 --- a/xmlsecurity/Library_xmlsecurity.mk +++ b/xmlsecurity/Library_xmlsecurity.mk @@ -52,9 +52,10 @@ $(eval $(call gb_Library_use_libraries,xmlsecurity,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,xmlsecurity)) + $(eval $(call gb_Library_add_exception_objects,xmlsecurity,\ xmlsecurity/source/component/certificatecontainer \ xmlsecurity/source/component/documentdigitalsignatures \ diff --git a/xmlsecurity/Library_xsec_fw.mk b/xmlsecurity/Library_xsec_fw.mk index 99b393f532de..1aea707bcb5e 100644 --- a/xmlsecurity/Library_xsec_fw.mk +++ b/xmlsecurity/Library_xsec_fw.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,xsec_fw,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,xsec_fw)) + $(eval $(call gb_Library_add_exception_objects,xsec_fw,\ xmlsecurity/source/framework/buffernode \ xmlsecurity/source/framework/decryptorimpl \ diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index 5195db72d41a..41cbfafcaad1 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -66,9 +66,10 @@ $(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ tl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,xsec_xmlsec)) + $(eval $(call gb_Library_use_externals,xsec_xmlsec,\ libxml2 \ )) From 40e0ebff76d839a548638ca8709c68c56e2b926c Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 27 Sep 2012 18:27:10 +0200 Subject: [PATCH 005/863] gbuild: remove libraries handled by RepositoryExternal.mk Change-Id: I159b7942cfa26f81ada421403835ff0f1e4b09ef --- solenv/gbuild/platform/IOS_ARM_GCC.mk | 2 -- solenv/gbuild/platform/WNT_INTEL_GCC.mk | 1 - solenv/gbuild/platform/WNT_INTEL_MSC.mk | 2 -- solenv/gbuild/platform/solaris.mk | 2 -- solenv/gbuild/platform/unxgcc.mk | 2 -- 5 files changed, 9 deletions(-) diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index daef8275892c..491d0cb9bb0d 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -211,10 +211,8 @@ gb_Library__FRAMEWORKS := \ gb_Library_PLAINLIBS_NONE += \ objc \ - jpeg \ m \ pthread \ - z \ gb_Library_FILENAMES := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \ diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index d2e53537d2e9..c6e351493911 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -228,7 +228,6 @@ gb_Library_PLAINLIBS_NONE += \ ddraw \ gdi32 \ gdiplus \ - gnu_getopt \ imm32 \ kernel32 \ jawt \ diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 739427e65659..8680c2e63d43 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -414,11 +414,9 @@ gb_Library_PLAINLIBS_NONE += \ delayimp \ gdi32 \ gdiplus \ - gnu_getopt \ imm32\ kernel32 \ jawt \ - ldap \ libcmt \ libcmtd \ mpr \ diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index be54115de350..1975a15ac2a0 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -243,8 +243,6 @@ gb_STDLIBS := \ gb_Library_PLAINLIBS_NONE += \ dl \ - fontconfig \ - freetype \ GL \ GLU \ ICE \ diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 0e18a741e248..aca89d933099 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -241,8 +241,6 @@ gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT) gb_Library_PLAINLIBS_NONE += \ dl \ - fontconfig \ - freetype \ GL \ GLU \ ICE \ From 78b59b8302e79fad71bfff66d5b88db80527e6a1 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 27 Sep 2012 21:45:47 +0200 Subject: [PATCH 006/863] gbuild: clean up usage of weird x11_extensions module etc. Move libraries using those headers to RepositoryExternal.mk and also move pkg-config invocation to configure. Change-Id: I17a240fcba83a98f3f248f15b34d245f941c62e2 --- RepositoryExternal.mk | 62 +++++++++++++++++++++++++++++++ canvas/Library_cairocanvas.mk | 6 ++- config_host.mk.in | 2 + configure.in | 3 ++ solenv/gbuild/platform/solaris.mk | 1 - solenv/gbuild/platform/unxgcc.mk | 1 - vcl/Library_vcl.mk | 7 +--- vcl/Library_vclplug_gen.mk | 23 +++--------- 8 files changed, 78 insertions(+), 27 deletions(-) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 05880d958992..d653b208dba2 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1940,6 +1940,68 @@ endef endif # SYSTEM_LIBORCUS + +### X11 stuff ### + +ifeq ($(GUIBASE),unx) + +# TODO: do we really need these X11 headers in the repo? +ifneq ($(filter X11_EXTENSIONS,$(BUILD_TYPE)),) + +define gb_LinkTarget__use_x11extensions +$(call gb_LinkTarget_use_packages,$(1),\ + x11_extensions_inc \ +) +endef + +else # !X11_EXTENSIONS + +gb_LinkTarget__use_x11extensions := + +endif # X11_EXTENSIONS + +ifeq ($(XRANDR_DLOPEN),FALSE) + +define gb_LinkTarget__use_Xrandr +$(call gb_LinkTarget__use_x11extensions,$(1)) + +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(XRANDR_CFLAGS) \ +) + +$(call gb_LinkTarget_add_libs,$(1),\ + $(XRANDR_LIBS) \ +) +endef + +else # XRANDR_DLOPEN + +define gb_LinkTarget__use_Xrandr +$(call gb_LinkTarget__use_x11extensions,$(1)) + +$(call gb_LinkTarget_add_defs,$(1),\ + -DXRANDR_DLOPEN \ +) +endef + +endif # XRANDR_DLOPEN + +define gb_LinkTarget__use_Xrender +$(call gb_LinkTarget__use_x11extensions,$(1)) + +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(XRENDER_CFLAGS) \ +) + +$(call gb_LinkTarget_add_libs,$(1),\ + $(XRENDER_LIBS) \ +) +endef + +endif # GUIBASE=unx + # MacOSX-only frameworks ############################################ # (in alphabetical order) diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk index 85ea94cda4ed..a30333a3069f 100644 --- a/canvas/Library_cairocanvas.mk +++ b/canvas/Library_cairocanvas.mk @@ -91,7 +91,9 @@ $(eval $(call gb_Library_add_exception_objects,cairocanvas,\ canvas/source/cairo/cairo_textlayout \ )) -$(eval $(call gb_Library_use_external,cairocanvas,cairo)) +$(eval $(call gb_Library_use_externals,cairocanvas,\ + cairo \ +)) ifeq ($(OS),WNT) @@ -116,6 +118,8 @@ $(eval $(call gb_Library_add_exception_objects,cairocanvas,\ # freetype? fontconfig? -> test on Solaris $(eval $(call gb_Library_use_libraries,cairocanvas,\ X11 \ +)) +$(eval $(call gb_Library_use_externals,cairocanvas,\ Xrender \ )) endif diff --git a/config_host.mk.in b/config_host.mk.in index 81890c69a363..231009810aa1 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -654,5 +654,7 @@ export XMLLINT=@XMLLINT@ export XRANDR_CFLAGS=@XRANDR_CFLAGS@ export XRANDR_DLOPEN=@XRANDR_DLOPEN@ export XRANDR_LIBS=@XRANDR_LIBS@ +export XRENDER_CFLAGS=@XRENDER_CFLAGS@ +export XRENDER_LIBS=@XRENDER_LIBS@ export XSLTML_TARBALL=@XSLTML_TARBALL@ export XSLTPROC=@XSLTPROC@ diff --git a/configure.in b/configure.in index 17b13c61bf05..c1abd8aa2ddb 100644 --- a/configure.in +++ b/configure.in @@ -8535,6 +8535,7 @@ dnl =================================================================== AC_MSG_CHECKING([whether to use Xrender]) if test "$WANT_X11" = "yes" -a "$test_xrender" = "yes"; then AC_MSG_RESULT([yes]) + PKG_CHECK_MODULES(XRENDER, xrender) AC_CHECK_LIB([Xrender], [XRenderQueryVersion], [:], [AC_MSG_ERROR(libXrender not found or functional)], []) AC_MSG_CHECKING([which Xrender headers to use]) @@ -8548,6 +8549,8 @@ if test "$WANT_X11" = "yes" -a "$test_xrender" = "yes"; then else AC_MSG_RESULT([no]) fi +AC_SUBST(XRENDER_CFLAGS) +AC_SUBST(XRENDER_LIBS) dnl =================================================================== dnl Check for XRandr diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 1975a15ac2a0..ba4b4ab005c4 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -254,7 +254,6 @@ gb_Library_PLAINLIBS_NONE += \ ICE \ X11 \ Xext \ - Xrender \ gb_Library_FILENAMES := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \ diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index aca89d933099..4946cf29d55e 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -250,7 +250,6 @@ gb_Library_PLAINLIBS_NONE += \ ICE \ X11 \ Xext \ - Xrender \ gb_Library_FILENAMES := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \ diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index a7ee6ca8e3d9..ce6d41e4a107 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -44,12 +44,6 @@ endif $(eval $(call gb_Library_use_package,vcl,vcl_inc)) -ifneq ($(filter X11_EXTENSIONS,$(BUILD_TYPE)),) -$(eval $(call gb_Library_use_packages,vclplug_gen,\ - x11_extensions_inc \ -)) -endif - $(eval $(call gb_Library_use_custom_headers,vcl,vcl/generic/fontmanager)) $(eval $(call gb_Library_set_include,vcl,\ @@ -526,6 +520,7 @@ $(eval $(call gb_Library_use_externals,vcl,\ dbus \ fontconfig \ freetype \ + x11extensions \ )) endif diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 0261c036465b..46c5f522820c 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -61,6 +61,7 @@ $(eval $(call gb_Library_use_externals,vclplug_gen,\ cairo \ icule \ icuuc \ + Xrender \ )) $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\ @@ -111,22 +112,12 @@ $(eval $(call gb_Library_add_defs,vclplug_gen,\ ## handle RandR ifneq ($(ENABLE_RANDR),) +$(eval $(call gb_Library_use_externals,vclplug_gen,\ + Xrandr \ +)) $(eval $(call gb_Library_add_defs,vclplug_gen,\ -DUSE_RANDR \ )) -ifeq ($(XRANDR_DLOPEN),FALSE) -$(eval $(call gb_Library_set_include,vclplug_gen,\ - $$(INCLUDE) \ - $$(XRANDR_CFLAGS) \ -)) -$(eval $(call gb_Library_add_libs,vclplug_gen,\ - $(XRANDR_LIBS) \ -)) -else -$(eval $(call gb_Library_add_defs,vclplug_gen,\ - -DXRANDR_DLOPEN \ -)) -endif endif $(eval $(call gb_Library_add_defs,vclplug_gen,\ @@ -172,11 +163,6 @@ endif endif endif -## handle Render linking -$(eval $(call gb_Library_add_libs,vclplug_gen,\ - $(shell pkg-config --libs xrender) \ -)) - ifeq ($(OS),LINUX) $(eval $(call gb_Library_use_libraries,vclplug_gen,\ dl \ @@ -184,4 +170,5 @@ $(eval $(call gb_Library_use_libraries,vclplug_gen,\ pthread \ )) endif + # vim: set noet sw=4 ts=4: From b05430409b3eb3a4b8649895788e025fc9a0d9a0 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 27 Sep 2012 22:54:29 +0200 Subject: [PATCH 007/863] vcl: clean up that Xinerama linkage... ... odd duplication apparently due to wrong conversion from dmakefile. Change-Id: I9a9e183373ec43fb0b1eadc2c233ce659bebd107 --- vcl/Library_vclplug_gen.mk | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 46c5f522820c..d9a9d236944c 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -129,8 +129,8 @@ $(eval $(call gb_Library_add_defs,vclplug_gen,\ ## handle Xinerama ifneq ($(USE_XINERAMA),NO) -ifneq ($(OS),SOLARIS) -# not Solaris +ifneq ($(OS)$(USE_XINERAMA_VERSION),SOLARISXsun) +# not Solaris/Xsun $(eval $(call gb_Library_add_defs,vclplug_gen,\ -DUSE_XINERAMA_XORG \ )) @@ -143,25 +143,12 @@ $(eval $(call gb_Library_add_libs,vclplug_gen,\ -Wl,-Bstatic -lXinerama -Wl,-Bdynamic \ )) endif -else -# Solaris +else # Solaris/Xsun $(eval $(call gb_Library_add_defs,vclplug_gen,\ -DUSE_XINERAMA_XSUN \ )) -ifeq ($(USE_XINERAMA_VERSION),Xorg) -# Solaris, Xorg -ifeq ($(XINERAMA_LINK),dynamic) -$(eval $(call gb_Library_add_libs,vclplug_gen,\ - -lXinerama \ -)) -else -$(eval $(call gb_Library_add_libs,vclplug_gen,\ - -Wl,-Bstatic -lXinerama -Wl,-Bdynamic \ -)) -endif -endif -endif endif +endif # USE_XINERAMA ifeq ($(OS),LINUX) $(eval $(call gb_Library_use_libraries,vclplug_gen,\ From cee32aae398283c38b42c73add694e9d074a5d62 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 00:18:12 +0200 Subject: [PATCH 008/863] gbuild: clean up Mac OS X framework handling: There are currently 3 different mechanisms being used for frameworks, which is of course intolerable so we invent a 4th one and standardize on it: gb_LinkTarget_use_darwin_frameworks (This doesn't mean using add_libs or externals was wrong, it was just inconsistent... and i don't see an obvious benefit of using externals here) Change-Id: I5de9020402c87e7236c6a358c47f02fa56642d3d --- Library_merged.mk | 18 ++--- RepositoryExternal.mk | 90 ---------------------- apple_remote/Library_AppleRemote.mk | 17 ++-- avmedia/Library_avmediaQuickTime.mk | 8 +- canvas/Library_cairocanvas.mk | 4 +- connectivity/Library_macabdrv1.mk | 6 +- extensions/Library_OOoSpotlightImporter.mk | 8 +- extensions/Library_pl.mk | 8 +- fpicker/Library_fps_aqua.mk | 6 +- lingucomponent/Library_MacOSXSpell.mk | 5 +- sal/Library_sal.mk | 6 +- sfx2/Library_sfx.mk | 6 +- shell/Library_localebe.mk | 6 +- shell/Library_macbe.mk | 6 +- slideshow/Library_OGLTrans.mk | 2 +- solenv/gbuild/CppunitTest.mk | 1 + solenv/gbuild/Executable.mk | 1 + solenv/gbuild/Library.mk | 1 + solenv/gbuild/platform/IOS_ARM_GCC.mk | 16 ++-- solenv/gbuild/platform/macosx.mk | 20 ++--- vcl/Library_vcl.mk | 20 ++--- 21 files changed, 77 insertions(+), 178 deletions(-) diff --git a/Library_merged.mk b/Library_merged.mk index 8914e598e5fc..847e5474e576 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -131,12 +131,12 @@ $(eval $(call gb_Library_use_libraries,merged,\ AppleRemote \ objc \ )) -$(eval $(call gb_Library_use_externals,merged,\ - carbon \ - cocoa \ - corefoundation \ - coreservices \ - quicktime \ +$(eval $(call gb_Library_use_system_darwin_frameworks,merged,\ + Carbon \ + Cocoa \ + CoreFoundation \ + CoreServices \ + QuickTime \ )) endif @@ -162,9 +162,9 @@ $(eval $(call gb_Library_use_externals,merged,\ endif ifeq ($(OS),IOS) -$(eval $(call gb_Library_use_externals,merged,\ - corefoundation \ - uikit \ +$(eval $(call gb_Library_use_system_darwin_frameworks,merged,\ + CoreFoundation \ + UIKit \ )) endif diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index d653b208dba2..2f79d77ec35d 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2002,96 +2002,6 @@ endef endif # GUIBASE=unx -# MacOSX-only frameworks ############################################ -# (in alphabetical order) - -define gb_LinkTarget__use_carbon -$(call gb_LinkTarget_add_libs,$(1), \ - -framework Carbon \ -) - -endef - -define gb_LinkTarget__use_cocoa -$(call gb_LinkTarget_add_libs,$(1), \ - -framework Cocoa \ -) - -endef - -define gb_LinkTarget__use_iokit -$(call gb_LinkTarget_add_libs,$(1), \ - -framework IOKit \ -) - -endef - -define gb_LinkTarget__use_qtkit -$(call gb_LinkTarget_add_libs,$(1), \ - -framework QTKit \ -) - -endef - -define gb_LinkTarget__use_quicktime -$(call gb_LinkTarget_add_libs,$(1), \ - -framework QuickTime \ -) - -endef - -# Common MacOSX and iOS frameworks - -define gb_LinkTarget__use_corefoundation -$(call gb_LinkTarget_add_libs,$(1), \ - -framework CoreFoundation \ -) - -endef - -define gb_LinkTarget__use_coregraphics -$(call gb_Library_add_libs,$(1), \ - -framework CoreGraphics \ -) - -endef - -define gb_LinkTarget__use_coreservices -$(call gb_Library_add_libs,$(1), \ - -framework CoreServices \ -) - -endef - -define gb_LinkTarget__use_coretext -$(call gb_Library_add_libs,$(1), \ - -framework CoreText \ -) - -endef - -define gb_LinkTarget__use_foundation -$(call gb_LinkTarget_add_libs,$(1), \ - -framework Foundation \ -) - -endef - -define gb_LinkTarget__use_systemconfiguration -$(call gb_LinkTarget_add_libs,$(1), \ - -framework SystemConfiguration \ -) - -endef - -# iOS-only frameworks - -define gb_LinkTarget__use_uikit -$(call gb_LinkTarget_add_libs,$(1), \ - -framework UIKit \ -) - -endef ifeq (,$(filter DESKTOP,$(BUILD_TYPE))) diff --git a/apple_remote/Library_AppleRemote.mk b/apple_remote/Library_AppleRemote.mk index 37a19282e043..c5fdbef72b08 100644 --- a/apple_remote/Library_AppleRemote.mk +++ b/apple_remote/Library_AppleRemote.mk @@ -1,4 +1,3 @@ - # -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- # # Version: MPL 1.1 / GPLv3+ / LGPLv3+ @@ -33,16 +32,10 @@ $(eval $(call gb_Library_use_package,AppleRemote,\ apple_remote_inc \ )) -$(eval $(call gb_Library_use_externals,AppleRemote,\ - cocoa \ - carbon \ - iokit \ -)) - -$(eval $(call gb_Library_add_libs,AppleRemote,\ - -framework Cocoa \ - -framework Carbon \ - -framework IOKit \ +$(eval $(call gb_Library_use_system_darwin_frameworks,AppleRemote,\ + Cocoa \ + Carbon \ + IOKit \ )) $(eval $(call gb_Library_add_objcobjects,AppleRemote,\ @@ -55,3 +48,5 @@ $(eval $(call gb_Library_add_objcobjects,AppleRemote,\ apple_remote/source/MultiClickRemoteBehavior \ apple_remote/source/RemoteMainController \ )) + +# vim: set noet sw=4 ts=4: diff --git a/avmedia/Library_avmediaQuickTime.mk b/avmedia/Library_avmediaQuickTime.mk index 1daa4aafbe10..7906a37c9665 100644 --- a/avmedia/Library_avmediaQuickTime.mk +++ b/avmedia/Library_avmediaQuickTime.mk @@ -49,10 +49,10 @@ $(eval $(call gb_Library_use_libraries,avmediaQuickTime,\ $(eval $(call gb_Library_add_standard_system_libs,avmediaQuickTime)) -$(eval $(call gb_Library_use_externals,avmediaQuickTime,\ - cocoa \ - qtkit \ - quicktime \ +$(eval $(call gb_Library_use_system_darwin_frameworks,avmediaQuickTime,\ + Cocoa \ + QTKit \ + QuickTime \ )) $(eval $(call gb_Library_add_objcxxobjects,avmediaQuickTime,\ diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk index a30333a3069f..1bfb26f86c8c 100644 --- a/canvas/Library_cairocanvas.mk +++ b/canvas/Library_cairocanvas.mk @@ -43,8 +43,8 @@ $(eval $(call gb_Library_add_cxxflags,cairocanvas,\ $(gb_OBJCXXFLAGS) \ )) -$(eval $(call gb_Library_add_libs,cairocanvas,\ - -framework Cocoa \ +$(eval $(call gb_Library_use_system_darwin_frameworks,cairocanvas,\ + Cocoa \ )) endif diff --git a/connectivity/Library_macabdrv1.mk b/connectivity/Library_macabdrv1.mk index bfb78473a161..feb754356a51 100644 --- a/connectivity/Library_macabdrv1.mk +++ b/connectivity/Library_macabdrv1.mk @@ -29,9 +29,9 @@ $(eval $(call gb_Library_Library,macabdrv1)) $(eval $(call gb_Library_use_sdk_api,macabdrv1)) -$(eval $(call gb_Library_add_libs,macabdrv1,\ - -framework Carbon \ - -framework AddressBook \ +$(eval $(call gb_Library_use_system_darwin_frameworks,macabdrv1,\ + Carbon \ + AddressBook \ )) $(eval $(call gb_Library_use_libraries,macabdrv1,\ diff --git a/extensions/Library_OOoSpotlightImporter.mk b/extensions/Library_OOoSpotlightImporter.mk index 112c7a6bbbed..ef48cb3253fe 100644 --- a/extensions/Library_OOoSpotlightImporter.mk +++ b/extensions/Library_OOoSpotlightImporter.mk @@ -38,10 +38,10 @@ $(eval $(call gb_Library_add_objcobjects,OOoSpotlightImporter,\ extensions/source/macosx/spotlight/main \ )) -$(eval $(call gb_Library_add_ldflags,OOoSpotlightImporter,\ - -framework CoreFoundation \ - -framework Foundation \ - -framework CoreServices \ +$(eval $(call gb_Library_use_system_darwin_frameworks,OOoSpotlightImporter,\ + CoreFoundation \ + Foundation \ + CoreServices \ )) $(eval $(call gb_Library_use_external,OOoSpotlightImporter,zlib)) diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk index 45b1b75d58b7..34b147320771 100644 --- a/extensions/Library_pl.mk +++ b/extensions/Library_pl.mk @@ -84,10 +84,10 @@ $(eval $(call gb_Library_add_objcxxobjects,pl,\ extensions/source/plugin/aqua/sysplug \ )) -$(eval $(call gb_Library_use_externals,pl,\ - cocoa \ - carbon \ - corefoundation \ +$(eval $(call gb_Library_use_system_darwin_frameworks,pl,\ + Cocoa \ + Carbon \ + CoreFoundation \ )) else # GUIBASE!=aqua diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk index 2c7665855779..1f1d3e4f2fd9 100644 --- a/fpicker/Library_fps_aqua.mk +++ b/fpicker/Library_fps_aqua.mk @@ -35,9 +35,9 @@ $(eval $(call gb_Library_use_packages,fps_aqua,\ $(eval $(call gb_Library_use_sdk_api,fps_aqua)) -$(eval $(call gb_Library_add_libs,fps_aqua,\ - -framework Cocoa \ - -framework CoreFoundation \ +$(eval $(call gb_Library_use_system_darwin_frameworks,fps_aqua,\ + Cocoa \ + CoreFoundation \ )) $(eval $(call gb_Library_use_libraries,fps_aqua,\ diff --git a/lingucomponent/Library_MacOSXSpell.mk b/lingucomponent/Library_MacOSXSpell.mk index 57d5a65568d1..b2bcd1952396 100644 --- a/lingucomponent/Library_MacOSXSpell.mk +++ b/lingucomponent/Library_MacOSXSpell.mk @@ -49,8 +49,11 @@ $(eval $(call gb_Library_use_libraries,MacOSXSpell,\ $(eval $(call gb_Library_add_standard_system_libs,MacOSXSpell)) +$(eval $(call gb_Library_use_system_darwin_frameworks,MacOSXSpell,\ + Cocoa \ +)) + $(eval $(call gb_Library_use_externals,MacOSXSpell,\ - cocoa \ hunspell \ )) diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index f5b3b3d4e689..c42728ff9ac1 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -87,9 +87,9 @@ $(eval $(call gb_Library_use_libraries,sal,\ $(eval $(call gb_Library_add_standard_system_libs,sal)) ifeq ($(OS),MACOSX) -$(eval $(call gb_Library_use_externals,sal,\ - carbon \ - corefoundation \ +$(eval $(call gb_Library_use_system_darwin_frameworks,sal,\ + Carbon \ + CoreFoundation \ )) endif diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index 23badc19286e..c384a1b98046 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -280,8 +280,10 @@ ifeq ($(OS),MACOSX) $(eval $(call gb_Library_add_objcxxobjects,sfx,\ sfx2/source/appl/shutdowniconaqua \ )) -$(eval $(call gb_Library_use_libraries,sfx,\ - objc \ +$(eval $(call gb_Library_add_libs,sfx,\ + -lobjc \ +)) +$(eval $(call gb_Library_use_system_darwin_frameworks,sfx,\ Cocoa \ )) endif diff --git a/shell/Library_localebe.mk b/shell/Library_localebe.mk index 96022b731a24..0cefa0b8908f 100644 --- a/shell/Library_localebe.mk +++ b/shell/Library_localebe.mk @@ -30,9 +30,9 @@ $(eval $(call gb_Library_Library,localebe1)) $(eval $(call gb_Library_use_sdk_api,localebe1)) ifeq ($(OS),MACOSX) -$(eval $(call gb_Library_use_externals,localebe1,\ - corefoundation \ - coreservices \ +$(eval $(call gb_Library_use_system_darwin_frameworks,localebe1,\ + CoreFoundation \ + CoreServices \ )) endif diff --git a/shell/Library_macbe.mk b/shell/Library_macbe.mk index 236cc6ce6e0a..6746fc0bffb8 100644 --- a/shell/Library_macbe.mk +++ b/shell/Library_macbe.mk @@ -29,9 +29,9 @@ $(eval $(call gb_Library_Library,macbe1)) $(eval $(call gb_Library_use_sdk_api,macbe1)) -$(eval $(call gb_Library_use_externals,macbe1,\ - cocoa \ - systemconfiguration \ +$(eval $(call gb_Library_use_system_darwin_frameworks,macbe1,\ + Cocoa \ + SystemConfiguration \ )) $(eval $(call gb_Library_use_libraries,macbe1,\ diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk index 380f935d9e0e..c3c2b6d768c0 100644 --- a/slideshow/Library_OGLTrans.mk +++ b/slideshow/Library_OGLTrans.mk @@ -74,7 +74,7 @@ $(eval $(call gb_Library_add_objcxxobjects,OGLTrans,\ , $(gb_LinkTarget_EXCEPTIONFLAGS) \ )) -$(eval $(call gb_Library_use_libraries,OGLTrans,\ +$(eval $(call gb_Library_use_system_darwin_frameworks,OGLTrans,\ Cocoa \ GLUT \ OpenGL \ diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index ee844de24330..02af2fbda472 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -342,6 +342,7 @@ $(eval $(foreach method,\ set_ldflags \ add_libs \ add_standard_system_libs \ + use_system_darwin_frameworks \ use_sdk_api \ use_udk_api \ use_internal_api \ diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index 1ddedfdad41b..243e3cda7b24 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -106,6 +106,7 @@ $(eval $(foreach method,\ set_ldflags \ add_libs \ add_standard_system_libs \ + use_system_darwin_frameworks \ set_library_path_flags \ add_api \ use_api \ diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 10ca542b58c5..131806f8d273 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -186,6 +186,7 @@ $(eval $(foreach method,\ set_x64 \ add_libs \ add_standard_system_libs \ + use_system_darwin_frameworks \ set_library_path_flags \ add_api \ use_api \ diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index 491d0cb9bb0d..a36d6a36182d 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -136,11 +136,9 @@ gb_LinkTarget_OBJCXXFLAGS += -g gb_LinkTarget_OBJCFLAGS += -g endif -# FIXME framework handling very hackish define gb_LinkTarget__get_liblinkflags -$(patsubst lib%.a,-l%,$(foreach lib,$(filter-out $(gb_Library__FRAMEWORKS) $(gb_Library_UNOLIBS_OOO),$(1)),$(call gb_Library_get_filename,$(lib)))) \ -$(foreach lib,$(filter $(gb_Library_UNOLIBS_OOO),$(1)),$(SOLARVER)/$(INPATH)/lib/$(lib)$(gb_Library_UNOEXT)) \ -$(addprefix -framework ,$(filter $(gb_Library__FRAMEWORKS),$(1))) +$(patsubst lib%.a,-l%,$(foreach lib,$(filter-out $(gb_Library_UNOLIBS_OOO),$(1)),$(call gb_Library_get_filename,$(lib)))) \ +$(foreach lib,$(filter $(gb_Library_UNOLIBS_OOO),$(1)),$(SOLARVER)/$(INPATH)/lib/$(lib)$(gb_Library_UNOEXT)) endef define gb_LinkTarget__get_layer @@ -190,6 +188,10 @@ $(call gb_Output_announce,$(2),$(true),LNK,4) $(call gb_LinkTarget__command_staticlink,$(1)) endef +define gb_LinkTarget_use_system_darwin_frameworks +$(call gb_LinkTarget_add_libs,$(1),$(foreach fw,$(2),-framework $(fw))) +endef + # Library class @@ -203,12 +205,6 @@ gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT) gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT) gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT) -gb_Library__FRAMEWORKS := \ - Foundation \ - CoreFoundation \ - CoreGraphics \ - CoreText \ - gb_Library_PLAINLIBS_NONE += \ objc \ m \ diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 8317c40f9f06..17e7aab47ccb 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -168,12 +168,6 @@ gb_LinkTarget_OBJCFLAGS += -g gb_LinkTarget_OBJCXXFLAGS += -g endif -# FIXME framework handling very hackish -define gb_LinkTarget__get_liblinkflags -$(patsubst lib%.dylib,-l%,$(foreach lib,$(filter-out $(gb_Library__FRAMEWORKS),$(1)),$(call gb_Library_get_filename,$(lib)))) \ -$(addprefix -framework ,$(filter $(gb_Library__FRAMEWORKS),$(1))) -endef - define gb_LinkTarget__get_layer $(if $(filter Executable,$(1)),\ $$(call gb_Executable_get_layer,$(2)),\ @@ -201,7 +195,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \ $(subst \d,$$,$(RPATH)) \ $(T_LDFLAGS) \ - $(call gb_LinkTarget__get_liblinkflags,$(LINKED_LIBS)) \ + $(patsubst lib%.dylib,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \ $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ $(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \ @@ -246,6 +240,10 @@ $(if $(filter Library Bundle CppunitTest Executable,$(TARGETTYPE)),$(call gb_Lin $(if $(filter StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlink,$(1))) endef +define gb_LinkTarget_use_system_darwin_frameworks +$(call gb_LinkTarget_add_libs,$(1),$(foreach fw,$(2),-framework $(fw))) +endef + # Library class @@ -261,16 +259,8 @@ gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT) gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT) gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT) -gb_Library__FRAMEWORKS := \ - Cocoa \ - GLUT \ - OpenGL \ - gb_Library_PLAINLIBS_NONE += \ - GLUT \ - Cocoa \ objc \ - OpenGL \ m \ pthread \ diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index ce6d41e4a107..194ef1c4bdd0 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -362,8 +362,8 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/aqua/source/gdi/coretext/salgdi \ )) -$(eval $(call gb_Library_use_externals,vcl,\ - coretext \ +$(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\ + CoreText \ )) else # ATSUI @@ -443,11 +443,11 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ $(eval $(call gb_Library_use_libraries,vcl,\ AppleRemote \ )) -$(eval $(call gb_Library_use_externals,vcl,\ - $(if $(filter 64,$(BITNESS_OVERRIDE)),,quicktime) \ - cocoa \ - carbon \ - corefoundation \ +$(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\ + $(if $(filter 64,$(BITNESS_OVERRIDE)),,QuickTime) \ + Cocoa \ + Carbon \ + CoreFoundation \ )) $(eval $(call gb_Library_use_libraries,vcl,\ @@ -610,9 +610,9 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/ios/source/window/salmenu \ vcl/ios/source/window/salobj \ )) -$(eval $(call gb_Library_use_externals,vcl,\ - uikit \ - corefoundation \ +$(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\ + UIKit \ + CoreFoundation \ )) endif From 967986b86184ee4bcd04ff4b98829d8fa73a15a5 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 00:54:49 +0200 Subject: [PATCH 009/863] gbuild: gb_Library_PLAINLIBS_NONE cleanup for Mac Change-Id: I66f8229e186e312ed3242695db9ef0768ab4d9a0 --- Library_merged.mk | 12 +++++++----- RepositoryExternal.mk | 4 ++-- clucene/Library_clucene.mk | 8 ++++---- padmin/Executable_spadmin.bin.mk | 4 ++-- padmin/Library_spa.mk | 6 +++--- sal/Library_sal.mk | 13 ++++++++----- solenv/gbuild/platform/IOS_ARM_GCC.mk | 5 ----- solenv/gbuild/platform/macosx.mk | 5 ----- svx/Executable_gengal.bin.mk | 6 +++--- vcl/Library_desktop_detector.mk | 9 +++++---- vcl/Library_vcl.mk | 12 ++++++------ vcl/Library_vclplug_gen.mk | 8 ++++---- vcl/Library_vclplug_gtk.mk | 9 +++++---- vcl/Library_vclplug_gtk3.mk | 9 +++++---- vcl/Library_vclplug_kde.mk | 9 +++++---- vcl/Library_vclplug_kde4.mk | 9 +++++---- vcl/Library_vclplug_svp.mk | 9 +++++---- vcl/Library_vclplug_tde.mk | 9 +++++---- 18 files changed, 74 insertions(+), 72 deletions(-) diff --git a/Library_merged.mk b/Library_merged.mk index 847e5474e576..6a2a9ecbdbb9 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -99,10 +99,10 @@ $(eval $(call gb_Library_use_externals,merged,\ endif ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,merged,\ - dl \ - m \ - pthread \ +$(eval $(call gb_Library_add_libs,merged,\ + -lm \ + -ldl \ + -lpthread \ )) endif @@ -129,7 +129,9 @@ endif ifeq ($(OS),MACOSX) $(eval $(call gb_Library_use_libraries,merged,\ AppleRemote \ - objc \ +)) +$(eval $(call gb_Library_add_libs,merged,\ + -lobjc \ )) $(eval $(call gb_Library_use_system_darwin_frameworks,merged,\ Carbon \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 2f79d77ec35d..2da039709050 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1464,8 +1464,8 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ ) ifeq ($(OS),MACOSX) -$(call gb_LinkTarget_use_libraries,$(1),\ - objc \ +$(call gb_LinkTarget_add_libs,$(1),\ + -lobjc \ ) else ifeq ($(OS),WNT) $(call gb_LinkTarget_use_libraries,$(1),\ diff --git a/clucene/Library_clucene.mk b/clucene/Library_clucene.mk index d80af92de302..77ac8ef48606 100644 --- a/clucene/Library_clucene.mk +++ b/clucene/Library_clucene.mk @@ -53,10 +53,10 @@ $(eval $(call gb_Library_add_defs,clucene,\ $(eval $(call gb_Library_add_standard_system_libs,clucene)) ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,clucene,\ - dl \ - m \ - pthread \ +$(eval $(call gb_Library_add_libs,clucene,\ + -lm \ + -ldl \ + -lpthread \ )) endif diff --git a/padmin/Executable_spadmin.bin.mk b/padmin/Executable_spadmin.bin.mk index d699894b33fd..2450e9889a52 100644 --- a/padmin/Executable_spadmin.bin.mk +++ b/padmin/Executable_spadmin.bin.mk @@ -51,8 +51,8 @@ $(eval $(call gb_Executable_add_exception_objects,spadmin.bin,\ )) ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS))) -$(eval $(call gb_Executable_use_libraries,spadmin.bin,\ - pthread \ +$(eval $(call gb_Executable_add_libs,spadmin.bin,\ + -lpthread \ )) endif diff --git a/padmin/Library_spa.mk b/padmin/Library_spa.mk index 1db89d5f6ce8..42bb40dd7b48 100644 --- a/padmin/Library_spa.mk +++ b/padmin/Library_spa.mk @@ -53,9 +53,9 @@ $(eval $(call gb_Library_add_exception_objects,spa,\ )) ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS))) -$(eval $(call gb_Library_use_libraries,spa,\ - m \ - pthread \ +$(eval $(call gb_Library_add_libs,spa,\ + -lm \ + -lpthread \ )) endif diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index c42728ff9ac1..1d6f75431cca 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -57,11 +57,6 @@ $(eval $(call gb_Library_add_defs,sal,\ )) $(eval $(call gb_Library_use_libraries,sal,\ - $(if $(filter $(GUI),UNX), \ - $(if $(filter $(OS),ANDROID),, \ - pthread \ - ) \ - ) \ $(if $(filter $(OS),LINUX), \ dl \ ) \ @@ -84,6 +79,14 @@ $(eval $(call gb_Library_use_libraries,sal,\ $(gb_UWINAPI) \ )) +$(eval $(call gb_Library_add_libs,sal,\ + $(if $(filter $(GUI),UNX), \ + $(if $(filter $(OS),ANDROID),, \ + -lpthread \ + ) \ + ) \ +)) + $(eval $(call gb_Library_add_standard_system_libs,sal)) ifeq ($(OS),MACOSX) diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index a36d6a36182d..21301fa95e84 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -205,11 +205,6 @@ gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT) gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT) gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT) -gb_Library_PLAINLIBS_NONE += \ - objc \ - m \ - pthread \ - gb_Library_FILENAMES := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \ $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \ diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 17e7aab47ccb..f1b6666cc482 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -259,11 +259,6 @@ gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT) gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT) gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT) -gb_Library_PLAINLIBS_NONE += \ - objc \ - m \ - pthread \ - gb_Library_FILENAMES := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \ $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \ diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk index 696212b9d6c7..b679787d856f 100644 --- a/svx/Executable_gengal.bin.mk +++ b/svx/Executable_gengal.bin.mk @@ -81,9 +81,9 @@ $(eval $(call gb_Executable_use_libraries,$(svx_GENGALBIN),\ endif ifeq ($(OS),LINUX) -$(eval $(call gb_Executable_use_libraries,$(svx_GENGALBIN),\ - dl \ - pthread \ +$(eval $(call gb_Executable_add_libs,$(svx_GENGALBIN),\ + -ldl \ + -lpthread \ )) endif diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk index af8578988c34..a155c3e0d281 100644 --- a/vcl/Library_desktop_detector.mk +++ b/vcl/Library_desktop_detector.mk @@ -73,10 +73,11 @@ $(eval $(call gb_Library_add_exception_objects,desktop_detector,\ )) ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,desktop_detector,\ - dl \ - m \ - pthread \ +$(eval $(call gb_Library_add_libs,desktop_detector,\ + -lm \ + -ldl \ + -lpthread \ )) endif + # vim: set noet sw=4 ts=4: diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 194ef1c4bdd0..341439ab23fe 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -84,8 +84,8 @@ $(eval $(call gb_Library_use_libraries,vcl,\ $(eval $(call gb_Library_add_standard_system_libs,vcl)) ifeq ($(OS),MACOSX) -$(eval $(call gb_Library_use_libraries,vcl,\ - objc \ +$(eval $(call gb_Library_add_libs,vcl,\ + -lobjc \ )) endif @@ -666,10 +666,10 @@ endif endif ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,vcl,\ - dl \ - m \ - pthread \ +$(eval $(call gb_Library_add_libs,vcl,\ + -lm \ + -ldl \ + -lpthread \ )) endif diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index d9a9d236944c..67a440b18e54 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -151,10 +151,10 @@ endif endif # USE_XINERAMA ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,vclplug_gen,\ - dl \ - m \ - pthread \ +$(eval $(call gb_Library_add_libs,vclplug_gen,\ + -lm \ + -ldl \ + -lpthread \ )) endif diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index 2d3b46eaa686..42ea2a485495 100644 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -111,10 +111,11 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\ endif ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,vclplug_gtk,\ - dl \ - m \ - pthread \ +$(eval $(call gb_Library_add_libs,vclplug_gtk,\ + -lm \ + -ldl \ + -lpthread \ )) endif + # vim: set noet sw=4 ts=4: diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk index 138904a0a004..b906fcf64bd5 100644 --- a/vcl/Library_vclplug_gtk3.mk +++ b/vcl/Library_vclplug_gtk3.mk @@ -115,10 +115,11 @@ $(eval $(call gb_Library_use_static_libraries,vclplug_gtk3,\ )) ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,vclplug_gtk3,\ - dl \ - m \ - pthread \ +$(eval $(call gb_Library_add_libs,vclplug_gtk3,\ + -lm \ + -ldl \ + -lpthread \ )) endif + # vim: set noet sw=4 ts=4: diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk index 7aa5ee5e230b..bfcf782345b4 100644 --- a/vcl/Library_vclplug_kde.mk +++ b/vcl/Library_vclplug_kde.mk @@ -83,10 +83,11 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_kde,\ $(eval $(call gb_Library_set_warnings_not_errors,vclplug_kde)) ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,vclplug_kde,\ - dl \ - m \ - pthread \ +$(eval $(call gb_Library_add_libs,vclplug_kde,\ + -lm \ + -ldl \ + -lpthread \ )) endif + # vim: set noet sw=4 ts=4: diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk index 3fbb80319a80..9fd110fc506b 100644 --- a/vcl/Library_vclplug_kde4.mk +++ b/vcl/Library_vclplug_kde4.mk @@ -83,10 +83,11 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_kde4,\ )) ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,vclplug_kde4,\ - dl \ - m \ - pthread \ +$(eval $(call gb_Library_add_libs,vclplug_kde4,\ + -lm \ + -ldl \ + -lpthread \ )) endif + # vim: set noet sw=4 ts=4: diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk index 63c9d725af73..750342c3225b 100644 --- a/vcl/Library_vclplug_svp.mk +++ b/vcl/Library_vclplug_svp.mk @@ -78,10 +78,11 @@ $(eval $(call gb_Library_use_static_libraries,vclplug_svp,\ )) ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,vclplug_svp,\ - dl \ - m \ - pthread \ +$(eval $(call gb_Library_add_libs,vclplug_svp,\ + -lm \ + -ldl \ + -lpthread \ )) endif + # vim: set noet sw=4 ts=4: diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk index 5e61c6315d7a..a55b8dd8025a 100644 --- a/vcl/Library_vclplug_tde.mk +++ b/vcl/Library_vclplug_tde.mk @@ -92,10 +92,11 @@ $(eval $(call gb_Library_add_cxxflags,vclplug_tde,\ $(eval $(call gb_Library_set_warnings_not_errors,vclplug_tde)) ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,vclplug_tde,\ - dl \ - m \ - pthread \ +$(eval $(call gb_Library_add_libs,vclplug_tde,\ + -lm \ + -ldl \ + -lpthread \ )) endif + # vim: set noet sw=4 ts=4: From 3c41244209386e22b34cb8da2267383e0238e0ff Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 00:58:46 +0200 Subject: [PATCH 010/863] gbuild: gb_Library_PLAINLIBS_NONE cleanup for android Change-Id: I0b99b6effb57bcd9ab5687f8896940620986b785 --- solenv/gbuild/platform/android.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk index f32fcc5bcb3e..58e7029f9851 100644 --- a/solenv/gbuild/platform/android.mk +++ b/solenv/gbuild/platform/android.mk @@ -11,10 +11,6 @@ gb_STDLIBS := \ -lgnustl_shared \ -gb_Library_PLAINLIBS_NONE := \ - android \ - gnustl_shared \ - # No unit testing can be run gb_CppunitTest_CPPTESTPRECOMMAND := : From 80374355ab96fa73f2aee8971195faf3cf5985f5 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 12:25:50 +0200 Subject: [PATCH 011/863] gbuild: gb_Library_PLAINLIBS_NONE cleanup for unxgcc/solaris Change-Id: Ia7f64bdd0fd81c5dcc08d828db4602b65e2da949 --- RepositoryExternal.mk | 6 +++--- bridges/Library_gcc3_aix_powerpc.mk | 5 ++++- bridges/Library_gcc3_ios_arm.mk | 5 ++++- bridges/Library_gcc3_linux_alpha.mk | 5 ++++- bridges/Library_gcc3_linux_arm.mk | 9 ++++++--- bridges/Library_gcc3_linux_hppa.mk | 5 ++++- bridges/Library_gcc3_linux_ia64.mk | 5 ++++- bridges/Library_gcc3_linux_intel.mk | 9 ++++++--- bridges/Library_gcc3_linux_m68k.mk | 5 ++++- bridges/Library_gcc3_linux_mips.mk | 9 ++++++--- bridges/Library_gcc3_linux_powerpc.mk | 5 ++++- bridges/Library_gcc3_linux_powerpc64.mk | 5 ++++- bridges/Library_gcc3_linux_s390.mk | 5 ++++- bridges/Library_gcc3_linux_s390x.mk | 5 ++++- bridges/Library_gcc3_linux_sparc.mk | 5 ++++- bridges/Library_gcc3_linux_x86-64.mk | 5 ++++- bridges/Library_gcc3_solaris_intel.mk | 5 ++++- bridges/Library_gcc3_solaris_sparc.mk | 5 ++++- canvas/Library_cairocanvas.mk | 4 ++-- extensions/Executable_nsplugin.mk | 17 ++++++++++------- extensions/Library_scn.mk | 4 ++-- framework/Library_lomenubar.mk | 5 ++++- neon/Library_neon.mk | 4 ++-- padmin/Executable_spadmin.bin.mk | 4 ++-- padmin/Library_spa.mk | 4 ++-- pyuno/Library_pyuno_wrapper.mk | 4 ++-- sal/Library_sal.mk | 14 +++++++------- shell/Executable_gnome_open_url.mk | 4 ++-- slideshow/Library_OGLTrans.mk | 8 ++++---- solenv/gbuild/platform/solaris.mk | 14 -------------- solenv/gbuild/platform/unxgcc.mk | 12 ------------ toolkit/Library_tk.mk | 4 ++-- ucb/Library_ucpdav1.mk | 8 ++++---- vcl/Library_desktop_detector.mk | 11 +++++++---- vcl/Library_vclplug_gen.mk | 11 +++++++---- vcl/Library_vclplug_gtk.mk | 11 +++++++---- vcl/Library_vclplug_gtk3.mk | 11 +++++++---- vcl/Library_vclplug_kde.mk | 11 +++++++---- vcl/Library_vclplug_kde4.mk | 11 +++++++---- vcl/Library_vclplug_tde.mk | 11 +++++++---- xmlsecurity/Library_xsec_xmlsec.mk | 4 ++-- 41 files changed, 173 insertions(+), 121 deletions(-) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 2da039709050..2a5585e0b8a7 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -914,9 +914,9 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ ssl \ ) ifeq ($(OS),SOLARIS) -$(call gb_LinkTarget_use_libraries,$(1),\ - nsl \ - socket \ +$(call gb_LinkTarget_add_libs,$(1),\ + -lnsl \ + -lsocket \ ) endif endif diff --git a/bridges/Library_gcc3_aix_powerpc.mk b/bridges/Library_gcc3_aix_powerpc.mk index 4cf7a7048526..0b541926e2b1 100644 --- a/bridges/Library_gcc3_aix_powerpc.mk +++ b/bridges/Library_gcc3_aix_powerpc.mk @@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ -fno-strict-aliasing \ )) +$(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ +)) + $(eval $(call gb_Library_use_libraries,gcc3_uno,\ cppu \ - dl \ sal \ )) diff --git a/bridges/Library_gcc3_ios_arm.mk b/bridges/Library_gcc3_ios_arm.mk index e121354bbf27..6744aa4c8863 100644 --- a/bridges/Library_gcc3_ios_arm.mk +++ b/bridges/Library_gcc3_ios_arm.mk @@ -40,9 +40,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ -fno-strict-aliasing \ )) +$(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ +)) + $(eval $(call gb_Library_use_libraries,gcc3_uno,\ cppu \ - dl \ sal \ )) diff --git a/bridges/Library_gcc3_linux_alpha.mk b/bridges/Library_gcc3_linux_alpha.mk index 22cd307a852b..77d331d390c3 100644 --- a/bridges/Library_gcc3_linux_alpha.mk +++ b/bridges/Library_gcc3_linux_alpha.mk @@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ -fno-strict-aliasing \ )) +$(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ +)) + $(eval $(call gb_Library_use_libraries,gcc3_uno,\ cppu \ - dl \ sal \ )) diff --git a/bridges/Library_gcc3_linux_arm.mk b/bridges/Library_gcc3_linux_arm.mk index ae0df1bad934..6a0fcba73cb2 100644 --- a/bridges/Library_gcc3_linux_arm.mk +++ b/bridges/Library_gcc3_linux_arm.mk @@ -36,11 +36,14 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ -fno-strict-aliasing \ )) +ifneq ($(OS),ANDROID) +$(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ +)) +endif + $(eval $(call gb_Library_use_libraries,gcc3_uno,\ cppu \ - $(if $(filter-out ANDROID,$(OS)),\ - dl \ - ) \ sal \ )) diff --git a/bridges/Library_gcc3_linux_hppa.mk b/bridges/Library_gcc3_linux_hppa.mk index 8aa77b5df83f..fea698d9f4ad 100644 --- a/bridges/Library_gcc3_linux_hppa.mk +++ b/bridges/Library_gcc3_linux_hppa.mk @@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ -fno-strict-aliasing \ )) +$(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ +)) + $(eval $(call gb_Library_use_libraries,gcc3_uno,\ cppu \ - dl \ sal \ )) diff --git a/bridges/Library_gcc3_linux_ia64.mk b/bridges/Library_gcc3_linux_ia64.mk index 8f8f61c00bcd..6f71829dc9f3 100644 --- a/bridges/Library_gcc3_linux_ia64.mk +++ b/bridges/Library_gcc3_linux_ia64.mk @@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ -fno-strict-aliasing \ )) +$(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ +)) + $(eval $(call gb_Library_use_libraries,gcc3_uno,\ cppu \ - dl \ sal \ )) diff --git a/bridges/Library_gcc3_linux_intel.mk b/bridges/Library_gcc3_linux_intel.mk index 526a1c95b322..97a37033f30a 100644 --- a/bridges/Library_gcc3_linux_intel.mk +++ b/bridges/Library_gcc3_linux_intel.mk @@ -39,11 +39,14 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ ) \ )) +ifneq ($(OS),ANDROID) +$(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ +)) +endif + $(eval $(call gb_Library_use_libraries,gcc3_uno,\ cppu \ - $(if $(filter-out ANDROID,$(OS)),\ - dl \ - ) \ sal \ )) diff --git a/bridges/Library_gcc3_linux_m68k.mk b/bridges/Library_gcc3_linux_m68k.mk index db74e2a26126..5175d374246b 100644 --- a/bridges/Library_gcc3_linux_m68k.mk +++ b/bridges/Library_gcc3_linux_m68k.mk @@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ -fno-strict-aliasing \ )) +$(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ +)) + $(eval $(call gb_Library_use_libraries,gcc3_uno,\ cppu \ - dl \ sal \ )) diff --git a/bridges/Library_gcc3_linux_mips.mk b/bridges/Library_gcc3_linux_mips.mk index 4cd01957c3dd..91613d9ddcd4 100644 --- a/bridges/Library_gcc3_linux_mips.mk +++ b/bridges/Library_gcc3_linux_mips.mk @@ -36,11 +36,14 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ -fno-strict-aliasing \ )) +ifneq ($(OS),ANDROID) +$(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ +)) +endif + $(eval $(call gb_Library_use_libraries,gcc3_uno,\ cppu \ - $(if $(filter-out ANDROID,$(OS)),\ - dl \ - ) \ sal \ )) diff --git a/bridges/Library_gcc3_linux_powerpc.mk b/bridges/Library_gcc3_linux_powerpc.mk index 0ae99a60e916..cbf62694e062 100644 --- a/bridges/Library_gcc3_linux_powerpc.mk +++ b/bridges/Library_gcc3_linux_powerpc.mk @@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ -fno-strict-aliasing \ )) +$(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ +)) + $(eval $(call gb_Library_use_libraries,gcc3_uno,\ cppu \ - dl \ sal \ )) diff --git a/bridges/Library_gcc3_linux_powerpc64.mk b/bridges/Library_gcc3_linux_powerpc64.mk index 037d4054599d..acb1f3f1a3c9 100644 --- a/bridges/Library_gcc3_linux_powerpc64.mk +++ b/bridges/Library_gcc3_linux_powerpc64.mk @@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ -fno-strict-aliasing \ )) +$(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ +)) + $(eval $(call gb_Library_use_libraries,gcc3_uno,\ cppu \ - dl \ sal \ )) diff --git a/bridges/Library_gcc3_linux_s390.mk b/bridges/Library_gcc3_linux_s390.mk index cd9dbf3444f4..2624e9e176d5 100644 --- a/bridges/Library_gcc3_linux_s390.mk +++ b/bridges/Library_gcc3_linux_s390.mk @@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ -fno-strict-aliasing \ )) +$(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ +)) + $(eval $(call gb_Library_use_libraries,gcc3_uno,\ cppu \ - dl \ sal \ )) diff --git a/bridges/Library_gcc3_linux_s390x.mk b/bridges/Library_gcc3_linux_s390x.mk index a04ebad91250..d2400e98b157 100644 --- a/bridges/Library_gcc3_linux_s390x.mk +++ b/bridges/Library_gcc3_linux_s390x.mk @@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ -fno-strict-aliasing \ )) +$(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ +)) + $(eval $(call gb_Library_use_libraries,gcc3_uno,\ cppu \ - dl \ sal \ )) diff --git a/bridges/Library_gcc3_linux_sparc.mk b/bridges/Library_gcc3_linux_sparc.mk index 778cbb12a6e8..5b2a9dc5bc19 100644 --- a/bridges/Library_gcc3_linux_sparc.mk +++ b/bridges/Library_gcc3_linux_sparc.mk @@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ -fno-strict-aliasing \ )) +$(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ +)) + $(eval $(call gb_Library_use_libraries,gcc3_uno,\ cppu \ - dl \ sal \ )) diff --git a/bridges/Library_gcc3_linux_x86-64.mk b/bridges/Library_gcc3_linux_x86-64.mk index 244bdda8dae2..b1e596778730 100644 --- a/bridges/Library_gcc3_linux_x86-64.mk +++ b/bridges/Library_gcc3_linux_x86-64.mk @@ -41,9 +41,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ ) \ )) +$(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ +)) + $(eval $(call gb_Library_use_libraries,gcc3_uno,\ cppu \ - dl \ sal \ )) diff --git a/bridges/Library_gcc3_solaris_intel.mk b/bridges/Library_gcc3_solaris_intel.mk index c333ca8d3db0..f3175faea884 100644 --- a/bridges/Library_gcc3_solaris_intel.mk +++ b/bridges/Library_gcc3_solaris_intel.mk @@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ -fno-strict-aliasing \ )) +$(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ +)) + $(eval $(call gb_Library_use_libraries,gcc3_uno,\ cppu \ - dl \ sal \ )) diff --git a/bridges/Library_gcc3_solaris_sparc.mk b/bridges/Library_gcc3_solaris_sparc.mk index 3829f219b8d9..5dab7c0345d0 100644 --- a/bridges/Library_gcc3_solaris_sparc.mk +++ b/bridges/Library_gcc3_solaris_sparc.mk @@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ -fno-strict-aliasing \ )) +$(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ +)) + $(eval $(call gb_Library_use_libraries,gcc3_uno,\ cppu \ - dl \ sal \ )) diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk index 1bfb26f86c8c..b85321f1b0d6 100644 --- a/canvas/Library_cairocanvas.mk +++ b/canvas/Library_cairocanvas.mk @@ -116,8 +116,8 @@ $(eval $(call gb_Library_add_exception_objects,cairocanvas,\ )) # freetype? fontconfig? -> test on Solaris -$(eval $(call gb_Library_use_libraries,cairocanvas,\ - X11 \ +$(eval $(call gb_Library_add_libs,cairocanvas,\ + -lX11 \ )) $(eval $(call gb_Library_use_externals,cairocanvas,\ Xrender \ diff --git a/extensions/Executable_nsplugin.mk b/extensions/Executable_nsplugin.mk index da860e821e7c..1117bce24681 100644 --- a/extensions/Executable_nsplugin.mk +++ b/extensions/Executable_nsplugin.mk @@ -42,17 +42,20 @@ $(eval $(call gb_Executable_use_static_libraries,nsplugin,\ npsoenv \ )) +$(eval $(call gb_Executable_add_libs,nsplugin,\ + $(if $(filter $(OS),LINUX), \ + -ldl \ + ) \ + $(if $(filter $(OS),SOLARIS), \ + -lnsl \ + -lsocket \ + ) \ +)) + $(eval $(call gb_Executable_use_libraries,nsplugin,\ cppu \ cppuhelper \ sal \ - $(if $(filter $(OS),LINUX), \ - dl \ - ) \ - $(if $(filter $(OS),SOLARIS), \ - nsl \ - socket \ - ) \ )) ifeq ($(GUI),WNT) diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk index 75872b73465f..a72cabcb6371 100644 --- a/extensions/Library_scn.mk +++ b/extensions/Library_scn.mk @@ -69,8 +69,8 @@ $(eval $(call gb_Library_add_exception_objects,scn,\ extensions/source/scanner/scanunx \ )) ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,scn,\ - dl \ +$(eval $(call gb_Library_add_libs,scn,\ + -ldl \ )) endif endif diff --git a/framework/Library_lomenubar.mk b/framework/Library_lomenubar.mk index b9f8c5fef6fa..ad4742f70e49 100644 --- a/framework/Library_lomenubar.mk +++ b/framework/Library_lomenubar.mk @@ -43,7 +43,10 @@ $(eval $(call gb_Library_use_libraries,lomenubar,\ cppu \ cppuhelper \ comphelper \ - X11 \ +)) + +$(eval $(call gb_Library_add_libs,lomenubar,\ + -lX11 \ )) $(eval $(call gb_Library_add_standard_system_libs,lomenubar)) diff --git a/neon/Library_neon.mk b/neon/Library_neon.mk index dc4c4345bb1f..17ac265b0aed 100644 --- a/neon/Library_neon.mk +++ b/neon/Library_neon.mk @@ -69,8 +69,8 @@ $(eval $(call gb_Library_add_generated_cobjects,neon,\ endif ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,neon,\ - dl \ +$(eval $(call gb_Library_add_libs,neon,\ + -ldl \ )) endif diff --git a/padmin/Executable_spadmin.bin.mk b/padmin/Executable_spadmin.bin.mk index 2450e9889a52..7d4b08ab5e69 100644 --- a/padmin/Executable_spadmin.bin.mk +++ b/padmin/Executable_spadmin.bin.mk @@ -57,8 +57,8 @@ $(eval $(call gb_Executable_add_libs,spadmin.bin,\ endif ifeq ($(OS),LINUX) -$(eval $(call gb_Executable_use_libraries,spadmin.bin,\ - dl \ +$(eval $(call gb_Executable_add_libs,spadmin.bin,\ + -ldl \ )) endif diff --git a/padmin/Library_spa.mk b/padmin/Library_spa.mk index 42bb40dd7b48..45c7b5c76729 100644 --- a/padmin/Library_spa.mk +++ b/padmin/Library_spa.mk @@ -60,8 +60,8 @@ $(eval $(call gb_Library_add_libs,spa,\ endif ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,spa,\ - dl \ +$(eval $(call gb_Library_add_libs,spa,\ + -ldl \ )) endif diff --git a/pyuno/Library_pyuno_wrapper.mk b/pyuno/Library_pyuno_wrapper.mk index 0f46beaac557..8ec4a1088a85 100644 --- a/pyuno/Library_pyuno_wrapper.mk +++ b/pyuno/Library_pyuno_wrapper.mk @@ -51,8 +51,8 @@ endif ifneq ($(GUI)$(COM),WNTMSC) ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),) -$(eval $(call gb_Library_use_libraries,pyuno_wrapper,\ - dl \ +$(eval $(call gb_Library_add_libs,pyuno_wrapper,\ + -ldl \ )) endif diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index 1d6f75431cca..36ace0d32738 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -57,13 +57,6 @@ $(eval $(call gb_Library_add_defs,sal,\ )) $(eval $(call gb_Library_use_libraries,sal,\ - $(if $(filter $(OS),LINUX), \ - dl \ - ) \ - $(if $(filter $(OS),SOLARIS), \ - nsl \ - socket \ - ) \ $(if $(filter $(OS),WNT), \ advapi32 \ comdlg32 \ @@ -85,6 +78,13 @@ $(eval $(call gb_Library_add_libs,sal,\ -lpthread \ ) \ ) \ + $(if $(filter $(OS),LINUX), \ + -ldl \ + ) \ + $(if $(filter $(OS),SOLARIS), \ + -lnsl \ + -lsocket \ + ) \ )) $(eval $(call gb_Library_add_standard_system_libs,sal)) diff --git a/shell/Executable_gnome_open_url.mk b/shell/Executable_gnome_open_url.mk index 68bf0a186f1d..0353ffa82344 100644 --- a/shell/Executable_gnome_open_url.mk +++ b/shell/Executable_gnome_open_url.mk @@ -28,8 +28,8 @@ $(eval $(call gb_Executable_Executable,gnome-open-url.bin)) ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),) -$(eval $(call gb_Executable_use_libraries,gnome-open-url.bin,\ - dl \ +$(eval $(call gb_Executable_add_libs,gnome-open-url.bin,\ + -ldl \ )) endif diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk index c3c2b6d768c0..cf911a1d4f2a 100644 --- a/slideshow/Library_OGLTrans.mk +++ b/slideshow/Library_OGLTrans.mk @@ -100,10 +100,10 @@ $(eval $(call gb_Library_add_exception_objects,OGLTrans,\ slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl \ )) -$(eval $(call gb_Library_use_libraries,OGLTrans,\ - GL \ - GLU \ - X11 \ +$(eval $(call gb_Library_add_libs,OGLTrans,\ + -lGL \ + -lGLU \ + -lX11 \ )) endif diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index ba4b4ab005c4..4b26f028fca9 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -241,20 +241,6 @@ gb_STDLIBS := \ -lnsl \ -lsocket \ -gb_Library_PLAINLIBS_NONE += \ - dl \ - GL \ - GLU \ - ICE \ - m \ - nsl \ - pthread \ - socket \ - SM \ - ICE \ - X11 \ - Xext \ - gb_Library_FILENAMES := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \ $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \ diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 4946cf29d55e..0957e4a3d71b 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -239,18 +239,6 @@ gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT) gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT) gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT) -gb_Library_PLAINLIBS_NONE += \ - dl \ - GL \ - GLU \ - ICE \ - m \ - pthread \ - SM \ - ICE \ - X11 \ - Xext \ - gb_Library_FILENAMES := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \ $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \ diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index 20f97124e355..d1e1fee6fe98 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -142,8 +142,8 @@ endif ifneq ($(GUIBASE),headless) ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS))) -$(eval $(call gb_Library_use_libraries,tk,\ - X11 \ +$(eval $(call gb_Library_add_libs,tk,\ + -lX11 \ )) endif endif diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk index e0b9801e2672..b6149a1dd3e8 100644 --- a/ucb/Library_ucpdav1.mk +++ b/ucb/Library_ucpdav1.mk @@ -80,10 +80,10 @@ $(eval $(call gb_Library_use_libraries,ucpdav1,\ endif ifeq ($(OS),SOLARIS) -$(eval $(call gb_Library_use_libraries,ucpdav1,\ - dl \ - nsl \ - socket \ +$(eval $(call gb_Library_add_libs,ucpdav1,\ + -ldl \ + -lnsl \ + -lsocket \ )) endif diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk index a155c3e0d281..6ade59bbd86a 100644 --- a/vcl/Library_desktop_detector.mk +++ b/vcl/Library_desktop_detector.mk @@ -55,10 +55,6 @@ $(eval $(call gb_Library_use_libraries,desktop_detector,\ jvmaccess \ cppu \ sal \ - X11 \ - Xext \ - SM \ - ICE \ )) $(eval $(call gb_Library_add_standard_system_libs,desktop_detector)) @@ -68,6 +64,13 @@ $(eval $(call gb_Library_use_externals,desktop_detector,\ icuuc \ )) +$(eval $(call gb_Library_add_libs,desktop_detector,\ + -lX11 \ + -lXext \ + -lSM \ + -lICE \ +)) + $(eval $(call gb_Library_add_exception_objects,desktop_detector,\ vcl/unx/generic/desktopdetect/desktopdetector \ )) diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 67a440b18e54..67795ef553a9 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -49,10 +49,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_gen,\ jvmaccess \ cppu \ sal \ - X11 \ - Xext \ - SM \ - ICE \ )) $(eval $(call gb_Library_add_standard_system_libs,vclplug_gen)) @@ -64,6 +60,13 @@ $(eval $(call gb_Library_use_externals,vclplug_gen,\ Xrender \ )) +$(eval $(call gb_Library_add_libs,vclplug_gen,\ + -lX11 \ + -lXext \ + -lSM \ + -lICE \ +)) + $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\ vcl/unx/generic/app/i18n_cb \ vcl/unx/generic/app/i18n_ic \ diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index 42ea2a485495..3fb0d8038b69 100644 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -57,10 +57,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk,\ jvmaccess \ cppu \ sal \ - X11 \ - Xext \ - SM \ - ICE \ )) $(eval $(call gb_Library_add_standard_system_libs,vclplug_gtk)) @@ -73,6 +69,13 @@ $(eval $(call gb_Library_use_externals,vclplug_gtk,\ icuuc \ )) +$(eval $(call gb_Library_add_libs,vclplug_gtk,\ + -lX11 \ + -lXext \ + -lSM \ + -lICE \ +)) + $(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\ vcl/unx/gtk/a11y/atkaction \ vcl/unx/gtk/a11y/atkbridge \ diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk index b906fcf64bd5..f924e80d8c33 100644 --- a/vcl/Library_vclplug_gtk3.mk +++ b/vcl/Library_vclplug_gtk3.mk @@ -69,10 +69,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk3,\ jvmaccess \ cppu \ sal \ - X11 \ - Xext \ - SM \ - ICE \ )) $(eval $(call gb_Library_add_standard_system_libs,vclplug_gtk3)) @@ -81,6 +77,13 @@ $(eval $(call gb_Library_use_externals,vclplug_gtk3,\ dbus \ )) +$(eval $(call gb_Library_use_libraries,vclplug_gtk3,\ + -lX11 \ + -lXext \ + -lSM \ + -lICE \ +)) + $(eval $(call gb_Library_add_exception_objects,vclplug_gtk3,\ vcl/unx/gtk3/a11y/gtk3atkaction \ vcl/unx/gtk3/a11y/gtk3atkbridge \ diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk index bfcf782345b4..d61717c00e2c 100644 --- a/vcl/Library_vclplug_kde.mk +++ b/vcl/Library_vclplug_kde.mk @@ -58,10 +58,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde,\ jvmaccess \ cppu \ sal \ - X11 \ - Xext \ - SM \ - ICE \ )) $(eval $(call gb_Library_add_standard_system_libs,vclplug_kde)) @@ -72,6 +68,13 @@ $(eval $(call gb_Library_use_externals,vclplug_kde,\ kde \ )) +$(eval $(call gb_Library_add_libs,vclplug_kde,\ + -lX11 \ + -lXext \ + -lSM \ + -lICE \ +)) + $(eval $(call gb_Library_add_exception_objects,vclplug_kde,\ vcl/unx/kde/kdedata \ vcl/unx/kde/salnativewidgets-kde \ diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk index 9fd110fc506b..f8450203ccd2 100644 --- a/vcl/Library_vclplug_kde4.mk +++ b/vcl/Library_vclplug_kde4.mk @@ -56,10 +56,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde4,\ jvmaccess \ cppu \ sal \ - X11 \ - Xext \ - SM \ - ICE \ )) $(eval $(call gb_Library_add_standard_system_libs,vclplug_kde4)) @@ -70,6 +66,13 @@ $(eval $(call gb_Library_use_externals,vclplug_kde4,\ kde4 \ )) +$(eval $(call gb_Library_add_libs,vclplug_kde4,\ + -lX11 \ + -lXext \ + -lSM \ + -lICE \ +)) + $(eval $(call gb_Library_add_exception_objects,vclplug_kde4,\ vcl/unx/kde4/KDEData \ vcl/unx/kde4/KDE4FilePicker \ diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk index a55b8dd8025a..efd3daaff151 100644 --- a/vcl/Library_vclplug_tde.mk +++ b/vcl/Library_vclplug_tde.mk @@ -63,10 +63,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_tde,\ jvmaccess \ cppu \ sal \ - X11 \ - Xext \ - SM \ - ICE \ )) $(eval $(call gb_Library_add_standard_system_libs,vclplug_tde)) @@ -76,6 +72,13 @@ $(eval $(call gb_Library_use_externals,vclplug_tde,\ icuuc \ )) +$(eval $(call gb_Library_add_libs,vclplug_tde,\ + -lX11 \ + -lXext \ + -lSM \ + -lICE \ +)) + $(eval $(call gb_Library_add_exception_objects,vclplug_tde,\ vcl/unx/kde/kdedata \ vcl/unx/kde/salnativewidgets-kde \ diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index 41cbfafcaad1..3966e76e4052 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -181,8 +181,8 @@ $(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ endif # ifeq ($(SYSTEM_NSS),YES) ifeq ($(OS),SOLARIS) -$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ - dl \ +$(eval $(call gb_Library_add_libs,xsec_xmlsec,\ + -ldl \ )) endif From dc397aae70433c0086ef41f4dac5289fb07a9b19 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 15:31:46 +0200 Subject: [PATCH 012/863] gbuild: gb_Library_PLAINLIBS_NONE cleanup for WNT: add a new gb_LinkTarget_use_system_win32_libs to abstract different linker options on MSVC and GCC. Change-Id: Ic9bf2545f59bf7871e6fc06b290c486ddfbec03d --- Library_merged.mk | 4 +- RepositoryExternal.mk | 4 +- RepositoryFixes.mk | 6 +-- avmedia/Library_avmediawin.mk | 10 ++-- basctl/Library_basctl.mk | 2 +- basic/CppunitTest_basic_enable.mk | 2 +- basic/CppunitTest_basic_nested_struct.mk | 2 +- basic/CppunitTest_basic_scanner.mk | 2 +- bean/Library_officebean.mk | 5 +- canvas/Library_canvastools.mk | 2 +- canvas/Library_directx9canvas.mk | 2 +- canvas/Library_gdipluscanvas.mk | 2 +- cli_ure/Executable_climaker.mk | 7 ++- cli_ure/Library_cli_cppuhelper_native.mk | 7 ++- cli_ure/Library_cli_uno.mk | 5 +- connectivity/Library_ado.mk | 9 ++-- connectivity/Library_postgresql-sdbc-impl.mk | 2 +- cui/Library_cui.mk | 2 +- dbaccess/Library_dbu.mk | 2 +- desktop/Executable_quickstart.mk | 11 +++-- desktop/Executable_soffice.mk | 5 +- desktop/Library_deploymentgui.mk | 2 +- dtrans/Library_dnd.mk | 10 ++-- dtrans/Library_ftransl.mk | 10 ++-- dtrans/Library_sysdtrans.mk | 10 ++-- embeddedobj/Library_emboleobj.mk | 3 ++ embedserv/Library_emser.mk | 7 ++- embedserv/Library_inprocserv.mk | 5 +- .../CppunitTest_extensions_test_update.mk | 2 +- extensions/Executable_nsplugin.mk | 18 +++---- extensions/Library_ldapbe2.mk | 2 +- extensions/Library_npsoplugin.mk | 18 +++---- extensions/Library_oleautobridge.mk | 3 ++ extensions/Library_oleautobridge2.mk | 3 ++ extensions/Library_pl.mk | 6 +-- extensions/Library_so_activex.mk | 8 ++-- extensions/Library_so_activex_x64.mk | 8 ++-- extensions/Library_updchk.mk | 2 +- fpicker/Library_fps.mk | 5 +- framework/Library_fwi.mk | 2 +- hwpfilter/Library_hwp.mk | 2 +- jvmfwk/Library_jvmfwk.mk | 4 +- jvmfwk/Library_sunjavaplugin.mk | 5 +- neon/Library_neon.mk | 2 +- sal/Library_sal.mk | 19 ++++---- sal/Library_uwinapi.mk | 2 +- sc/Library_scui.mk | 6 +-- sc/Library_vbaobj.mk | 6 +-- sd/CppunitTest_sd_uimpress.mk | 2 +- sd/Library_sd.mk | 2 +- sfx2/Library_sfx.mk | 12 ++--- shell/Executable_senddoc.mk | 5 +- shell/Library_ooofilt.mk | 6 +-- shell/Library_ooofilt_x64.mk | 4 +- shell/Library_propertyhdl.mk | 2 +- shell/Library_propertyhdl_x64.mk | 4 +- shell/Library_shlxthdl.mk | 2 +- shell/Library_shlxthdl_x64.mk | 4 +- shell/Library_smplmail.mk | 5 +- shell/Library_syssh_win.mk | 7 ++- slideshow/Library_OGLTrans.mk | 2 +- solenv/gbuild/CppunitTest.mk | 1 + solenv/gbuild/Executable.mk | 1 + solenv/gbuild/Library.mk | 1 + solenv/gbuild/platform/WNT_INTEL_GCC.mk | 44 ++--------------- solenv/gbuild/platform/WNT_INTEL_MSC.mk | 47 ++----------------- svl/CppunitTest_svl_lngmisc.mk | 2 +- svtools/Library_svt.mk | 2 +- svx/Executable_gengal.bin.mk | 11 ++--- tools/Library_tl.mk | 10 ++-- ucb/Library_ucpdav1.mk | 2 +- vcl/Library_vcl.mk | 32 +++++-------- xmlsecurity/Library_xsec_xmlsec.mk | 2 +- 73 files changed, 222 insertions(+), 253 deletions(-) diff --git a/Library_merged.mk b/Library_merged.mk index 6a2a9ecbdbb9..98d4cbf9ffde 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -107,14 +107,14 @@ $(eval $(call gb_Library_add_libs,merged,\ endif ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,merged,\ +$(eval $(call gb_Library_use_system_win32_libs,merged,\ advapi32 \ gdi32 \ gdiplus \ imm32 \ mpr \ msimg32 \ - $(gb_Library_win32_OLDNAMES) \ + oldnames \ ole32 \ oleaut32 \ shell32 \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 2a5585e0b8a7..1196385a9a93 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1468,7 +1468,7 @@ $(call gb_LinkTarget_add_libs,$(1),\ -lobjc \ ) else ifeq ($(OS),WNT) -$(call gb_LinkTarget_use_libraries,$(1),\ +$(call gb_LinkTarget_use_system_win32_libs,$(1),\ advapi32 \ gdi32 \ ) @@ -1614,7 +1614,7 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ ifeq ($(GUI)$(COM),WNTMSC) $(call gb_LinkTarget_use_external,$(1),openssl) -$(call gb_LinkTarget_use_libraries,$(1),\ +$(call gb_LinkTarget_use_system_win32_libs,$(1),\ secur32 \ ws2_32 \ ) diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index e49661874ccc..2eb16df6c43d 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -132,21 +132,17 @@ gb_Library_FILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_FILENAMES)) # change the names of all import libraries that don't have an "i" prefix as in our standard naming schema -gb_Library_NOILIBFILENAMES := $(gb_Library_PLAINLIBS_NONE) -gb_Library_NOILIBFILENAMES += \ +gb_Library_NOILIBFILENAMES := \ glib-2.0 \ gmodule-2.0 \ graphite2_off \ icudt icuin icule icuuc \ langtag \ lcms2 \ - msvcprt \ nspr4 \ nss3 \ - shlwapi \ smime3 \ uwinapi \ - version \ gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES)) gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT)) diff --git a/avmedia/Library_avmediawin.mk b/avmedia/Library_avmediawin.mk index 64750496d43c..ed1cc2d426fa 100644 --- a/avmedia/Library_avmediawin.mk +++ b/avmedia/Library_avmediawin.mk @@ -41,9 +41,6 @@ $(eval $(call gb_Library_use_libraries,avmediawin,\ comphelper \ cppu \ cppuhelper \ - gdi32 \ - ole32 \ - oleaut32 \ sal \ tl \ utl \ @@ -53,8 +50,11 @@ $(eval $(call gb_Library_use_libraries,avmediawin,\ $(eval $(call gb_Library_add_standard_system_libs,avmediawin)) -$(eval $(call gb_Library_add_libs,avmediawin,\ - strmiids.lib \ +$(eval $(call gb_Library_use_system_win32_libs,avmediawin,\ + gdi32 \ + ole32 \ + oleaut32 \ + strmiids \ )) $(eval $(call gb_Library_add_exception_objects,avmediawin,\ diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk index 6cd860ee73f9..ce2b096cbcac 100644 --- a/basctl/Library_basctl.mk +++ b/basctl/Library_basctl.mk @@ -124,7 +124,7 @@ $(eval $(call gb_SdiTarget_set_include,basctl/sdi/basslots,\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,basctl,\ +$(eval $(call gb_Library_use_system_win32_libs,basctl,\ advapi32 \ gdi32 \ shell32 \ diff --git a/basic/CppunitTest_basic_enable.mk b/basic/CppunitTest_basic_enable.mk index c09080ce2276..6e871736c1bf 100644 --- a/basic/CppunitTest_basic_enable.mk +++ b/basic/CppunitTest_basic_enable.mk @@ -34,7 +34,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_enable, \ $(eval $(call gb_CppunitTest_add_standard_system_libs,basic_enable)) ifeq ($(GUI),WNT) -$(eval $(call gb_CppunitTest_use_libraries,basic_enable, \ +$(eval $(call gb_CppunitTest_use_system_win32_libs,basic_enable, \ oleaut32 \ )) endif diff --git a/basic/CppunitTest_basic_nested_struct.mk b/basic/CppunitTest_basic_nested_struct.mk index e43404a27094..a768ddf007c7 100644 --- a/basic/CppunitTest_basic_nested_struct.mk +++ b/basic/CppunitTest_basic_nested_struct.mk @@ -35,7 +35,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_nested_struct, \ $(eval $(call gb_CppunitTest_add_standard_system_libs,basic_nested_struct)) ifeq ($(GUI),WNT) -$(eval $(call gb_CppunitTest_use_libraries,basic_nested_struct, \ +$(eval $(call gb_CppunitTest_use_system_win32_libs,basic_nested_struct, \ oleaut32 \ )) endif diff --git a/basic/CppunitTest_basic_scanner.mk b/basic/CppunitTest_basic_scanner.mk index 36806d0e276d..88876b75db9a 100644 --- a/basic/CppunitTest_basic_scanner.mk +++ b/basic/CppunitTest_basic_scanner.mk @@ -35,7 +35,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \ $(eval $(call gb_CppunitTest_add_standard_system_libs,basic_scanner)) ifeq ($(GUI),WNT) -$(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \ +$(eval $(call gb_CppunitTest_use_system_win32_libs,basic_scanner, \ oleaut32 \ )) endif diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk index 2b8e2164f045..94f4a0451c1e 100644 --- a/bean/Library_officebean.mk +++ b/bean/Library_officebean.mk @@ -47,10 +47,13 @@ endif ifeq ($(GUI),WNT) $(eval $(call gb_Library_use_libraries,officebean,\ - jawt \ $(gb_UWINAPI) \ )) +$(eval $(call gb_Library_use_system_win32_libs,officebean,\ + jawt \ +)) + else $(eval $(call gb_Library_add_libs,officebean,\ diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk index d08d76934fac..cb363de2ef04 100644 --- a/canvas/Library_canvastools.mk +++ b/canvas/Library_canvastools.mk @@ -87,7 +87,7 @@ endif endif ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,canvastools,\ +$(eval $(call gb_Library_use_system_win32_libs,canvastools,\ winmm \ )) endif diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk index fb2a28b6a928..d45b9066ca9b 100644 --- a/canvas/Library_directx9canvas.mk +++ b/canvas/Library_directx9canvas.mk @@ -60,7 +60,7 @@ $(eval $(call gb_Library_use_libraries,directx9canvas,\ $(eval $(call gb_Library_add_standard_system_libs,directx9canvas)) -$(eval $(call gb_Library_use_libraries,directx9canvas,\ +$(eval $(call gb_Library_use_system_win32_libs,directx9canvas,\ d3d9 \ gdi32 \ gdiplus \ diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk index cfe70a926995..b053b153e5e2 100644 --- a/canvas/Library_gdipluscanvas.mk +++ b/canvas/Library_gdipluscanvas.mk @@ -66,7 +66,7 @@ $(eval $(call gb_Library_use_libraries,gdipluscanvas,\ $(eval $(call gb_Library_add_standard_system_libs,gdipluscanvas)) -$(eval $(call gb_Library_use_libraries,gdipluscanvas,\ +$(eval $(call gb_Library_use_system_win32_libs,gdipluscanvas,\ gdi32 \ gdiplus \ )) diff --git a/cli_ure/Executable_climaker.mk b/cli_ure/Executable_climaker.mk index e6abcf5f55bf..73dcb63bd21d 100644 --- a/cli_ure/Executable_climaker.mk +++ b/cli_ure/Executable_climaker.mk @@ -24,13 +24,16 @@ $(eval $(call gb_Executable_use_internal_bootstrap_api,climaker,\ $(eval $(call gb_Executable_use_libraries,climaker,\ cppu \ cppuhelper \ + sal \ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_Executable_use_system_win32_libs,climaker,\ mscoree \ $(if $(USE_DEBUG_RUNTIME) \ ,msvcmrtd \ ,msvcmrt \ ) \ - sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Executable_add_standard_system_libs,climaker)) diff --git a/cli_ure/Library_cli_cppuhelper_native.mk b/cli_ure/Library_cli_cppuhelper_native.mk index 22985750b659..745c69c9480c 100644 --- a/cli_ure/Library_cli_cppuhelper_native.mk +++ b/cli_ure/Library_cli_cppuhelper_native.mk @@ -33,16 +33,19 @@ $(eval $(call gb_Library_use_packages,cli_cppuhelper_native,\ )) $(eval $(call gb_Library_use_libraries,cli_cppuhelper_native,\ - advapi32 \ cppu \ cppuhelper \ + sal \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,cli_cppuhelper_native,\ + advapi32 \ delayimp \ mscoree \ $(if $(USE_DEBUG_RUNTIME)\ ,msvcmrtd \ ,msvcmrt \ ) \ - sal \ )) $(eval $(call gb_Library_add_exception_objects,cli_cppuhelper_native,\ diff --git a/cli_ure/Library_cli_uno.mk b/cli_ure/Library_cli_uno.mk index 55288dee2aae..3166365bb1d4 100644 --- a/cli_ure/Library_cli_uno.mk +++ b/cli_ure/Library_cli_uno.mk @@ -19,12 +19,15 @@ $(eval $(call gb_Library_use_udk_api,cli_uno)) $(eval $(call gb_Library_use_libraries,cli_uno,\ cppu \ + sal \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,cli_uno,\ mscoree \ $(if $(USE_DEBUG_RUNTIME)\ ,msvcmrtd \ ,msvcmrt \ ) \ - sal \ )) $(eval $(call gb_Library_add_exception_objects,cli_uno,\ diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk index bd24464a5331..ed088bc89ee5 100644 --- a/connectivity/Library_ado.mk +++ b/connectivity/Library_ado.mk @@ -42,14 +42,17 @@ $(eval $(call gb_Library_add_cxxflags,ado,\ )) endif +$(eval $(call gb_Library_use_system_win32_libs,ado,\ + ole32 \ + oleaut32 \ + uuid \ +)) + $(eval $(call gb_Library_use_libraries,ado,\ cppu \ cppuhelper \ sal \ salhelper \ - ole32 \ - oleaut32 \ - uuid \ dbtools \ comphelper \ $(gb_UWINAPI) \ diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index 50900b1b7f66..a76eb7b735b6 100644 --- a/connectivity/Library_postgresql-sdbc-impl.mk +++ b/connectivity/Library_postgresql-sdbc-impl.mk @@ -46,7 +46,7 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\ $(eval $(call gb_Library_add_standard_system_libs,postgresql-sdbc-impl)) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\ +$(eval $(call gb_Library_use_system_win32_libs,postgresql-sdbc-impl,\ shell32 \ wldap32 \ )) diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index 059044fcafc4..23321fc64cce 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -78,7 +78,7 @@ $(eval $(call gb_Library_use_externals,cui,\ )) ifeq ($(GUI),WNT) -$(eval $(call gb_Library_use_libraries,cui,\ +$(eval $(call gb_Library_use_system_win32_libs,cui,\ advapi32 \ shlwapi \ )) diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk index 579deb6618ba..8d35b1f3da53 100644 --- a/dbaccess/Library_dbu.mk +++ b/dbaccess/Library_dbu.mk @@ -76,7 +76,7 @@ $(eval $(call gb_Library_use_libraries,dbu,\ $(eval $(call gb_Library_add_standard_system_libs,dbu)) ifeq ($(GUI),WNT) -$(eval $(call gb_Library_use_libraries,dbu,\ +$(eval $(call gb_Library_use_system_win32_libs,dbu,\ ole32 \ oleaut32 \ uuid \ diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk index 8e2bc84ad6ef..aecd9b37dd2b 100644 --- a/desktop/Executable_quickstart.mk +++ b/desktop/Executable_quickstart.mk @@ -33,12 +33,15 @@ $(eval $(call gb_Executable_set_include,quickstart,\ $$(INCLUDE) \ )) -$(eval $(call gb_Executable_use_libraries,quickstart,\ +$(eval $(call gb_Executable_use_system_win32_libs,quickstart,\ comdlg32 \ gdi32 \ ole32 \ oleaut32 \ shell32 \ +)) + +$(eval $(call gb_Executable_use_libraries,quickstart,\ $(gb_UWINAPI) \ )) @@ -46,14 +49,14 @@ $(eval $(call gb_Executable_add_standard_system_libs,quickstart)) ifeq ($(COM),GCC) -$(eval $(call gb_Executable_use_libraries,quickstart,\ +$(eval $(call gb_Executable_use_system_win32_libs,quickstart,\ uuid \ )) else -$(eval $(call gb_Executable_add_libs,quickstart,\ - comsupp.lib \ +$(eval $(call gb_Executable_use_system_win32_libs,quickstart,\ + comsupp \ )) endif diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk index afe746dc01d9..302c978a0096 100644 --- a/desktop/Executable_soffice.mk +++ b/desktop/Executable_soffice.mk @@ -30,10 +30,13 @@ $(eval $(call gb_Executable_Executable,soffice)) $(eval $(call gb_Executable_set_targettype_gui,soffice,YES)) $(eval $(call gb_Executable_use_libraries,soffice,\ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_Executable_use_system_win32_libs,soffice,\ advapi32 \ shell32 \ shlwapi \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Executable_add_standard_system_libs,soffice)) diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk index f81be8c52f41..712a020262ab 100644 --- a/desktop/Library_deploymentgui.mk +++ b/desktop/Library_deploymentgui.mk @@ -60,7 +60,7 @@ $(eval $(call gb_Library_add_standard_system_libs,deploymentgui)) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,deploymentgui,\ +$(eval $(call gb_Library_use_system_win32_libs,deploymentgui,\ ole32 \ )) diff --git a/dtrans/Library_dnd.mk b/dtrans/Library_dnd.mk index 7b6f08621c23..60027e2fef61 100644 --- a/dtrans/Library_dnd.mk +++ b/dtrans/Library_dnd.mk @@ -37,17 +37,19 @@ $(eval $(call gb_Library_set_include,dnd,\ $(eval $(call gb_Library_use_sdk_api,dnd)) $(eval $(call gb_Library_use_libraries,dnd,\ - advapi32 \ cppu \ cppuhelper \ + sal \ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,dnd,\ + advapi32 \ gdi32 \ ole32 \ oleaut32 \ - sal \ shell32 \ uuid \ - uwinapi \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_standard_system_libs,dnd)) diff --git a/dtrans/Library_ftransl.mk b/dtrans/Library_ftransl.mk index ae12a2bee575..f4c4e272999f 100644 --- a/dtrans/Library_ftransl.mk +++ b/dtrans/Library_ftransl.mk @@ -37,14 +37,16 @@ $(eval $(call gb_Library_set_include,ftransl,\ $(eval $(call gb_Library_use_sdk_api,ftransl)) $(eval $(call gb_Library_use_libraries,ftransl,\ - advapi32 \ cppu \ cppuhelper \ + sal \ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,ftransl,\ + advapi32 \ gdi32 \ ole32 \ - sal \ - uwinapi \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_standard_system_libs,ftransl)) diff --git a/dtrans/Library_sysdtrans.mk b/dtrans/Library_sysdtrans.mk index 698b9d605936..93e7b696604b 100644 --- a/dtrans/Library_sysdtrans.mk +++ b/dtrans/Library_sysdtrans.mk @@ -42,17 +42,19 @@ $(eval $(call gb_Library_add_defs,sysdtrans,\ )) $(eval $(call gb_Library_use_libraries,sysdtrans,\ - advapi32 \ cppu \ cppuhelper \ + sal \ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,sysdtrans,\ + advapi32 \ gdi32 \ ole32 \ oleaut32 \ - sal \ shell32 \ uuid \ - uwinapi \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_standard_system_libs,sysdtrans)) diff --git a/embeddedobj/Library_emboleobj.mk b/embeddedobj/Library_emboleobj.mk index d3ca7501e8cd..b4c8e6bb7be9 100644 --- a/embeddedobj/Library_emboleobj.mk +++ b/embeddedobj/Library_emboleobj.mk @@ -63,6 +63,9 @@ ifeq ($(OS),WNT) $(eval $(call gb_Library_use_libraries,emboleobj,\ embobj \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,emboleobj,\ gdi32 \ ole32 \ oleaut32 \ diff --git a/embedserv/Library_emser.mk b/embedserv/Library_emser.mk index 617458b94b1e..c261f9448e64 100644 --- a/embedserv/Library_emser.mk +++ b/embedserv/Library_emser.mk @@ -45,12 +45,15 @@ $(eval $(call gb_Library_use_libraries,emser,\ comphelper \ cppu \ cppuhelper \ + sal \ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,emser,\ gdi32 \ ole32 \ oleaut32 \ - sal \ uuid \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_standard_system_libs,emser)) diff --git a/embedserv/Library_inprocserv.mk b/embedserv/Library_inprocserv.mk index 122858ed9413..ffe596a86b0c 100644 --- a/embedserv/Library_inprocserv.mk +++ b/embedserv/Library_inprocserv.mk @@ -32,10 +32,13 @@ $(eval $(call gb_Library_set_include,inprocserv,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_libraries,inprocserv,\ +$(eval $(call gb_Library_use_system_win32_libs,inprocserv,\ gdi32 \ ole32 \ uuid \ +)) + +$(eval $(call gb_Library_use_libraries,inprocserv,\ $(gb_UWINAPI) \ )) diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk index 766552e29396..b5e88d2ba1e0 100644 --- a/extensions/CppunitTest_extensions_test_update.mk +++ b/extensions/CppunitTest_extensions_test_update.mk @@ -45,7 +45,7 @@ $(eval $(call gb_CppunitTest_use_libraries,extensions_test_update, \ $(eval $(call gb_CppunitTest_add_standard_system_libs,extensions_test_update)) ifeq ($(OS),WNT) -$(eval $(call gb_CppunitTest_use_libraries,extensions_test_update,\ +$(eval $(call gb_CppunitTest_use_system_win32_libs,extensions_test_update,\ shell32 \ ole32 \ )) diff --git a/extensions/Executable_nsplugin.mk b/extensions/Executable_nsplugin.mk index 1117bce24681..05bf003cd550 100644 --- a/extensions/Executable_nsplugin.mk +++ b/extensions/Executable_nsplugin.mk @@ -67,18 +67,18 @@ $(eval $(call gb_Executable_use_static_libraries,nsplugin,\ ooopathutils \ )) -$(eval $(call gb_Executable_use_libraries,nsplugin,\ - ws2_32 \ - shell32 \ - ole32 \ - kernel32 \ - user32 \ - gdi32 \ - winspool \ - comdlg32 \ +$(eval $(call gb_Executable_use_system_win32_libs,nsplugin,\ advapi32 \ + comdlg32 \ + gdi32 \ + kernel32 \ + ole32 \ oleaut32 \ + shell32 \ + user32 \ uuid \ + winspool \ + ws2_32 \ )) endif # WNT diff --git a/extensions/Library_ldapbe2.mk b/extensions/Library_ldapbe2.mk index d503cf6bb8cc..3b9c341445af 100644 --- a/extensions/Library_ldapbe2.mk +++ b/extensions/Library_ldapbe2.mk @@ -54,7 +54,7 @@ $(eval $(call gb_Library_use_libraries,ldapbe2,\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,ldapbe2,\ +$(eval $(call gb_Library_use_system_win32_libs,ldapbe2,\ wldap32 \ )) else # 0S!=WNT diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk index 7e8b400d6eb8..6528b3d3c4b7 100644 --- a/extensions/Library_npsoplugin.mk +++ b/extensions/Library_npsoplugin.mk @@ -69,18 +69,18 @@ $(eval $(call gb_Library_use_static_libraries,npsoplugin,\ ooopathutils \ )) -$(eval $(call gb_Library_use_libraries,npsoplugin,\ - ws2_32 \ - shell32 \ - ole32 \ - kernel32 \ - user32 \ - gdi32 \ - winspool \ - comdlg32 \ +$(eval $(call gb_Library_use_system_win32_libs,npsoplugin,\ advapi32 \ + comdlg32 \ + gdi32 \ + kernel32 \ + ole32 \ oleaut32 \ + shell32 \ + user32 \ uuid \ + winspool \ + ws2_32 \ )) $(eval $(call gb_Library_add_defs,npsoplugin,\ diff --git a/extensions/Library_oleautobridge.mk b/extensions/Library_oleautobridge.mk index 43404503b1dc..d86a604b1b9a 100644 --- a/extensions/Library_oleautobridge.mk +++ b/extensions/Library_oleautobridge.mk @@ -43,6 +43,9 @@ $(eval $(call gb_Library_use_libraries,oleautobridge,\ cppuhelper \ cppu \ sal \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,oleautobridge,\ advapi32 \ ole32 \ oleaut32 \ diff --git a/extensions/Library_oleautobridge2.mk b/extensions/Library_oleautobridge2.mk index e258e0fa1cc1..c7f1a0152034 100644 --- a/extensions/Library_oleautobridge2.mk +++ b/extensions/Library_oleautobridge2.mk @@ -47,6 +47,9 @@ $(eval $(call gb_Library_use_libraries,oleautobridge2,\ cppuhelper \ cppu \ sal \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,oleautobridge2,\ advapi32 \ ole32 \ oleaut32 \ diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk index 34b147320771..dc5e6c4f9cde 100644 --- a/extensions/Library_pl.mk +++ b/extensions/Library_pl.mk @@ -63,10 +63,10 @@ $(eval $(call gb_Library_add_libs,pl,\ endif # OS=SOLARIS ifeq ($(GUI),WNT) -$(eval $(call gb_Library_use_libraries,pl,\ - version \ - ole32 \ +$(eval $(call gb_Library_use_system_win32_libs,pl,\ advapi32 \ + ole32 \ + version \ )) $(eval $(call gb_Library_add_exception_objects,pl,\ diff --git a/extensions/Library_so_activex.mk b/extensions/Library_so_activex.mk index 33cccab682fd..733de14eab86 100644 --- a/extensions/Library_so_activex.mk +++ b/extensions/Library_so_activex.mk @@ -54,14 +54,14 @@ $(eval $(call gb_Library_add_ldflags,so_activex,\ /DEF:$(SRCDIR)/extensions/source/activex/so_activex.def \ )) -$(eval $(call gb_Library_use_libraries,so_activex,\ - uuid \ +$(eval $(call gb_Library_use_system_win32_libs,so_activex,\ advapi32 \ + gdi32 \ ole32 \ oleaut32 \ - gdi32 \ - urlmon \ shlwapi \ + urlmon \ + uuid \ )) ifneq ($(USE_DEBUG_RUNTIME),) diff --git a/extensions/Library_so_activex_x64.mk b/extensions/Library_so_activex_x64.mk index 7bcf286cb4f0..9bc43840d8a3 100644 --- a/extensions/Library_so_activex_x64.mk +++ b/extensions/Library_so_activex_x64.mk @@ -57,14 +57,14 @@ $(eval $(call gb_Library_add_ldflags,so_activex_x64,\ /DEF:$(SRCDIR)/extensions/source/activex/so_activex.def \ )) -$(eval $(call gb_Library_use_libraries,so_activex_x64,\ - uuid \ +$(eval $(call gb_Library_use_system_win32_libs,so_activex_x64,\ advapi32 \ + gdi32 \ ole32 \ oleaut32 \ - gdi32 \ - urlmon \ shlwapi \ + urlmon \ + uuid \ )) ifneq ($(USE_DEBUG_RUNTIME),) diff --git a/extensions/Library_updchk.mk b/extensions/Library_updchk.mk index cd291c8b695d..d03cb0c6060c 100644 --- a/extensions/Library_updchk.mk +++ b/extensions/Library_updchk.mk @@ -45,7 +45,7 @@ $(eval $(call gb_Library_use_libraries,updchk,\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,updchk,\ +$(eval $(call gb_Library_use_system_win32_libs,updchk,\ ole32 \ shell32 \ wininet \ diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk index 05f84ea2b1ba..b3b3fc3a3d4a 100644 --- a/fpicker/Library_fps.mk +++ b/fpicker/Library_fps.mk @@ -52,6 +52,10 @@ $(eval $(call gb_Library_use_libraries,fps,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,fps,\ advapi32 \ comdlg32 \ gdi32 \ @@ -60,7 +64,6 @@ $(eval $(call gb_Library_use_libraries,fps,\ oleaut32 \ shell32 \ uuid \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_standard_system_libs,fps)) diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk index ac51b15602a6..eab6f7a4f44c 100644 --- a/framework/Library_fwi.mk +++ b/framework/Library_fwi.mk @@ -76,7 +76,7 @@ $(eval $(call gb_Library_add_exception_objects,fwi,\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,fwi,\ +$(eval $(call gb_Library_use_system_win32_libs,fwi,\ advapi32 \ )) endif diff --git a/hwpfilter/Library_hwp.mk b/hwpfilter/Library_hwp.mk index 5ca70188fcf3..7b44aa42984a 100644 --- a/hwpfilter/Library_hwp.mk +++ b/hwpfilter/Library_hwp.mk @@ -47,7 +47,7 @@ $(eval $(call gb_Library_use_external,hwp,zlib)) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,hwp,\ +$(eval $(call gb_Library_use_system_win32_libs,hwp,\ ole32 \ uuid \ )) diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk index 73a2e6bd5e5c..5051a2b9bb17 100644 --- a/jvmfwk/Library_jvmfwk.mk +++ b/jvmfwk/Library_jvmfwk.mk @@ -50,8 +50,8 @@ $(eval $(call gb_Library_use_libraries,jvmfwk,\ $(eval $(call gb_Library_add_standard_system_libs,jvmfwk)) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,jvmfwk,\ - advapi32 \ +$(eval $(call gb_Library_use_system_win32_libs,jvmfwk,\ + advapi32 \ )) endif diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk index e25d993fac2d..61ff7bdfe5ac 100644 --- a/jvmfwk/Library_sunjavaplugin.mk +++ b/jvmfwk/Library_sunjavaplugin.mk @@ -62,9 +62,8 @@ $(eval $(call gb_Library_use_libraries,sunjavaplugin,\ endif ifeq ($(GUI),WNT) -$(eval $(call gb_Library_use_libraries,sunjavaplugin,\ - advapi32 \ - uwinapi \ +$(eval $(call gb_Library_use_system_win32_libs,sunjavaplugin,\ + advapi32 \ )) endif diff --git a/neon/Library_neon.mk b/neon/Library_neon.mk index 17ac265b0aed..239a43491b3a 100644 --- a/neon/Library_neon.mk +++ b/neon/Library_neon.mk @@ -47,7 +47,7 @@ $(eval $(call gb_Library_add_generated_cobjects,neon,\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,neon,\ +$(eval $(call gb_Library_use_system_win32_libs,neon,\ ws2_32 \ )) diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index 36ace0d32738..ecec9fffd76c 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -57,21 +57,22 @@ $(eval $(call gb_Library_add_defs,sal,\ )) $(eval $(call gb_Library_use_libraries,sal,\ - $(if $(filter $(OS),WNT), \ - advapi32 \ - comdlg32 \ - mpr \ - ole32 \ - shell32 \ - user32 \ - ws2_32 \ - ) \ $(if $(filter $(OS),ANDROID), \ lo-bootstrap \ ) \ $(gb_UWINAPI) \ )) +$(eval $(call gb_Library_use_system_win32_libs,sal,\ + advapi32 \ + comdlg32 \ + mpr \ + ole32 \ + shell32 \ + user32 \ + ws2_32 \ +)) + $(eval $(call gb_Library_add_libs,sal,\ $(if $(filter $(GUI),UNX), \ $(if $(filter $(OS),ANDROID),, \ diff --git a/sal/Library_uwinapi.mk b/sal/Library_uwinapi.mk index c5356c9f00d0..75a3a9cffca4 100644 --- a/sal/Library_uwinapi.mk +++ b/sal/Library_uwinapi.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_Library,uwinapi)) -$(eval $(call gb_Library_use_libraries,uwinapi,\ +$(eval $(call gb_Library_use_system_win32_libs,uwinapi,\ $(if $(filter $(COM),MSC), \ kernel32 \ msvcrt \ diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk index 86f7f8c4d0f8..807d7fd7591d 100644 --- a/sc/Library_scui.mk +++ b/sc/Library_scui.mk @@ -121,10 +121,10 @@ $(eval $(call gb_Library_add_exception_objects,scui,\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,scui,\ +$(eval $(call gb_Library_use_system_win32_libs,scui,\ advapi32 \ - $(gb_Library_win32_OLDNAMES) \ - uwinapi \ + oldnames \ )) endif + # vim: set noet sw=4 ts=4: diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk index e0e71a0da812..791175d5e08c 100644 --- a/sc/Library_vbaobj.mk +++ b/sc/Library_vbaobj.mk @@ -143,10 +143,10 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\ endif ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,vbaobj,\ +$(eval $(call gb_Library_use_system_win32_libs,vbaobj,\ advapi32 \ - $(gb_Library_win32_OLDNAMES) \ - uwinapi \ + oldnames \ )) endif + # vim: set noet sw=4 ts=4: diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk index 70f742949bc4..4d175957c35a 100644 --- a/sd/CppunitTest_sd_uimpress.mk +++ b/sd/CppunitTest_sd_uimpress.mk @@ -77,7 +77,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_uimpress,\ $(eval $(call gb_CppunitTest_add_standard_system_libs,sd_uimpress)) ifeq ($(OS),WNT) -$(eval $(call gb_CppunitTest_use_libraries,sd_uimpress,\ +$(eval $(call gb_CppunitTest_use_system_win32_libs,sd_uimpress,\ ws2_32 \ )) endif diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 3ac73b8f0857..d8dd7c095133 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -114,7 +114,7 @@ $(eval $(call gb_Library_use_externals,sd,\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,sd,\ +$(eval $(call gb_Library_use_system_win32_libs,sd,\ ws2_32 \ )) endif diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index c384a1b98046..1ec228446b2f 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -295,12 +295,12 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/doc/syspathw32 \ )) -$(eval $(call gb_Library_use_libraries,sfx,\ - gdi32 \ - advapi32 \ - ole32 \ - shell32 \ - uuid \ +$(eval $(call gb_Library_use_system_win32_libs,sfx,\ + advapi32 \ + gdi32 \ + ole32 \ + shell32 \ + uuid \ )) endif diff --git a/shell/Executable_senddoc.mk b/shell/Executable_senddoc.mk index 47c5b82827f7..13083ce77eb5 100644 --- a/shell/Executable_senddoc.mk +++ b/shell/Executable_senddoc.mk @@ -27,8 +27,11 @@ $(eval $(call gb_Executable_Executable,senddoc)) -$(eval $(call gb_Executable_use_libraries,senddoc,\ +$(eval $(call gb_Executable_use_system_win32_libs,senddoc,\ kernel32 \ +)) + +$(eval $(call gb_Executable_use_libraries,senddoc,\ sal \ )) diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk index 62c18edf4a90..2607fea33401 100644 --- a/shell/Library_ooofilt.mk +++ b/shell/Library_ooofilt.mk @@ -53,19 +53,19 @@ $(eval $(call gb_Library_use_externals,ooofilt,\ zlib \ )) -$(eval $(call gb_Library_use_libraries,ooofilt,\ +$(eval $(call gb_Library_use_system_win32_libs,ooofilt,\ advapi32 \ comctl32 \ kernel32 \ msvcprt \ + oldnames \ ole32 \ shell32 \ uuid \ - $(gb_Library_win32_OLDNAMES) \ )) ifneq ($(PRODUCT),full) -$(eval $(call gb_Library_use_libraries,ooofilt,\ +$(eval $(call gb_Library_use_system_win32_libs,ooofilt,\ msvcrt \ )) endif diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk index 3ddaeec9d6c2..f0232ba75e82 100644 --- a/shell/Library_ooofilt_x64.mk +++ b/shell/Library_ooofilt_x64.mk @@ -59,7 +59,7 @@ $(eval $(call gb_Library_use_externals,ooofilt_x64,\ zlib \ )) -$(eval $(call gb_Library_use_libraries,ooofilt_x64,\ +$(eval $(call gb_Library_use_system_win32_libs,ooofilt_x64,\ advapi32 \ comctl32 \ gdi32 \ @@ -67,13 +67,13 @@ $(eval $(call gb_Library_use_libraries,ooofilt_x64,\ kernel32 \ msvcprt \ msvcrt \ + oldnames \ ole32 \ oleaut32 \ propsys \ shell32 \ user32 \ uuid \ - $(gb_Library_win32_OLDNAMES) \ )) $(eval $(call gb_Library_use_static_libraries,ooofilt_x64,\ diff --git a/shell/Library_propertyhdl.mk b/shell/Library_propertyhdl.mk index 5ca9e91d6732..82e7db10a4ce 100644 --- a/shell/Library_propertyhdl.mk +++ b/shell/Library_propertyhdl.mk @@ -53,7 +53,7 @@ $(eval $(call gb_Library_use_externals,propertyhdl,\ zlib \ )) -$(eval $(call gb_Library_use_libraries,propertyhdl,\ +$(eval $(call gb_Library_use_system_win32_libs,propertyhdl,\ advapi32 \ comctl32 \ gdi32 \ diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk index 323335f55d64..46cfd15909e8 100644 --- a/shell/Library_propertyhdl_x64.mk +++ b/shell/Library_propertyhdl_x64.mk @@ -59,7 +59,7 @@ $(eval $(call gb_Library_use_externals,propertyhdl_x64,\ zlib \ )) -$(eval $(call gb_Library_use_libraries,propertyhdl_x64,\ +$(eval $(call gb_Library_use_system_win32_libs,propertyhdl_x64,\ advapi32 \ comctl32 \ gdi32 \ @@ -67,6 +67,7 @@ $(eval $(call gb_Library_use_libraries,propertyhdl_x64,\ kernel32 \ msvcprt \ msvcrt \ + oldnames \ ole32 \ oleaut32 \ propsys \ @@ -74,7 +75,6 @@ $(eval $(call gb_Library_use_libraries,propertyhdl_x64,\ shlwapi \ user32 \ uuid \ - $(gb_Library_win32_OLDNAMES) \ )) $(eval $(call gb_Library_use_static_libraries,propertyhdl_x64,\ diff --git a/shell/Library_shlxthdl.mk b/shell/Library_shlxthdl.mk index e4794cf4312d..9118f08f5018 100644 --- a/shell/Library_shlxthdl.mk +++ b/shell/Library_shlxthdl.mk @@ -53,7 +53,7 @@ $(eval $(call gb_Library_use_externals,shlxthdl,\ zlib \ )) -$(eval $(call gb_Library_use_libraries,shlxthdl,\ +$(eval $(call gb_Library_use_system_win32_libs,shlxthdl,\ advapi32 \ comctl32 \ gdi32 \ diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk index 2b5555a7c715..aa6ff0462480 100644 --- a/shell/Library_shlxthdl_x64.mk +++ b/shell/Library_shlxthdl_x64.mk @@ -59,7 +59,7 @@ $(eval $(call gb_Library_use_externals,shlxthdl_x64,\ zlib \ )) -$(eval $(call gb_Library_use_libraries,shlxthdl_x64,\ +$(eval $(call gb_Library_use_system_win32_libs,shlxthdl_x64,\ advapi32 \ comctl32 \ gdi32 \ @@ -67,13 +67,13 @@ $(eval $(call gb_Library_use_libraries,shlxthdl_x64,\ kernel32 \ msvcprt \ msvcrt \ + oldnames \ ole32 \ oleaut32 \ shell32 \ shlwapi \ user32 \ uuid \ - $(gb_Library_win32_OLDNAMES) \ )) $(eval $(call gb_Library_use_static_libraries,shlxthdl_x64,\ diff --git a/shell/Library_smplmail.mk b/shell/Library_smplmail.mk index 0b4cc0d01590..0e8cce656519 100644 --- a/shell/Library_smplmail.mk +++ b/shell/Library_smplmail.mk @@ -29,8 +29,11 @@ $(eval $(call gb_Library_Library,smplmail)) $(eval $(call gb_Library_use_sdk_api,smplmail)) -$(eval $(call gb_Library_use_libraries,smplmail,\ +$(eval $(call gb_Library_use_system_win32_libs,smplmail,\ advapi32 \ +)) + +$(eval $(call gb_Library_use_libraries,smplmail,\ cppu \ cppuhelper \ sal \ diff --git a/shell/Library_syssh_win.mk b/shell/Library_syssh_win.mk index b6ba2b4333fa..d1b5d0db498a 100644 --- a/shell/Library_syssh_win.mk +++ b/shell/Library_syssh_win.mk @@ -32,12 +32,15 @@ $(eval $(call gb_Library_use_sdk_api,syssh)) $(eval $(call gb_Library_use_libraries,syssh,\ cppu \ cppuhelper \ - ole32 \ sal \ - shell32 \ $(gb_UWINAPI) \ )) +$(eval $(call gb_Library_use_system_win32_libs,syssh,\ + ole32 \ + shell32 \ +)) + $(eval $(call gb_Library_add_standard_system_libs,syssh)) $(eval $(call gb_Library_set_componentfile,syssh,shell/source/win32/syssh)) diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk index cf911a1d4f2a..012262256290 100644 --- a/slideshow/Library_OGLTrans.mk +++ b/slideshow/Library_OGLTrans.mk @@ -81,7 +81,7 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,OGLTrans,\ )) else ifeq ($(strip $(OS)),WNT) -$(eval $(call gb_Library_use_libraries,OGLTrans,\ +$(eval $(call gb_Library_use_system_win32_libs,OGLTrans,\ gdi32 \ glu32 \ opengl32 \ diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 02af2fbda472..c7c7861275e4 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -343,6 +343,7 @@ $(eval $(foreach method,\ add_libs \ add_standard_system_libs \ use_system_darwin_frameworks \ + use_system_win32_libs \ use_sdk_api \ use_udk_api \ use_internal_api \ diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index 243e3cda7b24..0288c1755f71 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -107,6 +107,7 @@ $(eval $(foreach method,\ add_libs \ add_standard_system_libs \ use_system_darwin_frameworks \ + use_system_win32_libs \ set_library_path_flags \ add_api \ use_api \ diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 131806f8d273..e4003a9d2682 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -187,6 +187,7 @@ $(eval $(foreach method,\ add_libs \ add_standard_system_libs \ use_system_darwin_frameworks \ + use_system_win32_libs \ set_library_path_flags \ add_api \ use_api \ diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index c6e351493911..427c622326ad 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -186,6 +186,10 @@ $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(call gb_LinkTarget__command_d $(if $(filter StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlinklibrary,$(1))) endef +define gb_LinkTarget_use_system_win32_libs +$(call gb_LinkTarget_add_libs,$(1),$(foreach lib,$(2),-l$(patsubst oldnames,moldname,$(lib)))) +endef + # Library class @@ -213,46 +217,6 @@ gb_Library_OOODLLEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_DLLEXT) gb_Library_UNODLLEXT := .uno$(gb_Library_DLLEXT) gb_Library_UNOVERDLLEXT := $(gb_Library_UDK_MAJORVER)$(gb_Library_DLLEXT) -gb_Library_win32_OLDNAMES := moldname - -gb_Library_PLAINLIBS_NONE += \ - mingwthrd \ - mingw32 \ - mingwex \ - advapi32 \ - comctl32 \ - comdlg32 \ - crypt32 \ - d3d9 \ - d3dx \ - ddraw \ - gdi32 \ - gdiplus \ - imm32 \ - kernel32 \ - jawt \ - msi \ - msimg32 \ - msvcrt \ - msvcprt \ - mpr \ - $(gb_Library_win32_OLDNAMES) \ - ole32 \ - oleaut32 \ - propsys \ - shell32 \ - shlwapi \ - urlmon \ - user32 \ - usp10 \ - uuid \ - winmm \ - version \ - wininet \ - winspool \ - wldap32 \ - ws2_32 \ - gb_Library_LAYER := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \ $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):OOO) \ diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 8680c2e63d43..600fa43b57c7 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -374,6 +374,9 @@ $(call gb_Helper_abbreviate_dirs,\ ; exit $$RC) endef +define gb_LinkTarget_use_system_win32_libs +$(call gb_LinkTarget_add_libs,$(1),$(foreach lib,$(2),$(lib).lib)) +endef # Flags common for PE executables (EXEs and DLLs) gb_Windows_PE_TARGETTYPEFLAGS := \ @@ -401,50 +404,6 @@ gb_Library_get_rpath := gb_Library_SYSPRE := i gb_Library_PLAINEXT := .lib -gb_Library_win32_OLDNAMES := oldnames - -gb_Library_PLAINLIBS_NONE += \ - advapi32 \ - comctl32 \ - comdlg32 \ - crypt32 \ - d3d9 \ - d3dx \ - ddraw \ - delayimp \ - gdi32 \ - gdiplus \ - imm32\ - kernel32 \ - jawt \ - libcmt \ - libcmtd \ - mpr \ - mscoree \ - msi \ - msimg32 \ - msvcmrt \ - msvcmrtd \ - msvcrt \ - msvcprt \ - $(gb_Library_win32_OLDNAMES) \ - ole32 \ - oleaut32 \ - propsys \ - secur32 \ - shell32 \ - shlwapi \ - urlmon \ - user32 \ - usp10 \ - uuid \ - version \ - wininet \ - winmm \ - winspool \ - wldap32 \ - ws2_32 \ - gb_Library_LAYER := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \ $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):OOO) \ diff --git a/svl/CppunitTest_svl_lngmisc.mk b/svl/CppunitTest_svl_lngmisc.mk index 791f2716e659..505f63ea9683 100644 --- a/svl/CppunitTest_svl_lngmisc.mk +++ b/svl/CppunitTest_svl_lngmisc.mk @@ -45,7 +45,7 @@ $(eval $(call gb_CppunitTest_use_libraries,svl_lngmisc, \ $(eval $(call gb_CppunitTest_add_standard_system_libs,svl_lngmisc)) ifeq ($(GUI),WNT) -$(eval $(call gb_CppunitTest_use_libraries,svl_lngmisc, \ +$(eval $(call gb_CppunitTest_use_system_win32_libs,svl_lngmisc, \ oleaut32 \ )) endif diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index 1f40a65b5001..e001aa4b62cc 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -271,7 +271,7 @@ $(eval $(call gb_Library_add_cobjects,svt,\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,svt,\ +$(eval $(call gb_Library_use_system_win32_libs,svt,\ advapi32 \ gdi32 \ ole32 \ diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk index b679787d856f..1cb9d8f78e25 100644 --- a/svx/Executable_gengal.bin.mk +++ b/svx/Executable_gengal.bin.mk @@ -71,12 +71,11 @@ $(eval $(call gb_Executable_use_static_libraries,$(svx_GENGALBIN),\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Executable_use_libraries,$(svx_GENGALBIN),\ - kernel32 \ - msvcrt \ - $(gb_Library_win32_OLDNAMES) \ - user32 \ - uwinapi \ +$(eval $(call gb_Executable_use_system_win32_libs,$(svx_GENGALBIN),\ + kernel32 \ + msvcrt \ + oldnames \ + user32 \ )) endif diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index 3981bac35735..b7802267c891 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -117,11 +117,11 @@ $(eval $(call gb_Library_add_exception_objects,tl,\ tools/win/source/dll/toolsdll \ )) -$(eval $(call gb_Library_use_libraries,tl,\ - mpr \ - ole32 \ - shell32 \ - uuid \ +$(eval $(call gb_Library_use_system_win32_libs,tl,\ + mpr \ + ole32 \ + shell32 \ + uuid \ )) endif diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk index b6149a1dd3e8..c8053c180c9f 100644 --- a/ucb/Library_ucpdav1.mk +++ b/ucb/Library_ucpdav1.mk @@ -74,7 +74,7 @@ $(eval $(call gb_Library_add_exception_objects,ucpdav1,\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,ucpdav1,\ +$(eval $(call gb_Library_use_system_win32_libs,ucpdav1,\ ws2_32 \ )) endif diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 341439ab23fe..02dae7d43f95 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -314,11 +314,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/generic/glyphs/graphite_serverfont \ )) endif -ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,vcl,\ - version \ -)) -endif $(eval $(call gb_Library_use_external,vcl,graphite)) @@ -640,21 +635,20 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/win/source/window/salobj \ )) -$(eval $(call gb_Library_use_libraries,vcl,\ - advapi32 \ - gdi32 \ - gdiplus \ - imm32 \ - mpr \ - msimg32 \ - $(gb_Library_win32_OLDNAMES) \ - ole32 \ - shell32 \ - uuid \ +$(eval $(call gb_Library_use_system_win32_libs,vcl,\ + advapi32 \ + gdi32 \ + gdiplus \ + imm32 \ + mpr \ + msimg32 \ + oldnames \ + ole32 \ + shell32 \ usp10 \ - uwinapi \ - winspool \ - version \ + uuid \ + version \ + winspool \ )) $(eval $(call gb_Library_add_nativeres,vcl,vcl/src)) diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index 3966e76e4052..27479a3fc63f 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -101,7 +101,7 @@ $(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ xmlsec1-mscrypto \ )) -$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ +$(eval $(call gb_Library_use_system_win32_libs,xsec_xmlsec,\ crypt32 \ advapi32 \ )) From fa489789359d130735a814366154a3d91ec882a9 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 15:43:53 +0200 Subject: [PATCH 013/863] bean: just use AWTLIB on all platfroms to simplify this Change-Id: I6c8bc792a57750b7fd5f36e3eb97f76870a7a632 --- bean/Library_officebean.mk | 16 +--------------- configure.in | 6 +++++- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk index 94f4a0451c1e..64caf3dea54f 100644 --- a/bean/Library_officebean.mk +++ b/bean/Library_officebean.mk @@ -44,29 +44,15 @@ $(eval $(call gb_Library_add_cobjects,officebean,\ )) endif -ifeq ($(GUI),WNT) - $(eval $(call gb_Library_use_libraries,officebean,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_use_system_win32_libs,officebean,\ - jawt \ -)) - -else - $(eval $(call gb_Library_add_libs,officebean,\ + $(JAVALIB) \ $(AWTLIB) \ )) -$(eval $(call gb_Library_add_ldflags,officebean,\ - $(JAVALIB) \ -)) - - -endif - $(eval $(call gb_Library_add_standard_system_libs,officebean)) # vim: set noet sw=4 ts=4: diff --git a/configure.in b/configure.in index c1abd8aa2ddb..be6397872024 100644 --- a/configure.in +++ b/configure.in @@ -5982,7 +5982,11 @@ if test "$SOLAR_JAVA" != ""; then LD_LIBRARY_PATH=$save_LD_LIBRARY_PATH fi if test -z "$AWTLIB"; then - AWTLIB=-ljawt + if test $_os = WINNT -a "$WITH_MINGW" != yes; then + AWTLIB=jawt.lib + else + AWTLIB=-ljawt + fi fi AC_MSG_RESULT([$AWTLIB]) AC_SUBST(AWTLIB) From 7312f5ceacd44c9980b9262e403d4d9ac10f1aa9 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 15:47:42 +0200 Subject: [PATCH 014/863] gbuild: OpenBSD: remove custom gb_LinkTarget__command_dynamiclink: Should no longer be necessary with the new handling of gb_STDLIBS. Change-Id: Ia94a7266806e2d09d7608f642b25933e42499525 --- solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk | 23 -------------------- solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk | 23 -------------------- 2 files changed, 46 deletions(-) diff --git a/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk b/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk index 50267d307251..73090f0e7e20 100644 --- a/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk +++ b/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk @@ -33,29 +33,6 @@ gb_STDLIBS := $(PTHREAD_LIBS) include $(GBUILDDIR)/platform/unxgcc.mk -define gb_LinkTarget__command_dynamiclink -$(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ - $(gb_CXX) \ - $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ - $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \ - $(if $(SOVERSION),-Wl$(COMMA)--soname=$(notdir $(1)).$(SOVERSION)) \ - $(if $(SOVERSIONSCRIPT),-Wl$(COMMA)--version-script=$(SOVERSIONSCRIPT))\ - $(subst \d,$$,$(RPATH)) \ - $(T_LDFLAGS) \ - $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ - $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ - $(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \ - $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ - $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ - $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \ - -Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \ - $(LIBS) \ - $(subst -lpthread,$(PTHREAD_LIBS),$(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))))) \ - -o $(if $(SOVERSION),$(1).$(SOVERSION),$(1))) - $(if $(SOVERSION),ln -sf $(notdir $(1)).$(SOVERSION) $(1)) -endef - gb_LinkTarget_NOEXCEPTIONFLAGS += -DBOOST_NO_EXCEPTIONS # vim: set noet sw=4: diff --git a/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk b/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk index 34f35a36f7fd..89ef15e54887 100644 --- a/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk +++ b/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk @@ -32,29 +32,6 @@ gb_STDLIBS := $(PTHREAD_LIBS) include $(GBUILDDIR)/platform/unxgcc.mk -define gb_LinkTarget__command_dynamiclink -$(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ - $(gb_CXX) \ - $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ - $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \ - $(if $(SOVERSION),-Wl$(COMMA)--soname=$(notdir $(1)).$(SOVERSION)) \ - $(if $(SOVERSIONSCRIPT),-Wl$(COMMA)--version-script=$(SOVERSIONSCRIPT))\ - $(subst \d,$$,$(RPATH)) \ - $(T_LDFLAGS) \ - $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ - $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ - $(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \ - $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ - $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ - $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \ - -Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \ - $(LIBS) \ - $(subst -lpthread,$(PTHREAD_LIBS),$(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))))) \ - -o $(if $(SOVERSION),$(1).$(SOVERSION),$(1))) - $(if $(SOVERSION),ln -sf $(notdir $(1)).$(SOVERSION) $(1)) -endef - gb_LinkTarget_NOEXCEPTIONFLAGS += -DBOOST_NO_EXCEPTIONS # vim: set noet sw=4: From 5032dc0fc339ba6b200e80a5482cc86e00662a0b Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 16:29:24 +0200 Subject: [PATCH 015/863] gbuild: invert handling of standard system libraries: Always link in gb_STDLIBS, except when the library explicitly opts out with gb_LinkTarget_disable_standard_system_libs. Change-Id: I489a99114fbfa46d0421a27cf6c7b899dc268a4a --- Library_merged.mk | 2 -- UnoControls/Library_ctl.mk | 2 -- accessibility/Library_acc.mk | 2 -- accessibility/Library_java_uno_accessbridge.mk | 2 -- animations/Library_animcore.mk | 2 -- avmedia/Library_avmedia.mk | 2 -- avmedia/Library_avmediaQuickTime.mk | 2 -- avmedia/Library_avmediagst.mk | 2 -- avmedia/Library_avmediagst_0_10.mk | 2 -- avmedia/Library_avmediawin.mk | 2 -- basctl/Library_basctl.mk | 2 -- basebmp/CppunitTest_basebmp.mk | 2 -- basebmp/Library_basebmp.mk | 2 -- basegfx/CppunitTest_basegfx.mk | 2 -- basegfx/Library_basegfx.mk | 2 -- basic/CppunitTest_basic_enable.mk | 2 -- basic/CppunitTest_basic_nested_struct.mk | 2 -- basic/CppunitTest_basic_scanner.mk | 2 -- basic/Library_sb.mk | 2 -- bean/Library_officebean.mk | 2 -- binaryurp/CppunitTest_binaryurp_test-cache.mk | 2 -- binaryurp/CppunitTest_binaryurp_test-unmarshal.mk | 2 -- binaryurp/Library_binaryurp.mk | 2 -- bridges/Library_gcc3_linux_arm.mk | 2 -- bridges/Library_gcc3_linux_intel.mk | 2 -- bridges/Library_gcc3_linux_mips.mk | 2 -- bridges/Library_java_uno.mk | 2 -- canvas/Library_cairocanvas.mk | 2 -- canvas/Library_canvasfactory.mk | 2 -- canvas/Library_canvastools.mk | 2 -- canvas/Library_directx9canvas.mk | 2 -- canvas/Library_gdipluscanvas.mk | 2 -- canvas/Library_nullcanvas.mk | 2 -- canvas/Library_simplecanvas.mk | 2 -- canvas/Library_vclcanvas.mk | 2 -- chart2/Library_chartcontroller.mk | 2 -- chart2/Library_chartcore.mk | 2 -- cli_ure/Executable_climaker.mk | 2 -- clucene/Library_clucene.mk | 2 -- comphelper/CppunitTest_comphelper_test.mk | 2 -- comphelper/Library_comphelper.mk | 2 -- configmgr/Library_configmgr.mk | 2 -- connectivity/Library_ado.mk | 2 -- connectivity/Library_calc.mk | 2 -- connectivity/Library_dbase.mk | 2 -- connectivity/Library_dbpool2.mk | 2 -- connectivity/Library_dbtools.mk | 2 -- connectivity/Library_evoab.mk | 2 -- connectivity/Library_file.mk | 2 -- connectivity/Library_flat.mk | 2 -- connectivity/Library_hsqldb.mk | 2 -- connectivity/Library_jdbc.mk | 2 -- connectivity/Library_kab1.mk | 2 -- connectivity/Library_kabdrv1.mk | 2 -- connectivity/Library_macab1.mk | 2 -- connectivity/Library_macabdrv1.mk | 2 -- connectivity/Library_mork.mk | 2 -- connectivity/Library_mozab.mk | 2 -- connectivity/Library_mozabdrv.mk | 2 -- connectivity/Library_mozbootstrap.mk | 2 -- connectivity/Library_mysql.mk | 2 -- connectivity/Library_odbc.mk | 2 -- connectivity/Library_odbcbase.mk | 2 -- connectivity/Library_postgresql-sdbc-impl.mk | 2 -- connectivity/Library_postgresql-sdbc.mk | 2 -- connectivity/Library_sdbc2.mk | 2 -- connectivity/Library_tdeab1.mk | 2 -- connectivity/Library_tdeabdrv1.mk | 2 -- cppcanvas/Library_cppcanvas.mk | 2 -- cppcanvas/Library_mtfrenderer.mk | 2 -- cppu/CppunitTest_cppu_checkapi.mk | 2 -- cppu/CppunitTest_cppu_qa_any.mk | 2 -- cppu/CppunitTest_cppu_qa_recursion.mk | 2 -- cppu/CppunitTest_cppu_qa_reference.mk | 2 -- cppu/CppunitTest_cppu_qa_unotype.mk | 2 -- cppu/CppunitTest_cppu_test_cppumaker.mk | 2 -- cppu/Library_affine_uno.mk | 2 -- cppu/Library_cppu.mk | 2 -- cppu/Library_log_uno.mk | 2 -- cppu/Library_purpenvhelper.mk | 2 -- cppu/Library_unsafe_uno.mk | 2 -- cppuhelper/CppunitTest_cppuhelper_checkapi.mk | 2 -- cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk | 2 -- cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk | 2 -- cppuhelper/CppunitTest_cppuhelper_qa_weak.mk | 2 -- cppuhelper/Library_cppuhelper.mk | 2 -- cpputools/Executable_regcomp.mk | 2 -- cpputools/Executable_regsingleton.mk | 2 -- cpputools/Executable_uno.mk | 2 -- cui/Library_cui.mk | 2 -- dbaccess/CppunitTest_dbaccess_macros_test.mk | 2 -- dbaccess/Executable_odbcconfig.mk | 2 -- dbaccess/Library_dba.mk | 2 -- dbaccess/Library_dbaxml.mk | 2 -- dbaccess/Library_dbmm.mk | 2 -- dbaccess/Library_dbu.mk | 2 -- dbaccess/Library_sdbt.mk | 2 -- desktop/Executable_crashrep.com.mk | 2 -- desktop/Executable_officeloader.mk | 2 -- desktop/Executable_oosplash.mk | 2 -- desktop/Executable_quickstart.mk | 2 -- desktop/Executable_sbase.mk | 2 -- desktop/Executable_scalc.mk | 2 -- desktop/Executable_sdraw.mk | 2 -- desktop/Executable_simpress.mk | 2 -- desktop/Executable_smath.mk | 2 -- desktop/Executable_soffice.bin.mk | 2 -- desktop/Executable_soffice.mk | 2 -- desktop/Executable_soffice_bin.mk | 2 -- desktop/Executable_sweb.mk | 2 -- desktop/Executable_swriter.mk | 2 -- desktop/Executable_unopkg.bin.mk | 2 -- desktop/Library_deployment.mk | 2 -- desktop/Library_deploymentgui.mk | 2 -- desktop/Library_deploymentmisc.mk | 2 -- desktop/Library_migrationoo2.mk | 2 -- desktop/Library_migrationoo3.mk | 2 -- desktop/Library_offacc.mk | 2 -- desktop/Library_sofficeapp.mk | 2 -- desktop/Library_spl.mk | 2 -- desktop/Library_spl_unx.mk | 2 -- desktop/Library_unopkgapp.mk | 2 -- drawinglayer/Library_drawinglayer.mk | 2 -- dtrans/Library_dnd.mk | 2 -- dtrans/Library_dtrans.mk | 2 -- dtrans/Library_ftransl.mk | 2 -- dtrans/Library_mcnttype.mk | 2 -- dtrans/Library_sysdtrans.mk | 2 -- editeng/CppunitTest_editeng_borderline.mk | 2 -- editeng/CppunitTest_editeng_core.mk | 2 -- editeng/CppunitTest_editeng_lookuptree.mk | 2 -- editeng/Library_editeng.mk | 2 -- embeddedobj/Library_embobj.mk | 2 -- embeddedobj/Library_emboleobj.mk | 2 -- embedserv/Library_emser.mk | 2 -- embedserv/Library_inprocserv.mk | 2 -- eventattacher/Library_evtatt.mk | 2 -- extensions/CppunitTest_extensions_test_update.mk | 2 -- extensions/Library_abp.mk | 2 -- extensions/Library_bib.mk | 2 -- extensions/Library_dbp.mk | 2 -- extensions/Library_log.mk | 2 -- extensions/Library_pcr.mk | 2 -- extensions/Library_pl.mk | 2 -- extensions/Library_res.mk | 2 -- extensions/Library_scn.mk | 2 -- fileaccess/Library_fileacc.mk | 2 -- filter/CppunitTest_filter_pict_test.mk | 2 -- filter/CppunitTest_filter_tga_test.mk | 2 -- filter/CppunitTest_filter_tiff_test.mk | 2 -- filter/Executable_svg2odf.mk | 2 -- filter/Library_PptImporter.mk | 2 -- filter/Library_egi.mk | 2 -- filter/Library_eme.mk | 2 -- filter/Library_epb.mk | 2 -- filter/Library_epg.mk | 2 -- filter/Library_epp.mk | 2 -- filter/Library_eps.mk | 2 -- filter/Library_ept.mk | 2 -- filter/Library_era.mk | 2 -- filter/Library_eti.mk | 2 -- filter/Library_exp.mk | 2 -- filter/Library_filterconfig.mk | 2 -- filter/Library_flash.mk | 2 -- filter/Library_icd.mk | 2 -- filter/Library_icg.mk | 2 -- filter/Library_idx.mk | 2 -- filter/Library_ime.mk | 2 -- filter/Library_ipb.mk | 2 -- filter/Library_ipd.mk | 2 -- filter/Library_ips.mk | 2 -- filter/Library_ipt.mk | 2 -- filter/Library_ipx.mk | 2 -- filter/Library_ira.mk | 2 -- filter/Library_itg.mk | 2 -- filter/Library_iti.mk | 2 -- filter/Library_msfilter.mk | 2 -- filter/Library_odfflatxml.mk | 2 -- filter/Library_pdffilter.mk | 2 -- filter/Library_placeware.mk | 2 -- filter/Library_svgfilter.mk | 2 -- filter/Library_t602filter.mk | 2 -- filter/Library_textfd.mk | 2 -- filter/Library_xmlfa.mk | 2 -- filter/Library_xmlfd.mk | 2 -- filter/Library_xsltdlg.mk | 2 -- filter/Library_xsltfilter.mk | 2 -- forms/Library_frm.mk | 2 -- formula/Library_for.mk | 2 -- formula/Library_forui.mk | 2 -- fpicker/Library_fpicker.mk | 2 -- fpicker/Library_fps.mk | 2 -- fpicker/Library_fps_aqua.mk | 2 -- fpicker/Library_fps_odma.mk | 2 -- fpicker/Library_fps_office.mk | 2 -- framework/Library_fwe.mk | 2 -- framework/Library_fwi.mk | 2 -- framework/Library_fwk.mk | 2 -- framework/Library_fwl.mk | 2 -- framework/Library_fwm.mk | 2 -- framework/Library_lomenubar.mk | 2 -- hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk | 2 -- hwpfilter/Library_hwp.mk | 2 -- i18npool/CppunitTest_i18npool_test_breakiterator.mk | 2 -- ...ppunitTest_i18npool_test_characterclassification.mk | 2 -- i18npool/CppunitTest_i18npool_test_languagetag.mk | 2 -- i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk | 2 -- i18npool/Executable_gencoll_rule.mk | 2 -- i18npool/Executable_genconv_dict.mk | 2 -- i18npool/Executable_gendict.mk | 2 -- i18npool/Executable_genindex_data.mk | 2 -- i18npool/Executable_saxparser.mk | 2 -- i18npool/Library_collator_data.mk | 2 -- i18npool/Library_dict_ja.mk | 2 -- i18npool/Library_dict_zh.mk | 2 -- i18npool/Library_i18nisolang1.mk | 2 -- i18npool/Library_i18npool.mk | 2 -- i18npool/Library_i18nsearch.mk | 2 -- i18npool/Library_index_data.mk | 2 -- i18npool/Library_localedata_en.mk | 2 -- i18npool/Library_localedata_es.mk | 2 -- i18npool/Library_localedata_euro.mk | 2 -- i18npool/Library_localedata_others.mk | 2 -- i18npool/Library_textconv_dict.mk | 2 -- i18nutil/Library_i18nutil.mk | 2 -- idl/Executable_svidl.mk | 2 -- io/Library_acceptor.mk | 2 -- io/Library_connector.mk | 2 -- io/Library_streams.mk | 2 -- io/Library_textinstream.mk | 2 -- io/Library_textoutstream.mk | 2 -- javaunohelper/Library_juh.mk | 2 -- javaunohelper/Library_juhx.mk | 2 -- jurt/Library_jpipe.mk | 2 -- jurt/Library_jpipx.mk | 2 -- jvmaccess/Library_jvmaccess.mk | 2 -- jvmfwk/Executable_javaldx.mk | 2 -- jvmfwk/Library_jvmfwk.mk | 2 -- jvmfwk/Library_sunjavaplugin.mk | 2 -- l10ntools/Executable_ulfconv.mk | 2 -- lingucomponent/Library_MacOSXSpell.mk | 2 -- lingucomponent/Library_guesslang.mk | 2 -- lingucomponent/Library_hyphen.mk | 2 -- lingucomponent/Library_lnth.mk | 2 -- lingucomponent/Library_spell.mk | 2 -- linguistic/Library_lng.mk | 2 -- .../CppunitTest_lotuswordpro_test_lotuswordpro.mk | 2 -- lotuswordpro/Library_lwpft.mk | 2 -- o3tl/CppunitTest_o3tl_tests.mk | 2 -- officecfg/CppunitTest_officecfg_cppheader_test.mk | 2 -- oox/Library_oox.mk | 2 -- package/Library_package2.mk | 2 -- package/Library_xstor.mk | 2 -- padmin/Executable_spadmin.bin.mk | 2 -- padmin/Library_spa.mk | 2 -- regexp/Library_regexp.mk | 2 -- registry/Library_reg.mk | 2 -- remotebridges/Library_uuresolver.mk | 2 -- reportdesign/Library_rpt.mk | 2 -- reportdesign/Library_rptui.mk | 2 -- reportdesign/Library_rptxml.mk | 2 -- rsc/Executable_rsc.mk | 2 -- sal/CppunitTest_Module_DLL.mk | 2 -- sal/CppunitTest_sal_bytesequence.mk | 2 -- sal/CppunitTest_sal_checkapi.mk | 2 -- sal/CppunitTest_sal_osl_condition.mk | 2 -- sal/CppunitTest_sal_osl_file.mk | 2 -- sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk | 2 -- sal/CppunitTest_sal_osl_module.mk | 2 -- sal/CppunitTest_sal_osl_mutex.mk | 2 -- sal/CppunitTest_sal_osl_old_test_file.mk | 2 -- sal/CppunitTest_sal_osl_pipe.mk | 2 -- sal/CppunitTest_sal_osl_process.mk | 2 -- sal/CppunitTest_sal_osl_profile.mk | 2 -- sal/CppunitTest_sal_osl_security.mk | 2 -- sal/CppunitTest_sal_osl_setthreadname.mk | 2 -- sal/CppunitTest_sal_osl_thread.mk | 2 -- sal/CppunitTest_sal_rtl_alloc.mk | 2 -- sal/CppunitTest_sal_rtl_cipher.mk | 2 -- sal/CppunitTest_sal_rtl_crc32.mk | 2 -- sal/CppunitTest_sal_rtl_doublelock.mk | 2 -- sal/CppunitTest_sal_rtl_locale.mk | 2 -- sal/CppunitTest_sal_rtl_math.mk | 2 -- sal/CppunitTest_sal_rtl_ostringbuffer.mk | 2 -- sal/CppunitTest_sal_rtl_oustringbuffer.mk | 2 -- sal/CppunitTest_sal_rtl_strings.mk | 2 -- sal/CppunitTest_sal_rtl_uri.mk | 2 -- sal/CppunitTest_sal_rtl_uuid.mk | 2 -- sal/CppunitTest_sal_tcwf.mk | 2 -- sal/CppunitTest_sal_types.mk | 2 -- sal/Executable_cppunittester.mk | 2 -- sal/Executable_osl_process_child.mk | 2 -- sal/Library_lo-bootstrap.mk | 2 ++ sal/Library_sal.mk | 2 -- sal/Library_sal_textenc.mk | 2 -- sal/Library_uwinapi.mk | 2 -- salhelper/CppunitTest_salhelper_checkapi.mk | 2 -- salhelper/Library_salhelper.mk | 2 -- sax/CppunitTest_sax.mk | 2 -- sax/Library_expwrap.mk | 2 -- sax/Library_fastsax.mk | 2 -- sax/Library_sax.mk | 2 -- sc/CppunitTest_sc_annotationshapeobj.mk | 2 -- sc/CppunitTest_sc_cellrangeobj.mk | 2 -- sc/CppunitTest_sc_chart_regression_test.mk | 2 -- sc/CppunitTest_sc_databaserangeobj.mk | 2 -- sc/CppunitTest_sc_datapilotfieldobj.mk | 2 -- sc/CppunitTest_sc_datapilottableobj.mk | 2 -- sc/CppunitTest_sc_editfieldobj_cell.mk | 2 -- sc/CppunitTest_sc_editfieldobj_header.mk | 2 -- sc/CppunitTest_sc_filters_test.mk | 2 -- sc/CppunitTest_sc_macros_test.mk | 2 -- sc/CppunitTest_sc_modelobj.mk | 2 -- sc/CppunitTest_sc_namedrangeobj.mk | 2 -- sc/CppunitTest_sc_namedrangesobj.mk | 2 -- sc/CppunitTest_sc_rangelst_test.mk | 2 -- sc/CppunitTest_sc_subsequent_filters_test.mk | 2 -- sc/CppunitTest_sc_tableautoformatfield.mk | 2 -- sc/CppunitTest_sc_tablesheetobj.mk | 2 -- sc/CppunitTest_sc_tablesheetsobj.mk | 2 -- sc/CppunitTest_sc_ucalc.mk | 2 -- sc/Library_sc.mk | 2 -- sc/Library_scd.mk | 2 -- sc/Library_scfilt.mk | 2 -- sc/Library_scui.mk | 2 -- sc/Library_vbaobj.mk | 2 -- scaddins/Library_analysis.mk | 2 -- scaddins/Library_date.mk | 2 -- sccomp/Library_solver.mk | 2 -- scripting/Library_basprov.mk | 2 -- scripting/Library_dlgprov.mk | 2 -- scripting/Library_protocolhandler.mk | 2 -- scripting/Library_scriptframe.mk | 2 -- scripting/Library_stringresource.mk | 2 -- scripting/Library_vbaevents.mk | 2 -- sd/CppunitTest_sd_filters_test.mk | 2 -- sd/CppunitTest_sd_regression_test.mk | 2 -- sd/CppunitTest_sd_uimpress.mk | 2 -- sd/Library_sd.mk | 2 -- sd/Library_sdd.mk | 2 -- sd/Library_sdfilt.mk | 2 -- sd/Library_sdui.mk | 2 -- sdext/CppunitTest_pdfimport.mk | 2 -- sfx2/CppunitTest_sfx2_metadatable.mk | 2 -- sfx2/Library_qstart.mk | 2 -- sfx2/Library_sfx.mk | 2 -- shell/Executable_lngconvex.mk | 2 -- shell/Library_cmdmail.mk | 2 -- shell/Library_desktopbe.mk | 2 -- shell/Library_gconfbe.mk | 2 -- shell/Library_kde4be.mk | 2 -- shell/Library_kdebe.mk | 2 -- shell/Library_localebe.mk | 2 -- shell/Library_macbe.mk | 2 -- shell/Library_recentfile.mk | 2 -- shell/Library_syssh.mk | 2 -- shell/Library_syssh_win.mk | 2 -- shell/Library_tdebe.mk | 2 -- shell/Library_wininetbe.mk | 2 -- slideshow/CppunitTest_slideshow.mk | 2 -- slideshow/Executable_demoshow.mk | 2 -- slideshow/Library_OGLTrans.mk | 2 -- slideshow/Library_slideshow.mk | 2 -- solenv/gbuild/CppunitTest.mk | 3 ++- solenv/gbuild/Executable.mk | 3 ++- solenv/gbuild/Library.mk | 3 ++- solenv/gbuild/LinkTarget.mk | 10 +++++----- sot/CppunitTest_sot_test_sot.mk | 2 -- sot/Library_sot.mk | 2 -- starmath/CppunitTest_starmath_qa_cppunit.mk | 2 -- starmath/Library_sm.mk | 2 -- starmath/Library_smd.mk | 2 -- stoc/Library_bootstrap.mk | 2 -- stoc/Library_introspection.mk | 2 -- stoc/Library_invocadapt.mk | 2 -- stoc/Library_invocation.mk | 2 -- stoc/Library_javaloader.mk | 2 -- stoc/Library_javavm.mk | 2 -- stoc/Library_namingservice.mk | 2 -- stoc/Library_proxyfac.mk | 2 -- stoc/Library_reflection.mk | 2 -- stoc/Library_stocservices.mk | 2 -- store/Library_store.mk | 2 -- svl/CppunitTest_svl_lngmisc.mk | 2 -- svl/CppunitTest_svl_urihelper.mk | 2 -- svl/Library_fsstorage.mk | 2 -- svl/Library_passwordcontainer.mk | 2 -- svl/Library_svl.mk | 2 -- svtools/CppunitTest_svtools_filters_test.mk | 2 -- svtools/Executable_bmp.mk | 2 -- svtools/Executable_bmpsum.mk | 2 -- svtools/Executable_g2g.mk | 2 -- svtools/Executable_langsupport.mk | 2 -- svtools/Library_hatchwindowfactory.mk | 2 -- svtools/Library_svt.mk | 2 -- svx/Executable_gengal.bin.mk | 2 -- svx/Library_svx.mk | 2 -- svx/Library_svxcore.mk | 2 -- svx/Library_textconversiondlgs.mk | 2 -- sw/CppunitTest_sw_filters_test.mk | 2 -- sw/CppunitTest_sw_layout_test.mk | 2 -- sw/CppunitTest_sw_macros_test.mk | 2 -- sw/CppunitTest_sw_regression_test.mk | 2 -- sw/CppunitTest_sw_subsequent_odfexport.mk | 2 -- sw/CppunitTest_sw_subsequent_odfimport.mk | 2 -- sw/CppunitTest_sw_subsequent_ooxmlexport.mk | 2 -- sw/CppunitTest_sw_subsequent_ooxmlimport.mk | 2 -- sw/CppunitTest_sw_subsequent_rtfexport.mk | 2 -- sw/CppunitTest_sw_subsequent_rtfimport.mk | 2 -- sw/CppunitTest_sw_subsequent_ww8export.mk | 2 -- sw/CppunitTest_sw_subsequent_ww8import.mk | 2 -- sw/CppunitTest_sw_swdoc_test.mk | 2 -- sw/Library_msword.mk | 2 -- sw/Library_sw.mk | 2 -- sw/Library_swd.mk | 2 -- sw/Library_swui.mk | 2 -- sw/Library_vbaswobj.mk | 2 -- test/Library_subsequenttest.mk | 2 -- test/Library_test.mk | 2 -- toolkit/Library_tk.mk | 2 -- tools/CppunitTest_tools_test.mk | 2 -- tools/Executable_bestreversemap.mk | 2 -- tools/Executable_mkunroll.mk | 2 -- tools/Executable_rscdep.mk | 2 -- tools/Executable_so_checksum.mk | 2 -- tools/Library_tl.mk | 2 -- touch/Library_libotouch.mk | 2 -- tubes/CppunitTest_tubes_test.mk | 2 -- tubes/Library_tubes.mk | 2 -- ucb/Library_cached1.mk | 2 -- ucb/Library_srtrs1.mk | 2 -- ucb/Library_ucb1.mk | 2 -- ucb/Library_ucpcmis1.mk | 2 -- ucb/Library_ucpdav1.mk | 2 -- ucb/Library_ucpexpand1.mk | 2 -- ucb/Library_ucpext.mk | 2 -- ucb/Library_ucpfile1.mk | 2 -- ucb/Library_ucpftp1.mk | 2 -- ucb/Library_ucpgio1.mk | 2 -- ucb/Library_ucpgvfs1.mk | 2 -- ucb/Library_ucphier1.mk | 2 -- ucb/Library_ucpodma1.mk | 2 -- ucb/Library_ucppkg1.mk | 2 -- ucb/Library_ucptdoc1.mk | 2 -- ucbhelper/Library_ucbhelper.mk | 2 -- unotest/Library_unobootstrapprotector.mk | 2 -- unotest/Library_unoexceptionprotector.mk | 2 -- unotest/Library_unotest.mk | 2 -- unotools/Library_utl.mk | 2 -- unoxml/Library_unordf.mk | 2 -- unoxml/Library_unoxml.mk | 2 -- uui/Library_uui.mk | 2 -- vbahelper/Library_msforms.mk | 2 -- vbahelper/Library_vbahelper.mk | 2 -- vcl/Executable_kdefilepicker.mk | 2 -- vcl/Executable_tdefilepicker.mk | 2 -- vcl/Library_desktop_detector.mk | 2 -- vcl/Library_vcl.mk | 2 -- vcl/Library_vclplug_gen.mk | 2 -- vcl/Library_vclplug_gtk.mk | 2 -- vcl/Library_vclplug_gtk3.mk | 2 -- vcl/Library_vclplug_kde.mk | 2 -- vcl/Library_vclplug_kde4.mk | 2 -- vcl/Library_vclplug_svp.mk | 2 -- vcl/Library_vclplug_tde.mk | 2 -- writerfilter/CppunitTest_writerfilter_doctok.mk | 2 -- writerfilter/CppunitTest_writerfilter_rtftok.mk | 2 -- writerfilter/Library_writerfilter.mk | 2 -- writerfilter/Library_writerfilter_uno.mk | 2 -- writerperfect/Library_wpftdraw.mk | 2 -- writerperfect/Library_wpftwriter.mk | 2 -- xml2cmp/Executable_xml2cmp.mk | 2 -- xmloff/Library_xo.mk | 2 -- xmloff/Library_xof.mk | 2 -- xmlreader/Library_xmlreader.mk | 2 -- xmlscript/Library_xmlscript.mk | 2 -- xmlsecurity/CppunitTest_qa_certext.mk | 2 -- xmlsecurity/Library_xmlsecurity.mk | 2 -- xmlsecurity/Library_xsec_fw.mk | 2 -- xmlsecurity/Library_xsec_xmlsec.mk | 2 -- 480 files changed, 13 insertions(+), 958 deletions(-) diff --git a/Library_merged.mk b/Library_merged.mk index 98d4cbf9ffde..f6bf68aaa5c9 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -43,8 +43,6 @@ $(eval $(call gb_Library_use_libraries,merged,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,merged)) - $(eval $(call gb_Library_use_externals,merged,\ cups \ icui18n \ diff --git a/UnoControls/Library_ctl.mk b/UnoControls/Library_ctl.mk index fd7e1736962a..ee4e0335abd7 100644 --- a/UnoControls/Library_ctl.mk +++ b/UnoControls/Library_ctl.mk @@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,ctl,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ctl)) - $(eval $(call gb_Library_set_componentfile,ctl,UnoControls/util/ctl)) $(eval $(call gb_Library_add_exception_objects,ctl,\ diff --git a/accessibility/Library_acc.mk b/accessibility/Library_acc.mk index 667dcc30e09e..d10769f49041 100644 --- a/accessibility/Library_acc.mk +++ b/accessibility/Library_acc.mk @@ -50,8 +50,6 @@ $(eval $(call gb_Library_use_libraries,acc,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,acc)) - $(eval $(call gb_Library_add_exception_objects,acc,\ accessibility/source/extended/AccessibleBrowseBox \ accessibility/source/extended/AccessibleBrowseBoxBase \ diff --git a/accessibility/Library_java_uno_accessbridge.mk b/accessibility/Library_java_uno_accessbridge.mk index 1579f8a35e3a..3b4c27c39b96 100644 --- a/accessibility/Library_java_uno_accessbridge.mk +++ b/accessibility/Library_java_uno_accessbridge.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Library_use_libraries,java_uno_accessbridge,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,java_uno_accessbridge)) - $(eval $(call gb_Library_add_exception_objects,java_uno_accessbridge,\ accessibility/bridge/source/java/WindowsAccessBridgeAdapter \ )) diff --git a/animations/Library_animcore.mk b/animations/Library_animcore.mk index f4ada9c4f3af..9f4d5b4912bf 100644 --- a/animations/Library_animcore.mk +++ b/animations/Library_animcore.mk @@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,animcore,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,animcore)) - $(eval $(call gb_Library_add_exception_objects,animcore,\ animations/source/animcore/animcore \ animations/source/animcore/factreg \ diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk index f597bb35647d..40f952eba89b 100644 --- a/avmedia/Library_avmedia.mk +++ b/avmedia/Library_avmedia.mk @@ -59,8 +59,6 @@ $(eval $(call gb_Library_use_libraries,avmedia,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,avmedia)) - $(eval $(call gb_Library_add_exception_objects,avmedia,\ avmedia/source/framework/mediacontrol \ avmedia/source/framework/mediaitem \ diff --git a/avmedia/Library_avmediaQuickTime.mk b/avmedia/Library_avmediaQuickTime.mk index 7906a37c9665..defe843ab900 100644 --- a/avmedia/Library_avmediaQuickTime.mk +++ b/avmedia/Library_avmediaQuickTime.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,avmediaQuickTime,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,avmediaQuickTime)) - $(eval $(call gb_Library_use_system_darwin_frameworks,avmediaQuickTime,\ Cocoa \ QTKit \ diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk index 394873f04a16..8bb85617aa05 100644 --- a/avmedia/Library_avmediagst.mk +++ b/avmedia/Library_avmediagst.mk @@ -55,8 +55,6 @@ $(eval $(call gb_Library_use_libraries,avmediagst,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,avmediagst)) - $(eval $(call gb_Library_add_exception_objects,avmediagst,\ avmedia/source/gstreamer/gstmanager \ avmedia/source/gstreamer/gstplayer \ diff --git a/avmedia/Library_avmediagst_0_10.mk b/avmedia/Library_avmediagst_0_10.mk index 3369dbf57833..18387a9e05ef 100644 --- a/avmedia/Library_avmediagst_0_10.mk +++ b/avmedia/Library_avmediagst_0_10.mk @@ -54,8 +54,6 @@ $(eval $(call gb_Library_use_libraries,avmediagst_0_10,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,avmediagst_0_10)) - $(eval $(call gb_Library_add_libs,avmediagst_0_10,\ $(GSTREAMER_0_10_LIBS) \ -lgstinterfaces-0.10 \ diff --git a/avmedia/Library_avmediawin.mk b/avmedia/Library_avmediawin.mk index ed1cc2d426fa..5d6649c37baa 100644 --- a/avmedia/Library_avmediawin.mk +++ b/avmedia/Library_avmediawin.mk @@ -48,8 +48,6 @@ $(eval $(call gb_Library_use_libraries,avmediawin,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,avmediawin)) - $(eval $(call gb_Library_use_system_win32_libs,avmediawin,\ gdi32 \ ole32 \ diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk index ce2b096cbcac..b6e1c3b7dc5f 100644 --- a/basctl/Library_basctl.mk +++ b/basctl/Library_basctl.mk @@ -63,8 +63,6 @@ $(eval $(call gb_Library_use_libraries,basctl,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,basctl)) - $(eval $(call gb_Library_add_exception_objects,basctl,\ basctl/source/accessibility/accessibledialogcontrolshape \ basctl/source/accessibility/accessibledialogwindow \ diff --git a/basebmp/CppunitTest_basebmp.mk b/basebmp/CppunitTest_basebmp.mk index 5747cb6b59c8..4879303502de 100644 --- a/basebmp/CppunitTest_basebmp.mk +++ b/basebmp/CppunitTest_basebmp.mk @@ -30,8 +30,6 @@ $(eval $(call gb_CppunitTest_use_libraries,basebmp_cpputest,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,basebmp_cpputest)) - $(eval $(call gb_CppunitTest_add_exception_objects,basebmp_cpputest,\ basebmp/test/basictest \ basebmp/test/bmpmasktest \ diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk index fd385a8b1eb5..5f3de82840ff 100644 --- a/basebmp/Library_basebmp.mk +++ b/basebmp/Library_basebmp.mk @@ -21,8 +21,6 @@ $(eval $(call gb_Library_use_libraries,basebmp,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,basebmp)) - $(eval $(call gb_Library_set_include,basebmp,\ -I$(SRCDIR)/basebmp/inc/ \ $$(INCLUDE) \ diff --git a/basegfx/CppunitTest_basegfx.mk b/basegfx/CppunitTest_basegfx.mk index a531848951b8..e9c3bb887ea4 100644 --- a/basegfx/CppunitTest_basegfx.mk +++ b/basegfx/CppunitTest_basegfx.mk @@ -22,8 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,basegfx_cpputest,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,basegfx_cpputest)) - $(eval $(call gb_CppunitTest_add_exception_objects,basegfx_cpputest,\ basegfx/test/basegfx1d \ basegfx/test/basegfx2d \ diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk index 6d974ec6395a..8cc7a86b7ae9 100644 --- a/basegfx/Library_basegfx.mk +++ b/basegfx/Library_basegfx.mk @@ -24,8 +24,6 @@ $(eval $(call gb_Library_use_libraries,basegfx,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,basegfx)) - $(eval $(call gb_Library_set_include,basegfx,\ -I$(SRCDIR)/basegfx/inc \ -I$(SRCDIR)/basegfx/source/inc \ diff --git a/basic/CppunitTest_basic_enable.mk b/basic/CppunitTest_basic_enable.mk index 6e871736c1bf..5f6587dec684 100644 --- a/basic/CppunitTest_basic_enable.mk +++ b/basic/CppunitTest_basic_enable.mk @@ -31,8 +31,6 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_enable, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,basic_enable)) - ifeq ($(GUI),WNT) $(eval $(call gb_CppunitTest_use_system_win32_libs,basic_enable, \ oleaut32 \ diff --git a/basic/CppunitTest_basic_nested_struct.mk b/basic/CppunitTest_basic_nested_struct.mk index a768ddf007c7..268f29a43b1c 100644 --- a/basic/CppunitTest_basic_nested_struct.mk +++ b/basic/CppunitTest_basic_nested_struct.mk @@ -32,8 +32,6 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_nested_struct, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,basic_nested_struct)) - ifeq ($(GUI),WNT) $(eval $(call gb_CppunitTest_use_system_win32_libs,basic_nested_struct, \ oleaut32 \ diff --git a/basic/CppunitTest_basic_scanner.mk b/basic/CppunitTest_basic_scanner.mk index 88876b75db9a..193c4a5835a5 100644 --- a/basic/CppunitTest_basic_scanner.mk +++ b/basic/CppunitTest_basic_scanner.mk @@ -32,8 +32,6 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,basic_scanner)) - ifeq ($(GUI),WNT) $(eval $(call gb_CppunitTest_use_system_win32_libs,basic_scanner, \ oleaut32 \ diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk index c29a58c4b366..457a52bf6bdf 100644 --- a/basic/Library_sb.mk +++ b/basic/Library_sb.mk @@ -52,8 +52,6 @@ $(eval $(call gb_Library_use_libraries,sb,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sb)) - ifneq ($(DISABLE_SCRIPTING),TRUE) $(eval $(call gb_Library_add_exception_objects,sb,\ diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk index 64caf3dea54f..d17f795ce22c 100644 --- a/bean/Library_officebean.mk +++ b/bean/Library_officebean.mk @@ -53,6 +53,4 @@ $(eval $(call gb_Library_add_libs,officebean,\ $(AWTLIB) \ )) -$(eval $(call gb_Library_add_standard_system_libs,officebean)) - # vim: set noet sw=4 ts=4: diff --git a/binaryurp/CppunitTest_binaryurp_test-cache.mk b/binaryurp/CppunitTest_binaryurp_test-cache.mk index ecde720b9f58..93b716ca5990 100644 --- a/binaryurp/CppunitTest_binaryurp_test-cache.mk +++ b/binaryurp/CppunitTest_binaryurp_test-cache.mk @@ -33,8 +33,6 @@ $(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-cache,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,binaryurp_test-cache)) - $(eval $(call gb_CppunitTest_add_exception_objects,binaryurp_test-cache,\ binaryurp/qa/test-cache \ )) diff --git a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk index aed5a30d78a3..09fbcce439fa 100644 --- a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk +++ b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk @@ -36,8 +36,6 @@ $(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-unmarshal,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,binaryurp_test-unmarshal)) - $(eval $(call gb_CppunitTest_use_library_objects,binaryurp_test-unmarshal,\ binaryurp \ )) diff --git a/binaryurp/Library_binaryurp.mk b/binaryurp/Library_binaryurp.mk index 99e223a68d22..223d9c8113d5 100644 --- a/binaryurp/Library_binaryurp.mk +++ b/binaryurp/Library_binaryurp.mk @@ -40,8 +40,6 @@ $(eval $(call gb_Library_use_libraries,binaryurp,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,binaryurp)) - $(eval $(call gb_Library_add_exception_objects,binaryurp,\ binaryurp/source/binaryany \ binaryurp/source/bridge \ diff --git a/bridges/Library_gcc3_linux_arm.mk b/bridges/Library_gcc3_linux_arm.mk index 6a0fcba73cb2..94711eaecbab 100644 --- a/bridges/Library_gcc3_linux_arm.mk +++ b/bridges/Library_gcc3_linux_arm.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,gcc3_uno,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,gcc3_uno)) - $(eval $(call gb_Library_add_exception_objects,gcc3_uno,\ bridges/source/cpp_uno/shared/bridge \ bridges/source/cpp_uno/shared/component \ diff --git a/bridges/Library_gcc3_linux_intel.mk b/bridges/Library_gcc3_linux_intel.mk index 97a37033f30a..502093241a98 100644 --- a/bridges/Library_gcc3_linux_intel.mk +++ b/bridges/Library_gcc3_linux_intel.mk @@ -50,8 +50,6 @@ $(eval $(call gb_Library_use_libraries,gcc3_uno,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,gcc3_uno)) - $(eval $(call gb_Library_add_asmobjects,gcc3_uno,\ bridges/source/cpp_uno/gcc3_linux_intel/call \ )) diff --git a/bridges/Library_gcc3_linux_mips.mk b/bridges/Library_gcc3_linux_mips.mk index 91613d9ddcd4..a5dfe34b0f7c 100644 --- a/bridges/Library_gcc3_linux_mips.mk +++ b/bridges/Library_gcc3_linux_mips.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,gcc3_uno,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,gcc3_uno)) - $(eval $(call gb_Library_add_exception_objects,gcc3_uno,\ bridges/source/cpp_uno/gcc3_linux_mips/except \ bridges/source/cpp_uno/shared/bridge \ diff --git a/bridges/Library_java_uno.mk b/bridges/Library_java_uno.mk index df834277c41d..d9b8112b0282 100644 --- a/bridges/Library_java_uno.mk +++ b/bridges/Library_java_uno.mk @@ -34,8 +34,6 @@ $(eval $(call gb_Library_use_libraries,java_uno,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,java_uno)) - $(eval $(call gb_Library_add_exception_objects,java_uno,\ bridges/source/jni_uno/jni_bridge \ bridges/source/jni_uno/jni_data \ diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk index b85321f1b0d6..b9c93e21dff3 100644 --- a/canvas/Library_cairocanvas.mk +++ b/canvas/Library_cairocanvas.mk @@ -71,8 +71,6 @@ $(eval $(call gb_Library_use_libraries,cairocanvas,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,cairocanvas)) - $(eval $(call gb_Library_add_exception_objects,cairocanvas,\ canvas/source/cairo/cairo_cachedbitmap \ canvas/source/cairo/cairo_cairo \ diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk index 1b66f16a6b57..ec143c36000a 100644 --- a/canvas/Library_canvasfactory.mk +++ b/canvas/Library_canvasfactory.mk @@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,canvasfactory,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,canvasfactory)) - $(eval $(call gb_Library_add_exception_objects,canvasfactory,\ canvas/source/factory/cf_service \ )) diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk index cb363de2ef04..752c02befcaf 100644 --- a/canvas/Library_canvastools.mk +++ b/canvas/Library_canvastools.mk @@ -53,8 +53,6 @@ $(eval $(call gb_Library_use_libraries,canvastools,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,canvastools)) - $(eval $(call gb_Library_add_exception_objects,canvastools,\ canvas/source/tools/cachedprimitivebase \ canvas/source/tools/canvascustomspritehelper \ diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk index d45b9066ca9b..22a989a308b0 100644 --- a/canvas/Library_directx9canvas.mk +++ b/canvas/Library_directx9canvas.mk @@ -58,8 +58,6 @@ $(eval $(call gb_Library_use_libraries,directx9canvas,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,directx9canvas)) - $(eval $(call gb_Library_use_system_win32_libs,directx9canvas,\ d3d9 \ gdi32 \ diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk index b053b153e5e2..327f9c1b2927 100644 --- a/canvas/Library_gdipluscanvas.mk +++ b/canvas/Library_gdipluscanvas.mk @@ -64,8 +64,6 @@ $(eval $(call gb_Library_use_libraries,gdipluscanvas,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,gdipluscanvas)) - $(eval $(call gb_Library_use_system_win32_libs,gdipluscanvas,\ gdi32 \ gdiplus \ diff --git a/canvas/Library_nullcanvas.mk b/canvas/Library_nullcanvas.mk index ea7376e41bf5..0032336e2867 100644 --- a/canvas/Library_nullcanvas.mk +++ b/canvas/Library_nullcanvas.mk @@ -48,8 +48,6 @@ $(eval $(call gb_Library_use_libraries,nullcanvas,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,nullcanvas)) - $(eval $(call gb_Library_add_exception_objects,nullcanvas,\ canvas/source/null/null_canvasbitmap \ canvas/source/null/null_canvascustomsprite \ diff --git a/canvas/Library_simplecanvas.mk b/canvas/Library_simplecanvas.mk index 1fa62e75d91c..02587dd0b3f7 100644 --- a/canvas/Library_simplecanvas.mk +++ b/canvas/Library_simplecanvas.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,simplecanvas,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,simplecanvas)) - $(eval $(call gb_Library_add_exception_objects,simplecanvas,\ canvas/source/simplecanvas/simplecanvasimpl \ )) diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk index 53599b5555bf..e22d0dcc7e90 100644 --- a/canvas/Library_vclcanvas.mk +++ b/canvas/Library_vclcanvas.mk @@ -52,8 +52,6 @@ $(eval $(call gb_Library_use_libraries,vclcanvas,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,vclcanvas)) - $(eval $(call gb_Library_add_exception_objects,vclcanvas,\ canvas/source/vcl/backbuffer \ canvas/source/vcl/bitmapbackbuffer \ diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk index d5d4ec39e4f1..be78baa95a4c 100644 --- a/chart2/Library_chartcontroller.mk +++ b/chart2/Library_chartcontroller.mk @@ -58,8 +58,6 @@ $(eval $(call gb_Library_use_libraries,chartcontroller,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,chartcontroller)) - $(eval $(call gb_Library_set_componentfile,chartcontroller,chart2/source/controller/chartcontroller)) $(eval $(call gb_Library_add_exception_objects,chartcontroller,\ diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk index 429416d6a955..15b6226acd60 100644 --- a/chart2/Library_chartcore.mk +++ b/chart2/Library_chartcore.mk @@ -45,8 +45,6 @@ $(eval $(call gb_Library_use_libraries,chartcore,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,chartcore)) - $(eval $(call gb_Library_set_componentfile,chartcore,chart2/source/chartcore)) # view pieces ... diff --git a/cli_ure/Executable_climaker.mk b/cli_ure/Executable_climaker.mk index 73dcb63bd21d..0ccd386f8502 100644 --- a/cli_ure/Executable_climaker.mk +++ b/cli_ure/Executable_climaker.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Executable_use_system_win32_libs,climaker,\ ) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,climaker)) - $(eval $(call gb_Executable_add_exception_objects,climaker,\ cli_ure/source/climaker/climaker_app \ cli_ure/source/climaker/climaker_emit \ diff --git a/clucene/Library_clucene.mk b/clucene/Library_clucene.mk index 77ac8ef48606..16bfbd5bf6aa 100644 --- a/clucene/Library_clucene.mk +++ b/clucene/Library_clucene.mk @@ -50,8 +50,6 @@ $(eval $(call gb_Library_add_defs,clucene,\ $(LFS_CFLAGS) \ )) -$(eval $(call gb_Library_add_standard_system_libs,clucene)) - ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_libs,clucene,\ -lm \ diff --git a/comphelper/CppunitTest_comphelper_test.mk b/comphelper/CppunitTest_comphelper_test.mk index 11592b7cc976..b3f443de2cf2 100644 --- a/comphelper/CppunitTest_comphelper_test.mk +++ b/comphelper/CppunitTest_comphelper_test.mk @@ -44,8 +44,6 @@ $(eval $(call gb_CppunitTest_use_libraries,comphelper_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,comphelper_test)) - $(eval $(call gb_CppunitTest_set_include,comphelper_test,\ -I$(SRCDIR)/comphelper/inc \ $$(INCLUDE) \ diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk index c54d59d85339..38156d6d6712 100644 --- a/comphelper/Library_comphelper.mk +++ b/comphelper/Library_comphelper.mk @@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,comphelper,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,comphelper)) - $(eval $(call gb_Library_use_sdk_api,comphelper)) $(eval $(call gb_Library_add_exception_objects,comphelper,\ diff --git a/configmgr/Library_configmgr.mk b/configmgr/Library_configmgr.mk index 7dd348d45562..f7e39baa373a 100644 --- a/configmgr/Library_configmgr.mk +++ b/configmgr/Library_configmgr.mk @@ -75,6 +75,4 @@ $(eval $(call gb_Library_use_libraries,configmgr, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,configmgr)) - $(eval $(call gb_Library_set_componentfile,configmgr,configmgr/source/configmgr)) diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk index ed088bc89ee5..68abe62a2a1f 100644 --- a/connectivity/Library_ado.mk +++ b/connectivity/Library_ado.mk @@ -58,8 +58,6 @@ $(eval $(call gb_Library_use_libraries,ado,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ado)) - $(eval $(call gb_Library_add_exception_objects,ado,\ connectivity/source/drivers/ado/ADatabaseMetaDataImpl \ connectivity/source/drivers/ado/Aolevariant \ diff --git a/connectivity/Library_calc.mk b/connectivity/Library_calc.mk index 489542bbe743..aedd21bb3347 100644 --- a/connectivity/Library_calc.mk +++ b/connectivity/Library_calc.mk @@ -51,8 +51,6 @@ $(eval $(call gb_Library_use_libraries,calc,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,calc)) - $(eval $(call gb_Library_add_exception_objects,calc,\ connectivity/source/drivers/calc/CResultSet \ connectivity/source/drivers/calc/CStatement \ diff --git a/connectivity/Library_dbase.mk b/connectivity/Library_dbase.mk index 14c61ec5fcd8..0dbb517bd6ae 100644 --- a/connectivity/Library_dbase.mk +++ b/connectivity/Library_dbase.mk @@ -52,8 +52,6 @@ $(eval $(call gb_Library_use_libraries,dbase,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,dbase)) - $(eval $(call gb_Library_add_exception_objects,dbase,\ connectivity/source/drivers/dbase/DCode \ connectivity/source/drivers/dbase/DResultSet \ diff --git a/connectivity/Library_dbpool2.mk b/connectivity/Library_dbpool2.mk index ac008feb4bac..fbccc3ae0737 100644 --- a/connectivity/Library_dbpool2.mk +++ b/connectivity/Library_dbpool2.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,dbpool2,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,dbpool2)) - $(eval $(call gb_Library_add_exception_objects,dbpool2,\ connectivity/source/cpool/ZConnectionWrapper \ connectivity/source/cpool/ZDriverWrapper \ diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk index 74d8fea6058e..964f9f372950 100644 --- a/connectivity/Library_dbtools.mk +++ b/connectivity/Library_dbtools.mk @@ -58,8 +58,6 @@ $(eval $(call gb_Library_use_libraries,dbtools,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,dbtools)) - ifeq ($(filter-out NETBSD MACOSX,$(OS)),) $(eval $(call gb_Library_use_libraries,dbtools,\ ucbhelper \ diff --git a/connectivity/Library_evoab.mk b/connectivity/Library_evoab.mk index 4606b8865e1d..687245571f13 100644 --- a/connectivity/Library_evoab.mk +++ b/connectivity/Library_evoab.mk @@ -56,8 +56,6 @@ $(eval $(call gb_Library_use_libraries,evoab,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,evoab)) - $(eval $(call gb_Library_add_exception_objects,evoab,\ connectivity/source/drivers/evoab2/NDriver \ connectivity/source/drivers/evoab2/NTable \ diff --git a/connectivity/Library_file.mk b/connectivity/Library_file.mk index c3326b4af484..8ee3d104022d 100644 --- a/connectivity/Library_file.mk +++ b/connectivity/Library_file.mk @@ -53,8 +53,6 @@ $(eval $(call gb_Library_use_libraries,file,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,file)) - $(eval $(call gb_Library_add_exception_objects,file,\ connectivity/source/drivers/file/FCatalog \ connectivity/source/drivers/file/FColumns \ diff --git a/connectivity/Library_flat.mk b/connectivity/Library_flat.mk index 84345d803895..32e46440dc66 100644 --- a/connectivity/Library_flat.mk +++ b/connectivity/Library_flat.mk @@ -51,8 +51,6 @@ $(eval $(call gb_Library_use_libraries,flat,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,flat)) - $(eval $(call gb_Library_add_exception_objects,flat,\ connectivity/source/drivers/flat/EResultSet \ connectivity/source/drivers/flat/EStatement \ diff --git a/connectivity/Library_hsqldb.mk b/connectivity/Library_hsqldb.mk index b8b0e0f4372d..8521ae3107d9 100644 --- a/connectivity/Library_hsqldb.mk +++ b/connectivity/Library_hsqldb.mk @@ -50,8 +50,6 @@ $(eval $(call gb_Library_use_libraries,hsqldb,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,hsqldb)) - $(eval $(call gb_Library_set_componentfile,hsqldb,connectivity/source/drivers/hsqldb/hsqldb)) $(eval $(call gb_Library_add_exception_objects,hsqldb,\ diff --git a/connectivity/Library_jdbc.mk b/connectivity/Library_jdbc.mk index 71edd85d90d5..23b755374e55 100644 --- a/connectivity/Library_jdbc.mk +++ b/connectivity/Library_jdbc.mk @@ -50,8 +50,6 @@ $(eval $(call gb_Library_use_libraries,jdbc,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,jdbc)) - $(eval $(call gb_Library_add_exception_objects,jdbc,\ connectivity/source/drivers/jdbc/Array \ connectivity/source/drivers/jdbc/Blob \ diff --git a/connectivity/Library_kab1.mk b/connectivity/Library_kab1.mk index 8f2c04ee1263..7fd80cb65b65 100644 --- a/connectivity/Library_kab1.mk +++ b/connectivity/Library_kab1.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,kab1,\ salhelper \ )) -$(eval $(call gb_Library_add_standard_system_libs,kab1)) - $(eval $(call gb_Library_add_exception_objects,kab1,\ connectivity/source/drivers/kab/KDriver \ connectivity/source/drivers/kab/KServices \ diff --git a/connectivity/Library_kabdrv1.mk b/connectivity/Library_kabdrv1.mk index 097848e6e567..ecdd90568d98 100644 --- a/connectivity/Library_kabdrv1.mk +++ b/connectivity/Library_kabdrv1.mk @@ -55,8 +55,6 @@ $(eval $(call gb_Library_use_libraries,kabdrv1,\ comphelper \ )) -$(eval $(call gb_Library_add_standard_system_libs,kabdrv1)) - $(eval $(call gb_Library_add_exception_objects,kabdrv1,\ connectivity/source/drivers/kab/KColumns \ connectivity/source/drivers/kab/KTable \ diff --git a/connectivity/Library_macab1.mk b/connectivity/Library_macab1.mk index 7058eb553ae6..e55422cf924f 100644 --- a/connectivity/Library_macab1.mk +++ b/connectivity/Library_macab1.mk @@ -39,8 +39,6 @@ $(eval $(call gb_Library_use_libraries,macab1,\ salhelper \ )) -$(eval $(call gb_Library_add_standard_system_libs,macab1)) - $(eval $(call gb_Library_set_include,macab1,\ $$(INCLUDE) \ -I$(SRCDIR)/connectivity/inc \ diff --git a/connectivity/Library_macabdrv1.mk b/connectivity/Library_macabdrv1.mk index feb754356a51..c4e77daaa417 100644 --- a/connectivity/Library_macabdrv1.mk +++ b/connectivity/Library_macabdrv1.mk @@ -43,8 +43,6 @@ $(eval $(call gb_Library_use_libraries,macabdrv1,\ salhelper \ )) -$(eval $(call gb_Library_add_standard_system_libs,macabdrv1)) - $(eval $(call gb_Library_set_include,macabdrv1,\ $$(INCLUDE) \ -I$(SRCDIR)/connectivity/inc \ diff --git a/connectivity/Library_mork.mk b/connectivity/Library_mork.mk index 009a3c79b01f..b11cb4f586af 100644 --- a/connectivity/Library_mork.mk +++ b/connectivity/Library_mork.mk @@ -30,8 +30,6 @@ $(eval $(call gb_Library_use_libraries,mork, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,mork)) - $(eval $(call gb_Library_use_sdk_api,mork)) $(eval $(call gb_Library_add_exception_objects,mork, \ diff --git a/connectivity/Library_mozab.mk b/connectivity/Library_mozab.mk index 394d227ea51f..4b4b78927229 100644 --- a/connectivity/Library_mozab.mk +++ b/connectivity/Library_mozab.mk @@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,mozab2,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,mozab2)) - $(eval $(call gb_Library_add_exception_objects,mozab2,\ connectivity/source/drivers/mozab/MDriver \ connectivity/source/drivers/mozab/MServices \ diff --git a/connectivity/Library_mozabdrv.mk b/connectivity/Library_mozabdrv.mk index b7f95a811fa0..b73efc2ec13d 100644 --- a/connectivity/Library_mozabdrv.mk +++ b/connectivity/Library_mozabdrv.mk @@ -45,8 +45,6 @@ $(eval $(call gb_Library_use_libraries,mozabdrv,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,mozabdrv)) - $(eval $(call gb_Library_use_externals,mozabdrv,\ mozilla \ )) diff --git a/connectivity/Library_mozbootstrap.mk b/connectivity/Library_mozbootstrap.mk index edfb4986d943..cdea5e935bd7 100644 --- a/connectivity/Library_mozbootstrap.mk +++ b/connectivity/Library_mozbootstrap.mk @@ -48,8 +48,6 @@ $(eval $(call gb_Library_use_libraries,mozbootstrap,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,mozbootstrap)) - $(eval $(call gb_Library_add_exception_objects,mozbootstrap,\ connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap \ connectivity/source/drivers/mozab/bootstrap/MNSFolders \ diff --git a/connectivity/Library_mysql.mk b/connectivity/Library_mysql.mk index 71bdd14bec67..4e05e402e1e1 100644 --- a/connectivity/Library_mysql.mk +++ b/connectivity/Library_mysql.mk @@ -45,8 +45,6 @@ $(eval $(call gb_Library_use_libraries,mysql,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,mysql)) - $(eval $(call gb_Library_add_exception_objects,mysql,\ connectivity/source/drivers/mysql/YDriver \ connectivity/source/drivers/mysql/YTables \ diff --git a/connectivity/Library_odbc.mk b/connectivity/Library_odbc.mk index 32961f472a61..3f7ccbf02301 100644 --- a/connectivity/Library_odbc.mk +++ b/connectivity/Library_odbc.mk @@ -50,8 +50,6 @@ $(eval $(call gb_Library_use_libraries,odbc,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,odbc)) - $(eval $(call gb_Library_add_exception_objects,odbc,\ connectivity/source/drivers/odbc/oservices \ connectivity/source/drivers/odbc/ORealDriver \ diff --git a/connectivity/Library_odbcbase.mk b/connectivity/Library_odbcbase.mk index f2b2d41d5b12..8335f7e0b1b5 100644 --- a/connectivity/Library_odbcbase.mk +++ b/connectivity/Library_odbcbase.mk @@ -53,8 +53,6 @@ $(eval $(call gb_Library_use_libraries,odbcbase,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,odbcbase)) - $(eval $(call gb_Library_add_exception_objects,odbcbase,\ connectivity/source/drivers/odbcbase/OPreparedStatement \ connectivity/source/drivers/odbcbase/OStatement \ diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index a76eb7b735b6..7e525a9af7f0 100644 --- a/connectivity/Library_postgresql-sdbc-impl.mk +++ b/connectivity/Library_postgresql-sdbc-impl.mk @@ -43,8 +43,6 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,postgresql-sdbc-impl)) - ifeq ($(OS),WNT) $(eval $(call gb_Library_use_system_win32_libs,postgresql-sdbc-impl,\ shell32 \ diff --git a/connectivity/Library_postgresql-sdbc.mk b/connectivity/Library_postgresql-sdbc.mk index 60fbfc97f9f7..1a9f8eb1dd6c 100644 --- a/connectivity/Library_postgresql-sdbc.mk +++ b/connectivity/Library_postgresql-sdbc.mk @@ -42,8 +42,6 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,postgresql-sdbc)) - $(eval $(call gb_Library_set_componentfile,postgresql-sdbc,connectivity/source/drivers/postgresql/postgresql-sdbc)) $(eval $(call gb_Library_add_exception_objects,postgresql-sdbc,\ diff --git a/connectivity/Library_sdbc2.mk b/connectivity/Library_sdbc2.mk index 60db324099f8..7f030f1d53cd 100644 --- a/connectivity/Library_sdbc2.mk +++ b/connectivity/Library_sdbc2.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,sdbc2,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sdbc2)) - $(eval $(call gb_Library_add_exception_objects,sdbc2,\ connectivity/source/manager/mdrivermanager \ connectivity/source/manager/mregistration \ diff --git a/connectivity/Library_tdeab1.mk b/connectivity/Library_tdeab1.mk index 8c402457d7fc..59f2f80cf039 100644 --- a/connectivity/Library_tdeab1.mk +++ b/connectivity/Library_tdeab1.mk @@ -49,8 +49,6 @@ $(eval $(call gb_Library_use_libraries,tdeab1,\ salhelper \ )) -$(eval $(call gb_Library_add_standard_system_libs,tdeab1)) - $(eval $(call gb_Library_add_exception_objects,tdeab1,\ connectivity/source/drivers/kab/KDriver \ connectivity/source/drivers/kab/KServices \ diff --git a/connectivity/Library_tdeabdrv1.mk b/connectivity/Library_tdeabdrv1.mk index 40601d7cf416..b2df458fd4a0 100644 --- a/connectivity/Library_tdeabdrv1.mk +++ b/connectivity/Library_tdeabdrv1.mk @@ -51,8 +51,6 @@ $(eval $(call gb_Library_use_libraries,tdeabdrv1,\ comphelper \ )) -$(eval $(call gb_Library_add_standard_system_libs,tdeabdrv1)) - $(eval $(call gb_Library_add_exception_objects,tdeabdrv1,\ connectivity/source/drivers/kab/KColumns \ connectivity/source/drivers/kab/KTable \ diff --git a/cppcanvas/Library_cppcanvas.mk b/cppcanvas/Library_cppcanvas.mk index a37d36e0ab70..3fa5f1a13cd0 100644 --- a/cppcanvas/Library_cppcanvas.mk +++ b/cppcanvas/Library_cppcanvas.mk @@ -55,8 +55,6 @@ $(eval $(call gb_Library_use_libraries,cppcanvas,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,cppcanvas)) - $(eval $(call gb_Library_add_exception_objects,cppcanvas,\ cppcanvas/source/mtfrenderer/bitmapaction \ cppcanvas/source/mtfrenderer/cachedprimitivebase \ diff --git a/cppcanvas/Library_mtfrenderer.mk b/cppcanvas/Library_mtfrenderer.mk index eb7dbc43f161..ac3f4185c3d0 100644 --- a/cppcanvas/Library_mtfrenderer.mk +++ b/cppcanvas/Library_mtfrenderer.mk @@ -40,8 +40,6 @@ $(eval $(call gb_Library_use_libraries,mtfrenderer,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,mtfrenderer)) - $(eval $(call gb_Library_use_sdk_api,mtfrenderer)) $(eval $(call gb_Library_add_exception_objects,mtfrenderer,\ diff --git a/cppu/CppunitTest_cppu_checkapi.mk b/cppu/CppunitTest_cppu_checkapi.mk index af9e7ea16b48..c47643aea6c5 100644 --- a/cppu/CppunitTest_cppu_checkapi.mk +++ b/cppu/CppunitTest_cppu_checkapi.mk @@ -52,6 +52,4 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_checkapi,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_checkapi)) - # vim: set noet sw=4 ts=4: diff --git a/cppu/CppunitTest_cppu_qa_any.mk b/cppu/CppunitTest_cppu_qa_any.mk index 2b5f4653ee32..0a0342e5162a 100644 --- a/cppu/CppunitTest_cppu_qa_any.mk +++ b/cppu/CppunitTest_cppu_qa_any.mk @@ -37,8 +37,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_any, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_qa_any)) - $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_any, \ cppu \ udkapi \ diff --git a/cppu/CppunitTest_cppu_qa_recursion.mk b/cppu/CppunitTest_cppu_qa_recursion.mk index dffd187d01a1..20d70508ed86 100644 --- a/cppu/CppunitTest_cppu_qa_recursion.mk +++ b/cppu/CppunitTest_cppu_qa_recursion.mk @@ -37,8 +37,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_recursion, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_qa_recursion)) - $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_recursion, \ cppu \ udkapi \ diff --git a/cppu/CppunitTest_cppu_qa_reference.mk b/cppu/CppunitTest_cppu_qa_reference.mk index d2b59a27d5f9..2531f4247119 100644 --- a/cppu/CppunitTest_cppu_qa_reference.mk +++ b/cppu/CppunitTest_cppu_qa_reference.mk @@ -37,8 +37,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_reference, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_qa_reference)) - $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_reference, \ cppu \ udkapi \ diff --git a/cppu/CppunitTest_cppu_qa_unotype.mk b/cppu/CppunitTest_cppu_qa_unotype.mk index ddc84583ff05..094e185fd9c6 100644 --- a/cppu/CppunitTest_cppu_qa_unotype.mk +++ b/cppu/CppunitTest_cppu_qa_unotype.mk @@ -37,8 +37,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_unotype, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_qa_unotype)) - $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_unotype, \ cppu \ udkapi \ diff --git a/cppu/CppunitTest_cppu_test_cppumaker.mk b/cppu/CppunitTest_cppu_test_cppumaker.mk index 7472a3619da2..f235be8f122a 100644 --- a/cppu/CppunitTest_cppu_test_cppumaker.mk +++ b/cppu/CppunitTest_cppu_test_cppumaker.mk @@ -37,8 +37,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_test_cppumaker, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_test_cppumaker)) - $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_test_cppumaker, \ cppu \ udkapi \ diff --git a/cppu/Library_affine_uno.mk b/cppu/Library_affine_uno.mk index 644c82054e85..1edc2876947d 100644 --- a/cppu/Library_affine_uno.mk +++ b/cppu/Library_affine_uno.mk @@ -35,8 +35,6 @@ $(eval $(call gb_Library_use_libraries,affine_uno,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,affine_uno)) - $(eval $(call gb_Library_add_exception_objects,affine_uno,\ cppu/source/AffineBridge/AffineBridge \ )) diff --git a/cppu/Library_cppu.mk b/cppu/Library_cppu.mk index 4bdbb01d2565..d6dbc58c66ed 100644 --- a/cppu/Library_cppu.mk +++ b/cppu/Library_cppu.mk @@ -43,8 +43,6 @@ $(eval $(call gb_Library_use_libraries,cppu,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,cppu)) - $(eval $(call gb_Library_add_cobjects,cppu,\ cppu/source/uno/EnvDcp \ )) diff --git a/cppu/Library_log_uno.mk b/cppu/Library_log_uno.mk index aacb8ed73495..e70d16b20fcb 100644 --- a/cppu/Library_log_uno.mk +++ b/cppu/Library_log_uno.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,log_uno,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,log_uno)) - $(eval $(call gb_Library_add_exception_objects,log_uno,\ cppu/source/LogBridge/LogBridge \ )) diff --git a/cppu/Library_purpenvhelper.mk b/cppu/Library_purpenvhelper.mk index de60f76c5ce0..bddf619b2884 100644 --- a/cppu/Library_purpenvhelper.mk +++ b/cppu/Library_purpenvhelper.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Library_use_libraries,purpenvhelper,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,purpenvhelper)) - $(eval $(call gb_Library_add_exception_objects,purpenvhelper,\ cppu/source/helper/purpenv/helper_purpenv_Environment \ cppu/source/helper/purpenv/helper_purpenv_Mapping \ diff --git a/cppu/Library_unsafe_uno.mk b/cppu/Library_unsafe_uno.mk index 9b3eb68418f4..f71fea1a1a88 100644 --- a/cppu/Library_unsafe_uno.mk +++ b/cppu/Library_unsafe_uno.mk @@ -35,8 +35,6 @@ $(eval $(call gb_Library_use_libraries,unsafe_uno,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,unsafe_uno)) - $(eval $(call gb_Library_add_exception_objects,unsafe_uno,\ cppu/source/UnsafeBridge/UnsafeBridge \ )) diff --git a/cppuhelper/CppunitTest_cppuhelper_checkapi.mk b/cppuhelper/CppunitTest_cppuhelper_checkapi.mk index e5ef4b2b895c..68fd0ec4bc1f 100644 --- a/cppuhelper/CppunitTest_cppuhelper_checkapi.mk +++ b/cppuhelper/CppunitTest_cppuhelper_checkapi.mk @@ -52,6 +52,4 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_checkapi,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,cppuhelper_checkapi)) - # vim: set noet sw=4 ts=4: diff --git a/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk b/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk index 7b50f334646d..b176884a0616 100644 --- a/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk +++ b/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk @@ -42,6 +42,4 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_cppu_ifcontainer,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,cppuhelper_cppu_ifcontainer)) - # vim: set noet sw=4 ts=4: diff --git a/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk b/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk index ee832217dd03..d67382b75d8e 100644 --- a/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk +++ b/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk @@ -38,6 +38,4 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_cppu_unourl,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,cppuhelper_cppu_unourl)) - # vim: set noet sw=4 ts=4: diff --git a/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk b/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk index 6dd88b393cb1..f9fe2742186b 100644 --- a/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk +++ b/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk @@ -42,6 +42,4 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_qa_weak,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,cppuhelper_qa_weak)) - # vim: set noet sw=4 ts=4: diff --git a/cppuhelper/Library_cppuhelper.mk b/cppuhelper/Library_cppuhelper.mk index fcb37211671f..59020c27ef96 100644 --- a/cppuhelper/Library_cppuhelper.mk +++ b/cppuhelper/Library_cppuhelper.mk @@ -51,8 +51,6 @@ $(eval $(call gb_Library_use_libraries,cppuhelper,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,cppuhelper)) - $(eval $(call gb_Library_add_cobjects,cppuhelper,\ cppuhelper/source/findsofficepath \ )) diff --git a/cpputools/Executable_regcomp.mk b/cpputools/Executable_regcomp.mk index 017a8d6332c7..844fd94d683a 100644 --- a/cpputools/Executable_regcomp.mk +++ b/cpputools/Executable_regcomp.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,regcomp,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,regcomp)) - $(eval $(call gb_Executable_add_exception_objects,regcomp,\ cpputools/source/registercomponent/registercomponent \ )) diff --git a/cpputools/Executable_regsingleton.mk b/cpputools/Executable_regsingleton.mk index 19d507fe6a81..0d3354dc6e99 100644 --- a/cpputools/Executable_regsingleton.mk +++ b/cpputools/Executable_regsingleton.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,regsingleton,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,regsingleton)) - $(eval $(call gb_Executable_add_exception_objects,regsingleton,\ cpputools/source/regsingleton/regsingleton \ )) diff --git a/cpputools/Executable_uno.mk b/cpputools/Executable_uno.mk index 65280c0b2269..1825fbdc227f 100644 --- a/cpputools/Executable_uno.mk +++ b/cpputools/Executable_uno.mk @@ -38,8 +38,6 @@ $(eval $(call gb_Executable_use_libraries,uno,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,uno)) - $(eval $(call gb_Executable_use_externals,uno,\ libxml2 \ )) diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index 23321fc64cce..5c66e71eed8b 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -71,8 +71,6 @@ $(eval $(call gb_Library_use_libraries,cui,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,cui)) - $(eval $(call gb_Library_use_externals,cui,\ icuuc \ )) diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk index 06ac3147070c..4db6c7183576 100644 --- a/dbaccess/CppunitTest_dbaccess_macros_test.mk +++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk @@ -71,8 +71,6 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_macros_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,dbaccess_macros_test)) - $(eval $(call gb_CppunitTest_set_include,dbaccess_macros_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/dbaccess/Executable_odbcconfig.mk b/dbaccess/Executable_odbcconfig.mk index 809832fad7a3..0bc3e0da4bb4 100644 --- a/dbaccess/Executable_odbcconfig.mk +++ b/dbaccess/Executable_odbcconfig.mk @@ -40,8 +40,6 @@ $(eval $(call gb_Executable_use_libraries,odbcconfig,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,odbcconfig)) - $(eval $(call gb_Executable_add_exception_objects,odbcconfig,\ dbaccess/win32/source/odbcconfig/odbcconfig \ )) diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk index 8ec7dcd47e35..40a075ea10a3 100644 --- a/dbaccess/Library_dba.mk +++ b/dbaccess/Library_dba.mk @@ -66,8 +66,6 @@ $(eval $(call gb_Library_use_libraries,dba,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,dba)) - $(eval $(call gb_Library_set_componentfile,dba,dbaccess/util/dba)) $(eval $(call gb_Library_add_exception_objects,dba,\ diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk index e9db12444e8d..821852218459 100644 --- a/dbaccess/Library_dbaxml.mk +++ b/dbaccess/Library_dbaxml.mk @@ -53,8 +53,6 @@ $(eval $(call gb_Library_use_libraries,dbaxml,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,dbaxml)) - $(eval $(call gb_Library_set_componentfile,dbaxml,dbaccess/source/filter/xml/dbaxml)) $(eval $(call gb_Library_add_exception_objects,dbaxml,\ diff --git a/dbaccess/Library_dbmm.mk b/dbaccess/Library_dbmm.mk index 3da15cfea101..dd0a73b9b179 100644 --- a/dbaccess/Library_dbmm.mk +++ b/dbaccess/Library_dbmm.mk @@ -55,8 +55,6 @@ $(eval $(call gb_Library_use_libraries,dbmm,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,dbmm)) - $(eval $(call gb_Library_set_componentfile,dbmm,dbaccess/source/ext/macromigration/dbmm)) $(eval $(call gb_Library_add_exception_objects,dbmm,\ diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk index 8d35b1f3da53..f63efabcbdce 100644 --- a/dbaccess/Library_dbu.mk +++ b/dbaccess/Library_dbu.mk @@ -73,8 +73,6 @@ $(eval $(call gb_Library_use_libraries,dbu,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,dbu)) - ifeq ($(GUI),WNT) $(eval $(call gb_Library_use_system_win32_libs,dbu,\ ole32 \ diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk index 306b9ec99075..cc80dca441d5 100644 --- a/dbaccess/Library_sdbt.mk +++ b/dbaccess/Library_sdbt.mk @@ -51,8 +51,6 @@ $(eval $(call gb_Library_use_libraries,sdbt,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sdbt)) - $(eval $(call gb_Library_set_componentfile,sdbt,dbaccess/util/sdbt)) $(eval $(call gb_Library_add_exception_objects,sdbt,\ diff --git a/desktop/Executable_crashrep.com.mk b/desktop/Executable_crashrep.com.mk index 1c712acd537b..c42d6301a085 100644 --- a/desktop/Executable_crashrep.com.mk +++ b/desktop/Executable_crashrep.com.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Executable_use_libraries,crashrep_com,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,crashrep_com)) - $(eval $(call gb_Executable_add_exception_objects,crashrep_com,\ desktop/win32/source/guistdio/guistdio \ )) diff --git a/desktop/Executable_officeloader.mk b/desktop/Executable_officeloader.mk index d881087c969c..d29e0d31108b 100644 --- a/desktop/Executable_officeloader.mk +++ b/desktop/Executable_officeloader.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Executable_use_libraries,officeloader,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,officeloader)) - # I'm not suer wht was the intent, but that break the link #$(eval $(call gb_Executable_set_ldflags,officeloader,\ # $(filter -bind_at_load,$$(LDFLAGS)) \ diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk index 0cded218f54f..3fa96d4f57ce 100644 --- a/desktop/Executable_oosplash.mk +++ b/desktop/Executable_oosplash.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,oosplash,\ sal \ )) -$(eval $(call gb_Executable_add_standard_system_libs,oosplash)) - $(eval $(call gb_Executable_add_cobjects,oosplash,\ desktop/unx/source/args \ desktop/unx/source/file_image_unx \ diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk index aecd9b37dd2b..555917edf714 100644 --- a/desktop/Executable_quickstart.mk +++ b/desktop/Executable_quickstart.mk @@ -45,8 +45,6 @@ $(eval $(call gb_Executable_use_libraries,quickstart,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,quickstart)) - ifeq ($(COM),GCC) $(eval $(call gb_Executable_use_system_win32_libs,quickstart,\ diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk index 2da4803c9f31..3036b5de5cb2 100644 --- a/desktop/Executable_sbase.mk +++ b/desktop/Executable_sbase.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,sbase,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,sbase)) - $(eval $(call gb_Executable_add_libs,sbase,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk index 9d8c906240f7..aa4ce8f7e219 100644 --- a/desktop/Executable_scalc.mk +++ b/desktop/Executable_scalc.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,scalc,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,scalc)) - $(eval $(call gb_Executable_add_libs,scalc,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk index 37605330bfb8..c3f20a674b2a 100644 --- a/desktop/Executable_sdraw.mk +++ b/desktop/Executable_sdraw.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,sdraw,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,sdraw)) - $(eval $(call gb_Executable_add_libs,sdraw,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk index da674755db7e..34d7e13f3913 100644 --- a/desktop/Executable_simpress.mk +++ b/desktop/Executable_simpress.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,simpress,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,simpress)) - $(eval $(call gb_Executable_add_libs,simpress,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk index 261fada2d03c..9ff184704fa2 100644 --- a/desktop/Executable_smath.mk +++ b/desktop/Executable_smath.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,smath,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,smath)) - $(eval $(call gb_Executable_add_libs,smath,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index 98271c98d55b..4de733cb3036 100644 --- a/desktop/Executable_soffice.bin.mk +++ b/desktop/Executable_soffice.bin.mk @@ -40,8 +40,6 @@ $(eval $(call gb_Executable_use_libraries,soffice.bin,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,soffice.bin)) - $(eval $(call gb_Executable_add_cobjects,soffice.bin,\ desktop/source/app/main \ )) diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk index 302c978a0096..d28a20a1ddc9 100644 --- a/desktop/Executable_soffice.mk +++ b/desktop/Executable_soffice.mk @@ -39,8 +39,6 @@ $(eval $(call gb_Executable_use_system_win32_libs,soffice,\ shlwapi \ )) -$(eval $(call gb_Executable_add_standard_system_libs,soffice)) - $(eval $(call gb_Executable_use_static_libraries,soffice,\ ooopathutils \ winextendloaderenv \ diff --git a/desktop/Executable_soffice_bin.mk b/desktop/Executable_soffice_bin.mk index 83c725701c27..5bcf14ac10b5 100644 --- a/desktop/Executable_soffice_bin.mk +++ b/desktop/Executable_soffice_bin.mk @@ -40,8 +40,6 @@ $(eval $(call gb_Executable_use_libraries,soffice_bin,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,soffice_bin)) - $(eval $(call gb_Executable_add_cobjects,soffice_bin,\ desktop/source/app/main \ )) diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk index 2bade4a68e1e..2182da57db77 100644 --- a/desktop/Executable_sweb.mk +++ b/desktop/Executable_sweb.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,sweb,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,sweb)) - $(eval $(call gb_Executable_add_libs,sweb,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk index 2e9d22fb1e9d..e82215317179 100644 --- a/desktop/Executable_swriter.mk +++ b/desktop/Executable_swriter.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,swriter,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,swriter)) - $(eval $(call gb_Executable_add_libs,swriter,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk index d2ff1a3db48b..a15831627d6a 100644 --- a/desktop/Executable_unopkg.bin.mk +++ b/desktop/Executable_unopkg.bin.mk @@ -48,8 +48,6 @@ $(eval $(call gb_Executable_use_libraries,$(desktop_UNOPKGBIN),\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,$(desktop_UNOPKGBIN))) - $(eval $(call gb_Executable_add_cobjects,$(desktop_UNOPKGBIN),\ desktop/source/pkgchk/unopkg/unopkg_main \ )) diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk index 9937fdf0abe5..8298eb9915cf 100644 --- a/desktop/Library_deployment.mk +++ b/desktop/Library_deployment.mk @@ -50,8 +50,6 @@ $(eval $(call gb_Library_use_libraries,deployment,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,deployment)) - ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Library_use_externals,deployment,\ berkeleydb \ diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk index 712a020262ab..a7955115d3f8 100644 --- a/desktop/Library_deploymentgui.mk +++ b/desktop/Library_deploymentgui.mk @@ -56,8 +56,6 @@ $(eval $(call gb_Library_use_libraries,deploymentgui,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,deploymentgui)) - ifeq ($(OS),WNT) $(eval $(call gb_Library_use_system_win32_libs,deploymentgui,\ diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk index e5b179abc38d..2124ea59be1a 100644 --- a/desktop/Library_deploymentmisc.mk +++ b/desktop/Library_deploymentmisc.mk @@ -51,8 +51,6 @@ $(eval $(call gb_Library_use_libraries,deploymentmisc,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,deploymentmisc)) - ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Library_use_externals,deploymentmisc,\ berkeleydb \ diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk index 8c803522193b..36f430d4dcac 100644 --- a/desktop/Library_migrationoo2.mk +++ b/desktop/Library_migrationoo2.mk @@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,migrationoo2,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,migrationoo2)) - $(eval $(call gb_Library_use_externals,migrationoo2,\ berkeleydb \ )) diff --git a/desktop/Library_migrationoo3.mk b/desktop/Library_migrationoo3.mk index 41bc2c1b4a07..6c0783b53b9d 100644 --- a/desktop/Library_migrationoo3.mk +++ b/desktop/Library_migrationoo3.mk @@ -42,8 +42,6 @@ $(eval $(call gb_Library_use_libraries,migrationoo3,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,migrationoo3)) - $(eval $(call gb_Library_use_externals,migrationoo3,\ berkeleydb \ )) diff --git a/desktop/Library_offacc.mk b/desktop/Library_offacc.mk index 769cf5a56945..8272b4d49920 100644 --- a/desktop/Library_offacc.mk +++ b/desktop/Library_offacc.mk @@ -40,8 +40,6 @@ $(eval $(call gb_Library_use_libraries,offacc,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,offacc)) - $(eval $(call gb_Library_set_componentfile,offacc,desktop/source/offacc/offacc)) $(eval $(call gb_Library_add_exception_objects,offacc,\ diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index af9f39f7d72c..377fe1ac2172 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -63,8 +63,6 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sofficeapp)) - ifeq ($(GUIBASE),cocoatouch) $(eval $(call gb_Library_add_cflags,sofficeapp,\ $(gb_OBJCFLAGS) \ diff --git a/desktop/Library_spl.mk b/desktop/Library_spl.mk index 97c0cbf67dac..cc5086db0f68 100644 --- a/desktop/Library_spl.mk +++ b/desktop/Library_spl.mk @@ -46,8 +46,6 @@ $(eval $(call gb_Library_use_libraries,spl,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,spl)) - $(eval $(call gb_Library_set_componentfile,spl,desktop/source/splash/spl)) $(eval $(call gb_Library_add_exception_objects,spl,\ diff --git a/desktop/Library_spl_unx.mk b/desktop/Library_spl_unx.mk index 92059c690010..577a018849d3 100644 --- a/desktop/Library_spl_unx.mk +++ b/desktop/Library_spl_unx.mk @@ -35,8 +35,6 @@ $(eval $(call gb_Library_use_libraries,spl_unx,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,spl_unx)) - $(eval $(call gb_Library_set_componentfile,spl_unx,desktop/unx/splash/splash)) $(eval $(call gb_Library_add_exception_objects,spl_unx,\ diff --git a/desktop/Library_unopkgapp.mk b/desktop/Library_unopkgapp.mk index 4958c6fa47ca..5ce00afd5de6 100644 --- a/desktop/Library_unopkgapp.mk +++ b/desktop/Library_unopkgapp.mk @@ -53,8 +53,6 @@ $(eval $(call gb_Library_use_libraries,unopkgapp,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,unopkgapp)) - $(eval $(call gb_Library_add_exception_objects,unopkgapp,\ desktop/source/pkgchk/unopkg/unopkg_app \ desktop/source/pkgchk/unopkg/unopkg_cmdenv \ diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk index 0b0a62cab133..39d53d5d58bb 100644 --- a/drawinglayer/Library_drawinglayer.mk +++ b/drawinglayer/Library_drawinglayer.mk @@ -65,8 +65,6 @@ $(eval $(call gb_Library_use_libraries,drawinglayer,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,drawinglayer)) - $(eval $(call gb_Library_add_exception_objects,drawinglayer,\ drawinglayer/source/animation/animationtiming \ drawinglayer/source/attribute/fillbitmapattribute \ diff --git a/dtrans/Library_dnd.mk b/dtrans/Library_dnd.mk index 60027e2fef61..952b3cc51115 100644 --- a/dtrans/Library_dnd.mk +++ b/dtrans/Library_dnd.mk @@ -52,8 +52,6 @@ $(eval $(call gb_Library_use_system_win32_libs,dnd,\ uuid \ )) -$(eval $(call gb_Library_add_standard_system_libs,dnd)) - $(eval $(call gb_Library_use_static_libraries,dnd,\ dtobj \ )) diff --git a/dtrans/Library_dtrans.mk b/dtrans/Library_dtrans.mk index e6e48bebd32b..1313b9bff939 100644 --- a/dtrans/Library_dtrans.mk +++ b/dtrans/Library_dtrans.mk @@ -43,8 +43,6 @@ $(eval $(call gb_Library_use_libraries,dtrans,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,dtrans)) - $(eval $(call gb_Library_add_exception_objects,dtrans,\ dtrans/source/generic/clipboardmanager \ dtrans/source/generic/dtrans \ diff --git a/dtrans/Library_ftransl.mk b/dtrans/Library_ftransl.mk index f4c4e272999f..f85460203a9d 100644 --- a/dtrans/Library_ftransl.mk +++ b/dtrans/Library_ftransl.mk @@ -49,8 +49,6 @@ $(eval $(call gb_Library_use_system_win32_libs,ftransl,\ ole32 \ )) -$(eval $(call gb_Library_add_standard_system_libs,ftransl)) - $(eval $(call gb_Library_use_static_libraries,ftransl,\ dtobj \ )) diff --git a/dtrans/Library_mcnttype.mk b/dtrans/Library_mcnttype.mk index aa112dc51705..167f2a13fe38 100644 --- a/dtrans/Library_mcnttype.mk +++ b/dtrans/Library_mcnttype.mk @@ -43,8 +43,6 @@ $(eval $(call gb_Library_use_libraries,mcnttype,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,mcnttype)) - $(eval $(call gb_Library_add_exception_objects,mcnttype,\ dtrans/source/cnttype/mcnttfactory \ dtrans/source/cnttype/mcnttype \ diff --git a/dtrans/Library_sysdtrans.mk b/dtrans/Library_sysdtrans.mk index 93e7b696604b..6be9786b72fa 100644 --- a/dtrans/Library_sysdtrans.mk +++ b/dtrans/Library_sysdtrans.mk @@ -57,8 +57,6 @@ $(eval $(call gb_Library_use_system_win32_libs,sysdtrans,\ uuid \ )) -$(eval $(call gb_Library_add_standard_system_libs,sysdtrans)) - $(eval $(call gb_Library_use_static_libraries,sysdtrans,\ dtobj \ )) diff --git a/editeng/CppunitTest_editeng_borderline.mk b/editeng/CppunitTest_editeng_borderline.mk index 6b513bba5388..106892a7f526 100644 --- a/editeng/CppunitTest_editeng_borderline.mk +++ b/editeng/CppunitTest_editeng_borderline.mk @@ -55,8 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_borderline, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,editeng_borderline)) - $(eval $(call gb_CppunitTest_use_externals,editeng_borderline,\ icuuc \ )) diff --git a/editeng/CppunitTest_editeng_core.mk b/editeng/CppunitTest_editeng_core.mk index 561effdb67da..d98ddc76e2dd 100644 --- a/editeng/CppunitTest_editeng_core.mk +++ b/editeng/CppunitTest_editeng_core.mk @@ -60,8 +60,6 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_core, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,editeng_core)) - $(eval $(call gb_CppunitTest_use_externals,editeng_core,\ icuuc \ )) diff --git a/editeng/CppunitTest_editeng_lookuptree.mk b/editeng/CppunitTest_editeng_lookuptree.mk index a61c85495baa..499b6ed35e30 100644 --- a/editeng/CppunitTest_editeng_lookuptree.mk +++ b/editeng/CppunitTest_editeng_lookuptree.mk @@ -55,8 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_lookuptree, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,editeng_lookuptree)) - $(eval $(call gb_CppunitTest_use_externals,editeng_lookuptree,\ icuuc \ )) diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk index 308e7595de12..178d0168dd15 100644 --- a/editeng/Library_editeng.mk +++ b/editeng/Library_editeng.mk @@ -154,8 +154,6 @@ $(eval $(call gb_Library_use_libraries,editeng,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,editeng)) - $(eval $(call gb_Library_use_external,editeng,icuuc)) # Runtime dependency for unit-tests diff --git a/embeddedobj/Library_embobj.mk b/embeddedobj/Library_embobj.mk index 083166c77c1c..47963a0fd05f 100644 --- a/embeddedobj/Library_embobj.mk +++ b/embeddedobj/Library_embobj.mk @@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,embobj,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,embobj)) - $(eval $(call gb_Library_add_exception_objects,embobj,\ embeddedobj/source/commonembedding/embedobj \ embeddedobj/source/commonembedding/inplaceobj \ diff --git a/embeddedobj/Library_emboleobj.mk b/embeddedobj/Library_emboleobj.mk index b4c8e6bb7be9..32dfe09731ce 100644 --- a/embeddedobj/Library_emboleobj.mk +++ b/embeddedobj/Library_emboleobj.mk @@ -46,8 +46,6 @@ $(eval $(call gb_Library_use_libraries,emboleobj,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,emboleobj)) - $(eval $(call gb_Library_add_exception_objects,emboleobj,\ embeddedobj/source/msole/closepreventer \ embeddedobj/source/msole/oleembed \ diff --git a/embedserv/Library_emser.mk b/embedserv/Library_emser.mk index c261f9448e64..4d7e0d0b504a 100644 --- a/embedserv/Library_emser.mk +++ b/embedserv/Library_emser.mk @@ -56,8 +56,6 @@ $(eval $(call gb_Library_use_system_win32_libs,emser,\ uuid \ )) -$(eval $(call gb_Library_add_standard_system_libs,emser)) - ifeq ($(USE_DEBUG_RUNTIME),) $(eval $(call gb_Library_add_libs,emser,\ $(ATL_LIB)/atls.lib \ diff --git a/embedserv/Library_inprocserv.mk b/embedserv/Library_inprocserv.mk index ffe596a86b0c..3c1bf0d0aa75 100644 --- a/embedserv/Library_inprocserv.mk +++ b/embedserv/Library_inprocserv.mk @@ -42,8 +42,6 @@ $(eval $(call gb_Library_use_libraries,inprocserv,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,inprocserv)) - ifeq ($(COM),MSC) $(eval $(call gb_Library_add_ldflags,inprocserv,\ /EXPORT:DllCanUnloadNow \ diff --git a/eventattacher/Library_evtatt.mk b/eventattacher/Library_evtatt.mk index 3ea419418096..4e18e3c57e00 100644 --- a/eventattacher/Library_evtatt.mk +++ b/eventattacher/Library_evtatt.mk @@ -40,8 +40,6 @@ $(eval $(call gb_Library_use_libraries,evtatt,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,evtatt)) - $(eval $(call gb_Library_add_exception_objects,evtatt,\ eventattacher/source/eventattacher \ )) diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk index b5e88d2ba1e0..51e5fc4458c9 100644 --- a/extensions/CppunitTest_extensions_test_update.mk +++ b/extensions/CppunitTest_extensions_test_update.mk @@ -42,8 +42,6 @@ $(eval $(call gb_CppunitTest_use_libraries,extensions_test_update, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,extensions_test_update)) - ifeq ($(OS),WNT) $(eval $(call gb_CppunitTest_use_system_win32_libs,extensions_test_update,\ shell32 \ diff --git a/extensions/Library_abp.mk b/extensions/Library_abp.mk index 82ac86bef87d..b4a556976bc6 100644 --- a/extensions/Library_abp.mk +++ b/extensions/Library_abp.mk @@ -86,6 +86,4 @@ $(eval $(call gb_Library_use_libraries,abp,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,abp)) - # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Library_bib.mk b/extensions/Library_bib.mk index 6ba529538ad3..4e46e07c1da8 100644 --- a/extensions/Library_bib.mk +++ b/extensions/Library_bib.mk @@ -70,6 +70,4 @@ $(eval $(call gb_Library_use_libraries,bib,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,bib)) - # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Library_dbp.mk b/extensions/Library_dbp.mk index caf72dc5114a..47b64e5ed832 100644 --- a/extensions/Library_dbp.mk +++ b/extensions/Library_dbp.mk @@ -72,6 +72,4 @@ $(eval $(call gb_Library_use_libraries,dbp,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,dbp)) - # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Library_log.mk b/extensions/Library_log.mk index a366362cfea3..d09c1d04f552 100644 --- a/extensions/Library_log.mk +++ b/extensions/Library_log.mk @@ -55,6 +55,4 @@ $(eval $(call gb_Library_use_libraries,log,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,log)) - # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Library_pcr.mk b/extensions/Library_pcr.mk index 974701566838..690a3cd28256 100644 --- a/extensions/Library_pcr.mk +++ b/extensions/Library_pcr.mk @@ -58,8 +58,6 @@ $(eval $(call gb_Library_use_libraries,pcr,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,pcr)) - $(eval $(call gb_Library_add_exception_objects,pcr,\ extensions/source/propctrlr/MasterDetailLinkDialog \ extensions/source/propctrlr/browserline \ diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk index dc5e6c4f9cde..8cbbd1baf207 100644 --- a/extensions/Library_pl.mk +++ b/extensions/Library_pl.mk @@ -133,8 +133,6 @@ $(eval $(call gb_Library_use_libraries,pl,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,pl)) - $(eval $(call gb_Library_add_exception_objects,pl,\ extensions/source/plugin/base/context \ extensions/source/plugin/base/evtlstnr \ diff --git a/extensions/Library_res.mk b/extensions/Library_res.mk index 22587cc65e9c..953e369e4d48 100644 --- a/extensions/Library_res.mk +++ b/extensions/Library_res.mk @@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,res,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,res)) - $(eval $(call gb_Library_add_exception_objects,res,\ extensions/source/resource/ResourceIndexAccess \ extensions/source/resource/oooresourceloader \ diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk index a72cabcb6371..df976e6aa026 100644 --- a/extensions/Library_scn.mk +++ b/extensions/Library_scn.mk @@ -43,8 +43,6 @@ $(eval $(call gb_Library_use_libraries,scn,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,scn)) - $(eval $(call gb_Library_add_exception_objects,scn,\ extensions/source/scanner/scnserv \ extensions/source/scanner/scanner \ diff --git a/fileaccess/Library_fileacc.mk b/fileaccess/Library_fileacc.mk index 01a54320119a..a5df4474c901 100644 --- a/fileaccess/Library_fileacc.mk +++ b/fileaccess/Library_fileacc.mk @@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,fileacc,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,fileacc)) - $(eval $(call gb_Library_set_componentfile,fileacc,fileaccess/source/fileacc)) $(eval $(call gb_Library_add_exception_objects,fileacc,fileaccess/source/FileAccess)) diff --git a/filter/CppunitTest_filter_pict_test.mk b/filter/CppunitTest_filter_pict_test.mk index a84cffa41506..082ea8c53e9f 100644 --- a/filter/CppunitTest_filter_pict_test.mk +++ b/filter/CppunitTest_filter_pict_test.mk @@ -22,8 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_pict_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,filter_pict_test)) - $(eval $(call gb_CppunitTest_use_api,filter_pict_test,\ udkapi \ offapi \ diff --git a/filter/CppunitTest_filter_tga_test.mk b/filter/CppunitTest_filter_tga_test.mk index 597cd2cbfa55..2829dbd17005 100644 --- a/filter/CppunitTest_filter_tga_test.mk +++ b/filter/CppunitTest_filter_tga_test.mk @@ -41,8 +41,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_tga_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,filter_tga_test)) - $(eval $(call gb_CppunitTest_use_api,filter_tga_test,\ udkapi \ offapi \ diff --git a/filter/CppunitTest_filter_tiff_test.mk b/filter/CppunitTest_filter_tiff_test.mk index ce29bb29c6f8..1fe899c228a9 100644 --- a/filter/CppunitTest_filter_tiff_test.mk +++ b/filter/CppunitTest_filter_tiff_test.mk @@ -41,8 +41,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_tiff_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,filter_tiff_test)) - $(eval $(call gb_CppunitTest_use_api,filter_tiff_test,\ udkapi \ offapi \ diff --git a/filter/Executable_svg2odf.mk b/filter/Executable_svg2odf.mk index ad38d5eba6fd..ca0b39b4ddd5 100644 --- a/filter/Executable_svg2odf.mk +++ b/filter/Executable_svg2odf.mk @@ -55,8 +55,6 @@ $(eval $(call gb_Executable_use_libraries,svg2odf,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,svg2odf)) - $(eval $(call gb_Executable_add_exception_objects,svg2odf,\ filter/source/svg/test/svg2odf \ filter/source/svg/test/odfserializer \ diff --git a/filter/Library_PptImporter.mk b/filter/Library_PptImporter.mk index 22e613952383..f1d172aeda4f 100644 --- a/filter/Library_PptImporter.mk +++ b/filter/Library_PptImporter.mk @@ -33,8 +33,6 @@ $(eval $(call gb_Library_use_libraries,PptImporter,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,PptImporter)) - $(eval $(call gb_Library_add_exception_objects,PptImporter,\ filter/source/msfilter/powerpoint/pptimporter \ filter/source/msfilter/powerpoint/pptimporteruno \ diff --git a/filter/Library_egi.mk b/filter/Library_egi.mk index 68c45f9f1adb..21bfacd47d8e 100644 --- a/filter/Library_egi.mk +++ b/filter/Library_egi.mk @@ -33,8 +33,6 @@ $(eval $(call gb_Library_use_libraries,egi,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,egi)) - $(eval $(call gb_Library_add_exception_objects,egi,\ filter/source/graphicfilter/egif/egif \ filter/source/graphicfilter/egif/giflzwc \ diff --git a/filter/Library_eme.mk b/filter/Library_eme.mk index aed74813581c..603dd60fca50 100644 --- a/filter/Library_eme.mk +++ b/filter/Library_eme.mk @@ -33,8 +33,6 @@ $(eval $(call gb_Library_use_libraries,eme,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,eme)) - $(eval $(call gb_Library_add_exception_objects,eme,\ filter/source/graphicfilter/eos2met/eos2met \ )) diff --git a/filter/Library_epb.mk b/filter/Library_epb.mk index dabe92c4d75c..ef5cf034a0a6 100644 --- a/filter/Library_epb.mk +++ b/filter/Library_epb.mk @@ -33,8 +33,6 @@ $(eval $(call gb_Library_use_libraries,epb,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,epb)) - $(eval $(call gb_Library_add_exception_objects,epb,\ filter/source/graphicfilter/epbm/epbm \ )) diff --git a/filter/Library_epg.mk b/filter/Library_epg.mk index cf1ab1f69b65..4f0bf50af97e 100644 --- a/filter/Library_epg.mk +++ b/filter/Library_epg.mk @@ -33,8 +33,6 @@ $(eval $(call gb_Library_use_libraries,epg,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,epg)) - $(eval $(call gb_Library_add_exception_objects,epg,\ filter/source/graphicfilter/epgm/epgm \ )) diff --git a/filter/Library_epp.mk b/filter/Library_epp.mk index 9ca7ff0d0c4d..7ff57d7fa1b9 100644 --- a/filter/Library_epp.mk +++ b/filter/Library_epp.mk @@ -33,8 +33,6 @@ $(eval $(call gb_Library_use_libraries,epp,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,epp)) - $(eval $(call gb_Library_add_exception_objects,epp,\ filter/source/graphicfilter/eppm/eppm \ )) diff --git a/filter/Library_eps.mk b/filter/Library_eps.mk index 7ce9d29b04a4..5dda0d59957d 100644 --- a/filter/Library_eps.mk +++ b/filter/Library_eps.mk @@ -34,8 +34,6 @@ $(eval $(call gb_Library_use_libraries,eps,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,eps)) - $(eval $(call gb_Library_add_exception_objects,eps,\ filter/source/graphicfilter/eps/eps \ )) diff --git a/filter/Library_ept.mk b/filter/Library_ept.mk index 5281662571a4..7e798f514647 100644 --- a/filter/Library_ept.mk +++ b/filter/Library_ept.mk @@ -34,8 +34,6 @@ $(eval $(call gb_Library_use_libraries,ept,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ept)) - $(eval $(call gb_Library_add_exception_objects,ept,\ filter/source/graphicfilter/epict/epict \ )) diff --git a/filter/Library_era.mk b/filter/Library_era.mk index b558d014c8dd..80d576adbc02 100644 --- a/filter/Library_era.mk +++ b/filter/Library_era.mk @@ -33,8 +33,6 @@ $(eval $(call gb_Library_use_libraries,era,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,era)) - $(eval $(call gb_Library_add_exception_objects,era,\ filter/source/graphicfilter/eras/eras \ )) diff --git a/filter/Library_eti.mk b/filter/Library_eti.mk index 45c1aa1a9fd8..1bdf01f16235 100644 --- a/filter/Library_eti.mk +++ b/filter/Library_eti.mk @@ -33,8 +33,6 @@ $(eval $(call gb_Library_use_libraries,eti,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,eti)) - $(eval $(call gb_Library_add_exception_objects,eti,\ filter/source/graphicfilter/etiff/etiff \ )) diff --git a/filter/Library_exp.mk b/filter/Library_exp.mk index de4e0873178c..b9e8bfb3d9ad 100644 --- a/filter/Library_exp.mk +++ b/filter/Library_exp.mk @@ -33,8 +33,6 @@ $(eval $(call gb_Library_use_libraries,exp,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,exp)) - $(eval $(call gb_Library_add_exception_objects,exp,\ filter/source/graphicfilter/expm/expm \ )) diff --git a/filter/Library_filterconfig.mk b/filter/Library_filterconfig.mk index accb75de4a39..358239e8b32f 100644 --- a/filter/Library_filterconfig.mk +++ b/filter/Library_filterconfig.mk @@ -39,8 +39,6 @@ $(eval $(call gb_Library_use_libraries,filterconfig,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,filterconfig)) - $(eval $(call gb_Library_add_exception_objects,filterconfig,\ filter/source/config/cache/basecontainer \ diff --git a/filter/Library_flash.mk b/filter/Library_flash.mk index 13843bd93578..fd06b4c30f8b 100644 --- a/filter/Library_flash.mk +++ b/filter/Library_flash.mk @@ -39,8 +39,6 @@ $(eval $(call gb_Library_use_libraries,flash,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,flash)) - $(eval $(call gb_Library_use_externals,flash,zlib)) $(eval $(call gb_Library_add_exception_objects,flash,\ diff --git a/filter/Library_icd.mk b/filter/Library_icd.mk index ca60b884d51b..0edc312dd344 100644 --- a/filter/Library_icd.mk +++ b/filter/Library_icd.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Library_use_libraries,icd,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,icd)) - $(eval $(call gb_Library_add_exception_objects,icd,\ filter/source/graphicfilter/ipcd/ipcd \ )) diff --git a/filter/Library_icg.mk b/filter/Library_icg.mk index 614107ef2be3..da26358dbdf5 100644 --- a/filter/Library_icg.mk +++ b/filter/Library_icg.mk @@ -35,8 +35,6 @@ $(eval $(call gb_Library_use_libraries,icg,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,icg)) - $(eval $(call gb_Library_add_exception_objects,icg,\ filter/source/graphicfilter/icgm/actimpr \ filter/source/graphicfilter/icgm/bitmap \ diff --git a/filter/Library_idx.mk b/filter/Library_idx.mk index 6cd2083284b9..9b02248305b9 100644 --- a/filter/Library_idx.mk +++ b/filter/Library_idx.mk @@ -31,8 +31,6 @@ $(eval $(call gb_Library_use_libraries,idx,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,idx)) - $(eval $(call gb_Library_add_exception_objects,idx,\ filter/source/graphicfilter/idxf/dxf2mtf \ filter/source/graphicfilter/idxf/dxfblkrd \ diff --git a/filter/Library_ime.mk b/filter/Library_ime.mk index 8aa08162ddb6..3de90cee440c 100644 --- a/filter/Library_ime.mk +++ b/filter/Library_ime.mk @@ -31,8 +31,6 @@ $(eval $(call gb_Library_use_libraries,ime,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ime)) - $(eval $(call gb_Library_add_exception_objects,ime,\ filter/source/graphicfilter/ios2met/ios2met \ )) diff --git a/filter/Library_ipb.mk b/filter/Library_ipb.mk index 34db6b034768..cf2a5773e910 100644 --- a/filter/Library_ipb.mk +++ b/filter/Library_ipb.mk @@ -31,8 +31,6 @@ $(eval $(call gb_Library_use_libraries,ipb,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ipb)) - $(eval $(call gb_Library_add_exception_objects,ipb,\ filter/source/graphicfilter/ipbm/ipbm \ )) diff --git a/filter/Library_ipd.mk b/filter/Library_ipd.mk index d84768c10561..844bd3498ae9 100644 --- a/filter/Library_ipd.mk +++ b/filter/Library_ipd.mk @@ -31,8 +31,6 @@ $(eval $(call gb_Library_use_libraries,ipd,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ipd)) - $(eval $(call gb_Library_add_exception_objects,ipd,\ filter/source/graphicfilter/ipsd/ipsd \ )) diff --git a/filter/Library_ips.mk b/filter/Library_ips.mk index 01226fc530db..feed47ad0223 100644 --- a/filter/Library_ips.mk +++ b/filter/Library_ips.mk @@ -31,8 +31,6 @@ $(eval $(call gb_Library_use_libraries,ips,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ips)) - $(eval $(call gb_Library_add_exception_objects,ips,\ filter/source/graphicfilter/ieps/ieps \ )) diff --git a/filter/Library_ipt.mk b/filter/Library_ipt.mk index f6047a0c2460..86722c627490 100644 --- a/filter/Library_ipt.mk +++ b/filter/Library_ipt.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Library_use_libraries,ipt,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ipt)) - $(eval $(call gb_Library_add_exception_objects,ipt,\ filter/source/graphicfilter/ipict/ipict \ filter/source/graphicfilter/ipict/shape \ diff --git a/filter/Library_ipx.mk b/filter/Library_ipx.mk index b266f3b39879..50c87ec33be6 100644 --- a/filter/Library_ipx.mk +++ b/filter/Library_ipx.mk @@ -31,8 +31,6 @@ $(eval $(call gb_Library_use_libraries,ipx,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ipx)) - $(eval $(call gb_Library_add_exception_objects,ipx,\ filter/source/graphicfilter/ipcx/ipcx \ )) diff --git a/filter/Library_ira.mk b/filter/Library_ira.mk index d1f2b8a14cc1..80e2231d9834 100644 --- a/filter/Library_ira.mk +++ b/filter/Library_ira.mk @@ -31,8 +31,6 @@ $(eval $(call gb_Library_use_libraries,ira,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ira)) - $(eval $(call gb_Library_add_exception_objects,ira,\ filter/source/graphicfilter/iras/iras \ )) diff --git a/filter/Library_itg.mk b/filter/Library_itg.mk index fb7ae312fc3f..2e64888e2da6 100644 --- a/filter/Library_itg.mk +++ b/filter/Library_itg.mk @@ -31,8 +31,6 @@ $(eval $(call gb_Library_use_libraries,itg,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,itg)) - $(eval $(call gb_Library_add_exception_objects,itg,\ filter/source/graphicfilter/itga/itga \ )) diff --git a/filter/Library_iti.mk b/filter/Library_iti.mk index 895b2cd172e7..d186dc03163c 100644 --- a/filter/Library_iti.mk +++ b/filter/Library_iti.mk @@ -31,8 +31,6 @@ $(eval $(call gb_Library_use_libraries,iti,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,iti)) - $(eval $(call gb_Library_add_exception_objects,iti,\ filter/source/graphicfilter/itiff/ccidecom \ filter/source/graphicfilter/itiff/itiff \ diff --git a/filter/Library_msfilter.mk b/filter/Library_msfilter.mk index 2061f571015e..ea042bba87a1 100644 --- a/filter/Library_msfilter.mk +++ b/filter/Library_msfilter.mk @@ -54,8 +54,6 @@ $(eval $(call gb_Library_use_libraries,msfilter,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,msfilter)) - $(eval $(call gb_Library_add_exception_objects,msfilter,\ filter/source/msfilter/countryid \ filter/source/msfilter/escherex \ diff --git a/filter/Library_odfflatxml.mk b/filter/Library_odfflatxml.mk index b7a99a4568e8..b7d66b66488a 100644 --- a/filter/Library_odfflatxml.mk +++ b/filter/Library_odfflatxml.mk @@ -46,8 +46,6 @@ $(eval $(call gb_Library_use_libraries,odfflatxml,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,odfflatxml)) - $(eval $(call gb_Library_add_exception_objects,odfflatxml,\ filter/source/odfflatxml/OdfFlatXml \ )) diff --git a/filter/Library_pdffilter.mk b/filter/Library_pdffilter.mk index 1801ccf6086f..1f108429f44e 100644 --- a/filter/Library_pdffilter.mk +++ b/filter/Library_pdffilter.mk @@ -43,8 +43,6 @@ $(eval $(call gb_Library_use_libraries,pdffilter,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,pdffilter)) - $(eval $(call gb_Library_add_exception_objects,pdffilter,\ filter/source/pdf/impdialog \ filter/source/pdf/pdfdialog \ diff --git a/filter/Library_placeware.mk b/filter/Library_placeware.mk index eee399f1b859..742be659e46b 100644 --- a/filter/Library_placeware.mk +++ b/filter/Library_placeware.mk @@ -34,8 +34,6 @@ $(eval $(call gb_Library_use_libraries,placeware,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,placeware)) - $(eval $(call gb_Library_add_exception_objects,placeware,\ filter/source/placeware/exporter \ filter/source/placeware/filter \ diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk index c3b752e4d0f2..bc8520b80724 100644 --- a/filter/Library_svgfilter.mk +++ b/filter/Library_svgfilter.mk @@ -52,8 +52,6 @@ $(eval $(call gb_Library_use_libraries,svgfilter,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,svgfilter)) - $(eval $(call gb_Library_use_externals,svgfilter,libxml2)) $(eval $(call gb_Library_add_exception_objects,svgfilter,\ diff --git a/filter/Library_t602filter.mk b/filter/Library_t602filter.mk index b3d649db3ad2..12c7af621f0f 100644 --- a/filter/Library_t602filter.mk +++ b/filter/Library_t602filter.mk @@ -35,8 +35,6 @@ $(eval $(call gb_Library_use_libraries,t602filter,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,t602filter)) - $(eval $(call gb_Library_add_exception_objects,t602filter,\ filter/source/t602/filterenv \ filter/source/t602/t602filter \ diff --git a/filter/Library_textfd.mk b/filter/Library_textfd.mk index 3acc160d3954..bcb4d90b55de 100644 --- a/filter/Library_textfd.mk +++ b/filter/Library_textfd.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,textfd,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,textfd)) - $(eval $(call gb_Library_add_exception_objects,textfd,\ filter/source/textfilterdetect/fdcomp \ filter/source/textfilterdetect/filterdetect \ diff --git a/filter/Library_xmlfa.mk b/filter/Library_xmlfa.mk index 5cd70bb6ab76..54f98948ae92 100644 --- a/filter/Library_xmlfa.mk +++ b/filter/Library_xmlfa.mk @@ -35,8 +35,6 @@ $(eval $(call gb_Library_use_libraries,xmlfa,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,xmlfa)) - $(eval $(call gb_Library_add_exception_objects,xmlfa,\ filter/source/xmlfilteradaptor/XmlFilterAdaptor \ filter/source/xmlfilteradaptor/genericfilter \ diff --git a/filter/Library_xmlfd.mk b/filter/Library_xmlfd.mk index 99c6a8e91a62..af18c641d101 100644 --- a/filter/Library_xmlfd.mk +++ b/filter/Library_xmlfd.mk @@ -34,8 +34,6 @@ $(eval $(call gb_Library_use_libraries,xmlfd,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,xmlfd)) - $(eval $(call gb_Library_add_exception_objects,xmlfd,\ filter/source/xmlfilterdetect/fdcomp \ filter/source/xmlfilterdetect/filterdetect \ diff --git a/filter/Library_xsltdlg.mk b/filter/Library_xsltdlg.mk index 2f87b27acfa7..293721047d58 100644 --- a/filter/Library_xsltdlg.mk +++ b/filter/Library_xsltdlg.mk @@ -42,8 +42,6 @@ $(eval $(call gb_Library_use_libraries,xsltdlg,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,xsltdlg)) - $(eval $(call gb_Library_add_exception_objects,xsltdlg,\ filter/source/xsltdialog/typedetectionexport \ filter/source/xsltdialog/typedetectionimport \ diff --git a/filter/Library_xsltfilter.mk b/filter/Library_xsltfilter.mk index 3dec5645a86f..1563c14fe4ab 100644 --- a/filter/Library_xsltfilter.mk +++ b/filter/Library_xsltfilter.mk @@ -40,8 +40,6 @@ $(eval $(call gb_Library_use_libraries,xsltfilter,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,xsltfilter)) - $(eval $(call gb_Library_use_externals,xsltfilter,\ libxml2 \ libxslt \ diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk index 809bef707b6e..e86803163839 100644 --- a/forms/Library_frm.mk +++ b/forms/Library_frm.mk @@ -60,8 +60,6 @@ $(eval $(call gb_Library_use_libraries,frm,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,frm)) - ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Library_use_externals,frm,\ icuin \ diff --git a/formula/Library_for.mk b/formula/Library_for.mk index 4e392b7fa15c..848103af2e7c 100644 --- a/formula/Library_for.mk +++ b/formula/Library_for.mk @@ -55,8 +55,6 @@ $(eval $(call gb_Library_use_libraries,for,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,for)) - $(eval $(call gb_Library_set_componentfile,for,formula/util/for)) $(eval $(call gb_Library_add_exception_objects,for,\ diff --git a/formula/Library_forui.mk b/formula/Library_forui.mk index b92cf91da298..07ff194f14dc 100644 --- a/formula/Library_forui.mk +++ b/formula/Library_forui.mk @@ -54,8 +54,6 @@ $(eval $(call gb_Library_use_libraries,forui,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,forui)) - $(eval $(call gb_Library_add_exception_objects,forui,\ formula/source/ui/dlg/formula \ formula/source/ui/dlg/FormulaHelper \ diff --git a/fpicker/Library_fpicker.mk b/fpicker/Library_fpicker.mk index c18687564d4d..0a85dd4a00ae 100644 --- a/fpicker/Library_fpicker.mk +++ b/fpicker/Library_fpicker.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Library_use_libraries,fpicker,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,fpicker)) - ifeq ($(OS),WNT) $(eval $(call gb_Library_use_static_libraries,fpicker,\ odma_lib \ diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk index b3b3fc3a3d4a..eb1cd0c28687 100644 --- a/fpicker/Library_fps.mk +++ b/fpicker/Library_fps.mk @@ -66,8 +66,6 @@ $(eval $(call gb_Library_use_system_win32_libs,fps,\ uuid \ )) -$(eval $(call gb_Library_add_standard_system_libs,fps)) - ifeq ($(COM),MSC) $(eval $(call gb_Library_add_libs,fps,\ Delayimp.lib /DELAYLOAD:shell32.dll \ diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk index 1f1d3e4f2fd9..241be777d272 100644 --- a/fpicker/Library_fps_aqua.mk +++ b/fpicker/Library_fps_aqua.mk @@ -48,8 +48,6 @@ $(eval $(call gb_Library_use_libraries,fps_aqua,\ vcl \ )) -$(eval $(call gb_Library_add_standard_system_libs,fps_aqua)) - $(eval $(call gb_Library_add_objcxxobjects,fps_aqua,\ fpicker/source/aqua/AquaFilePickerDelegate \ fpicker/source/aqua/CFStringUtilities \ diff --git a/fpicker/Library_fps_odma.mk b/fpicker/Library_fps_odma.mk index dbb1fe382339..63e9834fe068 100644 --- a/fpicker/Library_fps_odma.mk +++ b/fpicker/Library_fps_odma.mk @@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,fps_odma,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,fps_odma)) - ifeq ($(OS),WNT) $(eval $(call gb_Library_use_static_libraries,fps_odma,\ odma_lib \ diff --git a/fpicker/Library_fps_office.mk b/fpicker/Library_fps_office.mk index 5582ffb076e2..58e3011fe7b6 100644 --- a/fpicker/Library_fps_office.mk +++ b/fpicker/Library_fps_office.mk @@ -51,8 +51,6 @@ $(eval $(call gb_Library_use_libraries,fps_office,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,fps_office)) - $(eval $(call gb_Library_add_exception_objects,fps_office,\ fpicker/source/office/asyncfilepicker \ fpicker/source/office/commonpicker \ diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk index fcc35cc1fecc..38f5f9a7adc0 100644 --- a/framework/Library_fwe.mk +++ b/framework/Library_fwe.mk @@ -54,8 +54,6 @@ $(eval $(call gb_Library_use_libraries,fwe,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,fwe)) - $(eval $(call gb_Library_add_exception_objects,fwe,\ framework/source/fwe/classes/actiontriggercontainer \ framework/source/fwe/classes/actiontriggerpropertyset \ diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk index eab6f7a4f44c..3dddcc13b999 100644 --- a/framework/Library_fwi.mk +++ b/framework/Library_fwi.mk @@ -57,8 +57,6 @@ $(eval $(call gb_Library_use_libraries,fwi,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,fwi)) - $(eval $(call gb_Library_add_exception_objects,fwi,\ framework/source/fwi/classes/converter \ framework/source/fwi/classes/propertysethelper \ diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk index 3a4ed045cae0..84ad3c6a3654 100644 --- a/framework/Library_fwk.mk +++ b/framework/Library_fwk.mk @@ -57,8 +57,6 @@ $(eval $(call gb_Library_use_libraries,fwk,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,fwk)) - $(eval $(call gb_Library_add_exception_objects,fwk,\ framework/source/accelerators/acceleratorcache \ framework/source/accelerators/acceleratorconfiguration \ diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk index 45c605663651..b01dbbf47ff0 100644 --- a/framework/Library_fwl.mk +++ b/framework/Library_fwl.mk @@ -55,8 +55,6 @@ $(eval $(call gb_Library_use_libraries,fwl,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,fwl)) - $(eval $(call gb_Library_add_exception_objects,fwl,\ framework/source/classes/fwlresid \ framework/source/dispatch/mailtodispatcher \ diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk index bc0daca7caff..ad0d53637eab 100644 --- a/framework/Library_fwm.mk +++ b/framework/Library_fwm.mk @@ -53,8 +53,6 @@ $(eval $(call gb_Library_use_libraries,fwm,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,fwm)) - $(eval $(call gb_Library_add_exception_objects,fwm,\ framework/source/dispatch/systemexec \ framework/source/jobs/helponstartup \ diff --git a/framework/Library_lomenubar.mk b/framework/Library_lomenubar.mk index ad4742f70e49..dbf2110db63c 100644 --- a/framework/Library_lomenubar.mk +++ b/framework/Library_lomenubar.mk @@ -49,8 +49,6 @@ $(eval $(call gb_Library_add_libs,lomenubar,\ -lX11 \ )) -$(eval $(call gb_Library_add_standard_system_libs,lomenubar)) - $(eval $(call gb_Library_add_exception_objects,lomenubar,\ framework/source/lomenubar/MenuItemInfo \ framework/source/lomenubar/AwtKeyToDbusmenuString \ diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk index f4a269873d5e..ac3779f4b391 100644 --- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk +++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk @@ -45,8 +45,6 @@ $(eval $(call gb_CppunitTest_use_libraries,hwpfilter_test_hwpfilter, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,hwpfilter_test_hwpfilter)) - $(eval $(call gb_CppunitTest_use_api,hwpfilter_test_hwpfilter,\ offapi \ udkapi \ diff --git a/hwpfilter/Library_hwp.mk b/hwpfilter/Library_hwp.mk index 7b44aa42984a..2681f966ab08 100644 --- a/hwpfilter/Library_hwp.mk +++ b/hwpfilter/Library_hwp.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Library_use_libraries,hwp,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,hwp)) - $(eval $(call gb_Library_use_external,hwp,zlib)) ifeq ($(OS),WNT) diff --git a/i18npool/CppunitTest_i18npool_test_breakiterator.mk b/i18npool/CppunitTest_i18npool_test_breakiterator.mk index c51f0a1630ce..24f67623d6d4 100644 --- a/i18npool/CppunitTest_i18npool_test_breakiterator.mk +++ b/i18npool/CppunitTest_i18npool_test_breakiterator.mk @@ -41,8 +41,6 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_breakiterator,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,i18npool_test_breakiterator)) - $(eval $(call gb_CppunitTest_add_exception_objects,i18npool_test_breakiterator,\ i18npool/qa/cppunit/test_breakiterator \ )) diff --git a/i18npool/CppunitTest_i18npool_test_characterclassification.mk b/i18npool/CppunitTest_i18npool_test_characterclassification.mk index 086dec586d1f..62f852d7a2d2 100644 --- a/i18npool/CppunitTest_i18npool_test_characterclassification.mk +++ b/i18npool/CppunitTest_i18npool_test_characterclassification.mk @@ -41,8 +41,6 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_characterclassification $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,i18npool_test_characterclassification)) - $(eval $(call gb_CppunitTest_add_exception_objects,i18npool_test_characterclassification,\ i18npool/qa/cppunit/test_characterclassification \ )) diff --git a/i18npool/CppunitTest_i18npool_test_languagetag.mk b/i18npool/CppunitTest_i18npool_test_languagetag.mk index 7043f320c028..610791cedbae 100644 --- a/i18npool/CppunitTest_i18npool_test_languagetag.mk +++ b/i18npool/CppunitTest_i18npool_test_languagetag.mk @@ -23,8 +23,6 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_languagetag,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,i18npool_test_languagetag)) - ifeq ($(ENABLE_LIBLANGTAG),YES) $(eval $(call gb_CppunitTest_use_externals,i18npool_test_languagetag,\ liblangtag \ diff --git a/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk b/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk index ed943389e970..c9236da6a47c 100644 --- a/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk +++ b/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk @@ -22,8 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_ordinalsuffix,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,i18npool_test_ordinalsuffix)) - $(eval $(call gb_CppunitTest_add_exception_objects,i18npool_test_ordinalsuffix,\ i18npool/qa/cppunit/test_ordinalsuffix \ )) diff --git a/i18npool/Executable_gencoll_rule.mk b/i18npool/Executable_gencoll_rule.mk index 82aafdb4cea0..d0ef67acc5a9 100644 --- a/i18npool/Executable_gencoll_rule.mk +++ b/i18npool/Executable_gencoll_rule.mk @@ -38,8 +38,6 @@ $(eval $(call gb_Executable_use_libraries,gencoll_rule,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,gencoll_rule)) - ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Executable_use_externals,gencoll_rule,\ icudt \ diff --git a/i18npool/Executable_genconv_dict.mk b/i18npool/Executable_genconv_dict.mk index 22ea9c5d54d1..70ec6c97dd2f 100644 --- a/i18npool/Executable_genconv_dict.mk +++ b/i18npool/Executable_genconv_dict.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,genconv_dict,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,genconv_dict)) - $(eval $(call gb_Executable_add_exception_objects,genconv_dict,\ i18npool/source/textconversion/genconv_dict \ )) diff --git a/i18npool/Executable_gendict.mk b/i18npool/Executable_gendict.mk index 38aae75eb138..3b63cfc5eea5 100644 --- a/i18npool/Executable_gendict.mk +++ b/i18npool/Executable_gendict.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,gendict,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,gendict)) - $(eval $(call gb_Executable_add_exception_objects,gendict,\ i18npool/source/breakiterator/gendict \ )) diff --git a/i18npool/Executable_genindex_data.mk b/i18npool/Executable_genindex_data.mk index c6b532192466..2c36e3e3123a 100644 --- a/i18npool/Executable_genindex_data.mk +++ b/i18npool/Executable_genindex_data.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,genindex_data,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,genindex_data)) - ifeq ($(OS),WNT) $(eval $(call gb_Executable_use_externals,gencoll_rule,\ icudt \ diff --git a/i18npool/Executable_saxparser.mk b/i18npool/Executable_saxparser.mk index b61799d690d1..ba0be63c5fc9 100644 --- a/i18npool/Executable_saxparser.mk +++ b/i18npool/Executable_saxparser.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Executable_use_libraries,saxparser,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,saxparser)) - $(eval $(call gb_Executable_add_exception_objects,saxparser,\ i18npool/source/localedata/LocaleNode \ i18npool/source/localedata/filewriter \ diff --git a/i18npool/Library_collator_data.mk b/i18npool/Library_collator_data.mk index a136cef873e0..952cbc667335 100644 --- a/i18npool/Library_collator_data.mk +++ b/i18npool/Library_collator_data.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Library_use_libraries,collator_data,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,collator_data)) - $(eval $(call gb_Library_add_generated_exception_objects,collator_data,\ $(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/collator/data/*.txt),\ CustomTarget/i18npool/collator/collator_$(notdir $(basename $(txt)))) \ diff --git a/i18npool/Library_dict_ja.mk b/i18npool/Library_dict_ja.mk index a22555b231f5..70e33cca4d02 100644 --- a/i18npool/Library_dict_ja.mk +++ b/i18npool/Library_dict_ja.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Library_use_libraries,dict_ja,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,dict_ja)) - $(eval $(call gb_Library_add_generated_exception_objects,dict_ja,\ CustomTarget/i18npool/breakiterator/dict_ja \ )) diff --git a/i18npool/Library_dict_zh.mk b/i18npool/Library_dict_zh.mk index 8b80f193de23..56d4dc987c75 100644 --- a/i18npool/Library_dict_zh.mk +++ b/i18npool/Library_dict_zh.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Library_use_libraries,dict_zh,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,dict_zh)) - $(eval $(call gb_Library_add_generated_exception_objects,dict_zh,\ CustomTarget/i18npool/breakiterator/dict_zh \ )) diff --git a/i18npool/Library_i18nisolang1.mk b/i18npool/Library_i18nisolang1.mk index 422d9cde94f6..3432d9d25329 100644 --- a/i18npool/Library_i18nisolang1.mk +++ b/i18npool/Library_i18nisolang1.mk @@ -46,8 +46,6 @@ $(eval $(call gb_Library_use_libraries,i18nisolang1,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,i18nisolang1)) - $(eval $(call gb_Library_add_exception_objects,i18nisolang1,\ i18npool/source/isolang/insys \ i18npool/source/isolang/isolang \ diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk index 81486613da42..1e26716a3d5b 100644 --- a/i18npool/Library_i18npool.mk +++ b/i18npool/Library_i18npool.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,i18npool,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,i18npool)) - ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Library_use_externals,i18npool,\ icuin \ diff --git a/i18npool/Library_i18nsearch.mk b/i18npool/Library_i18nsearch.mk index 828ec2ba37ca..d4499c8cade1 100644 --- a/i18npool/Library_i18nsearch.mk +++ b/i18npool/Library_i18nsearch.mk @@ -46,8 +46,6 @@ $(eval $(call gb_Library_use_libraries,i18nsearch,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,i18nsearch)) - $(eval $(call gb_Library_add_exception_objects,i18nsearch,\ i18npool/source/search/levdis \ i18npool/source/search/textsearch \ diff --git a/i18npool/Library_index_data.mk b/i18npool/Library_index_data.mk index 79f1cd93a64b..d60870770a44 100644 --- a/i18npool/Library_index_data.mk +++ b/i18npool/Library_index_data.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Library_use_libraries,index_data,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,index_data)) - $(eval $(call gb_Library_add_generated_exception_objects,index_data,\ $(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/indexentry/data/*.txt),\ CustomTarget/i18npool/indexentry/$(notdir $(basename $(txt)))) \ diff --git a/i18npool/Library_localedata_en.mk b/i18npool/Library_localedata_en.mk index a5cf7a780676..d5a2c9349460 100644 --- a/i18npool/Library_localedata_en.mk +++ b/i18npool/Library_localedata_en.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Library_use_libraries,localedata_en,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,localedata_en)) - $(eval $(call gb_Library_add_generated_exception_objects,localedata_en,\ CustomTarget/i18npool/localedata/localedata_en_AU \ CustomTarget/i18npool/localedata/localedata_en_BZ \ diff --git a/i18npool/Library_localedata_es.mk b/i18npool/Library_localedata_es.mk index 75ba17341a33..4b9931715054 100644 --- a/i18npool/Library_localedata_es.mk +++ b/i18npool/Library_localedata_es.mk @@ -33,8 +33,6 @@ $(eval $(call gb_Library_use_libraries,localedata_es,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,localedata_es)) - $(eval $(call gb_Library_add_generated_exception_objects,localedata_es,\ CustomTarget/i18npool/localedata/localedata_es_AR \ CustomTarget/i18npool/localedata/localedata_es_BO \ diff --git a/i18npool/Library_localedata_euro.mk b/i18npool/Library_localedata_euro.mk index ad3ebc679071..1122d0c2b1a5 100644 --- a/i18npool/Library_localedata_euro.mk +++ b/i18npool/Library_localedata_euro.mk @@ -33,8 +33,6 @@ $(eval $(call gb_Library_use_libraries,localedata_euro,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,localedata_euro)) - $(eval $(call gb_Library_add_generated_exception_objects,localedata_euro,\ CustomTarget/i18npool/localedata/localedata_an_ES \ CustomTarget/i18npool/localedata/localedata_ast_ES \ diff --git a/i18npool/Library_localedata_others.mk b/i18npool/Library_localedata_others.mk index b18593db55bf..66aab48d2466 100644 --- a/i18npool/Library_localedata_others.mk +++ b/i18npool/Library_localedata_others.mk @@ -33,8 +33,6 @@ $(eval $(call gb_Library_use_libraries,localedata_others,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,localedata_others)) - $(eval $(call gb_Library_add_generated_exception_objects,localedata_others,\ CustomTarget/i18npool/localedata/localedata_af_NA \ CustomTarget/i18npool/localedata/localedata_af_ZA \ diff --git a/i18npool/Library_textconv_dict.mk b/i18npool/Library_textconv_dict.mk index a568534c0a97..23afa2113a7c 100644 --- a/i18npool/Library_textconv_dict.mk +++ b/i18npool/Library_textconv_dict.mk @@ -39,8 +39,6 @@ $(eval $(call gb_Library_use_libraries,textconv_dict,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,textconv_dict)) - $(eval $(call gb_Library_add_generated_exception_objects,textconv_dict,\ $(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/textconversion/data/*.dic),\ CustomTarget/i18npool/textconversion/$(notdir $(basename $(txt)))) \ diff --git a/i18nutil/Library_i18nutil.mk b/i18nutil/Library_i18nutil.mk index fab587956517..94f5e20e5ea1 100644 --- a/i18nutil/Library_i18nutil.mk +++ b/i18nutil/Library_i18nutil.mk @@ -33,8 +33,6 @@ $(eval $(call gb_Library_use_libraries,i18nutil,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,i18nutil)) - $(eval $(call gb_Library_add_exception_objects,i18nutil,\ i18nutil/source/utility/casefolding \ i18nutil/source/utility/oneToOneMapping \ diff --git a/idl/Executable_svidl.mk b/idl/Executable_svidl.mk index fdde856cd925..8ae41a5894f9 100644 --- a/idl/Executable_svidl.mk +++ b/idl/Executable_svidl.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Executable_use_libraries,svidl,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,svidl)) - $(eval $(call gb_Executable_add_exception_objects,svidl,\ idl/source/cmptools/hash \ idl/source/cmptools/lex \ diff --git a/io/Library_acceptor.mk b/io/Library_acceptor.mk index f00e15bed383..07a702576f2c 100644 --- a/io/Library_acceptor.mk +++ b/io/Library_acceptor.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,acceptor,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,acceptor)) - $(eval $(call gb_Library_set_componentfile,acceptor,io/source/acceptor/acceptor)) $(eval $(call gb_Library_add_exception_objects,acceptor,\ diff --git a/io/Library_connector.mk b/io/Library_connector.mk index 826b074507c3..10e8e8aa1634 100644 --- a/io/Library_connector.mk +++ b/io/Library_connector.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,connector,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,connector)) - $(eval $(call gb_Library_set_componentfile,connector,io/source/connector/connector)) $(eval $(call gb_Library_add_exception_objects,connector,\ diff --git a/io/Library_streams.mk b/io/Library_streams.mk index 8bf18f4db6d2..6ba413c8ddd9 100644 --- a/io/Library_streams.mk +++ b/io/Library_streams.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,streams,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,streams)) - $(eval $(call gb_Library_set_componentfile,streams,io/source/stm/streams)) $(eval $(call gb_Library_add_exception_objects,streams,\ diff --git a/io/Library_textinstream.mk b/io/Library_textinstream.mk index 80ada3ef8d17..fbbe8756dd53 100644 --- a/io/Library_textinstream.mk +++ b/io/Library_textinstream.mk @@ -38,8 +38,6 @@ $(eval $(call gb_Library_use_libraries,textinstream,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,textinstream)) - $(eval $(call gb_Library_set_componentfile,textinstream,io/source/TextInputStream/textinstream)) $(eval $(call gb_Library_add_exception_objects,textinstream,\ diff --git a/io/Library_textoutstream.mk b/io/Library_textoutstream.mk index b6b0ff2bf899..0aeacdf2f64f 100644 --- a/io/Library_textoutstream.mk +++ b/io/Library_textoutstream.mk @@ -38,8 +38,6 @@ $(eval $(call gb_Library_use_libraries,textoutstream,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,textoutstream)) - $(eval $(call gb_Library_set_componentfile,textoutstream,io/source/TextOutputStream/textoutstream)) $(eval $(call gb_Library_add_exception_objects,textoutstream,\ diff --git a/javaunohelper/Library_juh.mk b/javaunohelper/Library_juh.mk index dd1644f4005a..8d1a3e83f908 100644 --- a/javaunohelper/Library_juh.mk +++ b/javaunohelper/Library_juh.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,juh,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,juh)) - ifneq ($(DISABLE_DYNLOADING),TRUE) $(eval $(call gb_Library_add_exception_objects,juh,\ javaunohelper/source/preload \ diff --git a/javaunohelper/Library_juhx.mk b/javaunohelper/Library_juhx.mk index eeef545357b7..a3bb96408978 100644 --- a/javaunohelper/Library_juhx.mk +++ b/javaunohelper/Library_juhx.mk @@ -40,8 +40,6 @@ $(eval $(call gb_Library_use_libraries,juhx,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,juhx)) - $(eval $(call gb_Library_add_exception_objects,juhx,\ javaunohelper/source/bootstrap \ javaunohelper/source/javaunohelper \ diff --git a/jurt/Library_jpipe.mk b/jurt/Library_jpipe.mk index 3f50e7a34a8e..0cd0d4f0293c 100644 --- a/jurt/Library_jpipe.mk +++ b/jurt/Library_jpipe.mk @@ -31,8 +31,6 @@ $(eval $(call gb_Library_use_libraries,jpipe,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,jpipe)) - ifeq ($(OS),WNT) # The real library is called jpipx on Windows. We build only a wrapper diff --git a/jurt/Library_jpipx.mk b/jurt/Library_jpipx.mk index 14d91cb9b839..c8978c86a5ac 100644 --- a/jurt/Library_jpipx.mk +++ b/jurt/Library_jpipx.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Library_use_libraries,jpipx,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,jpipx)) - $(eval $(call gb_Library_add_cobjects,jpipx,\ jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection \ )) diff --git a/jvmaccess/Library_jvmaccess.mk b/jvmaccess/Library_jvmaccess.mk index 6e8578dd0147..8a00566dc7b8 100644 --- a/jvmaccess/Library_jvmaccess.mk +++ b/jvmaccess/Library_jvmaccess.mk @@ -48,8 +48,6 @@ $(eval $(call gb_Library_use_libraries,jvmaccess,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,jvmaccess)) - $(eval $(call gb_Library_add_exception_objects,jvmaccess,\ jvmaccess/source/classpath \ jvmaccess/source/unovirtualmachine \ diff --git a/jvmfwk/Executable_javaldx.mk b/jvmfwk/Executable_javaldx.mk index aedb7dbc0b3a..0e64f3ffc5d8 100644 --- a/jvmfwk/Executable_javaldx.mk +++ b/jvmfwk/Executable_javaldx.mk @@ -33,8 +33,6 @@ $(eval $(call gb_Executable_use_libraries,javaldx,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,javaldx)) - $(eval $(call gb_Executable_add_exception_objects,javaldx,\ jvmfwk/plugins/sunmajor/javaenvsetup/javaldx \ )) diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk index 5051a2b9bb17..697642c4479f 100644 --- a/jvmfwk/Library_jvmfwk.mk +++ b/jvmfwk/Library_jvmfwk.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,jvmfwk,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,jvmfwk)) - ifeq ($(OS),WNT) $(eval $(call gb_Library_use_system_win32_libs,jvmfwk,\ advapi32 \ diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk index 61ff7bdfe5ac..d32dc70aa22c 100644 --- a/jvmfwk/Library_sunjavaplugin.mk +++ b/jvmfwk/Library_sunjavaplugin.mk @@ -53,8 +53,6 @@ $(eval $(call gb_Library_use_libraries,sunjavaplugin,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sunjavaplugin)) - ifeq ($(OS),ANDROID) $(eval $(call gb_Library_use_libraries,sunjavaplugin,\ lo-bootstrap \ diff --git a/l10ntools/Executable_ulfconv.mk b/l10ntools/Executable_ulfconv.mk index b981e56e2e59..b8a2001a2359 100644 --- a/l10ntools/Executable_ulfconv.mk +++ b/l10ntools/Executable_ulfconv.mk @@ -14,8 +14,6 @@ $(eval $(call gb_Executable_use_libraries,ulfconv,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,ulfconv)) - $(eval $(call gb_Executable_add_exception_objects,ulfconv,\ l10ntools/source/ulfconv/ulfconv \ )) diff --git a/lingucomponent/Library_MacOSXSpell.mk b/lingucomponent/Library_MacOSXSpell.mk index b2bcd1952396..8f5d57a0cc7a 100644 --- a/lingucomponent/Library_MacOSXSpell.mk +++ b/lingucomponent/Library_MacOSXSpell.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,MacOSXSpell,\ utl \ )) -$(eval $(call gb_Library_add_standard_system_libs,MacOSXSpell)) - $(eval $(call gb_Library_use_system_darwin_frameworks,MacOSXSpell,\ Cocoa \ )) diff --git a/lingucomponent/Library_guesslang.mk b/lingucomponent/Library_guesslang.mk index 73bfcb648061..ef37895044a8 100644 --- a/lingucomponent/Library_guesslang.mk +++ b/lingucomponent/Library_guesslang.mk @@ -40,8 +40,6 @@ $(eval $(call gb_Library_use_libraries,guesslang,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,guesslang)) - $(eval $(call gb_Library_use_externals,guesslang,\ libexttextcat \ )) diff --git a/lingucomponent/Library_hyphen.mk b/lingucomponent/Library_hyphen.mk index ed316051e1ed..aec8dba3502e 100644 --- a/lingucomponent/Library_hyphen.mk +++ b/lingucomponent/Library_hyphen.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,hyphen,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,hyphen)) - $(eval $(call gb_Library_use_static_libraries,hyphen,\ ulingu \ )) diff --git a/lingucomponent/Library_lnth.mk b/lingucomponent/Library_lnth.mk index 98e2eeeed8db..608c4213d7be 100644 --- a/lingucomponent/Library_lnth.mk +++ b/lingucomponent/Library_lnth.mk @@ -48,8 +48,6 @@ $(eval $(call gb_Library_use_libraries,lnth,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,lnth)) - $(eval $(call gb_Library_use_static_libraries,lnth,\ ulingu \ )) diff --git a/lingucomponent/Library_spell.mk b/lingucomponent/Library_spell.mk index 5b8d7b142d0b..96e2abdc6c8c 100644 --- a/lingucomponent/Library_spell.mk +++ b/lingucomponent/Library_spell.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,spell,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,spell)) - $(eval $(call gb_Library_use_static_libraries,spell,\ ulingu \ )) diff --git a/linguistic/Library_lng.mk b/linguistic/Library_lng.mk index bf26844f67dc..a7fad43ca28f 100644 --- a/linguistic/Library_lng.mk +++ b/linguistic/Library_lng.mk @@ -58,8 +58,6 @@ $(eval $(call gb_Library_use_libraries,lng,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,lng)) - $(eval $(call gb_Library_use_external,lng,icuuc)) $(eval $(call gb_Library_add_exception_objects,lng,\ diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk index 6f4b3b62ff73..123e382c76e5 100644 --- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk +++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk @@ -45,8 +45,6 @@ $(eval $(call gb_CppunitTest_use_libraries,lotuswordpro_test_lotuswordpro, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,lotuswordpro_test_lotuswordpro)) - $(eval $(call gb_CppunitTest_use_api,lotuswordpro_test_lotuswordpro,\ offapi \ udkapi \ diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk index 4620f6c819c2..ab1f8a2f2ed6 100644 --- a/lotuswordpro/Library_lwpft.mk +++ b/lotuswordpro/Library_lwpft.mk @@ -49,8 +49,6 @@ $(eval $(call gb_Library_use_libraries,lwpft,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,lwpft)) - ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Library_use_externals,lwpft,\ icuin \ diff --git a/o3tl/CppunitTest_o3tl_tests.mk b/o3tl/CppunitTest_o3tl_tests.mk index eed591bfdc81..361e7ecc044d 100644 --- a/o3tl/CppunitTest_o3tl_tests.mk +++ b/o3tl/CppunitTest_o3tl_tests.mk @@ -35,8 +35,6 @@ $(eval $(call gb_CppunitTest_use_libraries,o3tl_tests,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,o3tl_tests)) - $(eval $(call gb_CppunitTest_add_exception_objects,o3tl_tests,\ o3tl/qa/cow_wrapper_clients \ o3tl/qa/test-cow_wrapper \ diff --git a/officecfg/CppunitTest_officecfg_cppheader_test.mk b/officecfg/CppunitTest_officecfg_cppheader_test.mk index 47c14a001172..8ee29d0feb43 100644 --- a/officecfg/CppunitTest_officecfg_cppheader_test.mk +++ b/officecfg/CppunitTest_officecfg_cppheader_test.mk @@ -33,8 +33,6 @@ $(eval $(call gb_CppunitTest_use_libraries,officecfg_cppheader_test,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,officecfg_cppheader_test)) - $(eval $(call gb_CppunitTest_add_exception_objects,officecfg_cppheader_test, \ officecfg/qa/cppheader \ )) diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index d97fa4aac2ac..878d4815ec31 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -78,8 +78,6 @@ $(eval $(call gb_Library_use_libraries,oox,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,oox)) - $(eval $(call gb_Library_use_external,oox,openssl)) $(eval $(call gb_Library_set_componentfile,oox,oox/util/oox)) diff --git a/package/Library_package2.mk b/package/Library_package2.mk index c56a1863fa6c..72fb5f5ead99 100644 --- a/package/Library_package2.mk +++ b/package/Library_package2.mk @@ -53,8 +53,6 @@ $(eval $(call gb_Library_use_libraries,package2,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,package2)) - $(eval $(call gb_Library_use_externals,package2,\ zlib \ )) diff --git a/package/Library_xstor.mk b/package/Library_xstor.mk index 498f35d0fe8b..45c03ad5ca20 100644 --- a/package/Library_xstor.mk +++ b/package/Library_xstor.mk @@ -45,8 +45,6 @@ $(eval $(call gb_Library_use_libraries,xstor,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,xstor)) - $(eval $(call gb_Library_add_exception_objects,xstor,\ package/source/xstor/disposelistener \ package/source/xstor/ocompinstream \ diff --git a/padmin/Executable_spadmin.bin.mk b/padmin/Executable_spadmin.bin.mk index 7d4b08ab5e69..af674ea30f76 100644 --- a/padmin/Executable_spadmin.bin.mk +++ b/padmin/Executable_spadmin.bin.mk @@ -43,8 +43,6 @@ $(eval $(call gb_Executable_use_libraries,spadmin.bin,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,spadmin.bin)) - $(eval $(call gb_Executable_add_exception_objects,spadmin.bin,\ padmin/source/desktopcontext \ padmin/source/pamain \ diff --git a/padmin/Library_spa.mk b/padmin/Library_spa.mk index 45c7b5c76729..65df95fdb755 100644 --- a/padmin/Library_spa.mk +++ b/padmin/Library_spa.mk @@ -38,8 +38,6 @@ $(eval $(call gb_Library_use_libraries,spa,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,spa)) - $(eval $(call gb_Library_add_exception_objects,spa,\ padmin/source/adddlg \ diff --git a/regexp/Library_regexp.mk b/regexp/Library_regexp.mk index 0b3e6021d138..b23e4c15452c 100644 --- a/regexp/Library_regexp.mk +++ b/regexp/Library_regexp.mk @@ -42,8 +42,6 @@ $(eval $(call gb_Library_use_libraries,i18nregexp,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,i18nregexp)) - $(eval $(call gb_Library_add_exception_objects,i18nregexp,\ regexp/source/reclass \ )) diff --git a/registry/Library_reg.mk b/registry/Library_reg.mk index c6b1cd96fae1..b8eae85b98ac 100644 --- a/registry/Library_reg.mk +++ b/registry/Library_reg.mk @@ -43,8 +43,6 @@ $(eval $(call gb_Library_use_libraries,reg,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,reg)) - $(eval $(call gb_Library_add_exception_objects,reg,\ registry/source/keyimpl \ registry/source/reflread \ diff --git a/remotebridges/Library_uuresolver.mk b/remotebridges/Library_uuresolver.mk index cf8c0083d5c5..bf9cab438c72 100644 --- a/remotebridges/Library_uuresolver.mk +++ b/remotebridges/Library_uuresolver.mk @@ -38,8 +38,6 @@ $(eval $(call gb_Library_use_libraries,uuresolver,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,uuresolver)) - $(eval $(call gb_Library_add_exception_objects,uuresolver,\ remotebridges/source/unourl_resolver/unourl_resolver \ )) diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk index deb1b13bf9b6..f6db9c2c8684 100644 --- a/reportdesign/Library_rpt.mk +++ b/reportdesign/Library_rpt.mk @@ -62,8 +62,6 @@ $(eval $(call gb_Library_use_libraries,rpt,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,rpt)) - $(eval $(call gb_Library_set_componentfile,rpt,reportdesign/util/rpt)) $(eval $(call gb_Library_add_exception_objects,rpt,\ diff --git a/reportdesign/Library_rptui.mk b/reportdesign/Library_rptui.mk index 7e5d9f197fdf..695b06ed3a34 100644 --- a/reportdesign/Library_rptui.mk +++ b/reportdesign/Library_rptui.mk @@ -62,8 +62,6 @@ $(eval $(call gb_Library_use_libraries,rptui,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,rptui)) - $(eval $(call gb_Library_set_componentfile,rptui,reportdesign/util/rptui)) $(eval $(call gb_Library_add_exception_objects,rptui,\ diff --git a/reportdesign/Library_rptxml.mk b/reportdesign/Library_rptxml.mk index b0fc1bacc198..ba8c96a65324 100644 --- a/reportdesign/Library_rptxml.mk +++ b/reportdesign/Library_rptxml.mk @@ -56,8 +56,6 @@ $(eval $(call gb_Library_use_libraries,rptxml,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,rptxml)) - $(eval $(call gb_Library_set_componentfile,rptxml,reportdesign/util/rptxml)) $(eval $(call gb_Library_add_exception_objects,rptxml,\ diff --git a/rsc/Executable_rsc.mk b/rsc/Executable_rsc.mk index 3dd0feca4add..2138f87a963c 100644 --- a/rsc/Executable_rsc.mk +++ b/rsc/Executable_rsc.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Executable_use_libraries,rsc,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,rsc)) - $(eval $(call gb_Executable_add_grammars,rsc,\ rsc/source/parser/rscyacc \ )) diff --git a/sal/CppunitTest_Module_DLL.mk b/sal/CppunitTest_Module_DLL.mk index fe58e255a2df..8d7bb0f84be4 100644 --- a/sal/CppunitTest_Module_DLL.mk +++ b/sal/CppunitTest_Module_DLL.mk @@ -39,6 +39,4 @@ $(eval $(call gb_CppunitTest_use_libraries,Module_DLL,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,Module_DLL)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_bytesequence.mk b/sal/CppunitTest_sal_bytesequence.mk index 222f77a7b53c..2add4a5cc033 100644 --- a/sal/CppunitTest_sal_bytesequence.mk +++ b/sal/CppunitTest_sal_bytesequence.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_bytesequence,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_bytesequence)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_checkapi.mk b/sal/CppunitTest_sal_checkapi.mk index b61a739dbe2c..06e42a997987 100644 --- a/sal/CppunitTest_sal_checkapi.mk +++ b/sal/CppunitTest_sal_checkapi.mk @@ -47,6 +47,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_checkapi,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_checkapi)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_condition.mk b/sal/CppunitTest_sal_osl_condition.mk index 0dad649efa4c..4bf9cee70e4a 100644 --- a/sal/CppunitTest_sal_osl_condition.mk +++ b/sal/CppunitTest_sal_osl_condition.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_condition,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_condition)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_file.mk b/sal/CppunitTest_sal_osl_file.mk index ea64e55daca7..9b70af7e1e34 100644 --- a/sal/CppunitTest_sal_osl_file.mk +++ b/sal/CppunitTest_sal_osl_file.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_file,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_file)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk b/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk index af121a42f62e..1344908d6d46 100644 --- a/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk +++ b/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_getsystempathfromfileurl,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_getsystempathfromfileurl)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_module.mk b/sal/CppunitTest_sal_osl_module.mk index 93a24b4fdd8d..1748e1c4d992 100644 --- a/sal/CppunitTest_sal_osl_module.mk +++ b/sal/CppunitTest_sal_osl_module.mk @@ -40,6 +40,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_module,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_module)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_mutex.mk b/sal/CppunitTest_sal_osl_mutex.mk index 7768b1e5ce99..64312325b711 100644 --- a/sal/CppunitTest_sal_osl_mutex.mk +++ b/sal/CppunitTest_sal_osl_mutex.mk @@ -37,6 +37,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_mutex, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_mutex)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_old_test_file.mk b/sal/CppunitTest_sal_osl_old_test_file.mk index 3b9040c2f519..1823ac353ef7 100644 --- a/sal/CppunitTest_sal_osl_old_test_file.mk +++ b/sal/CppunitTest_sal_osl_old_test_file.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_old_test_file,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_old_test_file)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_pipe.mk b/sal/CppunitTest_sal_osl_pipe.mk index a71937b15342..f3f454275a5e 100644 --- a/sal/CppunitTest_sal_osl_pipe.mk +++ b/sal/CppunitTest_sal_osl_pipe.mk @@ -38,6 +38,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_pipe, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_pipe)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_process.mk b/sal/CppunitTest_sal_osl_process.mk index 4ee7e3f6eba6..8065f7ec9de6 100644 --- a/sal/CppunitTest_sal_osl_process.mk +++ b/sal/CppunitTest_sal_osl_process.mk @@ -38,8 +38,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_process,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_process)) - # Depend on to be tested executable $(call gb_CppunitTest_get_target,sal_osl_process) : \ $(call gb_Executable_get_target,osl_process_child) diff --git a/sal/CppunitTest_sal_osl_profile.mk b/sal/CppunitTest_sal_osl_profile.mk index 87d587f6632f..1a29e3dedbea 100644 --- a/sal/CppunitTest_sal_osl_profile.mk +++ b/sal/CppunitTest_sal_osl_profile.mk @@ -37,6 +37,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_profile, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_profile)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_security.mk b/sal/CppunitTest_sal_osl_security.mk index edb6a96ed88c..bc6fe2d1b6ef 100644 --- a/sal/CppunitTest_sal_osl_security.mk +++ b/sal/CppunitTest_sal_osl_security.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_security,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_security)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_setthreadname.mk b/sal/CppunitTest_sal_osl_setthreadname.mk index f7024cae6f07..b0c055f34227 100644 --- a/sal/CppunitTest_sal_osl_setthreadname.mk +++ b/sal/CppunitTest_sal_osl_setthreadname.mk @@ -37,6 +37,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_setthreadname, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_setthreadname)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_thread.mk b/sal/CppunitTest_sal_osl_thread.mk index 6feb7d59b584..d445bda953ad 100644 --- a/sal/CppunitTest_sal_osl_thread.mk +++ b/sal/CppunitTest_sal_osl_thread.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_thread,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_thread)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_alloc.mk b/sal/CppunitTest_sal_rtl_alloc.mk index 83405ab0a8b6..cde6e807466b 100644 --- a/sal/CppunitTest_sal_rtl_alloc.mk +++ b/sal/CppunitTest_sal_rtl_alloc.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_alloc,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_alloc)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_cipher.mk b/sal/CppunitTest_sal_rtl_cipher.mk index ce2cc1da5a19..68cc9faa0b4b 100644 --- a/sal/CppunitTest_sal_rtl_cipher.mk +++ b/sal/CppunitTest_sal_rtl_cipher.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_cipher,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_cipher)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_crc32.mk b/sal/CppunitTest_sal_rtl_crc32.mk index 1a2390f5fd2e..01632a77e004 100644 --- a/sal/CppunitTest_sal_rtl_crc32.mk +++ b/sal/CppunitTest_sal_rtl_crc32.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_crc32,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_crc32)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_doublelock.mk b/sal/CppunitTest_sal_rtl_doublelock.mk index e4fd8f2bf4b4..97f17a2e64f7 100644 --- a/sal/CppunitTest_sal_rtl_doublelock.mk +++ b/sal/CppunitTest_sal_rtl_doublelock.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_doublelock,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_doublelock)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_locale.mk b/sal/CppunitTest_sal_rtl_locale.mk index ce1f0ab9ce1c..1742c1e775b1 100644 --- a/sal/CppunitTest_sal_rtl_locale.mk +++ b/sal/CppunitTest_sal_rtl_locale.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_locale,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_locale)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_math.mk b/sal/CppunitTest_sal_rtl_math.mk index c502ab226659..c854f4cd756d 100644 --- a/sal/CppunitTest_sal_rtl_math.mk +++ b/sal/CppunitTest_sal_rtl_math.mk @@ -37,6 +37,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_math, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_math)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_ostringbuffer.mk b/sal/CppunitTest_sal_rtl_ostringbuffer.mk index 8c38783b7a93..1bb445893a94 100644 --- a/sal/CppunitTest_sal_rtl_ostringbuffer.mk +++ b/sal/CppunitTest_sal_rtl_ostringbuffer.mk @@ -37,6 +37,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_ostringbuffer,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_ostringbuffer)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_oustringbuffer.mk b/sal/CppunitTest_sal_rtl_oustringbuffer.mk index bb316eeda619..e28d9f453fa0 100644 --- a/sal/CppunitTest_sal_rtl_oustringbuffer.mk +++ b/sal/CppunitTest_sal_rtl_oustringbuffer.mk @@ -40,6 +40,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_oustringbuffer,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_oustringbuffer)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_strings.mk b/sal/CppunitTest_sal_rtl_strings.mk index 67299a3ab9d2..4d4f59828dab 100644 --- a/sal/CppunitTest_sal_rtl_strings.mk +++ b/sal/CppunitTest_sal_rtl_strings.mk @@ -43,8 +43,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_strings,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_strings)) - # The test uses O(U)String capabilities that dlopen this lib ifneq ($(OS),ANDROID) # Except that on Android we don't build it separately diff --git a/sal/CppunitTest_sal_rtl_uri.mk b/sal/CppunitTest_sal_rtl_uri.mk index 67ce1eab2732..65b6713a6608 100644 --- a/sal/CppunitTest_sal_rtl_uri.mk +++ b/sal/CppunitTest_sal_rtl_uri.mk @@ -25,8 +25,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_uri,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_uri)) - # The test uses O(U)String capabilities that dlopen this lib ifneq ($(OS),ANDROID) # Except that on Android we don't build it separately diff --git a/sal/CppunitTest_sal_rtl_uuid.mk b/sal/CppunitTest_sal_rtl_uuid.mk index 74ea9e057f6c..df0e6858cd9d 100644 --- a/sal/CppunitTest_sal_rtl_uuid.mk +++ b/sal/CppunitTest_sal_rtl_uuid.mk @@ -24,6 +24,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_uuid,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_uuid)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_tcwf.mk b/sal/CppunitTest_sal_tcwf.mk index fd202e2adec8..729a26467b80 100644 --- a/sal/CppunitTest_sal_tcwf.mk +++ b/sal/CppunitTest_sal_tcwf.mk @@ -37,6 +37,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_tcwf,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_tcwf)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_types.mk b/sal/CppunitTest_sal_types.mk index 942e8f318c35..5fb59d18d1c5 100644 --- a/sal/CppunitTest_sal_types.mk +++ b/sal/CppunitTest_sal_types.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_types,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_types)) - # vim: set noet sw=4 ts=4: diff --git a/sal/Executable_cppunittester.mk b/sal/Executable_cppunittester.mk index 9cf275e91476..b5826942378f 100644 --- a/sal/Executable_cppunittester.mk +++ b/sal/Executable_cppunittester.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,cppunit/cppunittester,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,cppunit/cppunittester)) - $(eval $(call gb_Executable_use_external,cppunit/cppunittester,cppunit)) $(eval $(call gb_Executable_add_exception_objects,cppunit/cppunittester,\ diff --git a/sal/Executable_osl_process_child.mk b/sal/Executable_osl_process_child.mk index 3f3cce24c160..47e057b689e9 100644 --- a/sal/Executable_osl_process_child.mk +++ b/sal/Executable_osl_process_child.mk @@ -34,8 +34,6 @@ $(eval $(call gb_Executable_use_libraries,osl_process_child,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,osl_process_child)) - $(eval $(call gb_Executable_add_exception_objects,osl_process_child,\ sal/qa/osl/process/osl_process_child \ )) diff --git a/sal/Library_lo-bootstrap.mk b/sal/Library_lo-bootstrap.mk index dea6bb4ab30c..958b0f18e5cf 100644 --- a/sal/Library_lo-bootstrap.mk +++ b/sal/Library_lo-bootstrap.mk @@ -28,6 +28,8 @@ $(eval $(call gb_Library_Library,lo-bootstrap)) # We explicitly *don't* want gb_STDLIBS to be linked here +$(eval $(call gb_Library_disable_standard_system_libs,lo-bootstrap)) + $(eval $(call gb_Library_add_libs,lo-bootstrap,\ -llog \ -landroid \ diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index ecec9fffd76c..73335befab10 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -88,8 +88,6 @@ $(eval $(call gb_Library_add_libs,sal,\ ) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sal)) - ifeq ($(OS),MACOSX) $(eval $(call gb_Library_use_system_darwin_frameworks,sal,\ Carbon \ diff --git a/sal/Library_sal_textenc.mk b/sal/Library_sal_textenc.mk index c50fa94ce6e4..5d5d40e0bb1b 100644 --- a/sal/Library_sal_textenc.mk +++ b/sal/Library_sal_textenc.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Library_use_libraries,sal_textenc,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sal_textenc)) - $(eval $(call gb_Library_add_defs,sal_textenc,\ $(LFS_CFLAGS) \ )) diff --git a/sal/Library_uwinapi.mk b/sal/Library_uwinapi.mk index 75a3a9cffca4..f62e043be150 100644 --- a/sal/Library_uwinapi.mk +++ b/sal/Library_uwinapi.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Library_use_system_win32_libs,uwinapi,\ ) \ )) -$(eval $(call gb_Library_add_standard_system_libs,uwinapi)) - $(eval $(call gb_Library_add_defs,uwinapi,\ $(if $(filter $(COM),GCC), \ -Wno-unused-parameter -Wno-return-type) \ diff --git a/salhelper/CppunitTest_salhelper_checkapi.mk b/salhelper/CppunitTest_salhelper_checkapi.mk index fb2361db4fa4..08c820836bea 100644 --- a/salhelper/CppunitTest_salhelper_checkapi.mk +++ b/salhelper/CppunitTest_salhelper_checkapi.mk @@ -47,6 +47,4 @@ $(eval $(call gb_CppunitTest_use_libraries,salhelper_checkapi,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,salhelper_checkapi)) - # vim: set noet sw=4 ts=4: diff --git a/salhelper/Library_salhelper.mk b/salhelper/Library_salhelper.mk index b416cc82c589..7c66678cbf4d 100644 --- a/salhelper/Library_salhelper.mk +++ b/salhelper/Library_salhelper.mk @@ -38,8 +38,6 @@ $(eval $(call gb_Library_use_libraries,salhelper,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,salhelper)) - $(eval $(call gb_Library_add_exception_objects,salhelper,\ salhelper/source/condition \ salhelper/source/dynload \ diff --git a/sax/CppunitTest_sax.mk b/sax/CppunitTest_sax.mk index 3cfa8cacfdd5..edb8429fbd9f 100644 --- a/sax/CppunitTest_sax.mk +++ b/sax/CppunitTest_sax.mk @@ -22,8 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sax_cpputest, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sax_cpputest)) - $(eval $(call gb_CppunitTest_add_exception_objects,sax_cpputest, \ sax/qa/cppunit/test_converter \ )) diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk index e7028b450435..a6ac2f972f7d 100644 --- a/sax/Library_expwrap.mk +++ b/sax/Library_expwrap.mk @@ -29,8 +29,6 @@ $(eval $(call gb_Library_use_libraries,expwrap,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,expwrap)) - $(eval $(call gb_Library_use_static_libraries,expwrap,\ sax_shared \ )) diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk index d7465316c1c3..37411b3575b5 100644 --- a/sax/Library_fastsax.mk +++ b/sax/Library_fastsax.mk @@ -31,8 +31,6 @@ $(eval $(call gb_Library_use_libraries,fastsax,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,fastsax)) - $(eval $(call gb_Library_use_static_libraries,fastsax,\ sax_shared \ )) diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk index 93cd25c66e62..6083db3d1685 100644 --- a/sax/Library_sax.mk +++ b/sax/Library_sax.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Library_use_libraries,sax,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sax)) - $(eval $(call gb_Library_add_defs,sax,\ -DSAX_DLLIMPLEMENTATION \ )) diff --git a/sc/CppunitTest_sc_annotationshapeobj.mk b/sc/CppunitTest_sc_annotationshapeobj.mk index b6bdef73cddb..9522e2779ea4 100644 --- a/sc/CppunitTest_sc_annotationshapeobj.mk +++ b/sc/CppunitTest_sc_annotationshapeobj.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_annonationshapeobj, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_annonationshapeobj)) - $(eval $(call gb_CppunitTest_set_include,sc_annonationshapeobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk index 195dea16e5d0..814e9cbbc1a1 100644 --- a/sc/CppunitTest_sc_cellrangeobj.mk +++ b/sc/CppunitTest_sc_cellrangeobj.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_cellrangesbase, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_cellrangesbase)) - $(eval $(call gb_CppunitTest_set_include,sc_cellrangesbase,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk index 4eeb3645c745..1ca505b5b1d7 100644 --- a/sc/CppunitTest_sc_chart_regression_test.mk +++ b/sc/CppunitTest_sc_chart_regression_test.mk @@ -68,8 +68,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_chart_regression_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_chart_regression_test)) - $(eval $(call gb_CppunitTest_set_include,sc_chart_regression_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk index b09b0318b1da..b1fd1bc89872 100644 --- a/sc/CppunitTest_sc_databaserangeobj.mk +++ b/sc/CppunitTest_sc_databaserangeobj.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_databaserangeobj, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_databaserangeobj)) - $(eval $(call gb_CppunitTest_set_include,sc_databaserangeobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk index f8988749dbb0..d221fe5c4bd2 100644 --- a/sc/CppunitTest_sc_datapilotfieldobj.mk +++ b/sc/CppunitTest_sc_datapilotfieldobj.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datapilotfieldobj, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_datapilotfieldobj)) - $(eval $(call gb_CppunitTest_set_include,sc_datapilotfieldobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk index 31832f2364ab..77f2b0be4e28 100644 --- a/sc/CppunitTest_sc_datapilottableobj.mk +++ b/sc/CppunitTest_sc_datapilottableobj.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datapilottableobj, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_datapilottableobj)) - $(eval $(call gb_CppunitTest_set_include,sc_datapilottableobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_editfieldobj_cell.mk b/sc/CppunitTest_sc_editfieldobj_cell.mk index 1826fb887bd5..3f75acb58ba3 100644 --- a/sc/CppunitTest_sc_editfieldobj_cell.mk +++ b/sc/CppunitTest_sc_editfieldobj_cell.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_cell, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_editfieldobj_cell)) - $(eval $(call gb_CppunitTest_set_include,sc_editfieldobj_cell,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_editfieldobj_header.mk b/sc/CppunitTest_sc_editfieldobj_header.mk index 009aa66f1fb8..32ac4577c5e8 100644 --- a/sc/CppunitTest_sc_editfieldobj_header.mk +++ b/sc/CppunitTest_sc_editfieldobj_header.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_header, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_editfieldobj_header)) - $(eval $(call gb_CppunitTest_set_include,sc_editfieldobj_header,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk index 09df0f2a96b5..5f4c1aa0cbd3 100644 --- a/sc/CppunitTest_sc_filters_test.mk +++ b/sc/CppunitTest_sc_filters_test.mk @@ -80,8 +80,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_filters_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_filters_test)) - $(eval $(call gb_CppunitTest_set_include,sc_filters_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk index 3fc1b7c77df6..c74f49433687 100644 --- a/sc/CppunitTest_sc_macros_test.mk +++ b/sc/CppunitTest_sc_macros_test.mk @@ -68,8 +68,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_macros_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_macros_test)) - $(eval $(call gb_CppunitTest_set_include,sc_macros_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_modelobj.mk b/sc/CppunitTest_sc_modelobj.mk index cb8f0a53cf9d..4548f4bc37f4 100644 --- a/sc/CppunitTest_sc_modelobj.mk +++ b/sc/CppunitTest_sc_modelobj.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_modelobj, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_modelobj)) - $(eval $(call gb_CppunitTest_set_include,sc_modelobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk index 9d30c411f359..ffca9b399833 100644 --- a/sc/CppunitTest_sc_namedrangeobj.mk +++ b/sc/CppunitTest_sc_namedrangeobj.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangeobj, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_namedrangeobj)) - $(eval $(call gb_CppunitTest_set_include,sc_namedrangeobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk index 893abdf5ea9a..49a87b49acf4 100644 --- a/sc/CppunitTest_sc_namedrangesobj.mk +++ b/sc/CppunitTest_sc_namedrangesobj.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangesobj, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_namedrangesobj)) - $(eval $(call gb_CppunitTest_set_include,sc_namedrangesobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_rangelst_test.mk b/sc/CppunitTest_sc_rangelst_test.mk index 9bd621db1f74..a97a4b1e258c 100644 --- a/sc/CppunitTest_sc_rangelst_test.mk +++ b/sc/CppunitTest_sc_rangelst_test.mk @@ -68,8 +68,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_rangelst_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_rangelst_test)) - $(eval $(call gb_CppunitTest_set_include,sc_rangelst_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk index 2f5dd35a7ae1..613ff558c774 100644 --- a/sc/CppunitTest_sc_subsequent_filters_test.mk +++ b/sc/CppunitTest_sc_subsequent_filters_test.mk @@ -74,8 +74,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_filters_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_subsequent_filters_test)) - $(eval $(call gb_CppunitTest_set_include,sc_subsequent_filters_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk index e526b1750618..23cab33b98cc 100644 --- a/sc/CppunitTest_sc_tableautoformatfield.mk +++ b/sc/CppunitTest_sc_tableautoformatfield.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_tableautoformatfield, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_tableautoformatfield)) - $(eval $(call gb_CppunitTest_set_include,sc_tableautoformatfield,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk index 0c9220419fd0..1bf3bd956973 100644 --- a/sc/CppunitTest_sc_tablesheetobj.mk +++ b/sc/CppunitTest_sc_tablesheetobj.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_spreadsheetobj, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_spreadsheetobj)) - $(eval $(call gb_CppunitTest_set_include,sc_spreadsheetobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk index 2f9cb97fd71d..478dcb090552 100644 --- a/sc/CppunitTest_sc_tablesheetsobj.mk +++ b/sc/CppunitTest_sc_tablesheetsobj.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_spreadsheetsobj, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_spreadsheetsobj)) - $(eval $(call gb_CppunitTest_set_include,sc_spreadsheetsobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk index 24cc9b7e50c7..4f761856a68a 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -79,8 +79,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_ucalc, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_ucalc)) - $(eval $(call gb_CppunitTest_set_include,sc_ucalc,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/source/core/inc \ diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index ed74a69202b6..9bc420fdbde0 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -86,8 +86,6 @@ $(eval $(call gb_Library_use_libraries,sc,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sc)) - $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/core/data/attarray \ sc/source/core/data/attrib \ diff --git a/sc/Library_scd.mk b/sc/Library_scd.mk index b22f0c0eaca1..25e2a6e1badf 100644 --- a/sc/Library_scd.mk +++ b/sc/Library_scd.mk @@ -46,8 +46,6 @@ $(eval $(call gb_Library_use_libraries,scd,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,scd)) - $(eval $(call gb_Library_add_exception_objects,scd,\ sc/source/ui/unoobj/detreg \ sc/source/ui/unoobj/scdetect \ diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk index 8a8e6fe0d183..7a5256e4ec7a 100644 --- a/sc/Library_scfilt.mk +++ b/sc/Library_scfilt.mk @@ -63,8 +63,6 @@ $(eval $(call gb_Library_use_libraries,scfilt,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,scfilt)) - $(eval $(call gb_Library_use_externals,scfilt,\ orcus \ )) diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk index 807d7fd7591d..0cc40992aa37 100644 --- a/sc/Library_scui.mk +++ b/sc/Library_scui.mk @@ -56,8 +56,6 @@ $(eval $(call gb_Library_use_libraries,scui,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,scui)) - $(eval $(call gb_Library_add_exception_objects,scui,\ sc/source/ui/attrdlg/attrdlg \ sc/source/ui/attrdlg/scdlgfact \ diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk index 791175d5e08c..6272d2238220 100644 --- a/sc/Library_vbaobj.mk +++ b/sc/Library_vbaobj.mk @@ -61,8 +61,6 @@ $(eval $(call gb_Library_use_libraries,vbaobj,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,vbaobj)) - $(eval $(call gb_Library_add_exception_objects,vbaobj,\ sc/source/ui/vba/excelvbahelper \ sc/source/ui/vba/service \ diff --git a/scaddins/Library_analysis.mk b/scaddins/Library_analysis.mk index 78b7bea0676c..dda698588fa0 100644 --- a/scaddins/Library_analysis.mk +++ b/scaddins/Library_analysis.mk @@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,analysis,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,analysis)) - $(eval $(call gb_Library_add_exception_objects,analysis,\ scaddins/source/analysis/analysis \ scaddins/source/analysis/analysishelper \ diff --git a/scaddins/Library_date.mk b/scaddins/Library_date.mk index d5db83125da3..03730e0afe7f 100644 --- a/scaddins/Library_date.mk +++ b/scaddins/Library_date.mk @@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,date,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,date)) - $(eval $(call gb_Library_add_exception_objects,date,\ scaddins/source/datefunc/datefunc \ )) diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk index 013855cbd344..578bd8824bc5 100644 --- a/sccomp/Library_solver.mk +++ b/sccomp/Library_solver.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Library_use_libraries,solver,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,solver)) - $(eval $(call gb_Library_use_external,solver,lpsolve55)) $(eval $(call gb_Library_add_exception_objects,solver,\ diff --git a/scripting/Library_basprov.mk b/scripting/Library_basprov.mk index 8941931b7ee4..602aa1df85af 100644 --- a/scripting/Library_basprov.mk +++ b/scripting/Library_basprov.mk @@ -51,8 +51,6 @@ $(eval $(call gb_Library_use_libraries,basprov,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,basprov)) - $(eval $(call gb_Library_add_exception_objects,basprov,\ scripting/source/basprov/baslibnode \ scripting/source/basprov/basmethnode \ diff --git a/scripting/Library_dlgprov.mk b/scripting/Library_dlgprov.mk index 6ffb4fe0d029..c8efe563bb34 100644 --- a/scripting/Library_dlgprov.mk +++ b/scripting/Library_dlgprov.mk @@ -56,8 +56,6 @@ $(eval $(call gb_Library_use_libraries,dlgprov,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,dlgprov)) - $(eval $(call gb_Library_add_exception_objects,dlgprov,\ scripting/source/dlgprov/DialogModelProvider \ scripting/source/dlgprov/dlgevtatt \ diff --git a/scripting/Library_protocolhandler.mk b/scripting/Library_protocolhandler.mk index a9ca47acfd26..291b1ecb03c1 100644 --- a/scripting/Library_protocolhandler.mk +++ b/scripting/Library_protocolhandler.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,protocolhandler,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,protocolhandler)) - $(eval $(call gb_Library_add_exception_objects,protocolhandler,\ scripting/source/protocolhandler/scripthandler \ )) diff --git a/scripting/Library_scriptframe.mk b/scripting/Library_scriptframe.mk index 025c5952cd8d..2ecc9ec70a48 100644 --- a/scripting/Library_scriptframe.mk +++ b/scripting/Library_scriptframe.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,scriptframe,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,scriptframe)) - $(eval $(call gb_Library_add_exception_objects,scriptframe,\ scripting/source/provider/ActiveMSPList \ scripting/source/provider/BrowseNodeFactoryImpl \ diff --git a/scripting/Library_stringresource.mk b/scripting/Library_stringresource.mk index 3ec938c4cb52..29c5eb9e0a3b 100644 --- a/scripting/Library_stringresource.mk +++ b/scripting/Library_stringresource.mk @@ -45,8 +45,6 @@ $(eval $(call gb_Library_use_libraries,stringresource,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,stringresource)) - $(eval $(call gb_Library_add_exception_objects,stringresource,\ scripting/source/stringresource/stringresource \ )) diff --git a/scripting/Library_vbaevents.mk b/scripting/Library_vbaevents.mk index e469d786e4e0..acab48fe2811 100644 --- a/scripting/Library_vbaevents.mk +++ b/scripting/Library_vbaevents.mk @@ -53,8 +53,6 @@ $(eval $(call gb_Library_use_libraries,vbaevents,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,vbaevents)) - $(eval $(call gb_Library_add_exception_objects,vbaevents,\ scripting/source/vbaevents/eventhelper \ scripting/source/vbaevents/service \ diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk index 1d9f6fb297ce..f5fc02664e14 100644 --- a/sd/CppunitTest_sd_filters_test.mk +++ b/sd/CppunitTest_sd_filters_test.mk @@ -73,8 +73,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_filters_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sd_filters_test)) - $(eval $(call gb_CppunitTest_set_include,sd_filters_test,\ -I$(SRCDIR)/sd/source/ui/inc \ -I$(SRCDIR)/sd/inc \ diff --git a/sd/CppunitTest_sd_regression_test.mk b/sd/CppunitTest_sd_regression_test.mk index 85ea7eb91f1b..abee99bf17de 100644 --- a/sd/CppunitTest_sd_regression_test.mk +++ b/sd/CppunitTest_sd_regression_test.mk @@ -68,8 +68,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_regression_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sd_regression_test)) - $(eval $(call gb_CppunitTest_set_include,sd_regression_test,\ -I$(SRCDIR)/sd/source/ui/inc \ -I$(SRCDIR)/sd/inc \ diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk index 4d175957c35a..03453fff113c 100644 --- a/sd/CppunitTest_sd_uimpress.mk +++ b/sd/CppunitTest_sd_uimpress.mk @@ -74,8 +74,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_uimpress,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sd_uimpress)) - ifeq ($(OS),WNT) $(eval $(call gb_CppunitTest_use_system_win32_libs,sd_uimpress,\ ws2_32 \ diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index d8dd7c095133..05a7baf7c9d1 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -106,8 +106,6 @@ $(eval $(call gb_Library_use_libraries,sd,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sd)) - $(eval $(call gb_Library_use_externals,sd,\ libxml2 \ dbus \ diff --git a/sd/Library_sdd.mk b/sd/Library_sdd.mk index c668637a588c..f0c23cd51c49 100644 --- a/sd/Library_sdd.mk +++ b/sd/Library_sdd.mk @@ -50,8 +50,6 @@ $(eval $(call gb_Library_use_libraries,sdd,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sdd)) - $(eval $(call gb_Library_set_componentfile,sdd,sd/util/sdd)) $(eval $(call gb_Library_add_exception_objects,sdd,\ diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk index b0b0d967731e..1c4c152bc4b6 100644 --- a/sd/Library_sdfilt.mk +++ b/sd/Library_sdfilt.mk @@ -68,8 +68,6 @@ $(eval $(call gb_Library_use_libraries,sdfilt,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sdfilt)) - $(eval $(call gb_Library_set_componentfile,sdfilt,sd/util/sdfilt)) $(eval $(call gb_Library_add_exception_objects,sdfilt,\ diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk index 7949f732e34e..98c1fe96c573 100644 --- a/sd/Library_sdui.mk +++ b/sd/Library_sdui.mk @@ -67,8 +67,6 @@ $(eval $(call gb_Library_use_libraries,sdui,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sdui)) - $(eval $(call gb_Library_add_exception_objects,sdui,\ sd/source/filter/html/htmlattr \ sd/source/filter/html/pubdlg \ diff --git a/sdext/CppunitTest_pdfimport.mk b/sdext/CppunitTest_pdfimport.mk index 8d40f2431493..f81f930d44a4 100644 --- a/sdext/CppunitTest_pdfimport.mk +++ b/sdext/CppunitTest_pdfimport.mk @@ -56,8 +56,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sdext_pdfimport,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sdext_pdfimport)) - $(eval $(call gb_CppunitTest_use_static_libraries,sdext_pdfimport,\ pdfimport_s \ )) diff --git a/sfx2/CppunitTest_sfx2_metadatable.mk b/sfx2/CppunitTest_sfx2_metadatable.mk index 81706c523065..277c56417f1c 100644 --- a/sfx2/CppunitTest_sfx2_metadatable.mk +++ b/sfx2/CppunitTest_sfx2_metadatable.mk @@ -31,8 +31,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sfx2_metadatable, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sfx2_metadatable)) - $(eval $(call gb_CppunitTest_set_include,sfx2_metadatable,\ $$(INCLUDE) \ )) diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk index 22925b03f315..3ecdb9cd263d 100644 --- a/sfx2/Library_qstart.mk +++ b/sfx2/Library_qstart.mk @@ -55,8 +55,6 @@ $(eval $(call gb_Library_use_libraries,qstart_gtk,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,qstart_gtk)) - $(eval $(call gb_Library_use_externals,qstart_gtk,\ gio \ gtk \ diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index 1ec228446b2f..baf71388e393 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -70,8 +70,6 @@ $(eval $(call gb_Library_use_libraries,sfx,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sfx)) - $(eval $(call gb_Library_use_external,sfx,libxml2)) $(eval $(call gb_Library_add_exception_objects,sfx,\ diff --git a/shell/Executable_lngconvex.mk b/shell/Executable_lngconvex.mk index b32ba7e89b97..e5ecb8b998bb 100644 --- a/shell/Executable_lngconvex.mk +++ b/shell/Executable_lngconvex.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Executable_use_libraries,lngconvex,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,lngconvex)) - $(eval $(call gb_Executable_add_exception_objects,lngconvex,\ shell/source/tools/lngconvex/cmdline \ shell/source/tools/lngconvex/lngconvex \ diff --git a/shell/Library_cmdmail.mk b/shell/Library_cmdmail.mk index 58c13032f883..9f2c8ba1eeda 100644 --- a/shell/Library_cmdmail.mk +++ b/shell/Library_cmdmail.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,cmdmail,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,cmdmail)) - $(eval $(call gb_Library_set_componentfile,cmdmail,shell/source/cmdmail/cmdmail)) $(eval $(call gb_Library_add_exception_objects,cmdmail,\ diff --git a/shell/Library_desktopbe.mk b/shell/Library_desktopbe.mk index 28a0e8760ab0..f52735eeaa64 100644 --- a/shell/Library_desktopbe.mk +++ b/shell/Library_desktopbe.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,desktopbe1,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,desktopbe1)) - $(eval $(call gb_Library_set_componentfile,desktopbe1,shell/source/backends/desktopbe/desktopbe1)) $(eval $(call gb_Library_add_exception_objects,desktopbe1,\ diff --git a/shell/Library_gconfbe.mk b/shell/Library_gconfbe.mk index d2deb022d20d..7ec447b38005 100644 --- a/shell/Library_gconfbe.mk +++ b/shell/Library_gconfbe.mk @@ -45,8 +45,6 @@ $(eval $(call gb_Library_use_libraries,gconfbe1,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,gconfbe1)) - $(eval $(call gb_Library_set_componentfile,gconfbe1,shell/source/backends/gconfbe/gconfbe1)) $(eval $(call gb_Library_add_exception_objects,gconfbe1,\ diff --git a/shell/Library_kde4be.mk b/shell/Library_kde4be.mk index c20863655d9f..b7053cb0401d 100644 --- a/shell/Library_kde4be.mk +++ b/shell/Library_kde4be.mk @@ -39,8 +39,6 @@ $(eval $(call gb_Library_use_libraries,kde4be1,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,kde4be1)) - $(eval $(call gb_Library_set_componentfile,kde4be1,shell/source/backends/kde4be/kde4be1)) $(eval $(call gb_Library_add_exception_objects,kde4be1,\ diff --git a/shell/Library_kdebe.mk b/shell/Library_kdebe.mk index 8637341d6ff0..13dd3530bfce 100644 --- a/shell/Library_kdebe.mk +++ b/shell/Library_kdebe.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,kdebe1,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,kdebe1)) - $(eval $(call gb_Library_set_componentfile,kdebe1,shell/source/backends/kdebe/kdebe1)) $(eval $(call gb_Library_add_exception_objects,kdebe1,\ diff --git a/shell/Library_localebe.mk b/shell/Library_localebe.mk index 0cefa0b8908f..11db1106248a 100644 --- a/shell/Library_localebe.mk +++ b/shell/Library_localebe.mk @@ -43,8 +43,6 @@ $(eval $(call gb_Library_use_libraries,localebe1,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,localebe1)) - $(eval $(call gb_Library_set_componentfile,localebe1,shell/source/backends/localebe/localebe1)) $(eval $(call gb_Library_add_exception_objects,localebe1,\ diff --git a/shell/Library_macbe.mk b/shell/Library_macbe.mk index 6746fc0bffb8..3aab6ea02292 100644 --- a/shell/Library_macbe.mk +++ b/shell/Library_macbe.mk @@ -40,8 +40,6 @@ $(eval $(call gb_Library_use_libraries,macbe1,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,macbe1)) - $(eval $(call gb_Library_set_componentfile,macbe1,shell/source/backends/macbe/macbe1)) $(eval $(call gb_Library_add_objcxxobjects,macbe1,\ diff --git a/shell/Library_recentfile.mk b/shell/Library_recentfile.mk index c95b2d1ee343..cd27d3f48cd2 100644 --- a/shell/Library_recentfile.mk +++ b/shell/Library_recentfile.mk @@ -49,8 +49,6 @@ $(eval $(call gb_Library_use_libraries,recentfile,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,recentfile)) - $(eval $(call gb_Library_use_static_libraries,recentfile,\ shell_xmlparser \ )) diff --git a/shell/Library_syssh.mk b/shell/Library_syssh.mk index e16e957b7986..5cbdcb2c8533 100644 --- a/shell/Library_syssh.mk +++ b/shell/Library_syssh.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,syssh,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,syssh)) - $(eval $(call gb_Library_use_static_libraries,syssh,\ shell_xmlparser \ )) diff --git a/shell/Library_syssh_win.mk b/shell/Library_syssh_win.mk index d1b5d0db498a..986dca817dd2 100644 --- a/shell/Library_syssh_win.mk +++ b/shell/Library_syssh_win.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Library_use_system_win32_libs,syssh,\ shell32 \ )) -$(eval $(call gb_Library_add_standard_system_libs,syssh)) - $(eval $(call gb_Library_set_componentfile,syssh,shell/source/win32/syssh)) $(eval $(call gb_Library_add_exception_objects,syssh,\ diff --git a/shell/Library_tdebe.mk b/shell/Library_tdebe.mk index a9472456af73..de6d19810532 100644 --- a/shell/Library_tdebe.mk +++ b/shell/Library_tdebe.mk @@ -43,8 +43,6 @@ $(eval $(call gb_Library_use_libraries,tdebe1,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,tdebe1)) - $(eval $(call gb_Library_set_componentfile,tdebe1,shell/source/backends/kdebe/tdebe1)) $(eval $(call gb_Library_add_exception_objects,tdebe1,\ diff --git a/shell/Library_wininetbe.mk b/shell/Library_wininetbe.mk index c2dbd1341e30..d578aa616b52 100644 --- a/shell/Library_wininetbe.mk +++ b/shell/Library_wininetbe.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,wininetbe1,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,wininetbe1)) - $(eval $(call gb_Library_set_componentfile,wininetbe1,shell/source/backends/wininetbe/wininetbe1)) $(eval $(call gb_Library_add_exception_objects,wininetbe1,\ diff --git a/slideshow/CppunitTest_slideshow.mk b/slideshow/CppunitTest_slideshow.mk index 133ae060e6fa..838fdd58dd26 100644 --- a/slideshow/CppunitTest_slideshow.mk +++ b/slideshow/CppunitTest_slideshow.mk @@ -69,8 +69,6 @@ $(eval $(call gb_CppunitTest_use_libraries,slideshow,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,slideshow)) - $(eval $(call gb_CppunitTest_add_exception_objects,slideshow,\ slideshow/test/slidetest \ slideshow/test/testshape \ diff --git a/slideshow/Executable_demoshow.mk b/slideshow/Executable_demoshow.mk index 3ed481ed774f..a31584a22f1f 100644 --- a/slideshow/Executable_demoshow.mk +++ b/slideshow/Executable_demoshow.mk @@ -63,8 +63,6 @@ $(eval $(call gb_Executable_use_libraries,demoshow,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,demoshow)) - $(eval $(call gb_Executable_add_exception_objects,demoshow,\ slideshow/test/demoshow \ )) diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk index 012262256290..bae4d99946f8 100644 --- a/slideshow/Library_OGLTrans.mk +++ b/slideshow/Library_OGLTrans.mk @@ -55,8 +55,6 @@ $(eval $(call gb_Library_use_libraries,OGLTrans,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,OGLTrans)) - $(eval $(call gb_Library_use_external,OGLTrans,mesa_headers)) $(eval $(call gb_Library_set_componentfile,OGLTrans,slideshow/source/engine/OGLTrans/ogltrans)) diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk index d065532a696c..3813ce364c14 100644 --- a/slideshow/Library_slideshow.mk +++ b/slideshow/Library_slideshow.mk @@ -65,8 +65,6 @@ $(eval $(call gb_Library_use_libraries,slideshow,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,slideshow)) - $(eval $(call gb_Library_set_componentfile,slideshow,slideshow/util/slideshow)) $(eval $(call gb_Library_add_exception_objects,slideshow,\ diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index c7c7861275e4..5d0788aab372 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -104,6 +104,7 @@ endef define gb_CppunitTest__CppunitTest_impl $(call gb_LinkTarget_LinkTarget,$(2)) $(call gb_LinkTarget_set_targettype,$(2),CppunitTest) +$(call gb_LinkTarget_add_libs,$(2),$(gb_STDLIBS)) $(call gb_LinkTarget_add_defs,$(2),\ $(gb_CppunitTest_DEFS) \ ) @@ -341,7 +342,7 @@ $(eval $(foreach method,\ add_ldflags \ set_ldflags \ add_libs \ - add_standard_system_libs \ + disable_standard_system_libs \ use_system_darwin_frameworks \ use_system_win32_libs \ use_sdk_api \ diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index 0288c1755f71..8c178175ad4f 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -54,6 +54,7 @@ endef define gb_Executable__Executable_impl $(call gb_LinkTarget_LinkTarget,$(2)) $(call gb_LinkTarget_set_targettype,$(2),Executable) +$(call gb_LinkTarget_add_libs,$(2),$(gb_STDLIBS)) $(call gb_Executable_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) \ | $(dir $(call gb_Executable_get_target,$(1))).dir $(call gb_Executable_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2)) @@ -105,7 +106,7 @@ $(eval $(foreach method,\ add_ldflags \ set_ldflags \ add_libs \ - add_standard_system_libs \ + disable_standard_system_libs \ use_system_darwin_frameworks \ use_system_win32_libs \ set_library_path_flags \ diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index e4003a9d2682..518211152cda 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -69,6 +69,7 @@ endef define gb_Library__Library_impl $(call gb_LinkTarget_LinkTarget,$(2)) $(call gb_LinkTarget_set_targettype,$(2),Library) +$(call gb_LinkTarget_add_libs,$(2),$(gb_STDLIBS)) $(call gb_LinkTarget_add_defs,$(2),\ $(gb_Library_DEFS) \ ) @@ -185,7 +186,7 @@ $(eval $(foreach method,\ set_ldflags \ set_x64 \ add_libs \ - add_standard_system_libs \ + disable_standard_system_libs \ use_system_darwin_frameworks \ use_system_win32_libs \ set_library_path_flags \ diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 5b953005ef24..617fc562bb2e 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -648,11 +648,11 @@ define gb_LinkTarget_add_libs $(call gb_LinkTarget_get_target,$(1)) : LIBS += $(2) endef -# add platform specific standard libraries to linker command for linktarget $(1) -# there are currently 94 Libraries/Executables/CppunitTests not using -# gb_STDLIBS... probably this should need to be added explicitly -define gb_LinkTarget_add_standard_system_libs -$(call gb_LinkTarget_get_target,$(1)) : LIBS += $(gb_STDLIBS) +# remove platform specific standard libraries for linktarget $(1) +# assumption is that adding these standard libs is always useful, but in very +# exceptional cases this disable method may be used +define gb_LinkTarget_disable_standard_system_libs +$(call gb_LinkTarget_get_target,$(1)) : LIBS := $$(filter-out $$(gb_STDLIBS),$$(LIBS)) endef define gb_LinkTarget_add_api diff --git a/sot/CppunitTest_sot_test_sot.mk b/sot/CppunitTest_sot_test_sot.mk index 0941434cf7f0..62b1b28980f0 100644 --- a/sot/CppunitTest_sot_test_sot.mk +++ b/sot/CppunitTest_sot_test_sot.mk @@ -47,8 +47,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sot_test_sot, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sot_test_sot)) - $(eval $(call gb_CppunitTest_use_api,sot_test_sot,\ offapi \ udkapi \ diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk index c11af837e39f..36b4e19fbf61 100644 --- a/sot/Library_sot.mk +++ b/sot/Library_sot.mk @@ -53,8 +53,6 @@ $(eval $(call gb_Library_use_libraries,sot,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sot)) - $(eval $(call gb_Library_add_exception_objects,sot,\ sot/source/unoolestorage/xolesimplestorage \ sot/source/unoolestorage/register \ diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk index df89cdb9dd9d..efde9b438482 100644 --- a/starmath/CppunitTest_starmath_qa_cppunit.mk +++ b/starmath/CppunitTest_starmath_qa_cppunit.mk @@ -63,8 +63,6 @@ $(eval $(call gb_CppunitTest_use_libraries,starmath_qa_cppunit,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,starmath_qa_cppunit)) - $(eval $(call gb_CppunitTest_add_exception_objects,starmath_qa_cppunit,\ starmath/qa/cppunit/test_nodetotextvisitors \ starmath/qa/cppunit/test_starmath \ diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk index 554b49ce16e0..af0e885146ee 100644 --- a/starmath/Library_sm.mk +++ b/starmath/Library_sm.mk @@ -58,8 +58,6 @@ $(eval $(call gb_Library_use_libraries,sm,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sm)) - $(eval $(call gb_Library_add_exception_objects,sm,\ starmath/source/accessibility \ starmath/source/action \ diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk index 0837c2db16f3..a8db56e8b6ad 100644 --- a/starmath/Library_smd.mk +++ b/starmath/Library_smd.mk @@ -45,8 +45,6 @@ $(eval $(call gb_Library_use_libraries,smd,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,smd)) - $(eval $(call gb_Library_add_exception_objects,smd,\ starmath/source/detreg \ starmath/source/smdetect \ diff --git a/stoc/Library_bootstrap.mk b/stoc/Library_bootstrap.mk index 46d72b7633d9..a7576114f947 100644 --- a/stoc/Library_bootstrap.mk +++ b/stoc/Library_bootstrap.mk @@ -56,8 +56,6 @@ $(eval $(call gb_Library_use_libraries,bootstrap,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,bootstrap)) - $(eval $(call gb_Library_set_componentfile,bootstrap,stoc/util/bootstrap)) $(eval $(call gb_Library_add_exception_objects,bootstrap,\ diff --git a/stoc/Library_introspection.mk b/stoc/Library_introspection.mk index a1e058c86304..be2eaf6711e2 100644 --- a/stoc/Library_introspection.mk +++ b/stoc/Library_introspection.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Library_use_libraries,introspection,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,introspection)) - $(eval $(call gb_Library_set_componentfile,introspection,stoc/source/inspect/introspection)) $(eval $(call gb_Library_add_exception_objects,introspection,\ diff --git a/stoc/Library_invocadapt.mk b/stoc/Library_invocadapt.mk index 7fe31573d480..81165cd9fc40 100644 --- a/stoc/Library_invocadapt.mk +++ b/stoc/Library_invocadapt.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,invocadapt,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,invocadapt)) - $(eval $(call gb_Library_set_componentfile,invocadapt,stoc/source/invocation_adapterfactory/invocadapt)) $(eval $(call gb_Library_add_exception_objects,invocadapt,\ diff --git a/stoc/Library_invocation.mk b/stoc/Library_invocation.mk index b2544c77372b..e5970024345d 100644 --- a/stoc/Library_invocation.mk +++ b/stoc/Library_invocation.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,invocation,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,invocation)) - $(eval $(call gb_Library_set_componentfile,invocation,stoc/source/invocation/invocation)) $(eval $(call gb_Library_add_exception_objects,invocation,\ diff --git a/stoc/Library_javaloader.mk b/stoc/Library_javaloader.mk index 2303d92c0195..d30ccd1cdf15 100644 --- a/stoc/Library_javaloader.mk +++ b/stoc/Library_javaloader.mk @@ -38,8 +38,6 @@ $(eval $(call gb_Library_use_libraries,javaloader,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,javaloader)) - $(eval $(call gb_Library_set_componentfile,javaloader,stoc/source/javaloader/javaloader)) $(eval $(call gb_Library_add_exception_objects,javaloader,\ diff --git a/stoc/Library_javavm.mk b/stoc/Library_javavm.mk index a0fc87853263..78d018cf9cc3 100644 --- a/stoc/Library_javavm.mk +++ b/stoc/Library_javavm.mk @@ -39,8 +39,6 @@ $(eval $(call gb_Library_use_libraries,javavm,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,javavm)) - $(eval $(call gb_Library_set_componentfile,javavm,stoc/source/javavm/javavm)) $(eval $(call gb_Library_add_exception_objects,javavm,\ diff --git a/stoc/Library_namingservice.mk b/stoc/Library_namingservice.mk index ed115ed30c42..0b049f5aefa3 100644 --- a/stoc/Library_namingservice.mk +++ b/stoc/Library_namingservice.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,namingservice,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,namingservice)) - $(eval $(call gb_Library_set_componentfile,namingservice,stoc/source/namingservice/namingservice)) $(eval $(call gb_Library_add_exception_objects,namingservice,\ diff --git a/stoc/Library_proxyfac.mk b/stoc/Library_proxyfac.mk index 8eb08e55265d..75166f0f6809 100644 --- a/stoc/Library_proxyfac.mk +++ b/stoc/Library_proxyfac.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,proxyfac,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,proxyfac)) - $(eval $(call gb_Library_set_componentfile,proxyfac,stoc/source/proxy_factory/proxyfac)) $(eval $(call gb_Library_add_exception_objects,proxyfac,\ diff --git a/stoc/Library_reflection.mk b/stoc/Library_reflection.mk index aa5198a84bdd..71fd2cdbc81f 100644 --- a/stoc/Library_reflection.mk +++ b/stoc/Library_reflection.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,reflection,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,reflection)) - $(eval $(call gb_Library_set_componentfile,reflection,stoc/source/corereflection/reflection)) $(eval $(call gb_Library_add_exception_objects,reflection,\ diff --git a/stoc/Library_stocservices.mk b/stoc/Library_stocservices.mk index 2a8b7b8f31e5..3da842d80946 100644 --- a/stoc/Library_stocservices.mk +++ b/stoc/Library_stocservices.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Library_use_libraries,stocservices,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,stocservices)) - $(eval $(call gb_Library_set_componentfile,stocservices,stoc/util/stocservices)) $(eval $(call gb_Library_add_exception_objects,stocservices,\ diff --git a/store/Library_store.mk b/store/Library_store.mk index 43d81da71f0a..f66c1ebce6db 100644 --- a/store/Library_store.mk +++ b/store/Library_store.mk @@ -42,8 +42,6 @@ $(eval $(call gb_Library_use_libraries,store,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,store)) - $(eval $(call gb_Library_add_exception_objects,store,\ store/source/object \ store/source/lockbyte \ diff --git a/svl/CppunitTest_svl_lngmisc.mk b/svl/CppunitTest_svl_lngmisc.mk index 505f63ea9683..8f19199517d5 100644 --- a/svl/CppunitTest_svl_lngmisc.mk +++ b/svl/CppunitTest_svl_lngmisc.mk @@ -42,8 +42,6 @@ $(eval $(call gb_CppunitTest_use_libraries,svl_lngmisc, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,svl_lngmisc)) - ifeq ($(GUI),WNT) $(eval $(call gb_CppunitTest_use_system_win32_libs,svl_lngmisc, \ oleaut32 \ diff --git a/svl/CppunitTest_svl_urihelper.mk b/svl/CppunitTest_svl_urihelper.mk index ef2f3f040ce5..b432734626cc 100644 --- a/svl/CppunitTest_svl_urihelper.mk +++ b/svl/CppunitTest_svl_urihelper.mk @@ -51,6 +51,4 @@ $(eval $(call gb_CppunitTest_use_libraries,svl_urihelper, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,svl_urihelper)) - $(eval $(call gb_CppunitTest_use_ure,svl_urihelper)) diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk index 558dc60d7eac..06423e41911b 100644 --- a/svl/Library_fsstorage.mk +++ b/svl/Library_fsstorage.mk @@ -50,8 +50,6 @@ $(eval $(call gb_Library_use_libraries,fsstorage,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,fsstorage)) - $(eval $(call gb_Library_add_exception_objects,fsstorage,\ svl/source/fsstor/fsfactory \ svl/source/fsstor/fsstorage \ diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk index a7c9886d925e..5cde5678563a 100644 --- a/svl/Library_passwordcontainer.mk +++ b/svl/Library_passwordcontainer.mk @@ -49,8 +49,6 @@ $(eval $(call gb_Library_use_libraries,passwordcontainer,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,passwordcontainer)) - $(eval $(call gb_Library_add_exception_objects,passwordcontainer,\ svl/source/passwordcontainer/passwordcontainer \ svl/source/passwordcontainer/syscreds \ diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk index 46af0f9970ca..c6a2ff2ae6b4 100644 --- a/svl/Library_svl.mk +++ b/svl/Library_svl.mk @@ -62,8 +62,6 @@ $(eval $(call gb_Library_use_libraries,svl,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,svl)) - $(eval $(call gb_Library_add_exception_objects,svl,\ svl/source/config/asiancfg \ svl/source/config/cjkoptions \ diff --git a/svtools/CppunitTest_svtools_filters_test.mk b/svtools/CppunitTest_svtools_filters_test.mk index aff901c79df6..b6db6efc463f 100644 --- a/svtools/CppunitTest_svtools_filters_test.mk +++ b/svtools/CppunitTest_svtools_filters_test.mk @@ -44,8 +44,6 @@ $(eval $(call gb_CppunitTest_use_libraries,svtools_filters_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,svtools_filters_test)) - $(eval $(call gb_CppunitTest_use_api,svtools_filters_test,\ udkapi \ offapi \ diff --git a/svtools/Executable_bmp.mk b/svtools/Executable_bmp.mk index e837abd32d58..3a7537cc2e7a 100644 --- a/svtools/Executable_bmp.mk +++ b/svtools/Executable_bmp.mk @@ -45,8 +45,6 @@ $(eval $(call gb_Executable_use_libraries,bmp,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,bmp)) - $(eval $(call gb_Executable_add_exception_objects,bmp,\ svtools/bmpmaker/bmp \ svtools/bmpmaker/bmpcore \ diff --git a/svtools/Executable_bmpsum.mk b/svtools/Executable_bmpsum.mk index 7ae8dbf46dd3..e6fabb7984bc 100644 --- a/svtools/Executable_bmpsum.mk +++ b/svtools/Executable_bmpsum.mk @@ -44,8 +44,6 @@ $(eval $(call gb_Executable_use_libraries,bmpsum,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,bmpsum)) - $(eval $(call gb_Executable_add_exception_objects,bmpsum,\ svtools/bmpmaker/bmpsum \ )) diff --git a/svtools/Executable_g2g.mk b/svtools/Executable_g2g.mk index 3dace37d6c7f..5abc4ea558cb 100644 --- a/svtools/Executable_g2g.mk +++ b/svtools/Executable_g2g.mk @@ -45,8 +45,6 @@ $(eval $(call gb_Executable_use_libraries,g2g,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,g2g)) - $(eval $(call gb_Executable_add_exception_objects,g2g,\ svtools/bmpmaker/g2g \ )) diff --git a/svtools/Executable_langsupport.mk b/svtools/Executable_langsupport.mk index 704e51b636ee..71db2aeb7d0e 100644 --- a/svtools/Executable_langsupport.mk +++ b/svtools/Executable_langsupport.mk @@ -51,8 +51,6 @@ $(eval $(call gb_Executable_use_libraries,langsupport,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,langsupport)) - $(eval $(call gb_Executable_add_exception_objects,langsupport,\ svtools/langsupport/langsupport \ )) diff --git a/svtools/Library_hatchwindowfactory.mk b/svtools/Library_hatchwindowfactory.mk index 1827cb1ae389..a25abdb3bcf3 100644 --- a/svtools/Library_hatchwindowfactory.mk +++ b/svtools/Library_hatchwindowfactory.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,hatchwindowfactory,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,hatchwindowfactory)) - $(eval $(call gb_Library_add_exception_objects,hatchwindowfactory,\ svtools/source/hatchwindow/documentcloser \ svtools/source/hatchwindow/hatchwindow \ diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index e001aa4b62cc..d78caa23be90 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -65,8 +65,6 @@ $(eval $(call gb_Library_use_libraries,svt,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,svt)) - $(eval $(call gb_Library_use_externals,svt,\ icuuc \ jpeg \ diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk index 1cb9d8f78e25..60bedc43dc7c 100644 --- a/svx/Executable_gengal.bin.mk +++ b/svx/Executable_gengal.bin.mk @@ -60,8 +60,6 @@ $(eval $(call gb_Executable_use_libraries,$(svx_GENGALBIN),\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,$(svx_GENGALBIN))) - $(eval $(call gb_Executable_add_exception_objects,$(svx_GENGALBIN),\ svx/source/gengal/gengal \ )) diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index 796aa222aac1..6ccba764b892 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -68,8 +68,6 @@ $(eval $(call gb_Library_use_libraries,svx,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,svx)) - $(eval $(call gb_Library_use_external,svx,icuuc)) $(eval $(call gb_Library_add_exception_objects,svx,\ diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index 929c8cf49ae6..ec1b98f5bc0d 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -85,8 +85,6 @@ $(eval $(call gb_Library_use_libraries,svxcore,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,svxcore)) - $(eval $(call gb_Library_use_external,svxcore,icuuc)) $(eval $(call gb_Library_add_exception_objects,svxcore,\ diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk index 13a11c1c1937..f16bf445963d 100644 --- a/svx/Library_textconversiondlgs.mk +++ b/svx/Library_textconversiondlgs.mk @@ -51,8 +51,6 @@ $(eval $(call gb_Library_use_libraries,textconversiondlgs,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,textconversiondlgs)) - $(eval $(call gb_Library_add_exception_objects,textconversiondlgs,\ svx/source/unodialogs/textconversiondlgs/services \ svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog \ diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk index 53d990751bb5..7b0d48fa14b4 100644 --- a/sw/CppunitTest_sw_filters_test.mk +++ b/sw/CppunitTest_sw_filters_test.mk @@ -58,8 +58,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_filters_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_filters_test)) - $(eval $(call gb_CppunitTest_set_include,sw_filters_test,\ -I$(SRCDIR)/sw/source/ui/inc \ -I$(SRCDIR)/sw/inc \ diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk index ccbe8cd678ce..af54e0af27da 100644 --- a/sw/CppunitTest_sw_layout_test.mk +++ b/sw/CppunitTest_sw_layout_test.mk @@ -69,8 +69,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_layout_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_layout_test)) - $(eval $(call gb_CppunitTest_set_include,sw_layout_test,\ -I$(SRCDIR)/sw/source/ui/inc \ -I$(SRCDIR)/sw/inc \ diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk index 30915f2ae77f..a321a29935e2 100644 --- a/sw/CppunitTest_sw_macros_test.mk +++ b/sw/CppunitTest_sw_macros_test.mk @@ -70,8 +70,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_macros_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_macros_test)) - $(eval $(call gb_CppunitTest_set_include,sw_macros_test,\ -I$(SRCDIR)/sw/source/ui/inc \ -I$(SRCDIR)/sw/inc \ diff --git a/sw/CppunitTest_sw_regression_test.mk b/sw/CppunitTest_sw_regression_test.mk index 69c10d366a67..32d2bdb46c55 100644 --- a/sw/CppunitTest_sw_regression_test.mk +++ b/sw/CppunitTest_sw_regression_test.mk @@ -70,8 +70,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_regression_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_regression_test)) - $(eval $(call gb_CppunitTest_set_include,sw_regression_test,\ -I$(SRCDIR)/sw/source/ui/inc \ -I$(SRCDIR)/sw/inc \ diff --git a/sw/CppunitTest_sw_subsequent_odfexport.mk b/sw/CppunitTest_sw_subsequent_odfexport.mk index 03af297f98d9..4ba12b90b0db 100644 --- a/sw/CppunitTest_sw_subsequent_odfexport.mk +++ b/sw/CppunitTest_sw_subsequent_odfexport.mk @@ -47,8 +47,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odfexport, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_odfexport)) - $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_odfexport,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_odfimport.mk b/sw/CppunitTest_sw_subsequent_odfimport.mk index 7d52f510aed5..9c9a1560d5ca 100644 --- a/sw/CppunitTest_sw_subsequent_odfimport.mk +++ b/sw/CppunitTest_sw_subsequent_odfimport.mk @@ -46,8 +46,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odfimport, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_odfimport)) - $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_odfimport,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_ooxmlexport.mk b/sw/CppunitTest_sw_subsequent_ooxmlexport.mk index 1523e5ca4f52..588349cad511 100644 --- a/sw/CppunitTest_sw_subsequent_ooxmlexport.mk +++ b/sw/CppunitTest_sw_subsequent_ooxmlexport.mk @@ -46,8 +46,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmlexport, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_ooxmlexport)) - $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ooxmlexport,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_ooxmlimport.mk b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk index 30d793c32c76..d8b9bc428383 100644 --- a/sw/CppunitTest_sw_subsequent_ooxmlimport.mk +++ b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk @@ -45,8 +45,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmlimport, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_ooxmlimport)) - $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ooxmlimport,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_rtfexport.mk b/sw/CppunitTest_sw_subsequent_rtfexport.mk index e9c721ec5611..bd45fad4bb34 100644 --- a/sw/CppunitTest_sw_subsequent_rtfexport.mk +++ b/sw/CppunitTest_sw_subsequent_rtfexport.mk @@ -45,8 +45,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtfexport, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_rtfexport)) - $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_rtfexport,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_rtfimport.mk b/sw/CppunitTest_sw_subsequent_rtfimport.mk index 6e9339e37a18..062ef8dd87f7 100644 --- a/sw/CppunitTest_sw_subsequent_rtfimport.mk +++ b/sw/CppunitTest_sw_subsequent_rtfimport.mk @@ -46,8 +46,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtfimport, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_rtfimport)) - $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_rtfimport,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_ww8export.mk b/sw/CppunitTest_sw_subsequent_ww8export.mk index 35a6af3814ce..5fccb5d848a1 100644 --- a/sw/CppunitTest_sw_subsequent_ww8export.mk +++ b/sw/CppunitTest_sw_subsequent_ww8export.mk @@ -47,8 +47,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8export, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_ww8export)) - $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ww8export,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_ww8import.mk b/sw/CppunitTest_sw_subsequent_ww8import.mk index f4bf71c30725..c00f966ae7d8 100644 --- a/sw/CppunitTest_sw_subsequent_ww8import.mk +++ b/sw/CppunitTest_sw_subsequent_ww8import.mk @@ -44,8 +44,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8import, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_ww8import)) - $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ww8import,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk index 268a620e9161..f25b9691aa21 100644 --- a/sw/CppunitTest_sw_swdoc_test.mk +++ b/sw/CppunitTest_sw_swdoc_test.mk @@ -70,8 +70,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_swdoc_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_swdoc_test)) - $(eval $(call gb_CppunitTest_use_externals,sw_swdoc_test,\ icuuc \ libxml2 \ diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk index f1f3a8c7a9b6..cba74d917d2e 100644 --- a/sw/Library_msword.mk +++ b/sw/Library_msword.mk @@ -70,8 +70,6 @@ $(eval $(call gb_Library_use_libraries,msword,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,msword)) - $(eval $(call gb_Library_use_externals,msword,\ icuuc \ libxml2 \ diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index 5dd22de249c2..ba3fcb23c2af 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -79,8 +79,6 @@ $(eval $(call gb_Library_use_libraries,sw,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sw)) - $(eval $(call gb_Library_use_externals,sw,\ icuuc \ libxml2 \ diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk index 780b069f4bfd..856efac25051 100644 --- a/sw/Library_swd.mk +++ b/sw/Library_swd.mk @@ -60,8 +60,6 @@ $(eval $(call gb_Library_use_libraries,swd,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,swd)) - $(eval $(call gb_Library_add_exception_objects,swd,\ sw/source/filter/basflt/iodetect \ sw/source/ui/uno/detreg \ diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk index 040717b7900a..eaa68dac9404 100644 --- a/sw/Library_swui.mk +++ b/sw/Library_swui.mk @@ -70,8 +70,6 @@ $(eval $(call gb_Library_use_libraries,swui,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,swui)) - $(eval $(call gb_Library_add_exception_objects,swui,\ sw/source/ui/chrdlg/break \ sw/source/ui/chrdlg/chardlg \ diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk index aeed2a85a0ff..7f593ec04b18 100644 --- a/sw/Library_vbaswobj.mk +++ b/sw/Library_vbaswobj.mk @@ -66,8 +66,6 @@ $(eval $(call gb_Library_use_libraries,vbaswobj,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,vbaswobj)) - $(eval $(call gb_Library_use_externals,vbaswobj,\ libxml2 \ )) diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk index 886702d022d7..0bc9359755c1 100644 --- a/test/Library_subsequenttest.mk +++ b/test/Library_subsequenttest.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,subsequenttest,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,subsequenttest)) - ifeq ($(GUIBASE),unx) $(call gb_Library_get_target,subsequenttest) : \ $(call gb_Library_get_target,desktop_detector) \ diff --git a/test/Library_test.mk b/test/Library_test.mk index 61579bf8d0a3..4b395be0f009 100644 --- a/test/Library_test.mk +++ b/test/Library_test.mk @@ -53,8 +53,6 @@ $(eval $(call gb_Library_use_libraries,test,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,test)) - ifeq ($(GUIBASE),unx) $(call gb_Library_get_target,test) : \ $(call gb_Library_get_target,desktop_detector) \ diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index d1e1fee6fe98..b7994783559d 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -55,8 +55,6 @@ $(eval $(call gb_Library_use_libraries,tk,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,tk)) - $(eval $(call gb_Library_add_exception_objects,tk,\ toolkit/source/awt/asynccallback \ toolkit/source/awt/stylesettings \ diff --git a/tools/CppunitTest_tools_test.mk b/tools/CppunitTest_tools_test.mk index 6fce0cdcbf4a..e753f49220d0 100644 --- a/tools/CppunitTest_tools_test.mk +++ b/tools/CppunitTest_tools_test.mk @@ -49,8 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,tools_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,tools_test)) - $(eval $(call gb_CppunitTest_use_static_libraries,tools_test, \ ooopathutils \ )) diff --git a/tools/Executable_bestreversemap.mk b/tools/Executable_bestreversemap.mk index 5fae14f4f6e4..33a51dd6d74d 100644 --- a/tools/Executable_bestreversemap.mk +++ b/tools/Executable_bestreversemap.mk @@ -31,8 +31,6 @@ $(eval $(call gb_Executable_use_libraries,bestreversemap,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,bestreversemap)) - $(eval $(call gb_Executable_add_exception_objects,bestreversemap,\ tools/source/reversemap/bestreversemap \ )) diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk index c92e01296759..d030d1d85f4e 100644 --- a/tools/Executable_mkunroll.mk +++ b/tools/Executable_mkunroll.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Executable_use_libraries,mkunroll,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,mkunroll)) - $(eval $(call gb_Executable_add_exception_objects,mkunroll,\ tools/bootstrp/mkunroll/mkunroll \ )) diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk index b408da57beb4..d00cba5c46eb 100644 --- a/tools/Executable_rscdep.mk +++ b/tools/Executable_rscdep.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Executable_use_libraries,rscdep,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,rscdep)) - $(eval $(call gb_Executable_use_sdk_api,rscdep)) $(eval $(call gb_Executable_add_exception_objects,rscdep,\ diff --git a/tools/Executable_so_checksum.mk b/tools/Executable_so_checksum.mk index c7cfd90e695a..fcd72c2ddded 100644 --- a/tools/Executable_so_checksum.mk +++ b/tools/Executable_so_checksum.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Executable_use_libraries,so_checksum,\ )) # used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 vos3gcc3 - seems to be superficial -$(eval $(call gb_Executable_add_standard_system_libs,so_checksum)) - $(eval $(call gb_Executable_add_exception_objects,so_checksum,\ tools/bootstrp/md5 \ tools/bootstrp/so_checksum \ diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index b7802267c891..cd8afecf5b73 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -43,8 +43,6 @@ $(eval $(call gb_Library_use_libraries,tl,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,tl)) - $(eval $(call gb_Library_add_exception_objects,tl,\ tools/source/datetime/datetime \ diff --git a/touch/Library_libotouch.mk b/touch/Library_libotouch.mk index 261d305f3ffe..7e26f3d4ff86 100644 --- a/touch/Library_libotouch.mk +++ b/touch/Library_libotouch.mk @@ -22,8 +22,6 @@ $(eval $(call gb_Library_use_internal_comprehensive_api,libotouch,\ $(eval $(call gb_Library_use_libraries,libotouch,\ )) -$(eval $(call gb_Library_add_standard_system_libs,libotouch)) - $(eval $(call gb_Library_add_exception_objects,libotouch,\ touch/source/uno/Document \ touch/source/generic/libotouch \ diff --git a/tubes/CppunitTest_tubes_test.mk b/tubes/CppunitTest_tubes_test.mk index 728067ddb4c3..923d75b056a3 100644 --- a/tubes/CppunitTest_tubes_test.mk +++ b/tubes/CppunitTest_tubes_test.mk @@ -37,8 +37,6 @@ $(eval $(call gb_CppunitTest_use_libraries,tubes_test, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,tubes_test)) - $(eval $(call gb_CppunitTest_use_externals,tubes_test,\ telepathy \ )) diff --git a/tubes/Library_tubes.mk b/tubes/Library_tubes.mk index fd1d2a1685a7..1f79acade6c7 100644 --- a/tubes/Library_tubes.mk +++ b/tubes/Library_tubes.mk @@ -52,8 +52,6 @@ $(eval $(call gb_Library_use_libraries,tubes,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,tubes)) - $(eval $(call gb_Library_use_externals,tubes,\ gtk \ telepathy \ diff --git a/ucb/Library_cached1.mk b/ucb/Library_cached1.mk index e5f4b858179e..1d9ca407cfc4 100644 --- a/ucb/Library_cached1.mk +++ b/ucb/Library_cached1.mk @@ -39,8 +39,6 @@ $(eval $(call gb_Library_use_libraries,cached1,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,cached1)) - $(eval $(call gb_Library_add_exception_objects,cached1,\ ucb/source/cacher/cachedcontentresultset \ ucb/source/cacher/cachedcontentresultsetstub \ diff --git a/ucb/Library_srtrs1.mk b/ucb/Library_srtrs1.mk index 38a48be65839..587b0745f53b 100644 --- a/ucb/Library_srtrs1.mk +++ b/ucb/Library_srtrs1.mk @@ -38,8 +38,6 @@ $(eval $(call gb_Library_use_libraries,srtrs1,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,srtrs1)) - $(eval $(call gb_Library_add_exception_objects,srtrs1,\ ucb/source/sorter/sortdynres \ ucb/source/sorter/sortmain \ diff --git a/ucb/Library_ucb1.mk b/ucb/Library_ucb1.mk index 5b04efbc31b7..5dabe48bbd4a 100644 --- a/ucb/Library_ucb1.mk +++ b/ucb/Library_ucb1.mk @@ -45,8 +45,6 @@ $(eval $(call gb_Library_use_libraries,ucb1,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ucb1)) - $(eval $(call gb_Library_add_exception_objects,ucb1,\ ucb/source/core/cmdenv \ ucb/source/core/identify \ diff --git a/ucb/Library_ucpcmis1.mk b/ucb/Library_ucpcmis1.mk index 6d3a61a37174..a19f10be8853 100644 --- a/ucb/Library_ucpcmis1.mk +++ b/ucb/Library_ucpcmis1.mk @@ -42,8 +42,6 @@ $(eval $(call gb_Library_use_libraries,ucpcmis1,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ucpcmis1)) - $(eval $(call gb_Library_use_externals,ucpcmis1,\ cmis \ curl \ diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk index c8053c180c9f..a38a8f103146 100644 --- a/ucb/Library_ucpdav1.mk +++ b/ucb/Library_ucpdav1.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Library_use_libraries,ucpdav1,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ucpdav1)) - $(eval $(call gb_Library_use_externals,ucpdav1,\ libxml2 \ neon \ diff --git a/ucb/Library_ucpexpand1.mk b/ucb/Library_ucpexpand1.mk index ade70cf4b568..04a29d601286 100644 --- a/ucb/Library_ucpexpand1.mk +++ b/ucb/Library_ucpexpand1.mk @@ -39,8 +39,6 @@ $(eval $(call gb_Library_use_libraries,ucpexpand1,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ucpexpand1)) - $(eval $(call gb_Library_add_exception_objects,ucpexpand1,\ ucb/source/ucp/expand/ucpexpand \ )) diff --git a/ucb/Library_ucpext.mk b/ucb/Library_ucpext.mk index 4a1de1b2460f..3e6c5f599a56 100644 --- a/ucb/Library_ucpext.mk +++ b/ucb/Library_ucpext.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Library_use_libraries,ucpext,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ucpext)) - $(eval $(call gb_Library_add_exception_objects,ucpext,\ ucb/source/ucp/ext/ucpext_content \ ucb/source/ucp/ext/ucpext_datasupplier \ diff --git a/ucb/Library_ucpfile1.mk b/ucb/Library_ucpfile1.mk index 532e5802de59..12890b1e70fe 100644 --- a/ucb/Library_ucpfile1.mk +++ b/ucb/Library_ucpfile1.mk @@ -40,8 +40,6 @@ $(eval $(call gb_Library_use_libraries,ucpfile1,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ucpfile1)) - $(eval $(call gb_Library_add_exception_objects,ucpfile1,\ ucb/source/ucp/file/bc \ ucb/source/ucp/file/filcmd \ diff --git a/ucb/Library_ucpftp1.mk b/ucb/Library_ucpftp1.mk index aa37b20a71af..c0925d24dcaf 100644 --- a/ucb/Library_ucpftp1.mk +++ b/ucb/Library_ucpftp1.mk @@ -40,8 +40,6 @@ $(eval $(call gb_Library_use_libraries,ucpftp1,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ucpftp1)) - $(eval $(call gb_Library_use_externals,ucpftp1,\ curl \ zlib \ diff --git a/ucb/Library_ucpgio1.mk b/ucb/Library_ucpgio1.mk index e863fc7602fe..27c7dea74ae3 100644 --- a/ucb/Library_ucpgio1.mk +++ b/ucb/Library_ucpgio1.mk @@ -39,8 +39,6 @@ $(eval $(call gb_Library_use_libraries,ucpgio1,\ ucbhelper \ )) -$(eval $(call gb_Library_add_standard_system_libs,ucpgio1)) - $(eval $(call gb_Library_use_externals,ucpgio1,\ gio \ )) diff --git a/ucb/Library_ucpgvfs1.mk b/ucb/Library_ucpgvfs1.mk index 42f0dc663741..3165c5f933c3 100644 --- a/ucb/Library_ucpgvfs1.mk +++ b/ucb/Library_ucpgvfs1.mk @@ -49,8 +49,6 @@ $(eval $(call gb_Library_use_libraries,ucpgvfs1,\ ucbhelper \ )) -$(eval $(call gb_Library_add_standard_system_libs,ucpgvfs1)) - $(eval $(call gb_Library_add_exception_objects,ucpgvfs1,\ ucb/source/ucp/gvfs/gvfs_content \ ucb/source/ucp/gvfs/gvfs_directory \ diff --git a/ucb/Library_ucphier1.mk b/ucb/Library_ucphier1.mk index 4f4325bc5b20..767fbd15208a 100644 --- a/ucb/Library_ucphier1.mk +++ b/ucb/Library_ucphier1.mk @@ -40,8 +40,6 @@ $(eval $(call gb_Library_use_libraries,ucphier1,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ucphier1)) - $(eval $(call gb_Library_add_exception_objects,ucphier1,\ ucb/source/ucp/hierarchy/dynamicresultset \ ucb/source/ucp/hierarchy/hierarchycontentcaps \ diff --git a/ucb/Library_ucpodma1.mk b/ucb/Library_ucpodma1.mk index d11376325a3a..1c0f950e632a 100644 --- a/ucb/Library_ucpodma1.mk +++ b/ucb/Library_ucpodma1.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Library_use_libraries,ucpodma1,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ucpodma1)) - $(eval $(call gb_Library_use_static_libraries,ucpodma1,\ odma_lib \ )) diff --git a/ucb/Library_ucppkg1.mk b/ucb/Library_ucppkg1.mk index 40983cf0b43b..c3c3671f082d 100644 --- a/ucb/Library_ucppkg1.mk +++ b/ucb/Library_ucppkg1.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Library_use_libraries,ucppkg1,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ucppkg1)) - $(eval $(call gb_Library_add_exception_objects,ucppkg1,\ ucb/source/ucp/package/pkgcontentcaps \ ucb/source/ucp/package/pkgcontent \ diff --git a/ucb/Library_ucptdoc1.mk b/ucb/Library_ucptdoc1.mk index 9138ca2af3eb..532d06828fce 100644 --- a/ucb/Library_ucptdoc1.mk +++ b/ucb/Library_ucptdoc1.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Library_use_libraries,ucptdoc1,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ucptdoc1)) - $(eval $(call gb_Library_add_exception_objects,ucptdoc1,\ ucb/source/ucp/tdoc/tdoc_contentcaps \ ucb/source/ucp/tdoc/tdoc_content \ diff --git a/ucbhelper/Library_ucbhelper.mk b/ucbhelper/Library_ucbhelper.mk index d6e32e8effbd..73b1afc30c4e 100644 --- a/ucbhelper/Library_ucbhelper.mk +++ b/ucbhelper/Library_ucbhelper.mk @@ -21,8 +21,6 @@ $(eval $(call gb_Library_use_libraries,ucbhelper,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ucbhelper)) - $(eval $(call gb_Library_add_defs,ucbhelper,\ -DUCBHELPER_DLLIMPLEMENTATION \ )) diff --git a/unotest/Library_unobootstrapprotector.mk b/unotest/Library_unobootstrapprotector.mk index 1da0fd52ccb1..1d1e0e127d79 100644 --- a/unotest/Library_unobootstrapprotector.mk +++ b/unotest/Library_unobootstrapprotector.mk @@ -39,8 +39,6 @@ $(eval $(call gb_Library_use_libraries,unobootstrapprotector,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,unobootstrapprotector)) - $(eval $(call gb_Library_use_externals,unobootstrapprotector,\ cppunit \ )) diff --git a/unotest/Library_unoexceptionprotector.mk b/unotest/Library_unoexceptionprotector.mk index ca5f9c064242..f5ed3f9f2486 100644 --- a/unotest/Library_unoexceptionprotector.mk +++ b/unotest/Library_unoexceptionprotector.mk @@ -38,8 +38,6 @@ $(eval $(call gb_Library_use_libraries,unoexceptionprotector,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,unoexceptionprotector)) - $(eval $(call gb_Library_use_externals,unoexceptionprotector,\ cppunit \ )) diff --git a/unotest/Library_unotest.mk b/unotest/Library_unotest.mk index 3c851a3cee54..178777fca719 100644 --- a/unotest/Library_unotest.mk +++ b/unotest/Library_unotest.mk @@ -43,8 +43,6 @@ $(eval $(call gb_Library_use_libraries,unotest,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,unotest)) - $(eval $(call gb_Library_use_externals,unotest,\ cppunit \ )) diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk index ef33f7f5c48f..7dafedab43ea 100644 --- a/unotools/Library_utl.mk +++ b/unotools/Library_utl.mk @@ -63,8 +63,6 @@ $(eval $(call gb_Library_use_libraries,utl,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,utl)) - # add all source files that shall be compiled with exceptions enabled # the name is relative to $(SRCROOT) and must not contain an extension $(eval $(call gb_Library_add_exception_objects,utl,\ diff --git a/unoxml/Library_unordf.mk b/unoxml/Library_unordf.mk index bc8aef2e2f3f..348b919dce17 100644 --- a/unoxml/Library_unordf.mk +++ b/unoxml/Library_unordf.mk @@ -35,8 +35,6 @@ $(eval $(call gb_Library_use_libraries,unordf,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,unordf)) - $(eval $(call gb_Library_use_externals,unordf,librdf)) $(eval $(call gb_Library_use_externals,unordf,libxslt)) $(eval $(call gb_Library_use_externals,unordf,libxml2)) diff --git a/unoxml/Library_unoxml.mk b/unoxml/Library_unoxml.mk index 8d47855670e7..502537750478 100644 --- a/unoxml/Library_unoxml.mk +++ b/unoxml/Library_unoxml.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Library_use_libraries,unoxml,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,unoxml)) - $(eval $(call gb_Library_use_external,unoxml,libxml2)) $(eval $(call gb_Library_add_exception_objects,unoxml,\ diff --git a/uui/Library_uui.mk b/uui/Library_uui.mk index 797f8eaf0512..69335bf0ad26 100644 --- a/uui/Library_uui.mk +++ b/uui/Library_uui.mk @@ -46,8 +46,6 @@ $(eval $(call gb_Library_use_libraries,uui,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,uui)) - $(eval $(call gb_Library_add_exception_objects,uui,\ uui/source/alreadyopen \ uui/source/filechanged \ diff --git a/vbahelper/Library_msforms.mk b/vbahelper/Library_msforms.mk index e8c009b3e59f..63d0f67aeb5c 100644 --- a/vbahelper/Library_msforms.mk +++ b/vbahelper/Library_msforms.mk @@ -65,8 +65,6 @@ $(eval $(call gb_Library_use_libraries,msforms,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,msforms)) - # add all source files that shall be compiled with exceptions enabled # the name is relative to $(SRCROOT) and must not contain an extension $(eval $(call gb_Library_add_exception_objects,msforms,\ diff --git a/vbahelper/Library_vbahelper.mk b/vbahelper/Library_vbahelper.mk index 06a146904a5c..1da2b8e07dae 100644 --- a/vbahelper/Library_vbahelper.mk +++ b/vbahelper/Library_vbahelper.mk @@ -68,8 +68,6 @@ $(eval $(call gb_Library_use_libraries,vbahelper,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,vbahelper)) - # add all source files that shall be compiled with exceptions enabled # the name is relative to $(SRCROOT) and must not contain an extension $(eval $(call gb_Library_add_exception_objects,vbahelper,\ diff --git a/vcl/Executable_kdefilepicker.mk b/vcl/Executable_kdefilepicker.mk index c0adf2735b6f..40a95922917d 100644 --- a/vcl/Executable_kdefilepicker.mk +++ b/vcl/Executable_kdefilepicker.mk @@ -35,8 +35,6 @@ $(eval $(call gb_Executable_use_libraries,kdefilepicker,\ sal \ )) -$(eval $(call gb_Executable_add_standard_system_libs,kdefilepicker)) - $(eval $(call gb_Executable_add_libs,kdefilepicker,\ $(KDE_LIBS) \ -lkio -lX11 \ diff --git a/vcl/Executable_tdefilepicker.mk b/vcl/Executable_tdefilepicker.mk index 7458f4197b2c..4c912e4779ad 100644 --- a/vcl/Executable_tdefilepicker.mk +++ b/vcl/Executable_tdefilepicker.mk @@ -44,8 +44,6 @@ $(eval $(call gb_Executable_use_libraries,tdefilepicker,\ sal \ )) -$(eval $(call gb_Executable_add_standard_system_libs,tdefilepicker)) - $(eval $(call gb_Executable_add_libs,tdefilepicker,\ $(TDE_LIBS) \ -lkio -lX11 \ diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk index 6ade59bbd86a..0b44caba6104 100644 --- a/vcl/Library_desktop_detector.mk +++ b/vcl/Library_desktop_detector.mk @@ -57,8 +57,6 @@ $(eval $(call gb_Library_use_libraries,desktop_detector,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,desktop_detector)) - $(eval $(call gb_Library_use_externals,desktop_detector,\ icule \ icuuc \ diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 02dae7d43f95..6eebaeb1e015 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -81,8 +81,6 @@ $(eval $(call gb_Library_use_libraries,vcl,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,vcl)) - ifeq ($(OS),MACOSX) $(eval $(call gb_Library_add_libs,vcl,\ -lobjc \ diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 67795ef553a9..269ee1ee6e51 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -51,8 +51,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_gen,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,vclplug_gen)) - $(eval $(call gb_Library_use_externals,vclplug_gen,\ cairo \ icule \ diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index 3fb0d8038b69..4ff18dafb5eb 100644 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -59,8 +59,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,vclplug_gtk)) - $(eval $(call gb_Library_use_externals,vclplug_gtk,\ dbus \ gtk \ diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk index f924e80d8c33..2c34e1d529e7 100644 --- a/vcl/Library_vclplug_gtk3.mk +++ b/vcl/Library_vclplug_gtk3.mk @@ -71,8 +71,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk3,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,vclplug_gtk3)) - $(eval $(call gb_Library_use_externals,vclplug_gtk3,\ dbus \ )) diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk index d61717c00e2c..9b725b33edba 100644 --- a/vcl/Library_vclplug_kde.mk +++ b/vcl/Library_vclplug_kde.mk @@ -60,8 +60,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,vclplug_kde)) - $(eval $(call gb_Library_use_externals,vclplug_kde,\ icule \ icuuc \ diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk index f8450203ccd2..48a13c9dbebc 100644 --- a/vcl/Library_vclplug_kde4.mk +++ b/vcl/Library_vclplug_kde4.mk @@ -58,8 +58,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde4,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,vclplug_kde4)) - $(eval $(call gb_Library_use_externals,vclplug_kde4,\ icule \ icuuc \ diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk index 750342c3225b..66ccd12b7d4b 100644 --- a/vcl/Library_vclplug_svp.mk +++ b/vcl/Library_vclplug_svp.mk @@ -60,8 +60,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_svp,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,vclplug_svp)) - $(eval $(call gb_Library_use_externals,vclplug_svp,\ icule \ icuuc \ diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk index efd3daaff151..9431131171ce 100644 --- a/vcl/Library_vclplug_tde.mk +++ b/vcl/Library_vclplug_tde.mk @@ -65,8 +65,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_tde,\ sal \ )) -$(eval $(call gb_Library_add_standard_system_libs,vclplug_tde)) - $(eval $(call gb_Library_use_externals,vclplug_tde,\ icule \ icuuc \ diff --git a/writerfilter/CppunitTest_writerfilter_doctok.mk b/writerfilter/CppunitTest_writerfilter_doctok.mk index b5b8e7e928b8..26b89a1ceb54 100644 --- a/writerfilter/CppunitTest_writerfilter_doctok.mk +++ b/writerfilter/CppunitTest_writerfilter_doctok.mk @@ -40,8 +40,6 @@ $(eval $(call gb_CppunitTest_use_libraries,writerfilter_doctok, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,writerfilter_doctok)) - $(eval $(call gb_CppunitTest_set_include,writerfilter_doctok,\ $$(INCLUDE) \ -I$(SRCDIR)/writerfilter/inc \ diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk index a50d72151a30..ae981d84b8ba 100644 --- a/writerfilter/CppunitTest_writerfilter_rtftok.mk +++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk @@ -46,8 +46,6 @@ $(eval $(call gb_CppunitTest_use_libraries,writerfilter_rtftok, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,writerfilter_rtftok)) - $(eval $(call gb_CppunitTest_use_api,writerfilter_rtftok,\ offapi \ udkapi \ diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index 5429ea7af4c6..1d7c66763a80 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -83,8 +83,6 @@ $(eval $(call gb_Library_use_libraries,writerfilter,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,writerfilter)) - $(eval $(call gb_Library_use_external,writerfilter,libxml2)) $(eval $(call gb_Library_add_exception_objects,writerfilter,\ diff --git a/writerfilter/Library_writerfilter_uno.mk b/writerfilter/Library_writerfilter_uno.mk index bc0bd83c9205..7c98491a81b4 100644 --- a/writerfilter/Library_writerfilter_uno.mk +++ b/writerfilter/Library_writerfilter_uno.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,writerfilter_uno,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,writerfilter_uno)) - $(eval $(call gb_Library_use_external,writerfilter_uno,libxml2)) $(eval $(call gb_Library_add_exception_objects,writerfilter_uno,\ diff --git a/writerperfect/Library_wpftdraw.mk b/writerperfect/Library_wpftdraw.mk index 38e961df7ebf..fb76ddacaa26 100644 --- a/writerperfect/Library_wpftdraw.mk +++ b/writerperfect/Library_wpftdraw.mk @@ -40,8 +40,6 @@ $(eval $(call gb_Library_use_libraries,wpftdraw,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,wpftdraw)) - $(eval $(call gb_Library_use_static_libraries,wpftdraw,\ writerperfect \ )) diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk index 3752308b6fa3..bf4759c2ddcc 100644 --- a/writerperfect/Library_wpftwriter.mk +++ b/writerperfect/Library_wpftwriter.mk @@ -43,8 +43,6 @@ $(eval $(call gb_Library_use_libraries,wpftwriter,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,wpftwriter)) - $(eval $(call gb_Library_use_static_libraries,wpftwriter,\ writerperfect \ )) diff --git a/xml2cmp/Executable_xml2cmp.mk b/xml2cmp/Executable_xml2cmp.mk index 9704b7642b3e..600302977d5c 100644 --- a/xml2cmp/Executable_xml2cmp.mk +++ b/xml2cmp/Executable_xml2cmp.mk @@ -46,6 +46,4 @@ $(eval $(call gb_Executable_add_exception_objects,xml2cmp,\ xml2cmp/source/xcd/dependy \ )) -$(eval $(call gb_Executable_add_standard_system_libs,xml2cmp)) - # vim: set noet sw=4 ts=4: diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk index d51a29352829..11b46e8372f3 100644 --- a/xmloff/Library_xo.mk +++ b/xmloff/Library_xo.mk @@ -58,8 +58,6 @@ $(eval $(call gb_Library_use_libraries,xo,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,xo)) - $(eval $(call gb_Library_add_exception_objects,xo,\ xmloff/source/chart/ColorPropertySet \ xmloff/source/chart/PropertyMaps \ diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk index e1870a4d6029..e816b46002bf 100644 --- a/xmloff/Library_xof.mk +++ b/xmloff/Library_xof.mk @@ -48,8 +48,6 @@ $(eval $(call gb_Library_use_libraries,xof,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,xof)) - $(eval $(call gb_Library_add_exception_objects,xof,\ xmloff/source/transform/ChartOASISTContext \ xmloff/source/transform/ChartOOoTContext \ diff --git a/xmlreader/Library_xmlreader.mk b/xmlreader/Library_xmlreader.mk index b3cd8f704aff..b9b16e864b52 100644 --- a/xmlreader/Library_xmlreader.mk +++ b/xmlreader/Library_xmlreader.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Library_use_libraries,xmlreader,\ )) # cppu is only needed due to the cppumaker -C hack -$(eval $(call gb_Library_add_standard_system_libs,xmlreader)) - $(eval $(call gb_Library_add_exception_objects,xmlreader,\ xmlreader/source/pad \ xmlreader/source/span \ diff --git a/xmlscript/Library_xmlscript.mk b/xmlscript/Library_xmlscript.mk index 00353edc75e2..c7c77557f630 100644 --- a/xmlscript/Library_xmlscript.mk +++ b/xmlscript/Library_xmlscript.mk @@ -26,8 +26,6 @@ $(eval $(call gb_Library_use_libraries,xmlscript,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,xmlscript)) - $(eval $(call gb_Library_set_include,xmlscript,\ -I$(SRCDIR)/xmlscript/source/inc \ $$(INCLUDE) \ diff --git a/xmlsecurity/CppunitTest_qa_certext.mk b/xmlsecurity/CppunitTest_qa_certext.mk index 201b8bf540cb..c42e02408fd7 100644 --- a/xmlsecurity/CppunitTest_qa_certext.mk +++ b/xmlsecurity/CppunitTest_qa_certext.mk @@ -47,8 +47,6 @@ $(eval $(call gb_CppunitTest_use_libraries,xmlsecurity_qa_certext,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,xmlsecurity_qa_certext)) - $(eval $(call gb_CppunitTest_add_exception_objects,xmlsecurity_qa_certext,\ xmlsecurity/qa/certext/SanCertExt \ )) diff --git a/xmlsecurity/Library_xmlsecurity.mk b/xmlsecurity/Library_xmlsecurity.mk index 3333e21f5fce..097e016aa3af 100644 --- a/xmlsecurity/Library_xmlsecurity.mk +++ b/xmlsecurity/Library_xmlsecurity.mk @@ -54,8 +54,6 @@ $(eval $(call gb_Library_use_libraries,xmlsecurity,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,xmlsecurity)) - $(eval $(call gb_Library_add_exception_objects,xmlsecurity,\ xmlsecurity/source/component/certificatecontainer \ xmlsecurity/source/component/documentdigitalsignatures \ diff --git a/xmlsecurity/Library_xsec_fw.mk b/xmlsecurity/Library_xsec_fw.mk index 1aea707bcb5e..24de37ee7c66 100644 --- a/xmlsecurity/Library_xsec_fw.mk +++ b/xmlsecurity/Library_xsec_fw.mk @@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,xsec_fw,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,xsec_fw)) - $(eval $(call gb_Library_add_exception_objects,xsec_fw,\ xmlsecurity/source/framework/buffernode \ xmlsecurity/source/framework/decryptorimpl \ diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index 27479a3fc63f..4eceb305587a 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -68,8 +68,6 @@ $(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,xsec_xmlsec)) - $(eval $(call gb_Library_use_externals,xsec_xmlsec,\ libxml2 \ )) From be70d912a3bb48018a588365eef031fdd5ce032e Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 16:53:11 +0200 Subject: [PATCH 016/863] vcl: remove gb_STDLIBS that crept in today Change-Id: Icb760daeca27289e424a72fb743d4e3bbd0e526d --- vcl/Executable_ui-previewer.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/vcl/Executable_ui-previewer.mk b/vcl/Executable_ui-previewer.mk index 06cf218802da..51d12d027827 100644 --- a/vcl/Executable_ui-previewer.mk +++ b/vcl/Executable_ui-previewer.mk @@ -48,7 +48,6 @@ $(eval $(call gb_Executable_use_libraries,ui-previewer,\ tl \ ucbhelper \ vcl \ - $(gb_STDLIBS) \ )) $(eval $(call gb_Executable_add_exception_objects,ui-previewer,\ From 23126cea9ed09389da9714cd6f0982822aa9805d Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Fri, 28 Sep 2012 10:15:33 -0500 Subject: [PATCH 017/863] hide clucene warnings under the carpet to avoid poluting make's output Change-Id: I1f6e4d187ae6200fe1d2444c07af9ca42a010bc1 --- clucene/Library_clucene.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/clucene/Library_clucene.mk b/clucene/Library_clucene.mk index 16bfbd5bf6aa..72a1dcccf104 100644 --- a/clucene/Library_clucene.mk +++ b/clucene/Library_clucene.mk @@ -50,6 +50,12 @@ $(eval $(call gb_Library_add_defs,clucene,\ $(LFS_CFLAGS) \ )) +# clucene is riddled with warnings... let's spare use +# the pointless spamming +$(eval $(call gb_Library_add_cxxflags,clucene,\ + -w \ +)) + ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_libs,clucene,\ -lm \ From 93a118d728736a9ffb6269b2816d4a1428472baa Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 17:57:08 +0200 Subject: [PATCH 018/863] fix WNT build: missed one oleaut32 Change-Id: Ic079200f6a3f1a1e7ac38f971e4da40a8dd39dd0 --- basic/Library_sb.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk index 457a52bf6bdf..73eb63163628 100644 --- a/basic/Library_sb.mk +++ b/basic/Library_sb.mk @@ -138,8 +138,7 @@ $(eval $(call gb_Library_add_exception_objects,sb,\ )) ifeq ($(GUI),WNT) -$(eval $(call gb_Library_use_libraries,sb,\ - uwinapi \ +$(eval $(call gb_Library_use_system_win32_libs,sb,\ oleaut32 \ )) endif From 9cce64934020576013ee03c3888a696a98d069de Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 28 Sep 2012 18:05:28 +0200 Subject: [PATCH 019/863] sw/qa: more getProperty() usage in extras Change-Id: Ic4782f3d315b6ef860153fdeb1890bba083f9630 --- sw/qa/extras/rtfimport/rtfimport.cxx | 56 +++++----------------------- 1 file changed, 10 insertions(+), 46 deletions(-) diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 68401dd214e8..96503a788933 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -199,19 +199,9 @@ void Test::testFdo45553() uno::Reference xRange(xRangeEnum->nextElement(), uno::UNO_QUERY); OUString aStr = xRange->getString(); if ( aStr == "space-before" ) - { - sal_Int32 nMargin = 0; - uno::Reference xPropertySet(xRange, uno::UNO_QUERY); - xPropertySet->getPropertyValue("ParaTopMargin") >>= nMargin; - CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(120)), nMargin); - } + CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(120)), getProperty(xRange, "ParaTopMargin")); else if ( aStr == "space-after" ) - { - sal_Int32 nMargin = 0; - uno::Reference xPropertySet(xRange, uno::UNO_QUERY); - xPropertySet->getPropertyValue("ParaBottomMargin") >>= nMargin; - CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(240)), nMargin); - } + CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(240)), getProperty(xRange, "ParaBottomMargin")); } } } @@ -249,12 +239,8 @@ void Test::testN695479() uno::Reference xPropertySet(xIndexAccess->getByIndex(0), uno::UNO_QUERY); // Negative ABSH should mean fixed size. - sal_Int16 nSizeType = 0; - xPropertySet->getPropertyValue("SizeType") >>= nSizeType; - CPPUNIT_ASSERT_EQUAL(text::SizeType::FIX, nSizeType); - sal_Int32 nHeight = 0; - xPropertySet->getPropertyValue("Height") >>= nHeight; - CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(300)), nHeight); + CPPUNIT_ASSERT_EQUAL(text::SizeType::FIX, getProperty(xPropertySet, "SizeType")); + CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(300)), getProperty(xPropertySet, "Height")); uno::Reference xDrawPageSupplier(mxComponent, uno::UNO_QUERY); uno::Reference xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY); @@ -272,24 +258,16 @@ void Test::testN695479() CPPUNIT_ASSERT_EQUAL(OUString("plain"), xText->getString()); if (i == 0) - { // Additonally, the frist frame should have double border at the bottom. - table::BorderLine2 aBorder; - xPropertySet->getPropertyValue("BottomBorder") >>= aBorder; - CPPUNIT_ASSERT_EQUAL(table::BorderLineStyle::DOUBLE, aBorder.LineStyle); - } + CPPUNIT_ASSERT_EQUAL(table::BorderLineStyle::DOUBLE, getProperty(xPropertySet, "BottomBorder").LineStyle); } else if (xServiceInfo->supportsService("com.sun.star.drawing.LineShape")) { // The older "drawing objects" syntax should be recognized. bDrawFound = true; xPropertySet.set(xServiceInfo, uno::UNO_QUERY); - sal_Int16 nHori = 0; - xPropertySet->getPropertyValue("HoriOrientRelation") >>= nHori; - CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_PRINT_AREA, nHori); - sal_Int16 nVert = 0; - xPropertySet->getPropertyValue("VertOrientRelation") >>= nVert; - CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME, nVert); + CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_PRINT_AREA, getProperty(xPropertySet, "HoriOrientRelation")); + CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME, getProperty(xPropertySet, "VertOrientRelation")); } } CPPUNIT_ASSERT(bFrameFound); @@ -311,13 +289,7 @@ void Test::testFdo45187() // There should be two shapes. CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xDraws->getCount()); // They should be anchored to different paragraphs. - uno::Reference xPropertySet(xDraws->getByIndex(0), uno::UNO_QUERY); - awt::Point aFirstPoint; - xPropertySet->getPropertyValue("AnchorPosition") >>= aFirstPoint; - xPropertySet.set(xDraws->getByIndex(1), uno::UNO_QUERY); - awt::Point aSecondPoint; - xPropertySet->getPropertyValue("AnchorPosition") >>= aSecondPoint; - CPPUNIT_ASSERT(aFirstPoint.Y != aSecondPoint.Y); + CPPUNIT_ASSERT(getProperty(xDraws->getByIndex(0), "AnchorPosition").Y != getProperty(xDraws->getByIndex(1), "AnchorPosition").Y); } void Test::testFdo46662() @@ -334,17 +306,9 @@ void Test::testFdo46662() const beans::PropertyValue& rProp = aProps[i]; if ( rProp.Name == "ParentNumbering" ) - { - sal_Int16 nValue; - rProp.Value >>= nValue; - CPPUNIT_ASSERT_EQUAL(sal_Int16(2), nValue); - } + CPPUNIT_ASSERT_EQUAL(sal_Int16(2), rProp.Value.get()); else if ( rProp.Name == "Suffix" ) - { - OUString sValue; - rProp.Value >>= sValue; - CPPUNIT_ASSERT_EQUAL(sal_Int32(0), sValue.getLength()); - } + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), rProp.Value.get().getLength()); } } From bee798cf4a91030184e01073c9aaaa5a66174600 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Fri, 28 Sep 2012 11:50:31 +0100 Subject: [PATCH 020/863] improve conditional formatting height calculations. Change-Id: If5080892b820d268ffef22111d0caee217586b56 --- sc/source/ui/condformat/condformatdlg.cxx | 37 ++++++++++------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index 3be5bc2ba239..ef69309bc64b 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -511,30 +511,25 @@ void ScCondFrmtEntry::HideColorScaleElements() void ScCondFrmtEntry::SetHeight() { - if(mbActive) + long nPad = LogicToPixel(Size(42,2), MapMode(MAP_APPFONT)).getHeight(); + + // Calculate maximum height we need from visible widgets + sal_uInt16 nChildren = GetChildCount(); + + long nMaxHeight = 0; + for(sal_uInt16 i = 0; i < nChildren; i++) { - Size aSize = GetSizePixel(); - switch (meType) - { - case CONDITION: - case FORMULA: - aSize.Height() = 120; - break; - case COLORSCALE: - aSize.Height() = 200; - break; - case DATABAR: - aSize.Height() = 200; - break; - default: - break; - } - SetSizePixel(aSize); + Window *pChild = GetChild(i); + if(!pChild || !pChild->IsVisible()) + continue; + Point aPos = pChild->GetPosPixel(); + Size aSize = pChild->GetSizePixel(); + nMaxHeight = std::max(aPos.Y() + aSize.Height(), nMaxHeight); } - else + Size aSize = GetSizePixel(); + if(nMaxHeight > 0) { - Size aSize = GetSizePixel(); - aSize.Height() = 40; + aSize.Height() = nMaxHeight + nPad; SetSizePixel(aSize); } } From 6b612128794b7dba984c45e8aa7673b5261eb5dd Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Fri, 28 Sep 2012 12:43:47 +0100 Subject: [PATCH 021/863] auto-expand the first conditional format in the list. Change-Id: I65280d39b560b4b7eed3e21a6e6c7b02c124f10a --- sc/source/ui/condformat/condformatdlg.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index ef69309bc64b..51fc4856dfeb 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -1005,6 +1005,8 @@ ScCondFormatList::ScCondFormatList(Window* pParent, const ResId& rResId, ScDocum { maEntries.push_back(new ScCondFrmtEntry( this, mpDoc, pFormat->GetEntry(nIndex), maPos )); } + if (nCount > 0) + maEntries.begin()->Select(); } RecalcAll(); From 5f32a4a2a18b1726c8bb7a5ce694648b0d8aba31 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Fri, 28 Sep 2012 13:38:52 +0100 Subject: [PATCH 022/863] double-click on a conditional format inspects / edits it. Change-Id: Icdfeae938627b63decd26571e86bc1e80e07f6c6 --- sc/source/ui/condformat/condformatmgr.cxx | 1 + sc/source/ui/inc/condformatmgr.hxx | 1 + 2 files changed, 2 insertions(+) diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx index ebaad9b8ba0a..b40a52319053 100644 --- a/sc/source/ui/condformat/condformatmgr.cxx +++ b/sc/source/ui/condformat/condformatmgr.cxx @@ -180,6 +180,7 @@ ScCondFormatManagerDlg::ScCondFormatManagerDlg(Window* pParent, ScDocument* pDoc maBtnRemove.SetClickHdl(LINK(this, ScCondFormatManagerDlg, RemoveBtnHdl)); maBtnEdit.SetClickHdl(LINK(this, ScCondFormatManagerDlg, EditBtnHdl)); + maCtrlManager.GetListControl().SetDoubleClickHdl(LINK(this, ScCondFormatManagerDlg, EditBtnHdl)); maBtnAdd.Hide(); } diff --git a/sc/source/ui/inc/condformatmgr.hxx b/sc/source/ui/inc/condformatmgr.hxx index 2f75dde4b9d6..3735e639b480 100644 --- a/sc/source/ui/inc/condformatmgr.hxx +++ b/sc/source/ui/inc/condformatmgr.hxx @@ -71,6 +71,7 @@ public: ScConditionalFormat* GetSelection(); void DeleteSelection(); void Update(); + ScCondFormatManagerWindow &GetListControl() { return maWdManager; } private: ScCondFormatManagerWindow maWdManager; From 985e7e4f5017b67f2734b8885d81e32e2011e470 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Fri, 28 Sep 2012 13:40:47 +0100 Subject: [PATCH 023/863] fdo#54940 - make editing relative refs more intuitive to me Change-Id: Ib7681de7b1aad9b6dda183e3c4fa1b1010270d3f --- sc/inc/rangelst.hxx | 1 + sc/source/core/tool/rangelst.cxx | 15 +++++++++++++++ sc/source/ui/condformat/condformatmgr.cxx | 5 +++-- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx index 74bb7be1d99a..8bf3bed47266 100644 --- a/sc/inc/rangelst.hxx +++ b/sc/inc/rangelst.hxx @@ -81,6 +81,7 @@ public: bool Intersects( const ScRange& ) const; bool In( const ScRange& ) const; size_t GetCellCount() const; + ScAddress GetTopLeftCorner() const; ScRange* Remove(size_t nPos); void RemoveAll(); diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx index c9c4c3e19097..b7347f62dcbd 100644 --- a/sc/source/core/tool/rangelst.cxx +++ b/sc/source/core/tool/rangelst.cxx @@ -1145,6 +1145,21 @@ void ScRangeList::push_back(ScRange* p) maRanges.push_back(p); } +ScAddress ScRangeList::GetTopLeftCorner() const +{ + if(empty()) + return ScAddress(); + + ScAddress aAddr = maRanges[0]->aStart; + for(size_t i = 1, n = size(); i < n; ++i) + { + if(maRanges[i]->aStart < aAddr) + aAddr = maRanges[i]->aStart; + } + + return aAddr; +} + // === ScRangePairList ======================================================== ScRangePairList::~ScRangePairList() diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx index b40a52319053..62b1fdc40be4 100644 --- a/sc/source/ui/condformat/condformatmgr.cxx +++ b/sc/source/ui/condformat/condformatmgr.cxx @@ -77,7 +77,7 @@ String ScCondFormatManagerWindow::createEntryString(const ScConditionalFormat& r String aStr; aRange.Format(aStr, SCA_VALID, mpDoc, mpDoc->GetAddressConvention()); aStr += '\t'; - aStr += ScCondFormatHelper::GetExpression(rFormat, mrPos); + aStr += ScCondFormatHelper::GetExpression(rFormat, aRange.GetTopLeftCorner()); return aStr; } @@ -209,7 +209,8 @@ IMPL_LINK_NOARG(ScCondFormatManagerDlg, EditBtnHdl) if(!pFormat) return 0; - ScCondFormatDlg* pDlg = new ScCondFormatDlg(this, mpDoc, pFormat, pFormat->GetRange(), maPos); + ScCondFormatDlg* pDlg = new ScCondFormatDlg(this, mpDoc, pFormat, pFormat->GetRange(), + pFormat->GetRange().GetTopLeftCorner()); if(pDlg->Execute() == RET_OK) { sal_Int32 nKey = pFormat->GetKey(); From 9edb6ba992ad2ef092996903d775df5313613bee Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Fri, 28 Sep 2012 18:09:43 +0200 Subject: [PATCH 024/863] add the remaining parts to previous commit Change-Id: Ia0b9ed9eed30991f38234bf56c49b26392491f30 --- sc/source/ui/view/cellsh1.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index a1cdc8c45766..e9211c109d8a 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -2061,11 +2061,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) const ScConditionalFormat* pCondFormat = pDoc->GetCondFormat(aPos.Col(), aPos.Row(), aPos.Tab()); if(pCondFormat) { - pDlg = pFact->CreateScCondFormatDlg( pTabViewShell->GetDialogParent(), pDoc, pCondFormat, pCondFormat->GetRange(), aPos, RID_SCDLG_CONDFORMAT ); + pDlg = pFact->CreateScCondFormatDlg( pTabViewShell->GetDialogParent(), pDoc, pCondFormat, pCondFormat->GetRange(), pCondFormat->GetRange().GetTopLeftCorner(), RID_SCDLG_CONDFORMAT ); } else { - pDlg = pFact->CreateScCondFormatDlg( pTabViewShell->GetDialogParent(), pDoc, NULL, aRangeList, aPos, RID_SCDLG_CONDFORMAT ); + pDlg = pFact->CreateScCondFormatDlg( pTabViewShell->GetDialogParent(), pDoc, NULL, aRangeList, aRangeList.GetTopLeftCorner(), RID_SCDLG_CONDFORMAT ); } if(pDlg->Execute() == RET_OK) From 9024006206451518712ada0d2007397c5d9e6c28 Mon Sep 17 00:00:00 2001 From: Takeshi Abe Date: Sat, 29 Sep 2012 01:13:00 +0900 Subject: [PATCH 025/863] The graphite page was moved Change-Id: I99bc4cd9e600dc0b2e9f74fba7615c6677cf90ca --- graphite/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphite/README b/graphite/README index 1cdf77576bd4..aac0d0df366c 100644 --- a/graphite/README +++ b/graphite/README @@ -1,4 +1,4 @@ Library for providing rendering capabilities for complex non-Roman writing systems. From: -[http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&cat_id=RenderingGraphite] +[http://graphite.sil.org/] From 050d74b558f896ab510a31bcffde2e0346fc5bd8 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 18:18:36 +0200 Subject: [PATCH 026/863] another oops in svx... Change-Id: I0f9de9ed23d160a8c3cf6a9db8eece95b4e8795a --- svx/Library_svx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index 6ccba764b892..26acd01aa954 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -221,7 +221,7 @@ $(eval $(call gb_Library_add_exception_objects,svx,\ )) else ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,svx,\ +$(eval $(call gb_Library_use_system_win32_libs,svx,\ advapi32 \ )) $(eval $(call gb_Library_add_exception_objects,svx,\ From d3d720b14c0bbfc849f8562d02b471e223e1b0bc Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 28 Sep 2012 18:26:44 +0200 Subject: [PATCH 027/863] rhbz#826526 Inform user about unsupported PDF encryption formats ...with a crudely reused "Version Incompatibility" message box (TODO: improve), rather than keeping asking for a password. Change-Id: I8239232704a4426af7a14a729840d184a502d2df --- sdext/source/pdfimport/inc/pdfihelper.hxx | 4 ++ sdext/source/pdfimport/inc/pdfparse.hxx | 3 + sdext/source/pdfimport/misc/pwdinteract.cxx | 41 +++++++++++- .../source/pdfimport/pdfparse/pdfentries.cxx | 15 +++-- sdext/source/pdfimport/wrapper/wrapper.cxx | 64 +++++++++++-------- 5 files changed, 95 insertions(+), 32 deletions(-) diff --git a/sdext/source/pdfimport/inc/pdfihelper.hxx b/sdext/source/pdfimport/inc/pdfihelper.hxx index d8f7d3c60e44..ad4774aadd46 100644 --- a/sdext/source/pdfimport/inc/pdfihelper.hxx +++ b/sdext/source/pdfimport/inc/pdfihelper.hxx @@ -196,6 +196,10 @@ namespace pdfi bool bFirstTry, const rtl::OUString& rDocName ); + + void reportUnsupportedEncryptionFormat( + com::sun::star::uno::Reference< + com::sun::star::task::XInteractionHandler > const & handler); } #define USTR(x) rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( x ) ) diff --git a/sdext/source/pdfimport/inc/pdfparse.hxx b/sdext/source/pdfimport/inc/pdfparse.hxx index df3e4259ab1a..5e87b89a164a 100644 --- a/sdext/source/pdfimport/inc/pdfparse.hxx +++ b/sdext/source/pdfimport/inc/pdfparse.hxx @@ -253,6 +253,9 @@ struct PDFFile : public PDFContainer virtual PDFEntry* clone() const; bool isEncrypted() const; + + bool usesSupportedEncryptionFormat() const; + // this method checks whether rPwd is compatible with // either user or owner password and sets up decrypt data in that case // returns true if decryption can be done diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx b/sdext/source/pdfimport/misc/pwdinteract.cxx index e5fb674047bc..81cdcb832208 100644 --- a/sdext/source/pdfimport/misc/pwdinteract.cxx +++ b/sdext/source/pdfimport/misc/pwdinteract.cxx @@ -26,9 +26,14 @@ * ************************************************************************/ +#include "sal/config.h" + +#include #include "pdfihelper.hxx" +#include +#include #include #include #include @@ -36,8 +41,9 @@ #include #include +#include #include - +#include using namespace com::sun::star; @@ -125,6 +131,32 @@ void SAL_CALL PDFPasswordRequest::select() throw (uno::RuntimeException) m_bSelected = true; } +class UnsupportedEncryptionFormatRequest: + public cppu::WeakImplHelper1< task::XInteractionRequest >, + private boost::noncopyable +{ +public: + UnsupportedEncryptionFormatRequest() {} + +private: + virtual ~UnsupportedEncryptionFormatRequest() {} + + virtual uno::Any SAL_CALL getRequest() throw (uno::RuntimeException) { + return uno::makeAny( + task::ErrorCodeRequest( + OUString(), uno::Reference< uno::XInterface >(), + ERRCODE_IO_WRONGVERSION)); + //TODO: should be something more informative than crudely reused + // ERRCODE_IO_WRONGVERSION + } + + virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > + SAL_CALL getContinuations() throw (uno::RuntimeException) { + return + uno::Sequence< uno::Reference< task::XInteractionContinuation > >(); + } +}; + } // namespace namespace pdfi @@ -159,6 +191,13 @@ bool getPassword( const uno::Reference< task::XInteractionHandler >& xHandler, return bSuccess; } +void reportUnsupportedEncryptionFormat( + uno::Reference< task::XInteractionHandler > const & handler) +{ + assert(handler.is()); + handler->handle(new UnsupportedEncryptionFormatRequest); +} + } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx index 259d700adc78..9a7855492685 100644 --- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx @@ -1224,17 +1224,22 @@ static bool check_user_password( const OString& rPwd, PDFFileImplData* pData ) return bValid; } +bool PDFFile::usesSupportedEncryptionFormat() const +{ + return m_pData->m_bStandardHandler && + m_pData->m_nAlgoVersion >= 1 && + m_pData->m_nAlgoVersion <= 2 && + m_pData->m_nStandardRevision >= 2 && + m_pData->m_nStandardRevision <= 3; +} + bool PDFFile::setupDecryptionData( const OString& rPwd ) const { if( !impl_getData()->m_bIsEncrypted ) return rPwd.isEmpty(); // check if we can handle this encryption at all - if( ! m_pData->m_bStandardHandler || - m_pData->m_nAlgoVersion < 1 || - m_pData->m_nAlgoVersion > 2 || - m_pData->m_nStandardRevision < 2 || - m_pData->m_nStandardRevision > 3 ) + if( ! usesSupportedEncryptionFormat() ) return false; if( ! m_pData->m_aCipher ) diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx index 61d4b29af31b..2d76fff27419 100644 --- a/sdext/source/pdfimport/wrapper/wrapper.cxx +++ b/sdext/source/pdfimport/wrapper/wrapper.cxx @@ -927,38 +927,50 @@ static bool checkEncryption( const rtl::OUString& o_rIsEncrypted = pPDFFile->isEncrypted(); if( o_rIsEncrypted ) { - bool bAuthenticated = false; - if( !io_rPwd.isEmpty() ) + if( pPDFFile->usesSupportedEncryptionFormat() ) { - rtl::OString aIsoPwd = rtl::OUStringToOString( io_rPwd, - RTL_TEXTENCODING_ISO_8859_1 ); - bAuthenticated = pPDFFile->setupDecryptionData( aIsoPwd.getStr() ); - } - if( bAuthenticated ) - bSuccess = true; - else - { - if( i_xIHdl.is() ) + bool bAuthenticated = false; + if( !io_rPwd.isEmpty() ) { - bool bEntered = false; - do - { - bEntered = getPassword( i_xIHdl, io_rPwd, ! bEntered, i_rDocName ); - rtl::OString aIsoPwd = rtl::OUStringToOString( io_rPwd, - RTL_TEXTENCODING_ISO_8859_1 ); - bAuthenticated = pPDFFile->setupDecryptionData( aIsoPwd.getStr() ); - } while( bEntered && ! bAuthenticated ); + rtl::OString aIsoPwd = rtl::OUStringToOString( io_rPwd, + RTL_TEXTENCODING_ISO_8859_1 ); + bAuthenticated = pPDFFile->setupDecryptionData( aIsoPwd.getStr() ); } + if( bAuthenticated ) + bSuccess = true; + else + { + if( i_xIHdl.is() ) + { + bool bEntered = false; + do + { + bEntered = getPassword( i_xIHdl, io_rPwd, ! bEntered, i_rDocName ); + rtl::OString aIsoPwd = rtl::OUStringToOString( io_rPwd, + RTL_TEXTENCODING_ISO_8859_1 ); + bAuthenticated = pPDFFile->setupDecryptionData( aIsoPwd.getStr() ); + } while( bEntered && ! bAuthenticated ); + } - OSL_TRACE( "password: %s", bAuthenticated ? "matches" : "does not match" ); - bSuccess = bAuthenticated; + OSL_TRACE( "password: %s", bAuthenticated ? "matches" : "does not match" ); + bSuccess = bAuthenticated; + } + if( bAuthenticated ) + { + rtl::OUStringBuffer aBuf( 128 ); + aBuf.appendAscii( "_OOO_pdfi_Credentials_" ); + aBuf.append( pPDFFile->getDecryptionKey() ); + io_rPwd = aBuf.makeStringAndClear(); + } } - if( bAuthenticated ) + else if( i_xIHdl.is() ) { - rtl::OUStringBuffer aBuf( 128 ); - aBuf.appendAscii( "_OOO_pdfi_Credentials_" ); - aBuf.append( pPDFFile->getDecryptionKey() ); - io_rPwd = aBuf.makeStringAndClear(); + reportUnsupportedEncryptionFormat( i_xIHdl ); + //TODO: this should either be handled further down the + // call stack, or else information that this has already + // been handled should be passed down the call stack, so + // that SfxBaseModel::load does not show an additional + // "General Error" message box } } else From 78a102e2060a1a8fc003d91fa3193b2bfa841d26 Mon Sep 17 00:00:00 2001 From: Noel Power Date: Fri, 28 Sep 2012 16:59:02 +0100 Subject: [PATCH 028/863] fix xlsx export missing alignment attributes with cellstyle fdo#55417 Change-Id: I510d0f399c58b5a9b192f3566e093c636cae2c0a --- sc/source/filter/excel/xestyle.cxx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index ebbe25621d94..a90483151e88 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -2025,7 +2025,6 @@ void XclExpXF::Init( const SfxItemSet& rItemSet, sal_Int16 nScript, GETITEMVALUE( rItemSet, SfxUInt32Item, ATTR_VALUE_FORMAT, sal_uLong ) : nForceScNumFmt; mnXclNumFmt = GetNumFmtBuffer().Insert( mnScNumFmt ); mbFmtUsed = ScfTools::CheckItem( rItemSet, ATTR_VALUE_FORMAT, IsStyleXF() ); - // alignment mbAlignUsed = maAlignment.FillFromItemSet( rItemSet, bForceLineBreak, GetBiff(), IsStyleXF() ); @@ -2112,10 +2111,12 @@ void XclExpXF::SaveXml( XclExpXmlStream& rStrm ) sax_fastparser::FSHelperPtr& rStyleSheet = rStrm.GetCurrentStream(); sal_Int32 nXfId = 0; + const XclExpXF* pStyleXF = NULL; if( IsCellXF() ) { sal_uInt16 nXFIndex = rStrm.GetRoot().GetXFBuffer().GetXFIndex( mnParentXFId ); nXfId = rStrm.GetRoot().GetXFBuffer().GetXmlStyleIndex( nXFIndex ); + pStyleXF = rStrm.GetRoot().GetXFBuffer().GetXFById( mnParentXFId ); } rStyleSheet->startElement( XML_xf, @@ -2135,8 +2136,13 @@ void XclExpXF::SaveXml( XclExpXmlStream& rStrm ) FSEND ); if( mbAlignUsed ) maAlignment.SaveXml( rStrm ); + else if ( pStyleXF ) + pStyleXF->GetAlignmentData().SaveXml( rStrm ); if( mbProtUsed ) maProtection.SaveXml( rStrm ); + else if ( pStyleXF ) + pStyleXF->GetProtectionData().SaveXml( rStrm ); + // OOXTODO: XML_extLst rStyleSheet->endElement( XML_xf ); } From deee6394c0db6c6ec844d2c9606b138d9bcb4672 Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Fri, 28 Sep 2012 12:21:53 -0400 Subject: [PATCH 029/863] Unwind some of the resource ID nastiness between sc and svx. Never reference SC resource ID's in svx. That's just asking for trouble. Change-Id: I893de42891fbc05a2824360c52f2b74ead60f60c --- sc/inc/sc.hrc | 9 ++- sc/sdi/scalc.sdi | 120 +++++++++++++++++++++++++++++++++++++++ svx/inc/svx/svxids.hrc | 16 +----- svx/sdi/svx.sdi | 125 ----------------------------------------- 4 files changed, 129 insertions(+), 141 deletions(-) diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index b5e6b8a15fd8..51cebf39f182 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -238,6 +238,7 @@ #define SC_HINT_SHOWRANGEFINDER (SC_MESSAGE_START + 34) #define SC_HINT_DOC_SAVED (SC_MESSAGE_START + 35) #define SC_HINT_FORCESETTAB (SC_MESSAGE_START + 36) +#define SID_ENTER_STRING (SC_MESSAGE_START + 37) // messages for opening dialogs: #define SID_OPENDLG_CONSOLIDATE (SC_MESSAGE_START + 50) @@ -369,13 +370,15 @@ #define SID_TEXT_TO_COLUMNS (DATA_MENU_START + 19) #define SID_CONSOLIDATE (DATA_MENU_START + 20) #define SID_AUTOFILTER_HIDE (DATA_MENU_START + 21) - #define SID_SBA_IMPORT (DATA_MENU_START + 22) - #define SID_SORT_DESCENDING (DATA_MENU_START + 23) #define SID_SORT_ASCENDING (DATA_MENU_START + 24) +#define SID_OUTLINE_HIDE (DATA_MENU_START + 25) +#define SID_OUTLINE_SHOW (DATA_MENU_START + 26) +#define SID_OUTLINE_MAKE (DATA_MENU_START + 27) +#define SID_OUTLINE_REMOVE (DATA_MENU_START + 28) -#define DATA_MENU_END (DATA_MENU_START + 25) +#define DATA_MENU_END (DATA_MENU_START + 29) #define TAB_POPUP_START (DATA_MENU_END) #define RID_POPUP_TAB (TAB_POPUP_START) diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi index 451ffca2ce8c..f9d70578e9bf 100644 --- a/sc/sdi/scalc.sdi +++ b/sc/sdi/scalc.sdi @@ -8172,3 +8172,123 @@ SfxVoidItem OpenFromCalc SID_OPEN_CALC ToolBoxConfig = FALSE, GroupId = GID_OPTIONS; ] + +SfxVoidItem ShowDetail SID_OUTLINE_SHOW +() +[ + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = GID_DATA; +] + +SfxVoidItem HideDetail SID_OUTLINE_HIDE +() +[ + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = GID_DATA; +] + +SfxVoidItem Group SID_OUTLINE_MAKE +(SfxStringItem RowOrCol SID_OUTLINE_MAKE) +[ + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = TRUE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, + GroupId = GID_DATA; +] + +SfxVoidItem Ungroup SID_OUTLINE_REMOVE +(SfxStringItem RowOrCol SID_OUTLINE_REMOVE) +[ + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = TRUE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, + GroupId = GID_DATA; +] + +SfxVoidItem EnterString SID_ENTER_STRING +(SfxStringItem StringName SID_ENTER_STRING) +[ + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + /* config: */ + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = GID_INTERN; +] diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc index a932a117bb99..8d6e56f1e8c2 100644 --- a/svx/inc/svx/svxids.hrc +++ b/svx/inc/svx/svxids.hrc @@ -231,19 +231,6 @@ #define ID_VAL_USELASTCOLUMNSTYLE (SID_SD_START+327) #define ID_VAL_USEBANDINGCOLUMNSTYLE (SID_SD_START+328) -// -------------------------------------------------------------------------- -// Calc-Id's -// -------------------------------------------------------------------------- - -#define SID_OUTLINE_HIDE (SID_SC_START + 329) -#define SID_OUTLINE_SHOW (SID_SC_START + 330) -#define SID_OUTLINE_MAKE (SID_SC_START + 331) -#define SID_OUTLINE_REMOVE (SID_SC_START + 332) -#define SID_FRAME_UP (SID_SC_START + 407) -#define SID_FRAME_DOWN (SID_SC_START + 408) -#define SID_ENTER_STRING (SID_SC_START + 476) -#define SID_ATTR_SPECIALCHAR (SID_SC_START + 581) - // -------------------------------------------------------------------------- // Writer-Id's // -------------------------------------------------------------------------- @@ -937,6 +924,9 @@ #define SID_ATTR_PAGE_SHARED_FIRST (SID_SVX_START+1114) #define SID_SAVE_GRAPHIC (SID_SVX_START+1115) #define SID_COMPRESS_GRAPHIC (SID_SVX_START+1116) +#define SID_FRAME_UP (SID_SVX_START+1117) +#define SID_FRAME_DOWN (SID_SVX_START+1118) +#define SID_ATTR_SPECIALCHAR (SID_SVX_START+1119) // IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id #define SID_SVX_FIRSTFREE (SID_COMPRESS_GRAPHIC + 1) diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index eea97a40a5bd..97c15711a3a6 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -5574,31 +5574,6 @@ SfxBoolItem GridVisible SID_GRID_VISIBLE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- -SfxVoidItem Group SID_OUTLINE_MAKE -(SfxStringItem RowOrCol SID_OUTLINE_MAKE) -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = TRUE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, - GroupId = GID_DATA; -] - //-------------------------------------------------------------------------- SfxBoolItem GroupBox SID_FM_GROUPBOX @@ -5734,31 +5709,6 @@ SfxBoolItem HFixedLine SID_INSERT_HFIXEDLINE GroupId = GID_CONTROLS; ] -//-------------------------------------------------------------------------- -SfxVoidItem HideDetail SID_OUTLINE_HIDE -() -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_DATA; -] - //-------------------------------------------------------------------------- SfxBoolItem HScrollbar SID_INSERT_HSCROLLBAR @@ -6072,31 +6022,6 @@ SfxVoidItem InPlaceObjectResize SID_OBJECTRESIZE GroupId = GID_DOCUMENT; ] -//-------------------------------------------------------------------------- -SfxVoidItem EnterString SID_ENTER_STRING -(SfxStringItem StringName SID_ENTER_STRING) -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_INTERN; -] - //-------------------------------------------------------------------------- SfxVoidItem InsertAnnotation SID_INSERT_POSTIT (SvxPostItAuthorItem Author SID_ATTR_POSTIT_AUTHOR,SvxPostItDateItem Date SID_ATTR_POSTIT_DATE,SvxPostItTextItem Text SID_ATTR_POSTIT_TEXT) @@ -10137,31 +10062,6 @@ SvxShadowedItem Shadowed SID_ATTR_CHAR_SHADOWED GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- -SfxVoidItem ShowDetail SID_OUTLINE_SHOW -() -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_DATA; -] - //-------------------------------------------------------------------------- SfxBoolItem ShowFmExplorer SID_FM_SHOW_FMEXPLORER @@ -11507,31 +11407,6 @@ SvxTextLineItem Overline SID_ATTR_CHAR_OVERLINE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- -SfxVoidItem Ungroup SID_OUTLINE_REMOVE -(SfxStringItem RowOrCol SID_OUTLINE_REMOVE) -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = TRUE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, - GroupId = GID_DATA; -] - //-------------------------------------------------------------------------- SfxBoolItem URLButton SID_INSERT_URLBUTTON From a705c6cac4182d62c3495be7367d4ae34fd47fac Mon Sep 17 00:00:00 2001 From: Noel Power Date: Fri, 28 Sep 2012 19:02:44 +0100 Subject: [PATCH 030/863] halt corrupted styles with multi-saved xlsx document fdo#55418 Change-Id: I2d53c88ab121edeec2bf53f7fd177a0edcc05a25 --- sc/source/filter/excel/xestyle.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index a90483151e88..339dd10df17b 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -2235,7 +2235,10 @@ void XclExpStyle::SaveXml( XclExpXmlStream& rStrm ) } else sName = XclXmlUtils::ToOString( maName ); - sal_Int32 nXFId = rStrm.GetRoot().GetXFBuffer().GetXmlStyleIndex( maXFId.mnXFId ); + // get the index in sortedlist associated with the mnXId + sal_Int32 nXFId = rStrm.GetRoot().GetXFBuffer().GetXFIndex( maXFId.mnXFId ); + // get the style index associated with index into sortedlist + nXFId = rStrm.GetRoot().GetXFBuffer().GetXmlStyleIndex( nXFId ); rStrm.GetCurrentStream()->singleElement( XML_cellStyle, XML_name, sName.getStr(), XML_xfId, OString::valueOf( nXFId ).getStr(), From c5d4e2cf96e5c28634ed6968f87b476e8a2a5850 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Fri, 28 Sep 2012 20:14:17 +0200 Subject: [PATCH 031/863] fetime of mpCondFormat is more complex, fdo#55379 Change-Id: I2b34f9fefdfdfa245ab73f8691090cbde8bcd34e --- sc/source/filter/xml/xmlstyli.cxx | 11 +++++------ sc/source/filter/xml/xmlstyli.hxx | 1 + 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index a05276fd5373..2b6c58b2615e 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -390,12 +390,15 @@ XMLTableStyleContext::XMLTableStyleContext( ScXMLImport& rImport, nNumberFormat(-1), nLastSheet(-1), bParentSet(false), - mpCondFormat(NULL) + mpCondFormat(NULL), + mbDeleteCondFormat(true) { } XMLTableStyleContext::~XMLTableStyleContext() { + if(mbDeleteCondFormat) + delete mpCondFormat; } SvXMLImportContext *XMLTableStyleContext::CreateChildContext( @@ -442,11 +445,6 @@ void XMLTableStyleContext::ApplyCondFormat( uno::SequenceEqualEntries(*mpCondFormat)) { - // we don't need the new cond format entry now - // the found one is the same and we just need to add the range to it - delete mpCondFormat; - mpCondFormat = NULL; - ScRangeList& rRangeList = itr->GetRangeList(); sal_uInt32 nCondId = itr->GetKey(); size_t n = rRange.size(); @@ -468,6 +466,7 @@ void XMLTableStyleContext::ApplyCondFormat( uno::SequenceAddCondFormat(mpCondFormat, nTab ); mpCondFormat->SetKey(nIndex); mpCondFormat->AddRange(rRange); diff --git a/sc/source/filter/xml/xmlstyli.hxx b/sc/source/filter/xml/xmlstyli.hxx index def350985b0f..28ea475e9c37 100644 --- a/sc/source/filter/xml/xmlstyli.hxx +++ b/sc/source/filter/xml/xmlstyli.hxx @@ -101,6 +101,7 @@ class XMLTableStyleContext : public XMLPropStyleContext SCTAB nLastSheet; bool bParentSet; ScConditionalFormat* mpCondFormat; + bool mbDeleteCondFormat; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } From 8e94ac21b72145d59992eaee4fbbd065e597b3d6 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Fri, 28 Sep 2012 20:16:18 +0200 Subject: [PATCH 032/863] use a as prefix for local variables Change-Id: Id4652eb986c02044e27cd4e91863d5ed97465860 --- sc/source/filter/xml/xmlstyli.cxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index 2b6c58b2615e..687c841b27b4 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -428,13 +428,13 @@ void XMLTableStyleContext::ApplyCondFormat( uno::SequenceGetRangeList(); sal_uInt32 nCondId = itr->GetKey(); - size_t n = rRange.size(); + size_t n = aRangeList.size(); for(size_t i = 0; i < n; ++i) { - const ScRange* pRange = rRange[i]; + const ScRange* pRange = aRangeList[i]; rRangeList.Join(*pRange); } ScPatternAttr aPattern( pDoc->GetPool() ); aPattern.GetItemSet().Put( SfxUInt32Item( ATTR_CONDITIONAL, nCondId ) ); ScMarkData aMarkData; - aMarkData.MarkFromRangeList(rRange, true); + aMarkData.MarkFromRangeList(aRangeList, true); pDoc->ApplySelectionPattern( aPattern , aMarkData); break; @@ -469,12 +469,12 @@ void XMLTableStyleContext::ApplyCondFormat( uno::SequenceAddCondFormat(mpCondFormat, nTab ); mpCondFormat->SetKey(nIndex); - mpCondFormat->AddRange(rRange); + mpCondFormat->AddRange(aRangeList); ScPatternAttr aPattern( pDoc->GetPool() ); aPattern.GetItemSet().Put( SfxUInt32Item( ATTR_CONDITIONAL, nIndex ) ); ScMarkData aMarkData; - aMarkData.MarkFromRangeList(rRange, true); + aMarkData.MarkFromRangeList(aRangeList, true); pDoc->ApplySelectionPattern( aPattern , aMarkData); } From d3a24e566eccd7b20b893ede1b17e64e38b29be9 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Fri, 28 Sep 2012 21:01:14 +0200 Subject: [PATCH 033/863] vba procedures and macro names will result in crash, fdo#55174 Change-Id: I23073ecc56482670d185b39452a7d8b9d6eb38c8 --- sc/source/filter/oox/defnamesbuffer.cxx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx index 6a3a3aaefa1c..6a62f019917a 100644 --- a/sc/source/filter/oox/defnamesbuffer.cxx +++ b/sc/source/filter/oox/defnamesbuffer.cxx @@ -426,6 +426,10 @@ DefinedName::getTokens() void DefinedName::convertFormula() { + // macro function or vba procedure + if(!mpScRangeData) + return; + // convert and set formula of the defined name if ( getFilterType() == FILTER_OOXML ) { From bce530e89cd32d40f7a54f80906c321c5b1b944b Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 21:37:26 +0200 Subject: [PATCH 034/863] vcl: fix gtk3 build breakage due to forgotten use_libraries Change-Id: I53faf1a5c88b6ffd954fd98814cdf27b77f1c3db --- vcl/Library_vclplug_gtk3.mk | 15 ++++++--------- vcl/Library_vclplug_tde.mk | 13 +++++-------- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk index 2c34e1d529e7..a04472353db2 100644 --- a/vcl/Library_vclplug_gtk3.mk +++ b/vcl/Library_vclplug_gtk3.mk @@ -50,8 +50,12 @@ $(eval $(call gb_Library_add_defs,vclplug_gtk3,\ $(eval $(call gb_Library_use_sdk_api,vclplug_gtk3)) $(eval $(call gb_Library_add_libs,vclplug_gtk3,\ - $$(GTK3_LIBS) \ - $$(GTHREAD_LIBS) \ + $(GTK3_LIBS) \ + $(GTHREAD_LIBS) \ + -lX11 \ + -lXext \ + -lSM \ + -lICE \ )) $(eval $(call gb_Library_use_libraries,vclplug_gtk3,\ @@ -75,13 +79,6 @@ $(eval $(call gb_Library_use_externals,vclplug_gtk3,\ dbus \ )) -$(eval $(call gb_Library_use_libraries,vclplug_gtk3,\ - -lX11 \ - -lXext \ - -lSM \ - -lICE \ -)) - $(eval $(call gb_Library_add_exception_objects,vclplug_gtk3,\ vcl/unx/gtk3/a11y/gtk3atkaction \ vcl/unx/gtk3/a11y/gtk3atkbridge \ diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk index 9431131171ce..600f00a9aa35 100644 --- a/vcl/Library_vclplug_tde.mk +++ b/vcl/Library_vclplug_tde.mk @@ -45,7 +45,11 @@ $(eval $(call gb_Library_add_defs,vclplug_tde,\ $(eval $(call gb_Library_use_sdk_api,vclplug_tde)) $(eval $(call gb_Library_add_libs,vclplug_tde,\ - $$(TDE_LIBS) \ + $(TDE_LIBS) \ + -lX11 \ + -lXext \ + -lSM \ + -lICE \ )) $(eval $(call gb_Library_use_libraries,vclplug_tde,\ @@ -70,13 +74,6 @@ $(eval $(call gb_Library_use_externals,vclplug_tde,\ icuuc \ )) -$(eval $(call gb_Library_add_libs,vclplug_tde,\ - -lX11 \ - -lXext \ - -lSM \ - -lICE \ -)) - $(eval $(call gb_Library_add_exception_objects,vclplug_tde,\ vcl/unx/kde/kdedata \ vcl/unx/kde/salnativewidgets-kde \ From 398ce44c54b26b31eb826c150926fd49e59b4f52 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 21:47:29 +0200 Subject: [PATCH 035/863] RepositoryExternal: internal libpng requires zlib as well Change-Id: Ib23b2a6bd9301a03321ddb5c8a488b579fa8d1a2 --- RepositoryExternal.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 1196385a9a93..78e82b697c1f 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1371,6 +1371,7 @@ define gb_LinkTarget__use_png $(call gb_LinkTarget_use_static_libraries,$(1),\ png \ ) +$(call gb_LinkTarget__use_zlib,$(1)) endef From 0919d45d514642ed6cc62fe20227a99295a09d40 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 28 Sep 2012 13:07:19 +0300 Subject: [PATCH 036/863] Workaround for boost problem with the 10.7 SDK Change-Id: I970326f084ef20fc9887e62adf95547c2468aebd --- solenv/gbuild/platform/macosx.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index f1b6666cc482..1aad554722ba 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -75,6 +75,14 @@ gb_COMPILERDEFS += \ endif +# Without this I get struct/class clashes for "complex" when compiling +# some source files in vcl, at least with the 10.7 SDK. +ifneq ($(filter 1070,$(MACOSX_SDK_VERSION)),) +gb_COMPILERDEFS += \ + -DBOOST_DETAIL_NO_CONTAINER_FWD \ + +endif + ifeq ($(HAVE_GCC_NO_LONG_DOUBLE),TRUE) gb_CXXFLAGS += -Wno-long-double endif From 4671e25d99bb2ad0f4f8f68c25fcc1bfce9e79b8 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 28 Sep 2012 13:21:59 +0300 Subject: [PATCH 037/863] No need for BITNESS_OVERRIDE in makefilery as CPU etc work fine Change-Id: I59f4d5ad275af62c997723908754112c062a31be --- avmedia/Module_avmedia.mk | 2 +- config_host.mk.in | 1 - configure.in | 2 -- postprocess/packcomponents/makefile.mk | 2 +- scp2/InstallModule_ooo.mk | 3 --- scp2/source/ooo/file_library_ooo.scp | 2 +- solenv/inc/wntmsc.mk | 12 ++++++------ vcl/Library_vcl.mk | 2 +- 8 files changed, 10 insertions(+), 16 deletions(-) diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk index 115ee13a5b06..f712344da4c7 100644 --- a/avmedia/Module_avmedia.mk +++ b/avmedia/Module_avmedia.mk @@ -47,7 +47,7 @@ $(eval $(call gb_Module_add_targets,avmedia,\ endif ifeq ($(GUIBASE),aqua) -ifneq ($(BITNESS_OVERRIDE),64) +ifneq ($(CPUNAME),X86_64) $(eval $(call gb_Module_add_targets,avmedia,\ Library_avmediaQuickTime \ )) diff --git a/config_host.mk.in b/config_host.mk.in index 231009810aa1..7a511eaaeb3b 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -56,7 +56,6 @@ export CDR_LIBS=@CDR_LIBS@ export CDR_TARBALL=@CDR_TARBALL@ export CHECK_PARALLELISM=@CHECK_PARALLELISM@ export CLASSPATH=@CLASSPATH@ -export BITNESS_OVERRIDE=@BITNESS_OVERRIDE@ export CLUCENE_CFLAGS=@CLUCENE_CFLAGS@ export CLUCENE_LIBS=@CLUCENE_LIBS@ export CLUCENE_TARBALL=@CLUCENE_TARBALL@ diff --git a/configure.in b/configure.in index be6397872024..aca0eafc5f6c 100644 --- a/configure.in +++ b/configure.in @@ -2865,8 +2865,6 @@ AC_SUBST(ENABLE_DIRECTX) AC_SUBST(DISABLE_ACTIVEX) AC_SUBST(DISABLE_ATL) -AC_SUBST(BITNESS_OVERRIDE) - if test "$cross_compiling" = "yes"; then CROSS_COMPILING=YES SCPDEFS="$SCPDEFS -DCROSS_COMPILING" diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 998a13f009f5..8b2aea2781c2 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -328,7 +328,7 @@ my_components += \ .END .IF "$(GUIBASE)" == "aqua" -.IF "$(BITNESS_OVERRIDE)" != "64" +.IF "$(CPUNAME)" != "X86_64" my_components += \ component/avmedia/source/quicktime/avmediaQuickTime .ENDIF diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 459cbf644564..5ca6b6c97408 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -166,9 +166,6 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\ $(if $(filter-out YES,$(WITH_MYSPELL_DICTS)),\ -DWITHOUT_MYSPELL_DICTS \ ) \ - $(if $(BITNESS_OVERRIDE),\ - -DBITNESS_OVERRIDE=$(BITNESS_OVERRIDE) \ - ) \ )) ifeq ($(DISABLE_PYTHON),TRUE) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 828c4765f13d..3cc740ba3daa 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -528,7 +528,7 @@ File gid_File_Lib_MacOSXSpell Dir = SCP2_OOO_BIN_DIR; End -#if !defined(BITNESS_OVERRIDE) || BITNESS_OVERRIDE==32 +#ifndef X86_64 File gid_File_Lib_avmediaQuickTime LIB_FILE_BODY; Styles = (PACKED); diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk index 4e8b7bea18c3..ef6e58978020 100644 --- a/solenv/inc/wntmsc.mk +++ b/solenv/inc/wntmsc.mk @@ -29,7 +29,7 @@ JAVAFLAGSDEBUG=-g -.IF "$(BITNESS_OVERRIDE)" == "" +.IF "$(CPU)" == "I" ASM=ml AFLAGS=/c /Cp /coff /safeseh .ELSE @@ -89,7 +89,7 @@ CFLAGS+=-GS CFLAGS+=-c -nologo -Gs $(NOLOGO) -.IF "$(BITNESS_OVERRIDE)" == "" +.IF "$(CPU)" == "I" CDEFS+= -D_X86_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS -D_SCL_SECURE_NO_WARNINGS .ELSE CDEFS+= -D_AMD64_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS -D_SCL_SECURE_NO_WARNINGS @@ -119,7 +119,7 @@ CFLAGS+= -Z7 CFLAGSEXCEPTIONS=-EHa CFLAGS_NO_EXCEPTIONS= -.IF "$(BITNESS_OVERRIDE)" == "" +.IF "$(CPU)" == "I" # enable boost support for __cdecl (SAL_CALL) C++-UNO interface methods CDEFS+=-DBOOST_MEM_FN_ENABLE_CDECL .ENDIF @@ -204,7 +204,7 @@ _VC_MANIFEST_BASENAME=__VC80 _VC_MANIFEST_BASENAME=__VC90 .ENDIF -.IF "$(BITNESS_OVERRIDE)" == "" +.IF "$(CPU)" == "I" LINK=link /MACHINE:IX86 /IGNORE:4102 /IGNORE:4197 .ELSE LINK=link /MACHINE:X64 @@ -217,7 +217,7 @@ LINKFLAGS=/MAP /OPT:NOREF .ENDIF # excetion handling protection -.IF "$(BITNESS_OVERRIDE)" == "" +.IF "$(CPU)" == "I" LINKFLAGS+=-safeseh .ENDIF @@ -301,7 +301,7 @@ LIBMGR=lib $(NOLOGO) IMPLIB=lib LIBFLAGS= -.IF "$(BITNESS_OVERRIDE)" == "" +.IF "$(CPU)" == "I" IMPLIBFLAGS=-machine:IX86 .ELSE IMPLIBFLAGS=-machine:X64 diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 6eebaeb1e015..6aaa675cba8d 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -437,7 +437,7 @@ $(eval $(call gb_Library_use_libraries,vcl,\ AppleRemote \ )) $(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\ - $(if $(filter 64,$(BITNESS_OVERRIDE)),,QuickTime) \ + $(if $(filter X86_64,$(CPUNAME)),,QuickTime) \ Cocoa \ Carbon \ CoreFoundation \ From d756f2a304ed0921e1791c8eb91ce7fb7a085529 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 29 Sep 2012 08:37:16 +0300 Subject: [PATCH 038/863] Make --enable-64-bit automatically turn on --enable-coretext Change-Id: I4d2749d8da44fd8b469315c2be0093c19fc20be1 --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index aca0eafc5f6c..7ba3b7a9060a 100644 --- a/configure.in +++ b/configure.in @@ -10645,7 +10645,7 @@ dnl =================================================================== ENABLE_CORETEXT=NO if test "$_os" = "Darwin"; then AC_MSG_CHECKING([whether to use CoreText framework]) - if test "$enable_coretext" = "yes"; then + if test "$enable_coretext" = yes -o "$BITNESS_OVERRIDE" = 64; then AC_MSG_RESULT([yes]) ENABLE_CORETEXT=YES else From 311babc08009ff4014f9b6b14d82ca41f5e6f942 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sat, 29 Sep 2012 02:02:03 -0500 Subject: [PATCH 039/863] gbuildify tomcat Change-Id: Ibd7b71292450db8e3e98f9ede5a836182eb38770 --- Makefile.top | 2 +- config_host.mk.in | 1 + configure.in | 3 +++ ooo.lst.in | 2 +- tomcat/ExternalProject_tomcat.mk | 36 ++++++++++++++++++++++++++++++++ tomcat/Makefile | 7 +++++++ tomcat/Module_tomcat.mk | 22 +++++++++++++++++++ tomcat/Package_tomcat.mk | 16 ++++++++++++++ tomcat/UnpackedTarball_tomcat.mk | 17 +++++++++++++++ tomcat/build.xml | 31 +++++++++++++++++++++++++++ tomcat/prj/build.lst | 2 +- tomcat/prj/d.lst | 2 +- tomcat/prj/dmake | 0 tomcat/tomcat.patch | 35 ------------------------------- 14 files changed, 137 insertions(+), 39 deletions(-) create mode 100644 tomcat/ExternalProject_tomcat.mk create mode 100644 tomcat/Makefile create mode 100644 tomcat/Module_tomcat.mk create mode 100644 tomcat/Package_tomcat.mk create mode 100644 tomcat/UnpackedTarball_tomcat.mk create mode 100644 tomcat/build.xml delete mode 100644 tomcat/prj/dmake delete mode 100644 tomcat/tomcat.patch diff --git a/Makefile.top b/Makefile.top index 642ec0036c50..d32a0baa204b 100644 --- a/Makefile.top +++ b/Makefile.top @@ -157,6 +157,7 @@ swext\ tail_build\ test\ testtools\ +tomcat\ toolkit\ tools\ touch\ @@ -249,7 +250,6 @@ soltools\ stax\ stlport\ sysui\ -tomcat\ xpdf\ zlib\ diff --git a/config_host.mk.in b/config_host.mk.in index 7a511eaaeb3b..9814f16d775c 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -592,6 +592,7 @@ export TELEPATHY_LIBS=@TELEPATHY_LIBS@ export THES_SYSTEM_DIR=@THES_SYSTEM_DIR@ @x_Cygwin@ export TMP=@TMP_DIRECTORY@ export TMPDIR=@TEMP_DIRECTORY@ +export TOMCAT_TARBALL=@TOMCAT_TARBALL@ export TYPO_EXTENSION_PACK=@TYPO_EXTENSION_PACK@ export SYSTEM_UCPP=@SYSTEM_UCPP@ export UNIXWRAPPERNAME=@UNIXWRAPPERNAME@ diff --git a/configure.in b/configure.in index 7ba3b7a9060a..ac9266cb8d3f 100644 --- a/configure.in +++ b/configure.in @@ -9702,6 +9702,7 @@ if test "$ENABLE_MEDIAWIKI" = "YES"; then AC_MSG_RESULT([internal]) SYSTEM_SERVLETAPI=NO BUILD_TYPE="$BUILD_TYPE TOMCAT" + TOMCAT_TARBALL="2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz" fi fi AC_SUBST(SYSTEM_SERVLETAPI) @@ -9972,6 +9973,7 @@ if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then APACHE_COMMONS_HTTPCLIENT_TARBALL=2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz APACHE_COMMONS_LANG_TARBALL=2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz APACHE_COMMONS_LOGGING_TARBALL=3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz + TOMCAT_TARBALL="2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz" BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT" fi fi @@ -9984,6 +9986,7 @@ AC_SUBST(COMMONS_CODEC_JAR) AC_SUBST(COMMONS_LANG_JAR) AC_SUBST(COMMONS_HTTPCLIENT_JAR) AC_SUBST(COMMONS_LOGGING_JAR) +AC_SUBST(TOMCAT_TARBALL) # scripting provider for BeanShell extension? AC_MSG_CHECKING([whether to build extension for support of scripts in BeanShell]) diff --git a/ooo.lst.in b/ooo.lst.in index 0c4e9a1f7673..6c5c763793c1 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -10,7 +10,7 @@ c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz 284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz -2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz +@TOMCAT_TARBALL@ @APACHE_COMMONS_HTTPCLIENT_TARBALL@ @APACHE_COMMONS_LANG_TARBALL@ @FONT_LINLIBERTINEG_TARBALL@ diff --git a/tomcat/ExternalProject_tomcat.mk b/tomcat/ExternalProject_tomcat.mk new file mode 100644 index 000000000000..48c063f7c8f8 --- /dev/null +++ b/tomcat/ExternalProject_tomcat.mk @@ -0,0 +1,36 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# for RSCREVISION +include $(SOLARENV)/inc/minor.mk + +$(eval $(call gb_ExternalProject_ExternalProject,tomcat)) + +$(eval $(call gb_ExternalProject_use_unpacked,tomcat,tomcat)) + +$(eval $(call gb_ExternalProject_register_targets,tomcat,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,tomcat,build) : + cd "$(call gb_UnpackedTarball_get_dir,tomcat)/jakarta-servletapi-5" && \ + "$(ANT)" \ + -q \ + -f build.xml \ + -Dbuild.label="build-$(RSCREVISION)" \ + $(if $(filter yes,$(JAVACISGCJ))\ + ,-Dbuild.compiler=gcj \ + ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + ) \ + $(if $(debug),-Dbuild.debug="on") \ + && \ + touch $@ + +# vim: set noet sw=4 ts=4: diff --git a/tomcat/Makefile b/tomcat/Makefile new file mode 100644 index 000000000000..ccb1c85a04da --- /dev/null +++ b/tomcat/Makefile @@ -0,0 +1,7 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +include $(module_directory)/../solenv/gbuild/partial_build.mk + +# vim: set noet sw=4 ts=4: diff --git a/tomcat/Module_tomcat.mk b/tomcat/Module_tomcat.mk new file mode 100644 index 000000000000..ffe909089a3a --- /dev/null +++ b/tomcat/Module_tomcat.mk @@ -0,0 +1,22 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Module_Module,tomcat)) + +ifneq ($(SOLAR_JAVA),) +ifneq ($(filter TOMCAT,$(BUILD_TYPE)),) +$(eval $(call gb_Module_add_targets,tomcat,\ + ExternalProject_tomcat \ + Package_tomcat \ + UnpackedTarball_tomcat \ +)) +endif +endif + +# vim: set noet sw=4 ts=4: diff --git a/tomcat/Package_tomcat.mk b/tomcat/Package_tomcat.mk new file mode 100644 index 000000000000..8cd451254f69 --- /dev/null +++ b/tomcat/Package_tomcat.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Package_Package,tomcat_inc,$(call gb_UnpackedTarball_get_dir,tomcat))) + +$(eval $(call gb_Package_use_external_project,tomcat_inc,tomcat)) + +$(eval $(call gb_Package_add_file,tomcat_inc,bin/servlet-api.jar,jakarta-servletapi-5/jsr154/dist/lib/servlet-api.jar)) + +# vim: set noet sw=4 ts=4: diff --git a/tomcat/UnpackedTarball_tomcat.mk b/tomcat/UnpackedTarball_tomcat.mk new file mode 100644 index 000000000000..6e6a71631491 --- /dev/null +++ b/tomcat/UnpackedTarball_tomcat.mk @@ -0,0 +1,17 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,tomcat)) + +$(eval $(call gb_UnpackedTarball_set_tarball,tomcat,$(TOMCAT_TARBALL))) + + +$(eval $(call gb_UnpackedTarball_add_file,tomcat,jakarta-servletapi-5/build.xml,tomcat/build.xml)) + +# vim: set noet sw=4 ts=4: diff --git a/tomcat/build.xml b/tomcat/build.xml new file mode 100644 index 000000000000..2d54d3df39da --- /dev/null +++ b/tomcat/build.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + diff --git a/tomcat/prj/build.lst b/tomcat/prj/build.lst index 184f6dd19b3e..eca653ba9490 100644 --- a/tomcat/prj/build.lst +++ b/tomcat/prj/build.lst @@ -1,2 +1,2 @@ to tomcat : solenv NULL -to tomcat nmake - all to_mkout NULL +to tomcat/prj nmake - all to_prj NULL diff --git a/tomcat/prj/d.lst b/tomcat/prj/d.lst index 41530ac07cf4..8b137891791f 100644 --- a/tomcat/prj/d.lst +++ b/tomcat/prj/d.lst @@ -1 +1 @@ -..\%__SRC%\misc\build\jakarta-tomcat-5.0.30-src\jakarta-servletapi-5\jsr154\dist\lib\servlet-api.jar %_DEST%\bin\servlet-api.jar + diff --git a/tomcat/prj/dmake b/tomcat/prj/dmake deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tomcat/tomcat.patch b/tomcat/tomcat.patch deleted file mode 100644 index 1815660b1b5b..000000000000 --- a/tomcat/tomcat.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- misc/jakarta-tomcat-5.0.30-src/jakarta-servletapi-5/build.xml Thu Jun 19 16:03:59 2008 -+++ misc/build/jakarta-tomcat-5.0.30-src/jakarta-servletapi-5/build.xml Thu Jun 19 15:56:18 2008 -@@ -1,1 +1,31 @@ --dummy -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ From 47894cdf75ffe29a3a070a884130565424af35f0 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sat, 29 Sep 2012 02:21:20 -0500 Subject: [PATCH 040/863] beautify Module_tailbuild a bit Change-Id: If54d57c962c6cb97c539e46f2ea747668706770e --- Module_tail_build.mk | 258 +++++++++++++++++----------------------- solenv/gbuild/Helper.mk | 4 + 2 files changed, 113 insertions(+), 149 deletions(-) diff --git a/Module_tail_build.mk b/Module_tail_build.mk index 3155b7b419e0..cf86f3c39c9f 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -25,74 +25,58 @@ $(eval $(call gb_Module_Module,tail_end)) $(eval $(call gb_Module_add_moduledirs,tail_end,\ - accessibility \ - $(if $(filter AFMS,$(BUILD_TYPE)),\ - afms \ - ) \ - animations \ - apple_remote \ + accessibility \ + $(call gb_Helper_optional,AFMS,afms) \ + animations \ + apple_remote \ autodoc \ - avmedia \ - basctl \ - basebmp \ + avmedia \ + basctl \ + basebmp \ basegfx \ - basic \ - bean \ + basic \ + bean \ binaryurp \ - $(if $(filter BLUEZ,$(BUILD_TYPE)),\ - bluez_bluetooth \ - ) \ + $(call gb_Helper_optional,BLUEZ,bluez_bluetooth) \ bridges \ - canvas \ - chart2 \ + canvas \ + chart2 \ cli_ure \ - $(if $(filter CLUCENE,$(BUILD_TYPE)),\ - clucene \ - ) \ - $(if $(filter DESKTOP,$(BUILD_TYPE)),\ - codemaker \ - ) \ - comphelper \ - configmgr \ - connectivity \ + $(call gb_Helper_optional,CLUCENE,clucene) \ + $(call gb_Helper_optional,DESKTOP,codemaker) \ + comphelper \ + configmgr \ + connectivity \ cosv \ - cppcanvas \ + cppcanvas \ cppu \ cppuhelper \ cpputools \ - cui \ - dbaccess \ - desktop \ - $(if $(filter DICTIONARIES,$(BUILD_TYPE)),\ - dictionaries \ - ) \ - dtrans \ - drawinglayer \ - editeng \ - embeddedobj \ + cui \ + dbaccess \ + desktop \ + $(call gb_Helper_optional,DICTIONARIES,dictionaries) \ + dtrans \ + drawinglayer \ + editeng \ + embeddedobj \ embedserv \ - eventattacher \ - extensions \ + eventattacher \ + extensions \ extras \ - fileaccess \ - filter \ - forms \ - formula \ - fpicker \ - framework \ - $(if $(filter DESKTOP,$(BUILD_TYPE)), \ - helpcompiler \ - ) \ - $(if $(filter HSQLDB,$(BUILD_TYPE)),\ - hsqldb \ - ) \ - hwpfilter \ + fileaccess \ + filter \ + forms \ + formula \ + fpicker \ + framework \ + $(call gb_Helper_optional,DESKTOP,helpcompiler) \ + $(call gb_Helper_optional,HSQLDB,hsqldb) \ + hwpfilter \ i18npool \ i18nutil \ - idl \ - $(if $(filter DESKTOP,$(BUILD_TYPE)),\ - idlc \ - ) \ + idl \ + $(call gb_Helper_optional,DESKTOP,idlc) \ io \ javaunohelper \ jurt \ @@ -106,118 +90,94 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ libwpd \ libwpg \ libwps \ - lingucomponent \ - linguistic \ - lotuswordpro \ - $(if $(filter DESKTOP,$(BUILD_TYPE)),\ - l10ntools \ - ) \ - MathMLDTD \ + lingucomponent \ + linguistic \ + lotuswordpro \ + $(call gb_Helper_optional,DESKTOP,l10ntools) \ + MathMLDTD \ mdds \ - Mesa \ - $(if $(filter MORE_FONTS,$(BUILD_TYPE)),\ - more_fonts \ - ) \ - $(if $(filter NEON,$(BUILD_TYPE)),\ - neon \ - ) \ - $(if $(filter NLPSOLVER,$(BUILD_TYPE)),\ - nlpsolver \ - ) \ - np_sdk \ + Mesa \ + $(call gb_Helper_optional,MORE_FONTS,more_fonts) \ + $(call gb_Helper_optional,NEON,neon) \ + $(call gb_Helper_optional,NLPSOLVER,nlpsolver) \ + np_sdk \ o3tl \ offapi \ officecfg \ - oovbaapi \ - oox \ - package \ - padmin \ - psprint_config \ - $(if $(filter PYUNO,$(BUILD_TYPE)),\ - pyuno \ - ) \ - $(if $(filter QADEVOOO,$(BUILD_TYPE)),\ - qadevOOo \ - ) \ - $(if $(filter DESKTOP,$(BUILD_TYPE)),\ - rdbmaker \ - ) \ - readlicense_oo \ - regexp \ - registry \ - remotebridges \ - reportbuilder \ - reportdesign \ + oovbaapi \ + oox \ + package \ + padmin \ + psprint_config \ + $(call gb_Helper_optional,PYUNO,pyuno) \ + $(call gb_Helper_optional,QADEVOOO,qadevOOo) \ + $(call gb_Helper_optional,DESKTOP,rdbmaker) \ + readlicense_oo \ + regexp \ + registry \ + remotebridges \ + reportbuilder \ + reportdesign \ ridljar \ - rsc \ + rsc \ salhelper \ - sane \ + sane \ sax \ - sc \ - scaddins \ - sccomp \ - $(if $(filter DESKTOP,$(BUILD_TYPE)),\ - scp2 \ - ) \ - scripting \ - sd \ - sdext \ - sfx2 \ - shell \ - slideshow \ - smoketest \ - sot \ - starmath \ + sc \ + scaddins \ + sccomp \ + $(call gb_Helper_optional,DESKTOP,scp2) \ + scripting \ + sd \ + sdext \ + sfx2 \ + shell \ + slideshow \ + smoketest \ + sot \ + starmath \ stoc \ store \ - svl \ - svtools \ - svx \ - sw \ - swext \ - test \ - testtools \ - toolkit \ + svl \ + svtools \ + svx \ + sw \ + swext \ + test \ + testtools \ + toolkit \ tools \ touch \ - $(if $(filter TRANSLATIONS,$(BUILD_TYPE)),\ - translations \ - ) \ - tubes \ - twain \ - ucb \ + $(call gb_Helper_optional,TRANSLATIONS,translations) \ + tubes \ + twain \ + ucb \ ucbhelper \ - $(if $(filter UCPP,$(BUILD_TYPE)),\ - ucpp \ - ) \ + $(call gb_Helper_optional,UCPP,ucpp) \ udkapi \ udm \ - unixODBC \ - UnoControls \ - unodevtools \ + unixODBC \ + UnoControls \ + unodevtools \ unoil \ unotest \ - unotools \ - unoxml \ + unotools \ + unoxml \ ure \ - uui \ - vbahelper \ - vcl \ + uui \ + vbahelper \ + vcl \ vigra \ - wizards \ - writerfilter \ - writerperfect \ - $(if $(filter X11_EXTENSIONS,$(BUILD_TYPE)), \ - x11_extensions \ - ) \ - xmerge \ - $(if $(filter DESKTOP,$(BUILD_TYPE)), \ - xmlhelp \ - ) \ - xmloff \ + wizards \ + writerfilter \ + writerperfect \ + $(call gb_Helper_optional,EXTENSIONS,x11_extensions) \ + xmerge \ + $(call gb_Helper_optional,DESKTOP,xmlhelp) \ + xmloff \ xmlreader \ - xmlscript \ - xmlsecurity \ + xmlscript \ + xmlsecurity \ xsltml \ )) @@ -228,7 +188,7 @@ $(eval $(call gb_Module_add_targets,tail_end,\ endif # Especially when building everything with symbols, the linking of the largest -# libraries takes enormous amounts of RAM. To prevent annoying OOM situations +# libraries takes enormous amounts of RAM. To prevent annoying OOM situations # etc., try to prevent linking these in parallel by adding artificial build # order dependencies here. define tailbuild_serialize1 diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index a75a6e0c05f9..c210cd716a61 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -189,4 +189,8 @@ endef # gb_Helper_OUTDIRLIBDIR is set by the platform to the path the dynamic linker need to use # for libraries from the OUTDIR +define gb_Helper_optional +$(if $(filter $(1),$(BUILD_TYPE)),$(2)) +endef + # vim: set noet sw=4 ts=4: From 4df639baacd871cb2793e75dd9721ad2ae715e20 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sat, 29 Sep 2012 02:34:58 -0500 Subject: [PATCH 041/863] add apache_commons to tail_build Change-Id: I0365a5170011ad44b9a0ab8f1129a756884694d5 --- Module_tail_build.mk | 1 + .../{Module_apache_commons.mk => Module_apache-commons.mk} | 1 - tail_build/prj/build.lst | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename apache-commons/{Module_apache_commons.mk => Module_apache-commons.mk} (95%) diff --git a/Module_tail_build.mk b/Module_tail_build.mk index cf86f3c39c9f..a9635e11bf70 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ accessibility \ $(call gb_Helper_optional,AFMS,afms) \ animations \ + $(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \ apple_remote \ autodoc \ avmedia \ diff --git a/apache-commons/Module_apache_commons.mk b/apache-commons/Module_apache-commons.mk similarity index 95% rename from apache-commons/Module_apache_commons.mk rename to apache-commons/Module_apache-commons.mk index 07cba6a99424..a89f69e6e94b 100644 --- a/apache-commons/Module_apache_commons.mk +++ b/apache-commons/Module_apache-commons.mk @@ -10,7 +10,6 @@ $(eval $(call gb_Module_Module,apache_commons)) ifneq ($(SOLAR_JAVA),) -$(info "f:$(filter APACHE_COMMONS,$(BUILD_TYPE))") ifneq ($(filter APACHE_COMMONS,$(BUILD_TYPE)),) $(eval $(call gb_Module_add_targets,apache_commons,\ ExternalProject_apache_commons_codec \ diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index 41b00d57d1e9..5e84fda48129 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon XPDF:xpdf ZLIB:zlib external RHINO:rhino sal solenv soltools NULL +tb tail_build : BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon XPDF:xpdf ZLIB:zlib external RHINO:rhino sal solenv soltools NULL tb tail_build\prj nmake - all tb_prj NULL From 8f2859a318198797fd11f3ea78ed336533eefa65 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sat, 29 Sep 2012 02:42:25 -0500 Subject: [PATCH 042/863] add tomcat to tail_build Change-Id: Ida93051b4b631d24e738584a8a3ff2e24ea7bd7a --- Module_tail_build.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/Module_tail_build.mk b/Module_tail_build.mk index a9635e11bf70..db82ee13c720 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -146,6 +146,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ swext \ test \ testtools \ + $(call gb_Helper_optional,TOMCAT,tomcat) \ toolkit \ tools \ touch \ From 26c8848639537f9b4d7921c04f8747c992a643c2 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sat, 29 Sep 2012 02:42:48 -0500 Subject: [PATCH 043/863] hide external library neon's warnings Change-Id: Ie394ee8fc7a7e4c34965242920225c5dc2297c0b --- neon/Library_neon.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/neon/Library_neon.mk b/neon/Library_neon.mk index 239a43491b3a..92b13ac97c11 100644 --- a/neon/Library_neon.mk +++ b/neon/Library_neon.mk @@ -19,6 +19,12 @@ $(eval $(call gb_Library_use_externals,neon,\ $(eval $(call gb_Library_set_visibility_default,neon)) +# neon has its share of warning... let's spare use +# the pointless spamming +$(eval $(call gb_Library_add_cflags,neon,\ + -w \ +)) + $(eval $(call gb_Library_set_warnings_not_errors,neon)) $(eval $(call gb_Library_add_generated_cobjects,neon,\ From 363e0b67e9ce5de317603a76a5ffc159fc964722 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Thu, 27 Sep 2012 16:19:14 -0500 Subject: [PATCH 044/863] add supporting target and options to generate patches for ExternalProjects also add the support for the convention that a patch filename encode the -p value if it end with .[0-9] for instance foo.patch.2 indicate a -p2 patch usage: generate a 'reference' copy of the expanded and patched file structure $> make clucene.clean $> patches=t make clucene go to the module $> cd clucene edit files in $WORKDIR/UnpackedTarball/clucene force a rebuild of things that depend on that UnpackedTarball $> make clucene.rebuild create a -p1 patch named clucene.new.patch.1 in the module's directory $> make clucene.genpatch you can then rename it, place it where appropriate in the module hierarchy, update the UnpackedTarball_lucene.mk to apply it. rinse and repeat from the top (yes the make lucene.clean is needed to regenerate a 'reference' expanded and patched tarball) Change-Id: I419c54a5981cffa385521596ba5016d2ca7ef52a Reviewed-on: https://gerrit.libreoffice.org/712 Reviewed-by: Norbert Thiebaud Tested-by: Norbert Thiebaud --- solenv/gbuild/TargetLocations.mk | 1 + solenv/gbuild/UnpackedTarball.mk | 31 ++++++++++++++++++++++++++++++- solenv/gbuild/gbuild.mk | 8 ++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index be268ba3e25d..28c7dd4d4e80 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -171,6 +171,7 @@ gb_UnoApiHeadersTarget_get_comprehensive_target = $(WORKDIR)/UnoApiHeadersTarget gb_UnoApiHeadersTarget_get_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/normal.done gb_UnoApiPartTarget_get_target = $(WORKDIR)/UnoApiPartTarget/$(1) gb_UnpackedTarball_get_dir = $(WORKDIR)/UnpackedTarball/$(1) +gb_UnpackedTarball_get_pristine_dir = $(WORKDIR)/UnpackedTarball/$(1).org gb_UnpackedTarball_get_final_target = $(WORKDIR)/UnpackedTarball/$(1).update gb_UnpackedTarball_get_target = $(WORKDIR)/UnpackedTarball/$(1).done gb_UnpackedTarball_get_preparation_target = $(WORKDIR)/UnpackedTarball/$(1).prepare diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk index a9cf53e09764..c96d4ced7cc2 100644 --- a/solenv/gbuild/UnpackedTarball.mk +++ b/solenv/gbuild/UnpackedTarball.mk @@ -131,7 +131,9 @@ $(call gb_Helper_abbreviate_dirs,\ $(foreach file,$(UNPACKED_FIX_EOL),$(call gb_UnpackedTarball_CONVERTTOUNIX,$(file)) && ) \ $(if $(UNPACKED_PATCHES),\ for p in $(UNPACKED_PATCHES); do \ - $(GNUPATCH) -s -p$(UNPACKED_PATCHLEVEL) < "$$p" || exit 1;\ + pl=$(UNPACKED_PATCHLEVEL); \ + s=$${p##*.}; case "$$s" in [0-9]$(CLOSE_PAREN) pl="$$s"; ;; esac ; \ + $(GNUPATCH) -s -p$$pl < "$$p" || exit 1;\ done && \ ) \ $(foreach file,$(UNPACKED_FIX_EOL),$(call gb_UnpackedTarball_CONVERTTODOS,$(file)) && ) \ @@ -145,6 +147,10 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(UNPACKED_POST_ACTION),\ $(UNPACKED_POST_ACTION) && \ ) \ + $(if $(gb_KEEP_PRISTINE), \ + rm -fr $(call gb_UnpackedTarball_get_pristine_dir,$(2)) && \ + cp -r $(call gb_UnpackedTarball_get_dir,$(2)) $(call gb_UnpackedTarball_get_pristine_dir,$(2)) && \ + ) \ touch $(1) \ ) || \ ( \ @@ -174,6 +180,7 @@ $(call gb_UnpackedTarball_get_clean_target,%) : $(call gb_UnpackedTarball_get_target,$*) \ $(call gb_UnpackedTarball_get_preparation_target,$*) \ $(call gb_UnpackedTarball_get_dir,$*) \ + $(call gb_UnpackedTarball_get_pristine_dir,$*) \ $(foreach subdir,$(UNPACKED_SUBDIRS),$(gb_EXTERNAL_HEADERS_DIR)/$(subdir)) \ ) @@ -365,4 +372,26 @@ $(foreach file,$(2),$(call gb_UnpackedTarball_mark_output_file,$(1),$(file))) endef +# force the rebuild of an external target +# this only works when running as partial build. +# +%.rebuild : + if [ -f $(call gb_UnpackedTarball_get_target,$*) ] ; then \ + touch $(call gb_UnpackedTarball_get_target,$*) ; \ + make ;\ + fi + +%.genpatch : + if [ -d $(call gb_UnpackedTarball_get_dir,$*) -a -d $(call gb_UnpackedTarball_get_pristine_dir,$*) ] ; then \ + ( \ + patch_file=$$(pwd)/$*.new.patch.1; \ + cd $(call gb_UnpackedTarball_get_dir,) ; \ + diff -ur $*.org $* > $$patch_file; \ + echo "Patch $$patch_file generated" ; \ + ); \ + else \ + echo "Error: No pristine tarball avaialable for $*" 1>&2 ; \ + fi + + # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 91bb68b39c8e..02f8998de1e1 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -71,6 +71,8 @@ endef COMMA :=, +CLOSE_PAREN :=) + # optional extensions that should never be essential ifneq ($(wildcard $(GBUILDDIR)/extensions/pre_*.mk),) include $(wildcard $(GBUILDDIR)/extensions/pre_*.mk) @@ -145,6 +147,12 @@ gb_FULLDEPS := $(true) endif endif +ifneq ($(strip $(patches)$(PATCHES)),) +gb_KEEP_PRISTINE := $(true) +else +gb_KEEP_PRISTINE := $(false) +endif + # save user-supplied flags for latter use # TODO remove after the old build system is abolished ifneq ($(strip $(ENVCFLAGS)),) From fa140733eeaf59030caa3115be4de11fb210b5b7 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 29 Sep 2012 11:05:17 +0200 Subject: [PATCH 045/863] fix dep on internal ucpp Change-Id: I42bbb3e53aaaad0e6b7df44ec2def038ac1a31eb --- solenv/gbuild/gbuild.mk | 86 ++++++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 40 deletions(-) diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 02f8998de1e1..74b0368ec209 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -171,6 +171,52 @@ include $(SRCDIR)/Repository.mk include $(SRCDIR)/RepositoryExternal.mk $(eval $(call gb_Helper_collect_libtargets)) +# Set up build tools that can be either internal or system. It is +# necessary to do it before we start including gbuild class makefiles, +# so the classes can add dependencies on them. +# +# TODO: As more external modules are converted, we would need more of +# these (e.g., ICU tools). Maybe the definitions should be moved to +# RepositoryExternal.mk ? +ifeq ($(SYSTEM_LIBXSLT_FOR_BUILD),YES) +gb_XSLTPROCTARGET := +gb_XSLTPROC := xsltproc +else +gb_XSLTPROCTARGET := $(call gb_Executable_get_target_for_build,xsltproc) +gb_XSLTPROC := $(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET) +endif + +ifeq ($(SYSTEM_LIBXML_FOR_BUILD),YES) +gb_XMLLINTTARGET := +gb_XMLLINT := xsltproc +else +gb_XMLLINTTARGET := $(call gb_Executable_get_target_for_build,xsltproc) +gb_XMLLINT := $(gb_Helper_set_ld_path) $(gb_XMLLINTTARGET) +endif + +ifeq ($(SYSTEM_PYTHON),YES) +gb_PYTHONTARGET := +gb_PYTHON := $(PYTHON) +else ifeq ($(OS),MACOSX) +#fixme: remove this MACOSX ifeq branch by filling in gb_PYTHON_PRECOMMAND in +#gbuild/platform/macosx.mk correctly for mac, e.g. PYTHONPATH and PYTHONHOME +#dirs for in-tree internal python +gb_PYTHONTARGET := +gb_PYTHON := $(PYTHON) +else ifeq ($(DISABLE_PYTHON),TRUE) +# Build-time python +gb_PYTHON := python +else +gb_PYTHONTARGET := $(call gb_Executable_get_target_for_build,python) +gb_PYTHON := $(gb_PYTHON_PRECOMMAND) $(gb_PYTHONTARGET) +endif + +ifneq (,$(SYSTEM_UCPP)) +gb_UCPPTARGET := +else +gb_UCPPTARGET := $(call gb_Executable_get_target_for_build,ucpp) +endif + gb_Library_DLLPOSTFIX := lo # Include platform/cpu/compiler specific config/definitions @@ -379,46 +425,6 @@ endif endef - -ifeq ($(SYSTEM_LIBXSLT_FOR_BUILD),YES) -gb_XSLTPROCTARGET := -gb_XSLTPROC := xsltproc -else -gb_XSLTPROCTARGET := $(call gb_Executable_get_target_for_build,xsltproc) -gb_XSLTPROC := $(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET) -endif - -ifeq ($(SYSTEM_LIBXML_FOR_BUILD),YES) -gb_XMLLINTTARGET := -gb_XMLLINT := xsltproc -else -gb_XMLLINTTARGET := $(call gb_Executable_get_target_for_build,xsltproc) -gb_XMLLINT := $(gb_Helper_set_ld_path) $(gb_XMLLINTTARGET) -endif - -ifeq ($(SYSTEM_PYTHON),YES) -gb_PYTHONTARGET := -gb_PYTHON := $(PYTHON) -else ifeq ($(OS),MACOSX) -#fixme: remove this MACOSX ifeq branch by filling in gb_PYTHON_PRECOMMAND in -#gbuild/platform/macosx.mk correctly for mac, e.g. PYTHONPATH and PYTHONHOME -#dirs for in-tree internal python -gb_PYTHONTARGET := -gb_PYTHON := $(PYTHON) -else ifeq ($(DISABLE_PYTHON),TRUE) -# Build-time python -gb_PYTHON := python -else -gb_PYTHONTARGET := $(call gb_Executable_get_target_for_build,python) -gb_PYTHON := $(gb_PYTHON_PRECOMMAND) $(gb_PYTHONTARGET) -endif - -ifneq (,$(SYSTEM_UCPP)) -gb_UCPPTARGET := -else -gb_UCPPTARGET := $(call gb_Executable_get_target_for_build,ucpp) -endif - .PHONY: help help: @cat $(SRCDIR)/solenv/gbuild/gbuild.help.txt From d626b631ff9a796b8d41fab06e4faf209387780d Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 29 Sep 2012 11:08:09 +0200 Subject: [PATCH 046/863] add missing dep on cosv headers Change-Id: I444874a8b59ac82c807087fb1a1d958ab1f75b12 --- udm/StaticLibrary_udm.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/udm/StaticLibrary_udm.mk b/udm/StaticLibrary_udm.mk index 01fe7eedaa23..3901a45bd727 100644 --- a/udm/StaticLibrary_udm.mk +++ b/udm/StaticLibrary_udm.mk @@ -10,6 +10,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,udm)) $(eval $(call gb_StaticLibrary_use_packages,udm,\ + cosv_inc \ udm_inc \ )) From 39726ed52d6370b0223d6f675e02ddb1989206cb Mon Sep 17 00:00:00 2001 From: Korrawit Pruegsanusak Date: Sat, 29 Sep 2012 11:40:56 +0700 Subject: [PATCH 047/863] sc/qa/unit: recover xDocSh->DoClose() which was removed in fde638b3ac35997aa3e38a37fed56d6eb661806b Change-Id: I57caf615f0ca49d0b90cb4c68b8ce8edf8f72a97 Reviewed-on: https://gerrit.libreoffice.org/723 Reviewed-by: Markus Mohrhard Tested-by: Markus Mohrhard --- sc/qa/unit/subsequent_filters-test.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index fb286e818424..10db9aeb80fc 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -355,6 +355,8 @@ void ScFiltersTest::testRangeNameXLSX() ScDocument* pDoc = xDocSh->GetDocument(); testRangeNameImpl(pDoc); + + xDocSh->DoClose(); } void ScFiltersTest::testHardRecalcODS() From 3d7005b67dd29a2392dcc91e9c8b4287fc6816c7 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Wed, 26 Sep 2012 23:59:18 +0200 Subject: [PATCH 048/863] soltools conversion to gbuild The following tools are considered to be obsolete and are discontinued: ldump, giparser, testhxx and support. Change-Id: I70813c046edb30546463cda9eb8a1b96c3e840a3 --- Makefile.top | 2 +- Repository.mk | 5 ++ solenv/gbuild/InstallModuleTarget.mk | 4 +- soltools/Executable_adjustvisibility.mk | 16 +++++ soltools/Executable_checkdll.mk | 22 +++++++ soltools/Executable_cpp.mk | 36 ++++++++++++ soltools/Executable_javadep.mk | 16 +++++ soltools/Executable_makedepend.mk | 43 ++++++++++++++ soltools/Makefile | 7 +++ soltools/Module_soltools.mk | 41 +++++++++++++ soltools/Package_inc.mk | 11 ++++ soltools/adjustvisibility/makefile.mk | 50 ---------------- soltools/checkdll/makefile.mk | 50 ---------------- soltools/cpp/makefile.mk | 72 ----------------------- soltools/giparser/makefile.mk | 54 ----------------- soltools/ldump/makefile.mk | 50 ---------------- soltools/mkdepend/makefile.mk | 78 ------------------------- soltools/prj/build.lst | 14 +---- soltools/prj/d.lst | 11 ---- soltools/prj/dmake | 0 soltools/support/makefile.mk | 51 ---------------- soltools/testhxx/makefile.mk | 49 ---------------- soltools/util/makefile.pmk | 35 ----------- soltools/winunistd/makefile.mk | 43 -------------- 24 files changed, 201 insertions(+), 559 deletions(-) create mode 100644 soltools/Executable_adjustvisibility.mk create mode 100644 soltools/Executable_checkdll.mk create mode 100644 soltools/Executable_cpp.mk create mode 100644 soltools/Executable_javadep.mk create mode 100644 soltools/Executable_makedepend.mk create mode 100644 soltools/Makefile create mode 100644 soltools/Module_soltools.mk create mode 100644 soltools/Package_inc.mk delete mode 100644 soltools/adjustvisibility/makefile.mk delete mode 100644 soltools/checkdll/makefile.mk delete mode 100644 soltools/cpp/makefile.mk delete mode 100644 soltools/giparser/makefile.mk delete mode 100644 soltools/ldump/makefile.mk delete mode 100644 soltools/mkdepend/makefile.mk delete mode 100644 soltools/prj/dmake delete mode 100644 soltools/support/makefile.mk delete mode 100644 soltools/testhxx/makefile.mk delete mode 100644 soltools/util/makefile.pmk delete mode 100644 soltools/winunistd/makefile.mk diff --git a/Makefile.top b/Makefile.top index d32a0baa204b..2fb2a7c5d1c4 100644 --- a/Makefile.top +++ b/Makefile.top @@ -145,6 +145,7 @@ shell\ slideshow\ smoketest\ solenv\ +soltools\ sot\ starmath\ stoc\ @@ -246,7 +247,6 @@ redland\ rhino\ saxon\ setup_native\ -soltools\ stax\ stlport\ sysui\ diff --git a/Repository.mk b/Repository.mk index 6b7ccf6bef58..85f1f6642656 100644 --- a/Repository.mk +++ b/Repository.mk @@ -29,11 +29,14 @@ $(eval $(call gb_Helper_register_executables,NONE, \ HelpIndexer \ HelpLinker \ + adjustvisibility \ bestreversemap \ bmp \ bmpsum \ cfgex \ + checkdll \ checksingleton \ + cpp \ cppunit/cppunittester \ g2g \ gencoll_rule \ @@ -43,8 +46,10 @@ $(eval $(call gb_Helper_register_executables,NONE, \ gsicheck \ helpex \ idxdict \ + javadepend \ lngconvex \ localize \ + makedepend \ mkunroll \ mork_helper \ osl_process_child \ diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk index 822c5d5698b7..08c130577548 100644 --- a/solenv/gbuild/InstallModuleTarget.mk +++ b/solenv/gbuild/InstallModuleTarget.mk @@ -74,9 +74,7 @@ endef # ScpPreprocessTarget class -# TODO change to gb_Executable_get_target_for_build after soltools has -# been gbuildified -gb_ScpPreprocessTarget_TARGET := $(OUTDIR_FOR_BUILD)/bin/cpp.lcc +gb_ScpPreprocessTarget_TARGET := $(call gb_Executable_get_target_for_build,cpp) gb_ScpPreprocessTarget_COMMAND := $(gb_Helper_set_ld_path) $(gb_ScpPreprocessTarget_TARGET) gb_ScpPreprocessTarget_get_source = $(SRCDIR)/$(1).scp diff --git a/soltools/Executable_adjustvisibility.mk b/soltools/Executable_adjustvisibility.mk new file mode 100644 index 000000000000..6a8ce614b7dd --- /dev/null +++ b/soltools/Executable_adjustvisibility.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Executable_Executable,adjustvisibility)) + +$(eval $(call gb_Executable_add_exception_objects,adjustvisibility,\ + soltools/adjustvisibility/adjustvisibility \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/soltools/Executable_checkdll.mk b/soltools/Executable_checkdll.mk new file mode 100644 index 000000000000..45e18246d6db --- /dev/null +++ b/soltools/Executable_checkdll.mk @@ -0,0 +1,22 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Executable_Executable,checkdll)) + +$(eval $(call gb_Executable_add_cobjects,checkdll,\ + soltools/checkdll/checkdll \ +)) + +ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),) +$(eval $(call gb_Executable_add_libs,checkdll,\ + -ldl \ +)) +endif + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/soltools/Executable_cpp.mk b/soltools/Executable_cpp.mk new file mode 100644 index 000000000000..29fb1f853fa8 --- /dev/null +++ b/soltools/Executable_cpp.mk @@ -0,0 +1,36 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Executable_Executable,cpp)) + +$(eval $(call gb_Executable_add_cobjects,cpp,\ + soltools/cpp/_cpp \ + soltools/cpp/_eval \ + soltools/cpp/_include \ + soltools/cpp/_lex \ + soltools/cpp/_macro \ + soltools/cpp/_mcrvalid \ + soltools/cpp/_nlist \ + soltools/cpp/_tokens \ + soltools/cpp/_unix \ +)) + +ifneq ($(or $(filter AIX MACOSX,$(OS)),$(filter NO,$(HAVE_GETOPT))),) +$(eval $(call gb_Executable_add_cobjects,cpp,\ + soltools/cpp/_getopt \ +)) +endif + +ifeq ($(HAVE_GETOPT),YES) +$(eval $(call gb_Executable_add_defs,cpp,\ + -DHAVE_GETOPT \ +)) +endif + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/soltools/Executable_javadep.mk b/soltools/Executable_javadep.mk new file mode 100644 index 000000000000..a0fc0369f8e1 --- /dev/null +++ b/soltools/Executable_javadep.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Executable_Executable,javadep)) + +$(eval $(call gb_Executable_add_cobjects,javadep,\ + soltools/javadep/javadep \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/soltools/Executable_makedepend.mk b/soltools/Executable_makedepend.mk new file mode 100644 index 000000000000..e6e7ac6d5ff6 --- /dev/null +++ b/soltools/Executable_makedepend.mk @@ -0,0 +1,43 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Executable_Executable,makedepend)) + +$(eval $(call gb_Executable_add_exception_objects,makedepend,\ + soltools/mkdepend/collectdircontent \ +)) + +$(eval $(call gb_Executable_add_defs,makedepend,\ + -DNO_X11 \ + -DXP_PC \ + -DHW_THREADS \ +)) + +ifeq ($(COM),MSC) +$(eval $(call gb_Executable_add_defs,makedepend,\ + -wd4100 \ + -wd4131 \ + -wd4706 \ +)) + +$(eval $(call gb_Executable_use_libraries,makedepend,\ + msvcprt \ +)) +endif + +$(eval $(call gb_Executable_add_cobjects,makedepend,\ + soltools/mkdepend/cppsetup \ + soltools/mkdepend/ifparser \ + soltools/mkdepend/include \ + soltools/mkdepend/main \ + soltools/mkdepend/parse \ + soltools/mkdepend/pr \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/soltools/Makefile b/soltools/Makefile new file mode 100644 index 000000000000..ccb1c85a04da --- /dev/null +++ b/soltools/Makefile @@ -0,0 +1,7 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +include $(module_directory)/../solenv/gbuild/partial_build.mk + +# vim: set noet sw=4 ts=4: diff --git a/soltools/Module_soltools.mk b/soltools/Module_soltools.mk new file mode 100644 index 000000000000..ebd855ad30fc --- /dev/null +++ b/soltools/Module_soltools.mk @@ -0,0 +1,41 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Module_Module,soltools)) + +ifneq ($(CROSS_COMPILING),YES) +$(eval $(call gb_Module_add_targets,soltools,\ + Executable_cpp \ + Executable_javadep \ + Executable_makedepend \ +)) + +ifeq ($(GUI),UNX) +$(eval $(call gb_Module_add_targets,soltools,\ + Executable_checkdll \ +)) +# +# the same as the condition outside of ifneq ($(CROSS_COMPILING),YES) +# ifeq ($(GUI)$(COM),WNTMSC) +# +else +$(eval $(call gb_Module_add_targets,soltools,\ + Package_inc \ +)) +endif # UNX + +ifeq ($(OS)$(COM),SOLARISC52) +$(eval $(call gb_Module_add_targets,soltools,\ + Executable_adjustvisibility \ +)) +endif # SOLARISC52 + +endif # CROSS_COMPILING + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/soltools/Package_inc.mk b/soltools/Package_inc.mk new file mode 100644 index 000000000000..863945fe63f6 --- /dev/null +++ b/soltools/Package_inc.mk @@ -0,0 +1,11 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Package_Package,soltools_inc,$(SRCDIR)/soltools/winunistd)) +$(eval $(call gb_Package_add_file,soltools_inc,inc/unistd.h,unistd.h)) diff --git a/soltools/adjustvisibility/makefile.mk b/soltools/adjustvisibility/makefile.mk deleted file mode 100644 index 1f8d3aac3fd2..000000000000 --- a/soltools/adjustvisibility/makefile.mk +++ /dev/null @@ -1,50 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -PRJ=.. - -PRJNAME=soltools -TARGET=adjustvisibility -TARGETTYPE=CUI -ENABLE_EXCEPTIONS=TRUE -noadjust=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -# This tool is for SunStudio on Solaris only -.IF "$(OS)$(COM)"=="SOLARISC52" - -APP1TARGET = adjustvisibility -APP1OBJS = $(OBJ)$/adjustvisibility.obj -DEPOBJFILES = $(APP1OBJ) -APP1STDLIBS = -lelf -APP1RPATH = NONE - -#APP1STDLIBS+=-lstlport -APP1STDLIBS+=-lCstd - -.ENDIF "$(OS)$(COM)"=="SOLARISC52" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/soltools/checkdll/makefile.mk b/soltools/checkdll/makefile.mk deleted file mode 100644 index 5ca0fb262381..000000000000 --- a/soltools/checkdll/makefile.mk +++ /dev/null @@ -1,50 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -PRJ=.. - -PRJNAME=soltools -TARGET=checkdll -TARGETTYPE=CUI -NO_DEFAULT_STL=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - - -.IF "$(GUI)"=="UNX" && "$(CROSS_COMPILING)"!="YES" -LIBSALCPPRT=$(0) -APP1TARGET = checkdll -APP1OBJS = $(OBJ)$/checkdll.obj -DEPOBJFILES = $(APP1OBJS) -.IF "$(OS)"!="FREEBSD" && "$(OS)"!="MACOSX" && "$(OS)"!="NETBSD" \ - && "$(OS)"!="OPENBSD" && "$(OS)"!="DRAGONFLY" -STDLIB += -ldl -.ENDIF -.IF "$(OS)"=="NETBSD" -APP1STDLIBS += -Wl,--whole-archive -lgcc -Wl,--no-whole-archive -.ENDIF -.ENDIF # "$(GUI)"=="UNX" && "$(CROSS_COMPILING)"!="YES" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/soltools/cpp/makefile.mk b/soltools/cpp/makefile.mk deleted file mode 100644 index 82bc13b84d88..000000000000 --- a/soltools/cpp/makefile.mk +++ /dev/null @@ -1,72 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -PRJ=.. - -PRJNAME=soltools -TARGET=cpp -TARGETTYPE=CUI -NO_DEFAULT_STL=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk -.INCLUDE : settings.mk - -.IF "$(CROSS_COMPILING)"=="YES" - -all: -# nothing - -.ENDIF - -UWINAPILIB=$(0) -LIBSALCPPRT=$(0) - -# --- Files -------------------------------------------------------- - -OBJFILES= \ - $(OBJ)$/_cpp.obj \ - $(OBJ)$/_eval.obj \ - $(OBJ)$/_include.obj \ - $(OBJ)$/_lex.obj \ - $(OBJ)$/_macro.obj \ - $(OBJ)$/_mcrvalid.obj \ - $(OBJ)$/_nlist.obj \ - $(OBJ)$/_tokens.obj \ - $(OBJ)$/_unix.obj - -# nonstandard cpp options needed for Mac (-isysroot), -# needs the custom stgetopt defined here :/ -.IF "$(OS)" == "MACOSX" || "$(OS)" == "AIX" || "$(HAVE_GETOPT)" != "YES" -OBJFILES += $(OBJ)$/_getopt.obj -.ENDIF -.IF "$(HAVE_GETOPT)" == "YES" -CDEFS += -DHAVE_GETOPT -.ENDIF - -APP1TARGET = $(TARGET) -APP1STACK = 1000000 -APP1LIBS = $(LB)$/$(TARGET).lib -APP1DEPN = $(LB)$/$(TARGET).lib - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - - diff --git a/soltools/giparser/makefile.mk b/soltools/giparser/makefile.mk deleted file mode 100644 index 9959782c7369..000000000000 --- a/soltools/giparser/makefile.mk +++ /dev/null @@ -1,54 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -PRJ=.. - -PRJNAME=soltools -TARGET=soltools_giparser -TARGETTYPE=CUI -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk -.INCLUDE : settings.mk - -.IF "$(CROSS_COMPILING)"=="YES" - -all: -# nothing - -.ENDIF - -# --- Files -------------------------------------------------------- - -OBJFILES=\ - $(OBJ)$/gen_info.obj \ - $(OBJ)$/gi_list.obj \ - $(OBJ)$/gi_parse.obj - -SLOFILES=\ - $(SLO)$/gen_info.obj \ - $(SLO)$/gi_list.obj \ - $(SLO)$/gi_parse.obj - -# --- Targets ------------------------------------------------------ - - -.INCLUDE : target.mk - diff --git a/soltools/ldump/makefile.mk b/soltools/ldump/makefile.mk deleted file mode 100644 index eb5533115d56..000000000000 --- a/soltools/ldump/makefile.mk +++ /dev/null @@ -1,50 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -PRJ=.. - -PRJNAME=ldump -TARGET=ldump -TARGETTYPE=CUI - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk -.INCLUDE : settings.mk - -UWINAPILIB=$(0) -LIBSALCPPRT=$(0) - -# --- Files -------------------------------------------------------- - -# ldump only supports windows environment -.IF "$(GUI)"=="WNT" -.IF "$(COM)"!="GCC" -#ldump4 reimplements feature set of ldump2 and ldump3 -APP1TARGET= ldump4 -.IF "$(GUI)"=="WNT" -APP1STACK= 16000 -.ENDIF -APP1OBJS= $(OBJ)$/ldump.obj $(OBJ)$/hashtbl.obj - -.ENDIF #"$(COM)"!="GCC" -.ENDIF #"$(GUI)"=="WNT" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/soltools/mkdepend/makefile.mk b/soltools/mkdepend/makefile.mk deleted file mode 100644 index 7a5fcbcb67ba..000000000000 --- a/soltools/mkdepend/makefile.mk +++ /dev/null @@ -1,78 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -PRJNAME=soltools -TARGET=make_makedepend -PRJ=.. -TARGETTYPE=CUI -LIBTARGET=NO -# noadjust here to have dependencies over there -noadjust=TRUE -nodep=true -ENABLE_EXCEPTIONS=TRUE - -.INCLUDE : $(PRJ)$/util$/makefile.pmk -.INCLUDE : settings.mk - -.IF "$(CROSS_COMPILING)"=="YES" - -all: -# nothing - -.ENDIF - -LIBSALCPPRT= -UWINAPILIB= - -CDEFS+=-DNO_X11 -DXP_PC -DHW_THREADS - -.IF "$(COM)" == "MSC" -# C4100: unreferenced formal parameter -# C4131: uses old-style declarator -# C4242: conversion from 'int' to 'char', possible loss of data -# C4706: assignment within conditional expression -CDEFS+=-wd4100 -wd4131 -wd4242 -wd4706 -.ENDIF - -OBJFILES= \ - $(OBJ)$/cppsetup.obj \ - $(OBJ)$/ifparser.obj \ - $(OBJ)$/include.obj \ - $(OBJ)$/main.obj \ - $(OBJ)$/parse.obj \ - $(OBJ)$/pr.obj \ - $(OBJ)$/collectdircontent.obj \ - $(NULL) - -APP1TARGET=makedepend -APP1OBJS=$(OBJFILES) -APP1RPATH=NONE - -.IF "$(COM)"=="MSC" -APP1STDLIBS+=msvcprt.lib -.ENDIF # "$(COM)"=="MSC" - -.IF "$(OS)$(COM)"=="SOLARISC52" -#APP1STDLIBS+=-lstlport -APP1STDLIBS+=-lCstd -.ENDIF - - -.INCLUDE : target.mk - - diff --git a/soltools/prj/build.lst b/soltools/prj/build.lst index 9ee36a789905..341c34a21d9c 100644 --- a/soltools/prj/build.lst +++ b/soltools/prj/build.lst @@ -1,13 +1,3 @@ so soltools : solenv NULL -so soltools usr1 - all so_usr1 NULL -so soltools\inc get - all so_inc NULL -so soltools\ldump nmake - w so_ldump so_mkdep NULL -so soltools\winunistd nmake - n so_wunistd NULL -so soltools\mkdepend nmake - all so_mkdep so_wunistd.n NULL -so soltools\checkdll nmake - u so_chkdl so_adjvis.u so_mkdep NULL -so soltools\cpp nmake - all so_cpp__ so_mkdep so_adjvis.u NULL -so soltools\javadep nmake - all so_jvdep so_mkdep so_adjvis.u NULL -so soltools\support nmake - all so_supp so_mkdep so_adjvis.u NULL -so soltools\giparser nmake - all so_gip so_supp so_adjvis.u NULL -so soltools\adjustvisibility nmake - u so_adjvis so_mkdep NULL -so soltools\testhxx nmake - all so_testhxx so_mkdep NULL +so soltools usr1 - all so_usr1 NULL +so soltools\prj nmake - all ro_prj NULL diff --git a/soltools/prj/d.lst b/soltools/prj/d.lst index 409b94aa069e..e69de29bb2d1 100644 --- a/soltools/prj/d.lst +++ b/soltools/prj/d.lst @@ -1,11 +0,0 @@ -..\%__SRC%\bin\ldump4.exe %_DEST%\bin\ldump4.exe -..\%__SRC%\bin\makedepend.exe %_DEST%\bin\makedepend.exe -..\%__SRC%\bin\makedepend %_DEST%\bin\makedepend -..\%__SRC%\bin\adjustvisibility %_DEST%\bin\adjustvisibility -..\%__SRC%\bin\javadep.exe %_DEST%\bin\javadep.exe -..\%__SRC%\bin\javadep %_DEST%\bin\javadep -..\%__SRC%\bin\checkdll %_DEST%\bin\checkdll -..\%__SRC%\bin\cpp.exe %_DEST%\bin\cpplcc.exe -..\%__SRC%\bin\cpp %_DEST%\bin\cpp.lcc -..\%__SRC%\inc\unistd.h %_DEST%\inc\unistd.h -..\%__SRC%\bin\testhxx* %_DEST%\bin\testhxx* diff --git a/soltools/prj/dmake b/soltools/prj/dmake deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/soltools/support/makefile.mk b/soltools/support/makefile.mk deleted file mode 100644 index 3bd39b88c1fc..000000000000 --- a/soltools/support/makefile.mk +++ /dev/null @@ -1,51 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -PRJ=.. - -PRJNAME=soltools -TARGET=soltools_support -TARGETTYPE=CUI - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk -.INCLUDE : settings.mk - -.IF "$(CROSS_COMPILING)"=="YES" - -all: -# nothing - -.ENDIF - -# --- Files -------------------------------------------------------- - -OBJFILES= \ - $(OBJ)$/simstr.obj - -SLOFILES= \ - $(SLO)$/simstr.obj - - - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - - diff --git a/soltools/testhxx/makefile.mk b/soltools/testhxx/makefile.mk deleted file mode 100644 index 9348eabcad9d..000000000000 --- a/soltools/testhxx/makefile.mk +++ /dev/null @@ -1,49 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# -PRJ := .. -PRJNAME := soltools -TARGET := testhxx -LIBTARGET := NO -ENABLE_EXCEPTIONS := TRUE - -CAPTURE_COMMAND = echo -CAPTURE_OUTPUT = > $(MISC)$/testhxx.output && $(TOUCH) $(SLO)$/testhxx.obj - -.INCLUDE: $(PRJ)$/util$/makefile.pmk -.INCLUDE: settings.mk - -.IF "$(CROSS_COMPILING)"=="YES" - -all: -# nothing - -.ENDIF - -SLOFILES = $(SLO)$/testhxx.obj - -.INCLUDE: target.mk - -ALLTAR: $(BIN)$/$(TARGET) - -$(BIN)$/$(TARGET) .ERRREMOVE : $(MISC)$/testhxx.output create.pl - $(PERL) -w create.pl < $(MISC)$/testhxx.output > $@ - chmod +x $@ - -$(MISC)$/testhxx.output: $(SLO)$/testhxx.obj - $(TOUCH) $< - $(TOUCH) $@ diff --git a/soltools/util/makefile.pmk b/soltools/util/makefile.pmk deleted file mode 100644 index 00384bf0a10a..000000000000 --- a/soltools/util/makefile.pmk +++ /dev/null @@ -1,35 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -# find 'makedepend' in own output tree -MAKEDEPEND=$(AUGMENT_LIBRARY_PATH) $(BIN)$/makedepend - -# find 'adjustvisibility' in own output tree -ADJUSTVISIBILITY=$(AUGMENT_LIBRARY_PATH) $(BIN)$/adjustvisibility - -.IF "$(OS)"=="SOLARIS" -# hack due to #i53089# -.IF "$(COMPATH:+"x")" != "$(COMPATH:+"x":s/binx//)" -HELP_COMPATH:=$(subst,/binx, $(COMPATH:+"x")) -.ELSE # "$(COMPATH:+"x")" == "$(COMPATH:s/binx//)/binx" -HELP_COMPATH:=$(COMPATH) -.ENDIF # "$(COMPATH:+"x")" == "$(COMPATH:s/binx//)/binx" -.IF "$(COM)"!="GCC" -SOLARINC+=-I$(HELP_COMPATH)/prod/include/CC/Cstd -.ENDIF -.ENDIF diff --git a/soltools/winunistd/makefile.mk b/soltools/winunistd/makefile.mk deleted file mode 100644 index f9519fd1a464..000000000000 --- a/soltools/winunistd/makefile.mk +++ /dev/null @@ -1,43 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -PRJ=.. - -PRJNAME=soltools -TARGET=winunistd -TARGETTYPE=CUI - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -.IF "$(GUI)"=="WNT" -.IF "$(COM)"!="GCC" -# provide dummy header for generated sources -$(INCCOM)$/unistd.h : unistd.h - @$(COPY) $< $@ - -.ENDIF # "$(COM)"!="GCC" -.ENDIF # "$(GUI)"=="WNT" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk From 5071a19385f3999539cfb60a333df405a34036fa Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Tue, 29 Mar 2011 09:47:28 +0200 Subject: [PATCH 049/863] fs34b: after the test, close all documents opened during the test --- dbaccess/qa/complex/dbaccess/CopyTableWizard.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dbaccess/qa/complex/dbaccess/CopyTableWizard.java b/dbaccess/qa/complex/dbaccess/CopyTableWizard.java index 1facca3d8497..0da7775e7c30 100644 --- a/dbaccess/qa/complex/dbaccess/CopyTableWizard.java +++ b/dbaccess/qa/complex/dbaccess/CopyTableWizard.java @@ -59,6 +59,7 @@ public class CopyTableWizard extends CRMBasedTestCase { private DatabaseApplication source; + private DbaseDatabase destinationDB = null; private DatabaseApplication dest; public CopyTableWizard() @@ -73,6 +74,9 @@ public class CopyTableWizard extends CRMBasedTestCase public void after() { dest.store(); + if ( destinationDB != null ) + destinationDB.close(); + destinationDB = null; super.after(); } @@ -83,8 +87,9 @@ public class CopyTableWizard extends CRMBasedTestCase try { createTestCase(); - source = new DatabaseApplication(this.m_database.getDatabase()); - dest = new DatabaseApplication(new DbaseDatabase(getMSF())); + source = new DatabaseApplication(m_database.getDatabase()); + destinationDB = new DbaseDatabase( getMSF() ); + dest = new DatabaseApplication( destinationDB ); } catch (java.lang.Exception ex) { From de53823101479e88d23963aa66e2ad64ebfa29cd Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Mon, 28 Mar 2011 12:10:16 +0200 Subject: [PATCH 050/863] fs34b: #i117552# check if query before call getByName in every case --- dbaccess/source/ui/browser/unodatbr.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 6000c5a49538..843114fbb351 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -2184,12 +2184,13 @@ void SbaTableQueryBrowser::populateTree(const Reference& _xNameAcce { if( !m_pTreeView->getListBox().GetEntryPosByName(*pIter,_pParent)) { - Reference xChild(_xNameAccess->getByName(*pIter),UNO_QUERY); DBTreeListUserData* pEntryData = new DBTreeListUserData; pEntryData->eType = _eEntryType; - if ( _eEntryType == etQuery && xChild.is() ) + if ( _eEntryType == etQuery ) { - pEntryData->eType = etQueryContainer; + Reference xChild(_xNameAccess->getByName(*pIter),UNO_QUERY); + if ( xChild.is() ) + pEntryData->eType = etQueryContainer; } implAppendEntry( _pParent, *pIter, pEntryData, pEntryData->eType ); } From 286a7733ac0b00e47a03b13735f7aa9270ffc8e3 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Thu, 27 Sep 2012 13:52:10 +0100 Subject: [PATCH 051/863] re-base on ALv2 code. --- accessibility/Makefile | 7 +++ .../java_uno_accessbridge.component | 43 ++++++++----------- .../java/WindowsAccessBridgeAdapter.cxx | 37 ++++++---------- .../extended/AccessibleBrowseBoxBase.hxx | 37 ++++++---------- .../extended/AccessibleGridControl.hxx | 37 ++++++---------- .../extended/AccessibleGridControlBase.hxx | 37 ++++++---------- .../extended/AccessibleGridControlTable.hxx | 37 ++++++---------- .../AccessibleGridControlTableBase.hxx | 37 ++++++---------- .../AccessibleGridControlTableCell.hxx | 37 ++++++---------- .../accessibleiconchoicectrlentry.hxx | 37 ++++++---------- .../extended/textwindowaccessibility.hxx | 37 ++++++---------- .../helper/IComboListBoxHelper.hxx | 37 ++++++---------- .../extended/AccessibleBrowseBoxBase.cxx | 37 ++++++---------- .../extended/AccessibleBrowseBoxHeaderBar.cxx | 37 ++++++---------- .../extended/AccessibleBrowseBoxTable.cxx | 37 ++++++---------- .../extended/AccessibleBrowseBoxTableBase.cxx | 37 ++++++---------- .../extended/AccessibleBrowseBoxTableCell.cxx | 37 ++++++---------- .../source/extended/AccessibleGridControl.cxx | 37 ++++++---------- .../extended/AccessibleGridControlBase.cxx | 37 ++++++---------- .../extended/AccessibleGridControlHeader.cxx | 37 ++++++---------- .../AccessibleGridControlHeaderCell.cxx | 37 ++++++---------- .../extended/AccessibleGridControlTable.cxx | 37 ++++++---------- .../AccessibleGridControlTableBase.cxx | 37 ++++++---------- .../AccessibleGridControlTableCell.cxx | 37 ++++++---------- .../extended/AccessibleToolPanelDeck.cxx | 36 ++++++---------- .../AccessibleToolPanelDeckTabBar.cxx | 36 ++++++---------- .../AccessibleToolPanelDeckTabBarItem.cxx | 36 ++++++---------- .../extended/accessibleeditbrowseboxcell.cxx | 37 ++++++---------- .../extended/accessibleiconchoicectrl.cxx | 37 ++++++---------- .../accessibleiconchoicectrlentry.cxx | 37 ++++++---------- .../extended/accessiblelistboxentry.cxx | 37 ++++++---------- .../source/extended/accessibletabbar.cxx | 37 ++++++---------- .../source/extended/accessibletabbarpage.cxx | 37 ++++++---------- .../extended/accessibletabbarpagelist.cxx | 37 ++++++---------- .../source/extended/accessibletablistbox.cxx | 37 ++++++---------- .../extended/accessibletablistboxtable.cxx | 37 ++++++---------- .../extended/textwindowaccessibility.cxx | 37 ++++++---------- accessibility/source/helper/acc_factory.cxx | 37 ++++++---------- accessibility/source/helper/accresmgr.cxx | 37 ++++++---------- .../helper/characterattributeshelper.cxx | 37 ++++++---------- .../standard/accessiblemenuitemcomponent.cxx | 37 ++++++---------- .../source/standard/vclxaccessiblebox.cxx | 37 ++++++---------- .../source/standard/vclxaccessiblebutton.cxx | 37 ++++++---------- .../standard/vclxaccessiblecheckbox.cxx | 37 ++++++---------- .../standard/vclxaccessiblecombobox.cxx | 37 ++++++---------- .../vclxaccessibledropdowncombobox.cxx | 37 ++++++---------- .../vclxaccessibledropdownlistbox.cxx | 37 ++++++---------- .../source/standard/vclxaccessibleedit.cxx | 37 ++++++---------- .../standard/vclxaccessiblefixedhyperlink.cxx | 37 ++++++---------- .../standard/vclxaccessiblefixedtext.cxx | 37 ++++++---------- .../source/standard/vclxaccessiblelistbox.cxx | 37 ++++++---------- .../standard/vclxaccessiblelistitem.cxx | 37 ++++++---------- .../source/standard/vclxaccessiblemenu.cxx | 37 ++++++---------- .../source/standard/vclxaccessiblemenubar.cxx | 37 ++++++---------- .../standard/vclxaccessiblemenuitem.cxx | 37 ++++++---------- .../standard/vclxaccessiblemenuseparator.cxx | 37 ++++++---------- .../standard/vclxaccessiblepopupmenu.cxx | 37 ++++++---------- .../standard/vclxaccessibleradiobutton.cxx | 37 ++++++---------- .../standard/vclxaccessiblescrollbar.cxx | 37 ++++++---------- .../standard/vclxaccessiblestatusbar.cxx | 37 ++++++---------- .../standard/vclxaccessiblestatusbaritem.cxx | 37 ++++++---------- .../standard/vclxaccessibletabcontrol.cxx | 37 ++++++---------- .../source/standard/vclxaccessibletabpage.cxx | 37 ++++++---------- .../standard/vclxaccessibletextfield.cxx | 37 ++++++---------- .../source/standard/vclxaccessibletoolbox.cxx | 37 ++++++---------- .../standard/vclxaccessibletoolboxitem.cxx | 37 ++++++---------- dbaccess/Makefile | 7 +++ .../qa/complex/dbaccess/CopyTableWizard.java | 37 ++++++---------- dbaccess/source/core/api/KeySet.cxx | 38 ++++++---------- dbaccess/source/ui/browser/dbtreeview.cxx | 37 ++++++---------- dbaccess/source/ui/browser/unodatbr.cxx | 37 ++++++---------- .../source/ui/querydesign/QTableWindow.cxx | 37 ++++++---------- .../source/ui/tabledesign/FieldDescGenWin.cxx | 37 ++++++---------- .../ui/tabledesign/TableDesignHelpBar.cxx | 37 ++++++---------- embeddedobj/Makefile | 7 +++ embeddedobj/qa/embedding/makefile.mk | 33 ++++++-------- .../source/commonembedding/embedobj.cxx | 37 ++++++---------- .../source/commonembedding/inplaceobj.cxx | 37 ++++++---------- .../source/commonembedding/miscobj.cxx | 37 ++++++---------- .../source/commonembedding/persistence.cxx | 37 ++++++---------- .../source/commonembedding/register.cxx | 37 ++++++---------- .../source/commonembedding/specialobject.cxx | 37 ++++++---------- embeddedobj/source/commonembedding/visobj.cxx | 37 ++++++---------- .../source/commonembedding/xfactory.cxx | 37 ++++++---------- embeddedobj/source/general/docholder.cxx | 37 ++++++---------- embeddedobj/source/general/dummyobject.cxx | 37 ++++++---------- embeddedobj/source/general/intercept.cxx | 37 ++++++---------- embeddedobj/source/general/xcreator.cxx | 37 ++++++---------- embeddedobj/source/inc/commonembobj.hxx | 37 ++++++---------- embeddedobj/source/inc/docholder.hxx | 37 ++++++---------- embeddedobj/source/inc/dummyobject.hxx | 37 ++++++---------- embeddedobj/source/inc/oleembobj.hxx | 37 ++++++---------- embeddedobj/source/msole/closepreventer.cxx | 37 ++++++---------- embeddedobj/source/msole/emboleobj.component | 43 ++++++++----------- .../source/msole/emboleobj.windows.component | 43 ++++++++----------- embeddedobj/source/msole/graphconvert.cxx | 37 ++++++---------- embeddedobj/source/msole/olecomponent.cxx | 37 ++++++---------- embeddedobj/source/msole/oleembed.cxx | 37 ++++++---------- embeddedobj/source/msole/olemisc.cxx | 37 ++++++---------- embeddedobj/source/msole/olepersist.cxx | 37 ++++++---------- embeddedobj/source/msole/oleregister.cxx | 37 ++++++---------- embeddedobj/source/msole/olevisual.cxx | 37 ++++++---------- embeddedobj/source/msole/ownview.cxx | 37 ++++++---------- embeddedobj/source/msole/xdialogcreator.cxx | 37 ++++++---------- embeddedobj/source/msole/xolefactory.cxx | 37 ++++++---------- .../test/Container1/nativelib/nativeview.c | 37 ++++++---------- .../test/MainThreadExecutor/register.cxx | 37 ++++++---------- .../test/MainThreadExecutor/xexecutor.cxx | 37 ++++++---------- .../test/MainThreadExecutor/xexecutor.hxx | 37 ++++++---------- embeddedobj/test/mtexecutor/bitmapcreator.cxx | 37 ++++++---------- .../test/mtexecutor/mainthreadexecutor.cxx | 37 ++++++---------- embeddedobj/test/mtexecutor/mteregister.cxx | 37 ++++++---------- embeddedobj/util/embobj.component | 43 ++++++++----------- l10ntools/Makefile | 7 +++ l10ntools/inc/cfgmerge.hxx | 37 ++++++---------- l10ntools/inc/export.hxx | 37 ++++++---------- l10ntools/inc/gsicheck.hxx | 37 ++++++---------- l10ntools/inc/helpmerge.hxx | 37 ++++++---------- l10ntools/inc/l10ntools/directory.hxx | 18 ++++++++ l10ntools/inc/l10ntools/file.hxx | 18 ++++++++ l10ntools/inc/lngmerge.hxx | 37 ++++++---------- l10ntools/inc/tagtest.hxx | 37 ++++++---------- l10ntools/inc/xmlparse.hxx | 37 ++++++---------- l10ntools/inc/xrmmerge.hxx | 37 ++++++---------- l10ntools/scripts/fast_merge.pl | 33 ++++++-------- l10ntools/scripts/keyidGen.pl | 35 ++++++--------- l10ntools/source/cfg_yy_wrapper.c | 18 ++++++++ l10ntools/source/cfglex.l | 19 +++++++- l10ntools/source/cfgmerge.cxx | 37 ++++++---------- l10ntools/source/directory.cxx | 37 ++++++---------- l10ntools/source/export.cxx | 37 ++++++---------- l10ntools/source/export2.cxx | 37 ++++++---------- l10ntools/source/file.cxx | 37 ++++++---------- l10ntools/source/filter/merge/FCFGMerge.cfg | 33 ++++++-------- l10ntools/source/helpex.cxx | 37 ++++++---------- l10ntools/source/helpmerge.cxx | 37 ++++++---------- l10ntools/source/lngex.cxx | 37 ++++++---------- l10ntools/source/lngmerge.cxx | 37 ++++++---------- l10ntools/source/localize.cxx | 37 ++++++---------- l10ntools/source/merge.cxx | 37 ++++++---------- l10ntools/source/src_yy_wrapper.c | 18 ++++++++ l10ntools/source/srclex.l | 19 +++++++- l10ntools/source/tagtest.cxx | 37 ++++++---------- l10ntools/source/xmlparse.cxx | 37 ++++++---------- l10ntools/source/xrm_yy_wrapper.c | 18 ++++++++ l10ntools/source/xrmlex.l | 19 +++++++- l10ntools/source/xrmmerge.cxx | 37 ++++++---------- ucpp/Makefile | 7 +++ 148 files changed, 2074 insertions(+), 3111 deletions(-) diff --git a/accessibility/Makefile b/accessibility/Makefile index ccb1c85a04da..0997e628485b 100644 --- a/accessibility/Makefile +++ b/accessibility/Makefile @@ -1,4 +1,11 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) diff --git a/accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge.component b/accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge.component index 5fc897f2d5aa..a1194a1c7744 100644 --- a/accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge.component +++ b/accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge.component @@ -1,30 +1,21 @@ - + diff --git a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx index e2dcbf94fd72..cb0fa441fc49 100644 --- a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx +++ b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifdef WNT #include diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx index 4f95f5ad831d..da27f56be52b 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef ACCESSIBILITY_EXT_ACCESSIBLEBROWSEBOXBASE_HXX diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx index 81bdf2a7cd8b..44cdbd8c7384 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef ACCESSIBILITY_EXT_ACCESSIBLEGRIDCONTROL_HXX diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx index c032e38d3959..2aca835f6faa 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef ACCESSIBILITY_EXT_ACCESSIBLEGRIDCONTROLBASE_HXX diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx index 95acb0d31371..76eaae442023 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef ACCESSIBILITY_EXT_ACCESSIBLEGRIDCONTROLTABLE_HXX diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx index 54491c24272e..aac97c540813 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef ACCESSIBILITY_EXT_ACCESSIBLEGRIDCONTROLTABLEBASE_HXX diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx index 15309e9d17d2..a06758f66ea1 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef ACCESSIBILITY_EXT_ACCESSIBILEGRIDCONTROLTABLECELL_HXX #define ACCESSIBILITY_EXT_ACCESSIBILEGRIDCONTROLTABLECELL_HXX diff --git a/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx b/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx index e8d28fe18dc5..93116ff88e10 100644 --- a/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx +++ b/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef ACCESSIBILITY_EXT_ACCESSIBLEICONCHOICECTRLENTRY_HXX_ #define ACCESSIBILITY_EXT_ACCESSIBLEICONCHOICECTRLENTRY_HXX_ diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx index e1d2ce19df06..6adbd2a0fd41 100644 --- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx +++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_ACCESSIBILITY_TEXTWINDOWACCESSIBILITY_HXX #define INCLUDED_ACCESSIBILITY_TEXTWINDOWACCESSIBILITY_HXX diff --git a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx b/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx index c4d32196cd99..c4eca89dd011 100644 --- a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx +++ b/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef ACCESSIBILITY_HELPER_COMBOLISTBOXHELPER_HXX #define ACCESSIBILITY_HELPER_COMBOLISTBOXHELPER_HXX diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx index 42d71501435c..dfcd8e56428a 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/AccessibleBrowseBoxBase.hxx" #include diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx index b59ad51d85f6..f5703766399c 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx" #include diff --git a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx index d5cf0ef1c6ee..77dd2d4ba7da 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/AccessibleBrowseBoxTable.hxx" #include diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx index cebe6681775d..981302ea6d15 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/AccessibleBrowseBoxTableBase.hxx" #include diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx index 9d0f65e61bc6..556e53aa0ee3 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/AccessibleBrowseBoxTableCell.hxx" diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx index e8058eab628d..ace45d2c8c3e 100644 --- a/accessibility/source/extended/AccessibleGridControl.cxx +++ b/accessibility/source/extended/AccessibleGridControl.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/AccessibleGridControl.hxx" #include "accessibility/extended/AccessibleGridControlTable.hxx" diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx index 4583363da7e5..8d71c2605b86 100644 --- a/accessibility/source/extended/AccessibleGridControlBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlBase.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/AccessibleGridControlBase.hxx" #include diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx index 609000d3d62a..3f431f9c49d5 100644 --- a/accessibility/source/extended/AccessibleGridControlHeader.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/AccessibleGridControlHeader.hxx" #include "accessibility/extended/AccessibleGridControlHeaderCell.hxx" diff --git a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx index 8ad0a949ff6c..548c21b05e5b 100644 --- a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/AccessibleGridControlHeaderCell.hxx" diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx index b0e2e4e6c02b..3b08eadfd62f 100644 --- a/accessibility/source/extended/AccessibleGridControlTable.cxx +++ b/accessibility/source/extended/AccessibleGridControlTable.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/AccessibleGridControlTable.hxx" #include "accessibility/extended/AccessibleGridControlTableCell.hxx" diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx index a869352eb2f9..f6d75707dade 100644 --- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableBase.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/AccessibleGridControlTableBase.hxx" #include diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx index f32eec0a1f1f..1f700880b1f0 100644 --- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/AccessibleGridControlTableCell.hxx" diff --git a/accessibility/source/extended/AccessibleToolPanelDeck.cxx b/accessibility/source/extended/AccessibleToolPanelDeck.cxx index bba762fc2b19..e9865de31801 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeck.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeck.cxx @@ -1,29 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/* + * This file is part of the LibreOffice project. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * OpenOffice.org - a multi-platform office productivity suite + * This file incorporates work covered by the following license notice: * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/AccessibleToolPanelDeck.hxx" diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx index 896ebad79647..a1dd5ab94835 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx @@ -1,29 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/* + * This file is part of the LibreOffice project. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * OpenOffice.org - a multi-platform office productivity suite + * This file incorporates work covered by the following license notice: * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/AccessibleToolPanelDeckTabBar.hxx" diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx index 998f83e20e58..a17ce8d153b7 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx @@ -1,29 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/* + * This file is part of the LibreOffice project. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * OpenOffice.org - a multi-platform office productivity suite + * This file incorporates work covered by the following license notice: * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx" diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx index dad1e74dcf32..e9c312267140 100644 --- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx +++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx index 16202db1ad39..869ec89571f4 100644 --- a/accessibility/source/extended/accessibleiconchoicectrl.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/accessibleiconchoicectrl.hxx" #include "accessibility/extended/accessibleiconchoicectrlentry.hxx" diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx index 7de4248be5aa..01ea6fdbca68 100644 --- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx index b491aa99edb4..68f056315e2a 100644 --- a/accessibility/source/extended/accessiblelistboxentry.cxx +++ b/accessibility/source/extended/accessiblelistboxentry.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/accessiblelistboxentry.hxx" #include diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx index 05259f1b4735..ee34dd868206 100644 --- a/accessibility/source/extended/accessibletabbar.cxx +++ b/accessibility/source/extended/accessibletabbar.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/extended/accessibletabbarpage.cxx b/accessibility/source/extended/accessibletabbarpage.cxx index 0751ae8cd79b..5d84d4956c97 100644 --- a/accessibility/source/extended/accessibletabbarpage.cxx +++ b/accessibility/source/extended/accessibletabbarpage.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx index f54616e7a7be..eed67bed01a0 100644 --- a/accessibility/source/extended/accessibletabbarpagelist.cxx +++ b/accessibility/source/extended/accessibletabbarpagelist.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/extended/accessibletablistbox.cxx b/accessibility/source/extended/accessibletablistbox.cxx index cca3a4431078..a277a447f1aa 100644 --- a/accessibility/source/extended/accessibletablistbox.cxx +++ b/accessibility/source/extended/accessibletablistbox.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/accessibletablistbox.hxx" diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx index 0c0570d24624..1ddaff3ec234 100644 --- a/accessibility/source/extended/accessibletablistboxtable.cxx +++ b/accessibility/source/extended/accessibletablistboxtable.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "accessibility/extended/accessibletablistboxtable.hxx" diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index 3fb4c8f6cd35..9f48b1a1ae2c 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx index 1f14f7dd5800..dc16fe664992 100644 --- a/accessibility/source/helper/acc_factory.cxx +++ b/accessibility/source/helper/acc_factory.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/helper/accresmgr.cxx b/accessibility/source/helper/accresmgr.cxx index 9ab4d1d91942..3df874460a48 100644 --- a/accessibility/source/helper/accresmgr.cxx +++ b/accessibility/source/helper/accresmgr.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/accessibility/source/helper/characterattributeshelper.cxx b/accessibility/source/helper/characterattributeshelper.cxx index a609e9936282..56fd3f8327d8 100644 --- a/accessibility/source/helper/characterattributeshelper.cxx +++ b/accessibility/source/helper/characterattributeshelper.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx index 2d38b685529c..b60504cd4bc1 100644 --- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx +++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx index d48fec71ff31..6676b15e3159 100644 --- a/accessibility/source/standard/vclxaccessiblebox.cxx +++ b/accessibility/source/standard/vclxaccessiblebox.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx index 8ba61069761d..e433811259a3 100644 --- a/accessibility/source/standard/vclxaccessiblebutton.cxx +++ b/accessibility/source/standard/vclxaccessiblebutton.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx b/accessibility/source/standard/vclxaccessiblecheckbox.cxx index 878e7648d8c1..d3b72f6cb22f 100644 --- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx +++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/accessibility/source/standard/vclxaccessiblecombobox.cxx b/accessibility/source/standard/vclxaccessiblecombobox.cxx index 7da7de7a50ae..5468b2e865cd 100644 --- a/accessibility/source/standard/vclxaccessiblecombobox.cxx +++ b/accessibility/source/standard/vclxaccessiblecombobox.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx index 808ada19f8ef..63e4241e7597 100644 --- a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx +++ b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx index 504d289800a9..cd5c507cefa2 100644 --- a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx +++ b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx index 95fda2b55abd..60b8414c0c6f 100644 --- a/accessibility/source/standard/vclxaccessibleedit.cxx +++ b/accessibility/source/standard/vclxaccessibleedit.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx b/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx index 96d000de97d8..827ef624f97b 100644 --- a/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx +++ b/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/accessibility/source/standard/vclxaccessiblefixedtext.cxx b/accessibility/source/standard/vclxaccessiblefixedtext.cxx index aca45fb554aa..786ca60b48fc 100644 --- a/accessibility/source/standard/vclxaccessiblefixedtext.cxx +++ b/accessibility/source/standard/vclxaccessiblefixedtext.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/accessibility/source/standard/vclxaccessiblelistbox.cxx b/accessibility/source/standard/vclxaccessiblelistbox.cxx index 0f8f35d960e5..1ee48a81fac0 100644 --- a/accessibility/source/standard/vclxaccessiblelistbox.cxx +++ b/accessibility/source/standard/vclxaccessiblelistbox.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx index af2a57c94d0c..a4bc12f3d217 100644 --- a/accessibility/source/standard/vclxaccessiblelistitem.cxx +++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/standard/vclxaccessiblemenu.cxx b/accessibility/source/standard/vclxaccessiblemenu.cxx index b45e35b7a9db..625a0db49416 100644 --- a/accessibility/source/standard/vclxaccessiblemenu.cxx +++ b/accessibility/source/standard/vclxaccessiblemenu.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/accessibility/source/standard/vclxaccessiblemenubar.cxx b/accessibility/source/standard/vclxaccessiblemenubar.cxx index cea52f42fc32..6f9f6a98aa02 100644 --- a/accessibility/source/standard/vclxaccessiblemenubar.cxx +++ b/accessibility/source/standard/vclxaccessiblemenubar.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx index 6ec29ad89b28..ff70acb4160d 100644 --- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx +++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/standard/vclxaccessiblemenuseparator.cxx b/accessibility/source/standard/vclxaccessiblemenuseparator.cxx index b239ea48c92a..633bdf1e5fac 100644 --- a/accessibility/source/standard/vclxaccessiblemenuseparator.cxx +++ b/accessibility/source/standard/vclxaccessiblemenuseparator.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx index 7ecfde472283..5e90402186e4 100644 --- a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx +++ b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx index c821700a0a65..2c6df31227c8 100644 --- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx +++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/accessibility/source/standard/vclxaccessiblescrollbar.cxx b/accessibility/source/standard/vclxaccessiblescrollbar.cxx index 5dc9e0ea6fb4..c87cdc4c6831 100644 --- a/accessibility/source/standard/vclxaccessiblescrollbar.cxx +++ b/accessibility/source/standard/vclxaccessiblescrollbar.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/accessibility/source/standard/vclxaccessiblestatusbar.cxx b/accessibility/source/standard/vclxaccessiblestatusbar.cxx index 327cf7bfc13f..a5c3da98c2cf 100644 --- a/accessibility/source/standard/vclxaccessiblestatusbar.cxx +++ b/accessibility/source/standard/vclxaccessiblestatusbar.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx index 889e25b96dbe..650dcfd4b921 100644 --- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx +++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx b/accessibility/source/standard/vclxaccessibletabcontrol.cxx index e34ef52868dc..a40796bead2c 100644 --- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx +++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx b/accessibility/source/standard/vclxaccessibletabpage.cxx index 7a1f1545ad25..144e62562031 100644 --- a/accessibility/source/standard/vclxaccessibletabpage.cxx +++ b/accessibility/source/standard/vclxaccessibletabpage.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/standard/vclxaccessibletextfield.cxx b/accessibility/source/standard/vclxaccessibletextfield.cxx index f38331f27714..44c6df487765 100644 --- a/accessibility/source/standard/vclxaccessibletextfield.cxx +++ b/accessibility/source/standard/vclxaccessibletextfield.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx index e2ca26e28172..759ed9687bcf 100644 --- a/accessibility/source/standard/vclxaccessibletoolbox.cxx +++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx index 347fcf1548d7..e7e9f30815cb 100644 --- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx +++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/dbaccess/Makefile b/dbaccess/Makefile index ccb1c85a04da..0997e628485b 100644 --- a/dbaccess/Makefile +++ b/dbaccess/Makefile @@ -1,4 +1,11 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) diff --git a/dbaccess/qa/complex/dbaccess/CopyTableWizard.java b/dbaccess/qa/complex/dbaccess/CopyTableWizard.java index 0da7775e7c30..68fba3ddb793 100644 --- a/dbaccess/qa/complex/dbaccess/CopyTableWizard.java +++ b/dbaccess/qa/complex/dbaccess/CopyTableWizard.java @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ package complex.dbaccess; import com.sun.star.accessibility.XAccessible; diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index c2dadcdf5893..6a520cf49fe1 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -1,31 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle andor its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "KeySet.hxx" #include "core_resource.hxx" diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx b/dbaccess/source/ui/browser/dbtreeview.cxx index 332681de8edd..b557766fe3d3 100644 --- a/dbaccess/source/ui/browser/dbtreeview.cxx +++ b/dbaccess/source/ui/browser/dbtreeview.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "dbtreeview.hxx" diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 843114fbb351..2b47defe48ad 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "browserids.hxx" diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx index f77aba68a657..0bcbb0e0ed48 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.cxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "QTableWindow.hxx" #include "QueryTableView.hxx" diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx index c0746df95719..cbbf61bf0a21 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "FieldDescGenWin.hxx" #include diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx index cbc2d3e3a75b..60907222b68b 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "TableDesignHelpBar.hxx" #include diff --git a/embeddedobj/Makefile b/embeddedobj/Makefile index ccb1c85a04da..0997e628485b 100644 --- a/embeddedobj/Makefile +++ b/embeddedobj/Makefile @@ -1,4 +1,11 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) diff --git a/embeddedobj/qa/embedding/makefile.mk b/embeddedobj/qa/embedding/makefile.mk index 2ed625910b89..483440c22f91 100644 --- a/embeddedobj/qa/embedding/makefile.mk +++ b/embeddedobj/qa/embedding/makefile.mk @@ -1,29 +1,20 @@ -#************************************************************************* # -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. +# This file is part of the LibreOffice project. # -# OpenOffice.org - a multi-platform office productivity suite +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# This file is part of OpenOffice.org. +# This file incorporates work covered by the following license notice: # -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . # -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* PRJ = ..$/.. TARGET = EmbeddingUnitTest diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx index ae8ef08665d6..df75afe66b9b 100644 --- a/embeddedobj/source/commonembedding/embedobj.cxx +++ b/embeddedobj/source/commonembedding/embedobj.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/commonembedding/inplaceobj.cxx b/embeddedobj/source/commonembedding/inplaceobj.cxx index 5d8fe3300656..731603a6e8e9 100644 --- a/embeddedobj/source/commonembedding/inplaceobj.cxx +++ b/embeddedobj/source/commonembedding/inplaceobj.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx index ae8f302051c8..2946d7fc3537 100644 --- a/embeddedobj/source/commonembedding/miscobj.cxx +++ b/embeddedobj/source/commonembedding/miscobj.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx index f881f108f022..a54f3a9f3bd0 100644 --- a/embeddedobj/source/commonembedding/persistence.cxx +++ b/embeddedobj/source/commonembedding/persistence.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/commonembedding/register.cxx b/embeddedobj/source/commonembedding/register.cxx index fe20fe0e79e4..d8fcaf7631f6 100644 --- a/embeddedobj/source/commonembedding/register.cxx +++ b/embeddedobj/source/commonembedding/register.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/commonembedding/specialobject.cxx b/embeddedobj/source/commonembedding/specialobject.cxx index c176a7f46851..62543b846d69 100644 --- a/embeddedobj/source/commonembedding/specialobject.cxx +++ b/embeddedobj/source/commonembedding/specialobject.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/commonembedding/visobj.cxx b/embeddedobj/source/commonembedding/visobj.cxx index 4c8d353a556a..56cdc983f5d5 100644 --- a/embeddedobj/source/commonembedding/visobj.cxx +++ b/embeddedobj/source/commonembedding/visobj.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/commonembedding/xfactory.cxx b/embeddedobj/source/commonembedding/xfactory.cxx index 3bef21d016fa..ec29edae881a 100644 --- a/embeddedobj/source/commonembedding/xfactory.cxx +++ b/embeddedobj/source/commonembedding/xfactory.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index 2f9e617230e5..65235d0f4d17 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/general/dummyobject.cxx b/embeddedobj/source/general/dummyobject.cxx index eac8a8aa94af..057fe8a7c245 100644 --- a/embeddedobj/source/general/dummyobject.cxx +++ b/embeddedobj/source/general/dummyobject.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/general/intercept.cxx b/embeddedobj/source/general/intercept.cxx index 8c9be5039b7e..88256898534e 100644 --- a/embeddedobj/source/general/intercept.cxx +++ b/embeddedobj/source/general/intercept.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/general/xcreator.cxx b/embeddedobj/source/general/xcreator.cxx index 99c265ebe583..599fc7ce2df2 100644 --- a/embeddedobj/source/general/xcreator.cxx +++ b/embeddedobj/source/general/xcreator.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/inc/commonembobj.hxx b/embeddedobj/source/inc/commonembobj.hxx index 5d366b119888..bf0dc1aed03d 100644 --- a/embeddedobj/source/inc/commonembobj.hxx +++ b/embeddedobj/source/inc/commonembobj.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _INC_COMMONEMBOBJ_HXX_ #define _INC_COMMONEMBOBJ_HXX_ diff --git a/embeddedobj/source/inc/docholder.hxx b/embeddedobj/source/inc/docholder.hxx index b5401b0aade2..7c8f1057f3de 100644 --- a/embeddedobj/source/inc/docholder.hxx +++ b/embeddedobj/source/inc/docholder.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _DOCHOLDER_HXX_ #define _DOCHOLDER_HXX_ diff --git a/embeddedobj/source/inc/dummyobject.hxx b/embeddedobj/source/inc/dummyobject.hxx index 9bee699f7750..8f1f1e9594dc 100644 --- a/embeddedobj/source/inc/dummyobject.hxx +++ b/embeddedobj/source/inc/dummyobject.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _INC_DUMMYOBJECT_HXX_ #define _INC_DUMMYOBJECT_HXX_ diff --git a/embeddedobj/source/inc/oleembobj.hxx b/embeddedobj/source/inc/oleembobj.hxx index 52e03da7d7d8..747ab415833e 100644 --- a/embeddedobj/source/inc/oleembobj.hxx +++ b/embeddedobj/source/inc/oleembobj.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _INC_OLEEMBOBJ_HXX_ #define _INC_OLEEMBOBJ_HXX_ diff --git a/embeddedobj/source/msole/closepreventer.cxx b/embeddedobj/source/msole/closepreventer.cxx index 4b9484d95d06..a7b845b8c56f 100644 --- a/embeddedobj/source/msole/closepreventer.cxx +++ b/embeddedobj/source/msole/closepreventer.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "closepreventer.hxx" diff --git a/embeddedobj/source/msole/emboleobj.component b/embeddedobj/source/msole/emboleobj.component index 96f8ed0d8d57..e9b5ea14eaa9 100644 --- a/embeddedobj/source/msole/emboleobj.component +++ b/embeddedobj/source/msole/emboleobj.component @@ -1,30 +1,21 @@ - + diff --git a/embeddedobj/source/msole/emboleobj.windows.component b/embeddedobj/source/msole/emboleobj.windows.component index 644a1d4f19a1..d70f7dc397bd 100644 --- a/embeddedobj/source/msole/emboleobj.windows.component +++ b/embeddedobj/source/msole/emboleobj.windows.component @@ -1,30 +1,21 @@ - + diff --git a/embeddedobj/source/msole/graphconvert.cxx b/embeddedobj/source/msole/graphconvert.cxx index 77caf58c7910..b1f69c4cdf6a 100644 --- a/embeddedobj/source/msole/graphconvert.cxx +++ b/embeddedobj/source/msole/graphconvert.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx index 4389a2cc505d..2acb811863b9 100644 --- a/embeddedobj/source/msole/olecomponent.cxx +++ b/embeddedobj/source/msole/olecomponent.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx index d829944a6d1d..9938ae91fdcd 100644 --- a/embeddedobj/source/msole/oleembed.cxx +++ b/embeddedobj/source/msole/oleembed.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx index 5947ae2bba9b..b0fddcaa3df2 100644 --- a/embeddedobj/source/msole/olemisc.cxx +++ b/embeddedobj/source/msole/olemisc.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx index edebfc3e1a3d..31563944c214 100644 --- a/embeddedobj/source/msole/olepersist.cxx +++ b/embeddedobj/source/msole/olepersist.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/msole/oleregister.cxx b/embeddedobj/source/msole/oleregister.cxx index 608e69ffa395..28b40291a9b3 100644 --- a/embeddedobj/source/msole/oleregister.cxx +++ b/embeddedobj/source/msole/oleregister.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/msole/olevisual.cxx b/embeddedobj/source/msole/olevisual.cxx index 617d8e4d7ea4..c517a7445248 100644 --- a/embeddedobj/source/msole/olevisual.cxx +++ b/embeddedobj/source/msole/olevisual.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx index a9bec9648a3e..d92b305d0b63 100644 --- a/embeddedobj/source/msole/ownview.cxx +++ b/embeddedobj/source/msole/ownview.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/msole/xdialogcreator.cxx b/embeddedobj/source/msole/xdialogcreator.cxx index c5e8a5f9a9a4..5cd43ac71f68 100644 --- a/embeddedobj/source/msole/xdialogcreator.cxx +++ b/embeddedobj/source/msole/xdialogcreator.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/source/msole/xolefactory.cxx b/embeddedobj/source/msole/xolefactory.cxx index 27cd1017aebc..2d5b35a0863f 100644 --- a/embeddedobj/source/msole/xolefactory.cxx +++ b/embeddedobj/source/msole/xolefactory.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/test/Container1/nativelib/nativeview.c b/embeddedobj/test/Container1/nativelib/nativeview.c index 0de1018050cc..8f5e4c7ad5e8 100644 --- a/embeddedobj/test/Container1/nativelib/nativeview.c +++ b/embeddedobj/test/Container1/nativelib/nativeview.c @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - *************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifdef WNT diff --git a/embeddedobj/test/MainThreadExecutor/register.cxx b/embeddedobj/test/MainThreadExecutor/register.cxx index 6a2e10d6d66d..ab21864711c6 100644 --- a/embeddedobj/test/MainThreadExecutor/register.cxx +++ b/embeddedobj/test/MainThreadExecutor/register.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/test/MainThreadExecutor/xexecutor.cxx b/embeddedobj/test/MainThreadExecutor/xexecutor.cxx index 58c211809b72..f5cb25e20146 100644 --- a/embeddedobj/test/MainThreadExecutor/xexecutor.cxx +++ b/embeddedobj/test/MainThreadExecutor/xexecutor.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "xexecutor.hxx" #include diff --git a/embeddedobj/test/MainThreadExecutor/xexecutor.hxx b/embeddedobj/test/MainThreadExecutor/xexecutor.hxx index 4b200d33eecc..97213d543aec 100644 --- a/embeddedobj/test/MainThreadExecutor/xexecutor.hxx +++ b/embeddedobj/test/MainThreadExecutor/xexecutor.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef __XFACTORY_HXX_ #define __XFACTORY_HXX_ diff --git a/embeddedobj/test/mtexecutor/bitmapcreator.cxx b/embeddedobj/test/mtexecutor/bitmapcreator.cxx index 4fe00521030b..fdc86df45e9e 100644 --- a/embeddedobj/test/mtexecutor/bitmapcreator.cxx +++ b/embeddedobj/test/mtexecutor/bitmapcreator.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "bitmapcreator.hxx" diff --git a/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx b/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx index 7612156feea0..828abef803be 100644 --- a/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx +++ b/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "mainthreadexecutor.hxx" diff --git a/embeddedobj/test/mtexecutor/mteregister.cxx b/embeddedobj/test/mtexecutor/mteregister.cxx index 937f1750fcad..33f98dc272d7 100644 --- a/embeddedobj/test/mtexecutor/mteregister.cxx +++ b/embeddedobj/test/mtexecutor/mteregister.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/embeddedobj/util/embobj.component b/embeddedobj/util/embobj.component index f7a9c2e7b3fb..1fdab5080375 100644 --- a/embeddedobj/util/embobj.component +++ b/embeddedobj/util/embobj.component @@ -1,30 +1,21 @@ - + diff --git a/l10ntools/Makefile b/l10ntools/Makefile index ccb1c85a04da..0997e628485b 100644 --- a/l10ntools/Makefile +++ b/l10ntools/Makefile @@ -1,4 +1,11 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx index c554aaf9246f..316c9dee2181 100644 --- a/l10ntools/inc/cfgmerge.hxx +++ b/l10ntools/inc/cfgmerge.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _CFG_MERGE_HXX #define _CFG_MERGE_HXX diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx index be243600d6a6..9a4ce788ec77 100644 --- a/l10ntools/inc/export.hxx +++ b/l10ntools/inc/export.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _EXPORT_HXX #define _EXPORT_HXX diff --git a/l10ntools/inc/gsicheck.hxx b/l10ntools/inc/gsicheck.hxx index 467925e46767..8d8992d2f6de 100644 --- a/l10ntools/inc/gsicheck.hxx +++ b/l10ntools/inc/gsicheck.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _GSICHECK_HXX_ #define _GSICHECK_HXX_ diff --git a/l10ntools/inc/helpmerge.hxx b/l10ntools/inc/helpmerge.hxx index bc2a6afa253f..34dfdc7eb472 100644 --- a/l10ntools/inc/helpmerge.hxx +++ b/l10ntools/inc/helpmerge.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "export.hxx" #include "xmlparse.hxx" diff --git a/l10ntools/inc/l10ntools/directory.hxx b/l10ntools/inc/l10ntools/directory.hxx index d70e5fe333fa..ad192ec7dc55 100644 --- a/l10ntools/inc/l10ntools/directory.hxx +++ b/l10ntools/inc/l10ntools/directory.hxx @@ -1,4 +1,22 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + #include #include #include diff --git a/l10ntools/inc/l10ntools/file.hxx b/l10ntools/inc/l10ntools/file.hxx index fae252e5f926..8c900ddd333f 100644 --- a/l10ntools/inc/l10ntools/file.hxx +++ b/l10ntools/inc/l10ntools/file.hxx @@ -1,4 +1,22 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + #include "rtl/ustring.hxx" namespace transex diff --git a/l10ntools/inc/lngmerge.hxx b/l10ntools/inc/lngmerge.hxx index dd9cbf6359d0..6391d1c25b3f 100644 --- a/l10ntools/inc/lngmerge.hxx +++ b/l10ntools/inc/lngmerge.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/l10ntools/inc/tagtest.hxx b/l10ntools/inc/tagtest.hxx index b546be2bab1e..a6ccec4d73ea 100644 --- a/l10ntools/inc/tagtest.hxx +++ b/l10ntools/inc/tagtest.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _TAGTEST_HXX_ #define _TAGTEST_HXX_ diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx index 36fdd608e45c..0fedb2b7a6d8 100644 --- a/l10ntools/inc/xmlparse.hxx +++ b/l10ntools/inc/xmlparse.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef BOOTSTRP_XMLPARSE_HXX #define BOOTSTRP_XMLPARSE_HXX diff --git a/l10ntools/inc/xrmmerge.hxx b/l10ntools/inc/xrmmerge.hxx index b80d37aaa5fa..e9839cee2288 100644 --- a/l10ntools/inc/xrmmerge.hxx +++ b/l10ntools/inc/xrmmerge.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/l10ntools/scripts/fast_merge.pl b/l10ntools/scripts/fast_merge.pl index 7074beaa3ff5..bd204870169d 100644 --- a/l10ntools/scripts/fast_merge.pl +++ b/l10ntools/scripts/fast_merge.pl @@ -1,32 +1,23 @@ : eval 'exec perl -wS $0 ${1+"$@"}' if 0; -#************************************************************************* # -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# This file is part of the LibreOffice project. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# OpenOffice.org - a multi-platform office productivity suite +# This file incorporates work covered by the following license notice: # -# This file is part of OpenOffice.org. +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . # -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* use strict; use Class::Struct; diff --git a/l10ntools/scripts/keyidGen.pl b/l10ntools/scripts/keyidGen.pl index cf95b2937830..6747ef15b022 100644 --- a/l10ntools/scripts/keyidGen.pl +++ b/l10ntools/scripts/keyidGen.pl @@ -1,32 +1,23 @@ -: +: eval 'exec perl -S $0 ${1+"$@"}' if 0; -#************************************************************************* # -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# This file is part of the LibreOffice project. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# OpenOffice.org - a multi-platform office productivity suite +# This file incorporates work covered by the following license notice: # -# This file is part of OpenOffice.org. +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . # -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* # # add keyids to sdf file # diff --git a/l10ntools/source/cfg_yy_wrapper.c b/l10ntools/source/cfg_yy_wrapper.c index b22d2a77cd87..485ce0ab6b7e 100644 --- a/l10ntools/source/cfg_yy_wrapper.c +++ b/l10ntools/source/cfg_yy_wrapper.c @@ -1,4 +1,22 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + // Helper to suppress warnings in lex generated c code, see #i57362# #include "cfg_yy.c" diff --git a/l10ntools/source/cfglex.l b/l10ntools/source/cfglex.l index 16ddf289fda3..3ace0a7c3563 100644 --- a/l10ntools/source/cfglex.l +++ b/l10ntools/source/cfglex.l @@ -1,7 +1,24 @@ %{ /* - * lexer for parsing cfg source files + * This file is part of the LibreOffice project. * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +/* + * lexer for parsing cfg source files */ /* enlarge token buffer to tokenize whole strings */ diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx index cca19c9bc1b1..41db0973fb47 100644 --- a/l10ntools/source/cfgmerge.cxx +++ b/l10ntools/source/cfgmerge.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "common.hxx" #include "sal/config.h" diff --git a/l10ntools/source/directory.cxx b/l10ntools/source/directory.cxx index c2c73ea6a863..468bfbd67837 100644 --- a/l10ntools/source/directory.cxx +++ b/l10ntools/source/directory.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx index 9cc3a56c296a..8fe8057188c3 100644 --- a/l10ntools/source/export.cxx +++ b/l10ntools/source/export.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/l10ntools/source/export2.cxx b/l10ntools/source/export2.cxx index 013ae90d164f..726f36a59541 100644 --- a/l10ntools/source/export2.cxx +++ b/l10ntools/source/export2.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/l10ntools/source/file.cxx b/l10ntools/source/file.cxx index d9d50553a979..be4fdde8c687 100644 --- a/l10ntools/source/file.cxx +++ b/l10ntools/source/file.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/l10ntools/source/filter/merge/FCFGMerge.cfg b/l10ntools/source/filter/merge/FCFGMerge.cfg index cae30bdd0260..4516a777bc57 100644 --- a/l10ntools/source/filter/merge/FCFGMerge.cfg +++ b/l10ntools/source/filter/merge/FCFGMerge.cfg @@ -1,29 +1,20 @@ -#************************************************************************* # -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. +# This file is part of the LibreOffice project. # -# OpenOffice.org - a multi-platform office productivity suite +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# This file is part of OpenOffice.org. +# This file incorporates work covered by the following license notice: # -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . # -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* #************************************************ # Specify the verbose mode of this tool. diff --git a/l10ntools/source/helpex.cxx b/l10ntools/source/helpex.cxx index 7896fdd8598a..470b4f1383bc 100644 --- a/l10ntools/source/helpex.cxx +++ b/l10ntools/source/helpex.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx index 2d4435c5e74c..05b3800bbc81 100644 --- a/l10ntools/source/helpmerge.cxx +++ b/l10ntools/source/helpmerge.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/l10ntools/source/lngex.cxx b/l10ntools/source/lngex.cxx index 0e910badfff7..ab2f0afe0eb5 100644 --- a/l10ntools/source/lngex.cxx +++ b/l10ntools/source/lngex.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx index 09cac112adeb..264b50c74f56 100644 --- a/l10ntools/source/lngmerge.cxx +++ b/l10ntools/source/lngmerge.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx index daa314257005..3700efea5fd9 100644 --- a/l10ntools/source/localize.cxx +++ b/l10ntools/source/localize.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx index f74bdc0ea22c..e4fc598322a3 100644 --- a/l10ntools/source/merge.cxx +++ b/l10ntools/source/merge.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/l10ntools/source/src_yy_wrapper.c b/l10ntools/source/src_yy_wrapper.c index da9c17fdc464..3fdcc392bfc4 100644 --- a/l10ntools/source/src_yy_wrapper.c +++ b/l10ntools/source/src_yy_wrapper.c @@ -1,4 +1,22 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + // Helper to suppress warnings in lex generated c code, see #i57362# #include "src_yy.c" diff --git a/l10ntools/source/srclex.l b/l10ntools/source/srclex.l index 01be0df7ea3b..9215702b3c98 100644 --- a/l10ntools/source/srclex.l +++ b/l10ntools/source/srclex.l @@ -1,8 +1,25 @@ %{ /* - * lexer for parsing resource source files (*.src) + * This file is part of the LibreOffice project. * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +/* + * lexer for parsing resource source files (*.src) */ /* enlarge token buffer to tokenize whole strings */ diff --git a/l10ntools/source/tagtest.cxx b/l10ntools/source/tagtest.cxx index 062c5c78a583..ada1a36582f1 100644 --- a/l10ntools/source/tagtest.cxx +++ b/l10ntools/source/tagtest.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx index 48e0d3f97512..dc2e3d639606 100644 --- a/l10ntools/source/xmlparse.cxx +++ b/l10ntools/source/xmlparse.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/l10ntools/source/xrm_yy_wrapper.c b/l10ntools/source/xrm_yy_wrapper.c index 191d16f30146..36f902e0fdf6 100644 --- a/l10ntools/source/xrm_yy_wrapper.c +++ b/l10ntools/source/xrm_yy_wrapper.c @@ -1,4 +1,22 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + // Helper to suppress warnings in lex generated c code, see #i57362# #include "xrm_yy.c" diff --git a/l10ntools/source/xrmlex.l b/l10ntools/source/xrmlex.l index eadb19f3fbfb..dfe74d7c1a56 100644 --- a/l10ntools/source/xrmlex.l +++ b/l10ntools/source/xrmlex.l @@ -1,7 +1,24 @@ %{ /* - * lexer for parsing xml-property source files (*.xml) + * This file is part of the LibreOffice project. * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +/* + * lexer for parsing xml-property source files (*.xml) */ /* enlarge token buffer to tokenize whole strings */ diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx index 7d2a01f2215e..a22996d8db43 100644 --- a/l10ntools/source/xrmmerge.cxx +++ b/l10ntools/source/xrmmerge.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/ucpp/Makefile b/ucpp/Makefile index ccb1c85a04da..0997e628485b 100644 --- a/ucpp/Makefile +++ b/ucpp/Makefile @@ -1,4 +1,11 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) From 093fe6c5ebae2b8b63690d11ba5f3843a374ff4c Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 29 Sep 2012 17:44:08 +0200 Subject: [PATCH 052/863] fix windows build Change-Id: If71b9a162b7deca5cc032bda206a8f580292ab91 --- soltools/Module_soltools.mk | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/soltools/Module_soltools.mk b/soltools/Module_soltools.mk index ebd855ad30fc..047e4c07e7f8 100644 --- a/soltools/Module_soltools.mk +++ b/soltools/Module_soltools.mk @@ -20,14 +20,6 @@ ifeq ($(GUI),UNX) $(eval $(call gb_Module_add_targets,soltools,\ Executable_checkdll \ )) -# -# the same as the condition outside of ifneq ($(CROSS_COMPILING),YES) -# ifeq ($(GUI)$(COM),WNTMSC) -# -else -$(eval $(call gb_Module_add_targets,soltools,\ - Package_inc \ -)) endif # UNX ifeq ($(OS)$(COM),SOLARISC52) @@ -38,4 +30,10 @@ endif # SOLARISC52 endif # CROSS_COMPILING +ifeq ($(GUI)$(COM),WNTMSC) +$(eval $(call gb_Module_add_targets,soltools,\ + Package_inc \ +)) +endif # WNTMSC + # vim:set shiftwidth=4 softtabstop=4 expandtab: From dec68c6684298cbcb793651f1221f842efd794e3 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 29 Sep 2012 17:47:33 +0200 Subject: [PATCH 053/863] the build tools need to know executable extension Change-Id: I44479648dd75142864503650494fb2e3f95fe719 --- solenv/gbuild/gbuild.mk | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 74b0368ec209..4afc09530edf 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -171,6 +171,18 @@ include $(SRCDIR)/Repository.mk include $(SRCDIR)/RepositoryExternal.mk $(eval $(call gb_Helper_collect_libtargets)) +gb_Library_DLLPOSTFIX := lo + +# Include platform/cpu/compiler specific config/definitions +include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk + +ifeq ($(CROSS_COMPILING),YES) +# We can safely Assume all cross-compilation is from Unix systems. +gb_Executable_EXT_for_build := +else +gb_Executable_EXT_for_build := $(gb_Executable_EXT) +endif + # Set up build tools that can be either internal or system. It is # necessary to do it before we start including gbuild class makefiles, # so the classes can add dependencies on them. @@ -217,18 +229,6 @@ else gb_UCPPTARGET := $(call gb_Executable_get_target_for_build,ucpp) endif -gb_Library_DLLPOSTFIX := lo - -# Include platform/cpu/compiler specific config/definitions -include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk - -ifeq ($(CROSS_COMPILING),YES) -# We can safely Assume all cross-compilation is from Unix systems. -gb_Executable_EXT_for_build := -else -gb_Executable_EXT_for_build := $(gb_Executable_EXT) -endif - include $(GBUILDDIR)/Tempfile.mk include $(SRCDIR)/RepositoryFixes.mk From f05d7abf93bbcf443cb0b5759ca19992e2fa85a3 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sat, 29 Sep 2012 13:43:20 +0200 Subject: [PATCH 054/863] Some clean up Change-Id: Ia17a714b55da06bd38c7b5d60881f1b3838da992 --- sdext/source/pdfimport/misc/pwdinteract.cxx | 76 ++++++++++----------- 1 file changed, 36 insertions(+), 40 deletions(-) diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx b/sdext/source/pdfimport/misc/pwdinteract.cxx index 81cdcb832208..7b470deda692 100644 --- a/sdext/source/pdfimport/misc/pwdinteract.cxx +++ b/sdext/source/pdfimport/misc/pwdinteract.cxx @@ -40,9 +40,10 @@ #include #include -#include #include -#include +#include +#include +#include #include using namespace com::sun::star; @@ -50,15 +51,14 @@ using namespace com::sun::star; namespace { -typedef ::cppu::WeakComponentImplHelper2< - com::sun::star::task::XInteractionRequest, - com::sun::star::task::XInteractionPassword > PDFPasswordRequestBase; - -class PDFPasswordRequest : private cppu::BaseMutex, - public PDFPasswordRequestBase +class PDFPasswordRequest: + public cppu::WeakImplHelper2< + task::XInteractionRequest, task::XInteractionPassword >, + private boost::noncopyable { private: - task::DocumentPasswordRequest m_aRequest; + mutable osl::Mutex m_aMutex; + uno::Any m_aRequest; rtl::OUString m_aPassword; bool m_bSelected; @@ -77,54 +77,51 @@ public: virtual void SAL_CALL select() throw (uno::RuntimeException); bool isSelected() const { osl::MutexGuard const guard( m_aMutex ); return m_bSelected; } + +private: + virtual ~PDFPasswordRequest() {} }; PDFPasswordRequest::PDFPasswordRequest( bool bFirstTry, const rtl::OUString& rName ) : - PDFPasswordRequestBase( m_aMutex ), - m_aRequest(), - m_aPassword(), + m_aRequest( + uno::makeAny( + task::DocumentPasswordRequest( + OUString(), uno::Reference< uno::XInterface >(), + task::InteractionClassification_QUERY, + (bFirstTry + ? task::PasswordRequestMode_PASSWORD_ENTER + : task::PasswordRequestMode_PASSWORD_REENTER), + rName))), m_bSelected(false) +{} + +uno::Any PDFPasswordRequest::getRequest() throw (uno::RuntimeException) { - m_aRequest.Mode = bFirstTry ? - task::PasswordRequestMode_PASSWORD_ENTER : - task::PasswordRequestMode_PASSWORD_REENTER; - m_aRequest.Classification = task::InteractionClassification_QUERY; - m_aRequest.Name = rName; + return m_aRequest; } -uno::Any SAL_CALL PDFPasswordRequest::getRequest() throw (uno::RuntimeException) +uno::Sequence< uno::Reference< task::XInteractionContinuation > > PDFPasswordRequest::getContinuations() throw (uno::RuntimeException) { - osl::MutexGuard const guard( m_aMutex ); - - uno::Any aRet; - aRet <<= m_aRequest; - return aRet; -} - -uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL PDFPasswordRequest::getContinuations() throw (uno::RuntimeException) -{ - osl::MutexGuard const guard( m_aMutex ); - uno::Sequence< uno::Reference< task::XInteractionContinuation > > aRet( 1 ); - aRet.getArray()[0] = static_cast(this); + aRet[0] = this; return aRet; } -void SAL_CALL PDFPasswordRequest::setPassword( const rtl::OUString& rPwd ) throw (uno::RuntimeException) +void PDFPasswordRequest::setPassword( const rtl::OUString& rPwd ) throw (uno::RuntimeException) { osl::MutexGuard const guard( m_aMutex ); m_aPassword = rPwd; } -rtl::OUString SAL_CALL PDFPasswordRequest::getPassword() throw (uno::RuntimeException) +rtl::OUString PDFPasswordRequest::getPassword() throw (uno::RuntimeException) { osl::MutexGuard const guard( m_aMutex ); return m_aPassword; } -void SAL_CALL PDFPasswordRequest::select() throw (uno::RuntimeException) +void PDFPasswordRequest::select() throw (uno::RuntimeException) { osl::MutexGuard const guard( m_aMutex ); @@ -170,22 +167,21 @@ bool getPassword( const uno::Reference< task::XInteractionHandler >& xHandler, { bool bSuccess = false; - PDFPasswordRequest* pRequest; - uno::Reference< task::XInteractionRequest > xReq( - pRequest = new PDFPasswordRequest( bFirstTry, rDocName ) ); + rtl::Reference< PDFPasswordRequest > xReq( + new PDFPasswordRequest( bFirstTry, rDocName ) ); try { - xHandler->handle( xReq ); + xHandler->handle( xReq.get() ); } catch( uno::Exception& ) { } - OSL_TRACE( "request %s selected", pRequest->isSelected() ? "was" : "was not" ); - if( pRequest->isSelected() ) + OSL_TRACE( "request %s selected", xReq->isSelected() ? "was" : "was not" ); + if( xReq->isSelected() ) { bSuccess = true; - rOutPwd = pRequest->getPassword(); + rOutPwd = xReq->getPassword(); } return bSuccess; From c2ca6fabd1afc3fc07001721c2069d3c8db7000a Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sat, 29 Sep 2012 17:20:22 +0200 Subject: [PATCH 055/863] Use comphelper::getComponentContext ...and some further clean up. Change-Id: Id294c0f38fe0041646fc86cacbd2e19734c746a9 --- basctl/source/basicide/baside3.cxx | 17 +--- basctl/source/basicide/basides3.cxx | 6 +- basctl/source/basicide/moduldlg.cxx | 7 +- basctl/source/basicide/scriptdocument.cxx | 5 +- basctl/source/dlged/dlged.cxx | 12 +-- basctl/source/dlged/propbrw.cxx | 4 +- basic/source/classes/eventatt.cxx | 33 +++---- basic/source/classes/sbunoobj.cxx | 96 ++++++------------- basic/source/classes/sbxmod.cxx | 10 +- basic/source/uno/dlgcont.cxx | 28 ++---- basic/source/uno/namecont.cxx | 55 ++++------- comphelper/source/misc/componentcontext.cxx | 23 +---- connectivity/Library_postgresql-sdbc.mk | 1 + .../source/drivers/postgresql/pq_driver.cxx | 23 ++--- .../source/resource/sharedresources.cxx | 9 +- cui/source/customize/cfg.cxx | 10 +- cui/source/customize/cfgutil.cxx | 6 +- cui/source/dialogs/scriptdlg.cxx | 9 +- cui/source/options/treeopt.cxx | 11 +-- desktop/Library_offacc.mk | 1 + desktop/inc/app.hxx | 2 - desktop/source/app/app.cxx | 5 +- desktop/source/app/appinit.cxx | 19 ---- desktop/source/offacc/acceptor.cxx | 18 +--- embeddedobj/source/general/docholder.cxx | 11 +-- extensions/Executable_nsplugin.mk | 1 + .../source/nsplugin/source/so_instance.cxx | 5 +- fileaccess/source/FileAccess.cxx | 12 +-- filter/source/xsltfilter/XSLTFilter.cxx | 9 +- framework/inc/macros/xserviceinfo.hxx | 8 +- .../source/fwe/classes/addonsoptions.cxx | 11 +-- .../source/fwe/xml/menudocumenthandler.cxx | 14 +-- .../layoutmanager/toolbarlayoutmanager.cxx | 1 + framework/source/lomenubar/FrameHelper.cxx | 10 +- .../source/uielement/addonstoolbarmanager.cxx | 10 +- .../imagebuttontoolbarcontroller.cxx | 13 +-- framework/source/uielement/menubarmanager.cxx | 8 +- .../source/uielement/popupmenucontroller.cxx | 4 +- .../source/uielement/statusbarmanager.cxx | 9 +- framework/source/uielement/toolbarmanager.cxx | 7 +- linguistic/source/lngsvcmgr.cxx | 24 ++--- oox/source/core/xmlfilterbase.cxx | 26 +---- oox/source/export/chartexport.cxx | 28 ++---- reportdesign/source/ui/report/propbrw.cxx | 10 +- sc/source/core/data/dpobject.cxx | 8 +- sc/source/core/tool/addincol.cxx | 18 +--- sc/source/ui/docshell/docsh.cxx | 50 +++++----- sc/source/ui/miscdlgs/solverutil.cxx | 33 +++---- sc/source/ui/vba/excelvbahelper.cxx | 6 +- sc/source/ui/vba/vbahelper.cxx | 15 ++- sc/source/ui/vba/vbaworksheet.cxx | 6 +- scripting/Library_protocolhandler.mk | 1 + .../source/protocolhandler/scripthandler.cxx | 9 +- scripting/source/vbaevents/eventhelper.cxx | 12 +-- sd/source/core/CustomAnimationPreset.cxx | 20 ++-- sd/source/core/TransitionPreset.cxx | 20 ++-- sfx2/source/dialog/dockwin.cxx | 15 +-- sfx2/source/doc/doctemplates.cxx | 51 +++------- svl/source/misc/urihelper.cxx | 13 +-- svtools/Library_hatchwindowfactory.mk | 1 + svtools/source/hatchwindow/documentcloser.cxx | 17 +--- svtools/source/misc/templatefoldercache.cxx | 36 ++----- svx/source/form/fmPropBrw.cxx | 4 +- sw/source/filter/ww8/ww8toolbar.cxx | 4 +- sw/source/ui/config/mailconfigpage.cxx | 5 +- sw/source/ui/dbui/mailmergehelper.cxx | 16 +--- sw/source/ui/inc/mailmergehelper.hxx | 20 +--- ucb/Library_ucphier1.mk | 1 + ucb/source/core/ucbcmds.cxx | 9 +- .../ucp/hierarchy/hierarchyprovider.cxx | 28 ++---- ucb/source/ucp/webdav/webdavcontent.cxx | 9 +- unotools/source/config/lingucfg.cxx | 13 +-- vbahelper/source/vbahelper/vbahelper.cxx | 12 +-- vcl/aqua/source/app/salinst.cxx | 22 +---- xmlhelp/source/cxxhelp/provider/databases.cxx | 25 +---- xmlhelp/source/cxxhelp/provider/provider.cxx | 13 +-- .../source/cxxhelp/provider/urlparameter.cxx | 18 +--- xmloff/source/chart/SchXMLExport.cxx | 31 ++---- xmloff/source/chart/SchXMLImport.cxx | 18 +--- xmloff/source/chart/SchXMLTools.cxx | 27 ++---- 80 files changed, 338 insertions(+), 899 deletions(-) diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index 619704312955..e5fc1ce20e04 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -724,10 +724,7 @@ bool DialogWindow::SaveDialog() // export dialog model to xml Reference< container::XNameContainer > xDialogModel = GetDialog(); - Reference< XComponentContext > xContext; - Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY ); - OSL_ASSERT( xProps.is() ); - OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext ); + Reference< XComponentContext > xContext( comphelper::getProcessComponentContext() ); Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, GetDocument().isDocument() ? GetDocument().getDocument() : Reference< frame::XModel >() ); Reference< XInputStream > xInput( xISP->createInputStream() ); @@ -1002,10 +999,8 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri if( xSFI->exists( aCurPath ) ) xInput = xSFI->openFileRead( aCurPath ); - Reference< XComponentContext > xContext; - Reference< beans::XPropertySet > xProps( xMSF, UNO_QUERY ); - OSL_ASSERT( xProps.is() ); - OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext ); + Reference< XComponentContext > xContext( + comphelper::getComponentContext( xMSF ) ); ::xmlscript::importDialogModel( xInput, xDialogModel, xContext, rDocument.isDocument() ? rDocument.getDocument() : Reference< frame::XModel >() ); ::rtl::OUString aXmlDlgName; @@ -1327,10 +1322,8 @@ void DialogWindow::StoreData() if( xDialogModel.is() ) { - Reference< XComponentContext > xContext; - Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY ); - OSL_ASSERT( xProps.is() ); - OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext ); + Reference< XComponentContext > xContext( + comphelper::getProcessComponentContext() ); Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, GetDocument().isDocument() ? GetDocument().getDocument() : Reference< frame::XModel >() ); xLib->replaceByName( ::rtl::OUString( GetName() ), makeAny( xISP ) ); } diff --git a/basctl/source/basicide/basides3.cxx b/basctl/source/basicide/basides3.cxx index 5f6d86b039a2..d642a2ae1785 100644 --- a/basctl/source/basicide/basides3.cxx +++ b/basctl/source/basicide/basides3.cxx @@ -81,10 +81,8 @@ DialogWindow* Shell::CreateDlgWin( const ScriptDocument& rDocument, const ::rtl: Reference< container::XNameContainer > xDialogModel( xMSF->createInstance ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDialogModel" ) ) ), UNO_QUERY ); Reference< XInputStream > xInput( xISP->createInputStream() ); - Reference< XComponentContext > xContext; - Reference< beans::XPropertySet > xProps( xMSF, UNO_QUERY ); - OSL_ASSERT( xProps.is() ); - OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext ); + Reference< XComponentContext > xContext( + comphelper::getComponentContext( xMSF ) ); ::xmlscript::importDialogModel( xInput, xDialogModel, xContext, rDocument.isDocument() ? rDocument.getDocument() : Reference< frame::XModel >() ); LocalizationMgr::setStringResourceAtDialog( rDocument, rLibName, aDlgName, xDialogModel ); diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx index 0d0d867c4e4a..4a8cdb5e6261 100644 --- a/basctl/source/basicide/moduldlg.cxx +++ b/basctl/source/basicide/moduldlg.cxx @@ -28,7 +28,6 @@ #include "iderdll.hxx" #include -#include #include #include #include @@ -288,10 +287,8 @@ void Shell::CopyDialogResources( Reference< container::XNameContainer > xDialogModel = Reference< container::XNameContainer >( xMSF->createInstance ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDialogModel" ) ) ), UNO_QUERY ); Reference< io::XInputStream > xInput( io_xISP->createInputStream() ); - Reference< XComponentContext > xContext; - Reference< beans::XPropertySet > xProps( xMSF, UNO_QUERY ); - OSL_ASSERT( xProps.is() ); - OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext ); + Reference< XComponentContext > xContext( + comphelper::getComponentContext( xMSF ) ); ::xmlscript::importDialogModel( xInput, xDialogModel, xContext, rSourceDoc.isDocument() ? rSourceDoc.getDocument() : Reference< frame::XModel >() ); if( xDialogModel.is() ) diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx index dfede33a0f73..cdf91fbc37e5 100644 --- a/basctl/source/basicide/scriptdocument.cxx +++ b/basctl/source/basicide/scriptdocument.cxx @@ -960,9 +960,8 @@ namespace basctl { ::rtl::OUString aDecodedURL( aAuthority.copy( sizeof ( "vnd.sun.star.expand:" ) - 1 ) ); aDecodedURL = ::rtl::Uri::decode( aDecodedURL, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 ); - Reference< XComponentContext > xContext; - Reference< XPropertySet > xProps( xMSF, UNO_QUERY_THROW ); - xContext.set( xProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" )) ), UNO_QUERY_THROW ); + Reference< XComponentContext > xContext( + comphelper::getComponentContext( xMSF ) ); Reference< XMacroExpander > xMacroExpander( xContext->getValueByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.util.theMacroExpander" )) ), diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index 9dfb43182c94..422a9d80eba2 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -742,10 +742,8 @@ void DlgEditor::Copy() } // export clipboard dialog model to xml - Reference< XComponentContext > xContext; - Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY ); - OSL_ASSERT( xProps.is() ); - OSL_VERIFY( xProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext ); + Reference< XComponentContext > xContext( + comphelper::getProcessComponentContext() ); Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xClipDialogModel, xContext, m_xDocument ); Reference< XInputStream > xStream( xISP->createInputStream() ); Sequence< sal_Int8 > DialogModelBytes; @@ -920,10 +918,8 @@ void DlgEditor::Paste() if ( xClipDialogModel.is() ) { - Reference< XComponentContext > xContext; - Reference< beans::XPropertySet > xProps( xMSF, UNO_QUERY ); - OSL_ASSERT( xProps.is() ); - OSL_VERIFY( xProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext ); + Reference< XComponentContext > xContext( + comphelper::getComponentContext( xMSF ) ); ::xmlscript::importDialogModel( ::xmlscript::createInputStream( rtl::ByteSequence(DialogModelBytes.getArray(), DialogModelBytes.getLength()) ) , xClipDialogModel, xContext, m_xDocument ); } diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx index 11529c240369..986a69b8baae 100644 --- a/basctl/source/dlged/propbrw.cxx +++ b/basctl/source/dlged/propbrw.cxx @@ -127,10 +127,8 @@ void PropBrw::ImplReCreateController() try { - Reference< XPropertySet > xFactoryProperties( m_xORB, UNO_QUERY_THROW ); Reference< XComponentContext > xOwnContext( - xFactoryProperties->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ), - UNO_QUERY_THROW ); + comphelper::getComponentContext( m_xORB ) ); // a ComponentContext for the ::cppu::ContextEntry_Init aHandlerContextInfo[] = diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx index 1c111e2d2eda..79e2c3b707ee 100644 --- a/basic/source/classes/eventatt.cxx +++ b/basic/source/classes/eventatt.cxx @@ -94,23 +94,18 @@ void SFURL_firing_impl( const ScriptEvent& aScriptEvent, Any* pRet, const Refere } else { - Reference< XComponentContext > xContext; - Reference< XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY ); - OSL_ASSERT( xProps.is() ); - OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext ); - if ( xContext.is() ) - { - Reference< provider::XScriptProviderFactory > xFactory( - xContext->getValueByName( + Reference< XComponentContext > xContext( + comphelper::getProcessComponentContext() ); + Reference< provider::XScriptProviderFactory > xFactory( + xContext->getValueByName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/singletons/com.sun.star.script.provider.theMasterScriptProviderFactory")) ), - UNO_QUERY ); - OSL_ENSURE( xFactory.is(), "SFURL_firing_impl: failed to get master script provider factory" ); - if ( xFactory.is() ) - { - Any aCtx; - aCtx <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user")); - xScriptProvider.set( xFactory->createScriptProvider( aCtx ), UNO_QUERY ); - } + UNO_QUERY ); + OSL_ENSURE( xFactory.is(), "SFURL_firing_impl: failed to get master script provider factory" ); + if ( xFactory.is() ) + { + Any aCtx; + aCtx <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user")); + xScriptProvider.set( xFactory->createScriptProvider( aCtx ), UNO_QUERY ); } } @@ -469,10 +464,8 @@ void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrit if( !xISP.is() ) return; - Reference< XComponentContext > xContext; - Reference< XPropertySet > xProps( xMSF, UNO_QUERY ); - OSL_ASSERT( xProps.is() ); - OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext ); + Reference< XComponentContext > xContext( + comphelper::getComponentContext( xMSF ) ); // Import the DialogModel Reference< XInputStream > xInput( xISP->createInputStream() ); diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index c79263493714..6735dfe6299c 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -162,26 +162,6 @@ void SetSbUnoObjectDfltPropName( SbxObject* pObj ) } } -Reference< XComponentContext > getComponentContext_Impl( void ) -{ - static Reference< XComponentContext > xContext; - - // Do we have already CoreReflection; if not obtain it - if( !xContext.is() ) - { - Reference< XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory(); - Reference< XPropertySet > xProps( xFactory, UNO_QUERY ); - OSL_ASSERT( xProps.is() ); - if (xProps.is()) - { - xProps->getPropertyValue( - ::rtl::OUString( "DefaultContext" ) ) >>= xContext; - OSL_ASSERT( xContext.is() ); - } - } - return xContext; -} - // save CoreReflection statically Reference< XIdlReflection > getCoreReflection_Impl( void ) { @@ -190,7 +170,8 @@ Reference< XIdlReflection > getCoreReflection_Impl( void ) // Do we have already CoreReflection; if not obtain it if( !xCoreReflection.is() ) { - Reference< XComponentContext > xContext = getComponentContext_Impl(); + Reference< XComponentContext > xContext( + comphelper::getProcessComponentContext() ); if( xContext.is() ) { xContext->getValueByName( @@ -233,7 +214,8 @@ Reference< XHierarchicalNameAccess > getTypeProvider_Impl( void ) // Do we have already CoreReflection; if not obtain it if( !xAccess.is() ) { - Reference< XComponentContext > xContext = getComponentContext_Impl(); + Reference< XComponentContext > xContext( + comphelper::getProcessComponentContext() ); if( xContext.is() ) { xContext->getValueByName( @@ -260,7 +242,8 @@ Reference< XTypeConverter > getTypeConverter_Impl( void ) // Do we have already CoreReflection; if not obtain it if( !xTypeConverter.is() ) { - Reference< XComponentContext > xContext = getComponentContext_Impl(); + Reference< XComponentContext > xContext( + comphelper::getProcessComponentContext() ); if( xContext.is() ) { xTypeConverter = Converter::create(xContext); @@ -287,7 +270,8 @@ SbUnoObject* createOLEObject_Impl( const ::rtl::OUString& aType ) { bNeedsInit = false; - Reference< XComponentContext > xContext = getComponentContext_Impl(); + Reference< XComponentContext > xContext( + comphelper::getProcessComponentContext() ); if( xContext.is() ) { Reference xSMgr = xContext->getServiceManager(); @@ -3694,33 +3678,24 @@ void SbUnoService::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, } // "Call" ctor using createInstanceWithArgumentsAndContext - Reference < XComponentContext > xContext; - if( xFirstParamContext.is() ) - { - xContext = xFirstParamContext; - } - else - { - Reference < XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW ); - xContext.set( xProps->getPropertyValue( rtl::OUString( "DefaultContext" ) ), UNO_QUERY_THROW ); - } + Reference < XComponentContext > xContext( + xFirstParamContext.is() + ? xFirstParamContext + : comphelper::getProcessComponentContext() ); Reference< XMultiComponentFactory > xServiceMgr( xContext->getServiceManager() ); Any aRetAny; - if( xServiceMgr.is() ) + ::rtl::OUString aServiceName = GetName(); + Reference < XInterface > xRet; + try { - ::rtl::OUString aServiceName = GetName(); - Reference < XInterface > xRet; - try - { - xRet = xServiceMgr->createInstanceWithArgumentsAndContext( aServiceName, args, xContext ); - } - catch( const Exception& ) - { - implHandleAnyException( ::cppu::getCaughtException() ); - } - aRetAny <<= xRet; + xRet = xServiceMgr->createInstanceWithArgumentsAndContext( aServiceName, args, xContext ); } + catch( const Exception& ) + { + implHandleAnyException( ::cppu::getCaughtException() ); + } + aRetAny <<= xRet; unoToSbxValue( pVar, aRetAny ); // Copy back out parameters? @@ -3835,8 +3810,7 @@ void SbUnoSingleton::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, if( !xContextToUse.is() ) { - Reference < XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW ); - xContextToUse.set( xProps->getPropertyValue( rtl::OUString( "DefaultContext" ) ), UNO_QUERY_THROW ); + xContextToUse = comphelper::getProcessComponentContext(); --nAllowedParamCount; } @@ -4205,22 +4179,12 @@ void RTL_Impl_GetDefaultContext( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWr SbxVariableRef refVar = rPar.Get(0); - Reference< XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory(); - Reference< XPropertySet> xPSMPropertySet( xFactory, UNO_QUERY ); - if( xPSMPropertySet.is() ) - { - Any aContextAny = xPSMPropertySet->getPropertyValue( - ::rtl::OUString( "DefaultContext" ) ); + Any aContextAny( comphelper::getProcessComponentContext() ); - SbUnoObjectRef xUnoObj = new SbUnoObject - ( ::rtl::OUString( "DefaultContext" ), - aContextAny ); - refVar->PutObject( (SbUnoObject*)xUnoObj ); - } - else - { - refVar->PutObject( NULL ); - } + SbUnoObjectRef xUnoObj = new SbUnoObject + ( ::rtl::OUString( "DefaultContext" ), + aContextAny ); + refVar->PutObject( (SbUnoObject*)xUnoObj ); } //======================================================================== @@ -4544,7 +4508,8 @@ Reference< XInterface > createComListener( const Any& aControlAny, const ::rtl:: { Reference< XInterface > xRet; - Reference< XComponentContext > xContext = getComponentContext_Impl(); + Reference< XComponentContext > xContext( + comphelper::getProcessComponentContext() ); Reference< XMultiComponentFactory > xServiceMgr( xContext->getServiceManager() ); Reference< XInvocation > xProxy = new ModuleInvocationProxy( aPrefix, xScopeObj ); @@ -4665,7 +4630,8 @@ bool SbModule::createCOMWrapperForIface( Any& o_rRetAny, SbClassModuleObject* pP // For now: Take first interface that allows to instantiate COM wrapper // TODO: Check if support for multiple interfaces is needed - Reference< XComponentContext > xContext = getComponentContext_Impl(); + Reference< XComponentContext > xContext( + comphelper::getProcessComponentContext() ); Reference< XMultiComponentFactory > xServiceMgr( xContext->getServiceManager() ); Reference< XSingleServiceFactory > xComImplementsFactory ( diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 3257a4ad5214..759b9b25f74b 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -139,7 +139,6 @@ DocObjectWrapper::DocObjectWrapper( SbModule* pVar ) : m_pMod( pVar ), mName( pV { if ( pMod->GetModuleType() == ModuleType::DOCUMENT ) { - Reference< XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory(); // Use proxy factory service to create aggregatable proxy. SbUnoObject* pUnoObj = PTR_CAST(SbUnoObject,pMod->GetObject() ); Reference< XInterface > xIf; @@ -157,11 +156,10 @@ DocObjectWrapper::DocObjectWrapper( SbModule* pVar ) : m_pMod( pVar ), mName( pV { try { - Reference< XMultiComponentFactory > xMFac( xFactory, UNO_QUERY_THROW ); - Reference< XPropertySet> xPSMPropertySet( xMFac, UNO_QUERY_THROW ); - Reference< XComponentContext > xCtx; - xPSMPropertySet->getPropertyValue( - String( RTL_CONSTASCII_USTRINGPARAM("DefaultContext") ) ) >>= xCtx; + Reference< XComponentContext > xCtx( + comphelper::getProcessComponentContext() ); + Reference< XMultiComponentFactory > xMFac( + xCtx->getServiceManager() ); Reference< XProxyFactory > xProxyFac( xMFac->createInstanceWithContext( rtl::OUString( "com.sun.star.reflection.ProxyFactory" ), xCtx ), UNO_QUERY_THROW ); m_xAggProxy = xProxyFac->createProxy( xIf ); } diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx index 3f1101c4eac0..2cfe035a21b7 100644 --- a/basic/source/uno/dlgcont.cxx +++ b/basic/source/uno/dlgcont.cxx @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include @@ -117,23 +116,12 @@ bool SAL_CALL SfxDialogLibraryContainer::isLibraryElementValid( Any aElement ) c bool writeOasis2OOoLibraryElement( Reference< XInputStream > xInput, Reference< XOutputStream > xOutput ) { - Reference< XMultiServiceFactory > xMSF( - comphelper::getProcessServiceFactory() ); - - Reference< XComponentContext > xContext; - Reference< beans::XPropertySet > xProps( xMSF, UNO_QUERY ); - OSL_ASSERT( xProps.is() ); - OSL_VERIFY( xProps->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext ); + Reference< XComponentContext > xContext( + comphelper::getProcessComponentContext() ); Reference< lang::XMultiComponentFactory > xSMgr( xContext->getServiceManager() ); - if (! xSMgr.is()) - { - return sal_False; - } - Reference< xml::sax::XParser > xParser( xSMgr->createInstanceWithContext( OUString( RTL_CONSTASCII_USTRINGPARAM( @@ -267,10 +255,8 @@ void SfxDialogLibraryContainer::storeLibrariesToStorage( const uno::Reference< e Reference< io::XInputStream > xInput( xISP->createInputStream() ); Reference< XNameContainer > xDialogModel( mxMSF->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDialogModel" ) ) ), UNO_QUERY ); - Reference< XComponentContext > xContext; - Reference< beans::XPropertySet > xProps( mxMSF, UNO_QUERY ); - OSL_ASSERT( xProps.is() ); - OSL_VERIFY( xProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext ); + Reference< XComponentContext > xContext( + comphelper::getComponentContext( mxMSF ) ); ::xmlscript::importDialogModel( xInput, xDialogModel, xContext, mxOwnerDocument ); std::vector< rtl::OUString > vEmbeddedImageURLs; GraphicObject::InspectForGraphicObjectImageURL( Reference< XInterface >( xDialogModel, UNO_QUERY ), vEmbeddedImageURLs ); @@ -351,10 +337,8 @@ Any SAL_CALL SfxDialogLibraryContainer::importLibraryElement if( !xInput.is() ) return aRetAny; - Reference< XComponentContext > xContext; - Reference< beans::XPropertySet > xProps( mxMSF, UNO_QUERY ); - OSL_ASSERT( xProps.is() ); - OSL_VERIFY( xProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext ); + Reference< XComponentContext > xContext( + comphelper::getComponentContext( mxMSF ) ); InputSource source; source.aInputStream = xInput; diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index f8d946edd69c..77ced57a2eec 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -2725,29 +2725,20 @@ OUString SfxLibraryContainer::expand_url( const OUString& url ) { if( !mxMacroExpander.is() ) { - Reference< XPropertySet > xProps( mxMSF, UNO_QUERY_THROW ); - if( xProps.is() ) + Reference< XComponentContext > xContext( + comphelper::getComponentContext( mxMSF ) ); + Reference< util::XMacroExpander > xExpander; + xContext->getValueByName( + OUSTR("/singletons/com.sun.star.util.theMacroExpander") ) >>= xExpander; + if(! xExpander.is()) { - Reference< XComponentContext > xContext; - xProps->getPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM("DefaultContext") ) ) >>= xContext; - SAL_WARN_IF(!xContext.is(), "basic", "no DefaultContext"); - if( xContext.is() ) - { - Reference< util::XMacroExpander > xExpander; - xContext->getValueByName( - OUSTR("/singletons/com.sun.star.util.theMacroExpander") ) >>= xExpander; - if(! xExpander.is()) - { - throw uno::DeploymentException( - OUSTR("no macro expander singleton available!"), Reference< XInterface >() ); - } - MutexGuard guard( Mutex::getGlobalMutex() ); - if( !mxMacroExpander.is() ) - { - mxMacroExpander = xExpander; - } - } + throw uno::DeploymentException( + OUSTR("no macro expander singleton available!"), Reference< XInterface >() ); + } + MutexGuard guard( Mutex::getGlobalMutex() ); + if( !mxMacroExpander.is() ) + { + mxMacroExpander = xExpander; } } @@ -3172,7 +3163,8 @@ void SAL_CALL SfxLibrary::removeChangesListener( const Reference< XChangesListen #define sDialogLibMediaType "application/vnd.sun.star.dialog-library" ScriptExtensionIterator::ScriptExtensionIterator( void ) - : m_eState( USER_EXTENSIONS ) + : m_xContext( comphelper::getProcessComponentContext() ) + , m_eState( USER_EXTENSIONS ) , m_bUserPackagesLoaded( false ) , m_bSharedPackagesLoaded( false ) , m_bBundledPackagesLoaded( false ) @@ -3180,22 +3172,7 @@ ScriptExtensionIterator::ScriptExtensionIterator( void ) , m_iSharedPackage( 0 ) , m_iBundledPackage( 0 ) , m_pScriptSubPackageIterator( NULL ) -{ - Reference< XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory(); - Reference< XPropertySet > xProps( xFactory, UNO_QUERY_THROW ); - if (xProps.is()) - { - xProps->getPropertyValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DefaultContext") ) ) >>= m_xContext; - SAL_WARN_IF(!m_xContext.is(), "basic", "no DefaultContext"); - } - if( !m_xContext.is() ) - { - throw RuntimeException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScriptExtensionIterator::init(), no XComponentContext")), - Reference< XInterface >() ); - } -} +{} rtl::OUString ScriptExtensionIterator::nextBasicOrDialogLibrary( bool& rbPureDialogLib ) { diff --git a/comphelper/source/misc/componentcontext.cxx b/comphelper/source/misc/componentcontext.cxx index df7db6a16185..8ec65d33542e 100644 --- a/comphelper/source/misc/componentcontext.cxx +++ b/comphelper/source/misc/componentcontext.cxx @@ -18,7 +18,7 @@ */ #include - +#include #include #include #include @@ -53,8 +53,6 @@ namespace comphelper { if ( m_xContext.is() ) m_xORB = m_xContext->getServiceManager(); - if ( !m_xORB.is() ) - throw NullPointerException(); } //------------------------------------------------------------------------ @@ -63,23 +61,8 @@ namespace comphelper if ( !_rxLegacyFactory.is() ) throw NullPointerException(); - try - { - Reference< XPropertySet > xFactoryProperties( _rxLegacyFactory, UNO_QUERY_THROW ); - m_xContext = Reference< XComponentContext >( - xFactoryProperties->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ), - UNO_QUERY ); - } - catch( const RuntimeException& ) { throw; } - catch( const Exception& ) - { - throw RuntimeException(); - } - - if ( m_xContext.is() ) - m_xORB = m_xContext->getServiceManager(); - if ( !m_xORB.is() ) - throw NullPointerException(); + m_xContext = comphelper::getComponentContext( _rxLegacyFactory ); + m_xORB = m_xContext->getServiceManager(); } //------------------------------------------------------------------------ diff --git a/connectivity/Library_postgresql-sdbc.mk b/connectivity/Library_postgresql-sdbc.mk index 1a9f8eb1dd6c..4ce53d8eada0 100644 --- a/connectivity/Library_postgresql-sdbc.mk +++ b/connectivity/Library_postgresql-sdbc.mk @@ -36,6 +36,7 @@ $(eval $(call gb_Library_add_defs,postgresql-sdbc,\ $(eval $(call gb_Library_use_sdk_api,postgresql-sdbc)) $(eval $(call gb_Library_use_libraries,postgresql-sdbc,\ + comphelper \ cppu \ cppuhelper \ sal \ diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx index ed8480c318c4..5a8dd9c15bf3 100644 --- a/connectivity/source/drivers/postgresql/pq_driver.cxx +++ b/connectivity/source/drivers/postgresql/pq_driver.cxx @@ -57,13 +57,12 @@ #include +#include #include #include #include #include -#include - #include "pq_driver.hxx" using rtl::OUString; @@ -86,7 +85,6 @@ using com::sun::star::uno::XComponentContext; using com::sun::star::uno::Any; using com::sun::star::beans::PropertyValue; -using com::sun::star::beans::XPropertySet; using com::sun::star::sdbc::XConnection; using com::sun::star::sdbc::SQLException; @@ -352,26 +350,17 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( // XSingleComponentFactory interface ... void * pRet = 0; Reference< XSingleComponentFactory > xFactory; - Reference< XInterface > xSmgr( (XInterface * ) pServiceManager ); + Reference< com::sun::star::lang::XMultiServiceFactory > xSmgr( + static_cast< XInterface * >(pServiceManager), + com::sun::star::uno::UNO_QUERY_THROW ); for( sal_Int32 i = 0 ; g_entries[i].create ; i ++ ) { OUString implName = g_entries[i].getImplementationName(); if( 0 == implName.compareToAscii( pImplName ) ) { - Reference< XComponentContext > defaultContext; - Reference< XPropertySet > propSet( xSmgr, UNO_QUERY ); - if( propSet.is() ) - { - try - { - propSet->getPropertyValue( ASCII_STR( "DefaultContext" ) ) >>= defaultContext; - } - catch( com::sun::star::uno::Exception & ) - { - // if there is no default context, ignore it - } - } + Reference< XComponentContext > defaultContext( + comphelper::getComponentContext( xSmgr ) ); xFactory = new pq_sdbc_driver::OOneInstanceComponentFactory( implName, g_entries[i].create, diff --git a/connectivity/source/resource/sharedresources.cxx b/connectivity/source/resource/sharedresources.cxx index 246591063547..902807829cb5 100644 --- a/connectivity/source/resource/sharedresources.cxx +++ b/connectivity/source/resource/sharedresources.cxx @@ -22,7 +22,6 @@ #include #include -#include #include #include @@ -35,8 +34,6 @@ namespace connectivity /** === begin UNO using === **/ using ::com::sun::star::uno::Reference; - using ::com::sun::star::beans::XPropertySet; - using ::com::sun::star::uno::UNO_QUERY_THROW; using ::com::sun::star::uno::XComponentContext; using ::com::sun::star::uno::Exception; /** === end UNO using === **/ @@ -82,12 +79,8 @@ namespace connectivity { try { - Reference< XPropertySet > xFactoryProps( - ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW ); Reference< XComponentContext > xContext( - xFactoryProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ), - UNO_QUERY_THROW - ); + comphelper::getProcessComponentContext() ); m_pResourceBundle.reset( new ::comphelper::OfficeResourceBundle( xContext, "cnr" ) ); } catch( const Exception& ) diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index f7dc04eae4c4..5b9b3170f65e 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -888,15 +888,9 @@ SaveInData::SaveInData( bDocConfig( isDocConfig ), bReadOnly( sal_False ), m_xCfgMgr( xCfgMgr ), - m_xParentCfgMgr( xParentCfgMgr ) + m_xParentCfgMgr( xParentCfgMgr ), + m_xComponentContext( comphelper::getProcessComponentContext() ) { - uno::Reference< beans::XPropertySet > xProps( - ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY ); - - xProps->getPropertyValue( - OUString("DefaultContext" )) - >>= m_xComponentContext; - m_aSeparatorSeq.realloc( 1 ); m_aSeparatorSeq[0].Name = OUString( ITEM_DESCRIPTOR_TYPE ); m_aSeparatorSeq[0].Value <<= css::ui::ItemType::SEPARATOR_LINE; diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 405c6fa83e10..4d2be18383e7 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -596,12 +596,10 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul OSL_TRACE("** ** About to initialise SF Scripts"); // Add Scripting Framework entries Reference< browse::XBrowseNode > rootNode; - Reference< XComponentContext > xCtx; + Reference< XComponentContext > xCtx( + comphelper::getProcessComponentContext() ); try { - Reference < beans::XPropertySet > xProps( - ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW ); - xCtx.set( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), UNO_QUERY_THROW ); Reference< browse::XBrowseNodeFactory > xFac( xCtx->getValueByName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.script.browse.theBrowseNodeFactory") ) ), UNO_QUERY_THROW ); rootNode.set( xFac->createView( browse::BrowseNodeFactoryViewTypes::MACROSELECTOR ) ); diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 2c7b1544dd74..e91e53fb67d3 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -164,7 +164,8 @@ void SFTreeListBox::Init( const ::rtl::OUString& language ) deleteAllTree(); Reference< browse::XBrowseNode > rootNode; - Reference< XComponentContext > xCtx; + Reference< XComponentContext > xCtx( + comphelper::getProcessComponentContext() ); Sequence< Reference< browse::XBrowseNode > > children; @@ -175,12 +176,6 @@ void SFTreeListBox::Init( const ::rtl::OUString& language ) try { - Reference < beans::XPropertySet > xProps( - ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW ); - - xCtx.set( xProps->getPropertyValue( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("DefaultContext" ))), UNO_QUERY_THROW ); - Reference< browse::XBrowseNodeFactory > xFac( xCtx->getValueByName( singleton ), UNO_QUERY_THROW ); diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 19c6a5070690..57189590616b 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -835,13 +835,10 @@ void OfaTreeOptionsDialog::ActivateLastSelection() if ( bMustExpand ) { - Reference< XComponentContext > xContext; - Reference< XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY ); - xProps->getPropertyValue( - ::rtl::OUString( "DefaultContext" ) ) >>= xContext; - if ( xContext.is() ) - m_xMacroExpander = Reference< com::sun::star::util::XMacroExpander >( - xContext->getValueByName( ::rtl::OUString( "/singletons/com.sun.star.util.theMacroExpander" ) ), UNO_QUERY ); + Reference< XComponentContext > xContext( + comphelper::getProcessComponentContext() ); + m_xMacroExpander = Reference< com::sun::star::util::XMacroExpander >( + xContext->getValueByName( ::rtl::OUString( "/singletons/com.sun.star.util.theMacroExpander" ) ), UNO_QUERY ); } SvLBoxEntry* pTemp = aTreeLB.First(); diff --git a/desktop/Library_offacc.mk b/desktop/Library_offacc.mk index 8272b4d49920..6e3c84589d76 100644 --- a/desktop/Library_offacc.mk +++ b/desktop/Library_offacc.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Library_set_include,offacc,\ $(eval $(call gb_Library_use_sdk_api,offacc)) $(eval $(call gb_Library_use_libraries,offacc,\ + comphelper \ cppu \ cppuhelper \ sal \ diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index 7b8359d44d15..4f56c32560e7 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -144,8 +144,6 @@ class Desktop : public Application void RegisterServices(); void DeregisterServices(); - void DestroyApplicationServiceManager( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xSMgr ); - void CreateTemporaryDirectory(); void RemoveTemporaryDirectory(); diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 4741ce6833a8..cff9f8ed65e6 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -665,8 +665,9 @@ void Desktop::DeInit() // close splashscreen if it's still open CloseSplashScreen(); - Reference xXMultiServiceFactory(::comphelper::getProcessServiceFactory()); - DestroyApplicationServiceManager( xXMultiServiceFactory ); + Reference< XComponent >( + comphelper::getProcessComponentContext(), UNO_QUERY_THROW )-> + dispose(); // nobody should get a destroyd service factory... ::comphelper::setProcessServiceFactory( NULL ); diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index 367b77ab08fd..157621ac92ed 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -128,25 +128,6 @@ void Desktop::InitApplicationServiceManager() comphelper::setProcessServiceFactory(sm); } -void Desktop::DestroyApplicationServiceManager( Reference< XMultiServiceFactory >& xSMgr ) -{ - Reference< XPropertySet > xProps( xSMgr, UNO_QUERY ); - if ( xProps.is() ) - { - try - { - Reference< XComponent > xComp; - if (xProps->getPropertyValue( OUString( "DefaultContext" )) >>= xComp ) - { - xComp->dispose(); - } - } - catch (const UnknownPropertyException&) - { - } - } -} - void Desktop::RegisterServices() { if( !m_bServicesRegistered ) diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx index 2fd0da302885..4510f65dcbc5 100644 --- a/desktop/source/offacc/acceptor.cxx +++ b/desktop/source/offacc/acceptor.cxx @@ -31,10 +31,9 @@ #include #include #include -#include #include #include - +#include #include namespace desktop @@ -45,15 +44,6 @@ extern "C" void workerfunc (void * acc) ((Acceptor*)acc)->run(); } -static Reference getComponentContext( const Reference& rFactory) -{ - Reference rContext; - Reference< XPropertySet > rPropSet( rFactory, UNO_QUERY ); - Any a = rPropSet->getPropertyValue( ::rtl::OUString( "DefaultContext" ) ); - a >>= rContext; - return rContext; -} - Mutex Acceptor::m_aMutex; Acceptor::Acceptor( const Reference< XMultiServiceFactory >& rFactory ) @@ -66,7 +56,7 @@ Acceptor::Acceptor( const Reference< XMultiServiceFactory >& rFactory ) { m_rSMgr = rFactory; // get component context - m_rContext = getComponentContext(m_rSMgr); + m_rContext = comphelper::getComponentContext(m_rSMgr); m_rAcceptor = Reference< XAcceptor > (m_rSMgr->createInstance( rtl::OUString("com.sun.star.connection.Acceptor" )), UNO_QUERY ); @@ -266,7 +256,7 @@ Reference SAL_CALL AccInstanceProvider::getInstance (const OUString& } else if(aName.compareToAscii( "StarOffice.ComponentContext" ) == 0 ) { - rInstance = getComponentContext( m_rSMgr ); + rInstance = comphelper::getComponentContext( m_rSMgr ); } else if ( aName.compareToAscii("StarOffice.NamingService" ) == 0 ) { @@ -278,7 +268,7 @@ Reference SAL_CALL AccInstanceProvider::getInstance (const OUString& rNamingService->registerObject( OUString("StarOffice.ServiceManager" ), m_rSMgr ); rNamingService->registerObject( - OUString("StarOffice.ComponentContext" ), getComponentContext( m_rSMgr )); + OUString("StarOffice.ComponentContext" ), comphelper::getComponentContext( m_rSMgr )); rInstance = rNamingService; } } diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index 65235d0f4d17..75643c901bda 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -18,7 +18,6 @@ */ #include -#include #include #include #include @@ -635,15 +634,9 @@ uno::Reference< container::XIndexAccess > DocumentHolder::MergeMenuesForInplace( uno::Reference< lang::XSingleComponentFactory > xIndAccessFact( xContMenu, uno::UNO_QUERY_THROW ); - uno::Reference< uno::XComponentContext > xComponentContext; - - uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY ); - if ( xProps.is() ) - xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= - xComponentContext; - uno::Reference< container::XIndexContainer > xMergedMenu( - xIndAccessFact->createInstanceWithContext( xComponentContext ), + xIndAccessFact->createInstanceWithContext( + comphelper::getProcessComponentContext() ), uno::UNO_QUERY_THROW ); FindConnectPoints( xContMenu, nContPoints ); diff --git a/extensions/Executable_nsplugin.mk b/extensions/Executable_nsplugin.mk index 05bf003cd550..0f6af603c9ee 100644 --- a/extensions/Executable_nsplugin.mk +++ b/extensions/Executable_nsplugin.mk @@ -53,6 +53,7 @@ $(eval $(call gb_Executable_add_libs,nsplugin,\ )) $(eval $(call gb_Executable_use_libraries,nsplugin,\ + comphelper \ cppu \ cppuhelper \ sal \ diff --git a/extensions/source/nsplugin/source/so_instance.cxx b/extensions/source/nsplugin/source/so_instance.cxx index b70a3e60ab40..c9b6ee9212df 100644 --- a/extensions/source/nsplugin/source/so_instance.cxx +++ b/extensions/source/nsplugin/source/so_instance.cxx @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -239,8 +240,8 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) } //create stream for the document - Reference< beans::XPropertySet > xFactoryProperties( mxRemoteMSF, uno::UNO_QUERY ); - Reference< uno::XComponentContext > xContext( xFactoryProperties->getPropertyValue( "DefaultContext" ), UNO_QUERY ); + Reference< uno::XComponentContext > xContext( + comphelper::getComponentContext( mxRemoteMSF ) ); Reference< ucb::XSimpleFileAccess2 > xSimpleFileAccess( ucb::SimpleFileAccess::create(xContext) ); Reference xInputStream = xSimpleFileAccess->openFileRead( m_sURL ); diff --git a/fileaccess/source/FileAccess.cxx b/fileaccess/source/FileAccess.cxx index 478a340bf823..b4c45db5beda 100644 --- a/fileaccess/source/FileAccess.cxx +++ b/fileaccess/source/FileAccess.cxx @@ -31,7 +31,6 @@ #include #include -#include #include #include #include @@ -253,15 +252,8 @@ void OFileAccess::transferImpl( const rtl::OUString& rSource, try { - Reference< XComponentContext > xCtx; - Reference< XPropertySet > xPropSet( mxSMgr, UNO_QUERY_THROW ); - if ( xPropSet.is() ) - { - xPropSet->getPropertyValue( - rtl::OUString( - "DefaultContext" ) ) - >>= xCtx; - } + Reference< XComponentContext > xCtx( + comphelper::getComponentContext( mxSMgr ) ); Reference< XMacroExpander > xExpander; diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index a5b28d571c9b..ba8503f7238a 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -58,7 +58,6 @@ #include #include #include -#include #include @@ -190,12 +189,8 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False) ::rtl::OUString sExpandedUrl; try { - css::uno::Reference xContext; - css::uno::Reference xProps(m_rServiceFactory, - UNO_QUERY_THROW); - xContext.set(xProps->getPropertyValue(::rtl::OUString( - "DefaultContext" )), - UNO_QUERY_THROW); + css::uno::Reference xContext( + comphelper::getComponentContext(m_rServiceFactory)); css::uno::Reference xMacroExpander( xContext->getValueByName( diff --git a/framework/inc/macros/xserviceinfo.hxx b/framework/inc/macros/xserviceinfo.hxx index 7d9fa130a6d0..bcca5c25f6a0 100644 --- a/framework/inc/macros/xserviceinfo.hxx +++ b/framework/inc/macros/xserviceinfo.hxx @@ -41,8 +41,8 @@ #include #include #include -#include #include +#include #include #include #include @@ -143,10 +143,8 @@ ________________________________________________________________________________ throw( css::uno::Exception ) \ { \ /* retrieve component context from the given service manager */ \ - static const ::rtl::OUString PROP_DEFAULTCONTEXT("DefaultContext"); \ - css::uno::Reference< css::beans::XPropertySet > xSMGRProps(xServiceManager, css::uno::UNO_QUERY_THROW); \ - css::uno::Reference< css::uno::XComponentContext > xComponentContext; \ - xSMGRProps->getPropertyValue( PROP_DEFAULTCONTEXT ) >>= xComponentContext; \ + css::uno::Reference< css::uno::XComponentContext > xComponentContext( \ + comphelper::getComponentContext( xServiceManager ) ); \ /* create new instance of service */ \ CLASS* pClass = new CLASS( xComponentContext ); \ /* hold it alive by increasing his ref count!!! */ \ diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index c1789c81a313..06dbc83c5d8c 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -35,7 +35,6 @@ #include #include "com/sun/star/util/XMacroExpander.hpp" #include "com/sun/star/uno/XComponentContext.hpp" -#include "com/sun/star/beans/XPropertySet.hpp" #include #include #include @@ -415,15 +414,11 @@ AddonsOptions_Impl::AddonsOptions_Impl() m_aPropMergeToolbarNames[ OFFSET_MERGETOOLBAR_MERGECONTEXT ] = PROPERTYNAME_MERGETOOLBAR_MERGECONTEXT; m_aPropMergeToolbarNames[ OFFSET_MERGETOOLBAR_TOOLBARITEMS ] = PROPERTYNAME_MERGETOOLBAR_TOOLBARITEMS; - Reference< XComponentContext > xContext; - Reference< com::sun::star::beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY ); - xProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xContext; - if ( xContext.is() ) - { - m_xMacroExpander = Reference< com::sun::star::util::XMacroExpander >( xContext->getValueByName( + Reference< XComponentContext > xContext( + comphelper::getProcessComponentContext() ); + m_xMacroExpander = Reference< com::sun::star::util::XMacroExpander >( xContext->getValueByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.util.theMacroExpander"))), UNO_QUERY ); - } ReadConfigurationData(); diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx index 680835d77bbd..24a133184a07 100644 --- a/framework/source/fwe/xml/menudocumenthandler.cxx +++ b/framework/source/fwe/xml/menudocumenthandler.cxx @@ -39,7 +39,6 @@ #include #include #include -#include #include #include @@ -376,10 +375,8 @@ throw( SAXException, RuntimeException ) m_bMenuMode = sal_True; // Container must be factory to create sub container - Reference< XComponentContext > xComponentContext; - Reference< XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY ); - xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= - xComponentContext; + Reference< XComponentContext > xComponentContext( + comphelper::getProcessComponentContext() ); Reference< XIndexContainer > xSubItemContainer; if ( m_xContainerFactory.is() ) @@ -573,6 +570,7 @@ OReadMenuPopupHandler::OReadMenuPopupHandler( m_bMenuMode( sal_False ), m_xMenuContainer( rMenuContainer ), m_xContainerFactory( rFactory ), + m_xComponentContext( comphelper::getProcessComponentContext() ), m_nNextElementExpected( ELEM_CLOSE_NONE ) { } @@ -612,12 +610,6 @@ throw( SAXException, RuntimeException ) m_bMenuMode = sal_True; // Container must be factory to create sub container - if ( !m_xComponentContext.is() ) - { - const Reference< XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW ); - m_xComponentContext.set(xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), UNO_QUERY_THROW ); - } - Reference< XIndexContainer > xSubItemContainer; if ( m_xContainerFactory.is() ) xSubItemContainer = Reference< XIndexContainer >( m_xContainerFactory->createInstanceWithContext( m_xComponentContext ), UNO_QUERY ); diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index 0fbd031d0b12..3a490d4b11b8 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -34,6 +34,7 @@ #include #include +#include #include #include #include diff --git a/framework/source/lomenubar/FrameHelper.cxx b/framework/source/lomenubar/FrameHelper.cxx index f7e0ba6a414a..bc90ebabb2dd 100644 --- a/framework/source/lomenubar/FrameHelper.cxx +++ b/framework/source/lomenubar/FrameHelper.cxx @@ -591,9 +591,8 @@ FrameHelper::rebuildMenu (Reference < XMenu > xMenu, //we need to access that info through a special XPopupMenuController if (isSpecialSubmenu (oUCommand)) { - Reference < XPropertySet > xMSFProps (m_xMSF, UNO_QUERY); - Reference xContext (xMSFProps->getPropertyValue (OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext"))), - UNO_QUERY); + Reference xContext( + comphelper::getComponentContext(m_xMSF)); Reference < XPopupMenuController > xRFC (m_xPCF->createInstanceWithArgumentsAndContext(oUCommand, m_args, @@ -736,9 +735,8 @@ FrameHelper::dispatchCommand (OUString command) { target = OUString(RTL_CONSTASCII_USTRINGPARAM("_default")); - Reference < XPropertySet > xMSFProps (m_xMSF, UNO_QUERY); - Reference xContext (xMSFProps->getPropertyValue (OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext"))), - UNO_QUERY); + Reference xContext( + comphelper::getComponentContext(m_xMSF)); Reference < XPopupMenuController > xRFC (m_xPCF->createInstanceWithArgumentsAndContext(OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:RecentFileList")), m_args, xContext), diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index ad1ddc476da2..1bc24dda35e1 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -50,12 +50,11 @@ #include #include #include -#include #include #include #include #include - +#include #include #include #include @@ -235,11 +234,8 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue } Reference< XMultiComponentFactory > xToolbarControllerFactory( m_xToolbarControllerRegistration, UNO_QUERY ); - Reference< XComponentContext > xComponentContext; - Reference< XPropertySet > xProps( m_xServiceManager, UNO_QUERY ); - - if ( xProps.is() ) - xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xComponentContext; + Reference< XComponentContext > xComponentContext( + comphelper::getComponentContext( m_xServiceManager ) ); sal_uInt32 nElements( 0 ); sal_Bool bAppendSeparator( sal_False ); diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx index f7d39231d665..4fd83d43869f 100644 --- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx @@ -38,7 +38,6 @@ #include #include "com/sun/star/util/XMacroExpander.hpp" #include "com/sun/star/uno/XComponentContext.hpp" -#include "com/sun/star/beans/XPropertySet.hpp" #include #include @@ -81,16 +80,12 @@ uno::Reference< util::XMacroExpander > GetMacroExpander() if ( !xMacroExpander.is() ) { - uno::Reference< uno::XComponentContext > xContext; - uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY ); - xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xContext; - if ( xContext.is() ) - { - m_xMacroExpander = Reference< com::sun::star::util::XMacroExpander >( xContext->getValueByName( + uno::Reference< uno::XComponentContext > xContext( + comphelper::getProcessComponentContext() ); + m_xMacroExpander = Reference< com::sun::star::util::XMacroExpander >( xContext->getValueByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.util.theMacroExpander"))), UNO_QUERY ); - xMacroExpander = m_xMacroExpander; - } + xMacroExpander = m_xMacroExpander; } } diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index c7b9d7c92ebe..b79f1795bce8 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -43,7 +43,6 @@ #include #include #include -#include #include #include #include @@ -1217,11 +1216,8 @@ sal_Bool MenuBarManager::CreatePopupMenuController( MenuItemHandler* pMenuItemHa aPropValue.Value <<= m_xFrame; aSeq[1] <<= aPropValue; - Reference< XComponentContext > xComponentContext; - Reference< XPropertySet > xProps( getServiceFactory(), UNO_QUERY ); - - xProps->getPropertyValue( rtl::OUString( "DefaultContext" )) >>= - xComponentContext; + Reference< XComponentContext > xComponentContext( + comphelper::getComponentContext( getServiceFactory() ) ); Reference< XPopupMenuController > xPopupMenuController( xPopupMenuControllerFactory->createInstanceWithArgumentsAndContext( diff --git a/framework/source/uielement/popupmenucontroller.cxx b/framework/source/uielement/popupmenucontroller.cxx index c1afcd45c876..47e1a9cb4502 100644 --- a/framework/source/uielement/popupmenucontroller.cxx +++ b/framework/source/uielement/popupmenucontroller.cxx @@ -177,8 +177,8 @@ bool PopupMenuController::CreatePopupMenuController() throw (Exception) aPropValue.Value <<= m_xFrame; aSeq[1] <<= aPropValue; - Reference< XPropertySet > xProps( getServiceManager(), UNO_QUERY_THROW ); - Reference< XComponentContext > xComponentContext( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), UNO_QUERY_THROW ); + Reference< XComponentContext > xComponentContext( + comphelper::getComponentContext( getServiceManager() ) ); Reference< XPopupMenuController > xPopupMenuController( xPopupMenuControllerRegistration->createInstanceWithArgumentsAndContext( getCommandURL(), aSeq, xComponentContext ), UNO_QUERY ); if ( xPopupMenuController.is() ) diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index 692c81dc07e0..7766746ee883 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -50,7 +50,7 @@ #include #include #include - +#include #include #include @@ -335,13 +335,10 @@ void StatusBarManager::CreateControllers() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::CreateControllers" ); uno::Reference< lang::XMultiComponentFactory > xStatusbarControllerFactory( m_xStatusbarControllerRegistration, uno::UNO_QUERY ); - uno::Reference< uno::XComponentContext > xComponentContext; - uno::Reference< beans::XPropertySet > xProps( m_xServiceManager, uno::UNO_QUERY ); + uno::Reference< uno::XComponentContext > xComponentContext( + comphelper::getComponentContext( m_xServiceManager ) ); uno::Reference< awt::XWindow > xStatusbarWindow = VCLUnoHelper::GetInterface( m_pStatusBar ); - if ( xProps.is() ) - xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xComponentContext; - for ( sal_uInt16 i = 0; i < m_pStatusBar->GetItemCount(); i++ ) { sal_uInt16 nId = m_pStatusBar->GetItemId( i ); diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index bf39ac075d17..208fe1dc81af 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -897,17 +897,14 @@ void ToolBarManager::CreateControllers() RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::ToolBarManager::CreateControllers" ); Reference< XMultiComponentFactory > xToolbarControllerFactory( m_xToolbarControllerRegistration, UNO_QUERY ); - Reference< XComponentContext > xComponentContext; - Reference< XPropertySet > xProps( m_xServiceManager, UNO_QUERY ); + Reference< XComponentContext > xComponentContext( + comphelper::getComponentContext( m_xServiceManager ) ); Reference< XWindow > xToolbarWindow = VCLUnoHelper::GetInterface( m_pToolBar ); css::util::URL aURL; sal_Bool bHasDisabledEntries = SvtCommandOptions().HasEntries( SvtCommandOptions::CMDOPTION_DISABLED ); SvtCommandOptions aCmdOptions; - if ( xProps.is() ) - xProps->getPropertyValue( rtl::OUString( "DefaultContext" )) >>= xComponentContext; - for ( sal_uInt16 i = 0; i < m_pToolBar->GetItemCount(); i++ ) { sal_uInt16 nId = m_pToolBar->GetItemId( i ); diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index 0a5de43332f2..acb037817002 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -1088,10 +1088,8 @@ void LngSvcMgr::GetAvailableSpellSvcs_Impl() { try { - uno::Reference < uno::XComponentContext > xContext; - uno::Reference< beans::XPropertySet > xProps( xFac, uno::UNO_QUERY ); - - xProps->getPropertyValue( "DefaultContext" ) >>= xContext; + uno::Reference < uno::XComponentContext > xContext( + comphelper::getComponentContext( xFac ) ); xSvc = uno::Reference< linguistic2::XSpellChecker >( ( xCompFactory.is() ? xCompFactory->createInstanceWithContext( xContext ) : xFactory->createInstance() ), uno::UNO_QUERY ); } catch (const uno::Exception &) @@ -1152,10 +1150,8 @@ void LngSvcMgr::GetAvailableGrammarSvcs_Impl() { try { - uno::Reference < uno::XComponentContext > xContext; - uno::Reference< beans::XPropertySet > xProps( xFac, uno::UNO_QUERY ); - - xProps->getPropertyValue( "DefaultContext" ) >>= xContext; + uno::Reference < uno::XComponentContext > xContext( + comphelper::getComponentContext( xFac ) ); xSvc = uno::Reference< linguistic2::XProofreader >( ( xCompFactory.is() ? xCompFactory->createInstanceWithContext( xContext ) : xFactory->createInstance() ), uno::UNO_QUERY ); } catch (const uno::Exception &) @@ -1215,10 +1211,8 @@ void LngSvcMgr::GetAvailableHyphSvcs_Impl() { try { - uno::Reference < uno::XComponentContext > xContext; - uno::Reference< beans::XPropertySet > xProps( xFac, uno::UNO_QUERY ); - - xProps->getPropertyValue( "DefaultContext" ) >>= xContext; + uno::Reference < uno::XComponentContext > xContext( + comphelper::getComponentContext( xFac ) ); xSvc = uno::Reference< linguistic2::XHyphenator >( ( xCompFactory.is() ? xCompFactory->createInstanceWithContext( xContext ) : xFactory->createInstance() ), uno::UNO_QUERY ); } @@ -1281,10 +1275,8 @@ void LngSvcMgr::GetAvailableThesSvcs_Impl() { try { - uno::Reference < uno::XComponentContext > xContext; - uno::Reference< beans::XPropertySet > xProps( xFac, uno::UNO_QUERY ); - - xProps->getPropertyValue( "DefaultContext" ) >>= xContext; + uno::Reference < uno::XComponentContext > xContext( + comphelper::getComponentContext( xFac ) ); xSvc = uno::Reference< linguistic2::XThesaurus >( ( xCompFactory.is() ? xCompFactory->createInstanceWithContext( xContext ) : xFactory->createInstance() ), uno::UNO_QUERY ); } catch (const uno::Exception &) diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx index 06773dc4be9e..70b39364e099 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -44,7 +44,6 @@ #include #include #include -#include #include #include #include @@ -56,7 +55,6 @@ using ::com::sun::star::xml::dom::DocumentBuilder; using ::com::sun::star::xml::dom::XDocument; using ::com::sun::star::xml::dom::XDocumentBuilder; using ::com::sun::star::xml::sax::XFastSAXSerializable; -using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::lang::XComponent; namespace oox { @@ -194,26 +192,6 @@ XmlFilterBaseImpl::XmlFilterBaseImpl( const Reference< XComponentContext >& rxCo maFastParser.registerNamespace( ids[i].Second ); } - -static Reference< XComponentContext > lcl_getComponentContext(Reference< XMultiServiceFactory > aFactory) -{ - Reference< XComponentContext > xContext; - try - { - Reference< XPropertySet > xFactProp( aFactory, UNO_QUERY ); - if( xFactProp.is() ) - xFactProp->getPropertyValue( "DefaultContext") >>= xContext; - } - catch( Exception& ) - {} - - return xContext; -} - -// ============================================================================ - -// ============================================================================ - XmlFilterBase::XmlFilterBase( const Reference< XComponentContext >& rxContext ) throw( RuntimeException ) : FilterBase( rxContext ), mxImpl( new XmlFilterBaseImpl( rxContext ) ), @@ -233,7 +211,7 @@ void XmlFilterBase::importDocumentProperties() throw() Reference< XMultiServiceFactory > xFactory( getServiceFactory(), UNO_QUERY ); MediaDescriptor aMediaDesc( getMediaDescriptor() ); Reference< XInputStream > xInputStream; - Reference< XComponentContext > xContext = lcl_getComponentContext(getServiceFactory()); + Reference< XComponentContext > xContext = comphelper::getComponentContext(getServiceFactory()); ::oox::core::FilterDetect aDetector( xContext ); xInputStream = aDetector.extractUnencryptedPackage( aMediaDesc ); Reference< XComponent > xModel( getModel(), UNO_QUERY ); @@ -357,7 +335,7 @@ Reference XmlFilterBase::importFragment( const ::rtl::OUString& aFrag { // create the dom parser Reference< XComponentContext > xContext = - lcl_getComponentContext(getServiceFactory()); + comphelper::getComponentContext(getServiceFactory()); Reference xDomBuilder( DocumentBuilder::create(xContext) ); // create DOM from fragment diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 65195432d41e..08cc68c29f9e 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -121,21 +121,6 @@ namespace oox { namespace drawingml { if ( GETA(propName) ) \ mAny >>= variable; -Reference< uno::XComponentContext > lcl_getComponentContext() -{ - Reference< uno::XComponentContext > xContext; - try - { - Reference< beans::XPropertySet > xFactProp( comphelper::getProcessServiceFactory(), uno::UNO_QUERY ); - if( xFactProp.is()) - xFactProp->getPropertyValue(OUString("DefaultContext")) >>= xContext; - } - catch( uno::Exception& ) - {} - - return xContext; -} - class lcl_MatchesRole : public ::std::unary_function< Reference< chart2::data::XLabeledDataSequence >, bool > { public: @@ -217,13 +202,12 @@ Reference< chart2::data::XLabeledDataSequence > lcl_getCategories( const Referen Reference< chart2::data::XDataSource > lcl_createDataSource( const Sequence< Reference< chart2::data::XLabeledDataSequence > > & aData ) { - Reference< chart2::data::XDataSink > xSink; - Reference< uno::XComponentContext > xContext( lcl_getComponentContext()); - if( xContext.is() ) - xSink.set( - xContext->getServiceManager()->createInstanceWithContext( - OUString("com.sun.star.chart2.data.DataSource"), - xContext ), uno::UNO_QUERY_THROW ); + Reference< uno::XComponentContext > xContext( + comphelper::getProcessComponentContext() ); + Reference< chart2::data::XDataSink > xSink( + xContext->getServiceManager()->createInstanceWithContext( + "com.sun.star.chart2.data.DataSource", xContext ), + uno::UNO_QUERY_THROW ); if( xSink.is()) xSink->setData( aData ); diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index 3ad3355426bc..42a195cca4de 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -132,16 +132,10 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >& _xORB,Window* pParen if (m_xMeAsFrame.is()) { - Reference< XComponentContext > xOwnContext; + Reference< XComponentContext > xOwnContext( + comphelper::getComponentContext( m_xORB ) ); try { - // our own component context - Reference< XPropertySet > xFactoryProperties( m_xORB, UNO_QUERY_THROW ); - xOwnContext.set( - xFactoryProperties->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ), - UNO_QUERY_THROW ); - - // a ComponentContext for the ::cppu::ContextEntry_Init aHandlerContextInfo[] = { ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContextDocument" ) ), makeAny( m_pDesignView->getController().getModel() )), diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index a9462b6465e1..8c5e0c4a0274 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -2628,9 +2628,6 @@ uno::Sequence ScDPObject::GetRegisteredSources() return aSeq; } -// use getContext from addincol.cxx -uno::Reference getContext(uno::Reference xMSF); - uno::Reference ScDPObject::CreateSource( const ScDPServiceDesc& rDesc ) { rtl::OUString aImplName = rDesc.aServiceName; @@ -2664,9 +2661,10 @@ uno::Reference ScDPObject::CreateSource( const ScDPS // passing the context to the component (see ScUnoAddInCollection::Initialize) uno::Reference xInterface; - uno::Reference xCtx = getContext(xManager); + uno::Reference xCtx( + comphelper::getComponentContext(xManager)); uno::Reference xCFac( xIntFac, uno::UNO_QUERY ); - if (xCtx.is() && xCFac.is()) + if (xCFac.is()) xInterface = xCFac->createInstanceWithContext(xCtx); if (!xInterface.is()) diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx index 33c92320c7b7..ac3b81272a76 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.cxx @@ -281,19 +281,6 @@ void ScUnoAddInCollection::Clear() bInitialized = false; } -uno::Reference getContext(uno::Reference xMSF) -{ - uno::Reference xCtx; - try { - uno::Reference xPropset(xMSF, uno::UNO_QUERY); - xPropset->getPropertyValue( - ::rtl::OUString("DefaultContext")) >>= xCtx; - } - catch ( uno::Exception & ) { - } - return xCtx; -} - void ScUnoAddInCollection::Initialize() { OSL_ENSURE( !bInitialized, "Initialize twice?" ); @@ -321,9 +308,10 @@ void ScUnoAddInCollection::Initialize() // passing the context to the component uno::Reference xInterface; - uno::Reference xCtx = getContext(xManager); + uno::Reference xCtx( + comphelper::getComponentContext(xManager)); uno::Reference xCFac( xIntFac, uno::UNO_QUERY ); - if (xCtx.is() && xCFac.is()) + if (xCFac.is()) { xInterface = xCFac->createInstanceWithContext(xCtx); if (xInterface.is()) diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 211473104ebf..645911d8e5a5 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -683,36 +683,34 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) try { - uno::Reference< uno::XComponentContext > xContext; - uno::Reference< lang::XMultiServiceFactory > xServiceManager = ::comphelper::getProcessServiceFactory(); - uno::Reference< beans::XPropertySet > xProp( xServiceManager, uno::UNO_QUERY_THROW ); - xProp->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ) >>= xContext; - if ( xContext.is() ) + uno::Reference< uno::XComponentContext > xContext( + comphelper::getProcessComponentContext() ); + uno::Reference< lang::XMultiServiceFactory > xServiceManager( + xContext->getServiceManager(), + uno::UNO_QUERY_THROW ); + uno::Reference< container::XContentEnumerationAccess > xEnumAccess( xServiceManager, uno::UNO_QUERY_THROW ); + uno::Reference< container::XEnumeration> xEnum = xEnumAccess->createContentEnumeration( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.SpreadsheetDocumentJob" ) ) ); + if ( xEnum.is() ) { - uno::Reference< container::XContentEnumerationAccess > xEnumAccess( xServiceManager, uno::UNO_QUERY_THROW ); - uno::Reference< container::XEnumeration> xEnum = xEnumAccess->createContentEnumeration( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.SpreadsheetDocumentJob" ) ) ); - if ( xEnum.is() ) + while ( xEnum->hasMoreElements() ) { - while ( xEnum->hasMoreElements() ) + uno::Any aAny = xEnum->nextElement(); + uno::Reference< lang::XSingleComponentFactory > xFactory; + aAny >>= xFactory; + if ( xFactory.is() ) { - uno::Any aAny = xEnum->nextElement(); - uno::Reference< lang::XSingleComponentFactory > xFactory; - aAny >>= xFactory; - if ( xFactory.is() ) - { - uno::Reference< task::XJob > xJob( xFactory->createInstanceWithContext( xContext ), uno::UNO_QUERY_THROW ); - uno::Sequence< beans::NamedValue > aArgsForJob(1); - ScViewData* pViewData = GetViewData(); - SfxViewShell* pViewShell = ( pViewData ? pViewData->GetViewShell() : NULL ); - SfxViewFrame* pViewFrame = ( pViewShell ? pViewShell->GetViewFrame() : NULL ); - SfxFrame* pFrame = ( pViewFrame ? &pViewFrame->GetFrame() : NULL ); - uno::Reference< frame::XController > xController = ( pFrame ? pFrame->GetController() : 0 ); - uno::Reference< sheet::XSpreadsheetView > xSpreadsheetView( xController, uno::UNO_QUERY_THROW ); - aArgsForJob[0] = beans::NamedValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SpreadsheetView" )), + uno::Reference< task::XJob > xJob( xFactory->createInstanceWithContext( xContext ), uno::UNO_QUERY_THROW ); + uno::Sequence< beans::NamedValue > aArgsForJob(1); + ScViewData* pViewData = GetViewData(); + SfxViewShell* pViewShell = ( pViewData ? pViewData->GetViewShell() : NULL ); + SfxViewFrame* pViewFrame = ( pViewShell ? pViewShell->GetViewFrame() : NULL ); + SfxFrame* pFrame = ( pViewFrame ? &pViewFrame->GetFrame() : NULL ); + uno::Reference< frame::XController > xController = ( pFrame ? pFrame->GetController() : 0 ); + uno::Reference< sheet::XSpreadsheetView > xSpreadsheetView( xController, uno::UNO_QUERY_THROW ); + aArgsForJob[0] = beans::NamedValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SpreadsheetView" )), uno::makeAny( xSpreadsheetView ) ); - xJob->execute( aArgsForJob ); - } + xJob->execute( aArgsForJob ); } } } diff --git a/sc/source/ui/miscdlgs/solverutil.cxx b/sc/source/ui/miscdlgs/solverutil.cxx index 356eef7440e2..8ed768e1f760 100644 --- a/sc/source/ui/miscdlgs/solverutil.cxx +++ b/sc/source/ui/miscdlgs/solverutil.cxx @@ -29,6 +29,7 @@ #include "solverutil.hxx" #include +#include #include #include #include @@ -84,19 +85,13 @@ void ScSolverUtil::GetImplementations( uno::Sequence& rImplNames, rImplNames.realloc(0); // clear rDescriptions.realloc(0); - uno::Reference xCtx; - uno::Reference xMSF = comphelper::getProcessServiceFactory(); - uno::Reference xPropset(xMSF, uno::UNO_QUERY); - try - { - xPropset->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xCtx; - } - catch ( uno::Exception & ) - { - } + uno::Reference xCtx( + comphelper::getProcessComponentContext() ); + uno::Reference xMSF( + xCtx->getServiceManager(), uno::UNO_QUERY_THROW ); uno::Reference xEnAc( xMSF, uno::UNO_QUERY ); - if ( xCtx.is() && xEnAc.is() ) + if ( xEnAc.is() ) { uno::Reference xEnum = xEnAc->createContentEnumeration( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SCSOLVER_SERVICE)) ); @@ -140,19 +135,13 @@ uno::Reference ScSolverUtil::GetSolver( const rtl::OUString& rIm { uno::Reference xSolver; - uno::Reference xCtx; - uno::Reference xMSF = comphelper::getProcessServiceFactory(); - uno::Reference xPropset(xMSF, uno::UNO_QUERY); - try - { - xPropset->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xCtx; - } - catch ( uno::Exception & ) - { - } + uno::Reference xCtx( + comphelper::getProcessComponentContext() ); + uno::Reference xMSF( + xCtx->getServiceManager(), uno::UNO_QUERY_THROW ); uno::Reference xEnAc( xMSF, uno::UNO_QUERY ); - if ( xCtx.is() && xEnAc.is() ) + if ( xEnAc.is() ) { uno::Reference xEnum = xEnAc->createContentEnumeration( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SCSOLVER_SERVICE)) ); diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx index cfbb7e79b64b..ec54e24a5051 100644 --- a/sc/source/ui/vba/excelvbahelper.cxx +++ b/sc/source/ui/vba/excelvbahelper.cxx @@ -118,10 +118,10 @@ private: bool bInitialWarningState; static uno::Reference< beans::XPropertySet > getGlobalSheetSettings() throw ( uno::RuntimeException ) { - static uno::Reference< beans::XPropertySet > xTmpProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW ); - static uno::Reference xContext( xTmpProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW ); + static uno::Reference xContext( + comphelper::getProcessComponentContext() ); static uno::Reference xServiceManager( - xContext->getServiceManager(), uno::UNO_QUERY_THROW ); + xContext->getServiceManager() ); static uno::Reference< beans::XPropertySet > xProps( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.GlobalSheetSettings" ) ) ,xContext ), uno::UNO_QUERY_THROW ); return xProps; } diff --git a/sc/source/ui/vba/vbahelper.cxx b/sc/source/ui/vba/vbahelper.cxx index a2a2217531f7..ce5e680f1c26 100644 --- a/sc/source/ui/vba/vbahelper.cxx +++ b/sc/source/ui/vba/vbahelper.cxx @@ -124,10 +124,10 @@ private: bool bInitialWarningState; static uno::Reference< beans::XPropertySet > getGlobalSheetSettings() throw ( uno::RuntimeException ) { - static uno::Reference< beans::XPropertySet > xTmpProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW ); - static uno::Reference xContext( xTmpProps->getPropertyValue( rtl::OUString( "DefaultContext" )), uno::UNO_QUERY_THROW ); + static uno::Reference xContext( + comphelper::getProcessComponentContext() ); static uno::Reference xServiceManager( - xContext->getServiceManager(), uno::UNO_QUERY_THROW ); + xContext->getServiceManager() ); static uno::Reference< beans::XPropertySet > xProps( xServiceManager->createInstanceWithContext( rtl::OUString( "com.sun.star.sheet.GlobalSheetSettings" ) ,xContext ), uno::UNO_QUERY_THROW ); return xProps; } @@ -279,11 +279,10 @@ getCurrentDocument() throw (uno::RuntimeException) if ( false == ( aModel >>= xModel ) || !xModel.is() ) { - // trying last gasp try the current component - uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW ); - // test if vba service is present - uno::Reference< uno::XComponentContext > xCtx( xProps->getPropertyValue( rtl::OUString( "DefaultContext" )), uno::UNO_QUERY_THROW ); - uno::Reference xSMgr( xCtx->getServiceManager(), uno::UNO_QUERY_THROW ); + uno::Reference< uno::XComponentContext > xCtx( + comphelper::getProcessComponentContext() ); + uno::Reference xSMgr( + xCtx->getServiceManager() ); uno::Reference< frame::XDesktop > xDesktop (xSMgr->createInstanceWithContext(::rtl::OUString("com.sun.star.frame.Desktop"), xCtx), uno::UNO_QUERY_THROW ); xModel.set( xDesktop->getCurrentComponent(), uno::UNO_QUERY ); if ( !xModel.is() ) diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx index 528941b090d7..d5fe171afde2 100644 --- a/sc/source/ui/vba/vbaworksheet.cxx +++ b/sc/source/ui/vba/vbaworksheet.cxx @@ -167,10 +167,10 @@ openNewDoc(rtl::OUString aSheetName ) uno::Reference xModel; try { - uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW ); - uno::Reference< uno::XComponentContext > xContext( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW ); + uno::Reference< uno::XComponentContext > xContext( + comphelper::getProcessComponentContext() ); uno::Reference xServiceManager( - xContext->getServiceManager(), uno::UNO_QUERY_THROW ); + xContext->getServiceManager() ); uno::Reference xComponentLoader( xServiceManager->createInstanceWithContext( diff --git a/scripting/Library_protocolhandler.mk b/scripting/Library_protocolhandler.mk index 291b1ecb03c1..d2a684ab852f 100644 --- a/scripting/Library_protocolhandler.mk +++ b/scripting/Library_protocolhandler.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Library_set_include,protocolhandler,\ $(eval $(call gb_Library_use_sdk_api,protocolhandler)) $(eval $(call gb_Library_use_libraries,protocolhandler,\ + comphelper \ cppu \ cppuhelper \ fwe \ diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx index ed41ebcfadc2..1881c917c4ae 100644 --- a/scripting/source/protocolhandler/scripthandler.cxx +++ b/scripting/source/protocolhandler/scripthandler.cxx @@ -41,6 +41,7 @@ #include #include +#include #include #include #include @@ -50,7 +51,6 @@ #include "com/sun/star/uri/XUriReference.hpp" #include "com/sun/star/uri/XUriReferenceFactory.hpp" #include "com/sun/star/uri/XVndSunStarScriptUrl.hpp" -#include "com/sun/star/beans/XPropertySet.hpp" using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -383,13 +383,8 @@ void ScriptProtocolHandler::createScriptProvider() // if nothing of this is successful, use the master script provider if ( !m_xScriptProvider.is() ) { - Reference< XPropertySet > xProps( m_xFactory, UNO_QUERY_THROW ); - - ::rtl::OUString dc( - "DefaultContext" ); - Reference< XComponentContext > xCtx( - xProps->getPropertyValue( dc ), UNO_QUERY_THROW ); + comphelper::getComponentContext( m_xFactory ) ); ::rtl::OUString tmspf( "/singletons/com.sun.star.script.provider.theMasterScriptProviderFactory"); diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx index 00981f075898..7249d143a8d0 100644 --- a/scripting/source/vbaevents/eventhelper.cxx +++ b/scripting/source/vbaevents/eventhelper.cxx @@ -368,14 +368,10 @@ eventMethodToDescriptor( const ::rtl::OUString& rEventMethod, ScriptEventDescrip } -ScriptEventHelper::ScriptEventHelper( const Reference< XInterface >& xControl ) : m_xControl( xControl ) -{ - Reference < beans::XPropertySet > xProps( - ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW ); - m_xCtx.set( xProps->getPropertyValue( rtl::OUString( - "DefaultContext" )), - uno::UNO_QUERY_THROW ); -} +ScriptEventHelper::ScriptEventHelper( const Reference< XInterface >& xControl ): + m_xCtx( comphelper::getProcessComponentContext() ), + m_xControl( xControl ) +{} Sequence< rtl::OUString > ScriptEventHelper::getEventListeners() diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx index bf8fd5027a2a..8eb74eeaabcf 100644 --- a/sd/source/core/CustomAnimationPreset.cxx +++ b/sd/source/core/CustomAnimationPreset.cxx @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include @@ -316,19 +315,14 @@ void CustomAnimationPresets::importEffects() { try { - // Get service factory - Reference< XMultiServiceFactory > xServiceFactory( comphelper::getProcessServiceFactory() ); - DBG_ASSERT( xServiceFactory.is(), "sd::CustomAnimationPresets::import(), got no service manager" ); - if( !xServiceFactory.is() ) - return; + uno::Reference< uno::XComponentContext > xContext( + comphelper::getProcessComponentContext() ); + Reference< XMultiServiceFactory > xServiceFactory( + xContext->getServiceManager(), UNO_QUERY_THROW ); - uno::Reference< beans::XPropertySet > xProps( xServiceFactory, UNO_QUERY ); - uno::Reference< uno::XComponentContext > xContext; - xProps->getPropertyValue( "DefaultContext" ) >>= xContext; - - uno::Reference< util::XMacroExpander > xMacroExpander; - if( xContext.is() ) - xMacroExpander.set( xContext->getValueByName("/singletons/com.sun.star.util.theMacroExpander"), UNO_QUERY ); + uno::Reference< util::XMacroExpander > xMacroExpander( + xContext->getValueByName("/singletons/com.sun.star.util.theMacroExpander"), + UNO_QUERY ); Reference< XMultiServiceFactory > xConfigProvider( xServiceFactory->createInstance("com.sun.star.configuration.ConfigurationProvider" ), diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx index dd03514cd5d4..3c77ead958fe 100644 --- a/sd/source/core/TransitionPreset.cxx +++ b/sd/source/core/TransitionPreset.cxx @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include @@ -152,19 +151,14 @@ bool TransitionPreset::importTransitionPresetList( TransitionPresetList& rList ) try { - // Get service factory - Reference< XMultiServiceFactory > xServiceFactory( comphelper::getProcessServiceFactory() ); - DBG_ASSERT( xServiceFactory.is(), "sd::CustomAnimationPresets::import(), got no service manager" ); - if( !xServiceFactory.is() ) - return false; + uno::Reference< uno::XComponentContext > xContext( + comphelper::getProcessComponentContext() ); + Reference< XMultiServiceFactory > xServiceFactory( + xContext->getServiceManager(), UNO_QUERY_THROW ); - uno::Reference< beans::XPropertySet > xProps( xServiceFactory, UNO_QUERY ); - uno::Reference< uno::XComponentContext > xContext; - xProps->getPropertyValue( "DefaultContext" ) >>= xContext; - - uno::Reference< util::XMacroExpander > xMacroExpander; - if( xContext.is() ) - xMacroExpander.set( xContext->getValueByName("/singletons/com.sun.star.util.theMacroExpander"), UNO_QUERY ); + uno::Reference< util::XMacroExpander > xMacroExpander( + xContext->getValueByName("/singletons/com.sun.star.util.theMacroExpander"), + UNO_QUERY ); // import ui strings Reference< XMultiServiceFactory > xConfigProvider( diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 7106771db298..d95318b00704 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -163,17 +163,12 @@ SfxDockingWrapper::SfxDockingWrapper( Window* pParentWnd , uno::Reference< awt::XWindow > xWindow; try { - uno::Reference< beans::XPropertySet > xProps( xServiceManager, uno::UNO_QUERY ); - uno::Reference< uno::XComponentContext > xContext; + uno::Reference< uno::XComponentContext > xContext( + comphelper::getComponentContext( xServiceManager ) ); - if ( xProps.is() ) - xProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xContext; - if ( xContext.is() ) - { - xWindow = uno::Reference< awt::XWindow>( - xFactoryMgr->createInstanceWithArgumentsAndContext( aArgs, xContext ), - uno::UNO_QUERY ); - } + xWindow = uno::Reference< awt::XWindow>( + xFactoryMgr->createInstanceWithArgumentsAndContext( aArgs, xContext ), + uno::UNO_QUERY ); static uno::WeakReference< frame::XModuleManager2 > m_xModuleManager; diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index c7a2fa62d6b5..25ed45909bcc 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -581,29 +581,18 @@ void SfxDocTplService_Impl::getDirList() maTemplateDirs = Sequence< OUString >( nCount ); - uno::Reference< XComponentContext > xCtx; + uno::Reference< XComponentContext > xCtx( + comphelper::getComponentContext( mxFactory ) ); uno::Reference< util::XMacroExpander > xExpander; - uno::Reference< XPropertySet > xPropSet( mxFactory, UNO_QUERY ); const rtl::OUString aPrefix( "vnd.sun.star.expand:" ); - if ( xPropSet.is() ) - { - xPropSet->getPropertyValue( - rtl::OUString( - "DefaultContext" ) ) - >>= xCtx; - } + xCtx->getValueByName( + rtl::OUString( "/singletons/com.sun.star.util.theMacroExpander" ) ) + >>= xExpander; - if ( xCtx.is() ) - { - xCtx->getValueByName( - rtl::OUString( "/singletons/com.sun.star.util.theMacroExpander" ) ) - >>= xExpander; - - OSL_ENSURE( xExpander.is(), - "Unable to obtain macro expander singleton!" ); - } + OSL_ENSURE( xExpander.is(), + "Unable to obtain macro expander singleton!" ); for ( sal_uInt16 i=0; i xCtx; - uno::Reference< XPropertySet > xPropSet( mxFactory, UNO_QUERY ); - if ( xPropSet.is() ) - { - xPropSet->getPropertyValue( - rtl::OUString( - "DefaultContext" ) ) - >>= xCtx; - } + uno::Reference< XComponentContext > xCtx( + comphelper::getComponentContext( mxFactory ) ); - OSL_ENSURE( xCtx.is(), - "Unable to obtain component context from " - "service manager!" ); - - if ( xCtx.is() ) - { - xCtx->getValueByName( - rtl::OUString( - "/singletons/" - "com.sun.star.util.theOfficeInstallationDirectories" ) ) + xCtx->getValueByName( + rtl::OUString( + "/singletons/" + "com.sun.star.util.theOfficeInstallationDirectories" ) ) >>= mxOfficeInstDirs; - } OSL_ENSURE( mxOfficeInstDirs.is(), "Unable to obtain office installation directory " diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx index ed96a698f48c..2ae2890f4c63 100644 --- a/svl/source/misc/urihelper.cxx +++ b/svl/source/misc/urihelper.cxx @@ -18,8 +18,6 @@ */ #include -#include -#include "com/sun/star/lang/XMultiComponentFactory.hpp" #include "com/sun/star/ucb/Command.hpp" #include "com/sun/star/ucb/IllegalIdentifierException.hpp" #include "com/sun/star/ucb/UniversalContentBroker.hpp" @@ -291,15 +289,8 @@ rtl::OUString URIHelper::simpleNormalizedMakeRelative( { com::sun::star::uno::Reference< com::sun::star::uri::XUriReference > rel( URIHelper::normalizedMakeRelative( - com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >( - (com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet >( - comphelper::getProcessServiceFactory(), - com::sun::star::uno::UNO_QUERY_THROW)-> - getPropertyValue("DefaultContext")), - com::sun::star::uno::UNO_QUERY_THROW), - baseUriReference, uriReference)); + comphelper::getProcessComponentContext(), baseUriReference, + uriReference)); return rel.is() ? rel->getUriReference() : uriReference; } diff --git a/svtools/Library_hatchwindowfactory.mk b/svtools/Library_hatchwindowfactory.mk index a25abdb3bcf3..03f2566bfae9 100644 --- a/svtools/Library_hatchwindowfactory.mk +++ b/svtools/Library_hatchwindowfactory.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Library_set_include,hatchwindowfactory,\ $(eval $(call gb_Library_use_sdk_api,hatchwindowfactory)) $(eval $(call gb_Library_use_libraries,hatchwindowfactory,\ + comphelper \ cppu \ cppuhelper \ sal \ diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx index fe934549d202..0cf4d7d120fd 100644 --- a/svtools/source/hatchwindow/documentcloser.cxx +++ b/svtools/source/hatchwindow/documentcloser.cxx @@ -22,9 +22,8 @@ #include #include #include -#include #include - +#include #include #include #include @@ -267,18 +266,8 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ODocumentCloser::impl_staticGetSupport uno::Reference< uno::XInterface > SAL_CALL ODocumentCloser::impl_staticCreateSelfInstance( const uno::Reference< lang::XMultiServiceFactory >& xServiceManager ) { - uno::Reference< uno::XComponentContext > xContext; - uno::Reference< beans::XPropertySet > xPropSet( xServiceManager, uno::UNO_QUERY ); - if ( xPropSet.is() ) - xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ) >>= xContext; - - if ( !xContext.is() ) - { - throw uno::RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unable to obtain component context from service manager!" ) ), - uno::Reference< uno::XInterface >() ); - } - + uno::Reference< uno::XComponentContext > xContext( + comphelper::getComponentContext( xServiceManager ) ); return static_cast< cppu::OWeakObject * >( new ODocumentCloser( xContext ) ); } diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index 139d84ad7336..b49d74aa0648 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include @@ -837,36 +836,15 @@ namespace svt osl::MutexGuard aGuard( m_aMutex ); if ( !m_xOfficeInstDirs.is() ) { - // @@@ This is bad! - uno::Reference< lang::XMultiServiceFactory > xSMgr - = comphelper::getProcessServiceFactory(); - OSL_ENSURE( xSMgr.is(), "No service manager!" ); - - uno::Reference< beans::XPropertySet > xPropSet( - xSMgr, uno::UNO_QUERY ); - if ( xPropSet.is() ) - { - uno::Reference< uno::XComponentContext > xCtx; - xPropSet->getPropertyValue( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ) - >>= xCtx; - - OSL_ENSURE( xCtx.is(), - "Unable to obtain component context from service manager!" ); - - if ( xCtx.is() ) - { - xCtx->getValueByName( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( + uno::Reference< uno::XComponentContext > xCtx( + comphelper::getProcessComponentContext() ); + xCtx->getValueByName( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.util.theOfficeInstallationDirectories" ) ) ) - >>= m_xOfficeInstDirs; - } + >>= m_xOfficeInstDirs; - OSL_ENSURE( m_xOfficeInstDirs.is(), - "Unable to obtain office directories singleton!" ); - - } + OSL_ENSURE( m_xOfficeInstDirs.is(), + "Unable to obtain office directories singleton!" ); } } return m_xOfficeInstDirs; diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index 044eb783380e..e83c2d89d16a 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -570,10 +570,8 @@ void FmPropBrw::impl_createPropertyBrowser_throw( FmFormShell* _pFormShell ) xControlMap = pFormPage->GetImpl().getControlToShapeMap(); // our own component context - Reference< XPropertySet > xFactoryProperties( m_xORB, UNO_QUERY_THROW ); Reference< XComponentContext > xOwnContext( - xFactoryProperties->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ), - UNO_QUERY_THROW ); + comphelper::getComponentContext( m_xORB ) ); // a ComponentContext for the ::cppu::ContextEntry_Init aHandlerContextInfo[] = diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx index ff1ae4971bf4..48910c0bead1 100644 --- a/sw/source/filter/ww8/ww8toolbar.cxx +++ b/sw/source/filter/ww8/ww8toolbar.cxx @@ -370,8 +370,8 @@ bool Customization::ImportMenu( CTBWrapper& rWrapper, CustomToolBarImportHelper& } uno::Reference< lang::XSingleComponentFactory > xSCF( xIndexContainer, uno::UNO_QUERY_THROW ); - uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW ); - uno::Reference< uno::XComponentContext > xContext( xProps->getPropertyValue( "DefaultContext" ), uno::UNO_QUERY_THROW ); + uno::Reference< uno::XComponentContext > xContext( + comphelper::getProcessComponentContext() ); // create the popup menu uno::Sequence< beans::PropertyValue > aPopupMenu( 4 ); aPopupMenu[0].Name = "CommandURL"; diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index da6591eea945..430312c0883e 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -339,8 +339,9 @@ void SwTestAccountSettingsDialog::Test() try { uno::Reference< mail::XMailService > xInMailService; - uno::Reference< mail::XMailServiceProvider > xMailServiceProvider = - mail::MailServiceProvider::create(getCurrentCmpCtx(rMgr)); + uno::Reference< mail::XMailServiceProvider > xMailServiceProvider( + mail::MailServiceProvider::create( + comphelper::getComponentContext(rMgr))); uno::Reference< mail::XMailService > xMailService = xMailServiceProvider->create( mail::MailServiceType_SMTP); diff --git a/sw/source/ui/dbui/mailmergehelper.cxx b/sw/source/ui/dbui/mailmergehelper.cxx index 9f756c267c69..91fd9fcdced8 100644 --- a/sw/source/ui/dbui/mailmergehelper.cxx +++ b/sw/source/ui/dbui/mailmergehelper.cxx @@ -110,8 +110,9 @@ uno::Reference< mail::XSmtpService > ConnectToSmtpServer( if (rMgr.is()) try { - uno::Reference< mail::XMailServiceProvider > xMailServiceProvider = - mail::MailServiceProvider::create(getCurrentCmpCtx(rMgr)); + uno::Reference< mail::XMailServiceProvider > xMailServiceProvider( + mail::MailServiceProvider::create( + comphelper::getComponentContext(rMgr))); xSmtpServer = uno::Reference< mail::XSmtpService > ( xMailServiceProvider->create( mail::MailServiceType_SMTP @@ -673,17 +674,6 @@ void SwConnectionListener::disposing(const lang::EventObject& /*aEvent*/) { } -uno::Reference< uno::XComponentContext> getCurrentCmpCtx( - uno::Reference rSrvMgr) -{ - uno::Reference< beans::XPropertySet > xPropSet = - uno::Reference< beans::XPropertySet>(rSrvMgr, uno::UNO_QUERY); - Any aAny = xPropSet->getPropertyValue( ::rtl::OUString("DefaultContext")); - uno::Reference< uno::XComponentContext> rCmpCtx; - aAny >>= rCmpCtx; - return rCmpCtx; -} - SwMailTransferable::SwMailTransferable(const rtl::OUString& rBody, const rtl::OUString& rMimeType) : cppu::WeakComponentImplHelper2< datatransfer::XTransferable, beans::XPropertySet >(m_aMutex), m_aMimeType( rMimeType ), diff --git a/sw/source/ui/inc/mailmergehelper.hxx b/sw/source/ui/inc/mailmergehelper.hxx index d7024d3c39a3..7796046c0b0b 100644 --- a/sw/source/ui/inc/mailmergehelper.hxx +++ b/sw/source/ui/inc/mailmergehelper.hxx @@ -45,18 +45,10 @@ class SwMailMergeConfigItem; -namespace com{ namespace sun{ namespace star{ - namespace uno{ - class XComponentContext; - } - namespace lang{ - class XMultiServiceFactory; - } - namespace mail{ - class XSmtpService; - class XMailService; - } -}}} +namespace com { namespace sun { namespace star { namespace mail { + class XMailService; + class XSmtpService; +} } } } namespace SwMailMergeHelper { @@ -317,10 +309,6 @@ public: {m_sSenderAddress = rSenderAddress;} }; -SW_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> - getCurrentCmpCtx( - ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory> rSrvMgr); #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/Library_ucphier1.mk b/ucb/Library_ucphier1.mk index 767fbd15208a..83798585807c 100644 --- a/ucb/Library_ucphier1.mk +++ b/ucb/Library_ucphier1.mk @@ -32,6 +32,7 @@ $(eval $(call gb_Library_set_componentfile,ucphier1,ucb/source/ucp/hierarchy/ucp $(eval $(call gb_Library_use_sdk_api,ucphier1)) $(eval $(call gb_Library_use_libraries,ucphier1,\ + comphelper \ cppu \ cppuhelper \ sal \ diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx index 0f6794b59b1c..4585efb6a3e3 100644 --- a/ucb/source/core/ucbcmds.cxx +++ b/ucb/source/core/ucbcmds.cxx @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include @@ -1705,12 +1704,8 @@ void UniversalContentBroker::globalTransfer( uno::Reference< ucb::XCommandEnvironment > xLocalEnv; if (xEnv.is()) { - uno::Reference< beans::XPropertySet > const xProps( - m_xSMgr, uno::UNO_QUERY_THROW ); - uno::Reference< uno::XComponentContext > xCtx; - xCtx.set( xProps->getPropertyValue( - rtl::OUString( "DefaultContext" ) ), - uno::UNO_QUERY_THROW ); + uno::Reference< uno::XComponentContext > xCtx( + comphelper::getComponentContext( m_xSMgr ) ); xLocalEnv.set( ucb::CommandEnvironment::create( xCtx, diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx index cf0db7a82a90..dfed6f6600be 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx @@ -36,9 +36,9 @@ *************************************************************************/ #include #include -#include #include #include +#include #include #include "hierarchyprovider.hxx" #include "hierarchycontent.hxx" @@ -279,30 +279,16 @@ HierarchyContentProvider::getOfficeInstallationDirectories() { OSL_ENSURE( m_xSMgr.is(), "No service manager!" ); - uno::Reference< uno::XComponentContext > xCtx; - uno::Reference< beans::XPropertySet > xPropSet( - m_xSMgr, uno::UNO_QUERY ); - if ( xPropSet.is() ) - { - xPropSet->getPropertyValue( - rtl::OUString( "DefaultContext" ) ) - >>= xCtx; - } + uno::Reference< uno::XComponentContext > xCtx( + comphelper::getComponentContext( m_xSMgr ) ); - OSL_ENSURE( xCtx.is(), - "Unable to obtain component context from " - "service manager!" ); - - if ( xCtx.is() ) - { - xCtx->getValueByName( - rtl::OUString( "/singletons/com.sun.star.util.theOfficeInstallationDirectories" ) ) + xCtx->getValueByName( + rtl::OUString( "/singletons/com.sun.star.util.theOfficeInstallationDirectories" ) ) >>= m_xOfficeInstDirs; // Be silent. singleton only available in an Office environment. -// OSL_ENSURE( m_xOfficeInstDirs.is(), -// "Unable to obtain office directories singleton!" ); - } +// OSL_ENSURE( m_xOfficeInstDirs.is(), +// "Unable to obtain office directories singleton!" ); } } return m_xOfficeInstDirs; diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx index 64a369a40548..bfabf8cedfac 100644 --- a/ucb/source/ucp/webdav/webdavcontent.cxx +++ b/ucb/source/ucp/webdav/webdavcontent.cxx @@ -33,6 +33,7 @@ *************************************************************************/ +#include #include #include "osl/doublecheckedlocking.h" #include @@ -199,12 +200,8 @@ uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) { try { - uno::Reference< beans::XPropertySet > const xProps( - m_xSMgr, uno::UNO_QUERY_THROW ); - uno::Reference< uno::XComponentContext > xCtx; - xCtx.set( xProps->getPropertyValue( - rtl::OUString( "DefaultContext" ) ), - uno::UNO_QUERY_THROW ); + uno::Reference< uno::XComponentContext > xCtx( + comphelper::getComponentContext( m_xSMgr ) ); uno::Reference< task::XInteractionHandler > xIH( task::PasswordContainerInteractionHandler::create( xCtx ) ); diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx index be309293d466..e8956c464d18 100644 --- a/unotools/source/config/lingucfg.cxx +++ b/unotools/source/config/lingucfg.cxx @@ -24,7 +24,6 @@ #include #include #include "com/sun/star/util/XMacroExpander.hpp" -#include "com/sun/star/beans/XPropertySet.hpp" #include #include #include @@ -939,16 +938,12 @@ static uno::Reference< util::XMacroExpander > lcl_GetMacroExpander() { if ( !xMacroExpander.is() ) { - uno::Reference< uno::XComponentContext > xContext; - uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY ); - xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext"))) >>= xContext; - if ( xContext.is() ) - { - aG_xMacroExpander = uno::Reference< com::sun::star::util::XMacroExpander >( xContext->getValueByName( + uno::Reference< uno::XComponentContext > xContext( + comphelper::getProcessComponentContext() ); + aG_xMacroExpander = uno::Reference< com::sun::star::util::XMacroExpander >( xContext->getValueByName( OUString(RTL_CONSTASCII_USTRINGPARAM("/singletons/com.sun.star.util.theMacroExpander"))), uno::UNO_QUERY ); - xMacroExpander = aG_xMacroExpander; - } + xMacroExpander = aG_xMacroExpander; } } diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx index 9db368e72b68..dece6b5d4ef5 100644 --- a/vbahelper/source/vbahelper/vbahelper.cxx +++ b/vbahelper/source/vbahelper/vbahelper.cxx @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include @@ -155,15 +154,8 @@ dispatchRequests (const uno::Reference< frame::XModel>& xModel, const OUString & uno::Reference xDispatchProvider (xFrame,uno::UNO_QUERY_THROW); try { - uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW ); - uno::Reference xContext( xProps->getPropertyValue( "DefaultContext" ), uno::UNO_QUERY_THROW ); - if ( !xContext.is() ) - return; - - uno::Reference xServiceManager = xContext->getServiceManager(); - if ( !xServiceManager.is() ) - return; - + uno::Reference xContext( + comphelper::getProcessComponentContext() ); uno::Reference xParser( util::URLTransformer::create(xContext) ); xParser->parseStrict (url); } diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx index f8a883528804..ecf17755e15f 100644 --- a/vcl/aqua/source/app/salinst.cxx +++ b/vcl/aqua/source/app/salinst.cxx @@ -59,8 +59,6 @@ #include -#include -#include #include #include #include @@ -1083,23 +1081,9 @@ void* AquaSalInstance::GetConnectionIdentifier( ConnectionIdentifierType& rRetur // to UTF-8 before encoding non ascii characters, which is not what other apps expect. static rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl) { - rtl::OUString extUrl; - - uno::Reference< lang::XMultiServiceFactory > sm = comphelper::getProcessServiceFactory(); - if (sm.is()) - { - uno::Reference< beans::XPropertySet > pset; - sm->queryInterface( getCppuType( &pset )) >>= pset; - if (pset.is()) - { - uno::Reference< uno::XComponentContext > context; - static const rtl::OUString DEFAULT_CONTEXT( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ); - pset->getPropertyValue(DEFAULT_CONTEXT) >>= context; - if (context.is()) - extUrl = uri::ExternalUriReferenceTranslator::create(context)->translateToExternal(internalUrl); - } - } - return extUrl; + uno::Reference< uno::XComponentContext > context( + comphelper::getProcessComponentContext()); + return uri::ExternalUriReferenceTranslator::create(context)->translateToExternal(internalUrl); } // #i104525# many versions of OSX have problems with some URLs: diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index 1472bea879f2..8537685ae278 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -36,6 +36,7 @@ #include #include "inputstream.hxx" #include +#include #include #include @@ -44,7 +45,6 @@ #include "com/sun/star/deployment/ExtensionManager.hpp" #include "com/sun/star/deployment/thePackageManagerFactory.hpp" #include -#include #include #include #include @@ -1406,12 +1406,14 @@ ExtensionIteratorBase::ExtensionIteratorBase( Reference< XComponentContext > xCo , m_aInitialModule( aInitialModule ) , m_aLanguage( aLanguage ) { + assert( m_xContext.is() ); init(); } ExtensionIteratorBase::ExtensionIteratorBase( Databases& rDatabases, const rtl::OUString& aInitialModule, const rtl::OUString& aLanguage ) - : m_rDatabases( rDatabases ) + : m_xContext( comphelper::getProcessComponentContext() ) + , m_rDatabases( rDatabases ) , m_eState( INITIAL_MODULE ) , m_aInitialModule( aInitialModule ) , m_aLanguage( aLanguage ) @@ -1421,25 +1423,6 @@ ExtensionIteratorBase::ExtensionIteratorBase( Databases& rDatabases, void ExtensionIteratorBase::init() { - if( !m_xContext.is() ) - { - Reference< XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory(); - Reference< XPropertySet > xProps( xFactory, UNO_QUERY ); - OSL_ASSERT( xProps.is() ); - if (xProps.is()) - { - xProps->getPropertyValue( - ::rtl::OUString( "DefaultContext" ) ) >>= m_xContext; - OSL_ASSERT( m_xContext.is() ); - } - } - if( !m_xContext.is() ) - { - throw RuntimeException( - ::rtl::OUString( "ExtensionIteratorBase::init(), no XComponentContext" ), - Reference< XInterface >() ); - } - m_xSFA = ucb::SimpleFileAccess::create(m_xContext); m_bUserPackagesLoaded = false; diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx index 79e4c0a1e5bb..e3deabafd57e 100644 --- a/xmlhelp/source/cxxhelp/provider/provider.cxx +++ b/xmlhelp/source/cxxhelp/provider/provider.cxx @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include @@ -345,15 +345,8 @@ void ContentProvider::init() rtl::Bootstrap::expandMacros(aPath); aImagesZipPaths[ 1 ] = aPath; - uno::Reference< uno::XComponentContext > xContext; - uno::Reference< beans::XPropertySet > xProps( m_xSMgr, uno::UNO_QUERY ); - OSL_ASSERT( xProps.is() ); - if (xProps.is()) - { - xProps->getPropertyValue( - ::rtl::OUString( "DefaultContext" ) ) >>= xContext; - OSL_ASSERT( xContext.is() ); - } + uno::Reference< uno::XComponentContext > xContext( + comphelper::getComponentContext( m_xSMgr ) ); sal_Bool showBasic = getBooleanKey(xHierAccess,"Help/ShowBasic"); m_pDatabases = new Databases( showBasic, diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx index 39c72815a06e..cb44797bd343 100644 --- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx +++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx @@ -53,7 +53,6 @@ #include #include #include -#include #include "urlparameter.hxx" #include "databases.hxx" @@ -993,21 +992,8 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam, if( bAddExtensionPath ) { - Reference< XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory(); - Reference< XPropertySet > xProps( xFactory, UNO_QUERY ); - OSL_ASSERT( xProps.is() ); - Reference< XComponentContext > xContext; - if (xProps.is()) - { - xProps->getPropertyValue( - ::rtl::OUString( "DefaultContext" ) ) >>= xContext; - } - if( !xContext.is() ) - { - throw RuntimeException( - ::rtl::OUString( "InputStreamTransformer::InputStreamTransformer(), no XComponentContext" ), - Reference< XInterface >() ); - } + Reference< XComponentContext > xContext( + comphelper::getProcessComponentContext() ); rtl::OUString aOUExpandedExtensionPath = Databases::expandURL( aExtensionRegistryPath, xContext ); rtl::OString aExpandedExtensionPath = rtl::OUStringToOString( aOUExpandedExtensionPath, osl_getThreadTextEncoding() ); diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index 9b2bcb708192..4640b85eda55 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -296,21 +296,6 @@ public: namespace { -Reference< uno::XComponentContext > lcl_getComponentContext() -{ - Reference< uno::XComponentContext > xContext; - try - { - Reference< beans::XPropertySet > xFactProp( comphelper::getProcessServiceFactory(), uno::UNO_QUERY ); - if( xFactProp.is()) - xFactProp->getPropertyValue(OUString( "DefaultContext" )) >>= xContext; - } - catch( const uno::Exception& ) - { - } - - return xContext; -} class lcl_MatchesRole : public ::std::unary_function< Reference< chart2::data::XLabeledDataSequence >, bool > { @@ -400,15 +385,13 @@ Reference< chart2::data::XLabeledDataSequence > lcl_getCategories( const Referen Reference< chart2::data::XDataSource > lcl_createDataSource( const Sequence< Reference< chart2::data::XLabeledDataSequence > > & aData ) { - Reference< chart2::data::XDataSink > xSink; - Reference< uno::XComponentContext > xContext( lcl_getComponentContext()); - if( xContext.is() ) - xSink.set( - xContext->getServiceManager()->createInstanceWithContext( - OUString( "com.sun.star.chart2.data.DataSource" ), - xContext ), uno::UNO_QUERY_THROW ); - if( xSink.is()) - xSink->setData( aData ); + Reference< uno::XComponentContext > xContext( + comphelper::getProcessComponentContext() ); + Reference< chart2::data::XDataSink > xSink( + xContext->getServiceManager()->createInstanceWithContext( + "com.sun.star.chart2.data.DataSource", xContext ), + uno::UNO_QUERY_THROW ); + xSink->setData( aData ); return Reference< chart2::data::XDataSource >( xSink, uno::UNO_QUERY ); } diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx index ab0ae4dd5493..729203bdc83b 100644 --- a/xmloff/source/chart/SchXMLImport.cxx +++ b/xmloff/source/chart/SchXMLImport.cxx @@ -70,21 +70,6 @@ using ::com::sun::star::uno::Sequence; namespace { -Reference< uno::XComponentContext > lcl_getComponentContext() -{ - Reference< uno::XComponentContext > xContext; - try - { - Reference< beans::XPropertySet > xFactProp( comphelper::getProcessServiceFactory(), uno::UNO_QUERY ); - if( xFactProp.is()) - xFactProp->getPropertyValue(OUString( "DefaultContext" )) >>= xContext; - } - catch( uno::Exception& ) - {} - - return xContext; -} - class lcl_MatchesChartType : public ::std::unary_function< Reference< chart2::XChartType >, bool > { public: @@ -489,7 +474,8 @@ Reference< chart2::XDataSeries > SchXMLImportHelper::GetNewDataSeries( xDoc->getFirstDiagram(), uno::UNO_QUERY_THROW ); Sequence< Reference< chart2::XCoordinateSystem > > aCooSysSeq( xCooSysCnt->getCoordinateSystems()); - Reference< uno::XComponentContext > xContext( lcl_getComponentContext()); + Reference< uno::XComponentContext > xContext( + comphelper::getProcessComponentContext() ); if( nCoordinateSystemIndex < aCooSysSeq.getLength()) { diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx index 524058f42756..948475a21ccf 100644 --- a/xmloff/source/chart/SchXMLTools.cxx +++ b/xmloff/source/chart/SchXMLTools.cxx @@ -72,20 +72,6 @@ using ::com::sun::star::uno::Sequence; namespace { -Reference< uno::XComponentContext > lcl_getComponentContext() -{ - Reference< uno::XComponentContext > xContext; - try - { - Reference< beans::XPropertySet > xFactProp( comphelper::getProcessServiceFactory(), uno::UNO_QUERY ); - if( xFactProp.is()) - xFactProp->getPropertyValue(OUString( "DefaultContext" )) >>= xContext; - } - catch( uno::Exception& ) - {} - - return xContext; -} rtl::OUString lcl_getGeneratorFromModel( const uno::Reference< frame::XModel >& xChartModel ) { @@ -375,13 +361,12 @@ XMLTokenEnum getTokenByChartType( Reference< chart2::data::XLabeledDataSequence > GetNewLabeledDataSequence() { - Reference< chart2::data::XLabeledDataSequence > xResult; - Reference< uno::XComponentContext > xContext( lcl_getComponentContext()); - if( xContext.is() ) - xResult.set( - xContext->getServiceManager()->createInstanceWithContext( - OUString( "com.sun.star.chart2.data.LabeledDataSequence" ), - xContext ), uno::UNO_QUERY_THROW ); + Reference< uno::XComponentContext > xContext( + comphelper::getProcessComponentContext() ); + Reference< chart2::data::XLabeledDataSequence > xResult( + xContext->getServiceManager()->createInstanceWithContext( + "com.sun.star.chart2.data.LabeledDataSequence", xContext ), + uno::UNO_QUERY_THROW ); return xResult; } From 34061bf6d4fe8b80f46a97b8fbeddc18247e8bf7 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sat, 29 Sep 2012 18:16:26 +0200 Subject: [PATCH 056/863] gb_PYTHON_PRECOMMAND is only defined after gb_PYTHON ...now that fa140733eeaf59030caa3115be4de11fb210b5b7 "fix dep on internal ucpp" moved things around, so use "=" instead of ":=" here. (And I'm not sure the other places need ":=" either.) Change-Id: Id71570c4a55ab08ca339801dec78ef06cfd80ef0 --- solenv/gbuild/gbuild.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 4afc09530edf..a8f76bffd204 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -220,7 +220,7 @@ else ifeq ($(DISABLE_PYTHON),TRUE) gb_PYTHON := python else gb_PYTHONTARGET := $(call gb_Executable_get_target_for_build,python) -gb_PYTHON := $(gb_PYTHON_PRECOMMAND) $(gb_PYTHONTARGET) +gb_PYTHON = $(gb_PYTHON_PRECOMMAND) $(gb_PYTHONTARGET) endif ifneq (,$(SYSTEM_UCPP)) From 0473dbefb23c10b4f801b9449462c87dd0ebad55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= Date: Sat, 29 Sep 2012 19:46:34 +0200 Subject: [PATCH 057/863] soltools: fix windows build Change-Id: Iac8321655a18826f9adcf8aed8075cce1aa24652 --- soltools/Executable_makedepend.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/soltools/Executable_makedepend.mk b/soltools/Executable_makedepend.mk index e6e7ac6d5ff6..e301a0937cc4 100644 --- a/soltools/Executable_makedepend.mk +++ b/soltools/Executable_makedepend.mk @@ -25,10 +25,6 @@ $(eval $(call gb_Executable_add_defs,makedepend,\ -wd4131 \ -wd4706 \ )) - -$(eval $(call gb_Executable_use_libraries,makedepend,\ - msvcprt \ -)) endif $(eval $(call gb_Executable_add_cobjects,makedepend,\ From d3f8bf8334bcc701aca2f4687530bde8f2c2c018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= Date: Fri, 28 Sep 2012 22:18:07 +0200 Subject: [PATCH 058/863] gbuild: gb_Library_TARGETS should really not be needed now Change-Id: I1a5f2fda44da782b43076eee67e292affe1bad1a --- solenv/gbuild/Helper.mk | 6 ------ solenv/gbuild/Library.mk | 1 - solenv/gbuild/StaticLibrary.mk | 1 - solenv/gbuild/TargetLocations.mk | 4 ++-- solenv/gbuild/gbuild.mk | 11 ++++------- solenv/gbuild/platform/WNT_INTEL_MSC.mk | 2 +- 6 files changed, 7 insertions(+), 18 deletions(-) diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index c210cd716a61..9817ef2923eb 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -108,12 +108,6 @@ $$(foreach group,$$(gb_Jar_VALIDGROUPS),$$(eval gb_Jar_$$(group) :=)) endef -define gb_Helper_collect_libtargets -gb_Library_TARGETS := $$(foreach group,$$(gb_Library_VALIDGROUPS),$$(gb_Library_$$(group))) -gb_StaticLibrary_TARGETS := $$(foreach group,$$(gb_StaticLibrary_VALIDGROUPS),$$(gb_StaticLibrary_$$(group))) - -endef - define gb_Helper_collect_knownlibs gb_Library_KNOWNLIBS := $$(foreach group,$$(gb_Library_VALIDGROUPS),$$(gb_Library_$$(group))) gb_StaticLibrary_KNOWNLIBS := $$(foreach group,$$(gb_StaticLibrary_VALIDGROUPS),$$(gb_StaticLibrary_$$(group))) diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 518211152cda..d07fe24292e0 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -37,7 +37,6 @@ # gb_Library_DLLFILENAMES # gb_Library_FILENAMES # gb_Library_Library_platform -# gb_Library_TARGETS # doesn't do anything, just used for hooking up component target .PHONY: $(call gb_Library__get_final_target,%) diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk index 124b009213b4..a09f720db995 100644 --- a/solenv/gbuild/StaticLibrary.mk +++ b/solenv/gbuild/StaticLibrary.mk @@ -33,7 +33,6 @@ # gb_StaticLibrary_OUTDIRLOCATION := $(OUTDIR)/lib # defined by platform # gb_StaticLibrary_FILENAMES -# gb_StaticLibrary_TARGETS # EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because they are indistinguishable on windows diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 28c7dd4d4e80..f3b92a34407e 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -67,11 +67,11 @@ gb_XcuModuleTarget_get_outdir_target = $(gb_Configuration_registry)/spool/$(1) define gb_Library_get_target -$(patsubst $(1):%,$(gb_Library_OUTDIRLOCATION)/%,$(filter $(filter $(1),$(gb_Library_TARGETS)):%,$(gb_Library_FILENAMES))) +$(patsubst $(1):%,$(gb_Library_OUTDIRLOCATION)/%,$(filter $(1):%,$(gb_Library_FILENAMES))) endef define gb_StaticLibrary_get_target -$(patsubst $(1):%,$(gb_StaticLibrary_OUTDIRLOCATION)/%,$(filter $(filter $(1),$(gb_StaticLibrary_TARGETS)):%,$(gb_StaticLibrary_FILENAMES))) +$(patsubst $(1):%,$(gb_StaticLibrary_OUTDIRLOCATION)/%,$(filter $(1):%,$(gb_StaticLibrary_FILENAMES))) endef diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index a8f76bffd204..9d521c79c092 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -165,17 +165,20 @@ endif include $(GBUILDDIR)/Helper.mk include $(GBUILDDIR)/TargetLocations.mk +include $(GBUILDDIR)/Tempfile.mk $(eval $(call gb_Helper_init_registries)) include $(SRCDIR)/Repository.mk include $(SRCDIR)/RepositoryExternal.mk -$(eval $(call gb_Helper_collect_libtargets)) +$(eval $(call gb_Helper_collect_knownlibs)) gb_Library_DLLPOSTFIX := lo # Include platform/cpu/compiler specific config/definitions include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk +include $(SRCDIR)/RepositoryFixes.mk + ifeq ($(CROSS_COMPILING),YES) # We can safely Assume all cross-compilation is from Unix systems. gb_Executable_EXT_for_build := @@ -229,12 +232,6 @@ else gb_UCPPTARGET := $(call gb_Executable_get_target_for_build,ucpp) endif -include $(GBUILDDIR)/Tempfile.mk - -include $(SRCDIR)/RepositoryFixes.mk - -$(eval $(call gb_Helper_collect_knownlibs)) - # add user-supplied flags ifneq ($(strip gb__ENV_CFLAGS),) gb_LinkTarget_CFLAGS += $(gb__ENV_CFLAGS) diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 600fa43b57c7..f6cae6ad5f4f 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -417,7 +417,7 @@ gb_Library_LAYER := \ $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \ gb_Library_FILENAMES :=\ - $(foreach lib,$(gb_Library_TARGETS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \ + $(foreach lib,$(gb_Library_KNOWNLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \ gb_Library_DLLEXT := .dll gb_Library_MAJORVER := 3 From 5753241d8869e7a3f64c535e4d23f125a7aed683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= Date: Sat, 29 Sep 2012 18:47:40 +0200 Subject: [PATCH 059/863] move gb_Executable_EXT_for_build to platform/ Change-Id: Ica30efee4fcd030dcc063321ba678a00bec726cd --- solenv/gbuild/AllLangResTarget.mk | 2 +- solenv/gbuild/gbuild.mk | 7 ------- solenv/gbuild/platform/WNT_INTEL_MSC.mk | 1 + solenv/gbuild/platform/com_GCC_defs.mk | 4 ++++ solenv/gbuild/platform/solaris.mk | 2 -- solenv/gbuild/platform/unxgcc.mk | 2 -- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index a82f98f7b4c8..866593d12f90 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -73,7 +73,7 @@ $(call gb_SrsPartMergeTarget_get_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY) # defined by platform # gb_SrsPartTarget__command_dep -gb_ResTarget_RSCTARGET := $(OUTDIR_FOR_BUILD)/bin/rsc$(gb_Executable_EXT_for_build) +gb_ResTarget_RSCTARGET := $(call gb_Executable_get_target_for_build,rsc) gb_ResTarget_RSCCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_ResTarget_RSCTARGET) define gb_SrsPartTarget__command diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 9d521c79c092..395c9669f808 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -179,13 +179,6 @@ include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk include $(SRCDIR)/RepositoryFixes.mk -ifeq ($(CROSS_COMPILING),YES) -# We can safely Assume all cross-compilation is from Unix systems. -gb_Executable_EXT_for_build := -else -gb_Executable_EXT_for_build := $(gb_Executable_EXT) -endif - # Set up build tools that can be either internal or system. It is # necessary to do it before we start including gbuild class makefiles, # so the classes can add dependencies on them. diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index f6cae6ad5f4f..a232b661eb93 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -521,6 +521,7 @@ endef # Executable class gb_Executable_EXT := .exe +gb_Executable_EXT_for_build := .exe gb_Executable_TARGETTYPEFLAGS := $(gb_Windows_PE_TARGETTYPEFLAGS) gb_Executable_get_rpath := diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index e03aa88a926e..0cc86e3c73d2 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -149,6 +149,10 @@ gb_DEBUG_CXXFLAGS := $(FNO_DEFAULT_INLINE) gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC))) +# Executable class + +gb_Executable_EXT_for_build := + # Helper class ifeq ($(OS_FOR_BUILD),MACOSX) diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 4b26f028fca9..47c12d2c1292 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -26,8 +26,6 @@ # #************************************************************************* -gb_Executable_EXT:= - include $(GBUILDDIR)/platform/com_GCC_defs.mk gb_MKTEMP := mktemp -t gbuild.XXXXXX diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 0957e4a3d71b..d996bd46107d 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -26,8 +26,6 @@ # #************************************************************************* -gb_Executable_EXT:= - include $(GBUILDDIR)/platform/com_GCC_defs.mk gb_CCVER := $(shell $(gb_CC) -dumpversion | $(gb_AWK) -F. -- '{ print $$1*10000+$$2*100+$$3 }') From 7cafe7ee9c0fe52c2b93fde59b35475a5b208f0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= Date: Sat, 29 Sep 2012 19:21:05 +0200 Subject: [PATCH 060/863] vertical space savings Change-Id: I8f73a804e2005108f4a47d9fe4f9cd4425787cb1 --- solenv/gbuild/Helper.mk | 4 ++ solenv/gbuild/gbuild.mk | 95 +++++++++++++---------------------------- 2 files changed, 34 insertions(+), 65 deletions(-) diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 9817ef2923eb..e1e5119b07ce 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -176,6 +176,10 @@ gb_Jar_$(1) += $(2) endef +define gb_Helper_define_if_set +$(foreach def,$(1),$(if $(filter TRUE YES,$($(def))),-D$(def))) +endef + define gb_Helper_execute $(gb_Helper_set_ld_path) $(OUTDIR_FOR_BUILD)/bin/$(1) endef diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 395c9669f808..b50faa02f5f7 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -245,12 +245,10 @@ gb_GLOBALDEFS := \ ifeq ($(gb_PRODUCT),$(false)) -gb_GLOBALDEFS += \ - -DDBG_UTIL \ +gb_GLOBALDEFS += -DDBG_UTIL \ ifneq ($(COM),MSC) -gb_GLOBALDEFS += \ - -D_DEBUG \ +gb_GLOBALDEFS += -D_DEBUG \ endif endif @@ -260,80 +258,47 @@ gb_GLOBALDEFS += -DSOLAR_JAVA endif ifeq ($(gb_TIMELOG),1) -gb_GLOBALDEFS += \ - -DTIMELOG \ +gb_GLOBALDEFS += -DTIMELOG \ endif ifeq ($(gb_DEBUGLEVEL),0) -gb_GLOBALDEFS += \ - -DOPTIMIZE \ +gb_GLOBALDEFS += -DOPTIMIZE \ ifeq ($(strip $(ASSERT_ALWAYS_ABORT)),FALSE) -gb_GLOBALDEFS += \ - -DNDEBUG \ +gb_GLOBALDEFS += -DNDEBUG \ endif else -gb_GLOBALDEFS += \ - -DSAL_LOG_INFO \ - -DSAL_LOG_WARN \ +gb_GLOBALDEFS += -DSAL_LOG_INFO \ + -DSAL_LOG_WARN \ ifneq ($(gb_DEBUGLEVEL),1) # 2 or more +gb_GLOBALDEFS += -DDEBUG \ + +endif +endif + +ifeq ($(ENABLE_HEADLESS),TRUE) +gb_GLOBALDEFS += -DLIBO_HEADLESS \ + +endif + gb_GLOBALDEFS += \ - -DDEBUG \ - -endif -endif - -ifneq ($(strip $(ENABLE_GTK)),) -gb_GLOBALDEFS += -DENABLE_GTK -endif - -ifneq ($(strip $(ENABLE_TDE)),) -gb_GLOBALDEFS += -DENABLE_TDE -endif - -ifneq ($(strip $(ENABLE_KDE)),) -gb_GLOBALDEFS += -DENABLE_KDE -endif - -ifneq ($(strip $(ENABLE_KDE4)),) -gb_GLOBALDEFS += -DENABLE_KDE4 -endif - -ifeq ($(strip $(ENABLE_GRAPHITE)),TRUE) -gb_GLOBALDEFS += -DENABLE_GRAPHITE -endif - -ifeq ($(strip $(ENABLE_HEADLESS)),TRUE) -gb_GLOBALDEFS += -DLIBO_HEADLESS -endif - -ifeq ($(strip $(DISABLE_DBCONNECTIVITY)),TRUE) -gb_GLOBALDEFS += -DDISABLE_DBCONNECTIVITY -endif - -ifeq ($(strip $(DISABLE_EXTENSIONS)),TRUE) -gb_GLOBALDEFS += -DDISABLE_EXTENSIONS -endif - -ifeq ($(strip $(DISABLE_SCRIPTING)),TRUE) -gb_GLOBALDEFS += -DDISABLE_SCRIPTING -endif - -ifeq ($(strip $(DISABLE_DYNLOADING)),TRUE) -gb_GLOBALDEFS += -DDISABLE_DYNLOADING -endif - -ifeq ($(HAVE_THREADSAFE_STATICS),TRUE) -gb_GLOBALDEFS += -DHAVE_THREADSAFE_STATICS -endif - -ifeq ($(ENABLE_TELEPATHY),TRUE) -gb_GLOBALDEFS += -DENABLE_TELEPATHY -endif + $(call gb_Helper_define_if_set,\ + DISABLE_DBCONNECTIVITY \ + DISABLE_DYNLOADING \ + DISABLE_EXTENSIONS \ + DISABLE_SCRIPTING \ + ENABLE_GRAPHITE \ + ENABLE_GTK \ + ENABLE_KDE \ + ENABLE_KDE4 \ + ENABLE_TDE \ + ENABLE_TELEPATHY \ + HAVE_THREADSAFE_STATICS \ + ) gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS)) From 898f54e72fc71d04c5090f3c7380e3bfce750adf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= Date: Sat, 29 Sep 2012 19:54:00 +0200 Subject: [PATCH 061/863] Revert "gb_PYTHON_PRECOMMAND is only defined after gb_PYTHON" This reverts commit 34061bf6d4fe8b80f46a97b8fbeddc18247e8bf7. gb_PYTHON was moved again in dec68c6684298cbcb793651f1221f842efd794e3. --- solenv/gbuild/gbuild.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index b50faa02f5f7..a83bd305b2db 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -216,7 +216,7 @@ else ifeq ($(DISABLE_PYTHON),TRUE) gb_PYTHON := python else gb_PYTHONTARGET := $(call gb_Executable_get_target_for_build,python) -gb_PYTHON = $(gb_PYTHON_PRECOMMAND) $(gb_PYTHONTARGET) +gb_PYTHON := $(gb_PYTHON_PRECOMMAND) $(gb_PYTHONTARGET) endif ifneq (,$(SYSTEM_UCPP)) From 010e207039cc12bf7c688d978adeb16c0802333e Mon Sep 17 00:00:00 2001 From: Katarina Behrens Date: Sat, 29 Sep 2012 20:09:42 +0200 Subject: [PATCH 062/863] fdo #50343: Fixed crash on xlsx import of file with array formula Follow-up of 7fff98724bc7e3. Buffer only cell formula values via setCellFormulaValue. Otherwise we get crash in FormulaBuffer::applyCellFormulaValues() as array/shared/datatable formulas are treated differently Change-Id: Ie344b273ec662e8af1bf9fa54e79614393634974 --- sc/source/filter/oox/sheetdatacontext.cxx | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sc/source/filter/oox/sheetdatacontext.cxx b/sc/source/filter/oox/sheetdatacontext.cxx index 7ca86d7adc93..c7db69c0e506 100644 --- a/sc/source/filter/oox/sheetdatacontext.cxx +++ b/sc/source/filter/oox/sheetdatacontext.cxx @@ -184,7 +184,13 @@ void SheetDataContext::onEndElement() case XML_normal: setCellFormula( maCellData.maCellAddr, maFormulaStr ); mrSheetData.setCellFormat( maCellData ); + + // If a number cell has some preloaded value, stick it into the buffer + // but do this only for real cell formulas (not array, shared etc.) + if( !( maCellValue.isEmpty() ) && ( maCellData.mnCellType == XML_n ) ) + setCellFormulaValue( maCellData.maCellAddr, maCellValue.toDouble() ); break; + case XML_shared: if( maFmlaData.mnSharedId >= 0 ) { @@ -249,13 +255,6 @@ void SheetDataContext::onEndElement() mrSheetData.setBlankCell( maCellData ); } } - else if( !maCellValue.isEmpty() ) switch( maCellData.mnCellType ) - { - case XML_n: - /* Set the pre-loaded value */ - setCellFormulaValue( maCellData.maCellAddr, maCellValue.toDouble() ); - break; - } } } From 7374bd94885088fabd05c7b83c1f47d2c94836a3 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Sat, 29 Sep 2012 22:09:39 +0200 Subject: [PATCH 063/863] introduce some new top level targets Change-Id: I3ac81132e21710a2c1d974944a5bcd612d796ec6 --- Makefile.top | 6 ++++++ solenv/gbuild/Module.mk | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile.top b/Makefile.top index 2fb2a7c5d1c4..8fd5620aa9d9 100644 --- a/Makefile.top +++ b/Makefile.top @@ -421,6 +421,9 @@ ifeq ($(OS),ANDROID) cd android && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) endif +build-nocheck : export SKIP_TESTS := YES +build-nocheck : build + cross-toolset: bootstrap fetch cd cross_toolset && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) @@ -460,6 +463,9 @@ endif endif @rm -f $(SRCDIR)/install && ln -s $(DEVINSTALLDIR)/opt/ $(SRCDIR)/install +dev-install-nocheck : export SKIP_TESTS := YES +dev-install-nocheck : dev-install + install-tb: @rm -rf $(DEVINSTALLDIR) @mkdir $(DEVINSTALLDIR) diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk index ae75d1de8a90..17fc857e81dc 100644 --- a/solenv/gbuild/Module.mk +++ b/solenv/gbuild/Module.mk @@ -175,7 +175,7 @@ clean : check : unitcheck slowcheck $(call gb_Output_announce_title,all tests checked.) $(call gb_Output_announce_bell) - + debugrun : $(call gb_Module_DEBUGRUNCOMMAND) @@ -236,7 +236,7 @@ $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET) endef -ifeq ($(strip $(NOCPPUNIT)),) +ifeq ($(strip $(SKIP_TESTS)),) define gb_Module_add_check_target $(call gb_Module__read_targetfile,$(1),$(2),check target) @@ -244,7 +244,6 @@ $(call gb_Module_get_check_target,$(1)) : $$(gb_Module_CURRENTTARGET) $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET) endef -endif # NOCPPUNIT define gb_Module_add_slowcheck_target $(call gb_Module__read_targetfile,$(1),$(2),slowcheck target) @@ -253,6 +252,7 @@ $(call gb_Module_get_slowcheck_target,$(1)) : $$(gb_Module_CURRENTTARGET) $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET) endef +endif # SKIP_TESTS define gb_Module_add_subsequentcheck_target $(call gb_Module__read_targetfile,$(1),$(2),subsequentcheck target) From f4b412ebd57016823dde50c5d41bdc39337b6b74 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Sat, 29 Sep 2012 22:16:41 +0200 Subject: [PATCH 064/863] remove superfluous linkoo output Change-Id: I09a14fd50cf69cec8693b7058d105ee5f2998e02 --- solenv/bin/linkoo | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo index ae9794409005..c6e6a2b040b8 100755 --- a/solenv/bin/linkoo +++ b/solenv/bin/linkoo @@ -446,8 +446,6 @@ if (!-f "$OOO_INSTALL/" . $brand_program_dir . "/ooenv") { evilness ('do'); -print "\nlinkoo finished"; -print ", please don't forget to source ooenv before ./soffice." if (!$windows); -print "\n"; +print "\nlinkoo finished\n"; # vim:set shiftwidth=4 softtabstop=4 expandtab: From 3f84462b47f070b4921fdd5fdab8397ab1439fd6 Mon Sep 17 00:00:00 2001 From: Lionel Elie Mamane Date: Sun, 30 Sep 2012 08:35:03 +0200 Subject: [PATCH 065/863] fdo#31405 CommandType is a LONG, so use a sal_Int32 to retrieve it Else, operator>>= flat out refuses to extract it, even though the particular value in this particular call would fit. Also OSL_VERIFY the result of >>= (instead of ignoring it) to facilitate future detection of similar problem Change-Id: I859c38c3589dc9e9ef5bdd882663aa3386a43237 --- sw/source/ui/dbui/dbmgr.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index 563f888a7e8d..f8824aea4db8 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -2381,13 +2381,13 @@ void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh, rtl::OUString sDataSource, sDataTableOrQuery; Sequence aSelection; - sal_Int16 nCmdType = CommandType::TABLE; + sal_Int32 nCmdType = CommandType::TABLE; uno::Reference< XConnection> xConnection; ODataAccessDescriptor aDescriptor(rProperties); sDataSource = aDescriptor.getDataSource(); - aDescriptor[daCommand] >>= sDataTableOrQuery; - aDescriptor[daCommandType] >>= nCmdType; + OSL_VERIFY(aDescriptor[daCommand] >>= sDataTableOrQuery); + OSL_VERIFY(aDescriptor[daCommandType] >>= nCmdType); if ( aDescriptor.has(daSelection) ) aDescriptor[daSelection] >>= aSelection; From 037ff8fac75db980a3bc44092df243aadaad3d38 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 30 Sep 2012 13:21:35 +0200 Subject: [PATCH 066/863] gettext depends on sal... Change-Id: Iec26cfb2f6715b12bed290d72e3a013d6a980544 --- Module_cross_tail_build.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk index e15848ba47ad..429891b89b46 100644 --- a/Module_cross_tail_build.mk +++ b/Module_cross_tail_build.mk @@ -73,7 +73,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\ remotebridges \ ridljar \ rsc \ - sal \ salhelper \ sax \ shell \ @@ -93,9 +92,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\ unotest \ unotools \ ure \ - $(if $(filter NATIVE,$(BUILD_TYPE)),\ - xml2cmp \ - ) \ xmlhelp \ xmlreader \ )) From 6e2b250c82b44bf8329e066a2a2823e207ed1da0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= Date: Sun, 30 Sep 2012 14:10:17 +0200 Subject: [PATCH 067/863] soltools: build again ldump4 for Windows Change-Id: I8f1f5756ac777cefed52ae72af65931bfa14d580 --- Repository.mk | 1 + soltools/Executable_ldump4.mk | 17 +++++++++++++++++ soltools/Module_soltools.mk | 1 + 3 files changed, 19 insertions(+) create mode 100644 soltools/Executable_ldump4.mk diff --git a/Repository.mk b/Repository.mk index 85f1f6642656..aacd7038a8b6 100644 --- a/Repository.mk +++ b/Repository.mk @@ -47,6 +47,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \ helpex \ idxdict \ javadepend \ + ldump4 \ lngconvex \ localize \ makedepend \ diff --git a/soltools/Executable_ldump4.mk b/soltools/Executable_ldump4.mk new file mode 100644 index 000000000000..d104d6f76487 --- /dev/null +++ b/soltools/Executable_ldump4.mk @@ -0,0 +1,17 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Executable_Executable,ldump4)) + +$(eval $(call gb_Executable_add_exception_objects,ldump4,\ + soltools/ldump/hashtbl \ + soltools/ldump/ldump \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/soltools/Module_soltools.mk b/soltools/Module_soltools.mk index 047e4c07e7f8..93f2aac81cc5 100644 --- a/soltools/Module_soltools.mk +++ b/soltools/Module_soltools.mk @@ -32,6 +32,7 @@ endif # CROSS_COMPILING ifeq ($(GUI)$(COM),WNTMSC) $(eval $(call gb_Module_add_targets,soltools,\ + Executable_ldump4 \ Package_inc \ )) endif # WNTMSC From 07467b0df2d347b6fbc88e590a36a6f732c9b966 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= Date: Sun, 30 Sep 2012 14:58:08 +0200 Subject: [PATCH 068/863] soltools: remove unused files Change-Id: I534aab7da0b05dadc3415856e57362ead57380c0 --- soltools/giparser/gen_info.cxx | 79 ---- soltools/giparser/gi_list.cxx | 223 --------- soltools/giparser/gi_parse.cxx | 387 ---------------- soltools/inc/gen_info.hxx | 82 ---- soltools/inc/gi_list.hxx | 208 --------- soltools/inc/gi_parse.hxx | 158 ------- soltools/inc/gilacces.hxx | 97 ---- soltools/inc/simstr.hxx | 216 --------- soltools/inc/st_list.hxx | 323 ------------- soltools/javadep/makefile.mk | 48 -- soltools/support/simstr.cxx | 822 --------------------------------- soltools/testhxx/create.pl | 116 ----- soltools/testhxx/testhxx.cxx | 22 - 13 files changed, 2781 deletions(-) delete mode 100644 soltools/giparser/gen_info.cxx delete mode 100644 soltools/giparser/gi_list.cxx delete mode 100644 soltools/giparser/gi_parse.cxx delete mode 100644 soltools/inc/gen_info.hxx delete mode 100644 soltools/inc/gi_list.hxx delete mode 100644 soltools/inc/gi_parse.hxx delete mode 100644 soltools/inc/gilacces.hxx delete mode 100644 soltools/inc/simstr.hxx delete mode 100644 soltools/inc/st_list.hxx delete mode 100644 soltools/javadep/makefile.mk delete mode 100644 soltools/support/simstr.cxx delete mode 100644 soltools/testhxx/create.pl delete mode 100644 soltools/testhxx/testhxx.cxx diff --git a/soltools/giparser/gen_info.cxx b/soltools/giparser/gen_info.cxx deleted file mode 100644 index 9cdd7e4f524c..000000000000 --- a/soltools/giparser/gen_info.cxx +++ /dev/null @@ -1,79 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - - -#include -#include - - -GenericInfo::GenericInfo( const Simstr & i_sKey, - const Simstr & i_sValue, - const Simstr & i_sComment ) - : sKey(i_sKey), - sValue(i_sValue), - sComment(i_sComment), - dpSubList(0) -{ -} - -GenericInfo::GenericInfo( const GenericInfo & i_rInfo ) - : sKey(i_rInfo.sKey), - sValue(i_rInfo.sValue), - sComment(i_rInfo.sComment), - dpSubList(0) -{ - if ( i_rInfo.HasSubList() ) - { - dpSubList = new List_GenericInfo(i_rInfo.SubList()); - } -} - -GenericInfo::~GenericInfo() -{ - if ( dpSubList != 0 ) - delete dpSubList; -} - -GenericInfo & -GenericInfo::operator=( const GenericInfo & i_rInfo ) -{ - sKey = i_rInfo.sKey; - sValue = i_rInfo.sValue; - sComment = i_rInfo.sComment; - - if ( dpSubList != 0 ) - delete dpSubList; - if ( i_rInfo.HasSubList() ) - { - dpSubList = new List_GenericInfo(i_rInfo.SubList()); - } - else - dpSubList = 0; - - return *this; -} - -List_GenericInfo & -GenericInfo::CreateMyList() const -{ - return * ( const_cast(*this).dpSubList = new List_GenericInfo); - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/giparser/gi_list.cxx b/soltools/giparser/gi_list.cxx deleted file mode 100644 index 903558e01f61..000000000000 --- a/soltools/giparser/gi_list.cxx +++ /dev/null @@ -1,223 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include - - -#include - - - -const char C_cKeySeparator = '/'; - - -List_GenericInfo::List_GenericInfo() -{ -} - -List_GenericInfo::List_GenericInfo( const List_GenericInfo & i_rList ) - : aChildren(i_rList.aChildren) -{ -} - -List_GenericInfo::~List_GenericInfo() -{ -} - -List_GenericInfo & -List_GenericInfo::operator=( const List_GenericInfo & i_rList ) -{ - aChildren = i_rList.aChildren; - return *this; -} - -const GenericInfo * -List_GenericInfo::operator[]( KeyPath i_sKeyPath ) const -{ - return const_cast< List_GenericInfo& >(*this)[i_sKeyPath]; -} - -GenericInfo * -List_GenericInfo::operator[]( KeyPath i_sKeyPath ) -{ - bool bExists = false; - const char * sNextPathSegment = 0; - sub_iterator it = lower_bound(bExists, sNextPathSegment, i_sKeyPath); - - if ( bExists ) - { - if ( sNextPathSegment == 0 ) - return (*it); - else - return (*it)->SubList()[sNextPathSegment]; - } - else - { - return 0; - } -} - -bool -List_GenericInfo::InsertInfo( GenericInfo * let_dpInfo, - bool i_bOverwrite ) -{ - if ( let_dpInfo == 0 ) - return false; - - bool bExists = false; - const char * sNextPathSegment = 0; - sub_iterator it = lower_bound(bExists, sNextPathSegment, let_dpInfo->Key() ); - - if ( ! bExists ) - { - aChildren.insert( it, let_dpInfo ); - } - else if ( i_bOverwrite ) - { - delete (*it); - (*it) = let_dpInfo; - } - else - { - delete let_dpInfo; - return false; - } - - return true; -} - -bool -List_GenericInfo::InsertInfoByPath( GenericInfo * let_dpInfo, - KeyPath i_sKeyPath, - bool i_bCreatePath, - bool i_bOverwrite ) -{ - if ( let_dpInfo == 0 ) - return false; - - if ( i_sKeyPath == 0 ? true : *i_sKeyPath == 0 ) - return InsertInfo(let_dpInfo, i_bOverwrite); - - bool bExists = false; - const char * sNextPathSegment = 0; - sub_iterator it = lower_bound(bExists, sNextPathSegment, i_sKeyPath); - - if ( bExists ) - { - return (*it)->SubList().InsertInfoByPath( - let_dpInfo, - sNextPathSegment, - i_bCreatePath, - i_bOverwrite ); - } - else if ( i_bCreatePath ) - { - Simstr aKey( i_sKeyPath, - 0, - (int)(sNextPathSegment - - ( *sNextPathSegment == 0 ? 0 : 1) - - i_sKeyPath )); - - GenericInfo * pNew = new GenericInfo(aKey); - InsertInfo(pNew,false); - - return pNew->SubList().InsertInfoByPath( - let_dpInfo, - sNextPathSegment, - i_bCreatePath, - i_bOverwrite ); - } - else - { - delete let_dpInfo; - return false; - } -} - -GenericInfo * -List_GenericInfo::ReleaseInfo( KeyPath i_sKeyPath ) -{ - bool bExists = false; - const char * sNextPathSegment = 0; - sub_iterator it = lower_bound(bExists, sNextPathSegment, i_sKeyPath ); - - if ( bExists ) - { - if ( *sNextPathSegment == 0 ) - return (*it); - else - return (*it)->SubList().ReleaseInfo(sNextPathSegment); - } - else - { - return 0; - } -} - -void -List_GenericInfo::DeleteInfo( KeyPath i_sKeyPath ) -{ - bool bExists = false; - const char * sNextPathSegment = 0; - sub_iterator it = lower_bound(bExists, sNextPathSegment, i_sKeyPath ); - - if ( bExists ) - { - if ( *sNextPathSegment == 0 ) - { - aChildren.remove(it); - } - else - { - (*it)->SubList().DeleteInfo(sNextPathSegment); - } - } -} - -List_GenericInfo::sub_iterator -List_GenericInfo::lower_bound( bool & o_bExists, - const char * & o_sNextPathSegment, - KeyPath i_sKeyPath ) -{ - o_sNextPathSegment = strchr(i_sKeyPath, '/'); - Simstr sKey( i_sKeyPath, (int)(o_sNextPathSegment == 0 ? strlen(i_sKeyPath) : o_sNextPathSegment++ - i_sKeyPath) ); - GenericInfo aSearch(sKey); - - unsigned low = 0; - unsigned high = aChildren.size(); - - for ( unsigned cur = high / 2; high > low; cur = (low + high) / 2 ) - { - if ( *aChildren[cur] < aSearch ) - { - low = cur+1; - } - else - { - high = cur; - } - } // end for - - o_bExists = low < aChildren.size() - ? !(aSearch < *aChildren[low] ) - : false; - return &aChildren[low]; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/giparser/gi_parse.cxx b/soltools/giparser/gi_parse.cxx deleted file mode 100644 index e1c7cb8d2c09..000000000000 --- a/soltools/giparser/gi_parse.cxx +++ /dev/null @@ -1,387 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - - -#include - -#include -#include -#include -#include - - -using namespace std; - - -const char * C_sLineEnd = "\r\n"; - - - -inline void -WriteStr( ostream & o_rOut, const Simstr & i_rStr ) -{ - o_rOut.write( i_rStr.str(), i_rStr.l() ); -} - -inline void -WriteStr( ostream & o_rOut, const char * i_rStr ) -{ - o_rOut.write( i_rStr, strlen(i_rStr) ); -} - -inline void -GenericInfo_Parser::SetError( E_Error i_eError ) -{ - eErrorCode = i_eError; - nErrorLine = nCurLine; -} - - -GenericInfo_Parser::GenericInfo_Parser() - : sCurParsePosition(""), - nCurLine(0), - nLevel(0), - bGoon(false), - eErrorCode(ok), - nErrorLine(0), - pResult(0), - pResource(0) -{ -} - -GenericInfo_Parser::~GenericInfo_Parser() -{ -} - -bool -GenericInfo_Parser::LoadList( GenericInfoList_Builder & o_rResult, - const Simstr & i_sSourceFileName ) -{ - ifstream aFile( i_sSourceFileName.str() ); - if ( aFile.fail() ) - { - SetError(cannot_open); - return false; - } - - aFile.seekg(0, ios::end); - UINT32 nTextSize = aFile.tellg(); - if ( nTextSize == 0 || nTextSize == UINT32(-1) ) - return true; - dpBuffer = new char[nTextSize+2]; - - aFile.seekg(0); - aFile.read( dpBuffer, nTextSize ); - aFile.close(); - - sFilePtr = dpBuffer; - char * sLastChar = dpBuffer + nTextSize - 1; - - while ( sFilePtr != sLastChar && *sFilePtr <= 32 ) - ++sCurParsePosition; - if ( sFilePtr == sLastChar ) - { - if ( *sFilePtr <= 32 ) - return true; - } - else while ( *sLastChar <= 32 ) - { - --sLastChar; - } - - *(sLastChar+1) = '\n'; - *(sLastChar+2) = '\0'; - - ResetState(o_rResult); - - for ( ReadLine(); bGoon; ReadLine() ) - { - bool bOk = InterpretLine(); - if ( !bOk) - { - SetError(syntax_error); - break; - } - } - - if ( nLevel > 0 && eErrorCode == ok) - { - SetError(unexpected_eof); - } - else if ( nLevel < 0 ) - { - SetError(unexpected_list_end); - } - - delete [] dpBuffer; - dpBuffer = 0; - sFilePtr = 0; - - return eErrorCode == ok; -} - -bool -GenericInfo_Parser::SaveList( const Simstr & i_rOutputFile, - GenericInfoList_Browser & io_rListBrowser ) -{ - ofstream aFile( i_rOutputFile.str() ); - if ( aFile.fail() ) - { - SetError(cannot_open); - return false; - } - - ResetState(io_rListBrowser); - - WriteList(aFile); - - aFile.close(); - return eErrorCode == ok; -} - -void -GenericInfo_Parser::ResetState( GenericInfoList_Builder & io_rResult ) -{ - sCurParsePosition = ""; - nCurLine = 0; - nLevel = 0; - bGoon = true; - sCurComment = ""; - eErrorCode = ok; - nErrorLine = 0; - pResult = &io_rResult; - pResource = 0; -} - -void -GenericInfo_Parser::ResetState( GenericInfoList_Browser & io_rSrc ) -{ - sCurParsePosition = ""; - nCurLine = 0; - nLevel = 0; - bGoon = false; - sCurComment = ""; - eErrorCode = ok; - nErrorLine = 0; - pResult = 0; - pResource = &io_rSrc; -} - - -void -GenericInfo_Parser::ReadLine() -{ - if ( *sFilePtr == '\0' ) // See initialising of dpBuffer and sLastChar in LoadList(). - { - bGoon = false; - return; - } - - sCurParsePosition = sFilePtr; - while ( *sFilePtr != '\n' ) - ++sFilePtr; - nCurLine++; - - // Remove leading and trailing whitespace from line: - while ( sCurParsePosition != sFilePtr && *sCurParsePosition <= 32 ) - ++sCurParsePosition; - - char * sEndOfLine = sFilePtr; - while ( sEndOfLine != sCurParsePosition && *sEndOfLine <= 32 ) - --sEndOfLine; - if ( sCurParsePosition != sEndOfLine || *sCurParsePosition > 32 ) - ++sEndOfLine; - *sEndOfLine = '\0'; - - ++sFilePtr; // Go beyond line end to first character of next line. -} - -bool -GenericInfo_Parser::InterpretLine() -{ - switch ( ClassifyLine() ) - { - case lt_key: ReadKey(); - break; - case lt_open_list: PushLevel_Read(); - break; - case lt_close_list: PopLevel_Read(); - break; - case lt_comment: AddCurLine2CurComment(); - break; - case lt_empty: AddCurLine2CurComment(); - break; - default: - return false; - } - return true; -} - -GenericInfo_Parser::E_LineType -GenericInfo_Parser::ClassifyLine() -{ - switch ( *sCurParsePosition ) - { - case '{': return lt_open_list; - case '}': return lt_close_list; - case '#': return lt_comment; - case '\0': return lt_empty; - } - - return lt_key; -} - -void -GenericInfo_Parser::ReadKey() -{ - const char * pSearch = sCurParsePosition; - - for ( ; *pSearch > 32; ++pSearch ) ; - UINT32 nKeyLength = pSearch - sCurParsePosition; - - for ( ; *pSearch <= 32 && *pSearch > '\0'; ++pSearch ) ; - - pResult->AddKey( sCurParsePosition, nKeyLength, - pSearch, strlen(pSearch), - sCurComment.str(), sCurComment.l() - ); - sCurComment = ""; -} - -void -GenericInfo_Parser::PushLevel_Read() -{ - nLevel++; - pResult->OpenList(); -} - -void -GenericInfo_Parser::PopLevel_Read() -{ - nLevel--; - pResult->CloseList(); -} - -void -GenericInfo_Parser::AddCurLine2CurComment() -{ - sCurComment += sCurParsePosition; - sCurComment += C_sLineEnd; -} - -void -GenericInfo_Parser::WriteList( ostream & o_rFile ) -{ - static char sBuffer[32000]; - - for ( bGoon = pResource->Start_CurList(); - bGoon; - bGoon = pResource->NextOf_CurList() ) - { - pResource->Get_CurComment(&sBuffer[0]); - WriteComment(o_rFile,sBuffer); - - pResource->Get_CurKey(&sBuffer[0]); - WriteKey(o_rFile,sBuffer); - - pResource->Get_CurValue(&sBuffer[0]); - WriteValue(o_rFile,sBuffer); - - if ( pResource->HasSubList_CurKey() ) - { - PushLevel_Write(); - - WriteList(o_rFile); - - PopLevel_Write(); - } - } // end for -} - -void -GenericInfo_Parser::PushLevel_Write() -{ - nLevel++; - pResource->Push_CurList(); -} - -void -GenericInfo_Parser::PopLevel_Write() -{ - nLevel--; - pResource->Pop_CurList(); -} - -void -GenericInfo_Parser::WriteComment( ostream & o_rFile, - const char * i_sStr ) -{ - WriteStr( o_rFile, i_sStr ); - if ( i_sStr[ strlen(i_sStr)-1 ] != '\n' ) - WriteStr( o_rFile, C_sLineEnd ); -} - -void -GenericInfo_Parser::WriteKey( ostream & o_rFile, - const char * i_sStr ) -{ - WriteIndentation(o_rFile); - WriteStr( o_rFile, i_sStr ); -} - -void -GenericInfo_Parser::WriteValue( ostream & o_rFile, - const char * i_sStr ) -{ - if ( i_sStr != 0 ? strlen(i_sStr) > 0 : false ) - { - WriteStr(o_rFile," "); - WriteStr(o_rFile,i_sStr); - } - - WriteStr(o_rFile,C_sLineEnd); -} - -void -GenericInfo_Parser::WriteIndentation( ostream & o_rFile ) -{ - const int nIndentBound = 60; - - static const char sIndentation[nIndentBound+1] = - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" - "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t"; - - if ( nLevel == 0 ) - return; - - if ( nLevel <= nIndentBound ) - o_rFile.write( sIndentation, nLevel ); - else - { - INT16 iLevel = nLevel; - for ( ; iLevel > nIndentBound; iLevel-=nIndentBound ) - o_rFile.write( sIndentation, nIndentBound ); - o_rFile.write( sIndentation, iLevel ); - } -} - - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/inc/gen_info.hxx b/soltools/inc/gen_info.hxx deleted file mode 100644 index 63ec62e63cb0..000000000000 --- a/soltools/inc/gen_info.hxx +++ /dev/null @@ -1,82 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef GEN_INFO_HXX -#define GEN_INFO_HXX - - -#include "simstr.hxx" -#include - - - -class List_GenericInfo; - - -/** Holds generic informations in a simple hierarchical format. -*/ -class GenericInfo -{ - public: - // LIFECFYCLE - GenericInfo( - const Simstr & i_sKey, - const Simstr & i_sValue = Simstr::null_(), - const Simstr & i_sComment = Simstr::null_() ); - GenericInfo( - const GenericInfo & i_rInfo ); - ~GenericInfo(); - - // OPERATORS - GenericInfo & operator=( - const GenericInfo & i_rInfo ); - bool operator<( - const GenericInfo & i_rInfo ) const -#ifdef UNX - { return strcasecmp(sKey.str(),i_rInfo.sKey.str()) < 0; } -#else - { return stricmp(sKey.str(),i_rInfo.sKey.str()) < 0; } -#endif - // INFO - const Simstr & Key() const { return sKey; } - const Simstr & Value() const { return sValue; } - const Simstr & Comment() const { return sComment; } - bool HasSubList() const { return dpSubList != 0; } - - const List_GenericInfo & - SubList() const { return HasSubList() ? *dpSubList : CreateMyList(); } - // ACCESS - List_GenericInfo & - SubList() { return HasSubList() ? *dpSubList : CreateMyList(); } - - private: - /// @precond dpSubList == 0 . - List_GenericInfo & CreateMyList() const; - - // DATA - Simstr sKey; - Simstr sValue; - Simstr sComment; - List_GenericInfo * dpSubList; /// Owned by this object. -}; - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/inc/gi_list.hxx b/soltools/inc/gi_list.hxx deleted file mode 100644 index ec831a5f8018..000000000000 --- a/soltools/inc/gi_list.hxx +++ /dev/null @@ -1,208 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef SOLTOOLS_GI_LIST_HXX -#define SOLTOOLS_GI_LIST_HXX - - -#include "st_list.hxx" - - -class GenericInfo; - -/** Holds set of generic informations in a sorted list. - - At different places, methods of this class have a parameter, - whose name includes "path". Those are paths like this: - - src370/drives/o: - - which are used to access GenericInfo keys in deep search through - the lists and their sublists. -*/ -class List_GenericInfo -{ - public: - // TYPES - class const_iterator - { - public: - const GenericInfo & operator*() const; - const_iterator & operator++(); - bool operator==( const const_iterator & ) const; - bool operator!=( const const_iterator & ) const; - - const_iterator(); - const_iterator( const DynamicList< GenericInfo >::const_iterator & ); - private: DynamicList< GenericInfo >::const_iterator it; - }; - class iterator - { public: - GenericInfo & operator*() const; - iterator & operator++(); - bool operator==( const iterator & ) const; - bool operator!=( const iterator & ) const; - - iterator(); - iterator( const DynamicList< GenericInfo >::iterator & ); - private: DynamicList< GenericInfo >::iterator it; - }; - - typedef const char * KeyPath; - - // LIFECYCLE - List_GenericInfo(); - List_GenericInfo( - const List_GenericInfo & - i_rList ); - ~List_GenericInfo(); - - // OPERATORS - List_GenericInfo & operator=( - const List_GenericInfo & - i_rList ); - const GenericInfo * operator[]( - KeyPath i_sKeyPath ) const; - GenericInfo * operator[]( - KeyPath i_sKeyPath ); - - // OPERATIONS - bool InsertInfo( - GenericInfo * let_dpInfo, /// Will be owned by this object. - bool i_bOverwrite = true ); - bool InsertInfoByPath( - GenericInfo * let_dpInfo, /// Will be owned by this object. - KeyPath i_sKeyPath, - bool i_bCreatePath, - bool i_bOverwrite = true ); - - GenericInfo * ReleaseInfo( /// Removes the GenericInfo from its parent. - KeyPath i_sKeyPath ); - - void DeleteInfo( - KeyPath i_sKeyPath ); - - // INFO - unsigned Size() const; - - const_iterator Begin() const; - const_iterator End() const; - - // ACCESS - iterator Begin(); - iterator End(); - - private: - typedef DynamicList< GenericInfo >::iterator sub_iterator; - - sub_iterator lower_bound( - bool & o_bExists, - const char * & o_sNextPathSegment, - KeyPath i_sKeyPath ); - - DynamicList< GenericInfo > - aChildren; -}; - - -// IMPLEMENTATION - - -inline const GenericInfo & -List_GenericInfo:: -const_iterator::operator*() const - { return *(*it); } - -inline List_GenericInfo::const_iterator & -List_GenericInfo:: -const_iterator::operator++() - { ++it; return *this; } - -inline bool -List_GenericInfo:: -const_iterator::operator==( const const_iterator & i_rIter ) const - { return it == i_rIter.it; } - -inline bool -List_GenericInfo:: -const_iterator::operator!=( const const_iterator & i_rIter ) const - { return it != i_rIter.it; } - -inline List_GenericInfo:: -const_iterator::const_iterator() - : it(0) { } - -inline List_GenericInfo:: -const_iterator::const_iterator( const DynamicList< GenericInfo >::const_iterator & i_rDynListIter ) - : it(i_rDynListIter) { } - - -inline GenericInfo & -List_GenericInfo:: -iterator::operator*() const - { return *(*it); } - -inline List_GenericInfo::iterator & -List_GenericInfo:: -iterator::operator++() - { ++it; return *this; } - -inline bool -List_GenericInfo:: -iterator::operator==( const iterator & i_rIter ) const - { return it == i_rIter.it; } - -inline bool -List_GenericInfo:: -iterator::operator!=( const iterator & i_rIter ) const - { return it != i_rIter.it; } - -inline List_GenericInfo:: -iterator::iterator() - : it(0) { } - -inline List_GenericInfo:: -iterator::iterator( const DynamicList< GenericInfo >::iterator & i_rDynListIter ) - : it(i_rDynListIter) { } - -inline unsigned -List_GenericInfo::Size() const - { return aChildren.size(); } - -inline List_GenericInfo::const_iterator -List_GenericInfo::Begin() const - { return aChildren.begin(); } - -inline List_GenericInfo::const_iterator -List_GenericInfo::End() const - { return aChildren.end(); } - -inline List_GenericInfo::iterator -List_GenericInfo::Begin() - { return aChildren.begin(); } - -inline List_GenericInfo::iterator -List_GenericInfo::End() - { return aChildren.end(); } - - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/inc/gi_parse.hxx b/soltools/inc/gi_parse.hxx deleted file mode 100644 index 7d93769643ef..000000000000 --- a/soltools/inc/gi_parse.hxx +++ /dev/null @@ -1,158 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef SOLTOOLS_GI_PARSE_HXX -#define SOLTOOLS_GI_PARSE_HXX - -#include "simstr.hxx" -#include "gilacces.hxx" -#include - -class GenericInfoList_Builder; -class GenericInfoList_Browser; - -/** Reads generic information files into a simple structure in memory. - -Information files used by this parser have the following format: - -key [value] -{ - key [value] - key [value] - { - key [value] - ... - ... - } -} -key [value] -... -... - -*/ - - -class GenericInfo_Parser : public GenericInfoParseTypes -{ - public: - typedef unsigned long UINT32; - typedef short INT16; - - GenericInfo_Parser(); - ~GenericInfo_Parser(); - - /** reads a information file and stores the data in a - List_GenericInfo - */ - bool LoadList( - GenericInfoList_Builder & - o_rResult, - const Simstr & i_sSourceFileName ); - - /** save the InformationList to rSourceFile - returns false on error - */ - bool SaveList( - const Simstr & i_rOutputFile, - GenericInfoList_Browser & - io_rListBrowser ); - - E_Error GetLastError( - UINT32 * o_pErrorLine = 0 ) const; - - private: - enum E_LineType - { - lt_empty = 0, - lt_key, - lt_open_list, - lt_close_list, - lt_comment - }; - - void SetError( - E_Error i_eError ); - void ResetState( - GenericInfoList_Builder & - io_rResult ); - void ResetState( - GenericInfoList_Browser & - io_rSrc ); - - void ReadLine(); - bool InterpretLine(); - E_LineType ClassifyLine(); - - void ReadKey(); - void PushLevel_Read(); /// When list is opened by '{': - void PopLevel_Read(); /// When list is closed by '}': - void AddCurLine2CurComment(); - - void WriteList( - std::ostream & o_rFile ); - - void PushLevel_Write(); /// When SubList is pushed in pResource - void PopLevel_Write(); /// When SubList is popped in pResource - - void WriteComment( - std::ostream & o_rFile, - const char * i_sStr ); - void WriteKey( - std::ostream & o_rFile, - const char * i_sStr ); - void WriteValue( - std::ostream & o_rFile, - const char * i_sStr ); - void WriteIndentation( - std::ostream & o_rFile ); - - // DATA - const char * sCurParsePosition; - - UINT32 nCurLine; - INT16 nLevel; - bool bGoon; - - Simstr sCurComment; - - E_Error eErrorCode; - UINT32 nErrorLine; - - GenericInfoList_Builder * - pResult; - GenericInfoList_Browser * - pResource; - - char * dpBuffer; - char * sFilePtr; -}; - - -inline GenericInfo_Parser::E_Error -GenericInfo_Parser::GetLastError( UINT32 * o_pErrorLine ) const -{ - if ( o_pErrorLine != 0 ) - *o_pErrorLine = nErrorLine; - return eErrorCode; -} - - -#endif - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/inc/gilacces.hxx b/soltools/inc/gilacces.hxx deleted file mode 100644 index c892591399d1..000000000000 --- a/soltools/inc/gilacces.hxx +++ /dev/null @@ -1,97 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef SOLTOOLS_GILACCES_HXX -#define SOLTOOLS_GILACCES_HXX - - - -class GenericInfoParseTypes -{ - public: - enum E_Error - { - ok = 0, - cannot_open, - unexpected_eof, - syntax_error, - unexpected_list_end - }; -}; - - - -/** This class is an abstract interface for a service, which - builds a memory structure out of a generic information - structure, read from a file or other stream. - - There may be different implementations, which build different kinds - of memory structures. -*/ -class GenericInfoList_Builder -{ - public: - typedef unsigned long UINT32; - - virtual ~GenericInfoList_Builder() {} - - virtual void AddKey( - const char * i_sKey, - UINT32 i_nKeyLength, - const char * i_sValue, - UINT32 i_nValueLength, - const char * i_sComment, - UINT32 i_nCommentLength ) = 0; - - virtual void OpenList() = 0; - virtual void CloseList() = 0; -}; - - -/** This class is an abstract interface for a service, which - returns the values of a generic information tree out of - a memory structure. - - There may be different implementations, which browse different - kinds of memory structures. -*/ -class GenericInfoList_Browser -{ - public: - virtual ~GenericInfoList_Browser() {} - - virtual bool Start_CurList() = 0; - virtual bool NextOf_CurList() = 0; - - virtual void Get_CurKey( - char * o_rKey ) const = 0; - virtual void Get_CurValue( - char * o_rValue ) const = 0; - virtual void Get_CurComment( - char * o_rComment ) const = 0; - virtual bool HasSubList_CurKey() const = 0; - - virtual void Push_CurList() = 0; - virtual void Pop_CurList() = 0; -}; - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/inc/simstr.hxx b/soltools/inc/simstr.hxx deleted file mode 100644 index 2b5c7e87fcce..000000000000 --- a/soltools/inc/simstr.hxx +++ /dev/null @@ -1,216 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef SOLTOOLS_SIMSTR_HXX -#define SOLTOOLS_SIMSTR_HXX - - -class Simstr /// Simple string class. -{ -// INTERFACE - public: - // LIFECYCLE - Simstr( - const char * str = 0); - Simstr( /** Creates Simstr out of a copy of the first - 'nrOfBytes' bytes of 'anyBytes'. - Adds a '\0' at the end. */ - const char * anybytes, - int nrOfBytes); - Simstr( /** Creates Simstr out of a copy of the described bytes within 'anyBytes'. - Adds a '\0' at the end. */ - const char * anybytes, - int firstBytesPos, - int nrOfBytes ); - Simstr( /// Creates Simstr of 'anzahl' times 'c'. - char c, - int anzahl); - Simstr( - const Simstr & S); - ~Simstr(); - - - // OPERATORS - operator const char*() const; - - Simstr & operator=( - const Simstr & S ); - - Simstr operator+( - const Simstr & S ) const; - Simstr & operator+=( - const Simstr & S ); - Simstr & operator+=( - const char * s ); - - bool operator==( - const Simstr & S ) const; - bool operator!=( - const Simstr & S ) const; - bool operator<( - const Simstr & S ) const; - bool operator>( - const Simstr & S ) const; - bool operator<=( - const Simstr & S ) const; - bool operator>=( - const Simstr & S ) const; - // INFO - static const Simstr & - null_(); - - const char * str() const; - int l() const; // Length of string without '\0' at end. - char * s(); // ATTENTION !!! // Only to be used, when a function needs a 'char*' but - // nevertheless THAT WILL BE NOT CHANGED! - // Typecasts to 'const char*' are performed automatically. - char get( - int n) const; - char get_front() const; - char get_back() const; - Simstr get( - int startPos, - int anzahl ) const; - Simstr get_front( - int anzahl ) const; - Simstr get_back( - int anzahl ) const; - - int pos_first( - char c ) const; - int pos_first_after( - char c, - int startSearchPos ) const; - int pos_last( - char c ) const; - int pos_first( - const Simstr & S ) const; - int pos_last( - const Simstr & S ) const; - int count( - char c ) const; - bool is_empty() const; // Only true if object == "". - bool is_no_text() const; // String may contain spaces or tabs. - - Simstr get_first_token( - char c ) const; - Simstr get_last_token( - char c ) const; - - // ACCESS - char & ch( /** Reference to sz[n]. Allows change of this char. - !!! No safety, if n is out of the allowed range! */ - int n ); - - // OPERATIONS - void insert( - int pos, - char c ); - void push_front( - char c ); - void push_back( - char c ); - void insert( - int pos, - const Simstr & S ); - void push_front( - const Simstr & S ); - void push_back( - const Simstr & S ); - - void remove( - int pos, - int anzahl = 1 ); - void remove_trailing_blanks(); - void pop_front( - int anzahl = 1 ); - void pop_back( - int anzahl = 1 ); - void rem_back_from( - int removeStartPos ); - void remove_all( - char c ); - void remove_all( // Starts search left. - const Simstr & S ); - void strip( - char c ); // Removes all characters == c from front and back. - // c == ' ' removes also TABs !!! - void empty(); // Changes object to the value "". - - void replace( - int pos, - char c ); - void replace( - int startPos, - int anzahl, - const Simstr & S ); - void replace_all( - char oldCh, - char newCh ); - void replace_all( - const Simstr & oldS, - const Simstr & newS ); - void to_lower(); - - Simstr take_first_token( /// Token is removed from the Simstr. - char c ); - Simstr take_last_token( /// Token is removed from the Simstr. - char c ); - private: - // DATA - char * sz; - int len; -}; - -// Simstr - char* / char - concatenations -Simstr operator+(const char * str, const Simstr & S); -Simstr operator+(const Simstr & S, const char * str); -Simstr operator+(char c, const Simstr & S); -Simstr operator+(const Simstr & S, char c); - -// Simstr - char* - comparison operators -bool operator==(const Simstr & S, const char * str); -bool operator!=(const Simstr & S, const char * str); -bool operator<(const Simstr & S, const char * str); -bool operator>(const Simstr & S, const char * str); -bool operator<=(const Simstr & S, const char * str); -bool operator>=(const Simstr & S, const char * str); -bool operator==(const char * str, const Simstr & S); -bool operator!=(const char * str, const Simstr & S); -bool operator<(const char * str, const Simstr & S); -bool operator>(const char * str, const Simstr & S); -bool operator<=(const char * str, const Simstr & S); -bool operator>=(const char * str, const Simstr & S); - - -inline const char * -Simstr::str() const { return sz; } -inline char * -Simstr::s() { return sz; } -inline int -Simstr::l() const { return len; } -inline -Simstr::operator const char*() const { return sz; } -inline bool -Simstr::is_empty() const { return len == 0; } - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/inc/st_list.hxx b/soltools/inc/st_list.hxx deleted file mode 100644 index 88618dd5f418..000000000000 --- a/soltools/inc/st_list.hxx +++ /dev/null @@ -1,323 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef SOLTOOLS_ST_LIST_HXX -#define SOLTOOLS_ST_LIST_HXX - -#include -#include -#include - -template -class ST_List /// Soltools-List. -{ - public : - typedef XX * iterator; - typedef const XX * const_iterator; - - // LIFECYCLE - ST_List(); - ST_List( - const ST_List & i_rList ); - virtual ~ST_List() { delete[] inhalt; } - - // OPERATORS - ST_List & operator=( - const ST_List & i_rList ); - - const XX & operator[]( - unsigned n) const - { return elem(n); } - XX & operator[]( - unsigned n) - { return elem(n); } - // OPERATIONS - void reserve( - unsigned i_nSize ) - { alloc(i_nSize,true); } - void insert( - iterator i_aPos, - const XX & elem_ ) - { Insert((unsigned)(i_aPos-begin()), elem_); } - virtual void Insert( - unsigned pos, - const XX & elem ); - void push_back( - const XX & elem_) - { Insert(size(),elem_); } - void remove( - iterator i_aPos ) - { Remove((int)(i_aPos-begin())); } - virtual void Remove( - unsigned pos ); - void pop_back() { Remove(size()-1); } - void erase_all() { while (size()) Remove(size()-1); } - - // INQUIRY - const_iterator begin() const { return &inhalt[0]; } - const_iterator end() const { return &inhalt[len]; } - - const XX & front() const { return elem(0); } - const XX & back() const { return elem(len-1); } - - unsigned size() const { return len; } - unsigned space() const { return allocated; } - bool is_valid_index( - unsigned n) const - { return n < len; } - // ACCESS - iterator begin() { return &inhalt[0]; } - iterator end() { return &inhalt[len]; } - - XX & front() { return elem(0); } - XX & back() { return elem(len-1); } - - protected: - void checkSize( - unsigned newLength); - void alloc( - unsigned newSpace, - bool re = false ); - - const XX & elem( - unsigned n ) const - { return inhalt[n]; } - XX & elem( - unsigned n ) - { return inhalt[n]; } - // DATA - XX * inhalt; - unsigned len; - unsigned allocated; -}; - - - -template -class DynamicList : public ST_List< XY* > -{ - public: - DynamicList(); - DynamicList( - const DynamicList & - i_rList ); - virtual ~DynamicList(); /// Deletes all member pointers - - DynamicList & operator=( - const DynamicList & - i_rList ); - - virtual void Insert( - unsigned pos, - XY * const & elem ); - virtual void Remove( - unsigned pos ); -}; - - - -template -ST_List::ST_List() - : inhalt(0), - len(0), - allocated(0) -{ - alloc(1); -} - -template -ST_List::ST_List( const ST_List & i_rList ) - : inhalt(0), - len(0), - allocated(0) -{ - alloc(i_rList.size()); - - for ( const_iterator it = i_rList.begin(); - it != i_rList.end(); - ++it ) - { - push_back(*it); - } -} - -template -ST_List & -ST_List::operator=( const ST_List & i_rList ) -{ - for ( const_iterator it = i_rList.begin(); - it != i_rList.end(); - ++it ) - { - push_back(*it); - } - return *this; -} - -template -void -ST_List::Insert(unsigned pos, const XX & elem_) -{ - if ( pos > len ) - return; - - checkSize(len+2); - for ( unsigned p = len; p > pos; --p) - { - inhalt[p] = inhalt[p-1]; - } - inhalt[pos] = elem_; - len++; -} - - -template -void -ST_List::Remove(unsigned pos) -{ - if ( pos >= len ) - return; - len--; - for ( unsigned p = pos; p < len; ++p) - { - inhalt[p] = inhalt[p+1]; - } -} - - -// Protected: -template -void -ST_List::checkSize(unsigned newLength) -{ - // neuen Platzbedarf pruefen: - unsigned newSpace = space(); - if (newLength >= newSpace) - { - if (!newSpace) - newSpace = 1; - const unsigned nBorder = 2000000000; - while(newLength >= newSpace) - { - if (newSpace < nBorder) - newSpace <<= 1; - else - { - std::cerr << "List becomes too big" << std::endl; - exit(1); - } - } - } - - // Veraenderung ?: - if (newSpace != space()) - alloc(newSpace,true); -} - -template -void -ST_List::alloc( unsigned newSpace, - bool re ) -{ - XX * pNew = new XX[newSpace]; - - if (inhalt != 0) - { - if (re) - { - for (unsigned i = 0; i < len; ++i) - { - pNew[i] = inhalt[i]; - } // end for - } - delete [] inhalt; - } - - inhalt = pNew; - allocated = newSpace; -} - - -template -DynamicList::DynamicList() -{ -} - -template -DynamicList::DynamicList( const DynamicList & i_rList ) - : ST_List< XY* >(i_rList) -{ - for ( typename DynamicList::iterator it = this->begin(); - it != DynamicList::end(); - ++it ) - { - // Copying the contents the pointers point at: - (*it) = new XY( *(*it) ); - } -} - -template -DynamicList::~DynamicList() -{ - this->erase_all(); -} - -template -DynamicList & -DynamicList::operator=( const DynamicList & i_rList ) -{ - for ( typename DynamicList::const_iterator it = i_rList.begin(); - it != i_rList.end(); - ++it ) - { - this->push_back( new XY(*(*it)) ); - } - return *this; -} - - -template -void -DynamicList::Insert(unsigned pos, XY * const & elem_) -{ - if ( pos > this->len ) - return; - - this->checkSize(DynamicList::len+2); - memmove( DynamicList::inhalt+pos+1, DynamicList::inhalt+pos, (DynamicList::len-pos) * sizeof(XY*) ); - this->inhalt[pos] = elem_; - this->len++; -} - -template -void -DynamicList::Remove( unsigned pos ) -{ - if (!this->is_valid_index(pos) ) - return; - this->len--; - delete DynamicList::inhalt[pos]; - memmove(DynamicList::inhalt+pos, DynamicList::inhalt+pos+1, (DynamicList::len-pos) * sizeof(XY*) ); -} - - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/javadep/makefile.mk b/soltools/javadep/makefile.mk deleted file mode 100644 index aefde1f0cccc..000000000000 --- a/soltools/javadep/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -PRJ=.. - -PRJNAME=soltools -TARGET=javadep -TARGETTYPE=CUI -NO_DEFAULT_STL=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk -.INCLUDE : settings.mk - -.IF "$(CROSS_COMPILING)"=="YES" - -all: -# nothing - -.ENDIF - -UWINAPILIB=$(0) -LIBSALCPPRT=$(0) - -# --- Files -------------------------------------------------------- - -APP1TARGET = javadep -APP1OBJS = $(OBJ)$/javadep.obj -DEPOBJFILES = $(APP1OBJS) -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/soltools/support/simstr.cxx b/soltools/support/simstr.cxx deleted file mode 100644 index 54bbbe8a30e5..000000000000 --- a/soltools/support/simstr.cxx +++ /dev/null @@ -1,822 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include - -#include // strlen(), memcpy(), memset() -#include // tolower() -#include // INT_MAX - -const char NULCH = '\0'; -const int NO_POS = -1; - - -Simstr::Simstr(const char * s_) -{ - if (s_ == 0) - { - len = 0; - sz = new char[1]; - *sz = 0; - } - else - { - len = (int)strlen(s_); - sz = new char[len+1]; - memcpy(sz,s_,len+1); - } -} - -Simstr::Simstr(const char * anybytes, int nrOfBytes) -{ - if (anybytes == 0) - { - len = 0; - sz = new char[1]; - *sz = 0; - return; - } - - int slen = static_cast( strlen(anybytes) ); - - len = slen < nrOfBytes - ? slen - : nrOfBytes; - sz = new char[len+1]; - memcpy( sz, anybytes, len ); - *( sz + len ) = 0; -} - -Simstr::Simstr(char c, int anzahl) -{ - if (anzahl < 1) - { - len = 0; - sz = new char[1]; - *sz = 0; - } - else - { - len = anzahl; - sz = new char[len+1]; - memset(sz,c,anzahl); - sz[len] = 0; - } -} - -Simstr::Simstr( const char * anybytes, - int firstBytesPos, - int nrOfBytes) -{ - unsigned slen = (unsigned)strlen(anybytes); - if (anybytes == 0 || slen <= unsigned(firstBytesPos)) - { - len = 0; - sz = new char[1]; - *sz = 0; - } - else - { - int maxLen = slen - unsigned(firstBytesPos); - len = maxLen < nrOfBytes - ? maxLen - : nrOfBytes; - sz = new char[len+1]; - memcpy(sz,anybytes+firstBytesPos,len); - *(sz+len) = 0; - } -} - - -Simstr::Simstr(const Simstr & S) -{ - len = S.len; - sz = new char[len+1]; - memcpy(sz,S.sz,len+1); -} - -Simstr & Simstr::operator=(const Simstr & S) -{ - if (sz == S.sz) - return *this; - - delete [] sz; - - len = S.len; - sz = new char[len+1]; - memcpy(sz,S.sz,len+1); - - return *this; -} - -Simstr::~Simstr() -{ - delete [] sz; -} - -char & -Simstr::ch(int n) -{ - static char nullCh = NULCH; - nullCh = NULCH; - if (n >= long(len) || n < 0) - return nullCh; - else - return sz[unsigned(n)]; -} - -const Simstr & -Simstr::null_() -{ - static Simstr aNull_; - return aNull_; -} - - -Simstr -Simstr::operator+(const Simstr & S) const -{ - Simstr ret = sz; - ret.push_back(S); - return ret; -} - -Simstr & -Simstr::operator+=(const Simstr & S) -{ - push_back(S); - return *this; -} - -Simstr & -Simstr::operator+=(const char * s_) -{ - Simstr a(s_); - push_back(a); - return *this; -} - - -// REL - -bool -Simstr::operator==(const Simstr & S) const -{ return !strcmp(sz,S.sz) ? true : false; } - -bool -Simstr::operator!=(const Simstr & S) const -{ return strcmp(sz,S.sz) ? true : false; } - -bool -Simstr::operator<(const Simstr & S) const -{ return (strcmp(sz,S.sz) < 0) ? true : false; } - -bool -Simstr::operator>(const Simstr & S) const -{ return (strcmp(sz,S.sz) > 0) ? true : false; } - -bool -Simstr::operator<=(const Simstr & S) const -{ return (strcmp(sz,S.sz) <= 0) ? true : false; } - -bool -Simstr::operator>=(const Simstr & S) const -{ return (strcmp(sz,S.sz) >= 0) ? true : false; } - - - - -// ************** LIST - Funktionen ***************** - - -// Einzelzugriff - -char -Simstr::get(int n) const { return (n >= len || n < 0) ? 0 : sz[n]; } - -char -Simstr::get_front() const { return sz[0]; } - -char -Simstr::get_back() const { return len ? sz[len-1] : 0; } - -Simstr -Simstr::get(int startPos, int anzahl) const -{ - if (startPos >= len || startPos < 0 || anzahl < 1) - return ""; - - int anz = len - startPos < anzahl ? len - startPos : anzahl; - - Simstr ret(' ',anz); - memcpy(ret.sz, sz+startPos, anz); - return ret; -} - -Simstr -Simstr::get_front(int anzahl) const -{ - int anz = len < anzahl ? len : anzahl; - if (anz < 1) - return ""; - - Simstr ret(' ',anz); - memcpy(ret.sz, sz, anz); - return ret; -} - -Simstr -Simstr::get_back(int anzahl) const -{ - int anz = len < anzahl ? len : anzahl; - if (anz < 1) - return ""; - int start = len-anz; - - Simstr ret(' ',anz); - memcpy(ret.sz, sz+start, anz); - return ret; -} - -Simstr -Simstr::get_first_token(char c) const -{ - int posc = pos_first(c); - if (posc != NO_POS) - return get_front(posc); - else - return sz; -} - -Simstr -Simstr::get_last_token(char c) const -{ - int posc = pos_last(c); - if (posc != NO_POS) - return get_back(len-posc-1); - else - return sz; -} - - - -// Insert - -void -Simstr::insert(int pos, char c) -{ - if (pos < 0 || pos > len) - return; - - char * result = new char[len+2]; - - memcpy(result,sz,pos); - result[pos] = c; - memcpy(result+pos+1,sz+pos,len-pos+1); - - delete [] sz; - sz = result; - len++; -} - -void -Simstr::push_front(char c) -{ - char * result = new char[len+2]; - - result[0] = c; - memcpy(result+1,sz,len+1); - - delete [] sz; - sz = result; - len++; -} - -void -Simstr::push_back(char c) -{ - char * result = new char[len+2]; - - memcpy(result,sz,len); - result[len] = c; - result[len+1] = 0; - - delete [] sz; - sz = result; - len++; -} - -void -Simstr::insert(int pos, const Simstr & S) -{ - if (pos < 0 || pos > len) - return; - - char * result = new char[len+1+S.len]; - - memcpy(result,sz,pos); - memcpy(result+pos,S.sz,S.len); - memcpy(result+pos+S.len,sz+pos,len-pos+1); - - delete [] sz; - sz = result; - len += S.len; -} - -void -Simstr::push_front(const Simstr & S) -{ - char * result = new char[len+1+S.len]; - - memcpy(result,S.sz,S.len); - memcpy(result+S.len,sz,len+1); - - delete [] sz; - sz = result; - len += S.len; -} - -void -Simstr::push_back(const Simstr & S) -{ - char * result = new char[len+1+S.len]; - - memcpy(result,sz,len); - memcpy(result+len,S.sz,S.len+1); - - delete [] sz; - sz = result; - len += S.len; -} - - -// Remove - -void -Simstr::remove(int pos, int anzahl) -{ - if (pos >= len || pos < 0 || anzahl < 1) - return; - - int anz = len - pos < anzahl ? len - pos : anzahl; - - char * result = new char[len-anz+1]; - - memcpy(result,sz,pos); - memcpy(result+pos,sz+pos+anz,len-pos-anz+1); - - delete [] sz; - sz = result; - len -= anz; -} - -void -Simstr::remove_trailing_blanks() -{ - int newlen = len-1; - for ( ; newlen > 1 && sz[newlen] <= 32; --newlen ) {} - - if (newlen < len-1) - remove ( newlen+1, len-newlen); -} - -void -Simstr::pop_front(int anzahl) -{ - if (anzahl < 1) - return; - int anz = len < anzahl ? len : anzahl; - - char * result = new char[len-anz+1]; - - memcpy(result,sz+anz,len-anz+1); - - delete [] sz; - sz = result; - len -= anz; -} - -void -Simstr::pop_back(int anzahl) -{ - if (anzahl < 1) - return; - - int anz = len < anzahl ? len : anzahl; - - char * result = new char[len-anz+1]; - - memcpy(result,sz,len-anz); - result[len-anz] = 0; - - delete [] sz; - sz = result; - len -= anz; -} - -void -Simstr::rem_back_from(int removeStartPos) -{ - if (removeStartPos != NO_POS) - pop_back(len-removeStartPos); -} - -void -Simstr::remove_all(char c) -{ - if (!len) - return; - char * result = new char[len]; - int i,j=0; - for (i = 0; i < len; i++) - if (sz[i] != c) - result[j++] = sz[i]; - - delete [] sz; - sz = new char[j+1]; - memcpy(sz,result,j); - sz[j] = 0; - len = j; - delete [] result; -} - -void -Simstr::remove_all(const Simstr & S) -{ - int pos; - while ( (pos=pos_first(S)) != NO_POS ) - remove(pos,S.len); -} - -void -Simstr::strip(char c) -{ - int start = 0; - if (c == ' ') - { // Sonderbehandlung: SPC entfernt auch TABs: - while ( start < len - ? sz[start] == ' ' - || sz[start] == '\t' - : false ) - start++; - } - else - { - while (start < len && sz[start] == c) - start++; - } - - int ende = len-1; - if (c == ' ') - { // Sonderbehandlung: SPC entfernt auch TABs: - while ( ende >= start - ? sz[ende] == ' ' - || sz[ende] == '\t' - : false ) - ende--; - } - else - { - while (ende >= start && sz[ende] == c) - ende--; - } - *this = get(start,ende-start+1); -} - -void -Simstr::empty() -{ - if (len > 0) - { - delete [] sz; - sz = new char[1]; - *sz = 0; - len = 0; - } -} - -Simstr -Simstr::take_first_token(char c) -{ - Simstr ret; - int pos = pos_first(c); - if (pos != NO_POS) - { - ret = get_front(pos); - pop_front(pos+1); - } - else - { - ret = sz; - delete [] sz; - sz = new char[1]; - *sz = NULCH; - len = 0; - } - - return ret; -} - -Simstr -Simstr::take_last_token(char c) -{ - Simstr ret; - int pos = pos_last(c); - if (pos != NO_POS) - { - ret = get_back(len-pos-1); - pop_back(len-pos); - } - else - { - ret = sz; - delete [] sz; - sz = new char[1]; - *sz = NULCH; - len = 0; - } - - return ret; -} - - - -// Find - -int -Simstr::pos_first(char c) const -{ - int i = 0; - for (i = 0; i < len ? sz[i] != c : false; i++) ; - if (i >= len) - return NO_POS; - else - return i; -} - -int -Simstr::pos_first_after( char c, - int startSearchPos) const -{ - int i = 0; - if (startSearchPos >= i) - i = startSearchPos+1; - for (; i < len ? sz[i] != c : false; i++) ; - if (i >= len) - return NO_POS; - else - return i; -} - - -int -Simstr::pos_last(char c) const -{ - int i = 0; - for (i = len-1; i >= 0 ? sz[i] != c : false; i--) ; - if (i < 0) - return NO_POS; - else - return i; -} - -int -Simstr::pos_first(const Simstr & S) const -{ - char * ptr = strstr(sz,S.sz); - if (ptr) - return int(ptr-sz); - else - return NO_POS; -} - -int -Simstr::pos_last(const Simstr & S) const -{ - Simstr vgl; - int i; - for (i = len-S.len; i >= 0 ; i--) - { - vgl = get(i,S.len); - if (vgl == S) - break; - } - if (i >= 0) - return i; - else - return NO_POS; -} - -int -Simstr::count(char c) const -{ - int ret = 0; - for (int i =0; i < len; i++) - if (sz[i] == c) - ret++; - return ret; -} - -bool -Simstr::is_no_text() const -{ - if (!len) - return true; - - int i; - for (i = 0; i < len && sz[i] <= 32 ; i++) ; - if (i < len) - return false; - return true; -} - -// Change - -void -Simstr::replace(int pos, char c) -{ - if (pos < 0 || pos >= len) - return; - else - sz[unsigned(pos)] = c; -} - -void -Simstr::replace(int startPos, int anzahl, const Simstr & S) -{ - if (startPos >= len || startPos < 0 || anzahl < 1) - return; - - int anz = len - startPos < anzahl ? len - startPos : anzahl; - - char * result = new char[len-anz+S.len+1]; - - memcpy(result,sz,startPos); - memcpy(result+startPos, S.sz, S.len); - memcpy(result+startPos+S.len, sz+startPos+anz, len-startPos-anz+1); - - delete [] sz; - sz = result; - len = len-anz+S.len; -} - -void -Simstr::replace_all(char oldCh, char newCh) -{ - for (int i=0; i < len; i++) - if (sz[i] == oldCh) - sz[i] = newCh; -} - -void -Simstr::replace_all(const Simstr & oldS, const Simstr & newS) -{ - Simstr vgl; - int i = 0; - while (i <= len-oldS.len) - { - vgl = get(i,oldS.len); - if (strcmp(vgl.sz,oldS.sz) == 0) - { - replace(i,oldS.len,newS); - i += newS.len; - } - else - i++; - } -} - -void -Simstr::to_lower() -{ - for (int i = 0; i < len; i++) - sz[i] = (char) tolower(sz[i]); -} - - - -// Simstr addition -Simstr -operator+(const char * str, const Simstr & S) -{ - Simstr ret = S; - ret.push_front(str); - return ret; -} - -Simstr -operator+(const Simstr & S, const char * str) -{ - Simstr ret = S; - ret.push_back(str); - return ret; -} - -Simstr -operator+(char c, const Simstr & S) -{ - Simstr ret = S; - ret.push_front(c); - return ret; -} - -Simstr -operator+(const Simstr & S, char c) -{ - Simstr ret = S; - ret.push_back(c); - return ret; -} - - -// Simstr-Vergleiche mit char * -bool -operator==(const Simstr & S, const char * str) -{ - return strcmp(S,str) == 0; -} - -bool -operator!=(const Simstr & S, const char * str) -{ - return strcmp(S,str) != 0; -} - -bool -operator<(const Simstr & S, const char * str) -{ - return strcmp(S,str) < 0; -} - -bool -operator>(const Simstr & S, const char * str) -{ - return strcmp(S,str) > 0; -} - -bool -operator<=(const Simstr & S, const char * str) -{ - return strcmp(S,str) <= 0; -} - -bool -operator>=(const Simstr & S, const char * str) -{ - return strcmp(S,str) >= 0; -} - -bool -operator==(const char * str, const Simstr & S) -{ - return strcmp(str,S) == 0; -} - -bool -operator!=(const char * str, const Simstr & S) -{ - return strcmp(str,S) != 0; -} - -bool -operator<(const char * str, const Simstr & S) -{ - return strcmp(str,S) < 0; -} - -bool -operator>(const char * str, const Simstr & S) -{ - return strcmp(str,S) > 0; -} - -bool -operator<=(const char * str, const Simstr & S) -{ - return strcmp(str,S) <= 0; -} - -bool -operator>=(const char * str, const Simstr & S) -{ - return strcmp(str,S) >= 0; -} - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/testhxx/create.pl b/soltools/testhxx/create.pl deleted file mode 100644 index 4902bef51462..000000000000 --- a/soltools/testhxx/create.pl +++ /dev/null @@ -1,116 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -$solarversion = $ENV{SOLARVERSION}; -$solarversion =~ s![^0-9A-Za-z]!\\$&!g; -$in = <> || die 'no input'; -chomp $in; -if ($ENV{OS} eq 'LINUX') { - 1 while $in =~ s!\s+-I\s*[^/]\S*\s*! !g; # discard relative includes - $in =~ s!(\s+-I\s*)$solarversion(\S*)!$1\${SOLARVERSION}$2!og; - # macrofy includes to solver - $in =~ s!\s+-o\s*\S+! -o /dev/null! || die 'bad input: no -o'; - $in =~ s!\S+/testhxx.cxx!-x c++ /proc/self/fd/0! - || die 'bad input: no source file'; - print STDOUT '#!/bin/sh', "\n"; - print STDOUT $in, - ' <<<"#include \\"`echo $(if [ ${1%/*} != $1 ];then cd ${1%/*};fi;', - '/bin/pwd)/${1##*/}`\\""', "\n"; -} elsif ($ENV{OS} eq 'SOLARIS') { - 1 while $in =~ s!\s+-I\s*[^/]\S*\s*! !g; # discard relative includes - $in =~ s!(\s+-I\s*)$solarversion(\S*)!$1\${SOLARVERSION}$2!og; - # macrofy includes to solver - $in =~ s!\s+-o\s*\S+! -o /dev/null! || die 'bad input: no -o'; - $in =~ s!\S+/testhxx.cxx!\${my_tmp}! - || die 'bad input: no source file'; - print STDOUT '#!/bin/sh', "\n"; - print STDOUT - 'my_tmp=${TMPDIR:-/tmp}/`/usr/xpg4/bin/id -u`_$$_include.cc', "\n"; - print STDOUT 'my_pat=`dirname $1`', "\n"; - print STDOUT 'my_fil=`basename $1`', "\n"; - print STDOUT 'my_org=${PWD}', "\n"; - print STDOUT 'cd $my_pat || exit 1', "\n"; - print STDOUT 'my_pat=`pwd`', "\n"; - print STDOUT 'cd $my_org || exit 1', "\n"; - print STDOUT - 'echo "#include \\"${my_pat}/${my_fil}\\"" > ${my_tmp} || exit 1', "\n"; - print STDOUT $in, ' > ${my_tmp}.out 2>&1', "\n"; - print STDOUT 'my_ret=$?', "\n"; - print STDOUT - 'if [ ${my_ret} -ne 0 ] ; then echo $1 >&2 ; cat ${my_tmp}.out >&2 ;', - ' fi', "\n"; - print STDOUT 'unlink ${my_tmp} || exit 1', "\n"; - print STDOUT 'unlink ${my_tmp}.out || exit 1', "\n"; - print STDOUT 'exit ${my_ret}', "\n"; -} elsif ($ENV{OS} eq 'WNT') { - if ($ENV{COM} eq 'GCC') { - 1 while $in =~ s!\s+-I\s*\.\S*\s*! !g; # discard relative includes - $in =~ s!(\s+-I\s*)(?i:$solarversion)(\S*)!$1\${SOLARVERSION}$2!og; - # macrofy includes to solver - $in =~ s!\s+-o\s*\S+! -o /dev/null! || die 'bad input: no -o'; - $in =~ s!\S+/testhxx.cxx!\${my_tmp}! - || die 'bad input: no source file'; - print STDOUT '#!/bin/sh', "\n"; - print STDOUT - 'my_tmp=${TMPDIR:-/tmp}/`id -u`_$$_include.cc', "\n"; - print STDOUT 'my_pat=`dirname $1`', "\n"; - print STDOUT 'my_fil=`basename $1`', "\n"; - print STDOUT 'my_org=${PWD}', "\n"; - print STDOUT 'cd $my_pat || exit 1', "\n"; - print STDOUT 'my_pat=`cygpath -m \`pwd\``', "\n"; - print STDOUT 'cd $my_org || exit 1', "\n"; - print STDOUT - 'echo "#include \\"${my_pat}/${my_fil}\\"" > ${my_tmp} || exit 1', "\n"; - print STDOUT $in, ' > ${my_tmp}.out 2>&1', "\n"; - print STDOUT 'my_ret=$?', "\n"; - print STDOUT - 'if [ ${my_ret} -ne 0 ] ; then echo $1 >&2 ; cat ${my_tmp}.out >&2 ;', - ' fi', "\n"; - print STDOUT 'unlink ${my_tmp} || exit 1', "\n"; - print STDOUT 'unlink ${my_tmp}.out || exit 1', "\n"; - print STDOUT 'exit ${my_ret}', "\n"; - } else { - 1 while $in =~ s!\s+-I\s*\.\S*\s*! !g; # discard relative includes - $in =~ s!(\s+-I\s*)(?i:$solarversion)(\S*)!$1\${SOLARVERSION}$2!og; - # macrofy includes to solver - $in =~ s!\s+-Fo\s*\S+! -Fo$[my_tmp}obj! || die 'bad input: no -Fo'; - $in =~ s!\s+-Zi\s! !; - $in =~ s!\s+-Fd\s*\S+!!; - print STDOUT '#!/bin/sh', "\n"; - print STDOUT - 'my_tmp=${TMPDIR:-/tmp}/`id -u`_$$_include.cc', "\n"; - print STDOUT 'my_pat=`dirname $1`', "\n"; - print STDOUT 'my_fil=`basename $1`', "\n"; - print STDOUT 'my_org=${PWD}', "\n"; - print STDOUT 'cd $my_pat || exit 1', "\n"; - print STDOUT 'my_pat=`pwd`', "\n"; - print STDOUT 'cd $my_org || exit 1', "\n"; - print STDOUT - 'echo "#include \\"${my_pat}/${my_fil}\\"" > ${my_tmp} || exit 1', "\n"; - print STDOUT $in, ' > ${my_tmp}.out 2>&1', "\n"; - print STDOUT 'my_ret=$?', "\n"; - print STDOUT - 'if [ ${my_ret} -ne 0 ] ; then echo $1 >&2 ; cat ${my_tmp}.out >&2 ;', - ' fi', "\n"; - print STDOUT 'unlink ${my_tmp} || exit 1', "\n"; - print STDOUT 'unlink ${my_tmp}.out || exit 1', "\n"; - print STDOUT 'exit ${my_ret}', "\n"; - } -} else { - print STDOUT 'echo \'no testhxx on this platform\'', "\n"; -} diff --git a/soltools/testhxx/testhxx.cxx b/soltools/testhxx/testhxx.cxx deleted file mode 100644 index efdba2d82431..000000000000 --- a/soltools/testhxx/testhxx.cxx +++ /dev/null @@ -1,22 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -// This is just a dummy file; see the makefile.mk for the real work. - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ From 023ea2a73f17303fcc0895e807413b1e54ae7ec2 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Sun, 30 Sep 2012 15:04:29 +0200 Subject: [PATCH 069/863] sw: cleanup in rtfimport test Change-Id: Idef3ee3fa246b314c4b6b8a59b2b366dadfb679a --- sw/qa/extras/rtfimport/rtfimport.cxx | 70 ++++++---------------------- 1 file changed, 13 insertions(+), 57 deletions(-) diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 96503a788933..525852250907 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -319,14 +319,8 @@ void Test::testN750757() uno::Reference xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY); uno::Reference xParaEnum = xParaEnumAccess->createEnumeration(); - uno::Reference xPropertySet(xParaEnum->nextElement(), uno::UNO_QUERY); - sal_Bool bValue; - xPropertySet->getPropertyValue("ParaContextMargin") >>= bValue; - CPPUNIT_ASSERT_EQUAL(sal_Bool(false), bValue); - - xPropertySet.set(xParaEnum->nextElement(), uno::UNO_QUERY); - xPropertySet->getPropertyValue("ParaContextMargin") >>= bValue; - CPPUNIT_ASSERT_EQUAL(sal_Bool(true), bValue); + CPPUNIT_ASSERT_EQUAL(sal_Bool(false), getProperty(xParaEnum->nextElement(), "ParaContextMargin")); + CPPUNIT_ASSERT_EQUAL(sal_Bool(true), getProperty(xParaEnum->nextElement(), "ParaContextMargin")); } void Test::testFdo45563() @@ -355,17 +349,11 @@ void Test::testFdo43965() uno::Reference xRangeEnumAccess(xParaEnum->nextElement(), uno::UNO_QUERY); uno::Reference xRangeEnum = xRangeEnumAccess->createEnumeration(); uno::Reference xPropertySet(xRangeEnum->nextElement(), uno::UNO_QUERY); - sal_Int32 nValue; - xPropertySet->getPropertyValue("CharEscapement") >>= nValue; - CPPUNIT_ASSERT_EQUAL(sal_Int32(36), nValue); - xPropertySet->getPropertyValue("CharEscapementHeight") >>= nValue; - CPPUNIT_ASSERT_EQUAL(sal_Int32(100), nValue); + CPPUNIT_ASSERT_EQUAL(sal_Int32(36), getProperty(xPropertySet, "CharEscapement")); + CPPUNIT_ASSERT_EQUAL(sal_Int32(100), getProperty(xPropertySet, "CharEscapementHeight")); // Second paragraph: Word vs Writer border default problem - xPropertySet.set(xParaEnum->nextElement(), uno::UNO_QUERY); - table::BorderLine2 aBorder; - xPropertySet->getPropertyValue("TopBorder") >>= aBorder; - CPPUNIT_ASSERT_EQUAL(sal_uInt32(26), aBorder.LineWidth); + CPPUNIT_ASSERT_EQUAL(sal_uInt32(26), getProperty(xParaEnum->nextElement(), "TopBorder").LineWidth); // Finally, make sure that we have two pages CPPUNIT_ASSERT_EQUAL(2, getPages()); @@ -378,10 +366,7 @@ void Test::testN751020() uno::Reference xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY); uno::Reference xParaEnum = xParaEnumAccess->createEnumeration(); CPPUNIT_ASSERT(xParaEnum->hasMoreElements()); - uno::Reference xPropertySet(xParaEnum->nextElement(), uno::UNO_QUERY); - sal_Int32 nValue = 0; - xPropertySet->getPropertyValue("ParaBottomMargin") >>= nValue; - CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(200)), nValue); + CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(200)), getProperty(xParaEnum->nextElement(), "ParaBottomMargin")); } void Test::testFdo47326() @@ -400,10 +385,7 @@ void Test::testFdo47036() int nAtCharacter = 0; for (int i = 0; i < xDraws->getCount(); ++i) { - uno::Reference xPropertySet(xDraws->getByIndex(i), uno::UNO_QUERY); - text::TextContentAnchorType eValue; - xPropertySet->getPropertyValue("AnchorType") >>= eValue; - if (eValue == text::TextContentAnchorType_AT_CHARACTER) + if (getProperty(xDraws->getByIndex(i), "AnchorType") == text::TextContentAnchorType_AT_CHARACTER) nAtCharacter++; } // The image at the document start was ignored. @@ -427,12 +409,7 @@ void Test::testFdo46955() uno::Reference xRangeEnumAccess(xParaEnum->nextElement(), uno::UNO_QUERY); uno::Reference xRangeEnum = xRangeEnumAccess->createEnumeration(); while (xRangeEnum->hasMoreElements()) - { - uno::Reference xPropertySet(xRangeEnum->nextElement(), uno::UNO_QUERY); - sal_Int16 nValue; - xPropertySet->getPropertyValue("CharCaseMap") >>= nValue; - CPPUNIT_ASSERT_EQUAL(style::CaseMap::UPPERCASE, nValue); - } + CPPUNIT_ASSERT_EQUAL(style::CaseMap::UPPERCASE, getProperty(xRangeEnum->nextElement(), "CharCaseMap")); } } @@ -440,8 +417,7 @@ void Test::testFdo45394() { load("fdo45394.rtf"); - uno::Reference xPropertySet(getStyles("PageStyles")->getByName("Default"), uno::UNO_QUERY); - uno::Reference xHeaderText(xPropertySet->getPropertyValue("HeaderText"), uno::UNO_QUERY); + uno::Reference xHeaderText = getProperty< uno::Reference >(getStyles("PageStyles")->getByName("Default"), "HeaderText"); OUString aActual = xHeaderText->getString(); // Encoding in the header was wrong. OUString aExpected("ПК РИК", 11, RTL_TEXTENCODING_UTF8); @@ -502,13 +478,8 @@ void Test::testFdo39053() uno::Reference xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY); int nAsCharacter = 0; for (int i = 0; i < xDraws->getCount(); ++i) - { - uno::Reference xPropertySet(xDraws->getByIndex(i), uno::UNO_QUERY); - text::TextContentAnchorType eValue; - xPropertySet->getPropertyValue("AnchorType") >>= eValue; - if (eValue == text::TextContentAnchorType_AS_CHARACTER) + if (getProperty(xDraws->getByIndex(i), "AnchorType") == text::TextContentAnchorType_AS_CHARACTER) nAsCharacter++; - } // The image in binary format was ignored. CPPUNIT_ASSERT_EQUAL(1, nAsCharacter); } @@ -541,13 +512,7 @@ void Test::testFdo48023() Application::SetSettings(aSettings); load("fdo48023.rtf"); Application::SetSettings(aSavedSettings); - - uno::Reference xTextDocument(mxComponent, uno::UNO_QUERY); - uno::Reference xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY); - uno::Reference xParaEnum = xParaEnumAccess->createEnumeration(); - uno::Reference xRangeEnumAccess(xParaEnum->nextElement(), uno::UNO_QUERY); - uno::Reference xRangeEnum = xRangeEnumAccess->createEnumeration(); - uno::Reference xTextRange(xRangeEnum->nextElement(), uno::UNO_QUERY); + uno::Reference xTextRange = getRun(getParagraph(1), 1); // Implicit encoding detection based on locale was missing OUString aExpected("ПрограммиÑÑ‚", 22, RTL_TEXTENCODING_UTF8); @@ -561,10 +526,7 @@ void Test::testFdo48876() uno::Reference xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY); uno::Reference xParaEnum = xParaEnumAccess->createEnumeration(); CPPUNIT_ASSERT(xParaEnum->hasMoreElements()); - uno::Reference xPropertySet(xParaEnum->nextElement(), uno::UNO_QUERY); - style::LineSpacing aSpacing; - xPropertySet->getPropertyValue("ParaLineSpacing") >>= aSpacing; - CPPUNIT_ASSERT_EQUAL(style::LineSpacingMode::MINIMUM, aSpacing.Mode); + CPPUNIT_ASSERT_EQUAL(style::LineSpacingMode::MINIMUM, getProperty(xParaEnum->nextElement(), "ParaLineSpacing").Mode); } void Test::testFdo48193() @@ -583,13 +545,7 @@ void Test::testFdo44211() Application::SetSettings(aSettings); load("fdo44211.rtf"); Application::SetSettings(aSavedSettings); - - uno::Reference xTextDocument(mxComponent, uno::UNO_QUERY); - uno::Reference xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY); - uno::Reference xParaEnum = xParaEnumAccess->createEnumeration(); - uno::Reference xRangeEnumAccess(xParaEnum->nextElement(), uno::UNO_QUERY); - uno::Reference xRangeEnum = xRangeEnumAccess->createEnumeration(); - uno::Reference xTextRange(xRangeEnum->nextElement(), uno::UNO_QUERY); + uno::Reference xTextRange = getRun(getParagraph(1), 1); OUString aExpected("Ä…ÄÄ™", 6, RTL_TEXTENCODING_UTF8); CPPUNIT_ASSERT_EQUAL(aExpected, xTextRange->getString()); From f9453275d2710f9d3e9a4cc1285a57db334a5e2e Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Sun, 30 Sep 2012 15:11:05 +0200 Subject: [PATCH 070/863] sw: more testcase cleanup Change-Id: I39681fbf57c828e5d6e80ae7c3155f2f60410a1a --- sw/qa/extras/rtfimport/rtfimport.cxx | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 525852250907..35a3e581ce7e 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -575,14 +575,8 @@ void Test::testFdo47764() { load("fdo47764.rtf"); - uno::Reference xTextDocument(mxComponent, uno::UNO_QUERY); - uno::Reference xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY); - uno::Reference xParaEnum = xParaEnumAccess->createEnumeration(); - uno::Reference xPropertySet(xParaEnum->nextElement(), uno::UNO_QUERY); - sal_Int32 nValue = 0; // \cbpat with zero argument should mean the auto (-1) color, not a default color (black) - xPropertySet->getPropertyValue("ParaBackColor") >>= nValue; - CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), nValue); + CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), getProperty(getParagraph(1), "ParaBackColor")); } void Test::testFdo38786() From 6ce7a5bd5709206f0f60f68d11c6040ad425b947 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Sun, 30 Sep 2012 15:28:47 +0200 Subject: [PATCH 071/863] sw: clean up one more test Change-Id: Icfcdbedaf6b123fc726e2298ac47698940b36091 --- sw/qa/extras/rtfimport/rtfimport.cxx | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 35a3e581ce7e..30e03ce6a4f2 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -605,19 +605,12 @@ void Test::testFdo49501() uno::Reference xStyle(getStyles("PageStyles")->getByName("Default"), uno::UNO_QUERY); - sal_Bool bIsLandscape = sal_False; - xStyle->getPropertyValue("IsLandscape") >>= bIsLandscape; - CPPUNIT_ASSERT_EQUAL(sal_True, bIsLandscape); + CPPUNIT_ASSERT_EQUAL(sal_True, getProperty(xStyle, "IsLandscape")); sal_Int32 nExpected(TWIP_TO_MM100(567)); - sal_Int32 nValue = 0; - xStyle->getPropertyValue("LeftMargin") >>= nValue; - CPPUNIT_ASSERT_EQUAL(nExpected, nValue); - xStyle->getPropertyValue("RightMargin") >>= nValue; - CPPUNIT_ASSERT_EQUAL(nExpected, nValue); - xStyle->getPropertyValue("TopMargin") >>= nValue; - CPPUNIT_ASSERT_EQUAL(nExpected, nValue); - xStyle->getPropertyValue("BottomMargin") >>= nValue; - CPPUNIT_ASSERT_EQUAL(nExpected, nValue); + CPPUNIT_ASSERT_EQUAL(nExpected, getProperty(xStyle, "LeftMargin")); + CPPUNIT_ASSERT_EQUAL(nExpected, getProperty(xStyle, "RightMargin")); + CPPUNIT_ASSERT_EQUAL(nExpected, getProperty(xStyle, "TopMargin")); + CPPUNIT_ASSERT_EQUAL(nExpected, getProperty(xStyle, "BottomMargin")); } void Test::testFdo49271() From 61395b51896f091d002896fc6fe0f5d2c8624590 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Sun, 30 Sep 2012 15:50:53 +0200 Subject: [PATCH 072/863] sw: finish cleanup of rtfimport test Change-Id: I10433c3c40a0c648bd651ed786ecd5523bf58f61 --- sw/qa/extras/rtfimport/rtfimport.cxx | 65 +++++----------------------- 1 file changed, 10 insertions(+), 55 deletions(-) diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 30e03ce6a4f2..61813f1c5555 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -617,15 +617,7 @@ void Test::testFdo49271() { load("fdo49271.rtf"); - uno::Reference xTextDocument(mxComponent, uno::UNO_QUERY); - uno::Reference xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY); - uno::Reference xParaEnum = xParaEnumAccess->createEnumeration(); - xParaEnum->nextElement(); - uno::Reference xPropertySet(xParaEnum->nextElement(), uno::UNO_QUERY); - float fValue = 0; - xPropertySet->getPropertyValue("CharHeight") >>= fValue; - - CPPUNIT_ASSERT_EQUAL(25.f, fValue); + CPPUNIT_ASSERT_EQUAL(25.f, getProperty(getParagraph(2), "CharHeight")); } void Test::testFdo49692() @@ -642,12 +634,7 @@ void Test::testFdo49692() const beans::PropertyValue& rProp = aProps[i]; if (rProp.Name == "Suffix") - { - OUString sValue; - rProp.Value >>= sValue; - - CPPUNIT_ASSERT_EQUAL(sal_Int32(0), sValue.getLength()); - } + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), rProp.Value.get().getLength()); } } @@ -655,54 +642,28 @@ void Test::testFdo45190() { load("fdo45190.rtf"); - uno::Reference xTextDocument(mxComponent, uno::UNO_QUERY); - uno::Reference xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY); - uno::Reference xParaEnum = xParaEnumAccess->createEnumeration(); - // inherited \fi should be reset - uno::Reference xPropertySet(xParaEnum->nextElement(), uno::UNO_QUERY); - sal_Int32 nValue = 0; - xPropertySet->getPropertyValue("ParaFirstLineIndent") >>= nValue; - CPPUNIT_ASSERT_EQUAL(sal_Int32(0), nValue); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty(getParagraph(1), "ParaFirstLineIndent")); // but direct one not - xPropertySet.set(xParaEnum->nextElement(), uno::UNO_QUERY); - xPropertySet->getPropertyValue("ParaFirstLineIndent") >>= nValue; - CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(-100)), nValue); + CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(-100)), getProperty(getParagraph(2), "ParaFirstLineIndent")); } void Test::testFdo50539() { load("fdo50539.rtf"); - uno::Reference xTextDocument(mxComponent, uno::UNO_QUERY); - uno::Reference xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY); - uno::Reference xParaEnum = xParaEnumAccess->createEnumeration(); - uno::Reference xRunEnumAccess(xParaEnum->nextElement(), uno::UNO_QUERY); - uno::Reference xRunEnum = xRunEnumAccess->createEnumeration(); - uno::Reference xPropertySet(xRunEnum->nextElement(), uno::UNO_QUERY); - sal_Int32 nValue = 0; // \chcbpat with zero argument should mean the auto (-1) color, not a default color (black) - xPropertySet->getPropertyValue("CharBackColor") >>= nValue; - CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), nValue); + CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), getProperty(getRun(getParagraph(1), 1), "CharBackColor")); } void Test::testFdo50665() { load("fdo50665.rtf"); - uno::Reference xTextDocument(mxComponent, uno::UNO_QUERY); - uno::Reference xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY); - uno::Reference xParaEnum(xParaEnumAccess->createEnumeration()); - uno::Reference xRunEnumAccess(xParaEnum->nextElement(), uno::UNO_QUERY); - uno::Reference xRunEnum(xRunEnumAccess->createEnumeration()); - // Access the second run, which is a textfield - xRunEnum->nextElement(); - uno::Reference xRun(xRunEnum->nextElement(), uno::UNO_QUERY); - OUString aValue; - xRun->getPropertyValue("CharFontName") >>= aValue; + uno::Reference xRun(getRun(getParagraph(1), 2), uno::UNO_QUERY); // This used to be the default, as character properties were ignored. - CPPUNIT_ASSERT_EQUAL(OUString("Book Antiqua"), aValue); + CPPUNIT_ASSERT_EQUAL(OUString("Book Antiqua"), getProperty(xRun, "CharFontName")); } void Test::testFdo49659() @@ -717,12 +678,8 @@ void Test::testFdo49659() // The graphic was also empty uno::Reference xDrawPageSupplier(mxComponent, uno::UNO_QUERY); uno::Reference xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY); - uno::Reference xPropertySet(xDraws->getByIndex(0), uno::UNO_QUERY); - uno::Reference xGraphic; - xPropertySet->getPropertyValue("Graphic") >>= xGraphic; - sal_Int8 nValue = 0; - xGraphic->getPropertyValue("GraphicType") >>= nValue; - CPPUNIT_ASSERT_EQUAL(graphic::GraphicType::PIXEL, nValue); + uno::Reference xGraphic(getProperty< uno::Reference >(xDraws->getByIndex(0), "Graphic"), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(graphic::GraphicType::PIXEL, getProperty(xGraphic, "GraphicType")); } void Test::testFdo46966() @@ -735,9 +692,7 @@ void Test::testFdo46966() load("fdo46966.rtf"); uno::Reference xPropertySet(getStyles("PageStyles")->getByName("Default"), uno::UNO_QUERY); - sal_Int32 nValue = 0; - xPropertySet->getPropertyValue("TopMargin") >>= nValue; - CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(720)), nValue); + CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(720)), getProperty(xPropertySet, "TopMargin")); } void Test::testFdo52066() From e8103258e2c744acbcb74bb0b90324d50cc880a5 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Sun, 30 Sep 2012 16:01:54 +0200 Subject: [PATCH 073/863] writerfilter: unused includes in DomainMapper Change-Id: Ia84271c5fe7064bfa2d71b84da9fa4d9df945d51 --- writerfilter/source/dmapper/DomainMapper.cxx | 3 --- 1 file changed, 3 deletions(-) diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index cfd8dad70163..8b5103495228 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -54,12 +54,9 @@ #include #include #include -#include #include #include -#include -#include #include #include #include From 3f3da5dff94412b432c0cd8abc24878888c8b8e4 Mon Sep 17 00:00:00 2001 From: Olivier Hallot Date: Sat, 29 Sep 2012 16:21:02 -0300 Subject: [PATCH 074/863] Update in Brazilian autocorrection Change-Id: Ifcd7410f659a76ac34f18bb561b2eaffa6ecbd3d Reviewed-on: https://gerrit.libreoffice.org/724 Reviewed-by: Andras Timar Tested-by: Andras Timar --- .../autotext/lang/pt-BR/acor/DocumentList.xml | 1 + .../lang/pt-BR/acor/WordExceptList.xml | 34 +++++++++---------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/extras/source/autotext/lang/pt-BR/acor/DocumentList.xml b/extras/source/autotext/lang/pt-BR/acor/DocumentList.xml index 13d65e32c7dc..22c51989830b 100644 --- a/extras/source/autotext/lang/pt-BR/acor/DocumentList.xml +++ b/extras/source/autotext/lang/pt-BR/acor/DocumentList.xml @@ -1012,6 +1012,7 @@ + diff --git a/extras/source/autotext/lang/pt-BR/acor/WordExceptList.xml b/extras/source/autotext/lang/pt-BR/acor/WordExceptList.xml index 45c24157e038..969d472d165a 100644 --- a/extras/source/autotext/lang/pt-BR/acor/WordExceptList.xml +++ b/extras/source/autotext/lang/pt-BR/acor/WordExceptList.xml @@ -1,20 +1,20 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + From 287050d68870a519161c649a4130d0e49a6c8beb Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 30 Sep 2012 16:59:02 +0200 Subject: [PATCH 075/863] add sal and xml2cmp back to build.pl deps Change-Id: Ia5607c977958317f3aca9061553cbfedb35944fa --- cross_tail_build/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cross_tail_build/prj/build.lst b/cross_tail_build/prj/build.lst index ec26db2f61bf..995bae7aae8b 100644 --- a/cross_tail_build/prj/build.lst +++ b/cross_tail_build/prj/build.lst @@ -1,2 +1,2 @@ -ctb cross_tail_build :: BERKELEYDB:berkeleydb BOOST:boost CPPUNIT:cppunit EXPAT:expat external ICU:icu LIBLANGTAG:liblangtag LIBXML2:libxml2 LIBXSLT:libxslt solenv soltools ZLIB:zlib NULL +ctb cross_tail_build :: BERKELEYDB:berkeleydb BOOST:boost CPPUNIT:cppunit EXPAT:expat external ICU:icu LIBLANGTAG:liblangtag LIBXML2:libxml2 LIBXSLT:libxslt sal solenv soltools NATIVE:xml2cmp ZLIB:zlib NULL ctb tail_build\prj nmake - all ctb_prj NULL From 665785c073f695922603854a9d2d5ecab4061ff0 Mon Sep 17 00:00:00 2001 From: Tim Retout Date: Sun, 30 Sep 2012 13:15:23 +0100 Subject: [PATCH 076/863] installer: Create new read_ziplist function. Change-Id: Ie91376bf9c52238febdc15720bb7f4cd62ee2e08 --- solenv/bin/modules/installer.pm | 72 +----------------------- solenv/bin/modules/installer/ziplist.pm | 73 +++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 70 deletions(-) diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm index 54b64b098bb4..4c50d3b9e426 100644 --- a/solenv/bin/modules/installer.pm +++ b/solenv/bin/modules/installer.pm @@ -82,7 +82,7 @@ use installer::windows::strip; use installer::windows::update; use installer::windows::upgrade; use installer::worker; -use installer::ziplist; +use installer::ziplist qw(read_ziplist); our @EXPORT_OK = qw(main); @@ -163,75 +163,7 @@ sub run { # Analyzing the settings and variables in zip.lst ################################################### - installer::logger::globallog("zip list file: $installer::globals::ziplistname"); - - my $ziplistref = installer::files::read_file($installer::globals::ziplistname); - - installer::logger::print_message( "... analyzing $installer::globals::ziplistname ... \n" ); - - my ($productblockref, $parent) = installer::ziplist::getproductblock($ziplistref, $installer::globals::product, 1); # product block from zip.lst - - my ($settingsblockref, undef) = installer::ziplist::getproductblock($productblockref, "Settings", 0); # settings block from zip.lst - - $settingsblockref = installer::ziplist::analyze_settings_block($settingsblockref); # select data from settings block in zip.lst - - my $allsettingsarrayref = installer::ziplist::get_settings_from_ziplist($settingsblockref); - - my $allvariablesarrayref = installer::ziplist::get_variables_from_ziplist($settingsblockref); - - my ($globalproductblockref, undef) = installer::ziplist::getproductblock($ziplistref, $installer::globals::globalblock, 0); # global product block from zip.lst - - while (defined $parent) - { - my $parentproductblockref; - ($parentproductblockref, $parent) = installer::ziplist::getproductblock( - $ziplistref, $parent, 1); - my ($parentsettingsblockref, undef) = installer::ziplist::getproductblock( - $parentproductblockref, "Settings", 0); - $parentsettingsblockref = installer::ziplist::analyze_settings_block( - $parentsettingsblockref); - my $allparentsettingsarrayref = - installer::ziplist::get_settings_from_ziplist($parentsettingsblockref); - my $allparentvariablesarrayref = - installer::ziplist::get_variables_from_ziplist($parentsettingsblockref); - $allsettingsarrayref = - installer::converter::combine_arrays_from_references_first_win( - $allsettingsarrayref, $allparentsettingsarrayref) - if $#{$allparentsettingsarrayref} > -1; - $allvariablesarrayref = - installer::converter::combine_arrays_from_references_first_win( - $allvariablesarrayref, $allparentvariablesarrayref) - if $#{$allparentvariablesarrayref} > -1; - } - - if ( $#{$globalproductblockref} > -1 ) - { - my ($globalsettingsblockref, undef) = installer::ziplist::getproductblock($globalproductblockref, "Settings", 0); # settings block from zip.lst - - $globalsettingsblockref = installer::ziplist::analyze_settings_block($globalsettingsblockref); # select data from settings block in zip.lst - - my $allglobalsettingsarrayref = installer::ziplist::get_settings_from_ziplist($globalsettingsblockref); - - my $allglobalvariablesarrayref = installer::ziplist::get_variables_from_ziplist($globalsettingsblockref); - - if ( $#{$allglobalsettingsarrayref} > -1 ) { $allsettingsarrayref = installer::converter::combine_arrays_from_references_first_win($allsettingsarrayref, $allglobalsettingsarrayref); } - if ( $#{$allglobalvariablesarrayref} > -1 ) { $allvariablesarrayref = installer::converter::combine_arrays_from_references_first_win($allvariablesarrayref, $allglobalvariablesarrayref); } - } - - $allsettingsarrayref = installer::ziplist::remove_multiples_from_ziplist($allsettingsarrayref); # the settings from the zip.lst - - $allvariablesarrayref = installer::ziplist::remove_multiples_from_ziplist($allvariablesarrayref); - - installer::ziplist::replace_variables_in_ziplist_variables($allvariablesarrayref); - - my $allvariableshashref = installer::converter::convert_array_to_hash($allvariablesarrayref); # the variables from the zip.lst - - installer::ziplist::set_default_productversion_if_required($allvariableshashref); - - installer::ziplist::add_variables_to_allvariableshashref($allvariableshashref); - - installer::ziplist::overwrite_branding( $allvariableshashref ); - + my ($allsettingsarrayref, $allvariableshashref) = read_ziplist($installer::globals::ziplistname); ######################################################## # Check if this is simple packaging mechanism diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm index 95b56389fd47..4a3e4767a0bd 100644 --- a/solenv/bin/modules/installer/ziplist.pm +++ b/solenv/bin/modules/installer/ziplist.pm @@ -27,14 +27,87 @@ package installer::ziplist; +use base 'Exporter'; + use File::Spec::Functions qw(rel2abs); +use installer::converter; use installer::exiter; +use installer::files; use installer::globals; use installer::logger; use installer::remover; use installer::systemactions; +our @EXPORT_OK = qw(read_ziplist); + +sub read_ziplist { + my $ziplistname = shift; + + installer::logger::globallog("zip list file: $ziplistname"); + + my $ziplistref = installer::files::read_file($ziplistname); + + installer::logger::print_message( "... analyzing $ziplistname ... \n" ); + + my ($productblockref, $parent) = getproductblock($ziplistref, $installer::globals::product, 1); # product block from zip.lst + + my ($settingsblockref, undef) = getproductblock($productblockref, "Settings", 0); # settings block from zip.lst + $settingsblockref = analyze_settings_block($settingsblockref); # select data from settings block in zip.lst + + my $allsettingsarrayref = get_settings_from_ziplist($settingsblockref); + my $allvariablesarrayref = get_variables_from_ziplist($settingsblockref); + + my ($globalproductblockref, undef) = getproductblock($ziplistref, $installer::globals::globalblock, 0); # global product block from zip.lst + + while (defined $parent) { + my $parentproductblockref; + ($parentproductblockref, $parent) = getproductblock($ziplistref, $parent, 1); + my ($parentsettingsblockref, undef) = getproductblock($parentproductblockref, "Settings", 0); + $parentsettingsblockref = analyze_settings_block($parentsettingsblockref); + my $allparentsettingsarrayref = get_settings_from_ziplist($parentsettingsblockref); + my $allparentvariablesarrayref = get_variables_from_ziplist($parentsettingsblockref); + $allsettingsarrayref = + installer::converter::combine_arrays_from_references_first_win( + $allsettingsarrayref, $allparentsettingsarrayref) + if $#{$allparentsettingsarrayref} > -1; + $allvariablesarrayref = + installer::converter::combine_arrays_from_references_first_win( + $allvariablesarrayref, $allparentvariablesarrayref) + if $#{$allparentvariablesarrayref} > -1; + } + + if ( @{$globalproductblockref} ) { + my ($globalsettingsblockref, undef) = getproductblock($globalproductblockref, "Settings", 0); # settings block from zip.lst + + $globalsettingsblockref = analyze_settings_block($globalsettingsblockref); # select data from settings block in zip.lst + + my $allglobalsettingsarrayref = get_settings_from_ziplist($globalsettingsblockref); + + my $allglobalvariablesarrayref = get_variables_from_ziplist($globalsettingsblockref); + + if ( @{$allglobalsettingsarrayref} ) { + $allsettingsarrayref = installer::converter::combine_arrays_from_references_first_win($allsettingsarrayref, $allglobalsettingsarrayref); + } + if ( @{$allglobalvariablesarrayref} ) { + $allvariablesarrayref = installer::converter::combine_arrays_from_references_first_win($allvariablesarrayref, $allglobalvariablesarrayref); + } + } + + $allsettingsarrayref = remove_multiples_from_ziplist($allsettingsarrayref); + $allvariablesarrayref = remove_multiples_from_ziplist($allvariablesarrayref); + + replace_variables_in_ziplist_variables($allvariablesarrayref); + + my $allvariableshashref = installer::converter::convert_array_to_hash($allvariablesarrayref); + + set_default_productversion_if_required($allvariableshashref); + add_variables_to_allvariableshashref($allvariableshashref); + overwrite_branding( $allvariableshashref ); + + return $allsettingsarrayref, $allvariableshashref; +} + ################################################# # Getting data from path file and zip list file ################################################# From 5cc1d5ca954a594129bd81159a87f8dfb9bbffe7 Mon Sep 17 00:00:00 2001 From: Tim Retout Date: Sun, 30 Sep 2012 13:23:43 +0100 Subject: [PATCH 077/863] installer::profiles: Test and rewrite sorting_profile Change-Id: Ie3c9bddcb4760d2fe2195c1ca0de7520e57d705f --- solenv/bin/modules/installer/profiles.pm | 45 +++++++---------- solenv/bin/modules/t/installer-profiles.t | 60 +++++++++++++++++++++++ 2 files changed, 79 insertions(+), 26 deletions(-) create mode 100644 solenv/bin/modules/t/installer-profiles.t diff --git a/solenv/bin/modules/installer/profiles.pm b/solenv/bin/modules/installer/profiles.pm index 7b621f70a78d..3b99973a92a4 100644 --- a/solenv/bin/modules/installer/profiles.pm +++ b/solenv/bin/modules/installer/profiles.pm @@ -42,40 +42,33 @@ use installer::systemactions; # Sorting the content of a profile ####################################################### -sub sorting_profile -{ +sub sorting_profile { my ($profilesref) = @_; - my @profile = (); - my @definedsections = (); + my @sections; + my %section_content; - for ( my $i = 0; $i <= $#{$profilesref}; $i++ ) - { + for ( my $i = 0; $i < @{$profilesref}; $i++ ) { my $line = ${$profilesref}[$i]; - if ( $line =~ /^\s*(\[.*\])\s*$/ ) # this is a section (every second line) - { - my $section = $1; + # Skip unless this is a section (every second line) + next unless ( $line =~ /^\s*(\[.*\])\s*$/ ); - if (! grep {$_ eq $section} @definedsections) - { - my $sectionline = $section . "\n"; - push(@definedsections, $section); - push(@profile, $sectionline); + my $section = $1; + my $next_line = ${$profilesref}[$i+1]; - for ( my $j = 0; $j <= $#{$profilesref}; $j++ ) - { - my $oneline = ${$profilesref}[$j]; - installer::remover::remove_leading_and_ending_whitespaces(\$oneline); - - if ( $oneline eq $section ) - { - my $nextline = ${$profilesref}[$j+1]; - push(@profile, $nextline); - } - } - } + if ( ! exists $section_content{$section} ) { + push @sections, $section; } + + push @{ $section_content{$section} }, $next_line; + } + + my @profile; + + for my $section (@sections) { + push @profile, "$section\n"; + push @profile, @{ $section_content{$section} }; } return \@profile; diff --git a/solenv/bin/modules/t/installer-profiles.t b/solenv/bin/modules/t/installer-profiles.t new file mode 100644 index 000000000000..841af1458e85 --- /dev/null +++ b/solenv/bin/modules/t/installer-profiles.t @@ -0,0 +1,60 @@ +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# [ Copyright (C) 2012 Tim Retout (initial developer) ] +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +use strict; +use warnings; + +use Test::More; + +use lib '.'; + +use installer::profiles; + +my @input = map { "$_\n" } split "\n", <<'END'; + [foo] +1 +NOT SEEN + [bar] +3 + [foo] +2 +[bar] +4 +END + +my @expected = map { "$_\n" } split "\n", <<'END'; +[foo] +1 +2 +[bar] +3 +4 +END + +my $result = installer::profiles::sorting_profile(\@input); + +is_deeply($result, \@expected); + +done_testing(); From a842b5690e77de51d933bd9a4224303abba1d870 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sun, 30 Sep 2012 19:59:02 +0200 Subject: [PATCH 078/863] Make Reference::iset_throw work with multiple-inheritance interfaces Change-Id: Ia8a644c613de17279abdab533a6314ba6c0e0aec --- cppu/inc/com/sun/star/uno/Reference.hxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cppu/inc/com/sun/star/uno/Reference.hxx b/cppu/inc/com/sun/star/uno/Reference.hxx index 100a430f7045..aa39810159d3 100644 --- a/cppu/inc/com/sun/star/uno/Reference.hxx +++ b/cppu/inc/com/sun/star/uno/Reference.hxx @@ -91,7 +91,7 @@ inline interface_type * Reference< interface_type >::iset_throw( { if (pInterface) { - pInterface->acquire(); + castToXInterface(pInterface)->acquire(); return pInterface; } throw RuntimeException( @@ -184,13 +184,13 @@ inline Reference< interface_type >::Reference( const Any & rAny, UnoReference_Qu template< class interface_type > inline Reference< interface_type >::Reference( const Reference< interface_type > & rRef, UnoReference_SetThrow ) SAL_THROW( (RuntimeException) ) { - _pInterface = iset_throw( rRef.get() ); + _pInterface = castToXInterface( iset_throw( rRef.get() ) ); } //__________________________________________________________________________________________________ template< class interface_type > inline Reference< interface_type >::Reference( interface_type * pInterface, UnoReference_SetThrow ) SAL_THROW( (RuntimeException) ) { - _pInterface = iset_throw( pInterface ); + _pInterface = castToXInterface( iset_throw( pInterface ) ); } #endif From 79dbac32afd3a937e323231ec310ec1f0e476fe5 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Sun, 30 Sep 2012 20:45:36 +0200 Subject: [PATCH 079/863] create guids that excel accepts Change-Id: I69868ad65b6eb6405d5723cb4d65d5e30c72e3ae --- sc/source/filter/excel/xecontent.cxx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index 6bef29b1f5ce..abca86f96d68 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -1082,13 +1082,21 @@ void XclExpColorScale::SaveXml( XclExpXmlStream& rStrm ) namespace { +rtl::OString createHexStringFromDigit(sal_uInt8 nDigit) +{ + rtl::OString aString = rtl::OString::valueOf( static_cast(nDigit), 16 ); + if(aString.getLength() == 1) + aString = aString + rtl::OString::valueOf(static_cast(0)); + return aString; +} + rtl::OString createGuidStringFromInt(sal_uInt8 nGuid[16]) { rtl::OStringBuffer aBuffer; aBuffer.append('{'); for(size_t i = 0; i < 16; ++i) { - aBuffer.append(static_cast(nGuid[i]), 16); + aBuffer.append(createHexStringFromDigit(nGuid[i])); if(i == 3|| i == 5 || i == 7 || i == 9 ) aBuffer.append('-'); } From e12f501bebf83ea8121e517283c25c24587268a7 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Sun, 30 Sep 2012 23:59:29 +0200 Subject: [PATCH 080/863] gbuildification of saxon Change-Id: Ic54337f4279daf78b099aab368eade5a6143f586 --- Makefile.top | 2 +- config_host.mk.in | 1 + configure.in | 2 + saxon/ExternalProject_saxon.mk | 38 ++ saxon/Makefile | 7 + saxon/Module_saxon.mk | 22 + saxon/Package_saxon.mk | 16 + saxon/UnpackedTarball_saxon.mk | 16 + saxon/build.xml | 1026 +++++++++++++++++++++++++++++++ saxon/makefile.mk | 69 --- saxon/prj/build.lst | 2 +- saxon/prj/d.lst | 1 - saxon/prj/dmake | 0 saxon/saxon-9.0.0.7-bj.patch | 1031 -------------------------------- 14 files changed, 1130 insertions(+), 1103 deletions(-) create mode 100644 saxon/ExternalProject_saxon.mk create mode 100644 saxon/Makefile create mode 100644 saxon/Module_saxon.mk create mode 100644 saxon/Package_saxon.mk create mode 100644 saxon/UnpackedTarball_saxon.mk create mode 100644 saxon/build.xml delete mode 100644 saxon/makefile.mk delete mode 100644 saxon/prj/dmake delete mode 100644 saxon/saxon-9.0.0.7-bj.patch diff --git a/Makefile.top b/Makefile.top index 8fd5620aa9d9..e188cdcbcc26 100644 --- a/Makefile.top +++ b/Makefile.top @@ -133,6 +133,7 @@ sal\ salhelper\ sane\ sax\ +saxon\ sc\ scaddins\ sccomp\ @@ -245,7 +246,6 @@ postprocess\ python\ redland\ rhino\ -saxon\ setup_native\ stax\ stlport\ diff --git a/config_host.mk.in b/config_host.mk.in index 9814f16d775c..473ab5dd69fa 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -483,6 +483,7 @@ export RTL_ARCH=@RTL_ARCH@ export SAC_JAR=@SAC_JAR@ export SAL_ENABLE_FILE_LOCKING=1 export SAXON_JAR=@SAXON_JAR@ +export SAXON_TARBALL=@SAXON_TARBALL@ export SCPDEFS=@SCPDEFS@ export SERVLETAPI_JAR=@SERVLETAPI_JAR@ export SHOWINCLUDES_PREFIX=@SHOWINCLUDES_PREFIX@ diff --git a/configure.in b/configure.in index ac9266cb8d3f..7c7ce66297b6 100644 --- a/configure.in +++ b/configure.in @@ -7697,9 +7697,11 @@ else AC_MSG_RESULT([internal]) SYSTEM_SAXON=NO NEED_SAXON=TRUE + SAXON_TARBALL=ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip fi fi AC_SUBST(SYSTEM_SAXON) +AC_SUBST(SAXON_TARBALL) AC_SUBST(SAXON_JAR) if test -n "$NEED_SAXON"; then diff --git a/saxon/ExternalProject_saxon.mk b/saxon/ExternalProject_saxon.mk new file mode 100644 index 000000000000..03f0b94436fa --- /dev/null +++ b/saxon/ExternalProject_saxon.mk @@ -0,0 +1,38 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_ExternalProject_ExternalProject,saxon)) + +$(eval $(call gb_ExternalProject_use_unpacked,saxon,saxon)) + +$(eval $(call gb_ExternalProject_register_targets,saxon,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,saxon,build) : + cd "$(call gb_UnpackedTarball_get_dir,saxon)" && \ + ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \ + "$(ANT)" \ + -q \ + -f build.xml \ + -Dbuild.label="build-libreoffice" \ + $(if $(filter YES,$(SYSTEM_TOMCAT))\ + ,-Dservletapi.jar=$(SERVLETAPI_JAR) \ + ,-Dservletapi.jar=$(SOLARVER)/$(INPATH)/bin/servlet-api.jar \ + )\ + $(if $(filter yes,$(JAVACISGCJ))\ + ,-Dbuild.compiler=gcj \ + ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + ) \ + $(if $(debug),-Dbuild.debug="on") \ + -Dsolarbindir=$(SOLARBINDIR) jar-bj && \ + touch $@ + +# vim: set noet sw=4 ts=4: diff --git a/saxon/Makefile b/saxon/Makefile new file mode 100644 index 000000000000..ccb1c85a04da --- /dev/null +++ b/saxon/Makefile @@ -0,0 +1,7 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +include $(module_directory)/../solenv/gbuild/partial_build.mk + +# vim: set noet sw=4 ts=4: diff --git a/saxon/Module_saxon.mk b/saxon/Module_saxon.mk new file mode 100644 index 000000000000..0ac17febdc0c --- /dev/null +++ b/saxon/Module_saxon.mk @@ -0,0 +1,22 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Module_Module,saxon)) + +ifneq ($(SOLAR_JAVA),) +ifneq ($(filter SAXON,$(BUILD_TYPE)),) +$(eval $(call gb_Module_add_targets,saxon,\ + ExternalProject_saxon \ + Package_saxon \ + UnpackedTarball_saxon \ +)) +endif +endif + +# vim: set noet sw=4 ts=4: diff --git a/saxon/Package_saxon.mk b/saxon/Package_saxon.mk new file mode 100644 index 000000000000..ba19d97a8324 --- /dev/null +++ b/saxon/Package_saxon.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Package_Package,saxon_inc,$(call gb_UnpackedTarball_get_dir,saxon))) + +$(eval $(call gb_Package_use_external_project,saxon_inc,saxon)) + +$(eval $(call gb_Package_add_file,saxon_inc,bin/saxon9.jar,saxon-build/9.0.0.7/bj/saxon9.jar)) + +# vim: set noet sw=4 ts=4: diff --git a/saxon/UnpackedTarball_saxon.mk b/saxon/UnpackedTarball_saxon.mk new file mode 100644 index 000000000000..206257b851f1 --- /dev/null +++ b/saxon/UnpackedTarball_saxon.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,saxon)) + +$(eval $(call gb_UnpackedTarball_set_tarball,saxon,$(SAXON_TARBALL))) + +$(eval $(call gb_UnpackedTarball_add_file,saxon,build.xml,saxon/build.xml)) + +# vim: set noet sw=4 ts=4: diff --git a/saxon/build.xml b/saxon/build.xml new file mode 100644 index 000000000000..c9026f7778ea --- /dev/null +++ b/saxon/build.xml @@ -0,0 +1,1026 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + net.sf.saxon.xpath.XPathFactoryImpl +http\://java.sun.com/jaxp/xpath/dom: net.sf.saxon.xpath.XPathFactoryImpl +http\://saxon.sf.net/jaxp/xpath/om: net.sf.saxon.xpath.XPathFactoryImpl +http\://www.xom.nu/jaxp/xpath/xom: net.sf.saxon.xpath.XPathFactoryImpl +http\://jdom.org/jaxp/xpath/jdom: net.sf.saxon.xpath.XPathFactoryImpl +http\://www.dom4j.org/jaxp/xpath/dom4j: net.sf.saxon.xpath.XPathFactoryImpl + + + + + com.saxonica.jaxp.SchemaFactoryImpl +http\://www.w3.org/2001/XMLSchema: com.saxonica.jaxp.SchemaFactoryImpl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + set NET="%PROGRAMFILES%\Microsoft.NET\SDK\v1.1\Bin" + %NET%\gacutil /if IKVM.Runtime.dll + %NET%\gacutil /if IKVM.GNU.Classpath.dll + %NET%\gacutil /if saxon9.dll + %NET%\gacutil /if saxon9api.dll + + + + + + + + + + + + + + + + + + + set NET="%PROGRAMFILES%\Microsoft.NET\SDK\v1.1\Bin" + %NET%\gacutil /if IKVM.Runtime.dll + %NET%\gacutil /if IKVM.GNU.Classpath.dll + %NET%\gacutil /if saxon9.dll + %NET%\gacutil /if saxon9sa.dll + %NET%\gacutil /if saxon9api.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/saxon/makefile.mk b/saxon/makefile.mk deleted file mode 100644 index 40a74043b233..000000000000 --- a/saxon/makefile.mk +++ /dev/null @@ -1,69 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=. - -PRJNAME=saxon -TARGET=saxon - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : antsettings.mk - -.IF "$(SOLAR_JAVA)" != "" -.IF "$(SYSTEM_SAXON)" == "YES" -all: - @echo "An already available installation of saxon should exist on your system." - @echo "Therefore the version provided here does not need to be built in addition." -.ENDIF - -# --- Files -------------------------------------------------------- - -TARFILE_NAME=source-9.0.0.7-bj -TARFILE_MD5=ada24d37d8d638b3d8a9985e80bc2978 -ADDITIONAL_FILES=build.xml -TARFILE_ROOTDIR=src - -PATCH_FILES=saxon-9.0.0.7-bj.patch - -BUILD_ACTION="$(ANT)" $(ANT_FLAGS) -Dsolarbindir=$(SOLARBINDIR) jar-bj - -OUT2CLASS= saxon-build$/9.0.0.7$/bj$/saxon9.jar - -.ELSE # $(SOLAR_JAVA)!= "" -nojava: - @echo "Not building $(PRJNAME) because Java is disabled" -.ENDIF # $(SOLAR_JAVA)!= "" -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_ext.mk -.INCLUDE : target.mk -.IF "$(SOLAR_JAVA)" != "" -.INCLUDE : tg_ext.mk -.ENDIF - diff --git a/saxon/prj/build.lst b/saxon/prj/build.lst index 813097c66d90..a69eba0832e7 100644 --- a/saxon/prj/build.lst +++ b/saxon/prj/build.lst @@ -1,2 +1,2 @@ xx saxon : solenv stax NULL -xx saxon nmake - all xx_saxon NULL +xx saxon\prj nmake - all xx_saxon NULL diff --git a/saxon/prj/d.lst b/saxon/prj/d.lst index 0793dadfcfb1..e69de29bb2d1 100644 --- a/saxon/prj/d.lst +++ b/saxon/prj/d.lst @@ -1 +0,0 @@ -..\%__SRC%\class\saxon9.jar %_DEST%\bin\saxon9.jar diff --git a/saxon/prj/dmake b/saxon/prj/dmake deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/saxon/saxon-9.0.0.7-bj.patch b/saxon/saxon-9.0.0.7-bj.patch deleted file mode 100644 index 11d30914e985..000000000000 --- a/saxon/saxon-9.0.0.7-bj.patch +++ /dev/null @@ -1,1031 +0,0 @@ ---- misc/src/build.xml 2008-07-11 12:11:50.079281000 +0200 -+++ misc/build/src/build.xml 2008-07-11 12:17:29.848740000 +0200 -@@ -1 +1,1027 @@ --dummy -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ net.sf.saxon.xpath.XPathFactoryImpl -+http\://java.sun.com/jaxp/xpath/dom: net.sf.saxon.xpath.XPathFactoryImpl -+http\://saxon.sf.net/jaxp/xpath/om: net.sf.saxon.xpath.XPathFactoryImpl -+http\://www.xom.nu/jaxp/xpath/xom: net.sf.saxon.xpath.XPathFactoryImpl -+http\://jdom.org/jaxp/xpath/jdom: net.sf.saxon.xpath.XPathFactoryImpl -+http\://www.dom4j.org/jaxp/xpath/dom4j: net.sf.saxon.xpath.XPathFactoryImpl -+ -+ -+ -+ -+ com.saxonica.jaxp.SchemaFactoryImpl -+http\://www.w3.org/2001/XMLSchema: com.saxonica.jaxp.SchemaFactoryImpl -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ set NET="%PROGRAMFILES%\Microsoft.NET\SDK\v1.1\Bin" -+ %NET%\gacutil /if IKVM.Runtime.dll -+ %NET%\gacutil /if IKVM.GNU.Classpath.dll -+ %NET%\gacutil /if saxon9.dll -+ %NET%\gacutil /if saxon9api.dll -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ set NET="%PROGRAMFILES%\Microsoft.NET\SDK\v1.1\Bin" -+ %NET%\gacutil /if IKVM.Runtime.dll -+ %NET%\gacutil /if IKVM.GNU.Classpath.dll -+ %NET%\gacutil /if saxon9.dll -+ %NET%\gacutil /if saxon9sa.dll -+ %NET%\gacutil /if saxon9api.dll -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ From 25a7a4bb6cc226f5a7d2d7352b10ebaa049661ff Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 30 Sep 2012 06:56:04 +0200 Subject: [PATCH 081/863] add missing deps for tools/color.hxx Change-Id: I164afe17c3bff2f7d7f2b9daec0d5a5ca8fdf97a --- extensions/Executable_nsplugin.mk | 6 ++++++ extensions/source/nsplugin/source/so_instance.cxx | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/extensions/Executable_nsplugin.mk b/extensions/Executable_nsplugin.mk index 0f6af603c9ee..866257e1fde2 100644 --- a/extensions/Executable_nsplugin.mk +++ b/extensions/Executable_nsplugin.mk @@ -30,6 +30,12 @@ $(eval $(call gb_Executable_Executable,nsplugin)) +$(eval $(call gb_Executable_use_packages,nsplugin,\ + basegfx_inc \ + comphelper_inc \ + tools_inc \ +)) + $(eval $(call gb_Executable_use_sdk_api,nsplugin)) $(eval $(call gb_Executable_add_exception_objects,nsplugin,\ diff --git a/extensions/source/nsplugin/source/so_instance.cxx b/extensions/source/nsplugin/source/so_instance.cxx index c9b6ee9212df..4aeb45a645f7 100644 --- a/extensions/source/nsplugin/source/so_instance.cxx +++ b/extensions/source/nsplugin/source/so_instance.cxx @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include From b7bc73de34f1fda3f5ce533e139a19d54b142c10 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 30 Sep 2012 07:35:08 +0200 Subject: [PATCH 082/863] add missing dep for tools/errcode.hxx Change-Id: I6e63a545332a1b865a26b355db49869c214f97c7 --- sdext/StaticLibrary_pdfimport_s.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sdext/StaticLibrary_pdfimport_s.mk b/sdext/StaticLibrary_pdfimport_s.mk index 699e3e7df185..20065a9100bb 100644 --- a/sdext/StaticLibrary_pdfimport_s.mk +++ b/sdext/StaticLibrary_pdfimport_s.mk @@ -29,6 +29,10 @@ include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))platform.mk $(eval $(call gb_StaticLibrary_StaticLibrary,pdfimport_s)) +$(eval $(call gb_StaticLibrary_use_packages,pdfimport_s,\ + tools_inc \ +)) + $(eval $(call gb_StaticLibrary_use_api,pdfimport_s,\ offapi \ udkapi \ From 6e9c84461a5b86275b61003de8753a6699fad1ba Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 30 Sep 2012 08:13:57 +0200 Subject: [PATCH 083/863] drop unused include Change-Id: I21360e2d65b64bc27f02d677eda05f9d9d765367 --- sdext/source/presenter/PresenterWindowManager.hxx | 1 - 1 file changed, 1 deletion(-) diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx index d2a5ae240f66..88a748e1de74 100644 --- a/sdext/source/presenter/PresenterWindowManager.hxx +++ b/sdext/source/presenter/PresenterWindowManager.hxx @@ -47,7 +47,6 @@ #include #include #include -#include #include #include #include From 898c34603555b64b330ef5a45b7e60eb82e25b66 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 30 Sep 2012 14:17:16 +0200 Subject: [PATCH 084/863] do not rely on target-spec. var. inheritance The whole idea of having two paths to look for schemas (one local, for module, and one global, in $(OUTDIR)) is bad anyway, because there is no way to do it in XSLT without warning if the checked schema does not exist in the first path. I see two ways out of that: 1. rewrite schema_val.xsl in a decent language 2. split the node reference check in schema_val.xsl into two phases: the first phase returns a list of subpaths to check, a helper script processes that, finds the real paths and feeds it to the second phase XSL, which does the internal check. Change-Id: Icfe3f9ec0960cfd3423c1223ad8f495d7634b25a --- solenv/gbuild/Configuration.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index e02d0dad0a79..f8b511484b98 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -54,6 +54,8 @@ # gb_Configuration__get_source = $(SRCDIR)/$(2) +# The main LibreOffice registry +gb_Configuration_PRIMARY_REGISTRY_NAME := registry # XcsTarget class @@ -77,7 +79,7 @@ $(call gb_Helper_abbreviate_dirs,\ --noout \ --stringparam componentName $(subst /,.,$(basename $(XCSFILE))) \ --stringparam root $(subst $(XCSFILE),,$(3)) \ - $(if $(SCHEMA_ROOT),--stringparam schemaRoot $(SCHEMA_ROOT)) \ + $(if $(PRIMARY_REGISTRY),,--stringparam schemaRoot $(call gb_XcsTarget_get_outdir_target,)) \ $(gb_XcsTarget_XSLT_SchemaVal) \ $(3) && \ $(gb_XSLTPROC) --nonet \ @@ -353,8 +355,6 @@ $(foreach lang,$(gb_Configuration_LANGS),$(eval \ $(call gb_Configuration_get_clean_target,$(1)) : \ $(call gb_Zip_get_clean_target,$(1)_$(lang)))) -$(call gb_Configuration_get_target,$(1)) : SCHEMA_ROOT := - $$(eval $$(call gb_Module_register_target,$(call gb_Configuration_get_target,$(1)),$(call gb_Configuration_get_clean_target,$(1)))) endef @@ -368,6 +368,7 @@ $(call gb_Configuration_get_clean_target,$(1)) : \ $(call gb_XcsTarget_get_target,$(2)/$(3)) : \ $(call gb_Configuration__get_source,$(1),$(2)/$(3)) \ $(call gb_Configuration_get_preparation_target,$(1)) +$(call gb_XcsTarget_get_target,$(2)/$(3)) : PRIMARY_REGISTRY := $(filter $(1),$(gb_Configuration_PRIMARY_REGISTRY_NAME)) $(call gb_XcsTarget_get_target,$(2)/$(3)) : XCSFILE := $(3) $(call gb_XcsTarget_get_clean_target,$(2)/$(3)) : XCSFILE := $(3) $(call gb_Configuration_get_target,$(1)) : \ @@ -508,7 +509,6 @@ endef # $(eval $(call gb_Configuration_use_configuration,foo,registry)) define gb_Configuration_use_configuration $(call gb_Configuration_get_preparation_target,$(1)) : $(call gb_Configuration_get_target,$(2)) -$(call gb_Configuration_get_target,$(1)) : SCHEMA_ROOT := $(gb_Configuration_registry)/schema endef From 93a3e81816e3479c0d107ba44d473134b51a7712 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 30 Sep 2012 18:51:11 +0200 Subject: [PATCH 085/863] add missing deps on headers to static libs Change-Id: I7a28dfa13bf0f98a654eca98eb1cdfd99177f37a --- codemaker/StaticLibrary_codemaker.mk | 1 + codemaker/StaticLibrary_codemaker_cpp.mk | 1 + codemaker/StaticLibrary_codemaker_java.mk | 1 + lingucomponent/StaticLibrary_ulingu.mk | 10 ++++++++++ sax/StaticLibrary_sax_shared.mk | 4 ++++ sdext/StaticLibrary_pdfimport_s.mk | 5 +++++ testtools/StaticLibrary_bridgetest.mk | 5 +++++ vcl/StaticLibrary_headless.mk | 13 +++++++++++++ vcl/StaticLibrary_vclmain.mk | 3 +++ writerperfect/StaticLibrary_writerperfect.mk | 10 ++++++++++ 10 files changed, 53 insertions(+) diff --git a/codemaker/StaticLibrary_codemaker.mk b/codemaker/StaticLibrary_codemaker.mk index bbea555a5d18..04b53db236af 100644 --- a/codemaker/StaticLibrary_codemaker.mk +++ b/codemaker/StaticLibrary_codemaker.mk @@ -29,6 +29,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,codemaker)) $(eval $(call gb_StaticLibrary_use_packages,codemaker,\ codemaker_inc \ + registry_inc \ sal_generated \ )) diff --git a/codemaker/StaticLibrary_codemaker_cpp.mk b/codemaker/StaticLibrary_codemaker_cpp.mk index b8cabf468a88..92678fa01a44 100644 --- a/codemaker/StaticLibrary_codemaker_cpp.mk +++ b/codemaker/StaticLibrary_codemaker_cpp.mk @@ -29,6 +29,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,codemaker_cpp)) $(eval $(call gb_StaticLibrary_use_packages,codemaker_cpp,\ codemaker_inc \ + registry_inc \ )) $(eval $(call gb_StaticLibrary_add_exception_objects,codemaker_cpp,\ diff --git a/codemaker/StaticLibrary_codemaker_java.mk b/codemaker/StaticLibrary_codemaker_java.mk index 6538e380496a..f33d38e14009 100644 --- a/codemaker/StaticLibrary_codemaker_java.mk +++ b/codemaker/StaticLibrary_codemaker_java.mk @@ -29,6 +29,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,codemaker_java)) $(eval $(call gb_StaticLibrary_use_packages,codemaker_java,\ codemaker_inc \ + registry_inc \ )) $(eval $(call gb_StaticLibrary_add_exception_objects,codemaker_java,\ diff --git a/lingucomponent/StaticLibrary_ulingu.mk b/lingucomponent/StaticLibrary_ulingu.mk index 3bc66a25a5c3..9767efa4e67a 100644 --- a/lingucomponent/StaticLibrary_ulingu.mk +++ b/lingucomponent/StaticLibrary_ulingu.mk @@ -27,6 +27,16 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,ulingu)) +$(eval $(call gb_StaticLibrary_use_packages,ulingu,\ + comphelper_inc \ + cppu_inc \ + cppuhelper_inc \ + i18npool_inc \ + linguistic_inc \ + tools_inc \ + unotools_inc \ +)) + $(eval $(call gb_StaticLibrary_use_api,ulingu,\ udkapi \ offapi \ diff --git a/sax/StaticLibrary_sax_shared.mk b/sax/StaticLibrary_sax_shared.mk index cdbc3c88843f..bf6887c00ada 100644 --- a/sax/StaticLibrary_sax_shared.mk +++ b/sax/StaticLibrary_sax_shared.mk @@ -9,6 +9,10 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,sax_shared)) +$(eval $(call gb_StaticLibrary_use_packages,sax_shared,\ + cppu_inc \ +)) + $(eval $(call gb_StaticLibrary_set_include,sax_shared,\ -I$(SRCDIR)/sax/inc \ $$(INCLUDE) \ diff --git a/sdext/StaticLibrary_pdfimport_s.mk b/sdext/StaticLibrary_pdfimport_s.mk index 20065a9100bb..bf49da31070b 100644 --- a/sdext/StaticLibrary_pdfimport_s.mk +++ b/sdext/StaticLibrary_pdfimport_s.mk @@ -30,6 +30,11 @@ include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))platform.mk $(eval $(call gb_StaticLibrary_StaticLibrary,pdfimport_s)) $(eval $(call gb_StaticLibrary_use_packages,pdfimport_s,\ + basegfx_inc \ + comphelper_inc \ + cppu_inc \ + cppuhelper_inc \ + o3tl_inc \ tools_inc \ )) diff --git a/testtools/StaticLibrary_bridgetest.mk b/testtools/StaticLibrary_bridgetest.mk index ed96f3489f42..23254e7f13a8 100644 --- a/testtools/StaticLibrary_bridgetest.mk +++ b/testtools/StaticLibrary_bridgetest.mk @@ -27,6 +27,11 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,testtools_bridgetest_s)) +$(eval $(call gb_StaticLibrary_use_packages,testtools_bridgetest_s,\ + cppu_inc \ + cppuhelper_inc \ +)) + $(eval $(call gb_StaticLibrary_use_internal_api,testtools_bridgetest_s,\ bridgetest \ )) diff --git a/vcl/StaticLibrary_headless.mk b/vcl/StaticLibrary_headless.mk index a07497ceb7a3..a3dc220a83cd 100644 --- a/vcl/StaticLibrary_headless.mk +++ b/vcl/StaticLibrary_headless.mk @@ -28,6 +28,19 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,headless)) +$(eval $(call gb_StaticLibrary_use_packages,headless,\ + basebmp_inc \ + basegfx_inc \ + comphelper_inc \ + cppu_inc \ + cppuhelper_inc \ + i18npool_inc \ + i18nutil_inc \ + o3tl_inc \ + tools_inc \ + unotools_inc \ +)) + $(eval $(call gb_StaticLibrary_use_api,headless,\ offapi \ udkapi \ diff --git a/vcl/StaticLibrary_vclmain.mk b/vcl/StaticLibrary_vclmain.mk index 05a6f3e9fe97..98998bb52e93 100644 --- a/vcl/StaticLibrary_vclmain.mk +++ b/vcl/StaticLibrary_vclmain.mk @@ -29,6 +29,9 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,vclmain)) $(eval $(call gb_StaticLibrary_use_packages,vclmain,\ + comphelper_inc \ + cppu_inc \ + cppuhelper_inc \ tools_inc \ )) diff --git a/writerperfect/StaticLibrary_writerperfect.mk b/writerperfect/StaticLibrary_writerperfect.mk index 6aec3aeaf98b..995b1bab2f35 100644 --- a/writerperfect/StaticLibrary_writerperfect.mk +++ b/writerperfect/StaticLibrary_writerperfect.mk @@ -19,6 +19,16 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,writerperfect)) +$(eval $(call gb_StaticLibrary_use_packages,writerperfect,\ + comphelper_inc \ + cppu_inc \ + cppuhelper_inc \ + sot_inc \ + tools_inc \ + unotools_inc \ + xmloff_inc \ +)) + $(eval $(call gb_StaticLibrary_set_include,writerperfect,\ $$(INCLUDE) \ -I$(SRCDIR)/writerperfect/source \ From 5013ebbffdd37a68c49a34e9c1b4e69c36a86912 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Mon, 1 Oct 2012 06:17:06 +0200 Subject: [PATCH 086/863] fix InternalUnoApi IDL deps Change-Id: I02bd49c6f6b252c6797292b8e4a9bc319fe0947e --- solenv/gbuild/InternalUnoApi.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/solenv/gbuild/InternalUnoApi.mk b/solenv/gbuild/InternalUnoApi.mk index 3dd32ee77fb6..8949323b9c12 100644 --- a/solenv/gbuild/InternalUnoApi.mk +++ b/solenv/gbuild/InternalUnoApi.mk @@ -52,7 +52,10 @@ $(call gb_InternalUnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$( $(call gb_InternalUnoApi_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1)_out) $(call gb_InternalUnoApi_get_clean_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_clean_target,$(1)) -$(call gb_UnoApiTarget_get_headers_target,$(1)) : $(gb_Helper_MISCDUMMY) +$(call gb_UnoApiTarget_get_headers_target,$(1)_out) : $(gb_Helper_MISCDUMMY) +$(call gb_UnoApiTarget_get_headers_target,$(1)) : $(call gb_UnoApiTarget_get_headers_target,$(1)_out) +$(call gb_UnoApiTarget_get_external_headers_target,$(1)_out) : $(gb_Helper_MISCDUMMY) +$(call gb_UnoApiTarget_get_external_headers_target,$(1)) : $(call gb_UnoApiTarget_get_external_headers_target,$(1)_out) $(call gb_Deliver_add_deliverable,$(call gb_InternalUnoApi_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)_out),$(1)) @@ -72,8 +75,8 @@ endef define gb_InternalUnoApi__use_api $(call gb_UnoApiHeadersTarget_use_api,$(1),$(2)) -$(call gb_InternalUnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(2)) -$(call gb_UnoApiTarget_get_external_headers_target,$(1)) : $(call gb_UnoApiTarget_get_headers_target,$(2)) +$(call gb_InternalUnoApi_get_target,$(1)_out) : $(call gb_UnoApiTarget_get_target,$(2)) +$(call gb_UnoApiTarget_get_external_headers_target,$(1)_out) : $(call gb_UnoApiTarget_get_headers_target,$(2)) endef From 9516c661e86f99cb625e13fe6e040ae74d66a3dd Mon Sep 17 00:00:00 2001 From: David Tardon Date: Mon, 1 Oct 2012 07:24:16 +0200 Subject: [PATCH 087/863] add saxon to tail_build Change-Id: I01e2b99a2618c3b4e5e80dc9e38652e75ef5217d --- Module_tail_build.mk | 1 + tail_build/prj/build.lst | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Module_tail_build.mk b/Module_tail_build.mk index db82ee13c720..a0c958bd493d 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -124,6 +124,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ salhelper \ sane \ sax \ + $(call gb_Helper_optional,SAXON,saxon) \ sc \ scaddins \ sccomp \ diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index 5e84fda48129..4129e2084473 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon XPDF:xpdf ZLIB:zlib external RHINO:rhino sal solenv soltools NULL +tb tail_build : BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland stax XPDF:xpdf ZLIB:zlib external RHINO:rhino sal solenv soltools NULL tb tail_build\prj nmake - all tb_prj NULL From 1558ee84dce09770ff80ad9984e84d6500b79bf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Mon, 1 Oct 2012 09:42:40 +0100 Subject: [PATCH 088/863] menus are way too wide, wrong checkbox/radiobutton width Change-Id: Ib8f1a21f19812092e2561621909f74fd98af2857 --- vcl/source/window/menu.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index c8f2e9718d51..2920878724bc 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -2254,7 +2254,7 @@ Size Menu::ImplGetNativeCheckAndRadioSize( Window* pWin, long& rCheckHeight, lon ) { rCheckHeight = aNativeBounds.GetHeight(); - nCheckWidth = aNativeBounds.GetWidth(); + nCheckWidth = aNativeContent.GetWidth(); } } if( pWin->IsNativeControlSupported( CTRL_MENU_POPUP, PART_MENU_ITEM_RADIO_MARK ) ) @@ -2270,7 +2270,7 @@ Size Menu::ImplGetNativeCheckAndRadioSize( Window* pWin, long& rCheckHeight, lon ) { rRadioHeight = aNativeBounds.GetHeight(); - nRadioWidth = aNativeBounds.GetWidth(); + nRadioWidth = aNativeContent.GetWidth(); } } } From 91f02521b827bf51f04befd45c51736fe4072fba Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 28 Sep 2012 17:45:21 +0200 Subject: [PATCH 089/863] fdo#52475 fix import of RTF_CHCBPAT with value 0 0 means auto, and for fdo#50539, this value was ignored. However a next sample shows that we should send something to the dmapper: COL_AUTO. Change-Id: I8d7d35125c9027dfb45288bbfbfa81ba4799e78d --- sw/qa/extras/rtfimport/data/fdo52475.rtf | 5 +++++ sw/qa/extras/rtfimport/rtfimport.cxx | 9 +++++++++ writerfilter/source/rtftok/rtfdocumentimpl.cxx | 3 +-- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 sw/qa/extras/rtfimport/data/fdo52475.rtf diff --git a/sw/qa/extras/rtfimport/data/fdo52475.rtf b/sw/qa/extras/rtfimport/data/fdo52475.rtf new file mode 100644 index 000000000000..fe4a557d77ca --- /dev/null +++ b/sw/qa/extras/rtfimport/data/fdo52475.rtf @@ -0,0 +1,5 @@ +{\rtf1 +{\colortbl;\red228\green228\blue228;} +before \chcbpat1 highlighted\chcbpat0 after +\par +} diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 61813f1c5555..997e33db4c0e 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -108,6 +108,7 @@ public: void testInk(); void testFdo52389(); void testFdo49655(); + void testFdo52475(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) && !defined(WNT) @@ -159,6 +160,7 @@ public: CPPUNIT_TEST(testInk); CPPUNIT_TEST(testFdo52389); CPPUNIT_TEST(testFdo49655); + CPPUNIT_TEST(testFdo52475); #endif CPPUNIT_TEST_SUITE_END(); @@ -843,6 +845,13 @@ void Test::testFdo49655() CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount()); } +void Test::testFdo52475() +{ + // The problem was that \chcbpat0 resulted in no color, instead of COL_AUTO. + load("fdo52475.rtf"); + CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), getProperty(getRun(getParagraph(1), 3), "CharBackColor")); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 5e3365431b5b..d56307fbe803 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2566,9 +2566,8 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) m_aDefaultState.aCharacterSprms.set(NS_sprm::LN_CLidBi, pIntValue); break; case RTF_CHCBPAT: - if (nParam) { - RTFValue::Pointer_t pValue(new RTFValue(getColorTable(nParam))); + RTFValue::Pointer_t pValue(new RTFValue(nParam ? getColorTable(nParam) : COL_AUTO)); lcl_putNestedAttribute(m_aStates.top().aCharacterSprms, NS_sprm::LN_CShd, NS_ooxml::LN_CT_Shd_fill, pValue); } break; From 585ad1cde03c395c056ff7aa4a8c814242150679 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Mon, 1 Oct 2012 11:43:05 +0200 Subject: [PATCH 090/863] Revert "take out @PLATFORM@ from extension ID" This reverts commit 21a82f4f91eb9940e5dd01c75e2f68721a431f09. --- sdext/CustomTarget_presenter.mk | 41 +++++++++++++++++++ sdext/Extension_presenter.mk | 4 +- sdext/Module_sdext.mk | 1 + sdext/source/minimizer/description.xml | 2 +- sdext/source/pdfimport/description.xml | 2 +- sdext/source/presenter/description.xml | 2 +- .../com.sun.PresenterScreen/presenter.xhp | 2 +- 7 files changed, 48 insertions(+), 6 deletions(-) create mode 100644 sdext/CustomTarget_presenter.mk diff --git a/sdext/CustomTarget_presenter.mk b/sdext/CustomTarget_presenter.mk new file mode 100644 index 000000000000..afecd49f763a --- /dev/null +++ b/sdext/CustomTarget_presenter.mk @@ -0,0 +1,41 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_CustomTarget_CustomTarget,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)) + +$(call gb_CustomTarget_get_target,sdext/source/presenter/help/en-US/com.sun.PresenterScreen) : \ + $(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)/presenter.xhp + +include $(SRCDIR)/sdext/platform.mk + +$(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)/presenter.xhp : \ + $(SRCDIR)/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp \ + | $(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)/.dir + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1) + sed "s/PLATFORMID/$(sdext_PLATFORM)/" < $< > $@ + +# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/sdext/Extension_presenter.mk b/sdext/Extension_presenter.mk index 771f8d6f178c..66f93a8f2a81 100644 --- a/sdext/Extension_presenter.mk +++ b/sdext/Extension_presenter.mk @@ -141,9 +141,9 @@ $(eval $(call gb_Extension_add_files,presenter-screen,registry/data/org/openoffi $(call gb_XcuDataTarget_get_target,sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu) \ )) -$(eval $(call gb_Extension_add_helpfile,presenter-screen,$(SRCDIR)/sdext/source/presenter/help/en-US,com.sun.PresenterScreen/presenter.xhp,com.sun.PresenterScreen/presenter.xhp)) +$(eval $(call gb_Extension_add_helpfile,presenter-screen,$(WORKDIR)/CustomTarget/sdext/source/presenter/help/en-US,com.sun.PresenterScreen-$(sdext_PLATFORM)/presenter.xhp,com.sun.PresenterScreen/presenter.xhp)) -$(eval $(call gb_Extension_add_helptreefile,presenter-screen,$(SRCDIR)/sdext/source/presenter/help/en-US,/help.tree,com.sun.PresenterScreen/help.tree,com.sun.PresenterScreen)) +$(eval $(call gb_Extension_add_helptreefile,presenter-screen,$(SRCDIR)/sdext/source/presenter/help/en-US,/help.tree,com.sun.PresenterScreen/help.tree,com.sun.PresenterScreen-$(sdext_PLATFORM))) diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk index 0ab6444d1a3a..7bba9d936232 100644 --- a/sdext/Module_sdext.mk +++ b/sdext/Module_sdext.mk @@ -56,6 +56,7 @@ endif ifeq ($(ENABLE_PRESENTER_SCREEN),YES) $(eval $(call gb_Module_add_targets,sdext,\ Configuration_presenter \ + CustomTarget_presenter \ Extension_presenter \ Library_presenter \ Rdb_presenter \ diff --git a/sdext/source/minimizer/description.xml b/sdext/source/minimizer/description.xml index 2ef926854bbe..f071a0622ecf 100644 --- a/sdext/source/minimizer/description.xml +++ b/sdext/source/minimizer/description.xml @@ -5,7 +5,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dep="http://openoffice.org/extensions/description/2006"> - + diff --git a/sdext/source/pdfimport/description.xml b/sdext/source/pdfimport/description.xml index 893f62a8cd06..08160046f0fd 100644 --- a/sdext/source/pdfimport/description.xml +++ b/sdext/source/pdfimport/description.xml @@ -4,7 +4,7 @@ xmlns="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dep="http://openoffice.org/extensions/description/2006"> - + diff --git a/sdext/source/presenter/description.xml b/sdext/source/presenter/description.xml index 8be0767c95e7..be71e449113f 100644 --- a/sdext/source/presenter/description.xml +++ b/sdext/source/presenter/description.xml @@ -5,7 +5,7 @@ xmlns:dep="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink"> - + diff --git a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp index c57997175a92..1c07357eac78 100644 --- a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp +++ b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp @@ -34,7 +34,7 @@ Presenter Console Keyboard Shortcuts - /com.sun.PresenterScreen/presenter.xhp + /com.sun.PresenterScreen-PLATFORMID/presenter.xhp From a900a4d70bb465e24c49a0183c60087328860e83 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 1 Oct 2012 11:46:24 +0200 Subject: [PATCH 091/863] Fail early if getPackageLocation fails; plus clean-up Change-Id: Ifa7d589e7854fed9cd9ca2a3f3c987179b60199f --- sdext/source/pdfimport/wrapper/wrapper.cxx | 33 ++++++++++------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx index 2d76fff27419..77ce15bf531e 100644 --- a/sdext/source/pdfimport/wrapper/wrapper.cxx +++ b/sdext/source/pdfimport/wrapper/wrapper.cxx @@ -44,7 +44,7 @@ #include "com/sun/star/io/XInputStream.hpp" #include "com/sun/star/uno/XComponentContext.hpp" #include "com/sun/star/awt/FontDescriptor.hpp" -#include "com/sun/star/deployment/XPackageInformationProvider.hpp" +#include "com/sun/star/deployment/PackageInformationProvider.hpp" #include "com/sun/star/beans/XMaterialHolder.hpp" #include "com/sun/star/rendering/PathCapType.hpp" #include "com/sun/star/rendering/PathJoinType.hpp" @@ -999,24 +999,21 @@ bool xpdf_ImportFromFile( const ::rtl::OUString& rUR if( checkEncryption( aSysUPath, xIHdl, aPwd, bIsEncrypted, aDocName ) == false ) return false; - rtl::OUStringBuffer converterURL = rtl::OUString("xpdfimport"); - - // retrieve package location url (xpdfimport executable is located there) - // --------------------------------------------------- - uno::Reference xProvider( - xContext->getValueByName( - rtl::OUString("/singletons/com.sun.star.deployment.PackageInformationProvider")), - uno::UNO_QUERY); - if( xProvider.is() ) - { - converterURL.insert( - 0, - rtl::OUString("/")); - converterURL.insert( - 0, - xProvider->getPackageLocation( - rtl::OUString::createFromAscii(PDFI_IMPL_IDENTIFIER))); + // Retrieve package location URL, xpdfimport executable is located there: + OUString location( + deployment::PackageInformationProvider::get(xContext)-> + getPackageLocation(PDFI_IMPL_IDENTIFIER)); + if (location.isEmpty()) { + SAL_WARN( + "sdext.pdfimport", + "getPackageLocation(" PDFI_IMPL_IDENTIFIER ") failed"); + return false; } + rtl::OUStringBuffer converterURL(location); + if (!location.endsWith("/")) { + converterURL.append('/'); + } + converterURL.append("xpdfimport"); // spawn separate process to keep LGPL/GPL code apart. // --------------------------------------------------- From 11b2959680a219b1bb608806159a8da8f5f4b810 Mon Sep 17 00:00:00 2001 From: Takeshi Abe Date: Sat, 29 Sep 2012 08:33:27 +0900 Subject: [PATCH 092/863] use "LibreOffice" as the default value of ProductKey for crashrep Change-Id: I12bab12ad32f4965b55d94dfd2d6fe8894129763 Reviewed-on: https://gerrit.libreoffice.org/721 Reviewed-by: Michael Stahl Tested-by: Michael Stahl --- crashrep/source/win32/soreport.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crashrep/source/win32/soreport.cpp b/crashrep/source/win32/soreport.cpp index daedb6290212..0721950393c4 100644 --- a/crashrep/source/win32/soreport.cpp +++ b/crashrep/source/win32/soreport.cpp @@ -2226,7 +2226,7 @@ static bool ReadBootstrapParams( CrashReportParams &rParams ) GetPrivateProfileString( TEXT("Bootstrap"), TEXT("ProductKey"), - TEXT("OpenOffice.org"), + TEXT("LibreOffice"), szBuffer, SAL_N_ELEMENTS(szBuffer), szModuleName ) From 8c089f59b83a80aa5c2c5cba8e9cf7bfbaf426a9 Mon Sep 17 00:00:00 2001 From: Korrawit Pruegsanusak Date: Sat, 29 Sep 2012 11:29:56 +0700 Subject: [PATCH 093/863] configure.in: edit message checking for new GStreamer 1.0 to not duplicate the message checking for old one and be consistent with the help message in AS_HELP_STRING Change-Id: I91e0a5ed0e2278de013d7872eadc6f93b970c231 Reviewed-on: https://gerrit.libreoffice.org/722 Reviewed-by: Michael Stahl Tested-by: Michael Stahl --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 7c7ce66297b6..906c530da25a 100644 --- a/configure.in +++ b/configure.in @@ -9519,7 +9519,7 @@ ENABLE_GSTREAMER="" if test "$build_gstreamer" = "yes"; then - AC_MSG_CHECKING([whether to enable the GStreamer avmedia backend]) + AC_MSG_CHECKING([whether to enable the new GStreamer 1.0 avmedia backend]) if test "x$enable_gstreamer" != "xno"; then ENABLE_GSTREAMER="TRUE" AC_MSG_RESULT([yes]) From 69222d71221d0ec81a3dbf01789456bcf2dde0da Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 1 Oct 2012 11:06:53 +0300 Subject: [PATCH 094/863] Deduplication of TemplatePopup_Impl for disable-dynlinking Change-Id: I3e49ab8bd3411be8fcfa7ab43b50cbb2d82b6de0 --- sd/source/ui/app/tmplctrl.cxx | 12 ++++++------ sw/source/ui/utlui/tmplctrl.cxx | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx index 3978631d5425..63abbc568437 100644 --- a/sd/source/ui/app/tmplctrl.cxx +++ b/sd/source/ui/app/tmplctrl.cxx @@ -31,12 +31,12 @@ SFX_IMPL_STATUSBAR_CONTROL( SdTemplateControl, SfxStringItem ); -// class TemplatePopup_Impl -------------------------------------------------- +// class SdTemplatePopup_Impl -------------------------------------------------- -class TemplatePopup_Impl : public PopupMenu +class SdTemplatePopup_Impl : public PopupMenu { public: - TemplatePopup_Impl(); + SdTemplatePopup_Impl(); sal_uInt16 GetCurId() const { return nCurId; } @@ -48,7 +48,7 @@ private: // ----------------------------------------------------------------------- -TemplatePopup_Impl::TemplatePopup_Impl() : +SdTemplatePopup_Impl::SdTemplatePopup_Impl() : PopupMenu(), nCurId(USHRT_MAX) { @@ -56,7 +56,7 @@ TemplatePopup_Impl::TemplatePopup_Impl() : // ----------------------------------------------------------------------- -void TemplatePopup_Impl::Select() +void SdTemplatePopup_Impl::Select() { nCurId = GetCurItemId(); } @@ -114,7 +114,7 @@ void SdTemplateControl::Command( const CommandEvent& rCEvt ) return; CaptureMouse(); - TemplatePopup_Impl aPop; + SdTemplatePopup_Impl aPop; { const sal_uInt16 nMasterCount = pDoc->GetMasterSdPageCount(PK_STANDARD); diff --git a/sw/source/ui/utlui/tmplctrl.cxx b/sw/source/ui/utlui/tmplctrl.cxx index b43d9c682f80..fba6dd705351 100644 --- a/sw/source/ui/utlui/tmplctrl.cxx +++ b/sw/source/ui/utlui/tmplctrl.cxx @@ -36,12 +36,12 @@ SFX_IMPL_STATUSBAR_CONTROL( SwTemplateControl, SfxStringItem ); -// class TemplatePopup_Impl -------------------------------------------------- +// class SwTemplatePopup_Impl -------------------------------------------------- -class TemplatePopup_Impl : public PopupMenu +class SwTemplatePopup_Impl : public PopupMenu { public: - TemplatePopup_Impl(); + SwTemplatePopup_Impl(); sal_uInt16 GetCurId() const { return nCurId; } @@ -51,13 +51,13 @@ private: virtual void Select(); }; -TemplatePopup_Impl::TemplatePopup_Impl() : +SwTemplatePopup_Impl::SwTemplatePopup_Impl() : PopupMenu(), nCurId(USHRT_MAX) { } -void TemplatePopup_Impl::Select() +void SwTemplatePopup_Impl::Select() { nCurId = GetCurItemId(); } @@ -98,7 +98,7 @@ void SwTemplateControl::Command( const CommandEvent& rCEvt ) GetStatusBar().GetItemText( GetId() ).Len() ) { CaptureMouse(); - TemplatePopup_Impl aPop; + SwTemplatePopup_Impl aPop; { SwView* pView = ::GetActiveView(); SwWrtShell* pWrtShell; From eef8ae7c3f52027476ca440586c0f65b6a174b78 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 1 Oct 2012 11:22:51 +0300 Subject: [PATCH 095/863] Prefixify lotuswordpro Change-Id: I9b30477d94995adef51a76bdf298d1815f511e9e --- lotuswordpro/source/filter/genericfilter.cxx | 2 +- lotuswordpro/util/lwpfilter.component | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lotuswordpro/source/filter/genericfilter.cxx b/lotuswordpro/source/filter/genericfilter.cxx index 1a374720c460..8708ae2cd958 100644 --- a/lotuswordpro/source/filter/genericfilter.cxx +++ b/lotuswordpro/source/filter/genericfilter.cxx @@ -16,7 +16,7 @@ using namespace ::com::sun::star::registry; extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL lotuswordpro_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/lotuswordpro/util/lwpfilter.component b/lotuswordpro/util/lwpfilter.component index 030c75992ff6..4989843c49c6 100644 --- a/lotuswordpro/util/lwpfilter.component +++ b/lotuswordpro/util/lwpfilter.component @@ -1,5 +1,5 @@ - From 88dd328e140b4f72eb9972e52b9fd05a5b856edb Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 1 Oct 2012 11:24:22 +0300 Subject: [PATCH 096/863] Prefixify svgfilter Change-Id: Ifd34a186cd25bafbfd49dad8a1d5bd30756d83d3 --- filter/source/svg/svgfilter.component | 2 +- filter/source/svg/svgfilter.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/filter/source/svg/svgfilter.component b/filter/source/svg/svgfilter.component index c4d5bffa0f37..f99b514e2919 100644 --- a/filter/source/svg/svgfilter.component +++ b/filter/source/svg/svgfilter.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx index 0187a902b7fc..ea25cdddf954 100644 --- a/filter/source/svg/svgfilter.cxx +++ b/filter/source/svg/svgfilter.cxx @@ -302,7 +302,7 @@ namespace sdecl = comphelper::service_decl; "com.sun.star.document.ExtendedTypeDetection" ); // The C shared lib entry points -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL svgfilter_component_getFactory( sal_Char const* pImplName, ::com::sun::star::lang::XMultiServiceFactory* pServiceManager, ::com::sun::star::registry::XRegistryKey* pRegistryKey ) From abba52d57f4a49d56edf0ba0d48073933b1af50f Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 1 Oct 2012 11:24:37 +0300 Subject: [PATCH 097/863] Prefixify t602filter Change-Id: I652ffdf009f6078c723a0f0932256adb183e7513 --- filter/source/t602/filterenv.cxx | 4 ++++ filter/source/t602/t602filter.component | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/filter/source/t602/filterenv.cxx b/filter/source/t602/filterenv.cxx index a8046326b978..1963ddba8635 100644 --- a/filter/source/t602/filterenv.cxx +++ b/filter/source/t602/filterenv.cxx @@ -44,6 +44,10 @@ using namespace T602ImportFilter; extern "C" { +#ifdef DISABLE_DYNLOADING +#define component_getFactory t602filter_component_getFactory +#endif + SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ ) { diff --git a/filter/source/t602/t602filter.component b/filter/source/t602/t602filter.component index fe512bf483ca..cb36327882da 100644 --- a/filter/source/t602/t602filter.component +++ b/filter/source/t602/t602filter.component @@ -26,7 +26,7 @@ * **********************************************************************--> - From 14d9d74717d999aae9d4ffb1e8c2e6369fef69fa Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 1 Oct 2012 11:26:25 +0300 Subject: [PATCH 098/863] Deduplication of lcl_HasOnlyControls for disable-dynlinking Change-Id: I56a9da0493fdbee7bff4d342d5e29a83ce289530 --- sc/source/ui/app/drwtrans.cxx | 2 +- sd/source/ui/app/sdxfer.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index a5137b913a1e..a78afe7bd998 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -281,7 +281,7 @@ ScDrawTransferObj* ScDrawTransferObj::GetOwnClipboard( Window* ) return pObj; } -sal_Bool lcl_HasOnlyControls( SdrModel* pModel ) +static sal_Bool lcl_HasOnlyControls( SdrModel* pModel ) { sal_Bool bOnlyControls = false; // default if there are no objects diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index 353709c35d54..8653fc6f546d 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -356,7 +356,7 @@ void SdTransferable::CreateData() // ----------------------------------------------------------------------------- -sal_Bool lcl_HasOnlyControls( SdrModel* pModel ) +static sal_Bool lcl_HasOnlyControls( SdrModel* pModel ) { sal_Bool bOnlyControls = sal_False; // default if there are no objects From f1d9c520a2a2df5bdbb02fff7ba8f3a134dfc32d Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 1 Oct 2012 11:29:42 +0300 Subject: [PATCH 099/863] Deduplication of NavigationOrderAccess for disable-dynlinking Change-Id: I70238711222a12cb6bd843ebbc742a21a325810d --- sd/source/ui/unoidl/unopage.cxx | 18 +++++++++--------- xmloff/source/draw/ximppage.cxx | 16 ++++++++-------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index fcdae15a7cda..614cb88c4593 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -2602,10 +2602,10 @@ void SdGenericDrawPage::setNavigationOrder( const Any& rValue ) throw IllegalArgumentException(); } -class NavigationOrderAccess : public ::cppu::WeakImplHelper1< XIndexAccess > +class SdNavigationOrderAccess : public ::cppu::WeakImplHelper1< XIndexAccess > { public: - NavigationOrderAccess( SdrPage* pPage ); + SdNavigationOrderAccess( SdrPage* pPage ); // XIndexAccess virtual sal_Int32 SAL_CALL getCount( ) throw (RuntimeException); @@ -2619,7 +2619,7 @@ private: std::vector< Reference< XShape > > maShapes; }; -NavigationOrderAccess::NavigationOrderAccess( SdrPage* pPage ) +SdNavigationOrderAccess::SdNavigationOrderAccess( SdrPage* pPage ) : maShapes( static_cast< sal_uInt32 >( pPage ? pPage->GetObjCount() : 0 ) ) { if( pPage ) @@ -2630,19 +2630,19 @@ NavigationOrderAccess::NavigationOrderAccess( SdrPage* pPage ) { SdrObject* pObj = pPage->GetObj( nIndex ); sal_uInt32 nNavPos = pObj->GetNavigationPosition(); - DBG_ASSERT( !maShapes[nNavPos].is(), "sd::NavigationOrderAccess::NavigationOrderAccess(), duplicate navigation positions from core!" ); + DBG_ASSERT( !maShapes[nNavPos].is(), "sd::SdNavigationOrderAccess::SdNavigationOrderAccess(), duplicate navigation positions from core!" ); maShapes[nNavPos] = Reference< XShape >( pObj->getUnoShape(), UNO_QUERY ); } } } // XIndexAccess -sal_Int32 SAL_CALL NavigationOrderAccess::getCount( ) throw (RuntimeException) +sal_Int32 SAL_CALL SdNavigationOrderAccess::getCount( ) throw (RuntimeException) { return static_cast< sal_Int32 >( maShapes.size() ); } -Any SAL_CALL NavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException) +Any SAL_CALL SdNavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException) { if( (Index < 0) || (Index > getCount()) ) throw IndexOutOfBoundsException(); @@ -2651,12 +2651,12 @@ Any SAL_CALL NavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (IndexOu } // XElementAccess -Type SAL_CALL NavigationOrderAccess::getElementType( ) throw (RuntimeException) +Type SAL_CALL SdNavigationOrderAccess::getElementType( ) throw (RuntimeException) { return XShape::static_type(); } -sal_Bool SAL_CALL NavigationOrderAccess::hasElements( ) throw (RuntimeException) +sal_Bool SAL_CALL SdNavigationOrderAccess::hasElements( ) throw (RuntimeException) { return maShapes.empty() ? sal_False : sal_True; } @@ -2665,7 +2665,7 @@ Any SdGenericDrawPage::getNavigationOrder() { if( GetPage()->HasObjectNavigationOrder() ) { - return Any( Reference< XIndexAccess >( new NavigationOrderAccess( GetPage() ) ) ); + return Any( Reference< XIndexAccess >( new SdNavigationOrderAccess( GetPage() ) ) ); } else { diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx index 9346e6aefb3e..7e57d11df8a8 100644 --- a/xmloff/source/draw/ximppage.cxx +++ b/xmloff/source/draw/ximppage.cxx @@ -563,10 +563,10 @@ void SdXMLGenericPageContext::SetPageMaster( OUString& rsPageMasterName ) } } -class NavigationOrderAccess : public ::cppu::WeakImplHelper1< XIndexAccess > +class XoNavigationOrderAccess : public ::cppu::WeakImplHelper1< XIndexAccess > { public: - NavigationOrderAccess( std::vector< Reference< XShape > >& rShapes ); + XoNavigationOrderAccess( std::vector< Reference< XShape > >& rShapes ); // XIndexAccess virtual sal_Int32 SAL_CALL getCount( ) throw (RuntimeException); @@ -580,18 +580,18 @@ private: std::vector< Reference< XShape > > maShapes; }; -NavigationOrderAccess::NavigationOrderAccess( std::vector< Reference< XShape > >& rShapes ) +XoNavigationOrderAccess::XoNavigationOrderAccess( std::vector< Reference< XShape > >& rShapes ) { maShapes.swap( rShapes ); } // XIndexAccess -sal_Int32 SAL_CALL NavigationOrderAccess::getCount( ) throw (RuntimeException) +sal_Int32 SAL_CALL XoNavigationOrderAccess::getCount( ) throw (RuntimeException) { return static_cast< sal_Int32 >( maShapes.size() ); } -Any SAL_CALL NavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException) +Any SAL_CALL XoNavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException) { if( (Index < 0) || (Index > getCount()) ) throw IndexOutOfBoundsException(); @@ -600,12 +600,12 @@ Any SAL_CALL NavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (IndexOu } // XElementAccess -Type SAL_CALL NavigationOrderAccess::getElementType( ) throw (RuntimeException) +Type SAL_CALL XoNavigationOrderAccess::getElementType( ) throw (RuntimeException) { return XShape::static_type(); } -sal_Bool SAL_CALL NavigationOrderAccess::hasElements( ) throw (RuntimeException) +sal_Bool SAL_CALL XoNavigationOrderAccess::hasElements( ) throw (RuntimeException) { return maShapes.empty() ? sal_False : sal_True; } @@ -640,7 +640,7 @@ void SdXMLGenericPageContext::SetNavigationOrder() } Reference< XPropertySet > xSet( mxShapes, UNO_QUERY_THROW ); - xSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "NavigationOrder" ) ), Any( Reference< XIndexAccess >( new NavigationOrderAccess( aShapes ) ) ) ); + xSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "NavigationOrder" ) ), Any( Reference< XIndexAccess >( new XoNavigationOrderAccess( aShapes ) ) ) ); } catch(const uno::Exception&) { From 5b14ebdda30a3900537f2bc5f5ec876f7c5d5efa Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 1 Oct 2012 11:30:15 +0300 Subject: [PATCH 100/863] Deduplication of ImplGetSupportedMacroItems for disable-dynlinking Change-Id: If6fb0a2152041f65d2e4b38dfbf87491b323f28f --- svx/source/unodraw/unomod.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index 47c96c889917..b07ee322bad9 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -106,7 +106,7 @@ public: }; //-//////////////////////////////////////////////////////////////////// -const SvEventDescription* ImplGetSupportedMacroItems() +static const SvEventDescription* ImplGetSupportedMacroItems() { static const SvEventDescription aMacroDescriptionsImpl[] = { From a24a6a41c60740e2ebd1df14d055f7c37af8f21b Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 1 Oct 2012 11:30:38 +0300 Subject: [PATCH 101/863] Deduplication of aEmptyStr for disable-dynlinking Change-Id: I9525be3b0f238abb106b1c57549436272e1eb165 --- sd/source/ui/view/viewshe2.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index c1ce1e5e27f3..4c4a06a86656 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -85,7 +85,9 @@ using namespace com::sun::star; +#ifndef DISABLE_DYNLOADING // otherwise use the one in sw... const String aEmptyStr; +#endif namespace sd { From a07a4688d10737bd88d89ef38e12bc9b6074ffea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20N=C3=A9meth?= Date: Sat, 29 Sep 2012 00:05:34 +0200 Subject: [PATCH 102/863] Add back compatible Hungarian date format acceptance Change-Id: I6b6d62cda241250db89cdcabaa04952d36e1acfd Reviewed-on: https://gerrit.libreoffice.org/720 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens --- i18npool/source/localedata/data/hu_HU.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/i18npool/source/localedata/data/hu_HU.xml b/i18npool/source/localedata/data/hu_HU.xml index 2345e313377b..2b5d5ba3c12e 100644 --- a/i18npool/source/localedata/data/hu_HU.xml +++ b/i18npool/source/localedata/data/hu_HU.xml @@ -52,6 +52,8 @@ metric + M-D + M.D Standard From 256344d507dbcc22e1e371b8061ad5cfdf21cf98 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 1 Oct 2012 13:29:38 +0300 Subject: [PATCH 103/863] Prefixify textfd Change-Id: I42c9166dcf6d256d071a3edb20ab64184fef1f89 --- filter/source/textfilterdetect/fdcomp.cxx | 2 +- filter/source/textfilterdetect/textfd.component | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/filter/source/textfilterdetect/fdcomp.cxx b/filter/source/textfilterdetect/fdcomp.cxx index 6be78b323702..85b9f3b8362a 100644 --- a/filter/source/textfilterdetect/fdcomp.cxx +++ b/filter/source/textfilterdetect/fdcomp.cxx @@ -44,7 +44,7 @@ using namespace ::com::sun::star::registry; extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL textfd_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ ) { void* pRet = NULL; diff --git a/filter/source/textfilterdetect/textfd.component b/filter/source/textfilterdetect/textfd.component index e1708e772e72..d2d333abebbe 100644 --- a/filter/source/textfilterdetect/textfd.component +++ b/filter/source/textfilterdetect/textfd.component @@ -28,7 +28,7 @@ * instead of those above. **************************************************************************--> - From 8e01b2aca4aad3c4f366b3f8d385b3dbe9aaa886 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Mon, 1 Oct 2012 12:51:27 +0100 Subject: [PATCH 104/863] fdo#54940 - fix last small ergonomic issue. Change-Id: I305bf537a203389321aa0e0efc1ce3d9654dd4aa --- sc/source/ui/view/cellsh1.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index e9211c109d8a..bd8f75acd89f 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -2061,7 +2061,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) const ScConditionalFormat* pCondFormat = pDoc->GetCondFormat(aPos.Col(), aPos.Row(), aPos.Tab()); if(pCondFormat) { - pDlg = pFact->CreateScCondFormatDlg( pTabViewShell->GetDialogParent(), pDoc, pCondFormat, pCondFormat->GetRange(), pCondFormat->GetRange().GetTopLeftCorner(), RID_SCDLG_CONDFORMAT ); + pDlg = pFact->CreateScCondFormatDlg( pTabViewShell->GetDialogParent(), pDoc, pCondFormat, pCondFormat->GetRange(), aPos, RID_SCDLG_CONDFORMAT ); } else { From 37a2fa5d5a58628d317a2305965863dfe50f140e Mon Sep 17 00:00:00 2001 From: Anurag Jain Date: Mon, 1 Oct 2012 14:10:03 +0200 Subject: [PATCH 105/863] fdo#51304: Remove the author of some java source files This patch remove some '@author' for Java souce files, and removes some commented code founded when removing the '@author'. Change-Id: Ic4fcd028a9cdbd85c693d93bcd48e41f36386d22 --- .../src/com/actionbarsherlock/ActionBarSherlock.java | 2 -- .../DocumentLoader/src/com/polites/android/Animation.java | 4 ---- .../DocumentLoader/src/com/polites/android/Animator.java | 5 ----- .../src/com/polites/android/FlingAnimation.java | 4 ---- .../src/com/polites/android/FlingAnimationListener.java | 5 ----- .../src/com/polites/android/GestureImageViewListener.java | 4 ---- .../src/com/polites/android/MoveAnimation.java | 5 ----- .../src/com/polites/android/MoveAnimationListener.java | 5 ----- .../src/com/polites/android/ZoomAnimation.java | 5 ----- .../src/com/polites/android/ZoomAnimationListener.java | 5 ----- .../TextturePage/src/libreoffice/android/ui/Mesh.java | 5 +---- .../src/com/polites/android/Animation.java | 4 ---- .../src/com/polites/android/Animator.java | 5 ----- .../src/com/polites/android/FlingAnimation.java | 4 ---- .../src/com/polites/android/FlingAnimationListener.java | 5 ----- .../src/com/polites/android/FlingListener.java | 5 ----- .../src/com/polites/android/GestureImageViewListener.java | 4 ---- .../src/com/polites/android/MoveAnimation.java | 5 ----- .../src/com/polites/android/MoveAnimationListener.java | 5 ----- .../src/com/polites/android/ZoomAnimation.java | 5 ----- .../src/com/polites/android/ZoomAnimationListener.java | 5 ----- .../impressremote/communication/BluetoothClient.java | 4 +--- .../org/libreoffice/impressremote/communication/Client.java | 4 +--- .../impressremote/communication/NetworkClient.java | 4 +--- .../impressremote/communication/Transmitter.java | 4 +--- android/sdremote/src/pl/polidea/coverflow/CoverFlow.java | 3 +-- .../src/pl/polidea/coverflow/ReflectingImageAdapter.java | 3 --- comphelper/qa/complex/comphelper/Map.java | 2 -- .../sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java | 4 ---- .../star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java | 4 ---- .../com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java | 5 ----- .../com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java | 4 ---- .../star/sdbcx/comp/hsqldb/StorageNativeInputStream.java | 4 ---- .../star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java | 4 ---- connectivity/org/hsqldb/lib/FileSystemRuntimeException.java | 4 +--- .../qa/complex/connectivity/hsqldb/DatabaseMetaData.java | 4 ---- .../qa/complex/connectivity/hsqldb/TestCacheSize.java | 1 - connectivity/qa/connectivity/tools/AbstractDatabase.java | 4 ---- connectivity/qa/connectivity/tools/DatabaseAccess.java | 4 ---- connectivity/qa/connectivity/tools/HsqlDatabase.java | 4 ---- embeddedobj/test/Container1/NativeView.java | 1 - filter/qa/complex/filter/misc/TypeDetection6FileFormat.java | 4 ---- .../xsltfilter/com/sun/star/comp/xsltfilter/Base64.java | 2 -- forms/qa/integration/forms/BooleanValidator.java | 4 ---- forms/qa/integration/forms/CellBinding.java | 4 ---- forms/qa/integration/forms/ImageComparison.java | 4 ---- forms/qa/integration/forms/SpreadsheetDocument.java | 4 ---- forms/qa/integration/forms/SpreadsheetView.java | 4 ---- forms/qa/org/openoffice/complex/forms/tools/ResultSet.java | 4 ---- forms/qa/org/openoffice/xforms/Instance.java | 4 ---- forms/qa/org/openoffice/xforms/Model.java | 4 ---- forms/qa/org/openoffice/xforms/XMLDocument.java | 4 ---- .../lib/uno/adapter/ByteArrayToXInputStreamAdapter.java | 5 ----- .../lib/uno/adapter/XInputStreamToInputStreamAdapter.java | 2 -- .../lib/uno/adapter/XOutputStreamToByteArrayAdapter.java | 5 ----- .../lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java | 2 -- javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java | 2 -- jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java | 1 - .../sun/star/comp/connections/ConstantInstanceProvider.java | 1 - jurt/com/sun/star/comp/connections/PipedConnection.java | 1 - jurt/com/sun/star/comp/loader/FactoryHelper.java | 1 - jurt/com/sun/star/comp/loader/JavaLoader.java | 1 - jurt/com/sun/star/comp/servicemanager/ServiceManager.java | 3 --- jurt/com/sun/star/comp/urlresolver/UrlResolver.java | 1 - jurt/com/sun/star/lib/connections/pipe/PipeConnection.java | 1 - .../sun/star/lib/connections/socket/SocketConnection.java | 1 - .../lib/uno/bridges/java_remote/java_remote_bridge.java | 1 - .../com/sun/star/lib/uno/environments/remote/IReceiver.java | 1 - .../sun/star/lib/uno/environments/remote/IThreadPool.java | 2 -- .../star/lib/uno/environments/remote/JavaThreadPool.java | 1 - jurt/com/sun/star/lib/uno/environments/remote/Job.java | 1 - jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java | 1 - jurt/com/sun/star/uno/Ascii.java | 1 - jurt/com/sun/star/uno/AsciiString.java | 1 - odk/examples/DevelopersGuide/Charts/CalcHelper.java | 5 ++--- odk/examples/DevelopersGuide/Charts/ChartHelper.java | 5 ++--- odk/examples/DevelopersGuide/Charts/ChartInCalc.java | 5 ++--- odk/examples/DevelopersGuide/Charts/ChartInDraw.java | 5 ++--- odk/examples/DevelopersGuide/Charts/ChartInWriter.java | 1 - odk/examples/DevelopersGuide/Charts/Helper.java | 5 ++--- .../DevelopersGuide/Charts/ListenAtCalcRangeInDraw.java | 1 - .../DevelopersGuide/Charts/SelectionChangeListener.java | 2 -- .../Thumbs/org/openoffice/comp/test/ImageShrink.java | 6 ------ odk/examples/DevelopersGuide/Config/ConfigExamples.java | 4 +--- odk/examples/DevelopersGuide/Database/OpenQuery.java | 4 ---- odk/examples/DevelopersGuide/Drawing/ChangeOrderDemo.java | 4 +--- .../DevelopersGuide/Drawing/ControlAndSelectDemo.java | 1 - odk/examples/DevelopersGuide/Drawing/CustomShowDemo.java | 4 +--- odk/examples/DevelopersGuide/Drawing/DrawViewDemo.java | 4 +--- odk/examples/DevelopersGuide/Drawing/DrawingDemo.java | 4 +--- .../DevelopersGuide/Drawing/FillAndLineStyleDemo.java | 4 +--- odk/examples/DevelopersGuide/Drawing/GluePointDemo.java | 4 +--- odk/examples/DevelopersGuide/Drawing/GraphicExportDemo.java | 4 +--- odk/examples/DevelopersGuide/Drawing/LayerDemo.java | 4 +--- .../DevelopersGuide/Drawing/ObjectTransformationDemo.java | 4 +--- odk/examples/DevelopersGuide/Drawing/Organigram.java | 4 ---- odk/examples/DevelopersGuide/Drawing/PresentationDemo.java | 4 +--- odk/examples/DevelopersGuide/Drawing/StyleDemo.java | 4 +--- odk/examples/DevelopersGuide/Drawing/TextDemo.java | 4 +--- .../DevelopersGuide/FirstSteps/FirstLoadComponent.java | 5 ----- .../DevelopersGuide/FirstSteps/HelloTextTableShape.java | 4 ---- odk/examples/DevelopersGuide/Forms/BooleanValidator.java | 4 ---- odk/examples/DevelopersGuide/Forms/ControlValidation.java | 4 ---- odk/examples/DevelopersGuide/Forms/ControlValidator.java | 6 ++---- odk/examples/DevelopersGuide/Forms/DateValidator.java | 5 ----- odk/examples/DevelopersGuide/Forms/FormLayer.java | 4 ---- odk/examples/DevelopersGuide/Forms/HsqlDatabase.java | 4 ---- .../DevelopersGuide/Forms/ListSelectionValidator.java | 4 ---- odk/examples/DevelopersGuide/Forms/NumericValidator.java | 6 ------ .../DevelopersGuide/Forms/SingleControlValidation.java | 4 ---- odk/examples/DevelopersGuide/Forms/SpreadsheetDocument.java | 4 ---- odk/examples/DevelopersGuide/Forms/SpreadsheetView.java | 4 ---- odk/examples/DevelopersGuide/Forms/TextValidator.java | 5 ----- odk/examples/DevelopersGuide/Forms/TimeValidator.java | 5 ----- .../OfficeDev/DesktopEnvironment/CustomizeView.java | 1 - .../DevelopersGuide/OfficeDev/DesktopEnvironment/Desk.java | 1 - .../OfficeDev/DesktopEnvironment/DocumentView.java | 1 - .../OfficeDev/DesktopEnvironment/FunctionHelper.java | 2 -- .../OfficeDev/DesktopEnvironment/IOnewayLink.java | 1 - .../OfficeDev/DesktopEnvironment/IShutdownListener.java | 1 - .../OfficeDev/DesktopEnvironment/Interceptor.java | 2 -- .../OfficeDev/DesktopEnvironment/NativeView.java | 1 - .../OfficeDev/DesktopEnvironment/OfficeConnect.java | 1 - .../OfficeDev/DesktopEnvironment/OnewayExecutor.java | 1 - .../OfficeDev/DesktopEnvironment/StatusListener.java | 1 - .../OfficeDev/DesktopEnvironment/StatusView.java | 1 - .../OfficeDev/DesktopEnvironment/ViewContainer.java | 1 - .../OfficeDev/DisableCommands/DisableCommandsTest.java | 2 -- odk/examples/DevelopersGuide/OfficeDev/Number_Formats.java | 1 - odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java | 1 - .../OfficeDev/PathSettings/PathSettingsTest.java | 2 -- .../OfficeDev/PathSubstitution/PathSubstitutionTest.java | 3 --- .../OfficeDev/TerminationTest/TerminateListener.java | 4 ---- .../OfficeDev/TerminationTest/TerminationTest.java | 4 ---- odk/examples/DevelopersGuide/Text/TextDocuments.java | 4 ---- odk/examples/java/Inspector/MethodParametersDialog.java | 3 --- odk/examples/java/Inspector/XTreePathProvider.java | 4 ---- odk/examples/java/Spreadsheet/ChartTypeChange.java | 1 - 138 files changed, 32 insertions(+), 421 deletions(-) diff --git a/android/abs-lib/src/com/actionbarsherlock/ActionBarSherlock.java b/android/abs-lib/src/com/actionbarsherlock/ActionBarSherlock.java index 8340fb591bf8..8b5eebfc9e47 100755 --- a/android/abs-lib/src/com/actionbarsherlock/ActionBarSherlock.java +++ b/android/abs-lib/src/com/actionbarsherlock/ActionBarSherlock.java @@ -35,8 +35,6 @@ import com.actionbarsherlock.view.MenuItem; *

This class will manage interaction with a custom action bar based on the * Android 4.0 source code. The exposed API mirrors that of its native * counterpart and you should refer to its documentation for instruction.

- * - * @author Jake Wharton */ public abstract class ActionBarSherlock { protected static final String TAG = "ActionBarSherlock"; diff --git a/android/experimental/DocumentLoader/src/com/polites/android/Animation.java b/android/experimental/DocumentLoader/src/com/polites/android/Animation.java index 993620893f91..a0d218b1e552 100644 --- a/android/experimental/DocumentLoader/src/com/polites/android/Animation.java +++ b/android/experimental/DocumentLoader/src/com/polites/android/Animation.java @@ -15,10 +15,6 @@ */ package com.polites.android; -/** - * @author Jason Polites - * - */ public interface Animation { /** diff --git a/android/experimental/DocumentLoader/src/com/polites/android/Animator.java b/android/experimental/DocumentLoader/src/com/polites/android/Animator.java index fb0728b7bf13..6fc82f127503 100644 --- a/android/experimental/DocumentLoader/src/com/polites/android/Animator.java +++ b/android/experimental/DocumentLoader/src/com/polites/android/Animator.java @@ -15,11 +15,6 @@ */ package com.polites.android; - -/** - * @author Jason Polites - * - */ public class Animator extends Thread { private GestureImageView view; diff --git a/android/experimental/DocumentLoader/src/com/polites/android/FlingAnimation.java b/android/experimental/DocumentLoader/src/com/polites/android/FlingAnimation.java index 3124b6201464..9afd54969b50 100644 --- a/android/experimental/DocumentLoader/src/com/polites/android/FlingAnimation.java +++ b/android/experimental/DocumentLoader/src/com/polites/android/FlingAnimation.java @@ -15,10 +15,6 @@ */ package com.polites.android; -/** - * @author Jason Polites - * - */ public class FlingAnimation implements Animation { private float velocityX; diff --git a/android/experimental/DocumentLoader/src/com/polites/android/FlingAnimationListener.java b/android/experimental/DocumentLoader/src/com/polites/android/FlingAnimationListener.java index b9611d51c040..8f0dd3d77e79 100644 --- a/android/experimental/DocumentLoader/src/com/polites/android/FlingAnimationListener.java +++ b/android/experimental/DocumentLoader/src/com/polites/android/FlingAnimationListener.java @@ -15,11 +15,6 @@ */ package com.polites.android; - -/** - * @author Jason Polites - * - */ public interface FlingAnimationListener { public void onMove(float x, float y); diff --git a/android/experimental/DocumentLoader/src/com/polites/android/GestureImageViewListener.java b/android/experimental/DocumentLoader/src/com/polites/android/GestureImageViewListener.java index 4a52358216d5..487620a7c225 100644 --- a/android/experimental/DocumentLoader/src/com/polites/android/GestureImageViewListener.java +++ b/android/experimental/DocumentLoader/src/com/polites/android/GestureImageViewListener.java @@ -15,10 +15,6 @@ */ package com.polites.android; -/** - * @author jasonpolites - * - */ public interface GestureImageViewListener { public void onTouch(float x, float y); diff --git a/android/experimental/DocumentLoader/src/com/polites/android/MoveAnimation.java b/android/experimental/DocumentLoader/src/com/polites/android/MoveAnimation.java index 5303d646672b..8cdebb61838a 100644 --- a/android/experimental/DocumentLoader/src/com/polites/android/MoveAnimation.java +++ b/android/experimental/DocumentLoader/src/com/polites/android/MoveAnimation.java @@ -15,11 +15,6 @@ */ package com.polites.android; - -/** - * @author Jason Polites - * - */ public class MoveAnimation implements Animation { private boolean firstFrame = true; diff --git a/android/experimental/DocumentLoader/src/com/polites/android/MoveAnimationListener.java b/android/experimental/DocumentLoader/src/com/polites/android/MoveAnimationListener.java index a19a265e5844..4574caa3a938 100644 --- a/android/experimental/DocumentLoader/src/com/polites/android/MoveAnimationListener.java +++ b/android/experimental/DocumentLoader/src/com/polites/android/MoveAnimationListener.java @@ -15,11 +15,6 @@ */ package com.polites.android; - -/** - * @author Jason Polites - * - */ public interface MoveAnimationListener { public void onMove(float x, float y); diff --git a/android/experimental/DocumentLoader/src/com/polites/android/ZoomAnimation.java b/android/experimental/DocumentLoader/src/com/polites/android/ZoomAnimation.java index 673b7f9cb148..c709a1b7b513 100644 --- a/android/experimental/DocumentLoader/src/com/polites/android/ZoomAnimation.java +++ b/android/experimental/DocumentLoader/src/com/polites/android/ZoomAnimation.java @@ -17,11 +17,6 @@ package com.polites.android; import android.graphics.PointF; - -/** - * @author Jason Polites - * - */ public class ZoomAnimation implements Animation { private boolean firstFrame = true; diff --git a/android/experimental/DocumentLoader/src/com/polites/android/ZoomAnimationListener.java b/android/experimental/DocumentLoader/src/com/polites/android/ZoomAnimationListener.java index 8df4bf641952..21b6ec9a6fb0 100644 --- a/android/experimental/DocumentLoader/src/com/polites/android/ZoomAnimationListener.java +++ b/android/experimental/DocumentLoader/src/com/polites/android/ZoomAnimationListener.java @@ -15,11 +15,6 @@ */ package com.polites.android; - -/** - * @author Jason Polites - * - */ public interface ZoomAnimationListener { public void onZoom(float scale, float x, float y); public void onComplete(); diff --git a/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/src/libreoffice/android/ui/Mesh.java b/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/src/libreoffice/android/ui/Mesh.java index 5f3229119bcd..d747e2ebf138 100644 --- a/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/src/libreoffice/android/ui/Mesh.java +++ b/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/src/libreoffice/android/ui/Mesh.java @@ -30,9 +30,6 @@ import android.util.Log; /** * Mesh is a base class for 3D objects making it easier to create and maintain * new primitives. - * - * @author Per-Erik Bergman (per-erik.bergman@jayway.com) - * */ public class Mesh { // Our vertex buffer. @@ -259,4 +256,4 @@ public class Mesh { GLUtils.texImage2D(GL10.GL_TEXTURE_2D, 0, mBitmap, 0); Log.d("gl-load-texture", Integer.toString(mTextureId) ); } -} \ No newline at end of file +} diff --git a/android/experimental/LibreOffice4Android/src/com/polites/android/Animation.java b/android/experimental/LibreOffice4Android/src/com/polites/android/Animation.java index 993620893f91..a0d218b1e552 100644 --- a/android/experimental/LibreOffice4Android/src/com/polites/android/Animation.java +++ b/android/experimental/LibreOffice4Android/src/com/polites/android/Animation.java @@ -15,10 +15,6 @@ */ package com.polites.android; -/** - * @author Jason Polites - * - */ public interface Animation { /** diff --git a/android/experimental/LibreOffice4Android/src/com/polites/android/Animator.java b/android/experimental/LibreOffice4Android/src/com/polites/android/Animator.java index fb0728b7bf13..6fc82f127503 100644 --- a/android/experimental/LibreOffice4Android/src/com/polites/android/Animator.java +++ b/android/experimental/LibreOffice4Android/src/com/polites/android/Animator.java @@ -15,11 +15,6 @@ */ package com.polites.android; - -/** - * @author Jason Polites - * - */ public class Animator extends Thread { private GestureImageView view; diff --git a/android/experimental/LibreOffice4Android/src/com/polites/android/FlingAnimation.java b/android/experimental/LibreOffice4Android/src/com/polites/android/FlingAnimation.java index 3124b6201464..9afd54969b50 100644 --- a/android/experimental/LibreOffice4Android/src/com/polites/android/FlingAnimation.java +++ b/android/experimental/LibreOffice4Android/src/com/polites/android/FlingAnimation.java @@ -15,10 +15,6 @@ */ package com.polites.android; -/** - * @author Jason Polites - * - */ public class FlingAnimation implements Animation { private float velocityX; diff --git a/android/experimental/LibreOffice4Android/src/com/polites/android/FlingAnimationListener.java b/android/experimental/LibreOffice4Android/src/com/polites/android/FlingAnimationListener.java index b9611d51c040..8f0dd3d77e79 100644 --- a/android/experimental/LibreOffice4Android/src/com/polites/android/FlingAnimationListener.java +++ b/android/experimental/LibreOffice4Android/src/com/polites/android/FlingAnimationListener.java @@ -15,11 +15,6 @@ */ package com.polites.android; - -/** - * @author Jason Polites - * - */ public interface FlingAnimationListener { public void onMove(float x, float y); diff --git a/android/experimental/LibreOffice4Android/src/com/polites/android/FlingListener.java b/android/experimental/LibreOffice4Android/src/com/polites/android/FlingListener.java index ab3007a14b00..cf6f45bc2875 100644 --- a/android/experimental/LibreOffice4Android/src/com/polites/android/FlingListener.java +++ b/android/experimental/LibreOffice4Android/src/com/polites/android/FlingListener.java @@ -18,11 +18,6 @@ package com.polites.android; import android.view.GestureDetector.SimpleOnGestureListener; import android.view.MotionEvent; - -/** - * @author Jason Polites - * - */ public class FlingListener extends SimpleOnGestureListener { private float velocityX; diff --git a/android/experimental/LibreOffice4Android/src/com/polites/android/GestureImageViewListener.java b/android/experimental/LibreOffice4Android/src/com/polites/android/GestureImageViewListener.java index 4a52358216d5..487620a7c225 100644 --- a/android/experimental/LibreOffice4Android/src/com/polites/android/GestureImageViewListener.java +++ b/android/experimental/LibreOffice4Android/src/com/polites/android/GestureImageViewListener.java @@ -15,10 +15,6 @@ */ package com.polites.android; -/** - * @author jasonpolites - * - */ public interface GestureImageViewListener { public void onTouch(float x, float y); diff --git a/android/experimental/LibreOffice4Android/src/com/polites/android/MoveAnimation.java b/android/experimental/LibreOffice4Android/src/com/polites/android/MoveAnimation.java index 5303d646672b..8cdebb61838a 100644 --- a/android/experimental/LibreOffice4Android/src/com/polites/android/MoveAnimation.java +++ b/android/experimental/LibreOffice4Android/src/com/polites/android/MoveAnimation.java @@ -15,11 +15,6 @@ */ package com.polites.android; - -/** - * @author Jason Polites - * - */ public class MoveAnimation implements Animation { private boolean firstFrame = true; diff --git a/android/experimental/LibreOffice4Android/src/com/polites/android/MoveAnimationListener.java b/android/experimental/LibreOffice4Android/src/com/polites/android/MoveAnimationListener.java index a19a265e5844..4574caa3a938 100644 --- a/android/experimental/LibreOffice4Android/src/com/polites/android/MoveAnimationListener.java +++ b/android/experimental/LibreOffice4Android/src/com/polites/android/MoveAnimationListener.java @@ -15,11 +15,6 @@ */ package com.polites.android; - -/** - * @author Jason Polites - * - */ public interface MoveAnimationListener { public void onMove(float x, float y); diff --git a/android/experimental/LibreOffice4Android/src/com/polites/android/ZoomAnimation.java b/android/experimental/LibreOffice4Android/src/com/polites/android/ZoomAnimation.java index 673b7f9cb148..c709a1b7b513 100644 --- a/android/experimental/LibreOffice4Android/src/com/polites/android/ZoomAnimation.java +++ b/android/experimental/LibreOffice4Android/src/com/polites/android/ZoomAnimation.java @@ -17,11 +17,6 @@ package com.polites.android; import android.graphics.PointF; - -/** - * @author Jason Polites - * - */ public class ZoomAnimation implements Animation { private boolean firstFrame = true; diff --git a/android/experimental/LibreOffice4Android/src/com/polites/android/ZoomAnimationListener.java b/android/experimental/LibreOffice4Android/src/com/polites/android/ZoomAnimationListener.java index 8df4bf641952..21b6ec9a6fb0 100644 --- a/android/experimental/LibreOffice4Android/src/com/polites/android/ZoomAnimationListener.java +++ b/android/experimental/LibreOffice4Android/src/com/polites/android/ZoomAnimationListener.java @@ -15,11 +15,6 @@ */ package com.polites.android; - -/** - * @author Jason Polites - * - */ public interface ZoomAnimationListener { public void onZoom(float scale, float x, float y); public void onComplete(); diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java index ba8cc9887a7a..f7846b01bfdd 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java +++ b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java @@ -21,8 +21,6 @@ import android.support.v4.content.LocalBroadcastManager; /** * Standard Network client. Connects to a server using Sockets. - * - * @author Andrzej J.R. Hunt */ public class BluetoothClient extends Client { @@ -88,4 +86,4 @@ public class BluetoothClient extends Client { } } -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ \ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/Client.java b/android/sdremote/src/org/libreoffice/impressremote/communication/Client.java index 5e6a50b937f1..4f90eb246091 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/communication/Client.java +++ b/android/sdremote/src/org/libreoffice/impressremote/communication/Client.java @@ -22,8 +22,6 @@ import android.content.Intent; * transport medium you must provide input and output streams ( * mInputStream and mOutputStream before calling any * methods. - * - * @author Andrzej J.R. Hunt */ public abstract class Client { @@ -139,4 +137,4 @@ public abstract class Client { } } -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ \ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/NetworkClient.java b/android/sdremote/src/org/libreoffice/impressremote/communication/NetworkClient.java index ff49a537a567..3da51544d3a1 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/communication/NetworkClient.java +++ b/android/sdremote/src/org/libreoffice/impressremote/communication/NetworkClient.java @@ -22,8 +22,6 @@ import android.support.v4.content.LocalBroadcastManager; /** * Standard Network client. Connects to a server using Sockets. - * - * @author Andrzej J.R. Hunt */ public class NetworkClient extends Client { @@ -133,4 +131,4 @@ public class NetworkClient extends Client { } } -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ \ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/Transmitter.java b/android/sdremote/src/org/libreoffice/impressremote/communication/Transmitter.java index 1a9560456f92..480324e64fb5 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/communication/Transmitter.java +++ b/android/sdremote/src/org/libreoffice/impressremote/communication/Transmitter.java @@ -12,8 +12,6 @@ import android.graphics.Color; /** * Interface to send commands to the server. - * - * @author Andrzej J.R. Hunt */ public class Transmitter { @@ -68,4 +66,4 @@ public class Transmitter { mClient.sendCommand("presentation_stop\n\n"); } } -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ \ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/android/sdremote/src/pl/polidea/coverflow/CoverFlow.java b/android/sdremote/src/pl/polidea/coverflow/CoverFlow.java index 88f0da6d3623..1328d45294f2 100644 --- a/android/sdremote/src/pl/polidea/coverflow/CoverFlow.java +++ b/android/sdremote/src/pl/polidea/coverflow/CoverFlow.java @@ -16,7 +16,6 @@ * This code is base on the Android Gallery widget and was Created * by Neil Davies neild001 'at' gmail dot com to be a Coverflow widget * - * @author Neil Davies */ package pl.polidea.coverflow; @@ -385,4 +384,4 @@ public class CoverFlow extends Gallery { } } -} \ No newline at end of file +} diff --git a/android/sdremote/src/pl/polidea/coverflow/ReflectingImageAdapter.java b/android/sdremote/src/pl/polidea/coverflow/ReflectingImageAdapter.java index f16c11259da4..009a69b34ccb 100644 --- a/android/sdremote/src/pl/polidea/coverflow/ReflectingImageAdapter.java +++ b/android/sdremote/src/pl/polidea/coverflow/ReflectingImageAdapter.java @@ -32,9 +32,6 @@ import android.graphics.Shader.TileMode; /** * This adapter provides reflected images from linked adapter. - * - * @author potiuk - * */ public class ReflectingImageAdapter extends AbstractCoverFlowImageAdapter { diff --git a/comphelper/qa/complex/comphelper/Map.java b/comphelper/qa/complex/comphelper/Map.java index d64834797623..84304d2f87bf 100644 --- a/comphelper/qa/complex/comphelper/Map.java +++ b/comphelper/qa/complex/comphelper/Map.java @@ -52,8 +52,6 @@ import org.openoffice.test.OfficeConnection; import static org.junit.Assert.*; /** complex test case for the css.container.Map implementation - * - * @author frank.schoenheit@sun.com */ public class Map /* extends complexlib.ComplexTestCase */ { diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java index 7b546f402e15..62e17e252a2c 100644 --- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java +++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java @@ -23,10 +23,6 @@ package com.sun.star.sdbcx.comp.hsqldb; -/** - * - * @author Ocke - */ public class NativeInputStreamHelper extends java.io.InputStream{ private String key; private String file; diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java index 53fc9126c69f..922e7111355a 100644 --- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java +++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java @@ -24,10 +24,6 @@ package com.sun.star.sdbcx.comp.hsqldb; -/** - * - * @author oj93728 - */ public class NativeOutputStreamHelper extends java.io.OutputStream{ private String key; diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java index dee7a3564aeb..2c0e616ae3da 100644 --- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java +++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java @@ -23,11 +23,6 @@ package com.sun.star.sdbcx.comp.hsqldb; -/** - * - * @author oj93728 - */ - public class NativeStorageAccess { static { NativeLibraries.load(); } diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java index 89fd15e920ff..71629ec9f561 100644 --- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java +++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java @@ -25,10 +25,6 @@ package com.sun.star.sdbcx.comp.hsqldb; import org.hsqldb.lib.FileAccess; import org.hsqldb.lib.FileSystemRuntimeException; -/** - * - * @author oj93728 - */ public class StorageFileAccess implements org.hsqldb.lib.FileAccess{ static { NativeLibraries.load(); } diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java index b40f5f6eda7f..bea6af9375d7 100644 --- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java +++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java @@ -23,10 +23,6 @@ package com.sun.star.sdbcx.comp.hsqldb; -/** - * - * @author Ocke - */ public class StorageNativeInputStream { static { NativeLibraries.load(); } diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java index 445669a16c10..de22fc41922c 100644 --- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java +++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java @@ -24,10 +24,6 @@ package com.sun.star.sdbcx.comp.hsqldb; -/** - * - * @author oj93728 - */ public class StorageNativeOutputStream { static { NativeLibraries.load(); } diff --git a/connectivity/org/hsqldb/lib/FileSystemRuntimeException.java b/connectivity/org/hsqldb/lib/FileSystemRuntimeException.java index f38fdfec9029..5830d5eb48f2 100644 --- a/connectivity/org/hsqldb/lib/FileSystemRuntimeException.java +++ b/connectivity/org/hsqldb/lib/FileSystemRuntimeException.java @@ -26,8 +26,6 @@ package org.hsqldb.lib; /** is a RuntimeException which indicates failure during basic IO * operations in a FileAccess implementation. * - * @author frank.schoenheit@sun.com - * * @version 1.8.0.8 * @since 1.8.0.8 */ @@ -61,4 +59,4 @@ public class FileSystemRuntimeException extends java.lang.RuntimeException { public final int getErrorCode() { return errorCode; } -} \ No newline at end of file +} diff --git a/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java b/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java index a07b0e5d0c3b..65bf5cfb4e72 100644 --- a/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java +++ b/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java @@ -22,10 +22,6 @@ * Created on June 23, 2003, 3:19 PM */ -/** - * - * @author oj93728 - */ package complex.connectivity.hsqldb; import complex.connectivity.HsqlDriverTest; import java.sql.*; diff --git a/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java b/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java index 3fd7388368fe..6fa5bafa026f 100644 --- a/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java +++ b/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java @@ -62,7 +62,6 @@ import com.sun.star.sdbc.*; * * This test now incorporates the defunct TestTextTables * - * @author fredt@users * @version 1.7.2 * @since 1.7.0 */ diff --git a/connectivity/qa/connectivity/tools/AbstractDatabase.java b/connectivity/qa/connectivity/tools/AbstractDatabase.java index c3895081f51f..28d05dd7c73d 100644 --- a/connectivity/qa/connectivity/tools/AbstractDatabase.java +++ b/connectivity/qa/connectivity/tools/AbstractDatabase.java @@ -32,10 +32,6 @@ import com.sun.star.util.CloseVetoException; import connectivity.tools.sdb.Connection; import java.io.File; -/** - * - * @author oj93728 - */ public abstract class AbstractDatabase implements DatabaseAccess { public AbstractDatabase(final XMultiServiceFactory orb) throws Exception diff --git a/connectivity/qa/connectivity/tools/DatabaseAccess.java b/connectivity/qa/connectivity/tools/DatabaseAccess.java index cf10f06fd994..347faa46e289 100644 --- a/connectivity/qa/connectivity/tools/DatabaseAccess.java +++ b/connectivity/qa/connectivity/tools/DatabaseAccess.java @@ -24,10 +24,6 @@ import com.sun.star.sdb.XOfficeDatabaseDocument; import com.sun.star.sdbc.SQLException; import connectivity.tools.sdb.Connection; -/** - * - * @author oj93728 - */ public interface DatabaseAccess { Connection defaultConnection() throws SQLException; diff --git a/connectivity/qa/connectivity/tools/HsqlDatabase.java b/connectivity/qa/connectivity/tools/HsqlDatabase.java index 851d0e38ac8c..0ea5e0d23725 100644 --- a/connectivity/qa/connectivity/tools/HsqlDatabase.java +++ b/connectivity/qa/connectivity/tools/HsqlDatabase.java @@ -35,10 +35,6 @@ import java.util.Iterator; import java.util.Set; import java.io.File; -/** - * - * @author fs93730 - */ public class HsqlDatabase extends AbstractDatabase { diff --git a/embeddedobj/test/Container1/NativeView.java b/embeddedobj/test/Container1/NativeView.java index 0d41ea3bdf1a..cd3e0f858d91 100644 --- a/embeddedobj/test/Container1/NativeView.java +++ b/embeddedobj/test/Container1/NativeView.java @@ -33,7 +33,6 @@ import java.awt.event.*; * Use JNI functions on already visible canvas objects only! * Otherwise they can make some trouble. * - * @author Andreas Schlüns */ public class NativeView extends java.awt.Canvas diff --git a/filter/qa/complex/filter/misc/TypeDetection6FileFormat.java b/filter/qa/complex/filter/misc/TypeDetection6FileFormat.java index 19c78d0d5f6a..deb1422a28ef 100644 --- a/filter/qa/complex/filter/misc/TypeDetection6FileFormat.java +++ b/filter/qa/complex/filter/misc/TypeDetection6FileFormat.java @@ -38,10 +38,6 @@ import org.openoffice.test.OfficeConnection; import static org.junit.Assert.*; // ------------------------------------------ -/** - * - * @author cn93815 - */ public class TypeDetection6FileFormat { diff --git a/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/Base64.java b/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/Base64.java index 43e3f2525331..0d0f331d3200 100644 --- a/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/Base64.java +++ b/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/Base64.java @@ -98,8 +98,6 @@ package com.sun.star.comp.xsltfilter; * periodically to check for updates or to contribute improvements. *

* - * @author Robert Harder - * @author rob@iharder.net * @version 2.2.2 */ public class Base64 diff --git a/forms/qa/integration/forms/BooleanValidator.java b/forms/qa/integration/forms/BooleanValidator.java index 5b03398ed2f0..d69ee588390d 100644 --- a/forms/qa/integration/forms/BooleanValidator.java +++ b/forms/qa/integration/forms/BooleanValidator.java @@ -24,10 +24,6 @@ package integration.forms; -/** - * - * @author fs93730 - */ public class BooleanValidator extends integration.forms.ControlValidator { private boolean m_preventChecked; diff --git a/forms/qa/integration/forms/CellBinding.java b/forms/qa/integration/forms/CellBinding.java index ea77d0f5a528..7dc9408c011e 100644 --- a/forms/qa/integration/forms/CellBinding.java +++ b/forms/qa/integration/forms/CellBinding.java @@ -38,10 +38,6 @@ import com.sun.star.sheet.XCellRangeFormula; import com.sun.star.table.CellRangeAddress; import com.sun.star.text.XTextRange; -/** - * - * @author fs93730 - */ public class CellBinding extends complexlib.ComplexTestCase { /** the test document our form layer lives in */ diff --git a/forms/qa/integration/forms/ImageComparison.java b/forms/qa/integration/forms/ImageComparison.java index 119039775938..f604fd3e7832 100644 --- a/forms/qa/integration/forms/ImageComparison.java +++ b/forms/qa/integration/forms/ImageComparison.java @@ -24,10 +24,6 @@ package integration.forms; -/** - * - * @author fs93730 - */ public final class ImageComparison implements com.sun.star.awt.XImageConsumer { diff --git a/forms/qa/integration/forms/SpreadsheetDocument.java b/forms/qa/integration/forms/SpreadsheetDocument.java index 8947064dfdee..cd653a773231 100644 --- a/forms/qa/integration/forms/SpreadsheetDocument.java +++ b/forms/qa/integration/forms/SpreadsheetDocument.java @@ -29,10 +29,6 @@ import com.sun.star.sheet.XSpreadsheetDocument; import com.sun.star.sheet.XSpreadsheets; import com.sun.star.beans.NamedValue; -/** - * - * @author fs93730 - */ public class SpreadsheetDocument extends DocumentHelper { /** Creates a new blank spreadsheet document */ diff --git a/forms/qa/integration/forms/SpreadsheetView.java b/forms/qa/integration/forms/SpreadsheetView.java index c4337ea188b0..fd958d5d478f 100644 --- a/forms/qa/integration/forms/SpreadsheetView.java +++ b/forms/qa/integration/forms/SpreadsheetView.java @@ -31,10 +31,6 @@ import com.sun.star.container.*; import integration.forms.DocumentHelper; -/** - * - * @author fs93730 - */ public class SpreadsheetView extends integration.forms.DocumentViewHelper { diff --git a/forms/qa/org/openoffice/complex/forms/tools/ResultSet.java b/forms/qa/org/openoffice/complex/forms/tools/ResultSet.java index df5a2ff5bf58..6bfc7700c26a 100644 --- a/forms/qa/org/openoffice/complex/forms/tools/ResultSet.java +++ b/forms/qa/org/openoffice/complex/forms/tools/ResultSet.java @@ -37,10 +37,6 @@ import com.sun.star.util.Date; import com.sun.star.util.DateTime; import com.sun.star.util.Time; -/** - * - * @author frank.schoenheit@sun.com - */ public class ResultSet implements XResultSet, XRow { private final XResultSet m_resultSet; diff --git a/forms/qa/org/openoffice/xforms/Instance.java b/forms/qa/org/openoffice/xforms/Instance.java index 5e4e04741995..ec99b551296d 100644 --- a/forms/qa/org/openoffice/xforms/Instance.java +++ b/forms/qa/org/openoffice/xforms/Instance.java @@ -11,10 +11,6 @@ import com.sun.star.xml.dom.XNode; import com.sun.star.xml.dom.XNodeList; import java.util.NoSuchElementException; -/** - * - * @author fs93730 - */ public class Instance { private Model m_model; diff --git a/forms/qa/org/openoffice/xforms/Model.java b/forms/qa/org/openoffice/xforms/Model.java index dba329f5e3f9..b96eb9e1d5cb 100644 --- a/forms/qa/org/openoffice/xforms/Model.java +++ b/forms/qa/org/openoffice/xforms/Model.java @@ -29,10 +29,6 @@ import com.sun.star.xforms.XFormsUIHelper1; import com.sun.star.xforms.XModel; import com.sun.star.xml.dom.XNode; -/** encapsulates an XForms model - * - * @author fs93730 - */ public class Model { private XModel m_model; diff --git a/forms/qa/org/openoffice/xforms/XMLDocument.java b/forms/qa/org/openoffice/xforms/XMLDocument.java index c5c153586842..e71e75540c11 100644 --- a/forms/qa/org/openoffice/xforms/XMLDocument.java +++ b/forms/qa/org/openoffice/xforms/XMLDocument.java @@ -35,10 +35,6 @@ import com.sun.star.xforms.XFormsUIHelper1; import com.sun.star.xforms.XModel; import integration.forms.DocumentType; -/** - * - * @author fs93730 - */ public class XMLDocument extends integration.forms.DocumentHelper { private XFormsSupplier m_formsSupplier; diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter.java index f575927d2c1e..1557bfde5a15 100644 --- a/javaunohelper/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter.java +++ b/javaunohelper/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter.java @@ -24,11 +24,6 @@ package com.sun.star.lib.uno.adapter; -/** - * - * @author lo119109 - */ - import com.sun.star.io.XInputStream; import com.sun.star.io.XSeekable; import com.sun.star.lib.uno.helper.ComponentBase; diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java index f78e4a500852..37df094a228b 100644 --- a/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java +++ b/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java @@ -27,8 +27,6 @@ import java.io.InputStream; * InputStream. This allows users to access * an XInputStream as if it were an * InputStream. - * - * @author Brian Cameron */ public class XInputStreamToInputStreamAdapter extends InputStream { diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java index ca401532fc97..c2860db6eadb 100644 --- a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java +++ b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java @@ -24,11 +24,6 @@ package com.sun.star.lib.uno.adapter; -/** - * - * @author lo119109 - */ - import com.sun.star.io.*; import com.sun.star.lib.uno.helper.ComponentBase; diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java index 43cd99e1504a..e5467cb47306 100644 --- a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java +++ b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java @@ -28,8 +28,6 @@ import java.io.OutputStream; * OutputStream. This allows users to access * an XOutputStream as if it were an * OutputStream. - * - * @author Brian Cameron */ public class XOutputStreamToOutputStreamAdapter extends OutputStream { diff --git a/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java b/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java index 844d9e30f579..baeee6049bde 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java +++ b/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java @@ -48,8 +48,6 @@ import java.util.ArrayList; * * UnoUrl url = UnoUrl.parseUnoUrl("socket,host=localhost,port=2002;urp;StarOffice.ServiceManager"); * - * - * @author Joerg Brunsmann */ public class UnoUrl { diff --git a/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java b/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java index b3d5a4dfb494..9d3920e88f1a 100644 --- a/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java +++ b/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java @@ -41,7 +41,6 @@ import com.sun.star.uno.UnoRuntime; *

* This component is only usable for remote bridges. *

- * @author Kay Ramme * @see com.sun.star.uno.UnoRuntime * @since UDK1.0 */ diff --git a/jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java b/jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java index cfc6e15f5e5a..95f3016f5f71 100644 --- a/jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java +++ b/jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java @@ -32,7 +32,6 @@ import com.sun.star.comp.loader.FactoryHelper; * The ConstantInstanceProvider is a component * that implements the XInstanceProvider Interface. *

- * @author Kay Ramme * @see com.sun.star.bridge.XBridge * @see com.sun.star.bridge.XBridgeFactory * @see com.sun.star.bridge.XInstanceProvider diff --git a/jurt/com/sun/star/comp/connections/PipedConnection.java b/jurt/com/sun/star/comp/connections/PipedConnection.java index def2872008e5..12f18957db36 100644 --- a/jurt/com/sun/star/comp/connections/PipedConnection.java +++ b/jurt/com/sun/star/comp/connections/PipedConnection.java @@ -34,7 +34,6 @@ import com.sun.star.registry.XRegistryKey; * It is useful for Thread communication * in one Process. *

- * @author Kay Ramme * @see com.sun.star.connection.XConnection * @see com.sun.star.comp.loader.JavaLoader * @since UDK1.0 diff --git a/jurt/com/sun/star/comp/loader/FactoryHelper.java b/jurt/com/sun/star/comp/loader/FactoryHelper.java index 72ce9171a51e..e035082bef52 100644 --- a/jurt/com/sun/star/comp/loader/FactoryHelper.java +++ b/jurt/com/sun/star/comp/loader/FactoryHelper.java @@ -42,7 +42,6 @@ import com.sun.star.uno.Type; * This class has default implementations for getServiceFactory * and writeRegistryServiceInfo. *

- * @author Kay Ramme * @see com.sun.star.lang.XMultiServiceFactory * @see com.sun.star.lang.XServiceInfo * @see com.sun.star.lang.XSingleServiceFactory diff --git a/jurt/com/sun/star/comp/loader/JavaLoader.java b/jurt/com/sun/star/comp/loader/JavaLoader.java index 73ff9d3f37bf..3656cfed0c46 100644 --- a/jurt/com/sun/star/comp/loader/JavaLoader.java +++ b/jurt/com/sun/star/comp/loader/JavaLoader.java @@ -53,7 +53,6 @@ import com.sun.star.uno.AnyConverter; * service. Therefor the JavaLoader activates external UNO components which are implemented in Java. * The loader is used by the ServiceManger. *

- * @author Markus Herzog * @see com.sun.star.loader.XImplementationLoader * @see com.sun.star.loader.Java * @see com.sun.star.comp.servicemanager.ServiceManager diff --git a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java b/jurt/com/sun/star/comp/servicemanager/ServiceManager.java index cc9b0323e8d8..631d941d3ce0 100644 --- a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java +++ b/jurt/com/sun/star/comp/servicemanager/ServiceManager.java @@ -47,7 +47,6 @@ import com.sun.star.uno.XComponentContext; * calls to the implementing objects and are used instead of casts * and identity comparisons. *

- * @author Markus Herzog * @see com.sun.star.lang.XMultiServiceFactory * @see com.sun.star.container.XSet * @see com.sun.star.container.XContentEnumerationAccess @@ -731,7 +730,6 @@ public class ServiceManager implements XMultiServiceFactory, * implementation of the @see com.sun.star.container.XEnumeration interface. * It is a inner wrapper for a java.util.Enumeration object. *

- * @author Markus Herzog * @see com.sun.star.lang.XSingleServiceFactory * @see com.sun.star.lang.XServiceInfo * @since UDK1.0 @@ -811,7 +809,6 @@ public class ServiceManager implements XMultiServiceFactory, * com.sun.star.lang.XSingleServiceFactory and the com.sun.star.lang.XServiceInfo * interfaces. *

- * @author Markus Herzog * @see com.sun.star.lang.XSingleServiceFactory * @see com.sun.star.lang.XServiceInfo * @since UDK1.0 diff --git a/jurt/com/sun/star/comp/urlresolver/UrlResolver.java b/jurt/com/sun/star/comp/urlresolver/UrlResolver.java index 166007acc13e..9b34e8c29b8b 100644 --- a/jurt/com/sun/star/comp/urlresolver/UrlResolver.java +++ b/jurt/com/sun/star/comp/urlresolver/UrlResolver.java @@ -42,7 +42,6 @@ import com.sun.star.uno.UnoRuntime; /** * This component gives a factory for an UnoUrlResolver service. *

- * @author Kay Ramme * @see com.sun.star.bridge.XBridgeFactory * @see com.sun.star.connection.Connector * @since UDK1.0 diff --git a/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java b/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java index bffe74048766..5f1bcb4a9f24 100644 --- a/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java +++ b/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java @@ -32,7 +32,6 @@ import com.sun.star.lib.util.NativeLibraryLoader; * and is uses by the PipeConnector and the PipeAcceptor. * This class is not part of the provided api. *

- * @author Kay Ramme * @see com.sun.star.lib.connections.pipe.pipeAcceptor * @see com.sun.star.lib.connections.pipe.pipeConnector * @see com.sun.star.connection.XConnection diff --git a/jurt/com/sun/star/lib/connections/socket/SocketConnection.java b/jurt/com/sun/star/lib/connections/socket/SocketConnection.java index 373194d95866..8e878ee83a45 100644 --- a/jurt/com/sun/star/lib/connections/socket/SocketConnection.java +++ b/jurt/com/sun/star/lib/connections/socket/SocketConnection.java @@ -36,7 +36,6 @@ import com.sun.star.io.XStreamListener; * and is uses by the SocketConnector and the SocketAcceptor. * This class is not part of the provided api. *

- * @author Kay Ramme * @see com.sun.star.lib.connections.socket.socketAcceptor * @see com.sun.star.lib.connections.socket.socketConnector * @see com.sun.star.connection.XConnection diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java b/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java index 1174becfb6a2..8fdf9bd3154a 100644 --- a/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java +++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java @@ -69,7 +69,6 @@ import com.sun.star.uno.Any; * The protocol to used is passed by name, the bridge * then looks for it under com.sun.star.lib.uno.protocols. *

- * @author Kay Ramme * @since UDK1.0 */ public class java_remote_bridge diff --git a/jurt/com/sun/star/lib/uno/environments/remote/IReceiver.java b/jurt/com/sun/star/lib/uno/environments/remote/IReceiver.java index 5a045efca68e..c0b06c5a0dea 100644 --- a/jurt/com/sun/star/lib/uno/environments/remote/IReceiver.java +++ b/jurt/com/sun/star/lib/uno/environments/remote/IReceiver.java @@ -21,7 +21,6 @@ package com.sun.star.lib.uno.environments.remote; /** * An abstraction for giving back a reply for a request. * - * @author Kay Ramme * @see com.sun.star.uno.IQueryInterface */ public interface IReceiver { diff --git a/jurt/com/sun/star/lib/uno/environments/remote/IThreadPool.java b/jurt/com/sun/star/lib/uno/environments/remote/IThreadPool.java index 7a2b8f4f3b47..cf73f089c756 100644 --- a/jurt/com/sun/star/lib/uno/environments/remote/IThreadPool.java +++ b/jurt/com/sun/star/lib/uno/environments/remote/IThreadPool.java @@ -22,8 +22,6 @@ package com.sun.star.lib.uno.environments.remote; * This interface is an abstraction of the various * threadpool implementations. *

- * @author Joerg Budischewski - * @author Kay Ramme * @see com.sun.star.lib.uno.environments.remote.ThreadPoolFactory * @see com.sun.star.lib.uno.environments.remote.IThreadPoolFactory * @since UDK1.0 diff --git a/jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPool.java b/jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPool.java index af1e4f2551f2..0b6c8afc0f04 100644 --- a/jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPool.java +++ b/jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPool.java @@ -21,7 +21,6 @@ package com.sun.star.lib.uno.environments.remote; /** * This class implements a java thread pool. *

- * @author Kay Ramme * @see com.sun.star.uno.UnoRuntime * @see com.sun.star.lib.uno.environments.remote.ThreadPool * @see com.sun.star.lib.uno.environments.remote.IThreadPool diff --git a/jurt/com/sun/star/lib/uno/environments/remote/Job.java b/jurt/com/sun/star/lib/uno/environments/remote/Job.java index e95f5f42fd2b..29287190fbf1 100644 --- a/jurt/com/sun/star/lib/uno/environments/remote/Job.java +++ b/jurt/com/sun/star/lib/uno/environments/remote/Job.java @@ -36,7 +36,6 @@ import com.sun.star.uno.XCurrentContext; * The Job is an abstraction for tasks which have to be done * remotely because of a method invocation. *

- * @author Kay Ramme * @see com.sun.star.lib.uno.environments.remote.ThreadId * @see com.sun.star.lib.uno.environments.remote.IReceiver * @since UDK1.0 diff --git a/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java b/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java index f9c3353dd1a4..7aebdfc818a2 100644 --- a/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java +++ b/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java @@ -29,7 +29,6 @@ import com.sun.star.lang.DisposedException; * (put by putjob) into the async queue, which is only * known by the sync queue. *

- * @author Kay Ramme * @see com.sun.star.lib.uno.environments.remote.ThreadPool * @see com.sun.star.lib.uno.environments.remote.Job * @see com.sun.star.lib.uno.environments.remote.ThreadId diff --git a/jurt/com/sun/star/uno/Ascii.java b/jurt/com/sun/star/uno/Ascii.java index 53d8905a797a..09dc8d671e57 100644 --- a/jurt/com/sun/star/uno/Ascii.java +++ b/jurt/com/sun/star/uno/Ascii.java @@ -21,7 +21,6 @@ package com.sun.star.uno; /** * The Ascii class represents the IDL build in type ascii. *

- * @author Markus Meyer * @deprecated do not use */ public final class Ascii { diff --git a/jurt/com/sun/star/uno/AsciiString.java b/jurt/com/sun/star/uno/AsciiString.java index 172054533a26..235547258bf7 100644 --- a/jurt/com/sun/star/uno/AsciiString.java +++ b/jurt/com/sun/star/uno/AsciiString.java @@ -21,7 +21,6 @@ package com.sun.star.uno; /** * The Ascii class represents the IDL build in type asciistring. *

- * @author Markus Meyer * @deprecated do not use */ public final class AsciiString { diff --git a/odk/examples/DevelopersGuide/Charts/CalcHelper.java b/odk/examples/DevelopersGuide/Charts/CalcHelper.java index 9e5f7430fd34..ec0bea5f6306 100644 --- a/odk/examples/DevelopersGuide/Charts/CalcHelper.java +++ b/odk/examples/DevelopersGuide/Charts/CalcHelper.java @@ -60,9 +60,8 @@ import com.sun.star.container.NoSuchElementException; // __________ Implementation __________ -/** Helper for accessing a calc document - @author Björn Milcke - */ +// Helper for accessing a calc document + public class CalcHelper { public CalcHelper( XSpreadsheetDocument aDoc ) diff --git a/odk/examples/DevelopersGuide/Charts/ChartHelper.java b/odk/examples/DevelopersGuide/Charts/ChartHelper.java index da61cb36377e..8f01b52aa426 100644 --- a/odk/examples/DevelopersGuide/Charts/ChartHelper.java +++ b/odk/examples/DevelopersGuide/Charts/ChartHelper.java @@ -57,9 +57,8 @@ import com.sun.star.awt.Size; // __________ Implementation __________ -/** Helper for creating an OLE chart - @author Björn Milcke - */ +// Helper for creating an OLE chart + public class ChartHelper { public ChartHelper( XModel aContainerDoc ) diff --git a/odk/examples/DevelopersGuide/Charts/ChartInCalc.java b/odk/examples/DevelopersGuide/Charts/ChartInCalc.java index 28e6266638fa..f5e4b116ac7d 100644 --- a/odk/examples/DevelopersGuide/Charts/ChartInCalc.java +++ b/odk/examples/DevelopersGuide/Charts/ChartInCalc.java @@ -66,9 +66,8 @@ import com.sun.star.util.MalformedNumberFormatException; // __________ Implementation __________ -/** Create a spreadsheet add some data and add a chart - @author Björn Milcke - */ +// Create a spreadsheet add some data and add a chart + public class ChartInCalc { // ____________________ diff --git a/odk/examples/DevelopersGuide/Charts/ChartInDraw.java b/odk/examples/DevelopersGuide/Charts/ChartInDraw.java index 224997b75e9c..362c1b731c32 100644 --- a/odk/examples/DevelopersGuide/Charts/ChartInDraw.java +++ b/odk/examples/DevelopersGuide/Charts/ChartInDraw.java @@ -56,9 +56,8 @@ import com.sun.star.beans.UnknownPropertyException; // __________ Implementation __________ -/** Create a spreadsheet add some data and add a chart - @author Björn Milcke - */ +// Create a spreadsheet add some data and add a chart + public class ChartInDraw { // ____________________ diff --git a/odk/examples/DevelopersGuide/Charts/ChartInWriter.java b/odk/examples/DevelopersGuide/Charts/ChartInWriter.java index f23a4ea262bc..30ff75a7e060 100644 --- a/odk/examples/DevelopersGuide/Charts/ChartInWriter.java +++ b/odk/examples/DevelopersGuide/Charts/ChartInWriter.java @@ -63,7 +63,6 @@ import com.sun.star.beans.UnknownPropertyException; Thus, you can not activate the chart by double-clicking. The office may also crash when the document is closed! - @author Björn Milcke */ public class ChartInWriter { diff --git a/odk/examples/DevelopersGuide/Charts/Helper.java b/odk/examples/DevelopersGuide/Charts/Helper.java index 928acee220d9..6c7e2c316030 100644 --- a/odk/examples/DevelopersGuide/Charts/Helper.java +++ b/odk/examples/DevelopersGuide/Charts/Helper.java @@ -49,9 +49,8 @@ import com.sun.star.frame.XModel; // __________ Implementation __________ -/** Helper for creating a calc document adding cell values and charts - @author Björn Milcke - */ +// Helper for creating a calc document adding cell values and charts + public class Helper { public Helper( String[] args ) diff --git a/odk/examples/DevelopersGuide/Charts/ListenAtCalcRangeInDraw.java b/odk/examples/DevelopersGuide/Charts/ListenAtCalcRangeInDraw.java index 15484004dc03..27cf351be271 100644 --- a/odk/examples/DevelopersGuide/Charts/ListenAtCalcRangeInDraw.java +++ b/odk/examples/DevelopersGuide/Charts/ListenAtCalcRangeInDraw.java @@ -58,7 +58,6 @@ import com.sun.star.uno.Exception; /** Create a spreadsheet add some data. Create a presentation and add a chart. Connect the chart to a calc range via a listener - @author Björn Milcke */ public class ListenAtCalcRangeInDraw implements XChartDataChangeEventListener { diff --git a/odk/examples/DevelopersGuide/Charts/SelectionChangeListener.java b/odk/examples/DevelopersGuide/Charts/SelectionChangeListener.java index b4ab571d7520..0f55fd1ddf00 100644 --- a/odk/examples/DevelopersGuide/Charts/SelectionChangeListener.java +++ b/odk/examples/DevelopersGuide/Charts/SelectionChangeListener.java @@ -66,8 +66,6 @@ import com.sun.star.awt.XWindow; * * Note: This example does not work in StarOffice 6.0. It will be available * in the StarOffice Accessibility release. - * - * @author Björn Milcke */ public class SelectionChangeListener implements XSelectionChangeListener { public static void main( String args[] ) { diff --git a/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/ImageShrink.java b/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/ImageShrink.java index 7da0e91ec1a7..6482e6e69ff4 100644 --- a/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/ImageShrink.java +++ b/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/ImageShrink.java @@ -41,12 +41,6 @@ package org.openoffice.comp.test; * Created on 4. Mai 2002, 20:25 */ - -/** - * - * @author dschulten - */ - import com.sun.star.lang.XSingleServiceFactory; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.comp.loader.FactoryHelper; diff --git a/odk/examples/DevelopersGuide/Config/ConfigExamples.java b/odk/examples/DevelopersGuide/Config/ConfigExamples.java index 5ea7fee09010..979075e82d52 100644 --- a/odk/examples/DevelopersGuide/Config/ConfigExamples.java +++ b/odk/examples/DevelopersGuide/Config/ConfigExamples.java @@ -67,9 +67,7 @@ import com.sun.star.util.XChangesBatch; import com.sun.star.util.XChangesNotifier; import com.sun.star.util.XChangesListener; import com.sun.star.util.ChangesEvent; -/** Config examples - @author Joerg Barfurth - */ +// Config examples /* These examples show how to use the following features of the Config API: diff --git a/odk/examples/DevelopersGuide/Database/OpenQuery.java b/odk/examples/DevelopersGuide/Database/OpenQuery.java index 1b81ce27ac2a..765079b779b3 100644 --- a/odk/examples/DevelopersGuide/Database/OpenQuery.java +++ b/odk/examples/DevelopersGuide/Database/OpenQuery.java @@ -45,10 +45,6 @@ import com.sun.star.beans.XPropertySet; * Created on 6. Juli 2002, 10:25 */ -/** - * - * @author dschulten - */ public class OpenQuery { private XComponentContext xContext = null; diff --git a/odk/examples/DevelopersGuide/Drawing/ChangeOrderDemo.java b/odk/examples/DevelopersGuide/Drawing/ChangeOrderDemo.java index 7adbd41ba6a0..fd407358a00a 100644 --- a/odk/examples/DevelopersGuide/Drawing/ChangeOrderDemo.java +++ b/odk/examples/DevelopersGuide/Drawing/ChangeOrderDemo.java @@ -51,9 +51,7 @@ import com.sun.star.drawing.XDrawPage; // __________ Implementation __________ -/** ChangeOrderDemo - @author Sven Jacobi - */ +// ChangeOrderDemo public class ChangeOrderDemo { diff --git a/odk/examples/DevelopersGuide/Drawing/ControlAndSelectDemo.java b/odk/examples/DevelopersGuide/Drawing/ControlAndSelectDemo.java index 1628f0c59ff8..2af75e409c63 100644 --- a/odk/examples/DevelopersGuide/Drawing/ControlAndSelectDemo.java +++ b/odk/examples/DevelopersGuide/Drawing/ControlAndSelectDemo.java @@ -60,7 +60,6 @@ import com.sun.star.view.XSelectionSupplier; // __________ Implementation __________ /** ControlAndSelectDemo - @author Sven Jacobi A (GroupBox) ControlShape will be created. Finally the ControlShape will be inserted into a selection. diff --git a/odk/examples/DevelopersGuide/Drawing/CustomShowDemo.java b/odk/examples/DevelopersGuide/Drawing/CustomShowDemo.java index de42d7ce426e..88b09888eab3 100644 --- a/odk/examples/DevelopersGuide/Drawing/CustomShowDemo.java +++ b/odk/examples/DevelopersGuide/Drawing/CustomShowDemo.java @@ -61,9 +61,7 @@ import com.sun.star.presentation.XCustomPresentationSupplier; // __________ Implementation __________ -/** presentation demo - @author Sven Jacobi - */ +// presentation demo // This demo will demonstrate how to create a CustomShow diff --git a/odk/examples/DevelopersGuide/Drawing/DrawViewDemo.java b/odk/examples/DevelopersGuide/Drawing/DrawViewDemo.java index 76cb9572bc3f..41780cfb6786 100644 --- a/odk/examples/DevelopersGuide/Drawing/DrawViewDemo.java +++ b/odk/examples/DevelopersGuide/Drawing/DrawViewDemo.java @@ -53,9 +53,7 @@ import com.sun.star.frame.XController; // __________ Implementation __________ -/** text demo - @author Sven Jacobi - */ +// text demo public class DrawViewDemo { diff --git a/odk/examples/DevelopersGuide/Drawing/DrawingDemo.java b/odk/examples/DevelopersGuide/Drawing/DrawingDemo.java index 78b4b981da7c..15cf5775b12b 100644 --- a/odk/examples/DevelopersGuide/Drawing/DrawingDemo.java +++ b/odk/examples/DevelopersGuide/Drawing/DrawingDemo.java @@ -57,9 +57,7 @@ import java.util.Random; // __________ Implementation __________ -/** drawing demo - @author Sven Jacobi - */ +// drawing demo // This drawing demo will create/load a document, and show how to // handle pages and shapes using the Office API, diff --git a/odk/examples/DevelopersGuide/Drawing/FillAndLineStyleDemo.java b/odk/examples/DevelopersGuide/Drawing/FillAndLineStyleDemo.java index 132338870fee..be32f589106b 100644 --- a/odk/examples/DevelopersGuide/Drawing/FillAndLineStyleDemo.java +++ b/odk/examples/DevelopersGuide/Drawing/FillAndLineStyleDemo.java @@ -53,9 +53,7 @@ import com.sun.star.awt.Size; // __________ Implementation __________ -/** FillStyle and LineStyle demo - @author Sven Jacobi - */ +// FillStyle and LineStyle demo public class FillAndLineStyleDemo { diff --git a/odk/examples/DevelopersGuide/Drawing/GluePointDemo.java b/odk/examples/DevelopersGuide/Drawing/GluePointDemo.java index 2835770e2ae5..4b9b08f07b9b 100644 --- a/odk/examples/DevelopersGuide/Drawing/GluePointDemo.java +++ b/odk/examples/DevelopersGuide/Drawing/GluePointDemo.java @@ -58,9 +58,7 @@ import com.sun.star.drawing.XGluePointsSupplier; // __________ Implementation __________ -/** GluePointDemo - @author Sven Jacobi - */ +// GluePointDemo public class GluePointDemo { diff --git a/odk/examples/DevelopersGuide/Drawing/GraphicExportDemo.java b/odk/examples/DevelopersGuide/Drawing/GraphicExportDemo.java index c470c7cb6f1b..25aa1b3ed771 100644 --- a/odk/examples/DevelopersGuide/Drawing/GraphicExportDemo.java +++ b/odk/examples/DevelopersGuide/Drawing/GraphicExportDemo.java @@ -46,9 +46,7 @@ import com.sun.star.drawing.XDrawPage; // __________ Implementation __________ -/** text demo - @author Sven Jacobi - */ +// text demo public class GraphicExportDemo { diff --git a/odk/examples/DevelopersGuide/Drawing/LayerDemo.java b/odk/examples/DevelopersGuide/Drawing/LayerDemo.java index 005468ed037f..eec7171d5525 100644 --- a/odk/examples/DevelopersGuide/Drawing/LayerDemo.java +++ b/odk/examples/DevelopersGuide/Drawing/LayerDemo.java @@ -57,9 +57,7 @@ import com.sun.star.drawing.XLayerSupplier; // __________ Implementation __________ -/** LayerDemo - @author Sven Jacobi - */ +// LayerDemo public class LayerDemo { diff --git a/odk/examples/DevelopersGuide/Drawing/ObjectTransformationDemo.java b/odk/examples/DevelopersGuide/Drawing/ObjectTransformationDemo.java index 787c0434be7f..4b09ea0ec72b 100644 --- a/odk/examples/DevelopersGuide/Drawing/ObjectTransformationDemo.java +++ b/odk/examples/DevelopersGuide/Drawing/ObjectTransformationDemo.java @@ -52,9 +52,7 @@ import java.awt.geom.AffineTransform; // __________ Implementation __________ -/** ObjectTransformationDemo - @author Sven Jacobi - */ +// ObjectTransformationDemo public class ObjectTransformationDemo { diff --git a/odk/examples/DevelopersGuide/Drawing/Organigram.java b/odk/examples/DevelopersGuide/Drawing/Organigram.java index 03f6e541efc1..5b0bdf0f8b39 100644 --- a/odk/examples/DevelopersGuide/Drawing/Organigram.java +++ b/odk/examples/DevelopersGuide/Drawing/Organigram.java @@ -49,10 +49,6 @@ import com.sun.star.uno.XComponentContext; * Created on 6. Juli 2002, 10:25 */ -/** - * - * @author dschulten - */ public class Organigram { private XComponentContext xRemoteContext = null; diff --git a/odk/examples/DevelopersGuide/Drawing/PresentationDemo.java b/odk/examples/DevelopersGuide/Drawing/PresentationDemo.java index 88c100e877f3..652d8b51a0e8 100644 --- a/odk/examples/DevelopersGuide/Drawing/PresentationDemo.java +++ b/odk/examples/DevelopersGuide/Drawing/PresentationDemo.java @@ -57,9 +57,7 @@ import com.sun.star.presentation.XPresentationSupplier; // __________ Implementation __________ -/** presentation demo - @author Sven Jacobi - */ +// presentation demo // This demo will demonstrate how to create a presentation using the Office API diff --git a/odk/examples/DevelopersGuide/Drawing/StyleDemo.java b/odk/examples/DevelopersGuide/Drawing/StyleDemo.java index 452526c1fcec..6196ad1d0727 100644 --- a/odk/examples/DevelopersGuide/Drawing/StyleDemo.java +++ b/odk/examples/DevelopersGuide/Drawing/StyleDemo.java @@ -58,9 +58,7 @@ import com.sun.star.frame.XModel; // __________ Implementation __________ -/** StyleDemo - @author Sven Jacobi - */ +// StyleDemo public class StyleDemo { diff --git a/odk/examples/DevelopersGuide/Drawing/TextDemo.java b/odk/examples/DevelopersGuide/Drawing/TextDemo.java index 579f2167da09..9d97b0aea29a 100644 --- a/odk/examples/DevelopersGuide/Drawing/TextDemo.java +++ b/odk/examples/DevelopersGuide/Drawing/TextDemo.java @@ -56,9 +56,7 @@ import com.sun.star.style.ParagraphAdjust; // __________ Implementation __________ -/** text demo - @author Sven Jacobi - */ +// text demo public class TextDemo { diff --git a/odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent.java b/odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent.java index 6382c600a143..56a5447853f1 100644 --- a/odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent.java +++ b/odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent.java @@ -190,11 +190,6 @@ public class FirstLoadComponent { // import com.sun.star.uno.AnyConverter; - -// /** -// * -// * @author dschulten -// */ // public class FirstLoadComponent { // /** Creates a new instance of FirstLoadComponent */ diff --git a/odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape.java b/odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape.java index acbf18b32aaa..6d8ebd25fabe 100644 --- a/odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape.java +++ b/odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape.java @@ -58,10 +58,6 @@ import com.sun.star.drawing.XDrawPagesSupplier; import com.sun.star.drawing.XDrawPageSupplier; import com.sun.star.drawing.XDrawPage; -/** - * - * @author dschulten - */ public class HelloTextTableShape { private XComponentContext xRemoteContext = null; diff --git a/odk/examples/DevelopersGuide/Forms/BooleanValidator.java b/odk/examples/DevelopersGuide/Forms/BooleanValidator.java index 84e6a8a90d30..1237f068d2bd 100644 --- a/odk/examples/DevelopersGuide/Forms/BooleanValidator.java +++ b/odk/examples/DevelopersGuide/Forms/BooleanValidator.java @@ -32,10 +32,6 @@ * *************************************************************************/ -/** - * - * @author fs93730 - */ public class BooleanValidator extends ControlValidator { private boolean m_preventChecked; diff --git a/odk/examples/DevelopersGuide/Forms/ControlValidation.java b/odk/examples/DevelopersGuide/Forms/ControlValidation.java index 67d0cec1d255..ea92c1c3ca8f 100644 --- a/odk/examples/DevelopersGuide/Forms/ControlValidation.java +++ b/odk/examples/DevelopersGuide/Forms/ControlValidation.java @@ -18,10 +18,6 @@ import com.sun.star.beans.*; -/** - * - * @author fs@openoffice.org - */ public class ControlValidation extends DocumentBasedExample { /** Creates a new instance of ControlValidation */ diff --git a/odk/examples/DevelopersGuide/Forms/ControlValidator.java b/odk/examples/DevelopersGuide/Forms/ControlValidator.java index a626aba4ee41..a298776526fd 100644 --- a/odk/examples/DevelopersGuide/Forms/ControlValidator.java +++ b/odk/examples/DevelopersGuide/Forms/ControlValidator.java @@ -16,10 +16,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -/** base class for components validating the content of form controls - * - * @author fs@openoffice.org - */ +// base class for components validating the content of form controls + public abstract class ControlValidator implements com.sun.star.form.validation.XValidator { diff --git a/odk/examples/DevelopersGuide/Forms/DateValidator.java b/odk/examples/DevelopersGuide/Forms/DateValidator.java index dc2cd5335833..05803e7a6704 100644 --- a/odk/examples/DevelopersGuide/Forms/DateValidator.java +++ b/odk/examples/DevelopersGuide/Forms/DateValidator.java @@ -17,11 +17,6 @@ */ - -/** - * - * @author fs@openoffice.org - */ public class DateValidator extends ControlValidator { diff --git a/odk/examples/DevelopersGuide/Forms/FormLayer.java b/odk/examples/DevelopersGuide/Forms/FormLayer.java index 58613add913e..1436591292a3 100644 --- a/odk/examples/DevelopersGuide/Forms/FormLayer.java +++ b/odk/examples/DevelopersGuide/Forms/FormLayer.java @@ -30,10 +30,6 @@ import com.sun.star.awt.XControlModel; import com.sun.star.text.TextContentAnchorType; import com.sun.star.drawing.XDrawPage; -/** - * - * @author fs@openoffice.org - */ public class FormLayer { private DocumentHelper m_document; diff --git a/odk/examples/DevelopersGuide/Forms/HsqlDatabase.java b/odk/examples/DevelopersGuide/Forms/HsqlDatabase.java index d967435163a8..01a364c8f3f9 100644 --- a/odk/examples/DevelopersGuide/Forms/HsqlDatabase.java +++ b/odk/examples/DevelopersGuide/Forms/HsqlDatabase.java @@ -35,10 +35,6 @@ import java.io.File; import com.sun.star.util.CloseVetoException; -/** - * - * @author fs93730 - */ public class HsqlDatabase { XComponentContext m_context; diff --git a/odk/examples/DevelopersGuide/Forms/ListSelectionValidator.java b/odk/examples/DevelopersGuide/Forms/ListSelectionValidator.java index ca46ea61c6b6..d8ae2de9a470 100644 --- a/odk/examples/DevelopersGuide/Forms/ListSelectionValidator.java +++ b/odk/examples/DevelopersGuide/Forms/ListSelectionValidator.java @@ -16,10 +16,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -/** - * - * @author fs@openoffice.org - */ public class ListSelectionValidator extends ControlValidator { /** Creates a new instance of ListSelectionValidator */ diff --git a/odk/examples/DevelopersGuide/Forms/NumericValidator.java b/odk/examples/DevelopersGuide/Forms/NumericValidator.java index d12574d847f6..38a9972c7363 100644 --- a/odk/examples/DevelopersGuide/Forms/NumericValidator.java +++ b/odk/examples/DevelopersGuide/Forms/NumericValidator.java @@ -16,12 +16,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - -/** - * - * @author fs@openoffice.org - */ public class NumericValidator extends ControlValidator { diff --git a/odk/examples/DevelopersGuide/Forms/SingleControlValidation.java b/odk/examples/DevelopersGuide/Forms/SingleControlValidation.java index 0d24c6f04465..50b59640fae3 100644 --- a/odk/examples/DevelopersGuide/Forms/SingleControlValidation.java +++ b/odk/examples/DevelopersGuide/Forms/SingleControlValidation.java @@ -21,10 +21,6 @@ import com.sun.star.lang.*; import com.sun.star.beans.*; import com.sun.star.form.validation.*; -/** - * - * @author fs@openoffice.org - */ public class SingleControlValidation implements XFormComponentValidityListener { private DocumentHelper m_document; /// our current test document diff --git a/odk/examples/DevelopersGuide/Forms/SpreadsheetDocument.java b/odk/examples/DevelopersGuide/Forms/SpreadsheetDocument.java index 2e01786c1dc7..c722bf36a894 100644 --- a/odk/examples/DevelopersGuide/Forms/SpreadsheetDocument.java +++ b/odk/examples/DevelopersGuide/Forms/SpreadsheetDocument.java @@ -25,10 +25,6 @@ import com.sun.star.container.XIndexAccess; import com.sun.star.sheet.XSpreadsheetDocument; import com.sun.star.beans.NamedValue; -/** - * - * @author fs93730 - */ public class SpreadsheetDocument extends DocumentHelper { /** Creates a new blank spreadsheet document */ diff --git a/odk/examples/DevelopersGuide/Forms/SpreadsheetView.java b/odk/examples/DevelopersGuide/Forms/SpreadsheetView.java index 84bf52dfebf1..679c520f92c3 100644 --- a/odk/examples/DevelopersGuide/Forms/SpreadsheetView.java +++ b/odk/examples/DevelopersGuide/Forms/SpreadsheetView.java @@ -27,10 +27,6 @@ import com.sun.star.frame.*; import com.sun.star.sheet.*; import com.sun.star.container.*; -/** - * - * @author fs93730 - */ public class SpreadsheetView extends DocumentViewHelper { diff --git a/odk/examples/DevelopersGuide/Forms/TextValidator.java b/odk/examples/DevelopersGuide/Forms/TextValidator.java index a5bfe07f589a..7901d76e2ec0 100644 --- a/odk/examples/DevelopersGuide/Forms/TextValidator.java +++ b/odk/examples/DevelopersGuide/Forms/TextValidator.java @@ -17,11 +17,6 @@ */ - -/** - * - * @author fs@openoffice.org - */ public class TextValidator extends ControlValidator { diff --git a/odk/examples/DevelopersGuide/Forms/TimeValidator.java b/odk/examples/DevelopersGuide/Forms/TimeValidator.java index 61fd89b0b243..81042294441a 100644 --- a/odk/examples/DevelopersGuide/Forms/TimeValidator.java +++ b/odk/examples/DevelopersGuide/Forms/TimeValidator.java @@ -17,11 +17,6 @@ */ - -/** - * - * @author fs@openoffice.org - */ public class TimeValidator extends ControlValidator { diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java index 5b37832d46f2..6a618304de45 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java @@ -41,7 +41,6 @@ import java.awt.event.*; * Makes it possible to change some states of currently loaded * document (e.g. enable/disable menubar, toolbar, objectbar) * - * @author Andreas Schlüns */ public class CustomizeView extends JPanel implements IShutdownListener diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Desk.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Desk.java index 5251eb5a2051..c565fe547698 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Desk.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Desk.java @@ -41,7 +41,6 @@ import java.lang.String; /** * TODO * - * @author Andreas Schlüns */ public class Desk { diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java index 37cc140a3dea..030d70e8da67 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java @@ -56,7 +56,6 @@ import java.awt.event.WindowEvent; * inside the global "ViewContainer" of this java * demo application which holds all opened views alive. * - * @author Andreas Schlüns */ public class DocumentView extends JFrame implements com.sun.star.lang.XEventListener, // react for Frame::disposing() diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java index 31d4522260ff..98480189c3d2 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java @@ -58,8 +58,6 @@ import java.net.*; * There exist some other helper functionality too, which * doesn't use or demonstrate the office api: * (a) getting file names by using a file chosser - * - * @author Andreas Schlüns */ public class FunctionHelper { diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/IOnewayLink.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/IOnewayLink.java index 14a1018bbdf8..180137c9f61c 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/IOnewayLink.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/IOnewayLink.java @@ -45,7 +45,6 @@ import java.util.Vector; * interface. It get the object, which whis to be called back and the type and * parameter of the original request. * - * @author Andreas Schlüns */ public interface IOnewayLink { diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/IShutdownListener.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/IShutdownListener.java index c3b13e71ed20..de9ac9fa43f2 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/IShutdownListener.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/IShutdownListener.java @@ -38,7 +38,6 @@ * Listener interface to get information about application shutdown * if java virtual machine dies. * - * @author Andreas Schlüns */ public interface IShutdownListener { diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java index 7b2aa68a8e96..69e218a25b85 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java @@ -54,8 +54,6 @@ import com.sun.star.uno.UnoRuntime; * synchronous/asynchronous ... normal ones and oneway calls are mixed. * Notifications of listener will be oneway mostly - her reactions can * be synchronous then. => deadlocks are possible - * - * @author Andreas Schlüns */ public class Interceptor implements com.sun.star.frame.XFrameActionListener, com.sun.star.frame.XDispatchProviderInterceptor, diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/NativeView.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/NativeView.java index 307f3e65ca69..1d405b9e62a3 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/NativeView.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/NativeView.java @@ -46,7 +46,6 @@ import java.awt.*; * Use JNI functions on already visible canvas objects only! * Otherwise they can make some trouble. * - * @author Andreas Schlüns */ public class NativeView extends java.awt.Canvas diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OfficeConnect.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OfficeConnect.java index cc840cb95ea3..c76d1e4c1525 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OfficeConnect.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OfficeConnect.java @@ -49,7 +49,6 @@ import java.lang.String; * "getConnection()" to open or use internal set connection which is created one * times only. * - * @author Andreas Schlüns */ public class OfficeConnect { diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java index 54b58309538e..0f48ede996ae 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java @@ -45,7 +45,6 @@ import java.util.Vector; * of oneway request. Because the source and the target of this call-link knows, * which method was used and which parameters must be handled. * - * @author Andreas Schlüns */ class OnewayExecutor extends Thread { diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java index b6dec65544a4..58ce8a2f178d 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java @@ -61,7 +61,6 @@ import com.sun.star.uno.UnoRuntime; * And it's not allowed to call back synchronously there. * So we must start threads for updating something internaly. * - * @author Andreas Schlüns */ class StatusListener implements com.sun.star.frame.XStatusListener, com.sun.star.frame.XFrameActionListener, diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java index c250940b379d..40f8c58db9bf 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java @@ -57,7 +57,6 @@ import java.lang.String; * inside the office process and so exist different threads * for this constallation. * - * @author Andreas Schlüns */ public class StatusView extends JPanel implements IShutdownListener diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/ViewContainer.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/ViewContainer.java index fb3e675820ae..356ee0772791 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/ViewContainer.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/ViewContainer.java @@ -46,7 +46,6 @@ import java.util.*; * some global functionality - like termination of * this demo application. * - * @author Andreas Schlüns */ public class ViewContainer extends Thread { diff --git a/odk/examples/DevelopersGuide/OfficeDev/DisableCommands/DisableCommandsTest.java b/odk/examples/DevelopersGuide/OfficeDev/DisableCommands/DisableCommandsTest.java index 18dc21b5a565..963ced576d43 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DisableCommands/DisableCommandsTest.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DisableCommands/DisableCommandsTest.java @@ -41,8 +41,6 @@ import com.sun.star.frame.XComponentLoader; import com.sun.star.text.XTextDocument; /* - * - * @author Carsten Driesner * Provides example code how to enable/disable * commands. */ diff --git a/odk/examples/DevelopersGuide/OfficeDev/Number_Formats.java b/odk/examples/DevelopersGuide/OfficeDev/Number_Formats.java index de05e4caa2f1..f3369c3e0d14 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/Number_Formats.java +++ b/odk/examples/DevelopersGuide/OfficeDev/Number_Formats.java @@ -50,7 +50,6 @@ import com.sun.star.uno.XComponentContext; /** Create a spreadsheet document and provide access to a sheet framework that is then used to modify some number formats. - @author Eike Rathke */ public class Number_Formats { diff --git a/odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java b/odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java index 97beab0c8627..49bbd9db82bd 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java +++ b/odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java @@ -48,7 +48,6 @@ import java.lang.String; * ctor isn't available from outside. You should call static function "getConnection()" * to open or use internal set connection which is created one times only. * - * @author Andreas Schlüns */ public class OfficeConnect { diff --git a/odk/examples/DevelopersGuide/OfficeDev/PathSettings/PathSettingsTest.java b/odk/examples/DevelopersGuide/OfficeDev/PathSettings/PathSettingsTest.java index 8270599a1e16..34858994f369 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/PathSettings/PathSettingsTest.java +++ b/odk/examples/DevelopersGuide/OfficeDev/PathSettings/PathSettingsTest.java @@ -38,8 +38,6 @@ import com.sun.star.lang.XMultiComponentFactory; import com.sun.star.beans.XPropertySet; /* - * - * @author Carsten Driesner * Provides example code how to access and use the * path pathsettings servce. */ diff --git a/odk/examples/DevelopersGuide/OfficeDev/PathSubstitution/PathSubstitutionTest.java b/odk/examples/DevelopersGuide/OfficeDev/PathSubstitution/PathSubstitutionTest.java index 22b6a82bec9d..e878b479813a 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/PathSubstitution/PathSubstitutionTest.java +++ b/odk/examples/DevelopersGuide/OfficeDev/PathSubstitution/PathSubstitutionTest.java @@ -37,9 +37,6 @@ import com.sun.star.uno.XComponentContext; import com.sun.star.lang.XMultiComponentFactory; import com.sun.star.util.XStringSubstitution; -/* - * @author Carsten Driesner - */ public class PathSubstitutionTest extends java.lang.Object { /* diff --git a/odk/examples/DevelopersGuide/OfficeDev/TerminationTest/TerminateListener.java b/odk/examples/DevelopersGuide/OfficeDev/TerminationTest/TerminateListener.java index 65343e967c69..ceded40f2e61 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/TerminationTest/TerminateListener.java +++ b/odk/examples/DevelopersGuide/OfficeDev/TerminationTest/TerminateListener.java @@ -35,10 +35,6 @@ import com.sun.star.frame.TerminationVetoException; import com.sun.star.frame.XTerminateListener; -/** - * - * @author dschulten - */ public class TerminateListener implements XTerminateListener { public void notifyTermination(com.sun.star.lang.EventObject eventObject) { diff --git a/odk/examples/DevelopersGuide/OfficeDev/TerminationTest/TerminationTest.java b/odk/examples/DevelopersGuide/OfficeDev/TerminationTest/TerminationTest.java index 8c0a0c556cbe..7ee55ab85bd4 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/TerminationTest/TerminationTest.java +++ b/odk/examples/DevelopersGuide/OfficeDev/TerminationTest/TerminationTest.java @@ -37,10 +37,6 @@ import com.sun.star.uno.XComponentContext; import com.sun.star.lang.XMultiComponentFactory; import com.sun.star.frame.XDesktop; -/** - * - * @author dschulten - */ public class TerminationTest extends java.lang.Object { private static boolean atWork = false; diff --git a/odk/examples/DevelopersGuide/Text/TextDocuments.java b/odk/examples/DevelopersGuide/Text/TextDocuments.java index 5a3515e7d267..13e68967131b 100644 --- a/odk/examples/DevelopersGuide/Text/TextDocuments.java +++ b/odk/examples/DevelopersGuide/Text/TextDocuments.java @@ -114,10 +114,6 @@ import java.util.Hashtable; * Created on 11. April 2002, 08:47 */ -/** - * - * @author Martin Gallwey, Dietrich Schulten - */ public class TextDocuments { // adjust these constant to your local printer! private static String sOutputDir; diff --git a/odk/examples/java/Inspector/MethodParametersDialog.java b/odk/examples/java/Inspector/MethodParametersDialog.java index 2f7c63ef8b1d..8a261b1d98b6 100644 --- a/odk/examples/java/Inspector/MethodParametersDialog.java +++ b/odk/examples/java/Inspector/MethodParametersDialog.java @@ -49,9 +49,6 @@ import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JTextField; -/** - * @author bc93774 - */ public class MethodParametersDialog extends JDialog{ private javax.swing.JPanel jPnlParamContainer; private ParameterPanel[] m_aParameterPanels; diff --git a/odk/examples/java/Inspector/XTreePathProvider.java b/odk/examples/java/Inspector/XTreePathProvider.java index 99d54bf5bad7..90ab022632f9 100644 --- a/odk/examples/java/Inspector/XTreePathProvider.java +++ b/odk/examples/java/Inspector/XTreePathProvider.java @@ -25,10 +25,6 @@ * and open the template in the editor. */ -/** - * - * @author bc93774 - */ public interface XTreePathProvider { public XUnoNode getLastPathComponent(); diff --git a/odk/examples/java/Spreadsheet/ChartTypeChange.java b/odk/examples/java/Spreadsheet/ChartTypeChange.java index 1a86ee3d0b97..7b14ab3716f9 100644 --- a/odk/examples/java/Spreadsheet/ChartTypeChange.java +++ b/odk/examples/java/Spreadsheet/ChartTypeChange.java @@ -70,7 +70,6 @@ import com.sun.star.uno.XComponentContext; /** This class loads an OpenOffice.org Calc document and changes the type of the * embedded chart. - * @author Bertram Nolte */ public class ChartTypeChange { From 773667483e3991b078eca03568681e2f3e8f4ec9 Mon Sep 17 00:00:00 2001 From: Ivan Timofeev Date: Tue, 25 Sep 2012 21:17:31 +0400 Subject: [PATCH 106/863] String -> OUString Change-Id: I94eafe01604b30d53d9021458a0a9c57dfc1144a --- starmath/inc/cursor.hxx | 2 +- starmath/inc/parse.hxx | 2 +- starmath/source/cursor.cxx | 4 ++-- starmath/source/parse.cxx | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/starmath/inc/cursor.hxx b/starmath/inc/cursor.hxx index 3c274cb7b7d2..b7a0d9c618e9 100644 --- a/starmath/inc/cursor.hxx +++ b/starmath/inc/cursor.hxx @@ -155,7 +155,7 @@ public: * This will work for stuff like "A intersection B". But stuff spaning multiple lines * or dependent on the context which position is placed in will not work! */ - void InsertCommandText(String aCommandText); + void InsertCommandText(OUString aCommandText); /** Insert a special node created from aString * diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx index e4f1c6a9a10c..e3a8d23c5154 100644 --- a/starmath/inc/parse.hxx +++ b/starmath/inc/parse.hxx @@ -263,7 +263,7 @@ public: /** Parse rBuffer to formula tree */ SmNode *Parse(const String &rBuffer); /** Parse rBuffer to formula subtree that constitutes an expression */ - SmNode *ParseExpression(const String &rBuffer); + SmNode *ParseExpression(const OUString &rBuffer); const String & GetText() const { return m_aBufferString; }; diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx index 9edb83ea1e2f..489c339f4d49 100644 --- a/starmath/source/cursor.cxx +++ b/starmath/source/cursor.cxx @@ -1156,12 +1156,12 @@ void SmCursor::InsertCommand(sal_uInt16 nCommand) { InsertLimit(CSUP, true); break; default: - InsertCommandText(SmResId(nCommand)); + InsertCommandText(SM_RESSTR(nCommand)); break; } } -void SmCursor::InsertCommandText(XubString aCommandText) { +void SmCursor::InsertCommandText(OUString aCommandText) { //Parse the the sub expression SmNode* pSubExpr = SmParser().ParseExpression(aCommandText); diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx index 827ff16251d5..51a60c2afbf8 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -2452,7 +2452,7 @@ SmNode *SmParser::Parse(const String &rBuffer) return result; } -SmNode *SmParser::ParseExpression(const String &rBuffer) +SmNode *SmParser::ParseExpression(const OUString &rBuffer) { m_aBufferString = convertLineEnd(rBuffer, LINEEND_LF); m_nBufferIndex = 0; From b03eab3560bb5c8379ae711b41796dec459c20e0 Mon Sep 17 00:00:00 2001 From: Ivan Timofeev Date: Thu, 27 Sep 2012 21:07:25 +0400 Subject: [PATCH 107/863] String -> OUString Change-Id: Icdb39e5b5ba38d48f5cc3a4ae371fb77cb981242 --- starmath/inc/visitors.hxx | 19 +++++++------------ .../qa/cppunit/test_nodetotextvisitors.cxx | 10 +++++----- starmath/source/cursor.cxx | 2 +- starmath/source/visitors.cxx | 6 ++++++ 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/starmath/inc/visitors.hxx b/starmath/inc/visitors.hxx index 9f792124d1c4..f20379d4df20 100644 --- a/starmath/inc/visitors.hxx +++ b/starmath/inc/visitors.hxx @@ -453,11 +453,9 @@ private: class SmNodeToTextVisitor : public SmVisitor { public: - SmNodeToTextVisitor( SmNode* pNode, String &rText ) - : rCmdText( rText ) { - pNode->Accept( this ); - } + SmNodeToTextVisitor( SmNode* pNode, OUString &rText ); virtual ~SmNodeToTextVisitor() {} + void Visit( SmTableNode* pNode ); void Visit( SmBraceNode* pNode ); void Visit( SmBracebodyNode* pNode ); @@ -493,19 +491,16 @@ private: pNode->Accept( this ); Separate( ); } - inline void Append( const sal_Char* pCharStr ) { - rCmdText.AppendAscii( pCharStr ); - } - inline void Append( const String &rText ) { - rCmdText.Append( rText ); + void Append( const OUString &rText ) { + aCmdText.append( rText ); } /** Append a blank for separation, if needed */ inline void Separate( ){ - if( !rCmdText.Len() || rCmdText.GetChar( rCmdText.Len( ) - 1 ) != ' ' ) - rCmdText.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " " ) ); + if( !aCmdText.getLength() || aCmdText[ aCmdText.getLength() - 1 ] != ' ' ) + aCmdText.append(' '); } /** Output text generated from the pNodes */ - String &rCmdText; + OUStringBuffer aCmdText; }; #endif /* SMVISITORS_H */ diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx b/starmath/qa/cppunit/test_nodetotextvisitors.cxx index 5e24fb04781c..b7e363ca4818 100644 --- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx +++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx @@ -494,11 +494,11 @@ void Test::SimpleSpecialChars() */ void Test::parseandparseagain(const char *formula, const char *test_name) { - String input, output1, output2; + OUString output1, output2; SmNode *pNode1, *pNode2; // parse 1 - input.AppendAscii(formula); + OUString input = OUString::createFromAscii(formula); pNode1 = SmParser().ParseExpression(input); pNode1->Prepare(xDocShRef->GetFormat(), *xDocShRef); SmNodeToTextVisitor(pNode1, output1); @@ -519,17 +519,17 @@ void Test::parseandparseagain(const char *formula, const char *test_name) void Test::ParseAndCheck(const char *formula, const char * expected, const char *test_name) { - String sInput, sOutput, sExpected; + OUString sOutput; SmNode *pNode; // parse - sInput.AppendAscii(formula); + OUString sInput = OUString::createFromAscii(formula); pNode = SmParser().ParseExpression(sInput); pNode->Prepare(xDocShRef->GetFormat(), *xDocShRef); SmNodeToTextVisitor(pNode, sOutput); // compare - sExpected.AppendAscii(expected); + OUString sExpected = OUString::createFromAscii(expected); CPPUNIT_ASSERT_EQUAL_MESSAGE(test_name, sExpected, sOutput); diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx index 489c339f4d49..de674f491b77 100644 --- a/starmath/source/cursor.cxx +++ b/starmath/source/cursor.cxx @@ -1462,7 +1462,7 @@ void SmCursor::EndEdit(){ RequestRepaint(); //Update the edit engine and text of the document - String formula; + OUString formula; SmNodeToTextVisitor(pTree, formula); //pTree->CreateTextFromNode(formula); pDocShell->aText = formula; diff --git a/starmath/source/visitors.cxx b/starmath/source/visitors.cxx index 9c279702d057..f1b835a462ee 100644 --- a/starmath/source/visitors.cxx +++ b/starmath/source/visitors.cxx @@ -2117,6 +2117,12 @@ void SmSelectionDrawingVisitor::Visit( SmTextNode* pNode ) /////////////////////////////// SmNodeToTextVisitor /////////////////////////////// +SmNodeToTextVisitor::SmNodeToTextVisitor( SmNode* pNode, OUString &rText ) +{ + pNode->Accept( this ); + rText = aCmdText.makeStringAndClear(); +} + void SmNodeToTextVisitor::Visit( SmTableNode* pNode ) { if( pNode->GetToken( ).eType == TBINOM ) { From c397e90062e64c6698467913de6faab1d2701d7f Mon Sep 17 00:00:00 2001 From: Ivan Timofeev Date: Mon, 1 Oct 2012 16:11:38 +0400 Subject: [PATCH 108/863] String -> OUString Change-Id: I29c644ed2c69f0c378f8c43b69c6c8c70d8cbf5e --- starmath/source/accessibility.cxx | 8 ++++---- starmath/source/accessibility.hxx | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx index b271773f332c..9207bdac537a 100644 --- a/starmath/source/accessibility.cxx +++ b/starmath/source/accessibility.cxx @@ -105,7 +105,7 @@ static awt::Point lcl_GetLocationOnScreen( Window *pWin ) ////////////////////////////////////////////////////////////////////// SmGraphicAccessible::SmGraphicAccessible( SmGraphicWindow *pGraphicWin ) : - aAccName ( String(SmResId(RID_DOCUMENTSTR)) ), + aAccName (SM_RESSTR(RID_DOCUMENTSTR)), nClientId (0), pWin (pGraphicWin) { @@ -115,7 +115,7 @@ SmGraphicAccessible::SmGraphicAccessible( SmGraphicWindow *pGraphicWin ) : SmGraphicAccessible::SmGraphicAccessible( const SmGraphicAccessible &rSmAcc ) : SmGraphicAccessibleBaseClass(), - aAccName ( String(SmResId(RID_DOCUMENTSTR)) ), + aAccName (SM_RESSTR(RID_DOCUMENTSTR)), nClientId (0) { pWin = rSmAcc.pWin; @@ -1631,7 +1631,7 @@ sal_Bool SmEditViewForwarder::Paste() //------------------------------------------------------------------------ SmEditAccessible::SmEditAccessible( SmEditWindow *pEditWin ) : - aAccName ( String(SmResId(STR_CMDBOXWINDOW)) ), + aAccName (SM_RESSTR(STR_CMDBOXWINDOW)), pTextHelper (0), pWin (pEditWin) { @@ -1641,7 +1641,7 @@ SmEditAccessible::SmEditAccessible( SmEditWindow *pEditWin ) : SmEditAccessible::SmEditAccessible( const SmEditAccessible &rSmAcc ) : SmEditAccessibleBaseClass(), - aAccName ( String(SmResId(STR_CMDBOXWINDOW)) ) + aAccName (SM_RESSTR(STR_CMDBOXWINDOW)) { pWin = rSmAcc.pWin; OSL_ENSURE( pWin, "SmEditAccessible: window missing" ); diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx index b9918ddbd866..07db582d2f17 100644 --- a/starmath/source/accessibility.hxx +++ b/starmath/source/accessibility.hxx @@ -72,7 +72,7 @@ class SmGraphicAccessible : public SmGraphicAccessibleBaseClass { osl::Mutex aListenerMutex; - String aAccName; + OUString aAccName; /// client id in the AccessibleEventNotifier queue sal_uInt32 nClientId; @@ -326,7 +326,7 @@ class SmEditAccessible : public SmEditAccessibleBaseClass { osl::Mutex aListenerMutex; - String aAccName; + OUString aAccName; ::accessibility::AccessibleTextHelper *pTextHelper; SmEditWindow *pWin; From b4a263329fe95c83b09fc9c626c021b7cd50cabc Mon Sep 17 00:00:00 2001 From: Ivan Timofeev Date: Mon, 1 Oct 2012 16:35:38 +0400 Subject: [PATCH 109/863] String -> OUString Change-Id: I28c2d87ddd1ea83e29dd11ef8aa20d8d583f4dd9 --- starmath/source/accessibility.cxx | 84 ++++++++++++++----------------- starmath/source/accessibility.hxx | 2 +- 2 files changed, 40 insertions(+), 46 deletions(-) diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx index 9207bdac537a..39c5d3acdc9e 100644 --- a/starmath/source/accessibility.cxx +++ b/starmath/source/accessibility.cxx @@ -134,9 +134,9 @@ SmDocShell * SmGraphicAccessible::GetDoc_Impl() return pView ? pView->GetDoc() : 0; } -String SmGraphicAccessible::GetAccessibleText_Impl() +OUString SmGraphicAccessible::GetAccessibleText_Impl() { - String aTxt; + OUString aTxt; SmDocShell *pDoc = GetDoc_Impl(); if (pDoc) aTxt = pDoc->GetAccessibleText(); @@ -451,9 +451,8 @@ sal_Bool SAL_CALL SmGraphicAccessible::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { SolarMutexGuard aGuard; - xub_StrLen nIdx = (xub_StrLen) nIndex; - String aTxt( GetAccessibleText_Impl() ); - if (!(nIdx < aTxt.Len())) + OUString aTxt( GetAccessibleText_Impl() ); + if (!(nIndex < aTxt.getLength())) throw IndexOutOfBoundsException(); return sal_False; } @@ -462,12 +461,10 @@ sal_Unicode SAL_CALL SmGraphicAccessible::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { SolarMutexGuard aGuard; - - xub_StrLen nIdx = (xub_StrLen) nIndex; - String aTxt( GetAccessibleText_Impl() ); - if (!(nIdx < aTxt.Len())) + OUString aTxt( GetAccessibleText_Impl() ); + if (!(nIndex < aTxt.getLength())) throw IndexOutOfBoundsException(); - return aTxt.GetChar( nIdx ); + return aTxt[nIndex]; } Sequence< beans::PropertyValue > SAL_CALL SmGraphicAccessible::getCharacterAttributes( @@ -476,7 +473,7 @@ Sequence< beans::PropertyValue > SAL_CALL SmGraphicAccessible::getCharacterAttri throw (IndexOutOfBoundsException, RuntimeException) { SolarMutexGuard aGuard; - sal_Int32 nLen = GetAccessibleText_Impl().Len(); + sal_Int32 nLen = GetAccessibleText_Impl().getLength(); if (!(0 <= nIndex && nIndex < nLen)) throw IndexOutOfBoundsException(); return Sequence< beans::PropertyValue >(); @@ -498,12 +495,12 @@ awt::Rectangle SAL_CALL SmGraphicAccessible::getCharacterBounds( sal_Int32 nInde SmDocShell *pDoc = pView ? pView->GetDoc() : 0; if (!pDoc) throw RuntimeException(); - String aTxt( GetAccessibleText_Impl() ); - if (!(0 <= nIndex && nIndex <= aTxt.Len())) // aTxt.Len() is valid + OUString aTxt( GetAccessibleText_Impl() ); + if (!(0 <= nIndex && nIndex <= aTxt.getLength())) // aTxt.getLength() is valid throw IndexOutOfBoundsException(); - // find a reasonable rectangle for position aTxt.Len(). - bool bWasBehindText = (nIndex == aTxt.Len()); + // find a reasonable rectangle for position aTxt.getLength(). + bool bWasBehindText = (nIndex == aTxt.getLength()); if (bWasBehindText && nIndex) --nIndex; @@ -560,7 +557,7 @@ sal_Int32 SAL_CALL SmGraphicAccessible::getCharacterCount() throw (RuntimeException) { SolarMutexGuard aGuard; - return GetAccessibleText_Impl().Len(); + return GetAccessibleText_Impl().getLength(); } sal_Int32 SAL_CALL SmGraphicAccessible::getIndexAtPoint( const awt::Point& aPoint ) @@ -656,7 +653,7 @@ sal_Bool SAL_CALL SmGraphicAccessible::setSelection( throw (IndexOutOfBoundsException, RuntimeException) { SolarMutexGuard aGuard; - sal_Int32 nLen = GetAccessibleText_Impl().Len(); + sal_Int32 nLen = GetAccessibleText_Impl().getLength(); if (!(0 <= nStartIndex && nStartIndex < nLen) || !(0 <= nEndIndex && nEndIndex < nLen)) throw IndexOutOfBoundsException(); @@ -680,32 +677,31 @@ OUString SAL_CALL SmGraphicAccessible::getTextRange( //!! may be switched. SolarMutexGuard aGuard; - String aTxt( GetAccessibleText_Impl() ); - xub_StrLen nStart = (xub_StrLen) Min(nStartIndex, nEndIndex); - xub_StrLen nEnd = (xub_StrLen) Max(nStartIndex, nEndIndex); - if (!(nStart <= aTxt.Len()) || - !(nEnd <= aTxt.Len())) + OUString aTxt( GetAccessibleText_Impl() ); + sal_Int32 nStart = Min(nStartIndex, nEndIndex); + sal_Int32 nEnd = Max(nStartIndex, nEndIndex); + if (!(nStart <= aTxt.getLength()) || + !(nEnd <= aTxt.getLength())) throw IndexOutOfBoundsException(); - return aTxt.Copy( nStart, nEnd - nStart ); + return aTxt.copy( nStart, nEnd - nStart ); } ::com::sun::star::accessibility::TextSegment SAL_CALL SmGraphicAccessible::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; - String aTxt( GetAccessibleText_Impl() ); - xub_StrLen nIdx = (xub_StrLen) nIndex; + OUString aTxt( GetAccessibleText_Impl() ); //!! nIndex is allowed to be the string length - if (!(nIdx <= aTxt.Len())) + if (!(nIndex <= aTxt.getLength())) throw IndexOutOfBoundsException(); ::com::sun::star::accessibility::TextSegment aResult; aResult.SegmentStart = -1; aResult.SegmentEnd = -1; - if ( (AccessibleTextType::CHARACTER == aTextType) && (nIdx < aTxt.Len()) ) + if ( (AccessibleTextType::CHARACTER == aTextType) && (nIndex < aTxt.getLength()) ) { - aResult.SegmentText = aTxt.Copy(nIdx, 1); - aResult.SegmentStart = nIdx; - aResult.SegmentEnd = nIdx+1; + aResult.SegmentText = aTxt.copy(nIndex, 1); + aResult.SegmentStart = nIndex; + aResult.SegmentEnd = nIndex+1; } return aResult; } @@ -713,21 +709,20 @@ OUString SAL_CALL SmGraphicAccessible::getTextRange( ::com::sun::star::accessibility::TextSegment SAL_CALL SmGraphicAccessible::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; - String aTxt( GetAccessibleText_Impl() ); - xub_StrLen nIdx = (xub_StrLen) nIndex; + OUString aTxt( GetAccessibleText_Impl() ); //!! nIndex is allowed to be the string length - if (!(nIdx <= aTxt.Len())) + if (!(nIndex <= aTxt.getLength())) throw IndexOutOfBoundsException(); ::com::sun::star::accessibility::TextSegment aResult; aResult.SegmentStart = -1; aResult.SegmentEnd = -1; - if ( (AccessibleTextType::CHARACTER == aTextType) && nIdx ) + if ( (AccessibleTextType::CHARACTER == aTextType) && nIndex ) { - aResult.SegmentText = aTxt.Copy(nIdx-1, 1); - aResult.SegmentStart = nIdx-1; - aResult.SegmentEnd = nIdx; + aResult.SegmentText = aTxt.copy(nIndex-1, 1); + aResult.SegmentStart = nIndex-1; + aResult.SegmentEnd = nIndex; } return aResult; } @@ -735,22 +730,21 @@ OUString SAL_CALL SmGraphicAccessible::getTextRange( ::com::sun::star::accessibility::TextSegment SAL_CALL SmGraphicAccessible::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; - String aTxt( GetAccessibleText_Impl() ); - xub_StrLen nIdx = (xub_StrLen) nIndex; + OUString aTxt( GetAccessibleText_Impl() ); //!! nIndex is allowed to be the string length - if (!(nIdx <= aTxt.Len())) + if (!(nIndex <= aTxt.getLength())) throw IndexOutOfBoundsException(); ::com::sun::star::accessibility::TextSegment aResult; aResult.SegmentStart = -1; aResult.SegmentEnd = -1; - nIdx++; // text *behind* - if ( (AccessibleTextType::CHARACTER == aTextType) && (nIdx < aTxt.Len()) ) + nIndex++; // text *behind* + if ( (AccessibleTextType::CHARACTER == aTextType) && (nIndex < aTxt.getLength()) ) { - aResult.SegmentText = aTxt.Copy(nIdx, 1); - aResult.SegmentStart = nIdx; - aResult.SegmentEnd = nIdx+1; + aResult.SegmentText = aTxt.copy(nIndex, 1); + aResult.SegmentStart = nIndex; + aResult.SegmentEnd = nIndex+1; } return aResult; } diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx index 07db582d2f17..6a05823e22c1 100644 --- a/starmath/source/accessibility.hxx +++ b/starmath/source/accessibility.hxx @@ -84,7 +84,7 @@ class SmGraphicAccessible : protected: SmDocShell * GetDoc_Impl(); - String GetAccessibleText_Impl(); + OUString GetAccessibleText_Impl(); public: SmGraphicAccessible( SmGraphicWindow *pGraphicWin ); From f2389862ea0459d6e17e718f33e1674a63a9bb19 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 1 Oct 2012 11:20:02 +0300 Subject: [PATCH 110/863] gcc3_uno is listed cross-platform already nowadays Change-Id: I8dc776d6d96dbe022908418b64dc130d619753c4 --- Repository.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Repository.mk b/Repository.mk index aacd7038a8b6..fdc4ce6cef5d 100644 --- a/Repository.mk +++ b/Repository.mk @@ -521,12 +521,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ )) endif -ifeq ($(OS),IOS) -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - gcc3_uno \ -)) -endif - $(eval $(call gb_Helper_register_libraries,RTLIBS, \ comphelper \ i18nisolang1 \ From cb5730dc277a98b45c120b6fb0847c32620da478 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 1 Oct 2012 15:40:49 +0300 Subject: [PATCH 111/863] Seems that the iOS-specific crack is not needed any longer Change-Id: I91a7f74e55b6ad8780a3a0920a22b6a7264b7b88 --- sal/inc/sal/mathconf.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/sal/inc/sal/mathconf.h b/sal/inc/sal/mathconf.h index c03adc45413d..f92d8b403123 100644 --- a/sal/inc/sal/mathconf.h +++ b/sal/inc/sal/mathconf.h @@ -69,16 +69,6 @@ extern "C" { #define SAL_MATH_FINITE(d) std::isfinite(d) #elif defined( WNT) #define SAL_MATH_FINITE(d) _finite(d) -#elif defined IOS -/* C++ is so nice. This is the only way I could come up with making - * this actually work in all cases (?), even when has been - * included which #undefs isfinite: copy the definition of isfinite() - * from - */ -#define SAL_MATH_FINITE(d) \ - ( sizeof (d) == sizeof(float ) ? __inline_isfinitef((float)(d)) \ - : sizeof (d) == sizeof(double) ? __inline_isfinited((double)(d)) \ - : __inline_isfinite ((long double)(d))) #elif defined LINUX || defined UNX #define SAL_MATH_FINITE(d) finite(d) #else /* WNT, LINUX, UNX */ From 35130c7c4d7992cd10f3bb232eecd7752b1a8c9d Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 1 Oct 2012 15:41:47 +0300 Subject: [PATCH 112/863] Make this actually work Change-Id: Icfe773e8f440372645b7a57dba1ab7f8fac3caaa --- bridges/CustomTarget_gcc3_ios_arm.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bridges/CustomTarget_gcc3_ios_arm.mk b/bridges/CustomTarget_gcc3_ios_arm.mk index c8c633e54c10..fd971313cd42 100644 --- a/bridges/CustomTarget_gcc3_ios_arm.mk +++ b/bridges/CustomTarget_gcc3_ios_arm.mk @@ -15,8 +15,7 @@ $(call gb_CustomTarget_get_target,bridges/source/cpp_uno/gcc3_ios_arm) : \ $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_ios_arm)/codesnippets.S : \ $(SRCDIR)/bridges/source/cpp_uno/gcc3_ios_arm/generate-snippets.pl - -$(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_ios_arm)/codesnippets.S : + mkdir -p $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_ios_arm) $(PERL) $< > $@ # vim: set noet sw=4 ts=4: From 9da897b56d5e2d95c50a8edd54a4a2aff31bc0dd Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 1 Oct 2012 15:42:12 +0300 Subject: [PATCH 113/863] Need -DBOOST_DETAIL_NO_CONTAINER_FWD here, too Change-Id: Ice20b6903f7bf26547a7a3e2bf3cec6c831a6734 --- solenv/gbuild/platform/IOS_ARM_GCC.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index 21301fa95e84..7636cef3e8f3 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -79,6 +79,9 @@ gb_OBJCXXFLAGS := -x objective-c++ $(gb_OBJC_OBJCXX_COMMON_FLAGS) gb_OBJCFLAGS := -x objective-c $(gb_OBJC_OBJCXX_COMMON_FLAGS) +gb_COMPILERDEFS += \ + -DBOOST_DETAIL_NO_CONTAINER_FWD + gb_LinkTarget_LDFLAGS := \ $(subst -L../lib , ,$(SOLARLIB)) \ #man ld says: obsolete -Wl,-multiply_defined,suppress \ From cc1a1123dbed3c13180fbd43328168008692f224 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 1 Oct 2012 15:42:40 +0300 Subject: [PATCH 114/863] No vbaobj component if DISABLE_SCRIPTING Change-Id: I8b00febb62502280afa6106289104af151caf9c5 --- sc/CppunitTest_sc_annotationshapeobj.mk | 3 ++- sc/CppunitTest_sc_cellrangeobj.mk | 3 ++- sc/CppunitTest_sc_chart_regression_test.mk | 3 ++- sc/CppunitTest_sc_datapilotfieldobj.mk | 3 ++- sc/CppunitTest_sc_datapilottableobj.mk | 3 ++- sc/CppunitTest_sc_editfieldobj_cell.mk | 3 ++- sc/CppunitTest_sc_editfieldobj_header.mk | 3 ++- sc/CppunitTest_sc_macros_test.mk | 3 ++- sc/CppunitTest_sc_modelobj.mk | 3 ++- sc/CppunitTest_sc_namedrangeobj.mk | 3 ++- sc/CppunitTest_sc_namedrangesobj.mk | 3 ++- sc/CppunitTest_sc_rangelst_test.mk | 3 ++- sc/CppunitTest_sc_tableautoformatfield.mk | 3 ++- sc/CppunitTest_sc_tablesheetobj.mk | 3 ++- sc/CppunitTest_sc_tablesheetsobj.mk | 3 ++- 15 files changed, 30 insertions(+), 15 deletions(-) diff --git a/sc/CppunitTest_sc_annotationshapeobj.mk b/sc/CppunitTest_sc_annotationshapeobj.mk index 9522e2779ea4..841b34a450a9 100644 --- a/sc/CppunitTest_sc_annotationshapeobj.mk +++ b/sc/CppunitTest_sc_annotationshapeobj.mk @@ -103,7 +103,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_annonationshapeobj,\ sc/util/sc \ sc/util/scd \ sc/util/scfilt \ - sc/util/vbaobj \ + $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \ + sc/util/vbaobj) \ scripting/source/basprov/basprov \ scripting/util/scriptframe \ sfx2/util/sfx \ diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk index 814e9cbbc1a1..b0a63217668a 100644 --- a/sc/CppunitTest_sc_cellrangeobj.mk +++ b/sc/CppunitTest_sc_cellrangeobj.mk @@ -104,7 +104,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_cellrangesbase,\ sc/util/sc \ sc/util/scd \ sc/util/scfilt \ - sc/util/vbaobj \ + $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \ + sc/util/vbaobj) \ scripting/source/basprov/basprov \ scripting/util/scriptframe \ sfx2/util/sfx \ diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk index 1ca505b5b1d7..c45aa69857b4 100644 --- a/sc/CppunitTest_sc_chart_regression_test.mk +++ b/sc/CppunitTest_sc_chart_regression_test.mk @@ -104,7 +104,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_chart_regression_test,\ sc/util/sc \ sc/util/scd \ sc/util/scfilt \ - sc/util/vbaobj \ + $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \ + sc/util/vbaobj) \ scaddins/source/analysis/analysis \ scaddins/source/datefunc/date \ scripting/source/basprov/basprov \ diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk index d221fe5c4bd2..7d86cb573941 100644 --- a/sc/CppunitTest_sc_datapilotfieldobj.mk +++ b/sc/CppunitTest_sc_datapilotfieldobj.mk @@ -103,7 +103,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_datapilotfieldobj,\ sc/util/sc \ sc/util/scd \ sc/util/scfilt \ - sc/util/vbaobj \ + $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \ + sc/util/vbaobj) \ scripting/source/basprov/basprov \ scripting/util/scriptframe \ sfx2/util/sfx \ diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk index 77f2b0be4e28..33207173b07a 100644 --- a/sc/CppunitTest_sc_datapilottableobj.mk +++ b/sc/CppunitTest_sc_datapilottableobj.mk @@ -103,7 +103,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_datapilottableobj,\ sc/util/sc \ sc/util/scd \ sc/util/scfilt \ - sc/util/vbaobj \ + $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \ + sc/util/vbaobj) \ scripting/source/basprov/basprov \ scripting/util/scriptframe \ sfx2/util/sfx \ diff --git a/sc/CppunitTest_sc_editfieldobj_cell.mk b/sc/CppunitTest_sc_editfieldobj_cell.mk index 3f75acb58ba3..b4f80621f9f6 100644 --- a/sc/CppunitTest_sc_editfieldobj_cell.mk +++ b/sc/CppunitTest_sc_editfieldobj_cell.mk @@ -103,7 +103,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_editfieldobj_cell,\ sc/util/sc \ sc/util/scd \ sc/util/scfilt \ - sc/util/vbaobj \ + $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \ + sc/util/vbaobj) \ scripting/source/basprov/basprov \ scripting/util/scriptframe \ sfx2/util/sfx \ diff --git a/sc/CppunitTest_sc_editfieldobj_header.mk b/sc/CppunitTest_sc_editfieldobj_header.mk index 32ac4577c5e8..ba55b6515208 100644 --- a/sc/CppunitTest_sc_editfieldobj_header.mk +++ b/sc/CppunitTest_sc_editfieldobj_header.mk @@ -103,7 +103,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_editfieldobj_header,\ sc/util/sc \ sc/util/scd \ sc/util/scfilt \ - sc/util/vbaobj \ + $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \ + sc/util/vbaobj) \ scripting/source/basprov/basprov \ scripting/util/scriptframe \ sfx2/util/sfx \ diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk index c74f49433687..fca4947cef41 100644 --- a/sc/CppunitTest_sc_macros_test.mk +++ b/sc/CppunitTest_sc_macros_test.mk @@ -100,7 +100,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_macros_test,\ sc/util/sc \ sc/util/scd \ sc/util/scfilt \ - sc/util/vbaobj \ + $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \ + sc/util/vbaobj) \ scripting/source/basprov/basprov \ scripting/util/scriptframe \ sfx2/util/sfx \ diff --git a/sc/CppunitTest_sc_modelobj.mk b/sc/CppunitTest_sc_modelobj.mk index 4548f4bc37f4..de62eb6475d4 100644 --- a/sc/CppunitTest_sc_modelobj.mk +++ b/sc/CppunitTest_sc_modelobj.mk @@ -103,7 +103,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_modelobj,\ sc/util/sc \ sc/util/scd \ sc/util/scfilt \ - sc/util/vbaobj \ + $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \ + sc/util/vbaobj) \ scripting/source/basprov/basprov \ scripting/util/scriptframe \ sfx2/util/sfx \ diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk index ffca9b399833..c2f1d438dd09 100644 --- a/sc/CppunitTest_sc_namedrangeobj.mk +++ b/sc/CppunitTest_sc_namedrangeobj.mk @@ -103,7 +103,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_namedrangeobj,\ sc/util/sc \ sc/util/scd \ sc/util/scfilt \ - sc/util/vbaobj \ + $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \ + sc/util/vbaobj) \ scripting/source/basprov/basprov \ scripting/util/scriptframe \ sfx2/util/sfx \ diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk index 49a87b49acf4..84d7f371c5a3 100644 --- a/sc/CppunitTest_sc_namedrangesobj.mk +++ b/sc/CppunitTest_sc_namedrangesobj.mk @@ -103,7 +103,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_namedrangesobj,\ sc/util/sc \ sc/util/scd \ sc/util/scfilt \ - sc/util/vbaobj \ + $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \ + sc/util/vbaobj) \ scripting/source/basprov/basprov \ scripting/util/scriptframe \ sfx2/util/sfx \ diff --git a/sc/CppunitTest_sc_rangelst_test.mk b/sc/CppunitTest_sc_rangelst_test.mk index a97a4b1e258c..44c6b5266696 100644 --- a/sc/CppunitTest_sc_rangelst_test.mk +++ b/sc/CppunitTest_sc_rangelst_test.mk @@ -104,7 +104,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_rangelst_test,\ sc/util/sc \ sc/util/scd \ sc/util/scfilt \ - sc/util/vbaobj \ + $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \ + sc/util/vbaobj) \ scaddins/source/analysis/analysis \ scaddins/source/datefunc/date \ scripting/source/basprov/basprov \ diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk index 23cab33b98cc..94b311049ed4 100644 --- a/sc/CppunitTest_sc_tableautoformatfield.mk +++ b/sc/CppunitTest_sc_tableautoformatfield.mk @@ -103,7 +103,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_tableautoformatfield,\ sc/util/sc \ sc/util/scd \ sc/util/scfilt \ - sc/util/vbaobj \ + $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \ + sc/util/vbaobj) \ scripting/source/basprov/basprov \ scripting/util/scriptframe \ sfx2/util/sfx \ diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk index 1bf3bd956973..067ed9eea0ef 100644 --- a/sc/CppunitTest_sc_tablesheetobj.mk +++ b/sc/CppunitTest_sc_tablesheetobj.mk @@ -104,7 +104,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_spreadsheetobj,\ sc/util/sc \ sc/util/scd \ sc/util/scfilt \ - sc/util/vbaobj \ + $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \ + sc/util/vbaobj) \ scripting/source/basprov/basprov \ scripting/util/scriptframe \ sfx2/util/sfx \ diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk index 478dcb090552..e950830fdde0 100644 --- a/sc/CppunitTest_sc_tablesheetsobj.mk +++ b/sc/CppunitTest_sc_tablesheetsobj.mk @@ -103,7 +103,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_spreadsheetsobj,\ sc/util/sc \ sc/util/scd \ sc/util/scfilt \ - sc/util/vbaobj \ + $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \ + sc/util/vbaobj) \ scripting/source/basprov/basprov \ scripting/util/scriptframe \ sfx2/util/sfx \ From 67081cdf67976a6478b406b6aadca6325691e605 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 1 Oct 2012 15:18:16 +0300 Subject: [PATCH 115/863] Use prefixes for the components here Change-Id: I7bebc936cdb489331c82690c244f72e9c3619b10 --- avmedia/source/framework/soundhandler.cxx | 2 +- avmedia/source/gstreamer/avmediagstreamer.component | 2 +- avmedia/source/gstreamer/gstuno.cxx | 2 +- avmedia/source/quicktime/avmediaQuickTime.component | 2 +- avmedia/source/quicktime/quicktimeuno.mm | 2 +- avmedia/source/win/avmediawin.component | 2 +- avmedia/source/win/winuno.cxx | 2 +- avmedia/util/avmedia.component | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx index e6aee2b4aa75..1eae3551ee15 100644 --- a/avmedia/source/framework/soundhandler.cxx +++ b/avmedia/source/framework/soundhandler.cxx @@ -446,7 +446,7 @@ IMPL_LINK_NOARG(SoundHandler, implts_PlayerNotify) } // namespace framework -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/ ) +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL avmedia_component_getFactory(const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/ ) { void* pReturn = NULL; if (pServiceManager != NULL ) diff --git a/avmedia/source/gstreamer/avmediagstreamer.component b/avmedia/source/gstreamer/avmediagstreamer.component index 8a9a85807cea..30a6cef26abc 100644 --- a/avmedia/source/gstreamer/avmediagstreamer.component +++ b/avmedia/source/gstreamer/avmediagstreamer.component @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * --> - + diff --git a/avmedia/source/gstreamer/gstuno.cxx b/avmedia/source/gstreamer/gstuno.cxx index 536e02879f77..9357a5d6db7f 100644 --- a/avmedia/source/gstreamer/gstuno.cxx +++ b/avmedia/source/gstreamer/gstuno.cxx @@ -39,7 +39,7 @@ static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno: return uno::Reference< uno::XInterface >( *new ::avmedia::gstreamer::Manager( rxFact ) ); } -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ ) +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL avmediagst_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ ) { uno::Reference< lang::XSingleServiceFactory > xFactory; void* pRet = 0; diff --git a/avmedia/source/quicktime/avmediaQuickTime.component b/avmedia/source/quicktime/avmediaQuickTime.component index c429141074f3..c7be231ac030 100644 --- a/avmedia/source/quicktime/avmediaQuickTime.component +++ b/avmedia/source/quicktime/avmediaQuickTime.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/avmedia/source/quicktime/quicktimeuno.mm b/avmedia/source/quicktime/quicktimeuno.mm index 040594a6564d..7baacb49e7e2 100644 --- a/avmedia/source/quicktime/quicktimeuno.mm +++ b/avmedia/source/quicktime/quicktimeuno.mm @@ -31,7 +31,7 @@ static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno: return uno::Reference< uno::XInterface >( *new ::avmedia::quicktime::Manager( rxFact ) ); } -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ ) +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL avmediaQuickTime_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ ) { uno::Reference< lang::XSingleServiceFactory > xFactory; void* pRet = 0; diff --git a/avmedia/source/win/avmediawin.component b/avmedia/source/win/avmediawin.component index 1cc47230aa16..9feb1facd204 100644 --- a/avmedia/source/win/avmediawin.component +++ b/avmedia/source/win/avmediawin.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/avmedia/source/win/winuno.cxx b/avmedia/source/win/winuno.cxx index 2bf3d6f9295b..b42427e2172e 100644 --- a/avmedia/source/win/winuno.cxx +++ b/avmedia/source/win/winuno.cxx @@ -31,7 +31,7 @@ static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno: return uno::Reference< uno::XInterface >( *new ::avmedia::win::Manager( rxFact ) ); } -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* ) +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL avmediawin_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* ) { uno::Reference< lang::XSingleServiceFactory > xFactory; void* pRet = 0; diff --git a/avmedia/util/avmedia.component b/avmedia/util/avmedia.component index f85783cb63a9..c410848a1bb4 100644 --- a/avmedia/util/avmedia.component +++ b/avmedia/util/avmedia.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - From 40d93d978d4f8fa709bdeb061b106122789d8e32 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 1 Oct 2012 13:42:02 +0200 Subject: [PATCH 116/863] n#782345 import DOCX w:splitPgBreakAndParaMark compat option This fixes docx import of page breaks in empty paragraphs, when the compat option in question is set. Even empty paragraphs have an "end of paragraph" character in dmapper: import page breaks there, instead of delaying the import till the all-catcher importer at the start of the next paragraph. Change-Id: Ie5c37042b3c445e0669771d15c8eb46380192db3 --- writerfilter/source/dmapper/DomainMapper.cxx | 10 ++++++++++ writerfilter/source/dmapper/SettingsTable.cxx | 10 ++++++++++ writerfilter/source/dmapper/SettingsTable.hxx | 1 + 3 files changed, 21 insertions(+) diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 8b5103495228..64618bf08614 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -3542,6 +3542,16 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len) if(len == 1 && (sText[0] == 0x0d || sText[0] == 0x07)) { + PropertyMapPtr pContext = m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH); + if (pContext && m_pImpl->GetSettingsTable()->GetSplitPgBreakAndParaMark()) + { + if (m_pImpl->isBreakDeferred(PAGE_BREAK)) + pContext->Insert(PROP_BREAK_TYPE, true, uno::makeAny( com::sun::star::style::BreakType_PAGE_BEFORE)); + else if (m_pImpl->isBreakDeferred(COLUMN_BREAK)) + pContext->Insert(PROP_BREAK_TYPE, true, uno::makeAny( com::sun::star::style::BreakType_COLUMN_BEFORE)); + m_pImpl->clearDeferredBreaks(); + } + bool bSingleParagraph = m_pImpl->GetIsFirstParagraphInSection() && m_pImpl->GetIsLastParagraphInSection(); // If the paragraph contains only the section properties and it has // no runs, we should not create a paragraph for it in Writer, unless that would remove the whole section. diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx index 18bef92d7b89..b01047ac0a9a 100644 --- a/writerfilter/source/dmapper/SettingsTable.cxx +++ b/writerfilter/source/dmapper/SettingsTable.cxx @@ -72,6 +72,7 @@ struct SettingsTable_Impl bool embedTrueTypeFonts; bool embedSystemFonts; bool m_bDoNotUseHTMLParagraphAutoSpacing; + bool m_bSplitPgBreakAndParaMark; SettingsTable_Impl( DomainMapper& rDMapper, const uno::Reference< lang::XMultiServiceFactory > xTextFactory ) : m_rDMapper( rDMapper ) @@ -95,6 +96,7 @@ struct SettingsTable_Impl , embedTrueTypeFonts(false) , embedSystemFonts(false) , m_bDoNotUseHTMLParagraphAutoSpacing(false) + , m_bSplitPgBreakAndParaMark(false) {} }; @@ -214,6 +216,9 @@ void SettingsTable::lcl_sprm(Sprm& rSprm) case NS_ooxml::LN_CT_Compat_doNotUseHTMLParagraphAutoSpacing: m_pImpl->m_bDoNotUseHTMLParagraphAutoSpacing = nIntValue; break; + case NS_ooxml::LN_CT_Compat_splitPgBreakAndParaMark: + m_pImpl->m_bSplitPgBreakAndParaMark = nIntValue; + break; default: { #ifdef DEBUG_DMAPPER_SETTINGS_TABLE @@ -271,6 +276,11 @@ bool SettingsTable::GetDoNotUseHTMLParagraphAutoSpacing() const return m_pImpl->m_bDoNotUseHTMLParagraphAutoSpacing; } +bool SettingsTable::GetSplitPgBreakAndParaMark() const +{ + return m_pImpl->m_bSplitPgBreakAndParaMark; +} + void SettingsTable::ApplyProperties( uno::Reference< text::XTextDocument > xDoc ) { uno::Reference< beans::XPropertySet> xDocProps( xDoc, uno::UNO_QUERY ); diff --git a/writerfilter/source/dmapper/SettingsTable.hxx b/writerfilter/source/dmapper/SettingsTable.hxx index 6a250a7157d0..14b7552135f3 100644 --- a/writerfilter/source/dmapper/SettingsTable.hxx +++ b/writerfilter/source/dmapper/SettingsTable.hxx @@ -69,6 +69,7 @@ class WRITERFILTER_DLLPRIVATE SettingsTable : public LoggedProperties, public Lo bool GetEmbedSystemFonts() const; bool GetDoNotUseHTMLParagraphAutoSpacing() const; + bool GetSplitPgBreakAndParaMark() const; void ApplyProperties( uno::Reference< text::XTextDocument > xDoc ); From 738d5dab435084737aab2e0519fd817f62f1e83b Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 1 Oct 2012 15:06:25 +0200 Subject: [PATCH 117/863] n#782345 testcase Change-Id: Id5204572ab9fddf3f15b5fd1b96d8f25e7166878 --- sw/qa/extras/ooxmlimport/data/n782345.docx | Bin 0 -> 12607 bytes sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 13 +++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 sw/qa/extras/ooxmlimport/data/n782345.docx diff --git a/sw/qa/extras/ooxmlimport/data/n782345.docx b/sw/qa/extras/ooxmlimport/data/n782345.docx new file mode 100644 index 0000000000000000000000000000000000000000..f25709fedf4f3c391ae655cb6064e01fa101d777 GIT binary patch literal 12607 zcmeHtbzEH8vToze^MSzO|~9WTBw30k8mg002M^K%ffo_k#ccqG134EC4*Dwy2#g z(9{;Fuj+1Z>ZHr;W@Am33k^w|4S)pS|G&roU<=eG$SVd2qX(Z-Kf%?!gIe@p?N7MQ zzABb4KW}3eogefuF~7e$eIX-Tnp2?F9`l*~^nMiSRluaor%6bDdMo8`iXM!Rls1K< zjHXpz2X2$Z@dJm%EKu^TQ3fS?Mk2a^#{kOG*U2>$(5?eK!;p2KdwE%baoSbl+1f&z z3WI2DP(I6t%k~!X0IUrq3()!+gd-b^D2LwUW@@i!7-LJ7etDZRbvi>Lwx85px5=u` zMuq5`#57ls5^5EEz`1(J!4{~i;Up#ZoIc<^g_j#)b1; zIIa>?FVrC^Oe;t7c_!baym%HtMLxtlJEgN+#yVbArR{e|jT3ZnB_Z4_-Oq2BD?4@x zK&Q=Dk?VN!cX+qgq;?{v(S1MC`SvKx)qjhFP~}{&8zJnOHBzDli(;Y;YE|dn+{xM` zT64-ouFYBMzUMjjc-gS5PLTG!y4YeUXLOzCmlL$o<0O%98)ICHz*__W;Q1K} zp!7@RlEe}=UVz+WuQcmgHK^r4F|os z77;0?=2xV0TqzEr0#lA4Tv12!7dqPW$Xb*Z^>!|IM-;!M1*A>$74gGX8EVdC&!rhi zu3EX-G)BNFX%1?q`kSLjegRq7+I?f;k4?zok7O&$-KY%~p%SDpdj-nV2^#EBZHXb4 zMo{?}J4$pFS=Q1qaQO}@HKlMt6UD;(RJeXXh&ICHeGa5erz{C}-jseOcm6hP;IWOan&W$0O}< z-O)uf*kBEQFz2g?^0z9=v;uMXufdD0o8hw;u=qkRx^Aou-8OY^_`b18aNXnR8=iTH ze-dfO*NddA$63qE`7U9lG(GUVl=@u?%`GzWjx=v?uw4Xrh3&&bli7{rXXo+myRCc? z@t0lT#Fr`clhVwAcUCeR)(TjTzh69B3qH|V9p030~Z?$6TI&$Y7j}FlDCJpaPre#llXspnA zj3`Vj0+wc^&!ZPHON=oiE&_9YHXE;Uz)4cxqG*Ct&8Dgb9DKJJoVZbfb{WMiCsh$~ z8iKi)ETsw`d0Z>IJVDNh$U!d(|7say!ONU};bu6->$z;$fz_}1xsd)P)5O~L&O46f zt1gzvz#yi@8vl7pP`hSCEZc$w24|=PO>sKrjDM;kpJ;PPw#sKLDI>Tc6qywga`5VhNCSeTV z5}hKIRx~l(N<@WRbb%(%Fpt>T4iyXA_qLGJ+Mt`zg&a=#^GeVuWt!uj4aWV9eG@ zQKnioe6QC1I%^e|?+GH6W*w~GBC^uHK zbbX?(#o&I5$MHhUDI5!ten(`xPG?bv!dQ~hNPD>?@vmR1pJ-kG__6eAr2n+Vq^ zW{l6P!?;|kP7o|^ZuEHw4`kIWB~aECOMtr zg5IO!m?+h`yKp?{c$wsyrNUi`J{>ywJg}~vE_S6p>Snbyd{#}&$lt)5V%A|XB0*;M zQ&K)!kA~h3owR}NsCXn!Tev+P`YrrkzqLiPy0&gOn>>HQ8vfu4;l~oi38nbU*Nz(k zuvKAk9-qyPvZb-igSuehoTFk?=1n1A7=63;Rs8%hc&p<(dXI9K*kV~qR%4xmGeVVl zM6wpBp{~--XTHT+#2#er7H+S~T5&^E!JrM}4P{_SGJAN{((WNL4gj476sjk&k4b!} zSQ)ZN625lGbZPun&Z*-S_B5P6TA@(%)!MX1BNx_$l*s9}e!+-_z#G*5Y4? zF@@LTuWsg|0Z>ddCZS6#WcueqXiqlWsA#_-pYe7T5b$k{G?R}ZN$XFj*0-anAQQ0V z-5lKARAmZ@51?hf5W3yJUGLe16ViI~rPL-pa9fR~^YLhWfHY4i)92#*B;JghX8-e# z9-7XF2X{{NDRb&C5iD5`*GEGURf3O?t&%ur@_v%0w=w-mB8JVDhuwG@|n>G+D`WTQOp`8+-+9ROvU^ zQ%(=QF^I<}$_I1KpMLnu3aalhi@%U#kY~@Qq)9c4Xs|%`Nm1WNesZy{^@MZgE}Qa* zAa0QwL>#3LB*olGKIhG(C4Lu6ypf!U;saGyEHl`pdTXkqNPh;D!k29KmC~%=NdkDw zDy()XRnsqbj1*Q!V26{aPPX~+uuwMMig0y1Xa&8PprSVxih)DV#XojXgIV3S4c>D- zgHph4xkr5&-Ktmx+i0;D%7KI~@CpN`qfMa+t22O($k<2*1>3nueSqVxwR?Nx^?5BlH2q7 zZljGhi=~5Vyp$FD{c^;d#A4m@d3U9!905@=9VJ)3Mcd0G0TEKzD_*A!sy;f#sI|A| z?5y_oIiJl?Fm=4e)Hp)z5#>FXzlyy{iA8-W(;V27OHi3#aXxX&;5lu5AR1ahj9I2j zGPjN+ke$!BnrVo^|D zB?bXxIcON39kE6|-Xf~1=G979*T8n2RY^m*0Ci>ijW^0_YGo-GT&_783cPYd@x{6@ z2&=>92G)FDlx8amztnL}4$szKvsKVulxyzek!|@NmE1M&FggWqzO7#LK641y7Ezfz zz?~rsu0?IwHi55`o_d=_D$x=Dd0ch!9$`ta9C`stPzMDm5?EL#z^vMvgIIuZbq`4h zr@}|3wdR9YNM5|=zwm&!rS#m$V{VaL7c82;P(+T2eNBmj@a8(3F=dZ0NJC(;l~Fng zgB?Q+^If6(5e5&Hb+Of2>B^!2wn%ZBWn3ae03X4J6VD`(JS8rkZ7(N!&FY&4;@cuV z(zMa+1nm%c(fGwq^y>F$X04^Vc1gRQcA6LhY*w{|?&^TrDfNlrsV7cx?p<{&hHvTp zBV#(;XB%z(tQs6*bW7yqk8syQ^j>D2E_*1>gEu)16t`|UVIp(Fs`@oia8oc-sL|OD zH36@aIq0kw%AKdwN4O4=PJl=qG?5iA`64>UEsk<|oaT9&-D3N{FdoeXnFzBh}&USk*VdRvEc|tJz$D4{pQOsk6bQ7iHFx@%*8WAR;=!Z}eEvqNGSqbK(pa&*PpgFaS%M}w zwBLTUw3w+-X;sU6gy_cyZLrK!TU;NyqTq+-DokejpYq%+c^(_@{xsGtg9eThZM(8#4cil@&J(l8tVVehCX}WhGtrR9UnfCJ8}UBspPIO+&kEik7{J znmEO&BoqKjNTo!Q)fFe+m(MfPa13G`qswz4ed*AK>`Bm!NW?UyXVg#kZEA3;B|$am zWncdDIl+&F7Tw|YUKE<{1{_Lx{7bT+k`i{ksOKs|-+H|HC#z5<^UTJy0h-9x_!fM2 z1&i^Qv`lPlu&AN0R>^RT*ZX28lA%g?Eb(m=pSa(pBEfHxAT*Q(7NWzB@zIqhjjABssVwlZmIpr)$7{j0 zinnqgravfGaEhc=<+?%inS(qAq6>j!J*Et!F$e0M1$7;I#8tDOBE};sr-cdDw>@HY zbiLpeYjyW?7C03%r1gPWb4;WL3%;&HuA#fBxoh+8JcRF?SISGy^3y+K#8YxxIgTff zQ5Ua=R>RF1eC)>pWlJo_J0i2r)mxTxZXbLk=iVd@=y-)XxmssE9a!^KN+8@nvgZq4 zL+5|<3lXWL?L_%GrRfsq=m0sc?Mr8 zhc}eBrB=O>C|mfFk-=1s2vTYtEXyB=!&GNbJ7e}bGKysKvS#aN z_C9iqWb(G&H@YIRrCaJkX@h?H+9x}dycD}}A4(b&?9Ixlyw%Z~`y?~Syr8dxWv%iZ zRS|-&IOv%|94UHb{dU8ICtWeCdqVH^HCYa29rmYU)EPt*3@H@eNxzs*5lQ)mam2#4 zBkS>t^Ac{-9i!>FNLn}8@@bN%tu=Mf^I;p$J<_j45ic880TR5hEeD_2e-TAjQzMms z1XScimkbmeI_z5O8XseG<9s4T4X}|+`JBT42f)I`g=o~ITh6jv(QcuXOwVJ4D&=F! zhvpx``t48=c@rgOdS!_I1zkZUDpf3p^HHT#DXjR45WMwpZ_A#(8>K8Frx2CCmLhu=;n1o;381odd_My}k z(tfzTsiLnt?!gWn>;DApRIB72_R+|3PtZ`_Ya{_igS0a0CLxRDR5s_?Wa$IgDu2&F ze{GC|GUjMo!LyH^002Pvm(84j?$)MG?<|1t#m&r2je&nmMRjR5DvR9c1FNf}-f$mR zMWwR0hB=Ov_Ml$be0gz>yKF<+7|Wl=Vd>u zz#)t6_r1QxJ)s`ih!~=}dd+XL??BroR_K`V!jnCH@Jh?gt0pl_C?!Kq@lw%&LLjqH zxYcM9OLn@dK@5b&>;`s zG@M_Sch!;`JKAS}nDULxL58;DCbwov_{r`{cgv>rwhkUsIC8NVrrke$9o9K(FR4r@ zYRpj6QV+JeJ@A!R^)XWhzGY}2*ScT{XlYw&V)FCx%raCFYRRxqXta!=L^K};uJnNy z99RvApYx6{N8jS?cfggL6}XPgGNRR}ddu0yZy29TKVN7{XdYOzXdECoz+pnFzkz`5 z)RQQ&Unlx9b;OQiefo*$>f4H48%LSOJ+0Te0yf(tnzdlH!TJ}o?RbXmt}=6o2$ErQ ze%=;+bpg$$>q*2TW}PHrCYHqNFx1+IMoilWdbitr-LMom1~hK#3_CAL0TK)laUmOJXWo^BV&_MK3-DRbwd<4K!;i}sSy}b`c(?*7k_1g31ZUOI^Ph^$ zKMu%HcL94Cg z4@r*jLRYao39ulO3l<>30_F-|ZtUs`MikH``Yai@(gP>sU|yK%h%Xjqg2poeybo{? zuD-cc6DUB%xWZjp{cZUKbHub`*uK(|M?i=1lP1NCORc#?HeXqRCy4q3;wFkL%+c_@ zFjUc#f{k}NOPKGm71}`*U5A96hjC3~&@$}kCK16czr)FG?GUZu1KK|07<1liv!BHy zHOcD~sMa?#j-H0QOz|s%Sp832u?IYRM?1SrIhO>I+h=VB%!^SUb~^@p94*mXW1aGL z136~V7y3@47)?NX7JJBHc%KYR^Gt^0Vk%25e*eE4JU z3yY>j<@z{1s-^qbkkyS0EW75eNHeU*wxNPv7p@mjA%^SEg*ilp7pK9pmfR5N&-3tj|k_t$j^j@_0Z^=zz^p%IZyC%Hn3U+$9lD{ zJXsB+fI6~ik{{;GwNC<<<>D8hgf#dkoj6B0Nj@7*cMYw#iiN8fj{N247{WcgWDp$X zIGDmrSCbvP)dCo31S`Y{j5Uml%!MPU6{Aiy?AquRFp<+-82434GmCmiV;y1HF<8?_ zY4C_VeD!)}_tgHJTB~9ptriK-=+aafgzzP)2t|I&>pKx}WHBKEknU$N$j!6B3%Uk4S{vyokD3eHZ<|fGac#e&6JFBiau(T0}XDx=I=N&e-j) zKdmg1Q5$rTySG{LHHqSL<||r7&TPNhBq~Ecao^6{R2uuTn42tA0(eGBDs=5(D54EX zI?@+QT_<0YAVuCu%*_kAXdfb@763cD}35Kf*t96M5xSfdWvjf~8~&hg8EoIEvw$I~6ZWctbkE zu3M`oP;a#-$Yw`iR~ z^*%e_Nq;zL=AuiIoS}lV*CW)WNX1C--I0*e{j_IOD|7mG1L~_kr-W#j!rEj_OFLcD zShK^~MkEX#)h$(A-FP$8Br|lH@zEVB_Jt;JkJdIyg|T;PW{$nXoO6wU+*L!wz#k@< z&%jcWf|nA8H1>LgQ$W}r8HIMD%Q*Gz!zRjF!t=$OD!Fu-;P|Ll8Ji08{%9L}f*w4C ziw$E7?xd7EMYqO}4+|etWtNY_p-K_EoKAdUHcRW5xcc$j9H%R)3b$i90Y@vvxiFbY)rvyjCXmH219o~e@V335ZtFC2EG70B3#eWKMJ+m#cLTj#aw<<; zyF#Fxqpv?~Y^1tDsCsW4jw^eESGNDoI29L+({&c>&v{k3HpET2M z=Ls(OX1Y3~e^zc;A+=$4w648QVJFix##kQ0fs9M~`GB2|#)*qEe zQdO%f1F<(MX3bMWQ&}C{*8(ZfysAUTQ=QFEZkL}{yO_Q38$U0_?@fs#VF8gn@H&yZL)nnPw z;^)uLOZ1b6Xw@&x@*wZ@;951PVHXwI3H-z}wzLy>Jgr=@tz3DLzRJO|k9X~JJ6;>* z#7&J}<{Q$gixfJwv$1?m2|JwZP4(aTYW#pL*?|XV{;4tSOE0f~S8H14t)0Qvn-^`L zh^iyxY*}i{%9|J~&&DM)l9yWfu-vn!Ig#n`LviMQ05i9SLuiz@cKF|Ito2lQAFjod zap72iyrYQ0^f+(*VYmBwZKz#}s`1{Fou@@p&9mlmMB56~dMWNw$J^LX zy|?pZ*SCBbc3~f+D=iM_0z}W@BS=H=81cl`@NjDjcQi$u^6^y~nFAq2pa5m5K_d&H zqLsos z!EV_4e?ns z;`Vq#vBSBe-$JN@N?Oj9#KB%0>ZuBIB&+sCU8ClO3Y3a6 z+M;p1k;EaO<02o0QpWMLcLVi@(61GPIOTC3!9K6;_o|Ld2k!Y)3|S5eWIKWtn^<`? zx+^I#1}mc9q`1$1UlC83d@8$Ew@sW}Z1yvJEVpg!*S4wNy6#rchHdwzN`D-uA7I-{ zmn&kbydJ7o3upZWTv>qmwPVZ+<9>SX z8X$A~uPAS>0AN{eZQJ3#Gd6STWC+vCBjWco|w3{M7KZ@B@l~)g(XtHoISz ztmFRV`-`L$$pW0at%Dbo{XK}JP#oou?7}@V*h zNlxMkOCx0{mtQxkl1du_whM5fH|=xxJMI)E<3wdi12C6?26Hd@pCs%bg8lhPNF>b) zG_E$0jC@5n7esGT2qu{1LBi{=zwZ$_@7H`@>`N0ige#_7fkx!x{0yVHuOom2bHE!Zoy zIYd9WoKq{!L0E=^Z4s>?uOxd;4Vr@}t(GaF1cAvMBs`WA2t4X`_?0ks1h?Ve=>M%P zLMu>QvY3wWUfL;UG*Ce}XLb3!gCgLzLcqk);J($hHGvH&H+epZ@%!8!f@~z~p``0o zbcOb@q1tmLj?5%MOHyVt=>%@6K!qoiRUep6)%3L6eZPhJnPb6FMqt?;swkv%An433 zPJkQwkpqp6cwYL3Z=`~go6Ka~8AsChEOhB5F+6?r)m;B|I$B$3NNM=u?T1Bw#4Nv1 zl(b?4q;i0Qm~(bG%IP)<)zXO`T;oyrKr}ze(41@S+>7U?V8>H|`MmjgJ7ZUW*GmG| zaM$SAkgBHQ*L?6HwIEq4w_+fqLM+Xf3Y>EV6ytQ;k_ghz4)8Ck7SvJs z!>&1AF6+%Esb)uC8n0ewedhxAO#O#EE8lRP*$t+7xzGRr=3jZ%4BYmpYG`Er2hYoo zlmA(j54wTzfb+Xg&M(goL+62CBHSyCpb!AatKhzUf+t=mwOhrYV?d(xU6uimx3BY$ zdby3Wd?=@jruV(BB=_o)%1OWEJHAG_yJ~3mq=FG!cjF?C5#3bJy5Y4=Cov^VhM3=Np70^`6IX{kgY(}J~i?7KP0Jqu?!z_9s z2CVCL`7-s1Gapp*)Zr=^S|Q>BRW)b{`3|`r3%9SH)q@B~f7$J>L~JE#NZ2jYV0hye zZP%ByDZRHx#)l!?cSkYe$WZ>es1`8*b}&d!az5iK58i{A_LJ~wwY@Ks)gadwd?GfX?qDMQ5IPXfD8eH5wazQdS%t0y% zibm7TRVf{_0JT?Xu9$QP$;Hn@{n(fqkKi`ee`i(+ImK)<;3xhK><{SwB=&~(_W#T4 z!6ESHk*?AO_Iu=Zv^gRC4lb8)TYN}y@mQlhLv5&DoAGkF#cmVn7>&I7*^f0uv-2*g ziXT66TwO|q9nP+pKm`|PEbknurI^1@EUUL^yc4~;+K|l@htv*mz-_$4F!o^*@w|hW;Pj z<0uy;n`YV1Hd=g%mwf{Vdzv6@oa+@p&O_{0vf6PmUf*c=Fh;V>4ehMlxZj*;1e*gE zx+3%R+oarN-#KS=VT^kkp)eziFrw2ab>XA3he|d3NzR1jkEka5c5fMFp<5k=uP`}Y zs63m}c3AM0Bm>G2Ct%N()9QFI;b350y`1NL!)U`@-z<^mSD%Q~YOzh235zqEynWv2 z(%YGTB_`yE#% z`YBNd-J|G{2c63_tF-Q*=I6Uep_UV!(=L*`GlJ?aq0NA*B^#|IF0}EXzR@fWXE?O* z5U1CVFf6ET1W@S#dSLPDG=N3J@{LIDDj3B2w9U#r|-I==sU^nYFdL;tsu?5_a7HlF@9@aMG!9AE!vL;Zc=uibe6 z9Jm7RV)?)I=KVw>f%;jx_)k4o_6VE)yC^;@CvcLjfMsQFvP zHl+Wiz2={q{d?i^pPGFF=bAq>`?ZYuQ?q|BVg9b!?-iWCHQNSv{`>*^TRrD@gx~8K zeW(6f#7_eJ{e;4?V2khBrOh4cKAI88RXaE2J literal 0 HcmV?d00001 diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index a83a398ff593..c545a898df45 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -47,6 +47,7 @@ #include #include #include +#include #include #include @@ -97,6 +98,7 @@ public: void testN780843(); void testShadow(); void testN782061(); + void testN782345(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) && !defined(WNT) @@ -140,6 +142,7 @@ public: CPPUNIT_TEST(testN780843); CPPUNIT_TEST(testShadow); CPPUNIT_TEST(testN782061); + CPPUNIT_TEST(testN782345); #endif CPPUNIT_TEST_SUITE_END(); @@ -993,6 +996,16 @@ void Test::testN782061() CPPUNIT_ASSERT_EQUAL(sal_Int32(-9), getProperty(getRun(getParagraph(1), 2), "CharEscapement")); } +void Test::testN782345() +{ + /* + * The problem was that the page break was inserted before the 3rd para, instead of before the 2nd para. + */ + load("n782345.docx"); + + CPPUNIT_ASSERT_EQUAL(style::BreakType_PAGE_BEFORE, getProperty(getParagraph(2), "BreakType")); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); From 968ed85d7304fe0044d3f82af20ae7190ad3c33d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 1 Oct 2012 15:42:13 +0200 Subject: [PATCH 118/863] fdo#54225: PDFExport::mbSignPDF potentially used uninitialized Change-Id: I2b83f4c6a1fd0ca4b230ab19c806f654232f9f96 --- filter/source/pdf/pdfexport.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index 5b493ec43397..9ba6f4133af6 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -152,7 +152,8 @@ PDFExport::PDFExport( const Reference< XComponent >& rxSrcDoc, mbExportRelativeFsysLinks ( sal_False ), mnDefaultLinkAction ( 0 ), mbConvertOOoTargetToPDFTarget( sal_False ), - mbExportBmkToDest ( sal_False ) + mbExportBmkToDest ( sal_False ), + mbSignPDF ( false ) { } From e4080dce647edfcec832164fcfb56cb36e220e27 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Mon, 1 Oct 2012 16:50:35 +0200 Subject: [PATCH 119/863] fdo#50163 move definition of PLATFORMID into configure.in Change-Id: Iea8385aa9213ccde7e6650cb934361597d508250 --- config_host.mk.in | 1 + configure.in | 45 +++++++++++++++++++++++++++ sdext/CustomTarget_presenter.mk | 4 +-- sdext/Extension_minimizer.mk | 4 --- sdext/Extension_pdfimport.mk | 4 --- sdext/Extension_presenter.mk | 8 ++--- sdext/Library_presenter.mk | 2 +- sdext/StaticLibrary_pdfimport_s.mk | 4 +-- sdext/platform.mk | 49 ------------------------------ solenv/gbuild/Extension.mk | 8 ----- solenv/gbuild/ExtensionTarget.mk | 10 +----- 11 files changed, 52 insertions(+), 87 deletions(-) delete mode 100644 sdext/platform.mk diff --git a/config_host.mk.in b/config_host.mk.in index 473ab5dd69fa..51990d995e03 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -451,6 +451,7 @@ export PERL=@PERL@ export PKGFORMAT=@PKGFORMAT@ export PKGMK=@PKGMK@ export PKG_CONFIG=@PKG_CONFIG@ +export PLATFORMID=@PLATFORMID@ export PNG_TARBALL=@PNG_TARBALL@ export POPPLER_CFLAGS=@POPPLER_CFLAGS@ export POPPLER_LIBS=@POPPLER_LIBS@ diff --git a/configure.in b/configure.in index 906c530da25a..4c44b7d65969 100644 --- a/configure.in +++ b/configure.in @@ -3286,6 +3286,7 @@ aix*) OS=AIX RTL_OS=AIX RTL_ARCH=PowerPC + PLATFORMID=aix_powerpc OUTPATH=unxaigppc P_SEP=: SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib" @@ -3308,11 +3309,13 @@ cygwin*) CPUNAME=X86_64 RTL_ARCH=X86_64 LIB64="lib/x64" + PLATFORMID=windows_x86_64 OUTPATH=wntmscx$COMEX else CPU=I CPUNAME=INTEL RTL_ARCH=x86 + PLATFORMID=windows_x86 OUTPATH=wntmsci$COMEX fi ;; @@ -3340,6 +3343,7 @@ darwin*) CPUNAME=ARM RTL_ARCH=ARM_EABI GUIBASE=cocoatouch + PLATFORMID=macosx_arm_eabi OUTPATH=unxiosr OS=IOS ;; @@ -3347,6 +3351,7 @@ darwin*) CPU=P CPUNAME=POWERPC RTL_ARCH=PowerPC + PLATFORMID=macosx_powerpc OUTPATH=unxmacxp ;; i*86) @@ -3356,6 +3361,7 @@ darwin*) CPU=I CPUNAME=INTEL RTL_ARCH=x86 + PLATFORMID=macosx_x86 OUTPATH=unxmacxi ;; x86_64) @@ -3363,11 +3369,13 @@ darwin*) CPU=X CPUNAME=X86_64 RTL_ARCH=X86_64 + PLATFORMID=macosx_x86_64 OUTPATH=unxmacxx else CPU=I CPUNAME=INTEL RTL_ARCH=x86 + PLATFORMID=macosx_x86 OUTPATH=unxmacxi fi ;; @@ -3392,11 +3400,13 @@ dragonfly*) CPU=I CPUNAME=INTEL RTL_ARCH=x86 + PLATFORMID=dragonfly_x86 ;; x86_64) CPU=X CPUNAME=X86_64 RTL_ARCH=X86_64 + PLATFORMID=dragonfly_x86_64 ;; *) AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os]) @@ -3421,12 +3431,14 @@ freebsd*) CPU=I CPUNAME=INTEL RTL_ARCH=x86 + PLATFORMID=freebsd_x86 OUTPATH=unxfbsdi ;; x86_64) CPU=X CPUNAME=X86_64 RTL_ARCH=X86_64 + PLATFORMID=freebsd_x86_64 ;; *) AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os]) @@ -3451,6 +3463,7 @@ kfreebsd*) CPU=I CPUNAME=INTEL RTL_ARCH=x86 + PLATFORMID=kfreebsd_x86 OUTPATH=unxkfgi6 ;; x86_64) @@ -3458,6 +3471,7 @@ kfreebsd*) CPUNAME=X86_64 RTL_ARCH=X86_64 LIB64="lib64" + PLATFORMID=kfreebsd_x86_64 OUTPATH=unxkfgx6 ;; *) @@ -3483,6 +3497,7 @@ linux-gnu*) CPU=L CPUNAME=AXP RTL_ARCH=ALPHA + PLATFORMID=linux_alpha OUTPATH=unxlngaxp ;; arm*) @@ -3491,9 +3506,11 @@ linux-gnu*) EPM_FLAGS="-a arm" OUTPATH=unxlngr RTL_ARCH=ARM_EABI + PLATFORMID=linux_arm_eabi case "$host_cpu" in arm*-linux) RTL_ARCH=ARM_OABI + PLATFORMID=linux_arm_oabi ;; esac ;; @@ -3502,18 +3519,21 @@ linux-gnu*) CPUNAME=HPPA RTL_ARCH=HPPA EPM_FLAGS="-a hppa" + PLATFORMID=linux_hppa OUTPATH=unxlnghppa ;; i*86) CPU=I CPUNAME=INTEL RTL_ARCH=x86 + PLATFORMID=linux_x86 OUTPATH=unxlngi6 ;; ia64) CPU=A CPUNAME=IA64 RTL_ARCH=IA64 + PLATFORMID=linux_ia64 OUTPATH=unxlnga ;; mips) @@ -3521,6 +3541,7 @@ linux-gnu*) CPUNAME=GODSON RTL_ARCH=MIPS_EB EPM_FLAGS="-a mips" + PLATFORMID=linux_mips_eb OUTPATH=unxlngmips ;; mips64) @@ -3528,6 +3549,7 @@ linux-gnu*) CPUNAME=GODSON RTL_ARCH=MIPS_EB EPM_FLAGS="-a mips64" + PLATFORMID=linux_mips_eb OUTPATH=unxlngmips ;; mips64el) @@ -3535,6 +3557,7 @@ linux-gnu*) CPUNAME=GODSON RTL_ARCH=MIPS_EL EPM_FLAGS="-a mips64el" + PLATFORMID=linux_mips_el OUTPATH=unxlngmips ;; mipsel) @@ -3542,18 +3565,21 @@ linux-gnu*) CPUNAME=GODSON RTL_ARCH=MIPS_EL EPM_FLAGS="-a mipsel" + PLATFORMID=linux_mips_el OUTPATH=unxlngmips ;; m68k) CPU=6 CPUNAME=M68K RTL_ARCH=M68K + PLATFORMID=linux_m68k OUTPATH=unxlngm68k ;; powerpc) CPU=P CPUNAME=POWERPC RTL_ARCH=PowerPC + PLATFORMID=linux_powerpc OUTPATH=unxlngppc ;; powerpc64) @@ -3561,18 +3587,21 @@ linux-gnu*) CPUNAME=POWERPC64 RTL_ARCH=PowerPC_64 LIB64="lib64" + PLATFORMID=linux_powerpc_64 OUTPATH=unxlngppc64 ;; sparc) CPU=S CPUNAME=SPARC RTL_ARCH=SPARC + PLATFORMID=linux_sparc OUTPATH=unxlngs ;; s390) CPU=3 CPUNAME=S390 RTL_ARCH=S390 + PLATFORMID=linux_s390 OUTPATH=unxlngs390 ;; s390x) @@ -3580,6 +3609,7 @@ linux-gnu*) CPUNAME=S390X RTL_ARCH=S390x LIB64="lib64" + PLATFORMID=linux_s390x OUTPATH=unxlngs390x ;; x86_64) @@ -3587,6 +3617,7 @@ linux-gnu*) CPUNAME=X86_64 RTL_ARCH=X86_64 LIB64="lib64" + PLATFORMID=linux_x86_64 OUTPATH=unxlngx6 ;; *) @@ -3612,18 +3643,21 @@ linux-android*) CPU=R CPUNAME=ARM RTL_ARCH=ARM_EABI + PLATFORMID=android_arm_eabi OUTPATH=unxandr ;; mips|mipsel) CPU=M CPUNAME=GODSON # Weird, but maybe that's the LO convention? RTL_ARCH=MIPS_EL + PLATFORMID=android_mips_el OUTPATH=unxandm ;; i*86) CPU=I CPUNAME=INTEL RTL_ARCH=x86 + PLATFORMID=android_x86 OUTPATH=unxandi ;; *) @@ -3648,11 +3682,13 @@ mingw*) CPU=X CPUNAME=X86_64 RTL_ARCH=X86_84 + PLATFORMID=windows_x86_64 OUTPATH=wntgccx$COMEX else CPU=I CPUNAME=INTEL RTL_ARCH=x86 + PLATFORMID=windows_x86 OUTPATH=wntgcci$COMEX fi ;; @@ -3680,21 +3716,25 @@ mingw*) CPU=I CPUNAME=INTEL RTL_ARCH=x86 + PLATFORMID=netbsd_x86 ;; powerpc) CPU=P CPUNAME=POWERPC RTL_ARCH=PowerPC + PLATFORMID=netbsd_powerpc ;; sparc) CPU=S CPUNAME=SPARC RTL_ARCH=SPARC + PLATFORMID=netbsd_sparc ;; x86_64) CPU=X CPUNAME=X86_64 RTL_ARCH=X86_64 + PLATFORMID=netbsd_x86_64 ;; *) AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os]) @@ -3719,11 +3759,13 @@ openbsd*) CPU=I CPUNAME=INTEL RTL_ARCH=x86 + PLATFORMID=openbsd_x86 ;; x86_64) CPU=X CPUNAME=X86_64 RTL_ARCH=X86_64 + PLATFORMID=openbsd_x86_64 ;; *) AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os]) @@ -3751,12 +3793,14 @@ solaris*) CPU=I CPUNAME=INTEL RTL_ARCH=x86 + PLATFORMID=solaris_x86 OUTPATH=unxsogi ;; sparc) CPU=S CPUNAME=SPARC RTL_ARCH=SPARC + PLATFORMID=solaris_sparc OUTPATH=unxsogs ;; *) @@ -3809,6 +3853,7 @@ AC_SUBST(OUTPATH) AC_SUBST(P_SEP) AC_SUBST(SOLARVER) AC_SUBST(WORKDIR) +AC_SUBST(PLATFORMID) dnl =================================================================== dnl Test which package format to use diff --git a/sdext/CustomTarget_presenter.mk b/sdext/CustomTarget_presenter.mk index afecd49f763a..e559bde7167c 100644 --- a/sdext/CustomTarget_presenter.mk +++ b/sdext/CustomTarget_presenter.mk @@ -30,12 +30,10 @@ $(eval $(call gb_CustomTarget_CustomTarget,sdext/source/presenter/help/en-US/com $(call gb_CustomTarget_get_target,sdext/source/presenter/help/en-US/com.sun.PresenterScreen) : \ $(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)/presenter.xhp -include $(SRCDIR)/sdext/platform.mk - $(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)/presenter.xhp : \ $(SRCDIR)/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp \ | $(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1) - sed "s/PLATFORMID/$(sdext_PLATFORM)/" < $< > $@ + sed "s/PLATFORMID/$(PLATFORMID)/" < $< > $@ # vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/sdext/Extension_minimizer.mk b/sdext/Extension_minimizer.mk index 2e4d1ff27b86..17142fccf66b 100644 --- a/sdext/Extension_minimizer.mk +++ b/sdext/Extension_minimizer.mk @@ -25,12 +25,8 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))platform.mk - $(eval $(call gb_Extension_Extension,presentation-minimizer,sdext/source/minimizer)) -$(eval $(call gb_Extension_set_platform,presentation-minimizer,$(sdext_PLATFORM))) - $(eval $(call gb_Extension_add_libraries,presentation-minimizer,\ SunPresentationMinimizer \ )) diff --git a/sdext/Extension_pdfimport.mk b/sdext/Extension_pdfimport.mk index c5692dec763c..a97ddff3e13e 100644 --- a/sdext/Extension_pdfimport.mk +++ b/sdext/Extension_pdfimport.mk @@ -25,12 +25,8 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))platform.mk - $(eval $(call gb_Extension_Extension,pdfimport,sdext/source/pdfimport)) -$(eval $(call gb_Extension_set_platform,pdfimport,$(sdext_PLATFORM))) - $(eval $(call gb_Extension_add_file,pdfimport,components.rdb,$(call gb_Rdb_get_target,pdfimport))) $(eval $(call gb_Extension_add_libraries,pdfimport,\ diff --git a/sdext/Extension_presenter.mk b/sdext/Extension_presenter.mk index 66f93a8f2a81..bdd584f0cc12 100644 --- a/sdext/Extension_presenter.mk +++ b/sdext/Extension_presenter.mk @@ -25,12 +25,8 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))platform.mk - $(eval $(call gb_Extension_Extension,presenter-screen,sdext/source/presenter)) -$(eval $(call gb_Extension_set_platform,presenter-screen,$(sdext_PLATFORM))) - $(eval $(call gb_Extension_add_libraries,presenter-screen,\ PresenterScreen \ )) @@ -141,9 +137,9 @@ $(eval $(call gb_Extension_add_files,presenter-screen,registry/data/org/openoffi $(call gb_XcuDataTarget_get_target,sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu) \ )) -$(eval $(call gb_Extension_add_helpfile,presenter-screen,$(WORKDIR)/CustomTarget/sdext/source/presenter/help/en-US,com.sun.PresenterScreen-$(sdext_PLATFORM)/presenter.xhp,com.sun.PresenterScreen/presenter.xhp)) +$(eval $(call gb_Extension_add_helpfile,presenter-screen,$(WORKDIR)/CustomTarget/sdext/source/presenter/help/en-US,com.sun.PresenterScreen-$(PLATFORMID)/presenter.xhp,com.sun.PresenterScreen/presenter.xhp)) -$(eval $(call gb_Extension_add_helptreefile,presenter-screen,$(SRCDIR)/sdext/source/presenter/help/en-US,/help.tree,com.sun.PresenterScreen/help.tree,com.sun.PresenterScreen-$(sdext_PLATFORM))) +$(eval $(call gb_Extension_add_helptreefile,presenter-screen,$(SRCDIR)/sdext/source/presenter/help/en-US,/help.tree,com.sun.PresenterScreen/help.tree,com.sun.PresenterScreen-$(PLATFORMID))) diff --git a/sdext/Library_presenter.mk b/sdext/Library_presenter.mk index ca404ca9f33d..7dcb3fd1551a 100644 --- a/sdext/Library_presenter.mk +++ b/sdext/Library_presenter.mk @@ -32,7 +32,7 @@ $(eval $(call gb_Library_set_componentfile,PresenterScreen,sdext/source/presente $(eval $(call gb_Library_use_sdk_api,PresenterScreen)) $(eval $(call gb_Library_add_defs,PresenterScreen,\ - -DPRESENTER_IMPL_IDENTIFIER=\"com.sun.PresenterScreen-$(sdext_PLATFORM)\" \ + -DPRESENTER_IMPL_IDENTIFIER=\"com.sun.PresenterScreen-$(PLATFORMID)\" \ )) $(eval $(call gb_Library_use_libraries,PresenterScreen,\ diff --git a/sdext/StaticLibrary_pdfimport_s.mk b/sdext/StaticLibrary_pdfimport_s.mk index bf49da31070b..7e648abf8abf 100644 --- a/sdext/StaticLibrary_pdfimport_s.mk +++ b/sdext/StaticLibrary_pdfimport_s.mk @@ -25,8 +25,6 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))platform.mk - $(eval $(call gb_StaticLibrary_StaticLibrary,pdfimport_s)) $(eval $(call gb_StaticLibrary_use_packages,pdfimport_s,\ @@ -56,7 +54,7 @@ $(eval $(call gb_StaticLibrary_set_include,pdfimport_s,\ $(eval $(call gb_StaticLibrary_add_defs,pdfimport_s,\ -DBOOST_SPIRIT_USE_OLD_NAMESPACE \ - -DPDFI_IMPL_IDENTIFIER=\"com.sun.star.PDFImport-$(sdext_PLATFORM)\" \ + -DPDFI_IMPL_IDENTIFIER=\"com.sun.star.PDFImport-$(PLATFORMID)\" \ )) $(eval $(call gb_StaticLibrary_add_exception_objects,pdfimport_s,\ diff --git a/sdext/platform.mk b/sdext/platform.mk deleted file mode 100644 index 2c818c8e179d..000000000000 --- a/sdext/platform.mk +++ /dev/null @@ -1,49 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2012 Red Hat, Inc., David Tardon -# (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -# TODO -# https://bugs.freedesktop.org/show_bug.cgi?id=50163 -# move definition of PLATFORMID into configure.in -# - -sdext__LOWERCASE_TABLE := A-a B-b C-c D-d E-e F-f G-g H-h I-i J-j K-k L-l M-m N-n O-o P-p R-r S-s T-t U-u V-v W-w X-x Y-y Z-z - -define sdext__lcase_impl -$(if $(3),$(call sdext__lcase,$(firstword $(3)),$(3),$(subst $(1),$(2),$(4))),$(subst $(1),$(2),$(4))) -endef - -define sdext__lcase -$(call sdext__lcase_impl,$(firstword $(subst -, ,$(1))),$(lastword $(subst -, ,$(1))),$(wordlist 2,$(words $(2)),$(2)),$(3)) -endef - -define sdext__lowercase -$(call sdext__lcase,$(firstword $(sdext__LOWERCASE_TABLE)),$(sdext__LOWERCASE_TABLE),$(1)) -endef - -sdext_PLATFORM := $(call sdext__lowercase,$(RTL_OS)_$(RTL_ARCH)) - -# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index c728e0d83d15..281bac89420a 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -41,14 +41,6 @@ $$(eval $$(call gb_Module_register_target,$(call gb_Extension_get_target,$(1)),$ endef -# Set platform. -# -# Only use this if the extension is platform-dependent. -define gb_Extension_set_platform -$(call gb_ExtensionTarget_set_platform,$(1),$(2)) - -endef - define gb_Extension_add_file $(call gb_ExtensionTarget_add_file,$(1),$(2),$(3)) diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk index 75b9e0c16bd8..91f1be3ed57a 100644 --- a/solenv/gbuild/ExtensionTarget.mk +++ b/solenv/gbuild/ExtensionTarget.mk @@ -127,7 +127,7 @@ $(call gb_ExtensionTarget_get_target,$(1)) : DESCRIPTION := $(call gb_ExtensionTarget_get_target,$(1)) : FILES := META-INF description.xml $(call gb_ExtensionTarget_get_target,$(1)) : LICENSE := $(call gb_ExtensionTarget_get_target,$(1)) : LOCATION := $(SRCDIR)/$(2) -$(call gb_ExtensionTarget_get_target,$(1)) : PLATFORM := +$(call gb_ExtensionTarget_get_target,$(1)) : PLATFORM := $(PLATFORMID) $(call gb_ExtensionTarget_get_target,$(1)) : PRJNAME := $(firstword $(subst /, ,$(2))) $(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : $(SRCDIR)/$(2)/description.xml ifneq ($(strip $(gb_WITH_LANG)),) @@ -139,14 +139,6 @@ $(foreach lang,$(gb_ExtensionTarget_ALL_LANGS), \ $(call gb_ExtensionTarget__compile_help_onelang,$(1),$(lang))) endef -# Set platform. -# -# Only use this if the extension is platform-dependent. -define gb_ExtensionTarget_set_platform -$(call gb_ExtensionTarget_get_target,$(1)) : PLATFORM := $(2) - -endef - # Use the default license file define gb_ExtensionTarget_use_default_license $(call gb_ExtensionTarget_get_target,$(1)) : FILES += registration From fa614231733800f4a961b77e36c86f8840d12251 Mon Sep 17 00:00:00 2001 From: Ivan Timofeev Date: Mon, 1 Oct 2012 20:46:34 +0400 Subject: [PATCH 120/863] String -> OUString Change-Id: Ie5e800df0c7663e6bb62a2019cf2fd8b0c1ae772 --- starmath/inc/caret.hxx | 2 +- starmath/inc/node.hxx | 20 +++++++++--------- starmath/source/cursor.cxx | 34 +++++++++++++++--------------- starmath/source/mathmlexport.cxx | 16 +++++++------- starmath/source/mathtype.cxx | 22 +++++++++---------- starmath/source/node.cxx | 20 +++++++++--------- starmath/source/ooxmlexport.cxx | 12 +++++------ starmath/source/rtfexport.cxx | 10 ++++----- starmath/source/visitors.cxx | 16 +++++++------- starmath/source/wordexportbase.cxx | 2 +- 10 files changed, 77 insertions(+), 77 deletions(-) diff --git a/starmath/inc/caret.hxx b/starmath/inc/caret.hxx index b97e00305e36..c38685d1a326 100644 --- a/starmath/inc/caret.hxx +++ b/starmath/inc/caret.hxx @@ -64,7 +64,7 @@ struct SmCaretPos{ */ static SmCaretPos GetPosAfter(SmNode* pNode) { if(pNode && pNode->GetType() == NTEXT) - return SmCaretPos(pNode, ((SmTextNode*)pNode)->GetText().Len()); + return SmCaretPos(pNode, ((SmTextNode*)pNode)->GetText().getLength()); return SmCaretPos(pNode, 1); } }; diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx index 78167251c563..45c96696d433 100644 --- a/starmath/inc/node.hxx +++ b/starmath/inc/node.hxx @@ -443,16 +443,16 @@ public: */ class SmTextNode : public SmVisibleNode { - XubString aText; + OUString aText; sal_uInt16 nFontDesc; /** Index within text where the selection starts * @remarks Only valid if SmNode::IsSelected() is true */ - xub_StrLen nSelectionStart; + sal_Int32 nSelectionStart; /** Index within text where the selection ends * @remarks Only valid if SmNode::IsSelected() is true */ - xub_StrLen nSelectionEnd; + sal_Int32 nSelectionEnd; protected: SmTextNode(SmNodeType eNodeType, const SmToken &rNodeToken, sal_uInt16 nFontDescP ); @@ -461,10 +461,10 @@ public: SmTextNode(const SmToken &rNodeToken, sal_uInt16 nFontDescP ); sal_uInt16 GetFontDesc() const { return nFontDesc; } - void SetText(const XubString &rText) { aText = rText; } - const XubString & GetText() const { return aText; } + void SetText(const OUString &rText) { aText = rText; } + const OUString & GetText() const { return aText; } /** Change the text of this node, including the underlying token */ - void ChangeText(const XubString &rText) { + void ChangeText(const OUString &rText) { aText = rText; SmToken token = GetToken(); token.aText = rText; @@ -476,15 +476,15 @@ public: /** Index within GetText() where the selection starts * @remarks Only valid of SmNode::IsSelected() is true */ - xub_StrLen GetSelectionStart() const {return nSelectionStart;} + sal_Int32 GetSelectionStart() const {return nSelectionStart;} /** Index within GetText() where the selection end * @remarks Only valid of SmNode::IsSelected() is true */ - xub_StrLen GetSelectionEnd() const {return nSelectionEnd;} + sal_Int32 GetSelectionEnd() const {return nSelectionEnd;} /** Set the index within GetText() where the selection starts */ - void SetSelectionStart(xub_StrLen index) {nSelectionStart = index;} + void SetSelectionStart(sal_Int32 index) {nSelectionStart = index;} /** Set the index within GetText() where the selection end */ - void SetSelectionEnd(xub_StrLen index) {nSelectionEnd = index;} + void SetSelectionEnd(sal_Int32 index) {nSelectionEnd = index;} virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell); virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat); diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx index de674f491b77..c3514ad6e873 100644 --- a/starmath/source/cursor.cxx +++ b/starmath/source/cursor.cxx @@ -338,7 +338,7 @@ void SmCursor::InsertNodes(SmNodeList* pNewNodes){ if(newIt == pNewNodes->begin()) patchIt = insIt; if((*newIt)->GetType() == NTEXT) - PosAfterInsert = SmCaretPos(*newIt, ((SmTextNode*)*newIt)->GetText().Len()); + PosAfterInsert = SmCaretPos(*newIt, ((SmTextNode*)*newIt)->GetText().getLength()); else PosAfterInsert = SmCaretPos(*newIt, 1); } @@ -362,12 +362,12 @@ SmNodeList::iterator SmCursor::FindPositionInLineList(SmNodeList* pLineList, SmC //Split textnode if needed if(aCaretPos.Index > 0){ SmTextNode* pText = (SmTextNode*)aCaretPos.pSelectedNode; - XubString str1 = pText->GetText().Copy(0, aCaretPos.Index); - XubString str2 = pText->GetText().Copy(aCaretPos.Index); + OUString str1 = pText->GetText().copy(0, aCaretPos.Index); + OUString str2 = pText->GetText().copy(aCaretPos.Index); pText->ChangeText(str1); ++it; //Insert str2 as new text node - if(str2.Len() > 0){ + if(!str2.isEmpty()){ SmTextNode* pNewText = new SmTextNode(pText->GetToken(), pText->GetFontDesc()); pNewText->ChangeText(str2); it = pLineList->insert(it, pNewText); @@ -405,8 +405,8 @@ SmCaretPos SmCursor::PatchLineList(SmNodeList* pLineList, SmNodeList::iterator a next->GetToken().eType == TNUMBER) ){ SmTextNode *pText = (SmTextNode*)prev, *pOldN = (SmTextNode*)next; - SmCaretPos retval(pText, pText->GetText().Len()); - String newText; + SmCaretPos retval(pText, pText->GetText().getLength()); + OUString newText; newText += pText->GetText(); newText += pOldN->GetText(); pText->ChangeText(newText); @@ -426,14 +426,14 @@ SmCaretPos SmCursor::PatchLineList(SmNodeList* pLineList, SmNodeList::iterator a if(aIter == pLineList->begin()) return SmCaretPos(); if((*aIter)->GetType() == NTEXT) - return SmCaretPos(*aIter, ((SmTextNode*)*aIter)->GetText().Len()); + return SmCaretPos(*aIter, ((SmTextNode*)*aIter)->GetText().getLength()); return SmCaretPos(*aIter, 1); } if(prev && next && next->GetType() == NPLACE && !SmNodeListParser::IsOperator(prev->GetToken())){ aIter = pLineList->erase(aIter); delete next; if(prev->GetType() == NTEXT) - return SmCaretPos(prev, ((SmTextNode*)prev)->GetText().Len()); + return SmCaretPos(prev, ((SmTextNode*)prev)->GetText().getLength()); return SmCaretPos(prev, 1); } @@ -441,7 +441,7 @@ SmCaretPos SmCursor::PatchLineList(SmNodeList* pLineList, SmNodeList::iterator a if(!prev) //return an invalid to indicate we're in front of line return SmCaretPos(); if(prev->GetType() == NTEXT) - return SmCaretPos(prev, ((SmTextNode*)prev)->GetText().Len()); + return SmCaretPos(prev, ((SmTextNode*)prev)->GetText().getLength()); return SmCaretPos(prev, 1); } @@ -454,19 +454,19 @@ SmNodeList::iterator SmCursor::TakeSelectedNodesFromList(SmNodeList *pLineList, //Split text nodes if((*it)->GetType() == NTEXT) { SmTextNode* pText = (SmTextNode*)*it; - String aText = pText->GetText(); + OUString aText = pText->GetText(); //Start and lengths of the segments, 2 is the selected segment int start2 = pText->GetSelectionStart(), start3 = pText->GetSelectionEnd(), len1 = start2 - 0, len2 = start3 - start2, - len3 = aText.Len() - start3; + len3 = aText.getLength() - start3; SmToken aToken = pText->GetToken(); sal_uInt16 eFontDesc = pText->GetFontDesc(); //If we need make segment 1 if(len1 > 0) { int start1 = 0; - String str = aText.Copy(start1, len1); + OUString str = aText.copy(start1, len1); pText->ChangeText(str); ++it; } else {//Remove it if not needed @@ -477,14 +477,14 @@ SmNodeList::iterator SmCursor::TakeSelectedNodesFromList(SmNodeList *pLineList, retval = it; //if we need make segment 3 if(len3 > 0) { - String str = aText.Copy(start3, len3); + OUString str = aText.copy(start3, len3); SmTextNode* pSeg3 = new SmTextNode(aToken, eFontDesc); pSeg3->ChangeText(str); retval = pLineList->insert(it, pSeg3); } //If we need to save the selected text if(pSelectedNodes && len2 > 0) { - String str = aText.Copy(start2, len2); + String str = aText.copy(start2, len2); SmTextNode* pSeg2 = new SmTextNode(aToken, eFontDesc); pSeg2->ChangeText(str); pSelectedNodes->push_back(pSeg2); @@ -1203,7 +1203,7 @@ void SmCursor::Copy(){ SmTextNode *pClone = new SmTextNode( pText->GetToken(), pText->GetFontDesc() ); int start = pText->GetSelectionStart(), length = pText->GetSelectionEnd() - pText->GetSelectionStart(); - pClone->ChangeText(pText->GetText().Copy(start, length)); + pClone->ChangeText(pText->GetText().copy(start, length)); pClone->SetScaleMode(pText->GetScaleMode()); pList->push_front(pClone); } else { @@ -1323,7 +1323,7 @@ SmNodeList* SmCursor::CloneLineToList(SmStructureNode* pLine, bool bOnlyIfSelect SmTextNode *pClone = new SmTextNode( it->GetToken(), pText->GetFontDesc() ); int start = pText->GetSelectionStart(), length = pText->GetSelectionEnd() - pText->GetSelectionStart(); - pClone->ChangeText(pText->GetText().Copy(start, length)); + pClone->ChangeText(pText->GetText().copy(start, length)); pClone->SetScaleMode(pText->GetScaleMode()); pList->push_back(pClone); } else @@ -1490,7 +1490,7 @@ bool SmCursor::IsAtTailOfBracket(SmBracketType eBracketType, SmBraceNode** ppBra if (pNode->GetType() == NTEXT) { SmTextNode* pTextNode = static_cast(pNode); - if (pos.Index < pTextNode->GetText().Len()) { + if (pos.Index < pTextNode->GetText().getLength()) { // The cursor is on a text node and at the middle of it. return false; } diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx index 20a3e74bcb0c..2c083680d8a0 100644 --- a/starmath/source/mathmlexport.cxx +++ b/starmath/source/mathmlexport.cxx @@ -824,7 +824,7 @@ void SmXMLExport::ExportMath(const SmNode *pNode, int /*nLevel*/) const SmMathSymbolNode *pTemp = static_cast(pNode); SvXMLElementExport aMath(*this, XML_NAMESPACE_MATH, XML_MO, sal_True, sal_False); sal_Unicode nArse[2]; - nArse[0] = pTemp->GetText().GetChar(0); + nArse[0] = pTemp->GetText()[0]; sal_Unicode cTmp = ConvertMathToMathML( nArse[0] ); if (cTmp != 0) nArse[0] = cTmp; @@ -845,9 +845,9 @@ void SmXMLExport::ExportText(const SmNode *pNode, int /*nLevel*/) //Note that we change the fontstyle to italic for strings that //are italic and longer than a single character. sal_Bool bIsItalic = IsItalic( pTemp->GetFont() ); - if ((pTemp->GetText().Len() > 1) && bIsItalic) + if ((pTemp->GetText().getLength() > 1) && bIsItalic) AddAttribute(XML_NAMESPACE_MATH, XML_MATHVARIANT, XML_ITALIC); - else if ((pTemp->GetText().Len() == 1) && !bIsItalic) + else if ((pTemp->GetText().getLength() == 1) && !bIsItalic) AddAttribute(XML_NAMESPACE_MATH, XML_MATHVARIANT, XML_NORMAL); pText = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MI,sal_True,sal_False); break; @@ -859,7 +859,7 @@ void SmXMLExport::ExportText(const SmNode *pNode, int /*nLevel*/) pText = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MTEXT,sal_True,sal_False); break; } - GetDocHandler()->characters(OUString(pTemp->GetText().GetBuffer())); + GetDocHandler()->characters(pTemp->GetText()); delete pText; } @@ -1030,11 +1030,11 @@ void SmXMLExport::ExportBrace(const SmNode *pNode, int nLevel) sal_Unicode nArse[2]; nArse[1] = 0; nArse[0] = static_cast< - const SmMathSymbolNode* >(pLeft)->GetText().GetChar(0); + const SmMathSymbolNode* >(pLeft)->GetText()[0]; OSL_ENSURE(nArse[0] != 0xffff,"Non existent symbol"); AddAttribute(XML_NAMESPACE_MATH, XML_OPEN,nArse); nArse[0] = static_cast< - const SmMathSymbolNode* >(pRight)->GetText().GetChar(0); + const SmMathSymbolNode* >(pRight)->GetText()[0]; OSL_ENSURE(nArse[0] != 0xffff,"Non existent symbol"); AddAttribute(XML_NAMESPACE_MATH, XML_CLOSE,nArse); pFences = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MFENCED, @@ -1406,8 +1406,8 @@ void SmXMLExport::ExportNodes(const SmNode *pNode, int nLevel) { sal_Unicode cTmp = 0; const SmTextNode *pTemp = static_cast< const SmTextNode * >(pNode); - if (pTemp->GetText().Len() > 0) - cTmp = ConvertMathToMathML( pTemp->GetText().GetChar(0) ); + if (!pTemp->GetText().isEmpty()) + cTmp = ConvertMathToMathML( pTemp->GetText()[0] ); if (cTmp == 0) { // no conversion to MathML implemented -> export it as text diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx index 1fb812baf268..69aeabe2ce77 100644 --- a/starmath/source/mathtype.cxx +++ b/starmath/source/mathtype.cxx @@ -1995,7 +1995,7 @@ sal_uInt8 MathType::HandleNodes(SmNode *pNode,int nLevel) SmTextNode *pText=(SmTextNode *)pNode; //if the token str and the result text are the same then this //is to be seen as text, else assume its a mathchar - if (pText->GetText() == pText->GetToken().aText) + if (pText->GetText() == OUString(pText->GetToken().aText)) HandleText(pText,nLevel); else HandleMath(pText,nLevel); @@ -3078,16 +3078,16 @@ void MathType::HandleMath(SmNode *pNode, int /*nLevel*/) return; } SmMathSymbolNode *pTemp=(SmMathSymbolNode *)pNode; - for(xub_StrLen i=0;iGetText().Len();i++) + for(sal_Int32 i=0;iGetText().getLength();i++) { - sal_Unicode nArse = SmTextNode::ConvertSymbolToUnicode(pTemp->GetText().GetChar(i)); + sal_Unicode nArse = SmTextNode::ConvertSymbolToUnicode(pTemp->GetText()[i]); if ((nArse == 0x2224) || (nArse == 0x2288) || (nArse == 0x2285) || (nArse == 0x2289)) { *pS << sal_uInt8(CHAR|0x20); } else if ((nPendingAttributes) && - (i == ((pTemp->GetText().Len()+1)/2)-1)) + (i == ((pTemp->GetText().getLength()+1)/2)-1)) { *pS << sal_uInt8(0x22); } @@ -3209,7 +3209,7 @@ void MathType::HandleAttributes(SmNode *pNode,int nLevel) case TOVERLINE: //If the next node is not text //or text with more than one char if ((pIsText->GetToken().eType != TTEXT) || - (pIsText->GetText().Len() > 1)) + (pIsText->GetText().getLength() > 1)) nOldPending = StartTemplate(0x11); break; default: @@ -3229,7 +3229,7 @@ void MathType::HandleAttributes(SmNode *pNode,int nLevel) break; case TOVERLINE: if ((pIsText->GetToken().eType != TTEXT) || - (pIsText->GetText().Len() > 1)) + (pIsText->GetText().getLength() > 1)) EndTemplate(nOldPending); break; default: @@ -3276,7 +3276,7 @@ void MathType::HandleAttributes(SmNode *pNode,int nLevel) break; case TOVERLINE: if ((pIsText->GetToken().eType == TTEXT) && - (pIsText->GetText().Len() == 1)) + (pIsText->GetText().getLength() == 1)) *pS << sal_uInt8(17); break; case TBREVE: @@ -3302,10 +3302,10 @@ void MathType::HandleAttributes(SmNode *pNode,int nLevel) void MathType::HandleText(SmNode *pNode, int /*nLevel*/) { SmTextNode *pTemp=(SmTextNode *)pNode; - for(xub_StrLen i=0;iGetText().Len();i++) + for(sal_Int32 i=0;iGetText().getLength();i++) { if ((nPendingAttributes) && - (i == ((pTemp->GetText().Len()+1)/2)-1)) + (i == ((pTemp->GetText().getLength()+1)/2)-1)) { *pS << sal_uInt8(0x22); //char, with attributes right //after the character @@ -3319,7 +3319,7 @@ void MathType::HandleText(SmNode *pNode, int /*nLevel*/) else if (pNode->GetFont().GetWeight() == WEIGHT_BOLD) nFace = 0x7; *pS << sal_uInt8(nFace+128); //typeface - sal_uInt16 nChar = pTemp->GetText().GetChar(i); + sal_uInt16 nChar = pTemp->GetText()[i]; *pS << SmTextNode::ConvertSymbolToUnicode(nChar); //Mathtype can only have these sort of character @@ -3335,7 +3335,7 @@ void MathType::HandleText(SmNode *pNode, int /*nLevel*/) //entities which cannot occur in mathtype e.g. a Summation //symbol so these attributes may be lost if ((nPendingAttributes) && - (i == ((pTemp->GetText().Len()+1)/2)-1)) + (i == ((pTemp->GetText().getLength()+1)/2)-1)) { *pS << sal_uInt8(EMBEL); while (nPendingAttributes) diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx index e8bd3b4f5213..eb2883bde514 100644 --- a/starmath/source/node.cxx +++ b/starmath/source/node.cxx @@ -2458,11 +2458,11 @@ void SmTextNode::AdjustFontDesc() nTok = pEntry->eType; nFontDesc = FNT_FUNCTION; } else { - sal_Unicode firstChar = aText.GetChar(0); + sal_Unicode firstChar = aText[0]; if( ('0' <= firstChar && firstChar <= '9') || firstChar == '.' || firstChar == ',') { nFontDesc = FNT_NUMBER; nTok = TNUMBER; - } else if (aText.Len() > 1) { + } else if (aText.getLength() > 1) { nFontDesc = FNT_VARIABLE; nTok = TIDENT; } else { @@ -2734,9 +2734,9 @@ void SmMathSymbolNode::Prepare(const SmFormat &rFormat, const SmDocShell &rDocSh void SmMathSymbolNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) { - const XubString &rText = GetText(); + const OUString &rText = GetText(); - if (rText.Len() == 0 || rText.GetChar(0) == xub_Unicode('\0')) + if (rText.isEmpty() || rText[0] == '\0') { SmRect::operator = (SmRect()); return; } @@ -2902,7 +2902,7 @@ void SmSpecialNode::Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell if (NULL != (pSym = pp->GetSymbolManager().GetSymbolByName( aName ))) { sal_UCS4 cChar = pSym->GetCharacter(); - String aTmp( OUString( &cChar, 1 ) ); + OUString aTmp( &cChar, 1 ); SetText( aTmp ); GetFont() = pSym->GetFace(); } @@ -2928,7 +2928,7 @@ void SmSpecialNode::Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell if (bIsFromGreekSymbolSet) { - OSL_ENSURE( GetText().Len() == 1, "a symbol should only consist of 1 char!" ); + OSL_ENSURE( GetText().getLength() == 1, "a symbol should only consist of 1 char!" ); bool bItalic = false; sal_Int16 nStyle = rFormat.GetGreekCharStyle(); OSL_ENSURE( nStyle >= 0 && nStyle <= 2, "unexpected value for GreekCharStyle" ); @@ -2936,12 +2936,12 @@ void SmSpecialNode::Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell bItalic = true; else if (nStyle == 2) { - String aTmp( GetText() ); - if (aTmp.Len() > 0) + const OUString& rTmp(GetText()); + if (rTmp.isEmpty()) { const sal_Unicode cUppercaseAlpha = 0x0391; const sal_Unicode cUppercaseOmega = 0x03A9; - sal_Unicode cChar = aTmp.GetBuffer()[0]; + sal_Unicode cChar = rTmp[0]; // uppercase letters should be straight and lowercase letters italic bItalic = !(cUppercaseAlpha <= cChar && cChar <= cUppercaseOmega); } @@ -3023,7 +3023,7 @@ void SmErrorNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SmTmpDevice aTmpDev ((OutputDevice &) rDev, true); aTmpDev.SetFont(GetFont()); - const XubString &rText = GetText(); + const OUString &rText = GetText(); SmRect::operator = (SmRect(aTmpDev, &rFormat, rText, GetFont().GetBorderWidth())); } diff --git a/starmath/source/ooxmlexport.cxx b/starmath/source/ooxmlexport.cxx index f9b716237461..a918cb295265 100644 --- a/starmath/source/ooxmlexport.cxx +++ b/starmath/source/ooxmlexport.cxx @@ -85,11 +85,11 @@ void SmOoxmlExport::HandleText( const SmNode* pNode, int /*nLevel*/) m_pSerializer->startElementNS( XML_m, XML_t, FSNS( XML_xml, XML_space ), "preserve", FSEND ); SmTextNode* pTemp=(SmTextNode* )pNode; SAL_INFO( "starmath.ooxml", "Text:" << OUStringToOString( pTemp->GetText(), RTL_TEXTENCODING_UTF8 ).getStr()); - for(xub_StrLen i=0;iGetText().Len();i++) + for(sal_Int32 i=0;iGetText().getLength();i++) { #if 0 if ((nPendingAttributes) && - (i == ((pTemp->GetText().Len()+1)/2)-1)) + (i == ((pTemp->GetText().getLength()+1)/2)-1)) { *pS << sal_uInt8(0x22); //char, with attributes right //after the character @@ -104,7 +104,7 @@ void SmOoxmlExport::HandleText( const SmNode* pNode, int /*nLevel*/) nFace = 0x7; *pS << sal_uInt8(nFace+128); //typeface #endif - sal_uInt16 nChar = pTemp->GetText().GetChar(i); + sal_uInt16 nChar = pTemp->GetText()[i]; m_pSerializer->writeEscaped( OUString( SmTextNode::ConvertSymbolToUnicode(nChar))); #if 0 @@ -121,7 +121,7 @@ void SmOoxmlExport::HandleText( const SmNode* pNode, int /*nLevel*/) //entities which cannot occur in mathtype e.g. a Summation //symbol so these attributes may be lost if ((nPendingAttributes) && - (i == ((pTemp->GetText().Len()+1)/2)-1)) + (i == ((pTemp->GetText().getLength()+1)/2)-1)) { *pS << sal_uInt8(EMBEL); while (nPendingAttributes) @@ -250,8 +250,8 @@ static OString mathSymbolToString( const SmNode* node ) { assert( node->GetType() == NMATH ); const SmTextNode* txtnode = static_cast< const SmTextNode* >( node ); - assert( txtnode->GetText().Len() == 1 ); - sal_Unicode chr = SmTextNode::ConvertSymbolToUnicode( txtnode->GetText().GetChar( 0 )); + assert( txtnode->GetText().getLength() == 1 ); + sal_Unicode chr = SmTextNode::ConvertSymbolToUnicode( txtnode->GetText()[0] ); return OUStringToOString( OUString( chr ), RTL_TEXTENCODING_UTF8 ); } diff --git a/starmath/source/rtfexport.cxx b/starmath/source/rtfexport.cxx index 7e37ac39de76..5d9695f71cdc 100644 --- a/starmath/source/rtfexport.cxx +++ b/starmath/source/rtfexport.cxx @@ -73,9 +73,9 @@ void SmRtfExport::HandleText(const SmNode* pNode, int /*nLevel*/) SmTextNode* pTemp=(SmTextNode* )pNode; SAL_INFO("starmath.rtf", "Text: " << pTemp->GetText()); - for (xub_StrLen i = 0; i < pTemp->GetText().Len(); i++) + for (sal_Int32 i = 0; i < pTemp->GetText().getLength(); i++) { - sal_uInt16 nChar = pTemp->GetText().GetChar(i); + sal_uInt16 nChar = pTemp->GetText()[i]; OUString aValue(SmTextNode::ConvertSymbolToUnicode(nChar)); m_pBuffer->append(msfilter::rtfutil::OutString(aValue, m_nEncoding)); } @@ -197,10 +197,10 @@ OString mathSymbolToString(const SmNode* node, rtl_TextEncoding nEncoding) { assert(node->GetType() == NMATH); const SmTextNode* txtnode = static_cast(node); - if (txtnode->GetText().Len() == 0) + if (txtnode->GetText().isEmpty()) return OString(); - assert(txtnode->GetText().Len() == 1); - sal_Unicode chr = SmTextNode::ConvertSymbolToUnicode(txtnode->GetText().GetChar(0)); + assert(txtnode->GetText().getLength() == 1); + sal_Unicode chr = SmTextNode::ConvertSymbolToUnicode(txtnode->GetText()[0]); OUString aValue(chr); return msfilter::rtfutil::OutString(aValue, nEncoding); } diff --git a/starmath/source/visitors.cxx b/starmath/source/visitors.cxx index f1b835a462ee..dc930ecc65ea 100644 --- a/starmath/source/visitors.cxx +++ b/starmath/source/visitors.cxx @@ -742,7 +742,7 @@ void SmDrawingVisitor::Visit( SmRectangleNode* pNode ) void SmDrawingVisitor::DrawTextNode( SmTextNode* pNode ) { - if ( pNode->IsPhantom( ) || pNode->GetText( ).Len( ) == 0 || pNode->GetText( ).GetChar( 0 ) == xub_Unicode( '\0' ) ) + if ( pNode->IsPhantom() || pNode->GetText().isEmpty() || pNode->GetText()[0] == '\0' ) return; SmTmpDevice2 aTmpDev ( ( OutputDevice & ) rDev, false ); @@ -936,15 +936,15 @@ void SmSetSelectionVisitor::Visit( SmTextNode* pNode ) { IsSelecting = false; } else if( !IsSelecting && i1 != -1 ) { start = i1; - end = pNode->GetText( ).Len( ); + end = pNode->GetText().getLength(); IsSelecting = true; } else if( !IsSelecting && i2 != -1 ) { start = i2; - end = pNode->GetText( ).Len( ); + end = pNode->GetText().getLength(); IsSelecting = true; } else if( IsSelecting ) { start = 0; - end = pNode->GetText( ).Len( ); + end = pNode->GetText().getLength(); } else { pNode->SetSelected( false ); start = 0; @@ -1329,9 +1329,9 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmMatrixNode* pNode ) */ void SmCaretPosGraphBuildingVisitor::Visit( SmTextNode* pNode ) { - OSL_ENSURE( pNode->GetText( ).Len( ) > 0, "Empty SmTextNode is bad" ); + OSL_ENSURE( !pNode->GetText().isEmpty(), "Empty SmTextNode is bad" ); - int size = pNode->GetText( ).Len( ); + int size = pNode->GetText().getLength(); for( int i = 1; i <= size; i++ ){ SmCaretPosGraphEntry* pRight = pRightMost; pRightMost = pGraph->Add( SmCaretPos( pNode, i ), pRight ); @@ -2302,10 +2302,10 @@ void SmNodeToTextVisitor::Visit( SmFontNode* pNode ) default: break; } - Append( String( ::rtl::math::doubleToUString( + Append( ::rtl::math::doubleToUString( static_cast( pNode->GetSizeParameter( ) ), rtl_math_StringFormat_Automatic, - rtl_math_DecimalPlaces_Max, '.', sal_True ) ) ); + rtl_math_DecimalPlaces_Max, '.', sal_True ) ); Append( " " ); } break; diff --git a/starmath/source/wordexportbase.cxx b/starmath/source/wordexportbase.cxx index 3181697edf9f..1e720b4b6f1c 100644 --- a/starmath/source/wordexportbase.cxx +++ b/starmath/source/wordexportbase.cxx @@ -77,7 +77,7 @@ void SmWordExportBase::HandleNode( const SmNode* pNode, int nLevel ) const SmTextNode* pText= static_cast< const SmTextNode* >( pNode ); //if the token str and the result text are the same then this //is to be seen as text, else assume its a mathchar - if (pText->GetText() == pText->GetToken().aText) + if (pText->GetText() == OUString(pText->GetToken().aText)) HandleText(pText,nLevel); else HandleMath(pText,nLevel); From 6fe5360e0b8876c5e7a5d1465e7772a1d84f4065 Mon Sep 17 00:00:00 2001 From: Ivan Timofeev Date: Mon, 1 Oct 2012 20:58:03 +0400 Subject: [PATCH 121/863] fix String->OUString conversion Change-Id: I65d9cda603aa95f36df57494195b159f9d2619ac --- xmlsecurity/source/dialogs/certificateviewer.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index b75e37e96c5a..27e0cbcba048 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -171,9 +171,9 @@ CertificateViewerGeneralTP::CertificateViewerGeneralTP( Window* _pParent, Certif utl::typeConvert( xCert->getNotValidBefore(), aDateTimeStart ); utl::typeConvert( xCert->getNotValidAfter(), aDateTimeEnd ); OUString sText = maValidDateFI.GetText(); - sText.replaceFirst( "%SDATE%", + sText = sText.replaceFirst( "%SDATE%", GetSettings().GetUILocaleDataWrapper().getDate( aDateTimeStart.GetDate() ) ); - sText.replaceFirst( "%EDATE%", + sText = sText.replaceFirst( "%EDATE%", GetSettings().GetUILocaleDataWrapper().getDate( aDateTimeEnd.GetDate() ) ); maValidDateFI.SetText( sText ); From f3f706274172879324884e845629ef74b2e2e443 Mon Sep 17 00:00:00 2001 From: Thorsten Behrens Date: Mon, 1 Oct 2012 19:33:34 +0200 Subject: [PATCH 122/863] Outline methods with conditionals in editeng --- editeng/source/editeng/editdoc.cxx | 15 +++++++++++++++ editeng/source/editeng/editdoc.hxx | 9 ++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index cb13c9128972..560d7cac5a09 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -1034,6 +1034,21 @@ sal_Bool operator != ( const EditLine& r1, const EditLine& r2 ) return !( r1 == r2 ); } +void EditLine::SetHeight( sal_uInt16 nH, sal_uInt16 nTxtH, sal_uInt16 nCrsrH ) +{ + nHeight = nH; + nTxtHeight = ( nTxtH ? nTxtH : nH ); + nCrsrHeight = ( nCrsrH ? nCrsrH : nTxtHeight ); +} + +void EditLine::SetStartPosX( long start ) +{ + if (start > 0) + nStartPosX = start; + else + nStartPosX = 0; +} + Size EditLine::CalcTextSize( ParaPortion& rParaPortion ) { Size aSz; diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx index c595ea86889e..2c303eed2093 100644 --- a/editeng/source/editeng/editdoc.hxx +++ b/editeng/source/editeng/editdoc.hxx @@ -513,11 +513,7 @@ public: sal_uInt16 GetEndPortion() const { return nEndPortion; } sal_uInt16& GetEndPortion() { return nEndPortion; } - void SetHeight( sal_uInt16 nH, sal_uInt16 nTxtH = 0, sal_uInt16 nCrsrH = 0 ) - { nHeight = nH; - nTxtHeight = ( nTxtH ? nTxtH : nH ); - nCrsrHeight = ( nCrsrH ? nCrsrH : nTxtHeight ); - } + void SetHeight( sal_uInt16 nH, sal_uInt16 nTxtH = 0, sal_uInt16 nCrsrH = 0 ); sal_uInt16 GetHeight() const { return nHeight; } sal_uInt16 GetTxtHeight() const { return nTxtHeight; } sal_uInt16 GetCrsrHeight() const { return nCrsrHeight; } @@ -534,8 +530,7 @@ public: sal_uInt16 GetLen() const { return nEnd - nStart; } sal_uInt16 GetStartPosX() const { return nStartPosX; } - void SetStartPosX( long start ) { if (start > 0) nStartPosX = start; else nStartPosX = 0; } - + void SetStartPosX( long start ); Size CalcTextSize( ParaPortion& rParaPortion ); bool IsInvalid() const { return bInvalid; } From 78272699f3fdad03c960b4888452ddb7049e24fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Guilherme=20Vanz?= Date: Mon, 1 Oct 2012 19:57:16 +0200 Subject: [PATCH 123/863] fdo#51304: Java author and commented code removal. This patch removes '@author' annotation, code in comments and adjust some empty catches. It's cleanup patch Change-Id: Ia0e61765dd06a61bae5419e5f723232f7711044c --- .../star/wizards/agenda/AgendaTemplate.java | 17 --- .../agenda/AgendaWizardDialogImpl.java | 21 --- .../star/wizards/agenda/TemplateConsts.java | 6 - .../star/wizards/agenda/TopicsControl.java | 3 - .../sun/star/wizards/common/ConfigNode.java | 1 - .../sun/star/wizards/common/ConfigSet.java | 4 - .../star/wizards/common/Configuration.java | 6 - .../sun/star/wizards/common/DebugHelper.java | 6 +- .../com/sun/star/wizards/common/Desktop.java | 9 -- .../sun/star/wizards/common/FileAccess.java | 99 +------------- .../com/sun/star/wizards/common/Helper.java | 7 - .../sun/star/wizards/common/Indexable.java | 4 - .../sun/star/wizards/common/JavaTools.java | 37 ------ .../wizards/common/NamedValueCollection.java | 4 - .../sun/star/wizards/common/Properties.java | 1 - .../star/wizards/common/PropertyNames.java | 4 - wizards/com/sun/star/wizards/common/UCB.java | 3 - .../sun/star/wizards/common/XMLHelper.java | 4 - .../sun/star/wizards/common/XMLProvider.java | 4 - .../sun/star/wizards/db/BlindtextCreator.java | 4 - .../star/wizards/db/RelationController.java | 2 - .../wizards/document/DatabaseControl.java | 27 ---- .../com/sun/star/wizards/document/Shape.java | 2 - .../star/wizards/form/FormConfiguration.java | 6 - .../star/wizards/query/CallQueryWizard.java | 3 - .../star/wizards/report/CallReportWizard.java | 23 ---- .../report/IReportBuilderLayouter.java | 1 - .../report/IReportDefinitionReadAccess.java | 1 - .../star/wizards/report/IReportDocument.java | 3 - .../report/ReportImplementationHelper.java | 5 - .../report/ReportTextImplementation.java | 37 ------ .../ReportBuilderImplementation.java | 3 - .../layout/ColumnarSingleColumn.java | 5 - .../layout/ColumnarThreeColumns.java | 4 - .../layout/ColumnarTwoColumns.java | 5 - .../reportbuilder/layout/DesignTemplate.java | 7 - .../layout/InBlocksLabelsAbove.java | 10 -- .../layout/InBlocksLabelsLeft.java | 7 - .../reportbuilder/layout/LayoutConstants.java | 4 - .../layout/ReportBuilderLayouter.java | 122 +----------------- .../layout/SectionEmptyObject.java | 4 - .../reportbuilder/layout/SectionLabel.java | 6 +- .../reportbuilder/layout/SectionObject.java | 4 - .../layout/SectionTextField.java | 4 - .../wizards/reportbuilder/layout/Tabular.java | 5 - .../sun/star/wizards/table/CGCategory.java | 3 - .../star/wizards/table/ScenarioSelector.java | 2 - .../com/sun/star/wizards/ui/ButtonList.java | 99 +------------- .../sun/star/wizards/ui/ControlScroller.java | 2 - .../wizards/ui/DBLimitedFieldSelection.java | 6 - .../sun/star/wizards/ui/DocumentPreview.java | 9 -- .../sun/star/wizards/ui/FieldSelection.java | 17 +-- .../com/sun/star/wizards/ui/ImageList.java | 122 +----------------- .../com/sun/star/wizards/ui/PeerConfig.java | 5 - wizards/com/sun/star/wizards/ui/UIConsts.java | 3 - .../com/sun/star/wizards/ui/UnoDialog.java | 32 +---- .../wizards/ui/event/AbstractListener.java | 1 - .../star/wizards/ui/event/CommonListener.java | 4 - .../sun/star/wizards/ui/event/DataAware.java | 5 - .../sun/star/wizards/ui/event/EventNames.java | 4 - .../wizards/ui/event/ListModelBinder.java | 29 ----- .../wizards/ui/event/MethodInvocation.java | 1 - .../star/wizards/ui/event/RadioDataAware.java | 3 - .../com/sun/star/wizards/ui/event/Task.java | 18 --- .../sun/star/wizards/ui/event/TaskEvent.java | 3 - .../star/wizards/ui/event/TaskListener.java | 3 - .../star/wizards/ui/event/UnoDataAware.java | 3 - .../star/wizards/web/BackgroundsDialog.java | 3 - .../sun/star/wizards/web/ErrorHandler.java | 3 - .../star/wizards/web/ExtensionVerifier.java | 1 - .../com/sun/star/wizards/web/IconsDialog.java | 8 -- .../sun/star/wizards/web/ImageListDialog.java | 9 -- .../sun/star/wizards/web/LogTaskListener.java | 1 - wizards/com/sun/star/wizards/web/Process.java | 26 ---- .../star/wizards/web/ProcessErrorHandler.java | 1 - .../sun/star/wizards/web/ProcessErrors.java | 1 - .../wizards/web/ProcessStatusRenderer.java | 2 - .../sun/star/wizards/web/StatusDialog.java | 8 -- .../sun/star/wizards/web/StylePreview.java | 1 - .../com/sun/star/wizards/web/TOCPreview.java | 3 +- .../com/sun/star/wizards/web/WWD_Events.java | 21 +-- .../com/sun/star/wizards/web/WWD_General.java | 8 -- .../com/sun/star/wizards/web/WWD_Startup.java | 33 ----- wizards/com/sun/star/wizards/web/WWHID.java | 3 - .../com/sun/star/wizards/web/WebWizard.java | 3 - .../sun/star/wizards/web/WebWizardDialog.java | 46 +------ .../sun/star/wizards/web/data/CGDocument.java | 7 - .../sun/star/wizards/web/data/CGSettings.java | 3 - .../star/wizards/web/data/ConfigSetItem.java | 4 - .../star/wizards/web/data/TypeDetection.java | 4 - .../wizards/web/export/AbstractExporter.java | 7 - .../web/export/ConfiguredExporter.java | 3 - .../star/wizards/web/export/CopyExporter.java | 3 - .../sun/star/wizards/web/export/Exporter.java | 4 - .../wizards/web/export/FilterExporter.java | 2 - .../web/export/ImpressHTMLExporter.java | 10 -- .../sun/star/wizards/web/status/ErrorLog.java | 3 - .../wizards/web/status/ErrorReporter.java | 3 - .../wizards/web/status/LogTaskListener.java | 3 - .../com/sun/star/wizards/web/status/Task.java | 15 --- .../star/wizards/web/status/TaskEvent.java | 3 - .../star/wizards/web/status/TaskListener.java | 3 - 102 files changed, 16 insertions(+), 1160 deletions(-) diff --git a/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java b/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java index 5e810e34bd11..6be8215f8498 100644 --- a/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java +++ b/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java @@ -18,8 +18,6 @@ package com.sun.star.wizards.agenda; import java.util.*; - - import com.sun.star.awt.TextEvent; import com.sun.star.beans.PropertyValue; import com.sun.star.container.NoSuchElementException; @@ -538,9 +536,7 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data drawTopicConstants(); _allItems.clear(); - //_allItems = null; constItems.clear(); - //constItems = null; } /** @@ -584,7 +580,6 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data } } } -// private void initializeConstantTitles() { XTextRange item = null; @@ -667,7 +662,6 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data trDeadline = item; constItems.remove(i--); } -// } } @@ -994,7 +988,6 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data for (int i = 0; i < allSections.length; i++) { Object section = getSection(allSections[i]); - //Try3.showProps(section); boolean visible = ((Boolean) Helper.getUnoPropertyValue(section, "IsVisible")).booleanValue(); if (!visible) { @@ -1384,8 +1377,6 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data * since there is anyway only one instance of this class at runtime * it could have also be implemented in the AgendaTemplate class * but for clarity and separation I decided to make a sub class for it. - * - * @author rp143992 */ public class Topics { @@ -1884,7 +1875,6 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data public static void removeTableRows(Object table, int start, int count) { XTableRows rows = UnoRuntime.queryInterface(XTextTable.class, table).getRows(); - //rows.removeByIndex(start, count); } /** @@ -1948,8 +1938,6 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data */ /** * Interface that is used for writing content to a Uno Text / TextRange - * @author rp143992 - * */ interface AgendaElement { @@ -1966,7 +1954,6 @@ interface AgendaElement /** * Basic implementation of the AgendaElement interface - * writes nothing, but applies a ParaStyle to the given XText/XTextRange - * @author rp143992 * * TODO To change the template for this generated type comment go to * Window - Preferences - Java - Code Style - Code Templates @@ -2010,7 +1997,6 @@ class ParaStyled implements AgendaElement * A basic implementation of AgendaElement: * writes a String to the given XText/XTextRange, and applies * a ParaStyle to it (using the parent class). - * @author rp143992 */ class TextElement extends ParaStyled { @@ -2041,7 +2027,6 @@ class TextElement extends ParaStyled /** * A Text element which, if the text to write is empty (null or PropertyNames.EMPTY_STRING) * inserts a placeholder instead. - * @author rp143992 * * TODO To change the template for this generated type comment go to * Window - Preferences - Java - Code Style - Code Templates @@ -2096,7 +2081,6 @@ class PlaceholderTextElement extends TextElement /** * An Agenda element which writes no text, but inserts a placeholder, and formats * it using a ParaStyleName. - * @author rp143992 * */ class PlaceholderElement extends ParaStyled @@ -2141,7 +2125,6 @@ class PlaceholderElement extends ParaStyled * gets as a parameter a table cursor, and writes * a text to the cell marked by this table cursor, and * a place holder to the next cell. - * @author rp143992 * * TODO To change the template for this generated type comment go to * Window - Preferences - Java - Code Style - Code Templates diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java index 33924bee21bb..adab22a168a9 100644 --- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java +++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java @@ -57,7 +57,6 @@ import com.sun.star.uno.XInterface; * there is not much business logic here - but mostley * event methods. * Some event methods are also implemented in TopicsControl and TopicsControl.ControlRow. - * @author rp143992 */ public class AgendaWizardDialogImpl extends AgendaWizardDialog { @@ -238,7 +237,6 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog setControlProperty("listPageDesign", PropertyNames.STRING_ITEM_LIST, agendaTemplates[0]); checkSavePath(); - //setFilename(agenda.cp_TemplatePath); UnoDataAware.attachListBox( agenda, "cp_AgendaType", listPageDesign , null, true ).updateUI(); UnoDataAware.attachCheckBox( agenda, "cp_IncludeMinutes", chkMinutes, null, true).updateUI(); @@ -289,16 +287,6 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog } - /* - private void initializePaths() { - try { - - sUserTemplatePath = FileAccess.getOfficePath(xMSF, "Template", "user"); - sBitmapPath = FileAccess.combinePaths(xMSF, sTemplatePath, "/../wizard/bitmap"); - } catch (NoValidPathException e) { - e.printStackTrace(); - } - }*/ /** * read the available agenda wizard templates. @@ -309,7 +297,6 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog XPropertySet xPropertySet = UnoRuntime.queryInterface(XPropertySet.class, xPathInterface); sTemplatePath = ((String[]) xPropertySet.getPropertyValue("Template_user"))[0]; - //sCurrentNorm = Norms[getCurrentLetter().cp_Norm]; String sAgendaPath = FileAccess.combinePaths(xMSF, sTemplatePath, "/../common/wizard/agenda" ); agendaTemplates = FileAccess.getFolderTitles(xMSF, "aw" , sAgendaPath); @@ -482,7 +469,6 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog bSaveSuccess = OfficeDocument.store(xMSF, xTextDocument, sPath , "writer8_template", false ); } catch (Exception e) { SystemDialog.showMessageBox(xMSF, xControl.getPeer(), "ErrorBox", VclWindowPeerAttribute.OK, resources.resErrSaveTemplate); - //e.printStackTrace(); } if (bSaveSuccess) { @@ -515,11 +501,7 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog * } */ - //xWindow.setVisible(false); - //running = false; agendaTemplate.xTextDocument.unlockControllers(); - //closeDocument(); - //removeTerminateListener(); PropertyValue loadValues[] = new PropertyValue[2]; loadValues[0] = new PropertyValue(); @@ -534,10 +516,8 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog try { loadValues[1].Value = UnoRuntime.queryInterface(XInteractionHandler.class, xMSF.createInstance("com.sun.star.comp.uui.UUIInteractionHandler")); } catch (Exception e) { - // TODO Auto-generated catch block e.printStackTrace(); } - //Object oDoc = OfficeDocument.load(Desktop.getDesktop(xMSF), agenda.cp_TemplatePath, "_default", new PropertyValue[0]); Object oDoc = OfficeDocument.load(Desktop.getDesktop(xMSF), sPath, "_default", new PropertyValue[0]); xTextDocument = (com.sun.star.text.XTextDocument) oDoc; XMultiServiceFactory xDocMSF = UnoRuntime.queryInterface(XMultiServiceFactory.class, xTextDocument); @@ -559,7 +539,6 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog private void closeDocument() { try { - //xComponent.dispose(); XCloseable xCloseable = UnoRuntime.queryInterface(XCloseable.class, agendaTemplate.xFrame); xCloseable.close(false); } catch (CloseVetoException e) { diff --git a/wizards/com/sun/star/wizards/agenda/TemplateConsts.java b/wizards/com/sun/star/wizards/agenda/TemplateConsts.java index e96edf274560..c2d5b7071f05 100644 --- a/wizards/com/sun/star/wizards/agenda/TemplateConsts.java +++ b/wizards/com/sun/star/wizards/agenda/TemplateConsts.java @@ -17,10 +17,6 @@ */ package com.sun.star.wizards.agenda; -/** - * @author rpiterman - * - */ public interface TemplateConsts { @@ -135,7 +131,6 @@ public interface TemplateConsts public final static String FILLIN_MINUTE_RESPONSIBLE = ""; public final static String FILLIN_MINUTE_TIME = ""; -// public final static String FILLIN_DATETITLE = "#datetitle#"; public final static String FILLIN_TIMETITLE = "#timetitle#"; public final static String FILLIN_LOCATIONTITLE = "#locationtitle#"; @@ -151,5 +146,4 @@ public interface TemplateConsts public final static String FILLIN_TO_DO = "#to-do#"; public final static String FILLIN_RESPONSIBLE_PARTY = "#responsible-party#"; public final static String FILLIN_DEADLINE = "#deadline#"; -// } diff --git a/wizards/com/sun/star/wizards/agenda/TopicsControl.java b/wizards/com/sun/star/wizards/agenda/TopicsControl.java index 975217b3eee6..4a72e26d89c9 100644 --- a/wizards/com/sun/star/wizards/agenda/TopicsControl.java +++ b/wizards/com/sun/star/wizards/agenda/TopicsControl.java @@ -44,7 +44,6 @@ import com.sun.star.wizards.ui.event.EventNames; import com.sun.star.wizards.ui.event.MethodInvocation; /** - * @author rpiterman * This class implements the UI functionality of the topics scroller control. *
* During developement, there has been a few changes which were not *fully* done - @@ -1083,8 +1082,6 @@ public class TopicsControl extends ControlScroller implements XFocusListener }; /** - * - * @author rp143992 * A class represting a single GUI row. * Note that the instance methods of this class * are being called and handle controls of diff --git a/wizards/com/sun/star/wizards/common/ConfigNode.java b/wizards/com/sun/star/wizards/common/ConfigNode.java index c9704e2c5a5c..593cb9d27d78 100644 --- a/wizards/com/sun/star/wizards/common/ConfigNode.java +++ b/wizards/com/sun/star/wizards/common/ConfigNode.java @@ -23,7 +23,6 @@ package com.sun.star.wizards.common; * OO Configuration.
* There are 2 direct implementations: ConfigGroup and ConfigSet. * The root is the first Java Object in the configuration hirarchie. - * @author rpiterman */ public interface ConfigNode { diff --git a/wizards/com/sun/star/wizards/common/ConfigSet.java b/wizards/com/sun/star/wizards/common/ConfigSet.java index 5266c694e2b2..64e15f72b224 100644 --- a/wizards/com/sun/star/wizards/common/ConfigSet.java +++ b/wizards/com/sun/star/wizards/common/ConfigSet.java @@ -25,10 +25,6 @@ import javax.swing.event.ListDataEvent; import org.w3c.dom.*; -/** - * - * @author rpiterman - */ public class ConfigSet implements ConfigNode, XMLProvider, ListModel { diff --git a/wizards/com/sun/star/wizards/common/Configuration.java b/wizards/com/sun/star/wizards/common/Configuration.java index da18fdc7b72a..fdf882b762d7 100644 --- a/wizards/com/sun/star/wizards/common/Configuration.java +++ b/wizards/com/sun/star/wizards/common/Configuration.java @@ -38,7 +38,6 @@ import com.sun.star.util.XChangesBatch; * NOTE: not yet supported, but sometime later, * If you will ommit the "parent" parameter, then the "name" parameter must be in hierarchy form from * the root of the registry. - * @author rpiterman */ public abstract class Configuration { @@ -220,8 +219,6 @@ public abstract class Configuration public static Locale getOfficeLocale(XMultiServiceFactory xMSF) { Locale aLocLocale = new Locale(); - // Object oMasterKey = getConfigurationRoot(xMSF, "org.openoffice.Setup/L10N/", false); - // String sLocale = (String) Helper.getUnoObjectbyName(oMasterKey, "ooLocale"); String sLocale = getOfficeLocaleString(xMSF); String[] sLocaleList = JavaTools.ArrayoutofString(sLocale, "-"); aLocLocale.Language = sLocaleList[0]; @@ -272,9 +269,6 @@ public abstract class Configuration else { - /*if (xNameContainer.hasByName(name)) - xNameContainer.removeByName(name);*/ - // create a new detached set element (instance of DataSourceDescription) XSingleServiceFactory xElementFactory = UnoRuntime.queryInterface(XSingleServiceFactory.class, configView); diff --git a/wizards/com/sun/star/wizards/common/DebugHelper.java b/wizards/com/sun/star/wizards/common/DebugHelper.java index c89da38800c0..16c39fb53286 100644 --- a/wizards/com/sun/star/wizards/common/DebugHelper.java +++ b/wizards/com/sun/star/wizards/common/DebugHelper.java @@ -19,13 +19,9 @@ package com.sun.star.wizards.common; import com.sun.star.uno.Exception; -/** - * - * @author ll93751 - */ public class DebugHelper { - +//TODO - Verify these methods. Can not remove? public static void exception(String DetailedMessage, Exception ex, int err, String additionalArgument) throws java.lang.Exception { // throw new UnsupportedOperationException("Not supported yet."); diff --git a/wizards/com/sun/star/wizards/common/Desktop.java b/wizards/com/sun/star/wizards/common/Desktop.java index 1a0637430a9a..f089350c2878 100644 --- a/wizards/com/sun/star/wizards/common/Desktop.java +++ b/wizards/com/sun/star/wizards/common/Desktop.java @@ -17,14 +17,7 @@ */ package com.sun.star.wizards.common; -// import java.util.Date; - -// import com.sun.star.awt.XToolkit; import com.sun.star.beans.PropertyValue; -// import com.sun.star.frame.XDesktop; -// import com.sun.star.frame.XFrame; -// import com.sun.star.frame.XFramesSupplier; - import com.sun.star.lang.WrappedTargetException; import com.sun.star.lang.XComponent; import com.sun.star.lang.XMultiComponentFactory; @@ -347,8 +340,6 @@ public class Desktop /** * @deprecated used to retrieve the most common paths used in the office application - * @author bc93774 - * */ public class OfficePathRetriever { diff --git a/wizards/com/sun/star/wizards/common/FileAccess.java b/wizards/com/sun/star/wizards/common/FileAccess.java index 46e4f8a55fb9..dfb5d68b7bc4 100644 --- a/wizards/com/sun/star/wizards/common/FileAccess.java +++ b/wizards/com/sun/star/wizards/common/FileAccess.java @@ -21,7 +21,6 @@ import com.sun.star.beans.XPropertySet; import com.sun.star.lang.Locale; import com.sun.star.uno.Exception; import com.sun.star.util.XMacroExpander; -// import com.sun.star.wizards.common.NoValidPathException; import java.io.File; import java.util.ArrayList; import java.util.Arrays; @@ -30,7 +29,6 @@ import java.util.Vector; import com.sun.star.awt.VclWindowPeerAttribute; import com.sun.star.io.XActiveDataSink; import com.sun.star.io.XInputStream; -// import com.sun.star.io.XStream; import com.sun.star.io.XTextInputStream; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.ucb.*; @@ -69,7 +67,6 @@ public class FileAccess String[] PathList = JavaTools.ArrayoutofString(ResultPath, PropertyNames.SEMI_COLON); int MaxIndex = PathList.length - 1; String CompCurPath; - // sAddPath.replace(null, (char) 47); String CompAddPath = JavaTools.replaceSubString(sAddPath, PropertyNames.EMPTY_STRING, "/"); String CurPath; for (int i = 0; i <= MaxIndex; i++) @@ -208,28 +205,19 @@ public class FileAccess { //This method currently only works with sPath="Template" - // String ResultPath = PropertyNames.EMPTY_STRING; ArrayList aPathList = new ArrayList(); String Template_writable = PropertyNames.EMPTY_STRING; String[] Template_internal; String[] Template_user; - // String [] ReadPaths = null; - - // boolean bexists = false; try { XInterface xPathInterface = (XInterface) xMSF.createInstance("com.sun.star.util.PathSettings"); XPropertySet xPropertySet = UnoRuntime.queryInterface(XPropertySet.class, xPathInterface); - // String WritePath = PropertyNames.EMPTY_STRING; - // XInterface xUcbInterface = (XInterface) xMSF.createInstance("com.sun.star.ucb.SimpleFileAccess"); - // XSimpleFileAccess xSimpleFileAccess = (XSimpleFileAccess) com.sun.star.uno.UnoRuntime.queryInterface(XSimpleFileAccess.class, xUcbInterface); - Template_writable = (String) xPropertySet.getPropertyValue(_sPath + "_writable"); Template_internal = (String[]) xPropertySet.getPropertyValue(_sPath + "_internal"); Template_user = (String[]) xPropertySet.getPropertyValue(_sPath + "_user"); - // int iNumEntries = Template_user.length + Template_internal.length + 1; for (int i = 0; i < Template_internal.length; i++) { String sPath = Template_internal[i]; @@ -248,41 +236,12 @@ public class FileAccess } aPathList.addAll(Arrays.asList(Template_user)); aPathList.add(Template_writable); - // WritePath = Template_writable; - -// if (sType.equalsIgnoreCase("user")) -// { -// ResultPath = WritePath; -// bexists = true; -// } - // There was a bug here, because we have to search through the whole list of paths -// else -// { -// //find right path using the search sub path -// for (int i = 0; i 0) || (CurPath.indexOf(EndString) == iPos)) { - ResultPath = deleteLastSlashfromUrl(CurPath); - if (xSimpleFileAccess.exists(ResultPath)) - break; - } - } - } else - ResultPath = PathList[0]; - if (ResultPath.equals(PropertyNames.EMPTY_STRING) == false) - bexists = xSimpleFileAccess.exists(ResultPath); - } catch (Exception exception) { - exception.printStackTrace(System.err); - ResultPath = PropertyNames.EMPTY_STRING; - } - if (bexists == false) - throw new NoValidPathException(xMSF); - return ResultPath; - } - **/ public static void combinePaths(XMultiServiceFactory xMSF, ArrayList _aFirstPath, String _sSecondPath) throws NoValidPathException { for (int i = 0; i < _aFirstPath.size(); ++i) @@ -588,7 +503,7 @@ public class FileAccess */ public static String[][] getFolderTitles(com.sun.star.lang.XMultiServiceFactory xMSF, String FilterName, String FolderName) { - String[][] LocLayoutFiles = new String[2][]; //{PropertyNames.EMPTY_STRING,PropertyNames.EMPTY_STRING}{PropertyNames.EMPTY_STRING}; + String[][] LocLayoutFiles = new String[2][]; try { java.util.Vector TitleVector = null; @@ -716,7 +631,7 @@ public class FileAccess public static String[][] getFolderTitles(com.sun.star.lang.XMultiServiceFactory xMSF, String _sStartFilterName, ArrayList FolderName, String _sEndFilterName) throws NoValidPathException { - String[][] LocLayoutFiles = new String[2][]; //{PropertyNames.EMPTY_STRING,PropertyNames.EMPTY_STRING}{PropertyNames.EMPTY_STRING}; + String[][] LocLayoutFiles = new String[2][]; if (FolderName.size() == 0) { throw new NoValidPathException(null, "Path not given."); @@ -827,7 +742,6 @@ public class FileAccess } /** - * @author rpiterman * @param filename * @return the extension of the given filename. */ @@ -850,7 +764,6 @@ public class FileAccess } /** - * @author rpiterman * @param s * @return */ @@ -873,7 +786,6 @@ public class FileAccess } /** - * @author rpiterman * @param filename * @param def what to return in case of an exception * @return true if the given file exists or not. @@ -896,7 +808,6 @@ public class FileAccess } /** - * @author rpiterman * @param filename * @return */ @@ -918,7 +829,6 @@ public class FileAccess /** * lists the files in a given directory - * @author rpiterman * @param dir * @param includeFolders * @return @@ -940,7 +850,6 @@ public class FileAccess } /** - * @author rpiterman * @param file * @return */ @@ -964,7 +873,6 @@ public class FileAccess } /** - * @author rpiterman * @param path * @return */ @@ -984,7 +892,6 @@ public class FileAccess } /** - * @author rpiterman * @param path * @param pathSeparator * @return @@ -1003,7 +910,6 @@ public class FileAccess } /** - * @author rpiterman * @param source * @param target * @return @@ -1041,7 +947,6 @@ public class FileAccess } /** - * * @param url * @return the parent dir of the given url. * if the path points to file, gives the directory in which the file is. diff --git a/wizards/com/sun/star/wizards/common/Helper.java b/wizards/com/sun/star/wizards/common/Helper.java index 9a50753c0050..429bc6a9398b 100644 --- a/wizards/com/sun/star/wizards/common/Helper.java +++ b/wizards/com/sun/star/wizards/common/Helper.java @@ -24,10 +24,8 @@ import java.util.Calendar; import com.sun.star.beans.Property; import com.sun.star.beans.PropertyValue; import com.sun.star.beans.XPropertySet; -// import com.sun.star.i18n.NumberFormatIndex; import com.sun.star.lang.Locale; import com.sun.star.lang.XMultiServiceFactory; -// import com.sun.star.uno.Any; import com.sun.star.uno.AnyConverter; import com.sun.star.uno.RuntimeException; import com.sun.star.uno.UnoRuntime; @@ -153,7 +151,6 @@ public class Helper } } } - // System.out.println("Property not found: " + PropertyName); return null; } @@ -176,7 +173,6 @@ public class Helper } } } - // System.out.println("Property not found: " + PropertyName); return null; } catch (Exception exception) @@ -193,7 +189,6 @@ public class Helper if (oUnoObject != null) { XPropertySet xPSet = UnoRuntime.queryInterface(XPropertySet.class, oUnoObject); - // Property[] aProps = xPSet.getPropertySetInfo().getProperties(); return xPSet.getPropertyValue(PropertyName); } } @@ -259,7 +254,6 @@ public class Helper { for (int i = 0; i < PropertyNames.length; i++) { - //System.out.println(PropertyNames[i] + "=" + PropertyValues[i]); setUnoPropertyValue(oUnoObject, PropertyNames[i], PropertyValues[i]); } } @@ -271,7 +265,6 @@ public class Helper } /** - * @author bc93774 * checks if the value of an object that represents an array is null. * check beforehand if the Object is really an array with "AnyConverter.IsArray(oObject) * @param oValue the paramter that has to represent an object diff --git a/wizards/com/sun/star/wizards/common/Indexable.java b/wizards/com/sun/star/wizards/common/Indexable.java index c2b27fe978fe..b20fd174c7f6 100644 --- a/wizards/com/sun/star/wizards/common/Indexable.java +++ b/wizards/com/sun/star/wizards/common/Indexable.java @@ -23,10 +23,6 @@ package com.sun.star.wizards.common; -/** - * - * @author rpiterman - */ public interface Indexable { public int getIndex(); diff --git a/wizards/com/sun/star/wizards/common/JavaTools.java b/wizards/com/sun/star/wizards/common/JavaTools.java index aaaf2dcae87f..f13120666850 100644 --- a/wizards/com/sun/star/wizards/common/JavaTools.java +++ b/wizards/com/sun/star/wizards/common/JavaTools.java @@ -26,10 +26,6 @@ import com.sun.star.lib.util.UrlToFileMapper; import java.net.MalformedURLException; import java.net.URL; -/** - * - * @author bc93774 - */ public class JavaTools { @@ -38,31 +34,6 @@ public class JavaTools { } -/* - public static void main(String args[]) - { - String sPath = PropertyNames.EMPTY_STRING; - DateTime oDateTime = null; - long n; - String ConnectStr = "uno:socket,host=localhost,port=8100;urp,negotiate=0,forcesynchronous=1;StarOffice.NamingService"; //localhost ;Lo-1.Germany.sun.com; 10.16.65.155 - try - { - XMultiServiceFactory xLocMSF = com.sun.star.wizards.common.Desktop.connect(ConnectStr); - if (xLocMSF != null) - { - System.out.println("Connected to " + ConnectStr); - oDateTime = getDateTime(9500000); - sPath = convertfromURLNotation("file:///E:/trash/Web%20Wizard.xcu"); - n = getMillis(oDateTime); - int a = 1; - } - } - catch (Exception exception) - { - exception.printStackTrace(System.err); - } - } -*/ public static String[] copyStringArray(String[] FirstArray) { if (FirstArray != null) @@ -218,7 +189,6 @@ public class JavaTools } /** - * @author bc93774 * @param SearchList * @param SearchString * @return the index of the field that contains the string 'SearchString' or '-1' if not it is @@ -327,7 +297,6 @@ public class JavaTools } /** - * @author bc93774 * This function bubble sorts an array of with 2 dimensions. * The default sorting order is the first dimension * Only if sort2ndValue is True the second dimension is the relevant for the sorting order @@ -496,17 +465,12 @@ public class JavaTools if ((baselist != null) && (_complist != null)) { ArrayList retvector = new ArrayList(); -// String[] orderedcomplist = new String[_complist.length]; -// System.arraycopy(_complist, 0, orderedcomplist, 0, _complist.length); for (int i = 0; i < baselist.length; i++) -// if (Arrays.binarySearch(orderedcomplist, baselist[i]) != -1) { if (FieldInList(_complist, baselist[i]) > -1) { retvector.add(baselist[i]); - // else // here you could call the method of a defined interface to notify the calling method - // } } } retarray = new String[retvector.size()]; @@ -529,7 +493,6 @@ public class JavaTools if (FieldInList(_complist, sValue) != -1) { retvector.add(baselist[i]); - // else // here you could call the method of a defined interface to notify the calling method } } diff --git a/wizards/com/sun/star/wizards/common/NamedValueCollection.java b/wizards/com/sun/star/wizards/common/NamedValueCollection.java index 30d06ec1fa53..2813b22647ea 100644 --- a/wizards/com/sun/star/wizards/common/NamedValueCollection.java +++ b/wizards/com/sun/star/wizards/common/NamedValueCollection.java @@ -26,10 +26,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map.Entry; -/** - * - * @author frank.schoenheit@sun.com - */ public class NamedValueCollection { final private HashMap< String, Object > m_values = new HashMap< String, Object >(); diff --git a/wizards/com/sun/star/wizards/common/Properties.java b/wizards/com/sun/star/wizards/common/Properties.java index 1d310957f58b..4c4a69df044e 100644 --- a/wizards/com/sun/star/wizards/common/Properties.java +++ b/wizards/com/sun/star/wizards/common/Properties.java @@ -31,7 +31,6 @@ import java.util.*; * the put(propName,propValue) method. * caution: propName should always be a String. * When finished, call the getProperties() method to get an array of the set properties. - * @author rp */ public class Properties extends HashMap { diff --git a/wizards/com/sun/star/wizards/common/PropertyNames.java b/wizards/com/sun/star/wizards/common/PropertyNames.java index 1f75b2071f04..c851b7432b3b 100644 --- a/wizards/com/sun/star/wizards/common/PropertyNames.java +++ b/wizards/com/sun/star/wizards/common/PropertyNames.java @@ -17,10 +17,6 @@ */ package com.sun.star.wizards.common; -/** - * - * @author Ocke Janssen - */ public class PropertyNames { diff --git a/wizards/com/sun/star/wizards/common/UCB.java b/wizards/com/sun/star/wizards/common/UCB.java index 2c9399b74d4a..f17b8698408e 100644 --- a/wizards/com/sun/star/wizards/common/UCB.java +++ b/wizards/com/sun/star/wizards/common/UCB.java @@ -40,7 +40,6 @@ import com.sun.star.ucb.XDynamicResultSet; import com.sun.star.uno.UnoRuntime; /** - * @author rpiterman * This class is used to copy the content of a folder to * another folder. * There is an incosistency with argument order. @@ -100,7 +99,6 @@ public class UCB { fa.fileAccess.createFolder(targetDir); } - //System.out.println("UCB.copy(" + sourceDir + ", " + filename + ", " + targetDir+ ", " + targetName); executeCommand(ucb, "globalTransfer", copyArg(sourceDir,filename, targetDir,targetName)); } @@ -246,7 +244,6 @@ public class UCB public Object getContent(String path) throws Exception { - //System.out.println("Getting Content for : " + path); XContentIdentifier id = UnoRuntime.queryInterface(XContentIdentifierFactory.class, ucb).createContentIdentifier(path); return UnoRuntime.queryInterface( diff --git a/wizards/com/sun/star/wizards/common/XMLHelper.java b/wizards/com/sun/star/wizards/common/XMLHelper.java index 9186d800fd95..5a49b288db72 100644 --- a/wizards/com/sun/star/wizards/common/XMLHelper.java +++ b/wizards/com/sun/star/wizards/common/XMLHelper.java @@ -25,10 +25,6 @@ package com.sun.star.wizards.common; import org.w3c.dom.*; -/** - * - * @author rpiterman - */ public class XMLHelper { diff --git a/wizards/com/sun/star/wizards/common/XMLProvider.java b/wizards/com/sun/star/wizards/common/XMLProvider.java index 6558365779aa..063cb7a620a5 100644 --- a/wizards/com/sun/star/wizards/common/XMLProvider.java +++ b/wizards/com/sun/star/wizards/common/XMLProvider.java @@ -25,10 +25,6 @@ package com.sun.star.wizards.common; import org.w3c.dom.Node; -/** - * - * @author rpiterman - */ public interface XMLProvider { diff --git a/wizards/com/sun/star/wizards/db/BlindtextCreator.java b/wizards/com/sun/star/wizards/db/BlindtextCreator.java index 6d155d0f2c74..96208c89e6a3 100644 --- a/wizards/com/sun/star/wizards/db/BlindtextCreator.java +++ b/wizards/com/sun/star/wizards/db/BlindtextCreator.java @@ -20,10 +20,6 @@ package com.sun.star.wizards.db; import com.sun.star.wizards.common.JavaTools; import com.sun.star.wizards.common.PropertyNames; -/** - * - * @author bc93774 - */ public class BlindtextCreator { diff --git a/wizards/com/sun/star/wizards/db/RelationController.java b/wizards/com/sun/star/wizards/db/RelationController.java index 1eb3b12420e2..d8ce52e72487 100644 --- a/wizards/com/sun/star/wizards/db/RelationController.java +++ b/wizards/com/sun/star/wizards/db/RelationController.java @@ -27,8 +27,6 @@ import com.sun.star.wizards.common.JavaTools; import com.sun.star.wizards.common.PropertyNames; /** - * @author bc93774 - * * TODO To change the template for this generated type comment go to * Window - Preferences - Java - Code Style - Code Templates */ diff --git a/wizards/com/sun/star/wizards/document/DatabaseControl.java b/wizards/com/sun/star/wizards/document/DatabaseControl.java index 21f1e7af9526..0a0c5cd2e60f 100644 --- a/wizards/com/sun/star/wizards/document/DatabaseControl.java +++ b/wizards/com/sun/star/wizards/document/DatabaseControl.java @@ -30,8 +30,6 @@ import com.sun.star.wizards.common.PropertyNames; import com.sun.star.wizards.db.FieldColumn; /** - * @author Administrator - * * To change the template for this generated type comment go to * Window>Preferences>Java>Code Generation>Code and Comments */ @@ -39,14 +37,10 @@ public class DatabaseControl extends Control { private int m_nFieldType; - // private int iMemofieldwidth = IIMGFIELDWIDTH; - // private int iMemofieldheight = -1; - // private FieldColumn m_FieldColumn; public DatabaseControl(GridControl _oGridControl, FieldColumn _curfieldcolumn) { super(); - // m_FieldColumn = _curfieldcolumn; if (_curfieldcolumn.getFieldType() != DataType.TIMESTAMP) { createGridColumn(_oGridControl, _curfieldcolumn, _curfieldcolumn.getFieldType(), _curfieldcolumn.getFieldTitle()); @@ -56,7 +50,6 @@ public class DatabaseControl extends Control public DatabaseControl(GridControl _oGridControl, FieldColumn _curfieldcolumn, int _fieldtype, String _columntitle) { super(); - // m_FieldColumn = _curfieldcolumn; createGridColumn(_oGridControl, _curfieldcolumn, _fieldtype, _columntitle); } @@ -150,14 +143,12 @@ public class DatabaseControl extends Control { if (getControlType() == FormHandler.SOIMAGECONTROL) { - // return oFormHandler.getImageControlHeight(); return oFormHandler.getControlReferenceHeight() * 4; } else { if (getFieldType() == DataType.LONGVARCHAR) { - // Helper.setUnoPropertyValue(xControlModel, PropertyNames.PROPERTY_MULTILINE, Boolean.TRUE); return oFormHandler.getControlReferenceHeight() * 4; } else if (getControlType() == FormHandler.SOCHECKBOX) @@ -199,21 +190,6 @@ public class DatabaseControl extends Control if (getControlType() == FormHandler.SONUMERICCONTROL) { xPropertySet.setPropertyValue("TreatAsNumber", Boolean.TRUE); - // Math. - // 2^63 - 1 = 9223372036854775807 - // int nIntMax = 0x7fffffff; - // int nIntMin = -0x80000000; - // long nLongMax = nIntMax; - // nLongMax <<= (4*4); - // nLongMax |= 0xffff; - // nLongMax <<= (4*4); - // nLongMax |= 0xffff; - - // long nLongMin = nIntMin; - // nLongMin <<= (8*4); - - // long nLong2 = (long)9223372036854775807; - switch (getFieldType()) { case DataType.BIGINT: @@ -240,9 +216,6 @@ public class DatabaseControl extends Control break; } } - // else if (getControlType() == FormHandler.SOTEXTBOX) - // { // com.sun.star.sdbc.DataType.CHAR, com.sun.star.sdbc.DataType.VARCHAR, com.sun.star.sdbc.DataType.LONGVARCHAR - // } else if (getControlType() == FormHandler.SOIMAGECONTROL) { xPropertySet.setPropertyValue("ScaleMode", com.sun.star.awt.ImageScaleMode.Isotropic); diff --git a/wizards/com/sun/star/wizards/document/Shape.java b/wizards/com/sun/star/wizards/document/Shape.java index bbb793285af3..93f0606a4207 100644 --- a/wizards/com/sun/star/wizards/document/Shape.java +++ b/wizards/com/sun/star/wizards/document/Shape.java @@ -31,8 +31,6 @@ import com.sun.star.uno.UnoRuntime; import com.sun.star.wizards.common.Helper; /** - * @author Administrator - * * To change the template for this generated type comment go to * Window>Preferences>Java>Code Generation>Code and Comments */ diff --git a/wizards/com/sun/star/wizards/form/FormConfiguration.java b/wizards/com/sun/star/wizards/form/FormConfiguration.java index aac5951610a3..bc372e2e7913 100644 --- a/wizards/com/sun/star/wizards/form/FormConfiguration.java +++ b/wizards/com/sun/star/wizards/form/FormConfiguration.java @@ -30,8 +30,6 @@ import com.sun.star.wizards.ui.WizardDialog; import com.sun.star.wizards.db.RelationController; /** - * @author Administrator - * * To change the template for this generated type comment go to * Window>Preferences>Java>Code Generation>Code and Comments */ @@ -124,10 +122,6 @@ public class FormConfiguration CurUnoDialog.insertInfoImage(97, 120, ISubFormStep.intValue()); } - // public void disableSubFormCheckBox() - // { - // Helper.setUnoPropertyValue(UnoDialog.getModel(chkcreateSubForm), PropertyNames.PROPERTY_ENABLED, Boolean.FALSE); - // } public RelationController getRelationController() { diff --git a/wizards/com/sun/star/wizards/query/CallQueryWizard.java b/wizards/com/sun/star/wizards/query/CallQueryWizard.java index e25cb8ec52d4..5ddd437aceb7 100644 --- a/wizards/com/sun/star/wizards/query/CallQueryWizard.java +++ b/wizards/com/sun/star/wizards/query/CallQueryWizard.java @@ -26,7 +26,6 @@ import com.sun.star.wizards.common.PropertyNames; /** This class capsulates the class, that implements the minimal component, a * factory for creating the service (__getServiceFactory). - * @author Bertram Nolte */ public class CallQueryWizard { @@ -57,10 +56,8 @@ public class CallQueryWizard public static class QueryWizardImplementation extends com.sun.star.lib.uno.helper.PropertySet implements com.sun.star.lang.XInitialization, com.sun.star.lang.XServiceInfo, com.sun.star.task.XJobExecutor { private PropertyValue[] m_wizardContext; - // public String Command; public final Integer CommandType = com.sun.star.sdb.CommandType.QUERY; - // /** The constructor of the inner class has a XMultiServiceFactory parameter. * @param i_serviceFactory A special service factory could be introduced while initializing. diff --git a/wizards/com/sun/star/wizards/report/CallReportWizard.java b/wizards/com/sun/star/wizards/report/CallReportWizard.java index d64468a4cdb4..4f284a06a989 100644 --- a/wizards/com/sun/star/wizards/report/CallReportWizard.java +++ b/wizards/com/sun/star/wizards/report/CallReportWizard.java @@ -29,34 +29,12 @@ import java.util.logging.Logger; /** This class capsulates the class, that implements the minimal component, a * factory for creating the service (__getServiceFactory). - * @author Bertram Nolte */ public class CallReportWizard { static boolean bWizardstartedalready; -/* public static void main(String args[]) - { - String ConnectStr = "uno:pipe,name=fs93730;urp;StarOffice.ServiceManager"; - try - { - XMultiServiceFactory orb = Desktop.connect(ConnectStr); - if ( orb != null ) - { - PropertyValue[] curproperties = new PropertyValue[1]; - curproperties[0] = Properties.createProperty("DataSourceName", "countries"); - - ReportWizard wizard = new ReportWizard( orb, curproperties ); - wizard.startReportWizard(); - } - } - catch (java.lang.Exception jexception) - { - jexception.printStackTrace(System.err); - } - }*/ - /** Gives a factory for creating the service. * This method is called by the JavaLoader *

@@ -152,7 +130,6 @@ public class CallReportWizard { this.m_wizardContext = Properties.convertToPropertyValueArray(object); - // xmultiservicefactory = (XMultiservicefactory) UnoRuntime.queryInterface(XMultiServiceFactory.class, object[0]); } /** This method returns an array of all supported service names. diff --git a/wizards/com/sun/star/wizards/report/IReportBuilderLayouter.java b/wizards/com/sun/star/wizards/report/IReportBuilderLayouter.java index 2381b1b7eda0..3285f65705b6 100644 --- a/wizards/com/sun/star/wizards/report/IReportBuilderLayouter.java +++ b/wizards/com/sun/star/wizards/report/IReportBuilderLayouter.java @@ -20,7 +20,6 @@ package com.sun.star.wizards.report; /** * This Interface separate the ReportBuilderImplementation from the layout. * Only these less methods are allowed to access from the ReportBuilderImplementation. - * @author ll93751 */ public interface IReportBuilderLayouter { diff --git a/wizards/com/sun/star/wizards/report/IReportDefinitionReadAccess.java b/wizards/com/sun/star/wizards/report/IReportDefinitionReadAccess.java index cb4e7ae68b4b..b365a06a94bc 100644 --- a/wizards/com/sun/star/wizards/report/IReportDefinitionReadAccess.java +++ b/wizards/com/sun/star/wizards/report/IReportDefinitionReadAccess.java @@ -24,7 +24,6 @@ import com.sun.star.report.XReportDefinition; * This interface contains only one function to give access to the ReportDefinition. * The ReportDefinition will be initialized very late, late after the ReportLayouters. * So we need this interface for the late access. - * @author ll93751 */ public interface IReportDefinitionReadAccess { diff --git a/wizards/com/sun/star/wizards/report/IReportDocument.java b/wizards/com/sun/star/wizards/report/IReportDocument.java index 02c41da4d91e..18e7cfe68310 100644 --- a/wizards/com/sun/star/wizards/report/IReportDocument.java +++ b/wizards/com/sun/star/wizards/report/IReportDocument.java @@ -27,8 +27,6 @@ import java.util.ArrayList; /** * New Interface which gives us the possibility to switch on the fly between the old * Wizard and the new Sun Report Builder Wizard, which use the same UI. - * - * @author ll93751 */ public interface IReportDocument { @@ -121,7 +119,6 @@ public interface IReportDocument public boolean liveupdate_addGroupNametoDocument(String[] GroupNames, String CurGroupTitle, ArrayList GroupFieldVector, ArrayList ReportPath, int iSelCount); public void refreshGroupFields(String[] _sNewNames); - // public boolean isGroupField(String _FieldName); /** * Called by press ('less then') Removes an already set Groupname out of the list * @param NewSelGroupNames diff --git a/wizards/com/sun/star/wizards/report/ReportImplementationHelper.java b/wizards/com/sun/star/wizards/report/ReportImplementationHelper.java index 33f49da8e0cc..316007469942 100644 --- a/wizards/com/sun/star/wizards/report/ReportImplementationHelper.java +++ b/wizards/com/sun/star/wizards/report/ReportImplementationHelper.java @@ -20,10 +20,6 @@ package com.sun.star.wizards.report; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.wizards.db.RecordParser; -/** - * - * @author ll93751 - */ public class ReportImplementationHelper { @@ -32,7 +28,6 @@ public class ReportImplementationHelper protected int m_nDefaultPageOrientation; /** - * * @param _aMSF * @param _nOrientation */ diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java index 93f052308fab..9ac60be6c1c7 100644 --- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java +++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java @@ -52,10 +52,6 @@ import java.util.ArrayList; import java.util.logging.Level; import java.util.logging.Logger; -/** - * - * @author ll93751 - */ public class ReportTextImplementation extends ReportImplementationHelper implements IReportDocument { @@ -334,7 +330,6 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme DBColumn CurDBColumn; Object CurGroupValue; String CurGroupTableName; -// RecordParser CurDBMetaData = getRecordParser(); getDoc().oTextFieldHandler.fixDateFields(true); getDoc().removeAllVisibleTextSections(); getDoc().removeNonLayoutTextTables(); @@ -365,11 +360,9 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme } if (getRecordParser().getcurrentRecordData(DataVector)) { - // int RowIndex = 1; m_bStopProcess = false; while ((getRecordParser().ResultSet.next()) && (!m_bStopProcess)) { - // RowIndex += 1; breset = false; for (ColIndex = 0; ColIndex < GroupFieldCount; ColIndex++) { @@ -385,7 +378,6 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme } } getRecordParser().getcurrentRecordData(DataVector); - // updateProgressDisplay(RowIndex); } insertDataToRecordTable(xTextCursor, DataVector, RecordFieldCount); } @@ -418,10 +410,6 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme { Logger.getLogger( ReportTextImplementation.class.getName() ).log( Level.SEVERE, null, ex ); } -// catch (java.lang.Exception javaexception) -// { -// javaexception.printStackTrace(System.err); -// } getDoc().unlockallControllers(); getDoc().setLayoutSectionsVisible(false); getDoc().removeCopiedTextSections(); @@ -446,22 +434,6 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme } DataVector.clear(); } -// public void updateProgressDisplay(int iCounter) -// { -// try -// { -// if (iCounter % 10 == 0) -// { -// sProgressCurRecord = JavaTools.replaceSubString(sProgressBaseCurRecord, String.valueOf(iCounter), ""); -// setControlProperty("lblCurProgress", PropertyNames.PROPERTY_LABEL, sProgressCurRecord); -// super.xReschedule.reschedule(); -// } -// } -// catch (java.lang.Exception jexception) -// { -// jexception.printStackTrace(System.err); -// } -// } private void replaceUserFields() { DBColumn CurDBColumn; @@ -495,7 +467,6 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme public void store(String _sName, int _nOpenMode) throws com.sun.star.uno.Exception { getDoc().createReportForm(ReportWizard.SOREPORTFORMNAME); - // int nOpenMode = getReportOpenMode(); getDoc().oTextFieldHandler.updateDateFields(); getDoc().oTextFieldHandler.fixDateFields(false); if ((_nOpenMode == ReportFinalizer.SOCREATETEMPLATE || _nOpenMode == ReportFinalizer.SOUSETEMPLATE)) @@ -515,10 +486,6 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme getDoc().refreshGroupFields(_sNewNames); } - // public boolean isGroupField(String _FieldName) - // { - // return getDoc().isGroupField(_FieldName); - // } public void liveupdate_removeGroupName(String[] NewSelGroupNames, String CurGroupTitle, ArrayList GroupFieldVector) { getDoc().removeGroupName(NewSelGroupNames, CurGroupTitle, GroupFieldVector); @@ -540,7 +507,6 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme { throw new com.sun.star.lang.IllegalArgumentException("Unknown Orientation."); } - // CurReportDocument.getDoc().unlockallControllers(); } public void liveupdate_changeLayoutTemplate(String LayoutTemplatePath/*, String BitmapPath*/) @@ -636,7 +602,6 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme try { m_aReportPath = FileAccess.getOfficePaths(getMSF(), "Template", "share", "/wizard"); - // m_sReportPath = FileAccess.combinePaths(getMSF(), m_sReportPath, "/wizard/report"); FileAccess.combinePaths(getMSF(), m_aReportPath, "/wizard/report"); } catch (Exception e) @@ -687,7 +652,6 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme String[][] ContentFiles; try { -// ContentFiles = FileAccess.getFolderTitles(m_xMSF, "cnt", CurReportDocument.getReportPath()); ContentFiles = FileAccess.getFolderTitles(getMSF(), "cnt", getReportPath()); exchangeContentTitlesWithLocalisedOnes(ContentFiles); } @@ -709,7 +673,6 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme String[][] LayoutFiles; try { -// LayoutFiles = FileAccess.getFolderTitles(m_xMSF, "stl", CurReportDocument.getReportPath()); LayoutFiles = FileAccess.getFolderTitles(getMSF(), "stl", getReportPath()); exchangeLayoutTitlesWithLocalisedOnes(LayoutFiles); } diff --git a/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java b/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java index 5ecc5d357f58..3a8e55e637e6 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java +++ b/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java @@ -61,8 +61,6 @@ import java.util.logging.Logger; /** * This class use the IReportDocument Interface to communicate between the UI * and the ReportBuilderLayouter which communicates to the new Sun Report Builder. - * - * @author ll93751 */ public class ReportBuilderImplementation extends ReportImplementationHelper implements IReportDocument, IReportDefinitionReadAccess @@ -99,7 +97,6 @@ public class ReportBuilderImplementation extends ReportImplementationHelper return UnoRuntime.queryInterface(XWindowPeer.class, getFrame().getComponentWindow()); } private XFrame m_xFrame = null; - // private ReportBuilderLayouter m_aReportBuilderLayouter = null; private String m_sReportBuilderLayoutName = PropertyNames.EMPTY_STRING; /** diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java index 89f155f4a064..ac166083dd9b 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java @@ -23,10 +23,6 @@ import com.sun.star.wizards.common.Resource; import com.sun.star.wizards.report.IReportDefinitionReadAccess; import com.sun.star.wizards.ui.UIConsts; -/** - * - * @author ll93751 - */ public class ColumnarSingleColumn extends ReportBuilderLayouter { @@ -59,7 +55,6 @@ public class ColumnarSingleColumn extends ReportBuilderLayouter { return; } -// int nGroups = getReportDefinition().getGroups().getCount(); final XSection xSection = getReportDefinition().getDetail(); diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarThreeColumns.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarThreeColumns.java index ae8ade62e3d2..82281f548be4 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarThreeColumns.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarThreeColumns.java @@ -21,10 +21,6 @@ import com.sun.star.wizards.common.Resource; import com.sun.star.wizards.report.IReportDefinitionReadAccess; import com.sun.star.wizards.ui.*; -/** - * - * @author ll93751 - */ public class ColumnarThreeColumns extends ColumnarTwoColumns { diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java index e045b8599a0c..e75eefc21359 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java @@ -23,10 +23,6 @@ import com.sun.star.wizards.common.Resource; import com.sun.star.wizards.report.IReportDefinitionReadAccess; import com.sun.star.wizards.ui.UIConsts; -/** - * - * @author ll93751 - */ public class ColumnarTwoColumns extends ReportBuilderLayouter { @@ -68,7 +64,6 @@ public class ColumnarTwoColumns extends ReportBuilderLayouter { return; } -// int nGroups = getReportDefinition().getGroups().getCount(); final XSection xSection = getReportDefinition().getDetail(); diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java b/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java index cecadae008af..c626dcd9c58e 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java @@ -18,9 +18,6 @@ package com.sun.star.wizards.reportbuilder.layout; import com.sun.star.beans.PropertyValue; -// import com.sun.star.container.NoSuchElementException; -// import com.sun.star.lang.IndexOutOfBoundsException; -// import com.sun.star.lang.WrappedTargetException; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.report.XFixedText; import com.sun.star.report.XFormattedField; @@ -32,10 +29,6 @@ import com.sun.star.uno.UnoRuntime; import com.sun.star.wizards.common.Properties; import com.sun.star.wizards.common.PropertyNames; -/** - * - * @author ll93751 - */ public class DesignTemplate { diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java index 6f859ef4f88f..00319ce2f856 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java @@ -23,10 +23,6 @@ import com.sun.star.wizards.common.Resource; import com.sun.star.wizards.report.IReportDefinitionReadAccess; import com.sun.star.wizards.ui.*; -/** - * - * @author ll93751 - */ public class InBlocksLabelsAbove extends ColumnarTwoColumns { @@ -59,7 +55,6 @@ public class InBlocksLabelsAbove extends ColumnarTwoColumns { return; } -// int nGroups = getReportDefinition().getGroups().getCount(); final XSection xSection = getReportDefinition().getDetail(); @@ -71,7 +66,6 @@ public class InBlocksLabelsAbove extends ColumnarTwoColumns int i = 0; int nCount = aFieldTitleNames.length; - // int x = 0; aRectLabels.Y = 0; aRectLabels.X = getLeftPageIndent() + getLeftGroupIndent(getCountOfGroups()); @@ -83,11 +77,7 @@ public class InBlocksLabelsAbove extends ColumnarTwoColumns int nFieldWidth = 3000; while (nCount > 0) { - // String sLabel = aFieldTitleNames[i]; - // int nLabelWidth = 3000; - // String sFieldName = convertToFieldName(aFieldNames[i]); aRectFields.X += nFieldWidth; - // aRectLabels.X += nFieldWidth; final int nNextX = aRectFields.X + nFieldWidth; if (nNextX > (getPageWidth() - getRightPageIndent())) diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java index 184c1b7a76c6..f7fef368ab02 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java @@ -24,10 +24,6 @@ import com.sun.star.wizards.common.Resource; import com.sun.star.wizards.report.IReportDefinitionReadAccess; import com.sun.star.wizards.ui.*; -/** - * - * @author ll93751 - */ public class InBlocksLabelsLeft extends ColumnarTwoColumns { @@ -60,7 +56,6 @@ public class InBlocksLabelsLeft extends ColumnarTwoColumns { return; } -// int nGroups = getReportDefinition().getGroups().getCount(); final XSection xSection = getReportDefinition().getDetail(); @@ -82,7 +77,6 @@ public class InBlocksLabelsLeft extends ColumnarTwoColumns int i = 0; int nCount = aFieldTitleNames.length; - // int x = 0; aRectLabelFields.Y = 0; aRectLabelFields.X = getLeftPageIndent() + getLeftGroupIndent(getCountOfGroups()); @@ -93,7 +87,6 @@ public class InBlocksLabelsLeft extends ColumnarTwoColumns while (nCount > 0) { final String sLabel = aFieldTitleNames[i]; -// nLabelWidth = 3000; aRectLabelFields = insertLabel(xSection, sLabel, aRectLabelFields, nLabelWidth, aSOLabel); final String sFieldName = convertToFieldName(aFieldNames[i]); nFieldWidth = 3000 + nDelta; diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/LayoutConstants.java b/wizards/com/sun/star/wizards/reportbuilder/layout/LayoutConstants.java index cc524769c835..9b294a12da26 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/LayoutConstants.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/LayoutConstants.java @@ -18,10 +18,6 @@ package com.sun.star.wizards.reportbuilder.layout; -/** - * - * @author ll93751 - */ public class LayoutConstants { public static final int LabelHeight = 500; diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java index a697ddea03e4..a7c6b8f44168 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java @@ -67,7 +67,6 @@ import java.util.logging.Logger; /** * This class is abstract and more like a helper for create different layouts for Report Builder Wizard. - * @author ll93751 */// TODO: let a little bit place between 2 formatted fields // TODO: move all sectionobjects which have a connect to the right max page width to left if there is a orientation change. abstract public class ReportBuilderLayouter implements IReportBuilderLayouter @@ -84,7 +83,6 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter { closeDesignTemplate(); m_xReportDefinitionReadAccess = null; - // m_xReportBuilderLayouter = null; } /** @@ -144,7 +142,6 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter int lastGroupPostion = insertGroups(); clearDetails(); - // clearFieldTitles(); insertDetailFieldTitles(lastGroupPostion); insertDetailFields(); } @@ -169,7 +166,6 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter protected void clearGroups() { final XGroups xGroups = getReportDefinition().getGroups(); -// int nCount = xGroups.getCount(); while (xGroups.hasElements()) { try @@ -194,7 +190,6 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter { return; } - // int nCount = _xSectionToClear.getCount(); while (_xSectionToClear.hasElements()) { try @@ -216,12 +211,8 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter final XSection xSection = getReportDefinition().getDetail(); emptySection(xSection); } -// public void clearFieldTitles() -// { -// } /** - * * @param _nGroupCount * @return the left indent in 1/100mm */ @@ -281,10 +272,6 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter final XNameAccess xNameAccess = getReportDefinition().getStyleFamilies(); try { - // - // String[] aNames = xNameAccess.getElementNames(); - // - // get all Page Styles final Object aPageStylesObj = xNameAccess.getByName(_sStyleName); final XNameAccess xContainer = UnoRuntime.queryInterface(XNameAccess.class, aPageStylesObj); @@ -533,7 +520,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter */ protected String[] getNamesWithoutGroupNames(String[] _aList, String[] _aGetResultFrom) { - if (_aList == null /* || _aGetResultsFrom == null */) + if (_aList == null) { return new String[] { @@ -793,12 +780,9 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter || nType == DataType.VARBINARY || nType == DataType.LONGVARBINARY) { - // aField = getMSFofReportDefinition().createInstance("com.sun.star.report.ImageControl"); final XImageControl xImageControl = UnoRuntime.queryInterface(XImageControl.class, xReportControlModel); if (xImageControl != null) { - // xImageControl.setScaleImage(true); - xImageControl.setScaleMode(com.sun.star.awt.ImageScaleMode.Isotropic); } } @@ -807,10 +791,6 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter try { xReportControlModel.setParaAdjust(_nAlignment); - // if (nType == DataType.LONGVARCHAR) - // { - // xReportControlModel.??? - // } } catch (com.sun.star.beans.UnknownPropertyException ex) { @@ -851,7 +831,6 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter m_aCommandType = _aType; m_sTableName = _sTableName; - // getReportDefinition().setCommandType(com.sun.star.sdb.CommandType.TABLE); getReportDefinition().setCommandType(_aType); getReportDefinition().setCommand(_sTableName); } // ------------------------------------------------------------------------- @@ -1025,46 +1004,6 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } } -// protected static String getDateString(String _sFormat) -// { -// GregorianCalendar aCalendar = new GregorianCalendar(); -// StringBuffer aBuf = new StringBuffer(); -// -// Locale aLocale = new Locale("en","US"); -// SimpleDateFormat aFormat = new SimpleDateFormat(_sFormat, aLocale); -// aBuf = aFormat.format(aCalendar.getTime(), aBuf, new FieldPosition(0) ); -// // DebugHelper.writeInfo("Date: " + aBuf.toString()); -// return aBuf.toString(); -// } -// protected String getCurrentDate() -// { -// Calendar aCalendar = Calendar.getInstance(); -//// aCalendar.setTimeInMillis(1202382900000L); -//// aCalendar. -// Date aDate = new Date(); -// String sDate = DateFormat.getDateInstance().format(aDate); -// // String aCalStr = aCalendar.toString(); -// return sDate; -// // -//// Date aDate = new Date(); -//// aDate.setSeconds(0); -//// aDate.setMinutes(15); -//// aDate.setHours(12); -//// // aDate.setMonth(2); -//// // aDate.setYear(2008); -//// // aDate.setDay(7); -//// long nTime = aDate.getTime(); -//// Long aLong = new Long(nTime); -//// String aStr = aLong.toString(); -//// -//// Date aNewDate = new Date(1202382900000L); -////// aNewDate. -//// String aDateStr = aNewDate.toString(); -////// Datetime aNewTime = new Time(1202382900); -////// String aTimeStr = aNewTime.toString(); -//// -// -// } protected void clearPageFooter() { XSection xSection; @@ -1122,19 +1061,14 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter Size aSizeMM_100TH = new Size(0, 0); try { - // Object aControlContainer = getGlobalMSF().createInstance("com.sun.star.awt.UnoControlContainer"); - // XControlContainer xControlContainer = (XControlContainer)UnoRuntime.queryInterface(XControlContainer.class, aControlContainer); final Object aFixedTextModel = getGlobalMSF().createInstance("com.sun.star.awt.UnoControlFixedTextModel"); final XControlModel xFixedTextModel = UnoRuntime.queryInterface(XControlModel.class, aFixedTextModel); final PropertySetHelper aPropertySetHelper = new PropertySetHelper(xFixedTextModel); -// aPropertySetHelper.showProperties(); aPropertySetHelper.setPropertyValueDontThrow(PropertyNames.FONT_DESCRIPTOR, _aFont); final Object aUnoCtrlFixedText = getGlobalMSF().createInstance("com.sun.star.awt.UnoControlFixedText"); -// XServiceInfo xServiceInfo2 = (XServiceInfo)UnoRuntime.queryInterface(XServiceInfo.class, aUnoCtrlFixedText); -// String[] sServices2 = xServiceInfo2.getSupportedServiceNames(); final XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, aUnoCtrlFixedText); xWindow.setVisible(false); @@ -1155,10 +1089,6 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter final XUnitConversion xConversion = UnoRuntime.queryInterface(XUnitConversion.class, x); aSizeMM_100TH = xConversion.convertSizeToLogic(aSizeInPixel, com.sun.star.util.MeasureUnit.MM_100TH); - // xToolkit.createScreenCompatibleDevice(_nWidth, _nWidth). - // XWindow x = getReportDefinition().getCurrentController().getFrame().getContainerWindow(); - // Object aObj = _xSection.getParent(); - // we don't need the created objects any longer final XComponent xFixedTextDeleter = UnoRuntime.queryInterface(XComponent.class, xFixedText); xFixedTextDeleter.dispose(); @@ -1251,7 +1181,6 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter Object aEnumObj = xEnum.nextElement(); XReportComponent aComponent = UnoRuntime.queryInterface(XReportComponent.class, aEnumObj); - // XCloneable aClone = (XCloneable)UnoRuntime.queryInterface(XCloneable.class, aEnumObj); if (aComponent != null) { Object aClone = aComponent.createClone(); @@ -1274,8 +1203,6 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter { Logger.getLogger(ReportBuilderLayouter.class.getName()).log(Level.SEVERE, null, e); } - // String sName = xForeignSection.getName(); - // int dummy = 0; } protected void insertPageHeader() @@ -1324,10 +1251,10 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter final String sTitleTitle = getResource().getResText(UIConsts.RID_REPORT + 86); // "Title:" final String sTitle = getTableName(); // "Default title, this is a first draft report generated by the new report wizard."; final String sAuthorTitle = getResource().getResText(UIConsts.RID_REPORT + 87); // "Author:" - final String sAuthor = getUserNameFromConfiguration(); // "You"; // rpt:fieldvalue(); + final String sAuthor = getUserNameFromConfiguration(); // "You"; final String sDateTitle = getResource().getResText(UIConsts.RID_REPORT + 88); // "Date:" // TODO: #i86911# Date: we need to set the style of the date. - final String sDate = "rpt:now()"; // getDateString("EEE, d MMM yyyy HH:mm:ss zzzz"); + final String sDate = "rpt:now()"; try { @@ -1346,21 +1273,18 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter aRect = insertLabel(xSection, sTitleTitle, aRect, nWidth, aSOLabel); final int nTitleWidth = getPageWidth() - getLeftPageIndent() - getRightPageIndent() - 3000; - // aRect = insertFormattedField(xSection, "rpt:Title()", aRect, nTitleWidth); aRect = insertLabel(xSection, sTitle, aRect, nTitleWidth, aSOLabel); aRect.Y += aSOLabel.getHeight(LayoutConstants.LabelHeight) + LayoutConstants.LineHeight; aRect.X = getLeftPageIndent(); aRect = insertLabel(xSection, sAuthorTitle, aRect, nWidth, aSOLabel); - // aRect = insertFormattedField(xSection, "rpt:Author()", aRect, nWidth); aRect = insertLabel(xSection, sAuthor, aRect, nTitleWidth, aSOLabel); aRect.Y += aSOLabel.getHeight(LayoutConstants.LabelHeight); aRect.X = getLeftPageIndent(); aRect = insertLabel(xSection, sDateTitle, aRect, nWidth, aSOLabel); - // aRect = insertFormattedField(xSection, "rpt:Date()", aRect, nWidth); aRect = insertFormattedField(xSection, sDate, aRect, nTitleWidth, aSOLabel); aRect.Y += aSOLabel.getHeight(LayoutConstants.FormattedFieldHeight) + LayoutConstants.LineHeight; @@ -1408,7 +1332,6 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } else { - // getReportDefinition().setPageFooterOn(true); getReportDefinition().setPageFooterOn(false); } } @@ -1484,7 +1407,6 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter protected String[] m_aFieldTitleNames; protected int[] m_aFieldWidths; protected int[] m_aFieldTypes; - // protected int[] m_nLeftIndent; private DesignTemplate m_xDesignTemplate = null; public void initializeData(IReportBuilderLayouter _aOther) @@ -1499,7 +1421,6 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter m_aFieldTitleNames = aOther.m_aFieldTitleNames; m_aFieldWidths = aOther.m_aFieldWidths; m_aFieldTypes = aOther.m_aFieldTypes; - // m_nLeftIndent = aOther.m_nLeftIndent; m_xDesignTemplate = aOther.m_xDesignTemplate; // dirty PageWidth @@ -1616,16 +1537,8 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter protected void doNotBreakInTable(Object _xSectionOrGroup) { -// try -// { -// _xSection.setKeepTogether(true); final PropertySetHelper aHelper = new PropertySetHelper(_xSectionOrGroup); aHelper.setPropertyValueDontThrow("KeepTogether", Boolean.TRUE); -// } -// catch (com.sun.star.uno.Exception e) -// { -// // Exception not set, but not really from interest. -// } } protected DesignTemplate getDesignTemplate() @@ -1635,35 +1548,6 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter // initialise the report definition. String sDefaultHeaderLayout = m_xReportDefinitionReadAccess.getDefaultHeaderLayout(); loadAndSetBackgroundTemplate(sDefaultHeaderLayout); - - // copy all functions from the design template to the current report definition -// XFunctions xOtherFunctions = m_xDesignTemplate.getReportDefinition().getFunctions(); -// final int nFunctionCount = xOtherFunctions.getCount(); -// for (int i=0;i getIndexFor( cols*rows - 1)) ; //do nothing - else - refreshImages(); - */ //m_nCurrentSelection = 0; - //pageStart = 0; - //if (event.refreshImages(); } public void intervalAdded(ListDataEvent event) @@ -404,14 +385,11 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener public void intervalRemoved(ListDataEvent event) { - //contentsChanged(event); } /** Registers ItemListener to receive events. * @param listener The listener to register. - * */ - // @Override public synchronized void addItemListener(XItemListener listener) { if (m_aItemListenerList == null) @@ -423,7 +401,6 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener /** Removes ItemListener from the list of listeners. * @param listener The listener to remove. - * */ public synchronized void removeItemListener(XItemListener listener) { @@ -439,8 +416,6 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener @SuppressWarnings("unchecked") private void fireItemSelected() { -// java.awt.event.ItemEvent event = new java.awt.event.ItemEvent(this, 0, -// getSelectedObject(), java.awt.event.ItemEvent.SELECTED); java.util.ArrayList list; synchronized(this) { @@ -456,97 +431,61 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener } } - /** - * @return - */ public int getCols() { return cols; } - /** - * @return - */ public Size getGap() { return gap; } - /** - * @return - */ public ListModel getListModel() { return listModel; } - /** - * @return - */ public Short getStep() { return step; } - /** - * @return - */ public int getPageStart() { return pageStart; } - /** - * @return - */ public Size getPos() { return pos; } - /** - * @return - */ public IImageRenderer getRenderer() { return renderer; } - /** - * @return - */ public int getRows() { return rows; } - /** - * @return - */ public int getSelected() { return m_nCurrentSelection; } - /** - * @return - */ public Size getSelectionGap() { return selectionGap; } - /** - * @return - */ public boolean isShowButtons() { return showButtons; } - /** - * @param i - */ public void setCols(int i) { cols = i; @@ -633,28 +572,6 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener fireItemSelected(); } -/* - public void setSelected(Object object) - { - if (object == null) - { - setSelected(-1); - } - else - { - for (int i = 0; i < getListModel().getSize(); i++) - { - if (getListModel().getElementAt(i).equals(object)) - { - setSelected(i); - return; - } - } - } - setSelected(-1); - - } -*/ /** * set the text under the button list @@ -723,8 +640,6 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener private void setBorder(Object control, Short border) { Helper.setUnoPropertyValue(getModel(control), PropertyNames.PROPERTY_BORDER, border); - //XWindowPeer peer = ((XControl)UnoRuntime.queryInterface(XControl.class,control)).getPeer(); - //peer.invalidate(InvalidateStyle.CHILDREN); } @@ -737,13 +652,10 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener } - /** - */ public static interface IImageRenderer extends IRenderer { /** - * * @param listItem * @return two resource ids for an image referenced in the imaglist resourcefile of the * wizards project; The second one of them is designed to be used for High Contrast Mode. @@ -754,7 +666,6 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener private static class SimpleCounterRenderer implements IRenderer { - // @Override public String render(Object counter) { return PropertyNames.EMPTY_STRING + ((Counter) counter).start + ".." + ((Counter) counter).end + "/" + ((Counter) counter).max; @@ -803,9 +714,6 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener setPageStart(ps); } - /** - * @return - */ public boolean isenabled() { return benabled; @@ -821,7 +729,6 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener { UnoDialog2.setEnabled(m_aButtons[i], b); } -// UnoDialog2.setEnabled(grbxSelectedImage, b); UnoDialog2.setEnabled(lblImageText, b); if (showButtons) { @@ -863,10 +770,8 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener * will call if a button from the m_aButtonList is pressed. * @param actionEvent */ -// @Override public void actionPerformed(com.sun.star.awt.ActionEvent actionEvent) { - // bStopProcess = true; XControlModel xModel = (XControlModel)UnoDialog2.getModel(actionEvent.Source); PropertySetHelper aHelper = new PropertySetHelper(xModel); @@ -882,11 +787,9 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener final String sButton = sControlName.substring(7 + m_aControlName.length()); int nButton = Integer.parseInt(sButton); - // int image = getImageFromEvent(event); int index = getIndexFor(nButton); if (index < listModel.getSize()) { - // focus(image); setSelected(index); } diff --git a/wizards/com/sun/star/wizards/ui/ControlScroller.java b/wizards/com/sun/star/wizards/ui/ControlScroller.java index 775e6682a964..b9affa2f625f 100644 --- a/wizards/com/sun/star/wizards/ui/ControlScroller.java +++ b/wizards/com/sun/star/wizards/ui/ControlScroller.java @@ -127,7 +127,6 @@ public abstract class ControlScroller } /** - * @author bc93774 * @param _ntotfieldcount The number of fields that are to be administered by the ControlScroller */ protected void initialize(int _ntotfieldcount) @@ -365,7 +364,6 @@ public abstract class ControlScroller return fieldInfo( scrollfields.get(guiRow + nscrollvalue)[column], scrollfields.get(guiRow)[column]); - //System.out.println("getting field info for : " + guiRow + "/" + column + ":" + pv.Value + "(" + pv.Name + ")" ); } else { diff --git a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java index bec278e373ca..ce2d5383de40 100644 --- a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java @@ -24,8 +24,6 @@ import com.sun.star.wizards.common.JavaTools; import com.sun.star.wizards.common.PropertyNames; /** - * @author Administrator - * * To change the template for this generated type comment go to * Window>Preferences>Java>Code Generation>Code and Comments */ @@ -45,7 +43,6 @@ public abstract class DBLimitedFieldSelection protected int iCurPosY; protected int FirstHelpIndex; protected int iCompPosX; - // protected int MaxSelIndex; public DBLimitedFieldSelection(WizardDialog _CurUnoDialog, int iStep, int _iCompPosX, int iCompPosY, int iCompWidth, int _FirstHelpIndex) { @@ -59,7 +56,6 @@ public abstract class DBLimitedFieldSelection ICompPosX = new Integer(iCompPosX); ICompPosY = new Integer(iCompPosY); ICompWidth = new Integer(iCompWidth); - // boolean bDoEnable; iCurPosY = iCompPosY; for (int i = 0; i < rowcount; i++) { @@ -75,13 +71,11 @@ public abstract class DBLimitedFieldSelection protected abstract void updateFromNextControlRow(int CurIndex); - // protected abstract void setMaxSelIndex(); protected abstract int getMaxSelIndex(); protected void moveupSelectedItems(int CurIndex, boolean bDoEnable) { - // short iNextItemPos; if ((!bDoEnable) && (MAXSELINDEX > CurIndex)) { for (int i = CurIndex; i < MAXSELINDEX; i++) diff --git a/wizards/com/sun/star/wizards/ui/DocumentPreview.java b/wizards/com/sun/star/wizards/ui/DocumentPreview.java index df87b573d78d..0eebed5356b6 100644 --- a/wizards/com/sun/star/wizards/ui/DocumentPreview.java +++ b/wizards/com/sun/star/wizards/ui/DocumentPreview.java @@ -30,9 +30,6 @@ import com.sun.star.util.XCloseable; import com.sun.star.wizards.common.Properties; import com.sun.star.wizards.common.PropertyNames; -/** - * @author rpiterman - */ public class DocumentPreview { @@ -63,10 +60,7 @@ public class DocumentPreview public DocumentPreview(XMultiServiceFactory xmsf, Object control) throws Exception { - //((XWindow)UnoRuntime.queryInterface(XWindow.class,control)).addPaintListener(this); xControl = UnoRuntime.queryInterface(XControl.class, control); - //register this object as a listener, to close the frame when disposing. - //((XComponent) UnoRuntime.queryInterface(XComponent.class, control)).addEventListener(this); createPreviewFrame(xmsf, xControl); } @@ -96,7 +90,6 @@ public class DocumentPreview { closeFrame(); createPreviewFrame(xmsf, xControl); - //System.out.println(xControl); setDocument(url, loadArgs); } @@ -155,8 +148,6 @@ public class DocumentPreview xWindow = UnoRuntime.queryInterface(XWindow.class, xPeer); Object frame = xmsf.createInstance("com.sun.star.frame.Frame"); xFrame = UnoRuntime.queryInterface(XFrame.class, frame); -// XFrame xF = (XFrame) UnoRuntime.queryInterface(XFrame.class, Desktop.getDesktop(xmsf)); -// xFrame = xF.findFrame("_blank", 0); xFrame.initialize(xWindow); xWindow.setVisible(true); } diff --git a/wizards/com/sun/star/wizards/ui/FieldSelection.java b/wizards/com/sun/star/wizards/ui/FieldSelection.java index 8abf43359f33..7317a900669c 100644 --- a/wizards/com/sun/star/wizards/ui/FieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/FieldSelection.java @@ -24,10 +24,6 @@ import com.sun.star.wizards.common.JavaTools; import java.util.*; -/** - * - * @author bc93774 - */ public class FieldSelection { public XListBox xFieldsListBox; // Left ListBox @@ -68,7 +64,6 @@ public class FieldSelection public void itemStateChanged(com.sun.star.awt.ItemEvent EventObject) { - // int iPos; com.sun.star.wizards.common.Helper.setUnoPropertyValue(CurUnoDialog.xDialogModel, PropertyNames.PROPERTY_ENABLED, Boolean.FALSE); int iKey = CurUnoDialog.getControlKey(EventObject.Source, CurUnoDialog.ControlList); switch (iKey) @@ -138,9 +133,6 @@ public class FieldSelection changeSelectionOrder(1); break; - default: - // System.err.println( exception); - break; } } catch (Exception exception) @@ -353,7 +345,7 @@ public class FieldSelection } } - // Todo: If Value is getting smaller than zero -> throw exception + // TODO: If Value is getting smaller than zero -> throw exception private Integer[] getYButtonPositions(int ButtonCount) { Integer[] YPosArray; @@ -384,7 +376,7 @@ public class FieldSelection private void changeSelectionOrder(int iNeighbor) { short[] iSelIndices = xSelectedFieldsListBox.getSelectedItemsPos(); - // Todo: we are assuming that the array starts with the lowest index. Verfy this assumption!!!!! + // TODO: we are assuming that the array starts with the lowest index. Verfy this assumption!!!!! if (iSelIndices.length == 1) { short iSelIndex = iSelIndices[0]; @@ -503,7 +495,6 @@ public class FieldSelection public void mergeList(String[] AllFieldNames, String[] SecondList) { - // int MaxIndex = SecondList.length; xFieldsListBox.addItems(AllFieldNames, (short) 0); toggleListboxButtons((short) - 1, (short) - 1); } @@ -557,10 +548,8 @@ public class FieldSelection public void selectFields(boolean bMoveAll) { - // int CurIndex; short iFieldSelected = (short) - 1; short iSelFieldSelected = (short) - 1; - // int MaxCurTarget = xSelectedFieldsListBox.getItemCount(); String[] SelFieldItems; if (bMoveAll) { @@ -600,7 +589,6 @@ public class FieldSelection public void deselectFields(boolean bMoveAll) { - // int m = 0; String SearchString; short iOldFieldSelected = xFieldsListBox.getSelectedItemPos(); short iOldSelFieldSelected = xSelectedFieldsListBox.getSelectedItemPos(); @@ -615,7 +603,6 @@ public class FieldSelection else { int MaxOriginalCount = AllFieldNames.length; - // int MaxSelected = OldSelFieldItems.length; String[] SelList = xFieldsListBox.getItems(); Vector NewSourceVector = new Vector(); for (int i = 0; i < MaxOriginalCount; i++) diff --git a/wizards/com/sun/star/wizards/ui/ImageList.java b/wizards/com/sun/star/wizards/ui/ImageList.java index 40e485109591..66696603db00 100644 --- a/wizards/com/sun/star/wizards/ui/ImageList.java +++ b/wizards/com/sun/star/wizards/ui/ImageList.java @@ -17,8 +17,6 @@ */ package com.sun.star.wizards.ui; -// import com.sun.star.awt.*; - import com.sun.star.awt.Key; import com.sun.star.awt.KeyEvent; import com.sun.star.awt.MouseEvent; @@ -38,24 +36,13 @@ import com.sun.star.wizards.common.HelpIds; import com.sun.star.wizards.common.IRenderer; import com.sun.star.wizards.common.PropertyNames; import com.sun.star.wizards.ui.event.*; - - -//import com.sun.star.awt.ItemEvent; -//import com.sun.star.awt.XItemListener; - - import javax.swing.ListModel; import javax.swing.event.ListDataEvent; import javax.swing.event.ListDataListener; -/** - * - * @author rpiterman - */ public class ImageList implements XItemEventBroadcaster, ListDataListener { - // private XControl imgContainer; private XFixedText lblImageText; private XFixedText grbxSelectedImage; private XButton btnBack; @@ -88,11 +75,10 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener public IRenderer counterRenderer = new SimpleCounterRenderer(); private Object dialogModel; private ImageKeyListener imageKeyListener; - private static final Integer BACKGROUND_COLOR = 16777216; //new Integer(SystemColor.window.getRGB() + 16777216); + private static final Integer BACKGROUND_COLOR = 16777216; private final static Short HIDE_PAGE = new Short((short) 99); private final static Integer TRANSPARENT = new Integer(-1); - private final static int LINE_HEIGHT = 8; //private MethodInvocation METHOD_MOUSE_ENTER_IMAGE; - //private MethodInvocation METHOD_MOUSE_EXIT_IMAGE; + private final static int LINE_HEIGHT = 8; private MethodInvocation METHOD_MOUSE_PRESSED; /** Getter for property imageSize. @@ -180,12 +166,6 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener Boolean.TRUE }); - //XWindow win = (XWindow)UnoRuntime.queryInterface(XWindow.class,lblContainer); - /*dialog.xWindow.addWindowListener(uiEventListener); - String dName = (String)Helper.getUnoPropertyValue(dialog.xDialogModel,PropertyNames.PROPERTY_NAME); - - uiEventListener.add(dName,EventNames.EVENT_WINDOW_SHOWN,"disableContainerMouseEvents",this); - */ int selectionWidth = rowSelect ? (imageSize.Width + gap.Width) * cols - gap.Width + (selectionGap.Width * 2) : imageSize.Width + (selectionGap.Width * 2); @@ -295,8 +275,6 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener try { - //METHOD_MOUSE_ENTER_IMAGE = new MethodInvocation("mouseEnterImage",this,Object.class); - //METHOD_MOUSE_EXIT_IMAGE = new MethodInvocation("mouseExitImage",this,Object.class); METHOD_MOUSE_PRESSED = new MethodInvocation("mousePressed", this, Object.class); } catch (NoSuchMethodException e) @@ -360,8 +338,6 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener XWindow win = UnoRuntime.queryInterface(XWindow.class, image); win.addMouseListener(uiEventListener); win.addKeyListener(imageKeyListener); - //uiEventListener.add(imageName,EventNames.EVENT_MOUSE_ENTERED,METHOD_MOUSE_ENTER_IMAGE); - //uiEventListener.add(imageName,EventNames.EVENT_MOUSE_EXITED,METHOD_MOUSE_EXIT_IMAGE); uiEventListener.add(imageName, EventNames.EVENT_MOUSE_PRESSED, METHOD_MOUSE_PRESSED); return image; @@ -461,7 +437,6 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener private void moveSelection(int image) { - //System.out.println(image); setVisible(grbxSelectedImage, false); int row = image / cols; @@ -585,13 +560,10 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener } /** Notifies all registered listeners about the event. - * */ @SuppressWarnings("unchecked") private void fireItemSelected() { -// java.awt.event.ItemEvent event = new java.awt.event.ItemEvent(this, 0, -// getSelectedObject(), java.awt.event.ItemEvent.SELECTED); java.util.ArrayList list; synchronized(this) { @@ -615,121 +587,76 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener return cols; } - /** - * @return - */ public Size getGap() { return gap; } - /** - * @return - */ public ListModel getListModel() { return listModel; } - /** - * @return - */ public Short getStep() { return step; } - /** - * @return - */ public int getPageStart() { return pageStart; } - /** - * @return - */ public Size getPos() { return pos; } - /** - * @return - */ public IImageRenderer getRenderer() { return renderer; } - /** - * @return - */ public int getRows() { return rows; } - /** - * @return - */ public int getSelected() { return selected; } - /** - * @return - */ public Size getSelectionGap() { return selectionGap; } - /** - * @return - */ public boolean isShowButtons() { return showButtons; } - /** - * @param i - */ public void setCols(int i) { cols = i; } - /** - * @param size - */ public void setGap(Size size) { gap = size; } - /** - * @param model - */ public void setListModel(ListModel model) { listModel = model; } - /** - * @param short1 - */ public void setStep(Short short1) { step = short1; } - /** - * @param i - */ public void setPageStart(int i) { if (i == pageStart) @@ -741,33 +668,21 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener refreshImages(); } - /** - * @param size - */ public void setPos(Size size) { pos = size; } - /** - * @param renderer - */ public void setRenderer(IImageRenderer renderer) { this.renderer = renderer; } - /** - * @param i - */ public void setRows(int i) { rows = i; } - /** - * @param i - */ public void setSelected(int i) { if (rowSelect && (i >= 0)) @@ -811,17 +726,11 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener Helper.setUnoPropertyValue(getModel(lblImageText), PropertyNames.PROPERTY_LABEL, PropertyNames.SPACE + renderer.render(item)); } - /** - * @param size - */ public void setSelectionGap(Size size) { selectionGap = size; } - /** - * @param b - */ public void setShowButtons(boolean b) { showButtons = b; @@ -865,28 +774,10 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener return UnoRuntime.queryInterface(XControl.class, control).getModel(); } - /* - public void mouseEnterImage(Object event) { - System.out.println("mouse enter"); - int i = getImageFromEvent(event); //TODO what is when the image does not display an image? - if (getIndexFor(i) != selected) - setBorder(m_aImages[i],imageBorderMO); - } - - public void mouseExitImage(Object event) { - //System.out.println("mouse exit"); - int i = getImageFromEvent(event); - //TODO what is when the image does not display an image? - if (getIndexFor(i) != selected) - setBorder(m_aImages[i],imageBorder); - } - */ private void setBorder(Object control, Short border) { Helper.setUnoPropertyValue(getModel(control), PropertyNames.PROPERTY_BORDER, border); - //XWindowPeer peer = ((XControl)UnoRuntime.queryInterface(XControl.class,control)).getPeer(); - //peer.invalidate(InvalidateStyle.CHILDREN); } private int getImageFromEvent(Object event) @@ -916,13 +807,10 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener }; } - /** - */ public static interface IImageRenderer extends IRenderer { /** - * * @param listItem * @return two resource ids for an image referenced in the imaglist resourcefile of the * wizards project; The second one of them is designed to be used for High Contrast Mode. @@ -1094,17 +982,11 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener setPageStart(ps); } - /** - * @return - */ public boolean isenabled() { return benabled; } - /** - * @param b - */ public void setenabled(boolean b) { diff --git a/wizards/com/sun/star/wizards/ui/PeerConfig.java b/wizards/com/sun/star/wizards/ui/PeerConfig.java index e01942c8d18b..b7505d340f56 100644 --- a/wizards/com/sun/star/wizards/ui/PeerConfig.java +++ b/wizards/com/sun/star/wizards/ui/PeerConfig.java @@ -29,9 +29,6 @@ import com.sun.star.uno.UnoRuntime; import com.sun.star.wizards.common.Helper; import com.sun.star.wizards.common.PropertyNames; -/** - * @author rpiterman - */ public class PeerConfig implements XWindowListener { @@ -152,7 +149,6 @@ public class PeerConfig implements XWindowListener } /** - * * @param oAPIControl an API control that the interface XControl can be derived from * @param _saccessname */ @@ -180,7 +176,6 @@ public class PeerConfig implements XWindowListener } /** - * * @param oAPIControl an API control that the interface XControl can be derived from * @param _propnames * @param _propvalues diff --git a/wizards/com/sun/star/wizards/ui/UIConsts.java b/wizards/com/sun/star/wizards/ui/UIConsts.java index 4d72278dbf97..9c4d77cad4bf 100644 --- a/wizards/com/sun/star/wizards/ui/UIConsts.java +++ b/wizards/com/sun/star/wizards/ui/UIConsts.java @@ -18,9 +18,6 @@ package com.sun.star.wizards.ui; -/** - * @author rpiterman - */ public interface UIConsts { diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java b/wizards/com/sun/star/wizards/ui/UnoDialog.java index c2f9dba76d7c..583751de9874 100644 --- a/wizards/com/sun/star/wizards/ui/UnoDialog.java +++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java @@ -80,11 +80,8 @@ public class UnoDialog implements EventNames xPSetDlg = UnoRuntime.queryInterface(XPropertySet.class, xDialogModel); xDlgContainer = UnoRuntime.queryInterface(XControlContainer.class, xUnoDialog); xDlgNames = UnoRuntime.queryInterface(XNameContainer.class, xDialogModel); - // xDlgNameAccess = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, xDialogModel); xComponent = UnoRuntime.queryInterface(XComponent.class, xUnoDialog); xWindow = UnoRuntime.queryInterface(XWindow.class, xUnoDialog); - - // setPeerConfiguration(); // LLA: will be done, if really used! } catch (com.sun.star.uno.Exception exception) { @@ -150,10 +147,6 @@ public class UnoDialog implements EventNames { com.sun.star.uno.Type seqType = new com.sun.star.uno.Type(PropertyValue.getClass()); PropertyValue = new com.sun.star.uno.Any(seqType, PropertyValue); - /* PropertyValue = Helper.getArrayValue(PropertyValue); - if (PropertyValue == null) - PropertyValue = new short[]{}; - */ } xPSet.setPropertyValue(PropertyName, PropertyValue); } @@ -302,18 +295,6 @@ public class UnoDialog implements EventNames } } - /* public XButton insertButton(String sName, int iControlKey, XActionListener xActionListener, String[] sProperties, Object[] sValues) throws com.sun.star.uno.Exception{ - Object oButtonModel = insertControlModel("com.sun.star.awt.UnoControlButtonModel", sName, sProperties, sValues); - XPropertySet xPSet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, oButtonModel); - xPSet.setPropertyValue(PropertyNames.PROPERTY_NAME, sName); - Object objectButton = xDlgContainer.getControl( new String(sName)); - XButton xButton = ( XButton ) UnoRuntime.queryInterface( XButton.class, objectButton ); - xButton.addActionListener(xActionListener); - Integer ControlKey = new Integer(iControlKey); - if (ControlList != null) - ControlList.put(sName, ControlKey); - return xButton; - } */ public XButton insertButton(String sName, int iControlKey, XActionListener xActionListener, String[] sProperties, Object[] sValues) throws com.sun.star.uno.Exception { Object oButtonModel = insertControlModel("com.sun.star.awt.UnoControlButtonModel", sName, sProperties, sValues); @@ -538,7 +519,6 @@ public class UnoDialog implements EventNames } /** - * @author bc93774 * The problem with setting the visibility of controls is that changing the current step * of a dialog will automatically make all controls visible. The PropertyNames.PROPERTY_STEP property always wins against * the property "visible". Therfor a control meant to be invisible is placed on a step far far away. @@ -559,7 +539,6 @@ public class UnoDialog implements EventNames } /** - * @author bc93774 * The problem with setting the visibility of controls is that changing the current step * of a dialog will automatically make all controls visible. The PropertyNames.PROPERTY_STEP property always wins against * the property "visible". Therfor a control meant to be invisible is placed on a step far far away. @@ -592,7 +571,6 @@ public class UnoDialog implements EventNames /** * repaints the currentDialogStep - * @author bc93774 */ public void repaintDialogStep() { @@ -671,7 +649,6 @@ public class UnoDialog implements EventNames } /** deselects a Listbox. MultipleMode is not supported - * * @param _xBasisListBox */ public static void deselectListBox(XInterface _xBasisListBox) @@ -686,7 +663,7 @@ public class UnoDialog implements EventNames public void calculateDialogPosition(Rectangle FramePosSize) { - // Todo: check if it would be useful or possible to create a dialog peer, that can be used for the messageboxes to + // TODO: check if it would be useful or possible to create a dialog peer, that can be used for the messageboxes to // maintain modality when they pop up. Rectangle CurPosSize = xWindow.getPosSize(); int WindowHeight = FramePosSize.Height; @@ -716,7 +693,6 @@ public class UnoDialog implements EventNames createWindowPeer(); } xVclWindowPeer = UnoRuntime.queryInterface(XVclWindowPeer.class, xWindowPeer); -// xVclWindowPeer.setProperty("AutoMnemonics", new Boolean(true)); this.BisHighContrastModeActivated = Boolean.valueOf(this.isHighContrastModeActivated()); xDialog = UnoRuntime.queryInterface(XDialog.class, xUnoDialog); return xDialog.execute(); @@ -735,7 +711,6 @@ public class UnoDialog implements EventNames } /** - * * @param parent * @return 0 for cancel, 1 for ok. * @throws com.sun.star.uno.Exception @@ -747,7 +722,6 @@ public class UnoDialog implements EventNames } /** - * * @param xComponent * @return 0 for cancel, 1 for ok. * @throws com.sun.star.uno.Exception @@ -875,7 +849,6 @@ public class UnoDialog implements EventNames } /** - * @author bc93774 * @param oControlModel the model of a control * @return the LabelType according to UIConsts.CONTROLTYPE */ @@ -961,7 +934,6 @@ public class UnoDialog implements EventNames } /** - * @author bc93774 * @param oControlModel * @return the name of the property that contains the value of a controlmodel */ @@ -973,13 +945,11 @@ public class UnoDialog implements EventNames } /** - * @author bc93774 * @param itype The type of the control conforming to UIConst.ControlType * @return the name of the property that contains the value of a controlmodel */ public static String getDisplayProperty(int itype) { - // String propertyname = PropertyNames.EMPTY_STRING; switch (itype) { case UIConsts.CONTROLTYPE.FIXEDTEXT: diff --git a/wizards/com/sun/star/wizards/ui/event/AbstractListener.java b/wizards/com/sun/star/wizards/ui/event/AbstractListener.java index 5c9bec24e09b..4b6fcd2acf49 100644 --- a/wizards/com/sun/star/wizards/ui/event/AbstractListener.java +++ b/wizards/com/sun/star/wizards/ui/event/AbstractListener.java @@ -37,7 +37,6 @@ import java.util.HashMap; *

  • Write the methods which should be performed when the event occures.
    • *
  • call the "add" method, to define a component-event-action mapping.
    • * - * @author rpiterman */ public class AbstractListener { diff --git a/wizards/com/sun/star/wizards/ui/event/CommonListener.java b/wizards/com/sun/star/wizards/ui/event/CommonListener.java index b3e2a78a703e..d0387f7533a6 100644 --- a/wizards/com/sun/star/wizards/ui/event/CommonListener.java +++ b/wizards/com/sun/star/wizards/ui/event/CommonListener.java @@ -20,10 +20,6 @@ package com.sun.star.wizards.ui.event; import com.sun.star.awt.*; import com.sun.star.lang.EventObject; -/** - * - * @author rpiterman - */ public class CommonListener extends AbstractListener implements XActionListener, XItemListener, XTextListener, EventNames, XWindowListener, XMouseListener, XFocusListener, XKeyListener { diff --git a/wizards/com/sun/star/wizards/ui/event/DataAware.java b/wizards/com/sun/star/wizards/ui/event/DataAware.java index 68c2efcd9b51..41ead473b929 100644 --- a/wizards/com/sun/star/wizards/ui/event/DataAware.java +++ b/wizards/com/sun/star/wizards/ui/event/DataAware.java @@ -25,7 +25,6 @@ import java.util.Iterator; import com.sun.star.wizards.common.PropertyNames; /** - * @author rpiterman * DataAware objects are used to live-synchronize UI and DataModel/DataObject. * It is used as listener on UI events, to keep the DataObject up to date. * This class, as a base abstract class, sets a frame of functionality, @@ -45,8 +44,6 @@ public abstract class DataAware { * this is the data object. */ protected Object dataObject; - //protected Method setMethod; - //protected Method getMethod; /** * A Value Object knows how to get/set a value * from/to the data object. @@ -61,8 +58,6 @@ public abstract class DataAware { protected DataAware(Object dataObject_, Value value_) { dataObject = dataObject_; value = value_; - //getMethod = createGetMethod(dataPropName, dataObject); - //setMethod = createSetMethod(dataPropName, dataObject, getMethod.getReturnType()); } /** diff --git a/wizards/com/sun/star/wizards/ui/event/EventNames.java b/wizards/com/sun/star/wizards/ui/event/EventNames.java index d41fa915f383..fbb733f522de 100644 --- a/wizards/com/sun/star/wizards/ui/event/EventNames.java +++ b/wizards/com/sun/star/wizards/ui/event/EventNames.java @@ -17,10 +17,6 @@ */ package com.sun.star.wizards.ui.event; -/** - * - * @author rpiterman - */ public interface EventNames { diff --git a/wizards/com/sun/star/wizards/ui/event/ListModelBinder.java b/wizards/com/sun/star/wizards/ui/event/ListModelBinder.java index 36a8172beffd..31d8ed5fe2a8 100644 --- a/wizards/com/sun/star/wizards/ui/event/ListModelBinder.java +++ b/wizards/com/sun/star/wizards/ui/event/ListModelBinder.java @@ -27,10 +27,6 @@ import com.sun.star.uno.UnoRuntime; import com.sun.star.wizards.common.Helper; import com.sun.star.wizards.common.PropertyNames; -/** - * @author rpiterman - - * */ public class ListModelBinder implements ListDataListener { @@ -124,17 +120,9 @@ public class ListModelBinder implements ListDataListener */ public void intervalAdded(ListDataEvent lde) { - //Short[] selected = getSelectedItems(); for (short i = (short) lde.getIndex0(); i <= lde.getIndex1(); i++) { insert(i); - - /*int insertedItems = lde.getIndex1() - lde.getIndex0() + 1; - - for (int i = 0; i= lde.getIndex0()) - selected[i] = new Short((short)(selected[i].shortValue() + insertedItems)); - setSelectedItems(selected);*/ } } @@ -143,24 +131,7 @@ public class ListModelBinder implements ListDataListener */ public void intervalRemoved(ListDataEvent lde) { - //Short[] selected = getSelectedItems(); - remove((short) lde.getIndex0(), (short) lde.getIndex1()); - - /*int removed = 0; - for (int i = 0; i=lde.getIndex0() && s<==lde.getIndex1()) { - selected[i] = null; - removed++; - } - } - - Short[] newSelected = (removed > 0 ? new Short[selected.length - removed] : selected; - if (removed>0) - - if (selected[i].intValue() >= lde.getIndex0()) - */ } public static interface Renderer diff --git a/wizards/com/sun/star/wizards/ui/event/MethodInvocation.java b/wizards/com/sun/star/wizards/ui/event/MethodInvocation.java index 30cb57467ebb..67277c8dbce3 100644 --- a/wizards/com/sun/star/wizards/ui/event/MethodInvocation.java +++ b/wizards/com/sun/star/wizards/ui/event/MethodInvocation.java @@ -29,7 +29,6 @@ import java.lang.reflect.Method; * wrong type, or the mothod doesnot exist on the given object. * You can trick this class howmuch you want: it will all throw exceptions * on the java level. i throw no error warnings or my own excceptions... - * @author rpiterman */ public class MethodInvocation { diff --git a/wizards/com/sun/star/wizards/ui/event/RadioDataAware.java b/wizards/com/sun/star/wizards/ui/event/RadioDataAware.java index 6d255e76f8b2..35505ad3ed14 100644 --- a/wizards/com/sun/star/wizards/ui/event/RadioDataAware.java +++ b/wizards/com/sun/star/wizards/ui/event/RadioDataAware.java @@ -21,9 +21,6 @@ import com.sun.star.awt.XItemListener; import com.sun.star.awt.XRadioButton; import com.sun.star.uno.UnoRuntime; -/** - * @author rpiterman - */ public class RadioDataAware extends DataAware { diff --git a/wizards/com/sun/star/wizards/ui/event/Task.java b/wizards/com/sun/star/wizards/ui/event/Task.java index 9096dd138146..95aba42f1dd0 100644 --- a/wizards/com/sun/star/wizards/ui/event/Task.java +++ b/wizards/com/sun/star/wizards/ui/event/Task.java @@ -20,9 +20,6 @@ package com.sun.star.wizards.ui.event; import java.util.ArrayList; import java.util.List; -/** - * @author rpiterman - */ public class Task { @@ -149,42 +146,27 @@ public class Task } } - /** - * @return - */ public String getSubtaskName() { return subtaskName; } - /** - * @return - */ public String getTaskName() { return taskName; } - /** - * @param string - */ public void setSubtaskName(String string) { subtaskName = string; fireSubtaskNameChanged(); } - /** - * @return - */ public int getFailed() { return failed; } - /** - * @return - */ public int getSuccessfull() { return successfull; diff --git a/wizards/com/sun/star/wizards/ui/event/TaskEvent.java b/wizards/com/sun/star/wizards/ui/event/TaskEvent.java index 24d38d2a5ba3..a907df6d59e2 100644 --- a/wizards/com/sun/star/wizards/ui/event/TaskEvent.java +++ b/wizards/com/sun/star/wizards/ui/event/TaskEvent.java @@ -19,9 +19,6 @@ package com.sun.star.wizards.ui.event; import java.util.EventObject; -/** - * @author rpiterman - */ public class TaskEvent extends EventObject { diff --git a/wizards/com/sun/star/wizards/ui/event/TaskListener.java b/wizards/com/sun/star/wizards/ui/event/TaskListener.java index 0e4c8f6b51d4..ecec8bb17591 100644 --- a/wizards/com/sun/star/wizards/ui/event/TaskListener.java +++ b/wizards/com/sun/star/wizards/ui/event/TaskListener.java @@ -19,9 +19,6 @@ package com.sun.star.wizards.ui.event; import java.util.EventListener; -/** - * @author rpiterman - */ public interface TaskListener extends EventListener { diff --git a/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java b/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java index c98586aa313b..7c1d0e3843f8 100644 --- a/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java +++ b/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java @@ -24,8 +24,6 @@ import com.sun.star.wizards.common.Helper; import com.sun.star.wizards.common.PropertyNames; /** - * @author rpiterman - * * This class suppoprts imple cases where a UI control can * be directly synchronized with a data property. * Such controls are: the different text controls @@ -71,7 +69,6 @@ public class UnoDataAware extends DataAware protected void setToUI(Object value) { - //System.out.println("Settings uno property : "+ Helper.getUnoPropertyValue(this.unoModel,PropertyNames.PROPERTY_NAME) + "<-" +stringof(value)); Helper.setUnoPropertyValue(unoModel, unoPropName, value); } diff --git a/wizards/com/sun/star/wizards/web/BackgroundsDialog.java b/wizards/com/sun/star/wizards/web/BackgroundsDialog.java index 9322d735fb08..cda5fb531cf5 100644 --- a/wizards/com/sun/star/wizards/web/BackgroundsDialog.java +++ b/wizards/com/sun/star/wizards/web/BackgroundsDialog.java @@ -30,9 +30,6 @@ import com.sun.star.wizards.ui.ImageList; import com.sun.star.wizards.web.data.CGImage; import com.sun.star.wizards.web.data.CGSettings; -/** - * @author rpiterman - */ public class BackgroundsDialog extends ImageListDialog { diff --git a/wizards/com/sun/star/wizards/web/ErrorHandler.java b/wizards/com/sun/star/wizards/web/ErrorHandler.java index 198b703b1610..21da7f1b2826 100644 --- a/wizards/com/sun/star/wizards/web/ErrorHandler.java +++ b/wizards/com/sun/star/wizards/web/ErrorHandler.java @@ -19,9 +19,6 @@ package com.sun.star.wizards.web; import com.sun.star.awt.VclWindowPeerAttribute; -/** - * @author rpiterman - */ public interface ErrorHandler { diff --git a/wizards/com/sun/star/wizards/web/ExtensionVerifier.java b/wizards/com/sun/star/wizards/web/ExtensionVerifier.java index 9a3f0885e1c7..0b7963261b5f 100644 --- a/wizards/com/sun/star/wizards/web/ExtensionVerifier.java +++ b/wizards/com/sun/star/wizards/web/ExtensionVerifier.java @@ -20,7 +20,6 @@ package com.sun.star.wizards.web; import com.sun.star.wizards.common.UCB; /** - * @author rpiterman * Verifies all String that do not end with * the given extension. * This is used to exclude from a copy all the diff --git a/wizards/com/sun/star/wizards/web/IconsDialog.java b/wizards/com/sun/star/wizards/web/IconsDialog.java index 7ea5f3975795..572834c870d4 100644 --- a/wizards/com/sun/star/wizards/web/IconsDialog.java +++ b/wizards/com/sun/star/wizards/web/IconsDialog.java @@ -28,7 +28,6 @@ import com.sun.star.wizards.ui.ImageList; import com.sun.star.wizards.web.data.CGIconSet; /** - * @author rpiterman * The dialog class for choosing an icon set. * This class simulates a model, though it does not functions really as one, * since it does not cast events. @@ -111,16 +110,10 @@ public class IconsDialog extends ImageListDialog implements ImageList.IImageRend this.setSelected(icon >= 0 ? objects[icon] : null); } - /** - * dummy - */ public synchronized void addListDataListener(javax.swing.event.ListDataListener listener) { } - /** - * dummy - */ public synchronized void removeListDataListener(javax.swing.event.ListDataListener listener) { } @@ -155,7 +148,6 @@ public class IconsDialog extends ImageListDialog implements ImageList.IImageRend icons[icon] + getIconsetPostfix(iset); sRetUrls[1] = sRetUrls[0]; - //System.out.println(s); return sRetUrls; } /* (non-Javadoc) diff --git a/wizards/com/sun/star/wizards/web/ImageListDialog.java b/wizards/com/sun/star/wizards/web/ImageListDialog.java index 53210d01306f..90283b948319 100644 --- a/wizards/com/sun/star/wizards/web/ImageListDialog.java +++ b/wizards/com/sun/star/wizards/web/ImageListDialog.java @@ -53,8 +53,6 @@ import com.sun.star.wizards.ui.ImageList.Counter; *
    * the consturctor should recieve, among others, an Array of String resources - see * constructor documentation for details. - * - * @author rpiterman */ public abstract class ImageListDialog extends UnoDialog2 implements UIConsts { @@ -87,7 +85,6 @@ public abstract class ImageListDialog extends UnoDialog2 implements UIConsts private int hid; /** - * * @param xmsf * @param resources_ a string array with the following strings : * dialog title, label text, ok, cancel, help, deselect, other. @@ -191,11 +188,6 @@ public abstract class ImageListDialog extends UnoDialog2 implements UIConsts il.tabIndex = 1; il.create(this); - /*lblContainer = insertLabel("lblContainer", - new String[] {PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH}, - new Object[] { 176,"lblContainer",6,17,new Short((short)5),214} - );*/ - lblTitle = insertLabel("lblTitle", new String[] { @@ -246,7 +238,6 @@ public abstract class ImageListDialog extends UnoDialog2 implements UIConsts * The counter renderer, which uses a template. * The template replaces the Strings "%START", "%END" and * "%TOTAL" with the respective values. - * @author rpiterman * */ public static class ARenderer implements IRenderer diff --git a/wizards/com/sun/star/wizards/web/LogTaskListener.java b/wizards/com/sun/star/wizards/web/LogTaskListener.java index 00228c04c091..b3784a5b11b6 100644 --- a/wizards/com/sun/star/wizards/web/LogTaskListener.java +++ b/wizards/com/sun/star/wizards/web/LogTaskListener.java @@ -26,7 +26,6 @@ import com.sun.star.wizards.ui.event.TaskListener; /** * used for debugging. - * @author rpiterman */ public class LogTaskListener implements TaskListener, ErrorHandler { diff --git a/wizards/com/sun/star/wizards/web/Process.java b/wizards/com/sun/star/wizards/web/Process.java index fa8bc53309eb..c04ba4dcfec5 100644 --- a/wizards/com/sun/star/wizards/web/Process.java +++ b/wizards/com/sun/star/wizards/web/Process.java @@ -46,7 +46,6 @@ import com.sun.star.wizards.web.data.CGSettings; import com.sun.star.wizards.web.export.Exporter; /** - * @author rpiterman * This class is used to process a CGSession object * and generate a site.
    * it does the following:
    @@ -257,29 +256,6 @@ public class Process implements WebWizardConst, ProcessErrors return b; } -// /** -// * deletes the given directory -// * @param dir the directory to delete -// * @return true if should continue -// */ -// private boolean cleanup(String dir) { -// -// boolean success = true; -// -// if (dir != null && fileAccess.exists(dir,false)) { -// -// String[] files = fileAccess.listFiles(dir,true); -// -// for (int i = 0; i < files.length; i++) { -// if (fileAccess.isDirectory(files[i])) -// success = success && cleanup(files[i]); -// else -// success = success && fileAccess.delete(files[i]); -// -// } -// } -// return success && fileAccess.delete(dir); -// } /** * This method is used to copy style files to a target * Directory: css and background. @@ -389,7 +365,6 @@ public class Process implements WebWizardConst, ProcessErrors { try { - //copy.deleteDirContent(publish.url); task.advance(true); copy.copy(dir, publish.url); task.advance(true); @@ -401,7 +376,6 @@ public class Process implements WebWizardConst, ProcessErrors return error(e, publish, ERROR_PUBLISH, ErrorHandler.ERROR_NORMAL_IGNORE); } } - //GENERATING METHODS /** * Generates the TOC pages for the current session. * @param targetDir generating to this directory. diff --git a/wizards/com/sun/star/wizards/web/ProcessErrorHandler.java b/wizards/com/sun/star/wizards/web/ProcessErrorHandler.java index 99d0c84aa12a..02586ae33c44 100644 --- a/wizards/com/sun/star/wizards/web/ProcessErrorHandler.java +++ b/wizards/com/sun/star/wizards/web/ProcessErrorHandler.java @@ -24,7 +24,6 @@ import com.sun.star.wizards.web.data.CGDocument; import com.sun.star.wizards.web.data.CGPublish; /** - * @author rpiterman * used to interact error accuring when generating the * web-site to the user. * This class renders the different errors, diff --git a/wizards/com/sun/star/wizards/web/ProcessErrors.java b/wizards/com/sun/star/wizards/web/ProcessErrors.java index 0d4057191e6d..7be7ef578ff0 100644 --- a/wizards/com/sun/star/wizards/web/ProcessErrors.java +++ b/wizards/com/sun/star/wizards/web/ProcessErrors.java @@ -18,7 +18,6 @@ package com.sun.star.wizards.web; /** - * @author rpiterman * Error IDs for errors that can accure * in the interaction with the Process class. */ diff --git a/wizards/com/sun/star/wizards/web/ProcessStatusRenderer.java b/wizards/com/sun/star/wizards/web/ProcessStatusRenderer.java index aec70c806654..c8cb917c0c07 100644 --- a/wizards/com/sun/star/wizards/web/ProcessStatusRenderer.java +++ b/wizards/com/sun/star/wizards/web/ProcessStatusRenderer.java @@ -23,7 +23,6 @@ import java.util.Map; import com.sun.star.wizards.common.IRenderer; /** - * @author rpiterman * recieves status calls from the status dialog which * apears when the user clicks "create". * allocates strings from the resources to @@ -43,7 +42,6 @@ public class ProcessStatusRenderer implements IRenderer, WebWizardConst strings.put(TASK_GENERATE_PREPARE, res.resTaskGeneratePrepare); strings.put(TASK_GENERATE_XSL, res.resTaskGenerateXsl); strings.put(TASK_PREPARE, res.resTaskPrepare); - //strings.put(TASK_PUBLISH , res.resTaskPublish ); strings.put(LOCAL_PUBLISHER, res.resTaskPublishLocal); strings.put(ZIP_PUBLISHER, res.resTaskPublishZip); strings.put(FTP_PUBLISHER, res.resTaskPublishFTP); diff --git a/wizards/com/sun/star/wizards/web/StatusDialog.java b/wizards/com/sun/star/wizards/web/StatusDialog.java index 0b47b5208620..8f7ba7e01bf8 100644 --- a/wizards/com/sun/star/wizards/web/StatusDialog.java +++ b/wizards/com/sun/star/wizards/web/StatusDialog.java @@ -32,7 +32,6 @@ import com.sun.star.wizards.ui.event.TaskEvent; import com.sun.star.wizards.ui.event.TaskListener; /** - * @author rpiterman * A Class which displays a Status Dialog with status bars. * This can display an X number of bars, to enable the * status display of more complex tasks. @@ -68,7 +67,6 @@ public class StatusDialog extends UnoDialog2 implements TaskListener if (res.length != 6) { throw new IllegalArgumentException("The resources argument should contain 6 Strings, see Javadoc on constructor."); //display a close button? - // if enableBreak == false and closeOnFinsih == false; } boolean b = !enableBreak && !closeOnFinish; @@ -126,9 +124,6 @@ public class StatusDialog extends UnoDialog2 implements TaskListener }); } -// xWindow.addWindowListener((XWindowListener)guiEventListener); -// guiEventListener.add("StatusDialog" ,EVENT_WINDOW_SHOWN, "performRunnable",this); - } private void initProgressBar(Task t) @@ -149,7 +144,6 @@ public class StatusDialog extends UnoDialog2 implements TaskListener public void setLabel(String s) { -// lblTaskName.setText(s); Helper.setUnoPropertyValue(UnoDialog.getModel(lblTaskName), PropertyNames.PROPERTY_LABEL, s); xReschedule.reschedule(); } @@ -185,13 +179,11 @@ public class StatusDialog extends UnoDialog2 implements TaskListener finished = true; if (closeOnFinish) { -// xDialog.endExecute(); parent.xWindow.setEnable(true); try { xWindow.setVisible(false); xComponent.dispose(); - //System.out.println("disposed"); } catch (Exception ex) { diff --git a/wizards/com/sun/star/wizards/web/StylePreview.java b/wizards/com/sun/star/wizards/web/StylePreview.java index 6d1aa62a74fd..e0b1d4e65a1f 100644 --- a/wizards/com/sun/star/wizards/web/StylePreview.java +++ b/wizards/com/sun/star/wizards/web/StylePreview.java @@ -23,7 +23,6 @@ import com.sun.star.wizards.common.PropertyNames; import com.sun.star.wizards.web.data.CGStyle; /** - * @author rpiterman * the style preview, which is a OOo Document Preview in * an Image Control. * This class copies the files needed for this diff --git a/wizards/com/sun/star/wizards/web/TOCPreview.java b/wizards/com/sun/star/wizards/web/TOCPreview.java index 7b4746e05a67..c7eca17259f2 100644 --- a/wizards/com/sun/star/wizards/web/TOCPreview.java +++ b/wizards/com/sun/star/wizards/web/TOCPreview.java @@ -33,7 +33,6 @@ import com.sun.star.wizards.web.data.CGLayout; import com.sun.star.wizards.web.data.CGSettings; /** - * @author rpiterman * This class both copies necessary files to * a temporary directory, generates a temporary TOC page, * and opens the generated html document in a web browser, @@ -96,7 +95,7 @@ public class TOCPreview Task task = new Task(PropertyNames.EMPTY_STRING, PropertyNames.EMPTY_STRING, 10000); Process.generate(xmsf, layout, doc, fileAccess, tempDir, task); Process.copyLayoutFiles(ucb, fileAccess, settings, layout, tempDir); - xDispatch.dispatch(openHyperlink, loadArgs); //Dispatch.dispatch(openHyperlink, loadArgs); + xDispatch.dispatch(openHyperlink, loadArgs); } private PropertyValue[] loadArgs(String url) diff --git a/wizards/com/sun/star/wizards/web/WWD_Events.java b/wizards/com/sun/star/wizards/web/WWD_Events.java index 2f5d707f82d2..a4d4173e28f3 100644 --- a/wizards/com/sun/star/wizards/web/WWD_Events.java +++ b/wizards/com/sun/star/wizards/web/WWD_Events.java @@ -192,7 +192,6 @@ public abstract class WWD_Events extends WWD_Startup } catch (Exception e) { - // TODO Auto-generated catch block e.printStackTrace(); } } @@ -245,10 +244,6 @@ public abstract class WWD_Events extends WWD_Startup Helper.setUnoPropertyValue(getModel(btnDelSession), PropertyNames.PROPERTY_ENABLED, Boolean.FALSE); // select... } Helper.setUnoPropertyValue(getModel(lstLoadSettings), PropertyNames.SELECTED_ITEMS, nextSelected); - - //ListModelBinder.fillComboBox(cbSaveSettings, settings.savedSessions.items(), null); - - } catch (Exception ex) { @@ -273,11 +268,6 @@ public abstract class WWD_Events extends WWD_Startup } private static String[] EMPTY_STRING_ARRAY = new String[0]; - /* public void loadSessionSelected() { - UIHelper.setEnabled(btnLoadSession,true); - UIHelper.setEnabled(btnDelSession,true); - } - */ /** * when the user clicks another document * in the listbox, this method is called, @@ -333,7 +323,7 @@ public abstract class WWD_Events extends WWD_Startup { StatusDialog sd = getStatusDialog(); sd.setLabel(resources.resValidatingDocuments); - sd.execute(this, task, resources.prodName); // new LoadDocs( sd.xControl, files, task ) + sd.execute(this, task, resources.prodName); LoadDocs oLoadDocs = new LoadDocs(this.xControl, files, task); oLoadDocs.loadDocuments(); task.removeTaskListener(sd); @@ -1190,10 +1180,6 @@ public abstract class WWD_Events extends WWD_Startup try { - //XCloseable xCloseable = (XCloseable) UnoRuntime.queryInterface(XCloseable.class, myDocument); - //if (xCloseable != null) - // xCloseable.close(false); - XCloseable xCloseable = UnoRuntime.queryInterface(XCloseable.class, myFrame); if (xCloseable != null) { @@ -1223,11 +1209,6 @@ public abstract class WWD_Events extends WWD_Startup public void loadDocuments() { - //LogTaskListener lts = new LogTaskListener(); - //task.addTaskListener(lts); - -// task.start(); - // where the documents are added to in the list (offset) int offset = (getSelectedDoc().length > 0 ? selectedDoc[0] + 1 : getDocsCount()); diff --git a/wizards/com/sun/star/wizards/web/WWD_General.java b/wizards/com/sun/star/wizards/web/WWD_General.java index ef5d781e62fb..e1064fd7051a 100644 --- a/wizards/com/sun/star/wizards/web/WWD_General.java +++ b/wizards/com/sun/star/wizards/web/WWD_General.java @@ -33,7 +33,6 @@ import com.sun.star.wizards.web.data.CGPublish; import com.sun.star.wizards.web.data.CGSettings; /** - * @author rpiterman * This class implements general methods, used by different sub-classes (either WWD_Sturtup, or WWD_Events) * or both. */ @@ -83,7 +82,6 @@ public abstract class WWD_General extends WebWizardDialog */ protected SystemDialog getDocAddDialog() { - //if (docAddDialog == null) { docAddDialog = SystemDialog.createOpenDialog(xMSF); for (int i = 0; i < settings.cp_Filters.getSize(); i++) { @@ -91,11 +89,6 @@ public abstract class WWD_General extends WebWizardDialog docAddDialog.addFilter( JavaTools.replaceSubString(f.cp_Name, resources.prodName, "%PRODNAME"), f.cp_Filter, i == 0); } - //docAddDialog.addFilter(resources.resSODocs, "*.oxt;*.sxw;*.sxc;*.sxd;*.sxi;*.sdw;*.sdc;*.sdd;*.sdi;*.sda;*.sdp" ,true); - //docAddDialog.addFilter(resources.resMSDocs, "*.doc;*.xls;*.ppt;*.pps",false); - //docAddDialog.addFilter(resources.resImages, "*.jpg;*.gif;*.png;*.bmp;*.tiff;*.jpeg;*.jpe",false); - //docAddDialog.addFilter(resources.resAllFiles,"*.*",false); - //} return docAddDialog; } @@ -324,7 +317,6 @@ public abstract class WWD_General extends WebWizardDialog } /** - * * @return false either if publishing input is wrong or there * are no publishing targets chosen. returns true when at least * one target is chosen, *and* all diff --git a/wizards/com/sun/star/wizards/web/WWD_Startup.java b/wizards/com/sun/star/wizards/web/WWD_Startup.java index 8d99b3ce25f2..4d8909675c8d 100644 --- a/wizards/com/sun/star/wizards/web/WWD_Startup.java +++ b/wizards/com/sun/star/wizards/web/WWD_Startup.java @@ -17,8 +17,6 @@ */ package com.sun.star.wizards.web; -//import com.sun.star.awt.ItemEvent; -//import com.sun.star.awt.XItemListener; import java.io.FileNotFoundException; import java.util.ArrayList; import java.util.Comparator; @@ -96,9 +94,6 @@ import com.sun.star.wizards.web.data.CGStyle; * The controls are the View, The DataObjects are the Model, containing the * Data rad directly from the configuration, and the DataAware objects * are the controller inbetween. - * - * @author rpiterman - * */ public abstract class WWD_Startup extends WWD_General { @@ -193,17 +188,6 @@ public abstract class WWD_Startup extends WWD_General * instance used for that purpose. */ protected XFrame myFrame; - - - /* ****************************************** - * **************************************** - * General Methods - * **************************************** - * ****************************************** */ - - /* - * GENERAL Initialization methods - */ /** * He - my constructor ! * I call/do here in this order:
    @@ -284,7 +268,6 @@ public abstract class WWD_Startup extends WWD_General { Object node = Configuration.getConfigurationRoot(xMSF, "org.openoffice.Inet/Settings", false); int i = Configuration.getInt("ooInetProxyType", node); - //System.out.println("WWD:Startup:getOOProxies:" + i); switch (i) { case 0: //no proxies @@ -392,15 +375,6 @@ public abstract class WWD_Startup extends WWD_General { try { - - - /* myFrame.initialize(docWindow); - * */ - - //desktopFrame = Desktop.findAFrame(xMSF, myFrame, desktopFrame); - - //XWindow xContainerWindow = myFrame.getContainerWindow(); - XWindow xContainerWindow = myFrame.getComponentWindow(); XWindowPeer xWindowPeer = UnoRuntime.queryInterface(XWindowPeer.class, xContainerWindow); @@ -569,7 +543,6 @@ public abstract class WWD_Startup extends WWD_General { sda.updateData(); //TODO xf uncomment - //refresh.eventPerformed(ie); } } @@ -649,8 +622,6 @@ public abstract class WWD_Startup extends WWD_General sessionNameDA = UnoDataAware.attachEditControl(settings.cp_DefaultSession, "cp_Name", cbSaveSettings, null, true); //cleanup when exiting wizard. - //guiEventListener.add("WebWizardDialog",EventNames.EVENT_WINDOW_HIDDEN, "cleanup", this); - //xWindow.addWindowListener((XWindowListener)guiEventListener); } /** @@ -853,8 +824,6 @@ public abstract class WWD_Startup extends WWD_General // an index change accures { content.cp_Documents.remove(i--); - /*for (Iterator i = content.cp_Contents.childrenMap.values().iterator(); i.hasNext();) - checkContent((CGContent)i.next(),task);*/ } } } @@ -863,7 +832,6 @@ public abstract class WWD_Startup extends WWD_General * A Listener which is called whenever * a Publish checkbox/textbox state changes, and * changes the "create" button enable state accordingly. - * @author rpiterman */ private class CheckPublish implements DataAware.Listener { @@ -960,7 +928,6 @@ public abstract class WWD_Startup extends WWD_General */ public int compare(Object o1, Object o2) { - // TODO Auto-generated method stub if (o1 instanceof CGStyle && o2 instanceof CGStyle) { return ((CGStyle) o1).cp_Name.compareTo( diff --git a/wizards/com/sun/star/wizards/web/WWHID.java b/wizards/com/sun/star/wizards/web/WWHID.java index dedd03002423..9ef8ef4ed77d 100644 --- a/wizards/com/sun/star/wizards/web/WWHID.java +++ b/wizards/com/sun/star/wizards/web/WWHID.java @@ -24,8 +24,6 @@ package com.sun.star.wizards.web; /** - * @author rp143992 - * * TODO To change the template for this generated type comment go to * Window - Preferences - Java - Code Generation - Code and Comments */ @@ -100,7 +98,6 @@ public interface WWHID public static final int HID7_TXT_ZIP = 34200 + 65; public static final int HID7_BTN_ZIP = 34200 + 66; public static final int HID7_CHK_PUBLISH_FTP = 34200 + 67; - //public static final int HID7_TXT_FTP = 34200 + 68 ; public static final int HID7_BTN_FTP = 34200 + 69; public static final int HID7_CHK_SAVE = 34200 + 70; public static final int HID7_TXT_SAVE = 34200 + 71;// web wizard backgrounds dialog diff --git a/wizards/com/sun/star/wizards/web/WebWizard.java b/wizards/com/sun/star/wizards/web/WebWizard.java index 17ee19596c1e..bce64f11ea50 100644 --- a/wizards/com/sun/star/wizards/web/WebWizard.java +++ b/wizards/com/sun/star/wizards/web/WebWizard.java @@ -29,9 +29,6 @@ import com.sun.star.wizards.common.Desktop; public class WebWizard extends WWD_Events { - /** - * @param xmsf - */ public WebWizard(XMultiServiceFactory xmsf) throws Exception { super(xmsf); diff --git a/wizards/com/sun/star/wizards/web/WebWizardDialog.java b/wizards/com/sun/star/wizards/web/WebWizardDialog.java index a94c675e21a4..f88ccefd612b 100644 --- a/wizards/com/sun/star/wizards/web/WebWizardDialog.java +++ b/wizards/com/sun/star/wizards/web/WebWizardDialog.java @@ -39,7 +39,6 @@ import com.sun.star.wizards.web.data.CGLayout; /** * This class is generated Automatically.... - * bla bla bla */ public abstract class WebWizardDialog extends WizardDialog implements WebWizardConst, UIConsts, WWHID { @@ -71,41 +70,6 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC XListBox lstDocTargetType; XFixedText lblLayoutTitle; XFixedText lblLayouts; - /*XFixedText Label1; - //Image Control - XControl ImageControl1; - //Image Control - XControl ImageControl3; - //Image Control - XControl ImageControl4; - //Image Control - XControl ImageControl5; - //Image Control - XControl ImageControl6; - XFixedText Label3; - //titled box - XControl FrameControl1; - //Image Control - XControl ImageControl2; - //Image Control - XControl ImageControl7; - //Image Control - XControl ImageControl8; - //Image Control - XControl ImageControl9; - //Image Control - XControl ImageControl10; - //Image Control - XControl ImageControl11; - //Image Control - XControl ImageControl12; - //Image Control - XControl ImageControl13; - //Image Control - XControl ImageControl14; - //Image Control - XControl ImageControl15; - */ XCheckBox chbDocDesc; XCheckBox chkDocFilename; XCheckBox chbDocAuthor; @@ -168,7 +132,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC FontDescriptor fontDescriptor4 = new FontDescriptor(); FontDescriptor fontDescriptor5 = new FontDescriptor(); FontDescriptor fontDescriptor6 = new FontDescriptor(); - FontDescriptor fontDescriptor7 = new FontDescriptor(); //private static String[] PROPNAMES_LBL_NOFOCUS = new String[] {PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_WIDTH}; + FontDescriptor fontDescriptor7 = new FontDescriptor(); private static String[] PROPNAMES_LBL = new String[] { PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH @@ -836,7 +800,6 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC { new Integer(-1), INTEGER_8, resources.reslblFTPDisabled, Boolean.TRUE, "lblFTPDisabled", 125, 136, INTEGERS[7], new Short(tabIndex++), 226 }); - //FTP_STEP = 99; } //else @@ -889,18 +852,11 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC ilLayouts.tabIndex = 31; ilLayouts.helpURL = HID3_IL_LAYOUTS_IMG1; - /*for (int i = 0; i<8; i++) - imgIconsPrev[i] = insertImage("imgIconPrev" + i, - new String[] { "BackgroundColor",PropertyNames.PROPERTY_BORDER,PropertyNames.PROPERTY_HEIGHT,PropertyNames.PROPERTY_IMAGEURL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, "ScaleImage", PropertyNames.PROPERTY_STEP, "Tabstop", PropertyNames.PROPERTY_WIDTH}, - new Object[] { new Integer(-1), new Short((short)0),14,"file:///c:/bludisk.gif", new Integer(97 + i * 20 + 7 ),147,Boolean.FALSE,INTEGERS[5],Boolean.FALSE,14}); - */ } /** * renders the images and titles of * the layouts - * @author rpiterman - */ private class LayoutRenderer implements ImageList.IImageRenderer { diff --git a/wizards/com/sun/star/wizards/web/data/CGDocument.java b/wizards/com/sun/star/wizards/web/data/CGDocument.java index c141bf76fb68..a6acf6608cfd 100644 --- a/wizards/com/sun/star/wizards/web/data/CGDocument.java +++ b/wizards/com/sun/star/wizards/web/data/CGDocument.java @@ -55,7 +55,6 @@ import com.sun.star.wizards.ui.event.Task; * the value read from the document. * The *cp_title* "overrides" *title*, if exists. if not, *title* is used. * The same is valid for *description* and *author*. - * @author rpiterman */ public class CGDocument extends ConfigSetItem implements XMLProvider { @@ -144,8 +143,6 @@ public class CGDocument extends ConfigSetItem implements XMLProvider task.advance(true); //1 - //System.out.println(Properties.getPropertyValue(mediaDescriptor,"UIName")); - analyzeFileType(mediaDescriptor); task.advance(true); //2 @@ -231,12 +228,9 @@ public class CGDocument extends ConfigSetItem implements XMLProvider ? PropertyNames.EMPTY_STRING : (String) Properties.getPropertyValue(mediaDescriptor, PropertyNames.PROPERTY_NAME); appType = getDocType(media); - //System.out.println(appType); - isSOOpenable = (appType.equals(TypeDetection.WRITER_DOC) || appType.equals(TypeDetection.CALC_DOC) || appType.equals(TypeDetection.IMPRESS_DOC) || appType.equals(TypeDetection.DRAW_DOC)) || appType.equals(TypeDetection.HTML_DOC); -// String[] parts = media.split("_"); // line removed because of compatibility to JDK13 String[] parts = JavaTools.ArrayoutofString(media, "_"); @@ -385,7 +379,6 @@ public class CGDocument extends ConfigSetItem implements XMLProvider private String getIcon(String appType) { - //System.out.println("Getting Icon for: " + appType); return appType + ".gif"; } diff --git a/wizards/com/sun/star/wizards/web/data/CGSettings.java b/wizards/com/sun/star/wizards/web/data/CGSettings.java index 6c72304549e4..ee464a41f8be 100644 --- a/wizards/com/sun/star/wizards/web/data/CGSettings.java +++ b/wizards/com/sun/star/wizards/web/data/CGSettings.java @@ -43,9 +43,6 @@ import com.sun.star.wizards.common.JavaTools; import com.sun.star.wizards.common.Properties; import com.sun.star.wizards.common.PropertyNames; -/** - * @author rpiterman - */ public class CGSettings extends ConfigGroup { diff --git a/wizards/com/sun/star/wizards/web/data/ConfigSetItem.java b/wizards/com/sun/star/wizards/web/data/ConfigSetItem.java index a75640938c07..0b27a537432d 100644 --- a/wizards/com/sun/star/wizards/web/data/ConfigSetItem.java +++ b/wizards/com/sun/star/wizards/web/data/ConfigSetItem.java @@ -24,10 +24,6 @@ package com.sun.star.wizards.web.data; import com.sun.star.wizards.common.*; -/** - * - * @author rpiterman - */ public class ConfigSetItem extends ConfigGroup implements Indexable { diff --git a/wizards/com/sun/star/wizards/web/data/TypeDetection.java b/wizards/com/sun/star/wizards/web/data/TypeDetection.java index 9be230d4f65d..c236bfcc0ab6 100644 --- a/wizards/com/sun/star/wizards/web/data/TypeDetection.java +++ b/wizards/com/sun/star/wizards/web/data/TypeDetection.java @@ -23,10 +23,6 @@ */ package com.sun.star.wizards.web.data; -/** - * - * @author rpiterman - */ public class TypeDetection { diff --git a/wizards/com/sun/star/wizards/web/export/AbstractExporter.java b/wizards/com/sun/star/wizards/web/export/AbstractExporter.java index bed3857d5f4a..284b44168b10 100644 --- a/wizards/com/sun/star/wizards/web/export/AbstractExporter.java +++ b/wizards/com/sun/star/wizards/web/export/AbstractExporter.java @@ -42,10 +42,6 @@ import com.sun.star.wizards.web.data.CGDocument; import com.sun.star.wizards.web.data.CGExporter; import com.sun.star.wizards.web.data.TypeDetection; -/** - * - * @author rpiterman - */ public abstract class AbstractExporter implements Exporter { @@ -119,9 +115,6 @@ public abstract class AbstractExporter implements Exporter protected void closeDocument(Object doc, XMultiServiceFactory xmsf) { - /*OfficeDocument.dispose( - xmsf, - (XComponent) UnoRuntime.queryInterface(XComponent.class, doc));*/ try { XCloseable xc = UnoRuntime.queryInterface(XCloseable.class, doc); diff --git a/wizards/com/sun/star/wizards/web/export/ConfiguredExporter.java b/wizards/com/sun/star/wizards/web/export/ConfiguredExporter.java index cba353639d32..ec5986086633 100644 --- a/wizards/com/sun/star/wizards/web/export/ConfiguredExporter.java +++ b/wizards/com/sun/star/wizards/web/export/ConfiguredExporter.java @@ -23,9 +23,6 @@ import java.util.Iterator; import com.sun.star.wizards.web.data.CGArgument; import com.sun.star.wizards.web.data.CGExporter; -/** - * @author rpiterman - */ public class ConfiguredExporter extends FilterExporter { diff --git a/wizards/com/sun/star/wizards/web/export/CopyExporter.java b/wizards/com/sun/star/wizards/web/export/CopyExporter.java index 77249e766414..50dca0195f01 100644 --- a/wizards/com/sun/star/wizards/web/export/CopyExporter.java +++ b/wizards/com/sun/star/wizards/web/export/CopyExporter.java @@ -23,9 +23,6 @@ import com.sun.star.wizards.common.FileAccess; import com.sun.star.wizards.ui.event.Task; import com.sun.star.wizards.web.data.CGDocument; -/** - * @author rpiterman - */ public class CopyExporter extends AbstractExporter { diff --git a/wizards/com/sun/star/wizards/web/export/Exporter.java b/wizards/com/sun/star/wizards/web/export/Exporter.java index b18df0d37beb..3c4d88c4a289 100644 --- a/wizards/com/sun/star/wizards/web/export/Exporter.java +++ b/wizards/com/sun/star/wizards/web/export/Exporter.java @@ -22,10 +22,6 @@ import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.wizards.ui.event.Task; import com.sun.star.wizards.web.data.*; -/** - * - * @author rpiterman - */ public interface Exporter { diff --git a/wizards/com/sun/star/wizards/web/export/FilterExporter.java b/wizards/com/sun/star/wizards/web/export/FilterExporter.java index 39b81e1f8744..4b5bf47ff44e 100644 --- a/wizards/com/sun/star/wizards/web/export/FilterExporter.java +++ b/wizards/com/sun/star/wizards/web/export/FilterExporter.java @@ -25,8 +25,6 @@ import com.sun.star.wizards.web.data.CGDocument; import com.sun.star.wizards.web.data.CGExporter; /** - * @author rpiterman - * * An exporter which is configured with a filter name, and * uses the specified filter to export documents. */ diff --git a/wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.java b/wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.java index fcae0a51d288..3392140e7a2e 100644 --- a/wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.java +++ b/wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.java @@ -24,9 +24,6 @@ import com.sun.star.wizards.ui.event.Task; import com.sun.star.wizards.web.data.CGDocument; import com.sun.star.wizards.web.data.CGSession; -/** - * @author rpiterman - */ public class ImpressHTMLExporter extends ConfiguredExporter { @@ -52,13 +49,6 @@ public class ImpressHTMLExporter extends ConfiguredExporter props.put(PropertyNames.PROPERTY_WIDTH, getImageWidth(session)); - /* - * props.put("BackColor",...); - * props.put("TextColor",...); - * props.put("LinkColor",...); - * props.put("VLinkColor",...); - * props.put("ALinkColor",...); - */ props.put("UseButtonSet", new Integer(session.cp_Design.cp_IconSet)); diff --git a/wizards/com/sun/star/wizards/web/status/ErrorLog.java b/wizards/com/sun/star/wizards/web/status/ErrorLog.java index 15d7057bb07d..99bd8a73e091 100644 --- a/wizards/com/sun/star/wizards/web/status/ErrorLog.java +++ b/wizards/com/sun/star/wizards/web/status/ErrorLog.java @@ -21,9 +21,6 @@ package com.sun.star.wizards.web.status; import java.util.ArrayList; import java.util.List; -/** - * @author rpiterman - */ public class ErrorLog implements ErrorReporter { diff --git a/wizards/com/sun/star/wizards/web/status/ErrorReporter.java b/wizards/com/sun/star/wizards/web/status/ErrorReporter.java index e5aad2988b25..14c9fc752d22 100644 --- a/wizards/com/sun/star/wizards/web/status/ErrorReporter.java +++ b/wizards/com/sun/star/wizards/web/status/ErrorReporter.java @@ -18,9 +18,6 @@ package com.sun.star.wizards.web.status; -/** - * @author rpiterman - */ public interface ErrorReporter { diff --git a/wizards/com/sun/star/wizards/web/status/LogTaskListener.java b/wizards/com/sun/star/wizards/web/status/LogTaskListener.java index 7b2898c0fd06..ebe025016d63 100644 --- a/wizards/com/sun/star/wizards/web/status/LogTaskListener.java +++ b/wizards/com/sun/star/wizards/web/status/LogTaskListener.java @@ -20,9 +20,6 @@ package com.sun.star.wizards.web.status; import java.io.PrintStream; -/** - * @author rpiterman - */ public class LogTaskListener implements TaskListener { diff --git a/wizards/com/sun/star/wizards/web/status/Task.java b/wizards/com/sun/star/wizards/web/status/Task.java index 0896e6ce7646..bfe2ea6b5633 100644 --- a/wizards/com/sun/star/wizards/web/status/Task.java +++ b/wizards/com/sun/star/wizards/web/status/Task.java @@ -21,9 +21,6 @@ package com.sun.star.wizards.web.status; import java.util.ArrayList; import java.util.List; -/** - * @author rpiterman - */ public class Task { @@ -135,17 +132,11 @@ public class Task } } - /** - * @return - */ public String getSubtaskName() { return subtaskName; } - /** - * @return - */ public String getTaskName() { return taskName; @@ -160,17 +151,11 @@ public class Task fireSubtaskNameChanged(); } - /** - * @return - */ public int getFailed() { return failed; } - /** - * @return - */ public int getSuccessfull() { return successfull; diff --git a/wizards/com/sun/star/wizards/web/status/TaskEvent.java b/wizards/com/sun/star/wizards/web/status/TaskEvent.java index 79965f2ae57c..d84c9cf44846 100644 --- a/wizards/com/sun/star/wizards/web/status/TaskEvent.java +++ b/wizards/com/sun/star/wizards/web/status/TaskEvent.java @@ -20,9 +20,6 @@ package com.sun.star.wizards.web.status; import java.util.EventObject; -/** - * @author rpiterman - */ public class TaskEvent extends EventObject { diff --git a/wizards/com/sun/star/wizards/web/status/TaskListener.java b/wizards/com/sun/star/wizards/web/status/TaskListener.java index 1fec9b3159e3..d0dfcaece8c9 100644 --- a/wizards/com/sun/star/wizards/web/status/TaskListener.java +++ b/wizards/com/sun/star/wizards/web/status/TaskListener.java @@ -20,9 +20,6 @@ package com.sun.star.wizards.web.status; import java.util.EventListener; -/** - * @author rpiterman - */ public interface TaskListener extends EventListener { From 053b68a0c7b75eae7d86d4465f65abc6046515ee Mon Sep 17 00:00:00 2001 From: Marcos Paulo de Souza Date: Mon, 1 Oct 2012 20:28:10 +0200 Subject: [PATCH 124/863] Unused code cleanup. Change-Id: Iad4d1f6cdd9ad03c5ccc02c57acef5b9bbb47d35 --- unotools/inc/unotools/useroptions.hxx | 8 -------- unotools/source/config/useroptions.cxx | 8 -------- unusedcode.easy | 8 -------- 3 files changed, 24 deletions(-) diff --git a/unotools/inc/unotools/useroptions.hxx b/unotools/inc/unotools/useroptions.hxx index 502fcce50f0e..a7b2267d7439 100644 --- a/unotools/inc/unotools/useroptions.hxx +++ b/unotools/inc/unotools/useroptions.hxx @@ -78,14 +78,6 @@ public: rtl::OUString GetFullName () const; // set the address token - void SetCompany (rtl::OUString const&); - void SetFirstName (rtl::OUString const&); - void SetID (rtl::OUString const&); - void SetState (rtl::OUString const&); - void SetCountry (rtl::OUString const&); - void SetPosition (rtl::OUString const&); - void SetTitle (rtl::OUString const&); - void SetFax (rtl::OUString const&); void SetCustomerNumber (rtl::OUString const&); sal_Bool IsTokenReadonly (sal_uInt16 nToken) const; diff --git a/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx index a8efcd1f4736..1da014a205bd 100644 --- a/unotools/source/config/useroptions.cxx +++ b/unotools/source/config/useroptions.cxx @@ -317,14 +317,6 @@ OUString SvtUserOptions::GetCustomerNumber () const { return GetToken(USER_OPT_C // // setters // -void SvtUserOptions::SetCompany (OUString const& sToken) { SetToken(USER_OPT_COMPANY, sToken); } -void SvtUserOptions::SetFirstName (OUString const& sToken) { SetToken(USER_OPT_FIRSTNAME, sToken); } -void SvtUserOptions::SetID (OUString const& sToken) { SetToken(USER_OPT_ID, sToken); } -void SvtUserOptions::SetState (OUString const& sToken) { SetToken(USER_OPT_STATE, sToken); } -void SvtUserOptions::SetCountry (OUString const& sToken) { SetToken(USER_OPT_COUNTRY, sToken); } -void SvtUserOptions::SetPosition (OUString const& sToken) { SetToken(USER_OPT_POSITION, sToken); } -void SvtUserOptions::SetTitle (OUString const& sToken) { SetToken(USER_OPT_TITLE, sToken); } -void SvtUserOptions::SetFax (OUString const& sToken) { SetToken(USER_OPT_FAX, sToken); } void SvtUserOptions::SetCustomerNumber (OUString const& sToken) { SetToken(USER_OPT_CUSTOMERNUMBER, sToken); } // ----------------------------------------------------------------------- diff --git a/unusedcode.easy b/unusedcode.easy index a4612b702373..1ac930675dc3 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -7,14 +7,6 @@ ScVbaFormat::setNumberFormat(com::sun::star::lang::Loca ScVbaFormat::getAddIndent() ScVbaFormat::setAddIndent(com::sun::star::uno::Any const&) ScVbaFormat::setNumberFormat(com::sun::star::lang::Locale, rtl::OUString const&) -SvtUserOptions::SetCompany(rtl::OUString const&) -SvtUserOptions::SetCountry(rtl::OUString const&) -SvtUserOptions::SetFax(rtl::OUString const&) -SvtUserOptions::SetFirstName(rtl::OUString const&) -SvtUserOptions::SetID(rtl::OUString const&) -SvtUserOptions::SetPosition(rtl::OUString const&) -SvtUserOptions::SetState(rtl::OUString const&) -SvtUserOptions::SetTitle(rtl::OUString const&) TextEngine::GetLeftMargin() const ThumbnailView::GetItemCount() const ThumbnailView::ImplScroll(Point const&) From 36a2db3722b79ed3df075d7f3fa77fb761bcf5a4 Mon Sep 17 00:00:00 2001 From: Arnaud Versini Date: Sat, 29 Sep 2012 14:47:11 +0200 Subject: [PATCH 125/863] Replace usage of rtl_*Memory with equivalent from string.h Change-Id: I50ffc10f007f03c3252ef0196b59b881429cc159 Reviewed-on: https://gerrit.libreoffice.org/734 Reviewed-by: Norbert Thiebaud Tested-by: Norbert Thiebaud --- .../source/standard/vclxaccessibletoolbox.cxx | 4 +++- animations/source/animcore/animcore.cxx | 3 ++- basctl/source/dlged/dlged.cxx | 10 ++++---- basebmp/source/bitmapdevice.cxx | 5 ++-- basegfx/inc/basegfx/raster/bpixelraster.hxx | 3 +-- basegfx/inc/basegfx/raster/bzpixelraster.hxx | 5 ++-- basic/source/basmgr/basmgr.cxx | 2 +- basic/source/runtime/iosys.cxx | 5 ++-- basic/source/uno/scriptcont.cxx | 4 ++-- binaryurp/source/writer.cxx | 6 ++--- bridges/source/jni_uno/nativethreadpool.cxx | 4 ++-- canvas/source/directx/dx_9rm.cxx | 9 ++++---- canvas/source/directx/dx_surfacebitmap.cxx | 23 ++++++++++--------- canvas/source/null/null_canvasfont.cxx | 1 - .../source/controller/main/ChartRenderer.cxx | 2 +- chart2/source/model/main/ChartModel.cxx | 2 +- chart2/source/view/main/ChartView.cxx | 2 +- codemaker/source/codemaker/global.cxx | 2 +- cppu/source/typelib/static_types.cxx | 1 - cppu/source/uno/eq.hxx | 1 - dbaccess/source/core/api/RowSet.cxx | 4 ++-- .../core/api/SingleSelectQueryComposer.cxx | 2 +- dbaccess/source/core/api/TableDeco.cxx | 3 ++- dbaccess/source/core/api/querycomposer.cxx | 2 +- dbaccess/source/core/api/querydescriptor.cxx | 3 ++- dbaccess/source/core/api/table.cxx | 4 +++- .../source/core/dataaccess/ContentHelper.cxx | 2 +- .../core/dataaccess/databasecontext.cxx | 2 +- dbaccess/source/ui/browser/sbagrid.cxx | 3 +-- .../source/ui/querydesign/JoinExchange.cxx | 2 +- desktop/source/deployment/misc/dp_misc.cxx | 2 +- .../configuration/dp_configuration.cxx | 5 ++-- .../source/pkgchk/unopkg/unopkg_cmdenv.cxx | 1 - dtrans/source/win32/dtobj/FmtFilter.cxx | 14 ++++++----- dtrans/source/win32/misc/ImplHelper.cxx | 8 +++---- dtrans/source/win32/workbench/test_wincb.cxx | 2 +- editeng/source/uno/unofield.cxx | 2 +- editeng/source/uno/unotext.cxx | 4 ++-- extensions/source/ole/oleobjw.cxx | 1 - extensions/source/update/feed/updatefeed.cxx | 1 - extensions/workben/testpgp.cxx | 11 ++++----- forms/source/component/Columns.cxx | 5 ++-- forms/source/component/imgprod.cxx | 2 +- forms/source/richtext/richtextmodel.cxx | 2 +- .../fwi/uielement/constitemcontainer.cxx | 4 +++- .../fwi/uielement/rootitemcontainer.cxx | 4 +++- jvmfwk/source/framework.cxx | 2 +- .../source/filter/xfilter/xfbase64.cxx | 5 ++-- .../source/filter/xfilter/xfcolor.cxx | 5 ++-- lotuswordpro/source/filter/xfilter/xfdate.cxx | 3 ++- .../source/filter/xfilter/xflineheight.hxx | 4 +++- lotuswordpro/source/filter/xfilter/xfutil.hxx | 1 - package/source/zipapi/MemoryByteGrabber.hxx | 2 +- rdbmaker/inc/codemaker/registry.hxx | 4 +++- rdbmaker/source/rdbmaker/typeblop.cxx | 14 ++++++----- registry/source/regimpl.cxx | 1 - .../source/core/api/ReportDefinition.cxx | 2 +- reportdesign/source/core/api/Section.cxx | 2 +- rsc/source/tools/rsctools.cxx | 5 ++-- sdext/source/pdfimport/filterdet.cxx | 2 +- .../source/pdfimport/pdfparse/pdfentries.cxx | 3 +-- sdext/source/pdfimport/pdfparse/pdfparse.cxx | 1 - sfx2/source/control/thumbnailviewacc.cxx | 4 ++-- sfx2/source/explorer/nochaos.cxx | 4 ++-- starmath/source/mathmlexport.cxx | 2 +- starmath/source/mathmlimport.cxx | 2 +- starmath/source/unomodel.cxx | 2 +- store/source/store.cxx | 3 +-- store/workben/t_base.cxx | 12 +++++----- store/workben/t_file.cxx | 7 +++--- svtools/source/control/valueacc.cxx | 4 ++-- svtools/source/filter/filter.cxx | 2 +- svtools/source/graphic/graphic.cxx | 2 +- svtools/source/misc/transfer.cxx | 5 ++-- svx/source/accessibility/AccessibleShape.cxx | 2 +- svx/source/dialog/dlgctrl.cxx | 4 ++-- svx/source/fmcomp/fmgridif.cxx | 2 +- svx/source/fmcomp/gridcell.cxx | 2 +- svx/source/unodraw/unopage.cxx | 1 - svx/source/unodraw/unoshap2.cxx | 1 - svx/source/unodraw/unoshap3.cxx | 1 - svx/source/unodraw/unoshape.cxx | 3 +-- sw/source/core/undo/undraw.cxx | 1 - toolkit/inc/toolkit/helper/macros.hxx | 6 +++-- toolkit/source/awt/vclxbitmap.cxx | 1 - toolkit/source/awt/vclxcontainer.cxx | 1 - toolkit/source/awt/vclxdevice.cxx | 1 - toolkit/source/awt/vclxfont.cxx | 3 ++- toolkit/source/awt/vclxgraphics.cxx | 1 - toolkit/source/awt/vclxmenu.cxx | 1 - toolkit/source/awt/vclxprinter.cxx | 1 - toolkit/source/awt/vclxregion.cxx | 1 - toolkit/source/awt/vclxtoolkit.cxx | 1 - toolkit/source/awt/vclxwindow.cxx | 1 - toolkit/source/controls/stdtabcontroller.cxx | 1 - .../source/controls/stdtabcontrollermodel.cxx | 1 - toolkit/source/controls/unocontrol.cxx | 1 - .../source/controls/unocontrolcontainer.cxx | 1 - toolkit/source/controls/unocontrolmodel.cxx | 1 - tools/source/generic/config.cxx | 2 +- tools/source/inet/inetstrm.cxx | 5 ++-- tools/source/string/tustring.cxx | 1 - ucb/source/ucp/ftp/ftpcontent.cxx | 4 ++-- ucb/source/ucp/ftp/ftpurl.cxx | 2 +- ucb/source/ucp/ftp/test_ftpurl.cxx | 3 +-- ucb/source/ucp/gio/gio_inputstream.cxx | 1 - ucb/source/ucp/gio/gio_outputstream.cxx | 1 - ucb/source/ucp/gio/gio_seekable.cxx | 1 - ucb/source/ucp/gvfs/gvfs_stream.cxx | 1 - ucb/source/ucp/webdav/NeonInputStream.cxx | 7 +++--- ucb/source/ucp/webdav/NeonSession.cxx | 2 +- unotools/source/ucbhelper/ucblockbytes.cxx | 2 +- unoxml/source/dom/documentbuilder.cxx | 3 +-- unoxml/source/dom/node.cxx | 2 +- vcl/unx/generic/app/sm.cxx | 4 ++-- .../source/ooxml/OOXMLFastContextHandler.cxx | 2 +- xmlhelp/source/cxxhelp/inc/qe/Query.hxx | 4 ++-- .../cxxhelp/provider/bufferedinputstream.cxx | 1 - xmlscript/source/xml_helper/xml_byteseq.cxx | 4 ++-- xmlscript/test/imexp.cxx | 3 +-- 120 files changed, 187 insertions(+), 202 deletions(-) diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx index 759ed9687bcf..cde2949538e7 100644 --- a/accessibility/source/standard/vclxaccessibletoolbox.cxx +++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include + #include #include #include @@ -164,7 +166,7 @@ namespace sal_Int64 SAL_CALL OToolBoxWindowItem::getSomething( const Sequence< sal_Int8 >& _rId ) throw (RuntimeException) { if ( ( 16 == _rId.getLength() ) - && ( 0 == rtl_compareMemory( getUnoTunnelImplementationId().getConstArray(), _rId.getConstArray(), 16 ) ) + && ( 0 == memcmp( getUnoTunnelImplementationId().getConstArray(), _rId.getConstArray(), 16 ) ) ) return reinterpret_cast< sal_Int64>( this ); diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx index a194dcc53eb5..36eeb6cd761d 100644 --- a/animations/source/animcore/animcore.cxx +++ b/animations/source/animcore/animcore.cxx @@ -52,6 +52,7 @@ #include #include #include +#include using ::osl::Mutex; using ::osl::Guard; @@ -2018,7 +2019,7 @@ void SAL_CALL AnimationNode::removeChangesListener( const Reference< XChangesLis // XUnoTunnel ::sal_Int64 SAL_CALL AnimationNode::getSomething( const Sequence< ::sal_Int8 >& rId ) throw (RuntimeException) { - if( rId.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) + if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) { return sal::static_int_cast< sal_Int64 >(reinterpret_cast< sal_IntPtr >(this)); diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index 422a9d80eba2..d4b8c5f12b85 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -677,7 +677,7 @@ void implCopyStreamToByteSequence( Reference< XInputStream > xStream, sal_Int32 nPos = bytes.getLength(); bytes.realloc( nPos + nRead ); - ::rtl_copyMemory( bytes.getArray() + nPos, readBytes.getConstArray(), (sal_uInt32)nRead ); + memcpy( bytes.getArray() + nPos, readBytes.getConstArray(), (sal_uInt32)nRead ); } } @@ -810,8 +810,8 @@ void DlgEditor::Copy() pCombinedData[i] = sal_Int8( n & 0xff ); n >>= 8; } - ::rtl_copyMemory( pCombinedData + 4, DialogModelBytes.getConstArray(), nDialogDataLen ); - ::rtl_copyMemory( pCombinedData + nResOffset, aResData.getConstArray(), nResDataLen ); + memcpy( pCombinedData + 4, DialogModelBytes.getConstArray(), nDialogDataLen ); + memcpy( pCombinedData + nResOffset, aResData.getConstArray(), nResDataLen ); Any aCombinedDataAny; aCombinedDataAny <<= aCombinedData; @@ -905,10 +905,10 @@ void DlgEditor::Paste() sal_Int32 nDialogDataLen = nTotalLen - nResDataLen - 4; DialogModelBytes.realloc( nDialogDataLen ); - ::rtl_copyMemory( DialogModelBytes.getArray(), pCombinedData + 4, nDialogDataLen ); + memcpy( DialogModelBytes.getArray(), pCombinedData + 4, nDialogDataLen ); aResData.realloc( nResDataLen ); - ::rtl_copyMemory( aResData.getArray(), pCombinedData + nResOffset, nResDataLen ); + memcpy( aResData.getArray(), pCombinedData + nResOffset, nResDataLen ); } else { diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx index 82a430fe3daa..5ed17967df39 100644 --- a/basebmp/source/bitmapdevice.cxx +++ b/basebmp/source/bitmapdevice.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include + #include "basebmp/bitmapdevice.hxx" #include "basebmp/compositeiterator.hxx" @@ -47,7 +49,6 @@ #include "intconversion.hxx" #include -#include #include #include @@ -1892,7 +1893,7 @@ BitmapDeviceSharedPtr createBitmapDeviceImpl( const basegfx::B2IVector& &rtl_freeMemory ); if (pMem.get() == 0 && nMemSize != 0) return BitmapDeviceSharedPtr(); - rtl_zeroMemory(pMem.get(),nMemSize); + memset(pMem.get(), 0, nMemSize); } sal_uInt8* pFirstScanline = nScanlineStride < 0 ? diff --git a/basegfx/inc/basegfx/raster/bpixelraster.hxx b/basegfx/inc/basegfx/raster/bpixelraster.hxx index 6f3379546385..9d95b3f40769 100644 --- a/basegfx/inc/basegfx/raster/bpixelraster.hxx +++ b/basegfx/inc/basegfx/raster/bpixelraster.hxx @@ -32,7 +32,6 @@ #include #include #include -#include #include ////////////////////////////////////////////////////////////////////////////// @@ -59,7 +58,7 @@ namespace basegfx // reset void reset() { - rtl_zeroMemory(mpContent, sizeof(BPixel) * mnCount); + memset(mpContent, 0, sizeof(BPixel) * mnCount); } // constructor/destructor diff --git a/basegfx/inc/basegfx/raster/bzpixelraster.hxx b/basegfx/inc/basegfx/raster/bzpixelraster.hxx index 2f161b687144..a3e1db61d087 100644 --- a/basegfx/inc/basegfx/raster/bzpixelraster.hxx +++ b/basegfx/inc/basegfx/raster/bzpixelraster.hxx @@ -30,7 +30,6 @@ #define _BGFX_RASTER_BZPIXELRASTER_HXX #include -#include #include ////////////////////////////////////////////////////////////////////////////// @@ -51,7 +50,7 @@ namespace basegfx void resetZ() { reset(); - rtl_zeroMemory(mpZBuffer, sizeof(sal_uInt16) * mnCount); + memset(mpZBuffer, 0, sizeof(sal_uInt16) * mnCount); } // constructor/destructor @@ -59,7 +58,7 @@ namespace basegfx : BPixelRaster(nWidth, nHeight), mpZBuffer(new sal_uInt16[mnCount]) { - rtl_zeroMemory(mpZBuffer, sizeof(sal_uInt16) * mnCount); + memset(mpZBuffer, 0, sizeof(sal_uInt16) * mnCount); } ~BZPixelRaster() diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 7f5c691da472..3bd3a52438b2 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -2009,7 +2009,7 @@ uno::Sequence< sal_Int8 > implGetDialogData( SbxObject* pDialog ) uno::Sequence< sal_Int8 > aData( nLen ); sal_Int8* pDestData = aData.getArray(); const sal_Int8* pSrcData = (const sal_Int8*)aMemStream.GetData(); - rtl_copyMemory( pDestData, pSrcData, nLen ); + memcpy( pDestData, pSrcData, nLen ); return aData; } diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index 7f2753ad8b61..d03b8a67d58d 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include #include #include #include @@ -435,14 +436,14 @@ sal_uIntPtr UCBStream::GetData( void* pData, sal_uIntPtr nSize ) { Sequence aData; nSize = xIS->readBytes( aData, nSize ); - rtl_copyMemory( pData, aData.getConstArray(), nSize ); + memcpy( pData, aData.getConstArray(), nSize ); return nSize; } else if( xS.is() && (xISFromS = xS->getInputStream()).is() ) { Sequence aData; nSize = xISFromS->readBytes( aData, nSize ); - rtl_copyMemory( pData, aData.getConstArray(), nSize ); + memcpy(pData, aData.getConstArray(), nSize ); return nSize; } else diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index cdd4b9ef6b56..393dc7771238 100644 --- a/basic/source/uno/scriptcont.cxx +++ b/basic/source/uno/scriptcont.cxx @@ -639,7 +639,7 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, sal_Int32 nSize = (sal_Int32)aMemStream.Tell(); Sequence< sal_Int8 > aBinSeq( nSize ); sal_Int8* pData = aBinSeq.getArray(); - ::rtl_copyMemory( pData, aMemStream.GetData(), nSize ); + memcpy( pData, aMemStream.GetData(), nSize ); Reference< XOutputStream > xOut = xCodeStream->getOutputStream(); if ( !xOut.is() ) @@ -775,7 +775,7 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, sal_Int32 nSize = (sal_Int32)aMemStream.Tell(); Sequence< sal_Int8 > aBinSeq( nSize ); sal_Int8* pData = aBinSeq.getArray(); - ::rtl_copyMemory( pData, aMemStream.GetData(), nSize ); + memcpy( pData, aMemStream.GetData(), nSize ); Reference< XOutputStream > xOut = xCodeStream->getOutputStream(); if ( xOut.is() ) diff --git a/binaryurp/source/writer.cxx b/binaryurp/source/writer.cxx index 664208a517ab..dbbaf85e6c4c 100644 --- a/binaryurp/source/writer.cxx +++ b/binaryurp/source/writer.cxx @@ -21,13 +21,13 @@ #include #include +#include #include "com/sun/star/connection/XConnection.hpp" #include "com/sun/star/lang/WrappedTargetRuntimeException.hpp" #include "com/sun/star/uno/XCurrentContext.hpp" #include "cppuhelper/exc_hlp.hxx" #include "osl/mutex.hxx" -#include "rtl/memory.h" #include "uno/dispatcher.hxx" #include "binaryany.hxx" @@ -421,10 +421,10 @@ void Writer::sendMessage(std::vector< unsigned char > const & buffer) { css::uno::Sequence< sal_Int8 > s( static_cast< sal_Int32 >(header.size() + k)); OSL_ASSERT(!header.empty()); - rtl_copyMemory( + memcpy( s.getArray(), &header[0], static_cast< sal_Size >(header.size())); for (;;) { - rtl_copyMemory(s.getArray() + s.getLength() - k, p, k); + memcpy(s.getArray() + s.getLength() - k, p, k); try { bridge_->getConnection()->write(s); } catch (const css::io::IOException & e) { diff --git a/bridges/source/jni_uno/nativethreadpool.cxx b/bridges/source/jni_uno/nativethreadpool.cxx index a1e623a9cc66..969d91bb4e80 100644 --- a/bridges/source/jni_uno/nativethreadpool.cxx +++ b/bridges/source/jni_uno/nativethreadpool.cxx @@ -27,10 +27,10 @@ ************************************************************************/ +#include #include "jvmaccess/virtualmachine.hxx" #include "rtl/byteseq.h" #include "rtl/byteseq.hxx" -#include "rtl/memory.h" #include "rtl/ref.hxx" #include "sal/types.h" #include "uno/threadpool.h" @@ -111,7 +111,7 @@ Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_threadId( if (p == 0) { return 0; } - rtl_copyMemory(p, seq.getConstArray(), n); + memcpy(p, seq.getConstArray(), n); // sal_Int8 and jbyte ought to be compatible env->ReleasePrimitiveArrayCritical(a, p, 0); return a; diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx index 8d3ffd8b2755..e67898c07ba8 100644 --- a/canvas/source/directx/dx_9rm.cxx +++ b/canvas/source/directx/dx_9rm.cxx @@ -38,6 +38,7 @@ // vertex buffer (must be divisable // by 3, as each triangle primitive // has 3 vertices) +#include #include #include @@ -439,7 +440,7 @@ namespace dxcanvas for(sal_uInt32 i=0; i #include "dx_surfacebitmap.hxx" #include "dx_impltools.hxx" @@ -83,7 +84,7 @@ namespace dxcanvas sal_uInt8* DXColorBuffer::lock() const { #if DIRECTX_VERSION < 0x0900 - rtl_zeroMemory((void *)&aSurfaceDesc,sizeof(DDSURFACEDESC)); + memset((void *)&aSurfaceDesc, 0, sizeof(DDSURFACEDESC)); aSurfaceDesc.dwSize = sizeof(DDSURFACEDESC); const DWORD dwFlags = DDLOCK_NOSYSLOCK|DDLOCK_SURFACEMEMORYPTR|DDLOCK_WAIT|DDLOCK_READONLY; if(SUCCEEDED(mpSurface->Lock(NULL,&aSurfaceDesc,dwFlags,NULL))) @@ -344,7 +345,7 @@ namespace dxcanvas #if DIRECTX_VERSION < 0x0900 DDSURFACEDESC aSurfaceDesc; - rtl_zeroMemory(&aSurfaceDesc,sizeof(DDSURFACEDESC)); + memset(&aSurfaceDesc, 0, sizeof(DDSURFACEDESC)); aSurfaceDesc.dwSize = sizeof(DDSURFACEDESC); const DWORD dwFlags = DDLOCK_NOSYSLOCK|DDLOCK_SURFACEMEMORYPTR|DDLOCK_WAIT|DDLOCK_READONLY; @@ -468,7 +469,7 @@ namespace dxcanvas { #if DIRECTX_VERSION < 0x0900 DDSURFACEDESC aSurfaceDesc; - rtl_zeroMemory( &aSurfaceDesc,sizeof(DDSURFACEDESC) ); + memset( &aSurfaceDesc, 0, sizeof(DDSURFACEDESC) ); aSurfaceDesc.dwSize = sizeof(DDSURFACEDESC); if( FAILED(mpSurface->Lock( NULL, @@ -541,7 +542,7 @@ namespace dxcanvas #if DIRECTX_VERSION < 0x0900 DDSURFACEDESC aSurfaceDesc; - rtl_zeroMemory(&aSurfaceDesc,sizeof(DDSURFACEDESC)); + memset(&aSurfaceDesc,0, sizeof(DDSURFACEDESC)); aSurfaceDesc.dwSize = sizeof(DDSURFACEDESC); const DWORD dwFlags = DDLOCK_NOSYSLOCK|DDLOCK_SURFACEMEMORYPTR|DDLOCK_WAIT|DDLOCK_READONLY; @@ -554,7 +555,7 @@ namespace dxcanvas sal_uInt32 nSegmentSizeInBytes = nWidth<<4; for(sal_uInt32 y=0; y& aIdentifier ) throw( uno::RuntimeException) { - if( aIdentifier.getLength() == 16 && 0 == rtl_compareMemory( + if( aIdentifier.getLength() == 16 && 0 == memcmp( ChartPrettyPainter::getUnoTunnelId().getConstArray(), aIdentifier.getConstArray(), 16 ) ) { diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index ff09525040b5..053bf079df4a 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -1286,7 +1286,7 @@ Reference< util::XNumberFormatsSupplier > ChartModel::impl_getNumberFormatsSuppl ::sal_Int64 SAL_CALL ChartModel::getSomething( const Sequence< ::sal_Int8 >& aIdentifier ) throw( uno::RuntimeException) { - if( aIdentifier.getLength() == 16 && 0 == rtl_compareMemory( SvNumberFormatsSupplierObj::getUnoTunnelId().getConstArray(), + if( aIdentifier.getLength() == 16 && 0 == memcmp( SvNumberFormatsSupplierObj::getUnoTunnelId().getConstArray(), aIdentifier.getConstArray(), 16 ) ) { Reference< lang::XUnoTunnel > xTunnel( impl_getNumberFormatsSupplier(), uno::UNO_QUERY ); diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 763994e1a131..ab2ea1ca1d97 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -359,7 +359,7 @@ uno::Sequence< datatransfer::DataFlavor > SAL_CALL ChartView::getTransferDataFla ::sal_Int64 SAL_CALL ChartView::getSomething( const uno::Sequence< ::sal_Int8 >& aIdentifier ) throw( uno::RuntimeException) { - if( aIdentifier.getLength() == 16 && 0 == rtl_compareMemory( ExplicitValueProvider::getUnoTunnelId().getConstArray(), + if( aIdentifier.getLength() == 16 && 0 == memcmp( ExplicitValueProvider::getUnoTunnelId().getConstArray(), aIdentifier.getConstArray(), 16 ) ) { ExplicitValueProvider* pProvider = this; diff --git a/codemaker/source/codemaker/global.cxx b/codemaker/source/codemaker/global.cxx index bfc71f6de6a4..9130fd17ff8f 100644 --- a/codemaker/source/codemaker/global.cxx +++ b/codemaker/source/codemaker/global.cxx @@ -194,7 +194,7 @@ sal_Bool checkFileContent(const OString& targetFileName, const OString& tmpFileN if ( n1 != n2 ) bFindChanges = sal_True; else - if ( rtl_compareMemory(buffer1, buffer2, n2) != 0 ) + if ( memcmp(buffer1, buffer2, n2) != 0 ) bFindChanges = sal_True; } } diff --git a/cppu/source/typelib/static_types.cxx b/cppu/source/typelib/static_types.cxx index df1b93f7c057..a01040146e18 100644 --- a/cppu/source/typelib/static_types.cxx +++ b/cppu/source/typelib/static_types.cxx @@ -27,7 +27,6 @@ #include #include #include -#include #include #include diff --git a/cppu/source/uno/eq.hxx b/cppu/source/uno/eq.hxx index a270f6e6f75e..a3a26bf08ba9 100644 --- a/cppu/source/uno/eq.hxx +++ b/cppu/source/uno/eq.hxx @@ -20,7 +20,6 @@ #define EQ_HXX #include -#include #include "prim.hxx" #include "destr.hxx" diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index 136992e1750d..a75a155441b3 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -455,7 +455,7 @@ void SAL_CALL ORowSet::release() throw() // com::sun::star::XUnoTunnel sal_Int64 SAL_CALL ORowSet::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException) { - if (rId.getLength() == 16 && 0 == rtl_compareMemory(getImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) + if (rId.getLength() == 16 && 0 == memcmp(getImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) return reinterpret_cast(this); return 0; @@ -2909,7 +2909,7 @@ Sequence< sal_Int8 > ORowSetClone::getUnoTunnelImplementationId() // com::sun::star::XUnoTunnel sal_Int64 SAL_CALL ORowSetClone::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException) { - if (rId.getLength() == 16 && 0 == rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) + if (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) return reinterpret_cast(this); return 0; diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx index a3d35e281162..55aa752d4f00 100644 --- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx +++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx @@ -318,7 +318,7 @@ IMPLEMENT_PROPERTYCONTAINER_DEFAULTS(OSingleSelectQueryComposer) sal_Int64 SAL_CALL OSingleSelectQueryComposer::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getSomething" ); - if (rId.getLength() == 16 && 0 == rtl_compareMemory(getImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) + if (rId.getLength() == 16 && 0 == memcmp(getImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) return reinterpret_cast(this); return sal_Int64(0); diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx index c7a9a12a2621..30eee81a9976 100644 --- a/dbaccess/source/core/api/TableDeco.cxx +++ b/dbaccess/source/core/api/TableDeco.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include #include "TableDeco.hxx" #include @@ -496,7 +497,7 @@ Reference< XNameAccess> ODBTableDecorator::getColumns() throw (RuntimeException) sal_Int64 SAL_CALL ODBTableDecorator::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::getSomething" ); - if (rId.getLength() == 16 && 0 == rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) + if (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) return reinterpret_cast(this); sal_Int64 nRet = 0; diff --git a/dbaccess/source/core/api/querycomposer.cxx b/dbaccess/source/core/api/querycomposer.cxx index 1c72c7800e84..336e726d65bb 100644 --- a/dbaccess/source/core/api/querycomposer.cxx +++ b/dbaccess/source/core/api/querycomposer.cxx @@ -115,7 +115,7 @@ Sequence< sal_Int8 > SAL_CALL OQueryComposer::getImplementationId() throw (Runti sal_Int64 SAL_CALL OQueryComposer::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getSomething" ); - if (rId.getLength() == 16 && 0 == rtl_compareMemory(getImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) + if (rId.getLength() == 16 && 0 == memcmp(getImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) return reinterpret_cast(this); return 0; diff --git a/dbaccess/source/core/api/querydescriptor.cxx b/dbaccess/source/core/api/querydescriptor.cxx index a1bef51c0a7b..8b6db104e3c3 100644 --- a/dbaccess/source/core/api/querydescriptor.cxx +++ b/dbaccess/source/core/api/querydescriptor.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include #include "querydescriptor.hxx" #include "apitools.hxx" @@ -154,7 +155,7 @@ sal_Int64 SAL_CALL OQueryDescriptor_Base::getSomething( const Sequence< sal_Int8 if (_rIdentifier.getLength() != 16) return 0; - if (0 == rtl_compareMemory(getImplementationId().getConstArray(), _rIdentifier.getConstArray(), 16 ) ) + if (0 == memcmp(getImplementationId().getConstArray(), _rIdentifier.getConstArray(), 16 ) ) return reinterpret_cast(this); return 0; diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx index 818a388a45c1..2bb0e7d53a7a 100644 --- a/dbaccess/source/core/api/table.cxx +++ b/dbaccess/source/core/api/table.cxx @@ -18,6 +18,8 @@ */ +#include + #include "table.hxx" #include #include "dbastrings.hrc" @@ -343,7 +345,7 @@ sal_Int64 SAL_CALL ODBTable::getSomething( const Sequence< sal_Int8 >& rId ) thr { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::getSomething" ); sal_Int64 nRet(0); - if (rId.getLength() == 16 && 0 == rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) + if (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) nRet = reinterpret_cast(this); else nRet = OTable_Base::getSomething(rId); diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx index 5cbf8c6524a3..fed2637e58f7 100644 --- a/dbaccess/source/core/dataaccess/ContentHelper.cxx +++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx @@ -590,7 +590,7 @@ void OContentHelper::notifyPropertiesChange( const Sequence< PropertyChangeEvent // com::sun::star::lang::XUnoTunnel sal_Int64 OContentHelper::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) { - if (rId.getLength() == 16 && 0 == rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) + if (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) return reinterpret_cast(this); return 0; diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx index 4d8f3babc9a8..4ca37127c2ca 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.cxx +++ b/dbaccess/source/core/dataaccess/databasecontext.cxx @@ -720,7 +720,7 @@ void ODatabaseContext::databaseDocumentURLChange( const ::rtl::OUString& _rOldUR sal_Int64 SAL_CALL ODatabaseContext::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException) { - if (rId.getLength() == 16 && 0 == rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) + if (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) return reinterpret_cast(this); return 0; diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index a77df938f369..3a8ac73c81bb 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -69,7 +69,6 @@ #include #include #include -#include #include #include #include @@ -588,7 +587,7 @@ Sequence< Type > SAL_CALL SbaXGridPeer::getTypes() throw (RuntimeException) //------------------------------------------------------------------ sal_Int64 SAL_CALL SbaXGridPeer::getSomething( const Sequence< sal_Int8 > & rId ) throw(::com::sun::star::uno::RuntimeException) { - if( rId.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) + if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) return reinterpret_cast< sal_Int64 >( this ); return FmXGridPeer::getSomething(rId); diff --git a/dbaccess/source/ui/querydesign/JoinExchange.cxx b/dbaccess/source/ui/querydesign/JoinExchange.cxx index 82100a1e053a..9614c49c94db 100644 --- a/dbaccess/source/ui/querydesign/JoinExchange.cxx +++ b/dbaccess/source/ui/querydesign/JoinExchange.cxx @@ -112,7 +112,7 @@ namespace dbaui //------------------------------------------------------------------------ sal_Int64 SAL_CALL OJoinExchObj::getSomething( const Sequence< sal_Int8 >& _rIdentifier ) throw(RuntimeException) { - if (_rIdentifier.getLength() == 16 && 0 == rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(), _rIdentifier.getConstArray(), 16 ) ) + if (_rIdentifier.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), _rIdentifier.getConstArray(), 16 ) ) return reinterpret_cast(this); return 0; diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx index 2c30677aff02..31cb38c2f4ed 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.cxx @@ -526,7 +526,7 @@ OUString readConsole() } #else char buf[1024]; - rtl_zeroMemory(buf, 1024); + memset(buf, 0, 1024); // read one char less so that the last char in buf is always zero if (fgets(buf, 1024, stdin) != NULL) { diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx index c1019bacefe4..06589bf80ed6 100644 --- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx @@ -39,7 +39,6 @@ #include "rtl/string.hxx" #include "rtl/ustrbuf.hxx" #include "rtl/uri.hxx" -#include "rtl/memory.h" #include "osl/file.hxx" #include "cppuhelper/exc_hlp.hxx" #include "ucbhelper/content.hxx" @@ -640,7 +639,7 @@ OUString replaceOrigin( if ((write_pos + index) > filtered.getLength()) filtered.realloc( (filtered.getLength() + index) * 2 ); - rtl_copyMemory( filtered.getArray() + write_pos, pBytes, index ); + memcpy( filtered.getArray() + write_pos, pBytes, index ); write_pos += index; pBytes += index; nBytes -= index; @@ -679,7 +678,7 @@ OUString replaceOrigin( } if ((write_pos + nAdd) > filtered.getLength()) filtered.realloc( (filtered.getLength() + nAdd) * 2 ); - rtl_copyMemory( filtered.getArray() + write_pos, pAdd, nAdd ); + memcpy( filtered.getArray() + write_pos, pAdd, nAdd ); write_pos += nAdd; } if (!use_filtered) diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx index b7b57b27e1d4..85141645fb96 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx @@ -31,7 +31,6 @@ #include "../../deployment/gui/dp_gui_shared.hxx" #include "unopkg_shared.h" #include "osl/thread.h" -#include "rtl/memory.h" #include "tools/string.hxx" #include "tools/resmgr.hxx" #include "cppuhelper/implbase3.hxx" diff --git a/dtrans/source/win32/dtobj/FmtFilter.cxx b/dtrans/source/win32/dtobj/FmtFilter.cxx index 909fd28a219f..516870bd7b7e 100644 --- a/dtrans/source/win32/dtobj/FmtFilter.cxx +++ b/dtrans/source/win32/dtobj/FmtFilter.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include + #include "FmtFilter.hxx" #include #include @@ -199,7 +201,7 @@ Sequence< sal_Int8 > SAL_CALL WinDIBToOOBMP( const Sequence< sal_Int8 >& aWinDIB BITMAPFILEHEADER *pBmpFileHdr = reinterpret_cast< BITMAPFILEHEADER* >( ooBmpStream.getArray() ); DWORD nOffset = sizeof( BITMAPFILEHEADER ) + sizeof( BITMAPINFOHEADER ); - rtl_copyMemory( pBmpFileHdr + 1, pBmpInfoHdr, aWinDIB.getLength( ) ); + memcpy( pBmpFileHdr + 1, pBmpInfoHdr, aWinDIB.getLength( ) ); if( pBmpInfoHdr->biBitCount <= 8 ) nOffset += ( pBmpInfoHdr->biClrUsed ? pBmpInfoHdr->biClrUsed : ( 1 << pBmpInfoHdr->biBitCount ) ) << 2; @@ -226,7 +228,7 @@ Sequence< sal_Int8 > SAL_CALL OOBmpToWinDIB( Sequence< sal_Int8 >& aOOBmp ) Sequence< sal_Int8 > winDIBStream( aOOBmp.getLength( ) - sizeof( BITMAPFILEHEADER ) ); - rtl_copyMemory( winDIBStream.getArray( ), + memcpy( winDIBStream.getArray( ), aOOBmp.getArray( ) + sizeof( BITMAPFILEHEADER ), aOOBmp.getLength( ) - sizeof( BITMAPFILEHEADER ) ); @@ -328,12 +330,12 @@ Sequence< sal_Int8 > SAL_CALL TextHtmlToHTMLFormat( Sequence< sal_Int8 >& aTextH rtl_zeroMemory( aHTMLFmtSequence.getArray( ), aHTMLFmtSequence.getLength( ) ); // copy the HTML Format header - rtl_copyMemory( + memcpy( static_cast< LPVOID >( aHTMLFmtSequence.getArray( ) ), static_cast< LPVOID >( aHTMLFmtHdr ), lHTMLFmtHdr ); // concat the text/html - rtl_copyMemory( + memcpy( static_cast< LPVOID >( aHTMLFmtSequence.getArray( ) + lHTMLFmtHdr ), static_cast< LPVOID >( aTextHtml.getArray( ) ), aTextHtml.getLength( ) ); @@ -391,9 +393,9 @@ Sequence SAL_CALL TextHtmlToHTMLFormat(Sequence& aTextHtml) htmlFormat += textHtml; Sequence byteSequence(htmlFormat.length() + 1); // space the trailing '\0' - rtl_zeroMemory(byteSequence.getArray(), byteSequence.getLength()); + memset(byteSequence.getArray(), 0, byteSequence.getLength()); - rtl_copyMemory( + memcpy( static_cast(byteSequence.getArray()), static_cast(htmlFormat.c_str()), htmlFormat.length()); diff --git a/dtrans/source/win32/misc/ImplHelper.cxx b/dtrans/source/win32/misc/ImplHelper.cxx index 93f0ba198468..d85674dc6375 100644 --- a/dtrans/source/win32/misc/ImplHelper.cxx +++ b/dtrans/source/win32/misc/ImplHelper.cxx @@ -20,9 +20,9 @@ #include #include "ImplHelper.hxx" #include -#include - +#include #include + #if defined _MSC_VER #pragma warning(push,1) #endif @@ -259,7 +259,7 @@ DVTARGETDEVICE* SAL_CALL CopyTargetDevice( DVTARGETDEVICE* ptdSrc ) if ( NULL != ptdSrc ) { ptdDest = static_cast< DVTARGETDEVICE* >( CoTaskMemAlloc( ptdSrc->tdSize ) ); - rtl_copyMemory( ptdDest, ptdSrc, static_cast< size_t >( ptdSrc->tdSize ) ); + memcpy( ptdDest, ptdSrc, static_cast< size_t >( ptdSrc->tdSize ) ); } } #ifdef __MINGW32__ @@ -450,7 +450,7 @@ sal_Bool SAL_CALL CompareTargetDevice( DVTARGETDEVICE* ptdLeft, DVTARGETDEVICE* if ( ptdLeft->tdSize == ptdRight->tdSize ) - if ( rtl_compareMemory( ptdLeft, ptdRight, ptdLeft->tdSize ) == 0 ) + if ( memcmp( ptdLeft, ptdRight, ptdLeft->tdSize ) == 0 ) bRet = sal_True; } #ifdef __MINGW32__ diff --git a/dtrans/source/win32/workbench/test_wincb.cxx b/dtrans/source/win32/workbench/test_wincb.cxx index 6cc69e2e706b..9839af5d7832 100644 --- a/dtrans/source/win32/workbench/test_wincb.cxx +++ b/dtrans/source/win32/workbench/test_wincb.cxx @@ -182,7 +182,7 @@ Any SAL_CALL CTransferable::getTransferData( const DataFlavor& aFlavor ) Sequence< sal_Int8 > textStream( text.getLength( ) + 1 ); - rtl_copyMemory( textStream.getArray( ), text.getStr( ), textStream.getLength( ) ); + memcpy( textStream.getArray( ), text.getStr( ), textStream.getLength( ) ); anyData = makeAny( textStream ); } diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx index 8bc3fccddde7..90ef8741d82b 100644 --- a/editeng/source/uno/unofield.cxx +++ b/editeng/source/uno/unofield.cxx @@ -245,7 +245,7 @@ const ::com::sun::star::uno::Sequence< sal_Int8 > & SvxUnoTextField::getUnoTunne sal_Int64 SAL_CALL SvxUnoTextField::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException) { - if( rId.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), + if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) { return sal::static_int_cast(reinterpret_cast(this)); diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index bbe42e00f01c..14121c6eb484 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -2160,7 +2160,7 @@ SvxUnoTextBase* SvxUnoTextBase::getImplementation( const uno::Reference< uno::XI sal_Int64 SAL_CALL SvxUnoTextBase::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw(uno::RuntimeException) \ { - if( rId.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), + if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) { return sal::static_int_cast(reinterpret_cast(this)); @@ -2208,7 +2208,7 @@ const uno::Sequence< sal_Int8 > & SvxUnoText::getUnoTunnelId() throw() sal_Int64 SAL_CALL SvxUnoText::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw(uno::RuntimeException) \ { - if( rId.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), + if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) { return sal::static_int_cast(reinterpret_cast(this)); diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx index 88ef33662dba..f77cfcca28ed 100644 --- a/extensions/source/ole/oleobjw.cxx +++ b/extensions/source/ole/oleobjw.cxx @@ -55,7 +55,6 @@ #include #include -#include #include #include "jscriptclasses.hxx" diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx index 65016a64af66..d1db88cbcea1 100644 --- a/extensions/source/update/feed/updatefeed.cxx +++ b/extensions/source/update/feed/updatefeed.cxx @@ -57,7 +57,6 @@ #include #include -#include #include #include #include diff --git a/extensions/workben/testpgp.cxx b/extensions/workben/testpgp.cxx index e6499dd0c2f1..5dad9bea661e 100644 --- a/extensions/workben/testpgp.cxx +++ b/extensions/workben/testpgp.cxx @@ -27,7 +27,6 @@ ************************************************************************/ #include -#include #ifndef _RTL_WSTRING_ #include #endif @@ -220,7 +219,7 @@ void DataSource_Impl::setBuffer (const Sequence &rBuffer) { // Fill buffer from file descriptor. char buffer[1024]; - rtl_zeroMemory (buffer, sizeof(buffer)); + memset (buffer, 0, sizeof(buffer)); int k = read (m_fd, buffer, sizeof(buffer)); while (k > 0) @@ -228,10 +227,10 @@ void DataSource_Impl::setBuffer (const Sequence &rBuffer) sal_Int32 n = m_buffer.getLength(); m_buffer.realloc (n + k); - rtl_copyMemory (m_buffer.getArray() + n, buffer, k); + memcpy (m_buffer.getArray() + n, buffer, k); n += k; - rtl_zeroMemory (buffer, k); + memset (buffer, 0, k); k = read (m_fd, buffer, sizeof(buffer)); } } @@ -283,7 +282,7 @@ sal_Int32 SAL_CALL DataSource_Impl::readBytes ( if (k > 0) { rData.realloc(k); - rtl_copyMemory ( + memcpy ( rData.getArray(), m_buffer.getConstArray() + m_position, k); m_position += k; } @@ -390,7 +389,7 @@ void SAL_CALL DataSink_Impl::writeBytes (const Sequence &rBuffer) sal_Int32 n = m_buffer.getLength(); m_buffer.realloc (n + rBuffer.getLength()); - rtl_copyMemory ( + memcpy ( m_buffer.getArray() + n, rBuffer.getConstArray(), rBuffer.getLength()); diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx index 7f8b95877eae..77372ae6d20c 100644 --- a/forms/source/component/Columns.cxx +++ b/forms/source/component/Columns.cxx @@ -26,6 +26,8 @@ * ************************************************************************/ +#include + #include "Columns.hxx" #include "property.hrc" #include "property.hxx" @@ -49,7 +51,6 @@ #include "services.hxx" #include "frm_resource.hrc" #include -#include //......................................................................... namespace frm @@ -138,7 +139,7 @@ sal_Int64 SAL_CALL OGridColumn::getSomething( const Sequence& _rIdenti sal_Int64 nReturn(0); if ( (_rIdentifier.getLength() == 16) - && (0 == rtl_compareMemory( getUnoTunnelImplementationId().getConstArray(), _rIdentifier.getConstArray(), 16 )) + && (0 == memcmp( getUnoTunnelImplementationId().getConstArray(), _rIdentifier.getConstArray(), 16 )) ) { nReturn = reinterpret_cast(this); diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx index be2843044899..49e539bc4012 100644 --- a/forms/source/component/imgprod.cxx +++ b/forms/source/component/imgprod.cxx @@ -90,7 +90,7 @@ ImgProdLockBytes::ImgProdLockBytes( ::com::sun::star::uno::Reference< ::com::sun { const sal_uInt32 nOldLength = maSeq.getLength(); maSeq.realloc( nOldLength + nRead ); - rtl_copyMemory( maSeq.getArray() + nOldLength, aReadSeq.getConstArray(), aReadSeq.getLength() ); + memcpy( maSeq.getArray() + nOldLength, aReadSeq.getConstArray(), aReadSeq.getLength() ); } } while( nBytesToRead == nRead ); diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx index 141b2f0df325..33aba9509c65 100644 --- a/forms/source/richtext/richtextmodel.cxx +++ b/forms/source/richtext/richtextmodel.cxx @@ -589,7 +589,7 @@ namespace frm { Sequence< sal_Int8 > aEditEngineAccessId( getEditEngineTunnelId() ); if ( ( _rId.getLength() == aEditEngineAccessId.getLength() ) - && ( 0 == rtl_compareMemory( aEditEngineAccessId.getConstArray(), _rId.getConstArray(), _rId.getLength() ) ) + && ( 0 == memcmp( aEditEngineAccessId.getConstArray(), _rId.getConstArray(), _rId.getLength() ) ) ) return reinterpret_cast< sal_Int64 >( m_pEngine.get() ); diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx index 078bf3000404..1d5482df6c3b 100644 --- a/framework/source/fwi/uielement/constitemcontainer.cxx +++ b/framework/source/fwi/uielement/constitemcontainer.cxx @@ -26,6 +26,8 @@ * ************************************************************************/ +#include + #include #include #include @@ -266,7 +268,7 @@ Reference< XIndexAccess > ConstItemContainer::deepCopyContainer( const Reference // XUnoTunnel sal_Int64 ConstItemContainer::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException) { - if( ( rIdentifier.getLength() == 16 ) && ( 0 == rtl_compareMemory( ConstItemContainer::GetUnoTunnelId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) ) + if( ( rIdentifier.getLength() == 16 ) && ( 0 == memcmp( ConstItemContainer::GetUnoTunnelId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) ) { return reinterpret_cast< sal_Int64 >( this ); } diff --git a/framework/source/fwi/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx index 92fca28ccc08..c373bcf948c9 100644 --- a/framework/source/fwi/uielement/rootitemcontainer.cxx +++ b/framework/source/fwi/uielement/rootitemcontainer.cxx @@ -26,6 +26,8 @@ * ************************************************************************/ +#include + #include #include #include @@ -167,7 +169,7 @@ Reference< XIndexAccess > RootItemContainer::deepCopyContainer( const Reference< // XUnoTunnel sal_Int64 RootItemContainer::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException) { - if( ( rIdentifier.getLength() == 16 ) && ( 0 == rtl_compareMemory( RootItemContainer::GetUnoTunnelId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) ) + if( ( rIdentifier.getLength() == 16 ) && ( 0 == memcmp( RootItemContainer::GetUnoTunnelId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) ) return sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >( this )); return 0; } diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index 28276b8bda5d..324b112b4e7e 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -1204,7 +1204,7 @@ JavaInfo * CJavaInfo::copyJavaInfo(const JavaInfo * pInfo) (JavaInfo*) rtl_allocateMemory(sizeof(JavaInfo)); if (newInfo) { - rtl_copyMemory(newInfo, pInfo, sizeof(JavaInfo)); + memcpy(newInfo, pInfo, sizeof(JavaInfo)); rtl_uString_acquire(pInfo->sVendor); rtl_uString_acquire(pInfo->sLocation); rtl_uString_acquire(pInfo->sVersion); diff --git a/lotuswordpro/source/filter/xfilter/xfbase64.cxx b/lotuswordpro/source/filter/xfilter/xfbase64.cxx index 0e0e433de1bf..5ce056d483e8 100644 --- a/lotuswordpro/source/filter/xfilter/xfbase64.cxx +++ b/lotuswordpro/source/filter/xfilter/xfbase64.cxx @@ -57,7 +57,8 @@ * @file * Base64 tool. ************************************************************************/ -#include "xfbase64.hxx" +#include +#include "xfbase64.hxx" const sal_Char aBase64EncodeTable[] = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', @@ -105,7 +106,7 @@ rtl::OUString XFBase64::Encode(sal_uInt8 *buf, sal_Int32 len) nNeeded = (cycles+1)*4; buffer = new sal_Char[nNeeded+1]; - rtl_zeroMemory(buffer,nNeeded+1); + memset(buffer, 0, nNeeded+1); for( sal_Int32 i=0; i #include -#include "xfcolor.hxx" +#include "xfcolor.hxx" rtl::OUString XFColor::ToString() const { char buf[8]; - rtl_zeroMemory(buf,8); + memset(buf, 0, 8); sprintf(buf,"#%2x%2x%2x",m_nRed, m_nGreen, m_nBlue); for( int i=1; i<7;i++ ) { diff --git a/lotuswordpro/source/filter/xfilter/xfdate.cxx b/lotuswordpro/source/filter/xfilter/xfdate.cxx index 2935392cb2dc..c5025086e64b 100644 --- a/lotuswordpro/source/filter/xfilter/xfdate.cxx +++ b/lotuswordpro/source/filter/xfilter/xfdate.cxx @@ -57,12 +57,13 @@ * @file * Date field with date style. ************************************************************************/ +#include #include "xfdate.hxx" XFDate::XFDate() { m_bFixed = 0; - rtl_zeroMemory(&m_aDateTime,sizeof(m_aDateTime)); + memset(&m_aDateTime, 0, sizeof(m_aDateTime)); m_bValued = sal_False; } diff --git a/lotuswordpro/source/filter/xfilter/xflineheight.hxx b/lotuswordpro/source/filter/xfilter/xflineheight.hxx index 838dbd1a84d3..9573fe31443f 100644 --- a/lotuswordpro/source/filter/xfilter/xflineheight.hxx +++ b/lotuswordpro/source/filter/xfilter/xflineheight.hxx @@ -60,6 +60,8 @@ #ifndef _XFLINEHEIGHT_HXX #define _XFLINEHEIGHT_HXX +#include + class XFLineHeight { public: @@ -117,7 +119,7 @@ inline void XFLineHeight::SetSpace(double value) inline void XFLineHeight::Reset() { m_eType = enumLHNone; - rtl_zeroMemory(&m_Value,sizeof(m_Value)); + memset(&m_Value, 0, sizeof(m_Value)); } inline enumLHType XFLineHeight::GetType() diff --git a/lotuswordpro/source/filter/xfilter/xfutil.hxx b/lotuswordpro/source/filter/xfilter/xfutil.hxx index df49ff4c1797..1cf756193d2a 100644 --- a/lotuswordpro/source/filter/xfilter/xfutil.hxx +++ b/lotuswordpro/source/filter/xfilter/xfutil.hxx @@ -63,7 +63,6 @@ #include "xfdefs.hxx" #include -#include #include diff --git a/package/source/zipapi/MemoryByteGrabber.hxx b/package/source/zipapi/MemoryByteGrabber.hxx index adde3a6daa66..90f542db4a7a 100644 --- a/package/source/zipapi/MemoryByteGrabber.hxx +++ b/package/source/zipapi/MemoryByteGrabber.hxx @@ -54,7 +54,7 @@ public: nBytesToRead = mnEnd - mnCurrent; aData.realloc ( nBytesToRead ); - rtl_copyMemory( aData.getArray(), mpBuffer + mnCurrent, nBytesToRead ); + memcpy( aData.getArray(), mpBuffer + mnCurrent, nBytesToRead ); mnCurrent += nBytesToRead; return nBytesToRead; } diff --git a/rdbmaker/inc/codemaker/registry.hxx b/rdbmaker/inc/codemaker/registry.hxx index 404d53bfe571..bb30b85fb1e6 100644 --- a/rdbmaker/inc/codemaker/registry.hxx +++ b/rdbmaker/inc/codemaker/registry.hxx @@ -20,6 +20,8 @@ #ifndef _CODEMAKER_REGISTRY_HXX_ #define _CODEMAKER_REGISTRY_HXX_ +#include + #include #include #include @@ -40,7 +42,7 @@ struct TypeReader_Impl if (copyData) { m_pBlop = (sal_uInt8*)rtl_allocateMemory(bufferLen); - rtl_copyMemory((void*)m_pBlop, buffer, bufferLen); + memcpy(const_cast(m_pBlop), buffer, bufferLen); } else { m_blopSize = bufferLen; diff --git a/rdbmaker/source/rdbmaker/typeblop.cxx b/rdbmaker/source/rdbmaker/typeblop.cxx index f9acdfd93343..7049da4502be 100644 --- a/rdbmaker/source/rdbmaker/typeblop.cxx +++ b/rdbmaker/source/rdbmaker/typeblop.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include + #include #include #include @@ -287,7 +289,7 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop) length = writer.getBlopSize(); *pBlop = (sal_uInt8*)rtl_allocateMemory( length ); - rtl_copyMemory(*pBlop, writer.getBlop(), length); + memcpy(*pBlop, writer.getBlop(), length); } break; case TypeClass_MODULE: @@ -329,7 +331,7 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop) length = writer.getBlopSize(); *pBlop = (sal_uInt8*)rtl_allocateMemory( length ); - rtl_copyMemory(*pBlop, writer.getBlop(), length); + memcpy(*pBlop, writer.getBlop(), length); } break; case TypeClass_INTERFACE: @@ -404,7 +406,7 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop) length = writer.getBlopSize(); *pBlop = (sal_uInt8*)rtl_allocateMemory( length ); - rtl_copyMemory(*pBlop, writer.getBlop(), length); + memcpy(*pBlop, writer.getBlop(), length); } break; case TypeClass_STRUCT: @@ -444,7 +446,7 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop) length = writer.getBlopSize(); *pBlop = (sal_uInt8*)rtl_allocateMemory( length ); - rtl_copyMemory(*pBlop, writer.getBlop(), length); + memcpy(*pBlop, writer.getBlop(), length); } break; case TypeClass_ENUM: @@ -473,7 +475,7 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop) length = writer.getBlopSize(); *pBlop = (sal_uInt8*)rtl_allocateMemory( length ); - rtl_copyMemory(*pBlop, writer.getBlop(), length); + memcpy(*pBlop, writer.getBlop(), length); } break; case TypeClass_TYPEDEF: @@ -488,7 +490,7 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop) 0, 0, 0); length = writer.getBlopSize(); *pBlop = (sal_uInt8*)rtl_allocateMemory( length ); - rtl_copyMemory(*pBlop, writer.getBlop(), length); + memcpy(*pBlop, writer.getBlop(), length); } break; default: diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx index d51aafdc53e2..e364a1757953 100644 --- a/registry/source/regimpl.cxx +++ b/registry/source/regimpl.cxx @@ -45,7 +45,6 @@ #include #include -#include #include #include #include diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 7e9f4f584f0e..ca28b10cd66a 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -2168,7 +2168,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OReportDefinition::getAvailableMimeTyp sal_Int64 SAL_CALL OReportDefinition::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw(uno::RuntimeException) { sal_Int64 nRet = 0; - if (rId.getLength() == 16 && 0 == rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) + if (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) nRet = reinterpret_cast(this); else { diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx index 71aeef5ffc59..186a4a86cf3c 100644 --- a/reportdesign/source/core/api/Section.cxx +++ b/reportdesign/source/core/api/Section.cxx @@ -670,7 +670,7 @@ sal_Bool SAL_CALL OSection::hasForms() throw (uno::RuntimeException) //------------------------------------------------------------------ sal_Int64 OSection::getSomething( const uno::Sequence< sal_Int8 > & rId ) throw (uno::RuntimeException) { - if (rId.getLength() == 16 && 0 == rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) + if (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) return reinterpret_cast(this); return (m_xDrawPage_Tunnel.is()) ? m_xDrawPage_Tunnel->getSomething(rId) : 0; } diff --git a/rsc/source/tools/rsctools.cxx b/rsc/source/tools/rsctools.cxx index 8c72ac4c540a..63d787e4e12f 100644 --- a/rsc/source/tools/rsctools.cxx +++ b/rsc/source/tools/rsctools.cxx @@ -36,7 +36,6 @@ #include #include -#include using ::rtl::OUString; using ::rtl::OUStringToOString; @@ -97,7 +96,7 @@ char* rsc_strdup( const char* pStr ) { int nLen = strlen( pStr ); char* pBuffer = (char*)rtl_allocateMemory( nLen+1 ); - rtl_copyMemory( pBuffer, pStr, nLen+1 ); + memcpy( pBuffer, pStr, nLen+1 ); return pBuffer; } @@ -405,7 +404,7 @@ void RscWriteRc :: PutUTF8( char * pStr ) n++; sal_uInt32 nOldLen = IncSize( n ); - rtl_copyMemory( GetPointer( nOldLen ), pStr, nStrLen ); + memcpy( GetPointer( nOldLen ), pStr, nStrLen ); // 0 terminated pMem[ nOldLen + nStrLen ] = '\0'; } diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx index 52a855d00620..39dccaad9c7a 100644 --- a/sdext/source/pdfimport/filterdet.cxx +++ b/sdext/source/pdfimport/filterdet.cxx @@ -590,7 +590,7 @@ bool checkDocChecksum( const rtl::OUString& rInPDFFileURL, rtl_digest_destroyMD5( aActualDigest ); // compare the contents - bRet = (0 == rtl_compareMemory( nActualChecksum, nTestChecksum, sizeof( nActualChecksum ) )); + bRet = (0 == memcmp( nActualChecksum, nTestChecksum, sizeof( nActualChecksum ) )); #if OSL_DEBUG_LEVEL > 1 OSL_TRACE( "test checksum: " ); for( unsigned int i = 0; i < sizeof(nTestChecksum); i++ ) diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx index 9a7855492685..10bb30d827dd 100644 --- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx @@ -35,7 +35,6 @@ #include #include #include -#include #ifdef SYSTEM_ZLIB #include "zlib.h" #else @@ -728,7 +727,7 @@ bool PDFObject::getDeflatedStream( char** ppStream, unsigned int* pBytes, const // get the compressed length *pBytes = m_pStream->getDictLength( pObjectContainer ); if( pStream != *ppStream ) - rtl_moveMemory( *ppStream, pStream, *pBytes ); + memmove( *ppStream, pStream, *pBytes ); if( rContext.m_bDecrypt ) { EmitImplData* pEData = getEmitData( rContext ); diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx index 21c195de48ff..75ee3eeb305a 100644 --- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx @@ -44,7 +44,6 @@ #include #include -#include #include // disable warnings again because someone along the line has enabled them diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx index 901cf412f1f1..511ad8a49ac5 100644 --- a/sfx2/source/control/thumbnailviewacc.cxx +++ b/sfx2/source/control/thumbnailviewacc.cxx @@ -552,7 +552,7 @@ sal_Int64 SAL_CALL ThumbnailViewAcc::getSomething( const uno::Sequence< sal_Int8 { sal_Int64 nRet; - if( ( rId.getLength() == 16 ) && ( 0 == rtl_compareMemory( ThumbnailViewAcc::getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) ) + if( ( rId.getLength() == 16 ) && ( 0 == memcmp( ThumbnailViewAcc::getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) ) nRet = reinterpret_cast< sal_Int64 >( this ); else nRet = 0; @@ -983,7 +983,7 @@ sal_Int64 SAL_CALL ThumbnailViewItemAcc::getSomething( const uno::Sequence< sal_ { sal_Int64 nRet; - if( ( rId.getLength() == 16 ) && ( 0 == rtl_compareMemory( ThumbnailViewItemAcc::getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) ) + if( ( rId.getLength() == 16 ) && ( 0 == memcmp( ThumbnailViewItemAcc::getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) ) nRet = reinterpret_cast< sal_Int64 >( this ); else nRet = 0; diff --git a/sfx2/source/explorer/nochaos.cxx b/sfx2/source/explorer/nochaos.cxx index 48c0ca942ae6..dc450c558830 100644 --- a/sfx2/source/explorer/nochaos.cxx +++ b/sfx2/source/explorer/nochaos.cxx @@ -190,8 +190,8 @@ CntStaticPoolDefaults_Impl::CntStaticPoolDefaults_Impl( CntItemPool* /*pPool*/ ) m_ppDefaults( new SfxPoolItem* [ m_nItems ] ), m_pItemInfos( new SfxItemInfo [ m_nItems ] ) { - rtl_zeroMemory( m_ppDefaults, sizeof( SfxPoolItem* ) * m_nItems ); - rtl_zeroMemory( m_pItemInfos, sizeof( SfxItemInfo ) * m_nItems ); + memset( m_ppDefaults, 0, sizeof( SfxPoolItem* ) * m_nItems ); + memset( m_pItemInfos, 0, sizeof( SfxItemInfo ) * m_nItems ); Insert( new SfxStringItem( WID_CHAOS_START, String() ), 0, diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx index 2c083680d8a0..ccca612276e0 100644 --- a/starmath/source/mathmlexport.cxx +++ b/starmath/source/mathmlexport.cxx @@ -391,7 +391,7 @@ sal_Int64 SAL_CALL SmXMLExport::getSomething( throw(uno::RuntimeException) { if ( rId.getLength() == 16 && - 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), + 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) return sal::static_int_cast< sal_Int64 >(reinterpret_cast< sal_uIntPtr >(this)); diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx index a57b83b51899..04d26efe36d1 100644 --- a/starmath/source/mathmlimport.cxx +++ b/starmath/source/mathmlimport.cxx @@ -543,7 +543,7 @@ sal_Int64 SAL_CALL SmXMLImport::getSomething( throw(uno::RuntimeException) { if ( rId.getLength() == 16 && - 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), + 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) return sal::static_int_cast< sal_Int64 >(reinterpret_cast< sal_uIntPtr >(this)); diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index 07e4535a8765..0cba7ccee2c2 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -381,7 +381,7 @@ sal_Int64 SAL_CALL SmModel::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw(uno::RuntimeException) { if( rId.getLength() == 16 - && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), + && 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) { return sal::static_int_cast< sal_Int64 >(reinterpret_cast< sal_uIntPtr >(this)); diff --git a/store/source/store.cxx b/store/source/store.cxx index 06ad766b9c90..184de2ca2cd0 100644 --- a/store/source/store.cxx +++ b/store/source/store.cxx @@ -21,7 +21,6 @@ #include "store/store.h" #include -#include #include #include @@ -353,7 +352,7 @@ storeError SAL_CALL store_findFirst ( return store_E_InvalidParameter; // Initialize FindData. - rtl_zeroMemory (pFindData, sizeof (storeFindData)); + memset (pFindData, 0, sizeof (storeFindData)); // Find first. pFindData->m_nReserved = (sal_uInt32)(~0); diff --git a/store/workben/t_base.cxx b/store/workben/t_base.cxx index ffb1e066cc8a..e60db8970121 100644 --- a/store/workben/t_base.cxx +++ b/store/workben/t_base.cxx @@ -18,10 +18,10 @@ */ +#include #include "sal/types.h" #include "osl/diagnose.h" #include "osl/thread.h" -#include "rtl/memory.h" #include "rtl/ustring.hxx" #include "object.hxx" @@ -242,15 +242,15 @@ static void __store_testUnicode (const sal_Char *pszFilename) hConvert = rtl_createTextToUnicodeConverter (RTL_TEXTENCODING_UTF8); MyFindData it; - rtl_zeroMemory (&it, sizeof(it)); + memset (&it, 0, sizeof(it)); sal_Int32 n = rtl_str_getLength (pszFilename); n = __store_convertTextToUnicode ( hConvert, pszFilename, n, it.m_pszName, STORE_MAXIMUM_NAMESIZE - 1); if (it.m_nLength > n) - rtl_zeroMemory ( - &it.m_pszName[n], ((it.m_nLength - n) * sizeof(sal_Unicode))); + memset ( + &it.m_pszName[n], 0, ((it.m_nLength - n) * sizeof(sal_Unicode))); it.m_nLength = n; rtl_destroyTextToUnicodeConverter (hConvert); @@ -340,8 +340,8 @@ int SAL_CALL main (int argc, char **argv) xLockBytes.clear(); sal_Char pBuffer[TEST_PAGESIZE]; - rtl_zeroMemory (pBuffer, sizeof (pBuffer)); - rtl_copyMemory (pBuffer, argv[0], rtl_str_getLength(argv[0]) + 1); + memset (pBuffer, 0, sizeof (pBuffer)); + memcpy (pBuffer, argv[0], rtl_str_getLength(argv[0]) + 1); eErrCode = xBIOS->write (TEST_PAGESIZE, pBuffer, sizeof (pBuffer)); if (eErrCode != store_E_None) diff --git a/store/workben/t_file.cxx b/store/workben/t_file.cxx index 745fbbd978e9..058d04b3577a 100644 --- a/store/workben/t_file.cxx +++ b/store/workben/t_file.cxx @@ -24,6 +24,7 @@ #include "lockbyte.hxx" +#include #include #include "osl/file.h" @@ -91,7 +92,7 @@ int SAL_CALL main (int argc, char **argv) } sal_Char buffer[TEST_PAGESIZE]; - rtl_fillMemory (buffer, sizeof(buffer), sal_uInt8('B')); + memset (buffer, sal_uInt8('B'), sizeof(buffer)); sal_uInt32 i, k; for (k = 0; k < 4; k++) @@ -173,14 +174,14 @@ int SAL_CALL main (int argc, char **argv) if (offset == 0) { sal_uInt32 magic = 256 * 4; - if (rtl_compareMemory (&verify[index], &magic, sizeof(magic))) + if (memcmp (&verify[index], &magic, sizeof(magic))) { // Failure. fprintf (stderr, "t_file: Unexpected value at 0x00000000\n"); } index += 4; } - if (rtl_compareMemory ( + if (memcmp ( &verify[index], &buffer[index], TEST_PAGESIZE - index)) { // Failure. diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx index e6d63fa3933d..065fa18d2555 100644 --- a/svtools/source/control/valueacc.cxx +++ b/svtools/source/control/valueacc.cxx @@ -669,7 +669,7 @@ sal_Int64 SAL_CALL ValueSetAcc::getSomething( const uno::Sequence< sal_Int8 >& r { sal_Int64 nRet; - if( ( rId.getLength() == 16 ) && ( 0 == rtl_compareMemory( ValueSetAcc::getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) ) + if( ( rId.getLength() == 16 ) && ( 0 == memcmp( ValueSetAcc::getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) ) nRet = reinterpret_cast< sal_Int64 >( this ); else nRet = 0; @@ -1217,7 +1217,7 @@ sal_Int64 SAL_CALL ValueItemAcc::getSomething( const uno::Sequence< sal_Int8 >& { sal_Int64 nRet; - if( ( rId.getLength() == 16 ) && ( 0 == rtl_compareMemory( ValueItemAcc::getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) ) + if( ( rId.getLength() == 16 ) && ( 0 == memcmp( ValueItemAcc::getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) ) nRet = reinterpret_cast< sal_Int64 >( this ); else nRet = 0; diff --git a/svtools/source/filter/filter.cxx b/svtools/source/filter/filter.cxx index 5cd2f8d7fd20..aaacb12884f8 100644 --- a/svtools/source/filter/filter.cxx +++ b/svtools/source/filter/filter.cxx @@ -1959,7 +1959,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String& if ( nChunkLen ) { aChunkData.aData.resize( nChunkLen ); - rtl_copyMemory( &aChunkData.aData[ 0 ], aByteSeq.getConstArray(), nChunkLen ); + memcpy( &aChunkData.aData[ 0 ], aByteSeq.getConstArray(), nChunkLen ); } std::vector< vcl::PNGWriter::ChunkData >::iterator aIter = rChunkData.end() - 1; rChunkData.insert( aIter, aChunkData ); diff --git a/svtools/source/graphic/graphic.cxx b/svtools/source/graphic/graphic.cxx index 14a5c32de6d8..9d522d3f8163 100644 --- a/svtools/source/graphic/graphic.cxx +++ b/svtools/source/graphic/graphic.cxx @@ -274,7 +274,7 @@ const ::Graphic* Graphic::getImplementation( const uno::Reference< uno::XInterfa sal_Int64 SAL_CALL Graphic::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw( uno::RuntimeException ) { - return( ( rId.getLength() == 16 && 0 == rtl_compareMemory( ::Graphic::getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) ? + return( ( rId.getLength() == 16 && 0 == memcmp( ::Graphic::getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) ? reinterpret_cast< sal_Int64 >( mpGraphic ) : 0 ); } diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 8c41222d2193..53b9fd1f5e7f 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -32,7 +32,6 @@ #include #endif #include -#include #include #include #include @@ -610,7 +609,7 @@ sal_Int64 SAL_CALL TransferableHelper::getSomething( const Sequence< sal_Int8 >& sal_Int64 nRet; if( ( rId.getLength() == 16 ) && - ( 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) ) + ( 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) ) { nRet = sal::static_int_cast(reinterpret_cast(this)); } @@ -791,7 +790,7 @@ sal_Bool TransferableHelper::SetString( const ::rtl::OUString& rString, const Da const rtl::OString aByteStr(rtl::OUStringToOString(rString, osl_getThreadTextEncoding())); Sequence< sal_Int8 > aSeq( aByteStr.getLength() + 1 ); - rtl_copyMemory( aSeq.getArray(), aByteStr.getStr(), aByteStr.getLength() ); + memcpy( aSeq.getArray(), aByteStr.getStr(), aByteStr.getLength() ); aSeq[ aByteStr.getLength() ] = 0; maAny <<= aSeq; } diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 7ef5c90e1a43..05b37d488aac 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -944,7 +944,7 @@ sal_Int64 SAL_CALL { sal_Int64 nReturn( 0 ); - if( ( rIdentifier.getLength() == 16 ) && ( 0 == rtl_compareMemory( getUnoTunnelImplementationId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) ) + if( ( rIdentifier.getLength() == 16 ) && ( 0 == memcmp( getUnoTunnelImplementationId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) ) nReturn = reinterpret_cast< sal_Int64 >( this ); return( nReturn ); diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 2c14e44a0fcd..c37687a9fe8d 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -735,7 +735,7 @@ SvxPixelCtl::SvxPixelCtl( Window* pParent, const ResId& rResId, sal_uInt16 nNumb nSquares = nLines * nLines; pPixel = new sal_uInt16[ nSquares ]; - rtl_zeroMemory(pPixel, nSquares * sizeof(sal_uInt16)); + memset(pPixel, 0, nSquares * sizeof(sal_uInt16)); } // Destructor dealocating the dynamic array @@ -852,7 +852,7 @@ void SvxPixelCtl::SetXBitmap( const XOBitmap& rXBmp ) void SvxPixelCtl::Reset() { // clear pixel area - rtl_zeroMemory(pPixel, nSquares * sizeof(sal_uInt16)); + memset(pPixel, 0, nSquares * sizeof(sal_uInt16)); Invalidate(); } diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index c5a1abca40b2..ad73e3bf060f 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -1210,7 +1210,7 @@ sal_Int64 SAL_CALL FmXGridPeer::getSomething( const Sequence< sal_Int8 >& _rIden sal_Int64 nReturn(0); if ( (_rIdentifier.getLength() == 16) - && (0 == rtl_compareMemory( getUnoTunnelImplementationId().getConstArray(), _rIdentifier.getConstArray(), 16 )) + && (0 == memcmp( getUnoTunnelImplementationId().getConstArray(), _rIdentifier.getConstArray(), 16 )) ) { nReturn = reinterpret_cast(this); diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index a015f6cce669..d24fd2653e9e 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -4681,7 +4681,7 @@ sal_Int64 SAL_CALL FmXFilterCell::getSomething( const Sequence< sal_Int8 >& _rId sal_Int64 nReturn(0); if ( (_rIdentifier.getLength() == 16) - && (0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), _rIdentifier.getConstArray(), 16 )) + && (0 == memcmp( getUnoTunnelId().getConstArray(), _rIdentifier.getConstArray(), 16 )) ) { nReturn = reinterpret_cast(this); diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index fb7a95b10789..22a284129947 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -33,7 +33,6 @@ #include #include -#include #include #include #include diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index 93f8e18f32a4..04da106169a1 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -45,7 +45,6 @@ #include #include -#include #include #include diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx index bab97e794a84..895674de2f69 100644 --- a/svx/source/unodraw/unoshap3.cxx +++ b/svx/source/unodraw/unoshap3.cxx @@ -36,7 +36,6 @@ #include #include -#include #include #include #include diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 13398726d1c7..2875ad6f6fd0 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -44,7 +44,6 @@ #include #include #include -#include #include #include #include @@ -341,7 +340,7 @@ SvxShape* SvxShape::getImplementation( const uno::Reference< uno::XInterface >& //---------------------------------------------------------------------- sal_Int64 SAL_CALL SvxShape::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException) \ { - if( rId.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) + if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) { return sal::static_int_cast(reinterpret_cast(this)); } diff --git a/sw/source/core/undo/undraw.cxx b/sw/source/core/undo/undraw.cxx index 35c8dea51b80..e2b97ae2b66b 100644 --- a/sw/source/core/undo/undraw.cxx +++ b/sw/source/core/undo/undraw.cxx @@ -30,7 +30,6 @@ #include #include -#include #include #include diff --git a/toolkit/inc/toolkit/helper/macros.hxx b/toolkit/inc/toolkit/helper/macros.hxx index 01d5705c60f5..a8282477b3d9 100644 --- a/toolkit/inc/toolkit/helper/macros.hxx +++ b/toolkit/inc/toolkit/helper/macros.hxx @@ -29,12 +29,14 @@ #ifndef _TOOLKIT_HELPER_MACROS_HXX_ #define _TOOLKIT_HELPER_MACROS_HXX_ +#include + #include #define IMPL_XUNOTUNNEL_MINIMAL( ClassName ) \ sal_Int64 ClassName::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException) \ { \ - if( ( rIdentifier.getLength() == 16 ) && ( 0 == rtl_compareMemory( ClassName::GetUnoTunnelId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) ) \ + if( ( rIdentifier.getLength() == 16 ) && ( 0 == memcmp( ClassName::GetUnoTunnelId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) ) \ { \ return sal::static_int_cast< sal_Int64 >(reinterpret_cast< sal_IntPtr >(this)); \ } \ @@ -60,7 +62,7 @@ ClassName* ClassName::GetImplementation( const ::com::sun::star::uno::Reference< #define IMPL_XUNOTUNNEL2( ClassName, BaseClass ) \ sal_Int64 ClassName::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException) \ { \ - if( ( rIdentifier.getLength() == 16 ) && ( 0 == rtl_compareMemory( ClassName::GetUnoTunnelId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) ) \ + if( ( rIdentifier.getLength() == 16 ) && ( 0 == memcmp( ClassName::GetUnoTunnelId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) ) \ { \ return sal::static_int_cast< sal_Int64 >(reinterpret_cast< sal_IntPtr >(this)); \ } \ diff --git a/toolkit/source/awt/vclxbitmap.cxx b/toolkit/source/awt/vclxbitmap.cxx index 736751ec232e..773b69a7e4a4 100644 --- a/toolkit/source/awt/vclxbitmap.cxx +++ b/toolkit/source/awt/vclxbitmap.cxx @@ -30,7 +30,6 @@ #include #include #include -#include #include // ---------------------------------------------------- diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx index 1afcfabe0fb9..1ea0e4765d5c 100644 --- a/toolkit/source/awt/vclxcontainer.cxx +++ b/toolkit/source/awt/vclxcontainer.cxx @@ -30,7 +30,6 @@ #include #include #include -#include #include #include diff --git a/toolkit/source/awt/vclxdevice.cxx b/toolkit/source/awt/vclxdevice.cxx index e73b1f2cd13e..1cc74ae90f26 100644 --- a/toolkit/source/awt/vclxdevice.cxx +++ b/toolkit/source/awt/vclxdevice.cxx @@ -37,7 +37,6 @@ #include #include -#include #include #include diff --git a/toolkit/source/awt/vclxfont.cxx b/toolkit/source/awt/vclxfont.cxx index 822d82246211..a44526a548b2 100644 --- a/toolkit/source/awt/vclxfont.cxx +++ b/toolkit/source/awt/vclxfont.cxx @@ -26,11 +26,12 @@ * ************************************************************************/ +#include + #include #include #include #include -#include #include #include diff --git a/toolkit/source/awt/vclxgraphics.cxx b/toolkit/source/awt/vclxgraphics.cxx index 2def418ce61f..491b2855c21b 100644 --- a/toolkit/source/awt/vclxgraphics.cxx +++ b/toolkit/source/awt/vclxgraphics.cxx @@ -32,7 +32,6 @@ #include #include #include -#include #include #include diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx index b12d79510ab1..7748aa675000 100644 --- a/toolkit/source/awt/vclxmenu.cxx +++ b/toolkit/source/awt/vclxmenu.cxx @@ -32,7 +32,6 @@ #include #include #include -#include #include #include diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx index f51ee238d659..1462087cf4a2 100644 --- a/toolkit/source/awt/vclxprinter.cxx +++ b/toolkit/source/awt/vclxprinter.cxx @@ -29,7 +29,6 @@ #include #include #include -#include #include diff --git a/toolkit/source/awt/vclxregion.cxx b/toolkit/source/awt/vclxregion.cxx index 4d463c1ad770..079aa2fb8a20 100644 --- a/toolkit/source/awt/vclxregion.cxx +++ b/toolkit/source/awt/vclxregion.cxx @@ -31,7 +31,6 @@ #include #include #include -#include #include #include diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index bea6a744dc86..6053de716e7c 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -53,7 +53,6 @@ #include #include #include -#include #include #include diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index 9d7cb73078c8..9d26ffbdd98f 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -53,7 +53,6 @@ #include #include #include -#include #include #include #include diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx index fcf33553c9e4..9a88234a30de 100644 --- a/toolkit/source/controls/stdtabcontroller.cxx +++ b/toolkit/source/controls/stdtabcontroller.cxx @@ -34,7 +34,6 @@ #include #include #include -#include #include #include diff --git a/toolkit/source/controls/stdtabcontrollermodel.cxx b/toolkit/source/controls/stdtabcontrollermodel.cxx index 344daaef67b4..982d029d93f8 100644 --- a/toolkit/source/controls/stdtabcontrollermodel.cxx +++ b/toolkit/source/controls/stdtabcontrollermodel.cxx @@ -33,7 +33,6 @@ #include #include #include -#include #include #include diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index 7d5a6ac98c68..8ad20ecac814 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx index 0bdf24c195db..7e6f3c97054d 100644 --- a/toolkit/source/controls/unocontrolcontainer.cxx +++ b/toolkit/source/controls/unocontrolcontainer.cxx @@ -31,7 +31,6 @@ #include #include -#include #include #include diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index a0c0230d50ba..86df917f6c16 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx index d2852cf5f737..30709499733f 100644 --- a/tools/source/generic/config.cxx +++ b/tools/source/generic/config.cxx @@ -116,7 +116,7 @@ static sal_uInt8* ImplSysReadConfig( const rtl::OUString& rFileName, if (nRead > 2 && memcmp(pBuf, BOM, 3) == 0) { nRead -= 3; - rtl_moveMemory(pBuf, pBuf + 3, sal::static_int_cast(nRead * sizeof(sal_uInt8)) ); + memmove(pBuf, pBuf + 3, sal::static_int_cast(nRead * sizeof(sal_uInt8)) ); rbIsUTF8BOM = sal_True; } diff --git a/tools/source/inet/inetstrm.cxx b/tools/source/inet/inetstrm.cxx index 19db6ee5a76a..7392f50b6647 100644 --- a/tools/source/inet/inetstrm.cxx +++ b/tools/source/inet/inetstrm.cxx @@ -19,7 +19,6 @@ #include #include -#include #include #include #include @@ -1284,7 +1283,7 @@ int INetMIMEMessageStream::GetMsgLine (sal_Char *pData, sal_uIntPtr nSize) aDelim.append(pMsg->GetMultipartBoundary()); aDelim.append(RTL_CONSTASCII_STRINGPARAM("\r\n")); - rtl_copyMemory(pData, aDelim.getStr(), + memcpy(pData, aDelim.getStr(), aDelim.getLength()); return aDelim.getLength(); } @@ -1303,7 +1302,7 @@ int INetMIMEMessageStream::GetMsgLine (sal_Char *pData, sal_uIntPtr nSize) aDelim.append(pMsg->GetMultipartBoundary()); aDelim.append(RTL_CONSTASCII_STRINGPARAM("--\r\n")); - rtl_copyMemory (pData, aDelim.getStr(), + memcpy (pData, aDelim.getStr(), aDelim.getLength()); return aDelim.getLength(); } diff --git a/tools/source/string/tustring.cxx b/tools/source/string/tustring.cxx index 58217be7c270..0893e4afb256 100644 --- a/tools/source/string/tustring.cxx +++ b/tools/source/string/tustring.cxx @@ -23,7 +23,6 @@ #include #include -#include #include #include #include diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx index 9d63b26022e0..314226aaf6dc 100644 --- a/ucb/source/ucp/ftp/ftpcontent.cxx +++ b/ucb/source/ucp/ftp/ftpcontent.cxx @@ -47,7 +47,7 @@ #include #include -#include +#include #include "curl.hxx" #include #include @@ -730,7 +730,7 @@ sal_Int32 InsertData::read(sal_Int8 *dest,sal_Int32 nBytesRequested) if(m_xInputStream.is()) { Sequence seq(nBytesRequested); m = m_xInputStream->readBytes(seq,nBytesRequested); - rtl_copyMemory(dest,seq.getConstArray(),m); + memcpy(dest,seq.getConstArray(),m); } return m; } diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx index 13b5ae89b4ff..06ffa42cfe67 100644 --- a/ucb/source/ucp/ftp/ftpurl.cxx +++ b/ucb/source/ucp/ftp/ftpurl.cxx @@ -94,7 +94,7 @@ int MemoryContainer::append( m_pBuffer = rtl_reallocateMemory(m_pBuffer,m_nLen); } - rtl_copyMemory(static_cast(m_pBuffer)+m_nWritePos, + memcpy(static_cast(m_pBuffer)+m_nWritePos, pBuffer,nLen); m_nWritePos = tmp; return nLen; diff --git a/ucb/source/ucp/ftp/test_ftpurl.cxx b/ucb/source/ucp/ftp/test_ftpurl.cxx index 3e2a5c22a2dd..573453e04595 100644 --- a/ucb/source/ucp/ftp/test_ftpurl.cxx +++ b/ucb/source/ucp/ftp/test_ftpurl.cxx @@ -32,7 +32,6 @@ #include "ftploaderthread.hxx" #include "ftphandleprovider.hxx" #include "debughelper.hxx" -#include #include #define TESTEVAL \ @@ -252,7 +251,7 @@ int test_ftpopen(void) char *dest = (char*) malloc(sizeof(char)); dest[0] = 0; do { - rtl_zeroMemory((void*)buff,bffsz); + memset((void*)buff, 0, bffsz); fread(buff,bffsz-1,1,file); nbuf = strlen(buff); ndest = strlen(dest); diff --git a/ucb/source/ucp/gio/gio_inputstream.cxx b/ucb/source/ucp/gio/gio_inputstream.cxx index e0bc9c38b185..f4d60c85b5fc 100644 --- a/ucb/source/ucp/gio/gio_inputstream.cxx +++ b/ucb/source/ucp/gio/gio_inputstream.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include #include #include #include diff --git a/ucb/source/ucp/gio/gio_outputstream.cxx b/ucb/source/ucp/gio/gio_outputstream.cxx index 047ef9fcdfc9..050133ebc9af 100644 --- a/ucb/source/ucp/gio/gio_outputstream.cxx +++ b/ucb/source/ucp/gio/gio_outputstream.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include #include #include #include diff --git a/ucb/source/ucp/gio/gio_seekable.cxx b/ucb/source/ucp/gio/gio_seekable.cxx index e78ec0485903..2f9774ef5de4 100644 --- a/ucb/source/ucp/gio/gio_seekable.cxx +++ b/ucb/source/ucp/gio/gio_seekable.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include #include #include #include diff --git a/ucb/source/ucp/gvfs/gvfs_stream.cxx b/ucb/source/ucp/gvfs/gvfs_stream.cxx index 3741703ac052..18dacfa50c34 100644 --- a/ucb/source/ucp/gvfs/gvfs_stream.cxx +++ b/ucb/source/ucp/gvfs/gvfs_stream.cxx @@ -27,7 +27,6 @@ ************************************************************************/ #include "gvfs_stream.hxx" -#include #include #include diff --git a/ucb/source/ucp/webdav/NeonInputStream.cxx b/ucb/source/ucp/webdav/NeonInputStream.cxx index 240f41232c2a..882fa2520b4f 100644 --- a/ucb/source/ucp/webdav/NeonInputStream.cxx +++ b/ucb/source/ucp/webdav/NeonInputStream.cxx @@ -26,8 +26,9 @@ * ************************************************************************/ +#include + #include "NeonInputStream.hxx" -#include using namespace cppu; using namespace com::sun::star::io; @@ -57,7 +58,7 @@ NeonInputStream::~NeonInputStream( void ) void NeonInputStream::AddToStream( const char * inBuf, sal_Int32 inLen ) { mInputBuffer.realloc( sal::static_int_cast(mLen) + inLen ); - rtl_copyMemory( mInputBuffer.getArray() + mLen, inBuf, inLen ); + memcpy( mInputBuffer.getArray() + mLen, inBuf, inLen ); mLen += inLen; } @@ -94,7 +95,7 @@ sal_Int32 SAL_CALL NeonInputStream::readBytes( aData.realloc( theBytes2Read ); // Write the data - rtl_copyMemory( + memcpy( aData.getArray(), mInputBuffer.getConstArray() + mPos, theBytes2Read ); // Update our stream position for next time diff --git a/ucb/source/ucp/webdav/NeonSession.cxx b/ucb/source/ucp/webdav/NeonSession.cxx index 45ee2409f0f0..b3a737fb5fa6 100644 --- a/ucb/source/ucp/webdav/NeonSession.cxx +++ b/ucb/source/ucp/webdav/NeonSession.cxx @@ -2125,7 +2125,7 @@ NeonSession::getDataFromInputStream( rData.realloc( nPos + nRead ); aBuffer.realloc( nRead ); - rtl_copyMemory( (void*)( rData.getArray() + nPos ), + memcpy( (void*)( rData.getArray() + nPos ), (const void*)aBuffer.getConstArray(), nRead ); nPos += nRead; diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index 2b709a98c157..758aef20670c 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -1435,7 +1435,7 @@ ErrCode UcbLockBytes::ReadAt ( sal_uLong nPos, void *pBuffer, sal_uLong nCount, return ERRCODE_IO_CANTREAD; } - rtl_copyMemory (pBuffer, aData.getConstArray(), nSize); + memcpy (pBuffer, aData.getConstArray(), nSize); if (pRead) *pRead = sal_uLong(nSize); diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx index 37f9b3f7a5d1..cbfe97a7eb71 100644 --- a/unoxml/source/dom/documentbuilder.cxx +++ b/unoxml/source/dom/documentbuilder.cxx @@ -29,7 +29,6 @@ #include #include -#include #include #include @@ -210,7 +209,7 @@ namespace DOM int nread = pctx->rInputStream->readBytes(chunk, len); // copy bytes to the provided buffer - rtl_copyMemory(buffer, chunk.getConstArray(), nread); + memcpy(buffer, chunk.getConstArray(), nread); return nread; } catch (const com::sun::star::uno::Exception& ex) { (void) ex; diff --git a/unoxml/source/dom/node.cxx b/unoxml/source/dom/node.cxx index 39fe729c9083..3fcb3dacfdc7 100644 --- a/unoxml/source/dom/node.cxx +++ b/unoxml/source/dom/node.cxx @@ -1033,7 +1033,7 @@ namespace DOM throw (RuntimeException) { if ((rId.getLength() == 16) && - (0 == rtl_compareMemory(theCNodeUnoTunnelId::get().getSeq().getConstArray(), + (0 == memcmp(theCNodeUnoTunnelId::get().getSeq().getConstArray(), rId.getConstArray(), 16))) { return ::sal::static_int_cast< sal_Int64 >( diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx index 67e7db213bf5..de2bf2caf912 100644 --- a/vcl/unx/generic/app/sm.cxx +++ b/vcl/unx/generic/app/sm.cxx @@ -736,8 +736,8 @@ void ICEWatchProc( { if( i < pThis->m_nConnections-1 ) { - rtl_moveMemory( pThis->m_pConnections+i, pThis->m_pConnections+i+1, sizeof( IceConn )*(pThis->m_nConnections-i-1) ); - rtl_moveMemory( pThis->m_pFilehandles+i+1, pThis->m_pFilehandles+i+2, sizeof( struct pollfd )*(pThis->m_nConnections-i-1) ); + memmove( pThis->m_pConnections+i, pThis->m_pConnections+i+1, sizeof( IceConn )*(pThis->m_nConnections-i-1) ); + memmove( pThis->m_pFilehandles+i+1, pThis->m_pFilehandles+i+2, sizeof( struct pollfd )*(pThis->m_nConnections-i-1) ); } pThis->m_nConnections--; pThis->m_pConnections = (IceConn*)rtl_reallocateMemory( pThis->m_pConnections, sizeof( IceConn )*pThis->m_nConnections ); diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index 09dee9314975..8670a45ffbb6 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -340,7 +340,7 @@ sal_Int64 SAL_CALL OOXMLFastContextHandler::getSomething( const uno::Sequence< s throw(uno::RuntimeException) { if( rId.getLength() == 16 - && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), + && 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) { return sal::static_int_cast diff --git a/xmlhelp/source/cxxhelp/inc/qe/Query.hxx b/xmlhelp/source/cxxhelp/inc/qe/Query.hxx index d5628f39f3ce..b9f52f379517 100644 --- a/xmlhelp/source/cxxhelp/inc/qe/Query.hxx +++ b/xmlhelp/source/cxxhelp/inc/qe/Query.hxx @@ -22,7 +22,7 @@ #include #include #include - +#include namespace xmlsearch { @@ -40,7 +40,7 @@ namespace xmlsearch { matches_( new sal_Int32[ 2*nColumns ] ), penalty_( penalty ) { - rtl_zeroMemory( matches_,sizeof( sal_Int32 ) * matchesL_ ); + memset( matches_, 0, sizeof( sal_Int32 ) * matchesL_ ); } ~QueryHit() { delete[] matches_; } diff --git a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx index ef84cc86cbb7..303340e614aa 100644 --- a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx +++ b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx @@ -28,7 +28,6 @@ #include -#include #include "bufferedinputstream.hxx" diff --git a/xmlscript/source/xml_helper/xml_byteseq.cxx b/xmlscript/source/xml_helper/xml_byteseq.cxx index dc90b75723bb..b6dee8dc59c5 100644 --- a/xmlscript/source/xml_helper/xml_byteseq.cxx +++ b/xmlscript/source/xml_helper/xml_byteseq.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include +#include #include #include @@ -129,7 +129,7 @@ void BSeqOutputStream::writeBytes( Sequence< sal_Int8 > const & rData ) { sal_Int32 nPos = _seq->getLength(); _seq->realloc( nPos + rData.getLength() ); - ::rtl_copyMemory( (char *)_seq->getArray() + nPos, + memcpy( (char *)_seq->getArray() + nPos, (char const *)rData.getConstArray(), rData.getLength() ); } diff --git a/xmlscript/test/imexp.cxx b/xmlscript/test/imexp.cxx index 0b1c90c9deca..42cc8851a86c 100644 --- a/xmlscript/test/imexp.cxx +++ b/xmlscript/test/imexp.cxx @@ -19,7 +19,6 @@ #include -#include #include "osl/file.h" #include @@ -138,7 +137,7 @@ void exportToFile( sal_Int32 nPos = bytes.getLength(); bytes.realloc( nPos + nRead ); - ::rtl_copyMemory( bytes.getArray() + nPos, readBytes.getConstArray(), (sal_uInt32)nRead ); + memcpy( bytes.getArray() + nPos, readBytes.getConstArray(), (sal_uInt32)nRead ); } FILE * f = ::fopen( fname, "w" ); From f42a9309760565d24619bad9ee1f5561ce89c14b Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 1 Oct 2012 21:51:40 +0300 Subject: [PATCH 126/863] Use prefixes for these UNO components Change-Id: I719f10818fd211bfe60e5351a5de53a716fdf20f --- .../source/commontools/FDatabaseMetaDataResultSet.cxx | 2 +- connectivity/source/cpool/Zregistration.cxx | 2 +- connectivity/source/cpool/dbpool2.component | 2 +- connectivity/source/dbtools/dbtools.component | 2 +- connectivity/source/drivers/ado/Aservices.cxx | 4 ++-- connectivity/source/drivers/ado/ado.component | 2 +- connectivity/source/drivers/calc/Cservices.cxx | 2 +- connectivity/source/drivers/calc/calc.component | 2 +- connectivity/source/drivers/dbase/Dservices.cxx | 2 +- connectivity/source/drivers/dbase/dbase.component | 2 +- connectivity/source/drivers/evoab2/NServices.cxx | 2 +- connectivity/source/drivers/evoab2/evoab.component | 2 +- connectivity/source/drivers/flat/Eservices.cxx | 2 +- connectivity/source/drivers/flat/flat.component | 2 +- connectivity/source/drivers/hsqldb/Hservices.cxx | 2 +- connectivity/source/drivers/hsqldb/hsqldb.component | 2 +- connectivity/source/drivers/jdbc/jdbc.component | 2 +- connectivity/source/drivers/jdbc/jservices.cxx | 2 +- connectivity/source/drivers/kab/KServices.cxx | 2 +- connectivity/source/drivers/kab/kab1.component | 2 +- connectivity/source/drivers/macab/MacabServices.cxx | 2 +- connectivity/source/drivers/macab/macab1.component | 2 +- connectivity/source/drivers/mork/MServices.cxx | 2 +- connectivity/source/drivers/mork/mork.component | 2 +- connectivity/source/drivers/mozab/MServices.cxx | 2 +- .../source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx | 2 +- .../source/drivers/mozab/bootstrap/mozbootstrap.component | 2 +- connectivity/source/drivers/mozab/mozab.component | 2 +- connectivity/source/drivers/mysql/Yservices.cxx | 2 +- connectivity/source/drivers/mysql/mysql.component | 2 +- connectivity/source/drivers/odbc/odbc.component | 2 +- connectivity/source/drivers/odbc/oservices.cxx | 2 +- .../source/drivers/postgresql/postgresql-sdbc-impl.component | 2 +- .../source/drivers/postgresql/postgresql-sdbc.component | 2 +- connectivity/source/drivers/postgresql/pq_connection.cxx | 2 +- connectivity/source/drivers/postgresql/pq_driver.cxx | 2 +- connectivity/source/manager/mregistration.cxx | 2 +- connectivity/source/manager/sdbc2.component | 2 +- 38 files changed, 39 insertions(+), 39 deletions(-) diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx index a03d6c1ec8af..465702193b66 100644 --- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx +++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx @@ -884,7 +884,7 @@ extern "C" { //--------------------------------------------------------------------------------------- -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* implName, ::com::sun::star::lang::XMultiServiceFactory* serviceManager, void* registryKey) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbtools_component_getFactory(const sal_Char* implName, ::com::sun::star::lang::XMultiServiceFactory* serviceManager, void* registryKey) { return cppu::component_getFactoryHelper(implName, serviceManager, registryKey, entries); } diff --git a/connectivity/source/cpool/Zregistration.cxx b/connectivity/source/cpool/Zregistration.cxx index 71fd7f2b4062..68039800a4d9 100644 --- a/connectivity/source/cpool/Zregistration.cxx +++ b/connectivity/source/cpool/Zregistration.cxx @@ -34,7 +34,7 @@ extern "C" { //--------------------------------------------------------------------------------------- -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* _pImplName, ::com::sun::star::lang::XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbpool2_component_getFactory(const sal_Char* _pImplName, ::com::sun::star::lang::XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/) { void* pRet = NULL; diff --git a/connectivity/source/cpool/dbpool2.component b/connectivity/source/cpool/dbpool2.component index 43e4c79009aa..f6876fb0103a 100644 --- a/connectivity/source/cpool/dbpool2.component +++ b/connectivity/source/cpool/dbpool2.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/connectivity/source/dbtools/dbtools.component b/connectivity/source/dbtools/dbtools.component index 9fb6d07e24e2..532884dbede6 100644 --- a/connectivity/source/dbtools/dbtools.component +++ b/connectivity/source/dbtools/dbtools.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/connectivity/source/drivers/ado/Aservices.cxx b/connectivity/source/drivers/ado/Aservices.cxx index 3ccae9d101a6..ec5cebe70c12 100644 --- a/connectivity/source/drivers/ado/Aservices.cxx +++ b/connectivity/source/drivers/ado/Aservices.cxx @@ -75,7 +75,7 @@ struct ProviderRequest }; //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL ado_component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment ** /*ppEnv*/) { @@ -83,7 +83,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron } //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL ado_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/connectivity/source/drivers/ado/ado.component b/connectivity/source/drivers/ado/ado.component index 21007a4f93b9..9286ca0bd0a5 100644 --- a/connectivity/source/drivers/ado/ado.component +++ b/connectivity/source/drivers/ado/ado.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/connectivity/source/drivers/calc/Cservices.cxx b/connectivity/source/drivers/calc/Cservices.cxx index c173f71c085a..217863e2a919 100644 --- a/connectivity/source/drivers/calc/Cservices.cxx +++ b/connectivity/source/drivers/calc/Cservices.cxx @@ -75,7 +75,7 @@ struct ProviderRequest }; //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL connectivity_calc_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/connectivity/source/drivers/calc/calc.component b/connectivity/source/drivers/calc/calc.component index 0e957bb3d58d..158a065efdee 100644 --- a/connectivity/source/drivers/calc/calc.component +++ b/connectivity/source/drivers/calc/calc.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/connectivity/source/drivers/dbase/Dservices.cxx b/connectivity/source/drivers/dbase/Dservices.cxx index cd053042abb0..15cc9d4a814f 100644 --- a/connectivity/source/drivers/dbase/Dservices.cxx +++ b/connectivity/source/drivers/dbase/Dservices.cxx @@ -75,7 +75,7 @@ struct ProviderRequest }; //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbase_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/connectivity/source/drivers/dbase/dbase.component b/connectivity/source/drivers/dbase/dbase.component index b491b2d58d07..8eda9a824f69 100644 --- a/connectivity/source/drivers/dbase/dbase.component +++ b/connectivity/source/drivers/dbase/dbase.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/connectivity/source/drivers/evoab2/NServices.cxx b/connectivity/source/drivers/evoab2/NServices.cxx index bd51216c21d6..e922073df08b 100644 --- a/connectivity/source/drivers/evoab2/NServices.cxx +++ b/connectivity/source/drivers/evoab2/NServices.cxx @@ -77,7 +77,7 @@ struct ProviderRequest }; //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL evoab2_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/connectivity/source/drivers/evoab2/evoab.component b/connectivity/source/drivers/evoab2/evoab.component index 01098393b979..c33e80a7633d 100644 --- a/connectivity/source/drivers/evoab2/evoab.component +++ b/connectivity/source/drivers/evoab2/evoab.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/connectivity/source/drivers/flat/Eservices.cxx b/connectivity/source/drivers/flat/Eservices.cxx index 7b65eed6172e..db3667c27b44 100644 --- a/connectivity/source/drivers/flat/Eservices.cxx +++ b/connectivity/source/drivers/flat/Eservices.cxx @@ -75,7 +75,7 @@ struct ProviderRequest }; //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL flat_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/connectivity/source/drivers/flat/flat.component b/connectivity/source/drivers/flat/flat.component index d5e820b898db..e1ccb844e1fb 100644 --- a/connectivity/source/drivers/flat/flat.component +++ b/connectivity/source/drivers/flat/flat.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/connectivity/source/drivers/hsqldb/Hservices.cxx b/connectivity/source/drivers/hsqldb/Hservices.cxx index 549a3a9cea54..86269c1bd1ca 100644 --- a/connectivity/source/drivers/hsqldb/Hservices.cxx +++ b/connectivity/source/drivers/hsqldb/Hservices.cxx @@ -76,7 +76,7 @@ struct ProviderRequest }; //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL hsqldb_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/connectivity/source/drivers/hsqldb/hsqldb.component b/connectivity/source/drivers/hsqldb/hsqldb.component index a911be7c0ef2..8c7413123445 100644 --- a/connectivity/source/drivers/hsqldb/hsqldb.component +++ b/connectivity/source/drivers/hsqldb/hsqldb.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/connectivity/source/drivers/jdbc/jdbc.component b/connectivity/source/drivers/jdbc/jdbc.component index 32e02a8c69eb..5b8b151ba3dc 100644 --- a/connectivity/source/drivers/jdbc/jdbc.component +++ b/connectivity/source/drivers/jdbc/jdbc.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/connectivity/source/drivers/jdbc/jservices.cxx b/connectivity/source/drivers/jdbc/jservices.cxx index fa5da2a526b5..8ad3d81c1fa1 100644 --- a/connectivity/source/drivers/jdbc/jservices.cxx +++ b/connectivity/source/drivers/jdbc/jservices.cxx @@ -89,7 +89,7 @@ component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ":affine"; } -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL jdbc_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/connectivity/source/drivers/kab/KServices.cxx b/connectivity/source/drivers/kab/KServices.cxx index eb599103fb01..2e1a6bc5e812 100644 --- a/connectivity/source/drivers/kab/KServices.cxx +++ b/connectivity/source/drivers/kab/KServices.cxx @@ -76,7 +76,7 @@ struct ProviderRequest }; //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL kab_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void*) diff --git a/connectivity/source/drivers/kab/kab1.component b/connectivity/source/drivers/kab/kab1.component index f507ecb00ac0..4123f66d79ad 100644 --- a/connectivity/source/drivers/kab/kab1.component +++ b/connectivity/source/drivers/kab/kab1.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/connectivity/source/drivers/macab/MacabServices.cxx b/connectivity/source/drivers/macab/MacabServices.cxx index 9f42b9909d84..3944bf872e40 100644 --- a/connectivity/source/drivers/macab/MacabServices.cxx +++ b/connectivity/source/drivers/macab/MacabServices.cxx @@ -76,7 +76,7 @@ struct ProviderRequest }; //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL macab_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void*) diff --git a/connectivity/source/drivers/macab/macab1.component b/connectivity/source/drivers/macab/macab1.component index 9f7969610429..90ff01820a4b 100644 --- a/connectivity/source/drivers/macab/macab1.component +++ b/connectivity/source/drivers/macab/macab1.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/connectivity/source/drivers/mork/MServices.cxx b/connectivity/source/drivers/mork/MServices.cxx index 3dfeb2053c5a..07395e63f54c 100644 --- a/connectivity/source/drivers/mork/MServices.cxx +++ b/connectivity/source/drivers/mork/MServices.cxx @@ -27,7 +27,7 @@ static cppu::ImplementationEntry const services[] = { } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL mork_component_getFactory( char const * pImplName, void * pServiceManager, void * pRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/connectivity/source/drivers/mork/mork.component b/connectivity/source/drivers/mork/mork.component index b8124faeb922..8b3e95ddad6c 100644 --- a/connectivity/source/drivers/mork/mork.component +++ b/connectivity/source/drivers/mork/mork.component @@ -8,7 +8,7 @@ * --> - diff --git a/connectivity/source/drivers/mozab/MServices.cxx b/connectivity/source/drivers/mozab/MServices.cxx index 676a920e7135..725a68197fec 100644 --- a/connectivity/source/drivers/mozab/MServices.cxx +++ b/connectivity/source/drivers/mozab/MServices.cxx @@ -111,7 +111,7 @@ typedef void* (SAL_CALL * OMozillaBootstrap_CreateInstanceFunction)(const Refere return NULL; } //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL mozab_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx index 7878fcb17188..27d328a113cd 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx @@ -237,7 +237,7 @@ static Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiS return *pBootstrap; } -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL mozbootstrap_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component b/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component index e5cc8cb94535..3b41e02794c7 100644 --- a/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component +++ b/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/connectivity/source/drivers/mozab/mozab.component b/connectivity/source/drivers/mozab/mozab.component index 6521e26fd6f2..be63b8eff420 100644 --- a/connectivity/source/drivers/mozab/mozab.component +++ b/connectivity/source/drivers/mozab/mozab.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/connectivity/source/drivers/mysql/Yservices.cxx b/connectivity/source/drivers/mysql/Yservices.cxx index 83ae495ab4b8..ee2be92e9e06 100644 --- a/connectivity/source/drivers/mysql/Yservices.cxx +++ b/connectivity/source/drivers/mysql/Yservices.cxx @@ -75,7 +75,7 @@ struct ProviderRequest }; //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL mysql_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/connectivity/source/drivers/mysql/mysql.component b/connectivity/source/drivers/mysql/mysql.component index 758cb346fb1c..18bf73cfccc2 100644 --- a/connectivity/source/drivers/mysql/mysql.component +++ b/connectivity/source/drivers/mysql/mysql.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/connectivity/source/drivers/odbc/odbc.component b/connectivity/source/drivers/odbc/odbc.component index 01acb0d397fa..ecbd021c4935 100644 --- a/connectivity/source/drivers/odbc/odbc.component +++ b/connectivity/source/drivers/odbc/odbc.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/connectivity/source/drivers/odbc/oservices.cxx b/connectivity/source/drivers/odbc/oservices.cxx index 807cf60895e5..73837a73084d 100644 --- a/connectivity/source/drivers/odbc/oservices.cxx +++ b/connectivity/source/drivers/odbc/oservices.cxx @@ -76,7 +76,7 @@ struct ProviderRequest }; //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL odbc_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component b/connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component index 407a0e6c9f54..79c33c493c24 100644 --- a/connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component +++ b/connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component @@ -27,7 +27,7 @@ * instead of those above. --> - diff --git a/connectivity/source/drivers/postgresql/postgresql-sdbc.component b/connectivity/source/drivers/postgresql/postgresql-sdbc.component index f691963f9628..28d468b3ea82 100644 --- a/connectivity/source/drivers/postgresql/postgresql-sdbc.component +++ b/connectivity/source/drivers/postgresql/postgresql-sdbc.component @@ -27,7 +27,7 @@ * instead of those above. --> - diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx index bd20f9c5e480..a2c846d423c0 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.cxx +++ b/connectivity/source/drivers/postgresql/pq_connection.cxx @@ -785,7 +785,7 @@ static struct cppu::ImplementationEntry g_entries[] = extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL postgresql_sdbc_impl_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx index 5a8dd9c15bf3..78289f3fdff1 100644 --- a/connectivity/source/drivers/postgresql/pq_driver.cxx +++ b/connectivity/source/drivers/postgresql/pq_driver.cxx @@ -342,7 +342,7 @@ static struct cppu::ImplementationEntry g_entries[] = extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL postgresql_sdbc_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { // need to extract the defaultcontext, because the way, sdbc diff --git a/connectivity/source/manager/mregistration.cxx b/connectivity/source/manager/mregistration.cxx index b13082f989c3..af01a22dd2b8 100644 --- a/connectivity/source/manager/mregistration.cxx +++ b/connectivity/source/manager/mregistration.cxx @@ -34,7 +34,7 @@ extern "C" { //--------------------------------------------------------------------------------------- -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* _pImplName, ::com::sun::star::lang::XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL sdbc2_component_getFactory(const sal_Char* _pImplName, ::com::sun::star::lang::XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/) { void* pRet = NULL; diff --git a/connectivity/source/manager/sdbc2.component b/connectivity/source/manager/sdbc2.component index 960f44af209b..20013729ed61 100644 --- a/connectivity/source/manager/sdbc2.component +++ b/connectivity/source/manager/sdbc2.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - From 7b089e2ccccb9872e6bd01af6ed8cefbd8160364 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 1 Oct 2012 21:54:06 +0300 Subject: [PATCH 127/863] Use prefix Change-Id: Ide081f18af82e68b55d6d48168a0a567e5e64f04 --- basctl/source/basicide/register.cxx | 2 +- basctl/util/basctl.component | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/basctl/source/basicide/register.cxx b/basctl/source/basicide/register.cxx index b2846591dc63..563cc6246de9 100644 --- a/basctl/source/basicide/register.cxx +++ b/basctl/source/basicide/register.cxx @@ -36,7 +36,7 @@ using namespace ::com::sun::star::lang; extern "C" { -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, +SAL_DLLPUBLIC_EXPORT void* SAL_CALL basctl_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* pRegistryKey ) { diff --git a/basctl/util/basctl.component b/basctl/util/basctl.component index d9ecf795f037..a42ddff3eddf 100644 --- a/basctl/util/basctl.component +++ b/basctl/util/basctl.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - From cbf2008355682ad7bfffaadc0d14a0f6cb9c3428 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 1 Oct 2012 21:54:23 +0300 Subject: [PATCH 128/863] Use prefix Change-Id: Ic1fcb3078757d7948bbb4ddb155ab9584e861c12 --- binaryurp/source/binaryurp.component | 2 +- binaryurp/source/bridgefactory.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/binaryurp/source/binaryurp.component b/binaryurp/source/binaryurp.component index f5908549227c..37fb96f9ad8a 100644 --- a/binaryurp/source/binaryurp.component +++ b/binaryurp/source/binaryurp.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/binaryurp/source/bridgefactory.cxx b/binaryurp/source/bridgefactory.cxx index 634ddb31359b..4050e068d619 100644 --- a/binaryurp/source/bridgefactory.cxx +++ b/binaryurp/source/bridgefactory.cxx @@ -197,7 +197,7 @@ static cppu::ImplementationEntry const services[] = { } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL binaryurp_component_getFactory( char const * pImplName, void * pServiceManager, void * pRegistryKey) { return cppu::component_getFactoryHelper( From a8ea2a423649d8df4f5df32132fd72a1ed1c7462 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 1 Oct 2012 21:54:40 +0300 Subject: [PATCH 129/863] Use prefix Change-Id: Id3d3df7869f6efb548ae44c3a6cac23dc1e21774 --- cui/source/uno/services.cxx | 2 +- cui/util/cui.component | 2 +- cui/util/cui.map | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cui/source/uno/services.cxx b/cui/source/uno/services.cxx index a63fd3c1e444..8164dea855ec 100644 --- a/cui/source/uno/services.cxx +++ b/cui/source/uno/services.cxx @@ -52,7 +52,7 @@ namespace }; } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( char const * implName, void * serviceManager, void * registryKey) +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL cui_component_getFactory( char const * implName, void * serviceManager, void * registryKey) { return cppu::component_getFactoryHelper(implName, serviceManager, registryKey, entries); } diff --git a/cui/util/cui.component b/cui/util/cui.component index 43cfdb5d2cd9..ab1129353f13 100644 --- a/cui/util/cui.component +++ b/cui/util/cui.component @@ -30,7 +30,7 @@ * instead of those above. * --> - diff --git a/cui/util/cui.map b/cui/util/cui.map index e0809cfbd396..5f35b1685aa2 100644 --- a/cui/util/cui.map +++ b/cui/util/cui.map @@ -2,7 +2,7 @@ UDK_3_0_0 { global: CreateDialogFactory; GetSpecialCharsForEdit; - component_getFactory; + cui_component_getFactory; local: *; }; From 2f93fb3fb94b5e416859922a869c86b021d7b7c0 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Mon, 1 Oct 2012 14:05:03 -0500 Subject: [PATCH 130/863] missing system header Change-Id: I33f6a9830accd4ed06aa5469f63e3f5329044ace --- basegfx/inc/basegfx/raster/bpixelraster.hxx | 1 + 1 file changed, 1 insertion(+) diff --git a/basegfx/inc/basegfx/raster/bpixelraster.hxx b/basegfx/inc/basegfx/raster/bpixelraster.hxx index 9d95b3f40769..d8d71c83bdae 100644 --- a/basegfx/inc/basegfx/raster/bpixelraster.hxx +++ b/basegfx/inc/basegfx/raster/bpixelraster.hxx @@ -30,6 +30,7 @@ #define _BGFX_RASTER_BPIXELRASTER_HXX #include +#include #include #include #include From 393588ce8e698203dd87a87eb506afb551457717 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 1 Oct 2012 22:00:53 +0300 Subject: [PATCH 131/863] Use prefix Change-Id: I28607f54eb06912ab1d27d80813d54cb6faa7771 --- embeddedobj/source/msole/emboleobj.component | 2 +- embeddedobj/source/msole/oleregister.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/embeddedobj/source/msole/emboleobj.component b/embeddedobj/source/msole/emboleobj.component index e9b5ea14eaa9..80f8eab7893f 100644 --- a/embeddedobj/source/msole/emboleobj.component +++ b/embeddedobj/source/msole/emboleobj.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/embeddedobj/source/msole/oleregister.cxx b/embeddedobj/source/msole/oleregister.cxx index 28b40291a9b3..f16a29a63aa2 100644 --- a/embeddedobj/source/msole/oleregister.cxx +++ b/embeddedobj/source/msole/oleregister.cxx @@ -29,7 +29,7 @@ using namespace ::com::sun::star; extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL emboleobj_component_getFactory( const sal_Char * pImplName, void * pServiceManager, SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ ) { From 28f128f037d627d08322ac1524dc04b65043790a Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 1 Oct 2012 22:02:03 +0300 Subject: [PATCH 132/863] Use prefix Change-Id: I5514112b700c31fa7e30c70ca7764d4ae1170ed2 --- embedserv/source/embed/register.cxx | 2 +- embedserv/util/emser.component | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/embedserv/source/embed/register.cxx b/embedserv/source/embed/register.cxx index 58f4fca6aee8..e6d1fff1bdab 100644 --- a/embedserv/source/embed/register.cxx +++ b/embedserv/source/embed/register.cxx @@ -58,7 +58,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL EmbedServer_getSupportedServiceNames() extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void * SAL_CALL emser_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/embedserv/util/emser.component b/embedserv/util/emser.component index 29358c9ed404..3e1b8918c32e 100644 --- a/embedserv/util/emser.component +++ b/embedserv/util/emser.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - From 616023b7a73511a73fcc88e8ebfdcd4bb050812e Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 1 Oct 2012 23:00:13 +0300 Subject: [PATCH 133/863] Use prefix Change-Id: Ica989983b36ff4df7f6d6ab529c3bc0efef984e1 --- extensions/source/abpilot/abp.component | 2 +- extensions/source/abpilot/abpservices.cxx | 2 +- extensions/source/bibliography/bib.component | 2 +- extensions/source/bibliography/bibload.cxx | 2 +- extensions/source/config/ldap/componentdef.cxx | 2 +- extensions/source/config/ldap/ldapbe2.component | 2 +- extensions/source/dbpilots/dbp.component | 2 +- extensions/source/dbpilots/dbpservices.cxx | 2 +- extensions/source/logging/log.component | 2 +- extensions/source/logging/log_services.cxx | 2 +- extensions/source/ole/oleautobridge.component | 2 +- extensions/source/ole/servreg.cxx | 4 ++-- extensions/source/plugin/base/service.cxx | 2 +- extensions/source/plugin/pl.component | 2 +- extensions/source/propctrlr/pcr.component | 2 +- extensions/source/propctrlr/pcrservices.cxx | 2 +- extensions/source/resource/res.component | 2 +- extensions/source/resource/resourceservices.cxx | 2 +- extensions/source/scanner/scn.component | 2 +- extensions/source/scanner/scnserv.cxx | 2 +- extensions/source/update/check/updatecheckjob.cxx | 2 +- extensions/source/update/check/updchk.uno.component | 2 +- extensions/source/update/feed/updatefeed.component | 2 +- extensions/source/update/feed/updatefeed.cxx | 2 +- extensions/source/update/ui/updatecheckui.cxx | 2 +- extensions/source/update/ui/updchk.component | 2 +- 26 files changed, 27 insertions(+), 27 deletions(-) diff --git a/extensions/source/abpilot/abp.component b/extensions/source/abpilot/abp.component index a07cef986219..83c42e58a383 100644 --- a/extensions/source/abpilot/abp.component +++ b/extensions/source/abpilot/abp.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/extensions/source/abpilot/abpservices.cxx b/extensions/source/abpilot/abpservices.cxx index c43d97895f32..a7955d6d0d6f 100644 --- a/extensions/source/abpilot/abpservices.cxx +++ b/extensions/source/abpilot/abpservices.cxx @@ -53,7 +53,7 @@ extern "C" void SAL_CALL abp_initializeModule() } //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL abp_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/extensions/source/bibliography/bib.component b/extensions/source/bibliography/bib.component index 98627854dffa..b59add76b404 100644 --- a/extensions/source/bibliography/bib.component +++ b/extensions/source/bibliography/bib.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index 5753a86f5aee..d963d2cddd6b 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -212,7 +212,7 @@ Sequence< rtl::OUString > BibliographyLoader::getSupportedServiceNames_Static(vo extern "C" { - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( + SAL_DLLPUBLIC_EXPORT void * SAL_CALL bib_component_getFactory( const sal_Char * pImplName, XMultiServiceFactory * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/extensions/source/config/ldap/componentdef.cxx b/extensions/source/config/ldap/componentdef.cxx index 86a56c740229..b3ea47b9e9f2 100644 --- a/extensions/source/config/ldap/componentdef.cxx +++ b/extensions/source/config/ldap/componentdef.cxx @@ -54,7 +54,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] = } ; //------------------------------------------------------------------------------ -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(const sal_Char *aImplementationName, +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ldapbe2_component_getFactory(const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey) { return cppu::component_getFactoryHelper(aImplementationName, diff --git a/extensions/source/config/ldap/ldapbe2.component b/extensions/source/config/ldap/ldapbe2.component index 071064d1c823..390da1147c4d 100644 --- a/extensions/source/config/ldap/ldapbe2.component +++ b/extensions/source/config/ldap/ldapbe2.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/extensions/source/dbpilots/dbp.component b/extensions/source/dbpilots/dbp.component index 84ec98713b2a..a0657efe8945 100644 --- a/extensions/source/dbpilots/dbp.component +++ b/extensions/source/dbpilots/dbp.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/extensions/source/dbpilots/dbpservices.cxx b/extensions/source/dbpilots/dbpservices.cxx index 0f0d8922e84e..e8b42cacb2f8 100644 --- a/extensions/source/dbpilots/dbpservices.cxx +++ b/extensions/source/dbpilots/dbpservices.cxx @@ -57,7 +57,7 @@ extern "C" void SAL_CALL dbp_initializeModule() } //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbp_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/extensions/source/logging/log.component b/extensions/source/logging/log.component index 4dd2db56c3cc..0f7093a65ca5 100644 --- a/extensions/source/logging/log.component +++ b/extensions/source/logging/log.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/extensions/source/logging/log_services.cxx b/extensions/source/logging/log_services.cxx index e5af7a66f236..b08410373fe6 100644 --- a/extensions/source/logging/log_services.cxx +++ b/extensions/source/logging/log_services.cxx @@ -54,7 +54,7 @@ namespace logging } // namespace logging //........................................................................ -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL log_component_getFactory( const sal_Char* pImplementationName, SAL_UNUSED_PARAMETER void*, SAL_UNUSED_PARAMETER void* ) { diff --git a/extensions/source/ole/oleautobridge.component b/extensions/source/ole/oleautobridge.component index 6f5309e42ad9..ea7d0214d026 100644 --- a/extensions/source/ole/oleautobridge.component +++ b/extensions/source/ole/oleautobridge.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/extensions/source/ole/servreg.cxx b/extensions/source/ole/servreg.cxx index b6471e47e6c4..9cd793f5ec8a 100644 --- a/extensions/source/ole/servreg.cxx +++ b/extensions/source/ole/servreg.cxx @@ -72,7 +72,7 @@ Reference SAL_CALL OleServer_CreateInstance( const Reference - diff --git a/extensions/source/propctrlr/pcr.component b/extensions/source/propctrlr/pcr.component index 2b606cc01c11..6fc809412cb0 100644 --- a/extensions/source/propctrlr/pcr.component +++ b/extensions/source/propctrlr/pcr.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/extensions/source/propctrlr/pcrservices.cxx b/extensions/source/propctrlr/pcrservices.cxx index ffde3d828451..ab1da1d92cb3 100644 --- a/extensions/source/propctrlr/pcrservices.cxx +++ b/extensions/source/propctrlr/pcrservices.cxx @@ -89,7 +89,7 @@ extern "C" void SAL_CALL pcr_initializeModule() } //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL pcr_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, SAL_UNUSED_PARAMETER void* /*pRegistryKey*/) diff --git a/extensions/source/resource/res.component b/extensions/source/resource/res.component index b5df9748e464..6ad58b45c7df 100644 --- a/extensions/source/resource/res.component +++ b/extensions/source/resource/res.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/extensions/source/resource/resourceservices.cxx b/extensions/source/resource/resourceservices.cxx index b683484acbe2..670c66347eb1 100644 --- a/extensions/source/resource/resourceservices.cxx +++ b/extensions/source/resource/resourceservices.cxx @@ -49,7 +49,7 @@ const sdecl::ServiceDecl OpenOfficeResourceLoaderDecl( "com.sun.star.comp.resource.OpenOfficeResourceLoader", "com.sun.star.resource.OfficeResourceLoader"); -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL res_component_getFactory( sal_Char const* pImplName, ::com::sun::star::lang::XMultiServiceFactory* pServiceManager, ::com::sun::star::registry::XRegistryKey* pRegistryKey ) diff --git a/extensions/source/scanner/scn.component b/extensions/source/scanner/scn.component index 076b745bd56e..80ca072eb5a3 100644 --- a/extensions/source/scanner/scn.component +++ b/extensions/source/scanner/scn.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/extensions/source/scanner/scnserv.cxx b/extensions/source/scanner/scnserv.cxx index 72d37fcee660..56cde1e6979a 100644 --- a/extensions/source/scanner/scnserv.cxx +++ b/extensions/source/scanner/scnserv.cxx @@ -36,7 +36,7 @@ using namespace com::sun::star::registry; -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ ) +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL scn_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ ) { REF( ::com::sun::star::lang::XSingleServiceFactory ) xFactory; void* pRet = 0; diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx index 2b7aa0a1dc9b..230d1f16f5de 100644 --- a/extensions/source/update/check/updatecheckjob.cxx +++ b/extensions/source/update/check/updatecheckjob.cxx @@ -379,7 +379,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] = //------------------------------------------------------------------------------ -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey) +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL updchk_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey) { return cppu::component_getFactoryHelper( pszImplementationName, diff --git a/extensions/source/update/check/updchk.uno.component b/extensions/source/update/check/updchk.uno.component index b1eb32917eaf..c19ae2f94085 100644 --- a/extensions/source/update/check/updchk.uno.component +++ b/extensions/source/update/check/updchk.uno.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/extensions/source/update/feed/updatefeed.component b/extensions/source/update/feed/updatefeed.component index 2d53ff5f9398..f43afc11cb29 100644 --- a/extensions/source/update/feed/updatefeed.component +++ b/extensions/source/update/feed/updatefeed.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx index d1db88cbcea1..310bbe86d864 100644 --- a/extensions/source/update/feed/updatefeed.cxx +++ b/extensions/source/update/feed/updatefeed.cxx @@ -822,7 +822,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] = //------------------------------------------------------------------------------ -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey) +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL updatefeed_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey) { return cppu::component_getFactoryHelper( pszImplementationName, diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index 75143fa018d9..fab97f574f7d 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -1025,7 +1025,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] = //------------------------------------------------------------------------------ -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey) +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL updchkui_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey) { return cppu::component_getFactoryHelper( pszImplementationName, diff --git a/extensions/source/update/ui/updchk.component b/extensions/source/update/ui/updchk.component index bd533e30d1f3..855936c81822 100644 --- a/extensions/source/update/ui/updchk.component +++ b/extensions/source/update/ui/updchk.component @@ -26,7 +26,7 @@ * **********************************************************************--> - From 8c04828bb1a6fefe258b5412db8e1b31a5b8cbb6 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 1 Oct 2012 23:02:44 +0300 Subject: [PATCH 134/863] Use prefix Change-Id: Ie741222944bf8ed6cacd5a3037f8aa75a6a4dec3 --- filter/source/flash/flash.component | 2 +- filter/source/flash/swfuno.cxx | 2 +- filter/source/msfilter/msfilter.component | 2 +- filter/source/msfilter/services.cxx | 2 +- filter/source/pdf/pdffilter.component | 2 +- filter/source/pdf/pdfuno.cxx | 2 +- filter/source/placeware/placeware.component | 2 +- filter/source/placeware/uno.cxx | 2 +- filter/source/t602/filterenv.cxx | 6 +----- filter/source/xmlfilteradaptor/genericfilter.cxx | 2 +- filter/source/xmlfilteradaptor/xmlfa.component | 2 +- filter/source/xmlfilterdetect/fdcomp.cxx | 6 +----- filter/source/xmlfilterdetect/xmlfd.component | 2 +- filter/source/xsltdialog/xmlfilterdialogcomponent.cxx | 2 +- filter/source/xsltdialog/xsltdlg.component | 2 +- filter/source/xsltfilter/XSLTFilter.cxx | 2 +- filter/source/xsltfilter/xsltfilter.component | 2 +- 17 files changed, 17 insertions(+), 25 deletions(-) diff --git a/filter/source/flash/flash.component b/filter/source/flash/flash.component index 1ce69b3549bc..79e1e68c4a1e 100644 --- a/filter/source/flash/flash.component +++ b/filter/source/flash/flash.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/filter/source/flash/swfuno.cxx b/filter/source/flash/swfuno.cxx index b3501532056b..49addf4a3273 100644 --- a/filter/source/flash/swfuno.cxx +++ b/filter/source/flash/swfuno.cxx @@ -54,7 +54,7 @@ using namespace ::swf; extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL flash_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ ) { void * pRet = 0; diff --git a/filter/source/msfilter/msfilter.component b/filter/source/msfilter/msfilter.component index 64128aa1385b..e3ea7e583876 100644 --- a/filter/source/msfilter/msfilter.component +++ b/filter/source/msfilter/msfilter.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/filter/source/msfilter/services.cxx b/filter/source/msfilter/services.cxx index 9586d4219ee2..4e4a77eb88ec 100644 --- a/filter/source/msfilter/services.cxx +++ b/filter/source/msfilter/services.cxx @@ -60,7 +60,7 @@ static ::cppu::ImplementationEntry const spServices[] = } // namespace -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const char* pImplName, void* pServiceManager, void* pRegistryKey ) +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL msfilter_component_getFactory( const char* pImplName, void* pServiceManager, void* pRegistryKey ) { return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, spServices ); } diff --git a/filter/source/pdf/pdffilter.component b/filter/source/pdf/pdffilter.component index 438d697a77b1..e9b84a54ca59 100644 --- a/filter/source/pdf/pdffilter.component +++ b/filter/source/pdf/pdffilter.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/filter/source/pdf/pdfuno.cxx b/filter/source/pdf/pdfuno.cxx index fe5ab0a44a91..a885a8203434 100644 --- a/filter/source/pdf/pdfuno.cxx +++ b/filter/source/pdf/pdfuno.cxx @@ -45,7 +45,7 @@ using namespace ::com::sun::star::registry; extern "C" { - SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) + SAL_DLLPUBLIC_EXPORT void* SAL_CALL pdffilter_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { OUString aImplName( OUString::createFromAscii( pImplName ) ); void* pRet = 0; diff --git a/filter/source/placeware/placeware.component b/filter/source/placeware/placeware.component index 9a6ca703ef2d..0ec5ef8d64b0 100644 --- a/filter/source/placeware/placeware.component +++ b/filter/source/placeware/placeware.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/filter/source/placeware/uno.cxx b/filter/source/placeware/uno.cxx index cd0396d8f2f8..1574803a7240 100644 --- a/filter/source/placeware/uno.cxx +++ b/filter/source/placeware/uno.cxx @@ -51,7 +51,7 @@ using namespace ::pwp; extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL placeware_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ ) { void * pRet = 0; diff --git a/filter/source/t602/filterenv.cxx b/filter/source/t602/filterenv.cxx index 1963ddba8635..6154dbfe3b14 100644 --- a/filter/source/t602/filterenv.cxx +++ b/filter/source/t602/filterenv.cxx @@ -44,11 +44,7 @@ using namespace T602ImportFilter; extern "C" { -#ifdef DISABLE_DYNLOADING -#define component_getFactory t602filter_component_getFactory -#endif - -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL t602filter_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ ) { void * pRet = 0; diff --git a/filter/source/xmlfilteradaptor/genericfilter.cxx b/filter/source/xmlfilteradaptor/genericfilter.cxx index 5f9fe9e939fe..67bc53698cf7 100644 --- a/filter/source/xmlfilteradaptor/genericfilter.cxx +++ b/filter/source/xmlfilteradaptor/genericfilter.cxx @@ -41,7 +41,7 @@ using namespace ::com::sun::star::registry; extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL xmlfa_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ ) { void * pRet = 0; diff --git a/filter/source/xmlfilteradaptor/xmlfa.component b/filter/source/xmlfilteradaptor/xmlfa.component index d835782c2f38..97ffd4eb68b7 100644 --- a/filter/source/xmlfilteradaptor/xmlfa.component +++ b/filter/source/xmlfilteradaptor/xmlfa.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/filter/source/xmlfilterdetect/fdcomp.cxx b/filter/source/xmlfilterdetect/fdcomp.cxx index b12cdb31ac03..004d11006e50 100644 --- a/filter/source/xmlfilterdetect/fdcomp.cxx +++ b/filter/source/xmlfilterdetect/fdcomp.cxx @@ -45,11 +45,7 @@ static cppu::ImplementationEntry const services[] = { } -#ifdef DISABLE_DYNLOADING -#define component_getFactory xmlfd_component_getFactory -#endif - -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL xmlfd_component_getFactory( char const * pImplName, void * pServiceManager, void * pRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/filter/source/xmlfilterdetect/xmlfd.component b/filter/source/xmlfilterdetect/xmlfd.component index 3796b0e1fb46..798e940c3ca5 100644 --- a/filter/source/xmlfilterdetect/xmlfd.component +++ b/filter/source/xmlfilterdetect/xmlfd.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx index ed77cd3fd47f..3cc5b0ec59e7 100644 --- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx +++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx @@ -392,7 +392,7 @@ void SAL_CALL XMLFilterDialogComponent::initialize( const Sequence< Any >& aArgu extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL xsltdlg_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ ) { void * pRet = 0; diff --git a/filter/source/xsltdialog/xsltdlg.component b/filter/source/xsltdialog/xsltdlg.component index 086208f4f830..5f6815646920 100644 --- a/filter/source/xsltdialog/xsltdlg.component +++ b/filter/source/xsltdialog/xsltdlg.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index ba8503f7238a..63de5a63dda3 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -575,7 +575,7 @@ using namespace XSLT; extern "C" { - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(const sal_Char * pImplName, + SAL_DLLPUBLIC_EXPORT void * SAL_CALL xsltfilter_component_getFactory(const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */) { void * pRet = 0; diff --git a/filter/source/xsltfilter/xsltfilter.component b/filter/source/xsltfilter/xsltfilter.component index 5fb985c983bb..b1cf36275c5c 100644 --- a/filter/source/xsltfilter/xsltfilter.component +++ b/filter/source/xsltfilter/xsltfilter.component @@ -26,7 +26,7 @@ * **********************************************************************--> - From 2726f7f4ca5cde91565203ef055561558ea66e7d Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 1 Oct 2012 23:03:59 +0300 Subject: [PATCH 135/863] As far as I can see the PptImporter library is not a UNO component Change-Id: I5a230207bb760dde7ffb2e052148072d9f589cba --- filter/Library_PptImporter.mk | 1 - .../msfilter/powerpoint/pptimporteruno.cxx | 63 ------------------- 2 files changed, 64 deletions(-) delete mode 100644 filter/source/msfilter/powerpoint/pptimporteruno.cxx diff --git a/filter/Library_PptImporter.mk b/filter/Library_PptImporter.mk index f1d172aeda4f..8fee1bd1eca9 100644 --- a/filter/Library_PptImporter.mk +++ b/filter/Library_PptImporter.mk @@ -35,7 +35,6 @@ $(eval $(call gb_Library_use_libraries,PptImporter,\ $(eval $(call gb_Library_add_exception_objects,PptImporter,\ filter/source/msfilter/powerpoint/pptimporter \ - filter/source/msfilter/powerpoint/pptimporteruno \ filter/source/msfilter/powerpoint/ppttoxml \ )) diff --git a/filter/source/msfilter/powerpoint/pptimporteruno.cxx b/filter/source/msfilter/powerpoint/pptimporteruno.cxx deleted file mode 100644 index be0b49ebfad5..000000000000 --- a/filter/source/msfilter/powerpoint/pptimporteruno.cxx +++ /dev/null @@ -1,63 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#include "pptimporter.hxx" - -#include -#include - -static REF( NMSP_UNO::XInterface ) SAL_CALL create_PptImporter( const REF( NMSP_LANG::XMultiServiceFactory )& rxFact ) -{ - return REF( NMSP_UNO::XInterface )( *new PptImporter( rxFact ) ); -} - -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ ) -{ - REF( NMSP_LANG::XSingleServiceFactory ) xFactory; - void* pRet = 0; - - if( rtl_str_compare( pImplName, "com.sun.star.presentation.PptImporter" ) == 0 ) - { - const NMSP_RTL::OUString aServiceName( B2UCONST( "com.sun.star.presentation.PptImporter" ) ); - - xFactory = REF( NMSP_LANG::XSingleServiceFactory )( NMSP_CPPU::createSingleFactory( - reinterpret_cast< NMSP_LANG::XMultiServiceFactory* >( pServiceManager ), - B2UCONST( "com.sun.star.presentation.PptImporter" ), - create_PptImporter, SEQ( NMSP_RTL::OUString )( &aServiceName, 1 ) ) ); - } - if( xFactory.is() ) - { - xFactory->acquire(); - pRet = xFactory.get(); - } - - return pRet; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ From d11d45e798b0dedd1e39fb6441fdd182e21a58f3 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Mon, 1 Oct 2012 16:05:06 -0500 Subject: [PATCH 136/863] remove dead link Change-Id: I021baa42231fff94e257445f790d52aed8227fe7 --- ure/README | 2 -- 1 file changed, 2 deletions(-) diff --git a/ure/README b/ure/README index f99174ab6530..23b15bf863cb 100644 --- a/ure/README +++ b/ure/README @@ -2,8 +2,6 @@ Contains the UNO Runtime Environment (URE). Beginnings of standalone UNO distribution. -See also: -[http://udk.openoffice.org/] You may also want to read the README located at: [git:ure/source/README] From afb28ae04ab818721e848e254ae89b2185318435 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Mon, 1 Oct 2012 16:08:10 -0500 Subject: [PATCH 137/863] missing system header Change-Id: Icba29c0ebfd30af36b18eb59a23643287985f8c8 --- dbaccess/source/core/api/querycomposer.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbaccess/source/core/api/querycomposer.cxx b/dbaccess/source/core/api/querycomposer.cxx index 336e726d65bb..d84e771560dd 100644 --- a/dbaccess/source/core/api/querycomposer.cxx +++ b/dbaccess/source/core/api/querycomposer.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - +#include #include #include #include From df706c23dcdc81f0cfaa8c2b106afd6accc03ad5 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Mon, 1 Oct 2012 16:11:22 -0500 Subject: [PATCH 138/863] missing system header Change-Id: Ieb97d877238941d06aab1aa2ef67186bbc3a995a --- dbaccess/source/core/api/RowSet.cxx | 2 +- dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 2 +- dbaccess/source/core/dataaccess/ContentHelper.cxx | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index a75a155441b3..1042d84531bc 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - +#include #include "RowSet.hxx" #include "dbastrings.hrc" #include "sdbcoretools.hxx" diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx index 55aa752d4f00..faef30832cc1 100644 --- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx +++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - +#include #include "composertools.hxx" #include "core_resource.hrc" #include "core_resource.hxx" diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx index fed2637e58f7..08cdd7e9c7ec 100644 --- a/dbaccess/source/core/dataaccess/ContentHelper.cxx +++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include #include "ContentHelper.hxx" #include #include From f3020438938d019784d32fffeaf5f18dc6175ed8 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 1 Oct 2012 23:02:57 +0200 Subject: [PATCH 139/863] fdo#55496: fix lifecycle of SwMailMergeOutputPage: Its member m_pDocumentPrinterCopy contains a SfxItemSet that points at the SwDoc's item pool; the SwDoc is freed in SwMailMergeWizardExecutor::LinkStubCancelHdl. But the SwDoc::setPrinter method does seem to work fine if the printer that is set is the same as the one it already has, so it does not seem to be necessary to clone the printer; just get it and set it again. Change-Id: Ic591f68f6e0bab4e42cb22a9cb0a47e97f5e938f --- sw/source/ui/dbui/mmoutputpage.cxx | 25 +++++++++++++++---------- sw/source/ui/dbui/mmoutputpage.hxx | 1 - 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index b8e5cef18afb..73b39c91bcb4 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -330,8 +330,7 @@ SwMailMergeOutputPage::SwMailMergeOutputPage( SwMailMergeWizard* _pParent) : #endif m_bCancelSaving( false ), m_pWizard(_pParent), - m_pTempPrinter( 0 ), - m_pDocumentPrinterCopy(0) + m_pTempPrinter( 0 ) { FreeResource(); @@ -383,7 +382,6 @@ SwMailMergeOutputPage::SwMailMergeOutputPage( SwMailMergeWizard* _pParent) : SwMailMergeOutputPage::~SwMailMergeOutputPage() { delete m_pTempPrinter; - delete m_pDocumentPrinterCopy; } void SwMailMergeOutputPage::ActivatePage() @@ -409,7 +407,6 @@ void SwMailMergeOutputPage::ActivatePage() m_aPrinterLB.SelectEntry( pPrinter->GetName() ); m_aToNF.SetValue( rConfigItem.GetMergedDocumentCount() ); m_aToNF.SetMax( rConfigItem.GetMergedDocumentCount() ); - m_pDocumentPrinterCopy = pTargetView->GetWrtShell().getIDocumentDeviceAccess()->getPrinter( true )->Clone(); } m_aPrinterLB.SelectEntry( rConfigItem.GetSelectedPrinter() ); @@ -852,7 +849,10 @@ IMPL_LINK(SwMailMergeOutputPage, SaveOutputHdl_Impl, PushButton*, pButton) IMPL_LINK(SwMailMergeOutputPage, PrinterChangeHdl_Impl, ListBox*, pBox) { - if( m_pDocumentPrinterCopy && pBox->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ) + SwView *const pTargetView = m_pWizard->GetConfigItem().GetTargetView(); + SfxPrinter *const pDocumentPrinter = pTargetView->GetWrtShell() + .getIDocumentDeviceAccess()->getPrinter(true); + if (pDocumentPrinter && pBox->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND) { const QueueInfo* pInfo = Printer::GetQueueInfo( pBox->GetSelectEntry(), false ); @@ -860,9 +860,11 @@ IMPL_LINK(SwMailMergeOutputPage, PrinterChangeHdl_Impl, ListBox*, pBox) { if ( !m_pTempPrinter ) { - if( (m_pDocumentPrinterCopy->GetName() == pInfo->GetPrinterName()) && - (m_pDocumentPrinterCopy->GetDriverName() == pInfo->GetDriver()) ) - m_pTempPrinter = new Printer( m_pDocumentPrinterCopy->GetJobSetup() ); + if ((pDocumentPrinter->GetName() == pInfo->GetPrinterName()) && + (pDocumentPrinter->GetDriverName() == pInfo->GetDriver())) + { + m_pTempPrinter = new Printer(pDocumentPrinter->GetJobSetup()); + } else m_pTempPrinter = new Printer( *pInfo ); } @@ -922,8 +924,11 @@ IMPL_LINK_NOARG(SwMailMergeOutputPage, PrintHdl_Impl) pTargetView->SetMailMergeConfigItem(&rConfigItem, 0, sal_False); if(m_pTempPrinter) { - m_pDocumentPrinterCopy->SetPrinterProps(m_pTempPrinter); - pTargetView->SetPrinter(m_pDocumentPrinterCopy->Clone()); + SfxPrinter *const pDocumentPrinter = pTargetView->GetWrtShell() + .getIDocumentDeviceAccess()->getPrinter(true); + pDocumentPrinter->SetPrinterProps(m_pTempPrinter); + // this should be able to handle setting its own printer + pTargetView->SetPrinter(pDocumentPrinter); } SfxObjectShell* pObjSh = pTargetView->GetViewFrame()->GetObjectShell(); diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx index 0aace255a628..0babb244d4ab 100644 --- a/sw/source/ui/dbui/mmoutputpage.hxx +++ b/sw/source/ui/dbui/mmoutputpage.hxx @@ -118,7 +118,6 @@ class SwMailMergeOutputPage : public svt::OWizardPage //some dialog data Printer* m_pTempPrinter; - SfxPrinter* m_pDocumentPrinterCopy; String m_sCC; String m_sBCC; From d9f61e785e7469165fefc1fc8e2459ffb3335883 Mon Sep 17 00:00:00 2001 From: Arnaud Versini Date: Mon, 1 Oct 2012 20:52:45 +0200 Subject: [PATCH 140/863] Remove internal usage of rtl/memory.h in sal module Change-Id: I43650c6f4a66058e73945851a6990555e42b8ac2 Reviewed-on: https://gerrit.libreoffice.org/744 Reviewed-by: Michael Stahl Tested-by: Michael Stahl --- sal/osl/w32/profile.cxx | 3 ++- sal/rtl/source/byteseq.cxx | 3 +-- sal/rtl/source/cipher.cxx | 1 - sal/rtl/source/digest.cxx | 1 - sal/rtl/source/strbuf.cxx | 5 ++--- sal/rtl/source/string.cxx | 1 - sal/rtl/source/ustrbuf.cxx | 7 +++---- sal/rtl/source/ustring.cxx | 1 - 8 files changed, 8 insertions(+), 14 deletions(-) diff --git a/sal/osl/w32/profile.cxx b/sal/osl/w32/profile.cxx index 1040a890ea2f..24b02ef10ee6 100644 --- a/sal/osl/w32/profile.cxx +++ b/sal/osl/w32/profile.cxx @@ -31,6 +31,7 @@ #include "file_url.h" #include "path_helper.hxx" +#include #include #include #include @@ -40,7 +41,7 @@ #include #include using std::min; -static inline void copy_ustr_n( void *dest, const void *source, size_t length ) { rtl_copyMemory(dest, source, length*sizeof(sal_Unicode)); } +static inline void copy_ustr_n( void *dest, const void *source, size_t length ) { memcpy(dest, source, length*sizeof(sal_Unicode)); } #define LINES_INI 32 #define LINES_ADD 10 diff --git a/sal/rtl/source/byteseq.cxx b/sal/rtl/source/byteseq.cxx index ee745818f0a8..8f9e400eabd4 100644 --- a/sal/rtl/source/byteseq.cxx +++ b/sal/rtl/source/byteseq.cxx @@ -33,7 +33,6 @@ #include #include -#include /* static data to be referenced by all empty strings * the refCount is predefined to 1 and must never become 0 ! @@ -245,7 +244,7 @@ sal_Bool SAL_CALL rtl_byte_sequence_equals( sal_Sequence *pSequence1 , sal_Seque return sal_False; } return (sal_Bool) - (rtl_compareMemory( + (memcmp( pSequence1->elements, pSequence2->elements, pSequence1->nElements ) == 0); } diff --git a/sal/rtl/source/cipher.cxx b/sal/rtl/source/cipher.cxx index b5ff96291862..42dfbd58dcf5 100644 --- a/sal/rtl/source/cipher.cxx +++ b/sal/rtl/source/cipher.cxx @@ -30,7 +30,6 @@ #include #include -#include #include /*======================================================================== diff --git a/sal/rtl/source/digest.cxx b/sal/rtl/source/digest.cxx index 58a179b13c2f..42b6f75e827d 100644 --- a/sal/rtl/source/digest.cxx +++ b/sal/rtl/source/digest.cxx @@ -32,7 +32,6 @@ #include #include #include -#include #include /*======================================================================== diff --git a/sal/rtl/source/strbuf.cxx b/sal/rtl/source/strbuf.cxx index 953e6302ccc3..9dd4699f8190 100644 --- a/sal/rtl/source/strbuf.cxx +++ b/sal/rtl/source/strbuf.cxx @@ -30,7 +30,6 @@ #include #include -#include /************************************************************************* * rtl_stringbuffer_newFromStr_WithLength @@ -125,7 +124,7 @@ void SAL_CALL rtl_stringbuffer_insert( rtl_String ** This, /* optimized for 1 character */ pBuf[offset + len] = pBuf[offset]; else if( n > 1 ) - rtl_moveMemory( pBuf + offset + len, pBuf + offset, n * sizeof(sal_Char) ); + memmove( pBuf + offset + len, pBuf + offset, n * sizeof(sal_Char) ); /* insert the new characters */ n = len; @@ -162,7 +161,7 @@ void SAL_CALL rtl_stringbuffer_remove( rtl_String ** This, if (nTailLen) { /* move the tail */ - rtl_moveMemory(pBuf + start, pBuf + start + len, nTailLen * sizeof(sal_Char)); + memmove(pBuf + start, pBuf + start + len, nTailLen * sizeof(sal_Char)); } (*This)->length-=len; diff --git a/sal/rtl/source/string.cxx b/sal/rtl/source/string.cxx index 78874b668b38..7926fa8ed7f6 100644 --- a/sal/rtl/source/string.cxx +++ b/sal/rtl/source/string.cxx @@ -35,7 +35,6 @@ #include #include -#include #include #include #include diff --git a/sal/rtl/source/ustrbuf.cxx b/sal/rtl/source/ustrbuf.cxx index 23b6cb8f4e62..1bbdfe3555ce 100644 --- a/sal/rtl/source/ustrbuf.cxx +++ b/sal/rtl/source/ustrbuf.cxx @@ -31,7 +31,6 @@ #include #include -#include #include void SAL_CALL rtl_uStringbuffer_newFromStr_WithLength( rtl_uString ** newStr, @@ -142,7 +141,7 @@ void SAL_CALL rtl_uStringbuffer_insert( rtl_uString ** This, /* optimized for 1 character */ pBuf[offset + len] = pBuf[offset]; else if( n > 1 ) - rtl_moveMemory( pBuf + offset + len, pBuf + offset, n * sizeof(sal_Unicode) ); + memmove( pBuf + offset + len, pBuf + offset, n * sizeof(sal_Unicode) ); /* insert the new characters */ if( len == 1 ) @@ -197,7 +196,7 @@ void SAL_CALL rtl_uStringbuffer_insert_ascii( /*inout*/rtl_uString ** This, /* optimized for 1 character */ pBuf[offset + len] = pBuf[offset]; else if( n > 1 ) - rtl_moveMemory( pBuf + offset + len, pBuf + offset, n * sizeof(sal_Unicode) ); + memmove( pBuf + offset + len, pBuf + offset, n * sizeof(sal_Unicode) ); /* insert the new characters */ for( n = 0; n < len; n++ ) @@ -236,7 +235,7 @@ void SAL_CALL rtl_uStringbuffer_remove( rtl_uString ** This, if (nTailLen) { /* move the tail */ - rtl_moveMemory(pBuf + start, pBuf + start + len, nTailLen * sizeof(sal_Unicode)); + memmove(pBuf + start, pBuf + start + len, nTailLen * sizeof(sal_Unicode)); } (*This)->length-=len; diff --git a/sal/rtl/source/ustring.cxx b/sal/rtl/source/ustring.cxx index ec0827f4e561..b21994959e62 100644 --- a/sal/rtl/source/ustring.cxx +++ b/sal/rtl/source/ustring.cxx @@ -35,7 +35,6 @@ #include #include -#include #include #include #include From c3e6c81eb0b1b4d5ca47dd1d266be97a602e015b Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Tue, 2 Oct 2012 00:39:24 +0200 Subject: [PATCH 141/863] add test for ScRangeList::Join Change-Id: Idb7a051e32884d8db4f6d452c280b3a985b4ff6e --- sc/qa/unit/rangelst_test.cxx | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/sc/qa/unit/rangelst_test.cxx b/sc/qa/unit/rangelst_test.cxx index 2c618a5ebcd8..b5381eceeee3 100644 --- a/sc/qa/unit/rangelst_test.cxx +++ b/sc/qa/unit/rangelst_test.cxx @@ -36,6 +36,8 @@ public: void testDeleteArea_2Ranges_Case8(); void testDeleteArea_1Range(); void testDeleteArea_0Ranges(); + void testJoin_Case1(); + void testJoin_Case2(); void testUpdateReference_DeleteRow(); void testUpdateReference_DeleteCol(); @@ -57,6 +59,8 @@ public: CPPUNIT_TEST(testDeleteArea_2Ranges_Case8); CPPUNIT_TEST(testDeleteArea_1Range); CPPUNIT_TEST(testDeleteArea_0Ranges); + CPPUNIT_TEST(testJoin_Case1); + CPPUNIT_TEST(testJoin_Case2); CPPUNIT_TEST(testUpdateReference_DeleteRow); CPPUNIT_TEST(testUpdateReference_DeleteCol); CPPUNIT_TEST_SUITE_END(); @@ -384,6 +388,29 @@ void Test::testDeleteArea_0Ranges() CPPUNIT_ASSERT(aList.empty()); } +void Test::testJoin_Case1() +{ + ScRangeList aList; + aList.push_back(new ScRange(1,1,0,3,3,0)); + aList.Join(ScRange(4,1,0,6,3,0)); + + CPPUNIT_ASSERT_EQUAL(static_cast(1), aList.size()); + CPPUNIT_ASSERT( ScRange(1,1,0,6,3,0) == *aList[0]); +} + +void Test::testJoin_Case2() +{ + ScRangeList aList; + aList.push_back(new ScRange(1,1,0,3,3,0)); + aList.push_back(new ScRange(4,1,0,6,3,0)); + aList.push_back(new ScRange(7,1,0,9,3,0)); + + aList.Join(*aList[2], true); + + CPPUNIT_ASSERT_EQUAL(static_cast(1), aList.size()); + CPPUNIT_ASSERT(ScRange(1,1,0,9,3,0) == *aList[0]); +} + void Test::testUpdateReference_DeleteRow() { ScRangeList aList(ScRange(1,1,0,4,4,0)); From 6eb8634a9f62bfe486ecd2f46bae37d3d930d5ef Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Tue, 2 Oct 2012 00:41:08 +0200 Subject: [PATCH 142/863] iterating here is wrong, join will already merge all necessary ranges Change-Id: I0653cdc8675c584fa11ef90a84b79a636bd98408 --- sc/source/core/tool/rangelst.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx index b7347f62dcbd..e4b38679311d 100644 --- a/sc/source/core/tool/rangelst.cxx +++ b/sc/source/core/tool/rangelst.cxx @@ -465,8 +465,7 @@ bool ScRangeList::UpdateReference( if( nDx < 0 || nDy < 0 ) { size_t n = maRanges.size(); - for(size_t i = n-1; i > 0; --i) - Join(*maRanges[i], true); + Join(*maRanges[n-1], true); } } From 2ffa6b313acc322a2502c6c200b39ec652699bf9 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Tue, 2 Oct 2012 00:52:28 +0200 Subject: [PATCH 143/863] fix errorin translation from german to english Change-Id: Ic58ef47fbd1972762830f66fc3d4d5f1ced2c54e --- sc/source/core/inc/adiasync.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sc/source/core/inc/adiasync.hxx b/sc/source/core/inc/adiasync.hxx index e9f0198afa51..3a479ce29aa5 100644 --- a/sc/source/core/inc/adiasync.hxx +++ b/sc/source/core/inc/adiasync.hxx @@ -52,7 +52,7 @@ private: String* pStr; }; ScAddInDocs* pDocs; // List of using documents - FuncData* mpFuncData; // Pointer to files in collection + FuncData* mpFuncData; // Pointer to data in collection sal_uLong nHandle; // is casted from double to sal_uLong ParamType meType; // result of type PTR_DOUBLE or PTR_STRING bool bValid; // is value valid? From d67dff5719b32c17f4bf02990de5d7a772db484c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Mon, 1 Oct 2012 11:03:34 +0100 Subject: [PATCH 144/863] XubString->OUString Change-Id: Id64cdd70c2877ff71c5bc90286fab6b3d8ab7ad4 --- sfx2/inc/sfx2/sfxhelp.hxx | 36 +++--- sfx2/source/appl/newhelp.cxx | 40 +++--- sfx2/source/appl/newhelp.hxx | 2 +- sfx2/source/appl/sfxhelp.cxx | 236 +++++++++++++++++------------------ vcl/inc/helpwin.hxx | 14 +-- vcl/inc/vcl/help.hxx | 32 ++--- vcl/source/app/help.cxx | 47 +++---- 7 files changed, 200 insertions(+), 207 deletions(-) diff --git a/sfx2/inc/sfx2/sfxhelp.hxx b/sfx2/inc/sfx2/sfxhelp.hxx index 12c58c29aff8..9de00f008736 100644 --- a/sfx2/inc/sfx2/sfxhelp.hxx +++ b/sfx2/inc/sfx2/sfxhelp.hxx @@ -19,45 +19,45 @@ #ifndef _SFX_HELP_HXX #define _SFX_HELP_HXX +#include #include "sal/config.h" #include "sfx2/dllapi.h" #include "sal/types.h" #include -#include class SfxHelp_Impl; class SfxFrame; class SFX2_DLLPUBLIC SfxHelp : public Help { - String aTicket; // for Plugins - String aUser; - String aLanguageStr; - String aCountryStr; + OUString aTicket; // for Plugins + OUString aUser; + OUString aLanguageStr; + OUString aCountryStr; sal_Bool bIsDebug; SfxHelp_Impl* pImp; private: - SAL_DLLPRIVATE sal_Bool Start_Impl( const String& rURL, const Window* pWindow, const String& rKeyword ); - SAL_DLLPRIVATE virtual sal_Bool SearchKeyword( const XubString& rKeyWord ); - SAL_DLLPRIVATE virtual sal_Bool Start( const String& rURL, const Window* pWindow ); - SAL_DLLPRIVATE virtual void OpenHelpAgent( const rtl::OString& sHelpId ); - SAL_DLLPRIVATE String GetHelpModuleName_Impl(); - SAL_DLLPRIVATE String CreateHelpURL_Impl( const String& aCommandURL, const String& rModuleName ); + SAL_DLLPRIVATE sal_Bool Start_Impl( const OUString& rURL, const Window* pWindow, const OUString& rKeyword ); + SAL_DLLPRIVATE virtual sal_Bool SearchKeyword( const OUString& rKeyWord ); + SAL_DLLPRIVATE virtual sal_Bool Start( const OUString& rURL, const Window* pWindow ); + SAL_DLLPRIVATE virtual void OpenHelpAgent( const OString& sHelpId ); + SAL_DLLPRIVATE OUString GetHelpModuleName_Impl(); + SAL_DLLPRIVATE OUString CreateHelpURL_Impl( const OUString& aCommandURL, const OUString& rModuleName ); public: SfxHelp(); ~SfxHelp(); - inline void SetTicket( const String& rTicket ) { aTicket = rTicket; } - inline void SetUser( const String& rUser ) { aUser = rUser; } + inline void SetTicket( const OUString& rTicket ) { aTicket = rTicket; } + inline void SetUser( const OUString& rUser ) { aUser = rUser; } - virtual XubString GetHelpText( const String&, const Window* pWindow ); + virtual OUString GetHelpText( const OUString&, const Window* pWindow ); - static String CreateHelpURL( const String& aCommandURL, const String& rModuleName ); + static OUString CreateHelpURL( const OUString& aCommandURL, const OUString& rModuleName ); using Help::OpenHelpAgent; - static void OpenHelpAgent( SfxFrame* pFrame, const rtl::OString& sHelpId ); - static String GetDefaultHelpModule(); - static ::rtl::OUString GetCurrentModuleIdentifier(); + static void OpenHelpAgent( SfxFrame* pFrame, const OString& sHelpId ); + static OUString GetDefaultHelpModule(); + static OUString GetCurrentModuleIdentifier(); }; #endif // #ifndef _SFX_HELP_HXX diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index f6da0cab9d22..8e360c693d40 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -627,14 +627,11 @@ void IndexTabPage_Impl::InitializeIndex() try { - ::rtl::OUString aURL = HELP_URL; - aURL += ::rtl::OUString( sFactory ); + OUStringBuffer aURL = HELP_URL; + aURL.append(sFactory); + AppendConfigToken(aURL, sal_True); - String aTemp = aURL; - AppendConfigToken( aTemp, sal_True ); - aURL = aTemp; - - Content aCnt( aURL, Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); + Content aCnt( aURL.makeStringAndClear(), Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > xInfo = aCnt.getProperties(); if ( xInfo->hasPropertyByName( PROPERTY_ANCHORREF ) ) { @@ -1070,17 +1067,17 @@ IMPL_LINK_NOARG(SearchTabPage_Impl, SearchHdl) EnterWait(); ClearSearchResults(); RememberSearchText( aSearchText ); - String aSearchURL = HELP_URL; - aSearchURL += aFactory; - aSearchURL += String( HELP_SEARCH_TAG ); + OUStringBuffer aSearchURL(HELP_URL); + aSearchURL.append(aFactory); + aSearchURL.append(HELP_SEARCH_TAG); if ( !aFullWordsCB.IsChecked() ) aSearchText = sfx2::PrepareSearchString( aSearchText, xBreakIterator, true ); - aSearchURL += aSearchText; - AppendConfigToken( aSearchURL, sal_False ); + aSearchURL.append(aSearchText); + AppendConfigToken(aSearchURL, sal_False); if ( aScopeCB.IsChecked() ) - aSearchURL += DEFINE_CONST_UNICODE("&Scope=Heading"); - Sequence< ::rtl::OUString > aFactories = SfxContentHelper::GetResultSet( aSearchURL ); - const ::rtl::OUString* pFacs = aFactories.getConstArray(); + aSearchURL.append("&Scope=Heading"); + Sequence< OUString > aFactories = SfxContentHelper::GetResultSet(aSearchURL.makeStringAndClear()); + const OUString* pFacs = aFactories.getConstArray(); sal_uInt32 i, nCount = aFactories.getLength(); for ( i = 0; i < nCount; ++i ) { @@ -1479,11 +1476,10 @@ void BookmarksTabPage_Impl::AddBookmarks( const String& rTitle, const String& rU sHelpURL.append(HELP_URL); sHelpURL.append(sFactory); sHelpURL.append(sContent); - String sURL = String(sHelpURL.makeStringAndClear()); - AppendConfigToken(sURL, bUseQuestionMark); + AppendConfigToken(sHelpURL, bUseQuestionMark); if (!sAnchor.isEmpty()) - sURL += String(sAnchor); - return ::rtl::OUString(sURL); + sHelpURL.append(sAnchor); + return sHelpURL.makeStringAndClear(); } void SfxHelpWindow_Impl::loadHelpContent(const ::rtl::OUString& sHelpURL, sal_Bool bAddToHistory) @@ -1597,9 +1593,9 @@ SfxHelpIndexWindow_Impl::~SfxHelpIndexWindow_Impl() void SfxHelpIndexWindow_Impl::Initialize() { - String aHelpURL = HELP_URL; - AppendConfigToken( aHelpURL, sal_True ); - Sequence< ::rtl::OUString > aFactories = SfxContentHelper::GetResultSet( aHelpURL ); + OUStringBuffer aHelpURL(HELP_URL); + AppendConfigToken(aHelpURL, sal_True); + Sequence< ::rtl::OUString > aFactories = SfxContentHelper::GetResultSet(aHelpURL.makeStringAndClear()); const ::rtl::OUString* pFacs = aFactories.getConstArray(); sal_uInt32 i, nCount = aFactories.getLength(); for ( i = 0; i < nCount; ++i ) diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index 9ba6b69be73d..6b60bb8cf8bf 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -598,7 +598,7 @@ public: }; /// Appends ?Language=xy&System=abc to the help URL in rURL -void AppendConfigToken( String& rURL, sal_Bool bQuestionMark, const rtl::OUString &rLang = rtl::OUString() ); +void AppendConfigToken(OUStringBuffer& rURL, sal_Bool bQuestionMark, const OUString &rLang = rtl::OUString()); #endif // #ifndef INCLUDED_SFX_NEWHELP_HXX diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 0d896375728a..b2be3e3f78de 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -98,15 +98,15 @@ void NoHelpErrorBox::RequestHelp( const HelpEvent& ) #define STARTERLIST 0 -static bool impl_hasHelpInstalled( const rtl::OUString &rLang ); +static bool impl_hasHelpInstalled( const OUString &rLang ); /// Return the locale we prefer for displaying help -static rtl::OUString HelpLocaleString() +static OUString HelpLocaleString() { - static rtl::OUString aLocaleStr; + static OUString aLocaleStr; if (aLocaleStr.isEmpty()) { - const rtl::OUString aEnglish( "en" ); + const OUString aEnglish( "en" ); // detect installed locale aLocaleStr = utl::ConfigManager::getLocale(); bool bOk = !aLocaleStr.isEmpty(); @@ -114,12 +114,12 @@ static rtl::OUString HelpLocaleString() aLocaleStr = aEnglish; else { - rtl::OUString aBaseInstallPath; + OUString aBaseInstallPath; utl::Bootstrap::locateBaseInstallation(aBaseInstallPath); static const char *szHelpPath = "/help/"; - rtl::OUString sHelpPath = aBaseInstallPath + - rtl::OUString::createFromAscii(szHelpPath) + aLocaleStr; + OUString sHelpPath = aBaseInstallPath + + OUString::createFromAscii(szHelpPath) + aLocaleStr; osl::DirectoryItem aDirItem; if (!osl::DirectoryItem::get(sHelpPath, aDirItem) == osl::FileBase::E_None) @@ -132,7 +132,7 @@ static rtl::OUString HelpLocaleString() bOk = true; sLang = sLang.Copy( 0, nSepPos ); sHelpPath = aBaseInstallPath + - rtl::OUString::createFromAscii(szHelpPath) + sLang; + OUString::createFromAscii(szHelpPath) + sLang; if (!osl::DirectoryItem::get(sHelpPath, aDirItem) == osl::FileBase::E_None) bOk = false; } @@ -146,40 +146,40 @@ static rtl::OUString HelpLocaleString() return aLocaleStr; } -void AppendConfigToken( String& rURL, sal_Bool bQuestionMark, const rtl::OUString &rLang ) +void AppendConfigToken( OUStringBuffer& rURL, sal_Bool bQuestionMark, const OUString &rLang ) { - ::rtl::OUString aLocaleStr( rLang ); + OUString aLocaleStr( rLang ); if ( aLocaleStr.isEmpty() ) aLocaleStr = HelpLocaleString(); // query part exists? if ( bQuestionMark ) // no, so start with '?' - rURL += '?'; + rURL.append('?'); else // yes, so only append with '&' - rURL += '&'; + rURL.append('&'); // set parameters - rURL += DEFINE_CONST_UNICODE("Language="); - rURL += String( aLocaleStr ); - rURL += DEFINE_CONST_UNICODE("&System="); - rURL += SvtHelpOptions().GetSystem(); - rURL += DEFINE_CONST_UNICODE("&Version="); - rURL += utl::ConfigManager::getProductVersion(); + rURL.append("Language="); + rURL.append(aLocaleStr); + rURL.append("&System="); + rURL.append(SvtHelpOptions().GetSystem()); + rURL.append("&Version="); + rURL.append(utl::ConfigManager::getProductVersion()); } -sal_Bool GetHelpAnchor_Impl( const String& _rURL, String& _rAnchor ) +sal_Bool GetHelpAnchor_Impl( const OUString& _rURL, OUString& _rAnchor ) { sal_Bool bRet = sal_False; - ::rtl::OUString sAnchor; + OUString sAnchor; try { ::ucbhelper::Content aCnt( INetURLObject( _rURL ).GetMainURL( INetURLObject::NO_DECODE ), Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - if ( ( aCnt.getPropertyValue( ::rtl::OUString("AnchorName") ) >>= sAnchor ) ) + if ( ( aCnt.getPropertyValue( OUString("AnchorName") ) >>= sAnchor ) ) { if ( !sAnchor.isEmpty() ) @@ -203,18 +203,18 @@ sal_Bool GetHelpAnchor_Impl( const String& _rURL, String& _rAnchor ) class SfxHelpOptions_Impl : public utl::ConfigItem { private: - std::set < rtl::OString > m_aIds; + std::set < OString > m_aIds; public: SfxHelpOptions_Impl(); ~SfxHelpOptions_Impl(); - bool HasId( const rtl::OString& rId ) { return m_aIds.size() ? m_aIds.find( rId ) != m_aIds.end() : false; } - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + bool HasId( const OString& rId ) { return m_aIds.size() ? m_aIds.find( rId ) != m_aIds.end() : false; } + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ); virtual void Commit(); }; -static Sequence< ::rtl::OUString > GetPropertyNames() +static Sequence< OUString > GetPropertyNames() { static const char* aPropNames[] = { @@ -222,20 +222,20 @@ static Sequence< ::rtl::OUString > GetPropertyNames() }; const int nCount = sizeof( aPropNames ) / sizeof( const char* ); - Sequence< ::rtl::OUString > aNames( nCount ); - ::rtl::OUString* pNames = aNames.getArray(); - ::rtl::OUString* pEnd = pNames + aNames.getLength(); + Sequence< OUString > aNames( nCount ); + OUString* pNames = aNames.getArray(); + OUString* pEnd = pNames + aNames.getLength(); int i = 0; for ( ; pNames != pEnd; ++pNames ) - *pNames = ::rtl::OUString::createFromAscii( aPropNames[i++] ); + *pNames = OUString::createFromAscii( aPropNames[i++] ); return aNames; } SfxHelpOptions_Impl::SfxHelpOptions_Impl() - : ConfigItem( ::rtl::OUString("Office.SFX/Help") ) + : ConfigItem( OUString("Office.SFX/Help") ) { - Sequence< ::rtl::OUString > aNames = GetPropertyNames(); + Sequence< OUString > aNames = GetPropertyNames(); Sequence< Any > aValues = GetProperties( aNames ); EnableNotification( aNames ); const Any* pValues = aValues.getConstArray(); @@ -251,16 +251,16 @@ SfxHelpOptions_Impl::SfxHelpOptions_Impl() { case STARTERLIST : { - ::rtl::OUString aCodedList; + OUString aCodedList; if ( pValues[nProp] >>= aCodedList ) { - rtl::OString aTmp( - rtl::OUStringToOString( - aCodedList, RTL_TEXTENCODING_UTF8 ) ); + OString aTmp( + OUStringToOString( + aCodedList, RTL_TEXTENCODING_UTF8)); sal_Int32 nIndex = 0; do { - rtl::OString aToken = aTmp.getToken( 0, ',', nIndex ); + OString aToken = aTmp.getToken( 0, ',', nIndex ); if ( !aToken.isEmpty() ) m_aIds.insert( aToken ); } @@ -287,7 +287,7 @@ SfxHelpOptions_Impl::~SfxHelpOptions_Impl() } -void SfxHelpOptions_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& ) +void SfxHelpOptions_Impl::Notify( const com::sun::star::uno::Sequence< OUString >& ) { } @@ -299,14 +299,14 @@ class SfxHelp_Impl { private: SfxHelpOptions_Impl* m_pOpt; // the options - ::std::vector< ::rtl::OUString > m_aModulesList; // list of all installed modules + ::std::vector< OUString > m_aModulesList; // list of all installed modules public: SfxHelp_Impl(); ~SfxHelp_Impl(); SfxHelpOptions_Impl* GetOptions(); - static String GetHelpText( const rtl::OUString& aCommandURL, const String& rModule ); + static String GetHelpText( const OUString& aCommandURL, const String& rModule ); }; SfxHelp_Impl::SfxHelp_Impl() : @@ -321,7 +321,7 @@ SfxHelp_Impl::~SfxHelp_Impl() delete m_pOpt; } -String SfxHelp_Impl::GetHelpText( const rtl::OUString& aCommandURL, const String& rModule ) +String SfxHelp_Impl::GetHelpText( const OUString& aCommandURL, const String& rModule ) { // create help url String aHelpURL = SfxHelp::CreateHelpURL( aCommandURL, rModule ); @@ -348,15 +348,15 @@ SfxHelp::SfxHelp() : // read the environment variable "HELP_DEBUG" // if it's set, you will see debug output on active help { - ::rtl::OUString sHelpDebug; - ::rtl::OUString sEnvVarName( "HELP_DEBUG" ); + OUString sHelpDebug; + OUString sEnvVarName( "HELP_DEBUG" ); osl_getEnvironment( sEnvVarName.pData, &sHelpDebug.pData ); bIsDebug = !sHelpDebug.isEmpty(); } pImp = new SfxHelp_Impl(); - ::rtl::OUString aLocaleStr = HelpLocaleString(); + OUString aLocaleStr = HelpLocaleString(); sal_Int32 nSepPos = aLocaleStr.indexOf( '_' ); if ( nSepPos != -1 ) @@ -384,9 +384,9 @@ SfxHelp::~SfxHelp() delete pImp; } -::rtl::OUString getDefaultModule_Impl() +OUString getDefaultModule_Impl() { - rtl::OUString sDefaultModule; + OUString sDefaultModule; SvtModuleOptions aModOpt; if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) ) sDefaultModule = DEFINE_CONST_UNICODE("swriter"); @@ -411,9 +411,9 @@ SfxHelp::~SfxHelp() return sDefaultModule; } -::rtl::OUString getCurrentModuleIdentifier_Impl() +OUString getCurrentModuleIdentifier_Impl() { - ::rtl::OUString sIdentifier; + OUString sIdentifier; Reference < XFrame > xCurrentFrame; Reference < XModuleManager2 > xModuleManager( ModuleManager::create(::comphelper::getProcessComponentContext()) ); Reference < XDesktop > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance( @@ -440,11 +440,10 @@ SfxHelp::~SfxHelp() return sIdentifier; } -String SfxHelp::GetHelpModuleName_Impl() +OUString SfxHelp::GetHelpModuleName_Impl() { - String sModuleName; - rtl::OUString aFactoryShortName; - rtl::OUString aModuleIdentifier = getCurrentModuleIdentifier_Impl(); + OUString aFactoryShortName; + OUString aModuleIdentifier = getCurrentModuleIdentifier_Impl(); if ( !aModuleIdentifier.isEmpty() ) { @@ -469,18 +468,18 @@ String SfxHelp::GetHelpModuleName_Impl() } } - rtl::OUString sDefaultModule = getDefaultModule_Impl(); + OUString sDefaultModule = getDefaultModule_Impl(); if ( !aFactoryShortName.isEmpty() ) { // Map some module identifiers to their "real" help module string. if ( aFactoryShortName == "chart2" ) - aFactoryShortName = rtl::OUString( "schart" ); + aFactoryShortName = OUString( "schart" ); else if ( aFactoryShortName == "BasicIDE" ) - aFactoryShortName = rtl::OUString( "sbasic" ); + aFactoryShortName = OUString( "sbasic" ); else if ( aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sweb")) || aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sglobal")) || aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("swxform")) ) - aFactoryShortName = rtl::OUString( "swriter" ); + aFactoryShortName = OUString( "swriter" ); else if ( aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dbquery")) || aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dbbrowser")) || aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dbrelation")) @@ -490,7 +489,7 @@ String SfxHelp::GetHelpModuleName_Impl() || aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("swreport")) || aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dbbrowser")) || aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("swform")) ) - aFactoryShortName = rtl::OUString( "sdatabase" ); + aFactoryShortName = OUString( "sdatabase" ); else if ( aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sbibliography")) || aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("StartModule")) ) aFactoryShortName = sDefaultModule; @@ -498,48 +497,46 @@ String SfxHelp::GetHelpModuleName_Impl() else aFactoryShortName = sDefaultModule; - sModuleName = String( aFactoryShortName ); - return sModuleName; + return aFactoryShortName; } -String SfxHelp::CreateHelpURL_Impl( const String& aCommandURL, const String& rModuleName ) +OUString SfxHelp::CreateHelpURL_Impl( const OUString& aCommandURL, const OUString& rModuleName ) { // build up the help URL - String aHelpURL; + OUStringBuffer aHelpURL("vnd.sun.star.help://"); sal_Bool bHasAnchor = sal_False; - String aAnchor; + OUString aAnchor; - String aModuleName( rModuleName ); - if ( aModuleName.Len() == 0 ) + OUString aModuleName( rModuleName ); + if (aModuleName.isEmpty()) aModuleName = getDefaultModule_Impl(); - aHelpURL = rtl::OUString("vnd.sun.star.help://"); - aHelpURL += aModuleName; + aHelpURL.append(aModuleName); - if ( !aCommandURL.Len() ) - aHelpURL += rtl::OUString("/start"); + if ( aCommandURL.isEmpty() ) + aHelpURL.append("/start"); else { - aHelpURL += '/'; - aHelpURL += String( rtl::Uri::encode( aCommandURL, + aHelpURL.append('/'); + aHelpURL.append(rtl::Uri::encode(aCommandURL, rtl_UriCharClassRelSegment, rtl_UriEncodeKeepEscapes, - RTL_TEXTENCODING_UTF8 )); + RTL_TEXTENCODING_UTF8)); - String aTempURL = aHelpURL; + OUStringBuffer aTempURL = aHelpURL; AppendConfigToken( aTempURL, sal_True ); - bHasAnchor = GetHelpAnchor_Impl( aTempURL, aAnchor ); + bHasAnchor = GetHelpAnchor_Impl(aTempURL.makeStringAndClear(), aAnchor); } AppendConfigToken( aHelpURL, sal_True ); if ( bHasAnchor ) { - aHelpURL += '#'; - aHelpURL += aAnchor; + aHelpURL.append('#'); + aHelpURL.append(aAnchor); } - return aHelpURL; + return aHelpURL.makeStringAndClear(); } SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame >& rHelpTask , @@ -550,7 +547,7 @@ SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame >& rHelpTask , // otherwhise - create new help task Reference< XFrame > xHelpTask = xDesktop->findFrame( - ::rtl::OUString(DEFINE_CONST_UNICODE("OFFICE_HELP_TASK")), + OUString("OFFICE_HELP_TASK"), FrameSearchFlag::TASKS | FrameSearchFlag::CREATE); if (!xHelpTask.is()) return 0; @@ -565,7 +562,7 @@ SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame >& rHelpTask , if (xHelpTask->setComponent( xHelpWindow, Reference< XController >() )) { // Customize UI ... - xHelpTask->setName( ::rtl::OUString(DEFINE_CONST_UNICODE("OFFICE_HELP_TASK")) ); + xHelpTask->setName( OUString("OFFICE_HELP_TASK") ); Reference< XPropertySet > xProps(xHelpTask, UNO_QUERY); if (xProps.is()) @@ -579,42 +576,42 @@ SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame >& rHelpTask , // This sub frame is created internaly (if we called new SfxHelpWindow_Impl() ...) // It should exist :-) - xHelpContent = xHelpTask->findFrame(::rtl::OUString(DEFINE_CONST_UNICODE("OFFICE_HELP")), FrameSearchFlag::CHILDREN); + xHelpContent = xHelpTask->findFrame(OUString("OFFICE_HELP"), FrameSearchFlag::CHILDREN); } if (!xHelpContent.is()) delete pHelpWindow; - xHelpContent->setName(::rtl::OUString(DEFINE_CONST_UNICODE("OFFICE_HELP"))); + xHelpContent->setName(OUString("OFFICE_HELP")); rHelpTask = xHelpTask; rHelpContent = xHelpContent; return pHelpWindow; } -XubString SfxHelp::GetHelpText( const String& aCommandURL, const Window* pWindow ) +OUString SfxHelp::GetHelpText( const OUString& aCommandURL, const Window* pWindow ) { - String sModuleName = GetHelpModuleName_Impl(); - String sHelpText = pImp->GetHelpText( aCommandURL, sModuleName ); + OUString sModuleName = GetHelpModuleName_Impl(); + OUString sHelpText = pImp->GetHelpText( aCommandURL, sModuleName ); - rtl::OString aNewHelpId; + OString aNewHelpId; - if ( pWindow && !sHelpText.Len() ) + if (pWindow && sHelpText.isEmpty()) { // no help text found -> try with parent help id. Window* pParent = pWindow->GetParent(); while ( pParent ) { aNewHelpId = pParent->GetHelpId(); - sHelpText = pImp->GetHelpText( rtl::OStringToOUString(aNewHelpId, RTL_TEXTENCODING_UTF8), sModuleName ); - if ( sHelpText.Len() > 0 ) + sHelpText = pImp->GetHelpText( OStringToOUString(aNewHelpId, RTL_TEXTENCODING_UTF8), sModuleName ); + if (!sHelpText.isEmpty()) pParent = NULL; else pParent = pParent->GetParent(); } - if ( bIsDebug && !sHelpText.Len() ) - aNewHelpId = rtl::OString(); + if (bIsDebug && sHelpText.isEmpty()) + aNewHelpId = OString(); } // add some debug information? @@ -627,7 +624,7 @@ XubString SfxHelp::GetHelpText( const String& aCommandURL, const Window* pWindow if ( !aNewHelpId.isEmpty() ) { sHelpText += DEFINE_CONST_UNICODE(" - "); - sHelpText += String(rtl::OStringToOUString(aNewHelpId, RTL_TEXTENCODING_UTF8)); + sHelpText += String(OStringToOUString(aNewHelpId, RTL_TEXTENCODING_UTF8)); } } @@ -635,23 +632,23 @@ XubString SfxHelp::GetHelpText( const String& aCommandURL, const Window* pWindow } /// Check for built-in help -static bool impl_hasHelpInstalled( const rtl::OUString &rLang = rtl::OUString() ) +static bool impl_hasHelpInstalled( const OUString &rLang = OUString() ) { - String aHelpRootURL( DEFINE_CONST_OUSTRING("vnd.sun.star.help://") ); - AppendConfigToken( aHelpRootURL, sal_True, rLang ); - Sequence< ::rtl::OUString > aFactories = SfxContentHelper::GetResultSet( aHelpRootURL ); + OUStringBuffer aHelpRootURL("vnd.sun.star.help://"); + AppendConfigToken(aHelpRootURL, sal_True, rLang); + Sequence< OUString > aFactories = SfxContentHelper::GetResultSet(aHelpRootURL.makeStringAndClear()); return ( aFactories.getLength() != 0 ); } -sal_Bool SfxHelp::SearchKeyword( const XubString& rKeyword ) +sal_Bool SfxHelp::SearchKeyword( const OUString& rKeyword ) { return Start_Impl( String(), NULL, rKeyword ); } -sal_Bool SfxHelp::Start( const String& rURL, const Window* pWindow ) +sal_Bool SfxHelp::Start( const OUString& rURL, const Window* pWindow ) { - return Start_Impl( rURL, pWindow, String() ); + return Start_Impl( rURL, pWindow, OUString() ); } /// Redirect the vnd.sun.star.help:// urls to http://help.libreoffice.org @@ -661,14 +658,14 @@ static bool impl_showOnlineHelp( const String& rURL ) if ( rURL.Len() <= aInternal.Len() || rURL.Copy( 0, aInternal.Len() ) != aInternal ) return false; - rtl::OUString aHelpLink( "http://help.libreoffice.org/" ); + OUString aHelpLink( "http://help.libreoffice.org/" ); aHelpLink += rURL.Copy( aInternal.Len() ); try { Reference< XSystemShellExecute > xSystemShell( SystemShellExecute::create(::comphelper::getProcessComponentContext()) ); - xSystemShell->execute( aHelpLink, rtl::OUString(), SystemShellExecuteFlags::URIS_ONLY ); + xSystemShell->execute( aHelpLink, OUString(), SystemShellExecuteFlags::URIS_ONLY ); return true; } catch (const Exception&) @@ -677,11 +674,11 @@ static bool impl_showOnlineHelp( const String& rURL ) return false; } -sal_Bool SfxHelp::Start_Impl( const String& rURL, const Window* pWindow, const String& rKeyword ) +sal_Bool SfxHelp::Start_Impl(const OUString& rURL, const Window* pWindow, const OUString& rKeyword) { - String aHelpRootURL( DEFINE_CONST_OUSTRING("vnd.sun.star.help://") ); - AppendConfigToken( aHelpRootURL, sal_True); - Sequence< ::rtl::OUString > aFactories = SfxContentHelper::GetResultSet( aHelpRootURL ); + OUStringBuffer aHelpRootURL("vnd.sun.star.help://"); + AppendConfigToken(aHelpRootURL, sal_True); + Sequence< OUString > aFactories = SfxContentHelper::GetResultSet(aHelpRootURL.makeStringAndClear()); /* rURL may be - a "real" URL @@ -716,8 +713,8 @@ sal_Bool SfxHelp::Start_Impl( const String& rURL, const Window* pWindow, const S Window* pParent = pWindow->GetParent(); while ( pParent ) { - rtl::OString aHelpId = pParent->GetHelpId(); - aHelpURL = CreateHelpURL( rtl::OStringToOUString(aHelpId, RTL_TEXTENCODING_UTF8), aHelpModuleName ); + OString aHelpId = pParent->GetHelpId(); + aHelpURL = CreateHelpURL( OStringToOUString(aHelpId, RTL_TEXTENCODING_UTF8), aHelpModuleName ); if ( !SfxContentHelper::IsHelpErrorDocument( aHelpURL ) ) { break; @@ -756,10 +753,10 @@ sal_Bool SfxHelp::Start_Impl( const String& rURL, const Window* pWindow, const S // If not, create a new one and return access directly to the internal sub frame showing the help content // search must be done here; search one desktop level could return an arbitraty frame Reference< XFrame > xHelp = xDesktop->findFrame( - ::rtl::OUString(DEFINE_CONST_UNICODE("OFFICE_HELP_TASK")), + OUString("OFFICE_HELP_TASK"), FrameSearchFlag::CHILDREN); Reference< XFrame > xHelpContent = xDesktop->findFrame( - ::rtl::OUString(DEFINE_CONST_UNICODE("OFFICE_HELP")), + OUString("OFFICE_HELP"), FrameSearchFlag::CHILDREN); SfxHelpWindow_Impl* pHelpWindow = 0; @@ -771,14 +768,14 @@ sal_Bool SfxHelp::Start_Impl( const String& rURL, const Window* pWindow, const S return sal_False; #ifdef DBG_UTIL - rtl::OStringBuffer aTmp(RTL_CONSTASCII_STRINGPARAM("SfxHelp: HelpId = ")); - aTmp.append(rtl::OUStringToOString(aHelpURL, RTL_TEXTENCODING_UTF8)); + OStringBuffer aTmp(RTL_CONSTASCII_STRINGPARAM("SfxHelp: HelpId = ")); + aTmp.append(OUStringToOString(aHelpURL, RTL_TEXTENCODING_UTF8)); OSL_TRACE( aTmp.getStr() ); #endif pHelpWindow->SetHelpURL( aHelpURL ); pHelpWindow->loadHelpContent(aHelpURL); - if ( rKeyword.Len() ) + if (!rKeyword.isEmpty()) pHelpWindow->OpenKeyword( rKeyword ); Reference < ::com::sun::star::awt::XTopWindow > xTopWindow( xHelp->getContainerWindow(), UNO_QUERY ); @@ -788,23 +785,20 @@ sal_Bool SfxHelp::Start_Impl( const String& rURL, const Window* pWindow, const S return sal_True; } -String SfxHelp::CreateHelpURL( const String& aCommandURL, const String& rModuleName ) +OUString SfxHelp::CreateHelpURL(const OUString& aCommandURL, const OUString& rModuleName) { - String aURL; - SfxHelp* pHelp = (static_cast< SfxHelp* >(Application::GetHelp()) ); - if ( pHelp ) - aURL = pHelp->CreateHelpURL_Impl( aCommandURL, rModuleName ); - return aURL; + SfxHelp* pHelp = static_cast< SfxHelp* >(Application::GetHelp()); + return pHelp ? pHelp->CreateHelpURL_Impl( aCommandURL, rModuleName ) : OUString(); } -void SfxHelp::OpenHelpAgent( SfxFrame*, const rtl::OString& sHelpId ) +void SfxHelp::OpenHelpAgent( SfxFrame*, const OString& sHelpId ) { SfxHelp* pHelp = (static_cast< SfxHelp* >(Application::GetHelp()) ); if ( pHelp ) pHelp->OpenHelpAgent( sHelpId ); } -void SfxHelp::OpenHelpAgent( const rtl::OString& sHelpId ) +void SfxHelp::OpenHelpAgent( const OString& sHelpId ) { if ( SvtHelpOptions().IsHelpAgentAutoStartMode() ) { @@ -815,7 +809,7 @@ void SfxHelp::OpenHelpAgent( const rtl::OString& sHelpId ) try { URL aURL; - aURL.Complete = CreateHelpURL_Impl( rtl::OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8), GetHelpModuleName_Impl() ); + aURL.Complete = CreateHelpURL_Impl( OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8), GetHelpModuleName_Impl() ); Reference< XURLTransformer > xTrans( URLTransformer::create( ::comphelper::getProcessComponentContext() ) ); xTrans->parseStrict(aURL); @@ -829,7 +823,7 @@ void SfxHelp::OpenHelpAgent( const rtl::OString& sHelpId ) Reference< XDispatch > xHelpDispatch; if ( xDispProv.is() ) xHelpDispatch = xDispProv->queryDispatch( - aURL, ::rtl::OUString("_helpagent"), + aURL, OUString("_helpagent"), FrameSearchFlag::PARENT | FrameSearchFlag::SELF ); DBG_ASSERT( xHelpDispatch.is(), "OpenHelpAgent: could not get a dispatcher!" ); @@ -843,12 +837,12 @@ void SfxHelp::OpenHelpAgent( const rtl::OString& sHelpId ) } } -String SfxHelp::GetDefaultHelpModule() +OUString SfxHelp::GetDefaultHelpModule() { return getDefaultModule_Impl(); } -::rtl::OUString SfxHelp::GetCurrentModuleIdentifier() +OUString SfxHelp::GetCurrentModuleIdentifier() { return getCurrentModuleIdentifier_Impl(); } diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx index 40a969f5b40c..7dd0c31ba964 100644 --- a/vcl/inc/helpwin.hxx +++ b/vcl/inc/helpwin.hxx @@ -44,8 +44,8 @@ private: Rectangle maTextRect; // For wrapped text in QuickHelp - String maHelpText; - String maStatusText; + OUString maHelpText; + OUString maStatusText; Timer maShowTimer; Timer maHideTimer; @@ -61,16 +61,16 @@ protected: void ImplShow(); public: - HelpTextWindow( Window* pParent, const String& rText, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle ); + HelpTextWindow( Window* pParent, const OUString& rText, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle ); ~HelpTextWindow(); - const String& GetHelpText() const { return maHelpText; } - void SetHelpText( const String& rHelpText ); + const OUString& GetHelpText() const { return maHelpText; } + void SetHelpText( const OUString& rHelpText ); sal_uInt16 GetWinStyle() const { return mnHelpWinStyle; } sal_uInt16 GetStyle() const { return mnStyle; } // Nur merken: - void SetStatusText( const String& rStatusText ) { maStatusText = rStatusText; } + void SetStatusText( const OUString& rStatusText ) { maStatusText = rStatusText; } void SetHelpArea( const Rectangle& rRect ) { maHelpArea = rRect; } void ShowHelp( sal_uInt16 nDelayMode ); @@ -82,7 +82,7 @@ public: }; void ImplShowHelpWindow( Window* pParent, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle, - const String& rHelpText, const String& rStatusText, + const OUString& rHelpText, const OUString& rStatusText, const Point& rScreenPos, const Rectangle* pHelpArea = NULL ); void ImplDestroyHelpWindow( bool bUpdateHideTime ); void ImplSetHelpWindowPos( Window* pHelpWindow, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle, diff --git a/vcl/inc/vcl/help.hxx b/vcl/inc/vcl/help.hxx index 1906bcaa7e56..8753c3c8fd08 100644 --- a/vcl/inc/vcl/help.hxx +++ b/vcl/inc/vcl/help.hxx @@ -29,7 +29,7 @@ #ifndef _SV_HELP_HXX #define _SV_HELP_HXX -#include +#include #include #include @@ -69,19 +69,19 @@ class Window; class VCL_DLLPUBLIC Help { private: - String maHelpFile; + OUString maHelpFile; public: Help(); virtual ~Help(); - void SetHelpFile( const String& rFileName ) { maHelpFile = rFileName; } - const String& GetHelpFile() const { return maHelpFile; } + void SetHelpFile( const OUString& rFileName ) { maHelpFile = rFileName; } + const OUString& GetHelpFile() const { return maHelpFile; } - virtual sal_Bool Start( const XubString& rHelpId, const Window* pWindow ); - virtual sal_Bool SearchKeyword( const XubString& rKeyWord ); - virtual void OpenHelpAgent( const rtl::OString& rHelpId ); - virtual XubString GetHelpText( const String& aHelpURL, const Window* pWindow ); + virtual sal_Bool Start( const OUString& rHelpId, const Window* pWindow ); + virtual sal_Bool SearchKeyword( const OUString& rKeyWord ); + virtual void OpenHelpAgent( const OString& rHelpId ); + virtual OUString GetHelpText( const OUString& aHelpURL, const Window* pWindow ); static void EnableContextHelp(); static void DisableContextHelp(); @@ -98,35 +98,35 @@ public: static sal_Bool IsBalloonHelpEnabled(); static sal_Bool ShowBalloon( Window* pParent, const Point& rScreenPos, - const XubString& rHelpText ); + const OUString& rHelpText ); static sal_Bool ShowBalloon( Window* pParent, const Point& rScreenPos, const Rectangle&, - const XubString& rHelpText ); + const OUString& rHelpText ); static void EnableQuickHelp(); static void DisableQuickHelp(); static sal_Bool IsQuickHelpEnabled(); static sal_Bool ShowQuickHelp( Window* pParent, const Rectangle& rScreenRect, - const XubString& rHelpText, - const XubString& rLongHelpText, + const OUString& rHelpText, + const OUString& rLongHelpText, sal_uInt16 nStyle = 0 ); static sal_Bool ShowQuickHelp( Window* pParent, const Rectangle& rScreenRect, - const XubString& rHelpText, + const OUString& rHelpText, sal_uInt16 nStyle = 0 ) - { return Help::ShowQuickHelp( pParent, rScreenRect, rHelpText, XubString(), nStyle ); } + { return Help::ShowQuickHelp( pParent, rScreenRect, rHelpText, OUString(), nStyle ); } static void HideBalloonAndQuickHelp(); static sal_uLong ShowTip( Window* pParent, const Rectangle& rScreenRect, - const XubString& rText, sal_uInt16 nStyle = 0 ); + const OUString& rText, sal_uInt16 nStyle = 0 ); static void UpdateTip( sal_uLong nId, Window* pParent, const Rectangle& rScreenRect, - const XubString& rText ); + const OUString& rText ); static void HideTip( sal_uLong nId ); }; diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index 9cb7a03a617c..18a6573e1491 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -26,6 +26,7 @@ * ************************************************************************/ +#include #include "tools/debug.hxx" #include "tools/diagnose_ex.h" @@ -66,25 +67,25 @@ Help::~Help() // ----------------------------------------------------------------------- -void Help::OpenHelpAgent( const rtl::OString& ) +void Help::OpenHelpAgent( const OString& ) { } // ----------------------------------------------------------------------- -sal_Bool Help::Start( const XubString&, const Window* ) +sal_Bool Help::Start( const OUString&, const Window* ) { return sal_False; } -sal_Bool Help::SearchKeyword( const XubString& ) +sal_Bool Help::SearchKeyword( const OUString& ) { return sal_False; } // ----------------------------------------------------------------------- -XubString Help::GetHelpText( const String&, const Window* ) +OUString Help::GetHelpText( const OUString&, const Window* ) { return ImplGetSVEmptyStr(); } @@ -193,7 +194,7 @@ sal_Bool Help::IsBalloonHelpEnabled() sal_Bool Help::ShowBalloon( Window* pParent, const Point& rScreenPos, - const XubString& rHelpText ) + const OUString& rHelpText ) { ImplShowHelpWindow( pParent, HELPWINSTYLE_BALLOON, 0, rHelpText, ImplGetSVEmptyStr(), rScreenPos ); @@ -205,7 +206,7 @@ sal_Bool Help::ShowBalloon( Window* pParent, sal_Bool Help::ShowBalloon( Window* pParent, const Point& rScreenPos, const Rectangle& rRect, - const XubString& rHelpText ) + const OUString& rHelpText ) { ImplShowHelpWindow( pParent, HELPWINSTYLE_BALLOON, 0, rHelpText, ImplGetSVEmptyStr(), rScreenPos, &rRect ); @@ -238,8 +239,8 @@ sal_Bool Help::IsQuickHelpEnabled() sal_Bool Help::ShowQuickHelp( Window* pParent, const Rectangle& rScreenRect, - const XubString& rHelpText, - const XubString& rLongHelpText, + const OUString& rHelpText, + const OUString& rLongHelpText, sal_uInt16 nStyle ) { ImplShowHelpWindow( pParent, HELPWINSTYLE_QUICK, nStyle, @@ -260,7 +261,7 @@ void Help::HideBalloonAndQuickHelp() // ----------------------------------------------------------------------- sal_uIntPtr Help::ShowTip( Window* pParent, const Rectangle& rScreenRect, - const XubString& rText, sal_uInt16 nStyle ) + const OUString& rText, sal_uInt16 nStyle ) { sal_uInt16 nHelpWinStyle = ( ( nStyle & QUICKHELP_TIP_STYLE_BALLOON ) != 0 ) ? HELPWINSTYLE_BALLOON : HELPWINSTYLE_QUICK; HelpTextWindow* pHelpWin = new HelpTextWindow( pParent, rText, nHelpWinStyle, nStyle ); @@ -274,7 +275,7 @@ sal_uIntPtr Help::ShowTip( Window* pParent, const Rectangle& rScreenRect, // ----------------------------------------------------------------------- -void Help::UpdateTip( sal_uIntPtr nId, Window* pParent, const Rectangle& rScreenRect, const XubString& rText ) +void Help::UpdateTip( sal_uIntPtr nId, Window* pParent, const Rectangle& rScreenRect, const OUString& rText ) { HelpTextWindow* pHelpWin = reinterpret_cast< HelpTextWindow* >( nId ); ENSURE_OR_RETURN_VOID( pHelpWin != NULL, "Help::UpdateTip: invalid ID!" ); @@ -303,7 +304,7 @@ void Help::HideTip( sal_uLong nId ) // ======================================================================= -HelpTextWindow::HelpTextWindow( Window* pParent, const XubString& rText, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle ) : +HelpTextWindow::HelpTextWindow( Window* pParent, const OUString& rText, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle ) : //FloatingWindow( pParent->ImplGetFrameWindow(), WB_SYSTEMWINDOW ), FloatingWindow( pParent, WB_SYSTEMWINDOW|WB_TOOLTIPWIN ), // #105827# if we change the parent, mirroring will not work correctly when positioning this window maHelpText( rText ) @@ -367,10 +368,10 @@ HelpTextWindow::~HelpTextWindow() // ----------------------------------------------------------------------- -void HelpTextWindow::SetHelpText( const String& rHelpText ) +void HelpTextWindow::SetHelpText( const OUString& rHelpText ) { maHelpText = rHelpText; - if ( mnHelpWinStyle == HELPWINSTYLE_QUICK && maHelpText.Len() < HELPTEXTMAXLEN) + if ( mnHelpWinStyle == HELPWINSTYLE_QUICK && maHelpText.getLength() < HELPTEXTMAXLEN) { Size aSize; aSize.Height() = GetTextHeight(); @@ -383,9 +384,11 @@ void HelpTextWindow::SetHelpText( const String& rHelpText ) else // HELPWINSTYLE_BALLOON { Point aTmpPoint; - sal_uInt16 nCharsInLine = 35 + ((maHelpText.Len()/100)*5); - XubString aXXX; - aXXX.Fill( nCharsInLine, 'x' ); // average width to have all windows consistent + sal_Int32 nCharsInLine = 35 + ((maHelpText.getLength()/100)*5); + // average width to have all windows consistent + OUStringBuffer aBuf; + comphelper::string::padToLength(aBuf, nCharsInLine, 'x'); + OUString aXXX = aBuf.makeStringAndClear(); long nWidth = GetTextWidth( aXXX ); Size aTmpSize( nWidth, 0x7FFFFFFF ); Rectangle aTry1( aTmpPoint, aTmpSize ); @@ -428,11 +431,11 @@ void HelpTextWindow::Paint( const Rectangle& ) Rectangle aCtrlRegion( Point( 0, 0 ), GetOutputSizePixel() ); ImplControlValue aControlValue; bNativeOK = DrawNativeControl( CTRL_TOOLTIP, PART_ENTIRE_CONTROL, aCtrlRegion, - 0, aControlValue, rtl::OUString() ); + 0, aControlValue, OUString() ); } // paint text - if ( mnHelpWinStyle == HELPWINSTYLE_QUICK && maHelpText.Len() < HELPTEXTMAXLEN) + if ( mnHelpWinStyle == HELPWINSTYLE_QUICK && maHelpText.getLength() < HELPTEXTMAXLEN) { if ( mnStyle & QUICKHELP_CTRLTEXT ) DrawCtrlText( maTextRect.TopLeft(), maHelpText ); @@ -536,7 +539,7 @@ void HelpTextWindow::RequestHelp( const HelpEvent& /*rHEvt*/ ) // ----------------------------------------------------------------------- -String HelpTextWindow::GetText() const +XubString HelpTextWindow::GetText() const { return maHelpText; } @@ -552,12 +555,12 @@ String HelpTextWindow::GetText() const // ======================================================================= void ImplShowHelpWindow( Window* pParent, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle, - const XubString& rHelpText, const XubString& rStatusText, + const OUString& rHelpText, const OUString& rStatusText, const Point& rScreenPos, const Rectangle* pHelpArea ) { ImplSVData* pSVData = ImplGetSVData(); - if( !rHelpText.Len() && !pSVData->maHelpData.mbRequestingHelp ) + if (rHelpText.isEmpty() && !pSVData->maHelpData.mbRequestingHelp) return; HelpTextWindow* pHelpWin = pSVData->maHelpData.mpHelpWin; @@ -602,7 +605,7 @@ void ImplShowHelpWindow( Window* pParent, sal_uInt16 nHelpWinStyle, sal_uInt16 n } } - if ( !pHelpWin && rHelpText.Len() ) + if (!pHelpWin && !rHelpText.isEmpty()) { sal_uLong nCurTime = Time::GetSystemTicks(); if ( ( ( nCurTime - pSVData->maHelpData.mnLastHelpHideTime ) < pParent->GetSettings().GetHelpSettings().GetTipDelay() ) From b966a09c2da9441961c93c44be556399575db849 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Mon, 1 Oct 2012 23:57:06 +0100 Subject: [PATCH 145/863] Resolves: fdo#54862 extra ++n causing merged cells to be skipped commit 567c1db25bd705faac44203e4a3d01d0f5e1385c reverted a pile of other commits, including 858b5b4f36a357fe7192e7c2ed9cc3cdfc81fd8f but didn't revert the ++n of that commit, leading to merge groups getting skipped Change-Id: Ie2b46ebc433df636ebe0092f4a992631b7f06a3f --- sw/source/filter/ww8/ww8par2.cxx | 1 - 1 file changed, 1 deletion(-) diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index a4336b9f5a18..83db83e8b71e 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -2752,7 +2752,6 @@ void WW8TabDesc::FinishSwTable() nRowSpan : ((-1) * (nRowSpan - n)); pCurrentBox->setRowSpan( nRowSpanSet ); - ++n; } } } From e33a9181c76309d31f2ace01b924e404906da28c Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Wed, 26 Sep 2012 15:25:39 +0200 Subject: [PATCH 146/863] docx import: set table above/bottom spacing to 0 Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I3e0397dd3d5d14f1e584ac7bc3d22d4638393b06 --- sw/qa/extras/ooxmlimport/data/n779941.docx | Bin 0 -> 10316 bytes sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 25 ++++++++++++++++++ .../dmapper/DomainMapperTableHandler.cxx | 5 ++++ 3 files changed, 30 insertions(+) create mode 100644 sw/qa/extras/ooxmlimport/data/n779941.docx diff --git a/sw/qa/extras/ooxmlimport/data/n779941.docx b/sw/qa/extras/ooxmlimport/data/n779941.docx new file mode 100644 index 0000000000000000000000000000000000000000..9889d81e238300e8fd9571971f01c78cfd0e1cf9 GIT binary patch literal 10316 zcmeHt^;=xYwszyL!QF!e*Wdwy1$XyGg1fsDf)m_>yL)In!8N$MOK`iLxp&TFa_0HI zKj57DVej2f*SmJr+V83*RSGgt&{zOi06YKyAO|cxBys~G001%=0N@1x9#UJ>*2c-y z#z|kr-Okiem&wiAiYylzk~SLv3GV;j_8+W)I+a12E*A7Q^?f0+4z=){(2^2(qC1`j z$`mZkosaIIB zrsmS69Em4Tz8XA`iR$voRULRzzRy*Qi4yNoH2bwa-?`FTr(nxYoA;4rNH{TZB(|crpP`+KKwP)^0q78jJUrK>e=|>#Sc1k2@IP{3>q7#Yr@n)!l_N9L&+C89 z@;}%Xf0_D+xCLn_5#*2)m=(hTZ|(&|iix>p$sAXT1E`>sLkL&Yq5S!d_B^r{g$2Fs zA3KBcGiiZoQ+$Q|u$6|I)7i6W1`;dp-K-lU;S@9nv{M7jP$WjGENpCNnE7K9a`->6 zmgcV4hKNuJQUKYj@^pd+I#gO>h@=pdqhp5%FF%yFboBpFhe}N;nAb$HFgp>h@7Lhc zpF!2-Ch$Q7p3Dx0V-LU?+RiZ<(OXINIYe2~T{03_v5Zn@#2S?$a;;kAPG5>W>qmYJ zW<-9*3x8~dNb!kVgwmmOl_tRBlsOjMAK9{~; zpmk$*aUCTKt1qv!$H7LHtQxkp<*GF2=og)G$rO86ou6%b^`5TSs``5ZPc+x@6w{B? zJmjb!Ee~TT-&9itzp@PbJy0kgGQb$>F9p)VlBPY6x;QT--mHH!j!vpn8DQpbBX?{g z>eV17FoAi&9$rUQ8CaGCog;+x(hQYc8_OT=h0w(VGRJ=NT|e~!???EjhG?aa@45O< ztEfbe7;*0mXo$=XpvjqG1)l$rJBB#!@~z;tbrTT)zyMR?5AOWRnnSe(n*|nRZ_+AX z_=n6{xp+qQRIJ_>!YWA6yy0jKWB*&z!IIusmr@Il zT>O2FfEI%vQ>1Y>!#E4OVuty+2K^FCXZdm;%A|U$&5-IOYte<)j9plvR81Ivl$JQ( z5-`(faY~0FPnzu0yF}CBVEuqlpLaSt?%UK0VbwU8oJBJ#&SsF>7p+!qJ@he$Cwx5} zu@K)~qr=tAXN(01_Drs&aWm9(@B;Nm)9nr3#orsiBlwB|U5(PO9nodKKMZrJ0}x5&K#bzjMgK=%CI6*)<7<5N2?LJQrDT+@S^o%ISpr$}SZ4+_3_AWNvD0%KXQb_2(LSs3~u|z=ib%ZPt~{ z$=3L#3jv&S#B6oiD_O!Gn@|#q@T6IVT;T~RZ^HQvKZx!Y!%*y5>rg{&f1KIR_Z)Mt zt%%1et0a`-dNuUoxMm~D1*tG^H}0QFNQ+CqANL~@W0KR!&+9!p42x2oxeLcv9W9Yu zF_*hb(x*cwp9R&m)5R{=M_sS9MtoNlGYT;9ruc5Z5SbwT{ZmptTDOMYHl37#&5-y9 z?6wFyI`kX(-99UeW;Jcy2v%ACgjKwOWrFBp`7wp~A6yRW0dd#-WQX zr2A$=X^+?4sAy-9PhW#R2q;Djyvt9+4p?c{qoDhgF7esgc;39By-lo z)#2C3O2Nm+RtfA=S$_%Bo0vYa+_X*jqYFGNb~StImz4G$*xm4x=MlqH2|S=w8JNe+ z2%;aubifo>BHq_M^{d1XTX~3X-VUP}Zs_6Rx!CEhxw8<*4kNF1RJ05wF6dL-d8E25 zw~dtgj*PuDdRrr3^nYoWLUd+FlaV;H5hG%~#*@QBm3o6U;rQSegLrhTv_I?o=`KJ< zP;Hk4ZllQH$gN;t+ihDdu+a+3QSN zBK26J_2fhpAE?qI=>d?+jj4`2{i%~Ao$v$ACqvg>*ZC5O{;k4pWqRlX9o(PB4@ z0|{M#9b^8JLP-W9(d6dIH`Y9bXlrC09o`VgoArZ!?AXf&oORjR_!2h5d$C*HAU;i} zRvqXcN0rUmZgGbg@E5mHJGx)J)g9WOy}s%ujGDcwtDQ$QRli1QpyPVw&{ic%qTB~- z`E3BjBGm-pUTiE>qON&ju1JuwdDTHC4d%BGPPB^O zsEH1T?5M4yLTPm8j184Z@vH=5G>*)SOlaZpm6b6*e=q^{l_u{D}K*pH~f`t}YfK<~9zGw!bz`Yof%s#TYUS53FhlIOF zfxqTwA~@kOdS7Idp3ooBjNmt0d>SjbnPF6q*_cFg54$+Bp3m0W2kFv$z1$x^h~_#$%x0Vu7$b1&3qrh@67{A4C+u+c< zNLAF$8C-v#-X%vY8LXnM@s^8YNCgLyaXh{3VNjOkK%CBi@{u!NLo?9e=6gPXucd-| zgY`^xZtgRNHQ#+|qLQGZ7;^3^eAKMip|RZ;RMoMU*_ahH@5INL?V=0HtqT^{)2VfD zufDAw@&GM@Y8^_IIYv#8xZQOI43?$W{cRF!2)9NmBcyJTls*&nJ+rI+@PXupVer55 zL;KzYNtsb;9gT!-U-ZU8?6JeI4>W}uhSL-oYynT-^p5KphIi`OdPI|erhKil@X8_# zI`~miJRnAZR)*$Ij$Cc@ib*EUH0YgJVozc*wx<{>0^vSEQ^~apnmGD?L8^&q=c-&^ z)_tbw810m-9Pdgxfzn|+7u?g{NIwlb?beLpXAn+|BB~e#BR7|+Vnsz zWO8CdfLhX3C0!S9qn38{Hiw?gc9%cy4rd4`mt1REA({oeGAZINgPT0J%> z6jm0w3pV#I&YC}lDaOSPIx3#H4wNsYISDL}Z_w({)VC|tJ{2&udNrr{;4Np2JDf5& z^0haT!v$#AKjUJRQw*wosf-oUcPrAz)8{oo@9Vst=efH3s%a&Qg<6&c#7*s=b4irU z@3+}VG&~XYLMxkVOq@5(9Pu=B+w zlTX39VKDV|KPb#gVFeB1c*28^s;$hruMYU+jJitTa|C+@&9>btcw60KDCSv>c}uL@ zvS zn5dXhw91xp#ZnA)FXCjg+|F4Rnw;g#q}X_0DYA=OauOhnFpYD3-MvK^lw;e9b56~q z3PG^LsLA@Hp)BChM#F!SjgmB^RZ@m!+=AJJ z$fnlz)~sxYlNmYr@kOkoW7zTCx=E?I%ige`dTWI?r#Lx)=k!MpR|c0qQ znjj{JzKNch05ipl*H=iVz2H)AjjAT|ENz8-m9arXgbc&LSF>^x|IKW7+#MESl@VQ5)g+mRu=V!rz!?QF7Y507ovu7VNpbvYDk1}Th z`kpeA7>NY*^3Z2%_um5=&xFP_pcevwQ|e!^ISi6fI_qe-=1mX%T|TNVj{B-!NOyH} z=@s^iM$^29@H|}fFIPYBy8}eg+X)l$*X?(vXi4yS;mKsFmThvx-0I<6U^4Z0!Zb3O zrCv?vHT+`jHPVcw_ES)v_ALI{2aF z1y!r&5W`27SjS2iPdQnsVZa> zRVAnHi21-tmzL}ZPTEuth+rMpopO`?zVYMA4MpPejxrmhXB%aGPyC1|s`G;JfKIckmf$GLw_tMYkuI<8$R#-Y-x z_1U#JU-sk5`TSyB$iwNxU2st6-b7{^sxJh1~xpMQIJj-*> z$F2SV*X{m2*p{A+h-(FZBWUpV!us=Dxtba&|FTSd7y*G(aOA!-Ps0;*C;f~|7HLT( z+C1j5O9&ka3*>4OD(mH|ADmX7mOQYsZq827^ewCf6*<^YPHU`lL=gGKTTtxWg#=D= z6fZb#6A|EU-UfHy)a}WrpL)Ely(^YgmE^-WU>(eGB*1y6*O(r=&s9rhdzp~7;r!|U5tTI83(mUOLXGyfSMGcZ+>9TC_>21h!+u8+}`-) zsXp5E9~b1=Gm}Xd@I?E;i!wU6{sK;)6&!5s9GMO6?0(V`T&VnS%>}HvbfrN#aLuKS z@(fM!c!~}S+WY{q{tc0vief=5I18*|l$XVa;NFGQzC zMlSa92iWT-=&TRipR|^_~y2bjZ20A=D)vGV?xFjl$>vHB1PNE%!e@F}!H zKK4*n&}$=}d7mY*7=0($ns!SP+8@MXocsNw8UejEBDWY$^JkE=cwKo7?NJ?M+9FdT zH^38X;i}lK)i~fzA`6B;F@i?R3{vaH=7mD+vZvSOXKm-T!{`SZ33eN2OD;XhbGEdo zLSjw>(b#N?d$?vw2(%wWASYKPrG~f8vloryTh}wsGJ*nGSam*-e0D#mxCTV6Lu#xr*^CSB-5Q{#Zl*OIEPn!0m$)$R>~lxm|un)o&En$F}M`X!Vj-vt6i}Sr#{ZMVlM_Y_QB>LJ;c`r^2 zcmI`I!qFa%9ahM76SNF(Jyv5t2LblDW?ZeJ60y@bf?Y_CA7(yhGBmV)6ONO`6XR|S z1CY)tZ&7Z?zOtV802J%ZW<)jPOgvRFv9>#E5j36UIk-<(80en zNHnw3X_Z9+1;>IirS^KT*JH^^T(scQ15H-f!bWF_$|0BtdGd{>D@e~d&h9XPpw;2! z68viP@YpK%*wwfl){*{zx!`PhR4yJD zY}?tcA%3!@WTmW|Jov!I%sj~OaFF-S31cxcj6yn&!H%e)NscWsD+?%&+4X`B(OZkk zXs0{T{rygS(HQ6ZlQ>6&?dATD+ zBom*o)qY@=*mIthI8=dzFSPi4g`r$lhgWP}0DAn2RZI429nCd%F&PVLGKB@>$p|*T z&q{G4TXbO)MCh3((wp|IHb6<(osp1;1tf&oebz%C@!-SbU}GjoZ`z(~O?2RojGNoLz|)|!7P6`7w^510Fl|3%&JBdoNpre%OkY-E~_m6|_Y znQY^A_?B1e7>Bx|TozN3V@By=fvb4->$LKF6WOP#oq5Rp|>dnIdPR* zbA6m5t=h3zFiofTF^=5$EAe~q@xz8>?)|KiZp0MzSmJ&+xs;B zTje&G8pNu3d~cm)x86nQavzXgQwt}@lAh7{J%n*XY)Z5tWUs9+p`E>4hQ`q*OfQ(} zO#^hP^9b$pDd@H#kTq~=)HC>+sZ0yh)jWr4qpi#Sd(I0n0mk4f~z7_B@BA>AJ8I8j1xCMO4BrjwnaW?E= zIJbZBEt>{-a$Z}-WFtSN8ovGi54gJCu+VLTcx_XEh z!DHz-heki9kW2oTZ~~^~M|5BCoT}?V7M6dgmY?VURGjSCV5gVh#eZ2uiBPnIT%wF( zvRXtbsbatjI&q+L+%<`NEEI)>EX8LFBi<9qSm*of16>!mwDA#|JTFc>m6m_PJG#)x zG75fUFHe*IX>1<`}0!RIXh=in_pM-QB!TA(Mwjm=-ZB-n) zUCA?@HoB{IQpydzV^68y-QDRRM>Ef%f}i{O)Y){!)5+t7jq`o^F#ef<;0FGAdnxWJ z1J|-OT#hx8?*7GCMq^jwB}ILd`Dt|IP!Qz&)9Le!)xZXy;c(XldrCnTOhdUv{hkkJ zqKtJG39(UzRk9Xs`E-k?*T?>W@pxTWgYbiqSsC{5+N zJ@qe*tecibpiWpTi%XY}(gu+lgIR_OVC&OCFB?VykDBo2UH6tA`(yZCIx7}OjQ&?p zM7M4$#J z4aWKuIA6Wp=4Z{Pe_}Q4Rg-62t5pz96Pw;OiXShO`t(IGN=@oy5(pVpUCm!P(LEWV zRqE?mZ^>;hfbk^nplp4-KJ5E1*A4;s3Y-f5^RX*%r@ys-IE1Aj^LGJ%KN#{WIt#oF z{>w3u-+_PME&mnR4KAqtzxK|5m-PGI>0h#*!Dq|V{ty29_SEkp zelG?7C87pgA^G2c>6eWAclhrWmA~L6;2p9*;D4*H{Eq)U%l`|n2CfSHf&VS%|6Ri0 zQ|G_%0DveS0PuSv{X6>a$;_|l6M|pRf2KCS!+#Gj{}PZ&{HON*6>ciXz<}xT^AHje N00d5+oT-2Q`X59z5V-&V literal 0 HcmV?d00001 diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index c545a898df45..1267eac0c742 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -92,6 +92,7 @@ public: void testInk(); void testN779834(); void testN779627(); + void testN779941(); void testFdo55187(); void testN780563(); void testN780853(); @@ -136,6 +137,7 @@ public: CPPUNIT_TEST(testInk); CPPUNIT_TEST(testN779834); CPPUNIT_TEST(testN779627); + CPPUNIT_TEST(testN779941); CPPUNIT_TEST(testFdo55187); CPPUNIT_TEST(testN780563); CPPUNIT_TEST(testN780853); @@ -1006,6 +1008,29 @@ void Test::testN782345() CPPUNIT_ASSERT_EQUAL(style::BreakType_PAGE_BEFORE, getProperty(getParagraph(2), "BreakType")); } +void Test::testN779941() +{ + /* + * Make sure top/bottom margins of tables are set to 0 (problem was: bottom margin set to 0.35cm) + */ + load("n779941.docx"); + uno::Reference xTablesSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference xTables(xTablesSupplier->getTextTables( ), uno::UNO_QUERY); + uno::Reference xTableProperties(xTables->getByIndex(0), uno::UNO_QUERY); + { + uno::Any aValue = xTableProperties->getPropertyValue("TopMargin"); + sal_Int32 nTopMargin; + aValue >>= nTopMargin; + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), nTopMargin); + } + { + uno::Any aValue = xTableProperties->getPropertyValue("BottomMargin"); + sal_Int32 nBottomMargin; + aValue >>= nBottomMargin; + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), nBottomMargin); + } +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index dce337d40ea0..e710a1366084 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx @@ -391,6 +391,11 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo m_aTableProperties->Insert( PROP_TABLE_BORDER_DISTANCES, false, uno::makeAny( aDistances ) ); + // Set table above/bottom spacing to 0. + // TODO: handle 'Around' text wrapping mode + m_aTableProperties->Insert( PropertyIds::PROP_TOP_MARGIN, true, uno::makeAny( 0 ) ); + m_aTableProperties->Insert( PropertyIds::PROP_BOTTOM_MARGIN, true, uno::makeAny( 0 ) ); + //table border settings table::TableBorder aTableBorder; table::BorderLine2 aBorderLine; From 3cb619bd15a6017f253891f4c377fc790d8aae82 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Thu, 27 Sep 2012 10:15:58 +0200 Subject: [PATCH 147/863] docx import: properly import table position This a follow up of commit 53b7f7df0617bcbd7bbef9a34ef53e5097eb16dc Change-Id: Ia0f79ca24418636af14162e9f339237d847dc221 Reviewed-on: https://gerrit.libreoffice.org/714 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna --- .../dmapper/DomainMapperTableHandler.cxx | 27 ++++++++----------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index e710a1366084..26901057157f 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx @@ -398,7 +398,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo //table border settings table::TableBorder aTableBorder; - table::BorderLine2 aBorderLine; + table::BorderLine2 aBorderLine, aLeftBorder; if (lcl_extractTableBorderProperty(m_aTableProperties, PROP_TOP_BORDER, rInfo, aBorderLine)) { @@ -410,10 +410,11 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo aTableBorder.BottomLine = aBorderLine; aTableBorder.IsBottomLineValid = sal_True; } - if (lcl_extractTableBorderProperty(m_aTableProperties, PROP_LEFT_BORDER, rInfo, aBorderLine)) + if (lcl_extractTableBorderProperty(m_aTableProperties, PROP_LEFT_BORDER, rInfo, aLeftBorder)) { - aTableBorder.LeftLine = aBorderLine; + aTableBorder.LeftLine = aLeftBorder; aTableBorder.IsLeftLineValid = sal_True; + rInfo.nLeftBorderDistance += aLeftBorder.LineWidth * 0.5; } if (lcl_extractTableBorderProperty(m_aTableProperties, PROP_RIGHT_BORDER, rInfo, aBorderLine)) { @@ -440,23 +441,17 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo lcl_debug_TableBorder(aTableBorder); #endif - // Mimic Office behavior : if tlbInd is defined, use it place table. - // Otherwise, top-level table's position depends w:tblCellMar attribute (but not nested tables) - if (nLeftMargin) + // Table position in Office is computed in 2 different ways : + // - top level tables: the goal is to have in-cell text starting at table indent pos (tblInd), + // so table's position depends on table's cells margin + // - nested tables: the goal is to have left-most border starting at table_indent pos + if (rInfo.nNestLevel > 1) { - m_aTableProperties->Insert( PROP_LEFT_MARGIN, false, uno::makeAny( nLeftMargin - nGapHalf)); + m_aTableProperties->Insert( PROP_LEFT_MARGIN, false, uno::makeAny( nLeftMargin - nGapHalf )); } else { - // TODO: top-level position depends on w:tblCellMar attribute, not w:cellMar - if (rInfo.nNestLevel > 1) - { - m_aTableProperties->Insert( PROP_LEFT_MARGIN, false, uno::makeAny( - nGapHalf)); - } - else - { - m_aTableProperties->Insert( PROP_LEFT_MARGIN, false, uno::makeAny( - nGapHalf - rInfo.nLeftBorderDistance)); - } + m_aTableProperties->Insert( PROP_LEFT_MARGIN, false, uno::makeAny( nLeftMargin - nGapHalf - rInfo.nLeftBorderDistance )); } m_aTableProperties->getValue( TablePropertyMap::TABLE_WIDTH, nTableWidth ); From 2cf0f5fe6244e1a98f82a1aca77b32c029c73e27 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Thu, 27 Sep 2012 14:44:41 +0200 Subject: [PATCH 148/863] docx import: add table position unit test Change-Id: I21aa721e20be4b7f9984bf6910a94a7b7bf09c7a Reviewed-on: https://gerrit.libreoffice.org/715 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna --- sw/qa/extras/ooxmlimport/data/n779957.docx | Bin 0 -> 13789 bytes sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 46 +++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 sw/qa/extras/ooxmlimport/data/n779957.docx diff --git a/sw/qa/extras/ooxmlimport/data/n779957.docx b/sw/qa/extras/ooxmlimport/data/n779957.docx new file mode 100644 index 0000000000000000000000000000000000000000..4347854442c911830752490e9a931dcc1b219042 GIT binary patch literal 13789 zcmeHug(&B z?cDI)dr91|Q3-3LVmqV}ss8cUUbhnfMFn@}Cvr&7VZJf&#-0IwR<{(rTFHDpksYNG z6gG%}Z%5yptQ7$m+bY&|Tbp1mY%JoOhF^BF2gIWp+iH!fI@G9h7}7C=W$ydTHuSfv z#owd@J?m7EYhgn#G$Rjp>w23{vkEWhL#@dDywI~*?`9w3EH$UNekKuSSZ_6Y*HCi) zOwYd31SdDI887Dh@+OPuRSX&N2>tww&gL7&$%Y2)kT-IQu!kox{!Yb@;^w8w6OT|- z+G2Huu9pyJt%KILrxMzIkK^5{$I+f4yPWvy7lwUs(XXs=Qf(OIGaV2c`j3{bc4i4W zvt|k%?lO=4uZ1VyLdq-N;q$==(^_dttVVGqH2O}RqEwu`7yG(B$+PNq2L}MWzCr+0 z{^GgB$@nc-py8+la!dq}=Nh?~+qtqZ|Jwi8WB(7k>A(H;xRg~n2ryuFfLTHkDPw{p;`J%3pz@z#IQp=*fZwp{2vTq{6A zro)Ks@B1ho+Q4EZ42ofY_YpsV3_fzuna>aa03iSt%+t}ujO8DWV&?eH-5wO^enq%{ zISm*n%z>`{zr9tZDk_Ju{$rY-ZO7C!h+qDM!?j#lbFs#xZWZ?4Z3yM16RQD!tPqA- z(IUHRdQP@ow|n93H8^p6Lr95pA9>x_-Vk<(ke#D4vrZVLJu`!)SRHm!b;C~40+B{a z9~q-!sH#jot+wpEzH>rFn6BwDew~T5fRQ|W35yrSLMmerON!a3zeuQg=!8`&!amPE zU2L;G#z>&0Ky`eGZCS2u9cRcUti+ZDE_(?}5ag=o_U7naYu|Rz8~ZfR1J1#*g{RaP zu})mWIEp5$&7y)!DO;8K;n%h7OBocexVU?gqJxo6F}I(X0em#MeF(vhK3bO!ie-dT z-`!@WW;IVMa)-5S<+kmVqP3R3z51kg?i+@o2OyXa^J!${GtmyT{2l~_qHq~v&PwSj0>%_k5OAf8@4ZaL1d zf6K*_7`=nAGn(*Zx~8b!Qd6P6;B>Jik7>gakOCcY>)v30kUed%1?4xpC?fQ&amtM; zJth}wD?a_YHe8R`#FRMQQu zQ1kDoLse0sUBDWVXlN)N9vHVe74kL7P=#mJ!Ob(CqRk{@@w*O3k0!te>QnE?Mo7K* zk+#+14L%0P%;^_rxXX1&m~=T118?BF-|Q*gZ1S79F2$s5!hgnp=XF>>tKre}%;fn~ zFQ&9!Da%eeNrJ4Onw;@!f+||O2Z6mktJFq6D$4)qksGa{6_p10rpRMB4?!0ILF{cZQw2GvKNZ~H`a(G z$fSdX0ja&(#yWSuG6cpWzwA-tp{c;Tlkihws`h( zmg}jZH1i4^ug_&=P;32bmQBiQ2RxJNYBmKT@3W603!t;C(Vg_I8=162FJ-8(o`*)X z68eq{DZ?&`^Z~I7c-x*pNMd@4@z)SNS5|0zMP^f04xp^+TGvjluJH=B*{NUrZ8(;E z1nIZDxC!Z5bfLLsP0ga7qPkCnQh~4+h#I4_5&p8KaiNsyDB#8H$xplS+CJ;)oNVJL9SJzy>ofhlHiHQ zPV-6yKsdux4Ry*U{v2CvQd$hVq;DX-B}#)CB@+xpzgIp~Cah151hVqqP zo~)0bBM4!XYgFue;f_`y>nOnjY=q=m5%u-U71uMS4ZsI)I#jUGpmqXYl?3s$=0+uz!KrPto=V zxvOudVKFKzD_oKuR4z9S*lCTc{bDU)p*;1X0+^T@?4DWQ8T?I3fL<*I`Z%r=)Yj{t zrj%`G1r-*}UwKM_Fi@4YGi*c5{`w0|8~)>8lX4?z4-*R=<~zk%RU+dS3%?J-S|d^c z;S-AHHqnfo-Q2FvI-m8xda;{^vz%RA`2~C9TlG-rIZ+L zr*?Y0vxObH$P?&vRp9Nu|1ici+7CbHH(r!p~#N3OMdR?|M*ew>k*K70d35D5TGYfZd+)0;!odltc6d!)m5a4YbB z0~$B6kX$7VIS5Tn{f-Ivqo>!|4IeAzUZB4yFtE1Iae0zt{eiduZa55o)N}877GdAr zRHdHZ`w5;moMmm&^=aOE9oQH6y~?+AN@g3bV>42xeAIZI`^R}6{0Eovu~L_~!8d%_ z4~TN3T>&;KKe@5rXhx)F6&DmNi3w$Zw^R-EOT*S}J+g-Bwqii9b)ys`sCf|iz+T49 z0(F&sI>S!v<)tCLfMWmOnE~rJak_G70HBxv0Kod!tnFrHZg0-=$DZvMFF4jwc3kDg z>_%DgBz1FqN8^DH;~ukA4`fm#7;uOrwvK+kq*5q4E9+0NvJ(W>-)0htwPYV@q8E(4 zRPxBV%x_0DQ(GskmNKYqn8LjjQ!Px1e!uhhN=)*xa`AK+kqDiPPI<-f*=16k^1@p* zweI8_@eND0w+wv_WadR!V<%nmdQ<%EMtjWSTM5$;V}J5R=hfIWxy6k4#VGyShWm7~ z#tsvbaabKOPIRbuum?kS)}J-?3}V<61=BWhN7nHZKPu0tq+WBoYzslxMyL4nSeoX` zVpxXvLc_SnC#f%+gAy=oo%*tzNbascUwT#Wwt!r+qaST{) zvlDZwv-65^(qOH=C8%c5gYt(kwjo|T`q|d$BQ_1FI}0tyrUwza;W zKQmM>M8xvsM}65fMy@7WIkTKc7|Conk-Nk1S+v3PiwLozEtGG-y^>&xX~NyuDMSGv znQ4E4{AevVv=m8uy6r_t`xWt=zqbTWV0Zj8*(8Fj(Tqk@CyF{E9$V4v;r(rGu88C? zN-mMe-H*Gi{v8+*-8WMe_BmmDZ&|vZkEe%8ibQe)t}egeEO_Y*y*~8QbU!_LbD_>! zQcuOQriW1TAoOPk*%4M`LNcVSPia4|VFovCOjoV&34VdpMmCMnZ+ zd$Z-Co^xXeuP5m&vOEd-_y?LciNN-X;Jy4^rqR4mqoWJ4ay$!{z)oGJ`1Lh(O{A~r zv%Gm_`)u}2)rL;q`DqWf$6^e3cgn)MbD+peUpPn*vfbh;VIs@E!JKt{3QB@MIaNDc za?f}Okr&oHV3s6OU{GW)rl85Th;6n;49L>_f%xKK*We4|&RaR_6HC}8GXg(BA4Y<{ zpLxNbOG~JgOt_tyjuZe0AwErI9FR!%Gt5Q$@t!uor zJ{B{ESmR4aFdqv=%bgfcpR;Z_(F`U1JCP(9)I!`7=eJNBdkzr?p63us*lmx*bOi5A<&ZGl%QS~M@7wz(X*C?ix3=MV(#CL%L~4>A z?U|N=b-r)+CT^nNbi#Um67>8Gd$4Nsq2-)%nIZ}GN^ib>`>BT4_w|0egEo()i*mYx z71Qcl?2^=KZ&bQ29WsDdF5uvNhxBO7phkN zo3tr*pLuF+7}BG9>ayAW1h874jR)?~>8Htwa9N!?j2hVj_WNWcB#!iOfIKG+!>bF% zgpVq`hDK3?Z2c$b-t$^nFb_8a`Js2)m7f~qDONmgxEM6! zd^2R_31?U3wS~{pI!D-?_N3IoUY-+di*(1h4*8}Pj~0S&X7Gh?$aT#~%sHEkKb<_wKb>hqp&cMP#= zb4t*yk&!*a+=$ToS#*0GAi0m+7BrLJc@;#9Es1IveTs*fg_=c9$anq}%ALtcXS-76 zKC3y-bA)i}hR{V5S4|}l+dXZ4T*&9T%=g(Vd1#99cxfepiIdCg#w@09hF4?+cQ|v} zY>!39&kcpJ6KVsIT0s^=;rxS~@j(F$H45oHlXQdI4htx7{XMj)>@r3~gM!`>XodHG zZb)3s-Q27lEM0$vwMI?7UtukPr0&)Dz&n9*BfG*GemJ-V`+{F%d3>EVx;gqhLVPUd z@yJ&uMm4lm?2D-~`LyRL&*9;7(Pj|^RDYU2^}Xc#xbmvE{ks8KPrluFM${DVqU~U{ zQkYXQxJDn3HUirZ;l-;ZxjEio&0-cBQp4D~CzqBAtB6g6&uWmjs*^?yG90UmZ5Ax- z=)x&7R^nRTq$z!}OTM<5XSWu^?u@B7=Atd~_!^CA)AEk%L_`%lV89`%e% zd|DBTTsFiUwGDg@zxO5 z`(o<6PL=DlLj(nPe7iCwteEdvB1pLeFK=EHn#8frw4os1WYvS^;1n_oAD4iuIonk* z=TR*#sT!rB7uC#Q+Az+tXH7Lwx{Hc?7Vq8UYLvXi*GYgp=^kZ<@Z2(G)g(j8 zk2?#dLl~8`sYJy_?VZ$DIb9XOORhsl^Tnm)Ah;tczd-)E0`>8kBU-X((L{)*vyEyS zs}L20V@b6xpa#umQO}Zp+;=3p97SWK!5KcLlju1lexpw;ZdAa;>Uu<)KIs<(;*Nd5 zJ{D78pKOKgkKUX?OYhZc!oH0)SfbD^Io2Gr=|u>jfc;L8lLLEa zjVak5*Ht1=``!`m7^YJQCZ}W@Gth5#k2FJG6a%3air){8S^+M-jK`h*B0*$^AJGoWXTBB;rP@S!T!*Eq~=N0s+sJS^Bs4TlJC zE0rQO+{x$bP>fK#u$f_q;0p23&@8N2b||I3`#N1-6rmlm-K8-dR_}J_c(I0a3qFsy zS}z!FqrDagIn2k=T#WD8@ivI;vFTyTmiR@jrW>?m`***^$;Va#2Q5EUf!>(^qNJYY zrt1IZx^XkTau95&(3|a>0*s$qmea{UxwVk0U66-70IWSc2qw(>6l|)L9akzy4SmKb zvl6ocKR<{Xbwb1z&3v>ltb`9K=?(v=UdwW{9A811#fqy8#@_^^TKRHmnzf1uw3PYy zlvY72rrY>or4&=Ide8wZeuC}|Z6XC*wuW3TCw{={U=~#z_2>92=98aq4U8%sBc@fY z2tR}id=dytN_fuh#YqmaGe{$0$}2M8CS%t@rF+a5@wU>xGtV9rf&E~Pjz8DISfq^c z1LExp@WJa%Eq&ujKW5bAPzI!HgNlE2qN&S)u!*AIcp8*8NlpB1S|0J4e8H>PS|G?O zf4A95P>HW9Xr3z*1px5>WiwYdZ##2WEo(O`Nec_}cW!@7dh>enuB*I=U1t+7F!84! zPbd|ev)Vpz`-qK%>5qDw{8!zBcs?Jo1zdyf-wAqQp#A+Fc7w`uuu1m=`G6-8~W;DYH*Z zD{~q9$eHlie<*XSh+2mzY}d(twBn2%a1@aJhzM~Qj&#imJ6{` zB6BKnnsK<@%>7{uvQCpfRx(-S%kl{&_Hv@459ErvYI#YF#s#3Q%rYHc=$1#vMHSy| z7m=MD=WG6@GF5U@$5OB@)y9D_#(1&lfGjmdofyr%ZiyZb@&Yt-4MXbb4WBcP^n&m0 zkK@Mh@A{Zn=5xC=gh}aOqQ<^8EQ{;r_^TXzYXdZ&)#ltZXa@g z$fL$B+39e1&x%x9u*oC-eCQSoU#XDcB3LcIUlF=ef zYE0txju3a!&~GDi5DWMwgR~sbb7-^mseZdhu}1@8eCb@HM)+_u5)lVVF!M1AipR00 z%R2|iNTnHgOi+_$3{mM#ijrP==al|*Snd< zJYIq!)`v=0c8=l8Sh8WXrrfn$BYVD9A=WwQgP$*z?$#Ou8Z2dv1@?zcnY6p(w8lgFDpv4)*_@IT(jDjS;P!1!GWa*?wgQaA?0B}|)Gj(I= zhwd)C$DY3^M8?aCoqxw|R>+Ah%Dg(zk15aT-KU0d|9A<~MSghmeS`5l?n1=-=@q>t z1F2ePi2euFZ#4)g9^s{XHz6O~8GUZ$w4X`dCfL@s0Q1~iXUlRh`x_EEjx}FoBWy6V zyssDOvMcq55UKPkzT~%DJS|CZYhICfi*!BP&(|J81UU)ifhO=wnZj$Sbx!ec zZ3qSC=UTK&CxER-Y@T1&Z=zbabkJ27I-B2#*H7UQgs(k}SY@I=4lqqU_4F>ANbFg& z2x2_B$?n|qo2>_*36b$Va3nCeJ}XER;7yEiN$;7a`h0C=MMIP>Ey-{-dLtke7s(|I zJyVA~0>J+Yk0(lW|E2T0vrsZJdj}tT-BROm8*V94R@U_L#Bq=plW}pE>{6h+hNCBQ z<0Ca#I8naG24#L-(cFP~jU#%U)DaM}Dxu~JQ4xQcOOEO7B!AK>9I7CGWCxt+P7)88 z72zc{0Ey--An9TR7&N#KJ^axf^vxDSPVED7xzai$DL0RHGeaOp#RIX;^6Q=l%jz_T}3P*5kAOT_7*HIu~ zpcDp1gT@gYwX1I{;=^wI+t<}mU{D{j3a|r?_V|DkcEMf^PWu?ZRY&NJQFo4|#Ga;| zxkgwvMCKSG{Xbg&@dI1C-%!|zL02uUZSpq#p|22cKEF3c(9&96YDYb8pnx}q$`Y7O zDi6puAD|2Pb197LA?ABreyQ$M1hf1-i!6HFRhG z54`Kmpu=57fT?T0(&Z5T{mHJPs0mED;yNUzhZ}y_;V<(ct3Zsa5`o$NGOCFwGRR1% zT`mArO*9&XKjHs(a{vh@`1E*L@Gf zKfD+v$Rw^vMA-65!6O70h>gUQ@|Zm|`}_qO;*CX3B_UW})(itKEd8)gTwT^xFphJ1 zMMwN=3zO;=2Wg=(0lhYaCICa#H-8M`>=Y55*wYc*Gbct`yqN+oJ!|jB-3jqn*X=>v zzF|9pE4p9eq?elC8NT;jOuWsiDDKpo)Cb0}Bqj<0Q)rT!6jZ?uma+yr*8aS{ijeOa z>@mV{gfa|nE6+BRTH*fuKvNjIa^1ti8Rr(i2$+E{DF*PQM2AC5@;efqxs*UJx`xYE zZ%euCso+$rMD^KR_Y)bYLpjgYeV1M=n24`#8SmNd29!|qh2+6@+>It03E!g#*DR_C za2VGCs7wl1AqfUc=j3r)13XOg+~NthyVb^n`_(<`eK(Ubv}#TAaik^`6<0dmR8Gu$ z@}XSWp04IK8;cg;OCwImZk?1i5mOrM9f|e952=aY7sNm<+A_S{nrt__ z9ge>S(qC2-U*f#}Mu6%Zx?-r&NgE=xruSN4+{(arDKLRiKA~`$6x{_~YL2YiF@8 zpYa~uTr1(mbVG*6qON(8eFOWY?%9#rZA{Jje&6sc7+Xbkrr! zZj+=*;NlSY3g^7jE>DxtPAjk8CI?TXP4LnLmiRj_Zt~7HO4q%WaK~-TM`L7C6L~u= z3p-b=HWdop3}8_|AFW$aDqF|m!M#1ru&b)i&#s8w>$ILR>Rd=mKc$$;D2782i&C?} z2$cwX8je3k{zR`2*_D*rw{~u)=Fpv@B|F0sR^RdGhWm+ooHxWbc_qK2(-Sd}5g6?M zA4i>{H!;F23;@t91OTA?mHz%3bMrt&^;H>ADp#-RRjfpStr-qkBL|brq=23Tvj0@) z{g4-Z$`HdS*yT}6nKXWwne4asE=%e&!`E{h->#ZT=NvagqzbOoDL-mltPyqdyAh#1 z(kER!uXVO}@_Oy?Tkj7B<5Xx*e4|NjJKK1^A6|`|JPZov6^eiQ+&=Yb@`qL0 zgDsl(4~8Z*HbMQ5l$Y$S3a8S^8Ba?N$bMM%9SY3mv<+oncF)h3CMPK|8El$Ty6(!K z>?yYqhZE7!LL{-uY(L8)*rH(CqR_)}M_)>2_Z1h-EX4}q>2d57Wf#aiM9VGE`$DDS z;U!9~U?P%`Y%8lC@FxfQxRX>4=tb0dq3lrH5>@HvKP8&(+4nOpWQ@9}80~A_O^3%c z%zN|xR5KdW(^g|em92C4#x9!;r|FY#XwdKxAgTGOCy;k%t@-Ij40@Kx+Vlaz?&Z4g zvp^Q6=Ts96%W1fwpV68g6$}oKx$=HZ6v`>~!&mgy2A%e$F0l9j?PW%NO-(`oOL{$%=K$`9={G}$2DNuH9y4jZ=4a^KnR#RPFNtvlfP5jOWM zu)Ak>n(4uYz;g5D0>Uc7!k#+!T1c4eso(biHEv^zwIn@+?DB+da zlIr?MvqN3!I<(h!nqc_1X>A?zyo-k0-)Pn?P7eBX-P;uzaaPTxT(S1t0_*k7qGQek zv>+=Q*4un-FUzbNZq(q6WQpWOetf=ed8iz|XGj*KIc$>cTFE)@H?xFmM;0=wdW#!1 z@EI$Sx-jm-D7}Hz2=BwxPsAfj@9wFbL40`!n&VcJFF>unrB_CE{m`$IZfmUR%sa)n z#5}v^4HqorNvq}B_iwe=+@cQKD_ybq0cmuZF1>l+D>QeGF$f!7 z32cLb>M=Ks%I6!HH9{xv0vd-isyRuvGBhI_J1veoeQVyNS2df|!|?B!46XNKivhuX zG4viOlQZi*&k^q3ru;|({=qw^`Nw|oPTJPx16LE65^~>nLvc%B6?N2znj+QaK}&_c z6ajM2JZuhZqUp^W*&kNDSL(o3LS!~(Hd^S9ULtZit%%cIu=?}l)wX7=<{~~wm+ak} z9THItJ;Reg%-4dmi$2SdLChzSOl}A^Q_qq;$5Mn2zBkt!WIY)f6MV!!9|?d%wcw2N z!Vv9`;sN`k@jTd0z@FoUp>1bhm#vHK2o7ts^;F>~W`02(w6tP8&-@BhRlS{&dt_;W zh~fzb@k4_S&@Z`V4*>sQohl|eA1Uf0&>X?7a6uw}X_R++d5TA1ID*GkBWbFSZz}@o z_j*IdK*ucxLi;7U_12@nb}tOtW5B{7@R#1?Ek_oK zVm%BGw1b>s1quIZs03b|Mj+CxLt^U@RF%FT1OiOQL!r`t9c}xSE`}!WR)0allryhG zf;cjkSQEcAh;nL}=v+|Ou^Rcr@_>ca9wTf|{L=c5-5;v|?;6)PnUs0$5Z|9{D}t!E z296^*h{?v}>w@5Z^?TJkn)WZ7hD9&yb-J^r`cgNQM2VDoNeES^ey4jc;tT!&+jP+Yx+P;L?uTO!H%i?3}}QMRa_s zlvk&wS}Zi_^k_^ks7~?}9zW!=nOI2s_P!@}Nh5t@=(T0?<2eVavoX6Y^?ee0HnAphlBifU_CUP9nY1p8ShZ_)ChXQ^^X%UvAJpx)w0ua<(w5%L>X z?6&zmvM@WmY;2CZEqY|*h#AVLS6hn^JVBo!OhFMGle@wGh(-nbY$K#WdJg5`NNq5N z()aY^8uNm}y%5_6pjFx=WOK`jl3WSb+<{dqI`o5c8=b3KIW6R43E!-g{VH2=dKIm< zWgZ}chpVxbyZcAJP-O)eu!n~0{LWM0>HGeZ(8O`y@?5+b?I4PR-nTFWkwnC~;)(mC z^Mckkd;`TJ1jvcUgQpSVhKBw@+^Pqy3%;|vSUx4~%2xrIMy`ub)(H5RF&+{|d6)qX z?vSeNIxV1jlw{v{=1ce5Ui1|;2xpyv5CL0`r?ck>V70p8%j+C9OS8tqsR$^z|9$mK z)<6G4KZqCDj`)bKN{70)O?<&)yz@F>iJQ_XD) z7R_@&%@HT|OSGUvgTF7e2R<{s1VREPm8GCGN8Z$Pe_&BV=XHKgwXEkInBuG(u?WTVvY?-)y>gN1U578Oc)+8fx_!2Cp=haTJM1jwFHp z8lDu3A4|e_{&ua>Bwqu(X|NCZYZY}MZmww)x$LN|TH$$XP8xWm91Y3Y1PxSbXsBeK z7gcwxaC!dp64v)(I({0;-1Ow6=XC#@X*>rJQnfk)O6Pb%X!fhvsJjCKI7885ubi7< z#rLgawW}_|r>{!8r>^9q-~Gtt9a!<7AkZO#B}_?Obhx{uwmAu^a+W$$qhxy|{Amc@ z$rxXNsuTX+<&R7Xp-Z4HUj!w1Q2+ft!^Fwyzqc76ANc2%qdxAi%8J^7b07lSHhhU- zZ!&`j4kL+d|E@>QWnG0KnpP5hcPQ%dr-58Od5h57vgOE#{^gR^fD;9e0o103RX;Z1 zcRbxadV8S#i%LM}LyBc`kEU_XpnX7JrqOsJ$$&6#Vld}W9G%_TK2!1rrlbaw2dbrh zv;IeegCJf+#jQhKh7R|`5^?!K7vWcpO@@N%y0%LS6Jb_|gzN6&bah!HKSt$TD0x-W z??|X)B(e!;gPEu$6s#quDm9upBoy_L&_()Drhx6yaQZPW8fZ!nCP>g)Dr=Br~oa_a8pd$bT}`C~mBf)HW? z61ow!R1=39BxjT|d-bZt(Kn~&PRp4oq0r3w6-UZZw_F=(FJvBUSgW?U#Y(#hn_fdC zRRW9Nbu_|$5_ad)cboE_K##r2{_$P2L*?w1P?*7foq(>)*J5(y4l3;n(P_UkIOkyx zm{jDwZ}mu;-*dYWtc!>vJ?U|dmUFrT!l(EQ=PtlTH$eUR4{rbiX9A^1{`2!I|LXmJ z9sk4AEGqJU1^8 #include #include +#include +#include + #include @@ -93,6 +96,7 @@ public: void testN779834(); void testN779627(); void testN779941(); + void testN779957(); void testFdo55187(); void testN780563(); void testN780853(); @@ -138,6 +142,7 @@ public: CPPUNIT_TEST(testN779834); CPPUNIT_TEST(testN779627); CPPUNIT_TEST(testN779941); + CPPUNIT_TEST(testN779957); CPPUNIT_TEST(testFdo55187); CPPUNIT_TEST(testN780563); CPPUNIT_TEST(testN780853); @@ -1031,6 +1036,47 @@ void Test::testN779941() } } +void Test::testN779957() +{ + /* + * n779957.docx contains 4 tables. This test verifies their X position. + * We compare cursor position in LibreOffice to table indentation in Office, because it's + * where text starts in tables. + */ + sal_Int32 xCoordsFromOffice[] = { 2500, -1000, 0, 0 }; + sal_Int32 cellLeftMarginFromOffice[] = { 250, 100, 0, 0 }; + + load("n779957.docx"); + uno::Reference xTablesSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference xModel(mxComponent, uno::UNO_QUERY); + uno::Reference xTables(xTablesSupplier->getTextTables( ), uno::UNO_QUERY); + + for (int i=0; i<4; i++) { + uno::Reference xTable1 (xTables->getByIndex(i), uno::UNO_QUERY); + // Verify X coord + uno::Reference xCtrl(xModel->getCurrentController(), uno::UNO_QUERY); + xCtrl->select(uno::makeAny(xTable1)); + uno::Reference xTextViewCursorSupplier(xCtrl, uno::UNO_QUERY); + uno::Reference xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY); + awt::Point pos = xCursor->getPosition(); + CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Incorrect X coord computed from docx", + xCoordsFromOffice[i], pos.X, 1); + + // Verify left margin of 1st cell : + // * Office left margins are measured relative to the right of the border + // * LO left spacing is measured from the center of the border + uno::Reference xCell = xTable1->getCellByName("A1"); + uno::Reference< beans::XPropertySet > xPropSet(xCell, uno::UNO_QUERY_THROW); + sal_Int32 aLeftMargin = -1; + xPropSet->getPropertyValue("LeftBorderDistance") >>= aLeftMargin; + uno::Any aLeftBorder = xPropSet->getPropertyValue("LeftBorder"); + table::BorderLine2 aLeftBorderLine; + aLeftBorder >>= aLeftBorderLine; + CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Incorrect left spacing computed from docx cell margin", + cellLeftMarginFromOffice[i], aLeftMargin - 0.5 * aLeftBorderLine.LineWidth, 1); + } +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); From e40a86ca748ff7cd742250f1fb989eeeeb4d80b3 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 2 Oct 2012 10:37:33 +0300 Subject: [PATCH 149/863] Use prefix Change-Id: Id6ef3325df8dc8d193a7745370134ef47792893a --- forms/source/misc/services.cxx | 2 +- forms/util/frm.component | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/forms/source/misc/services.cxx b/forms/source/misc/services.cxx index 9f1785fab7dd..de7cf7907e2f 100644 --- a/forms/source/misc/services.cxx +++ b/forms/source/misc/services.cxx @@ -319,7 +319,7 @@ void SAL_CALL createRegistryInfo_FORMS() } //--------------------------------------------------------------------------------------- -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* _pImplName, XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL frm_component_getFactory(const sal_Char* _pImplName, XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/) { if (!_pServiceManager || !_pImplName) return NULL; diff --git a/forms/util/frm.component b/forms/util/frm.component index c727e805940a..fcb705097604 100644 --- a/forms/util/frm.component +++ b/forms/util/frm.component @@ -26,7 +26,7 @@ * **********************************************************************--> - From 4b6111cf6a6bcc8e3e7064871fea687aa7798299 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 2 Oct 2012 10:46:53 +0300 Subject: [PATCH 150/863] Use prefix Change-Id: Ifbe8796e3af2e7544cf7d47bacb0632d36202433 --- fpicker/source/aqua/FPentry.mm | 2 +- fpicker/source/aqua/fps_aqua.component | 2 +- fpicker/source/generic/fpicker.component | 2 +- fpicker/source/generic/fpicker.cxx | 2 +- fpicker/source/office/fps_office.component | 2 +- fpicker/source/office/fps_office.cxx | 2 +- fpicker/source/win32/filepicker/FPentry.cxx | 2 +- fpicker/source/win32/fps.component | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fpicker/source/aqua/FPentry.mm b/fpicker/source/aqua/FPentry.mm index f3fee99419ac..d51486838819 100644 --- a/fpicker/source/aqua/FPentry.mm +++ b/fpicker/source/aqua/FPentry.mm @@ -53,7 +53,7 @@ static Reference< XInterface > SAL_CALL createFolderInstance( extern "C" { -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void* SAL_CALL fps_aqua_component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) { void* pRet = 0; diff --git a/fpicker/source/aqua/fps_aqua.component b/fpicker/source/aqua/fps_aqua.component index f0e2f47b8ae3..7ad2926b62df 100644 --- a/fpicker/source/aqua/fps_aqua.component +++ b/fpicker/source/aqua/fps_aqua.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/fpicker/source/generic/fpicker.component b/fpicker/source/generic/fpicker.component index b87a2c8be085..7aee017dc99a 100644 --- a/fpicker/source/generic/fpicker.component +++ b/fpicker/source/generic/fpicker.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx index 1222025a3786..4c4dd9a57847 100644 --- a/fpicker/source/generic/fpicker.cxx +++ b/fpicker/source/generic/fpicker.cxx @@ -225,7 +225,7 @@ static cppu::ImplementationEntry g_entries[] = */ extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory ( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL fpicker_component_getFactory ( const sal_Char * pImplementationName, void * pServiceManager, void * pRegistryKey) { return cppu::component_getFactoryHelper ( diff --git a/fpicker/source/office/fps_office.component b/fpicker/source/office/fps_office.component index ebce7f2e13b5..335a63a6f7a9 100644 --- a/fpicker/source/office/fps_office.component +++ b/fpicker/source/office/fps_office.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/fpicker/source/office/fps_office.cxx b/fpicker/source/office/fps_office.cxx index 77a9e207e047..e38d25f06322 100644 --- a/fpicker/source/office/fps_office.cxx +++ b/fpicker/source/office/fps_office.cxx @@ -44,7 +44,7 @@ static cppu::ImplementationEntry g_entries[] = extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL fps_office_component_getFactory( const sal_Char * pImplementationName, void * pServiceManager, void * pRegistryKey) { return cppu::component_getFactoryHelper ( diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx index 532edcfbf086..f09938ddec51 100644 --- a/fpicker/source/win32/filepicker/FPentry.cxx +++ b/fpicker/source/win32/filepicker/FPentry.cxx @@ -89,7 +89,7 @@ createInstance_fop( const Reference< XMultiServiceFactory >& rServiceManager ) extern "C" { -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void* SAL_CALL fps_win32_component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* ) { void* pRet = 0; diff --git a/fpicker/source/win32/fps.component b/fpicker/source/win32/fps.component index 1a2e7f2ad9a2..1dc9d4f3abf9 100644 --- a/fpicker/source/win32/fps.component +++ b/fpicker/source/win32/fps.component @@ -16,7 +16,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - From 3cba672351b2736e35fcaba1b4b465da5b4ecc9a Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 2 Oct 2012 11:19:05 +0300 Subject: [PATCH 151/863] Use prefix Change-Id: I84ec9d6eed209eb429f5b5d4a667d3450a1435e1 --- io/source/TextInputStream/TextInputStream.cxx | 2 +- io/source/TextInputStream/textinstream.component | 2 +- io/source/TextOutputStream/TextOutputStream.cxx | 2 +- io/source/TextOutputStream/textoutstream.component | 2 +- io/source/acceptor/acceptor.component | 2 +- io/source/acceptor/acceptor.cxx | 2 +- io/source/connector/connector.component | 2 +- io/source/connector/connector.cxx | 2 +- io/source/stm/factreg.cxx | 2 +- io/source/stm/streams.component | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx index 8015c3be27bd..5e87cf6c1d51 100644 --- a/io/source/TextInputStream/TextInputStream.cxx +++ b/io/source/TextInputStream/TextInputStream.cxx @@ -493,7 +493,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) } //================================================================================================== -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL textinstream_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); diff --git a/io/source/TextInputStream/textinstream.component b/io/source/TextInputStream/textinstream.component index 8c021499bb9f..5d543a1a458c 100644 --- a/io/source/TextInputStream/textinstream.component +++ b/io/source/TextInputStream/textinstream.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx index da32f3457459..beabc010bc68 100644 --- a/io/source/TextOutputStream/TextOutputStream.cxx +++ b/io/source/TextOutputStream/TextOutputStream.cxx @@ -292,7 +292,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) } //================================================================================================== -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL textoutstream_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); diff --git a/io/source/TextOutputStream/textoutstream.component b/io/source/TextOutputStream/textoutstream.component index f498f5a74a80..807489cfa36c 100644 --- a/io/source/TextOutputStream/textoutstream.component +++ b/io/source/TextOutputStream/textoutstream.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/io/source/acceptor/acceptor.component b/io/source/acceptor/acceptor.component index 1fcb6ab7fecb..0b4877bc7b67 100644 --- a/io/source/acceptor/acceptor.component +++ b/io/source/acceptor/acceptor.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx index d3efe3be0b72..eb94ca532395 100644 --- a/io/source/acceptor/acceptor.cxx +++ b/io/source/acceptor/acceptor.cxx @@ -339,7 +339,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) } //================================================================================================== -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL acceptor_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); diff --git a/io/source/connector/connector.component b/io/source/connector/connector.component index 13f05134bda0..3e60b1802ca1 100644 --- a/io/source/connector/connector.component +++ b/io/source/connector/connector.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx index 72401cda6e6d..9ba335ba637e 100644 --- a/io/source/connector/connector.cxx +++ b/io/source/connector/connector.cxx @@ -250,7 +250,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) } //================================================================================================== -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL connector_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); diff --git a/io/source/stm/factreg.cxx b/io/source/stm/factreg.cxx index 35111fa5e09f..ccd4eac14662 100644 --- a/io/source/stm/factreg.cxx +++ b/io/source/stm/factreg.cxx @@ -94,7 +94,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) } //================================================================================================== -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL streams_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); diff --git a/io/source/stm/streams.component b/io/source/stm/streams.component index 1469ef13aca2..7de1ebb6ba2b 100644 --- a/io/source/stm/streams.component +++ b/io/source/stm/streams.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - From 9751056ba806ba9614392f3c70ada3cbd1251814 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Thu, 27 Sep 2012 17:00:08 +0200 Subject: [PATCH 152/863] docx export: export default table cell margins, based on 1st cell Change-Id: I1a697c2a60c7979774242fb6c9b0f66baa3bb72e Reviewed-on: https://gerrit.libreoffice.org/716 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna --- sw/source/filter/ww8/docxattributeoutput.cxx | 145 ++++++++++++++----- sw/source/filter/ww8/docxattributeoutput.hxx | 4 + 2 files changed, 115 insertions(+), 34 deletions(-) diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 29aafd2eb3c6..cf6f43eaa796 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -1460,7 +1460,7 @@ static void impl_borderLine( FSHelperPtr pSerializer, sal_Int32 elementToken, co pSerializer->singleElementNS( XML_w, elementToken, xAttrs ); } -static void impl_pageBorders( FSHelperPtr pSerializer, const SvxBoxItem& rBox, bool bUseStartEnd = false ) +static void impl_pageBorders( FSHelperPtr pSerializer, const SvxBoxItem& rBox, sal_Int32 tag, bool bUseStartEnd = false, bool bWriteTag = true, const SvxBoxItem* pDefaultBorders = 0) { static const sal_uInt16 aBorders[] = { @@ -1474,12 +1474,91 @@ static void impl_pageBorders( FSHelperPtr pSerializer, const SvxBoxItem& rBox, b XML_bottom, bUseStartEnd ? XML_end : XML_right }; + bool tagWritten = false; const sal_uInt16* pBrd = aBorders; for( int i = 0; i < 4; ++i, ++pBrd ) { const SvxBorderLine* pLn = rBox.GetLine( *pBrd ); if ( pLn ) + { + if ( pDefaultBorders ) + { + const SvxBorderLine* pRefLn = pDefaultBorders->GetLine( *pBrd ); + + // If border is equal to default border: do not output + if ( pRefLn && *pLn == *pRefLn) { + continue; + } + } + + if (!tagWritten && bWriteTag) { + pSerializer->startElementNS( XML_w, tag, FSEND ); + tagWritten = true; + } + impl_borderLine( pSerializer, aXmlElements[i], pLn, 0 ); + + // When exporting default borders, we need to export these 2 attr + if ( pDefaultBorders == 0 ) { + if ( i == 2 ) + impl_borderLine( pSerializer, XML_insideH, pLn, 0 ); + else if ( i == 3 ) + impl_borderLine( pSerializer, XML_insideV, pLn, 0 ); + } + } + } + if (tagWritten && bWriteTag) { + pSerializer->endElementNS( XML_w, tag ); + } +} + +static void impl_cellMargins( FSHelperPtr pSerializer, const SvxBoxItem& rBox, sal_Int32 tag, bool bUseStartEnd = false, const SvxBoxItem* pDefaultMargins = 0) +{ + static const sal_uInt16 aBorders[] = + { + BOX_LINE_TOP, BOX_LINE_LEFT, BOX_LINE_BOTTOM, BOX_LINE_RIGHT + }; + + const sal_Int32 aXmlElements[] = + { + XML_top, + bUseStartEnd ? XML_start : XML_left, + XML_bottom, + bUseStartEnd ? XML_end : XML_right + }; + bool tagWritten = false; + const sal_uInt16* pBrd = aBorders; + for( int i = 0; i < 4; ++i, ++pBrd ) + { + sal_Int32 nDist = sal_Int32( rBox.GetDistance( *pBrd ) ); + + if ( aBorders[i] == BOX_LINE_LEFT ) { + // Office's cell margin is measured from the right of the border. + // While LO's cell spacing is measured from the center of the border. + // So we add half left-border width to tblIndent value + const SvxBorderLine* pLn = rBox.GetLine( *pBrd ); + if (pLn) + nDist -= pLn->GetWidth() * 0.5; + } + + if (pDefaultMargins) + { + // Skip output if cell margin == table default margin + if (sal_Int32( pDefaultMargins->GetDistance( *pBrd ) ) == nDist) + continue; + } + + if (!tagWritten) { + pSerializer->startElementNS( XML_w, tag, FSEND ); + tagWritten = true; + } + pSerializer->singleElementNS( XML_w, aXmlElements[i], + FSNS( XML_w, XML_w ), OString::valueOf( nDist ).getStr( ), + FSNS( XML_w, XML_type ), "dxa", + FSEND ); + } + if (tagWritten) { + pSerializer->endElementNS( XML_w, tag ); } } @@ -1526,41 +1605,20 @@ void DocxAttributeOutput::TableCellProperties( ww8::WW8TableNodeInfoInner::Point FSEND ); } - // The cell borders - m_pSerializer->startElementNS( XML_w, XML_tcBorders, FSEND ); - SwFrmFmt *pFmt = pTblBox->GetFrmFmt( ); - impl_pageBorders( m_pSerializer, pFmt->GetBox( ), !bEcma ); - m_pSerializer->endElementNS( XML_w, XML_tcBorders ); + const SvxBoxItem& rBox = pTblBox->GetFrmFmt( )->GetBox( ); + const SvxBoxItem& rDefaultBox = (*tableFirstCells.rbegin())->getTableBox( )->GetFrmFmt( )->GetBox( ); + { + // The cell borders + impl_pageBorders( m_pSerializer, rBox, XML_tcBorders, !bEcma, true, &rDefaultBox ); + } TableBackgrounds( pTableTextNodeInfoInner ); - // Cell margins - m_pSerializer->startElementNS( XML_w, XML_tcMar, FSEND ); - const SvxBoxItem& rBox = pFmt->GetBox( ); - static const sal_uInt16 aBorders[] = { - BOX_LINE_TOP, BOX_LINE_LEFT, BOX_LINE_BOTTOM, BOX_LINE_RIGHT - }; - - const sal_Int32 aXmlElements[] = - { - XML_top, - bEcma ? XML_left : XML_start, - XML_bottom, - bEcma ? XML_right : XML_end - }; - const sal_uInt16* pBrd = aBorders; - for( int i = 0; i < 4; ++i, ++pBrd ) - { - sal_Int32 nDist = sal_Int32( rBox.GetDistance( *pBrd ) ); - m_pSerializer->singleElementNS( XML_w, aXmlElements[i], - FSNS( XML_w, XML_w ), OString::valueOf( nDist ).getStr( ), - FSNS( XML_w, XML_type ), "dxa", - FSEND ); + // Cell margins + impl_cellMargins( m_pSerializer, rBox, XML_tcMar, !bEcma, &rDefaultBox ); } - m_pSerializer->endElementNS( XML_w, XML_tcMar ); - TableVerticalCell( pTableTextNodeInfoInner ); m_pSerializer->endElementNS( XML_w, XML_tcPr ); @@ -1590,6 +1648,8 @@ void DocxAttributeOutput::StartTable( ww8::WW8TableNodeInfoInner::Pointer_t pTab { m_pSerializer->startElementNS( XML_w, XML_tbl, FSEND ); + tableFirstCells.push_back(pTableTextNodeInfoInner); + InitTableHelper( pTableTextNodeInfoInner ); TableDefinition( pTableTextNodeInfoInner ); } @@ -1601,6 +1661,8 @@ void DocxAttributeOutput::EndTable() if ( m_nTableDepth > 0 ) --m_nTableDepth; + tableFirstCells.pop_back(); + // We closed the table; if it is a nested table, the cell that contains it // still continues m_bTableCellOpen = true; @@ -1745,6 +1807,10 @@ void DocxAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t // Output the table borders TableDefaultBorders( pTableTextNodeInfoInner ); + + // Output the default cell margins + TableDefaultCellMargins( pTableTextNodeInfoInner, nIndent ); + TableBidi( pTableTextNodeInfoInner ); // Table indent @@ -1783,9 +1849,20 @@ void DocxAttributeOutput::TableDefaultBorders( ww8::WW8TableNodeInfoInner::Point bool bEcma = GetExport().GetFilter().getVersion( ) == oox::core::ECMA_DIALECT; // the defaults of the table are taken from the top-left cell - m_pSerializer->startElementNS( XML_w, XML_tblBorders, FSEND ); - impl_pageBorders( m_pSerializer, pFrmFmt->GetBox( ), !bEcma ); - m_pSerializer->endElementNS( XML_w, XML_tblBorders ); + impl_pageBorders( m_pSerializer, pFrmFmt->GetBox( ), XML_tblBorders, !bEcma, true ); +} + +void DocxAttributeOutput::TableDefaultCellMargins( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner, sal_Int32& tblIndent ) +{ + const SwTableBox * pTabBox = pTableTextNodeInfoInner->getTableBox(); + const SwFrmFmt * pFrmFmt = pTabBox->GetFrmFmt(); + const SvxBoxItem& rBox = pFrmFmt->GetBox( ); + const bool bEcma = GetExport().GetFilter().getVersion( ) == oox::core::ECMA_DIALECT; + + impl_cellMargins(m_pSerializer, rBox, XML_tblCellMar, !bEcma); + + // add table cell left margin to tblIndent + tblIndent += sal_Int32( rBox.GetDistance( BOX_LINE_LEFT ) ); } void DocxAttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) @@ -4350,7 +4427,7 @@ void DocxAttributeOutput::FormatBox( const SvxBoxItem& rBox ) m_pSerializer->startElementNS( XML_w, XML_pBdr, FSEND ); } - impl_pageBorders( m_pSerializer, rBox ); + impl_pageBorders( m_pSerializer, rBox, false, false ); if ( m_bOpenedSectPr ) { diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index 8ab41d4692bd..bae6944cdb85 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -148,6 +148,7 @@ public: virtual void TableInfoRow( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); virtual void TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); virtual void TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); + virtual void TableDefaultCellMargins( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner, sal_Int32& tblIndent ); virtual void TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); virtual void TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); virtual void TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); @@ -613,6 +614,9 @@ private: int m_anchorId; int m_nextFontId; + // Remember first cell (used for for default borders/margins) of each table + std::vector tableFirstCells; + public: DocxAttributeOutput( DocxExport &rExport, ::sax_fastparser::FSHelperPtr pSerializer, oox::drawingml::DrawingML* pDrawingML ); From 9a5eb5f51d29b3af4e2d23653508196cc68c0b87 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Thu, 27 Sep 2012 17:00:37 +0200 Subject: [PATCH 153/863] docx export: add unit test for 9751056 Change-Id: I25aa07d3e1811fdf4ab0124e14794e70d7de82ec --- sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 49 ++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index c3d7fc4eed2a..6f8689a52e73 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -30,6 +30,13 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include #include @@ -55,6 +62,7 @@ public: void testMathRad(); void testMathSubscripts(); void testMathVerticalStacks(); + void testTablePosition(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) && !defined(WNT) @@ -77,6 +85,7 @@ public: CPPUNIT_TEST(testMathRad); CPPUNIT_TEST(testMathSubscripts); CPPUNIT_TEST(testMathVerticalStacks); + CPPUNIT_TEST(testTablePosition); #endif CPPUNIT_TEST_SUITE_END(); @@ -348,6 +357,46 @@ void Test::testMathVerticalStacks() // CHECK_FORMULA( "binom {a} {binom {b} {c}}", getFormula( getRun( getParagraph( 4 ), 1 ))); } +void Test::testTablePosition() +{ + // This is the reverse test of n779957 from ooxmlimport + // We want to verify that a full round-trip does not break formatting + // Of course if import code is wrong, this tests will fail regardless of export code. + roundtrip( "../../ooxmlimport/data/n779957.docx" ); + + sal_Int32 xCoordsFromOffice[] = { 2500, -1000, 0, 0 }; + sal_Int32 cellLeftMarginFromOffice[] = { 250, 100, 0, 0 }; + + uno::Reference xTablesSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference xModel(mxComponent, uno::UNO_QUERY); + uno::Reference xTables(xTablesSupplier->getTextTables( ), uno::UNO_QUERY); + + for (int i=0; i<4; i++) { + uno::Reference xTable1 (xTables->getByIndex(i), uno::UNO_QUERY); + // Verify X coord + uno::Reference xCtrl(xModel->getCurrentController(), uno::UNO_QUERY); + xCtrl->select(uno::makeAny(xTable1)); + uno::Reference xTextViewCursorSupplier(xCtrl, uno::UNO_QUERY); + uno::Reference xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY); + awt::Point pos = xCursor->getPosition(); + CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Incorrect X coord computed from docx", + xCoordsFromOffice[i], pos.X, 1); + + // Verify left margin of 1st cell : + // * Office left margins are measured relative to the right of the border + // * LO left spacing is measured from the center of the border + uno::Reference xCell = xTable1->getCellByName("A1"); + uno::Reference< beans::XPropertySet > xPropSet(xCell, uno::UNO_QUERY_THROW); + sal_Int32 aLeftMargin = -1; + xPropSet->getPropertyValue("LeftBorderDistance") >>= aLeftMargin; + uno::Any aLeftBorder = xPropSet->getPropertyValue("LeftBorder"); + table::BorderLine2 aLeftBorderLine; + aLeftBorder >>= aLeftBorderLine; + CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Incorrect left spacing computed from docx cell margin", + cellLeftMarginFromOffice[i], aLeftMargin - 0.5 * aLeftBorderLine.LineWidth, 1); + } +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); From 559a1a5d28d94e915150f94d5267a4f720d175b0 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Fri, 28 Sep 2012 09:58:44 +0200 Subject: [PATCH 154/863] docx export: always write tblInd attribute (even when equal to 0) Otherwise when opening the docx in Office table may get misplaced. Change-Id: Ic1df8d941c72a224d2db189ededfc5e134e5683a Reviewed-on: https://gerrit.libreoffice.org/718 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna --- sw/source/filter/ww8/docxattributeoutput.cxx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index cf6f43eaa796..bce14c8a391d 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -1813,12 +1813,11 @@ void DocxAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t TableBidi( pTableTextNodeInfoInner ); - // Table indent - if ( nIndent != 0 ) - m_pSerializer->singleElementNS( XML_w, XML_tblInd, - FSNS( XML_w, XML_w ), OString::valueOf( nIndent ).getStr( ), - FSNS( XML_w, XML_type ), "dxa", - FSEND ); + // Table indent (need to get written even if == 0) + m_pSerializer->singleElementNS( XML_w, XML_tblInd, + FSNS( XML_w, XML_w ), OString::valueOf( nIndent ).getStr( ), + FSNS( XML_w, XML_type ), "dxa", + FSEND ); // Merge the marks for the ordered elements m_pSerializer->mergeTopMarks( ); From 303b86bc23d4bac5379ad0924ab93d482467ff13 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 2 Oct 2012 11:33:11 +0300 Subject: [PATCH 155/863] Use prefix Change-Id: Iee586539871acee78a32d13141dd446feb43efdb --- .../source/spellcheck/macosxspell/MacOSXSpell.component | 2 +- lingucomponent/source/spellcheck/macosxspell/macreg.mm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component b/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component index 2f2f9e102087..9bc92671fe53 100644 --- a/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component +++ b/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/lingucomponent/source/spellcheck/macosxspell/macreg.mm b/lingucomponent/source/spellcheck/macosxspell/macreg.mm index 9020aceb8f61..6e438bb9e202 100644 --- a/lingucomponent/source/spellcheck/macosxspell/macreg.mm +++ b/lingucomponent/source/spellcheck/macosxspell/macreg.mm @@ -52,7 +52,7 @@ extern void * SAL_CALL MacSpellChecker_getFactory( extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL MacOSXSpell_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { void * pRet = NULL; From e6150aa67e98d8de7cd3b83d17df12a8f9678c7d Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 2 Oct 2012 11:37:05 +0300 Subject: [PATCH 156/863] Use prefix Change-Id: Ibc446d8616bad00ce71c273e46517e80527e2f0e --- pyuno/source/loader/pythonloader.component | 2 +- pyuno/source/loader/pyuno_loader.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyuno/source/loader/pythonloader.component b/pyuno/source/loader/pythonloader.component index 0abab7fc4fd1..1dc51f44722d 100644 --- a/pyuno/source/loader/pythonloader.component +++ b/pyuno/source/loader/pythonloader.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx index 34176ebadab2..3e7a250d687a 100644 --- a/pyuno/source/loader/pyuno_loader.cxx +++ b/pyuno/source/loader/pyuno_loader.cxx @@ -252,7 +252,7 @@ static struct cppu::ImplementationEntry g_entries[] = extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL pythonloader_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); From ae53e3e9fc0e0f878e7911732a5dd918a9bec597 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 2 Oct 2012 11:38:39 +0300 Subject: [PATCH 157/863] Use prefix Change-Id: Ifa5ea2dd818043b6b5442e580bff51d1e2cb93e1 --- remotebridges/source/unourl_resolver/unourl_resolver.cxx | 4 ++-- remotebridges/source/unourl_resolver/uuresolver.component | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/remotebridges/source/unourl_resolver/unourl_resolver.cxx b/remotebridges/source/unourl_resolver/unourl_resolver.cxx index a44d0b481320..a5577bea4de9 100644 --- a/remotebridges/source/unourl_resolver/unourl_resolver.cxx +++ b/remotebridges/source/unourl_resolver/unourl_resolver.cxx @@ -194,13 +194,13 @@ static struct ImplementationEntry g_entries[] = extern "C" { -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) +SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL uuresolver_component_canUnload( TimeValue *pTime ) { return g_moduleCount.canUnload( &g_moduleCount , pTime ); } //================================================================================================== -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL uuresolver_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); diff --git a/remotebridges/source/unourl_resolver/uuresolver.component b/remotebridges/source/unourl_resolver/uuresolver.component index 4cfb40e09739..5131b8a61760 100644 --- a/remotebridges/source/unourl_resolver/uuresolver.component +++ b/remotebridges/source/unourl_resolver/uuresolver.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - From 1b075ea2cbeef67bf556cade80f2fcf8130be571 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 2 Oct 2012 11:45:11 +0300 Subject: [PATCH 158/863] Use prefix Change-Id: I0323e3eb9446c4f2b18f84f5ed33909a877163c8 --- scripting/source/basprov/basprov.component | 2 +- scripting/source/basprov/basprov.cxx | 2 +- scripting/source/dlgprov/dlgprov.component | 2 +- scripting/source/dlgprov/dlgprov.cxx | 2 +- scripting/source/protocolhandler/protocolhandler.component | 2 +- scripting/source/protocolhandler/scripthandler.cxx | 2 +- scripting/source/provider/MasterScriptProvider.cxx | 2 +- scripting/source/stringresource/stringresource.component | 2 +- scripting/source/stringresource/stringresource.cxx | 2 +- scripting/source/vbaevents/service.cxx | 2 +- scripting/source/vbaevents/vbaevents.component | 2 +- scripting/util/scriptframe.component | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/scripting/source/basprov/basprov.component b/scripting/source/basprov/basprov.component index 5268cfe6f30a..09ed542c4e69 100644 --- a/scripting/source/basprov/basprov.component +++ b/scripting/source/basprov/basprov.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx index 06675e8ca975..bf4a449e1a13 100644 --- a/scripting/source/basprov/basprov.cxx +++ b/scripting/source/basprov/basprov.cxx @@ -586,7 +586,7 @@ namespace basprov extern "C" { - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( + SAL_DLLPUBLIC_EXPORT void * SAL_CALL basprov_component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) { diff --git a/scripting/source/dlgprov/dlgprov.component b/scripting/source/dlgprov/dlgprov.component index dffc48edf897..66dd111fe0d5 100644 --- a/scripting/source/dlgprov/dlgprov.component +++ b/scripting/source/dlgprov/dlgprov.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx index 862e21a6ffce..2c55c323fa8e 100644 --- a/scripting/source/dlgprov/dlgprov.cxx +++ b/scripting/source/dlgprov/dlgprov.cxx @@ -876,7 +876,7 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); extern "C" { - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( + SAL_DLLPUBLIC_EXPORT void * SAL_CALL dlgprov_component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) { diff --git a/scripting/source/protocolhandler/protocolhandler.component b/scripting/source/protocolhandler/protocolhandler.component index 5bfe9d9ff09c..95c6b503997f 100644 --- a/scripting/source/protocolhandler/protocolhandler.component +++ b/scripting/source/protocolhandler/protocolhandler.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx index 1881c917c4ae..4151a56c4179 100644 --- a/scripting/source/protocolhandler/scripthandler.cxx +++ b/scripting/source/protocolhandler/scripthandler.cxx @@ -497,7 +497,7 @@ extern "C" namespace css = ::com::sun::star; - SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImplementationName , + SAL_DLLPUBLIC_EXPORT void* SAL_CALL protocolhandler_component_getFactory( const sal_Char * pImplementationName , void * pServiceManager , void * pRegistryKey ) { diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx index f0623c0fa89f..ff034699700d 100644 --- a/scripting/source/provider/MasterScriptProvider.cxx +++ b/scripting/source/provider/MasterScriptProvider.cxx @@ -959,7 +959,7 @@ extern "C" * data * @return a component factory */ - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( + SAL_DLLPUBLIC_EXPORT void * SAL_CALL scriptframe_component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) diff --git a/scripting/source/stringresource/stringresource.component b/scripting/source/stringresource/stringresource.component index eb2e9ac9f976..5407300240cb 100644 --- a/scripting/source/stringresource/stringresource.component +++ b/scripting/source/stringresource/stringresource.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index 7af39bd9dc75..338883dbf7e5 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -3050,7 +3050,7 @@ static struct ::cppu::ImplementationEntry s_component_entries [] = extern "C" { - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( + SAL_DLLPUBLIC_EXPORT void * SAL_CALL stringresource_component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) { diff --git a/scripting/source/vbaevents/service.cxx b/scripting/source/vbaevents/service.cxx index 1f6bbc813437..11b51d0189dd 100644 --- a/scripting/source/vbaevents/service.cxx +++ b/scripting/source/vbaevents/service.cxx @@ -90,7 +90,7 @@ namespace ooevtdescgen extern "C" { - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( + SAL_DLLPUBLIC_EXPORT void * SAL_CALL vbaevents_component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) { diff --git a/scripting/source/vbaevents/vbaevents.component b/scripting/source/vbaevents/vbaevents.component index 78b17a30edbe..ea456583bc7c 100644 --- a/scripting/source/vbaevents/vbaevents.component +++ b/scripting/source/vbaevents/vbaevents.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/scripting/util/scriptframe.component b/scripting/util/scriptframe.component index 959f9fcccbaa..09f874e0a46c 100644 --- a/scripting/util/scriptframe.component +++ b/scripting/util/scriptframe.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - From 671746f57cd3337ba49a0be512080dd5b69e3d40 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 2 Oct 2012 11:45:48 +0300 Subject: [PATCH 159/863] Use prefix Change-Id: Id1ac9a800b58595771be22097d77d3a7c5a8862c --- oox/source/core/services.cxx | 2 +- oox/util/oox.component | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/oox/source/core/services.cxx b/oox/source/core/services.cxx index 16d1e5f05f40..aec65592db88 100644 --- a/oox/source/core/services.cxx +++ b/oox/source/core/services.cxx @@ -65,7 +65,7 @@ static ::cppu::ImplementationEntry const spServices[] = } // namespace -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const char* pImplName, void* pServiceManager, void* pRegistryKey ) +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL oox_component_getFactory( const char* pImplName, void* pServiceManager, void* pRegistryKey ) { return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, spServices ); } diff --git a/oox/util/oox.component b/oox/util/oox.component index 0c3157fedc04..54f4655fe259 100644 --- a/oox/util/oox.component +++ b/oox/util/oox.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - From 1a28e705322463f2ed25acace19c8edc33466eeb Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 2 Oct 2012 12:04:00 +0300 Subject: [PATCH 160/863] Revert "As far as I can see the PptImporter library is not a UNO component" I don't trust myself. This reverts commit 2726f7f4ca5cde91565203ef055561558ea66e7d. --- filter/Library_PptImporter.mk | 1 + .../msfilter/powerpoint/pptimporteruno.cxx | 63 +++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 filter/source/msfilter/powerpoint/pptimporteruno.cxx diff --git a/filter/Library_PptImporter.mk b/filter/Library_PptImporter.mk index 8fee1bd1eca9..f1d172aeda4f 100644 --- a/filter/Library_PptImporter.mk +++ b/filter/Library_PptImporter.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Library_use_libraries,PptImporter,\ $(eval $(call gb_Library_add_exception_objects,PptImporter,\ filter/source/msfilter/powerpoint/pptimporter \ + filter/source/msfilter/powerpoint/pptimporteruno \ filter/source/msfilter/powerpoint/ppttoxml \ )) diff --git a/filter/source/msfilter/powerpoint/pptimporteruno.cxx b/filter/source/msfilter/powerpoint/pptimporteruno.cxx new file mode 100644 index 000000000000..be0b49ebfad5 --- /dev/null +++ b/filter/source/msfilter/powerpoint/pptimporteruno.cxx @@ -0,0 +1,63 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + + +#include "pptimporter.hxx" + +#include +#include + +static REF( NMSP_UNO::XInterface ) SAL_CALL create_PptImporter( const REF( NMSP_LANG::XMultiServiceFactory )& rxFact ) +{ + return REF( NMSP_UNO::XInterface )( *new PptImporter( rxFact ) ); +} + +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ ) +{ + REF( NMSP_LANG::XSingleServiceFactory ) xFactory; + void* pRet = 0; + + if( rtl_str_compare( pImplName, "com.sun.star.presentation.PptImporter" ) == 0 ) + { + const NMSP_RTL::OUString aServiceName( B2UCONST( "com.sun.star.presentation.PptImporter" ) ); + + xFactory = REF( NMSP_LANG::XSingleServiceFactory )( NMSP_CPPU::createSingleFactory( + reinterpret_cast< NMSP_LANG::XMultiServiceFactory* >( pServiceManager ), + B2UCONST( "com.sun.star.presentation.PptImporter" ), + create_PptImporter, SEQ( NMSP_RTL::OUString )( &aServiceName, 1 ) ) ); + } + if( xFactory.is() ) + { + xFactory->acquire(); + pRet = xFactory.get(); + } + + return pRet; +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ From f4901ad51b62db9faa2328f07cb6cf4b03a8ff1a Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 2 Oct 2012 11:53:55 +0300 Subject: [PATCH 161/863] Use prefix Change-Id: I80de62d3afd461bc51a33d427794c86c4a6bc32c --- sdext/source/minimizer/minimizer.component | 3 ++- sdext/source/minimizer/pppoptimizeruno.cxx | 2 +- sdext/source/pdfimport/pdfimport.component | 3 ++- sdext/source/pdfimport/services.cxx | 2 +- sdext/source/presenter/PresenterComponent.cxx | 4 ++-- sdext/source/presenter/presenter.component | 3 ++- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/sdext/source/minimizer/minimizer.component b/sdext/source/minimizer/minimizer.component index 8a90fd22c5dc..a0111a35f0f6 100644 --- a/sdext/source/minimizer/minimizer.component +++ b/sdext/source/minimizer/minimizer.component @@ -1,6 +1,7 @@ + loader="com.sun.star.loader.SharedLibrary" + prefix="pptminimizer"> diff --git a/sdext/source/minimizer/pppoptimizeruno.cxx b/sdext/source/minimizer/pppoptimizeruno.cxx index 515baf3648f9..5de73c7d0553 100644 --- a/sdext/source/minimizer/pppoptimizeruno.cxx +++ b/sdext/source/minimizer/pppoptimizeruno.cxx @@ -42,7 +42,7 @@ using namespace ::com::sun::star::registry; extern "C" { - SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( + SAL_DLLPUBLIC_EXPORT void* SAL_CALL pptminimizer_component_getFactory( const sal_Char * pImplName, void * pServiceManager, SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ ) { diff --git a/sdext/source/pdfimport/pdfimport.component b/sdext/source/pdfimport/pdfimport.component index 1392302f358a..548af84cb4f4 100644 --- a/sdext/source/pdfimport/pdfimport.component +++ b/sdext/source/pdfimport/pdfimport.component @@ -1,6 +1,7 @@ + loader="com.sun.star.loader.SharedLibrary" + prefix="pdfimport"> diff --git a/sdext/source/pdfimport/services.cxx b/sdext/source/pdfimport/services.cxx index 7e4da4b2132c..1bafab0a9ae7 100644 --- a/sdext/source/pdfimport/services.cxx +++ b/sdext/source/pdfimport/services.cxx @@ -119,7 +119,7 @@ namespace } } -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL pdfimport_component_getFactory( const sal_Char* pImplementationName, SAL_UNUSED_PARAMETER void* /*pServiceManager*/, SAL_UNUSED_PARAMETER void* /*pRegistryKey*/ ) diff --git a/sdext/source/presenter/PresenterComponent.cxx b/sdext/source/presenter/PresenterComponent.cxx index 8032fb03c27a..4a5180d310a6 100644 --- a/sdext/source/presenter/PresenterComponent.cxx +++ b/sdext/source/presenter/PresenterComponent.cxx @@ -100,12 +100,12 @@ static struct ImplementationEntry gServiceEntries[] = extern "C" { - SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) + SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL presenter_component_canUnload( TimeValue *pTime ) { return g_moduleCount.canUnload( &g_moduleCount , pTime ); } - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( + SAL_DLLPUBLIC_EXPORT void * SAL_CALL presenter_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , gServiceEntries); diff --git a/sdext/source/presenter/presenter.component b/sdext/source/presenter/presenter.component index 4dfd7cc403e4..a61807b2329a 100644 --- a/sdext/source/presenter/presenter.component +++ b/sdext/source/presenter/presenter.component @@ -1,6 +1,7 @@ + loader="com.sun.star.loader.SharedLibrary" + prefix="presenter"> From 565acfef761e37a0172154aae0bdace1ce3c6666 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 2 Oct 2012 12:04:10 +0300 Subject: [PATCH 162/863] Use prefix Change-Id: Ife93e37f8b24f3ce96b55c5a221f0f929b789f60 --- shell/source/backends/gconfbe/gconfbackend.cxx | 2 +- shell/source/backends/gconfbe/gconfbe1.component | 2 +- shell/source/backends/kde4be/kde4backend.cxx | 2 +- shell/source/backends/kde4be/kde4be1.component | 2 +- shell/source/backends/kdebe/kdebackend.cxx | 2 +- shell/source/backends/kdebe/kdebe1.component | 2 +- shell/source/backends/macbe/macbe1.component | 2 +- shell/source/backends/macbe/macbecdef.cxx | 2 +- shell/source/backends/wininetbe/wininetbe1.component | 2 +- shell/source/backends/wininetbe/wininetbecdef.cxx | 2 +- shell/source/cmdmail/cmdmail.component | 2 +- shell/source/cmdmail/cmdmailentry.cxx | 2 +- shell/source/unix/exec/shellexecentry.cxx | 2 +- shell/source/unix/exec/syssh.component | 2 +- shell/source/win32/SysShentry.cxx | 2 +- shell/source/win32/simplemail/smplmail.component | 2 +- shell/source/win32/simplemail/smplmailentry.cxx | 2 +- shell/source/win32/syssh.component | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx b/shell/source/backends/gconfbe/gconfbackend.cxx index 82ea9fe0721b..263fa7de7454 100644 --- a/shell/source/backends/gconfbe/gconfbackend.cxx +++ b/shell/source/backends/gconfbe/gconfbackend.cxx @@ -217,7 +217,7 @@ static cppu::ImplementationEntry const services[] = { } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL gconfbe1_component_getFactory( char const * pImplName, void * pServiceManager, void * pRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/shell/source/backends/gconfbe/gconfbe1.component b/shell/source/backends/gconfbe/gconfbe1.component index 7638e05b544a..b48806c827fc 100644 --- a/shell/source/backends/gconfbe/gconfbe1.component +++ b/shell/source/backends/gconfbe/gconfbe1.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/shell/source/backends/kde4be/kde4backend.cxx b/shell/source/backends/kde4be/kde4backend.cxx index 1c87c48a02ec..314cd5aa7144 100644 --- a/shell/source/backends/kde4be/kde4backend.cxx +++ b/shell/source/backends/kde4be/kde4backend.cxx @@ -215,7 +215,7 @@ static cppu::ImplementationEntry const services[] = { } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL kde4be1_component_getFactory( char const * pImplName, void * pServiceManager, void * pRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/shell/source/backends/kde4be/kde4be1.component b/shell/source/backends/kde4be/kde4be1.component index 8ea7ae121088..9bceccc62ca6 100644 --- a/shell/source/backends/kde4be/kde4be1.component +++ b/shell/source/backends/kde4be/kde4be1.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/shell/source/backends/kdebe/kdebackend.cxx b/shell/source/backends/kdebe/kdebackend.cxx index 4faf91106560..ad82efcc2c4f 100644 --- a/shell/source/backends/kdebe/kdebackend.cxx +++ b/shell/source/backends/kdebe/kdebackend.cxx @@ -215,7 +215,7 @@ static cppu::ImplementationEntry const services[] = { } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL kdebe1_component_getFactory( char const * pImplName, void * pServiceManager, void * pRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/shell/source/backends/kdebe/kdebe1.component b/shell/source/backends/kdebe/kdebe1.component index 393fbc80d538..7e70f656f254 100644 --- a/shell/source/backends/kdebe/kdebe1.component +++ b/shell/source/backends/kdebe/kdebe1.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/shell/source/backends/macbe/macbe1.component b/shell/source/backends/macbe/macbe1.component index 10bac2e2b6a0..c76036126733 100644 --- a/shell/source/backends/macbe/macbe1.component +++ b/shell/source/backends/macbe/macbe1.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/shell/source/backends/macbe/macbecdef.cxx b/shell/source/backends/macbe/macbecdef.cxx index a52d7acb6ee9..cd1f702aec98 100644 --- a/shell/source/backends/macbe/macbecdef.cxx +++ b/shell/source/backends/macbe/macbecdef.cxx @@ -60,7 +60,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] = //------------------------------------------------------------------------------ -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey) +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL macbe1_component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/shell/source/backends/wininetbe/wininetbe1.component b/shell/source/backends/wininetbe/wininetbe1.component index d8930280fb2a..a6655ce680f5 100644 --- a/shell/source/backends/wininetbe/wininetbe1.component +++ b/shell/source/backends/wininetbe/wininetbe1.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/shell/source/backends/wininetbe/wininetbecdef.cxx b/shell/source/backends/wininetbe/wininetbecdef.cxx index ca82c1b8c088..8b47da586e1f 100644 --- a/shell/source/backends/wininetbe/wininetbecdef.cxx +++ b/shell/source/backends/wininetbe/wininetbecdef.cxx @@ -60,7 +60,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] = //------------------------------------------------------------------------------ -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char *aImplementationName, +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL wininetbe1_component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey) { diff --git a/shell/source/cmdmail/cmdmail.component b/shell/source/cmdmail/cmdmail.component index 7e56741d16c1..7b2761d6cfb1 100644 --- a/shell/source/cmdmail/cmdmail.component +++ b/shell/source/cmdmail/cmdmail.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/shell/source/cmdmail/cmdmailentry.cxx b/shell/source/cmdmail/cmdmailentry.cxx index b0e45feaafb5..3dbb894bd033 100644 --- a/shell/source/cmdmail/cmdmailentry.cxx +++ b/shell/source/cmdmail/cmdmailentry.cxx @@ -62,7 +62,7 @@ extern "C" // component_getFactory //---------------------------------------------------------------------- -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void* SAL_CALL cmdmail_component_getFactory( const sal_Char* pImplName, SAL_UNUSED_PARAMETER uno_Interface* /*pSrvManager*/, SAL_UNUSED_PARAMETER uno_Interface* /*pRegistryKey*/ ) diff --git a/shell/source/unix/exec/shellexecentry.cxx b/shell/source/unix/exec/shellexecentry.cxx index 684acfe5f036..997de2132d30 100644 --- a/shell/source/unix/exec/shellexecentry.cxx +++ b/shell/source/unix/exec/shellexecentry.cxx @@ -60,7 +60,7 @@ extern "C" // component_getFactory //---------------------------------------------------------------------- -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void* SAL_CALL syssh_component_getFactory( const sal_Char* pImplName, SAL_UNUSED_PARAMETER uno_Interface* /*pSrvManager*/, SAL_UNUSED_PARAMETER uno_Interface* /*pRegistryKey*/ ) diff --git a/shell/source/unix/exec/syssh.component b/shell/source/unix/exec/syssh.component index 030240dff3bf..d7e76945c0d3 100644 --- a/shell/source/unix/exec/syssh.component +++ b/shell/source/unix/exec/syssh.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/shell/source/win32/SysShentry.cxx b/shell/source/win32/SysShentry.cxx index e5a61bb25d04..93a4533a9f15 100644 --- a/shell/source/win32/SysShentry.cxx +++ b/shell/source/win32/SysShentry.cxx @@ -63,7 +63,7 @@ extern "C" // returns a factory to create XFilePicker-Services //---------------------------------------------------------------------- -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface*, uno_Interface* /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL syssh_component_getFactory( const sal_Char* pImplName, uno_Interface*, uno_Interface* /*pRegistryKey*/ ) { void* pRet = 0; diff --git a/shell/source/win32/simplemail/smplmail.component b/shell/source/win32/simplemail/smplmail.component index 59246c6d1551..c0a2bcb84e76 100644 --- a/shell/source/win32/simplemail/smplmail.component +++ b/shell/source/win32/simplemail/smplmail.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/shell/source/win32/simplemail/smplmailentry.cxx b/shell/source/win32/simplemail/smplmailentry.cxx index df3774a79345..9b6228bea516 100644 --- a/shell/source/win32/simplemail/smplmailentry.cxx +++ b/shell/source/win32/simplemail/smplmailentry.cxx @@ -63,7 +63,7 @@ extern "C" // returns a factory to create XFilePicker-Services //---------------------------------------------------------------------- -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL smplmail_component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) { void* pRet = 0; diff --git a/shell/source/win32/syssh.component b/shell/source/win32/syssh.component index 1e783f5221ae..78da5c2cae17 100644 --- a/shell/source/win32/syssh.component +++ b/shell/source/win32/syssh.component @@ -26,7 +26,7 @@ * **********************************************************************--> - From 95630ef04b9df092653fb2f68d91a7e6100f7a4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= Date: Tue, 2 Oct 2012 10:57:38 +0200 Subject: [PATCH 163/863] these libs are now prefixed Change-Id: Ida3cc87ef2ef6fdb40b03d0401fbefa5e7cd7c92 --- cpputools/source/unoexe/unoexe.cxx | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx index d9a92e3dd2f6..db3e63b8d36e 100644 --- a/cpputools/source/unoexe/unoexe.cxx +++ b/cpputools/source/unoexe/unoexe.cxx @@ -257,29 +257,25 @@ void createInstance( Reference< XMultiServiceFactory > xSF( xMgr, UNO_QUERY ); // acceptor xSet->insert( makeAny( loadSharedLibComponentFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM( - "acceptor.uno" SAL_DLLEXTENSION) ), + OUString( "acceptor.uno" SAL_DLLEXTENSION ), OUString(), - OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.io.Acceptor") ), - xSF, Reference< XRegistryKey >() ) ) ); + OUString( "com.sun.star.comp.io.Acceptor" ), + xSF, Reference< XRegistryKey >(), + "acceptor" ) ) ); // connector xSet->insert( makeAny( loadSharedLibComponentFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM( - "connector.uno" SAL_DLLEXTENSION) ), + OUString( "connector.uno" SAL_DLLEXTENSION ), OUString(), - OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.io.Connector") ), - xSF, Reference< XRegistryKey >() ) ) ); + OUString( "com.sun.star.comp.io.Connector" ), + xSF, Reference< XRegistryKey >(), + "connector" ) ) ); // bridge factory xSet->insert( makeAny( loadSharedLibComponentFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM( - "binaryurp.uno" SAL_DLLEXTENSION) ), + OUString( "binaryurp.uno" SAL_DLLEXTENSION ), OUString(), - OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.bridge.BridgeFactory") ), - xSF, Reference< XRegistryKey >() ) ) ); + OUString( "com.sun.star.comp.bridge.BridgeFactory" ), + xSF, Reference< XRegistryKey >(), + "binaryurp" ) ) ); } s_bSet = sal_True; } From d50f3c5922411304b4291953a4cc9f07f4730892 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= Date: Tue, 2 Oct 2012 11:01:23 +0200 Subject: [PATCH 164/863] stoc: prefix more libs; only bootstrap is remaining Change-Id: Ie9032c6faa493da47e76bc9ff467c4de4b318ca9 --- cpputools/source/registercomponent/registercomponent.cxx | 6 ++++-- stoc/source/javaloader/javaloader.component | 2 +- stoc/source/javaloader/javaloader.cxx | 2 +- stoc/source/javavm/javavm.component | 2 +- stoc/source/javavm/javavm.cxx | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/cpputools/source/registercomponent/registercomponent.cxx b/cpputools/source/registercomponent/registercomponent.cxx index 06c38f5e7d80..950952b5d880 100644 --- a/cpputools/source/registercomponent/registercomponent.cxx +++ b/cpputools/source/registercomponent/registercomponent.cxx @@ -722,13 +722,15 @@ static void bootstrap( OUString(), OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.JavaVirtualMachine")), xSMgr, - Reference< XRegistryKey > () ); + Reference< XRegistryKey > (), + "javavm" ); Reference< XInterface > r2 = loadSharedLibComponentFactory( OUString(RTL_CONSTASCII_USTRINGPARAM("javaloader.uno" SAL_DLLEXTENSION)), OUString(), OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.JavaComponentLoader")), xSMgr, - Reference< XRegistryKey > () ); + Reference< XRegistryKey > (), + "javaloader" ); Reference xSet( xSMgr, UNO_QUERY ); if( r.is() && r2.is() && xSet.is() ) { diff --git a/stoc/source/javaloader/javaloader.component b/stoc/source/javaloader/javaloader.component index bb2ea0f97ba5..5fd7d8671a5f 100644 --- a/stoc/source/javaloader/javaloader.component +++ b/stoc/source/javaloader/javaloader.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx index 7bfe44080d03..cb48b6cf83fc 100644 --- a/stoc/source/javaloader/javaloader.cxx +++ b/stoc/source/javaloader/javaloader.cxx @@ -435,7 +435,7 @@ static struct ImplementationEntry g_entries[] = extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL javaloader_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); diff --git a/stoc/source/javavm/javavm.component b/stoc/source/javavm/javavm.component index 1394b5b62b8d..570ce4c635d4 100644 --- a/stoc/source/javavm/javavm.component +++ b/stoc/source/javavm/javavm.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index fbb1c89d3721..4667fee609fc 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -598,7 +598,7 @@ private: } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(sal_Char const * pImplName, +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL javavm_component_getFactory(sal_Char const * pImplName, void * pServiceManager, void * pRegistryKey) { From 12c220ae8e55a033ab6aeca27c0e26a643d2001a Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Tue, 2 Oct 2012 12:25:41 +0300 Subject: [PATCH 165/863] Make Clang happy Change-Id: I69c886d0a1875ec674f40c2422dc1490418c1da3 --- writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index 26901057157f..f8786c9ed32e 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx @@ -393,8 +393,8 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo // Set table above/bottom spacing to 0. // TODO: handle 'Around' text wrapping mode - m_aTableProperties->Insert( PropertyIds::PROP_TOP_MARGIN, true, uno::makeAny( 0 ) ); - m_aTableProperties->Insert( PropertyIds::PROP_BOTTOM_MARGIN, true, uno::makeAny( 0 ) ); + m_aTableProperties->Insert( PROP_TOP_MARGIN, true, uno::makeAny( sal_Int32( 0 ) ) ); + m_aTableProperties->Insert( PROP_BOTTOM_MARGIN, true, uno::makeAny( sal_Int32( 0 ) ) ); //table border settings table::TableBorder aTableBorder; From 4ea8ddb05b3e5f65ee8cf73ae87500d066c13ea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= Date: Tue, 2 Oct 2012 11:29:48 +0200 Subject: [PATCH 166/863] PptImporter is unused; it was also missing in scp2 Change-Id: I87c8d46d791525e3e5b6866edc6423e92cbcca81 --- Repository.mk | 1 - filter/Library_PptImporter.mk | 42 ----- filter/Module_filter.mk | 1 - filter/source/msfilter/powerpoint/pptcom.hxx | 62 -------- .../msfilter/powerpoint/pptimporter.cxx | 148 ------------------ .../msfilter/powerpoint/pptimporter.hxx | 85 ---------- .../msfilter/powerpoint/pptimporteruno.cxx | 63 -------- .../source/msfilter/powerpoint/ppttoxml.cxx | 83 ---------- .../source/msfilter/powerpoint/ppttoxml.hxx | 41 ----- 9 files changed, 526 deletions(-) delete mode 100644 filter/Library_PptImporter.mk delete mode 100644 filter/source/msfilter/powerpoint/pptcom.hxx delete mode 100644 filter/source/msfilter/powerpoint/pptimporter.cxx delete mode 100644 filter/source/msfilter/powerpoint/pptimporter.hxx delete mode 100644 filter/source/msfilter/powerpoint/pptimporteruno.cxx delete mode 100644 filter/source/msfilter/powerpoint/ppttoxml.cxx delete mode 100644 filter/source/msfilter/powerpoint/ppttoxml.hxx diff --git a/Repository.mk b/Repository.mk index fdc4ce6cef5d..a4daa93ee4d9 100644 --- a/Repository.mk +++ b/Repository.mk @@ -217,7 +217,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ endif $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ - PptImporter \ abp \ acc \ adabas \ diff --git a/filter/Library_PptImporter.mk b/filter/Library_PptImporter.mk deleted file mode 100644 index f1d172aeda4f..000000000000 --- a/filter/Library_PptImporter.mk +++ /dev/null @@ -1,42 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -$(eval $(call gb_Library_Library,PptImporter)) - -$(eval $(call gb_Library_use_sdk_api,PptImporter)) - -$(eval $(call gb_Library_set_include,PptImporter,\ - $$(INCLUDE) \ -)) - -$(eval $(call gb_Library_use_libraries,PptImporter,\ - sot \ - tl \ - cppuhelper \ - cppu \ - sal \ - $(gb_UWINAPI) \ -)) - -$(eval $(call gb_Library_add_exception_objects,PptImporter,\ - filter/source/msfilter/powerpoint/pptimporter \ - filter/source/msfilter/powerpoint/pptimporteruno \ - filter/source/msfilter/powerpoint/ppttoxml \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk index b3ec2a3f19a0..99bebb5c55d8 100644 --- a/filter/Module_filter.mk +++ b/filter/Module_filter.mk @@ -26,7 +26,6 @@ $(eval $(call gb_Module_add_targets,filter,\ AllLangResTarget_xsltdlg \ Configuration_filter \ CustomTarget_svg \ - Library_PptImporter \ Library_egi \ Library_eme \ Library_epb \ diff --git a/filter/source/msfilter/powerpoint/pptcom.hxx b/filter/source/msfilter/powerpoint/pptcom.hxx deleted file mode 100644 index f25e6adaab20..000000000000 --- a/filter/source/msfilter/powerpoint/pptcom.hxx +++ /dev/null @@ -1,62 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef _PPTCOM_HXX -#define _PPTCOM_HXX - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -// ----------------------------------------------------------------------------- - -#define NMSP_CPPU cppu -#define NMSP_RTL rtl -#define NMSP_UTL utl -#define NMSP_COMPHELPER comphelper -#define NMSP_UNO com::sun::star::uno -#define NMSP_BEANS com::sun::star::beans -#define NMSP_LANG com::sun::star::lang -#define NMSP_IO com::sun::star::io -#define NMSP_SAX com::sun::star::xml::sax -#define NMSP_REGISTRY com::sun::star::registry -#define NMSP_DOCUMENT com::sun::star::document - - -#define REF( _def_Obj ) NMSP_UNO::Reference< _def_Obj > -#define SEQ( _def_Obj ) NMSP_UNO::Sequence< _def_Obj > -#define ANY NMSP_UNO::Any -#define B2UCONST( _def_pChar ) (NMSP_RTL::OUString(RTL_CONSTASCII_USTRINGPARAM(_def_pChar ))) -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/msfilter/powerpoint/pptimporter.cxx b/filter/source/msfilter/powerpoint/pptimporter.cxx deleted file mode 100644 index 6450b761ba15..000000000000 --- a/filter/source/msfilter/powerpoint/pptimporter.cxx +++ /dev/null @@ -1,148 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "pptimporter.hxx" - -#ifdef DBG_DUMP_PPT_IMPORT -#include -#include -#include -#endif - -#include - -NMSP_RTL::OUString PptImporter_getImplementationName() - throw( NMSP_UNO::RuntimeException ) -{ - return B2UCONST( "com.sun.star.presentation.PptImporter" ); -} -#define SERVICE_NAME "com.sun.star.document.ImportFilter" -sal_Bool SAL_CALL PptImporter_supportsService( const NMSP_RTL::OUString& ServiceName ) - throw( NMSP_UNO::RuntimeException ) -{ - return ServiceName == SERVICE_NAME; -} - -SEQ( NMSP_RTL::OUString ) SAL_CALL PptImporter_getSupportedServiceNames() - throw( NMSP_UNO::RuntimeException ) -{ - SEQ( NMSP_RTL::OUString ) aRet(1); - NMSP_RTL::OUString* pArray = aRet.getArray(); - pArray[0] = B2UCONST( SERVICE_NAME ); - return aRet; -} -#undef SERVICE_NAME - -PptImporter::PptImporter( const REF( NMSP_LANG::XMultiServiceFactory )& rxMgr ) : - xFact( rxMgr ) -{ - NMSP_RTL::OUString sService( B2UCONST( "com.sun.star.comp.Impress.XMLImporter" ) ); - try - { - xHdl = REF( NMSP_SAX::XDocumentHandler ) ( xFact->createInstance( sService ), NMSP_UNO::UNO_QUERY ); - xImporter = REF( NMSP_DOCUMENT::XImporter )( xHdl, NMSP_UNO::UNO_QUERY ); - } - catch( const NMSP_UNO::Exception & ) - { - } -} - -PptImporter::~PptImporter() -{ -} - -void SAL_CALL PptImporter::acquire() throw() -{ - OWeakObject::acquire(); -} - -void SAL_CALL PptImporter::release() throw() -{ - OWeakObject::release(); -} - -// XFilter -sal_Bool SAL_CALL PptImporter::filter( const SEQ( NMSP_BEANS::PropertyValue )& aDescriptor ) - throw ( NMSP_UNO::RuntimeException ) -{ - - -#ifdef DBG_DUMP_PPT_IMPORT - - REF( NMSP_LANG::XMultiServiceFactory ) xServiceFactory( NMSP_COMPHELPER::getProcessServiceFactory() ); - REF( NMSP_UNO::XInterface ) xWriter( xServiceFactory->createInstance( B2UCONST( "com.sun.star.xml.sax.Writer" ) ) ); - SvFileStream aStrm( B2UCONST( "d:\\test2.xml" ), STREAM_READ | STREAM_WRITE | STREAM_TRUNC ); - REF( NMSP_IO::XOutputStream ) xOutStream( (::cppu::OWeakObject*) new NMSP_UTL::OOutputStreamWrapper( aStrm ), NMSP_UNO::UNO_QUERY ); - REF( NMSP_IO::XActiveDataSource ) xDataSource( xWriter , NMSP_UNO::UNO_QUERY ); - xDataSource->setOutputStream( xOutStream ); - aFilter.filter( aDescriptor, REF( NMSP_SAX::XDocumentHandler )( xWriter, NMSP_UNO::UNO_QUERY ) ); - -#endif - - return aFilter.filter( aDescriptor, xHdl ); -} - -void SAL_CALL PptImporter::cancel() - throw ( NMSP_UNO::RuntimeException ) -{ - aFilter.cancel(); -} - -// XImporter -void SAL_CALL PptImporter::setTargetDocument( const REF( NMSP_LANG::XComponent )& xDoc ) - throw ( NMSP_LANG::IllegalArgumentException, NMSP_UNO::RuntimeException) -{ - xImporter->setTargetDocument( xDoc ); -} - -// XInitialization -void SAL_CALL PptImporter::initialize( const SEQ( NMSP_UNO::Any )& /* aArguments */ ) - throw ( NMSP_UNO::Exception, NMSP_UNO::RuntimeException ) -{ -} - -// XServiceInfo -NMSP_RTL::OUString SAL_CALL PptImporter::getImplementationName() - throw( NMSP_UNO::RuntimeException ) -{ - return PptImporter_getImplementationName(); -} - -sal_Bool SAL_CALL PptImporter::supportsService( const NMSP_RTL::OUString& rServiceName ) - throw( NMSP_UNO::RuntimeException ) -{ - return PptImporter_supportsService( rServiceName ); -} - -SEQ( NMSP_RTL::OUString ) SAL_CALL PptImporter::getSupportedServiceNames() - throw ( NMSP_UNO::RuntimeException ) -{ - return PptImporter_getSupportedServiceNames(); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/msfilter/powerpoint/pptimporter.hxx b/filter/source/msfilter/powerpoint/pptimporter.hxx deleted file mode 100644 index 10cce61d559f..000000000000 --- a/filter/source/msfilter/powerpoint/pptimporter.hxx +++ /dev/null @@ -1,85 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef _PPTIMPORTER_HXX -#define _PPTIMPORTER_HXX - -#include "pptcom.hxx" -#include "ppttoxml.hxx" - -// --------------- -// - PptImporter - -// --------------- - -class PptImporter : public NMSP_CPPU::WeakImplHelper4 -< - NMSP_DOCUMENT::XFilter, - NMSP_DOCUMENT::XImporter, - NMSP_LANG::XInitialization, - NMSP_LANG::XServiceInfo -> -{ - PptToXml aFilter; - REF( NMSP_SAX::XDocumentHandler ) xHdl; - REF( NMSP_LANG::XMultiServiceFactory ) xFact; - REF( NMSP_DOCUMENT::XImporter ) xImporter; - -public: - - PptImporter( const REF( NMSP_LANG::XMultiServiceFactory )& rxMgr ); - virtual ~PptImporter(); - - // XInterface - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); - - // XFilter - virtual sal_Bool SAL_CALL filter( const SEQ( NMSP_BEANS::PropertyValue )& aDescriptor ) - throw ( NMSP_UNO::RuntimeException ); - virtual void SAL_CALL cancel( ) - throw ( NMSP_UNO::RuntimeException ); - - // XImporter - virtual void SAL_CALL setTargetDocument( const REF(NMSP_LANG::XComponent)& xDoc ) - throw ( NMSP_LANG::IllegalArgumentException, NMSP_UNO::RuntimeException ); - - // XInitialization - virtual void SAL_CALL initialize( const SEQ( NMSP_UNO::Any )& aArguments ) - throw ( NMSP_UNO::Exception, NMSP_UNO::RuntimeException ); - - // XServiceInfo - virtual NMSP_RTL::OUString SAL_CALL getImplementationName() - throw ( NMSP_UNO::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const NMSP_RTL::OUString& ServiceName ) - throw ( NMSP_UNO::RuntimeException ); - virtual SEQ( NMSP_RTL::OUString ) SAL_CALL getSupportedServiceNames() - throw ( NMSP_UNO::RuntimeException ); - -}; - -NMSP_RTL::OUString PptImporter_getImplementationName() - throw ( NMSP_UNO::RuntimeException ); -sal_Bool SAL_CALL PptImportert_supportsService( const NMSP_RTL::OUString& ServiceName ) - throw( NMSP_UNO::RuntimeException ); -SEQ( NMSP_RTL::OUString ) SAL_CALL PptImporter_getSupportedServiceNames() - throw( NMSP_UNO::RuntimeException ); - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/msfilter/powerpoint/pptimporteruno.cxx b/filter/source/msfilter/powerpoint/pptimporteruno.cxx deleted file mode 100644 index be0b49ebfad5..000000000000 --- a/filter/source/msfilter/powerpoint/pptimporteruno.cxx +++ /dev/null @@ -1,63 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#include "pptimporter.hxx" - -#include -#include - -static REF( NMSP_UNO::XInterface ) SAL_CALL create_PptImporter( const REF( NMSP_LANG::XMultiServiceFactory )& rxFact ) -{ - return REF( NMSP_UNO::XInterface )( *new PptImporter( rxFact ) ); -} - -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ ) -{ - REF( NMSP_LANG::XSingleServiceFactory ) xFactory; - void* pRet = 0; - - if( rtl_str_compare( pImplName, "com.sun.star.presentation.PptImporter" ) == 0 ) - { - const NMSP_RTL::OUString aServiceName( B2UCONST( "com.sun.star.presentation.PptImporter" ) ); - - xFactory = REF( NMSP_LANG::XSingleServiceFactory )( NMSP_CPPU::createSingleFactory( - reinterpret_cast< NMSP_LANG::XMultiServiceFactory* >( pServiceManager ), - B2UCONST( "com.sun.star.presentation.PptImporter" ), - create_PptImporter, SEQ( NMSP_RTL::OUString )( &aServiceName, 1 ) ) ); - } - if( xFactory.is() ) - { - xFactory->acquire(); - pRet = xFactory.get(); - } - - return pRet; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/msfilter/powerpoint/ppttoxml.cxx b/filter/source/msfilter/powerpoint/ppttoxml.cxx deleted file mode 100644 index 9385108c5b12..000000000000 --- a/filter/source/msfilter/powerpoint/ppttoxml.cxx +++ /dev/null @@ -1,83 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#include "ppttoxml.hxx" -#include - -PptToXml::PptToXml() -{ -} - -PptToXml::~PptToXml() -{ -} - -sal_Bool PptToXml::filter( const SEQ( NMSP_BEANS::PropertyValue )& aDescriptor, - REF( NMSP_SAX::XDocumentHandler ) xHandler ) -{ - xHdl = xHandler; - - sal_Bool bStatus = sal_False; - sal_Int32 i; - for( i = 0; i < aDescriptor.getLength(); i++ ) - { - NMSP_RTL::OUString strTemp; - aDescriptor[ i ].Value >>= strTemp; - - if ( aDescriptor[ i ].Name == B2UCONST( "URL" ) ) - { - NMSP_RTL::OUString sURL; - aDescriptor[ i ].Value >>= sURL; - SotStorageRef xStg( new SotStorage( sURL, STREAM_STD_READ, 0 ) ); - if ( xStg.Is() ) - { - SotStorageStreamRef xDocStream( xStg->OpenSotStream( B2UCONST( "PowerPoint Document" ), STREAM_STD_READ ) ); - if( xDocStream.Is() ) - { - xDocStream->SetVersion( xStg->GetVersion() ); - xDocStream->SetCryptMaskKey(xStg->GetKey()); - - xHdl->startDocument(); - - - xHdl->endDocument(); - bStatus = sal_True; - } - } - } - } - return bStatus; -} - -void PptToXml::cancel() -{ - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/msfilter/powerpoint/ppttoxml.hxx b/filter/source/msfilter/powerpoint/ppttoxml.hxx deleted file mode 100644 index 47120852d282..000000000000 --- a/filter/source/msfilter/powerpoint/ppttoxml.hxx +++ /dev/null @@ -1,41 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef _PPTTOXML_HXX -#define _PPTTOXML_HXX - -#include "pptcom.hxx" - -class PptToXml -{ - REF( NMSP_SAX::XDocumentHandler ) xHdl; - - public: - - PptToXml(); - ~PptToXml(); - - sal_Bool filter( const SEQ( NMSP_BEANS::PropertyValue )& aDescriptor, - REF(NMSP_SAX::XDocumentHandler) xHandler ); - void cancel(); -}; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ From 2f3b4edc414b30a149db336ef1d3d8bf716698f0 Mon Sep 17 00:00:00 2001 From: Winfried Donkers Date: Fri, 28 Sep 2012 12:15:11 +0200 Subject: [PATCH 167/863] fdo#52673 fix for layout problems with version 3.6 and up Change-Id: I626ec5bce931005dccbc8f4d235e8208ae98f9a5 --- sw/source/ui/app/applab.cxx | 77 +++++++++++-------------------------- 1 file changed, 23 insertions(+), 54 deletions(-) diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx index 55989b850ddb..1ed815e24ef5 100644 --- a/sw/source/ui/app/applab.cxx +++ b/sw/source/ui/app/applab.cxx @@ -91,21 +91,19 @@ const char MASTER_LABEL[] = "MasterLabel"; const SwFrmFmt *lcl_InsertBCText( SwWrtShell& rSh, const SwLabItem& rItem, SwFrmFmt &rFmt, - sal_uInt16 nCol, sal_uInt16 nRow, sal_Bool bPage) + sal_uInt16 nCol, sal_uInt16 nRow ) { SfxItemSet aSet(rSh.GetAttrPool(), RES_ANCHOR, RES_ANCHOR, RES_VERT_ORIENT, RES_VERT_ORIENT, RES_HORI_ORIENT, RES_HORI_ORIENT, 0 ); sal_uInt16 nPhyPageNum, nVirtPageNum; rSh.GetPageNum( nPhyPageNum, nVirtPageNum ); - aSet.Put(SwFmtAnchor(bPage ? FLY_AS_CHAR : FLY_AT_PAGE, nPhyPageNum)); - if (!bPage) - { - aSet.Put(SwFmtHoriOrient(rItem.lLeft + nCol * rItem.lHDist, - text::HoriOrientation::NONE, text::RelOrientation::PAGE_FRAME )); - aSet.Put(SwFmtVertOrient(rItem.lUpper + nRow * rItem.lVDist, - text::VertOrientation::NONE, text::RelOrientation::PAGE_FRAME )); - } + //anchor frame to page + aSet.Put( SwFmtAnchor( FLY_AT_PAGE, nPhyPageNum ) ); + aSet.Put( SwFmtHoriOrient( rItem.lLeft + nCol * rItem.lHDist, + text::HoriOrientation::NONE, text::RelOrientation::PAGE_FRAME ) ); + aSet.Put( SwFmtVertOrient( rItem.lUpper + nRow * rItem.lVDist, + text::VertOrientation::NONE, text::RelOrientation::PAGE_FRAME ) ); const SwFrmFmt *pFmt = rSh.NewFlyFrm(aSet, sal_True, &rFmt ); // Insert Fly OSL_ENSURE( pFmt, "Fly not inserted" ); @@ -130,21 +128,19 @@ const SwFrmFmt *lcl_InsertBCText( SwWrtShell& rSh, const SwLabItem& rItem, const SwFrmFmt *lcl_InsertLabText( SwWrtShell& rSh, const SwLabItem& rItem, SwFrmFmt &rFmt, SwFldMgr& rFldMgr, - sal_uInt16 nCol, sal_uInt16 nRow, sal_Bool bLast, sal_Bool bPage) + sal_uInt16 nCol, sal_uInt16 nRow, sal_Bool bLast ) { SfxItemSet aSet(rSh.GetAttrPool(), RES_ANCHOR, RES_ANCHOR, RES_VERT_ORIENT, RES_VERT_ORIENT, RES_HORI_ORIENT, RES_HORI_ORIENT, 0 ); sal_uInt16 nPhyPageNum, nVirtPageNum; rSh.GetPageNum( nPhyPageNum, nVirtPageNum ); - aSet.Put(SwFmtAnchor(bPage ? FLY_AS_CHAR : FLY_AT_PAGE, nPhyPageNum)); - if (!bPage) - { - aSet.Put(SwFmtHoriOrient(rItem.lLeft + nCol * rItem.lHDist, - text::HoriOrientation::NONE, text::RelOrientation::PAGE_FRAME )); - aSet.Put(SwFmtVertOrient(rItem.lUpper + nRow * rItem.lVDist, - text::VertOrientation::NONE, text::RelOrientation::PAGE_FRAME )); - } + //anchor frame to page + aSet.Put( SwFmtAnchor( FLY_AT_PAGE, nPhyPageNum ) ); + aSet.Put( SwFmtHoriOrient( rItem.lLeft + nCol * rItem.lHDist, + text::HoriOrientation::NONE, text::RelOrientation::PAGE_FRAME ) ); + aSet.Put( SwFmtVertOrient( rItem.lUpper + nRow * rItem.lVDist, + text::VertOrientation::NONE, text::RelOrientation::PAGE_FRAME ) ); const SwFrmFmt *pFmt = rSh.NewFlyFrm(aSet, sal_True, &rFmt ); // Insert Fly OSL_ENSURE( pFmt, "Fly not inserted" ); @@ -300,26 +296,11 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel) SwFmtFrmSize aFrmSize( ATT_FIX_SIZE, iWidth, iHeight ); pFmt->SetFmtAttr( aFrmSize ); - SwFrmFmt* pFmtEORow = new SwFrmFmt (*pFmt); - SwFrmFmt* pFmtEOCol = new SwFrmFmt (*pFmt); - SwFrmFmt* pFmtEOColEORow = new SwFrmFmt (*pFmt); - - SvxULSpaceItem aFrmULSpace( 0, (sal_uInt16)(rItem.lVDist - rItem.lHeight), - RES_UL_SPACE ); + //frame represents label itself, no border space SvxULSpaceItem aFrmNoULSpace( 0, 0, RES_UL_SPACE ); - - SvxLRSpaceItem aFrmLRSpace( 0, (sal_uInt16)(rItem.lHDist - rItem.lWidth), - 0, 0, RES_LR_SPACE ); SvxLRSpaceItem aFrmNoLRSpace( 0, 0, 0, 0, RES_LR_SPACE ); - - pFmt->SetFmtAttr(aFrmULSpace); - pFmt->SetFmtAttr(aFrmLRSpace); - pFmtEORow->SetFmtAttr(aFrmULSpace); - pFmtEORow->SetFmtAttr(aFrmNoLRSpace); - pFmtEOCol->SetFmtAttr(aFrmNoULSpace); - pFmtEOCol->SetFmtAttr(aFrmLRSpace); - pFmtEOColEORow->SetFmtAttr(aFrmNoULSpace); - pFmtEOColEORow->SetFmtAttr(aFrmNoLRSpace); + pFmt->SetFmtAttr( aFrmNoULSpace ); + pFmt->SetFmtAttr( aFrmNoLRSpace ); const SwFrmFmt *pFirstFlyFmt = 0; if ( rItem.bPage ) @@ -327,26 +308,16 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel) SwFmtVertOrient aFrmVertOrient( pFmt->GetVertOrient() ); aFrmVertOrient.SetVertOrient( text::VertOrientation::TOP ); pFmt->SetFmtAttr(aFrmVertOrient); - pFmtEORow->SetFmtAttr(aFrmVertOrient); - pFmtEOCol->SetFmtAttr(aFrmVertOrient); - pFmtEOColEORow->SetFmtAttr(aFrmVertOrient); for ( sal_uInt16 i = 0; i < rItem.nRows; ++i ) { for ( sal_uInt16 j = 0; j < rItem.nCols; ++j ) { pSh->Push(); - SwFrmFmt* pFrmFmt; - if ( j == rItem.nCols - 1 ) - pFrmFmt = ( i == rItem.nRows - 1 ? pFmtEOColEORow : pFmtEORow ); - else - pFrmFmt = ( i == rItem.nRows - 1 ? pFmtEOCol : pFmt ); - - const SwFrmFmt *pTmp = - bLabel ? - lcl_InsertLabText( *pSh, rItem, *pFrmFmt, *pFldMgr, j, i, - i == rItem.nRows - 1 && j == rItem.nCols - 1, sal_True ) : - lcl_InsertBCText(*pSh, rItem, *pFrmFmt, j, i, sal_True); + const SwFrmFmt *pTmp = ( bLabel ? + lcl_InsertLabText( *pSh, rItem, *pFmt, *pFldMgr, j, i, + i == rItem.nRows - 1 && j == rItem.nCols - 1 ) : + lcl_InsertBCText( *pSh, rItem, *pFmt, j, i ) ); if (!(i|j)) { pFirstFlyFmt = pTmp; @@ -388,8 +359,6 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel) } pSh->Pop( sal_False ); } - if ( i + 1 != rItem.nRows ) - pSh->SplitNode(); // Small optimisation } } else @@ -397,10 +366,10 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel) pFirstFlyFmt = bLabel ? lcl_InsertLabText( *pSh, rItem, *pFmt, *pFldMgr, static_cast< sal_uInt16 >(rItem.nCol - 1), - static_cast< sal_uInt16 >(rItem.nRow - 1), sal_True, sal_False ) : + static_cast< sal_uInt16 >(rItem.nRow - 1), sal_True ) : lcl_InsertBCText(*pSh, rItem, *pFmt, static_cast< sal_uInt16 >(rItem.nCol - 1), - static_cast< sal_uInt16 >(rItem.nRow - 1), sal_False); + static_cast< sal_uInt16 >(rItem.nRow - 1)); } //fill the user fields From 13ec17ce63dcba161169e8f6d351e92be1e5647e Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 2 Oct 2012 12:54:32 +0300 Subject: [PATCH 168/863] Use prefix Change-Id: I128623b27bd88795e21de13d7a6fc960de3b6ea8 --- writerfilter/source/filter/WriterFilter.cxx | 2 +- writerfilter/util/writerfilter.component | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx index 68550cf904db..7e139c569f10 100644 --- a/writerfilter/source/filter/WriterFilter.cxx +++ b/writerfilter/source/filter/WriterFilter.cxx @@ -51,7 +51,7 @@ static struct ::cppu::ImplementationEntry s_component_entries [] = { 0, 0, 0, 0, 0, 0 } // terminate with NULL }; -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(sal_Char const * implName, ::com::sun::star::lang::XMultiServiceFactory * xMgr, ::com::sun::star::registry::XRegistryKey * xRegistry ) +SAL_DLLPUBLIC_EXPORT void * SAL_CALL writerfilter_component_getFactory(sal_Char const * implName, ::com::sun::star::lang::XMultiServiceFactory * xMgr, ::com::sun::star::registry::XRegistryKey * xRegistry ) { return ::cppu::component_getFactoryHelper(implName, xMgr, xRegistry, s_component_entries ); } diff --git a/writerfilter/util/writerfilter.component b/writerfilter/util/writerfilter.component index 0101ea077f87..b5deea5cfd25 100644 --- a/writerfilter/util/writerfilter.component +++ b/writerfilter/util/writerfilter.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - From 9da34c09bfd27ba0b1c423ebb558d997b5213018 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 2 Oct 2012 12:59:32 +0300 Subject: [PATCH 169/863] Use prefix Change-Id: Ic63d4b6403438fee2d6c70e329ee33d2cde7426b --- vbahelper/source/msforms/service.cxx | 2 +- vbahelper/util/msforms.component | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vbahelper/source/msforms/service.cxx b/vbahelper/source/msforms/service.cxx index 7a32b493d287..9bc7953429cf 100644 --- a/vbahelper/source/msforms/service.cxx +++ b/vbahelper/source/msforms/service.cxx @@ -42,7 +42,7 @@ extern sdecl::ServiceDecl const serviceDecl; extern "C" { - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( + SAL_DLLPUBLIC_EXPORT void * SAL_CALL msforms_component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) { diff --git a/vbahelper/util/msforms.component b/vbahelper/util/msforms.component index 5e4c28be6694..f4fc16823d9c 100644 --- a/vbahelper/util/msforms.component +++ b/vbahelper/util/msforms.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - From b9d1006ebb3c97e398d4bb31075fd2577f3ac858 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Mon, 1 Oct 2012 16:08:38 +0100 Subject: [PATCH 170/863] re-base on ALv2 code. Includes: #i118662# remove berkeleyDB from module l10tools Patch contributed by Oliver-Rainer Wittmann http://svn.apache.org/viewvc?view=revision&revision=1213189 reportdesign: remove extra items from Help menu Patch contributed by Ariel Constenla-Haile http://svn.apache.org/viewvc?view=revision&revision=1201215 --- helpcompiler/Executable_helpindexer.mk | 1 - helpcompiler/Executable_helplinker.mk | 1 - helpcompiler/Library_helplinker.mk | 1 - helpcompiler/Makefile | 7 + helpcompiler/inc/HelpCompiler.hxx | 42 ++---- helpcompiler/inc/HelpLinker.hxx | 41 ++---- helpcompiler/inc/dllapi.h | 37 ++--- helpcompiler/source/HelpCompiler.cxx | 37 ++--- helpcompiler/source/HelpLinker.cxx | 139 +++--------------- helpcompiler/source/HelpLinker_main.cxx | 37 ++--- reportdesign/Makefile | 7 + reportdesign/inc/ModuleHelper.hxx | 37 ++--- reportdesign/inc/ReportDefinition.hxx | 37 ++--- reportdesign/inc/ReportVisitor.hxx | 37 ++--- reportdesign/inc/RptDef.hxx | 37 ++--- reportdesign/inc/RptModel.hxx | 37 ++--- reportdesign/inc/RptObject.hxx | 37 ++--- reportdesign/inc/RptPage.hxx | 37 ++--- reportdesign/inc/UndoActions.hxx | 37 ++--- reportdesign/inc/reportformula.hxx | 37 ++--- reportdesign/prj/rpt.xml | 17 +++ .../qa/complex/reportdesign/runner.props | 18 +++ reportdesign/source/core/api/FixedLine.cxx | 37 ++--- reportdesign/source/core/api/FixedText.cxx | 37 ++--- .../source/core/api/FormattedField.cxx | 37 ++--- reportdesign/source/core/api/Group.cxx | 37 ++--- reportdesign/source/core/api/ImageControl.cxx | 37 ++--- .../source/core/api/ReportControlModel.cxx | 37 ++--- .../source/core/api/ReportDefinition.cxx | 37 ++--- .../source/core/api/ReportEngineJFree.cxx | 37 ++--- reportdesign/source/core/api/Section.cxx | 37 ++--- reportdesign/source/core/api/Shape.cxx | 37 ++--- reportdesign/source/core/api/services.cxx | 37 ++--- reportdesign/source/core/inc/Tools.hxx | 37 ++--- .../core/misc/conditionalexpression.cxx | 37 ++--- .../source/core/misc/conditionupdater.cxx | 37 ++--- .../source/core/misc/reportformula.cxx | 37 ++--- .../source/core/resource/core_resource.cxx | 37 ++--- reportdesign/source/core/sdr/ModuleHelper.cxx | 37 ++--- .../source/core/sdr/PropertyForward.cxx | 37 ++--- .../source/core/sdr/ReportDrawPage.cxx | 37 ++--- .../source/core/sdr/ReportUndoFactory.cxx | 37 ++--- reportdesign/source/core/sdr/RptModel.cxx | 37 ++--- reportdesign/source/core/sdr/RptObject.cxx | 37 ++--- .../source/core/sdr/RptObjectListener.cxx | 37 ++--- reportdesign/source/core/sdr/RptPage.cxx | 37 ++--- reportdesign/source/core/sdr/UndoActions.cxx | 37 ++--- reportdesign/source/core/sdr/UndoEnv.cxx | 37 ++--- .../source/core/sdr/formatnormalizer.cxx | 37 ++--- reportdesign/source/filter/xml/dbloader2.cxx | 37 ++--- reportdesign/source/filter/xml/dbloader2.hxx | 37 ++--- .../source/filter/xml/xmlAutoStyle.cxx | 37 ++--- reportdesign/source/filter/xml/xmlCell.cxx | 37 ++--- reportdesign/source/filter/xml/xmlColumn.cxx | 37 ++--- .../source/filter/xml/xmlComponent.cxx | 37 ++--- .../source/filter/xml/xmlComponent.hxx | 37 ++--- .../source/filter/xml/xmlCondPrtExpr.cxx | 37 ++--- .../source/filter/xml/xmlControlProperty.cxx | 37 ++--- reportdesign/source/filter/xml/xmlExport.cxx | 37 ++--- .../filter/xml/xmlExportDocumentHandler.cxx | 37 ++--- .../source/filter/xml/xmlFixedContent.cxx | 37 ++--- .../source/filter/xml/xmlFixedContent.hxx | 37 ++--- .../source/filter/xml/xmlFormatCondition.cxx | 37 ++--- .../source/filter/xml/xmlFormattedField.cxx | 37 ++--- .../source/filter/xml/xmlFunction.cxx | 37 ++--- .../source/filter/xml/xmlFunction.hxx | 37 ++--- reportdesign/source/filter/xml/xmlGroup.cxx | 37 ++--- reportdesign/source/filter/xml/xmlGroup.hxx | 37 ++--- reportdesign/source/filter/xml/xmlHelper.cxx | 37 ++--- reportdesign/source/filter/xml/xmlImage.cxx | 37 ++--- .../filter/xml/xmlImportDocumentHandler.cxx | 37 ++--- .../filter/xml/xmlImportDocumentHandler.hxx | 37 ++--- .../source/filter/xml/xmlMasterFields.cxx | 37 ++--- reportdesign/source/filter/xml/xmlReport.cxx | 37 ++--- .../source/filter/xml/xmlReportElement.cxx | 37 ++--- .../filter/xml/xmlReportElementBase.cxx | 37 ++--- .../filter/xml/xmlReportElementBase.hxx | 37 ++--- reportdesign/source/filter/xml/xmlSection.cxx | 37 ++--- .../source/filter/xml/xmlStyleImport.cxx | 37 ++--- .../source/filter/xml/xmlSubDocument.cxx | 37 ++--- reportdesign/source/filter/xml/xmlTable.cxx | 37 ++--- reportdesign/source/filter/xml/xmlfilter.cxx | 37 ++--- reportdesign/source/filter/xml/xmlfilter.hxx | 37 ++--- .../source/filter/xml/xmlservices.cxx | 37 ++--- reportdesign/source/inc/constasciistring.hxx | 18 +++ reportdesign/source/inc/corestrings.hrc | 37 ++--- reportdesign/source/inc/uistrings.hrc | 37 ++--- reportdesign/source/inc/xmlstrings.hrc | 37 ++--- reportdesign/source/ui/dlg/AddField.cxx | 37 ++--- reportdesign/source/ui/dlg/CondFormat.cxx | 37 ++--- reportdesign/source/ui/dlg/CondFormat.src | 37 ++--- reportdesign/source/ui/dlg/Condition.cxx | 37 ++--- reportdesign/source/ui/dlg/Condition.hxx | 37 ++--- reportdesign/source/ui/dlg/DateTime.cxx | 37 ++--- reportdesign/source/ui/dlg/Formula.cxx | 37 ++--- reportdesign/source/ui/dlg/GroupsSorting.cxx | 37 ++--- reportdesign/source/ui/dlg/GroupsSorting.src | 37 ++--- reportdesign/source/ui/dlg/Navigator.cxx | 37 ++--- reportdesign/source/ui/dlg/Navigator.src | 37 ++--- reportdesign/source/ui/dlg/PageNumber.src | 37 ++--- reportdesign/source/ui/dlg/dlgpage.cxx | 37 ++--- reportdesign/source/ui/dlg/dlgpage.src | 37 ++--- reportdesign/source/ui/inc/AddField.hxx | 37 ++--- reportdesign/source/ui/inc/CondFormat.hxx | 37 ++--- .../source/ui/inc/DataProviderHandler.hxx | 37 ++--- reportdesign/source/ui/inc/DateTime.hxx | 37 ++--- reportdesign/source/ui/inc/DesignView.hxx | 37 ++--- reportdesign/source/ui/inc/Formula.hxx | 37 ++--- .../source/ui/inc/GeometryHandler.hxx | 37 ++--- reportdesign/source/ui/inc/GroupsSorting.hxx | 37 ++--- reportdesign/source/ui/inc/MarkedSection.hxx | 37 ++--- .../source/ui/inc/ReportComponentHandler.hxx | 37 ++--- .../source/ui/inc/ReportController.hxx | 37 ++--- .../ui/inc/ReportControllerObserver.hxx | 37 ++--- reportdesign/source/ui/inc/ReportWindow.hxx | 37 ++--- reportdesign/source/ui/inc/RptUndo.hxx | 37 ++--- reportdesign/source/ui/inc/StartMarker.hxx | 37 ++--- reportdesign/source/ui/inc/UITools.hxx | 37 ++--- reportdesign/source/ui/inc/ViewsWindow.hxx | 37 ++--- .../ui/inspection/DataProviderHandler.cxx | 37 ++--- .../ui/inspection/DefaultInspection.cxx | 37 ++--- .../source/ui/inspection/GeometryHandler.cxx | 37 ++--- .../ui/inspection/ReportComponentHandler.cxx | 37 ++--- .../source/ui/inspection/inspection.src | 37 ++--- .../source/ui/inspection/metadata.cxx | 37 ++--- .../source/ui/misc/FunctionHelper.cxx | 37 ++--- reportdesign/source/ui/misc/RptUndo.cxx | 37 ++--- reportdesign/source/ui/misc/UITools.cxx | 37 ++--- reportdesign/source/ui/misc/rptuiservices.cxx | 37 ++--- .../source/ui/misc/statusbarcontroller.cxx | 37 ++--- .../source/ui/misc/toolboxcontroller.cxx | 37 ++--- reportdesign/source/ui/report/DesignView.cxx | 37 ++--- .../source/ui/report/FixedTextColor.cxx | 37 ++--- .../ui/report/FormattedFieldBeautifier.cxx | 37 ++--- .../source/ui/report/ReportController.cxx | 37 ++--- .../ui/report/ReportControllerObserver.cxx | 37 ++--- .../source/ui/report/ReportSection.cxx | 37 ++--- .../source/ui/report/ReportWindow.cxx | 37 ++--- reportdesign/source/ui/report/SectionView.cxx | 37 ++--- .../source/ui/report/SectionWindow.cxx | 37 ++--- reportdesign/source/ui/report/StartMarker.cxx | 37 ++--- reportdesign/source/ui/report/ViewsWindow.cxx | 37 ++--- reportdesign/source/ui/report/dlgedfac.cxx | 37 ++--- reportdesign/source/ui/report/dlgedfunc.cxx | 37 ++--- reportdesign/source/ui/report/propbrw.cxx | 37 ++--- reportdesign/source/ui/report/report.src | 37 ++--- .../uiconfig/dbreport/menubar/menubar.xml | 22 ++- .../uiconfig/dbreport/statusbar/statusbar.xml | 17 +++ .../uiconfig/dbreport/toolbar/Formatting.xml | 17 +++ .../dbreport/toolbar/alignmentbar.xml | 17 +++ .../uiconfig/dbreport/toolbar/arrowshapes.xml | 17 +++ .../uiconfig/dbreport/toolbar/basicshapes.xml | 17 +++ .../dbreport/toolbar/calloutshapes.xml | 17 +++ .../uiconfig/dbreport/toolbar/drawbar.xml | 17 +++ .../dbreport/toolbar/flowchartshapes.xml | 17 +++ .../dbreport/toolbar/reportcontrols.xml | 17 +++ .../uiconfig/dbreport/toolbar/resizebar.xml | 17 +++ .../dbreport/toolbar/sectionalignmentbar.xml | 17 +++ .../dbreport/toolbar/sectionshrinkbar.xml | 17 +++ .../uiconfig/dbreport/toolbar/starshapes.xml | 17 +++ .../dbreport/toolbar/symbolshapes.xml | 17 +++ .../uiconfig/dbreport/toolbar/toolbar.xml | 17 +++ reportdesign/util/rpt.component | 43 +++--- reportdesign/util/rptui.component | 43 +++--- reportdesign/util/rptxml.component | 43 +++--- sdext/Makefile | 7 + sdext/StaticLibrary_pdfimport_s.mk | 1 + sdext/source/minimizer/basic.txt | 17 +++ .../source/minimizer/configurationaccess.cxx | 37 ++--- sdext/source/minimizer/description.xml | 17 +++ sdext/source/minimizer/fileopendialog.cxx | 37 ++--- sdext/source/minimizer/graphiccollector.cxx | 37 ++--- sdext/source/minimizer/impoptimizer.cxx | 37 ++--- sdext/source/minimizer/informationdialog.cxx | 37 ++--- sdext/source/minimizer/manifest.xml | 17 +++ sdext/source/minimizer/minimizer.component | 10 +- sdext/source/minimizer/optimizerdialog.cxx | 37 ++--- .../minimizer/optimizerdialogcontrols.cxx | 37 ++--- sdext/source/minimizer/pagecollector.cxx | 37 ++--- sdext/source/minimizer/pppoptimizer.cxx | 37 ++--- sdext/source/minimizer/pppoptimizerdialog.cxx | 37 ++--- sdext/source/minimizer/pppoptimizertoken.cxx | 37 ++--- sdext/source/minimizer/pppoptimizertoken.hxx | 37 ++--- sdext/source/minimizer/pppoptimizeruno.cxx | 37 ++--- .../data/org/openoffice/Office/Addons.xcu | 17 +++ .../org/openoffice/Office/ProtocolHandler.xcu | 17 +++ .../extension/SunPresentationMinimizer.xcu | 17 +++ .../extension/SunPresentationMinimizer.xcs | 17 +++ sdext/source/minimizer/unodialog.cxx | 37 ++--- sdext/source/minimizer/unodialog.hxx | 37 ++--- .../pdfimport/config/pdf_import_filter.xcu | 17 +++ sdext/source/pdfimport/config/pdf_types.xcu | 17 +++ sdext/source/pdfimport/description.xml | 17 +++ sdext/source/pdfimport/dialogs/Module1.xba | 17 +++ .../pdfimport/dialogs/TargetChooser.xdl | 17 +++ sdext/source/pdfimport/filterdet.cxx | 37 ++--- sdext/source/pdfimport/inc/pdfihelper.hxx | 39 ++--- sdext/source/pdfimport/inc/pdfparse.hxx | 37 ++--- sdext/source/pdfimport/manifest.xml | 17 +++ sdext/source/pdfimport/misc/pwdinteract.cxx | 37 ++--- sdext/source/pdfimport/pdfiadaptor.cxx | 37 ++--- sdext/source/pdfimport/pdfimport.component | 10 +- .../source/pdfimport/pdfparse/pdfentries.cxx | 37 ++--- sdext/source/pdfimport/pdfparse/pdfparse.cxx | 37 ++--- sdext/source/pdfimport/sax/emitcontext.cxx | 37 ++--- sdext/source/pdfimport/sax/saxattrlist.cxx | 37 ++--- sdext/source/pdfimport/sax/saxattrlist.hxx | 37 ++--- sdext/source/pdfimport/services.cxx | 37 ++--- sdext/source/pdfimport/test/export.map | 33 ++--- sdext/source/pdfimport/test/outputwrap.hxx | 37 ++--- sdext/source/pdfimport/test/pdf2xml.cxx | 37 ++--- sdext/source/pdfimport/test/pdfunzip.cxx | 37 ++--- .../graphicformats_pdfi_unittest_draw.xml | 17 +++ .../graphicformats_pdfi_unittest_impress.xml | 17 +++ .../graphicformats_pdfi_unittest_writer.xml | 17 +++ .../testdocs/pictxt_pdfi_unittest_draw.xml | 17 +++ .../testdocs/pictxt_pdfi_unittest_impress.xml | 17 +++ .../testdocs/pictxt_pdfi_unittest_writer.xml | 17 +++ .../testdocs/txtpic_pdfi_unittest_draw.xml | 17 +++ .../testdocs/txtpic_pdfi_unittest_impress.xml | 17 +++ .../testdocs/txtpic_pdfi_unittest_writer.xml | 17 +++ .../testdocs/txtpictxt_pdfi_unittest_draw.xml | 17 +++ .../txtpictxt_pdfi_unittest_impress.xml | 17 +++ .../txtpictxt_pdfi_unittest_writer.xml | 17 +++ .../verticaltext_pdfi_unittest_draw.xml | 17 +++ .../verticaltext_pdfi_unittest_impress.xml | 17 +++ .../verticaltext_pdfi_unittest_writer.xml | 17 +++ sdext/source/pdfimport/test/tests.cxx | 39 ++--- .../pdfimport/tree/drawtreevisiting.cxx | 37 ++--- .../pdfimport/tree/drawtreevisiting.hxx | 37 ++--- .../source/pdfimport/tree/genericelements.cxx | 37 ++--- sdext/source/pdfimport/tree/pdfiprocessor.cxx | 37 ++--- sdext/source/pdfimport/tree/pdfiprocessor.hxx | 39 ++--- sdext/source/pdfimport/tree/style.cxx | 37 ++--- sdext/source/pdfimport/tree/style.hxx | 37 ++--- sdext/source/pdfimport/tree/treevisiting.hxx | 37 ++--- .../pdfimport/tree/writertreevisiting.cxx | 37 ++--- sdext/source/pdfimport/wrapper/wrapper.cxx | 37 ++--- .../pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 40 ++--- .../pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 40 ++--- .../pdfimport/xpdfwrapper/pnghelper.cxx | 40 ++--- .../pdfimport/xpdfwrapper/wrapper_gpl.cxx | 40 ++--- .../presenter/PresenterAccessibility.cxx | 37 ++--- .../presenter/PresenterAccessibility.hxx | 37 ++--- .../presenter/PresenterBitmapContainer.cxx | 37 ++--- sdext/source/presenter/PresenterButton.cxx | 37 ++--- .../presenter/PresenterCanvasHelper.cxx | 37 ++--- sdext/source/presenter/PresenterComponent.cxx | 37 ++--- .../PresenterConfigurationAccess.cxx | 37 ++--- .../PresenterConfigurationAccess.hxx | 37 ++--- .../source/presenter/PresenterController.cxx | 37 ++--- .../source/presenter/PresenterController.hxx | 37 ++--- .../PresenterExtensionIdentifier.hxx | 37 ++--- .../presenter/PresenterFrameworkObserver.cxx | 37 ++--- .../presenter/PresenterFrameworkObserver.hxx | 37 ++--- .../presenter/PresenterGeometryHelper.cxx | 37 ++--- .../presenter/PresenterGeometryHelper.hxx | 37 ++--- sdext/source/presenter/PresenterHelpView.cxx | 37 ++--- sdext/source/presenter/PresenterHelper.cxx | 37 ++--- sdext/source/presenter/PresenterNotesView.cxx | 37 ++--- sdext/source/presenter/PresenterPane.cxx | 37 ++--- sdext/source/presenter/PresenterPaneBase.cxx | 37 ++--- sdext/source/presenter/PresenterPaneBase.hxx | 37 ++--- .../presenter/PresenterPaneBorderManager.cxx | 37 ++--- .../presenter/PresenterPaneBorderPainter.cxx | 37 ++--- .../presenter/PresenterPaneBorderPainter.hxx | 37 ++--- .../presenter/PresenterPaneContainer.cxx | 37 ++--- .../source/presenter/PresenterPaneFactory.cxx | 37 ++--- .../presenter/PresenterProtocolHandler.cxx | 37 ++--- sdext/source/presenter/PresenterScreen.cxx | 37 ++--- sdext/source/presenter/PresenterScreen.hxx | 37 ++--- sdext/source/presenter/PresenterScrollBar.cxx | 37 ++--- sdext/source/presenter/PresenterScrollBar.hxx | 37 ++--- .../presenter/PresenterSlidePreview.cxx | 37 ++--- .../presenter/PresenterSlideShowView.cxx | 37 ++--- .../presenter/PresenterSlideShowView.hxx | 37 ++--- .../source/presenter/PresenterSlideSorter.cxx | 37 ++--- .../source/presenter/PresenterSlideSorter.hxx | 37 ++--- sdext/source/presenter/PresenterSprite.cxx | 37 ++--- sdext/source/presenter/PresenterSprite.hxx | 37 ++--- .../source/presenter/PresenterSpritePane.cxx | 37 ++--- .../source/presenter/PresenterSpritePane.hxx | 37 ++--- sdext/source/presenter/PresenterTextView.cxx | 37 ++--- sdext/source/presenter/PresenterTextView.hxx | 37 ++--- sdext/source/presenter/PresenterTheme.cxx | 37 ++--- sdext/source/presenter/PresenterTheme.hxx | 37 ++--- sdext/source/presenter/PresenterTimer.cxx | 37 ++--- sdext/source/presenter/PresenterTimer.hxx | 37 ++--- sdext/source/presenter/PresenterToolBar.cxx | 37 ++--- sdext/source/presenter/PresenterToolBar.hxx | 37 ++--- .../source/presenter/PresenterViewFactory.hxx | 37 ++--- .../presenter/PresenterWindowManager.cxx | 37 ++--- .../presenter/PresenterWindowManager.hxx | 37 ++--- sdext/source/presenter/description.xml | 17 +++ .../com.sun.PresenterScreen/presenter.xhp | 39 ++--- sdext/source/presenter/manifest.xml | 17 +++ sdext/source/presenter/presenter.component | 10 +- .../data/org/openoffice/Office/Jobs.xcu | 17 +++ .../org/openoffice/Office/ProtocolHandler.xcu | 17 +++ .../Office/extension/PresenterScreen.xcu | 37 ++--- .../Office/extension/PresenterScreen.xcs | 37 ++--- 301 files changed, 4290 insertions(+), 5664 deletions(-) diff --git a/helpcompiler/Executable_helpindexer.mk b/helpcompiler/Executable_helpindexer.mk index f7249b9a66d0..6c3839c55471 100644 --- a/helpcompiler/Executable_helpindexer.mk +++ b/helpcompiler/Executable_helpindexer.mk @@ -39,7 +39,6 @@ $(eval $(call gb_Executable_use_externals,HelpIndexer,\ expat_utf8 \ libxslt \ libxml2 \ - berkeleydb \ clucene \ )) diff --git a/helpcompiler/Executable_helplinker.mk b/helpcompiler/Executable_helplinker.mk index 4682943c7d4b..dbad161b805a 100644 --- a/helpcompiler/Executable_helplinker.mk +++ b/helpcompiler/Executable_helplinker.mk @@ -39,7 +39,6 @@ $(eval $(call gb_Executable_use_externals,HelpLinker,\ expat_utf8 \ libxslt \ libxml2 \ - berkeleydb \ clucene \ )) diff --git a/helpcompiler/Library_helplinker.mk b/helpcompiler/Library_helplinker.mk index 17966c4c3291..405ad80d4fa4 100644 --- a/helpcompiler/Library_helplinker.mk +++ b/helpcompiler/Library_helplinker.mk @@ -46,7 +46,6 @@ $(eval $(call gb_Library_use_libraries,helplinker,\ )) $(eval $(call gb_Library_use_externals,helplinker,\ - berkeleydb \ expat_utf8 \ libxslt \ libxml2 \ diff --git a/helpcompiler/Makefile b/helpcompiler/Makefile index ccb1c85a04da..0997e628485b 100644 --- a/helpcompiler/Makefile +++ b/helpcompiler/Makefile @@ -1,4 +1,11 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) diff --git a/helpcompiler/inc/HelpCompiler.hxx b/helpcompiler/inc/HelpCompiler.hxx index a7c4a16a995f..f0a4177f5507 100644 --- a/helpcompiler/inc/HelpCompiler.hxx +++ b/helpcompiler/inc/HelpCompiler.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef HELPCOMPILER_HXX #define HELPCOMPILER_HXX @@ -40,11 +31,6 @@ #include #include #include -#ifdef SYSTEM_DB_HEADER -#include SYSTEM_DB_HEADER -#else -#include -#endif #include diff --git a/helpcompiler/inc/HelpLinker.hxx b/helpcompiler/inc/HelpLinker.hxx index f6b8ddb86040..57e21a5424d1 100644 --- a/helpcompiler/inc/HelpLinker.hxx +++ b/helpcompiler/inc/HelpLinker.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef HELPLINKER_HXX #define HELPLINKER_HXX @@ -36,8 +27,6 @@ # undef _THREAD_SAFE #endif -#define DBHELP_ONLY - class L10N_DLLPUBLIC IndexerPreProcessor { private: @@ -94,7 +83,7 @@ private: IndexerPreProcessor* m_pIndexerPreProcessor; void initIndexerPreProcessor(); void link() throw( HelpProcessingException ); - void addBookmark( DB* dbBase, FILE* pFile_DBHelp, std::string thishid, + void addBookmark( FILE* pFile_DBHelp, std::string thishid, const std::string& fileB, const std::string& anchorB, const std::string& jarfileB, const std::string& titleB ); }; diff --git a/helpcompiler/inc/dllapi.h b/helpcompiler/inc/dllapi.h index 184a590944ed..c82395272134 100644 --- a/helpcompiler/inc/dllapi.h +++ b/helpcompiler/inc/dllapi.h @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _L10N_DLLAPI_H #define _L10N_DLLAPI_H diff --git a/helpcompiler/source/HelpCompiler.cxx b/helpcompiler/source/HelpCompiler.cxx index 07989e4b953b..17bb2b0c9a98 100644 --- a/helpcompiler/source/HelpCompiler.cxx +++ b/helpcompiler/source/HelpCompiler.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx index 242627c0476d..62d364583f2a 100644 --- a/helpcompiler/source/HelpLinker.cxx +++ b/helpcompiler/source/HelpLinker.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include @@ -194,28 +185,6 @@ public: data.append(id); } - void dump(DB* table) - { - DataHashtable::const_iterator aEnd = _hash.end(); - for (DataHashtable::const_iterator aIter = _hash.begin(); aIter != aEnd; ++aIter) - { - const std::string &keystr = aIter->first; - DBT key; - memset(&key, 0, sizeof(key)); - key.data = const_cast(keystr.c_str()); - key.size = keystr.length(); - - const Data &data = aIter->second; - std::string str = data.getString(); - DBT value; - memset(&value, 0, sizeof(value)); - value.data = const_cast(str.c_str()); - value.size = str.length(); - - table->put(table, NULL, &key, &value, 0); - } - } - void dump_DBHelp( const fs::path& rFileName ) { #ifdef WNT //We need _wfopen to support long file paths on Windows XP @@ -257,7 +226,7 @@ namespace URLEncoder } } -void HelpLinker::addBookmark( DB* dbBase, FILE* pFile_DBHelp, std::string thishid, +void HelpLinker::addBookmark( FILE* pFile_DBHelp, std::string thishid, const std::string& fileB, const std::string& anchorB, const std::string& jarfileB, const std::string& titleB) { @@ -266,11 +235,6 @@ void HelpLinker::addBookmark( DB* dbBase, FILE* pFile_DBHelp, std::string thishi thishid = URLEncoder::encode(thishid); - DBT key; - memset(&key, 0, sizeof(key)); - key.data = const_cast(thishid.c_str()); - key.size = thishid.length(); - int fileLen = fileB.length(); if (!anchorB.empty()) fileLen += (1 + anchorB.length()); @@ -295,14 +259,6 @@ void HelpLinker::addBookmark( DB* dbBase, FILE* pFile_DBHelp, std::string thishi for (size_t j = 0; j < titleB.length(); ++j) dataB[i++] = titleB[j]; - DBT data; - memset(&data, 0, sizeof(data)); - data.data = &dataB[0]; - data.size = dataB.size(); - - if( dbBase != NULL ) - dbBase->put(dbBase, NULL, &key, &data, 0); - if( pFile_DBHelp != NULL ) { std::string aValueStr( dataB.begin(), dataB.end() ); @@ -337,10 +293,6 @@ void HelpLinker::link() throw( HelpProcessingException ) fs::create_directory(indexDirParentName); } -#ifdef CMC_DEBUG - std::cerr << "will not delete tmpdir of " << indexDirParentName.native_file_string().c_str() << std::endl; -#endif - std::string mod = module; std::transform (mod.begin(), mod.end(), mod.begin(), tocharlower); @@ -352,18 +304,8 @@ void HelpLinker::link() throw( HelpProcessingException ) appl = appl.substr(1); bool bUse_ = true; -#ifdef DBHELP_ONLY if( !bExtensionMode ) bUse_ = false; -#endif - - DB* helpText(0); -#ifndef DBHELP_ONLY - fs::path helpTextFileName(indexDirParentName / (mod + ".ht")); - db_create(&helpText,0,0); - helpText->open(helpText, NULL, helpTextFileName.native_file_string().c_str(), NULL, DB_BTREE, - DB_CREATE | DB_TRUNCATE, 0644); -#endif fs::path helpTextFileName_DBHelp(indexDirParentName / (mod + (bUse_ ? ".ht_" : ".ht"))); #ifdef WNT @@ -375,13 +317,6 @@ void HelpLinker::link() throw( HelpProcessingException ) FILE* pFileHelpText_DBHelp = fopen ( helpTextFileName_DBHelp.native_file_string().c_str(), "wb" ); #endif - DB* dbBase(0); -#ifndef DBHELP_ONLY - fs::path dbBaseFileName(indexDirParentName / (mod + ".db")); - db_create(&dbBase,0,0); - dbBase->open(dbBase, NULL, dbBaseFileName.native_file_string().c_str(), NULL, DB_BTREE, - DB_CREATE | DB_TRUNCATE, 0644); -#endif fs::path dbBaseFileName_DBHelp(indexDirParentName / (mod + (bUse_ ? ".db_" : ".db"))); #ifdef WNT @@ -393,14 +328,6 @@ void HelpLinker::link() throw( HelpProcessingException ) ( dbBaseFileName_DBHelp.native_file_string().c_str(), "wb" ); #endif -#ifndef DBHELP_ONLY - DB* keyWord(0); - fs::path keyWordFileName(indexDirParentName / (mod + ".key")); - db_create(&keyWord,0,0); - keyWord->open(keyWord, NULL, keyWordFileName.native_file_string().c_str(), NULL, DB_BTREE, - DB_CREATE | DB_TRUNCATE, 0644); -#endif - fs::path keyWordFileName_DBHelp(indexDirParentName / (mod + (bUse_ ? ".key_" : ".key"))); HelpKeyword helpKeyword; @@ -484,11 +411,7 @@ void HelpLinker::link() throw( HelpProcessingException ) std::string& titleB = documentTitle; // add once this as its own id. - addBookmark(dbBase, pFileDbBase_DBHelp, documentPath, fileB, std::string(), jarfileB, titleB); - - // first the database *.db - // ByteArrayInputStream bais = null; - // ObjectInputStream ois = null; + addBookmark( pFileDbBase_DBHelp, documentPath, fileB, std::string(), jarfileB, titleB); const HashSet *hidlist = streamTable.appl_hidlist; if (!hidlist) @@ -509,7 +432,7 @@ void HelpLinker::link() throw( HelpProcessingException ) anchorB = thishid.substr(1 + index); thishid = thishid.substr(0, index); } - addBookmark(dbBase, pFileDbBase_DBHelp, thishid, fileB, anchorB, jarfileB, titleB); + addBookmark( pFileDbBase_DBHelp, thishid, fileB, anchorB, jarfileB, titleB); } } @@ -525,8 +448,8 @@ void HelpLinker::link() throw( HelpProcessingException ) enumer != aEnd; ++enumer) { const std::string &anchor = enumer->first; - addBookmark(dbBase, pFileDbBase_DBHelp, documentPath, fileB, - anchor, jarfileB, titleB); + addBookmark(pFileDbBase_DBHelp, documentPath, fileB, + anchor, jarfileB, titleB); std::string totalId = fakedHid + "#" + anchor; // std::cerr << hzipFileName << std::endl; const LinkedList& ll = enumer->second; @@ -555,19 +478,6 @@ void HelpLinker::link() throw( HelpProcessingException ) helpTextId = URLEncoder::encode(helpTextId); - DBT keyDbt; - memset(&keyDbt, 0, sizeof(keyDbt)); - keyDbt.data = const_cast(helpTextId.c_str()); - keyDbt.size = helpTextId.length(); - - DBT textDbt; - memset(&textDbt, 0, sizeof(textDbt)); - textDbt.data = const_cast(helpTextText.c_str()); - textDbt.size = helpTextText.length(); - - if( helpText != NULL ) - helpText->put(helpText, NULL, &keyDbt, &textDbt, 0); - if( pFileHelpText_DBHelp != NULL ) writeKeyValue_DBHelp( pFileHelpText_DBHelp, helpTextId, helpTextText ); } @@ -594,11 +504,6 @@ void HelpLinker::link() throw( HelpProcessingException ) catch( const HelpProcessingException& ) { // catch HelpProcessingException to avoid locking data bases -#ifndef DBHELP_ONLY - helpText->close(helpText, 0); - dbBase->close(dbBase, 0); - keyWord->close(keyWord, 0); -#endif if( pFileHelpText_DBHelp != NULL ) fclose( pFileHelpText_DBHelp ); if( pFileDbBase_DBHelp != NULL ) @@ -606,12 +511,6 @@ void HelpLinker::link() throw( HelpProcessingException ) throw; } -#ifndef DBHELP_ONLY - helpText->close(helpText, 0); - dbBase->close(dbBase, 0); - helpKeyword.dump(keyWord); - keyWord->close(keyWord, 0); -#endif if( pFileHelpText_DBHelp != NULL ) fclose( pFileHelpText_DBHelp ); if( pFileDbBase_DBHelp != NULL ) diff --git a/helpcompiler/source/HelpLinker_main.cxx b/helpcompiler/source/HelpLinker_main.cxx index 1c5ca7e3372f..8542a761f5df 100644 --- a/helpcompiler/source/HelpLinker_main.cxx +++ b/helpcompiler/source/HelpLinker_main.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/reportdesign/Makefile b/reportdesign/Makefile index ccb1c85a04da..0997e628485b 100644 --- a/reportdesign/Makefile +++ b/reportdesign/Makefile @@ -1,4 +1,11 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) diff --git a/reportdesign/inc/ModuleHelper.hxx b/reportdesign/inc/ModuleHelper.hxx index 297216ed4af7..541d0cbe8bcb 100644 --- a/reportdesign/inc/ModuleHelper.hxx +++ b/reportdesign/inc/ModuleHelper.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _RPTUI_MODULE_HELPER_RPT_HXX_ #define _RPTUI_MODULE_HELPER_RPT_HXX_ diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx index 3d5126464fa3..ebe30d867aaf 100644 --- a/reportdesign/inc/ReportDefinition.hxx +++ b/reportdesign/inc/ReportDefinition.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef REPORTDESIGN_API_REPORTDEFINITION_HXX #define REPORTDESIGN_API_REPORTDEFINITION_HXX diff --git a/reportdesign/inc/ReportVisitor.hxx b/reportdesign/inc/ReportVisitor.hxx index b22847112042..c48b41aa8429 100644 --- a/reportdesign/inc/ReportVisitor.hxx +++ b/reportdesign/inc/ReportVisitor.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_REPORT_VISTITOR_HXX #define INCLUDED_REPORT_VISTITOR_HXX diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx index 95765bbe3f71..e415765466a8 100644 --- a/reportdesign/inc/RptDef.hxx +++ b/reportdesign/inc/RptDef.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _REPORT_RPTUIDEF_HXX #define _REPORT_RPTUIDEF_HXX diff --git a/reportdesign/inc/RptModel.hxx b/reportdesign/inc/RptModel.hxx index 8ee243b8273d..38983a0e34e9 100644 --- a/reportdesign/inc/RptModel.hxx +++ b/reportdesign/inc/RptModel.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef REPORT_RPTMODEL_HXX #define REPORT_RPTMODEL_HXX diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx index 4084a4770e32..7a11c4e52c50 100644 --- a/reportdesign/inc/RptObject.hxx +++ b/reportdesign/inc/RptObject.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _REPORT_RPTUIOBJ_HXX #define _REPORT_RPTUIOBJ_HXX diff --git a/reportdesign/inc/RptPage.hxx b/reportdesign/inc/RptPage.hxx index bd3a768ed0cc..f43de616eb7b 100644 --- a/reportdesign/inc/RptPage.hxx +++ b/reportdesign/inc/RptPage.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _REPORT_RPTUIPAGE_HXX #define _REPORT_RPTUIPAGE_HXX diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx index e8cbfe8b0725..b11a55537d16 100644 --- a/reportdesign/inc/UndoActions.hxx +++ b/reportdesign/inc/UndoActions.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef RPTUI_UNDOACTIONS_HXX #define RPTUI_UNDOACTIONS_HXX diff --git a/reportdesign/inc/reportformula.hxx b/reportdesign/inc/reportformula.hxx index 7604fede8153..01f502bf59de 100644 --- a/reportdesign/inc/reportformula.hxx +++ b/reportdesign/inc/reportformula.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef REPORTFORMULA_HXX #define REPORTFORMULA_HXX diff --git a/reportdesign/prj/rpt.xml b/reportdesign/prj/rpt.xml index efc28985c639..a7b2539e5f6f 100644 --- a/reportdesign/prj/rpt.xml +++ b/reportdesign/prj/rpt.xml @@ -1,5 +1,22 @@ + reportdesign diff --git a/reportdesign/qa/complex/reportdesign/runner.props b/reportdesign/qa/complex/reportdesign/runner.props index 2312de9f55d2..e663320b6671 100644 --- a/reportdesign/qa/complex/reportdesign/runner.props +++ b/reportdesign/qa/complex/reportdesign/runner.props @@ -1,3 +1,21 @@ +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# This file incorporates work covered by the following license notice: +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . +# + # where to store created documents wntmsci.DOC_COMPARATOR_OUTPUT_PATH=\\\\so-gfxcmp-lin\\doc-pool\\reporttest unxlngi.DOC_COMPARATOR_OUTPUT_PATH=/net/so-gfxcmp-lin/export/gfxcmp/document-pool/reporttest diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx index 4cd06eeae952..b2c3dbe26734 100644 --- a/reportdesign/source/core/api/FixedLine.cxx +++ b/reportdesign/source/core/api/FixedLine.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "FixedLine.hxx" #include #include "corestrings.hrc" diff --git a/reportdesign/source/core/api/FixedText.cxx b/reportdesign/source/core/api/FixedText.cxx index dd47a11cb54f..2d127a1eac0f 100644 --- a/reportdesign/source/core/api/FixedText.cxx +++ b/reportdesign/source/core/api/FixedText.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "FixedText.hxx" #include #include "corestrings.hrc" diff --git a/reportdesign/source/core/api/FormattedField.cxx b/reportdesign/source/core/api/FormattedField.cxx index ddd4125a6a84..a05fc557f320 100644 --- a/reportdesign/source/core/api/FormattedField.cxx +++ b/reportdesign/source/core/api/FormattedField.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "FormattedField.hxx" #include #include diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx index c11bb7e43606..5e2288ffd14a 100644 --- a/reportdesign/source/core/api/Group.cxx +++ b/reportdesign/source/core/api/Group.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "Group.hxx" #include "Section.hxx" #include diff --git a/reportdesign/source/core/api/ImageControl.cxx b/reportdesign/source/core/api/ImageControl.cxx index 0b7e55cbc1fb..99081f7159c7 100644 --- a/reportdesign/source/core/api/ImageControl.cxx +++ b/reportdesign/source/core/api/ImageControl.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "ImageControl.hxx" #include #include diff --git a/reportdesign/source/core/api/ReportControlModel.cxx b/reportdesign/source/core/api/ReportControlModel.cxx index a1617d75d86f..f6138af9db3e 100644 --- a/reportdesign/source/core/api/ReportControlModel.cxx +++ b/reportdesign/source/core/api/ReportControlModel.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "ReportControlModel.hxx" #include #include diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index ca28b10cd66a..cd764ddaf7cb 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "ReportDefinition.hxx" #include "FixedLine.hxx" diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx index 9f88f51cbebc..27b26e38c4c8 100644 --- a/reportdesign/source/core/api/ReportEngineJFree.cxx +++ b/reportdesign/source/core/api/ReportEngineJFree.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include "ReportEngineJFree.hxx" #include diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx index 186a4a86cf3c..12788fd0491e 100644 --- a/reportdesign/source/core/api/Section.cxx +++ b/reportdesign/source/core/api/Section.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "Section.hxx" #include #include diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx index b92a23382f9a..d57fb95e278c 100644 --- a/reportdesign/source/core/api/Shape.cxx +++ b/reportdesign/source/core/api/Shape.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "Shape.hxx" #include diff --git a/reportdesign/source/core/api/services.cxx b/reportdesign/source/core/api/services.cxx index 056b6da119a4..91e2490917e4 100644 --- a/reportdesign/source/core/api/services.cxx +++ b/reportdesign/source/core/api/services.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/types.h" #include #include diff --git a/reportdesign/source/core/inc/Tools.hxx b/reportdesign/source/core/inc/Tools.hxx index f9a00b6bbd3f..94d6a4d28a26 100644 --- a/reportdesign/source/core/inc/Tools.hxx +++ b/reportdesign/source/core/inc/Tools.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef REPORTDESIGN_TOOLS_HXX #define REPORTDESIGN_TOOLS_HXX diff --git a/reportdesign/source/core/misc/conditionalexpression.cxx b/reportdesign/source/core/misc/conditionalexpression.cxx index 2630af52fde1..826ef1feebca 100644 --- a/reportdesign/source/core/misc/conditionalexpression.cxx +++ b/reportdesign/source/core/misc/conditionalexpression.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "conditionalexpression.hxx" //........................................................................ diff --git a/reportdesign/source/core/misc/conditionupdater.cxx b/reportdesign/source/core/misc/conditionupdater.cxx index 20f37015d040..b3718109f56a 100644 --- a/reportdesign/source/core/misc/conditionupdater.cxx +++ b/reportdesign/source/core/misc/conditionupdater.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "conditionupdater.hxx" #include "reportformula.hxx" diff --git a/reportdesign/source/core/misc/reportformula.cxx b/reportdesign/source/core/misc/reportformula.cxx index fce2bd67a193..f1431e4c8f8d 100644 --- a/reportdesign/source/core/misc/reportformula.cxx +++ b/reportdesign/source/core/misc/reportformula.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "reportformula.hxx" diff --git a/reportdesign/source/core/resource/core_resource.cxx b/reportdesign/source/core/resource/core_resource.cxx index 5aacfa4775b8..7dc6f01551d5 100644 --- a/reportdesign/source/core/resource/core_resource.cxx +++ b/reportdesign/source/core/resource/core_resource.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "core_resource.hxx" #include diff --git a/reportdesign/source/core/sdr/ModuleHelper.cxx b/reportdesign/source/core/sdr/ModuleHelper.cxx index f6f6071765ef..aa117162f885 100644 --- a/reportdesign/source/core/sdr/ModuleHelper.cxx +++ b/reportdesign/source/core/sdr/ModuleHelper.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "ModuleHelper.hxx" #include #include diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx b/reportdesign/source/core/sdr/PropertyForward.cxx index 9c8cc05162f5..5c1ee6a8b10e 100644 --- a/reportdesign/source/core/sdr/PropertyForward.cxx +++ b/reportdesign/source/core/sdr/PropertyForward.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "PropertyForward.hxx" #include #include diff --git a/reportdesign/source/core/sdr/ReportDrawPage.cxx b/reportdesign/source/core/sdr/ReportDrawPage.cxx index bcfd5b5c2e75..11cf7cc7c3d2 100644 --- a/reportdesign/source/core/sdr/ReportDrawPage.cxx +++ b/reportdesign/source/core/sdr/ReportDrawPage.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "ReportDrawPage.hxx" #include "RptObject.hxx" #include "RptModel.hxx" diff --git a/reportdesign/source/core/sdr/ReportUndoFactory.cxx b/reportdesign/source/core/sdr/ReportUndoFactory.cxx index 054b3dd311cc..8d418afd5aa5 100644 --- a/reportdesign/source/core/sdr/ReportUndoFactory.cxx +++ b/reportdesign/source/core/sdr/ReportUndoFactory.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "ReportUndoFactory.hxx" #include "RptObject.hxx" #include "UndoActions.hxx" diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx index 9ad105c43d70..47b0b6c6178c 100644 --- a/reportdesign/source/core/sdr/RptModel.cxx +++ b/reportdesign/source/core/sdr/RptModel.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "RptModel.hxx" #include "RptPage.hxx" diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index 699a755e8902..13fb18ae6372 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "RptObject.hxx" #include #include diff --git a/reportdesign/source/core/sdr/RptObjectListener.cxx b/reportdesign/source/core/sdr/RptObjectListener.cxx index 666e6e722154..8ac300850e02 100644 --- a/reportdesign/source/core/sdr/RptObjectListener.cxx +++ b/reportdesign/source/core/sdr/RptObjectListener.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "RptObjectListener.hxx" #include "RptObject.hxx" #include "RptDef.hxx" diff --git a/reportdesign/source/core/sdr/RptPage.cxx b/reportdesign/source/core/sdr/RptPage.cxx index 2ebbd53a2603..6b843584f9e5 100644 --- a/reportdesign/source/core/sdr/RptPage.cxx +++ b/reportdesign/source/core/sdr/RptPage.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "RptPage.hxx" #include "RptModel.hxx" #include "Section.hxx" diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx index d986f47ea1ba..c6fc902a1ce7 100644 --- a/reportdesign/source/core/sdr/UndoActions.cxx +++ b/reportdesign/source/core/sdr/UndoActions.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "UndoActions.hxx" #include "UndoEnv.hxx" diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx index bda520b8afb6..41c13e2f1d19 100644 --- a/reportdesign/source/core/sdr/UndoEnv.cxx +++ b/reportdesign/source/core/sdr/UndoEnv.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "UndoActions.hxx" #include "UndoEnv.hxx" #include "formatnormalizer.hxx" diff --git a/reportdesign/source/core/sdr/formatnormalizer.cxx b/reportdesign/source/core/sdr/formatnormalizer.cxx index 8373575dc7b8..b4258e7334c5 100644 --- a/reportdesign/source/core/sdr/formatnormalizer.cxx +++ b/reportdesign/source/core/sdr/formatnormalizer.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "formatnormalizer.hxx" #include "RptModel.hxx" diff --git a/reportdesign/source/filter/xml/dbloader2.cxx b/reportdesign/source/filter/xml/dbloader2.cxx index 3b5ddd9172cb..71fc57682add 100644 --- a/reportdesign/source/filter/xml/dbloader2.cxx +++ b/reportdesign/source/filter/xml/dbloader2.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "dbloader2.hxx" #include #include diff --git a/reportdesign/source/filter/xml/dbloader2.hxx b/reportdesign/source/filter/xml/dbloader2.hxx index b7f3b4259a1c..ea6623d2f9d7 100644 --- a/reportdesign/source/filter/xml/dbloader2.hxx +++ b/reportdesign/source/filter/xml/dbloader2.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef RPTXML_DBLOADER2_HXX #define RPTXML_DBLOADER2_HXX diff --git a/reportdesign/source/filter/xml/xmlAutoStyle.cxx b/reportdesign/source/filter/xml/xmlAutoStyle.cxx index e5f52bceb756..faf0d94fdea3 100644 --- a/reportdesign/source/filter/xml/xmlAutoStyle.cxx +++ b/reportdesign/source/filter/xml/xmlAutoStyle.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "xmlAutoStyle.hxx" #include "xmlHelper.hxx" #include "xmlExport.hxx" diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx index c4071eb96a72..87df50d2b6ab 100644 --- a/reportdesign/source/filter/xml/xmlCell.cxx +++ b/reportdesign/source/filter/xml/xmlCell.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "xmlCell.hxx" #include "xmlHelper.hxx" #include diff --git a/reportdesign/source/filter/xml/xmlColumn.cxx b/reportdesign/source/filter/xml/xmlColumn.cxx index 0a584381fa16..3f4eb4ca4c19 100644 --- a/reportdesign/source/filter/xml/xmlColumn.cxx +++ b/reportdesign/source/filter/xml/xmlColumn.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "xmlColumn.hxx" #include diff --git a/reportdesign/source/filter/xml/xmlComponent.cxx b/reportdesign/source/filter/xml/xmlComponent.cxx index d790dfa282b0..47c85568d73c 100644 --- a/reportdesign/source/filter/xml/xmlComponent.cxx +++ b/reportdesign/source/filter/xml/xmlComponent.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "xmlComponent.hxx" #include "xmlfilter.hxx" #include diff --git a/reportdesign/source/filter/xml/xmlComponent.hxx b/reportdesign/source/filter/xml/xmlComponent.hxx index 9797b8e2d632..fadd5247c839 100644 --- a/reportdesign/source/filter/xml/xmlComponent.hxx +++ b/reportdesign/source/filter/xml/xmlComponent.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef RPT_XMLCOMPONENT_HXX #define RPT_XMLCOMPONENT_HXX diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx index 541b50064a74..b3fb83285d0c 100644 --- a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx +++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "xmlCondPrtExpr.hxx" #include "xmlfilter.hxx" #include diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx index 346451d47b91..c5929c2a4a97 100644 --- a/reportdesign/source/filter/xml/xmlControlProperty.cxx +++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "xmlControlProperty.hxx" diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 9f3ce57bf259..18b71bdf4780 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "xmlExport.hxx" #include "xmlAutoStyle.hxx" diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx index 75155732a956..d73a9d931ab3 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "xmlExportDocumentHandler.hxx" #include diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx index 292f9e96d7da..06273c372d50 100644 --- a/reportdesign/source/filter/xml/xmlFixedContent.cxx +++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "xmlFixedContent.hxx" #include "xmlfilter.hxx" #include diff --git a/reportdesign/source/filter/xml/xmlFixedContent.hxx b/reportdesign/source/filter/xml/xmlFixedContent.hxx index f1b0fa85ebe7..f6076e9d658d 100644 --- a/reportdesign/source/filter/xml/xmlFixedContent.hxx +++ b/reportdesign/source/filter/xml/xmlFixedContent.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef RPT_XMLFIXEDCONTENT_HXX #define RPT_XMLFIXEDCONTENT_HXX diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.cxx b/reportdesign/source/filter/xml/xmlFormatCondition.cxx index 3ff6a531b546..612fda8cd41c 100644 --- a/reportdesign/source/filter/xml/xmlFormatCondition.cxx +++ b/reportdesign/source/filter/xml/xmlFormatCondition.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "xmlFormatCondition.hxx" #include "xmlfilter.hxx" #include diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx b/reportdesign/source/filter/xml/xmlFormattedField.cxx index 0f94c6baeae2..503c27aeebae 100644 --- a/reportdesign/source/filter/xml/xmlFormattedField.cxx +++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "xmlFormattedField.hxx" #include "xmlfilter.hxx" #include diff --git a/reportdesign/source/filter/xml/xmlFunction.cxx b/reportdesign/source/filter/xml/xmlFunction.cxx index d9d727b01973..9b1ddfe6f7b8 100644 --- a/reportdesign/source/filter/xml/xmlFunction.cxx +++ b/reportdesign/source/filter/xml/xmlFunction.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "xmlFunction.hxx" #include "xmlfilter.hxx" #include diff --git a/reportdesign/source/filter/xml/xmlFunction.hxx b/reportdesign/source/filter/xml/xmlFunction.hxx index 1a3f9a06d6bf..ffcdb5b2ddfd 100644 --- a/reportdesign/source/filter/xml/xmlFunction.hxx +++ b/reportdesign/source/filter/xml/xmlFunction.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef RPT_XMLFUNCTION_HXX #define RPT_XMLFUNCTION_HXX diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx index 7ebca1fd8494..90bcba28d0d2 100644 --- a/reportdesign/source/filter/xml/xmlGroup.cxx +++ b/reportdesign/source/filter/xml/xmlGroup.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "xmlGroup.hxx" #include "xmlSection.hxx" #include "xmlFunction.hxx" diff --git a/reportdesign/source/filter/xml/xmlGroup.hxx b/reportdesign/source/filter/xml/xmlGroup.hxx index 31d31fea2742..4b68be4ffc1c 100644 --- a/reportdesign/source/filter/xml/xmlGroup.hxx +++ b/reportdesign/source/filter/xml/xmlGroup.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef RPT_XMLGROUP_HXX #define RPT_XMLGROUP_HXX diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx index 7009fd062e94..1bb3c718c4e8 100644 --- a/reportdesign/source/filter/xml/xmlHelper.cxx +++ b/reportdesign/source/filter/xml/xmlHelper.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "xmlHelper.hxx" #include #include diff --git a/reportdesign/source/filter/xml/xmlImage.cxx b/reportdesign/source/filter/xml/xmlImage.cxx index 24a97c3d2804..ca9e02f7b1e2 100644 --- a/reportdesign/source/filter/xml/xmlImage.cxx +++ b/reportdesign/source/filter/xml/xmlImage.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "xmlImage.hxx" #include "xmlfilter.hxx" #include diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx index 215d5301338c..0e61365537fe 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "xmlImportDocumentHandler.hxx" #include diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx index efed1a7f69f1..a890f6266d36 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef RPT_IMPORTDOCUMENTHANDLER_HXX_INCLUDED #define RPT_IMPORTDOCUMENTHANDLER_HXX_INCLUDED diff --git a/reportdesign/source/filter/xml/xmlMasterFields.cxx b/reportdesign/source/filter/xml/xmlMasterFields.cxx index 735a35038f39..591650fc0cc6 100644 --- a/reportdesign/source/filter/xml/xmlMasterFields.cxx +++ b/reportdesign/source/filter/xml/xmlMasterFields.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "xmlMasterFields.hxx" #include "xmlfilter.hxx" #include diff --git a/reportdesign/source/filter/xml/xmlReport.cxx b/reportdesign/source/filter/xml/xmlReport.cxx index 8dbc4ad0bf3e..0fe6a3787366 100644 --- a/reportdesign/source/filter/xml/xmlReport.cxx +++ b/reportdesign/source/filter/xml/xmlReport.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "xmlReport.hxx" #include "xmlfilter.hxx" #include diff --git a/reportdesign/source/filter/xml/xmlReportElement.cxx b/reportdesign/source/filter/xml/xmlReportElement.cxx index ca92401324b9..c857e8af7a18 100644 --- a/reportdesign/source/filter/xml/xmlReportElement.cxx +++ b/reportdesign/source/filter/xml/xmlReportElement.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "xmlReportElement.hxx" #include "xmlfilter.hxx" #include diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.cxx b/reportdesign/source/filter/xml/xmlReportElementBase.cxx index 5c2a14726e4a..9579f63753ef 100644 --- a/reportdesign/source/filter/xml/xmlReportElementBase.cxx +++ b/reportdesign/source/filter/xml/xmlReportElementBase.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "xmlReportElementBase.hxx" #include "xmlfilter.hxx" #include "xmlControlProperty.hxx" diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.hxx b/reportdesign/source/filter/xml/xmlReportElementBase.hxx index 692c84fdb88d..c9401c056be2 100644 --- a/reportdesign/source/filter/xml/xmlReportElementBase.hxx +++ b/reportdesign/source/filter/xml/xmlReportElementBase.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef RPT_XMLREPORTELEMENTBASE_HXX #define RPT_XMLREPORTELEMENTBASE_HXX diff --git a/reportdesign/source/filter/xml/xmlSection.cxx b/reportdesign/source/filter/xml/xmlSection.cxx index 7a61d0db8fc9..ca5419dc8299 100644 --- a/reportdesign/source/filter/xml/xmlSection.cxx +++ b/reportdesign/source/filter/xml/xmlSection.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "xmlSection.hxx" #include "xmlfilter.hxx" #include diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx index e5d0beb9ee70..c6da98c813c1 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.cxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "xmlStyleImport.hxx" #include #include diff --git a/reportdesign/source/filter/xml/xmlSubDocument.cxx b/reportdesign/source/filter/xml/xmlSubDocument.cxx index cb41bea62212..c59810f4fcc0 100644 --- a/reportdesign/source/filter/xml/xmlSubDocument.cxx +++ b/reportdesign/source/filter/xml/xmlSubDocument.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "xmlSubDocument.hxx" #include "xmlCell.hxx" #include "xmlfilter.hxx" diff --git a/reportdesign/source/filter/xml/xmlTable.cxx b/reportdesign/source/filter/xml/xmlTable.cxx index 7f2d85178834..f79deceac6cc 100644 --- a/reportdesign/source/filter/xml/xmlTable.cxx +++ b/reportdesign/source/filter/xml/xmlTable.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "xmlTable.hxx" #include "xmlfilter.hxx" #include diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index bb919568354b..b9d2daf488d1 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include #include diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx index 07bc1fc42f8e..bb597deaeef1 100644 --- a/reportdesign/source/filter/xml/xmlfilter.hxx +++ b/reportdesign/source/filter/xml/xmlfilter.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef RPT_XMLFILTER_HXX #define RPT_XMLFILTER_HXX diff --git a/reportdesign/source/filter/xml/xmlservices.cxx b/reportdesign/source/filter/xml/xmlservices.cxx index ba1388f65921..0bcaa49be56c 100644 --- a/reportdesign/source/filter/xml/xmlservices.cxx +++ b/reportdesign/source/filter/xml/xmlservices.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include #include diff --git a/reportdesign/source/inc/constasciistring.hxx b/reportdesign/source/inc/constasciistring.hxx index f4d38af3f5f4..a7e5497a5be0 100644 --- a/reportdesign/source/inc/constasciistring.hxx +++ b/reportdesign/source/inc/constasciistring.hxx @@ -1,4 +1,22 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + #ifndef _RPTSHARED_CONSTASCIISTRING_HXX_ #define _RPTSHARED_CONSTASCIISTRING_HXX_ diff --git a/reportdesign/source/inc/corestrings.hrc b/reportdesign/source/inc/corestrings.hrc index 0fb95ea0b364..7d0bb983f8d0 100644 --- a/reportdesign/source/inc/corestrings.hrc +++ b/reportdesign/source/inc/corestrings.hrc @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef REPORTDESIGN_SHARED_CORESTRINGS_HRC #define REPORTDESIGN_SHARED_CORESTRINGS_HRC diff --git a/reportdesign/source/inc/uistrings.hrc b/reportdesign/source/inc/uistrings.hrc index b3543c37724e..0c34944a4423 100644 --- a/reportdesign/source/inc/uistrings.hrc +++ b/reportdesign/source/inc/uistrings.hrc @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef REPORTDESIGN_SHARED_UISTRINGS_HRC #define REPORTDESIGN_SHARED_UISTRINGS_HRC diff --git a/reportdesign/source/inc/xmlstrings.hrc b/reportdesign/source/inc/xmlstrings.hrc index 8755a399c9f6..ea85f50323f0 100644 --- a/reportdesign/source/inc/xmlstrings.hrc +++ b/reportdesign/source/inc/xmlstrings.hrc @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef REPORTDESIGN_SHARED_XMLSTRINGS_HRC #define REPORTDESIGN_SHARED_XMLSTRINGS_HRC diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index e1b909246354..d57bef7cc600 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "AddField.hxx" #include "UITools.hxx" #include diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx index ec341d1c1c3b..360d2ca1d23d 100644 --- a/reportdesign/source/ui/dlg/CondFormat.cxx +++ b/reportdesign/source/ui/dlg/CondFormat.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "CondFormat.hxx" #include "CondFormat.hrc" diff --git a/reportdesign/source/ui/dlg/CondFormat.src b/reportdesign/source/ui/dlg/CondFormat.src index 5ba0a87445e4..22f9d3b4f4e6 100644 --- a/reportdesign/source/ui/dlg/CondFormat.src +++ b/reportdesign/source/ui/dlg/CondFormat.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "CondFormat.hrc" #include "RptResId.hrc" #include "helpids.hrc" diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index f2883654ef63..8fbd4987e889 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "Condition.hxx" #include "UITools.hxx" diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx index 8df9bd35d850..b46b2e768915 100644 --- a/reportdesign/source/ui/dlg/Condition.hxx +++ b/reportdesign/source/ui/dlg/Condition.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef RPTUI_CONDITION_HXX #define RPTUI_CONDITION_HXX diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx index 3212681c325f..22aaa324732e 100644 --- a/reportdesign/source/ui/dlg/DateTime.cxx +++ b/reportdesign/source/ui/dlg/DateTime.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "DateTime.hxx" #include "DateTime.hrc" #include diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index 6a434dd6dc72..73363f077f18 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 1633f61ae79b..7b29560b2787 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "GroupsSorting.hxx" #include "GroupsSorting.hrc" #include diff --git a/reportdesign/source/ui/dlg/GroupsSorting.src b/reportdesign/source/ui/dlg/GroupsSorting.src index b80f39a15420..91f2f47269a0 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.src +++ b/reportdesign/source/ui/dlg/GroupsSorting.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "GroupsSorting.hrc" #include "RptResId.hrc" #include "helpids.hrc" diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index b508dda91257..26baf9fe5077 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "Navigator.hxx" diff --git a/reportdesign/source/ui/dlg/Navigator.src b/reportdesign/source/ui/dlg/Navigator.src index 7d81a13030bd..2a84f47e36fc 100644 --- a/reportdesign/source/ui/dlg/Navigator.src +++ b/reportdesign/source/ui/dlg/Navigator.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "RptResId.hrc" #include "helpids.hrc" #include "rptui_slotid.hrc" diff --git a/reportdesign/source/ui/dlg/PageNumber.src b/reportdesign/source/ui/dlg/PageNumber.src index 8fc0fd1b3483..640a4c6af998 100644 --- a/reportdesign/source/ui/dlg/PageNumber.src +++ b/reportdesign/source/ui/dlg/PageNumber.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "PageNumber.hrc" #include "RptResId.hrc" #include "helpids.hrc" diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx index 651f2408d03f..25fad2968d2c 100644 --- a/reportdesign/source/ui/dlg/dlgpage.cxx +++ b/reportdesign/source/ui/dlg/dlgpage.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/reportdesign/source/ui/dlg/dlgpage.src b/reportdesign/source/ui/dlg/dlgpage.src index b9361ae54441..60f0fa989d31 100644 --- a/reportdesign/source/ui/dlg/dlgpage.src +++ b/reportdesign/source/ui/dlg/dlgpage.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include "RptResId.hrc" diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx index 374ec169a055..81198a25c4ef 100644 --- a/reportdesign/source/ui/inc/AddField.hxx +++ b/reportdesign/source/ui/inc/AddField.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef RPTUI_ADDFIELDWINDOW_HXX #define RPTUI_ADDFIELDWINDOW_HXX diff --git a/reportdesign/source/ui/inc/CondFormat.hxx b/reportdesign/source/ui/inc/CondFormat.hxx index bc1ef7edf2b7..465f02aebd63 100644 --- a/reportdesign/source/ui/inc/CondFormat.hxx +++ b/reportdesign/source/ui/inc/CondFormat.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef RPTUI_CONDFORMAT_HXX #define RPTUI_CONDFORMAT_HXX diff --git a/reportdesign/source/ui/inc/DataProviderHandler.hxx b/reportdesign/source/ui/inc/DataProviderHandler.hxx index 9fa7e61616a1..102b52c6aa4d 100644 --- a/reportdesign/source/ui/inc/DataProviderHandler.hxx +++ b/reportdesign/source/ui/inc/DataProviderHandler.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef RPT_DATAPROVIDERHANDLER_HXX #define RPT_DATAPROVIDERHANDLER_HXX diff --git a/reportdesign/source/ui/inc/DateTime.hxx b/reportdesign/source/ui/inc/DateTime.hxx index 4d6f9a233a55..ae709eec530a 100644 --- a/reportdesign/source/ui/inc/DateTime.hxx +++ b/reportdesign/source/ui/inc/DateTime.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef RPTUI_DATETIME_HXX #define RPTUI_DATETIME_HXX diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx index af115410bbd3..37edf05fe71f 100644 --- a/reportdesign/source/ui/inc/DesignView.hxx +++ b/reportdesign/source/ui/inc/DesignView.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef RPTUI_DESIGNVIEW_HXX #define RPTUI_DESIGNVIEW_HXX diff --git a/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx index 8e16fceadf40..5688f1721087 100644 --- a/reportdesign/source/ui/inc/Formula.hxx +++ b/reportdesign/source/ui/inc/Formula.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef RPTUI_FORMULA_HXX #define RPTUI_FORMULA_HXX diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx b/reportdesign/source/ui/inc/GeometryHandler.hxx index 68053cd2c062..08b71ef48529 100644 --- a/reportdesign/source/ui/inc/GeometryHandler.hxx +++ b/reportdesign/source/ui/inc/GeometryHandler.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef RPT_GEOMETRYHANDLER_HXX #define RPT_GEOMETRYHANDLER_HXX diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx index 22f195bac07e..1b67a6d5506a 100644 --- a/reportdesign/source/ui/inc/GroupsSorting.hxx +++ b/reportdesign/source/ui/inc/GroupsSorting.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef RPTUI_GROUPS_SORTING_HXX #define RPTUI_GROUPS_SORTING_HXX diff --git a/reportdesign/source/ui/inc/MarkedSection.hxx b/reportdesign/source/ui/inc/MarkedSection.hxx index 2a441ab3c4bb..7fa6c2e6a349 100644 --- a/reportdesign/source/ui/inc/MarkedSection.hxx +++ b/reportdesign/source/ui/inc/MarkedSection.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef RPTUI_MARKEDSECTION_HXX #define RPTUI_MARKEDSECTION_HXX diff --git a/reportdesign/source/ui/inc/ReportComponentHandler.hxx b/reportdesign/source/ui/inc/ReportComponentHandler.hxx index b315743e50f1..833513ce9c45 100644 --- a/reportdesign/source/ui/inc/ReportComponentHandler.hxx +++ b/reportdesign/source/ui/inc/ReportComponentHandler.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef RPT_REPORTCOMPONENTHANDLER_HXX #define RPT_REPORTCOMPONENTHANDLER_HXX diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx index 8c07708681e6..004cbe73b105 100644 --- a/reportdesign/source/ui/inc/ReportController.hxx +++ b/reportdesign/source/ui/inc/ReportController.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef RPTUI_REPORTCONTROLLER_HXX #define RPTUI_REPORTCONTROLLER_HXX diff --git a/reportdesign/source/ui/inc/ReportControllerObserver.hxx b/reportdesign/source/ui/inc/ReportControllerObserver.hxx index 9beba004407b..d53959c600b3 100644 --- a/reportdesign/source/ui/inc/ReportControllerObserver.hxx +++ b/reportdesign/source/ui/inc/ReportControllerObserver.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_REPORTCONTROLLEROBSERVER_HXX #define INCLUDED_REPORTCONTROLLEROBSERVER_HXX diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx index ef9ae1e156a7..43d6eacbd9db 100644 --- a/reportdesign/source/ui/inc/ReportWindow.hxx +++ b/reportdesign/source/ui/inc/ReportWindow.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef RPTUI_REPORT_WINDOW_HXX #define RPTUI_REPORT_WINDOW_HXX diff --git a/reportdesign/source/ui/inc/RptUndo.hxx b/reportdesign/source/ui/inc/RptUndo.hxx index a9a0be8c0e5d..1e36634a9a03 100644 --- a/reportdesign/source/ui/inc/RptUndo.hxx +++ b/reportdesign/source/ui/inc/RptUndo.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef RPTUI_UNDO_HXX #define RPTUI_UNDO_HXX diff --git a/reportdesign/source/ui/inc/StartMarker.hxx b/reportdesign/source/ui/inc/StartMarker.hxx index 2ae45214b44b..6bfe03a55849 100644 --- a/reportdesign/source/ui/inc/StartMarker.hxx +++ b/reportdesign/source/ui/inc/StartMarker.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef RPTUI_STARTMARKER_HXX #define RPTUI_STARTMARKER_HXX diff --git a/reportdesign/source/ui/inc/UITools.hxx b/reportdesign/source/ui/inc/UITools.hxx index 569c0b138e7c..29b7c4c1095d 100644 --- a/reportdesign/source/ui/inc/UITools.hxx +++ b/reportdesign/source/ui/inc/UITools.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef RPTUI_UITOOLS_HXX #define RPTUI_UITOOLS_HXX diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx index 9a4502f1e224..56474633e391 100644 --- a/reportdesign/source/ui/inc/ViewsWindow.hxx +++ b/reportdesign/source/ui/inc/ViewsWindow.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef RPTUI_VIEWSWINDOW_HXX #define RPTUI_VIEWSWINDOW_HXX diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index f044ace483b4..ab1f255cddf6 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "DataProviderHandler.hxx" #include #include diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx index 382264828215..ea5b96c627c7 100644 --- a/reportdesign/source/ui/inspection/DefaultInspection.cxx +++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "DefaultInspection.hxx" #include #include diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index 796ebd8c7841..6922728c1ace 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "GeometryHandler.hxx" #include diff --git a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx index 5ae7b0285535..ac86218f4e31 100644 --- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx +++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "ReportComponentHandler.hxx" #include #include diff --git a/reportdesign/source/ui/inspection/inspection.src b/reportdesign/source/ui/inspection/inspection.src index 45bf522d2464..9d4ca8d9e5f9 100644 --- a/reportdesign/source/ui/inspection/inspection.src +++ b/reportdesign/source/ui/inspection/inspection.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "RptResId.hrc" #include "rptui_slotid.hrc" #include diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx index 7563a46e9e96..40ba8a94387f 100644 --- a/reportdesign/source/ui/inspection/metadata.cxx +++ b/reportdesign/source/ui/inspection/metadata.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "metadata.hxx" #include #include "com/sun/star/inspection/XPropertyHandler.hpp" diff --git a/reportdesign/source/ui/misc/FunctionHelper.cxx b/reportdesign/source/ui/misc/FunctionHelper.cxx index 641817d01a87..bfd87207dcb6 100644 --- a/reportdesign/source/ui/misc/FunctionHelper.cxx +++ b/reportdesign/source/ui/misc/FunctionHelper.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "FunctionHelper.hxx" diff --git a/reportdesign/source/ui/misc/RptUndo.cxx b/reportdesign/source/ui/misc/RptUndo.cxx index 0268b97f624a..497ec21131c1 100644 --- a/reportdesign/source/ui/misc/RptUndo.cxx +++ b/reportdesign/source/ui/misc/RptUndo.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "RptUndo.hxx" #include "uistrings.hrc" diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 720086177d64..afa86cd7b006 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/reportdesign/source/ui/misc/rptuiservices.cxx b/reportdesign/source/ui/misc/rptuiservices.cxx index 4363a2bbb3cb..39a4b049514e 100644 --- a/reportdesign/source/ui/misc/rptuiservices.cxx +++ b/reportdesign/source/ui/misc/rptuiservices.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include #include diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx index 6b89a263f754..1337dd79b3aa 100644 --- a/reportdesign/source/ui/misc/statusbarcontroller.cxx +++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "statusbarcontroller.hxx" diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx index ebe551c0ca23..e54aa2779979 100644 --- a/reportdesign/source/ui/misc/toolboxcontroller.cxx +++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "toolboxcontroller.hxx" #include #include diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index b83337cdbf3f..d9a4f7f0b83f 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "DesignView.hxx" #include diff --git a/reportdesign/source/ui/report/FixedTextColor.cxx b/reportdesign/source/ui/report/FixedTextColor.cxx index 0123b0cfb1aa..43220434db9e 100644 --- a/reportdesign/source/ui/report/FixedTextColor.cxx +++ b/reportdesign/source/ui/report/FixedTextColor.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx index 1aa4480cafc5..43ae9e24f2c9 100644 --- a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx +++ b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index e1f076fa974f..279aeba07630 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #define RPTUI_ID_LRSPACE 1 #define RPTUI_ID_ULSPACE 2 diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx index 53dd211bb05c..eb8006532a9f 100644 --- a/reportdesign/source/ui/report/ReportControllerObserver.cxx +++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index fe0271084c53..ef723e92bec4 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "ReportSection.hxx" #include "ReportWindow.hxx" #include "DesignView.hxx" diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx index 9b450902e6fc..2542c37df2a5 100644 --- a/reportdesign/source/ui/report/ReportWindow.cxx +++ b/reportdesign/source/ui/report/ReportWindow.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "ReportWindow.hxx" #include "ReportSection.hxx" #include "SectionView.hxx" diff --git a/reportdesign/source/ui/report/SectionView.cxx b/reportdesign/source/ui/report/SectionView.cxx index a67c445d3422..d0921a3a18df 100644 --- a/reportdesign/source/ui/report/SectionView.cxx +++ b/reportdesign/source/ui/report/SectionView.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "SectionView.hxx" #include "DesignView.hxx" #include diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx index 5b6c0ad6c54c..eefc892939b9 100644 --- a/reportdesign/source/ui/report/SectionWindow.cxx +++ b/reportdesign/source/ui/report/SectionWindow.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "SectionWindow.hxx" #include "ReportWindow.hxx" #include "ReportRuler.hxx" diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx index fe52a140e123..f1bc875946e7 100644 --- a/reportdesign/source/ui/report/StartMarker.cxx +++ b/reportdesign/source/ui/report/StartMarker.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "StartMarker.hxx" #include #include diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index 8de44eead00b..66381a2c3854 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "ViewsWindow.hxx" #include "ScrollHelper.hxx" diff --git a/reportdesign/source/ui/report/dlgedfac.cxx b/reportdesign/source/ui/report/dlgedfac.cxx index 8b5e2ddf82b1..b2da2c0ffff1 100644 --- a/reportdesign/source/ui/report/dlgedfac.cxx +++ b/reportdesign/source/ui/report/dlgedfac.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "dlgedfac.hxx" #include "uistrings.hrc" #include "RptObject.hxx" diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx index b99f2e3bd1e1..a6adf88498dd 100644 --- a/reportdesign/source/ui/report/dlgedfunc.cxx +++ b/reportdesign/source/ui/report/dlgedfunc.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include #include diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index 42a195cca4de..719691817efd 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "propbrw.hxx" #include "RptObject.hxx" #include "ReportController.hxx" diff --git a/reportdesign/source/ui/report/report.src b/reportdesign/source/ui/report/report.src index b76f1a1f5fc2..ce64d671649f 100644 --- a/reportdesign/source/ui/report/report.src +++ b/reportdesign/source/ui/report/report.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "RptResId.hrc" #include "rptui_slotid.hrc" #include diff --git a/reportdesign/uiconfig/dbreport/menubar/menubar.xml b/reportdesign/uiconfig/dbreport/menubar/menubar.xml index 21bfb56ea042..832854bd62fa 100644 --- a/reportdesign/uiconfig/dbreport/menubar/menubar.xml +++ b/reportdesign/uiconfig/dbreport/menubar/menubar.xml @@ -1,4 +1,21 @@ + @@ -416,12 +433,7 @@ - - - - - diff --git a/reportdesign/uiconfig/dbreport/statusbar/statusbar.xml b/reportdesign/uiconfig/dbreport/statusbar/statusbar.xml index 7e50780b633d..d5e90ae3fd96 100644 --- a/reportdesign/uiconfig/dbreport/statusbar/statusbar.xml +++ b/reportdesign/uiconfig/dbreport/statusbar/statusbar.xml @@ -1,5 +1,22 @@ + diff --git a/reportdesign/uiconfig/dbreport/toolbar/Formatting.xml b/reportdesign/uiconfig/dbreport/toolbar/Formatting.xml index 2fc8494938d4..ff8ed77c1ff1 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/Formatting.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/Formatting.xml @@ -1,5 +1,22 @@ + diff --git a/reportdesign/uiconfig/dbreport/toolbar/alignmentbar.xml b/reportdesign/uiconfig/dbreport/toolbar/alignmentbar.xml index 1c4a05228a07..49466fc35a17 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/alignmentbar.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/alignmentbar.xml @@ -1,5 +1,22 @@ + diff --git a/reportdesign/uiconfig/dbreport/toolbar/arrowshapes.xml b/reportdesign/uiconfig/dbreport/toolbar/arrowshapes.xml index 62f2e5e2d534..442fb1095ab4 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/arrowshapes.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/arrowshapes.xml @@ -1,5 +1,22 @@ + diff --git a/reportdesign/uiconfig/dbreport/toolbar/basicshapes.xml b/reportdesign/uiconfig/dbreport/toolbar/basicshapes.xml index e26df54f29ab..0d37be099cf9 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/basicshapes.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/basicshapes.xml @@ -1,5 +1,22 @@ + diff --git a/reportdesign/uiconfig/dbreport/toolbar/calloutshapes.xml b/reportdesign/uiconfig/dbreport/toolbar/calloutshapes.xml index 5a37c8de0301..288fa8302a40 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/calloutshapes.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/calloutshapes.xml @@ -1,5 +1,22 @@ + diff --git a/reportdesign/uiconfig/dbreport/toolbar/drawbar.xml b/reportdesign/uiconfig/dbreport/toolbar/drawbar.xml index 07778059053a..8eabfafdc464 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/drawbar.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/drawbar.xml @@ -1,5 +1,22 @@ + diff --git a/reportdesign/uiconfig/dbreport/toolbar/flowchartshapes.xml b/reportdesign/uiconfig/dbreport/toolbar/flowchartshapes.xml index d3e649930942..11998f275b9e 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/flowchartshapes.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/flowchartshapes.xml @@ -1,5 +1,22 @@ + diff --git a/reportdesign/uiconfig/dbreport/toolbar/reportcontrols.xml b/reportdesign/uiconfig/dbreport/toolbar/reportcontrols.xml index ac460a3ba77c..8c13265ed8a6 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/reportcontrols.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/reportcontrols.xml @@ -1,5 +1,22 @@ + diff --git a/reportdesign/uiconfig/dbreport/toolbar/resizebar.xml b/reportdesign/uiconfig/dbreport/toolbar/resizebar.xml index 864f588b976b..886e7ff0df86 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/resizebar.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/resizebar.xml @@ -1,5 +1,22 @@ + diff --git a/reportdesign/uiconfig/dbreport/toolbar/sectionalignmentbar.xml b/reportdesign/uiconfig/dbreport/toolbar/sectionalignmentbar.xml index fc21516735a5..6caba27aa39f 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/sectionalignmentbar.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/sectionalignmentbar.xml @@ -1,5 +1,22 @@ + diff --git a/reportdesign/uiconfig/dbreport/toolbar/sectionshrinkbar.xml b/reportdesign/uiconfig/dbreport/toolbar/sectionshrinkbar.xml index 0064ce8501b3..de02e1b6ee28 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/sectionshrinkbar.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/sectionshrinkbar.xml @@ -1,5 +1,22 @@ + diff --git a/reportdesign/uiconfig/dbreport/toolbar/starshapes.xml b/reportdesign/uiconfig/dbreport/toolbar/starshapes.xml index 820e9c07434d..ba860b469145 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/starshapes.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/starshapes.xml @@ -1,5 +1,22 @@ + diff --git a/reportdesign/uiconfig/dbreport/toolbar/symbolshapes.xml b/reportdesign/uiconfig/dbreport/toolbar/symbolshapes.xml index 4269c1d42e08..deeeab639f3d 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/symbolshapes.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/symbolshapes.xml @@ -1,5 +1,22 @@ + diff --git a/reportdesign/uiconfig/dbreport/toolbar/toolbar.xml b/reportdesign/uiconfig/dbreport/toolbar/toolbar.xml index 55d77cb75f97..ae4bb6afdd58 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/toolbar.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/toolbar.xml @@ -1,5 +1,22 @@ + diff --git a/reportdesign/util/rpt.component b/reportdesign/util/rpt.component index 20fc9d19cf98..064b4597eb93 100644 --- a/reportdesign/util/rpt.component +++ b/reportdesign/util/rpt.component @@ -1,30 +1,21 @@ - + diff --git a/reportdesign/util/rptui.component b/reportdesign/util/rptui.component index e4d61aaca0f9..459863607d29 100644 --- a/reportdesign/util/rptui.component +++ b/reportdesign/util/rptui.component @@ -1,30 +1,21 @@ - + diff --git a/reportdesign/util/rptxml.component b/reportdesign/util/rptxml.component index ccc4486b100f..8c00dfaa2dd7 100644 --- a/reportdesign/util/rptxml.component +++ b/reportdesign/util/rptxml.component @@ -1,30 +1,21 @@ - + diff --git a/sdext/Makefile b/sdext/Makefile index ccb1c85a04da..0997e628485b 100644 --- a/sdext/Makefile +++ b/sdext/Makefile @@ -1,4 +1,11 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) diff --git a/sdext/StaticLibrary_pdfimport_s.mk b/sdext/StaticLibrary_pdfimport_s.mk index 7e648abf8abf..52724a92f03c 100644 --- a/sdext/StaticLibrary_pdfimport_s.mk +++ b/sdext/StaticLibrary_pdfimport_s.mk @@ -53,6 +53,7 @@ $(eval $(call gb_StaticLibrary_set_include,pdfimport_s,\ )) $(eval $(call gb_StaticLibrary_add_defs,pdfimport_s,\ + -DBASEGFX_STATIC_LIBRARY \ -DBOOST_SPIRIT_USE_OLD_NAMESPACE \ -DPDFI_IMPL_IDENTIFIER=\"com.sun.star.PDFImport-$(PLATFORMID)\" \ )) diff --git a/sdext/source/minimizer/basic.txt b/sdext/source/minimizer/basic.txt index 3a540aea5730..2ff6286018d9 100644 --- a/sdext/source/minimizer/basic.txt +++ b/sdext/source/minimizer/basic.txt @@ -1,3 +1,20 @@ +' +' This file is part of the LibreOffice project. +' +' This Source Code Form is subject to the terms of the Mozilla Public +' License, v. 2.0. If a copy of the MPL was not distributed with this +' file, You can obtain one at http://mozilla.org/MPL/2.0/. +' +' This file incorporates work covered by the following license notice: +' +' Licensed to the Apache Software Foundation (ASF) under one or more +' contributor license agreements. See the NOTICE file distributed +' with this work for additional information regarding copyright +' ownership. The ASF licenses this file to you under the Apache +' License, Version 2.0 (the "License"); you may not use this file +' except in compliance with the License. You may obtain a copy of +' the License at http://www.apache.org/licenses/LICENSE-2.0 . +' Sub Main Dim oSettings(11) as new com.sun.star.beans.PropertyValue diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx index b3ffaba4cf90..d55cc63a8935 100644 --- a/sdext/source/minimizer/configurationaccess.cxx +++ b/sdext/source/minimizer/configurationaccess.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "configurationaccess.hxx" diff --git a/sdext/source/minimizer/description.xml b/sdext/source/minimizer/description.xml index f071a0622ecf..879044b4b8fe 100644 --- a/sdext/source/minimizer/description.xml +++ b/sdext/source/minimizer/description.xml @@ -1,4 +1,21 @@ + - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "fileopendialog.hxx" diff --git a/sdext/source/minimizer/graphiccollector.cxx b/sdext/source/minimizer/graphiccollector.cxx index 0c9f75ae1936..8c13a1c59ae3 100644 --- a/sdext/source/minimizer/graphiccollector.cxx +++ b/sdext/source/minimizer/graphiccollector.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - /************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "graphiccollector.hxx" diff --git a/sdext/source/minimizer/impoptimizer.cxx b/sdext/source/minimizer/impoptimizer.cxx index e9886991b57e..c8882639312e 100644 --- a/sdext/source/minimizer/impoptimizer.cxx +++ b/sdext/source/minimizer/impoptimizer.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "impoptimizer.hxx" diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx index c56b254400a0..4e53ec01a932 100644 --- a/sdext/source/minimizer/informationdialog.cxx +++ b/sdext/source/minimizer/informationdialog.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - /************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "informationdialog.hxx" diff --git a/sdext/source/minimizer/manifest.xml b/sdext/source/minimizer/manifest.xml index 5de702ca19f1..a70fe27e848c 100644 --- a/sdext/source/minimizer/manifest.xml +++ b/sdext/source/minimizer/manifest.xml @@ -1,5 +1,22 @@ + diff --git a/sdext/source/minimizer/minimizer.component b/sdext/source/minimizer/minimizer.component index a0111a35f0f6..02d467606bca 100644 --- a/sdext/source/minimizer/minimizer.component +++ b/sdext/source/minimizer/minimizer.component @@ -1,4 +1,12 @@ - + + diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx index ce3a42a3578d..711134f8f9af 100644 --- a/sdext/source/minimizer/optimizerdialog.cxx +++ b/sdext/source/minimizer/optimizerdialog.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - /************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "optimizerdialog.hxx" diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx b/sdext/source/minimizer/optimizerdialogcontrols.cxx index f412dc1c641a..3eb04b098034 100644 --- a/sdext/source/minimizer/optimizerdialogcontrols.cxx +++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - /************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "optimizerdialog.hxx" diff --git a/sdext/source/minimizer/pagecollector.cxx b/sdext/source/minimizer/pagecollector.cxx index 3ca80c24c263..113f3baaf8bb 100644 --- a/sdext/source/minimizer/pagecollector.cxx +++ b/sdext/source/minimizer/pagecollector.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - /************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "pagecollector.hxx" diff --git a/sdext/source/minimizer/pppoptimizer.cxx b/sdext/source/minimizer/pppoptimizer.cxx index ae6f5d7d504c..e72bb272a4df 100644 --- a/sdext/source/minimizer/pppoptimizer.cxx +++ b/sdext/source/minimizer/pppoptimizer.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - /************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "pppoptimizer.hxx" diff --git a/sdext/source/minimizer/pppoptimizerdialog.cxx b/sdext/source/minimizer/pppoptimizerdialog.cxx index 31d10ba65b7a..79c874558573 100644 --- a/sdext/source/minimizer/pppoptimizerdialog.cxx +++ b/sdext/source/minimizer/pppoptimizerdialog.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - /************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "pppoptimizerdialog.hxx" diff --git a/sdext/source/minimizer/pppoptimizertoken.cxx b/sdext/source/minimizer/pppoptimizertoken.cxx index 55fbe0689b58..e446863f77eb 100644 --- a/sdext/source/minimizer/pppoptimizertoken.cxx +++ b/sdext/source/minimizer/pppoptimizertoken.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "pppoptimizertoken.hxx" diff --git a/sdext/source/minimizer/pppoptimizertoken.hxx b/sdext/source/minimizer/pppoptimizertoken.hxx index bb6089630e21..dee94a585bea 100644 --- a/sdext/source/minimizer/pppoptimizertoken.hxx +++ b/sdext/source/minimizer/pppoptimizertoken.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _PPPOPTIMIZER_TOKEN_HXX #define _PPPOPTIMIZER_TOKEN_HXX diff --git a/sdext/source/minimizer/pppoptimizeruno.cxx b/sdext/source/minimizer/pppoptimizeruno.cxx index 5de73c7d0553..efed9ad11928 100644 --- a/sdext/source/minimizer/pppoptimizeruno.cxx +++ b/sdext/source/minimizer/pppoptimizeruno.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/sdext/source/minimizer/registry/data/org/openoffice/Office/Addons.xcu b/sdext/source/minimizer/registry/data/org/openoffice/Office/Addons.xcu index 2b4465b402f1..574ed6e9cd4e 100644 --- a/sdext/source/minimizer/registry/data/org/openoffice/Office/Addons.xcu +++ b/sdext/source/minimizer/registry/data/org/openoffice/Office/Addons.xcu @@ -1,4 +1,21 @@ + diff --git a/sdext/source/minimizer/registry/data/org/openoffice/Office/ProtocolHandler.xcu b/sdext/source/minimizer/registry/data/org/openoffice/Office/ProtocolHandler.xcu index 9baea2c363df..661ecd23ff8e 100644 --- a/sdext/source/minimizer/registry/data/org/openoffice/Office/ProtocolHandler.xcu +++ b/sdext/source/minimizer/registry/data/org/openoffice/Office/ProtocolHandler.xcu @@ -1,4 +1,21 @@ + diff --git a/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu b/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu index 65c07f5b4acc..8477159121f5 100644 --- a/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu +++ b/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu @@ -1,4 +1,21 @@ + diff --git a/sdext/source/minimizer/registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs b/sdext/source/minimizer/registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs index 6e54658e96f0..a80c249def94 100644 --- a/sdext/source/minimizer/registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs +++ b/sdext/source/minimizer/registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs @@ -1,4 +1,21 @@ + diff --git a/sdext/source/minimizer/unodialog.cxx b/sdext/source/minimizer/unodialog.cxx index 1e4ad6c55e5d..c39e90106ed0 100644 --- a/sdext/source/minimizer/unodialog.cxx +++ b/sdext/source/minimizer/unodialog.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - /************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "unodialog.hxx" diff --git a/sdext/source/minimizer/unodialog.hxx b/sdext/source/minimizer/unodialog.hxx index 65063831f7f0..6384f6dd3b4b 100644 --- a/sdext/source/minimizer/unodialog.hxx +++ b/sdext/source/minimizer/unodialog.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef UNODIALOG_HXX #define UNODIALOG_HXX diff --git a/sdext/source/pdfimport/config/pdf_import_filter.xcu b/sdext/source/pdfimport/config/pdf_import_filter.xcu index 628be6db8be9..2e2591072f78 100644 --- a/sdext/source/pdfimport/config/pdf_import_filter.xcu +++ b/sdext/source/pdfimport/config/pdf_import_filter.xcu @@ -1,4 +1,21 @@ + diff --git a/sdext/source/pdfimport/config/pdf_types.xcu b/sdext/source/pdfimport/config/pdf_types.xcu index 11990a89dcdd..4b3c489b3cd7 100644 --- a/sdext/source/pdfimport/config/pdf_types.xcu +++ b/sdext/source/pdfimport/config/pdf_types.xcu @@ -1,5 +1,22 @@ + diff --git a/sdext/source/pdfimport/description.xml b/sdext/source/pdfimport/description.xml index 08160046f0fd..0d1af2749113 100644 --- a/sdext/source/pdfimport/description.xml +++ b/sdext/source/pdfimport/description.xml @@ -1,4 +1,21 @@ + + REM ***** BASIC ***** Sub Main diff --git a/sdext/source/pdfimport/dialogs/TargetChooser.xdl b/sdext/source/pdfimport/dialogs/TargetChooser.xdl index 2622cbfca6c4..1602870d0ea3 100644 --- a/sdext/source/pdfimport/dialogs/TargetChooser.xdl +++ b/sdext/source/pdfimport/dialogs/TargetChooser.xdl @@ -1,5 +1,22 @@ + diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx index 39dccaad9c7a..f4349bda5797 100644 --- a/sdext/source/pdfimport/filterdet.cxx +++ b/sdext/source/pdfimport/filterdet.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "filterdet.hxx" diff --git a/sdext/source/pdfimport/inc/pdfihelper.hxx b/sdext/source/pdfimport/inc/pdfihelper.hxx index ad4774aadd46..3749b6cdfa76 100644 --- a/sdext/source/pdfimport/inc/pdfihelper.hxx +++ b/sdext/source/pdfimport/inc/pdfihelper.hxx @@ -1,36 +1,25 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_PDFI_HELPER_HXX #define INCLUDED_PDFI_HELPER_HXX -#define BASEGFX_STATICLIBRARY - #include "contentsink.hxx" #include diff --git a/sdext/source/pdfimport/inc/pdfparse.hxx b/sdext/source/pdfimport/inc/pdfparse.hxx index 5e87b89a164a..06e222efb08d 100644 --- a/sdext/source/pdfimport/inc/pdfparse.hxx +++ b/sdext/source/pdfimport/inc/pdfparse.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_PDFI_PDFPARSE_HXX #define INCLUDED_PDFI_PDFPARSE_HXX diff --git a/sdext/source/pdfimport/manifest.xml b/sdext/source/pdfimport/manifest.xml index 2264a20158c9..2c23a785a584 100644 --- a/sdext/source/pdfimport/manifest.xml +++ b/sdext/source/pdfimport/manifest.xml @@ -1,5 +1,22 @@ + diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx b/sdext/source/pdfimport/misc/pwdinteract.cxx index 7b470deda692..977690a50a87 100644 --- a/sdext/source/pdfimport/misc/pwdinteract.cxx +++ b/sdext/source/pdfimport/misc/pwdinteract.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx index e69907fc4a87..ac222f8260af 100644 --- a/sdext/source/pdfimport/pdfiadaptor.cxx +++ b/sdext/source/pdfimport/pdfiadaptor.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "pdfiadaptor.hxx" diff --git a/sdext/source/pdfimport/pdfimport.component b/sdext/source/pdfimport/pdfimport.component index 548af84cb4f4..5debd2583ffa 100644 --- a/sdext/source/pdfimport/pdfimport.component +++ b/sdext/source/pdfimport/pdfimport.component @@ -1,4 +1,12 @@ - + + diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx index 10bb30d827dd..44fc327bc219 100644 --- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx index 75ee3eeb305a..272702d2c118 100644 --- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #if defined __SUNPRO_CC diff --git a/sdext/source/pdfimport/sax/emitcontext.cxx b/sdext/source/pdfimport/sax/emitcontext.cxx index 9818387d4b2b..f9204407d506 100644 --- a/sdext/source/pdfimport/sax/emitcontext.cxx +++ b/sdext/source/pdfimport/sax/emitcontext.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "saxemitter.hxx" diff --git a/sdext/source/pdfimport/sax/saxattrlist.cxx b/sdext/source/pdfimport/sax/saxattrlist.cxx index 51278e5867df..774193e57306 100644 --- a/sdext/source/pdfimport/sax/saxattrlist.cxx +++ b/sdext/source/pdfimport/sax/saxattrlist.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "saxattrlist.hxx" diff --git a/sdext/source/pdfimport/sax/saxattrlist.hxx b/sdext/source/pdfimport/sax/saxattrlist.hxx index 6a2279762925..408f9baec66a 100644 --- a/sdext/source/pdfimport/sax/saxattrlist.hxx +++ b/sdext/source/pdfimport/sax/saxattrlist.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_PDFI_SAXATTRLIST_HXX #define INCLUDED_PDFI_SAXATTRLIST_HXX diff --git a/sdext/source/pdfimport/services.cxx b/sdext/source/pdfimport/services.cxx index 1bafab0a9ae7..6261e6f03be2 100644 --- a/sdext/source/pdfimport/services.cxx +++ b/sdext/source/pdfimport/services.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "pdfiadaptor.hxx" diff --git a/sdext/source/pdfimport/test/export.map b/sdext/source/pdfimport/test/export.map index 3308588ef6f8..83ddc114ec63 100644 --- a/sdext/source/pdfimport/test/export.map +++ b/sdext/source/pdfimport/test/export.map @@ -1,29 +1,20 @@ -#************************************************************************* # -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# This file is part of the LibreOffice project. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# OpenOffice.org - a multi-platform office productivity suite +# This file incorporates work covered by the following license notice: # -# This file is part of OpenOffice.org. +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . # -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* UDK_3_0_0 { global: diff --git a/sdext/source/pdfimport/test/outputwrap.hxx b/sdext/source/pdfimport/test/outputwrap.hxx index 0e9fbb0925a0..5272ee120621 100644 --- a/sdext/source/pdfimport/test/outputwrap.hxx +++ b/sdext/source/pdfimport/test/outputwrap.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_PDFIMPORT_OUTPUTWRAP_HXX diff --git a/sdext/source/pdfimport/test/pdf2xml.cxx b/sdext/source/pdfimport/test/pdf2xml.cxx index d05ae1c7009e..c19944a8d5e0 100644 --- a/sdext/source/pdfimport/test/pdf2xml.cxx +++ b/sdext/source/pdfimport/test/pdf2xml.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "outputwrap.hxx" diff --git a/sdext/source/pdfimport/test/pdfunzip.cxx b/sdext/source/pdfimport/test/pdfunzip.cxx index 987f81252862..0e2016b9ab1f 100644 --- a/sdext/source/pdfimport/test/pdfunzip.cxx +++ b/sdext/source/pdfimport/test/pdfunzip.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/sdext/source/pdfimport/test/testdocs/graphicformats_pdfi_unittest_draw.xml b/sdext/source/pdfimport/test/testdocs/graphicformats_pdfi_unittest_draw.xml index c362f0474529..18b79e805f59 100644 --- a/sdext/source/pdfimport/test/testdocs/graphicformats_pdfi_unittest_draw.xml +++ b/sdext/source/pdfimport/test/testdocs/graphicformats_pdfi_unittest_draw.xml @@ -1,4 +1,21 @@ + diff --git a/sdext/source/pdfimport/test/testdocs/graphicformats_pdfi_unittest_impress.xml b/sdext/source/pdfimport/test/testdocs/graphicformats_pdfi_unittest_impress.xml index 1957b7974ae8..e01366c08aba 100644 --- a/sdext/source/pdfimport/test/testdocs/graphicformats_pdfi_unittest_impress.xml +++ b/sdext/source/pdfimport/test/testdocs/graphicformats_pdfi_unittest_impress.xml @@ -1,4 +1,21 @@ + diff --git a/sdext/source/pdfimport/test/testdocs/graphicformats_pdfi_unittest_writer.xml b/sdext/source/pdfimport/test/testdocs/graphicformats_pdfi_unittest_writer.xml index 047e46dad074..7a7b1883e3de 100644 --- a/sdext/source/pdfimport/test/testdocs/graphicformats_pdfi_unittest_writer.xml +++ b/sdext/source/pdfimport/test/testdocs/graphicformats_pdfi_unittest_writer.xml @@ -1,4 +1,21 @@ + diff --git a/sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_draw.xml b/sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_draw.xml index f864c4dfb01a..0a35f8439853 100644 --- a/sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_draw.xml +++ b/sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_draw.xml @@ -1,4 +1,21 @@ + diff --git a/sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_impress.xml b/sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_impress.xml index 6d777866ee33..7ca5e843321a 100644 --- a/sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_impress.xml +++ b/sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_impress.xml @@ -1,4 +1,21 @@ + diff --git a/sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_writer.xml b/sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_writer.xml index 8b773553d793..b64046a9f5f2 100644 --- a/sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_writer.xml +++ b/sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_writer.xml @@ -1,4 +1,21 @@ + diff --git a/sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_draw.xml b/sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_draw.xml index da1251864b43..c4456003fc1c 100644 --- a/sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_draw.xml +++ b/sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_draw.xml @@ -1,4 +1,21 @@ + diff --git a/sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_impress.xml b/sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_impress.xml index a57b2bc750de..4ee430dbbe71 100644 --- a/sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_impress.xml +++ b/sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_impress.xml @@ -1,4 +1,21 @@ + diff --git a/sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_writer.xml b/sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_writer.xml index 955b81b73a36..5a903322c37e 100644 --- a/sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_writer.xml +++ b/sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_writer.xml @@ -1,4 +1,21 @@ + diff --git a/sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_draw.xml b/sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_draw.xml index 01cdab8eaf68..42e8a1eae036 100644 --- a/sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_draw.xml +++ b/sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_draw.xml @@ -1,4 +1,21 @@ + diff --git a/sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_impress.xml b/sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_impress.xml index b4e9bfdc2468..f7dd540db573 100644 --- a/sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_impress.xml +++ b/sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_impress.xml @@ -1,4 +1,21 @@ + diff --git a/sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_writer.xml b/sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_writer.xml index 2b68f12e6bb5..ef5248f1de45 100644 --- a/sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_writer.xml +++ b/sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_writer.xml @@ -1,4 +1,21 @@ + diff --git a/sdext/source/pdfimport/test/testdocs/verticaltext_pdfi_unittest_draw.xml b/sdext/source/pdfimport/test/testdocs/verticaltext_pdfi_unittest_draw.xml index 26f1f9c109c5..ee3263752e40 100644 --- a/sdext/source/pdfimport/test/testdocs/verticaltext_pdfi_unittest_draw.xml +++ b/sdext/source/pdfimport/test/testdocs/verticaltext_pdfi_unittest_draw.xml @@ -1,4 +1,21 @@ + diff --git a/sdext/source/pdfimport/test/testdocs/verticaltext_pdfi_unittest_impress.xml b/sdext/source/pdfimport/test/testdocs/verticaltext_pdfi_unittest_impress.xml index 6bc625b04647..7e11d1ea136a 100644 --- a/sdext/source/pdfimport/test/testdocs/verticaltext_pdfi_unittest_impress.xml +++ b/sdext/source/pdfimport/test/testdocs/verticaltext_pdfi_unittest_impress.xml @@ -1,4 +1,21 @@ + diff --git a/sdext/source/pdfimport/test/testdocs/verticaltext_pdfi_unittest_writer.xml b/sdext/source/pdfimport/test/testdocs/verticaltext_pdfi_unittest_writer.xml index ed2df0e34f41..0b1ccb0c90ed 100644 --- a/sdext/source/pdfimport/test/testdocs/verticaltext_pdfi_unittest_writer.xml +++ b/sdext/source/pdfimport/test/testdocs/verticaltext_pdfi_unittest_writer.xml @@ -1,4 +1,21 @@ + diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx index e6f3f29ffad8..a452ba0b4828 100644 --- a/sdext/source/pdfimport/test/tests.cxx +++ b/sdext/source/pdfimport/test/tests.cxx @@ -1,32 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#define BASEGFX_STATICLIBRARY + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifdef SYSTEM_ZLIB #include "zlib.h" diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx index 45e40c31b8b5..33d8db9d2a23 100644 --- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx +++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "pdfiprocessor.hxx" diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.hxx b/sdext/source/pdfimport/tree/drawtreevisiting.hxx index eb9bc23b208d..5c2555205f0d 100644 --- a/sdext/source/pdfimport/tree/drawtreevisiting.hxx +++ b/sdext/source/pdfimport/tree/drawtreevisiting.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_PDFI_DRAWTREEVISITING_HXX #define INCLUDED_PDFI_DRAWTREEVISITING_HXX diff --git a/sdext/source/pdfimport/tree/genericelements.cxx b/sdext/source/pdfimport/tree/genericelements.cxx index e523b702ff01..76a30e9977fd 100644 --- a/sdext/source/pdfimport/tree/genericelements.cxx +++ b/sdext/source/pdfimport/tree/genericelements.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "xmlemitter.hxx" diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx index 4508ad35c770..378619ec3252 100644 --- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx +++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "pdfiprocessor.hxx" diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.hxx b/sdext/source/pdfimport/tree/pdfiprocessor.hxx index eabdd11b0378..a288c64b2988 100644 --- a/sdext/source/pdfimport/tree/pdfiprocessor.hxx +++ b/sdext/source/pdfimport/tree/pdfiprocessor.hxx @@ -1,36 +1,25 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_PDFI_PROCESSOR_HXX #define INCLUDED_PDFI_PROCESSOR_HXX -#include "pdfihelper.hxx" - #include #include #include diff --git a/sdext/source/pdfimport/tree/style.cxx b/sdext/source/pdfimport/tree/style.cxx index 4f7ea3859736..1028eb902533 100644 --- a/sdext/source/pdfimport/tree/style.cxx +++ b/sdext/source/pdfimport/tree/style.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "style.hxx" diff --git a/sdext/source/pdfimport/tree/style.hxx b/sdext/source/pdfimport/tree/style.hxx index 17ee2e210661..0db40d440276 100644 --- a/sdext/source/pdfimport/tree/style.hxx +++ b/sdext/source/pdfimport/tree/style.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_PDFI_STYLE_HXX #define INCLUDED_PDFI_STYLE_HXX diff --git a/sdext/source/pdfimport/tree/treevisiting.hxx b/sdext/source/pdfimport/tree/treevisiting.hxx index 901342963563..2d2b4f5678c2 100644 --- a/sdext/source/pdfimport/tree/treevisiting.hxx +++ b/sdext/source/pdfimport/tree/treevisiting.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_PDFI_TREEVISITING_HXX #define INCLUDED_PDFI_TREEVISITING_HXX diff --git a/sdext/source/pdfimport/tree/writertreevisiting.cxx b/sdext/source/pdfimport/tree/writertreevisiting.cxx index 5f74b65369d3..1804d4c07caf 100644 --- a/sdext/source/pdfimport/tree/writertreevisiting.cxx +++ b/sdext/source/pdfimport/tree/writertreevisiting.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "pdfiprocessor.hxx" diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx index 77ce15bf531e..4d6f30299907 100644 --- a/sdext/source/pdfimport/wrapper/wrapper.cxx +++ b/sdext/source/pdfimport/wrapper/wrapper.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "contentsink.hxx" diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index 87c0ab2afa0d..e6bc7610d431 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -1,33 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * OpenOffice.org - a multi-platform office productivity suite + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * The Contents of this file are made available subject to - * the terms of GNU General Public License Version 2. + * This file incorporates work covered by the following license notice: * - * - * GNU General Public License, version 2 - * ============================================= - * Copyright 2005 by Sun Microsystems, Inc. - * 901 San Antonio Road, Palo Alto, CA 94303, USA - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the Free - * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "pdfioutdev_gpl.hxx" #include "pnghelper.hxx" diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx index bba8f58c9f71..0a19b9a34b97 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx @@ -1,33 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * OpenOffice.org - a multi-platform office productivity suite + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * The Contents of this file are made available subject to - * the terms of GNU General Public License Version 2. + * This file incorporates work covered by the following license notice: * - * - * GNU General Public License, version 2 - * ============================================= - * Copyright 2005 by Sun Microsystems, Inc. - * 901 San Antonio Road, Palo Alto, CA 94303, USA - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the Free - * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_PDFI_OUTDEV_HXX #define INCLUDED_PDFI_OUTDEV_HXX diff --git a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx index 71b0c8989228..2bb11237bc6f 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx @@ -1,33 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * OpenOffice.org - a multi-platform office productivity suite + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * The Contents of this file are made available subject to - * the terms of GNU General Public License Version 2. + * This file incorporates work covered by the following license notice: * - * - * GNU General Public License, version 2 - * ============================================= - * Copyright 2005 by Sun Microsystems, Inc. - * 901 San Antonio Road, Palo Alto, CA 94303, USA - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the Free - * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "pnghelper.hxx" #include diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx index f10ed9278b6b..3b9488565d56 100644 --- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx @@ -1,33 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * OpenOffice.org - a multi-platform office productivity suite + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * The Contents of this file are made available subject to - * the terms of GNU General Public License Version 2. + * This file incorporates work covered by the following license notice: * - * - * GNU General Public License, version 2 - * ============================================= - * Copyright 2005 by Sun Microsystems, Inc. - * 901 San Antonio Road, Palo Alto, CA 94303, USA - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the Free - * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "pdfioutdev_gpl.hxx" #ifdef WNT diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx index 32c46a63e503..b19bac9a6867 100644 --- a/sdext/source/presenter/PresenterAccessibility.cxx +++ b/sdext/source/presenter/PresenterAccessibility.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "PresenterAccessibility.hxx" #include "PresenterTextView.hxx" diff --git a/sdext/source/presenter/PresenterAccessibility.hxx b/sdext/source/presenter/PresenterAccessibility.hxx index 4eb7c3d195bf..d23a381e5888 100644 --- a/sdext/source/presenter/PresenterAccessibility.hxx +++ b/sdext/source/presenter/PresenterAccessibility.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef SDEXT_PRESENTER_PRESENTER_ACCESSIBILITY_HXX #define SDEXT_PRESENTER_PRESENTER_ACCESSIBILITY_HXX diff --git a/sdext/source/presenter/PresenterBitmapContainer.cxx b/sdext/source/presenter/PresenterBitmapContainer.cxx index 8b3ff5c11861..88c4d6d16928 100644 --- a/sdext/source/presenter/PresenterBitmapContainer.cxx +++ b/sdext/source/presenter/PresenterBitmapContainer.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "PresenterBitmapContainer.hxx" #include "PresenterComponent.hxx" diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx index cfe1d6a1591e..00e18429c134 100644 --- a/sdext/source/presenter/PresenterButton.cxx +++ b/sdext/source/presenter/PresenterButton.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "PresenterButton.hxx" #include "PresenterCanvasHelper.hxx" diff --git a/sdext/source/presenter/PresenterCanvasHelper.cxx b/sdext/source/presenter/PresenterCanvasHelper.cxx index 0bf9ceb5aba8..899a2a70dbb0 100644 --- a/sdext/source/presenter/PresenterCanvasHelper.cxx +++ b/sdext/source/presenter/PresenterCanvasHelper.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "PresenterCanvasHelper.hxx" diff --git a/sdext/source/presenter/PresenterComponent.cxx b/sdext/source/presenter/PresenterComponent.cxx index 4a5180d310a6..cb4d049e6216 100644 --- a/sdext/source/presenter/PresenterComponent.cxx +++ b/sdext/source/presenter/PresenterComponent.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "PresenterComponent.hxx" #include "cppuhelper/factory.hxx" diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx b/sdext/source/presenter/PresenterConfigurationAccess.cxx index 2a32d824b9c2..e321b71215a5 100644 --- a/sdext/source/presenter/PresenterConfigurationAccess.cxx +++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "PresenterConfigurationAccess.hxx" diff --git a/sdext/source/presenter/PresenterConfigurationAccess.hxx b/sdext/source/presenter/PresenterConfigurationAccess.hxx index e00b17892f8e..0ddb80c3843d 100644 --- a/sdext/source/presenter/PresenterConfigurationAccess.hxx +++ b/sdext/source/presenter/PresenterConfigurationAccess.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef SDEXT_PRESENTER_CONFIGURATION_ACCESS_HXX #define SDEXT_PRESENTER_CONFIGURATION_ACCESS_HXX diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx index 1418d5a3b793..14820da65c3e 100644 --- a/sdext/source/presenter/PresenterController.cxx +++ b/sdext/source/presenter/PresenterController.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "PresenterController.hxx" diff --git a/sdext/source/presenter/PresenterController.hxx b/sdext/source/presenter/PresenterController.hxx index 69cc55392a56..b68638d6434c 100644 --- a/sdext/source/presenter/PresenterController.hxx +++ b/sdext/source/presenter/PresenterController.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef SDEXT_PRESENTER_CONTROLLER_HXX #define SDEXT_PRESENTER_CONTROLLER_HXX diff --git a/sdext/source/presenter/PresenterExtensionIdentifier.hxx b/sdext/source/presenter/PresenterExtensionIdentifier.hxx index 5e4f9001b678..089f8e377da8 100644 --- a/sdext/source/presenter/PresenterExtensionIdentifier.hxx +++ b/sdext/source/presenter/PresenterExtensionIdentifier.hxx @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * OpenOffice.org - a multi-platform office productivity suite + * This file incorporates work covered by the following license notice: * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef SDEXT_PRESENTER_EXTENSION_IDENTIFIER_HXX #define SDEXT_PRESENTER_EXTENSION_IDENTIFIER_HXX diff --git a/sdext/source/presenter/PresenterFrameworkObserver.cxx b/sdext/source/presenter/PresenterFrameworkObserver.cxx index 0921df36f3bc..dff6046580b3 100644 --- a/sdext/source/presenter/PresenterFrameworkObserver.cxx +++ b/sdext/source/presenter/PresenterFrameworkObserver.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "PresenterFrameworkObserver.hxx" #include diff --git a/sdext/source/presenter/PresenterFrameworkObserver.hxx b/sdext/source/presenter/PresenterFrameworkObserver.hxx index 34af9ab3791a..ae338faaa5af 100644 --- a/sdext/source/presenter/PresenterFrameworkObserver.hxx +++ b/sdext/source/presenter/PresenterFrameworkObserver.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef SDEXT_PRESENTER_PRESENTER_FRAMEWORK_OBSERVER_HXX #define SDEXT_PRESENTER_PRESENTER_FRAMEWORK_OBSERVER_HXX diff --git a/sdext/source/presenter/PresenterGeometryHelper.cxx b/sdext/source/presenter/PresenterGeometryHelper.cxx index 211bf8e10250..9e283d5a813a 100644 --- a/sdext/source/presenter/PresenterGeometryHelper.cxx +++ b/sdext/source/presenter/PresenterGeometryHelper.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "PresenterGeometryHelper.hxx" diff --git a/sdext/source/presenter/PresenterGeometryHelper.hxx b/sdext/source/presenter/PresenterGeometryHelper.hxx index 4e8874866ba8..7fd249e06b43 100644 --- a/sdext/source/presenter/PresenterGeometryHelper.hxx +++ b/sdext/source/presenter/PresenterGeometryHelper.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef SDEXT_PRESENTER_PRESENTER_GEOMETRY_HELPER_HXX #define SDEXT_PRESENTER_PRESENTER_GEOMETRY_HELPER_HXX diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx index 5e461a940964..e2c2f3d0aca7 100644 --- a/sdext/source/presenter/PresenterHelpView.cxx +++ b/sdext/source/presenter/PresenterHelpView.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "PresenterHelpView.hxx" #include "PresenterButton.hxx" diff --git a/sdext/source/presenter/PresenterHelper.cxx b/sdext/source/presenter/PresenterHelper.cxx index 5689ee3347cd..0145eb922ff1 100644 --- a/sdext/source/presenter/PresenterHelper.cxx +++ b/sdext/source/presenter/PresenterHelper.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "PresenterHelper.hxx" diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx index 481bb6756523..f3dbdbe432fc 100644 --- a/sdext/source/presenter/PresenterNotesView.cxx +++ b/sdext/source/presenter/PresenterNotesView.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "PresenterNotesView.hxx" #include "PresenterButton.hxx" diff --git a/sdext/source/presenter/PresenterPane.cxx b/sdext/source/presenter/PresenterPane.cxx index 3f2f98a4a21b..8f79086e61dc 100644 --- a/sdext/source/presenter/PresenterPane.cxx +++ b/sdext/source/presenter/PresenterPane.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "PresenterPane.hxx" #include "PresenterController.hxx" diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx index d50a1bc098fb..d20b530b7be4 100644 --- a/sdext/source/presenter/PresenterPaneBase.cxx +++ b/sdext/source/presenter/PresenterPaneBase.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "PresenterPaneBase.hxx" #include "PresenterCanvasHelper.hxx" diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx index acb69e6cd053..d6f62f94f0a4 100644 --- a/sdext/source/presenter/PresenterPaneBase.hxx +++ b/sdext/source/presenter/PresenterPaneBase.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef SD_PRESENTER_PRESENTER_PANE_BASE_HXX #define SD_PRESENTER_PRESENTER_PANE_BASE_HXX diff --git a/sdext/source/presenter/PresenterPaneBorderManager.cxx b/sdext/source/presenter/PresenterPaneBorderManager.cxx index 426a3810e908..7f09074721c7 100644 --- a/sdext/source/presenter/PresenterPaneBorderManager.cxx +++ b/sdext/source/presenter/PresenterPaneBorderManager.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ // The body of this file is only used when PresenterWindowManager defines // the preprocessor symbol ENABLE_PANE_RESIZING, which by default is not the diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx index cecf92501f1e..ea1c80c4a87a 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "PresenterPaneBorderPainter.hxx" #include "PresenterCanvasHelper.hxx" diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.hxx b/sdext/source/presenter/PresenterPaneBorderPainter.hxx index d2582160614a..ab0f0b36c7dc 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.hxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef SDEXT_PRESENTER_PRESENTER_PANE_BORDER_PAINTER_HXX #define SDEXT_PRESENTER_PRESENTER_PANE_BORDER_PAINTER_HXX diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx b/sdext/source/presenter/PresenterPaneContainer.cxx index 74e56c138d1e..9a06197cd04d 100644 --- a/sdext/source/presenter/PresenterPaneContainer.cxx +++ b/sdext/source/presenter/PresenterPaneContainer.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "PresenterPaneContainer.hxx" #include "PresenterPaneBase.hxx" diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx index 7091ff9efe57..775244ddfc8b 100644 --- a/sdext/source/presenter/PresenterPaneFactory.cxx +++ b/sdext/source/presenter/PresenterPaneFactory.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "PresenterPaneFactory.hxx" #include "PresenterController.hxx" diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx index 8a119dd0bab7..45b671827acf 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.cxx +++ b/sdext/source/presenter/PresenterProtocolHandler.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "PresenterProtocolHandler.hxx" #include "PresenterConfigurationAccess.hxx" diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx index 669815c17d71..bfa2ae2a43d8 100644 --- a/sdext/source/presenter/PresenterScreen.cxx +++ b/sdext/source/presenter/PresenterScreen.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "PresenterScreen.hxx" #include "PresenterConfigurationAccess.hxx" diff --git a/sdext/source/presenter/PresenterScreen.hxx b/sdext/source/presenter/PresenterScreen.hxx index 07aff4e7c8ee..b83e62fa6555 100644 --- a/sdext/source/presenter/PresenterScreen.hxx +++ b/sdext/source/presenter/PresenterScreen.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef SDEXT_PRESENTER_PRESENTER_SCREEN_HXX #define SDEXT_PRESENTER_PRESENTER_SCREEN_HXX diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx index 8c86515011dd..576458bd0256 100644 --- a/sdext/source/presenter/PresenterScrollBar.cxx +++ b/sdext/source/presenter/PresenterScrollBar.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "PresenterScrollBar.hxx" #include "PresenterBitmapContainer.hxx" diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx index 574bdaac405f..191d30cac366 100644 --- a/sdext/source/presenter/PresenterScrollBar.hxx +++ b/sdext/source/presenter/PresenterScrollBar.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef SDEXT_PRESENTER_PRESENTER_SCROLL_BAR_HXX #define SDEXT_PRESENTER_PRESENTER_SCROLL_BAR_HXX diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sdext/source/presenter/PresenterSlidePreview.cxx index 884f5273cad3..1829d9c1da7d 100644 --- a/sdext/source/presenter/PresenterSlidePreview.cxx +++ b/sdext/source/presenter/PresenterSlidePreview.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "PresenterSlidePreview.hxx" #include "PresenterCanvasHelper.hxx" diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx index 8892aaeef772..ba820ebefe41 100644 --- a/sdext/source/presenter/PresenterSlideShowView.cxx +++ b/sdext/source/presenter/PresenterSlideShowView.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "PresenterSlideShowView.hxx" diff --git a/sdext/source/presenter/PresenterSlideShowView.hxx b/sdext/source/presenter/PresenterSlideShowView.hxx index c0816271c1b6..76aa439b9b96 100644 --- a/sdext/source/presenter/PresenterSlideShowView.hxx +++ b/sdext/source/presenter/PresenterSlideShowView.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef SDEXT_PRESENTER_SLIDE_SHOW_VIEW_HXX #define SDEXT_PRESENTER_SLIDE_SHOW_VIEW_HXX diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx index 2aaf8e6018fb..cc00c0960482 100644 --- a/sdext/source/presenter/PresenterSlideSorter.cxx +++ b/sdext/source/presenter/PresenterSlideSorter.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "PresenterSlideSorter.hxx" #include "PresenterButton.hxx" diff --git a/sdext/source/presenter/PresenterSlideSorter.hxx b/sdext/source/presenter/PresenterSlideSorter.hxx index 0b3682ef6be4..f9b397d735d5 100644 --- a/sdext/source/presenter/PresenterSlideSorter.hxx +++ b/sdext/source/presenter/PresenterSlideSorter.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef SDEXT_PRESENTER_PRESENTER_SLIDE_SORTER_HXX #define SDEXT_PRESENTER_PRESENTER_SLIDE_SORTER_HXX diff --git a/sdext/source/presenter/PresenterSprite.cxx b/sdext/source/presenter/PresenterSprite.cxx index 2fc20968b1cd..01f784117e70 100644 --- a/sdext/source/presenter/PresenterSprite.cxx +++ b/sdext/source/presenter/PresenterSprite.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "PresenterSprite.hxx" diff --git a/sdext/source/presenter/PresenterSprite.hxx b/sdext/source/presenter/PresenterSprite.hxx index 0478d4362674..4cc23598e211 100644 --- a/sdext/source/presenter/PresenterSprite.hxx +++ b/sdext/source/presenter/PresenterSprite.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef SDEXT_PRESENTER_PRESENTER_SPRITE_HXX #define SDEXT_PRESENTER_PRESENTER_SPRITE_HXX diff --git a/sdext/source/presenter/PresenterSpritePane.cxx b/sdext/source/presenter/PresenterSpritePane.cxx index 9eef52d62729..c7364477eef7 100644 --- a/sdext/source/presenter/PresenterSpritePane.cxx +++ b/sdext/source/presenter/PresenterSpritePane.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "PresenterSpritePane.hxx" #include "PresenterGeometryHelper.hxx" diff --git a/sdext/source/presenter/PresenterSpritePane.hxx b/sdext/source/presenter/PresenterSpritePane.hxx index fad67722cd82..4d4c33bd2b71 100644 --- a/sdext/source/presenter/PresenterSpritePane.hxx +++ b/sdext/source/presenter/PresenterSpritePane.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef SD_PRESENTER_PRESENTER_SPRITE_PANE_HXX #define SD_PRESENTER_PRESENTER_SPRITE_PANE_HXX diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx index d3a84dcd2509..4277b554b301 100644 --- a/sdext/source/presenter/PresenterTextView.cxx +++ b/sdext/source/presenter/PresenterTextView.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "PresenterTextView.hxx" #include "PresenterCanvasHelper.hxx" diff --git a/sdext/source/presenter/PresenterTextView.hxx b/sdext/source/presenter/PresenterTextView.hxx index bb0f76ef7181..4f9a5dadd87f 100644 --- a/sdext/source/presenter/PresenterTextView.hxx +++ b/sdext/source/presenter/PresenterTextView.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef SDEXT_PRESENTER_TEXT_VIEW_HXX #define SDEXT_PRESENTER_TEXT_VIEW_HXX diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx index 0b600d4ec994..e64f1073c4f7 100644 --- a/sdext/source/presenter/PresenterTheme.cxx +++ b/sdext/source/presenter/PresenterTheme.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "PresenterTheme.hxx" #include "PresenterBitmapContainer.hxx" diff --git a/sdext/source/presenter/PresenterTheme.hxx b/sdext/source/presenter/PresenterTheme.hxx index ca2b17adfb63..7e1c6bead071 100644 --- a/sdext/source/presenter/PresenterTheme.hxx +++ b/sdext/source/presenter/PresenterTheme.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef SDEXT_PRESENTER_PRESENTER_THEME_HXX #define SDEXT_PRESENTER_PRESENTER_THEME_HXX diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sdext/source/presenter/PresenterTimer.cxx index 208f649e6bf6..ad9992ad5529 100644 --- a/sdext/source/presenter/PresenterTimer.cxx +++ b/sdext/source/presenter/PresenterTimer.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "PresenterTimer.hxx" #include diff --git a/sdext/source/presenter/PresenterTimer.hxx b/sdext/source/presenter/PresenterTimer.hxx index 242d746aa9b2..5006a4488c2d 100644 --- a/sdext/source/presenter/PresenterTimer.hxx +++ b/sdext/source/presenter/PresenterTimer.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef SDEXT_PRESENTER_TIMER_HXX #define SDEXT_PRESENTER_TIMER_HXX diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index c5acb8c6c8b3..fa3dcacc99bf 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "PresenterToolBar.hxx" diff --git a/sdext/source/presenter/PresenterToolBar.hxx b/sdext/source/presenter/PresenterToolBar.hxx index af698a383972..141db899414a 100644 --- a/sdext/source/presenter/PresenterToolBar.hxx +++ b/sdext/source/presenter/PresenterToolBar.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef SDEXT_PRESENTER_TOOL_BAR_HXX #define SDEXT_PRESENTER_TOOL_BAR_HXX diff --git a/sdext/source/presenter/PresenterViewFactory.hxx b/sdext/source/presenter/PresenterViewFactory.hxx index 5c6aedf50016..e590f564d7f2 100644 --- a/sdext/source/presenter/PresenterViewFactory.hxx +++ b/sdext/source/presenter/PresenterViewFactory.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef SDEXT_PRESENTER_VIEW_FACTORY_HXX #define SDEXT_PRESENTER_VIEW_FACTORY_HXX diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx index bc0866fed2a7..88359a2f98bb 100644 --- a/sdext/source/presenter/PresenterWindowManager.cxx +++ b/sdext/source/presenter/PresenterWindowManager.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #undef ENABLE_PANE_RESIZING //#define ENABLE_PANE_RESIZING diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx index 88a748e1de74..f065b7fed2cb 100644 --- a/sdext/source/presenter/PresenterWindowManager.hxx +++ b/sdext/source/presenter/PresenterWindowManager.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef SDEXT_PRESENTER_PRESENTER_WINDOW_MANAGER_HXX #define SDEXT_PRESENTER_PRESENTER_WINDOW_MANAGER_HXX diff --git a/sdext/source/presenter/description.xml b/sdext/source/presenter/description.xml index be71e449113f..e8c52f047c03 100644 --- a/sdext/source/presenter/description.xml +++ b/sdext/source/presenter/description.xml @@ -1,4 +1,21 @@ + - - + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . +--> diff --git a/sdext/source/presenter/manifest.xml b/sdext/source/presenter/manifest.xml index 705ac2cdd0f5..a25f22fdf81a 100644 --- a/sdext/source/presenter/manifest.xml +++ b/sdext/source/presenter/manifest.xml @@ -1,5 +1,22 @@ + diff --git a/sdext/source/presenter/presenter.component b/sdext/source/presenter/presenter.component index a61807b2329a..698180404f5e 100644 --- a/sdext/source/presenter/presenter.component +++ b/sdext/source/presenter/presenter.component @@ -1,4 +1,12 @@ - + + diff --git a/sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu b/sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu index 1241a72a0243..a7991b8cad21 100644 --- a/sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu +++ b/sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu @@ -1,4 +1,21 @@ + diff --git a/sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu b/sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu index 0f8369973a20..b1ecdb0d47fa 100644 --- a/sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu +++ b/sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu @@ -1,4 +1,21 @@ + diff --git a/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu b/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu index 069cc3bf03cc..837805794dc3 100644 --- a/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu +++ b/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu @@ -1,30 +1,21 @@ - + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + --> diff --git a/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs b/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs index 888142b7d89f..74900896c96a 100644 --- a/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs +++ b/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs @@ -1,30 +1,21 @@ - + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + --> AF From 02e400865cb9a51b623a3d866d3236f0d6c899ca Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Tue, 2 Oct 2012 09:31:35 +0200 Subject: [PATCH 171/863] gbuildification of beanshell Change-Id: I1b71796ca95500efeffe5e01dba3e73711f920e7 Reviewed-on: https://gerrit.libreoffice.org/745 Reviewed-by: Michael Stahl Tested-by: Michael Stahl --- Makefile.top | 2 +- Module_tail_build.mk | 1 + beanshell/ExternalProject_beanshell.mk | 33 ++++++++++++++++++++++++++ beanshell/Makefile | 7 ++++++ beanshell/Module_beanshell.mk | 22 +++++++++++++++++ beanshell/Package_beanshell.mk | 16 +++++++++++++ beanshell/UnpackedTarball_beanshell.mk | 18 ++++++++++++++ beanshell/prj/build.lst | 5 ++-- beanshell/prj/dmake | 0 config_host.mk.in | 1 + configure.in | 2 ++ tail_build/prj/build.lst | 2 +- 12 files changed, 104 insertions(+), 5 deletions(-) create mode 100644 beanshell/ExternalProject_beanshell.mk create mode 100644 beanshell/Makefile create mode 100644 beanshell/Module_beanshell.mk create mode 100644 beanshell/Package_beanshell.mk create mode 100644 beanshell/UnpackedTarball_beanshell.mk delete mode 100644 beanshell/prj/dmake diff --git a/Makefile.top b/Makefile.top index e188cdcbcc26..de91f563abf5 100644 --- a/Makefile.top +++ b/Makefile.top @@ -44,6 +44,7 @@ basebmp\ basegfx\ basic\ bean\ +beanshell\ binaryurp\ bluez_bluetooth\ boost\ @@ -196,7 +197,6 @@ xmlsecurity\ xsltml\ dmake_modules:=\ -beanshell\ berkeleydb\ binfilter \ cairo\ diff --git a/Module_tail_build.mk b/Module_tail_build.mk index a0c958bd493d..86a9c11ab465 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ basegfx \ basic \ bean \ + $(call gb_Helper_optional,BSH,beanshell) \ binaryurp \ $(call gb_Helper_optional,BLUEZ,bluez_bluetooth) \ bridges \ diff --git a/beanshell/ExternalProject_beanshell.mk b/beanshell/ExternalProject_beanshell.mk new file mode 100644 index 000000000000..b1bfa9f5faff --- /dev/null +++ b/beanshell/ExternalProject_beanshell.mk @@ -0,0 +1,33 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_ExternalProject_ExternalProject,beanshell)) + +$(eval $(call gb_ExternalProject_use_unpacked,beanshell,beanshell)) + +$(eval $(call gb_ExternalProject_register_targets,beanshell,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,beanshell,build) : + cd "$(call gb_UnpackedTarball_get_dir,beanshell)" && \ + ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \ + "$(ANT)" \ + -q \ + -f build.xml \ + -Dbuild.label="build-libreoffice" \ + $(if $(filter yes,$(JAVACISGCJ))\ + ,-Dbuild.compiler=gcj \ + ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + ) \ + $(if $(debug),-Dbuild.debug="on") && \ + touch $@ + +# vim: set noet sw=4 ts=4: diff --git a/beanshell/Makefile b/beanshell/Makefile new file mode 100644 index 000000000000..ccb1c85a04da --- /dev/null +++ b/beanshell/Makefile @@ -0,0 +1,7 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +include $(module_directory)/../solenv/gbuild/partial_build.mk + +# vim: set noet sw=4 ts=4: diff --git a/beanshell/Module_beanshell.mk b/beanshell/Module_beanshell.mk new file mode 100644 index 000000000000..e739b3698ef6 --- /dev/null +++ b/beanshell/Module_beanshell.mk @@ -0,0 +1,22 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Module_Module,beanshell)) + +ifneq ($(SOLAR_JAVA),) +ifneq ($(filter BSH,$(BUILD_TYPE)),) +$(eval $(call gb_Module_add_targets,beanshell,\ + ExternalProject_beanshell \ + Package_beanshell \ + UnpackedTarball_beanshell \ +)) +endif +endif + +# vim: set noet sw=4 ts=4: diff --git a/beanshell/Package_beanshell.mk b/beanshell/Package_beanshell.mk new file mode 100644 index 000000000000..983c1fc77f93 --- /dev/null +++ b/beanshell/Package_beanshell.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Package_Package,beanshell_inc,$(call gb_UnpackedTarball_get_dir,beanshell))) + +$(eval $(call gb_Package_use_external_project,beanshell_inc,beanshell)) + +$(eval $(call gb_Package_add_file,beanshell_inc,bin/bsh.jar,dist/bsh-2.0b1.jar)) + +# vim: set noet sw=4 ts=4: diff --git a/beanshell/UnpackedTarball_beanshell.mk b/beanshell/UnpackedTarball_beanshell.mk new file mode 100644 index 000000000000..6e798ae01929 --- /dev/null +++ b/beanshell/UnpackedTarball_beanshell.mk @@ -0,0 +1,18 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,beanshell)) + +$(eval $(call gb_UnpackedTarball_set_tarball,beanshell,$(BSH_TARBALL))) + +$(eval $(call gb_UnpackedTarball_add_patches,beanshell,\ + beanshell/bsh-2.0b1-src.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/beanshell/prj/build.lst b/beanshell/prj/build.lst index 2a1401b3fbeb..8d2fb8c7a59b 100644 --- a/beanshell/prj/build.lst +++ b/beanshell/prj/build.lst @@ -1,3 +1,2 @@ -be beanshell : solenv NULL -be beanshell usr1 - all be_mkout NULL -be beanshell nmake - all be_beanshell NULL +be beanshell : solenv NULL +be beanshell\prj nmake - all be_beanshell NULL diff --git a/beanshell/prj/dmake b/beanshell/prj/dmake deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/config_host.mk.in b/config_host.mk.in index 51990d995e03..d6f5f1659fb8 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -36,6 +36,7 @@ export BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@ export BOOST_LDFLAGS=@BOOST_LDFLAGS@ export BOOST_TARBALL=@BOOST_TARBALL@ export BSH_JAR=@BSH_JAR@ +export BSH_TARBALL=@BSH_TARBALL@ export BUILD_DMAKE=@BUILD_DMAKE@ export BUILD_EPM=@BUILD_EPM@ export BUILD_MOZAB=@BUILD_MOZAB@ diff --git a/configure.in b/configure.in index 4c44b7d65969..93b828d1e8d1 100644 --- a/configure.in +++ b/configure.in @@ -10056,6 +10056,7 @@ if test "x$enable_ext_scripting_beanshell" = "xyes" -a "x$enable_extension_integ else AC_MSG_RESULT([internal]) SYSTEM_BSH=NO + BSH_TARBALL="ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz" BUILD_TYPE="$BUILD_TYPE BSH" fi else @@ -10066,6 +10067,7 @@ fi AC_SUBST(ENABLE_SCRIPTING_BEANSHELL) AC_SUBST(SYSTEM_BSH) AC_SUBST(BSH_JAR) +AC_SUBST(BSH_TARBALL) # scripting provider for JavaScript extension? AC_MSG_CHECKING([whether to build extension for support of scripts in JavaScript]) diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index 4129e2084473..15d2e0efe37d 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland stax XPDF:xpdf ZLIB:zlib external RHINO:rhino sal solenv soltools NULL +tb tail_build : BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland stax XPDF:xpdf ZLIB:zlib external RHINO:rhino sal solenv soltools NULL tb tail_build\prj nmake - all tb_prj NULL From 9fadb7804fb425ab92b1a5e85db9a89207ce2607 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 2 Oct 2012 13:09:26 +0200 Subject: [PATCH 172/863] beanshell: rename package to beanshell Change-Id: Ie4979cfb2a20bc0128a550358b0d0adc3f3d209c --- beanshell/Package_beanshell.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/beanshell/Package_beanshell.mk b/beanshell/Package_beanshell.mk index 983c1fc77f93..bb4b829cce08 100644 --- a/beanshell/Package_beanshell.mk +++ b/beanshell/Package_beanshell.mk @@ -7,10 +7,10 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,beanshell_inc,$(call gb_UnpackedTarball_get_dir,beanshell))) +$(eval $(call gb_Package_Package,beanshell,$(call gb_UnpackedTarball_get_dir,beanshell))) -$(eval $(call gb_Package_use_external_project,beanshell_inc,beanshell)) +$(eval $(call gb_Package_use_external_project,beanshell,beanshell)) -$(eval $(call gb_Package_add_file,beanshell_inc,bin/bsh.jar,dist/bsh-2.0b1.jar)) +$(eval $(call gb_Package_add_file,beanshell,bin/bsh.jar,dist/bsh-2.0b1.jar)) # vim: set noet sw=4 ts=4: From 369a5ffbf1cd92c26a8e61c40b75fabb44d64da2 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 2 Oct 2012 13:12:50 +0200 Subject: [PATCH 173/863] beanshell: we didn't need -Dfile.encoding=ISO-8859-1 before Change-Id: Ic1cbd5e7ad15452d4fabaff273dad78188b2201b --- beanshell/ExternalProject_beanshell.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/beanshell/ExternalProject_beanshell.mk b/beanshell/ExternalProject_beanshell.mk index b1bfa9f5faff..0fc720d30042 100644 --- a/beanshell/ExternalProject_beanshell.mk +++ b/beanshell/ExternalProject_beanshell.mk @@ -17,7 +17,6 @@ $(eval $(call gb_ExternalProject_register_targets,beanshell,\ $(call gb_ExternalProject_get_state_target,beanshell,build) : cd "$(call gb_UnpackedTarball_get_dir,beanshell)" && \ - ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \ "$(ANT)" \ -q \ -f build.xml \ From e17db9f50e3a50b656dc8234330b61f30313e8fa Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 2 Oct 2012 13:13:22 +0200 Subject: [PATCH 174/863] remove dmakefile Change-Id: I1d6df640011a4a2d0361be0bc1f46cb83282ded5 --- beanshell/makefile.mk | 57 ------------------------------------------- 1 file changed, 57 deletions(-) delete mode 100644 beanshell/makefile.mk diff --git a/beanshell/makefile.mk b/beanshell/makefile.mk deleted file mode 100644 index 09b8427d8bf7..000000000000 --- a/beanshell/makefile.mk +++ /dev/null @@ -1,57 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=. - -PRJNAME=ooo_beanshell -TARGET=ooo_beanshell - -.IF "$(SOLAR_JAVA)"!="" -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : antsettings.mk - -# --- Files -------------------------------------------------------- - -TARFILE_NAME=bsh-2.0b1-src -TARFILE_MD5=ea570af93c284aa9e5621cd563f54f4d -TARFILE_ROOTDIR=BeanShell -PATCH_FILES=bsh-2.0b1-src.patch - -BUILD_ACTION="$(ANT)" $(ANT_FLAGS) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_ext.mk -.INCLUDE : target.mk -.INCLUDE : tg_ext.mk - -.ELSE -all: - @echo java disabled -.ENDIF From 741dd512af5bd448c231cbd945e545cd79377858 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Tue, 2 Oct 2012 12:47:08 +0200 Subject: [PATCH 175/863] SwXPageStyle: make sure SHARED_FIRST is added to both HEADER and FOOTER sets It makes no sense to alter only the header set, as this property affects both. Change-Id: I7a34f97d144f877f808506e6ed961745994bb9a1 --- sw/source/core/unocore/unostyle.cxx | 68 +++++++++++++++++------------ 1 file changed, 41 insertions(+), 27 deletions(-) diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index a851413e8641..5f965ba58eda 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -2948,6 +2948,39 @@ SwXPageStyle::~SwXPageStyle() } +void lcl_putItemToSet(const SvxSetItem* pSetItem, sal_uInt16 nRes, sal_uInt16 nItemType, const uno::Any& rVal, sal_uInt8 nMemberId, SwStyleBase_Impl& rBaseImpl) +{ + SvxSetItem* pNewSetItem = (SvxSetItem*)pSetItem->Clone(); + SfxItemSet& rSetSet = pNewSetItem->GetItemSet(); + const SfxPoolItem* pItem = 0; + SfxPoolItem* pNewItem = 0; + rSetSet.GetItemState(nRes, sal_True, &pItem); + if(!pItem && nRes != rSetSet.GetPool()->GetSlotId(nRes)) + pItem = &rSetSet.GetPool()->GetDefaultItem(nRes); + if(pItem) + { + pNewItem = pItem->Clone(); + } + else + { + switch(nItemType) + { + case TYPE_BOOL: pNewItem = new SfxBoolItem(nRes); break; + case TYPE_SIZE: pNewItem = new SvxSizeItem(nRes); break; + case TYPE_BRUSH: pNewItem = new SvxBrushItem(nRes); break; + case TYPE_ULSPACE: pNewItem = new SvxULSpaceItem(nRes); break; + case TYPE_SHADOW : pNewItem = new SvxShadowItem(nRes); break; + case TYPE_LRSPACE: pNewItem = new SvxLRSpaceItem(nRes); break; + case TYPE_BOX: pNewItem = new SvxBoxItem(nRes); break; + } + } + pNewItem->PutValue(rVal, nMemberId); + rSetSet.Put(*pNewItem); + rBaseImpl.GetItemSet().Put(*pNewSetItem); + delete pNewItem; + delete pNewSetItem; +} + void SAL_CALL SwXPageStyle::SetPropertyValues_Impl( const uno::Sequence< OUString >& rPropertyNames, const uno::Sequence< uno::Any >& rValues ) @@ -3067,35 +3100,16 @@ void SAL_CALL SwXPageStyle::SetPropertyValues_Impl( bFooter ? SID_ATTR_PAGE_FOOTERSET : SID_ATTR_PAGE_HEADERSET, sal_False, (const SfxPoolItem**)&pSetItem)) { - SvxSetItem* pNewSetItem = (SvxSetItem*)pSetItem->Clone(); - SfxItemSet& rSetSet = pNewSetItem->GetItemSet(); - const SfxPoolItem* pItem = 0; - SfxPoolItem* pNewItem = 0; - rSetSet.GetItemState(nRes, sal_True, &pItem); - if(!pItem && nRes != rSetSet.GetPool()->GetSlotId(nRes)) - pItem = &rSetSet.GetPool()->GetDefaultItem(nRes); - if(pItem) + lcl_putItemToSet(pSetItem, nRes, nItemType, pValues[nProp], pEntry->nMemberId, aBaseImpl); + + if (nRes == SID_ATTR_PAGE_SHARED_FIRST) { - pNewItem = pItem->Clone(); + // Need to add this to the other as well + if (SFX_ITEM_SET == aBaseImpl.GetItemSet().GetItemState( + bFooter ? SID_ATTR_PAGE_HEADERSET : SID_ATTR_PAGE_FOOTERSET, + sal_False, (const SfxPoolItem**)&pSetItem)) + lcl_putItemToSet(pSetItem, nRes, nItemType, pValues[nProp], pEntry->nMemberId, aBaseImpl); } - else - { - switch(nItemType) - { - case TYPE_BOOL: pNewItem = new SfxBoolItem(nRes); break; - case TYPE_SIZE: pNewItem = new SvxSizeItem(nRes); break; - case TYPE_BRUSH: pNewItem = new SvxBrushItem(nRes); break; - case TYPE_ULSPACE: pNewItem = new SvxULSpaceItem(nRes); break; - case TYPE_SHADOW : pNewItem = new SvxShadowItem(nRes); break; - case TYPE_LRSPACE: pNewItem = new SvxLRSpaceItem(nRes); break; - case TYPE_BOX: pNewItem = new SvxBoxItem(nRes); break; - } - } - pNewItem->PutValue(pValues[nProp], pEntry->nMemberId); - rSetSet.Put(*pNewItem); - aBaseImpl.GetItemSet().Put(*pNewSetItem); - delete pNewItem; - delete pNewSetItem; } else if(SID_ATTR_PAGE_ON == nRes ) { From 857a26eb173f9e0a2ac550da14812ba80500f114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 2 Oct 2012 10:19:18 +0100 Subject: [PATCH 176/863] XubString->OUString Change-Id: I49d2d41ad4d5ee4ececf5a57eae070898e33075f --- sc/source/core/tool/interpr1.cxx | 6 +- sc/source/filter/lotus/tool.cxx | 42 ++-- sc/source/ui/docshell/docsh8.cxx | 3 +- sc/source/ui/view/viewfunc.cxx | 5 +- sfx2/source/view/viewsh.cxx | 4 +- svl/inc/svl/zforlist.hxx | 62 +++--- svl/source/numbers/numfmuno.cxx | 6 +- svl/source/numbers/zforlist.cxx | 326 ++++++++++++++-------------- svtools/source/control/fmtfield.cxx | 8 +- svx/source/fmcomp/gridcell.cxx | 281 ++++++++++++------------ svx/source/inc/gridcell.hxx | 94 ++++---- svx/source/items/numfmtsh.cxx | 16 +- xmloff/source/style/xmlnumfi.cxx | 3 +- 13 files changed, 417 insertions(+), 439 deletions(-) diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index dfbf8da01dbe..db4d30e0673a 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -7639,8 +7639,7 @@ void ScInterpreter::ScCurrency() ScGlobal::eLnge); if ( (sal_uInt16) fDec != pFormatter->GetFormatPrecision( nIndex ) ) { - String sFormatString; - pFormatter->GenerateFormat(sFormatString, + String sFormatString = pFormatter->GenerateFormat( nIndex, ScGlobal::eLnge, true, // mit Tausenderpunkt @@ -7728,13 +7727,12 @@ void ScInterpreter::ScFixed() else fVal = floor(fVal*fFac+0.5)/fFac; Color* pColor = NULL; - String sFormatString; if (fDec < 0.0) fDec = 0.0; sal_uLong nIndex = pFormatter->GetStandardFormat( NUMBERFORMAT_NUMBER, ScGlobal::eLnge); - pFormatter->GenerateFormat(sFormatString, + String sFormatString = pFormatter->GenerateFormat( nIndex, ScGlobal::eLnge, bThousand, // mit Tausenderpunkt diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx index 44bf49140a86..b1b3b2da5b89 100644 --- a/sc/source/filter/lotus/tool.cxx +++ b/sc/source/filter/lotus/tool.cxx @@ -209,8 +209,6 @@ SfxUInt32Item* FormCache::NewAttr( sal_uInt8 nFormat, sal_uInt8 nSt ) sal_uInt32 nHandle; NfIndexTableOffset eIndexTableOffset = NF_NUMERIC_START; sal_Bool bDefault = false; - //void GenerateFormat( aFormString, eType, COUNTRY_SYSTEM, LANGUAGE_SYSTEM, - // sal_Bool bThousand, sal_Bool IsRed, sal_uInt16 nPrecision, sal_uInt16 nAnzLeading ); if( nForm == 0xFF ) // Default-Format? nForm = nDefaultFormat; @@ -226,50 +224,50 @@ SfxUInt32Item* FormCache::NewAttr( sal_uInt8 nFormat, sal_uInt8 nSt ) //fStandard;nL; nIndex1 = pFormTable->GetStandardFormat( NUMBERFORMAT_NUMBER, eLanguage ); - pFormTable->GenerateFormat( aFormString, nIndex1, - eLanguage, false, false, nL, 1 ); + aFormString = pFormTable->GenerateFormat(nIndex1, + eLanguage, false, false, nL, 1); break; case 0x01: // Exponentdarstellung (scientific notation) //fExponent;nL; nIndex1 = pFormTable->GetStandardFormat( NUMBERFORMAT_SCIENTIFIC, eLanguage ); - pFormTable->GenerateFormat( aFormString, nIndex1, - eLanguage, false, false, nL, 1 ); + aFormString = pFormTable->GenerateFormat(nIndex1, + eLanguage, false, false, nL, 1); break; case 0x02: // Waehrungsdarstellung (currency) //fMoney;nL; nIndex1 = pFormTable->GetStandardFormat( NUMBERFORMAT_CURRENCY, eLanguage ); - pFormTable->GenerateFormat( aFormString, nIndex1, - eLanguage, false, false, nL, 1 ); + aFormString = pFormTable->GenerateFormat(nIndex1, + eLanguage, false, false, nL, 1); break; case 0x03: // Prozent //fPercent;nL; nIndex1 = pFormTable->GetStandardFormat( NUMBERFORMAT_PERCENT, eLanguage ); - pFormTable->GenerateFormat( aFormString, nIndex1, - eLanguage, false, false, nL, 1 ); + aFormString = pFormTable->GenerateFormat(nIndex1, + eLanguage, false, false, nL, 1); break; case 0x04: // Komma //fStandard;nL; nIndex1 = pFormTable->GetStandardFormat( NUMBERFORMAT_NUMBER, eLanguage ); - pFormTable->GenerateFormat( aFormString, nIndex1, - eLanguage, sal_True, false, nL, 1 ); + aFormString = pFormTable->GenerateFormat(nIndex1, + eLanguage, sal_True, false, nL, 1); break; case 0x05: // frei //fStandard;nL; nIndex1 = pFormTable->GetStandardFormat( NUMBERFORMAT_NUMBER, eLanguage ); - pFormTable->GenerateFormat( aFormString, nIndex1, - eLanguage, false, false, nL, 1 ); + aFormString = pFormTable->GenerateFormat(nIndex1, + eLanguage, false, false, nL, 1); break; case 0x06: // frei //fStandard;nL; nIndex1 = pFormTable->GetStandardFormat( NUMBERFORMAT_NUMBER, eLanguage ); - pFormTable->GenerateFormat( aFormString, nIndex1, - eLanguage, false, false, nL, 1 ); + aFormString = pFormTable->GenerateFormat(nIndex1, + eLanguage, false, false, nL, 1); nIndex1 = 0; break; case 0x07: // Spezialformat @@ -279,15 +277,15 @@ SfxUInt32Item* FormCache::NewAttr( sal_uInt8 nFormat, sal_uInt8 nSt ) //fStandard;nSt; nIndex1 = pFormTable->GetStandardFormat( NUMBERFORMAT_NUMBER, eLanguage ); - pFormTable->GenerateFormat( aFormString, nIndex1, - eLanguage, false, sal_True, nSt, 1 ); + aFormString = pFormTable->GenerateFormat(nIndex1, + eLanguage, false, sal_True, nSt, 1); break; case 0x01: // generelles Format //fStandard;nSt; nIndex1 = pFormTable->GetStandardFormat( NUMBERFORMAT_NUMBER, eLanguage ); - pFormTable->GenerateFormat( aFormString, nIndex1, - eLanguage, false, false, nSt, 1 ); + aFormString = pFormTable->GenerateFormat(nIndex1, + eLanguage, false, false, nSt, 1); break; case 0x02: // Datum: Tag, Monat, Jahr //fDate;dfDayMonthYearLong; @@ -362,8 +360,8 @@ SfxUInt32Item* FormCache::NewAttr( sal_uInt8 nFormat, sal_uInt8 nSt ) //fStandard;nL; nIndex1 = pFormTable->GetStandardFormat( NUMBERFORMAT_NUMBER, eLanguage ); - pFormTable->GenerateFormat( aFormString, nIndex1, - eLanguage, false, false, nL, 1 ); + aFormString = pFormTable->GenerateFormat(nIndex1, + eLanguage, false, false, nL, 1); nIndex1 = 0; break; } diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index 63330ba9e907..6453631f570a 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -282,8 +282,7 @@ static void lcl_setScalesToColumns(ScDocument& rDoc, const vector& rScales pOldEntry->GetFormatSpecialInfo(bThousand, bNegRed, nPrecision, nLeading); nPrecision = static_cast(rScales[i]); - String aNewPicture; - pFormatter->GenerateFormat(aNewPicture, nOldFormat, eLang, + String aNewPicture = pFormatter->GenerateFormat(nOldFormat, eLang, bThousand, bNegRed, nPrecision, nLeading); sal_uInt32 nNewFormat = pFormatter->GetEntryKey(aNewPicture, eLang); diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index f999b52d1a1e..b302d2ba9c66 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -2724,9 +2724,8 @@ void ScViewFunc::ChangeNumFmtDecimals( sal_Bool bIncrement ) if (!bError) { - String aNewPicture; - pFormatter->GenerateFormat( aNewPicture, nOldFormat, eLanguage, - bThousand, bNegRed, nPrecision, nLeading ); + String aNewPicture = pFormatter->GenerateFormat(nOldFormat, eLanguage, + bThousand, bNegRed, nPrecision, nLeading); nNewFormat = pFormatter->GetEntryKey( aNewPicture, eLanguage ); if ( nNewFormat == NUMBERFORMAT_ENTRY_NOT_FOUND ) diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 2b1c8faf07e3..c61e3005f8c5 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -499,8 +499,8 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) for( sal_uInt16 nItem = 0; nItem < nItemCount; ++nItem ) { sal_uInt16 nItemId = pTextToolbox->GetItemId( nItem ); - const XubString& rCommand = pTextToolbox->GetItemCommand( nItemId ); - if( rCommand.EqualsAscii( ".uno:StyleApply" ) ) + const OUString& rCommand = pTextToolbox->GetItemCommand( nItemId ); + if (rCommand == ".uno:StyleApply") { Window* pItemWin = pTextToolbox->GetItemWindow( nItemId ); if( pItemWin ) diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx index 0d82c0f1c41c..5a86329578b4 100644 --- a/svl/inc/svl/zforlist.hxx +++ b/svl/inc/svl/zforlist.hxx @@ -20,14 +20,16 @@ #define _ZFORLIST_HXX #include "svl/svldllapi.h" +#include +#include #include #include #include #include #include #include -#include #include +#include #include #include @@ -50,10 +52,6 @@ namespace com { namespace sun { namespace star { } }}} -namespace rtl { - class OUString; -} - #define SV_COUNTRY_LANGUAGE_OFFSET 5000 // Max count of formats per country/language #define SV_MAX_ANZ_STANDARD_FORMATE 100 // Max count of builtin default formats per CL @@ -273,25 +271,25 @@ public: OUString BuildSymbolString(bool bBank, bool bWithoutExtension = false) const; - /** #,##0.00 [$DM-407] is assigned to rStr, separators + /** #,##0.00 [$DM-407] is returned, separators from rLoc, incl. minus sign but without [RED] */ - void BuildPositiveFormatString( String& rStr, bool bBank, - const LocaleDataWrapper&, sal_uInt16 nDecimalFormat = 1 ) const; - void BuildNegativeFormatString( String& rStr, bool bBank, - const LocaleDataWrapper&, sal_uInt16 nDecimalFormat = 1 ) const; + OUString BuildPositiveFormatString(bool bBank, + const LocaleDataWrapper&, sal_uInt16 nDecimalFormat = 1) const; + OUString BuildNegativeFormatString(bool bBank, + const LocaleDataWrapper&, sal_uInt16 nDecimalFormat = 1) const; /** [$DM-407] (or [$DEM] if bBank==true) is appended/prepended to rStr, incl. minus sign */ - void CompletePositiveFormatString( String& rStr, bool bBank, - sal_uInt16 nPosiFormat ) const; - void CompleteNegativeFormatString( String& rStr, bool bBank, - sal_uInt16 nNegaFormat ) const; + void CompletePositiveFormatString(OUStringBuffer& rStr, bool bBank, + sal_uInt16 nPosiFormat) const; + void CompleteNegativeFormatString(OUStringBuffer& rStr, bool bBank, + sal_uInt16 nNegaFormat) const; /// rSymStr is appended/prepended to rStr, incl. minus sign - static void CompletePositiveFormatString( String& rStr, - const String& rSymStr, sal_uInt16 nPosiFormat ); - static void CompleteNegativeFormatString( String& rStr, - const String& rSymStr, sal_uInt16 nNegaFormat ); + static void CompletePositiveFormatString(OUStringBuffer& rStr, + const String& rSymStr, sal_uInt16 nPosiFormat); + static void CompleteNegativeFormatString(OUStringBuffer& rStr, + const String& rSymStr, sal_uInt16 nNegaFormat); /** Representation of a currency (symbol position and negative sign) in other language settings */ @@ -309,7 +307,7 @@ public: typedef boost::ptr_vector NfCurrencyTable; -typedef std::vector< ::rtl::OUString > NfWSStringsDtor; +typedef std::vector< OUString > NfWSStringsDtor; class SvNumberFormatterRegistry_Impl; @@ -397,7 +395,7 @@ public: bool PutEntry( String& rString, xub_StrLen& nCheckPos, short& nType, sal_uInt32& nKey, LanguageType eLnge = LANGUAGE_DONTKNOW ); - bool PutEntry( rtl::OUString& rString, xub_StrLen& nCheckPos, short& nType, sal_uInt32& nKey, + bool PutEntry( OUString& rString, xub_StrLen& nCheckPos, short& nType, sal_uInt32& nKey, LanguageType eLnge = LANGUAGE_DONTKNOW ); /** Same as PutEntry but the format code string is @@ -407,7 +405,7 @@ public: short& nType, sal_uInt32& nKey, LanguageType eLnge, LanguageType eNewLnge ); - bool PutandConvertEntry( rtl::OUString& rString, xub_StrLen& nCheckPos, + bool PutandConvertEntry( OUString& rString, xub_StrLen& nCheckPos, short& nType, sal_uInt32& nKey, LanguageType eLnge, LanguageType eNewLnge ); @@ -463,10 +461,10 @@ public: /** Create a format code string using format nIndex as a template and applying other settings (passed from the dialog) */ - void GenerateFormat( String& sString, sal_uInt32 nIndex, - LanguageType eLnge = LANGUAGE_DONTKNOW, - bool bThousand = false, bool IsRed = false, - sal_uInt16 nPrecision = 0, sal_uInt16 nAnzLeading = 1 ); + OUString GenerateFormat(sal_uInt32 nIndex, + LanguageType eLnge = LANGUAGE_DONTKNOW, + bool bThousand = false, bool IsRed = false, + sal_uInt16 nPrecision = 0, sal_uInt16 nAnzLeading = 1); /** Analyze an input string @return @@ -483,7 +481,7 @@ public: /// Format a number according to a format index, return string and color void GetOutputString( const double& fOutNumber, sal_uInt32 nFIndex, - rtl::OUString& sOutString, Color** ppColor, bool bUseStarFormat = false ); + OUString& sOutString, Color** ppColor, bool bUseStarFormat = false ); /** Format a string according to a format index, return string and color. Formats only if the format code is of type text or the 4th subcode @@ -495,8 +493,8 @@ public: /** Format a string according to a format index, return string and color. Formats only if the format code is of type text or the 4th subcode of a format code is specified, otherwise sOutString will be == "" */ - void GetOutputString( rtl::OUString& sString, sal_uInt32 nFIndex, - rtl::OUString& sOutString, Color** ppColor, bool bUseStarFormat = false ); + void GetOutputString( OUString& sString, sal_uInt32 nFIndex, + OUString& sOutString, Color** ppColor, bool bUseStarFormat = false ); /** Format a number according to the standard default format matching the given format index */ @@ -504,7 +502,7 @@ public: sal_uInt32 nFIndex, String& sOutString ); void GetInputLineString( const double& fOutNumber, - sal_uInt32 nFIndex, rtl::OUString& rOutString ); + sal_uInt32 nFIndex, OUString& rOutString ); /** Format a number according to a format code string to be scanned. @return @@ -878,9 +876,9 @@ private: SVL_DLLPRIVATE sal_uInt32 ImpGenerateCL( LanguageType eLnge, bool bNoAdditionalFormats = false ); // Build negative currency format, old compatibility style - SVL_DLLPRIVATE void ImpGetNegCurrFormat( String& sNegStr, const String& rCurrSymbol ); + SVL_DLLPRIVATE void ImpGetNegCurrFormat(OUStringBuffer& sNegStr, const OUString& rCurrSymbol); // Build positive currency format, old compatibility style - SVL_DLLPRIVATE void ImpGetPosCurrFormat( String& sPosStr, const String& rCurrSymbol ); + SVL_DLLPRIVATE void ImpGetPosCurrFormat(OUStringBuffer& sPosStr, const OUString& rCurrSymbol); // Create theCurrencyTable with all NfCurrencyEntry SVL_DLLPRIVATE static void ImpInitCurrencyTable(); @@ -978,7 +976,7 @@ public: // return corresponding Transliteration wrapper with loadModuleByImplName() inline const ::utl::TransliterationWrapper* GetTransliterationForModule( - const String& rModule, LanguageType eLang ) const + const OUString& rModule, LanguageType eLang ) const { return xTransliteration.getForModule( rModule, eLang ); } // return the corresponding CharacterClassification wrapper diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx index e712255ee85b..461ff8bb370e 100644 --- a/svl/source/numbers/numfmuno.cxx +++ b/svl/source/numbers/numfmuno.cxx @@ -566,19 +566,19 @@ void SAL_CALL SvNumberFormatsObj::removeByKey( sal_Int32 nKey ) throw(uno::Runti } } -rtl::OUString SAL_CALL SvNumberFormatsObj::generateFormat( sal_Int32 nBaseKey, +OUString SAL_CALL SvNumberFormatsObj::generateFormat( sal_Int32 nBaseKey, const lang::Locale& nLocale, sal_Bool bThousands, sal_Bool bRed, sal_Int16 nDecimals, sal_Int16 nLeading ) throw(uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - String aRet; + OUString aRet; SvNumberFormatter* pFormatter = rSupplier.GetNumberFormatter(); if (pFormatter) { LanguageType eLang = lcl_GetLanguage( nLocale ); - pFormatter->GenerateFormat( aRet, nBaseKey, eLang, bThousands, bRed, nDecimals, nLeading ); + aRet = pFormatter->GenerateFormat(nBaseKey, eLang, bThousands, bRed, nDecimals, nLeading); } else throw uno::RuntimeException(); diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index cdc689a54b67..22872d1ff9f2 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include #include #include #include @@ -54,9 +55,6 @@ using namespace ::com::sun::star::i18n; using namespace ::com::sun::star::lang; using namespace ::std; -using ::rtl::OUString; - - // Constants for type offsets per Country/Language (CL) #define ZF_STANDARD 0 #define ZF_STANDARD_PERCENT 10 @@ -535,7 +533,7 @@ bool SvNumberFormatter::PutEntry( OUString& rString, xub_StrLen& nCheckPos, short& nType, sal_uInt32& nKey, LanguageType eLnge) { - // Wrapper to allow rtl::OUString to be used. + // Wrapper to allow OUString to be used. String aStr(rString); bool bRet = PutEntry(aStr, nCheckPos, nType, nKey, eLnge); rString = aStr; @@ -559,7 +557,7 @@ bool SvNumberFormatter::PutandConvertEntry(String& rString, return bRes; } -bool SvNumberFormatter::PutandConvertEntry(rtl::OUString& rString, +bool SvNumberFormatter::PutandConvertEntry(OUString& rString, xub_StrLen& nCheckPos, short& nType, sal_uInt32& nKey, @@ -925,7 +923,7 @@ sal_uInt32 SvNumberFormatter::ImpGenerateCL( LanguageType eLnge, bool bNoAdditio if ( aLoadedLocale.Language != aLocale.Language || aLoadedLocale.Country != aLocale.Country ) { - rtl::OUString aMsg("SvNumerFormatter::ImpGenerateCL: locales don't match:"); + OUString aMsg("SvNumerFormatter::ImpGenerateCL: locales don't match:"); LocaleDataWrapper::outputCheckMessage( xLocaleData->appendLocaleInfo( aMsg )); } // test XML locale data FormatElement entries @@ -939,25 +937,25 @@ sal_uInt32 SvNumberFormatter::ImpGenerateCL( LanguageType eLnge, bool bNoAdditio for ( sal_Int32 j = 0; j < xSeq.getLength(); j++ ) { sal_Int16 nIdx = xSeq[j].formatIndex; - rtl::OUString aDupes; + OUString aDupes; for ( sal_Int32 i = 0; i < xSeq.getLength(); i++ ) { if ( i != j && xSeq[i].formatIndex == nIdx ) { - aDupes += rtl::OUString::valueOf( i ); + aDupes += OUString::valueOf( i ); aDupes += "("; - aDupes += rtl::OUString( xSeq[i].formatKey ); + aDupes += OUString( xSeq[i].formatKey ); aDupes += ") "; } } if ( !aDupes.isEmpty() ) { - rtl::OUString aMsg("XML locale data FormatElement formatindex dupe: "); - aMsg += rtl::OUString::valueOf( sal_Int32(nIdx) ); + OUString aMsg("XML locale data FormatElement formatindex dupe: "); + aMsg += OUString::valueOf( sal_Int32(nIdx) ); aMsg += "\nFormatElements: "; - aMsg += rtl::OUString::valueOf( j ); + aMsg += OUString::valueOf( j ); aMsg += "("; - aMsg += rtl::OUString( xSeq[j].formatKey ); + aMsg += OUString( xSeq[j].formatKey ); aMsg += ") "; aMsg += aDupes; LocaleDataWrapper::outputCheckMessage( @@ -1322,7 +1320,7 @@ sal_uInt32 SvNumberFormatter::GetEditFormat( double fNumber, sal_uInt32 nFIndex, switch ( eType ) { // #61619# always edit using 4-digit year case NUMBERFORMAT_DATE : - if (::rtl::math::approxFloor( fNumber) != fNumber) + if (rtl::math::approxFloor( fNumber) != fNumber) nKey = GetFormatIndex( NF_DATETIME_SYS_DDMMYYYY_HHMMSS, eLang ); // fdo#34977 preserve time when editing even if only date was // displayed. @@ -1414,7 +1412,7 @@ void SvNumberFormatter::GetInputLineString(const double& fOutNumber, void SvNumberFormatter::GetInputLineString(const double& fOutNumber, sal_uInt32 nFIndex, - rtl::OUString& rOutString) + OUString& rOutString) { String aTmp; GetInputLineString(fOutNumber, nFIndex, aTmp); @@ -1470,13 +1468,13 @@ void SvNumberFormatter::GetOutputString(String& sString, void SvNumberFormatter::GetOutputString(const double& fOutNumber, sal_uInt32 nFIndex, - rtl::OUString& sOutString, + OUString& sOutString, Color** ppColor, bool bUseStarFormat ) { if (bNoZero && fOutNumber == 0.0) { - sOutString = rtl::OUString(); + sOutString = OUString(); return; } SvNumberformat* pFormat = GetFormatEntry( nFIndex ); @@ -1492,9 +1490,9 @@ void SvNumberFormatter::GetOutputString(const double& fOutNumber, sOutString = aOutString; } -void SvNumberFormatter::GetOutputString(rtl::OUString& sString, +void SvNumberFormatter::GetOutputString(OUString& sString, sal_uInt32 nFIndex, - rtl::OUString& sOutString, + OUString& sOutString, Color** ppColor, bool bUseStarFormat ) { @@ -1760,8 +1758,8 @@ SvNumberformat* SvNumberFormatter::ImpInsertFormat( if (LocaleDataWrapper::areChecksEnabled() && rCode.Index != NF_CURRENCY_1000DEC2_CCC ) { - rtl::OUString aMsg("SvNumberFormatter::ImpInsertFormat: no [$...] on currency format code, index "); - aMsg += rtl::OUString::valueOf( sal_Int32(rCode.Index) ); + OUString aMsg("SvNumberFormatter::ImpInsertFormat: no [$...] on currency format code, index "); + aMsg += OUString::valueOf( sal_Int32(rCode.Index) ); aMsg += ":\n"; aMsg += rCode.Code; LocaleDataWrapper::outputCheckMessage( xLocaleData->appendLocaleInfo( aMsg)); @@ -1778,8 +1776,8 @@ SvNumberformat* SvNumberFormatter::ImpInsertFormat( { if (LocaleDataWrapper::areChecksEnabled()) { - rtl::OUString aMsg( "SvNumberFormatter::ImpInsertFormat: bad format code, index " ); - aMsg += rtl::OUString::valueOf( sal_Int32(rCode.Index) ); + OUString aMsg( "SvNumberFormatter::ImpInsertFormat: bad format code, index " ); + aMsg += OUString::valueOf( sal_Int32(rCode.Index) ); aMsg += "\n"; aMsg += rCode.Code; LocaleDataWrapper::outputCheckMessage( xLocaleData->appendLocaleInfo( aMsg)); @@ -1808,8 +1806,8 @@ SvNumberformat* SvNumberFormatter::ImpInsertFormat( break; default: { - rtl::OUString aMsg("SvNumberFormatter::ImpInsertFormat: dup format code, index "); - aMsg += rtl::OUString::valueOf( sal_Int32(rCode.Index) ); + OUString aMsg("SvNumberFormatter::ImpInsertFormat: dup format code, index "); + aMsg += OUString::valueOf( sal_Int32(rCode.Index) ); aMsg += "\n"; aMsg += rCode.Code; LocaleDataWrapper::outputCheckMessage( xLocaleData->appendLocaleInfo( aMsg)); @@ -1823,8 +1821,8 @@ SvNumberformat* SvNumberFormatter::ImpInsertFormat( { if (LocaleDataWrapper::areChecksEnabled()) { - rtl::OUString aMsg( "SvNumberFormatter::ImpInsertFormat: too many format codes, index "); - aMsg += rtl::OUString::valueOf( sal_Int32(rCode.Index) ); + OUString aMsg( "SvNumberFormatter::ImpInsertFormat: too many format codes, index "); + aMsg += OUString::valueOf( sal_Int32(rCode.Index) ); aMsg += "\n"; aMsg += rCode.Code; LocaleDataWrapper::outputCheckMessage( xLocaleData->appendLocaleInfo( aMsg)); @@ -1837,10 +1835,10 @@ SvNumberformat* SvNumberFormatter::ImpInsertFormat( { if (LocaleDataWrapper::areChecksEnabled()) { - rtl::OUString aMsg( "ImpInsertFormat: can't insert number format key pos: "); - aMsg += rtl::OUString::valueOf( sal_Int32( nPos ) ); + OUString aMsg( "ImpInsertFormat: can't insert number format key pos: "); + aMsg += OUString::valueOf( sal_Int32( nPos ) ); aMsg += ", code index "; - aMsg += rtl::OUString::valueOf( sal_Int32(rCode.Index) ); + aMsg += OUString::valueOf( sal_Int32(rCode.Index) ); aMsg += "\n"; aMsg += rCode.Code; LocaleDataWrapper::outputCheckMessage( xLocaleData->appendLocaleInfo( aMsg)); @@ -1974,8 +1972,8 @@ sal_Int32 SvNumberFormatter::ImpGetFormatCodeIndex( || nTabOff == NF_CURRENCY_1000INT_RED || nTabOff == NF_CURRENCY_1000DEC2_CCC)) { // currency entries with decimals might not exist, e.g. Italian Lira - rtl::OUString aMsg( "SvNumberFormatter::ImpGetFormatCodeIndex: not found: " ); - aMsg += rtl::OUString::valueOf( sal_Int32( nTabOff ) ); + OUString aMsg( "SvNumberFormatter::ImpGetFormatCodeIndex: not found: " ); + aMsg += OUString::valueOf( sal_Int32( nTabOff ) ); LocaleDataWrapper::outputCheckMessage( xLocaleData->appendLocaleInfo(aMsg)); } if ( nLen ) @@ -2009,7 +2007,7 @@ sal_Int32 SvNumberFormatter::ImpGetFormatCodeIndex( { // we need at least _some_ format rSeq.realloc(1); rSeq[0] = ::com::sun::star::i18n::NumberFormatCode(); - rSeq[0].Code = rtl::OUStringBuffer(). + rSeq[0].Code = OUStringBuffer(). append('0'). append(GetNumDecimalSep()). appendAscii(RTL_CONSTASCII_STRINGPARAM("############")). @@ -2030,7 +2028,7 @@ sal_Int32 SvNumberFormatter::ImpAdjustFormatCodeDefault( if (bCheckCorrectness && LocaleDataWrapper::areChecksEnabled()) { // check the locale data for correctness - rtl::OStringBuffer aMsg; + OStringBuffer aMsg; sal_Int32 nElem, nShort, nMedium, nLong, nShortDef, nMediumDef, nLongDef; nShort = nMedium = nLong = nShortDef = nMediumDef = nLongDef = -1; for ( nElem = 0; nElem < nCnt; nElem++ ) @@ -2075,7 +2073,7 @@ sal_Int32 SvNumberFormatter::ImpAdjustFormatCodeDefault( aMsg.insert(0, RTL_CONSTASCII_STRINGPARAM("SvNumberFormatter::ImpAdjustFormatCodeDefault: ")); aMsg.append(RTL_CONSTASCII_STRINGPARAM("\nXML locale data FormatElement formatindex: ")); aMsg.append(static_cast(pFormatArr[nElem].Index)); - rtl::OUString aUMsg(rtl::OStringToOUString(aMsg.makeStringAndClear(), + OUString aUMsg(OStringToOUString(aMsg.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US)); LocaleDataWrapper::outputCheckMessage(xLocaleData->appendLocaleInfo(aUMsg)); } @@ -2090,7 +2088,7 @@ sal_Int32 SvNumberFormatter::ImpAdjustFormatCodeDefault( { aMsg.insert(0, RTL_CONSTASCII_STRINGPARAM("SvNumberFormatter::ImpAdjustFormatCodeDefault: ")); aMsg.append(RTL_CONSTASCII_STRINGPARAM("\nXML locale data FormatElement group of: ")); - rtl::OUString aUMsg(rtl::OStringToOUString(aMsg.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US)); + OUString aUMsg(OStringToOUString(aMsg.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US)); LocaleDataWrapper::outputCheckMessage( xLocaleData->appendLocaleInfo(aUMsg + pFormatArr[0].NameID)); } @@ -2659,32 +2657,30 @@ void SvNumberFormatter::ImpGenerateAdditionalFormats( sal_uInt32 CLOffset, } -void SvNumberFormatter::ImpGetPosCurrFormat( String& sPosStr, const String& rCurrSymbol ) +void SvNumberFormatter::ImpGetPosCurrFormat(OUStringBuffer& sPosStr, const OUString& rCurrSymbol) { NfCurrencyEntry::CompletePositiveFormatString( sPosStr, rCurrSymbol, xLocaleData->getCurrPositiveFormat() ); } -void SvNumberFormatter::ImpGetNegCurrFormat( String& sNegStr, const String& rCurrSymbol ) +void SvNumberFormatter::ImpGetNegCurrFormat(OUStringBuffer& sNegStr, const OUString& rCurrSymbol) { NfCurrencyEntry::CompleteNegativeFormatString( sNegStr, rCurrSymbol, xLocaleData->getCurrNegativeFormat() ); } -void SvNumberFormatter::GenerateFormat(String& sString, - sal_uInt32 nIndex, - LanguageType eLnge, - bool bThousand, - bool IsRed, - sal_uInt16 nPrecision, - sal_uInt16 nAnzLeading) +OUString SvNumberFormatter::GenerateFormat(sal_uInt32 nIndex, + LanguageType eLnge, + bool bThousand, + bool IsRed, + sal_uInt16 nPrecision, + sal_uInt16 nAnzLeading) { if (eLnge == LANGUAGE_DONTKNOW) eLnge = IniLnge; short eType = GetType(nIndex); sal_uInt16 i; ImpGenerateCL(eLnge); // create new standard formats if necessary - sString.Erase(); utl::DigitGroupingIterator aGrouping( xLocaleData->getDigitGrouping()); const xub_StrLen nDigitsInFirstGroup = static_cast(aGrouping.get()); @@ -2692,15 +2688,18 @@ void SvNumberFormatter::GenerateFormat(String& sString, SvNumberformat* pFormat = GetFormatEntry( nIndex ); + OUStringBuffer sString; + using comphelper::string::padToLength; + if (nAnzLeading == 0) { if (!bThousand) - sString += '#'; + sString.append('#'); else { - sString += '#'; - sString += rThSep; - sString.Expand( sString.Len() + nDigitsInFirstGroup, '#' ); + sString.append('#'); + sString.append(rThSep); + padToLength(sString, sString.getLength() + nDigitsInFirstGroup, '#'); } } else @@ -2709,31 +2708,31 @@ void SvNumberFormatter::GenerateFormat(String& sString, { if (bThousand && i > 0 && i == aGrouping.getPos()) { - sString.Insert( rThSep, 0 ); + sString.insert(0, rThSep); aGrouping.advance(); } - sString.Insert('0',0); + sString.insert(0, '0'); } if (bThousand && nAnzLeading < nDigitsInFirstGroup + 1) { for (i = nAnzLeading; i < nDigitsInFirstGroup + 1; i++) { if (bThousand && i % nDigitsInFirstGroup == 0) - sString.Insert( rThSep, 0 ); - sString.Insert('#',0); + sString.insert(0, rThSep); + sString.insert(0, '#'); } } } if (nPrecision > 0) { - sString += GetNumDecimalSep(); - sString.Expand( sString.Len() + nPrecision, '0' ); + sString.append(GetNumDecimalSep()); + padToLength(sString, sString.getLength() + nPrecision, '0'); } if (eType == NUMBERFORMAT_PERCENT) - sString += '%'; + sString.append('%'); else if (eType == NUMBERFORMAT_CURRENCY) { - String sNegStr = sString; + OUStringBuffer sNegStr(sString); String aCurr; const NfCurrencyEntry* pEntry; bool bBank; @@ -2775,14 +2774,14 @@ void SvNumberFormatter::GenerateFormat(String& sString, } if (IsRed) { - sString += ';'; - sString += '['; - sString += pFormatScanner->GetRedString(); - sString += ']'; + sString.append(';'); + sString.append('['); + sString.append(pFormatScanner->GetRedString()); + sString.append(']'); } else - sString += ';'; - sString += sNegStr; + sString.append(';'); + sString.append(sNegStr.makeStringAndClear()); } if (eType != NUMBERFORMAT_CURRENCY) { @@ -2791,36 +2790,37 @@ void SvNumberFormatter::GenerateFormat(String& sString, insertBrackets = pFormat->IsNegativeInBracket(); if (IsRed || insertBrackets) { - String sTmpStr = sString; + OUStringBuffer sTmpStr(sString); if ( pFormat->HasPositiveBracketPlaceholder() ) { - sTmpStr += '_'; - sTmpStr += ')'; + sTmpStr.append('_'); + sTmpStr.append(')'); } - sTmpStr += ';'; + sTmpStr.append(';'); if (IsRed) { - sTmpStr += '['; - sTmpStr += pFormatScanner->GetRedString(); - sTmpStr += ']'; + sTmpStr.append('['); + sTmpStr.append(pFormatScanner->GetRedString()); + sTmpStr.append(']'); } if (insertBrackets) { - sTmpStr += '('; - sTmpStr += sString; - sTmpStr += ')'; + sTmpStr.append('('); + sTmpStr.append(sString.toString()); + sTmpStr.append(')'); } else { - sTmpStr += '-'; - sTmpStr +=sString; + sTmpStr.append('-'); + sTmpStr.append(sString.toString()); } sString = sTmpStr; - } + } } + return sString.makeStringAndClear(); } bool SvNumberFormatter::IsUserDefined(const String& sStr, @@ -3358,7 +3358,7 @@ const NfCurrencyEntry* SvNumberFormatter::GetCurrencyEntry( bool & bFoundBank, LanguageType eExtLang; if ( nExtLen ) { - sal_Int32 nExtLang = ::rtl::OUString( rExtension ).toInt32( 16 ); + sal_Int32 nExtLang = OUString( rExtension ).toInt32( 16 ); if ( !nExtLang ) eExtLang = LANGUAGE_DONTKNOW; else @@ -3652,7 +3652,7 @@ void SvNumberFormatter::ImpInitCurrencyTable() sal_uInt16 SvNumberFormatter::GetCurrencyFormatStrings( NfWSStringsDtor& rStrArr, const NfCurrencyEntry& rCurr, bool bBank ) const { - rtl::OUString aRed = rtl::OUStringBuffer(). + OUString aRed = OUStringBuffer(). append('['). append(pFormatScanner->GetRedString()). append(']').makeStringAndClear(); @@ -3661,16 +3661,15 @@ sal_uInt16 SvNumberFormatter::GetCurrencyFormatStrings( NfWSStringsDtor& rStrArr if ( bBank ) { // Only bank symbols. - String aPositiveBank, aNegativeBank; - rCurr.BuildPositiveFormatString( aPositiveBank, true, *xLocaleData, 1 ); - rCurr.BuildNegativeFormatString( aNegativeBank, true, *xLocaleData, 1 ); + OUString aPositiveBank = rCurr.BuildPositiveFormatString(true, *xLocaleData, 1); + OUString aNegativeBank = rCurr.BuildNegativeFormatString(true, *xLocaleData, 1 ); - ::rtl::OUStringBuffer format1(aPositiveBank); + OUStringBuffer format1(aPositiveBank); format1.append(';'); format1.append(aNegativeBank); rStrArr.push_back(format1.makeStringAndClear()); - ::rtl::OUStringBuffer format2(aPositiveBank); + OUStringBuffer format2(aPositiveBank); format2.append(';'); format2.append(aRed); @@ -3684,22 +3683,19 @@ sal_uInt16 SvNumberFormatter::GetCurrencyFormatStrings( NfWSStringsDtor& rStrArr { // Mixed formats like in SvNumberFormatter::ImpGenerateFormats() but no // duplicates if no decimals in currency. - String aPositive, aNegative, aPositiveNoDec, aNegativeNoDec, - aPositiveDashed, aNegativeDashed; - - rCurr.BuildPositiveFormatString( aPositive, false, *xLocaleData, 1 ); - rCurr.BuildNegativeFormatString( aNegative, false, *xLocaleData, 1 ); - ::rtl::OUStringBuffer format1; - ::rtl::OUStringBuffer format2; - ::rtl::OUStringBuffer format3; - ::rtl::OUStringBuffer format4; - ::rtl::OUStringBuffer format5; - if ( rCurr.GetDigits() ) + OUString aPositive = rCurr.BuildPositiveFormatString(false, *xLocaleData, 1); + OUString aNegative = rCurr.BuildNegativeFormatString(false, *xLocaleData, 1 ); + OUStringBuffer format1; + OUStringBuffer format2; + OUStringBuffer format3; + OUStringBuffer format4; + OUStringBuffer format5; + if (rCurr.GetDigits()) { - rCurr.BuildPositiveFormatString( aPositiveNoDec, false, *xLocaleData, 0 ); - rCurr.BuildNegativeFormatString( aNegativeNoDec, false, *xLocaleData, 0 ); - rCurr.BuildPositiveFormatString( aPositiveDashed, false, *xLocaleData, 2 ); - rCurr.BuildNegativeFormatString( aNegativeDashed, false, *xLocaleData, 2 ); + OUString aPositiveNoDec = rCurr.BuildPositiveFormatString(false, *xLocaleData, 0); + OUString aNegativeNoDec = rCurr.BuildNegativeFormatString(false, *xLocaleData, 0 ); + OUString aPositiveDashed = rCurr.BuildPositiveFormatString(false, *xLocaleData, 2); + OUString aNegativeDashed = rCurr.BuildNegativeFormatString(false, *xLocaleData, 2); format1.append(aPositiveNoDec); format1.append(';'); @@ -3821,64 +3817,66 @@ OUString NfCurrencyEntry::Impl_BuildFormatStringNumChars( } -void NfCurrencyEntry::BuildPositiveFormatString( String& rStr, bool bBank, - const LocaleDataWrapper& rLoc, sal_uInt16 nDecimalFormat ) const +OUString NfCurrencyEntry::BuildPositiveFormatString(bool bBank, + const LocaleDataWrapper& rLoc, sal_uInt16 nDecimalFormat) const { - rStr = Impl_BuildFormatStringNumChars(rLoc, nDecimalFormat); + OUStringBuffer sBuf(Impl_BuildFormatStringNumChars(rLoc, nDecimalFormat)); sal_uInt16 nPosiForm = NfCurrencyEntry::GetEffectivePositiveFormat( rLoc.getCurrPositiveFormat(), nPositiveFormat, bBank ); - CompletePositiveFormatString( rStr, bBank, nPosiForm ); + CompletePositiveFormatString(sBuf, bBank, nPosiForm); + return sBuf.makeStringAndClear(); } -void NfCurrencyEntry::BuildNegativeFormatString( String& rStr, bool bBank, +OUString NfCurrencyEntry::BuildNegativeFormatString(bool bBank, const LocaleDataWrapper& rLoc, sal_uInt16 nDecimalFormat ) const { - rStr = Impl_BuildFormatStringNumChars(rLoc, nDecimalFormat); + OUStringBuffer sBuf(Impl_BuildFormatStringNumChars(rLoc, nDecimalFormat)); sal_uInt16 nNegaForm = NfCurrencyEntry::GetEffectiveNegativeFormat( rLoc.getCurrNegativeFormat(), nNegativeFormat, bBank ); - CompleteNegativeFormatString( rStr, bBank, nNegaForm ); + CompleteNegativeFormatString(sBuf, bBank, nNegaForm); + return sBuf.makeStringAndClear(); } -void NfCurrencyEntry::CompletePositiveFormatString( String& rStr, bool bBank, - sal_uInt16 nPosiForm ) const +void NfCurrencyEntry::CompletePositiveFormatString(OUStringBuffer& rStr, bool bBank, + sal_uInt16 nPosiForm) const { - String aSymStr = BuildSymbolString(bBank); + OUString aSymStr = BuildSymbolString(bBank); NfCurrencyEntry::CompletePositiveFormatString( rStr, aSymStr, nPosiForm ); } -void NfCurrencyEntry::CompleteNegativeFormatString( String& rStr, bool bBank, - sal_uInt16 nNegaForm ) const +void NfCurrencyEntry::CompleteNegativeFormatString(OUStringBuffer& rStr, bool bBank, + sal_uInt16 nNegaForm) const { - String aSymStr = BuildSymbolString(bBank); + OUString aSymStr = BuildSymbolString(bBank); NfCurrencyEntry::CompleteNegativeFormatString( rStr, aSymStr, nNegaForm ); } // static -void NfCurrencyEntry::CompletePositiveFormatString( String& rStr, - const String& rSymStr, sal_uInt16 nPositiveFormat ) +void NfCurrencyEntry::CompletePositiveFormatString(OUStringBuffer& rStr, + const String& rSymStr, sal_uInt16 nPositiveFormat) { switch( nPositiveFormat ) { case 0: // $1 - rStr.Insert( rSymStr , 0 ); + rStr.insert(0, rSymStr); break; case 1: // 1$ - rStr += rSymStr; + rStr.append(rSymStr); break; case 2: // $ 1 { - rStr.Insert( ' ', 0 ); - rStr.Insert( rSymStr, 0 ); + rStr.insert(0, ' '); + rStr.insert(0, rSymStr); } break; case 3: // 1 $ { - rStr += ' '; - rStr += rSymStr; + rStr.append(' '); + rStr.append(rSymStr); } break; default: @@ -3889,80 +3887,80 @@ void NfCurrencyEntry::CompletePositiveFormatString( String& rStr, // static -void NfCurrencyEntry::CompleteNegativeFormatString( String& rStr, - const String& rSymStr, sal_uInt16 nNegativeFormat ) +void NfCurrencyEntry::CompleteNegativeFormatString(OUStringBuffer& rStr, + const String& rSymStr, sal_uInt16 nNegativeFormat) { switch( nNegativeFormat ) { case 0: // ($1) { - rStr.Insert( rSymStr, 0); - rStr.Insert('(',0); - rStr += ')'; + rStr.insert(0, rSymStr); + rStr.insert(0, '('); + rStr.append(')'); } break; case 1: // -$1 { - rStr.Insert( rSymStr, 0); - rStr.Insert('-',0); + rStr.insert(0, rSymStr); + rStr.insert(0, '-'); } break; case 2: // $-1 { - rStr.Insert('-',0); - rStr.Insert( rSymStr, 0); + rStr.insert(0, '-'); + rStr.insert(0, rSymStr); } break; case 3: // $1- { - rStr.Insert( rSymStr, 0); - rStr += '-'; + rStr.insert(0, rSymStr); + rStr.append('-'); } break; case 4: // (1$) { - rStr.Insert('(',0); - rStr += rSymStr; - rStr += ')'; + rStr.insert(0, '('); + rStr.append(rSymStr); + rStr.append(')'); } break; case 5: // -1$ { - rStr += rSymStr; - rStr.Insert('-',0); + rStr.append(rSymStr); + rStr.insert(0, '-'); } break; case 6: // 1-$ { - rStr += '-'; - rStr += rSymStr; + rStr.append('-'); + rStr.append(rSymStr); } break; case 7: // 1$- { - rStr += rSymStr; - rStr += '-'; + rStr.append(rSymStr); + rStr.append('-'); } break; case 8: // -1 $ { - rStr += ' '; - rStr += rSymStr; - rStr.Insert('-',0); + rStr.append(' '); + rStr.append(rSymStr); + rStr.insert(0, '-'); } break; case 9: // -$ 1 { - rStr.Insert(' ',0); - rStr.Insert( rSymStr, 0); - rStr.Insert('-',0); + rStr.insert(0, ' '); + rStr.insert(0, rSymStr); + rStr.insert(0, '-'); } break; case 10: // 1 $- { - rStr += ' '; - rStr += rSymStr; - rStr += '-'; + rStr.append(' '); + rStr.append(rSymStr); + rStr.append('-'); } break; case 11: // $ -1 @@ -3970,37 +3968,37 @@ void NfCurrencyEntry::CompleteNegativeFormatString( String& rStr, String aTmp( rSymStr ); aTmp += ' '; aTmp += '-'; - rStr.Insert( aTmp, 0 ); + rStr.insert(0, aTmp); } break; case 12 : // $ 1- { - rStr.Insert(' ', 0); - rStr.Insert( rSymStr, 0); - rStr += '-'; + rStr.insert(0, ' '); + rStr.insert(0, rSymStr); + rStr.append('-'); } break; case 13 : // 1- $ { - rStr += '-'; - rStr += ' '; - rStr += rSymStr; + rStr.append('-'); + rStr.append(' '); + rStr.append(rSymStr); } break; case 14 : // ($ 1) { - rStr.Insert(' ',0); - rStr.Insert( rSymStr, 0); - rStr.Insert('(',0); - rStr += ')'; + rStr.insert(0, ' '); + rStr.insert(0, rSymStr); + rStr.insert(0, '('); + rStr.append(')'); } break; case 15 : // (1 $) { - rStr.Insert('(',0); - rStr += ' '; - rStr += rSymStr; - rStr += ')'; + rStr.insert(0, '('); + rStr.append(' '); + rStr.append(rSymStr); + rStr.append(')'); } break; default: diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx index d4a4c5bfd649..acaaa1e95433 100644 --- a/svtools/source/control/fmtfield.cxx +++ b/svtools/source/control/fmtfield.cxx @@ -710,10 +710,10 @@ void FormattedField::SetThousandsSep(sal_Bool _bUseSeparator) // we need the language for the following LanguageType eLang; - String sFmtDescription = GetFormat(eLang); + GetFormat(eLang); // generate a new format ... - ImplGetFormatter()->GenerateFormat(sFmtDescription, m_nFormatKey, eLang, _bUseSeparator, IsRed, nPrecision, nAnzLeading); + OUString sFmtDescription = ImplGetFormatter()->GenerateFormat(m_nFormatKey, eLang, _bUseSeparator, IsRed, nPrecision, nAnzLeading); // ... and introduce it to the formatter sal_uInt16 nCheckPos; sal_uInt32 nNewKey; @@ -753,10 +753,10 @@ void FormattedField::SetDecimalDigits(sal_uInt16 _nPrecision) // we need the language for the following LanguageType eLang; - String sFmtDescription = GetFormat(eLang); + GetFormat(eLang); // generate a new format ... - ImplGetFormatter()->GenerateFormat(sFmtDescription, m_nFormatKey, eLang, bThousand, IsRed, _nPrecision, nAnzLeading); + OUString sFmtDescription = ImplGetFormatter()->GenerateFormat(m_nFormatKey, eLang, bThousand, IsRed, _nPrecision, nAnzLeading); // ... and introduce it to the formatter sal_uInt16 nCheckPos; sal_uInt32 nNewKey; diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index d24fd2653e9e..230dd3e193e4 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -415,14 +415,14 @@ void DbGridColumn::setLock(sal_Bool _bLock) } //------------------------------------------------------------------------------ -String DbGridColumn::GetCellText(const DbGridRow* pRow, const Reference< XNumberFormatter >& xFormatter) const +OUString DbGridColumn::GetCellText(const DbGridRow* pRow, const Reference< XNumberFormatter >& xFormatter) const { - String aText; + OUString aText; if (m_pCell && m_pCell->ISA(FmXFilterCell)) return aText; if (!pRow || !pRow->IsValid()) - aText = rtl::OUString(INVALIDTEXT); + aText = OUString(INVALIDTEXT); else if (pRow->HasField(m_nFieldPos)) { aText = GetCellText( pRow->GetField( m_nFieldPos ).getColumn(), xFormatter ); @@ -431,16 +431,16 @@ String DbGridColumn::GetCellText(const DbGridRow* pRow, const Reference< XNumber } //------------------------------------------------------------------------------ -String DbGridColumn::GetCellText(const Reference< ::com::sun::star::sdb::XColumn >& xField, const Reference< XNumberFormatter >& xFormatter) const +OUString DbGridColumn::GetCellText(const Reference< ::com::sun::star::sdb::XColumn >& xField, const Reference< XNumberFormatter >& xFormatter) const { - String aText; + OUString aText; if (xField.is()) { FmXTextCell* pTextCell = PTR_CAST(FmXTextCell, m_pCell); if (pTextCell) aText = pTextCell->GetText(xField, xFormatter); else if (m_bObject) - aText = rtl::OUString(OBJECTTEXT); + aText = OUString(OBJECTTEXT); } return aText; } @@ -475,11 +475,10 @@ void DbGridColumn::Paint(OutputDevice& rDev, if ( !bEnabled ) nStyle |= TEXT_DRAW_DISABLE; - rDev.DrawText(rRect, rtl::OUString(INVALIDTEXT), nStyle); + rDev.DrawText(rRect, OUString(INVALIDTEXT), nStyle); } else if (m_bAutoValue && pRow->IsNew()) { - static String aAutoText(SVX_RES(RID_STR_AUTOFIELD)); sal_uInt16 nStyle = TEXT_DRAW_CLIP | TEXT_DRAW_VCENTER; if ( !bEnabled ) nStyle |= TEXT_DRAW_DISABLE; @@ -496,7 +495,7 @@ void DbGridColumn::Paint(OutputDevice& rDev, nStyle |= TEXT_DRAW_LEFT; } - rDev.DrawText(rRect, aAutoText , nStyle); + rDev.DrawText(rRect, SVX_RESSTR(RID_STR_AUTOFIELD), nStyle); } else if (pRow->HasField(m_nFieldPos)) { @@ -511,14 +510,14 @@ void DbGridColumn::Paint(OutputDevice& rDev, if ( !bEnabled ) nStyle |= TEXT_DRAW_DISABLE; - rDev.DrawText(rRect, rtl::OUString(INVALIDTEXT), nStyle); + rDev.DrawText(rRect, OUString(INVALIDTEXT), nStyle); } else if (pRow->HasField(m_nFieldPos) && m_bObject) { sal_uInt16 nStyle = TEXT_DRAW_CLIP | TEXT_DRAW_CENTER; if ( !bEnabled ) nStyle |= TEXT_DRAW_DISABLE; - rDev.DrawText(rRect, rtl::OUString(OBJECTTEXT), nStyle); + rDev.DrawText(rRect, OUString(OBJECTTEXT), nStyle); } } else if ( m_pCell->ISA( FmXFilterCell ) ) @@ -602,7 +601,7 @@ DbCellControl::DbCellControl( DbGridColumn& _rColumn, sal_Bool /*_bText*/ ) } //------------------------------------------------------------------------------ -void DbCellControl::implDoPropertyListening( const ::rtl::OUString& _rPropertyName, sal_Bool _bWarnIfNotExistent ) +void DbCellControl::implDoPropertyListening(const OUString& _rPropertyName, sal_Bool _bWarnIfNotExistent) { try { @@ -625,7 +624,7 @@ void DbCellControl::implDoPropertyListening( const ::rtl::OUString& _rPropertyNa } //------------------------------------------------------------------------------ -void DbCellControl::doPropertyListening( const ::rtl::OUString& _rPropertyName ) +void DbCellControl::doPropertyListening(const OUString& _rPropertyName) { implDoPropertyListening( _rPropertyName ); } @@ -1186,9 +1185,9 @@ void DbTextField::PaintFieldToCell( OutputDevice& _rDev, const Rectangle& _rRect } //------------------------------------------------------------------------------ -String DbTextField::GetFormatText(const Reference< XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter, Color** /*ppColor*/) +OUString DbTextField::GetFormatText(const Reference< XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter, Color** /*ppColor*/) { - ::rtl::OUString aString; + OUString aString; if ( _rxField.is() ) try { @@ -1214,14 +1213,14 @@ void DbTextField::updateFromModel( Reference< XPropertySet > _rxModel ) { OSL_ENSURE( _rxModel.is() && m_pWindow, "DbTextField::updateFromModel: invalid call!" ); - ::rtl::OUString sText; + OUString sText; _rxModel->getPropertyValue( FM_PROP_TEXT ) >>= sText; xub_StrLen nMaxTextLen = m_pEdit->GetMaxTextLen(); if ( EDIT_NOLIMIT != nMaxTextLen && sText.getLength() > nMaxTextLen ) { sal_Int32 nDiff = sText.getLength() - nMaxTextLen; - sText = sText.replaceAt(sText.getLength() - nDiff,nDiff,::rtl::OUString()); + sText = sText.replaceAt(sText.getLength() - nDiff,nDiff, OUString()); } @@ -1232,12 +1231,12 @@ void DbTextField::updateFromModel( Reference< XPropertySet > _rxModel ) //------------------------------------------------------------------------------ sal_Bool DbTextField::commitControl() { - ::rtl::OUString aText( m_pEdit->GetText( getModelLineEndSetting( m_rColumn.getModel() ) ) ); + OUString aText( m_pEdit->GetText( getModelLineEndSetting( m_rColumn.getModel() ) ) ); // we have to check if the length before we can decide if the value was modified xub_StrLen nMaxTextLen = m_pEdit->GetMaxTextLen(); if ( EDIT_NOLIMIT != nMaxTextLen ) { - ::rtl::OUString sOldValue; + OUString sOldValue; m_rColumn.getModel()->getPropertyValue( FM_PROP_TEXT ) >>= sOldValue; // if the new value didn't change we must set the old long value again if ( sOldValue.getLength() > nMaxTextLen && sOldValue.compareTo(aText,nMaxTextLen) == 0 ) @@ -1461,7 +1460,7 @@ void DbFormattedField::Init( Window& rParent, const Reference< XRowSet >& xCurso break; case TypeClass_STRING: { - String sDefault( ::comphelper::getString(aDefault) ); + OUString sDefault( ::comphelper::getString(aDefault) ); if (m_rColumn.IsNumeric()) { double dVal; @@ -1513,7 +1512,7 @@ void DbFormattedField::_propertyChanged( const PropertyChangeEvent& _rEvent ) th } //------------------------------------------------------------------------------ -String DbFormattedField::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/, Color** ppColor) +OUString DbFormattedField::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/, Color** ppColor) { // defaultmaessig keine Farb-Angabe if (ppColor != NULL) @@ -1521,9 +1520,9 @@ String DbFormattedField::GetFormatText(const Reference< ::com::sun::star::sdb::X // NULL-Wert -> leerer Text if (!_rxField.is()) - return String(); + return OUString(); - String aText; + OUString aText; try { if (m_rColumn.IsNumeric()) @@ -1568,7 +1567,7 @@ void DbFormattedField::UpdateFromField(const Reference< ::com::sun::star::sdb::X FormattedField* pFormattedWindow = static_cast(m_pWindow); if (!_rxField.is()) { // NULL-Wert -> leerer Text - m_pWindow->SetText(String()); + m_pWindow->SetText(OUString()); } else if (m_rColumn.IsNumeric()) { @@ -1579,7 +1578,7 @@ void DbFormattedField::UpdateFromField(const Reference< ::com::sun::star::sdb::X // ich den Rest (die Formatierung) dem FormattedField ueberlassen. double dValue = getValue( _rxField, m_rColumn.GetParent().getNullDate() ); if (_rxField->wasNull()) - m_pWindow->SetText(String()); + m_pWindow->SetText(OUString()); else pFormattedWindow->SetValue(dValue); } @@ -1587,7 +1586,7 @@ void DbFormattedField::UpdateFromField(const Reference< ::com::sun::star::sdb::X { // Hier kann ich nicht mit einem double arbeiten, da das Feld mir keines liefern kann. // Also einfach den Text vom ::com::sun::star::util::NumberFormatter in die richtige ::com::sun::star::form::component::Form brinden lassen. - String sText( _rxField->getString()); + OUString sText( _rxField->getString()); pFormattedWindow->SetTextFormatted( sText ); pFormattedWindow->SetSelection( Selection( SELECTION_MAX, SELECTION_MIN ) ); @@ -1606,7 +1605,7 @@ void DbFormattedField::updateFromModel( Reference< XPropertySet > _rxModel ) FormattedField* pFormattedWindow = static_cast< FormattedField* >( m_pWindow ); - ::rtl::OUString sText; + OUString sText; Any aValue = _rxModel->getPropertyValue( FM_PROP_EFFECTIVE_VALUE ); if ( aValue >>= sText ) { // our effective value is transfered as string @@ -1634,7 +1633,7 @@ sal_Bool DbFormattedField::commitControl() // ein LeerString wird erst mal standardmaessig als void weitergereicht } else - aNewVal <<= ::rtl::OUString(rField.GetTextValue()); + aNewVal <<= OUString(rField.GetTextValue()); m_rColumn.getModel()->setPropertyValue(FM_PROP_EFFECTIVE_VALUE, aNewVal); return sal_True; @@ -1764,9 +1763,9 @@ sal_Bool DbCheckBox::commitControl() } //------------------------------------------------------------------------------ -XubString DbCheckBox::GetFormatText(const Reference< XColumn >& /*_rxField*/, const Reference< XNumberFormatter >& /*xFormatter*/, Color** /*ppColor*/) +OUString DbCheckBox::GetFormatText(const Reference< XColumn >& /*_rxField*/, const Reference< XNumberFormatter >& /*xFormatter*/, Color** /*ppColor*/) { - return XubString(); + return OUString(); } //============================================================================== @@ -1788,15 +1787,15 @@ void DbPatternField::implAdjustGenericFieldSetting( const Reference< XPropertySe DBG_ASSERT( _rxModel.is(), "DbPatternField::implAdjustGenericFieldSetting: invalid model!" ); if ( m_pWindow && _rxModel.is() ) { - ::rtl::OUString aLitMask; - ::rtl::OUString aEditMask; + OUString aLitMask; + OUString aEditMask; sal_Bool bStrict = sal_False; _rxModel->getPropertyValue( FM_PROP_LITERALMASK ) >>= aLitMask; _rxModel->getPropertyValue( FM_PROP_EDITMASK ) >>= aEditMask; _rxModel->getPropertyValue( FM_PROP_STRICTFORMAT ) >>= bStrict; - rtl::OString aAsciiEditMask(rtl::OUStringToOString(aEditMask, RTL_TEXTENCODING_ASCII_US)); + OString aAsciiEditMask(OUStringToOString(aEditMask, RTL_TEXTENCODING_ASCII_US)); static_cast< PatternField* >( m_pWindow )->SetMask( aAsciiEditMask, aLitMask ); static_cast< PatternField* >( m_pPainter )->SetMask( aAsciiEditMask, aLitMask ); @@ -1826,7 +1825,7 @@ CellControllerRef DbPatternField::CreateController() const } //------------------------------------------------------------------------------ -String DbPatternField::impl_formatText( const String& _rText ) +OUString DbPatternField::impl_formatText( const OUString& _rText ) { m_pPainter->SetText( _rText ); static_cast< PatternField* >( m_pPainter )->ReformatAll(); @@ -1834,7 +1833,7 @@ String DbPatternField::impl_formatText( const String& _rText ) } //------------------------------------------------------------------------------ -String DbPatternField::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/, Color** /*ppColor*/) +OUString DbPatternField::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/, Color** /*ppColor*/) { bool bIsForPaint = _rxField != m_rColumn.GetField(); SAL_WNODEPRECATED_DECLARATIONS_PUSH @@ -1852,7 +1851,7 @@ String DbPatternField::GetFormatText(const Reference< ::com::sun::star::sdb::XCo OSL_ENSURE( rpFormatter->getColumn() == _rxField, "DbPatternField::GetFormatText: my value formatter is working for another field ...!" ); // re-creating the value formatter here everytime would be quite expensive ... - String sText; + OUString sText; if ( rpFormatter.get() ) sText = rpFormatter->getFormattedValue(); @@ -1871,7 +1870,7 @@ void DbPatternField::updateFromModel( Reference< XPropertySet > _rxModel ) { OSL_ENSURE( _rxModel.is() && m_pWindow, "DbPatternField::updateFromModel: invalid call!" ); - ::rtl::OUString sText; + OUString sText; _rxModel->getPropertyValue( FM_PROP_TEXT ) >>= sText; static_cast< Edit* >( m_pWindow )->SetText( impl_formatText( sText ) ); @@ -1881,8 +1880,8 @@ void DbPatternField::updateFromModel( Reference< XPropertySet > _rxModel ) //------------------------------------------------------------------------------ sal_Bool DbPatternField::commitControl() { - String aText(m_pWindow->GetText()); - m_rColumn.getModel()->setPropertyValue(FM_PROP_TEXT, makeAny(::rtl::OUString(aText))); + OUString aText(m_pWindow->GetText()); + m_rColumn.getModel()->setPropertyValue(FM_PROP_TEXT, makeAny(aText)); return sal_True; } @@ -1986,9 +1985,8 @@ void DbNumericField::implAdjustGenericFieldSetting( const Reference< XPropertySe static_cast< DoubleNumericField* >( m_pPainter )->SetFormatter( pFormatterUsed ); // und dann ein Format generieren, dass die gewuenschten Nachkommastellen usw. hat - String sFormatString; LanguageType aAppLanguage = Application::GetSettings().GetUILanguage(); - pFormatterUsed->GenerateFormat( sFormatString, 0, aAppLanguage, bThousand, sal_False, nScale ); + OUString sFormatString = pFormatterUsed->GenerateFormat(0, aAppLanguage, bThousand, sal_False, nScale); static_cast< DoubleNumericField* >( m_pWindow )->SetFormat( sFormatString, aAppLanguage ); static_cast< DoubleNumericField* >( m_pPainter )->SetFormat( sFormatString, aAppLanguage ); @@ -2004,10 +2002,10 @@ SpinField* DbNumericField::createField( Window* _pParent, WinBits _nFieldStyle, namespace { //-------------------------------------------------------------------------- - static String lcl_setFormattedNumeric_nothrow( DoubleNumericField& _rField, const DbCellControl& _rControl, + static OUString lcl_setFormattedNumeric_nothrow( DoubleNumericField& _rField, const DbCellControl& _rControl, const Reference< XColumn >& _rxField, const Reference< XNumberFormatter >& _rxFormatter ) { - String sValue; + OUString sValue; if ( _rxField.is() ) { try @@ -2029,7 +2027,7 @@ namespace } //------------------------------------------------------------------------------ -String DbNumericField::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, Color** /*ppColor*/) +OUString DbNumericField::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, Color** /*ppColor*/) { return lcl_setFormattedNumeric_nothrow( *dynamic_cast< DoubleNumericField* >( m_pPainter ), *this, _rxField, _rxFormatter ); } @@ -2049,16 +2047,16 @@ void DbNumericField::updateFromModel( Reference< XPropertySet > _rxModel ) if ( _rxModel->getPropertyValue( FM_PROP_VALUE ) >>= dValue ) static_cast< DoubleNumericField* >( m_pWindow )->SetValue( dValue ); else - m_pWindow->SetText( String() ); + m_pWindow->SetText( OUString() ); } //------------------------------------------------------------------------------ sal_Bool DbNumericField::commitControl() { - String aText( m_pWindow->GetText()); + OUString aText( m_pWindow->GetText()); Any aVal; - if (aText.Len() != 0) // nicht null + if (!aText.isEmpty()) // not empty { double fValue = ((DoubleNumericField*)m_pWindow)->GetValue(); aVal <<= (double)fValue; @@ -2097,7 +2095,7 @@ void DbCurrencyField::implAdjustGenericFieldSetting( const Reference< XPropertyS double nStep = getDouble( _rxModel->getPropertyValue( FM_PROP_VALUESTEP ) ); sal_Bool bStrict = getBOOL( _rxModel->getPropertyValue( FM_PROP_STRICTFORMAT ) ); sal_Bool bThousand = getBOOL( _rxModel->getPropertyValue( FM_PROP_SHOWTHOUSANDSEP ) ); - ::rtl::OUString aStr( getString( _rxModel->getPropertyValue(FM_PROP_CURRENCYSYMBOL ) ) ); + OUString aStr( getString( _rxModel->getPropertyValue(FM_PROP_CURRENCYSYMBOL ) ) ); static_cast< LongCurrencyField* >( m_pWindow )->SetUseThousandSep( bThousand ); static_cast< LongCurrencyField* >( m_pWindow )->SetDecimalDigits( m_nScale ); @@ -2142,10 +2140,10 @@ double DbCurrencyField::GetCurrency(const Reference< ::com::sun::star::sdb::XCol namespace { //-------------------------------------------------------------------------- - static String lcl_setFormattedCurrency_nothrow( LongCurrencyField& _rField, const DbCurrencyField& _rControl, + static OUString lcl_setFormattedCurrency_nothrow( LongCurrencyField& _rField, const DbCurrencyField& _rControl, const Reference< XColumn >& _rxField, const Reference< XNumberFormatter >& _rxFormatter ) { - String sValue; + OUString sValue; if ( _rxField.is() ) { try @@ -2169,7 +2167,7 @@ namespace } //------------------------------------------------------------------------------ -String DbCurrencyField::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, Color** /*ppColor*/) +OUString DbCurrencyField::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, Color** /*ppColor*/) { return lcl_setFormattedCurrency_nothrow( *dynamic_cast< LongCurrencyField* >( m_pPainter ), *this, _rxField, _rxFormatter ); } @@ -2197,21 +2195,20 @@ void DbCurrencyField::updateFromModel( Reference< XPropertySet > _rxModel ) static_cast< LongCurrencyField* >( m_pWindow )->SetValue( dValue ); } else - m_pWindow->SetText( String() ); + m_pWindow->SetText( OUString() ); } //------------------------------------------------------------------------------ sal_Bool DbCurrencyField::commitControl() { - String aText( m_pWindow->GetText()); + OUString aText(m_pWindow->GetText()); Any aVal; - if (aText.Len() != 0) // nicht null + if (!aText.isEmpty()) // not empty { double fValue = ((LongCurrencyField*)m_pWindow)->GetValue(); if (m_nScale) { fValue /= ::rtl::math::pow10Exp(1.0, m_nScale); - //fValue = ::rtl::math::round(fValue, m_nScale); } aVal <<= (double)fValue; } @@ -2288,9 +2285,9 @@ void DbDateField::implAdjustGenericFieldSetting( const Reference< XPropertySet > namespace { //-------------------------------------------------------------------------- - static String lcl_setFormattedDate_nothrow( DateField& _rField, const Reference< XColumn >& _rxField ) + static OUString lcl_setFormattedDate_nothrow( DateField& _rField, const Reference< XColumn >& _rxField ) { - String sDate; + OUString sDate; if ( _rxField.is() ) { try @@ -2313,7 +2310,7 @@ namespace } } //------------------------------------------------------------------------------ -String DbDateField::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< ::com::sun::star::util::XNumberFormatter >& /*xFormatter*/, Color** /*ppColor*/) +OUString DbDateField::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< ::com::sun::star::util::XNumberFormatter >& /*xFormatter*/, Color** /*ppColor*/) { return lcl_setFormattedDate_nothrow( *dynamic_cast< DateField* >( m_pPainter ), _rxField ); } @@ -2333,15 +2330,15 @@ void DbDateField::updateFromModel( Reference< XPropertySet > _rxModel ) if ( _rxModel->getPropertyValue( FM_PROP_DATE ) >>= nDate ) static_cast< DateField* >( m_pWindow )->SetDate( ::Date( nDate ) ); else - static_cast< DateField* >( m_pWindow )->SetText( String() ); + static_cast< DateField* >( m_pWindow )->SetText( OUString() ); } //------------------------------------------------------------------------------ sal_Bool DbDateField::commitControl() { - String aText( m_pWindow->GetText()); + OUString aText(m_pWindow->GetText()); Any aVal; - if (aText.Len() != 0) + if (!aText.isEmpty()) aVal <<= (sal_Int32)static_cast(m_pWindow)->GetDate().GetDate(); else aVal.clear(); @@ -2398,9 +2395,9 @@ void DbTimeField::implAdjustGenericFieldSetting( const Reference< XPropertySet > namespace { //-------------------------------------------------------------------------- - static String lcl_setFormattedTime_nothrow( TimeField& _rField, const Reference< XColumn >& _rxField ) + static OUString lcl_setFormattedTime_nothrow( TimeField& _rField, const Reference< XColumn >& _rxField ) { - String sTime; + OUString sTime; if ( _rxField.is() ) { try @@ -2423,7 +2420,7 @@ namespace } } //------------------------------------------------------------------------------ -String DbTimeField::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< ::com::sun::star::util::XNumberFormatter >& /*xFormatter*/, Color** /*ppColor*/) +OUString DbTimeField::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< ::com::sun::star::util::XNumberFormatter >& /*xFormatter*/, Color** /*ppColor*/) { return lcl_setFormattedTime_nothrow( *static_cast< TimeField* >( m_pPainter ), _rxField ); } @@ -2443,15 +2440,15 @@ void DbTimeField::updateFromModel( Reference< XPropertySet > _rxModel ) if ( _rxModel->getPropertyValue( FM_PROP_DATE ) >>= nTime ) static_cast< TimeField* >( m_pWindow )->SetTime( ::Time( nTime ) ); else - static_cast< TimeField* >( m_pWindow )->SetText( String() ); + static_cast< TimeField* >( m_pWindow )->SetText( OUString() ); } //------------------------------------------------------------------------------ sal_Bool DbTimeField::commitControl() { - String aText( m_pWindow->GetText()); + OUString aText(m_pWindow->GetText()); Any aVal; - if (aText.Len() != 0) + if (!aText.isEmpty()) aVal <<= (sal_Int32)static_cast(m_pWindow)->GetTime().GetTime(); else aVal.clear(); @@ -2496,7 +2493,7 @@ void DbComboBox::SetList(const Any& rItems) ::comphelper::StringSequence aTest; if (rItems >>= aTest) { - const ::rtl::OUString* pStrings = aTest.getConstArray(); + const OUString* pStrings = aTest.getConstArray(); sal_Int32 nItems = aTest.getLength(); for (sal_Int32 i = 0; i < nItems; ++i, ++pStrings ) pField->InsertEntry(*pStrings, LISTBOX_APPEND); @@ -2551,9 +2548,9 @@ CellControllerRef DbComboBox::CreateController() const } //------------------------------------------------------------------------------ -String DbComboBox::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter, Color** /*ppColor*/) +OUString DbComboBox::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter, Color** /*ppColor*/) { - ::rtl::OUString aString; + OUString aString; if (_rxField.is()) try { @@ -2577,7 +2574,7 @@ void DbComboBox::updateFromModel( Reference< XPropertySet > _rxModel ) { OSL_ENSURE( _rxModel.is() && m_pWindow, "DbComboBox::updateFromModel: invalid call!" ); - ::rtl::OUString sText; + OUString sText; _rxModel->getPropertyValue( FM_PROP_TEXT ) >>= sText; static_cast< ComboBox* >( m_pWindow )->SetText( sText ); @@ -2587,8 +2584,8 @@ void DbComboBox::updateFromModel( Reference< XPropertySet > _rxModel ) //------------------------------------------------------------------------------ sal_Bool DbComboBox::commitControl() { - String aText( m_pWindow->GetText()); - m_rColumn.getModel()->setPropertyValue(FM_PROP_TEXT, makeAny(::rtl::OUString(aText))); + OUString aText( m_pWindow->GetText()); + m_rColumn.getModel()->setPropertyValue(FM_PROP_TEXT, makeAny(aText)); return sal_True; } @@ -2627,7 +2624,7 @@ void DbListBox::SetList(const Any& rItems) ::comphelper::StringSequence aTest; if (rItems >>= aTest) { - const ::rtl::OUString* pStrings = aTest.getConstArray(); + const OUString* pStrings = aTest.getConstArray(); sal_Int32 nItems = aTest.getLength(); if (nItems) { @@ -2677,9 +2674,9 @@ CellControllerRef DbListBox::CreateController() const } //------------------------------------------------------------------------------ -String DbListBox::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/, Color** /*ppColor*/) +OUString DbListBox::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/, Color** /*ppColor*/) { - String sText; + OUString sText; if ( _rxField.is() ) { try @@ -2705,8 +2702,8 @@ String DbListBox::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn //------------------------------------------------------------------------------ void DbListBox::UpdateFromField(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter) { - String sFormattedText( GetFormatText( _rxField, xFormatter ) ); - if ( sFormattedText.Len() ) + OUString sFormattedText( GetFormatText( _rxField, xFormatter ) ); + if (!sFormattedText.isEmpty()) static_cast< ListBox* >( m_pWindow )->SelectEntry( sFormattedText ); else static_cast< ListBox* >( m_pWindow )->SetNoSelection(); @@ -2794,7 +2791,7 @@ void DbFilterField::SetList(const Any& rItems, sal_Bool bComboBox) { ::comphelper::StringSequence aTest; rItems >>= aTest; - const ::rtl::OUString* pStrings = aTest.getConstArray(); + const OUString* pStrings = aTest.getConstArray(); sal_Int32 nItems = aTest.getLength(); if (nItems) { @@ -2950,13 +2947,13 @@ void DbFilterField::updateFromModel( Reference< XPropertySet > _rxModel ) //------------------------------------------------------------------------------ sal_Bool DbFilterField::commitControl() { - String aText(m_aText); + OUString aText(m_aText); switch (m_nControlClass) { case ::com::sun::star::form::FormComponentType::CHECKBOX: return sal_True; case ::com::sun::star::form::FormComponentType::LISTBOX: - aText.Erase(); + aText = OUString(); if (static_cast(m_pWindow)->GetSelectEntryCount()) { sal_Int16 nPos = (sal_Int16)static_cast(m_pWindow)->GetSelectEntryPos(); @@ -2977,16 +2974,16 @@ sal_Bool DbFilterField::commitControl() if (m_aText != aText) { // check the text with the SQL-Parser - String aNewText(comphelper::string::stripEnd(aText, ' ')); - if (aNewText.Len() != 0) + OUString aNewText(comphelper::string::stripEnd(aText, ' ')); + if (!aNewText.isEmpty()) { - ::rtl::OUString aErrorMsg; + OUString aErrorMsg; Reference< XNumberFormatter > xNumberFormatter(m_rColumn.GetParent().getNumberFormatter()); ::rtl::Reference< ISQLParseNode > xParseNode = predicateTree(aErrorMsg, aNewText,xNumberFormatter, m_rColumn.GetField()); if (xParseNode.is()) { - ::rtl::OUString aPreparedText; + OUString aPreparedText; ::com::sun::star::lang::Locale aAppLocale = Application::GetSettings().GetUILocale(); @@ -3004,7 +3001,7 @@ sal_Bool DbFilterField::commitControl() else { // display the error and return sal_False - String aTitle( SVX_RES(RID_STR_SYNTAXERROR) ); + OUString aTitle( SVX_RESSTR(RID_STR_SYNTAXERROR) ); SQLException aError; aError.Message = aErrorMsg; @@ -3024,7 +3021,7 @@ sal_Bool DbFilterField::commitControl() } //------------------------------------------------------------------------------ -void DbFilterField::SetText(const String& rText) +void DbFilterField::SetText(const OUString& rText) { m_aText = rText; switch (m_nControlClass) @@ -3032,9 +3029,9 @@ void DbFilterField::SetText(const String& rText) case ::com::sun::star::form::FormComponentType::CHECKBOX: { TriState eState; - if (rText.EqualsAscii("1")) + if (rText == "1") eState = STATE_CHECK; - else if (rText.EqualsAscii("0")) + else if (rText == "0") eState = STATE_NOCHECK; else eState = STATE_DONTKNOW; @@ -3044,7 +3041,7 @@ void DbFilterField::SetText(const String& rText) } break; case ::com::sun::star::form::FormComponentType::LISTBOX: { - String aText; + OUString aText; Sequence aPosSeq = ::comphelper::findValue(m_aValueList, m_aText, sal_True); if (aPosSeq.getLength()) static_cast(m_pWindow)->SelectEntryPos(aPosSeq.getConstArray()[0], sal_True); @@ -3070,7 +3067,7 @@ void DbFilterField::Update() if (!xField.is()) return; - ::rtl::OUString aName; + OUString aName; xField->getPropertyValue(FM_PROP_NAME) >>= aName; // the columnmodel @@ -3083,7 +3080,7 @@ void DbFilterField::Update() Reference xFormProp(xForm,UNO_QUERY); Reference< XTablesSupplier > xSupTab; - xFormProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SingleSelectQueryComposer"))) >>= xSupTab; + xFormProp->getPropertyValue(OUString("SingleSelectQueryComposer")) >>= xSupTab; Reference< XConnection > xConnection(getRowSetConnection(xForm)); if (!xSupTab.is()) @@ -3101,8 +3098,8 @@ void DbFilterField::Update() if (xComposerFieldAsSet.is() && ::comphelper::hasProperty(FM_PROP_TABLENAME, xComposerFieldAsSet) && ::comphelper::hasProperty(FM_PROP_FIELDSOURCE, xComposerFieldAsSet)) { - ::rtl::OUString aFieldName; - ::rtl::OUString aTableName; + OUString aFieldName; + OUString aTableName; xComposerFieldAsSet->getPropertyValue(FM_PROP_FIELDSOURCE) >>= aFieldName; xComposerFieldAsSet->getPropertyValue(FM_PROP_TABLENAME) >>= aTableName; @@ -3121,27 +3118,25 @@ void DbFilterField::Update() { Reference< XDatabaseMetaData > xMeta = xConnection->getMetaData(); - String aQuote( xMeta->getIdentifierQuoteString()); - String aStatement; - aStatement.AssignAscii("SELECT DISTINCT "); - - aStatement += String(quoteName(aQuote, aName)); + OUString aQuote(xMeta->getIdentifierQuoteString()); + OUStringBuffer aStatement("SELECT DISTINCT "); + aStatement.append(quoteName(aQuote, aName)); if (!aFieldName.isEmpty() && aName != aFieldName) { - aStatement.AppendAscii(" AS "); - aStatement += quoteName(aQuote, aFieldName).getStr(); + aStatement.append(" AS "); + aStatement.append(quoteName(aQuote, aFieldName)); } - aStatement.AppendAscii(" FROM "); + aStatement.append(" FROM "); - Reference< XPropertySet > xTableNameAccess( xTablesNames->getByName(aTableName), UNO_QUERY_THROW ); - aStatement += composeTableNameForSelect( xConnection, xTableNameAccess ).getStr(); + Reference< XPropertySet > xTableNameAccess(xTablesNames->getByName(aTableName), UNO_QUERY_THROW); + aStatement.append(composeTableNameForSelect(xConnection, xTableNameAccess)); xStatement = xConnection->createStatement(); Reference< ::com::sun::star::beans::XPropertySet > xStatementProps(xStatement, UNO_QUERY); xStatementProps->setPropertyValue(FM_PROP_ESCAPE_PROCESSING, makeAny((sal_Bool)sal_True)); - xListCursor = xStatement->executeQuery(aStatement); + xListCursor = xStatement->executeQuery(aStatement.makeStringAndClear()); Reference< ::com::sun::star::sdbcx::XColumnsSupplier > xSupplyCols(xListCursor, UNO_QUERY); Reference< ::com::sun::star::container::XIndexAccess > xFields(xSupplyCols->getColumns(), UNO_QUERY); @@ -3156,9 +3151,9 @@ void DbFilterField::Update() } sal_Int16 i = 0; - ::std::vector< ::rtl::OUString > aStringList; + ::std::vector< OUString > aStringList; aStringList.reserve(16); - ::rtl::OUString aStr; + OUString aStr; com::sun::star::util::Date aNullDate = m_rColumn.GetParent().getNullDate(); sal_Int32 nFormatKey = m_rColumn.GetKey(); Reference< XNumberFormatter > xFormatter = m_rColumn.GetParent().getNumberFormatter(); @@ -3172,7 +3167,7 @@ void DbFilterField::Update() } // filling the entries for the combobox - for (::std::vector< ::rtl::OUString >::const_iterator iter = aStringList.begin(); + for (::std::vector< OUString >::const_iterator iter = aStringList.begin(); iter != aStringList.end(); ++iter) ((ComboBox*)m_pWindow)->InsertEntry(*iter, LISTBOX_APPEND); } @@ -3180,9 +3175,9 @@ void DbFilterField::Update() } //------------------------------------------------------------------------------ -XubString DbFilterField::GetFormatText(const Reference< XColumn >& /*_rxField*/, const Reference< XNumberFormatter >& /*xFormatter*/, Color** /*ppColor*/) +OUString DbFilterField::GetFormatText(const Reference< XColumn >& /*_rxField*/, const Reference< XNumberFormatter >& /*xFormatter*/, Color** /*ppColor*/) { - return XubString(); + return OUString(); } //------------------------------------------------------------------ @@ -3195,18 +3190,17 @@ void DbFilterField::UpdateFromField(const Reference< XColumn >& /*_rxField*/, co IMPL_LINK_NOARG(DbFilterField, OnClick) { TriState eState = ((CheckBoxControl*)m_pWindow)->GetBox().GetState(); - String aText; + OUString aText; switch (eState) { case STATE_CHECK: - aText.AssignAscii("1"); + aText = "1"; break; case STATE_NOCHECK: - aText.AssignAscii("0"); + aText = "0"; break; case STATE_DONTKNOW: - aText = String(); break; } @@ -3641,7 +3635,7 @@ void FmXTextCell::PaintFieldToCell(OutputDevice& rDev, } Color* pColor = NULL; - String aText = GetText(_rxField, xFormatter, &pColor); + OUString aText = GetText(_rxField, xFormatter, &pColor); if (pColor != NULL) { Color aOldTextColor( rDev.GetTextColor() ); @@ -3748,7 +3742,7 @@ void SAL_CALL FmXEditCell::removeTextListener(const Reference< ::com::sun::star: } //------------------------------------------------------------------------------ -void SAL_CALL FmXEditCell::setText( const ::rtl::OUString& aText ) throw( RuntimeException ) +void SAL_CALL FmXEditCell::setText( const OUString& aText ) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3763,7 +3757,7 @@ void SAL_CALL FmXEditCell::setText( const ::rtl::OUString& aText ) throw( Runtim } //------------------------------------------------------------------------------ -void SAL_CALL FmXEditCell::insertText(const ::com::sun::star::awt::Selection& rSel, const ::rtl::OUString& aText) throw(RuntimeException) +void SAL_CALL FmXEditCell::insertText(const ::com::sun::star::awt::Selection& rSel, const OUString& aText) throw(RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3775,11 +3769,11 @@ void SAL_CALL FmXEditCell::insertText(const ::com::sun::star::awt::Selection& rS } //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL FmXEditCell::getText() throw( RuntimeException ) +OUString SAL_CALL FmXEditCell::getText() throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); - ::rtl::OUString aText; + OUString aText; if ( m_pEditImplementation ) { if ( m_pEditImplementation->GetControl().IsVisible() && m_pColumn->GetParent().getDisplaySynchron()) @@ -3799,11 +3793,11 @@ void SAL_CALL FmXEditCell::insertText(const ::com::sun::star::awt::Selection& rS } //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL FmXEditCell::getSelectedText( void ) throw( RuntimeException ) +OUString SAL_CALL FmXEditCell::getSelectedText( void ) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); - ::rtl::OUString aText; + OUString aText; if ( m_pEditImplementation ) { LineEnd eLineEndFormat = m_pColumn ? getModelLineEndSetting( m_pColumn->getModel() ) : LINEEND_LF; @@ -4042,7 +4036,7 @@ void SAL_CALL FmXCheckBoxCell::removeActionListener( const Reference< awt::XActi } //------------------------------------------------------------------ -void SAL_CALL FmXCheckBoxCell::setLabel( const ::rtl::OUString& _Label ) throw (RuntimeException) +void SAL_CALL FmXCheckBoxCell::setLabel( const OUString& _Label ) throw (RuntimeException) { SolarMutexGuard aGuard; if ( m_pColumn ) @@ -4053,7 +4047,7 @@ void SAL_CALL FmXCheckBoxCell::setLabel( const ::rtl::OUString& _Label ) throw ( } //------------------------------------------------------------------ -void SAL_CALL FmXCheckBoxCell::setActionCommand( const ::rtl::OUString& _Command ) throw (RuntimeException) +void SAL_CALL FmXCheckBoxCell::setActionCommand( const OUString& _Command ) throw (RuntimeException) { m_aActionCommand = _Command; } @@ -4191,7 +4185,7 @@ void SAL_CALL FmXListBoxCell::removeActionListener(const Reference< ::com::sun:: } //------------------------------------------------------------------ -void SAL_CALL FmXListBoxCell::addItem(const ::rtl::OUString& aItem, sal_Int16 nPos) throw( RuntimeException ) +void SAL_CALL FmXListBoxCell::addItem(const OUString& aItem, sal_Int16 nPos) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); if (m_pBox) @@ -4233,13 +4227,10 @@ sal_Int16 SAL_CALL FmXListBoxCell::getItemCount() throw( RuntimeException ) } //------------------------------------------------------------------ -::rtl::OUString SAL_CALL FmXListBoxCell::getItem(sal_Int16 nPos) throw( RuntimeException ) +OUString SAL_CALL FmXListBoxCell::getItem(sal_Int16 nPos) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); - String aItem; - if (m_pBox) - aItem = m_pBox->GetEntry( nPos ); - return aItem; + return m_pBox ? OUString(m_pBox->GetEntry(nPos)) : OUString(); } //------------------------------------------------------------------ ::comphelper::StringSequence SAL_CALL FmXListBoxCell::getItems() throw( RuntimeException ) @@ -4289,11 +4280,12 @@ Sequence< sal_Int16 > SAL_CALL FmXListBoxCell::getSelectedItemsPos() throw( Runt return aSeq; } //------------------------------------------------------------------ -::rtl::OUString SAL_CALL FmXListBoxCell::getSelectedItem() throw( RuntimeException ) +OUString SAL_CALL FmXListBoxCell::getSelectedItem() throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); - String aItem; + OUString aItem; + if (m_pBox) { UpdateFromColumn(); @@ -4343,7 +4335,7 @@ void SAL_CALL FmXListBoxCell::selectItemsPos(const Sequence< sal_Int16 >& aPosit } //------------------------------------------------------------------ -void SAL_CALL FmXListBoxCell::selectItem(const ::rtl::OUString& aItem, sal_Bool bSelect) throw( RuntimeException ) +void SAL_CALL FmXListBoxCell::selectItem(const OUString& aItem, sal_Bool bSelect) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4528,7 +4520,7 @@ void SAL_CALL FmXComboBoxCell::removeActionListener(const Reference< awt::XActio } //------------------------------------------------------------------ -void SAL_CALL FmXComboBoxCell::addItem( const ::rtl::OUString& _Item, sal_Int16 _Pos ) throw( RuntimeException ) +void SAL_CALL FmXComboBoxCell::addItem( const OUString& _Item, sal_Int16 _Pos ) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_pComboBox ) @@ -4536,7 +4528,7 @@ void SAL_CALL FmXComboBoxCell::addItem( const ::rtl::OUString& _Item, sal_Int16 } //------------------------------------------------------------------ -void SAL_CALL FmXComboBoxCell::addItems( const Sequence< ::rtl::OUString >& _Items, sal_Int16 _Pos ) throw( RuntimeException ) +void SAL_CALL FmXComboBoxCell::addItems( const Sequence< OUString >& _Items, sal_Int16 _Pos ) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_pComboBox ) @@ -4570,25 +4562,22 @@ sal_Int16 SAL_CALL FmXComboBoxCell::getItemCount() throw( RuntimeException ) } //------------------------------------------------------------------ -::rtl::OUString SAL_CALL FmXComboBoxCell::getItem( sal_Int16 _Pos ) throw( RuntimeException ) +OUString SAL_CALL FmXComboBoxCell::getItem( sal_Int16 _Pos ) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); - String sItem; - if ( m_pComboBox ) - sItem = m_pComboBox->GetEntry( _Pos ); - return sItem; + return m_pComboBox ? OUString(m_pComboBox->GetEntry(_Pos)) : OUString(); } //------------------------------------------------------------------ -Sequence< ::rtl::OUString > SAL_CALL FmXComboBoxCell::getItems() throw( RuntimeException ) +Sequence< OUString > SAL_CALL FmXComboBoxCell::getItems() throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); - Sequence< ::rtl::OUString > aItems; + Sequence< OUString > aItems; if ( m_pComboBox ) { sal_uInt16 nEntries = m_pComboBox->GetEntryCount(); aItems.realloc( nEntries ); - ::rtl::OUString* pItem = aItems.getArray(); + OUString* pItem = aItems.getArray(); for ( sal_uInt16 n=0; nGetEntry( n ); } @@ -4755,26 +4744,26 @@ void SAL_CALL FmXFilterCell::removeTextListener(const Reference< ::com::sun::sta } //------------------------------------------------------------------------------ -void SAL_CALL FmXFilterCell::setText( const ::rtl::OUString& aText ) throw( RuntimeException ) +void SAL_CALL FmXFilterCell::setText( const OUString& aText ) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); ((DbFilterField*)m_pCellControl)->SetText(aText); } //------------------------------------------------------------------------------ -void SAL_CALL FmXFilterCell::insertText( const ::com::sun::star::awt::Selection& /*rSel*/, const ::rtl::OUString& /*aText*/ ) throw( RuntimeException ) +void SAL_CALL FmXFilterCell::insertText( const ::com::sun::star::awt::Selection& /*rSel*/, const OUString& /*aText*/ ) throw( RuntimeException ) { } //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL FmXFilterCell::getText() throw( RuntimeException ) +OUString SAL_CALL FmXFilterCell::getText() throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); return ((DbFilterField*)m_pCellControl)->GetText(); } //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL FmXFilterCell::getSelectedText( void ) throw( RuntimeException ) +OUString SAL_CALL FmXFilterCell::getSelectedText( void ) throw( RuntimeException ) { return getText(); } diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index 4f780cc7fdcd..3e56d9895d51 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -178,8 +178,8 @@ public: // freigeben aller Daten, die fuer den AliveMode noetig sind void Clear(); - XubString GetCellText(const DbGridRow* pRow, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) const; - XubString GetCellText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& xField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) const; + OUString GetCellText(const DbGridRow* pRow, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) const; + OUString GetCellText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& xField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) const; void SetReadOnly(sal_Bool bRead){m_bReadOnly = bRead;} void SetObject(sal_Int16 nPos) {m_bObject = m_bReadOnly = sal_True; m_nFieldPos = nPos;} @@ -266,7 +266,7 @@ protected: protected: // adds the given property to the list of properties which we listen for - void doPropertyListening( const ::rtl::OUString& _rPropertyName ); + void doPropertyListening( const OUString& _rPropertyName ); // called whenever a property which affects field settings in general is called // you should overwrite this method for every property you add yourself as listener to @@ -304,7 +304,7 @@ public: sal_Bool Commit(); // Formatting the field data to output text - virtual XubString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) = 0; + virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) = 0; virtual void Update(){} // Refresh the control by the field data @@ -345,7 +345,7 @@ protected: virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException); private: - void implDoPropertyListening( const ::rtl::OUString& _rPropertyName, sal_Bool _bWarnIfNotExistent = sal_True ); + void implDoPropertyListening( const OUString& _rPropertyName, sal_Bool _bWarnIfNotExistent = sal_True ); /// updates the "readonly" setting on m_pWindow, according to the respective property value in the given model void implAdjustReadOnly( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel,bool i_bReadOnly ); @@ -417,7 +417,7 @@ public: sal_Bool IsSimpleEdit() const { return m_bIsSimpleEdit; } virtual void Init( Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ); - virtual XubString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL); + virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL); virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter); virtual ::svt::CellControllerRef CreateController() const; virtual void PaintFieldToCell( OutputDevice& _rDev, const Rectangle& _rRect, @@ -447,7 +447,7 @@ public: virtual void Init( Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ); - virtual XubString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL); + virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL); virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter); virtual ::svt::CellControllerRef CreateController() const; @@ -473,7 +473,7 @@ public: virtual void PaintFieldToCell(OutputDevice& rDev, const Rectangle& rRect, const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter); - virtual XubString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL); + virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL); protected: // DbCellControl @@ -491,7 +491,7 @@ public: DbComboBox(DbGridColumn& _rColumn); virtual void Init( Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ); - virtual XubString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL); + virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL); virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter); virtual ::svt::CellControllerRef CreateController() const; @@ -512,14 +512,14 @@ protected: class DbListBox :public DbCellControl { sal_Bool m_bBound : 1; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aValueList; + ::com::sun::star::uno::Sequence< OUString > m_aValueList; public: TYPEINFO(); DbListBox(DbGridColumn& _rColumn); virtual void Init( Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ); - virtual XubString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL); + virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL); virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter); virtual ::svt::CellControllerRef CreateController() const; @@ -543,7 +543,7 @@ public: TYPEINFO(); DbPatternField( DbGridColumn& _rColumn, const ::comphelper::ComponentContext& _rContext ); virtual void Init( Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ); - virtual XubString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL); + virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL); virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter); virtual ::svt::CellControllerRef CreateController() const; @@ -555,7 +555,7 @@ protected: virtual void implAdjustGenericFieldSetting( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel ); private: - String impl_formatText( const String& _rText ); + OUString impl_formatText(const OUString& _rText); private: SAL_WNODEPRECATED_DECLARATIONS_PUSH @@ -595,7 +595,7 @@ class DbDateField : public DbSpinField public: TYPEINFO(); DbDateField(DbGridColumn& _rColumn); - virtual XubString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL); + virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL); virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter); protected: @@ -620,7 +620,7 @@ class DbTimeField : public DbSpinField public: TYPEINFO(); DbTimeField(DbGridColumn& _rColumn); - virtual XubString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL); + virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL); virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter); protected: @@ -647,7 +647,7 @@ class DbCurrencyField : public DbSpinField public: TYPEINFO(); DbCurrencyField(DbGridColumn& _rColumn); - virtual XubString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL); + virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL); virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter); double GetCurrency(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) const; @@ -674,7 +674,7 @@ class DbNumericField : public DbSpinField public: TYPEINFO(); DbNumericField(DbGridColumn& _rColumn); - virtual XubString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL); + virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL); virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter); protected: @@ -698,8 +698,8 @@ class DbFilterField :public DbCellControl ,public ::svxform::OSQLParserClient { - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aValueList; - XubString m_aText; + ::com::sun::star::uno::Sequence< OUString > m_aValueList; + OUString m_aText; Link m_aCommitLink; sal_Int16 m_nControlClass; sal_Bool m_bFilterList : 1; @@ -715,11 +715,11 @@ public: virtual ::svt::CellControllerRef CreateController() const; virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect); virtual void Update(); - virtual XubString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL); + virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL); virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter); - const XubString& GetText() const {return m_aText;} - void SetText(const XubString& rText); + const OUString& GetText() const {return m_aText;} + void SetText(const OUString& rText); void SetCommitHdl( const Link& rLink ) { m_aCommitLink = rLink; } const Link& GetCommitHdl() const { return m_aCommitLink; } @@ -893,7 +893,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& xField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter); - XubString GetText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, + OUString GetText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) {return m_pCellControl->GetFormatText(_rxField, xFormatter, ppColor);} @@ -907,7 +907,7 @@ class FmXEditCell : public FmXTextCell, public FmXEditCell_Base { private: - ::rtl::OUString m_sValueOnEnter; + OUString m_sValueOnEnter; protected: ::cppu::OInterfaceContainerHelper m_aTextListeners; @@ -932,10 +932,10 @@ public: // ::com::sun::star::awt::XTextComponent virtual void SAL_CALL addTextListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeTextListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setText(const ::rtl::OUString& aText) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertText(const ::com::sun::star::awt::Selection& Sel, const ::rtl::OUString& Text) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getText() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSelectedText() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setText(const OUString& aText) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertText(const ::com::sun::star::awt::Selection& Sel, const OUString& Text) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getText() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSelectedText() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setSelection(const ::com::sun::star::awt::Selection& aSelection) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::awt::Selection SAL_CALL getSelection() throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isEditable() throw(::com::sun::star::uno::RuntimeException); @@ -966,7 +966,7 @@ class FmXCheckBoxCell : public FmXDataCell, { ::cppu::OInterfaceContainerHelper m_aItemListeners; ::cppu::OInterfaceContainerHelper m_aActionListeners; - ::rtl::OUString m_aActionCommand; + OUString m_aActionCommand; CheckBox* m_pBox; protected: @@ -989,14 +989,14 @@ public: virtual void SAL_CALL removeItemListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getState() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setState(sal_Int16 n) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setLabel(const ::rtl::OUString& Label) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setLabel(const OUString& Label) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL enableTriState(sal_Bool b) throw(::com::sun::star::uno::RuntimeException); // XButton virtual void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw (::com::sun::star::uno::RuntimeException); - //virtual void SAL_CALL setLabel( const ::rtl::OUString& Label ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setActionCommand( const ::rtl::OUString& Command ) throw (::com::sun::star::uno::RuntimeException); + //virtual void SAL_CALL setLabel( const OUString& Label ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setActionCommand( const OUString& Command ) throw (::com::sun::star::uno::RuntimeException); protected: virtual Window* getEventWindow() const; @@ -1032,19 +1032,19 @@ public: virtual void SAL_CALL removeItemListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addActionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeActionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addItem(const ::rtl::OUString& aItem, sal_Int16 nPos) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addItems(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aItems, sal_Int16 nPos) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addItem(const OUString& aItem, sal_Int16 nPos) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addItems(const ::com::sun::star::uno::Sequence< OUString >& aItems, sal_Int16 nPos) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeItems(sal_Int16 nPos, sal_Int16 nCount) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getItemCount() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getItem(sal_Int16 nPos) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getItems() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getItem(sal_Int16 nPos) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getItems() throw(::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getSelectedItemPos() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSelectedItemsPos() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSelectedItem() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSelectedItems() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSelectedItem() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedItems() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL SAL_CALL selectItemPos(sal_Int16 nPos, sal_Bool bSelect) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL SAL_CALL selectItemsPos(const ::com::sun::star::uno::Sequence< sal_Int16 >& aPositions, sal_Bool bSelect) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL SAL_CALL selectItem(const ::rtl::OUString& aItem, sal_Bool bSelect) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL SAL_CALL selectItem(const OUString& aItem, sal_Bool bSelect) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isMutipleMode() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL SAL_CALL setMultipleMode(sal_Bool bMulti) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getDropDownLineCount() throw(::com::sun::star::uno::RuntimeException); @@ -1087,12 +1087,12 @@ public: virtual void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& _Listener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& _Listener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& _Listener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addItem( const ::rtl::OUString& _Item, ::sal_Int16 _Pos ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addItems( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _Items, ::sal_Int16 _Pos ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addItem( const OUString& _Item, ::sal_Int16 _Pos ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addItems( const ::com::sun::star::uno::Sequence< OUString >& _Items, ::sal_Int16 _Pos ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeItems( ::sal_Int16 nPos, ::sal_Int16 nCount ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int16 SAL_CALL getItemCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getItem( ::sal_Int16 _Pos ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getItems( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getItem( ::sal_Int16 _Pos ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getItems( ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int16 SAL_CALL getDropDownLineCount( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDropDownLineCount( ::sal_Int16 _Lines ) throw (::com::sun::star::uno::RuntimeException); @@ -1136,10 +1136,10 @@ public: // ::com::sun::star::awt::XTextComponent virtual void SAL_CALL addTextListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeTextListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setText(const ::rtl::OUString& aText) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertText(const ::com::sun::star::awt::Selection& Sel, const ::rtl::OUString& Text) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getText() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSelectedText() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setText(const OUString& aText) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertText(const ::com::sun::star::awt::Selection& Sel, const OUString& Text) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getText() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSelectedText() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setSelection(const ::com::sun::star::awt::Selection& aSelection) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::awt::Selection SAL_CALL getSelection() throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isEditable() throw(::com::sun::star::uno::RuntimeException); diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index c1437048e48d..be291142bad4 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -366,20 +366,20 @@ void SvxNumberFormatShell::MakeFormat( String& rFormat, if(rErrPos==0) { - pFormatter->GenerateFormat( rFormat, nCurFormatKey, - eCurLanguage, - bThousand, bNegRed, - nPrecision, nLeadingZeroes ); + rFormat = pFormatter->GenerateFormat(nCurFormatKey, + eCurLanguage, + bThousand, bNegRed, + nPrecision, nLeadingZeroes); } for ( std::vector::const_iterator it(aFmtEList.begin()); it != aFmtEList.end(); ++it ) delete *it; } else { - pFormatter->GenerateFormat( rFormat, nCurFormatKey, - eCurLanguage, - bThousand, bNegRed, - nPrecision, nLeadingZeroes ); + rFormat = pFormatter->GenerateFormat(nCurFormatKey, + eCurLanguage, + bThousand, bNegRed, + nPrecision, nLeadingZeroes); } } diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index 6d4994ad6753..c0035bbd493a 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -1764,9 +1764,8 @@ void SvXMLNumFormatContext::AddNumber( const SvXMLNumberInfo& rInfo ) if ( nEmbeddedCount ) bGrouping = sal_False; // grouping and embedded characters can't be used together - String aNumStr; sal_uInt32 nStdIndex = pFormatter->GetStandardIndex( nFormatLang ); - pFormatter->GenerateFormat( aNumStr, nStdIndex, nFormatLang, + String aNumStr = pFormatter->GenerateFormat( nStdIndex, nFormatLang, bGrouping, sal_False, nGenPrec, nLeading ); if ( rInfo.nExpDigits >= 0 && nLeading == 0 && !bGrouping && nEmbeddedCount == 0 ) From 3621487e49f53f0d37ea92c3cf45ed3dabb6daa5 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 2 Oct 2012 13:50:28 +0200 Subject: [PATCH 177/863] RepositoryModule_ooo.mk: add missing modules Change-Id: Ieab82857f712c07e5bddc981d78f69b4c3a234b5 --- RepositoryModule_ooo.mk | 47 +++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index 0e3dcae5ae43..b654664f4f53 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -30,25 +30,31 @@ $(eval $(call gb_Module_Module,ooo)) $(eval $(call gb_Module_add_moduledirs,ooo,\ accessibility \ + $(call gb_Helper_optional,AFMS,afms) \ animations \ - autodoc \ + $(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \ apple_remote \ + autodoc \ avmedia \ basctl \ basebmp \ basegfx \ basic \ bean \ + $(call gb_Helper_optional,BSH,beanshell) \ binaryurp \ - bluez_bluetooth \ + $(call gb_Helper_optional,BLUEZ,bluez_bluetooth) \ boost \ + bridges \ canvas \ chart2 \ - clucene \ - codemaker \ + cli_ure \ + $(call gb_Helper_optional,CLUCENE,clucene) \ + $(call gb_Helper_optional,DESKTOP,codemaker) \ comphelper \ configmgr \ connectivity \ + cosv \ cppcanvas \ cppu \ cppuhelper \ @@ -56,6 +62,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ cui \ dbaccess \ desktop \ + $(call gb_Helper_optional,DICTIONARIES,dictionaries) \ drawinglayer \ dtrans \ editeng \ @@ -70,18 +77,19 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ formula \ fpicker \ framework \ - hsqldb \ + $(call gb_Helper_optional,DESKTOP,helpcompiler) \ + $(call gb_Helper_optional,HSQLDB,hsqldb) \ hwpfilter \ i18npool \ i18nutil \ idl \ - idlc \ + $(call gb_Helper_optional,DESKTOP,idlc) \ io \ javaunohelper \ jurt \ jvmaccess \ jvmfwk \ - l10ntools \ + $(call gb_Helper_optional,DESKTOP,l10ntools) \ libcdr \ libcmis \ libmspub \ @@ -97,8 +105,9 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ MathMLDTD \ mdds \ Mesa \ - neon \ - nlpsolver \ + $(call gb_Helper_optional,MORE_FONTS,more_fonts) \ + $(call gb_Helper_optional,NEON,neon) \ + $(call gb_Helper_optional,NLPSOLVER,nlpsolver) \ np_sdk \ o3tl \ offapi \ @@ -109,10 +118,12 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ packimages \ padmin \ psprint_config \ + $(call gb_Helper_optional,PYUNO,pyuno) \ $(if $(strip $(OOO_JUNIT_JAR)),\ qadevOOo \ ) \ - rdbmaker \ + $(call gb_Helper_optional,DESKTOP,rdbmaker) \ + readlicense_oo \ regexp \ registry \ remotebridges \ @@ -124,10 +135,11 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ salhelper \ sane \ sax \ + $(call gb_Helper_optional,SAXON,saxon) \ sc \ scaddins \ sccomp \ - scp2 \ + $(call gb_Helper_optional,DESKTOP,scp2) \ scripting \ sd \ sdext \ @@ -147,17 +159,18 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ swext \ test \ testtools \ + $(call gb_Helper_optional,TOMCAT,tomcat) \ toolkit \ tools \ touch \ - $(if $(filter TRANSLATIONS,$(BUILD_TYPE)),\ - translations \ - ) \ + $(call gb_Helper_optional,TRANSLATIONS,translations) \ tubes \ twain \ ucb \ ucbhelper \ + $(call gb_Helper_optional,UCPP,ucpp) \ udkapi \ + udm \ unixODBC \ UnoControls \ unodevtools \ @@ -173,12 +186,10 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ wizards \ writerfilter \ writerperfect \ - $(if $(filter X11_EXTENSIONS,$(BUILD_TYPE)),\ - x11_extensions \ - ) \ + $(call gb_Helper_optional,X11_EXTENSIONS,x11_extensions) \ xmerge \ xml2cmp \ - xmlhelp \ + $(call gb_Helper_optional,DESKTOP,xmlhelp) \ xmloff \ xmlreader \ xmlscript \ From ad09ced9f63be77831aab6708b2afa2861ff0eaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 2 Oct 2012 13:17:28 +0100 Subject: [PATCH 178/863] Resolves: fdo#55524 convert insert break dialog fully Change-Id: Id25bde8db310a83b52ebda7d47d0b1dcda79ed45 --- sw/AllLangResTarget_sw.mk | 1 - sw/UI_sw.mk | 1 - sw/UI_swriter.mk | 1 + sw/inc/chrdlg.hrc | 1 - sw/inc/swabstdlg.hxx | 2 +- sw/source/ui/chrdlg/break.cxx | 118 +++++++-------- sw/source/ui/chrdlg/break.hrc | 30 ---- sw/source/ui/chrdlg/swbreak.src | 139 ------------------ sw/source/ui/dialog/swdlgfact.cxx | 21 +-- sw/source/ui/dialog/swdlgfact.hxx | 2 +- sw/source/ui/inc/break.hxx | 19 +-- sw/source/ui/shells/textsh1.cxx | 2 +- .../ui/20705.ui => swriter/ui/insertbreak.ui} | 64 ++++---- 13 files changed, 105 insertions(+), 296 deletions(-) delete mode 100644 sw/source/ui/chrdlg/break.hrc delete mode 100644 sw/source/ui/chrdlg/swbreak.src rename sw/uiconfig/{sw/ui/20705.ui => swriter/ui/insertbreak.ui} (89%) diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk index 21d313fea2e0..8d7f4f8cf886 100644 --- a/sw/AllLangResTarget_sw.mk +++ b/sw/AllLangResTarget_sw.mk @@ -87,7 +87,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\ sw/source/ui/chrdlg/drpcps.src \ sw/source/ui/chrdlg/numpara.src \ sw/source/ui/chrdlg/paradlg.src \ - sw/source/ui/chrdlg/swbreak.src \ sw/source/ui/config/mailconfigpage.src \ sw/source/ui/config/optcomp.src \ sw/source/ui/config/optdlg.src \ diff --git a/sw/UI_sw.mk b/sw/UI_sw.mk index 789da4f42171..96e8a2a3b626 100644 --- a/sw/UI_sw.mk +++ b/sw/UI_sw.mk @@ -10,7 +10,6 @@ $(eval $(call gb_UI_UI,sw)) $(eval $(call gb_UI_add_uifiles,sw,\ - sw/uiconfig/sw/ui/20705 \ sw/uiconfig/sw/ui/20872 \ sw/uiconfig/sw/ui/20876 \ )) diff --git a/sw/UI_swriter.mk b/sw/UI_swriter.mk index b08b0fbeb4f2..fc53c25e062a 100644 --- a/sw/UI_swriter.mk +++ b/sw/UI_swriter.mk @@ -14,6 +14,7 @@ $(eval $(call gb_UI_add_uifiles,modules/swriter,\ sw/uiconfig/swriter/ui/charurlpage \ sw/uiconfig/swriter/ui/columnwidth \ sw/uiconfig/swriter/ui/converttexttable \ + sw/uiconfig/swriter/ui/insertbreak \ sw/uiconfig/swriter/ui/inserttable \ sw/uiconfig/swriter/ui/linenumbering \ sw/uiconfig/swriter/ui/printeroptions \ diff --git a/sw/inc/chrdlg.hrc b/sw/inc/chrdlg.hrc index a365245b86ab..ea17a38e58cf 100644 --- a/sw/inc/chrdlg.hrc +++ b/sw/inc/chrdlg.hrc @@ -23,7 +23,6 @@ #define DLG_CHAR (RC_CHRDLG_BEGIN + 1) #define DLG_PARA (RC_CHRDLG_BEGIN + 2) -#define DLG_BREAK (RC_CHRDLG_BEGIN + 5) #define DLG_DROPCAPS (RC_CHRDLG_BEGIN + 8) #define DLG_DRAWCHAR (RC_CHRDLG_BEGIN + 9) #define DLG_DRAWPARA (RC_CHRDLG_BEGIN + 10) diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index 10398a842d6b..5f12fa8d5423 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -362,7 +362,7 @@ public: SvStream* pStream, int nResId ) = 0;// add for SwAsciiFilterDlg virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( Window *pParent, SwWrtShell &rSh, SfxRequest& rReq, int nResId ) = 0;// add for SwInsertBookmarkDlg - virtual AbstractSwBreakDlg * CreateSwBreakDlg( Window *pParent, SwWrtShell &rSh,int nResId ) = 0; // add for SwBreakDlg + virtual AbstractSwBreakDlg * CreateSwBreakDlg(Window *pParent, SwWrtShell &rSh) = 0; // add for SwBreakDlg virtual VclAbstractDialog * CreateSwChangeDBDlg( SwView& rVw, int nResId ) = 0; //add for SwChangeDBDlg virtual SfxAbstractTabDialog * CreateSwCharDlg( Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet, int nResId, // add for SwCharDlg const String* pFmtStr = 0, sal_Bool bIsDrwTxtDlg = sal_False) = 0; diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx index 0e6e4731ae36..5abbd8d482cd 100644 --- a/sw/source/ui/chrdlg/break.cxx +++ b/sw/source/ui/chrdlg/break.cxx @@ -41,25 +41,24 @@ #include #include -#include #include #include void SwBreakDlg::Apply() { nKind = 0; - if(aLineBtn.IsChecked()) + if(m_pLineBtn->IsChecked()) nKind = 1; - else if(aColumnBtn.IsChecked()) + else if(m_pColumnBtn->IsChecked()) nKind = 2; - else if(aPageBtn.IsChecked()) + else if(m_pPageBtn->IsChecked()) { nKind = 3; - const sal_uInt16 nPos = aPageCollBox.GetSelectEntryPos(); + const sal_uInt16 nPos = m_pPageCollBox->GetSelectEntryPos(); if(0 != nPos && LISTBOX_ENTRY_NOTFOUND != nPos) { - aTemplate = aPageCollBox.GetSelectEntry(); - nPgNum = aPageNumBox.IsChecked() ? (sal_uInt16)aPageNumEdit.GetValue() : 0; + aTemplate = m_pPageCollBox->GetSelectEntry(); + nPgNum = m_pPageNumBox->IsChecked() ? (sal_uInt16)m_pPageNumEdit->GetValue() : 0; } } } @@ -77,8 +76,8 @@ IMPL_LINK_NOARG_INLINE_END(SwBreakDlg, ClickHdl) IMPL_LINK_INLINE_START( SwBreakDlg, PageNumHdl, CheckBox *, pBox ) { - if(pBox->IsChecked()) aPageNumEdit.SetValue(1); - else aPageNumEdit.SetText(aEmptyStr); + if(pBox->IsChecked()) m_pPageNumEdit->SetValue(1); + else m_pPageNumEdit->SetText(OUString()); return 0; } IMPL_LINK_INLINE_END( SwBreakDlg, PageNumHdl, CheckBox *, pBox ) @@ -89,7 +88,7 @@ IMPL_LINK_INLINE_END( SwBreakDlg, PageNumHdl, CheckBox *, pBox ) IMPL_LINK_NOARG_INLINE_START(SwBreakDlg, PageNumModifyHdl) { - aPageNumBox.Check(); + m_pPageNumBox->Check(); return 0; } IMPL_LINK_NOARG_INLINE_END(SwBreakDlg, PageNumModifyHdl) @@ -103,19 +102,19 @@ IMPL_LINK_NOARG_INLINE_END(SwBreakDlg, PageNumModifyHdl) IMPL_LINK_NOARG(SwBreakDlg, OkHdl) { - if(aPageNumBox.IsChecked()) { + if(m_pPageNumBox->IsChecked()) { // In case of differing page descriptions, test validity - const sal_uInt16 nPos = aPageCollBox.GetSelectEntryPos(); + const sal_uInt16 nPos = m_pPageCollBox->GetSelectEntryPos(); // position 0 says 'Without'. const SwPageDesc *pPageDesc; if ( 0 != nPos && LISTBOX_ENTRY_NOTFOUND != nPos ) - pPageDesc = rSh.FindPageDescByName( aPageCollBox.GetSelectEntry(), + pPageDesc = rSh.FindPageDescByName( m_pPageCollBox->GetSelectEntry(), sal_True ); else pPageDesc = &rSh.GetPageDesc(rSh.GetCurPageDesc()); OSL_ENSURE(pPageDesc, "Page description not found."); - const sal_uInt16 nUserPage = sal_uInt16(aPageNumEdit.GetValue()); + const sal_uInt16 nUserPage = sal_uInt16(m_pPageNumEdit->GetValue()); sal_Bool bOk = sal_True; switch(pPageDesc->GetUseOn()) { @@ -127,7 +126,7 @@ IMPL_LINK_NOARG(SwBreakDlg, OkHdl) } if(!bOk) { InfoBox(this, SW_RES(MSG_ILLEGAL_PAGENUM)).Execute(); - aPageNumEdit.GrabFocus(); + m_pPageNumEdit->GrabFocus(); return 0; } } @@ -135,41 +134,33 @@ IMPL_LINK_NOARG(SwBreakDlg, OkHdl) return 0; } -SwBreakDlg::SwBreakDlg( Window *pParent, SwWrtShell &rS ) : - - SvxStandardDialog( pParent,SW_RES(DLG_BREAK) ), - - rSh(rS), - aBreakFL(this,SW_RES(FL_BREAK)), - aLineBtn(this,SW_RES(RB_LINE)), - aColumnBtn(this,SW_RES(RB_COL)), - aPageBtn(this,SW_RES(RB_PAGE)), - aPageCollText(this, SW_RES(FT_COLL)), - aPageCollBox(this, SW_RES(LB_COLL)), - aPageNumBox(this, SW_RES(CB_PAGENUM)), - aPageNumEdit(this, SW_RES(ED_PAGENUM)), - - aOkBtn(this,SW_RES(BT_OK)), - aCancelBtn(this,SW_RES(BT_CANCEL)), - aHelpBtn(this,SW_RES(BT_HELP)), - - nKind(0), - nPgNum(0), - - bHtmlMode(0 != ::GetHtmlMode(rS.GetView().GetDocShell())) +SwBreakDlg::SwBreakDlg( Window *pParent, SwWrtShell &rS ) + : SvxStandardDialog(pParent, "BreakDialog", "modules/swriter/ui/insertbreak.ui") + , rSh(rS) + , nKind(0) + , nPgNum(0) + , bHtmlMode(0 != ::GetHtmlMode(rS.GetView().GetDocShell())) { - aPageNumEdit.SetAccessibleRelationLabeledBy(&aPageNumBox); - aPageNumEdit.SetAccessibleName(aPageNumBox.GetText()); + get(m_pLineBtn, "linerb"); + get(m_pColumnBtn, "columnrb"); + get(m_pPageBtn, "pagerb"); + get(m_pPageCollText, "styleft"); + get(m_pPageCollBox, "stylelb"); + get(m_pPageNumBox, "pagenumcb"); + get(m_pPageNumEdit, "pagenumsb"); + + m_pPageNumEdit->SetAccessibleRelationLabeledBy(m_pPageNumBox); + m_pPageNumEdit->SetAccessibleName(m_pPageNumBox->GetText()); Link aLk = LINK(this,SwBreakDlg,ClickHdl); - aPageBtn.SetClickHdl( aLk ); - aLineBtn.SetClickHdl( aLk ); - aColumnBtn.SetClickHdl( aLk ); - aPageCollBox.SetSelectHdl( aLk ); + m_pPageBtn->SetClickHdl( aLk ); + m_pLineBtn->SetClickHdl( aLk ); + m_pColumnBtn->SetClickHdl( aLk ); + m_pPageCollBox->SetSelectHdl( aLk ); - aOkBtn.SetClickHdl(LINK(this,SwBreakDlg,OkHdl)); - aPageNumBox.SetClickHdl(LINK(this,SwBreakDlg,PageNumHdl)); - aPageNumEdit.SetModifyHdl(LINK(this,SwBreakDlg,PageNumModifyHdl)); + get("ok")->SetClickHdl(LINK(this,SwBreakDlg,OkHdl));; + m_pPageNumBox->SetClickHdl(LINK(this,SwBreakDlg,PageNumHdl)); + m_pPageNumEdit->SetModifyHdl(LINK(this,SwBreakDlg,PageNumModifyHdl)); // Insert page description to Listbox @@ -179,21 +170,20 @@ SwBreakDlg::SwBreakDlg( Window *pParent, SwWrtShell &rS ) : for( i = 0; i < nCount; ++i) { const SwPageDesc &rPageDesc = rSh.GetPageDesc(i); - ::InsertStringSorted(rPageDesc.GetName(), aPageCollBox, 1 ); + ::InsertStringSorted(rPageDesc.GetName(), *m_pPageCollBox, 1 ); } String aFmtName; for(i = RES_POOLPAGE_BEGIN; i < RES_POOLPAGE_END; ++i) - if(LISTBOX_ENTRY_NOTFOUND == aPageCollBox.GetEntryPos( aFmtName = + if(LISTBOX_ENTRY_NOTFOUND == m_pPageCollBox->GetEntryPos( aFmtName = SwStyleNameMapper::GetUIName( i, aFmtName ))) - ::InsertStringSorted(aFmtName, aPageCollBox, 1 ); + ::InsertStringSorted(aFmtName, *m_pPageCollBox, 1 ); //add landscape page - if(LISTBOX_ENTRY_NOTFOUND == aPageCollBox.GetEntryPos( aFmtName = + if(LISTBOX_ENTRY_NOTFOUND == m_pPageCollBox->GetEntryPos( aFmtName = SwStyleNameMapper::GetUIName( RES_POOLPAGE_LANDSCAPE, aFmtName ))) - ::InsertStringSorted(aFmtName, aPageCollBox, 1 ); + ::InsertStringSorted(aFmtName, *m_pPageCollBox, 1 ); CheckEnable(); - aPageNumEdit.SetText( aEmptyStr ); - FreeResource(); + m_pPageNumEdit->SetText(OUString()); } void SwBreakDlg::CheckEnable() @@ -201,32 +191,32 @@ void SwBreakDlg::CheckEnable() sal_Bool bEnable = sal_True; if ( bHtmlMode ) { - aColumnBtn .Enable(sal_False); - aPageCollBox.Enable(sal_False); + m_pColumnBtn->Enable(sal_False); + m_pPageCollBox->Enable(sal_False); bEnable = sal_False; } else if(rSh.GetFrmType(0,sal_True) & (FRMTYPE_FLY_ANY | FRMTYPE_HEADER | FRMTYPE_FOOTER | FRMTYPE_FOOTNOTE)) { - aPageBtn.Enable(sal_False); - if(aPageBtn.IsChecked()) - aLineBtn.Check(sal_True); + m_pPageBtn->Enable(sal_False); + if(m_pPageBtn->IsChecked()) + m_pLineBtn->Check(sal_True); bEnable = sal_False; } - const sal_Bool bPage = aPageBtn.IsChecked(); - aPageCollText.Enable( bPage ); - aPageCollBox.Enable ( bPage ); + const sal_Bool bPage = m_pPageBtn->IsChecked(); + m_pPageCollText->Enable( bPage ); + m_pPageCollBox->Enable ( bPage ); bEnable &= bPage; if ( bEnable ) { // position 0 says 'Without' page template. - const sal_uInt16 nPos = aPageCollBox.GetSelectEntryPos(); + const sal_uInt16 nPos = m_pPageCollBox->GetSelectEntryPos(); if ( 0 == nPos || LISTBOX_ENTRY_NOTFOUND == nPos ) bEnable = sal_False; } - aPageNumBox .Enable(bEnable); - aPageNumEdit.Enable(bEnable); + m_pPageNumBox->Enable(bEnable); + m_pPageNumEdit->Enable(bEnable); } SwBreakDlg::~SwBreakDlg() diff --git a/sw/source/ui/chrdlg/break.hrc b/sw/source/ui/chrdlg/break.hrc deleted file mode 100644 index 29084c685c81..000000000000 --- a/sw/source/ui/chrdlg/break.hrc +++ /dev/null @@ -1,30 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#define RB_PAGE 1 -#define RB_LINE 2 -#define RB_COL 3 -#define FT_COLL 4 -#define LB_COLL 5 -#define FL_BREAK 6 -#define CB_PAGENUM 7 -#define ED_PAGENUM 8 - -#define BT_OK 100 -#define BT_CANCEL 101 -#define BT_HELP 102 diff --git a/sw/source/ui/chrdlg/swbreak.src b/sw/source/ui/chrdlg/swbreak.src deleted file mode 100644 index 1363b4c295c7..000000000000 --- a/sw/source/ui/chrdlg/swbreak.src +++ /dev/null @@ -1,139 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "chrdlg.hrc" -#include "break.hrc" -#include "cmdid.h" -#include "helpid.h" -ModalDialog DLG_BREAK -{ - HelpID = CMD_FN_INSERT_BREAK_DLG ; - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 161 , 114 ) ; - Text [ en-US ] = "Insert Break" ; - Moveable = TRUE ; - OKButton BT_OK - { - Pos = MAP_APPFONT ( 105 , 6 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - Group = TRUE ; - DefButton = TRUE ; - }; - CancelButton BT_CANCEL - { - Pos = MAP_APPFONT ( 105 , 23 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - Group = TRUE ; - }; - HelpButton BT_HELP - { - Pos = MAP_APPFONT ( 105 , 43 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - Group = TRUE ; - }; - RadioButton RB_LINE - { - HelpID = "sw:RadioButton:DLG_BREAK:RB_LINE"; - Pos = MAP_APPFONT ( 12 , 15 ) ; - Size = MAP_APPFONT ( 63 , 10 ) ; - Text [ en-US ] = "~Line break" ; - TabStop = TRUE ; - Group = TRUE ; - }; - RadioButton RB_PAGE - { - HelpID = "sw:RadioButton:DLG_BREAK:RB_PAGE"; - Pos = MAP_APPFONT ( 12 , 39 ) ; - Size = MAP_APPFONT ( 63 , 10 ) ; - Text [ en-US ] = "~Page break" ; - TabStop = TRUE ; - Check = TRUE ; - }; - RadioButton RB_COL - { - HelpID = "sw:RadioButton:DLG_BREAK:RB_COL"; - Pos = MAP_APPFONT ( 12 , 27 ) ; - Size = MAP_APPFONT ( 69 , 10 ) ; - Text [ en-US ] = "~Column break" ; - TabStop = TRUE ; - }; - FixedLine FL_BREAK - { - Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 93 , 8 ) ; - Text [ en-US ] = "Type" ; - }; - FixedText FT_COLL - { - Pos = MAP_APPFONT ( 12 , 51 ) ; - Size = MAP_APPFONT ( 69 , 8 ) ; - Text [ en-US ] = "~Style" ; - Group = TRUE ; - Left = TRUE ; - }; - ListBox LB_COLL - { - HelpID = "sw:ListBox:DLG_BREAK:LB_COLL"; - Pos = MAP_APPFONT ( 12 , 62 ) ; - Size = MAP_APPFONT ( 75 , 50 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - CurPos = 0 ; - StringList [ en-US ] = - { - < "[None]" ; > ; - }; - }; - CheckBox CB_PAGENUM - { - HelpID = "sw:CheckBox:DLG_BREAK:CB_PAGENUM"; - Pos = MAP_APPFONT ( 12 , 79 ) ; - Size = MAP_APPFONT ( 84 , 10 ) ; - Text [ en-US ] = "Change page ~number" ; - TabStop = TRUE ; - }; - NumericField ED_PAGENUM - { - HelpID = "sw:NumericField:DLG_BREAK:ED_PAGENUM"; - Border = TRUE ; - Pos = MAP_APPFONT ( 12 , 94 ) ; - Size = MAP_APPFONT ( 31 , 12 ) ; - TabStop = TRUE ; - Left = TRUE ; - Repeat = TRUE ; - Spin = TRUE ; - Minimum = 1 ; - Maximum = 9999 ; - Value = 1 ; - First = 1 ; - Last = 9999 ; - }; -}; diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index a062c72dc857..131b70732ebd 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -713,24 +713,11 @@ VclAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwInsertBookmarkDlg( Wind return 0; } -AbstractSwBreakDlg * SwAbstractDialogFactory_Impl::CreateSwBreakDlg ( Window *pParent, - SwWrtShell &rSh, - int nResId ) +AbstractSwBreakDlg * SwAbstractDialogFactory_Impl::CreateSwBreakDlg(Window *pParent, + SwWrtShell &rSh) { - SwBreakDlg* pDlg=NULL; - switch ( nResId ) - { - case DLG_BREAK : - pDlg = new SwBreakDlg( pParent, rSh ); - break; - - default: - break; - } - - if ( pDlg ) - return new AbstractSwBreakDlg_Impl( pDlg ); - return 0; + SwBreakDlg* pDlg = new SwBreakDlg(pParent, rSh); + return new AbstractSwBreakDlg_Impl(pDlg); } VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwChangeDBDlg( SwView& rVw, int nResId ) diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index da5e1801b7ab..b94f61a83ff9 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -445,7 +445,7 @@ public: virtual AbstractSwAsciiFilterDlg* CreateSwAsciiFilterDlg ( Window* pParent, SwDocShell& rDocSh, SvStream* pStream, int nResId ); //add for SwAsciiFilterDlg virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( Window *pParent, SwWrtShell &rSh, SfxRequest& rReq, int nResId );//add for SwInsertBookmarkDlg - virtual AbstractSwBreakDlg * CreateSwBreakDlg ( Window *pParent, SwWrtShell &rSh,int nResId ); // add for SwBreakDlg + virtual AbstractSwBreakDlg * CreateSwBreakDlg(Window *pParent, SwWrtShell &rSh); // add for SwBreakDlg virtual VclAbstractDialog * CreateSwChangeDBDlg( SwView& rVw, int nResId ); //add for SwChangeDBDlg virtual SfxAbstractTabDialog * CreateSwCharDlg( Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet, int nResId, // add for SwCharDlg const String* pFmtStr = 0, sal_Bool bIsDrwTxtDlg = sal_False); diff --git a/sw/source/ui/inc/break.hxx b/sw/source/ui/inc/break.hxx index caa75d1a4c36..e95d93078027 100644 --- a/sw/source/ui/inc/break.hxx +++ b/sw/source/ui/inc/break.hxx @@ -43,18 +43,13 @@ class SwWrtShell; class SwBreakDlg: public SvxStandardDialog { SwWrtShell &rSh; - FixedLine aBreakFL; - RadioButton aLineBtn; - RadioButton aColumnBtn; - RadioButton aPageBtn; - FixedText aPageCollText; - ListBox aPageCollBox; - CheckBox aPageNumBox; - NumericField aPageNumEdit; - - OKButton aOkBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; + RadioButton* m_pLineBtn; + RadioButton* m_pColumnBtn; + RadioButton* m_pPageBtn; + FixedText* m_pPageCollText; + ListBox* m_pPageCollBox; + CheckBox* m_pPageNumBox; + NumericField* m_pPageNumEdit; String aTemplate; sal_uInt16 nKind; diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index 4929427611cb..d82aad7f3828 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.cxx @@ -532,7 +532,7 @@ void SwTextShell::Execute(SfxRequest &rReq) SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); - AbstractSwBreakDlg* pDlg = pFact->CreateSwBreakDlg( GetView().GetWindow(), rWrtSh, DLG_BREAK ); + AbstractSwBreakDlg* pDlg = pFact->CreateSwBreakDlg(GetView().GetWindow(), rWrtSh); OSL_ENSURE(pDlg, "Dialogdiet fail!"); if ( pDlg->Execute() == RET_OK ) { diff --git a/sw/uiconfig/sw/ui/20705.ui b/sw/uiconfig/swriter/ui/insertbreak.ui similarity index 89% rename from sw/uiconfig/sw/ui/20705.ui rename to sw/uiconfig/swriter/ui/insertbreak.ui index a5b2e2e608ef..867e86a6e9fc 100644 --- a/sw/uiconfig/sw/ui/20705.ui +++ b/sw/uiconfig/swriter/ui/insertbreak.ui @@ -1,7 +1,25 @@ - + + 1 + 9999 + 1 + 1 + 10 + + + + + + + + + [None] + + + + False 5 Insert Break @@ -16,7 +34,7 @@ vertical start - + gtk-ok False True @@ -32,7 +50,7 @@ - + gtk-cancel False True @@ -48,7 +66,7 @@ - + gtk-help False True @@ -88,7 +106,7 @@ False vertical - + Line break False True @@ -106,7 +124,7 @@ - + Column break False True @@ -116,7 +134,7 @@ 0 True True - 2 + linerb False @@ -125,7 +143,7 @@ - + Page break False True @@ -135,7 +153,7 @@ 0 True True - 2 + linerb False @@ -144,7 +162,7 @@ - + True False 0 @@ -157,7 +175,7 @@ - + True False liststore1 @@ -169,7 +187,7 @@ - + Change page number False True @@ -190,11 +208,12 @@ True False - + True True â— True + adjustment1 False @@ -217,7 +236,7 @@ - + True False Type @@ -234,20 +253,9 @@ - 100 - 101 - 102 + ok + cancel + help - - - - - - - - [None] - - - From 59e6d18bea73417b2b5cd044d0489f882e847df6 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Tue, 2 Oct 2012 14:39:54 +0200 Subject: [PATCH 179/863] remove deprecated configure switch --disable-activex-component Change-Id: I3a5b19ac9f7c09a7bb5c919b3a9bc18ab646fd76 --- distro-configs/LibreOfficeWin32.conf | 1 - distro-configs/LibreOfficeWin64.conf | 1 - 2 files changed, 2 deletions(-) diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf index 1a34632dde4c..7273ed41b861 100644 --- a/distro-configs/LibreOfficeWin32.conf +++ b/distro-configs/LibreOfficeWin32.conf @@ -6,7 +6,6 @@ --without-agfa-monotype-fonts --enable-extension-integration --with-java-target-version=1.5 ---disable-activex-component --disable-gtk --enable-binfilter --enable-ext-scripting-beanshell diff --git a/distro-configs/LibreOfficeWin64.conf b/distro-configs/LibreOfficeWin64.conf index 2c0b022e5125..344551eeca4a 100644 --- a/distro-configs/LibreOfficeWin64.conf +++ b/distro-configs/LibreOfficeWin64.conf @@ -2,7 +2,6 @@ --without-agfa-monotype-fonts --with-java-target-version=1.5 --enable-cl-x64 ---disable-activex-component --disable-gtk --enable-ext-scripting-beanshell --enable-ext-scripting-javascript From 2c270eeff422ef93100376ce0717a131d4f3cc2f Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 27 Sep 2012 11:13:36 +0200 Subject: [PATCH 180/863] sal_Bool->bool in svl::SvtCTLOptions Change-Id: I824595b6b60d4114f27bf64d8a84f2973f778e39 --- svl/inc/svl/ctloptions.hxx | 20 ++++----- svl/source/config/ctloptions.cxx | 74 ++++++++++++++++---------------- 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/svl/inc/svl/ctloptions.hxx b/svl/inc/svl/ctloptions.hxx index 3a0b82603e83..525e8e73a795 100644 --- a/svl/inc/svl/ctloptions.hxx +++ b/svl/inc/svl/ctloptions.hxx @@ -37,20 +37,20 @@ private: public: // bDontLoad is for referencing purposes only - SvtCTLOptions( sal_Bool bDontLoad = sal_False ); + SvtCTLOptions( bool bDontLoad = false ); virtual ~SvtCTLOptions(); - void SetCTLFontEnabled( sal_Bool _bEnabled ); - sal_Bool IsCTLFontEnabled() const; + void SetCTLFontEnabled( bool _bEnabled ); + bool IsCTLFontEnabled() const; - void SetCTLSequenceChecking( sal_Bool _bEnabled ); - sal_Bool IsCTLSequenceChecking() const; + void SetCTLSequenceChecking( bool _bEnabled ); + bool IsCTLSequenceChecking() const; - void SetCTLSequenceCheckingRestricted( sal_Bool _bEnable ); - sal_Bool IsCTLSequenceCheckingRestricted( void ) const; + void SetCTLSequenceCheckingRestricted( bool _bEnable ); + bool IsCTLSequenceCheckingRestricted( void ) const; - void SetCTLSequenceCheckingTypeAndReplace( sal_Bool _bEnable ); - sal_Bool IsCTLSequenceCheckingTypeAndReplace() const; + void SetCTLSequenceCheckingTypeAndReplace( bool _bEnable ); + bool IsCTLSequenceCheckingTypeAndReplace() const; enum CursorMovement { @@ -79,7 +79,7 @@ public: E_CTLSEQUENCECHECKINGRESTRICTED, E_CTLSEQUENCECHECKINGTYPEANDREPLACE }; - sal_Bool IsReadOnly(EOption eOption) const; + bool IsReadOnly(EOption eOption) const; }; #endif // _SVTOOLS_CTLOPTIONS_HXX diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx index e7cb760cb8be..36d8df1a7507 100644 --- a/svl/source/config/ctloptions.cxx +++ b/svl/source/config/ctloptions.cxx @@ -42,20 +42,20 @@ using namespace ::com::sun::star::uno; class SvtCTLOptions_Impl : public utl::ConfigItem { private: - sal_Bool m_bIsLoaded; - sal_Bool m_bCTLFontEnabled; - sal_Bool m_bCTLSequenceChecking; - sal_Bool m_bCTLRestricted; - sal_Bool m_bCTLTypeAndReplace; + bool m_bIsLoaded; + bool m_bCTLFontEnabled; + bool m_bCTLSequenceChecking; + bool m_bCTLRestricted; + bool m_bCTLTypeAndReplace; SvtCTLOptions::CursorMovement m_eCTLCursorMovement; SvtCTLOptions::TextNumerals m_eCTLTextNumerals; - sal_Bool m_bROCTLFontEnabled; - sal_Bool m_bROCTLSequenceChecking; - sal_Bool m_bROCTLRestricted; - sal_Bool m_bROCTLTypeAndReplace; - sal_Bool m_bROCTLCursorMovement; - sal_Bool m_bROCTLTextNumerals; + bool m_bROCTLFontEnabled; + bool m_bROCTLSequenceChecking; + bool m_bROCTLRestricted; + bool m_bROCTLTypeAndReplace; + bool m_bROCTLCursorMovement; + bool m_bROCTLTextNumerals; public: SvtCTLOptions_Impl(); @@ -65,18 +65,18 @@ public: virtual void Commit(); void Load(); - sal_Bool IsLoaded() { return m_bIsLoaded; } - void SetCTLFontEnabled( sal_Bool _bEnabled ); - sal_Bool IsCTLFontEnabled() const { return m_bCTLFontEnabled; } + bool IsLoaded() { return m_bIsLoaded; } + void SetCTLFontEnabled( bool _bEnabled ); + bool IsCTLFontEnabled() const { return m_bCTLFontEnabled; } - void SetCTLSequenceChecking( sal_Bool _bEnabled ); - sal_Bool IsCTLSequenceChecking() const { return m_bCTLSequenceChecking;} + void SetCTLSequenceChecking( bool _bEnabled ); + bool IsCTLSequenceChecking() const { return m_bCTLSequenceChecking;} - void SetCTLSequenceCheckingRestricted( sal_Bool _bEnable ); - sal_Bool IsCTLSequenceCheckingRestricted( void ) const { return m_bCTLRestricted; } + void SetCTLSequenceCheckingRestricted( bool _bEnable ); + bool IsCTLSequenceCheckingRestricted( void ) const { return m_bCTLRestricted; } - void SetCTLSequenceCheckingTypeAndReplace( sal_Bool _bEnable ); - sal_Bool IsCTLSequenceCheckingTypeAndReplace() const { return m_bCTLTypeAndReplace; } + void SetCTLSequenceCheckingTypeAndReplace( bool _bEnable ); + bool IsCTLSequenceCheckingTypeAndReplace() const { return m_bCTLTypeAndReplace; } void SetCTLCursorMovement( SvtCTLOptions::CursorMovement _eMovement ); SvtCTLOptions::CursorMovement @@ -86,7 +86,7 @@ public: SvtCTLOptions::TextNumerals GetCTLTextNumerals() const { return m_eCTLTextNumerals; } - sal_Bool IsReadOnly(SvtCTLOptions::EOption eOption) const; + bool IsReadOnly(SvtCTLOptions::EOption eOption) const; }; //------------------------------------------------------------------------------ namespace @@ -95,9 +95,9 @@ namespace : public rtl::Static< Sequence< rtl::OUString >, PropertyNames > {}; } //------------------------------------------------------------------------------ -sal_Bool SvtCTLOptions_Impl::IsReadOnly(SvtCTLOptions::EOption eOption) const +bool SvtCTLOptions_Impl::IsReadOnly(SvtCTLOptions::EOption eOption) const { - sal_Bool bReadOnly = CFG_READONLY_DEFAULT; + bool bReadOnly = CFG_READONLY_DEFAULT; switch(eOption) { case SvtCTLOptions::E_CTLFONT : bReadOnly = m_bROCTLFontEnabled ; break; @@ -303,7 +303,7 @@ void SvtCTLOptions_Impl::Load() m_bIsLoaded = sal_True; } //------------------------------------------------------------------------------ -void SvtCTLOptions_Impl::SetCTLFontEnabled( sal_Bool _bEnabled ) +void SvtCTLOptions_Impl::SetCTLFontEnabled( bool _bEnabled ) { if(!m_bROCTLFontEnabled && m_bCTLFontEnabled != _bEnabled) { @@ -313,7 +313,7 @@ void SvtCTLOptions_Impl::SetCTLFontEnabled( sal_Bool _bEnabled ) } } //------------------------------------------------------------------------------ -void SvtCTLOptions_Impl::SetCTLSequenceChecking( sal_Bool _bEnabled ) +void SvtCTLOptions_Impl::SetCTLSequenceChecking( bool _bEnabled ) { if(!m_bROCTLSequenceChecking && m_bCTLSequenceChecking != _bEnabled) { @@ -323,7 +323,7 @@ void SvtCTLOptions_Impl::SetCTLSequenceChecking( sal_Bool _bEnabled ) } } //------------------------------------------------------------------------------ -void SvtCTLOptions_Impl::SetCTLSequenceCheckingRestricted( sal_Bool _bEnabled ) +void SvtCTLOptions_Impl::SetCTLSequenceCheckingRestricted( bool _bEnabled ) { if(!m_bROCTLRestricted && m_bCTLRestricted != _bEnabled) { @@ -333,7 +333,7 @@ void SvtCTLOptions_Impl::SetCTLSequenceCheckingRestricted( sal_Bool _bEnabled ) } } //------------------------------------------------------------------------------ -void SvtCTLOptions_Impl::SetCTLSequenceCheckingTypeAndReplace( sal_Bool _bEnabled ) +void SvtCTLOptions_Impl::SetCTLSequenceCheckingTypeAndReplace( bool _bEnabled ) { if(!m_bROCTLTypeAndReplace && m_bCTLTypeAndReplace != _bEnabled) { @@ -370,7 +370,7 @@ namespace { struct CTLMutex : public rtl::Static< osl::Mutex, CTLMutex > {}; } // class SvtCTLOptions -------------------------------------------------- -SvtCTLOptions::SvtCTLOptions( sal_Bool bDontLoad ) +SvtCTLOptions::SvtCTLOptions( bool bDontLoad ) { // Global access, must be guarded (multithreading) ::osl::MutexGuard aGuard( CTLMutex::get() ); @@ -399,49 +399,49 @@ SvtCTLOptions::~SvtCTLOptions() DELETEZ( pCTLOptions ); } // ----------------------------------------------------------------------------- -void SvtCTLOptions::SetCTLFontEnabled( sal_Bool _bEnabled ) +void SvtCTLOptions::SetCTLFontEnabled( bool _bEnabled ) { DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" ); pCTLOptions->SetCTLFontEnabled( _bEnabled ); } // ----------------------------------------------------------------------------- -sal_Bool SvtCTLOptions::IsCTLFontEnabled() const +bool SvtCTLOptions::IsCTLFontEnabled() const { DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" ); return pCTLOptions->IsCTLFontEnabled(); } // ----------------------------------------------------------------------------- -void SvtCTLOptions::SetCTLSequenceChecking( sal_Bool _bEnabled ) +void SvtCTLOptions::SetCTLSequenceChecking( bool _bEnabled ) { DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" ); pCTLOptions->SetCTLSequenceChecking(_bEnabled); } // ----------------------------------------------------------------------------- -sal_Bool SvtCTLOptions::IsCTLSequenceChecking() const +bool SvtCTLOptions::IsCTLSequenceChecking() const { DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" ); return pCTLOptions->IsCTLSequenceChecking(); } // ----------------------------------------------------------------------------- -void SvtCTLOptions::SetCTLSequenceCheckingRestricted( sal_Bool _bEnable ) +void SvtCTLOptions::SetCTLSequenceCheckingRestricted( bool _bEnable ) { DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" ); pCTLOptions->SetCTLSequenceCheckingRestricted(_bEnable); } // ----------------------------------------------------------------------------- -sal_Bool SvtCTLOptions::IsCTLSequenceCheckingRestricted( void ) const +bool SvtCTLOptions::IsCTLSequenceCheckingRestricted( void ) const { DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" ); return pCTLOptions->IsCTLSequenceCheckingRestricted(); } // ----------------------------------------------------------------------------- -void SvtCTLOptions::SetCTLSequenceCheckingTypeAndReplace( sal_Bool _bEnable ) +void SvtCTLOptions::SetCTLSequenceCheckingTypeAndReplace( bool _bEnable ) { DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" ); pCTLOptions->SetCTLSequenceCheckingTypeAndReplace(_bEnable); } // ----------------------------------------------------------------------------- -sal_Bool SvtCTLOptions::IsCTLSequenceCheckingTypeAndReplace() const +bool SvtCTLOptions::IsCTLSequenceCheckingTypeAndReplace() const { DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" ); return pCTLOptions->IsCTLSequenceCheckingTypeAndReplace(); @@ -471,7 +471,7 @@ SvtCTLOptions::TextNumerals SvtCTLOptions::GetCTLTextNumerals() const return pCTLOptions->GetCTLTextNumerals(); } // ----------------------------------------------------------------------------- -sal_Bool SvtCTLOptions::IsReadOnly(EOption eOption) const +bool SvtCTLOptions::IsReadOnly(EOption eOption) const { DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" ); return pCTLOptions->IsReadOnly(eOption); From d5abaeb1614c65947c7c9674a319511b0450c357 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 27 Sep 2012 11:20:55 +0200 Subject: [PATCH 181/863] sal_Bool->bool in svl::OFSInputStreamContainer and OFSStreamContainer Also make OFSInputStreamContainer's member variables private, there is no reason for them to be protected Change-Id: Ic5717b5a3740e27adfc0ee55e7677a8727b8cbae --- svl/source/fsstor/oinputstreamcontainer.cxx | 6 +++--- svl/source/fsstor/oinputstreamcontainer.hxx | 5 ++--- svl/source/fsstor/ostreamcontainer.cxx | 16 ++++++++-------- svl/source/fsstor/ostreamcontainer.hxx | 6 +++--- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/svl/source/fsstor/oinputstreamcontainer.cxx b/svl/source/fsstor/oinputstreamcontainer.cxx index e8a53c772b17..d43b02101c10 100644 --- a/svl/source/fsstor/oinputstreamcontainer.cxx +++ b/svl/source/fsstor/oinputstreamcontainer.cxx @@ -27,8 +27,8 @@ using namespace ::com::sun::star; OFSInputStreamContainer::OFSInputStreamContainer( const uno::Reference< io::XInputStream >& xStream ) : m_xInputStream( xStream ) , m_xSeekable( xStream, uno::UNO_QUERY ) -, m_bSeekable( sal_False ) -, m_bDisposed( sal_False ) +, m_bSeekable( false ) +, m_bDisposed( false ) , m_pListenersContainer( NULL ) { m_bSeekable = m_xSeekable.is(); @@ -302,7 +302,7 @@ void SAL_CALL OFSInputStreamContainer::dispose( ) m_pListenersContainer->disposeAndClear( aSource ); } - m_bDisposed = sal_True; + m_bDisposed = true; } //----------------------------------------------- diff --git a/svl/source/fsstor/oinputstreamcontainer.hxx b/svl/source/fsstor/oinputstreamcontainer.hxx index f3f8fe1a8233..6bc2e4a843fb 100644 --- a/svl/source/fsstor/oinputstreamcontainer.hxx +++ b/svl/source/fsstor/oinputstreamcontainer.hxx @@ -34,15 +34,14 @@ class OFSInputStreamContainer : public cppu::WeakImplHelper2 < ::com::sun::star: ,::com::sun::star::embed::XExtendedStorageStream > , public ::com::sun::star::io::XSeekable { -protected: ::osl::Mutex m_aMutex; ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > m_xInputStream; ::com::sun::star::uno::Reference < ::com::sun::star::io::XSeekable > m_xSeekable; - sal_Bool m_bSeekable; + bool m_bSeekable; - sal_Bool m_bDisposed; + bool m_bDisposed; ::cppu::OInterfaceContainerHelper* m_pListenersContainer; // list of listeners diff --git a/svl/source/fsstor/ostreamcontainer.cxx b/svl/source/fsstor/ostreamcontainer.cxx index f439d8966498..081eb5986557 100644 --- a/svl/source/fsstor/ostreamcontainer.cxx +++ b/svl/source/fsstor/ostreamcontainer.cxx @@ -25,9 +25,9 @@ using namespace ::com::sun::star; //----------------------------------------------- OFSStreamContainer::OFSStreamContainer( const uno::Reference < io::XStream >& xStream ) -: m_bDisposed( sal_False ) -, m_bInputClosed( sal_False ) -, m_bOutputClosed( sal_False ) +: m_bDisposed( false ) +, m_bInputClosed( false ) +, m_bOutputClosed( false ) , m_pListenersContainer( NULL ) , m_pTypeCollection( NULL ) { @@ -261,13 +261,13 @@ void SAL_CALL OFSStreamContainer::dispose() if ( m_xInputStream.is() && !m_bInputClosed ) { m_xInputStream->closeInput(); - m_bInputClosed = sal_True; + m_bInputClosed = true; } if ( m_xOutputStream.is() && !m_bOutputClosed ) { m_xOutputStream->closeOutput(); - m_bOutputClosed = sal_True; + m_bOutputClosed = true; } if ( m_pListenersContainer ) @@ -276,7 +276,7 @@ void SAL_CALL OFSStreamContainer::dispose() m_pListenersContainer->disposeAndClear( aSource ); } - m_bDisposed = sal_True; + m_bDisposed = true; } //----------------------------------------------- @@ -448,7 +448,7 @@ void SAL_CALL OFSStreamContainer::closeInput() if ( m_xInputStream.is() ) { m_xInputStream->closeInput(); - m_bInputClosed = sal_True; + m_bInputClosed = true; } if ( m_bOutputClosed ) @@ -510,7 +510,7 @@ void SAL_CALL OFSStreamContainer::closeOutput() if ( m_xOutputStream.is() ) { m_xOutputStream->closeOutput(); - m_bOutputClosed = sal_True; + m_bOutputClosed = true; } if ( m_bInputClosed ) diff --git a/svl/source/fsstor/ostreamcontainer.hxx b/svl/source/fsstor/ostreamcontainer.hxx index a8770940c364..fef3edc41d6d 100644 --- a/svl/source/fsstor/ostreamcontainer.hxx +++ b/svl/source/fsstor/ostreamcontainer.hxx @@ -52,9 +52,9 @@ class OFSStreamContainer : public cppu::OWeakObject, ::com::sun::star::uno::Reference< ::com::sun::star::io::XTruncate > m_xTruncate; ::com::sun::star::uno::Reference< ::com::sun::star::io::XAsyncOutputMonitor > m_xAsyncOutputMonitor; - sal_Bool m_bDisposed; - sal_Bool m_bInputClosed; - sal_Bool m_bOutputClosed; + bool m_bDisposed; + bool m_bInputClosed; + bool m_bOutputClosed; ::cppu::OInterfaceContainerHelper* m_pListenersContainer; // list of listeners ::cppu::OTypeCollection* m_pTypeCollection; From b8df7f62c4afb62715bfde248541938d002102c2 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 27 Sep 2012 11:38:04 +0200 Subject: [PATCH 182/863] sal_Bool->bool in svl::PasswordContainer Change-Id: I2be813554e773fade260a78eb677022b4c6991b0 --- svl/source/inc/passwordcontainer.hxx | 58 +++++++++---------- .../passwordcontainer/passwordcontainer.cxx | 24 ++++---- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/svl/source/inc/passwordcontainer.hxx b/svl/source/inc/passwordcontainer.hxx index 6b69b3ce2c3b..5dfd5c6685ab 100644 --- a/svl/source/inc/passwordcontainer.hxx +++ b/svl/source/inc/passwordcontainer.hxx @@ -49,18 +49,18 @@ class NamePassRecord { - ::rtl::OUString m_aName; + ::rtl::OUString m_aName; // there are two lists of passwords, memory passwords and persistent passwords - sal_Bool m_bHasMemPass; + bool m_bHasMemPass; ::std::vector< ::rtl::OUString > m_aMemPass; // persistent passwords are encrypted in one string - sal_Bool m_bHasPersPass; + bool m_bHasPersPass; ::rtl::OUString m_aPersPass; - void InitArrays( sal_Bool bHasMemoryList, const ::std::vector< ::rtl::OUString >& aMemoryList, - sal_Bool bHasPersistentList, const ::rtl::OUString& aPersistentList ) + void InitArrays( bool bHasMemoryList, const ::std::vector< ::rtl::OUString >& aMemoryList, + bool bHasPersistentList, const ::rtl::OUString& aPersistentList ) { m_bHasMemPass = bHasMemoryList; if ( bHasMemoryList ) @@ -75,30 +75,30 @@ public: NamePassRecord( const ::rtl::OUString& aName ) : m_aName( aName ) - , m_bHasMemPass( sal_False ) - , m_bHasPersPass( sal_False ) + , m_bHasMemPass( false ) + , m_bHasPersPass( false ) { } NamePassRecord( const ::rtl::OUString& aName, const ::std::vector< ::rtl::OUString >& aMemoryList ) : m_aName( aName ) - , m_bHasMemPass( sal_True ) + , m_bHasMemPass( true ) , m_aMemPass( aMemoryList ) - , m_bHasPersPass( sal_False ) + , m_bHasPersPass( false ) { } NamePassRecord( const ::rtl::OUString& aName, const ::rtl::OUString& aPersistentList ) : m_aName( aName ) - , m_bHasMemPass( sal_False ) - , m_bHasPersPass( sal_True ) + , m_bHasMemPass( false ) + , m_bHasPersPass( true ) , m_aPersPass( aPersistentList ) { } NamePassRecord( const ::rtl::OUString& aName, - sal_Bool bHasMemoryList, const ::std::vector< ::rtl::OUString >& aMemoryList, - sal_Bool bHasPersistentList, const ::rtl::OUString aPersistentList ) + bool bHasMemoryList, const ::std::vector< ::rtl::OUString >& aMemoryList, + bool bHasPersistentList, const ::rtl::OUString aPersistentList ) : m_aName( aName ) , m_bHasMemPass( bHasMemoryList ) , m_bHasPersPass( bHasPersistentList ) @@ -108,8 +108,8 @@ public: NamePassRecord( const NamePassRecord& aRecord ) : m_aName( aRecord.m_aName ) - , m_bHasMemPass( sal_False ) - , m_bHasPersPass( sal_False ) + , m_bHasMemPass( false ) + , m_bHasPersPass( false ) { InitArrays( aRecord.m_bHasMemPass, aRecord.m_aMemPass, aRecord.m_bHasPersPass, aRecord.m_aPersPass ); } @@ -130,7 +130,7 @@ public: return m_aName; } - sal_Bool HasPasswords( sal_Int8 nStatus ) const + bool HasPasswords( sal_Int8 nStatus ) const { if ( nStatus == MEMORY_RECORD ) return m_bHasMemPass; @@ -159,25 +159,25 @@ public: void SetMemPasswords( const ::std::vector< ::rtl::OUString >& aMemList ) { m_aMemPass = aMemList; - m_bHasMemPass = sal_True; + m_bHasMemPass = true; } void SetPersPasswords( const ::rtl::OUString& aPersList ) { m_aPersPass = aPersList; - m_bHasPersPass = sal_True; + m_bHasPersPass = true; } void RemovePasswords( sal_Int8 nStatus ) { if ( nStatus == MEMORY_RECORD ) { - m_bHasMemPass = sal_False; + m_bHasMemPass = false; m_aMemPass.clear(); } else if ( nStatus == PERSISTENT_RECORD ) { - m_bHasPersPass = sal_False; + m_bHasPersPass = false; m_aPersPass = ::rtl::OUString(); } } @@ -194,14 +194,14 @@ typedef ::std::map< ::rtl::OUString, ::std::list< NamePassRecord > > PassMap; class PasswordContainer; class StorageItem : public ::utl::ConfigItem { - PasswordContainer* mainCont; - sal_Bool hasEncoded; + PasswordContainer* mainCont; + bool hasEncoded; ::rtl::OUString mEncoded; public: StorageItem( PasswordContainer* point, const ::rtl::OUString& path ) : ConfigItem( path, CONFIG_MODE_IMMEDIATE_UPDATE ), mainCont( point ), - hasEncoded( sal_False ) + hasEncoded( false ) { ::com::sun::star::uno::Sequence< ::rtl::OUString > aNode( 1 ); *aNode.getArray() = path; @@ -214,10 +214,10 @@ public: void remove( const ::rtl::OUString& url, const ::rtl::OUString& rec ); void clear(); - sal_Bool getEncodedMP( ::rtl::OUString& aResult ); - void setEncodedMP( const ::rtl::OUString& aResult, sal_Bool bAcceptEnmpty = sal_False ); - void setUseStorage( sal_Bool bUse ); - sal_Bool useStorage(); + bool getEncodedMP( ::rtl::OUString& aResult ); + void setEncodedMP( const ::rtl::OUString& aResult, bool bAcceptEnmpty = false ); + void setUseStorage( bool bUse ); + bool useStorage(); virtual void Notify( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ); virtual void Commit(); @@ -251,7 +251,7 @@ private: ::com::sun::star::task::UserRecord CopyToUserRecord( const NamePassRecord& aRecord, - sal_Bool& io_bTryToDecode, + bool& io_bTryToDecode, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& aHandler ); ::com::sun::star::uno::Sequence< ::com::sun::star::task::UserRecord > FindUsr( @@ -282,7 +282,7 @@ bool createUrlRecord( ::rtl::OUString GetMasterPassword( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw(::com::sun::star::uno::RuntimeException); - void UpdateVector( const ::rtl::OUString& url, ::std::list< NamePassRecord >& toUpdate, NamePassRecord& rec, sal_Bool writeFile ) + void UpdateVector( const ::rtl::OUString& url, ::std::list< NamePassRecord >& toUpdate, NamePassRecord& rec, bool writeFile ) throw(::com::sun::star::uno::RuntimeException); void PrivateAdd( const ::rtl::OUString& aUrl, diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx index 0a86600acebb..213856fc00e0 100644 --- a/svl/source/passwordcontainer/passwordcontainer.cxx +++ b/svl/source/passwordcontainer/passwordcontainer.cxx @@ -258,7 +258,7 @@ PassMap StorageItem::getInfo() //------------------------------------------------------------------------- -void StorageItem::setUseStorage( sal_Bool bUse ) +void StorageItem::setUseStorage( bool bUse ) { Sequence< ::rtl::OUString > sendNames(1); Sequence< uno::Any > sendVals(1); @@ -273,7 +273,7 @@ void StorageItem::setUseStorage( sal_Bool bUse ) //------------------------------------------------------------------------- -sal_Bool StorageItem::useStorage() +bool StorageItem::useStorage() { Sequence< ::rtl::OUString > aNodeNames( 1 ); aNodeNames[0] = ::rtl::OUString("UseStorage"); @@ -286,7 +286,7 @@ sal_Bool StorageItem::useStorage() return sal_False; } - sal_Bool aResult = false; + bool aResult = false; aPropertyValues[0] >>= aResult; return aResult; @@ -294,12 +294,12 @@ sal_Bool StorageItem::useStorage() //------------------------------------------------------------------------- -sal_Bool StorageItem::getEncodedMP( ::rtl::OUString& aResult ) +bool StorageItem::getEncodedMP( ::rtl::OUString& aResult ) { if( hasEncoded ) { aResult = mEncoded; - return sal_True; + return true; } Sequence< ::rtl::OUString > aNodeNames( 2 ); @@ -311,7 +311,7 @@ sal_Bool StorageItem::getEncodedMP( ::rtl::OUString& aResult ) if( aPropertyValues.getLength() != aNodeNames.getLength() ) { OSL_ENSURE( aPropertyValues.getLength() == aNodeNames.getLength(), "Problems during reading\n" ); - return sal_False; + return false; } aPropertyValues[0] >>= hasEncoded; @@ -324,7 +324,7 @@ sal_Bool StorageItem::getEncodedMP( ::rtl::OUString& aResult ) //------------------------------------------------------------------------- -void StorageItem::setEncodedMP( const ::rtl::OUString& aEncoded, sal_Bool bAcceptEmpty ) +void StorageItem::setEncodedMP( const ::rtl::OUString& aEncoded, bool bAcceptEmpty ) { Sequence< ::rtl::OUString > sendNames(2); Sequence< uno::Any > sendVals(2); @@ -598,7 +598,7 @@ vector< ::rtl::OUString > PasswordContainer::DecodePasswords( const ::rtl::OUStr //------------------------------------------------------------------------- -void PasswordContainer::UpdateVector( const ::rtl::OUString& aURL, list< NamePassRecord >& toUpdate, NamePassRecord& aRecord, sal_Bool writeFile ) throw(RuntimeException) +void PasswordContainer::UpdateVector( const ::rtl::OUString& aURL, list< NamePassRecord >& toUpdate, NamePassRecord& aRecord, bool writeFile ) throw(RuntimeException) { for( list< NamePassRecord >::iterator aNPIter = toUpdate.begin(); aNPIter != toUpdate.end(); ++aNPIter ) if( aNPIter->GetUserName().equals( aRecord.GetUserName() ) ) @@ -632,7 +632,7 @@ void PasswordContainer::UpdateVector( const ::rtl::OUString& aURL, list< NamePas //------------------------------------------------------------------------- -UserRecord PasswordContainer::CopyToUserRecord( const NamePassRecord& aRecord, sal_Bool& io_bTryToDecode, const Reference< XInteractionHandler >& aHandler ) +UserRecord PasswordContainer::CopyToUserRecord( const NamePassRecord& aRecord, bool& io_bTryToDecode, const Reference< XInteractionHandler >& aHandler ) { ::std::vector< ::rtl::OUString > aPasswords; if( aRecord.HasPasswords( MEMORY_RECORD ) ) @@ -648,7 +648,7 @@ UserRecord PasswordContainer::CopyToUserRecord( const NamePassRecord& aRecord, s catch( NoMasterException& ) { // if master password could not be detected the entry will be just ignored - io_bTryToDecode = sal_False; + io_bTryToDecode = false; } } @@ -661,7 +661,7 @@ Sequence< UserRecord > PasswordContainer::CopyToUserRecordSequence( const list< { Sequence< UserRecord > aResult( original.size() ); sal_uInt32 nInd = 0; - sal_Bool bTryToDecode = sal_True; + bool bTryToDecode = true; for( list< NamePassRecord >::const_iterator aNPIter = original.begin(); aNPIter != original.end(); @@ -754,7 +754,7 @@ Sequence< UserRecord > PasswordContainer::FindUsr( const list< NamePassRecord >& if( aNPIter->GetUserName().equals( aName ) ) { Sequence< UserRecord > aResult(1); - sal_Bool bTryToDecode = sal_True; + bool bTryToDecode = true; aResult[0] = CopyToUserRecord( *aNPIter, bTryToDecode, aHandler ); return aResult; From afaaf2528d11ba570ecfd466f5f06bdffc4f6fcb Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 27 Sep 2012 11:40:09 +0200 Subject: [PATCH 183/863] sal_Bool->bool in svl::SfxImageItem Change-Id: I1a6d53352c65cd0999392531d8e406154bc4bf7a --- svl/inc/svl/imageitm.hxx | 4 ++-- svl/source/items/imageitm.cxx | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/svl/inc/svl/imageitm.hxx b/svl/inc/svl/imageitm.hxx index fce6f4268e78..0a2e26f80086 100644 --- a/svl/inc/svl/imageitm.hxx +++ b/svl/inc/svl/imageitm.hxx @@ -42,8 +42,8 @@ public: void SetRotation( long nValue ); long GetRotation() const; - void SetMirrored( sal_Bool bSet ); - sal_Bool IsMirrored() const; + void SetMirrored( bool bSet ); + bool IsMirrored() const; }; #endif // _SFX_IMAGEITM_HXX diff --git a/svl/source/items/imageitm.cxx b/svl/source/items/imageitm.cxx index 7d13eb48abb9..7db9160139c0 100644 --- a/svl/source/items/imageitm.cxx +++ b/svl/source/items/imageitm.cxx @@ -27,7 +27,7 @@ struct SfxImageItem_Impl { String aURL; long nAngle; - sal_Bool bMirrored; + bool bMirrored; int operator == ( const SfxImageItem_Impl& rOther ) const { return nAngle == rOther.nAngle && bMirrored == rOther.bMirrored; } }; @@ -39,7 +39,7 @@ SfxImageItem::SfxImageItem( sal_uInt16 which, sal_uInt16 nImage ) { pImp = new SfxImageItem_Impl; pImp->nAngle = 0; - pImp->bMirrored = sal_False; + pImp->bMirrored = false; } SfxImageItem::SfxImageItem( const SfxImageItem& rItem ) @@ -109,12 +109,12 @@ long SfxImageItem::GetRotation() const return pImp->nAngle; } -void SfxImageItem::SetMirrored( sal_Bool bSet ) +void SfxImageItem::SetMirrored( bool bSet ) { pImp->bMirrored = bSet; } -sal_Bool SfxImageItem::IsMirrored() const +bool SfxImageItem::IsMirrored() const { return pImp->bMirrored; } From 307ecf719f6a8a9c4a81b53e33de0bd00ba5eada Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 27 Sep 2012 13:47:25 +0200 Subject: [PATCH 184/863] UniString->OUString in chart2 Change-Id: I8fb6593ebabb38d0656a35fd95d663547e6a9e29 --- chart2/source/controller/dialogs/res_DataLabel.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx index 227b300d8887..9113d90250f1 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.cxx +++ b/chart2/source/controller/dialogs/res_DataLabel.cxx @@ -128,9 +128,9 @@ DataLabelResources::DataLabelResources( Window* pWindow, const SfxItemSet& rInAt m_pPool(rInAttrs.GetPool()) { //fill label placement list - std::map< sal_Int32, XubString > aPlacementToStringMap; + std::map< sal_Int32, OUString > aPlacementToStringMap; for( sal_Int32 nEnum=0; nEnum(nEnum)); + aPlacementToStringMap[nEnum] = m_aLB_LabelPlacement.GetEntry(static_cast(nEnum)); ::com::sun::star::uno::Sequence < sal_Int32 > aAvailabelPlacementList; const SfxPoolItem *pPoolItem = NULL; From eef39fdc031ca83940d8cd48fb04a7e44355495a Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 27 Sep 2012 13:49:39 +0200 Subject: [PATCH 185/863] XubString->OUString in drawinglayer Also fix method name Change-Id: I2ebe3fe5231fbf5e8253537f2f9809e780f180cb --- .../source/primitive2d/metafileprimitive2d.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx index 40f653b627c2..5f2239780142 100644 --- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx @@ -1291,9 +1291,9 @@ namespace /** helper which takes complete care for creating the needed text primitives. It takes care of decorated stuff and all the geometry adaptions needed */ - void proccessMetaTextAction( + void processMetaTextAction( const Point& rTextStartPosition, - const XubString& rText, + const OUString& rText, sal_uInt16 nTextStart, sal_uInt16 nTextLength, const ::std::vector< double >& rDXArray, @@ -1994,7 +1994,7 @@ namespace if(nTextLength && rPropertyHolders.Current().getTextColorActive()) { const std::vector< double > aDXArray; - proccessMetaTextAction( + processMetaTextAction( pA->GetPoint(), pA->GetText(), nTextIndex, @@ -2035,7 +2035,7 @@ namespace } } - proccessMetaTextAction( + processMetaTextAction( pA->GetPoint(), pA->GetText(), nTextIndex, @@ -2098,7 +2098,7 @@ namespace } } - proccessMetaTextAction( + processMetaTextAction( pA->GetPoint(), pA->GetText(), nTextIndex, From aa720dcd3ab5ed87a58540e92f754d2426614978 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 1 Oct 2012 11:42:00 +0200 Subject: [PATCH 186/863] String->OUString in sComment field in svl::SvNumberFormat Change-Id: I5a774563c791c7cd4170680a65711cc339f60c5b --- svl/inc/svl/zformat.hxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/svl/inc/svl/zformat.hxx b/svl/inc/svl/zformat.hxx index f94e62d25dd7..0418fcad97b1 100644 --- a/svl/inc/svl/zformat.hxx +++ b/svl/inc/svl/zformat.hxx @@ -378,9 +378,9 @@ public: sal_Unicode cQuote = '"', sal_Unicode cEscIn = '\0', sal_Unicode cEscOut = '\\' ); - void SetComment( const String& rStr ) + void SetComment( const OUString& rStr ) { sComment = rStr; } - const String& GetComment() const { return sComment; } + const OUString& GetComment() const { return sComment; } /** Insert the number of blanks into the string that is needed to simulate the width of character c for underscore formats */ @@ -459,7 +459,7 @@ public: private: ImpSvNumFor NumFor[4]; // Array for the 4 subformats OUString sFormatstring; // The format code string - String sComment; // Comment, since number formatter version 6 + OUString sComment; // Comment, since number formatter version 6 double fLimit1; // Value for first condition double fLimit2; // Value for second condition ImpSvNumberformatScan& rScan; // Format code scanner From 5d8c2eddead8c9144e337d64a559e1621d36da43 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 1 Oct 2012 12:54:52 +0200 Subject: [PATCH 187/863] String->OUString in svl::ImpSvNumberformatInfo Change-Id: Iff00b06a1e4e7c485e70ef0537fdea07ce3d42e5 --- svl/inc/svl/zformat.hxx | 4 +- svl/source/numbers/zforfind.cxx | 2 +- svl/source/numbers/zformat.cxx | 66 ++++++++++++++++---------------- xmloff/source/style/xmlnumfe.cxx | 28 +++++++------- 4 files changed, 50 insertions(+), 50 deletions(-) diff --git a/svl/inc/svl/zformat.hxx b/svl/inc/svl/zformat.hxx index 0418fcad97b1..1a352825e617 100644 --- a/svl/inc/svl/zformat.hxx +++ b/svl/inc/svl/zformat.hxx @@ -65,7 +65,7 @@ enum NfHackConversion struct ImpSvNumberformatInfo // Struct for FormatInfo { - String* sStrArray; // Array of symbols + OUString* sStrArray; // Array of symbols short* nTypeArray; // Array of infos sal_uInt16 nThousand; // Count of group separator sequences sal_uInt16 nCntPre; // Count of digits before decimal point @@ -281,7 +281,7 @@ public: // Substring of a subformat code nNumFor (0..3) // nPos == 0xFFFF => last substring // bString==true: first/last SYMBOLTYPE_STRING or SYMBOLTYPE_CURRENCY - const String* GetNumForString( sal_uInt16 nNumFor, sal_uInt16 nPos, + const OUString* GetNumForString( sal_uInt16 nNumFor, sal_uInt16 nPos, bool bString = false ) const; // Subtype of a subformat code nNumFor (0..3) diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx index fb5bbe3ad821..69d676181f46 100644 --- a/svl/source/numbers/zforfind.cxx +++ b/svl/source/numbers/zforfind.cxx @@ -2466,7 +2466,7 @@ bool ImpSvNumberInputScan::ScanStringNumFor( if ( !pFormat ) return false; const ::utl::TransliterationWrapper* pTransliteration = pFormatter->GetTransliteration(); - const String* pStr; + const OUString* pStr; rtl::OUString aString( rString ); bool bFound = false; bool bFirst = true; diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 5cf224ba451e..5c4c31c7fcf3 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -353,7 +353,7 @@ void ImpSvNumFor::Enlarge(sal_uInt16 nAnz) if ( nAnz ) { aI.nTypeArray = new short[nAnz]; - aI.sStrArray = new String[nAnz]; + aI.sStrArray = new OUString[nAnz]; } else { @@ -2051,13 +2051,13 @@ bool SvNumberformat::GetOutputString(String& sString, if( bStarFlag ) { OutString += (sal_Unicode) 0x1B; - OutString += rInfo.sStrArray[i].GetChar(1); + OutString += rInfo.sStrArray[i][1]; bRes = true; } break; case NF_SYMBOLTYPE_BLANK: InsertBlanks( OutString, OutString.Len(), - rInfo.sStrArray[i].GetChar(1) ); + rInfo.sStrArray[i][1] ); break; case NF_KEY_GENERAL : // #77026# "General" is the same as "@" case NF_SYMBOLTYPE_DEL : @@ -2319,13 +2319,13 @@ bool SvNumberformat::GetOutputString(double fNumber, if( bStarFlag ) { OutString += (sal_Unicode) 0x1B; - OutString += rInfo.sStrArray[i].GetChar(1); + OutString += rInfo.sStrArray[i][1]; bRes = true; } break; case NF_SYMBOLTYPE_BLANK: InsertBlanks( OutString, OutString.Len(), - rInfo.sStrArray[i].GetChar(1) ); + rInfo.sStrArray[i][1] ); break; case NF_SYMBOLTYPE_STRING: case NF_SYMBOLTYPE_CURRENCY: @@ -2586,7 +2586,7 @@ bool SvNumberformat::GetOutputString(double fNumber, if (rInfo.nCntPre > 0 && nFrac == 0) sDiv.Insert(' ',0); else - sDiv.Insert( rInfo.sStrArray[j].GetChar(0), 0 ); + sDiv.Insert( rInfo.sStrArray[j][0], 0 ); if ( j ) j--; else @@ -2845,13 +2845,13 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber, if( bStarFlag ) { OutString += (sal_Unicode) 0x1B; - OutString += rInfo.sStrArray[i].GetChar(1); + OutString += rInfo.sStrArray[i][1]; bRes = true; } break; case NF_SYMBOLTYPE_BLANK: InsertBlanks( OutString, OutString.Len(), - rInfo.sStrArray[i].GetChar(1) ); + rInfo.sStrArray[i][1] ); break; case NF_SYMBOLTYPE_STRING: case NF_SYMBOLTYPE_CURRENCY: @@ -2865,7 +2865,7 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber, xub_StrLen nLen = ( bInputLine && i > 0 && (rInfo.nTypeArray[i-1] == NF_SYMBOLTYPE_STRING || rInfo.nTypeArray[i-1] == NF_SYMBOLTYPE_TIME100SECSEP) ? - nCntPost : rInfo.sStrArray[i].Len() ); + nCntPost : rInfo.sStrArray[i].getLength() ); for (xub_StrLen j = 0; j < nLen && nSecPos < nCntPost; j++) { OutString += sSecStr.GetChar(nSecPos); @@ -2966,11 +2966,11 @@ sal_Int32 SvNumberformat::ImpUseMonthCase( int & io_nState, const ImpSvNumFor& r xub_StrLen nLen; if ((i < nCount-1 && rInfo.nTypeArray[i+1] == NF_SYMBOLTYPE_STRING && - rInfo.sStrArray[i+1].GetChar(0) != ' ') || + rInfo.sStrArray[i+1][0] != ' ') || (i > 0 && rInfo.nTypeArray[i-1] == NF_SYMBOLTYPE_STRING && - ((nLen = rInfo.sStrArray[i-1].Len()) > 0) && - rInfo.sStrArray[i-1].GetChar(nLen-1) != ' ')) + ((nLen = rInfo.sStrArray[i-1].getLength()) > 0) && + rInfo.sStrArray[i-1][nLen-1] != ' ')) io_nState = 1; else if (bDaySeen) io_nState = 3; @@ -3285,13 +3285,13 @@ bool SvNumberformat::ImpGetDateOutput(double fNumber, if( bStarFlag ) { OutString += (sal_Unicode) 0x1B; - OutString += rInfo.sStrArray[i].GetChar(1); + OutString += rInfo.sStrArray[i][1]; bRes = true; } break; case NF_SYMBOLTYPE_BLANK: InsertBlanks( OutString, OutString.Len(), - rInfo.sStrArray[i].GetChar(1) ); + rInfo.sStrArray[i][1] ); break; case NF_SYMBOLTYPE_STRING: case NF_SYMBOLTYPE_CURRENCY: @@ -3572,13 +3572,13 @@ bool SvNumberformat::ImpGetDateTimeOutput(double fNumber, if( bStarFlag ) { OutString += (sal_Unicode) 0x1B; - OutString += rInfo.sStrArray[i].GetChar(1); + OutString += rInfo.sStrArray[i][1]; bRes = true; } break; case NF_SYMBOLTYPE_BLANK: InsertBlanks( OutString, OutString.Len(), - rInfo.sStrArray[i].GetChar(1) ); + rInfo.sStrArray[i][1] ); break; case NF_SYMBOLTYPE_STRING: case NF_SYMBOLTYPE_CURRENCY: @@ -3592,7 +3592,7 @@ bool SvNumberformat::ImpGetDateTimeOutput(double fNumber, xub_StrLen nLen = ( bInputLine && i > 0 && (rInfo.nTypeArray[i-1] == NF_SYMBOLTYPE_STRING || rInfo.nTypeArray[i-1] == NF_SYMBOLTYPE_TIME100SECSEP) ? - nCntPost : rInfo.sStrArray[i].Len() ); + nCntPost : rInfo.sStrArray[i].getLength() ); for (xub_StrLen j = 0; j < nLen && nSecPos < nCntPost; j++) { OutString += sSecStr.GetChar(nSecPos); @@ -3885,13 +3885,13 @@ bool SvNumberformat::ImpGetNumberOutput(double fNumber, case NF_SYMBOLTYPE_STAR: if( bStarFlag ) { - sStr.Insert(rInfo.sStrArray[j].GetChar(1),k); + sStr.Insert(rInfo.sStrArray[j][1], k); sStr.Insert( (sal_Unicode) 0x1B, k ); bRes = true; } break; case NF_SYMBOLTYPE_BLANK: - /*k = */ InsertBlanks( sStr,k,rInfo.sStrArray[j].GetChar(1) ); + /*k = */ InsertBlanks( sStr,k,rInfo.sStrArray[j][1] ); break; case NF_SYMBOLTYPE_STRING: case NF_SYMBOLTYPE_CURRENCY: @@ -4000,18 +4000,18 @@ bool SvNumberformat::ImpNumberFillWithThousands( sStr.Insert(rInfo.sStrArray[j],k); if ( k == 0 ) nLeadingStringChars = - nLeadingStringChars + rInfo.sStrArray[j].Len(); + nLeadingStringChars + rInfo.sStrArray[j].getLength(); break; case NF_SYMBOLTYPE_STAR: if( bStarFlag ) { - sStr.Insert(rInfo.sStrArray[j].GetChar(1),k); + sStr.Insert(rInfo.sStrArray[j][1], k); sStr.Insert( (sal_Unicode) 0x1B, k ); bRes = true; } break; case NF_SYMBOLTYPE_BLANK: - /*k = */ InsertBlanks( sStr,k,rInfo.sStrArray[j].GetChar(1) ); + /*k = */ InsertBlanks( sStr,k,rInfo.sStrArray[j][1] ); break; case NF_SYMBOLTYPE_THSEP: { @@ -4169,13 +4169,13 @@ bool SvNumberformat::ImpNumberFill( String& sStr, // number string case NF_SYMBOLTYPE_STAR: if( bStarFlag ) { - sStr.Insert(rInfo.sStrArray[j].GetChar(1),k); + sStr.Insert(rInfo.sStrArray[j][1], k); sStr.Insert( sal_Unicode(0x1B), k ); bRes = true; } break; case NF_SYMBOLTYPE_BLANK: - k = InsertBlanks( sStr,k,rInfo.sStrArray[j].GetChar(1) ); + k = InsertBlanks( sStr,k,rInfo.sStrArray[j][1] ); break; case NF_SYMBOLTYPE_THSEP: { @@ -4287,7 +4287,7 @@ void SvNumberformat::GetNumForInfo( sal_uInt16 nNumFor, short& rScannedType, short nType = rInfo.nTypeArray[i]; if ( nType == NF_SYMBOLTYPE_DIGIT) { - register const sal_Unicode* p = rInfo.sStrArray[i].GetBuffer(); + const sal_Unicode* p = rInfo.sStrArray[i].getStr(); while ( *p == '#' ) p++; while ( *p++ == '0' ) @@ -4300,7 +4300,7 @@ void SvNumberformat::GetNumForInfo( sal_uInt16 nNumFor, short& rScannedType, } } -const String* SvNumberformat::GetNumForString( sal_uInt16 nNumFor, sal_uInt16 nPos, +const OUString* SvNumberformat::GetNumForString( sal_uInt16 nNumFor, sal_uInt16 nPos, bool bString /* = false */ ) const { if ( nNumFor > 3 ) @@ -4387,7 +4387,7 @@ bool SvNumberformat::IsNegativeWithoutSign() const { if ( IsNegativeRealNegative() ) { - const String* pStr = GetNumForString( 1, 0, true ); + const OUString* pStr = GetNumForString( 1, 0, true ); if ( pStr ) return !HasStringNegativeSign( *pStr ); } @@ -4400,7 +4400,7 @@ bool SvNumberformat::IsNegativeInBracket() const if (!nAnz) return false; - String *tmpStr = NumFor[1].Info().sStrArray; + OUString *tmpStr = NumFor[1].Info().sStrArray; using comphelper::string::equals; return (equals(tmpStr[0], '(') && equals(tmpStr[nAnz-1], ')')); } @@ -4408,8 +4408,8 @@ bool SvNumberformat::IsNegativeInBracket() const bool SvNumberformat::HasPositiveBracketPlaceholder() const { sal_uInt16 nAnz = NumFor[0].GetCount(); - String *tmpStr = NumFor[0].Info().sStrArray; - return (tmpStr[nAnz-1].EqualsAscii( "_)" )); + OUString *tmpStr = NumFor[0].Info().sStrArray; + return (tmpStr[nAnz-1].equalsAscii( "_)" )); } DateFormat SvNumberformat::GetDateOrder() const @@ -4639,7 +4639,7 @@ String SvNumberformat::GetMappedFormatstring( if ( nAnz ) { const short* pType = NumFor[n].Info().nTypeArray; - const String* pStr = NumFor[n].Info().sStrArray; + const OUString* pStr = NumFor[n].Info().sStrArray; for ( sal_uInt16 j=0; jLen(); - else if ( !bDecDashes && pElemStr && pElemStr->GetChar(0) == '-' ) + nExpDigits += pElemStr->getLength(); + else if ( !bDecDashes && pElemStr && (*pElemStr)[0] == '-' ) bDecDashes = sal_True; - else if ( !bVarDecimals && !bInInteger && pElemStr && pElemStr->GetChar(0) == '#' ) + else if ( !bVarDecimals && !bInInteger && pElemStr && (*pElemStr)[0] == '#' ) { // If the decimal digits string starts with a '#', variable // decimals is assumed (for 0.###, but not 0.0##). bVarDecimals = sal_True; } if ( bInInteger && pElemStr ) - nIntegerSymbols += pElemStr->Len(); + nIntegerSymbols += pElemStr->getLength(); nTrailingThousands = 0; break; case NF_SYMBOLTYPE_DECSEP: @@ -1196,7 +1196,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt break; case NF_SYMBOLTYPE_THSEP: if (pElemStr) - nTrailingThousands += pElemStr->Len(); // is reset to 0 if digits follow + nTrailingThousands += pElemStr->getLength(); // is reset to 0 if digits follow break; case NF_SYMBOLTYPE_EXP: bExpFound = sal_True; // following digits are exponent digits @@ -1236,7 +1236,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt while (!bEnd) { short nElemType = rFormat.GetNumForType( nPart, nPos, sal_False ); - const XubString* pElemStr = rFormat.GetNumForString( nPart, nPos, sal_False ); + const OUString* pElemStr = rFormat.GetNumForString( nPart, nPos, sal_False ); switch ( nElemType ) { @@ -1245,7 +1245,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt break; case NF_SYMBOLTYPE_DIGIT: if ( pElemStr ) - nDigitsPassed += pElemStr->Len(); + nDigitsPassed += pElemStr->getLength(); break; case NF_SYMBOLTYPE_STRING: case NF_SYMBOLTYPE_BLANK: @@ -1258,7 +1258,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt if ( nElemType == NF_SYMBOLTYPE_STRING || nElemType == NF_SYMBOLTYPE_PERCENT ) aEmbeddedStr = *pElemStr; else - SvNumberformat::InsertBlanks( aEmbeddedStr, 0, pElemStr->GetChar(1) ); + SvNumberformat::InsertBlanks( aEmbeddedStr, 0, (*pElemStr)[1] ); sal_Int32 nEmbedPos = nIntegerSymbols - nDigitsPassed; @@ -1281,7 +1281,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt while (!bEnd) { short nElemType = rFormat.GetNumForType( nPart, nPos, sal_False ); - const XubString* pElemStr = rFormat.GetNumForString( nPart, nPos, sal_False ); + const OUString* pElemStr = rFormat.GetNumForString( nPart, nPos, sal_False ); switch ( nElemType ) { @@ -1328,7 +1328,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt // (#i20396# the spaces may also be in embedded-text elements) String aBlanks; - SvNumberformat::InsertBlanks( aBlanks, 0, pElemStr->GetChar(1) ); + SvNumberformat::InsertBlanks( aBlanks, 0, (*pElemStr)[1] ); AddToTextElement_Impl( aBlanks ); } break; @@ -1415,7 +1415,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt case NUMBERFORMAT_FRACTION: { sal_Int32 nInteger = nLeading; - if ( pElemStr && pElemStr->GetChar(0) == '?' ) + if ( pElemStr && (*pElemStr)[0] == '?' ) { // If the first digit character is a question mark, // the fraction doesn't have an integer part, and no @@ -1575,8 +1575,8 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt // export only if ODF 1.2 extensions are enabled if( SvtSaveOptions().GetODFDefaultVersion() > SvtSaveOptions::ODFVER_012 ) { - if ( pElemStr && pElemStr->Len() > 1 ) - WriteRepeatedElement_Impl( pElemStr->GetChar( 1 ) ); + if ( pElemStr && pElemStr->getLength() > 1 ) + WriteRepeatedElement_Impl( (*pElemStr)[1] ); } break; } From b14073218ea28a5bf05cd639e30215787d67114c Mon Sep 17 00:00:00 2001 From: Ivan Timofeev Date: Sat, 29 Sep 2012 20:03:12 +0400 Subject: [PATCH 188/863] fdo#52268: splash: change color and position of messages Change-Id: If6c607fc9f0be1f7a71eda8d555399451938c5fc --- config_host.mk.in | 2 ++ configure.in | 22 ++++++++++++ desktop/source/splash/splash.cxx | 46 +++++++++++++++++++++++-- scp2/source/ooo/common_brand.scp | 18 ++++++++++ solenv/bin/modules/installer/ziplist.pm | 2 ++ 5 files changed, 88 insertions(+), 2 deletions(-) diff --git a/config_host.mk.in b/config_host.mk.in index d6f5f1659fb8..48b470e228f0 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -465,6 +465,8 @@ export PRODUCTNAME=@PRODUCTNAME@ export PRODUCTVERSION=@PRODUCTVERSION@ export PROGRESSBARCOLOR=@PROGRESSBARCOLOR@ export PROGRESSFRAMECOLOR=@PROGRESSFRAMECOLOR@ +export PROGRESSTEXTCOLOR=@PROGRESSTEXTCOLOR@ +export PROGRESSTEXTBASELINE=@PROGRESSTEXTBASELINE@ export PROGRESSPOSITION=@PROGRESSPOSITION@ export PROGRESSSIZE=@PROGRESSSIZE@ export PROEXT=@PROEXT@ diff --git a/configure.in b/configure.in index 93b828d1e8d1..34dfce7f02a6 100644 --- a/configure.in +++ b/configure.in @@ -12053,6 +12053,28 @@ else fi AC_SUBST(PROGRESSFRAMECOLOR) +AC_MSG_CHECKING([for custom 'intro' progress text color]) +PROGRESSTEXTCOLOR= +if test -z "$with_intro_progressbar_text_color"; then + PROGRESSTEXTCOLOR="255,255,255" + AC_MSG_RESULT([none]) +else + PROGRESSTEXTCOLOR="$with_intro_progressbar_text_color" + AC_MSG_RESULT([$PROGRESSTEXTCOLOR]) +fi +AC_SUBST(PROGRESSTEXTCOLOR) + +AC_MSG_CHECKING([for custom 'intro' progress text baseline]) +PROGRESSTEXTBASELINE= +if test -z "$with_intro_progressbar_text_baseline"; then + PROGRESSTEXTBASELINE="287" + AC_MSG_RESULT([none]) +else + PROGRESSTEXTBASELINE="$with_intro_progressbar_text_baseline" + AC_MSG_RESULT([$PROGRESSTEXTBASELINE]) +fi +AC_SUBST(PROGRESSTEXTBASELINE) + AC_MSG_CHECKING([for alternative branding images directory]) INTRO_BITMAP= ABOUT_BACKGROUND_SVG= diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx index 38de2eb112cf..e55b5b2b1b41 100644 --- a/desktop/source/splash/splash.cxx +++ b/desktop/source/splash/splash.cxx @@ -86,6 +86,7 @@ private: BitmapEx _aIntroBmp; Color _cProgressFrameColor; Color _cProgressBarColor; + Color _cProgressTextColor; bool _bNativeProgress; OUString _sAppName; OUString _sProgressText; @@ -101,7 +102,7 @@ private: sal_Bool _bFullScreenSplash; sal_Bool _bProgressEnd; long _height, _width, _tlx, _tly, _barwidth; - long _barheight, _barspace; + long _barheight, _barspace, _textBaseline; double _fXPos, _fYPos; double _fWidth, _fHeight; const long _xoffset, _yoffset; @@ -130,6 +131,7 @@ SplashScreen::SplashScreen() , _vdev(*((IntroWindow*)this)) , _cProgressFrameColor(sal::static_int_cast< ColorData >(NOT_LOADED)) , _cProgressBarColor(sal::static_int_cast< ColorData >(NOT_LOADED)) + , _cProgressTextColor(sal::static_int_cast< ColorData >(NOT_LOADED)) , _bNativeProgress(true) , _iMax(100) , _iProgress(0) @@ -144,6 +146,7 @@ SplashScreen::SplashScreen() , _barwidth(NOT_LOADED) , _barheight(NOT_LOADED) , _barspace(2) + , _textBaseline(NOT_LOADED) , _fXPos(-1.0) , _fYPos(-1.0) , _fWidth(-1.0) @@ -297,6 +300,9 @@ SplashScreen::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::sta } } + if ( NOT_LOADED == _textBaseline ) + _textBaseline = _height; + if ( sal::static_int_cast< ColorData >(NOT_LOADED) == _cProgressFrameColor.GetColor() ) _cProgressFrameColor = Color( COL_LIGHTGRAY ); @@ -311,6 +317,10 @@ SplashScreen::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::sta _cProgressBarColor = Color( COL_BLUE ); } + if ( sal::static_int_cast< ColorData >(NOT_LOADED) == + _cProgressTextColor.GetColor() ) + _cProgressTextColor = Color( COL_BLACK ); + Application::AddEventListener( LINK( this, SplashScreen, AppEventListenerHdl ) ); @@ -363,6 +373,10 @@ void SplashScreen::loadConfig() OUString( RTL_CONSTASCII_USTRINGPARAM( "ProgressFrameColor" ) ) ); OUString sProgressBarColor = implReadBootstrapKey( OUString( RTL_CONSTASCII_USTRINGPARAM( "ProgressBarColor" ) ) ); + OUString sProgressTextColor = implReadBootstrapKey( + OUString( RTL_CONSTASCII_USTRINGPARAM( "ProgressTextColor" ) ) ); + OUString sProgressTextBaseline = implReadBootstrapKey( + OUString( RTL_CONSTASCII_USTRINGPARAM( "ProgressTextBaseline" ) ) ); OUString sSize = implReadBootstrapKey( OUString( RTL_CONSTASCII_USTRINGPARAM( "ProgressSize" ) ) ); OUString sPosition = implReadBootstrapKey( @@ -418,6 +432,29 @@ void SplashScreen::loadConfig() } } + if ( !sProgressTextColor.isEmpty() ) + { + sal_uInt8 nRed = 0; + sal_Int32 idx = 0; + sal_Int32 temp = sProgressTextColor.getToken( 0, ',', idx ).toInt32(); + if ( idx != -1 ) + { + nRed = static_cast< sal_uInt8 >( temp ); + temp = sProgressTextColor.getToken( 0, ',', idx ).toInt32(); + } + if ( idx != -1 ) + { + sal_uInt8 nGreen = static_cast< sal_uInt8 >( temp ); + sal_uInt8 nBlue = static_cast< sal_uInt8 >( sProgressTextColor.getToken( 0, ',', idx ).toInt32() ); + _cProgressTextColor = Color( nRed, nGreen, nBlue ); + } + } + + if ( !sProgressTextBaseline.isEmpty() ) + { + _textBaseline = sProgressTextBaseline.toInt32(); + } + if( !sNativeProgress.isEmpty() ) { _bNativeProgress = sNativeProgress.toBoolean(); @@ -608,7 +645,12 @@ void SplashScreen::Paint( const Rectangle&) _vdev.SetFillColor( _cProgressBarColor ); _vdev.SetLineColor(); _vdev.DrawRect(Rectangle(_tlx+_barspace, _tly+_barspace, _tlx+_barspace+length, _tly+_barheight-_barspace)); - _vdev.DrawText( Rectangle(_tlx, _tly+_barheight+5, _tlx+_barwidth, _tly+_barheight+5+20), _sProgressText, TEXT_DRAW_CENTER ); + Font aFont; + aFont.SetSize(Size(0, 12)); + aFont.SetAlign(ALIGN_BASELINE); + _vdev.SetFont(aFont); + _vdev.SetTextColor(_cProgressTextColor); + _vdev.DrawText(Point(_tlx, _textBaseline), _sProgressText); } DrawOutDev(Point(), GetOutputSizePixel(), Point(), _vdev.GetOutputSizePixel(), _vdev ); } diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 0a7c84769104..b000c0a7492a 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -932,6 +932,24 @@ ProfileItem gid_Brand_Profileitem_Soffice_NativeProgress_So Value = "${NATIVEPROGRESS}"; End +ProfileItem gid_Brand_Profileitem_Soffice_ProgressTextColor_So + ProfileID = gid_Brand_Profile_Soffice_Ini; + ModuleID = gid_Module_Root_Brand; + Section = "Bootstrap"; + Order = 7; + Key = "ProgressTextColor"; + Value = "${PROGRESSTEXTCOLOR}"; +End + +ProfileItem gid_Brand_Profileitem_Soffice_ProgressTextBaseline_So + ProfileID = gid_Brand_Profile_Soffice_Ini; + ModuleID = gid_Module_Root_Brand; + Section = "Bootstrap"; + Order = 8; + Key = "ProgressTextBaseline"; + Value = "${PROGRESSTEXTBASELINE}"; +End + ProfileItem gid_Brand_Profileitem_Soffice_Hideeula ProfileID = gid_Brand_Profile_Soffice_Ini; ModuleID = gid_Module_Root_Brand; diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm index 4a3e4767a0bd..c9ba2388ae92 100644 --- a/solenv/bin/modules/installer/ziplist.pm +++ b/solenv/bin/modules/installer/ziplist.pm @@ -828,6 +828,8 @@ sub overwrite_branding $variableshashref->{'PROGRESSSIZE'} = $ENV{'PROGRESSSIZE'} , if( defined $ENV{'PROGRESSSIZE'} && $ENV{'PROGRESSSIZE'} ne "" ); $variableshashref->{'PROGRESSPOSITION'} = $ENV{'PROGRESSPOSITION'} , if( defined $ENV{'PROGRESSPOSITION'} && $ENV{'PROGRESSPOSITION'} ne "" ); $variableshashref->{'PROGRESSFRAMECOLOR'} = $ENV{'PROGRESSFRAMECOLOR'} , if( defined $ENV{'PROGRESSFRAMECOLOR'} && $ENV{'PROGRESSFRAMECOLOR'} ne "" ); + $variableshashref->{'PROGRESSTEXTCOLOR'} = $ENV{'PROGRESSTEXTCOLOR'} , if( defined $ENV{'PROGRESSTEXTCOLOR'} && $ENV{'PROGRESSTEXTCOLOR'} ne "" ); + $variableshashref->{'PROGRESSTEXTBASELINE'} = $ENV{'PROGRESSTEXTBASELINE'} , if( defined $ENV{'PROGRESSTEXTBASELINE'} && $ENV{'PROGRESSTEXTBASELINE'} ne "" ); } ########################################################### From 0ee9572db3934aa4e739c424765d4fd36a59a291 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Mon, 1 Oct 2012 16:26:35 +0100 Subject: [PATCH 189/863] ignore various unhelpful signals in our --backtrace gdb setup. Change-Id: I8ede40ebf5954e0492e790ce148c9b7f1f1e62df --- desktop/scripts/gdbtrace | 1 + 1 file changed, 1 insertion(+) diff --git a/desktop/scripts/gdbtrace b/desktop/scripts/gdbtrace index 548ffe6512e9..f5fbf6325d11 100644 --- a/desktop/scripts/gdbtrace +++ b/desktop/scripts/gdbtrace @@ -1,5 +1,6 @@ set pagination off echo log will be saved as gdbtrace.log, this will take some time, patience...\n +handle SIGPIPE SIGXCPU SIG33 SIG35 SIGPWR nostop noprint set logging redirect on set logging file gdbtrace.log set logging on From 3751efff81a9bc1e53c8cbee74770bbed6d4f8de Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Mon, 1 Oct 2012 16:26:54 +0100 Subject: [PATCH 190/863] initialize various fields in constructor. Change-Id: Ib2165121786353062a52e6dd65cca6dab8584e60 --- sw/source/filter/html/wrthtml.cxx | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 131c04e0a787..0ebd7376fe94 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -99,6 +99,30 @@ static sal_Char sIndentTabs[MAX_INDENT_LEVEL+2] = "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t"; SwHTMLWriter::SwHTMLWriter( const String& rBaseURL ) + , bCfgOutStyles( sal_False ) + , bCfgPreferStyles( sal_False ) + , bCfgFormFeed( sal_False ) + , bCfgStarBasic( sal_False ) + , bCfgCpyLinkedGrfs( sal_False ) + , bFirstLine( sal_False ) + , bTagOn( sal_False ) + , bTxtAttr( sal_False ) + , bOutOpts( sal_False ) + , bOutTable( sal_False ) + , bOutHeader( sal_False ) + , bOutFooter( sal_False ) + , bOutFlyFrame( sal_False ) + , bFirstCSS1Rule( sal_False ) + , bFirstCSS1Property( sal_False ) + , bPoolCollTextModified( sal_False ) + , bCSS1IgnoreFirstPageDesc( sal_False ) + , bNoAlign( sal_False ) + , bClearLeft( sal_False ) + , bClearRight( sal_False ) + , bLFPossible( sal_False ) + , bPreserveForm( sal_False ) + , bCfgNetscape4( sal_False ) + { SetBaseURL( rBaseURL ); bFirstLine = sal_True; From a9097843e6b2935dcab9f038b80e5a51bc5cfc94 Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Tue, 2 Oct 2012 16:00:09 +0200 Subject: [PATCH 191/863] Help text for newly introduced switches. Change-Id: I3f148d0dd61adc7008fdf64d077818c22a0e7d09 --- configure.in | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/configure.in b/configure.in index 34dfce7f02a6..fb54ec32e3eb 100644 --- a/configure.in +++ b/configure.in @@ -1980,6 +1980,20 @@ AC_ARG_WITH(intro-progressbar-frame-color, Usage: --with-intro-progressbar-frame-color=207,208,211 ],,) +AC_ARG_WITH(intro-progressbar-text-color, + AS_HELP_STRING([--with-intro-progressbar-text-color], + [Set color of progress bar text on intro screen. Comma separated RGB values in decimal format.]) + [ + Usage: --with-intro-progressbar-text-color=207,208,211 +],,) + +AC_ARG_WITH(intro-progressbar-text-baseline, + AS_HELP_STRING([--with-intro-progressbar-text-baseline], + [Set horizontal position of progress bar text on intro screen. Value in decimal format.]) + [ + Usage: --with-intro-progressbar-text-baseline=250 +],,) + AC_ARG_WITH(flat-logo-svg, [ --with-flat-logo-svg Allows specification of the flat Logo SVG. From d92345561c998f7382cf9ef0fdcd29096f978435 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 2 Oct 2012 14:41:59 +0100 Subject: [PATCH 192/863] don't blow up on .odt export with !hasValue footers/headers Change-Id: I2507c23b7b17b9172f720548d32cdfe299d4fa20 --- xmloff/source/text/XMLTextMasterPageExport.cxx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/xmloff/source/text/XMLTextMasterPageExport.cxx b/xmloff/source/text/XMLTextMasterPageExport.cxx index a449f9204c47..ab7f854bf07a 100644 --- a/xmloff/source/text/XMLTextMasterPageExport.cxx +++ b/xmloff/source/text/XMLTextMasterPageExport.cxx @@ -127,20 +127,21 @@ void XMLTextMasterPageExport::exportMasterPageContent( else { aAny = rPropSet->getPropertyValue( sHeaderOn ); - sal_Bool bHeader = *(sal_Bool *)aAny.getValue(); + sal_Bool bHeader = sal_False; + aAny >>= bHeader; sal_Bool bHeaderFirst = sal_False; if( bHeader ) { aAny = rPropSet->getPropertyValue( sFirstShareContent ); - bHeaderFirst = !*(sal_Bool *)aAny.getValue(); + aAny >>= bHeaderFirst; } sal_Bool bHeaderLeft = sal_False; if( bHeader ) { aAny = rPropSet->getPropertyValue( sHeaderShareContent ); - bHeaderLeft = !*(sal_Bool *)aAny.getValue(); + aAny >>= bHeaderLeft; } if( xHeaderText.is() ) @@ -174,20 +175,21 @@ void XMLTextMasterPageExport::exportMasterPageContent( } aAny = rPropSet->getPropertyValue( sFooterOn ); - sal_Bool bFooter = *(sal_Bool *)aAny.getValue(); + sal_Bool bFooter = sal_False; + aAny >>= bFooter; sal_Bool bFooterFirst = sal_False; if( bFooter ) { aAny = rPropSet->getPropertyValue( sFirstShareContent ); - bFooterFirst = !*(sal_Bool *)aAny.getValue(); + aAny >>= bFooterFirst; } sal_Bool bFooterLeft = sal_False; if( bFooter ) { aAny = rPropSet->getPropertyValue( sFooterShareContent ); - bFooterLeft = !*(sal_Bool *)aAny.getValue(); + aAny >>= bFooterLeft; } if( xFooterText.is() ) From 4afd166c229e27d741b48a6f099d2f00d01b05de Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Tue, 2 Oct 2012 16:10:46 +0200 Subject: [PATCH 193/863] Fix build. Change-Id: I291cb5422f5338d64e6d8973c8dc863f4fb982f5 --- sw/source/filter/html/wrthtml.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 0ebd7376fe94..baba51cf920f 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -99,7 +99,7 @@ static sal_Char sIndentTabs[MAX_INDENT_LEVEL+2] = "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t"; SwHTMLWriter::SwHTMLWriter( const String& rBaseURL ) - , bCfgOutStyles( sal_False ) + : bCfgOutStyles( sal_False ) , bCfgPreferStyles( sal_False ) , bCfgFormFeed( sal_False ) , bCfgStarBasic( sal_False ) From d6418f680b8861dfea1ce1be6e9358b23cfb3064 Mon Sep 17 00:00:00 2001 From: Thorsten Behrens Date: Tue, 2 Oct 2012 17:31:56 +0200 Subject: [PATCH 194/863] Revert "Fix fdo#55142 - wrong character pos calculation on mac." Caused fdo#55350, better fix in the next commit. This reverts commit f1651ee579bf38a49b839dbcb28ac38c0163a3d2. --- vcl/aqua/source/gdi/atsui/salgdi.cxx | 29 ++-------------------------- vcl/inc/aqua/atsui/salgdi.h | 1 - 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/vcl/aqua/source/gdi/atsui/salgdi.cxx b/vcl/aqua/source/gdi/atsui/salgdi.cxx index a57068db0efc..5c0bff7a6243 100644 --- a/vcl/aqua/source/gdi/atsui/salgdi.cxx +++ b/vcl/aqua/source/gdi/atsui/salgdi.cxx @@ -354,8 +354,6 @@ AquaSalGraphics::AquaSalGraphics() { // create the style object for font attributes ATSUCreateStyle( &maATSUStyle ); - - ResetFontStyle(); } // ----------------------------------------------------------------------- @@ -581,29 +579,6 @@ bool AquaSalGraphics::AddTempDevFont( ImplDevFontList*, // ----------------------------------------------------------------------- -void AquaSalGraphics::ResetFontStyle() -{ - ATSUClearStyle(maATSUStyle); - - // Set justification attributes - ATSJustPriorityWidthDeltaOverrides nPriorityJustOverrides; - memset(nPriorityJustOverrides, 0, sizeof(nPriorityJustOverrides)); - - nPriorityJustOverrides[kJUSTLetterPriority].growFlags = kJUSTOverrideLimits; - nPriorityJustOverrides[kJUSTLetterPriority].shrinkFlags = kJUSTOverrideLimits; - - ATSUAttributeTag theTag = kATSUPriorityJustOverrideTag; - ByteCount theSize = sizeof(ATSJustPriorityWidthDeltaOverrides); - ATSUAttributeValuePtr thePtr = &nPriorityJustOverrides; - OSStatus eStatus = ATSUSetAttributes(maATSUStyle, 1, &theTag, &theSize, &thePtr); - if (eStatus != noErr) - { - DBG_WARNING("AquaSalGraphics::ResetFontStyle() : Could not override justification attributes!\n"); - } -} - -// ----------------------------------------------------------------------- - // callbacks from ATSUGlyphGetCubicPaths() fore GetGlyphOutline() struct GgoData { basegfx::B2DPolygon maPolygon; basegfx::B2DPolyPolygon* mpPolyPoly; }; @@ -723,7 +698,7 @@ sal_uInt16 AquaSalGraphics::SetFont( FontSelectPattern* pReqFont, int /*nFallbac { if( !pReqFont ) { - ResetFontStyle(); + ATSUClearStyle( maATSUStyle ); mpMacFontData = NULL; return 0; } @@ -809,7 +784,7 @@ sal_uInt16 AquaSalGraphics::SetFont( FontSelectPattern* pReqFont, int /*nFallbac if( eStatus != noErr ) { DBG_WARNING( "AquaSalGraphics::SetFont() : Could not set font attributes!\n"); - ResetFontStyle(); + ATSUClearStyle( maATSUStyle ); mpMacFontData = NULL; return 0; } diff --git a/vcl/inc/aqua/atsui/salgdi.h b/vcl/inc/aqua/atsui/salgdi.h index eeb7aa43f2b3..19fe1f48b9f7 100644 --- a/vcl/inc/aqua/atsui/salgdi.h +++ b/vcl/inc/aqua/atsui/salgdi.h @@ -353,7 +353,6 @@ private: bool GetRawFontData( const PhysicalFontFace* pFontData, std::vector& rBuffer, bool* pJustCFF ); - void ResetFontStyle(); }; // --- some trivial inlines From da9a26f5f49ea56422bb791d4f96725283d3e8c6 Mon Sep 17 00:00:00 2001 From: Sergey Farbotka Date: Tue, 2 Oct 2012 17:36:09 +0200 Subject: [PATCH 195/863] Fix fdo#55142 - use proper output offsets. Change-Id: I76e6158f1ac64b9dd555cf8aee3ce8bdd5d035c5 --- vcl/aqua/source/gdi/atsui/salatslayout.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcl/aqua/source/gdi/atsui/salatslayout.cxx b/vcl/aqua/source/gdi/atsui/salatslayout.cxx index 4145dbf91342..5d9ad09e6fcb 100644 --- a/vcl/aqua/source/gdi/atsui/salatslayout.cxx +++ b/vcl/aqua/source/gdi/atsui/salatslayout.cxx @@ -437,7 +437,7 @@ void ATSLayout::DrawText( SalGraphics& rGraphics ) const { const SubPortion& rSubPortion = *it; // calculate sub-portion offset for rotated text - Fixed nXOfsFixed = 0, nYOfsFixed = 0; + Fixed nXOfsFixed = rSubPortion.mnXOffset, nYOfsFixed = 0; if( rAquaGraphics.mnATSUIRotation != 0 ) { const double fRadians = rAquaGraphics.mnATSUIRotation * (M_PI/0xB40000); From c59769ec7a4f9af1086f534ae92a4f2ccd653122 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 2 Oct 2012 16:38:21 +0100 Subject: [PATCH 196/863] GetParent()->GetParent() does't take into account containers The assumption was that the page is directly a child of the parent dialog => ka-boom Change-Id: Ia0e7f33273d7a3c6b726c74371b8ee8a809ee5bb --- sw/source/ui/frmdlg/frmpage.cxx | 18 +++++++++++------- sw/source/ui/inc/frmpage.hxx | 2 ++ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index b05b030db317..8396539392e4 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -775,11 +775,15 @@ void SwFrmPage::EnableGraficMode( void ) } } +SwWrtShell *SwFrmPage::getFrmDlgParentShell() +{ + return ((SwFrmDlg*)GetParentDialog())->GetWrtShell(); +} + void SwFrmPage::Reset( const SfxItemSet &rSet ) { - SwWrtShell* pSh = bFormat ? ::GetActiveWrtShell() : - ((SwFrmDlg*)GetParent()->GetParent())->GetWrtShell(); + getFrmDlgParentShell(); nHtmlMode = ::GetHtmlMode(pSh->GetView().GetDocShell()); bHtmlMode = nHtmlMode & HTMLMODE_ON ? sal_True : sal_False; @@ -951,7 +955,7 @@ sal_Bool SwFrmPage::FillItemSet(SfxItemSet &rSet) { sal_Bool bRet = sal_False; SwWrtShell* pSh = bFormat ? ::GetActiveWrtShell() - : ((SwFrmDlg*)GetParent()->GetParent())->GetWrtShell(); + : getFrmDlgParentShell(); OSL_ENSURE( pSh , "shell not found"); const SfxItemSet& rOldSet = GetItemSet(); const SfxPoolItem* pOldItem = 0; @@ -1619,7 +1623,7 @@ int SwFrmPage::DeactivatePage(SfxItemSet * _pSet) //FillItemSet doesn't set the anchor into the set when it matches //the original. But for the other pages we need the current anchor. SwWrtShell* pSh = bFormat ? ::GetActiveWrtShell() - : ((SwFrmDlg*)GetParent()->GetParent())->GetWrtShell(); + : getFrmDlgParentShell(); RndStdIds eAnchorId = (RndStdIds)GetAnchor(); SwFmtAnchor aAnc( eAnchorId, pSh->GetPhyPageNum() ); _pSet->Put( aAnc ); @@ -1674,7 +1678,7 @@ IMPL_LINK_NOARG(SwFrmPage, RangeModifyHdl) return 0; SwWrtShell* pSh = bFormat ? ::GetActiveWrtShell() - :((SwFrmDlg*)GetParent()->GetParent())->GetWrtShell(); + : getFrmDlgParentShell(); OSL_ENSURE(pSh , "shell not found"); SwFlyFrmAttrMgr aMgr( bNew, pSh, (const SwAttrSet&)GetItemSet() ); SvxSwFrameValidation aVal; @@ -2045,7 +2049,7 @@ void SwFrmPage::Init(const SfxItemSet& rSet, sal_Bool bReset) { if(!bFormat) { - SwWrtShell* pSh = ((SwFrmDlg*)GetParent()->GetParent())->GetWrtShell(); + SwWrtShell* pSh = getFrmDlgParentShell(); // size const sal_Bool bSizeFixed = pSh->IsSelObjProtected( FLYPROTECT_FIXED ); @@ -2140,7 +2144,7 @@ void SwFrmPage::Init(const SfxItemSet& rSet, sal_Bool bReset) if ( !bFormat ) { - SwWrtShell* pSh = ((SwFrmDlg*)GetParent()->GetParent())->GetWrtShell(); + SwWrtShell* pSh = getFrmDlgParentShell(); const SwFrmFmt* pFmt = pSh->GetFlyFrmFmt(); if( pFmt && pFmt->GetChain().GetNext() ) aAutoHeightCB.Enable( sal_False ); diff --git a/sw/source/ui/inc/frmpage.hxx b/sw/source/ui/inc/frmpage.hxx index 94453ce5d709..1e31ccb064a4 100644 --- a/sw/source/ui/inc/frmpage.hxx +++ b/sw/source/ui/inc/frmpage.hxx @@ -184,6 +184,8 @@ class SwFrmPage: public SfxTabPage SwFrmPage(Window *pParent, const SfxItemSet &rSet); ~SwFrmPage(); + SwWrtShell *getFrmDlgParentShell(); + using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; From e2dcbf5e1791badab39361782057005681866e5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Tue, 2 Oct 2012 17:41:01 +0200 Subject: [PATCH 197/863] don't use empty rpath Besides the usual problem this causes with rpath (security), clang also doesn't like empty arguments in -Wl. Change-Id: I5c0896ae06ffcf6d2a268bf98a2b3f031cb8a70f --- solenv/gbuild/platform/solaris.mk | 10 +++++++--- solenv/gbuild/platform/unxgcc.mk | 9 ++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 47c12d2c1292..6c0bded557d8 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -301,12 +301,16 @@ gb_Executable_LAYER := \ $(foreach exe,$(gb_Executable_NONE),$(exe):NONE) \ -define gb_Executable_get_rpath -'-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Executable_get_layer,$(1)))' \ --L$(gb_Library_OUTDIRLOCATION) +define gb_Executable__get_rpath +$(strip $(if $(1),'-Wl$(COMMA)-rpath$(COMMA)$(1)') \ +-L$(gb_Library_OUTDIRLOCATION)) #JAD#-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION) endef +define gb_Executable_get_rpath +$(call gb_Executable__get_rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Executable_get_layer,$(1)))) +endef + define gb_Executable_Executable_platform $(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call gb_Executable_get_rpath,$(1)) diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index d996bd46107d..73a354cc63ea 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -262,7 +262,7 @@ gb_Library_LAYER := \ $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \ define gb_Library__get_rpath -$(if $(1),$(strip -Wl,-z,origin '-Wl,-rpath,$(1)' '-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)')) +$(if $(1),$(strip -Wl,-z,origin '-Wl,-rpath,$(1)' -Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION))) endef define gb_Library_get_rpath @@ -299,9 +299,12 @@ gb_Executable_LAYER := \ $(foreach exe,$(gb_Executable_NONE),$(exe):NONE) \ +define gb_Executable__get_rpath +$(strip -Wl,-z,origin $(if $(1),'-Wl$(COMMA)-rpath$(COMMA)$(1)') -Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)) +endef + define gb_Executable_get_rpath --Wl,-z,origin '-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Executable_get_layer,$(1)))' \ --Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION) +$(call gb_Executable__get_rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Executable_get_layer,$(1)))) endef define gb_Executable_Executable_platform From 238e5c5bd379fd98cb877be62984e5c32222be9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 2 Oct 2012 16:52:41 +0100 Subject: [PATCH 198/863] various rather mad uses of GetParent()->GetParent() Change-Id: I0f0d5771d82c7a577ef86ce5ab1ca10a0aaeb89a --- sw/source/ui/envelp/envfmt.cxx | 24 ++++++++++++------------ sw/source/ui/envelp/envfmt.hxx | 3 +-- sw/source/ui/envelp/envlop1.cxx | 14 +++++++------- sw/source/ui/envelp/envprt.cxx | 4 ++-- sw/source/ui/envelp/envprt.hxx | 3 +-- sw/source/ui/envelp/label1.cxx | 30 +++++++++++++++--------------- sw/source/ui/envelp/labfmt.cxx | 12 ++++++------ sw/source/ui/envelp/labfmt.hxx | 3 +-- sw/source/ui/envelp/labprt.cxx | 4 ++-- sw/source/ui/envelp/labprt.hxx | 3 +-- sw/source/ui/envelp/swuilabimp.hxx | 3 +-- sw/source/ui/inc/envlop.hxx | 3 +-- sw/source/ui/index/cnttab.cxx | 6 ------ 13 files changed, 50 insertions(+), 62 deletions(-) diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index 12d5e4aa94d5..4e5f2bef0de2 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -268,7 +268,7 @@ IMPL_LINK_INLINE_START( SwEnvFmtPage, ModifyHdl, Edit *, pEdit ) } else { - FillItem(GetParent()->aEnvItem); + FillItem(GetParentSwEnvDlg()->aEnvItem); SetMinMax(); aPreview.Invalidate(); } @@ -278,7 +278,7 @@ IMPL_LINK_INLINE_END( SwEnvFmtPage, ModifyHdl, Edit *, pEdit ) IMPL_LINK( SwEnvFmtPage, EditHdl, MenuButton *, pButton ) { - SwWrtShell* pSh = GetParent()->pSh; + SwWrtShell* pSh = GetParentSwEnvDlg()->pSh; OSL_ENSURE(pSh, "Shell missing"); // determine collection-ptr @@ -314,7 +314,7 @@ IMPL_LINK( SwEnvFmtPage, EditHdl, MenuButton *, pButton ) SwAbstractDialogFactory* pFact = swui::GetFactory(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); - SfxAbstractTabDialog* pDlg = pFact->CreateSwCharDlg( GetParent(), pSh->GetView(), aTmpSet, DLG_CHAR ,&pColl->GetName() ); + SfxAbstractTabDialog* pDlg = pFact->CreateSwCharDlg( GetParentSwEnvDlg(), pSh->GetView(), aTmpSet, DLG_CHAR ,&pColl->GetName() ); OSL_ENSURE(pDlg, "Dialogdiet fail!"); if (pDlg->Execute() == RET_OK) { @@ -362,7 +362,7 @@ IMPL_LINK( SwEnvFmtPage, EditHdl, MenuButton *, pButton ) // set BoxInfo ::PrepareBoxInfo( aTmpSet, *pSh ); - SwParaDlg *pDlg = new SwParaDlg(GetParent(), pSh->GetView(), aTmpSet, DLG_ENVELOP, &pColl->GetName()); + SwParaDlg *pDlg = new SwParaDlg(GetParentSwEnvDlg(), pSh->GetView(), aTmpSet, DLG_ENVELOP, &pColl->GetName()); if ( pDlg->Execute() == RET_OK ) { @@ -398,7 +398,7 @@ IMPL_LINK( SwEnvFmtPage, EditHdl, MenuButton *, pButton ) SfxItemSet *SwEnvFmtPage::GetCollItemSet(SwTxtFmtColl* pColl, sal_Bool bSender) { - SfxItemSet *&pAddrSet = bSender ? GetParent()->pSenderSet : GetParent()->pAddresseeSet; + SfxItemSet *&pAddrSet = bSender ? GetParentSwEnvDlg()->pSenderSet : GetParentSwEnvDlg()->pAddresseeSet; if (!pAddrSet) { @@ -424,7 +424,7 @@ SfxItemSet *SwEnvFmtPage::GetCollItemSet(SwTxtFmtColl* pColl, sal_Bool bSender) pVec.insert(pVec.end(), aVec.begin(), aVec.end()); sal_uInt16 *pNewRanges = ::lcl_convertListToRanges(pVec); - pAddrSet = new SfxItemSet(GetParent()->pSh->GetView().GetCurShell()->GetPool(), + pAddrSet = new SfxItemSet(GetParentSwEnvDlg()->pSh->GetView().GetCurShell()->GetPool(), pNewRanges); pAddrSet->Put(pColl->GetAttrSet()); delete[] pNewRanges; @@ -470,7 +470,7 @@ IMPL_LINK_NOARG(SwEnvFmtPage, FormatHdl) SetMinMax(); - FillItem(GetParent()->aEnvItem); + FillItem(GetParentSwEnvDlg()->aEnvItem); aPreview.Invalidate(); return 0; } @@ -520,7 +520,7 @@ SfxTabPage* SwEnvFmtPage::Create(Window* pParent, const SfxItemSet& rSet) void SwEnvFmtPage::ActivatePage(const SfxItemSet& rSet) { SfxItemSet aSet(rSet); - aSet.Put(GetParent()->aEnvItem); + aSet.Put(GetParentSwEnvDlg()->aEnvItem); Reset(aSet); } @@ -557,8 +557,8 @@ void SwEnvFmtPage::FillItem(SwEnvItem& rItem) sal_Bool SwEnvFmtPage::FillItemSet(SfxItemSet& rSet) { - FillItem(GetParent()->aEnvItem); - rSet.Put(GetParent()->aEnvItem); + FillItem(GetParentSwEnvDlg()->aEnvItem); + rSet.Put(GetParentSwEnvDlg()->aEnvItem); return sal_True; } @@ -582,8 +582,8 @@ void SwEnvFmtPage::Reset(const SfxItemSet& rSet) SetFldVal(aSizeHeightField , Min(rItem.lWidth, rItem.lHeight)); SetMinMax(); - DELETEZ(GetParent()->pSenderSet); - DELETEZ(GetParent()->pAddresseeSet); + DELETEZ(GetParentSwEnvDlg()->pSenderSet); + DELETEZ(GetParentSwEnvDlg()->pAddresseeSet); } diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx index de614b884aed..789d862ef3b0 100644 --- a/sw/source/ui/envelp/envfmt.hxx +++ b/sw/source/ui/envelp/envfmt.hxx @@ -80,8 +80,7 @@ class SwEnvFmtPage : public SfxTabPage SfxItemSet *GetCollItemSet(SwTxtFmtColl* pColl, sal_Bool bSender); - using Window::GetParent; - SwEnvDlg *GetParent() {return (SwEnvDlg*) SfxTabPage::GetParent()->GetParent();} + SwEnvDlg *GetParentSwEnvDlg() {return (SwEnvDlg*) GetParentDialog();} using TabPage::ActivatePage; using TabPage::DeactivatePage; diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index 5a397b78f616..dc9b39341c83 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -81,7 +81,7 @@ void SwEnvPreview::Paint(const Rectangle &) const StyleSettings& rSettings = GetSettings().GetStyleSettings(); const SwEnvItem& rItem = - ((SwEnvDlg*) GetParent()->GetParent()->GetParent())->aEnvItem; + ((SwEnvDlg*) GetParentDialog())->aEnvItem; sal_uInt16 nPageW = (sal_uInt16) Max(rItem.lWidth, rItem.lHeight), nPageH = (sal_uInt16) Min(rItem.lWidth, rItem.lHeight); @@ -220,7 +220,7 @@ SwEnvPage::SwEnvPage(Window* pParent, const SfxItemSet& rSet) : { FreeResource(); SetExchangeSupport(); - pSh = GetParent()->pSh; + pSh = GetParentSwEnvDlg()->pSh; // Install handlers aDatabaseLB .SetSelectHdl(LINK(this, SwEnvPage, DatabaseHdl )); @@ -279,7 +279,7 @@ IMPL_LINK_NOARG(SwEnvPage, FieldHdl) IMPL_LINK_NOARG(SwEnvPage, SenderHdl) { const sal_Bool bEnable = aSenderBox.IsChecked(); - GetParent()->aEnvItem.bSend = bEnable; + GetParentSwEnvDlg()->aEnvItem.bSend = bEnable; aSenderEdit.Enable(bEnable); if ( bEnable ) { @@ -324,13 +324,13 @@ SfxTabPage* SwEnvPage::Create(Window* pParent, const SfxItemSet& rSet) void SwEnvPage::ActivatePage(const SfxItemSet& rSet) { SfxItemSet aSet(rSet); - aSet.Put(GetParent()->aEnvItem); + aSet.Put(GetParentSwEnvDlg()->aEnvItem); Reset(aSet); } int SwEnvPage::DeactivatePage(SfxItemSet* _pSet) { - FillItem(GetParent()->aEnvItem); + FillItem(GetParentSwEnvDlg()->aEnvItem); if( _pSet ) FillItemSet(*_pSet); return SfxTabPage::LEAVE_PAGE; @@ -345,8 +345,8 @@ void SwEnvPage::FillItem(SwEnvItem& rItem) sal_Bool SwEnvPage::FillItemSet(SfxItemSet& rSet) { - FillItem(GetParent()->aEnvItem); - rSet.Put(GetParent()->aEnvItem); + FillItem(GetParentSwEnvDlg()->aEnvItem); + rSet.Put(GetParentSwEnvDlg()->aEnvItem); return sal_True; } diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx index dd4127a5b479..b9dbebe6772f 100644 --- a/sw/source/ui/envelp/envprt.cxx +++ b/sw/source/ui/envelp/envprt.cxx @@ -174,8 +174,8 @@ void SwEnvPrtPage::FillItem(SwEnvItem& rItem) sal_Bool SwEnvPrtPage::FillItemSet(SfxItemSet& rSet) { - FillItem(GetParent()->aEnvItem); - rSet.Put(GetParent()->aEnvItem); + FillItem(GetParentSwEnvDlg()->aEnvItem); + rSet.Put(GetParentSwEnvDlg()->aEnvItem); return sal_True; } diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx index 4dd2912d6819..357a46e9f302 100644 --- a/sw/source/ui/envelp/envprt.hxx +++ b/sw/source/ui/envelp/envprt.hxx @@ -69,8 +69,7 @@ class SwEnvPrtPage : public SfxTabPage DECL_LINK(AlignHdl, void *); DECL_LINK( ButtonHdl, Button * ); - using Window::GetParent; - SwEnvDlg* GetParent() {return (SwEnvDlg*) SfxTabPage::GetParent()->GetParent();} + SwEnvDlg* GetParentSwEnvDlg() {return (SwEnvDlg*) GetParentDialog();} using TabPage::ActivatePage; using TabPage::DeactivatePage; diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 473e7e75c2ce..6f878e67245e 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -280,10 +280,10 @@ SwLabPage::SwLabPage(Window* pParent, const SfxItemSet& rSet) : size_t nLstGroup = 0; - const sal_uInt16 nCount = (sal_uInt16)GetParent()->Makes().size(); + const sal_uInt16 nCount = (sal_uInt16)GetParentSwLabDlg()->Makes().size(); for(size_t i = 0; i < nCount; ++i) { - rtl::OUString& rStr = GetParent()->Makes()[i]; + rtl::OUString& rStr = GetParentSwLabDlg()->Makes()[i]; aMakeBox.InsertEntry( rStr ); if ( rStr == aItem.aLstMake) @@ -364,7 +364,7 @@ IMPL_LINK( SwLabPage, DatabaseHdl, ListBox *, pListBox ) { sActDBName = aDatabaseLB.GetSelectEntry(); - WaitObject aObj( GetParent() ); + WaitObject aObj( GetParentSwLabDlg() ); if (pListBox == &aDatabaseLB) GetNewDBMgr()->GetTableNames(&aTableLB, sActDBName); @@ -401,32 +401,32 @@ IMPL_LINK_NOARG_INLINE_END(SwLabPage, PageHdl) IMPL_LINK_NOARG(SwLabPage, MakeHdl) { - WaitObject aWait( GetParent() ); + WaitObject aWait( GetParentSwLabDlg() ); aTypeBox.Clear(); aHiddenSortTypeBox.Clear(); - GetParent()->TypeIds().clear(); + GetParentSwLabDlg()->TypeIds().clear(); const String aMake = aMakeBox.GetSelectEntry(); - GetParent()->ReplaceGroup( aMake ); + GetParentSwLabDlg()->ReplaceGroup( aMake ); aItem.aLstMake = aMake; const sal_Bool bCont = aContButton.IsChecked(); - const sal_uInt16 nCount = GetParent()->Recs().size(); + const sal_uInt16 nCount = GetParentSwLabDlg()->Recs().size(); sal_uInt16 nLstType = 0; const String sCustom(SW_RES(STR_CUSTOM)); //insert the entries into the sorted list box for ( sal_uInt16 i = 0; i < nCount; ++i ) { - const String aType ( GetParent()->Recs()[i]->aType ); + const String aType ( GetParentSwLabDlg()->Recs()[i]->aType ); sal_Bool bInsert = sal_False; - if ( GetParent()->Recs()[i]->aType == sCustom ) + if ( GetParentSwLabDlg()->Recs()[i]->aType == sCustom ) { bInsert = sal_True; aTypeBox.InsertEntry(aType ); } - else if ( GetParent()->Recs()[i]->bCont == bCont ) + else if ( GetParentSwLabDlg()->Recs()[i]->bCont == bCont ) { if ( aHiddenSortTypeBox.GetEntryPos(aType) == LISTBOX_ENTRY_NOTFOUND ) { @@ -436,9 +436,9 @@ IMPL_LINK_NOARG(SwLabPage, MakeHdl) } if(bInsert) { - GetParent()->TypeIds().push_back(i); + GetParentSwLabDlg()->TypeIds().push_back(i); if ( !nLstType && aType == String(aItem.aLstType) ) - nLstType = GetParent()->TypeIds().size(); + nLstType = GetParentSwLabDlg()->TypeIds().size(); } } for(sal_uInt16 nEntry = 0; nEntry < aHiddenSortTypeBox.GetEntryCount(); nEntry++) @@ -496,7 +496,7 @@ SwLabRec* SwLabPage::GetSelectedEntryPos() { String sSelEntry(aTypeBox.GetSelectEntry()); - return GetParent()->GetRecord(sSelEntry, aContButton.IsChecked()); + return GetParentSwLabDlg()->GetRecord(sSelEntry, aContButton.IsChecked()); } void SwLabPage::InitDatabaseBox() @@ -573,7 +573,7 @@ void SwLabPage::Reset(const SfxItemSet& rSet) aAddrBox .Check ( aItem.bAddr ); aWritingEdit.SetText ( aWriting ); - for(std::vector::const_iterator i = GetParent()->Makes().begin(); i != GetParent()->Makes().end(); ++i) + for(std::vector::const_iterator i = GetParentSwLabDlg()->Makes().begin(); i != GetParentSwLabDlg()->Makes().end(); ++i) { if(aMakeBox.GetEntryPos(String(*i)) == LISTBOX_ENTRY_NOTFOUND) aMakeBox.InsertEntry(*i); @@ -586,7 +586,7 @@ void SwLabPage::Reset(const SfxItemSet& rSet) aItem.aType = sType; //#102806# a newly added make may not be in the type ListBox already if (aTypeBox.GetEntryPos(String(aItem.aType)) == LISTBOX_ENTRY_NOTFOUND && !aItem.aMake.isEmpty()) - GetParent()->UpdateGroup( aItem.aMake ); + GetParentSwLabDlg()->UpdateGroup( aItem.aMake ); if (aTypeBox.GetEntryPos(String(aItem.aType)) != LISTBOX_ENTRY_NOTFOUND) { aTypeBox.SelectEntry(aItem.aType); diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index 139823af7933..5a8e83552a5e 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -510,7 +510,7 @@ void SwLabFmtPage::FillItem(SwLabItem& rItem) { rItem.aMake = rItem.aType = SW_RESSTR(STR_CUSTOM); - SwLabRec& rRec = *GetParent()->Recs()[0]; + SwLabRec& rRec = *GetParentSwLabDlg()->Recs()[0]; rItem.lHDist = rRec.lHDist = static_cast< long >(GETFLDVAL(aHDistField )); rItem.lVDist = rRec.lVDist = static_cast< long >(GETFLDVAL(aVDistField )); rItem.lWidth = rRec.lWidth = static_cast< long >(GETFLDVAL(aWidthField )); @@ -535,7 +535,7 @@ sal_Bool SwLabFmtPage::FillItemSet(SfxItemSet& rSet) void SwLabFmtPage::Reset(const SfxItemSet& ) { // Initialise fields - GetParent()->GetLabItem(aItem); + GetParentSwLabDlg()->GetLabItem(aItem); aHDistField .SetMax(100 * aItem.lHDist , FUNIT_TWIP); aVDistField .SetMax(100 * aItem.lVDist , FUNIT_TWIP); @@ -585,8 +585,8 @@ IMPL_LINK_NOARG(SwLabFmtPage, SaveHdl) if(pSaveDlg->GetLabel(aItem)) { bModified = sal_False; - const Sequence& rMan = GetParent()->GetLabelsConfig().GetManufacturers(); - std::vector& rMakes(GetParent()->Makes()); + const Sequence& rMan = GetParentSwLabDlg()->GetLabelsConfig().GetManufacturers(); + std::vector& rMakes(GetParentSwLabDlg()->Makes()); if(rMakes.size() < (sal_uInt16)rMan.getLength()) { rMakes.clear(); @@ -626,7 +626,7 @@ SwSaveLabelDlg::SwSaveLabelDlg(SwLabFmtPage* pParent, SwLabRec& rRec) : aMakeCB.SetModifyHdl(aLk); aTypeED.SetModifyHdl(aLk); - SwLabelConfig& rCfg = pLabPage->GetParent()->GetLabelsConfig(); + SwLabelConfig& rCfg = pLabPage->GetParentSwLabDlg()->GetLabelsConfig(); const Sequence& rMan = rCfg.GetManufacturers(); const OUString* pMan = rMan.getConstArray(); for(sal_Int32 i = 0; i < rMan.getLength(); i++) @@ -635,7 +635,7 @@ SwSaveLabelDlg::SwSaveLabelDlg(SwLabFmtPage* pParent, SwLabRec& rRec) : IMPL_LINK_NOARG(SwSaveLabelDlg, OkHdl) { - SwLabelConfig& rCfg = pLabPage->GetParent()->GetLabelsConfig(); + SwLabelConfig& rCfg = pLabPage->GetParentSwLabDlg()->GetLabelsConfig(); String sMake(aMakeCB.GetText()); String sType(aTypeED.GetText()); if(rCfg.HasLabel(sMake, sType)) diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index d31bf82bcbf3..d15e99a0c7ce 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -132,7 +132,6 @@ class SwLabFmtPage : public SfxTabPage using TabPage::ActivatePage; using TabPage::DeactivatePage; - using Window::GetParent; public: @@ -144,7 +143,7 @@ public: virtual sal_Bool FillItemSet(SfxItemSet& rSet); virtual void Reset(const SfxItemSet& rSet); - SwLabDlg* GetParent() {return (SwLabDlg*) SfxTabPage::GetParent()->GetParent();} + SwLabDlg* GetParentSwLabDlg() {return (SwLabDlg*)GetParentDialog();} }; class SwSaveLabelDlg : public ModalDialog diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx index 07cd90e38b76..343fec9aa038 100644 --- a/sw/source/ui/envelp/labprt.cxx +++ b/sw/source/ui/envelp/labprt.cxx @@ -142,7 +142,7 @@ void SwLabPrtPage::FillItem(SwLabItem& rItem) sal_Bool SwLabPrtPage::FillItemSet(SfxItemSet& rSet) { SwLabItem aItem; - GetParent()->GetLabItem(aItem); + GetParentSwLabDlg()->GetLabItem(aItem); FillItem(aItem); rSet.Put(aItem); @@ -152,7 +152,7 @@ sal_Bool SwLabPrtPage::FillItemSet(SfxItemSet& rSet) void SwLabPrtPage::Reset(const SfxItemSet& ) { SwLabItem aItem; - GetParent()->GetLabItem(aItem); + GetParentSwLabDlg()->GetLabItem(aItem); aColField.SetValue (aItem.nCol); aRowField.SetValue (aItem.nRow); diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx index 23f163d0a4b3..d016b0e83e9a 100644 --- a/sw/source/ui/envelp/labprt.hxx +++ b/sw/source/ui/envelp/labprt.hxx @@ -62,8 +62,7 @@ class SwLabPrtPage : public SfxTabPage DECL_LINK( CountHdl, Button * ); - using Window::GetParent; - SwLabDlg* GetParent() {return (SwLabDlg*) SfxTabPage::GetParent()->GetParent();} + SwLabDlg* GetParentSwLabDlg() {return (SwLabDlg*)GetParentDialog();} using TabPage::ActivatePage; using TabPage::DeactivatePage; diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx index 006555b5dadd..60adf5717ee3 100644 --- a/sw/source/ui/envelp/swuilabimp.hxx +++ b/sw/source/ui/envelp/swuilabimp.hxx @@ -76,7 +76,6 @@ class SwLabPage : public SfxTabPage using TabPage::ActivatePage; using TabPage::DeactivatePage; - using Window::GetParent; public: @@ -88,7 +87,7 @@ public: virtual sal_Bool FillItemSet(SfxItemSet& rSet); virtual void Reset(const SfxItemSet& rSet); - SwLabDlg* GetParent() {return (SwLabDlg*) SfxTabPage::GetParent()->GetParent();} + SwLabDlg* GetParentSwLabDlg() {return (SwLabDlg*) GetParentDialog();} void SetToBusinessCard(); diff --git a/sw/source/ui/inc/envlop.hxx b/sw/source/ui/inc/envlop.hxx index 50dd3dd5f595..657548e24d3b 100644 --- a/sw/source/ui/inc/envlop.hxx +++ b/sw/source/ui/inc/envlop.hxx @@ -115,8 +115,7 @@ class SwEnvPage : public SfxTabPage void InitDatabaseBox(); - using Window::GetParent; - SwEnvDlg* GetParent() {return (SwEnvDlg*) SfxTabPage::GetParent()->GetParent();} + SwEnvDlg* GetParentSwEnvDlg() {return (SwEnvDlg*)GetParentDialog();} using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index f9c7db879ccb..1bf5c7a3618a 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -3425,12 +3425,6 @@ IMPL_LINK(SwTokenWindow, ScrollHdl, ImageButton*, pBtn ) pCtrl = *(aControlList.rbegin()); aRightScrollWin.Enable((pCtrl->GetPosPixel().X() + pCtrl->GetSizePixel().Width()) > nSpace); - -#if OSL_DEBUG_LEVEL > 1 - sMessage.AppendAscii("Move: "); - sMessage += String::CreateFromInt32(nMove); - GetParent()->GetParent()->GetParent()->SetText(sMessage); -#endif } return 0; From 960e57178a81688fef65d3fe339afaa5e3bf2afb Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Tue, 2 Oct 2012 17:45:35 +0200 Subject: [PATCH 199/863] makedepend depends on unistd.h Change-Id: I02df1b67dd9470a4a7225fd8986a52bd88a86e93 --- soltools/Executable_makedepend.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/soltools/Executable_makedepend.mk b/soltools/Executable_makedepend.mk index e301a0937cc4..96a3682a2b0c 100644 --- a/soltools/Executable_makedepend.mk +++ b/soltools/Executable_makedepend.mk @@ -13,6 +13,10 @@ $(eval $(call gb_Executable_add_exception_objects,makedepend,\ soltools/mkdepend/collectdircontent \ )) +$(eval $(call gb_Executable_use_package,makedepend,\ + soltools_inc \ +)) + $(eval $(call gb_Executable_add_defs,makedepend,\ -DNO_X11 \ -DXP_PC \ From 9b95cd5ada9aeb92eaf29bd8a03dfa186bc79ac2 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Tue, 2 Oct 2012 17:47:11 +0200 Subject: [PATCH 200/863] nss depends on soltools Change-Id: Ic532b35cf282186843d886fda578bb20845db415 --- nss/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nss/prj/build.lst b/nss/prj/build.lst index 14963fff7c8d..2377ac2f1740 100644 --- a/nss/prj/build.lst +++ b/nss/prj/build.lst @@ -1,3 +1,3 @@ -ns nss : solenv NULL +ns nss : solenv soltools NULL ns nss nmake - usr1 ns_mkout NULL ns nss nmake - all ns_nss NULL From b31f9715ff0682b6ed4dcf230bf263da4468b00b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Tue, 2 Oct 2012 18:21:46 +0200 Subject: [PATCH 201/863] poppler 0.20.0 makes sdext test fail, fail already in configure But I expect this was too much work to add when the first person ran into this. Change-Id: I8cc84ddec2ffaa76b408f9fb7102ab694347099d --- configure.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure.in b/configure.in index fb54ec32e3eb..fba3bc244c71 100644 --- a/configure.in +++ b/configure.in @@ -9703,6 +9703,9 @@ if test "x$enable_ext_pdfimport" != "xno" -a "x$enable_extension_integration" != AC_MSG_RESULT([external]) SYSTEM_POPPLER=YES PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 ) + # sdext test fails with 0.20.0 + PKG_CHECK_MODULES( POPPLER_NOT_0_20_0, poppler != 0.20.0, + , [AC_MSG_ERROR([Poppler 0.20.0 is broken, do not use --with-system-poppler or use a different version])]) AC_LANG_PUSH([C++]) save_CXXFLAGS=$CXXFLAGS save_CPPFLAGS=$CPPFLAGS From 10272d32865b2d9754f89a50efde6e685b39b036 Mon Sep 17 00:00:00 2001 From: Ivan Timofeev Date: Mon, 1 Oct 2012 21:27:28 +0400 Subject: [PATCH 202/863] String -> OUString Change-Id: Ibbd6305e78738403b5140a27125f452b3ec2ec8b --- starmath/source/unomodel.cxx | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index 0cba7ccee2c2..74a545d79338 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -58,9 +58,6 @@ using namespace ::com::sun::star::formula; using namespace ::com::sun::star::view; using namespace ::com::sun::star::script; - -using rtl::OUString; - #define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L)) #define MM100_TO_TWIP(MM100) ((MM100) >= 0 ? (((MM100)*72L+63L)/127L) : (((MM100)*72L-63L)/127L)) @@ -91,9 +88,9 @@ SmPrintUIOptions::SmPrintUIOptions() // create Section for formula (results in an extra tab page in dialog) SvtModuleOptions aOpt; - String aAppGroupname( aLocalizedStrings.GetString( 0 ) ); - aAppGroupname.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%s" ) ), - aOpt.GetModuleName( SvtModuleOptions::E_SMATH ) ); + OUString aAppGroupname( + aLocalizedStrings.GetString( 0 ). + replaceFirst( "%s", aOpt.GetModuleName( SvtModuleOptions::E_SMATH ) ) ); m_aUIProperties[nIdx++].Value = setGroupControlOpt("tabcontrol-page2", aAppGroupname, ".HelpID:vcl:PrintDialog:TabPage:AppPage"); // create subgroup for print options @@ -473,13 +470,12 @@ void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any* case HANDLE_CUSTOM_FONT_NAME_SANS : case HANDLE_CUSTOM_FONT_NAME_FIXED : { - OUString aText; - *pValues >>= aText; - String sFontName = aText; - if(!sFontName.Len()) + OUString sFontName; + *pValues >>= sFontName; + if(sFontName.isEmpty()) throw IllegalArgumentException(); - if(aFormat.GetFont((*ppEntries)->mnMemberId).GetName() != sFontName) + if(OUString(aFormat.GetFont((*ppEntries)->mnMemberId).GetName()) != sFontName) { const SmFace rOld = aFormat.GetFont((*ppEntries)->mnMemberId); From 6fa4242439466be61c159d54cd85c2c44b631c32 Mon Sep 17 00:00:00 2001 From: Ivan Timofeev Date: Mon, 1 Oct 2012 21:32:31 +0400 Subject: [PATCH 203/863] remove unused method Change-Id: I7acca32fdf9902ce598bdbed32cccdecf9a08907 --- starmath/inc/utility.hxx | 6 ------ starmath/source/utility.cxx | 5 ----- 2 files changed, 11 deletions(-) diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx index 9ea1281eb96f..52aa72e60928 100644 --- a/starmath/inc/utility.hxx +++ b/starmath/inc/utility.hxx @@ -27,10 +27,6 @@ #include -class String; - -///////////////////////////////////////////////////////////////// - inline long SmPtsTo100th_mm(long nNumPts) // returns the length (in 100th of mm) that corresponds to the length // 'nNumPts' (in units points). @@ -126,7 +122,6 @@ class SmPickList : public SfxPtrArr protected: sal_uInt16 nSize; - virtual void *CreateItem(const String& rString) = 0; virtual void *CreateItem(const void *pItem) = 0; virtual void DestroyItem(void *pItem) = 0; @@ -172,7 +167,6 @@ class SmFontDialog; class SmFontPickList : public SmPickList { protected: - virtual void *CreateItem(const String& rString); virtual void *CreateItem(const void *pItem); virtual void DestroyItem(void *pItem); diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx index f1d64400073b..7cef6dec786e 100644 --- a/starmath/source/utility.cxx +++ b/starmath/source/utility.cxx @@ -129,11 +129,6 @@ void SmPickList::Clear() /**************************************************************************/ -void * SmFontPickList::CreateItem(const String& /*rString*/) -{ - return new Font(); -} - void * SmFontPickList::CreateItem(const void *pItem) { return new Font(*((Font *) pItem)); From 3c8e3212045b66abf5af0976c6b4d09b64e051b0 Mon Sep 17 00:00:00 2001 From: Ivan Timofeev Date: Mon, 1 Oct 2012 21:39:33 +0400 Subject: [PATCH 204/863] String -> OUString Change-Id: I1cfd68c37629b4847bad88f54d2866496bc91283 --- starmath/inc/utility.hxx | 4 ++-- starmath/source/utility.cxx | 24 +++++++++--------------- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx index 52aa72e60928..1184c8522afd 100644 --- a/starmath/inc/utility.hxx +++ b/starmath/inc/utility.hxx @@ -127,7 +127,7 @@ protected: virtual bool CompareItem(const void *pFirstItem, const void *pSecondItem) const = 0; - virtual String GetStringItem(void *pItem) = 0; + virtual OUString GetStringItem(void *pItem) = 0; void *GetPtr(sal_uInt16 nPos) const { return SfxPtrArr::GetObject(nPos); } void *&GetPtr(sal_uInt16 nPos) { return SfxPtrArr::GetObject(nPos); } @@ -172,7 +172,7 @@ protected: virtual bool CompareItem(const void *pFirstItem, const void *pSecondItem) const; - virtual String GetStringItem(void *pItem); + virtual OUString GetStringItem(void *pItem); public: SmFontPickList() diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx index 7cef6dec786e..cde1b35a4769 100644 --- a/starmath/source/utility.cxx +++ b/starmath/source/utility.cxx @@ -19,7 +19,6 @@ #include #include -#include #include #include @@ -156,28 +155,23 @@ bool SmFontPickList::CompareItem(const void *pFirstItem, const void *pSecondItem return false; } -String SmFontPickList::GetStringItem(void *pItem) +OUString SmFontPickList::GetStringItem(void *pItem) { - Font *pFont; - String aString; - const sal_Char *pDelim = ", "; - - pFont = (Font *)pItem; - - aString = pFont->GetName(); + Font *pFont = (Font *)pItem; + OUStringBuffer aString(pFont->GetName()); if (IsItalic( *pFont )) { - aString.AppendAscii( pDelim ); - aString += String(SmResId(RID_FONTITALIC)); + aString.append(", "); + aString.append(SM_RESSTR(RID_FONTITALIC)); } if (IsBold( *pFont )) { - aString.AppendAscii( pDelim ); - aString += String(SmResId(RID_FONTBOLD)); + aString.append(", "); + aString.append(SM_RESSTR(RID_FONTBOLD)); } - return (aString); + return aString.makeStringAndClear(); } void SmFontPickList::Insert(const Font &rFont) @@ -213,7 +207,7 @@ void SmFontPickList::WriteTo(SmFontDialog& rDialog) const IMPL_LINK( SmFontPickListBox, SelectHdl, ListBox *, /*pListBox*/ ) { sal_uInt16 nPos; - String aString; + OUString aString; nPos = GetSelectEntryPos(); From 939d6400401d01658d173b67d17b2051c3468bb6 Mon Sep 17 00:00:00 2001 From: Ivan Timofeev Date: Mon, 1 Oct 2012 22:09:35 +0400 Subject: [PATCH 205/863] String -> OUString Change-Id: I9921e9803e5d63fafffbfcf15e5c4fc2c9080669 --- starmath/inc/edit.hxx | 2 +- starmath/source/edit.cxx | 60 +++++++++++++++----------------- starmath/source/mathmlexport.cxx | 2 +- starmath/source/mathmlimport.cxx | 3 +- 4 files changed, 32 insertions(+), 35 deletions(-) diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx index 2096b926ce21..67e657491e49 100644 --- a/starmath/inc/edit.hxx +++ b/starmath/inc/edit.hxx @@ -118,7 +118,7 @@ public: void MarkError(const Point &rPos); void SelNextMark(); void SelPrevMark(); - bool HasMark(const String &rText) const; + bool HasMark(const OUString &rText) const; void Flush(); void DeleteEditView( SmViewShell &rView ); diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx index 5091d409aedc..1c0510ab98d1 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -237,7 +237,7 @@ void SmEditWindow::DataChanged( const DataChangedEvent& ) // forces new settings to be used // unfortunately this resets the whole edit engine // thus we need to save at least the text - String aTxt( pEditEngine->GetText( LINEEND_LF ) ); + OUString aTxt( pEditEngine->GetText( LINEEND_LF ) ); pEditEngine->Clear(); //incorrect font size pEditEngine->SetText( aTxt ); } @@ -686,8 +686,8 @@ bool SmEditWindow::IsAllSelected() const sal_Int32 nParaCnt = pEditEngine->GetParagraphCount(); if (!(nParaCnt - 1)) { - String Text( pEditEngine->GetText( LINEEND_LF ) ); - bRes = !eSelection.nStartPos && (eSelection.nEndPos == Text.Len () - 1); + sal_uInt16 nTextLen = pEditEngine->GetText( LINEEND_LF ).Len(); + bRes = !eSelection.nStartPos && (eSelection.nEndPos == nTextLen - 1); } else { @@ -719,7 +719,7 @@ void SmEditWindow::InsertCommand(sal_uInt16 nCommand) aSelection.nEndPara = aSelection.nStartPara; OSL_ENSURE( pEditView, "NULL pointer" ); - String aText = String(SmResId(nCommand)); + OUString aText = SM_RESSTR(nCommand); pEditView->InsertText(aText); if (HasMark(aText)) @@ -729,7 +729,7 @@ void SmEditWindow::InsertCommand(sal_uInt16 nCommand) } else { // set selection after inserted text - aSelection.nEndPos = aSelection.nEndPos + sal::static_int_cast< xub_StrLen >(aText.Len()); + aSelection.nEndPos += aText.getLength(); aSelection.nStartPos = aSelection.nEndPos; pEditView->SetSelection(aSelection); } @@ -761,23 +761,21 @@ void SmEditWindow::SelNextMark() if (pEditEngine && pEditView) { ESelection eSelection = pEditView->GetSelection(); - sal_uInt16 Pos = eSelection.nEndPos; - rtl::OUString aMark(""); - String aText; + sal_Int32 nPos = eSelection.nEndPos; sal_uInt16 nCounts = pEditEngine->GetParagraphCount(); while (eSelection.nEndPara < nCounts) { - aText = pEditEngine->GetText( eSelection.nEndPara ); - Pos = aText.Search(aMark, Pos); - - if (Pos != STRING_NOTFOUND) + OUString aText = pEditEngine->GetText(eSelection.nEndPara); + nPos = aText.indexOf("", nPos); + if (nPos != -1) { - pEditView->SetSelection(ESelection (eSelection.nEndPara, Pos, eSelection.nEndPara, Pos + 3)); + pEditView->SetSelection(ESelection( + eSelection.nEndPara, nPos, eSelection.nEndPara, nPos + 3)); break; } - Pos = 0; + nPos = 0; eSelection.nEndPara++; } } @@ -791,43 +789,43 @@ void SmEditWindow::SelPrevMark() if (pEditEngine && pEditView) { ESelection eSelection = pEditView->GetSelection(); - sal_uInt16 Pos = STRING_NOTFOUND; - xub_StrLen Max = eSelection.nStartPos; - String Text( pEditEngine->GetText( eSelection.nStartPara ) ); - rtl::OUString aMark(""); + sal_Int32 nPos = -1; + sal_Int32 nMax = eSelection.nStartPos; + OUString aText(pEditEngine->GetText(eSelection.nStartPara)); + OUString aMark(""); sal_uInt16 nCounts = pEditEngine->GetParagraphCount(); do { - sal_uInt16 Fnd = Text.Search(aMark, 0); - - while ((Fnd < Max) && (Fnd != STRING_NOTFOUND)) + sal_Int32 nMarkIndex = aText.indexOf(aMark); + while ((nMarkIndex < nMax) && (nMarkIndex != -1)) { - Pos = Fnd; - Fnd = Text.Search(aMark, Fnd + 1); + nPos = nMarkIndex; + nMarkIndex = aText.indexOf(aMark, nMarkIndex + 1); } - if (Pos == STRING_NOTFOUND) + if (nPos == -1) { eSelection.nStartPara--; - Text = pEditEngine->GetText( eSelection.nStartPara ); - Max = Text.Len(); + aText = pEditEngine->GetText(eSelection.nStartPara); + nMax = aText.getLength(); } } while ((eSelection.nStartPara < nCounts) && - (Pos == STRING_NOTFOUND)); + (nPos == -1)); - if (Pos != STRING_NOTFOUND) + if (nPos != -1) { - pEditView->SetSelection(ESelection (eSelection.nStartPara, Pos, eSelection.nStartPara, Pos + 3)); + pEditView->SetSelection(ESelection( + eSelection.nStartPara, nPos, eSelection.nStartPara, nPos + 3)); } } } -bool SmEditWindow::HasMark(const String& rText) const +bool SmEditWindow::HasMark(const OUString& rText) const // returns true iff 'rText' contains a mark { - return rText.SearchAscii("", 0) != STRING_NOTFOUND; + return rText.indexOf("") != -1; } void SmEditWindow::MouseMove(const MouseEvent &rEvt) diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx index ccca612276e0..1ecaff1db896 100644 --- a/starmath/source/mathmlexport.cxx +++ b/starmath/source/mathmlexport.cxx @@ -134,7 +134,7 @@ sal_Bool SmXMLExportWrapper::Export(SfxMedium &rMedium) if (xStatusIndicator.is()) { sal_Int32 nProgressRange = bFlat ? 1 : 3; - xStatusIndicator->start(String(SmResId(STR_STATSTR_WRITING)), + xStatusIndicator->start(SM_RESSTR(STR_STATSTR_WRITING), nProgressRange); } } diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx index 04d26efe36d1..a71fc36683fc 100644 --- a/starmath/source/mathmlimport.cxx +++ b/starmath/source/mathmlimport.cxx @@ -171,8 +171,7 @@ sal_uLong SmXMLImportWrapper::Import(SfxMedium &rMedium) sal_Int32 nProgressRange(nSteps); if (xStatusIndicator.is()) { - xStatusIndicator->start(String(SmResId(STR_STATSTR_READING)), - nProgressRange); + xStatusIndicator->start(SM_RESSTR(STR_STATSTR_READING), nProgressRange); } nSteps=0; From 86b9e14bc8fed823ae39ebc5fee62e98c524d3fe Mon Sep 17 00:00:00 2001 From: Ivan Timofeev Date: Tue, 2 Oct 2012 16:59:26 +0400 Subject: [PATCH 206/863] String -> OUString Change-Id: I88873eec738a068152e7d7be0dc4ab86fcfe345a --- starmath/inc/edit.hxx | 2 +- starmath/source/cursor.cxx | 2 +- starmath/source/edit.cxx | 4 ++-- starmath/source/view.cxx | 12 ++---------- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx index 67e657491e49..be7b52d8c397 100644 --- a/starmath/inc/edit.hxx +++ b/starmath/inc/edit.hxx @@ -113,7 +113,7 @@ public: void Paste(); void Delete(); void SelectAll(); - void InsertText(const String &rText); + void InsertText(const OUString &rText); void InsertCommand(sal_uInt16 nCommand); void MarkError(const Point &rPos); void SelNextMark(); diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx index c3514ad6e873..8ba0529bf2cf 100644 --- a/starmath/source/cursor.cxx +++ b/starmath/source/cursor.cxx @@ -484,7 +484,7 @@ SmNodeList::iterator SmCursor::TakeSelectedNodesFromList(SmNodeList *pLineList, } //If we need to save the selected text if(pSelectedNodes && len2 > 0) { - String str = aText.copy(start2, len2); + OUString str = aText.copy(start2, len2); SmTextNode* pSeg2 = new SmTextNode(aToken, eFontDesc); pSeg2->ChangeText(str); pSelectedNodes->push_back(pSeg2); diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx index 1c0510ab98d1..b6d83e0f6e9f 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -912,12 +912,12 @@ void SmEditWindow::Delete() } } -void SmEditWindow::InsertText(const String& Text) +void SmEditWindow::InsertText(const OUString& rText) { OSL_ENSURE( pEditView, "EditView missing" ); if (pEditView) { - pEditView->InsertText(Text); + pEditView->InsertText(rText); aModifyTimer.Start(); StartCursorMove(); } diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 5707439852fe..2f7e0a7a4baf 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -1466,8 +1466,6 @@ bool SmViewShell::Insert( SfxMedium& rMedium ) RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::Insert" ); SmDocShell *pDoc = GetDoc(); - String aText( pDoc->GetText() ); - String aTemp = aText; bool bRet = false; uno::Reference < embed::XStorage > xStorage = rMedium.GetStorage(); @@ -1485,15 +1483,13 @@ bool SmViewShell::Insert( SfxMedium& rMedium ) if( bRet ) { - aText = pDoc->GetText(); + OUString aText = pDoc->GetText(); SmEditWindow *pEditWin = GetEditWindow(); if (pEditWin) pEditWin->InsertText( aText ); else { OSL_FAIL( "EditWindow missing" ); - aTemp += aText; - aText = aTemp; } pDoc->Parse(); @@ -1514,8 +1510,6 @@ bool SmViewShell::InsertFrom(SfxMedium &rMedium) bool bSuccess = false; SmDocShell *pDoc = GetDoc(); SvStream *pStream = rMedium.GetInStream(); - String aText( pDoc->GetText() ); - String aTemp = aText; if (pStream) { @@ -1530,15 +1524,13 @@ bool SmViewShell::InsertFrom(SfxMedium &rMedium) if( bSuccess ) { - aText = pDoc->GetText(); + OUString aText = pDoc->GetText(); SmEditWindow *pEditWin = GetEditWindow(); if (pEditWin) pEditWin->InsertText( aText ); else { OSL_FAIL( "EditWindow missing" ); - aTemp += aText; - aText = aTemp; } pDoc->Parse(); From 509d964e985b58ddc4c20ccc163809a6f3623d8a Mon Sep 17 00:00:00 2001 From: Ivan Timofeev Date: Tue, 2 Oct 2012 20:43:41 +0400 Subject: [PATCH 207/863] correct help string: horizontal -> vertical Change-Id: Id67da9d90a8fa21b99733c448fc32e81c6f1ab46 --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index fba3bc244c71..2974db0d21d0 100644 --- a/configure.in +++ b/configure.in @@ -1989,7 +1989,7 @@ AC_ARG_WITH(intro-progressbar-text-color, AC_ARG_WITH(intro-progressbar-text-baseline, AS_HELP_STRING([--with-intro-progressbar-text-baseline], - [Set horizontal position of progress bar text on intro screen. Value in decimal format.]) + [Set vertical position of progress bar text on intro screen. Value in decimal format.]) [ Usage: --with-intro-progressbar-text-baseline=250 ],,) From 2d25eea6949196d2275d8b2bd484e6dab0163a33 Mon Sep 17 00:00:00 2001 From: Ivan Timofeev Date: Tue, 2 Oct 2012 20:53:27 +0400 Subject: [PATCH 208/863] splash screen: fix RTL mode Change-Id: I6a00cba8fda11351ed5340f21678c330ce028a2d --- desktop/source/splash/splash.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx index e55b5b2b1b41..95cdc670296a 100644 --- a/desktop/source/splash/splash.cxx +++ b/desktop/source/splash/splash.cxx @@ -155,6 +155,7 @@ SplashScreen::SplashScreen() , _yoffset(18) { loadConfig(); + _vdev.EnableRTL(IsRTLEnabled()); } SplashScreen::~SplashScreen() From 595ba03fd4769c069bbe0431ab878956ef1c37ad Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Tue, 2 Oct 2012 18:39:30 +0100 Subject: [PATCH 209/863] update string copy semantics to be undefined in a non-crashing way. Change-Id: I03bb4db5931932280e368012cbaee6bef2854dd6 --- sal/inc/rtl/string.h | 17 +++++++++++++++++ sal/inc/rtl/string.hxx | 36 ++++++++++++------------------------ sal/inc/rtl/ustring.h | 17 +++++++++++++++++ sal/inc/rtl/ustring.hxx | 36 ++++++++++++------------------------ sal/rtl/source/strtmpl.cxx | 23 +++++++++++++++++++++++ sal/util/sal.map | 6 ++++++ 6 files changed, 87 insertions(+), 48 deletions(-) diff --git a/sal/inc/rtl/string.h b/sal/inc/rtl/string.h index c38e106e6fdb..6dd42363b98a 100644 --- a/sal/inc/rtl/string.h +++ b/sal/inc/rtl/string.h @@ -889,6 +889,23 @@ SAL_DLLPUBLIC void SAL_CALL rtl_string_newFromStr( rtl_String ** newStr, const s */ SAL_DLLPUBLIC void SAL_CALL rtl_string_newFromStr_WithLength( rtl_String ** newStr, const sal_Char * value, sal_Int32 len ) SAL_THROW_EXTERN_C(); +/** Allocate a new string that is a substring of this string. + + The substring begins at the specified beginIndex and contains count + characters. Meaningless combinations such as negative beginIndex, + or beginIndex + count greater than the length of the string have + undefined behaviour. + + @param beginIndex the beginning index, inclusive. + @param count the number of characters. + @return the specified substring. + + @since LibreOffice 3.7 + */ +SAL_DLLPUBLIC void SAL_CALL rtl_string_newFromSubString( + rtl_String ** newStr, const rtl_String * from, + sal_Int32 beginIndex, sal_Int32 count ) SAL_THROW_EXTERN_C(); + /** @internal @since LibreOffice 3.6 diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx index 84ab48e05dc6..d58999b812f6 100644 --- a/sal/inc/rtl/string.hxx +++ b/sal/inc/rtl/string.hxx @@ -1024,31 +1024,27 @@ public: /** Returns a new string that is a substring of this string. - The substring begins at the specified beginIndex. It is an error for - beginIndex to be negative or to be greater than the length of this string. + The substring begins at the specified beginIndex. If + beginIndex is negative or be greater than the length of + this string, behaviour is undefined. @param beginIndex the beginning index, inclusive. @return the specified substring. */ OString copy( sal_Int32 beginIndex ) const SAL_THROW(()) { - assert(beginIndex >= 0 && beginIndex <= getLength()); - if ( beginIndex == 0 ) - return *this; - else - { - rtl_String* pNew = 0; - rtl_string_newFromStr_WithLength( &pNew, pData->buffer+beginIndex, getLength()-beginIndex ); - return OString( pNew, (DO_NOT_ACQUIRE*)0 ); - } + rtl_String *pNew = 0; + rtl_string_newFromSubString( &pNew, pData, beginIndex, getLength() - beginIndex ); + return OString( pNew, (DO_NOT_ACQUIRE*)0 ); } /** Returns a new string that is a substring of this string. The substring begins at the specified beginIndex and contains count - characters. It is an error for either beginIndex or count to be negative, - or for beginIndex + count to be greater than the length of this string. + characters. If either beginIndex or count are negative, + or beginIndex + count are greater than the length of this string + then behaviour is undefined. @param beginIndex the beginning index, inclusive. @param count the number of characters. @@ -1056,17 +1052,9 @@ public: */ OString copy( sal_Int32 beginIndex, sal_Int32 count ) const SAL_THROW(()) { - assert(beginIndex >= 0 && beginIndex <= getLength() && count >= 0 - && sal::static_int_cast(count) <= - sal::static_int_cast(getLength() - beginIndex)); - if ( (beginIndex == 0) && (count == getLength()) ) - return *this; - else - { - rtl_String* pNew = 0; - rtl_string_newFromStr_WithLength( &pNew, pData->buffer+beginIndex, count ); - return OString( pNew, (DO_NOT_ACQUIRE*)0 ); - } + rtl_String *pNew = 0; + rtl_string_newFromSubString( &pNew, pData, beginIndex, count ); + return OString( pNew, (DO_NOT_ACQUIRE*)0 ); } /** diff --git a/sal/inc/rtl/ustring.h b/sal/inc/rtl/ustring.h index 5b4982ec1461..231dcdce253a 100644 --- a/sal/inc/rtl/ustring.h +++ b/sal/inc/rtl/ustring.h @@ -1226,6 +1226,23 @@ SAL_DLLPUBLIC void SAL_CALL rtl_uString_newFromStr( SAL_DLLPUBLIC void SAL_CALL rtl_uString_newFromStr_WithLength( rtl_uString ** newStr, const sal_Unicode * value, sal_Int32 len ) SAL_THROW_EXTERN_C(); +/** Allocate a new string that is a substring of this string. + + The substring begins at the specified beginIndex and contains count + characters. Meaningless combinations such as negative beginIndex, + or beginIndex + count greater than the length of the string have + undefined behaviour. + + @param beginIndex the beginning index, inclusive. + @param count the number of characters. + @return the specified substring. + + @since LibreOffice 3.7 + */ +SAL_DLLPUBLIC void SAL_CALL rtl_uString_newFromSubString( + rtl_uString ** newStr, const rtl_uString * from, + sal_Int32 beginIndex, sal_Int32 count ) SAL_THROW_EXTERN_C(); + /** Allocate a new string that contains a copy of a character array. If the length of value is greater than zero, the reference count of the diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx index b008054e17e3..e12a4b0b6256 100644 --- a/sal/inc/rtl/ustring.hxx +++ b/sal/inc/rtl/ustring.hxx @@ -1340,31 +1340,27 @@ public: /** Returns a new string that is a substring of this string. - The substring begins at the specified beginIndex. It is an error for - beginIndex to be negative or to be greater than the length of this string. + The substring begins at the specified beginIndex. If + beginIndex is negative or be greater than the length of + this string, behaviour is undefined. @param beginIndex the beginning index, inclusive. @return the specified substring. */ OUString copy( sal_Int32 beginIndex ) const SAL_THROW(()) { - assert(beginIndex >= 0 && beginIndex <= getLength()); - if ( beginIndex == 0 ) - return *this; - else - { - rtl_uString* pNew = 0; - rtl_uString_newFromStr_WithLength( &pNew, pData->buffer+beginIndex, getLength()-beginIndex ); - return OUString( pNew, (DO_NOT_ACQUIRE*)0 ); - } + rtl_uString *pNew = 0; + rtl_uString_newFromSubString( &pNew, pData, beginIndex, getLength() - beginIndex ); + return OUString( pNew, (DO_NOT_ACQUIRE*)0 ); } /** Returns a new string that is a substring of this string. The substring begins at the specified beginIndex and contains count - characters. It is an error for either beginIndex or count to be negative, - or for beginIndex + count to be greater than the length of this string. + characters. If either beginIndex or count are negative, + or beginIndex + count are greater than the length of this string + then behaviour is undefined. @param beginIndex the beginning index, inclusive. @param count the number of characters. @@ -1372,17 +1368,9 @@ public: */ OUString copy( sal_Int32 beginIndex, sal_Int32 count ) const SAL_THROW(()) { - assert(beginIndex >= 0 && beginIndex <= getLength() && count >= 0 - && sal::static_int_cast< sal_uInt32 >(count) <= - sal::static_int_cast< sal_uInt32 >(getLength() - beginIndex)); - if ( (beginIndex == 0) && (count == getLength()) ) - return *this; - else - { - rtl_uString* pNew = 0; - rtl_uString_newFromStr_WithLength( &pNew, pData->buffer+beginIndex, count ); - return OUString( pNew, (DO_NOT_ACQUIRE*)0 ); - } + rtl_uString *pNew = 0; + rtl_uString_newFromSubString( &pNew, pData, beginIndex, count ); + return OUString( pNew, (DO_NOT_ACQUIRE*)0 ); } /** diff --git a/sal/rtl/source/strtmpl.cxx b/sal/rtl/source/strtmpl.cxx index ebb0da199f2c..6069349bd36a 100644 --- a/sal/rtl/source/strtmpl.cxx +++ b/sal/rtl/source/strtmpl.cxx @@ -1194,6 +1194,29 @@ void SAL_CALL IMPL_RTL_STRINGNAME( newFromStr_WithLength )( IMPL_RTL_STRINGDATA* /* ----------------------------------------------------------------------- */ +void SAL_CALL IMPL_RTL_STRINGNAME( newFromSubString )( IMPL_RTL_STRINGDATA** ppThis, + const IMPL_RTL_STRINGDATA* pFrom, + sal_Int32 beginIndex, + sal_Int32 count ) + SAL_THROW_EXTERN_C() +{ + if ( beginIndex == 0 && count == pFrom->length ) + { + IMPL_RTL_STRINGNAME( assign )( ppThis, const_cast< IMPL_RTL_STRINGDATA * >( pFrom ) ); + return; + } + if ( count < 0 || beginIndex < 0 || beginIndex + count > pFrom->length ) + { + OSL_FAIL( "Out of bounds substring access" ); + IMPL_RTL_STRINGNAME( newFromLiteral )( ppThis, "!!br0ken!!", 10, 0 ); + return; + } + + IMPL_RTL_STRINGNAME( newFromStr_WithLength )( ppThis, pFrom->buffer + beginIndex, count ); +} + +/* ----------------------------------------------------------------------- */ + // Used when creating from string literals. void SAL_CALL IMPL_RTL_STRINGNAME( newFromLiteral )( IMPL_RTL_STRINGDATA** ppThis, const sal_Char* pCharStr, diff --git a/sal/util/sal.map b/sal/util/sal.map index 7a431c3872d9..9efed6aaea9a 100644 --- a/sal/util/sal.map +++ b/sal/util/sal.map @@ -627,6 +627,12 @@ LIBO_UDK_3.6 { # symbols available in >= LibO 3.6 rtl_uStringBuffer_makeStringAndClear; } UDK_3.10; +LIBO_UDK_3.7 { # symbols available in >= LibO 3.7 + global: + rtl_string_newFromSubString; + rtl_uString_newFromSubString; +} UDK_3.10; + PRIVATE_1.0 { global: osl_detail_ObjectRegistry_storeAddresses; From dde7ff4da28e754c2542191f363d8de78388e75a Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Tue, 2 Oct 2012 18:15:38 +0200 Subject: [PATCH 210/863] simplify and speed up color format rendering Change-Id: I7f9abc1e20ffb7d49ebae0c0f9d5e50f91b074c0 --- sc/inc/colorscale.hxx | 16 ++- sc/source/core/data/colorscale.cxx | 206 ++++++++++------------------- 2 files changed, 88 insertions(+), 134 deletions(-) diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx index df3e17a66507..146c10b7c28e 100644 --- a/sc/inc/colorscale.hxx +++ b/sc/inc/colorscale.hxx @@ -189,10 +189,24 @@ public: virtual void DataChanged(const ScRange& rRange) = 0; virtual void SetParent(ScConditionalFormat* pParent); + virtual void startRendering(); + virtual void endRendering(); + protected: - void getValues( std::vector& rValues ) const; + std::vector& getValues() const; + + double getMinValue() const; + double getMaxValue() const; ScConditionalFormat* mpParent; + +private: + + struct ScColorFormatCache + { + std::vector maValues; + }; + mutable boost::scoped_ptr mpCache; }; class SC_DLLPUBLIC ScColorScaleFormat : public ScColorFormat diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx index b224b51f12ff..6951e8b1af1e 100644 --- a/sc/source/core/data/colorscale.cxx +++ b/sc/source/core/data/colorscale.cxx @@ -34,6 +34,8 @@ #include #endif +#include + ScColorScaleEntry::ScColorScaleEntry(): mnVal(0), mpCell(NULL), @@ -239,103 +241,6 @@ ScColorScaleEntryType ScColorScaleEntry::GetType() const return meType; } -namespace { - -double getMinValue(const ScRange& rRange, ScDocument* pDoc) -{ - double aMinValue = std::numeric_limits::max(); - //iterate through columns - SCTAB nTab = rRange.aStart.Tab(); - for(SCCOL nCol = rRange.aStart.Col(); nCol <= rRange.aEnd.Col(); ++nCol) - { - for(SCROW nRow = rRange.aStart.Row(); nRow <= rRange.aEnd.Row(); ++nRow) - { - ScAddress aAddr(nCol, nRow, rRange.aStart.Tab()); - CellType eType = pDoc->GetCellType(aAddr); - if(eType == CELLTYPE_VALUE) - { - double aVal = pDoc->GetValue(nCol, nRow, nTab); - if( aVal < aMinValue ) - aMinValue = aVal; - } - else if(eType == CELLTYPE_FORMULA) - { - if(static_cast(pDoc->GetCell(aAddr))->IsValue()) - { - double aVal = pDoc->GetValue(nCol, nRow, nTab); - if( aVal < aMinValue ) - aMinValue = aVal; - } - } - } - } - return aMinValue; -} - -double getMaxValue(const ScRange& rRange, ScDocument* pDoc) -{ - double aMaxValue = std::numeric_limits::min(); - //iterate through columns - SCTAB nTab = rRange.aStart.Tab(); - for(SCCOL nCol = rRange.aStart.Col(); nCol <= rRange.aEnd.Col(); ++nCol) - { - for(SCROW nRow = rRange.aStart.Row(); nRow <= rRange.aEnd.Row(); ++nRow) - { - ScAddress aAddr(nCol, nRow, rRange.aStart.Tab()); - CellType eType = pDoc->GetCellType(aAddr); - if(eType == CELLTYPE_VALUE) - { - double aVal = pDoc->GetValue(nCol, nRow, nTab); - if( aVal > aMaxValue ) - aMaxValue = aVal; - } - else if(eType == CELLTYPE_FORMULA) - { - if(static_cast(pDoc->GetCell(aAddr))->IsValue()) - { - double aVal = pDoc->GetValue(nCol, nRow, nTab); - if( aVal > aMaxValue ) - aMaxValue = aVal; - } - } - } - } - return aMaxValue; -} - -double getMinValue(const ScRangeList& rList, ScDocument* pDoc) -{ - double aMinValue = std::numeric_limits::max(); - - size_t n = rList.size(); - for(size_t i = 0; i < n; ++i) - { - const ScRange* pRange = rList[i]; - double aVal = getMinValue(*pRange, pDoc); - if( aVal < aMinValue ) - aMinValue = aVal; - } - return aMinValue; -} - -double getMaxValue(const ScRangeList& rList, ScDocument* pDoc) -{ - double aMaxVal = std::numeric_limits::min(); - - size_t n = rList.size(); - for(size_t i = 0; i < n; ++i) - { - const ScRange* pRange = rList[i]; - double aVal = getMaxValue(*pRange, pDoc); - if( aVal > aMaxVal ) - aMaxVal = aVal; - } - - return aMaxVal; -} - -} - double ScColorScaleFormat::GetMinValue() const { const_iterator itr = maColorScales.begin(); @@ -344,7 +249,7 @@ double ScColorScaleFormat::GetMinValue() const return itr->GetValue(); else { - return getMinValue(GetRange(), mpDoc); + return getMinValue(); } } @@ -356,7 +261,7 @@ double ScColorScaleFormat::GetMaxValue() const return itr->GetValue(); else { - return getMaxValue(GetRange(), mpDoc); + return getMaxValue(); } } @@ -371,36 +276,72 @@ const ScRangeList& ScColorFormat::GetRange() const return mpParent->GetRange(); } -void ScColorFormat::getValues(std::vector& rValues) const +std::vector& ScColorFormat::getValues() const { - size_t n = GetRange().size(); - const ScRangeList& aRanges = GetRange(); - for(size_t i = 0; i < n; ++i) + if(!mpCache) { - const ScRange* pRange = aRanges[i]; - SCTAB nTab = pRange->aStart.Tab(); - for(SCCOL nCol = pRange->aStart.Col(); nCol <= pRange->aEnd.Col(); ++nCol) + mpCache.reset(new ScColorFormatCache); + std::vector& rValues = mpCache->maValues; + + size_t n = GetRange().size(); + const ScRangeList& aRanges = GetRange(); + for(size_t i = 0; i < n; ++i) { - for(SCCOL nRow = pRange->aStart.Row(); nRow <= pRange->aEnd.Row(); ++nRow) + const ScRange* pRange = aRanges[i]; + SCTAB nTab = pRange->aStart.Tab(); + for(SCCOL nCol = pRange->aStart.Col(); nCol <= pRange->aEnd.Col(); ++nCol) { - ScAddress aAddr(nCol, nRow, nTab); - CellType eType = mpDoc->GetCellType(aAddr); - if(eType == CELLTYPE_VALUE) + for(SCCOL nRow = pRange->aStart.Row(); nRow <= pRange->aEnd.Row(); ++nRow) { - double aVal = mpDoc->GetValue(nCol, nRow, nTab); - rValues.push_back(aVal); - } - else if(eType == CELLTYPE_FORMULA) - { - if(static_cast(mpDoc->GetCell(aAddr))->IsValue()) + ScAddress aAddr(nCol, nRow, nTab); + CellType eType = mpDoc->GetCellType(aAddr); + if(eType == CELLTYPE_VALUE) { double aVal = mpDoc->GetValue(nCol, nRow, nTab); rValues.push_back(aVal); } + else if(eType == CELLTYPE_FORMULA) + { + if(static_cast(mpDoc->GetCell(aAddr))->IsValue()) + { + double aVal = mpDoc->GetValue(nCol, nRow, nTab); + rValues.push_back(aVal); + } + } } } } + + std::sort(rValues.begin(), rValues.end()); } + + return mpCache->maValues; +} + +double ScColorFormat::getMinValue() const +{ + std::vector& rValues = getValues(); + if(rValues.empty()) + return 0; + return rValues[0]; +} + +double ScColorFormat::getMaxValue() const +{ + std::vector& rValues = getValues(); + if(rValues.empty()) + return 0; + return rValues[rValues.size()-1]; +} + +void ScColorFormat::startRendering() +{ + mpCache.reset(); +} + +void ScColorFormat::endRendering() +{ + mpCache.reset(); } namespace { @@ -426,20 +367,22 @@ Color CalcColor( double nVal, double nVal1, const Color& rCol1, double nVal2, co return Color(nColRed, nColGreen, nColBlue); } -double GetPercentile( std::vector& rArray, double fPercentile ) +/** + * @param rVector sorted vector of the array + * @param fPercentile percentile + */ +double GetPercentile( const std::vector& rArray, double fPercentile ) { size_t nSize = rArray.size(); size_t nIndex = (size_t)::rtl::math::approxFloor( fPercentile * (nSize-1)); double fDiff = fPercentile * (nSize-1) - ::rtl::math::approxFloor( fPercentile * (nSize-1)); - std::vector::iterator iter = rArray.begin() + nIndex; - ::std::nth_element( rArray.begin(), iter, rArray.end()); + std::vector::const_iterator iter = rArray.begin() + nIndex; if (fDiff == 0.0) return *iter; else { double fVal = *iter; iter = rArray.begin() + nIndex+1; - ::std::nth_element( rArray.begin(), iter, rArray.end()); return fVal + fDiff * (*iter - fVal); } } @@ -462,14 +405,13 @@ double ScColorScaleFormat::CalcValue(double nMin, double nMax, ScColorScaleForma return std::max(0, nMax); case COLORSCALE_PERCENTILE: { - std::vector aValues; - getValues(aValues); - if(aValues.size() == 1) - return aValues[0]; + std::vector& rValues = getValues(); + if(rValues.size() == 1) + return rValues[0]; else { double fPercentile = itr->GetValue()/100.0; - return GetPercentile(aValues, fPercentile); + return GetPercentile(rValues, fPercentile); } } @@ -745,9 +687,8 @@ double ScDataBarFormat::getMin(double nMin, double nMax) const case COLORSCALE_PERCENTILE: { double fPercentile = mpFormatData->mpLowerLimit->GetValue()/100.0; - std::vector aValues; - getValues(aValues); - return GetPercentile(aValues, fPercentile); + std::vector& rValues = getValues(); + return GetPercentile(rValues, fPercentile); } default: @@ -770,9 +711,8 @@ double ScDataBarFormat::getMax(double nMin, double nMax) const case COLORSCALE_PERCENTILE: { double fPercentile = mpFormatData->mpUpperLimit->GetValue()/100.0; - std::vector aValues; - getValues(aValues); - return GetPercentile(aValues, fPercentile); + std::vector& rValues = getValues(); + return GetPercentile(rValues, fPercentile); } default: @@ -796,8 +736,8 @@ ScDataBarInfo* ScDataBarFormat::GetDataBarInfo(const ScAddress& rAddr) const // now we have for sure a value // - double nValMin = getMinValue(GetRange(), mpDoc); - double nValMax = getMaxValue(GetRange(), mpDoc); + double nValMin = getMinValue(); + double nValMax = getMaxValue(); double nMin = getMin(nValMin, nValMax); double nMax = getMax(nValMin, nValMax); From 02a7bf55603d8b1e74b83bb2b02fa86e1e31807b Mon Sep 17 00:00:00 2001 From: Marcos Paulo de Souza Date: Tue, 2 Oct 2012 13:29:18 -0300 Subject: [PATCH 211/863] Remove not used macros from lotusworkpro Change-Id: I0c5b52030e9837f5ee9aa6258b6ccb16dd3f03c0 Signed-off-by: Marcos Paulo de Souza Reviewed-on: https://gerrit.libreoffice.org/749 Reviewed-by: Michael Stahl Tested-by: Michael Stahl --- lotuswordpro/source/filter/bentoid.hxx | 17 ----------------- lotuswordpro/source/filter/lwpdoc.hxx | 9 --------- lotuswordpro/source/filter/lwpfribheader.hxx | 3 --- lotuswordpro/source/filter/lwpgrfobj.cxx | 19 ++----------------- lotuswordpro/source/filter/lwplayout.hxx | 14 -------------- lotuswordpro/source/filter/lwpoleobject.hxx | 2 -- .../source/filter/xfilter/xfframe.cxx | 1 - 7 files changed, 2 insertions(+), 63 deletions(-) diff --git a/lotuswordpro/source/filter/bentoid.hxx b/lotuswordpro/source/filter/bentoid.hxx index 135b190f3f38..d34cc45a1510 100644 --- a/lotuswordpro/source/filter/bentoid.hxx +++ b/lotuswordpro/source/filter/bentoid.hxx @@ -61,20 +61,11 @@ namespace OpenStormBento #define BEN_OBJID_TOC 1 // TOC object ID #define BEN_PROPID_TOC_SEED 2 // TOC object starting seed -#define BEN_PROPID_TOC_MIN_SEED 3 // TOC object minimum seed -#define BEN_PROPID_TOC_OBJECT 4 // TOC object -#define BEN_PROPID_TOC_CONTAINER 5 // TOC object entire container -#define BEN_PROPID_TOC_DELETED 6 // TOC object amount deleted #define BEN_TYPEID_TOC_TYPE 19 // TOC object property value type -#define BEN_OBJID_WRITEABLE 20 // Predefined ID's below this value will be - // written to container TOC. Predefined IDs - // above this are not written #define BEN_TYPEID_7_BIT_ASCII 21 // 7-bit ASCII #define BEN_PROPID_GLOBAL_TYPE_NAME 23 // Global type name #define BEN_PROPID_GLOBAL_PROPERTY_NAME 24 // Global property name #define BEN_PROPID_OBJ_REFERENCES 31 // Referenced objects from an object -#define BEN_TYPEID_OBJ_REFERENCES_DATA 32 // Reference data -#define BEN_OBJID_MIN_GENERAL_ID 100 // Min object ID for general std objects #define BEN_NEW_OBJECT 1 // object + property + type #define BEN_NEW_PROPERTY 2 // property + type @@ -95,14 +86,6 @@ namespace OpenStormBento #define BEN_SEGMENT_CODE_END 14 #define BEN_REFERENCE_LIST_ID 15 // references recording object ID -#define BEN_RESERVED4B 16 -#define BEN_RESERVED4C 17 -#define BEN_RESERVED8A 18 // reserved for future use of 8 byte entry -#define BEN_RESERVED8B 19 // reserved for future use of 8 byte entry -#define BEN_RESERVED8C 20 // reserved for future use of 8 byte entry -#define BEN_RESERVED12A 21 // reserved for future use of 12 byte entry -#define BEN_RESERVED12B 22 // reserved for future use of 12 byte entry -#define BEN_RESERVED12C 23 // reserved for future use of 12 byte entry #define BEN_END_OF_BUFFER 24 // end of current buffer, go to next #define BEN_READ_PAST_END_OF_TOC 50 // Our code #define BEN_NOOP 0xFF diff --git a/lotuswordpro/source/filter/lwpdoc.hxx b/lotuswordpro/source/filter/lwpdoc.hxx index a920e648f4d2..0e4a737c2464 100644 --- a/lotuswordpro/source/filter/lwpdoc.hxx +++ b/lotuswordpro/source/filter/lwpdoc.hxx @@ -98,16 +98,7 @@ private: enum { DOC_PROTECTED = 0x00000004UL, - /*#define DOC_USECONTENTS 0x00000008UL - #define DOC_LOCKREVISIONS 0x00000200UL - #define DOC_LOCAL 0x00000400UL - */ DOC_CHILDDOC = 0x00000800UL - /*#define DOC_DOPREVIEW 0x02000000UL - #define DOC_REBUILDENDNOTES 0x04000000UL - #define DOC_FILEPROTECTION 0x10000000UL - #define DOC_PERSISTENTBITS (DOC_PROTECTED | DOC_USECONTENTS | DOC_LOCKREVISIONS | DOC_LOCAL | DOC_CHILDDOC | DOC_DOPREVIEW | DOC_REBUILDENDNOTES | DOC_FILEPROTECTION) - */ }; //Code cleaning by change some members to local variables in Read() diff --git a/lotuswordpro/source/filter/lwpfribheader.hxx b/lotuswordpro/source/filter/lwpfribheader.hxx index 03757ce6f9a2..143799e756d5 100644 --- a/lotuswordpro/source/filter/lwpfribheader.hxx +++ b/lotuswordpro/source/filter/lwpfribheader.hxx @@ -68,10 +68,7 @@ #define FRIB_MTAG_CHARSTYLE 3 #define FRIB_MTAG_ATTRIBUTE 4 #define FRIB_MTAG_LANGUAGE 5 -#define FRIB_MTAG_CHARBORDER 6 -#define FRIB_MTAG_AMIKAKE 7 #define FRIB_MTAG_CODEPAGE 8 -#define FRIB_MTAG_STXLINK 9 // SmarText; do not #ifdef out #define FT_MAXIMUM 30 diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx b/lotuswordpro/source/filter/lwpgrfobj.cxx index 718d5f5fe984..aa6fa88968af 100644 --- a/lotuswordpro/source/filter/lwpgrfobj.cxx +++ b/lotuswordpro/source/filter/lwpgrfobj.cxx @@ -85,9 +85,7 @@ #include #define EF_NONE 0x0000 -#define EF_FTP 0x0001 #define EF_ODMA 0x0002 -#define EF_NOS 0x0003 LwpGraphicObject::LwpGraphicObject(LwpObjectHeader &objHdr, LwpSvStream* pStrm) : LwpGraphicOleObject(objHdr, pStrm) @@ -119,7 +117,6 @@ void LwpGraphicObject::Read() { pServerContext = new unsigned char[nServerContextSize]; m_pObjStrm->QuickRead(pServerContext, static_cast(nServerContextSize)); - // add by , 04/05/2005 if (nServerContextSize > 44) { m_aIPData.nBrightness = pServerContext[14]; @@ -129,7 +126,6 @@ void LwpGraphicObject::Read() m_aIPData.bInvertImage = (sal_Bool)(pServerContext[34] == 0x01); m_aIPData.bAutoContrast = (sal_Bool)(pServerContext[44] == 0x00); } - // end add } m_pObjStrm->QuickReaduInt16(); //disksize strsize = m_pObjStrm->QuickReaduInt16(); @@ -149,7 +145,6 @@ void LwpGraphicObject::Read() } m_nCachedBaseLine = m_pObjStrm->QuickReadInt32(); m_bIsLinked = m_pObjStrm->QuickReadInt16(); - //OUString pLinkedFilePath; unsigned char * pFilterContext = NULL; if (m_bIsLinked) @@ -202,15 +197,11 @@ void LwpGraphicObject::XFConvert (XFContentContainer* pCont) { if ((m_sServerContextFormat[1]=='s'&&m_sServerContextFormat[2]=='d'&&m_sServerContextFormat[3]=='w')) { - //XFParagraph* pPara = new XFParagraph(); std::vector ::iterator iter; for (iter = m_vXFDrawObjects.begin(); iter != m_vXFDrawObjects.end(); ++iter) { pCont->Add(*iter); } - - //pCont->Add(pPara); - } else if (this->IsGrafFormatValid()) { @@ -299,7 +290,6 @@ void LwpGraphicObject::RegisterStyle() } -// add by , 03/25/2005 /** * @descr create drawing object. */ @@ -443,7 +433,6 @@ sal_uInt32 LwpGraphicObject::GetGrafData(sal_uInt8*& pGrafData) return 0; } - /** * @descr create xf-image object and save it in the container: m_vXFDrawObjects. */ @@ -462,8 +451,6 @@ void LwpGraphicObject::CreateGrafObject() } if (m_aIPData.nContrast != 50) { - //sal_Int32 nSODCContrast = (sal_Int32)m_aIPData.nContrast*2 - 100; - //lwp [0, 100] map to sodc [80, -80] sal_Int32 nSODCContrast = (sal_Int32)(80 - (double)m_aIPData.nContrast*1.6); pImageStyle->SetContrast(nSODCContrast); } @@ -499,8 +486,8 @@ void LwpGraphicObject::CreateGrafObject() double fDisFrameHeight = fFrameHeight - (fTopMargin+fBottomMargin); // scaled image size - double fSclGrafWidth = fOrgGrafWidth;//LwpTools::ConvertFromUnitsToMetric(pMyScale->GetScaleWidth()); - double fSclGrafHeight = fOrgGrafHeight;//LwpTools::ConvertFromUnitsToMetric(pMyScale->GetScaleHeight()); + double fSclGrafWidth = fOrgGrafWidth; + double fSclGrafHeight = fOrgGrafHeight; // get scale mode sal_uInt16 nScalemode = pMyScale->GetScaleMode(); @@ -664,7 +651,6 @@ void LwpGraphicObject::CreateGrafObject() // set archor to frame pImage->SetAnchorType(enumXFAnchorFrame); -// pImage->SetAnchorType(enumXFAnchorPara);//enumXFAnchorFrame); // set object name LwpAtomHolder* pHolder = this->GetName(); @@ -677,7 +663,6 @@ void LwpGraphicObject::CreateGrafObject() m_vXFDrawObjects.push_back(pImage); } -// end add /** * @descr Reserve the equation text in a note in the context. diff --git a/lotuswordpro/source/filter/lwplayout.hxx b/lotuswordpro/source/filter/lwplayout.hxx index 2ea81957856e..a07a7d155a2a 100644 --- a/lotuswordpro/source/filter/lwplayout.hxx +++ b/lotuswordpro/source/filter/lwplayout.hxx @@ -83,13 +83,10 @@ #include "xfilter/xfbgimage.hxx" #include "lwpusewhen.hxx" -#define ANCHOR_HEIGHT 0x120000 #define FIRST_LAYOUTPAGENO 0x0001 #define LAST_LAYOUTPAGENO 0xffff -#define LAY_BUOYFLOAT 0x01 #define LAY_BUOYNEUTRAL 0x02 -#define LAY_BUOYSINK 0x03 #define LAY_BUOYLAYER 0x80 class LwpPara; @@ -224,7 +221,6 @@ class LwpAssociatedLayouts { public: LwpAssociatedLayouts(){} - //LwpAssociatedLayouts(LwpObjectStream* pStrm){Read(pStrm);} public: void Read(LwpObjectStream* pStrm); LwpObjectID* GetOnlyLayout(){return &m_OnlyLayout;} @@ -247,7 +243,6 @@ protected: virtual LWP_LAYOUT_TYPE GetLayoutType () { return LWP_HEAD_LAYOUT;} }; -//add by , 01/20/2005 class LwpLayoutStyle { public: @@ -271,7 +266,6 @@ private: sal_uInt16 m_nGridType; LwpAtomHolder* m_pContentStyle; }; -//end add #include "lwplaypiece.hxx" @@ -320,11 +314,8 @@ public: virtual double GetHeight(); virtual LwpPoint GetOrigin(); - // added by , 06/01/2004 sal_Bool IsPatternFill(); XFBGImage* GetFillPattern(); - // end add - //Check whether there are contents in the layout virtual sal_Bool HasContent(); @@ -342,7 +333,6 @@ protected: LwpObjectID m_Content; LwpObjectID m_BasedOnStyle; - // 01/20/2005 LwpObjectID m_TabPiece; LwpLayoutStyle* m_pStyleStuff; LwpLayoutMisc* m_pMiscStuff; @@ -352,7 +342,6 @@ protected: LwpObjectID m_LayBorderStuff; LwpObjectID m_LayBackgroundStuff; LwpObjectID m_LayExtBorderStuff; - //end public: LwpObjectID* GetContent(){return &m_Content;} LwpTabOverride* GetTabOverride(); @@ -370,7 +359,6 @@ public: protected: void Read(); protected: - // 01/20/2005 LwpUseWhen* m_pUseWhen; LwpObjectID m_Positon; LwpObjectID m_LayColumns; @@ -378,7 +366,6 @@ protected: LwpObjectID m_LayJoinStuff; LwpObjectID m_LayShadow; LwpObjectID m_LayExtJoinStuff; - //end public: LwpUseWhen* VirtualGetUseWhen(); @@ -428,7 +415,6 @@ public: LAY_NO_WRAP_AROUND, LAY_WRAP_LEFT, LAY_WRAP_RIGHT, - //OLD_LAY_WRAP_RIGHT, LAY_WRAP_BOTH, LAY_WRAP_IRREG_BOTH, LAY_WRAP_IRREG_LEFT, diff --git a/lotuswordpro/source/filter/lwpoleobject.hxx b/lotuswordpro/source/filter/lwpoleobject.hxx index eec39f5d52cd..78720e2372a1 100644 --- a/lotuswordpro/source/filter/lwpoleobject.hxx +++ b/lotuswordpro/source/filter/lwpoleobject.hxx @@ -87,8 +87,6 @@ typedef struct tagAFID_CACHE #define AFID_MAX_FILE_FORMAT_SIZE 80 #define AFID_MAX_CONTEXT_FORMAT_SIZE 80 -// OLE defined maximum -#define MAX_STREAMORSTORAGENAME 32 /** * @descr * super class of LwpOleObject and LwpGraphicObject diff --git a/lotuswordpro/source/filter/xfilter/xfframe.cxx b/lotuswordpro/source/filter/xfilter/xfframe.cxx index a6e0755b66e8..5a31146e796c 100644 --- a/lotuswordpro/source/filter/xfilter/xfframe.cxx +++ b/lotuswordpro/source/filter/xfilter/xfframe.cxx @@ -59,7 +59,6 @@ ************************************************************************/ #include "xfframe.hxx" #include "xfparagraph.hxx" -#define ZINDEX_MAX 0x7fffffff #define ZINDEX_MIN 0 XFFrame::XFFrame() { From c2eb9698eff7412e6973e659f26e7e39eeaf2887 Mon Sep 17 00:00:00 2001 From: Takeshi Abe Date: Tue, 2 Oct 2012 22:36:28 +0900 Subject: [PATCH 212/863] Remove dead code SW_CRSR_TIMER was undefined Change-Id: Ib851170ea61547e0ceaa6721c0b2fb90fecaecd3 Reviewed-on: https://gerrit.libreoffice.org/747 Reviewed-by: Michael Stahl Tested-by: Michael Stahl --- sw/inc/crsrsh.hxx | 6 --- sw/inc/viscrs.hxx | 14 ------- sw/source/core/crsr/viscrs.cxx | 64 -------------------------------- sw/source/core/layout/layact.cxx | 3 -- sw/source/ui/docvw/edtwin.cxx | 13 ------- 5 files changed, 100 deletions(-) diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index 4c7e48c008fa..e8678e99d783 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -750,12 +750,6 @@ public: // is the whole document protected/hidden (for UI...) sal_Bool IsAllProtect() const { return bAllProtect; } -#ifdef SW_CRSR_TIMER - // Set flag at VisCrsr. Is it triggered by Timer (TRUE) or directly (FALSE). - // Default is triggert by Timer. - sal_Bool ChgCrsrTimerFlag( sal_Bool bTimerOn = sal_True ); -#endif - sal_Bool BasicActionPend() const { return nBasicActionCnt != nStartAction; } sal_Bool GotoRegion( const String& rName ); diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx index 5b0b925c3d17..f8b274bfaa83 100644 --- a/sw/inc/viscrs.hxx +++ b/sw/inc/viscrs.hxx @@ -39,9 +39,6 @@ class SwShellCrsr; // From here classes/methods for non-text cursor. class SwVisCrsr -#ifdef SW_CRSR_TIMER - : private Timer -#endif { friend void _InitCore(); friend void _FinitCore(); @@ -49,16 +46,9 @@ class SwVisCrsr sal_Bool bIsVisible : 1; sal_Bool bIsDragCrsr : 1; -#ifdef SW_CRSR_TIMER - sal_Bool bTimerOn : 1; -#endif - Cursor aTxtCrsr; const SwCrsrShell* pCrsrShell; -#ifdef SW_CRSR_TIMER - virtual void Timeout(); -#endif void _SetPosAndShow(); public: @@ -70,10 +60,6 @@ public: sal_Bool IsVisible() const { return bIsVisible; } void SetDragCrsr( sal_Bool bFlag = sal_True ) { bIsDragCrsr = bFlag; } - -#ifdef SW_CRSR_TIMER - sal_Bool ChgTimerFlag( sal_Bool bTimerOn = sal_True ); -#endif }; diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx index 09eebb7d37f0..88d840480b0c 100644 --- a/sw/source/core/crsr/viscrs.cxx +++ b/sw/source/core/crsr/viscrs.cxx @@ -70,22 +70,12 @@ SwVisCrsr::SwVisCrsr( const SwCrsrShell * pCShell ) bIsVisible = aTxtCrsr.IsVisible(); bIsDragCrsr = sal_False; aTxtCrsr.SetWidth( 0 ); - -#ifdef SW_CRSR_TIMER - bTimerOn = sal_True; - SetTimeout( 50 ); // 50 millisecond delay -#endif } SwVisCrsr::~SwVisCrsr() { -#ifdef SW_CRSR_TIMER - if( bTimerOn ) - Stop(); // stop timer -#endif - if( bIsVisible && aTxtCrsr.IsVisible() ) aTxtCrsr.Hide(); @@ -103,21 +93,7 @@ void SwVisCrsr::Show() // display at all? if( pCrsrShell->VisArea().IsOver( pCrsrShell->aCharRect ) ) -#ifdef SW_CRSR_TIMER - { - if( bTimerOn ) - Start(); // start timer - else - { - if( IsActive() ) - Stop(); // stop timer - - _SetPosAndShow(); - } - } -#else _SetPosAndShow(); -#endif } } @@ -129,51 +105,11 @@ void SwVisCrsr::Hide() { bIsVisible = sal_False; -#ifdef SW_CRSR_TIMER - if( IsActive() ) - Stop(); // stop timer -#endif - if( aTxtCrsr.IsVisible() ) // Shouldn't the flags be in effect? aTxtCrsr.Hide(); } } -#ifdef SW_CRSR_TIMER - -void SwVisCrsr::Timeout() -{ - OSL_ENSURE( !bIsDragCrsr, "stop timer before" ); - if( bIsVisible ) - { - if ( !pCrsrShell->GetWin() ) // SwFrmFmt::GetGraphic suspends Win temporarily! - Start(); - else - _SetPosAndShow(); - } -} - -sal_Bool SwCrsrShell::ChgCrsrTimerFlag( sal_Bool bTimerOn ) -{ - return pVisCrsr->ChgTimerFlag( bTimerOn ); -} - - -sal_Bool SwVisCrsr::ChgTimerFlag( sal_Bool bFlag ) -{ - bOld = bTimerOn; - if( !bFlag && bIsVisible && IsActive() ) - { - Stop(); // stop timer - _SetPosAndShow(); - } - bTimerOn = bFlag; - return bOld; -} - -#endif - - void SwVisCrsr::_SetPosAndShow() { SwRect aRect; diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index d5422388625e..26de885b3650 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -2330,9 +2330,6 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) : sal_Bool bVis = sal_False; if ( pSh->ISA(SwCrsrShell) ) { -#ifdef SW_CRSR_TIMER - ((SwCrsrShell*)pSh)->ChgCrsrTimerFlag( sal_False ); -#endif bVis = ((SwCrsrShell*)pSh)->GetCharRect().IsOver(pSh->VisArea()); } aBools.push_back( bVis ); diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index f9ae3ce43bbd..711c63c4a3d1 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -2007,9 +2007,6 @@ KEYINPUT_CHECKTABLE_INSDEL: case KEY_TAB: { -#ifdef SW_CRSR_TIMER - sal_Bool bOld = rSh.ChgCrsrTimerFlag( sal_False ); -#endif if (rSh.IsFormProtected() || rSh.GetCurrentFieldmark() || rSh.GetChar(sal_False)==CH_TXT_ATR_FORMELEMENT) { eKeyState=KS_GotoNextFieldMark; @@ -2052,17 +2049,10 @@ KEYINPUT_CHECKTABLE_INSDEL: eKeyState = KS_OutlineDown; } } -#ifdef SW_CRSR_TIMER - rSh.ChgCrsrTimerFlag( bOld ); -#endif } break; case KEY_TAB | KEY_SHIFT: { -#ifdef SW_CRSR_TIMER - sal_Bool bOld = rSh.ChgCrsrTimerFlag( sal_False ); - sal_Bool bOld = rSh.ChgCrsrTimerFlag( sal_False ); -#endif if (rSh.IsFormProtected() || rSh.GetCurrentFieldmark()|| rSh.GetChar(sal_False)==CH_TXT_ATR_FORMELEMENT) { eKeyState=KS_GotoPrevFieldMark; } @@ -2103,9 +2093,6 @@ KEYINPUT_CHECKTABLE_INSDEL: eKeyState = KS_OutlineUp; } } -#ifdef SW_CRSR_TIMER - rSh.ChgCrsrTimerFlag( bOld ); -#endif } break; case KEY_TAB | KEY_MOD1: From 7192f0ddaa937f6c63bfffed0b35146a0f97943a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= Date: Tue, 2 Oct 2012 23:12:49 +0200 Subject: [PATCH 213/863] Clean the path pushed to the API as much as possible Change-Id: I5e68bc5aedc4c6e350e62b30472a1b3f0803c520 --- libvisio/UnpackedTarball_visio.mk | 9 +++ libvisio/libvisio-0.0.19.patch | 116 ++++++++++++++++++++++++++++++ 2 files changed, 125 insertions(+) create mode 100644 libvisio/libvisio-0.0.19.patch diff --git a/libvisio/UnpackedTarball_visio.mk b/libvisio/UnpackedTarball_visio.mk index aa9113bafd6d..15429c546290 100644 --- a/libvisio/UnpackedTarball_visio.mk +++ b/libvisio/UnpackedTarball_visio.mk @@ -11,4 +11,13 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,visio)) $(eval $(call gb_UnpackedTarball_set_tarball,visio,$(VISIO_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_patchlevel,visio,0)) + +visio_patches := +# Somehow draw is very picky about what is a closed path +visio_patches += libvisio-0.0.19.patch + +$(eval $(call gb_UnpackedTarball_add_patches,visio,\ + $(foreach patch,$(visio_patches),libvisio/$(patch)) \ +)) # vim: set noet sw=4 ts=4: diff --git a/libvisio/libvisio-0.0.19.patch b/libvisio/libvisio-0.0.19.patch new file mode 100644 index 000000000000..ee3c17f51af2 --- /dev/null +++ b/libvisio/libvisio-0.0.19.patch @@ -0,0 +1,116 @@ +--- src/lib/VSDXContentCollector.cpp ++++ src/lib/VSDXContentCollector.cpp +@@ -676,7 +676,6 @@ double libvisio::VSDXContentCollector::_linePropertiesMarkerScale(unsigned marke + + void libvisio::VSDXContentCollector::_flushCurrentPath() + { +- WPXPropertyListVector path; + WPXPropertyList fillPathProps(m_styleProps); + fillPathProps.insert("draw:stroke", "none"); + WPXPropertyList linePathProps(m_styleProps); +@@ -695,6 +694,7 @@ void libvisio::VSDXContentCollector::_flushCurrentPath() + if (needsGroup) + m_shapeOutputDrawing->addStartLayer(WPXPropertyList()); + ++ std::vector tmpPath; + if (m_styleProps["draw:fill"] && m_styleProps["draw:fill"]->getStr() != "none") + { + bool firstPoint = true; +@@ -708,39 +708,84 @@ void libvisio::VSDXContentCollector::_flushCurrentPath() + } + else if (m_currentFillGeometry[i]["libwpg:path-action"]->getStr() == "M") + { +- if (path.count() && !wasMove) ++ if (!tmpPath.empty()) + { +- WPXPropertyList closedPath; +- closedPath.insert("libwpg:path-action", "Z"); +- path.append(closedPath); ++ if (!wasMove) ++ { ++ WPXPropertyList closedPath; ++ closedPath.insert("libwpg:path-action", "Z"); ++ tmpPath.push_back(closedPath); ++ } ++ else ++ { ++ tmpPath.pop_back(); ++ } + } + wasMove = true; + } + else + wasMove = false; +- path.append(m_currentFillGeometry[i]); ++ tmpPath.push_back(m_currentFillGeometry[i]); + } +- if (path.count() && !wasMove) ++ if (!tmpPath.empty()) + { +- WPXPropertyList closedPath; +- closedPath.insert("libwpg:path-action", "Z"); +- path.append(closedPath); ++ if (!wasMove) ++ { ++ WPXPropertyList closedPath; ++ closedPath.insert("libwpg:path-action", "Z"); ++ tmpPath.push_back(closedPath); ++ } ++ else ++ tmpPath.pop_back(); + } +- if (path.count()) ++ if (!tmpPath.empty()) + { ++ WPXPropertyListVector path; ++ for (unsigned i = 0; i < tmpPath.size(); ++i) ++ path.append(tmpPath[i]); + m_shapeOutputDrawing->addStyle(fillPathProps, WPXPropertyListVector()); + m_shapeOutputDrawing->addPath(path); + } + } + m_currentFillGeometry.clear(); +- path = WPXPropertyListVector(); ++ tmpPath.clear(); + + if (m_styleProps["draw:stroke"] && m_styleProps["draw:stroke"]->getStr() != "none") + { ++ bool firstPoint = true; ++ bool wasMove = false; + for (unsigned i = 0; i < m_currentLineGeometry.size(); i++) +- path.append(m_currentLineGeometry[i]); +- if (path.count()) + { ++ if (firstPoint) ++ { ++ firstPoint = false; ++ wasMove = true; ++ } ++ else if (m_currentLineGeometry[i]["libwpg:path-action"]->getStr() == "M") ++ { ++ if (!tmpPath.empty()) ++ { ++ if (wasMove) ++ { ++ tmpPath.pop_back(); ++ } ++ } ++ wasMove = true; ++ } ++ else ++ wasMove = false; ++ tmpPath.push_back(m_currentLineGeometry[i]); ++ } ++ if (!tmpPath.empty()) ++ { ++ if (wasMove) ++ tmpPath.pop_back(); ++ } ++ if (!tmpPath.empty()) ++ { ++ WPXPropertyListVector path; ++ for (unsigned i = 0; i < tmpPath.size(); ++i) ++ path.append(tmpPath[i]); + m_shapeOutputDrawing->addStyle(linePathProps, WPXPropertyListVector()); + m_shapeOutputDrawing->addPath(path); + } From 58deab04a99ab0ad49d4f33348dc801ca932c0ca Mon Sep 17 00:00:00 2001 From: Xisco Fauli Date: Tue, 2 Oct 2012 23:27:33 +0200 Subject: [PATCH 214/863] pyfax: Add TextElement to makefile Change-Id: Iddc7ae6ce49d815e05f3f537569434489e3ccf53 --- wizards/Pyuno_commonwizards.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/wizards/Pyuno_commonwizards.mk b/wizards/Pyuno_commonwizards.mk index fb7ac105bb84..5653dac67f3c 100644 --- a/wizards/Pyuno_commonwizards.mk +++ b/wizards/Pyuno_commonwizards.mk @@ -46,6 +46,7 @@ $(eval $(call gb_Pyuno_add_files,wizards,\ common/HelpIds.py \ common/NumberFormatter.py \ common/PropertySetHelper.py \ + common/TextElement.py \ document/__init__.py \ document/OfficeDocument.py \ text/__init__.py \ From ae1f2f6b932d43e6770022039d9cbe3f3960ab27 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Tue, 2 Oct 2012 23:22:37 +0200 Subject: [PATCH 215/863] gbuildification of rhino Default patch level 3 was not working here and must be overriden with gb_UnpackedTarball_set_patchlevel function with 2. New java file OfficeScriptInfo.java was extracted from rhino1_5R5.patch and added with gb_UnpackedTarball_add_file. Change-Id: Iba25b2350caffd943af93f59fa2139332b009ef2 Reviewed-on: https://gerrit.libreoffice.org/752 Reviewed-by: Michael Stahl Tested-by: Michael Stahl --- Makefile.top | 4 +- Module_tail_build.mk | 1 + RepositoryModule_ooo.mk | 1 + config_host.mk.in | 1 + configure.in | 2 + rhino/ExternalProject_rhino.mk | 37 +++++++++ rhino/Makefile | 7 ++ rhino/Module_rhino.mk | 22 ++++++ rhino/OfficeScriptInfo.java | 128 +++++++++++++++++++++++++++++++ rhino/Package_rhino.mk | 16 ++++ rhino/UnpackedTarball_rhino.mk | 24 ++++++ rhino/makefile.mk | 75 ------------------ rhino/prj/build.lst | 5 +- rhino/prj/d.lst | 1 - rhino/prj/dmake | 0 rhino/rhino1_5R5.patch | 134 --------------------------------- tail_build/prj/build.lst | 2 +- 17 files changed, 244 insertions(+), 216 deletions(-) create mode 100644 rhino/ExternalProject_rhino.mk create mode 100644 rhino/Makefile create mode 100644 rhino/Module_rhino.mk create mode 100644 rhino/OfficeScriptInfo.java create mode 100644 rhino/Package_rhino.mk create mode 100644 rhino/UnpackedTarball_rhino.mk delete mode 100644 rhino/makefile.mk delete mode 100644 rhino/prj/dmake diff --git a/Makefile.top b/Makefile.top index de91f563abf5..bb4f73e8c11d 100644 --- a/Makefile.top +++ b/Makefile.top @@ -121,13 +121,14 @@ padmin\ psprint_config\ pyuno\ qadevOOo\ +rdbmaker\ readlicense_oo\ regexp\ registry\ remotebridges\ reportbuilder\ reportdesign\ -rdbmaker\ +rhino\ ridljar\ rsc\ sal\ @@ -245,7 +246,6 @@ postgresql\ postprocess\ python\ redland\ -rhino\ setup_native\ stax\ stlport\ diff --git a/Module_tail_build.mk b/Module_tail_build.mk index 86a9c11ab465..fa63c17da9d1 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -120,6 +120,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ remotebridges \ reportbuilder \ reportdesign \ + $(call gb_Helper_optional,RHINO,rhino) \ ridljar \ rsc \ salhelper \ diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index b654664f4f53..a8153e103371 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -129,6 +129,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ remotebridges \ reportbuilder \ reportdesign \ + $(call gb_Helper_optional,RHINO,rhino) \ ridljar \ rsc \ sal \ diff --git a/config_host.mk.in b/config_host.mk.in index 48b470e228f0..9052d70c4693 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -481,6 +481,7 @@ export RANLIB=@RANLIB@ export REDLAND_CFLAGS=@REDLAND_CFLAGS@ export REDLAND_LIBS=@REDLAND_LIBS@ export RHINO_JAR=@RHINO_JAR@ +export RHINO_TARBALL=@RHINO_TARBALL@ export RPM=@RPM@ export RTL_OS=@RTL_OS@ export RTL_ARCH=@RTL_ARCH@ diff --git a/configure.in b/configure.in index 2974db0d21d0..45c3d85ef9c0 100644 --- a/configure.in +++ b/configure.in @@ -10107,6 +10107,7 @@ if test "x$enable_ext_scripting_javascript" = "xyes" -a "x$enable_extension_inte else AC_MSG_RESULT([internal]) SYSTEM_RHINO=NO + RHINO_TARBALL="798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip" BUILD_TYPE="$BUILD_TYPE RHINO" fi else @@ -10117,6 +10118,7 @@ fi AC_SUBST(ENABLE_SCRIPTING_JAVASCRIPT) AC_SUBST(SYSTEM_RHINO) AC_SUBST(RHINO_JAR) +AC_SUBST(RHINO_TARBALL) dnl Scripting provider for Python extension? dnl We always provide this unless we have disabled Python completely diff --git a/rhino/ExternalProject_rhino.mk b/rhino/ExternalProject_rhino.mk new file mode 100644 index 000000000000..0ca364e59c09 --- /dev/null +++ b/rhino/ExternalProject_rhino.mk @@ -0,0 +1,37 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# for RSCREVISION +include $(SOLARENV)/inc/minor.mk + +$(eval $(call gb_ExternalProject_ExternalProject,rhino)) + +$(eval $(call gb_ExternalProject_use_unpacked,rhino,rhino)) + +$(eval $(call gb_ExternalProject_register_targets,rhino,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,rhino,build) : + cd "$(call gb_UnpackedTarball_get_dir,rhino)" && \ + "$(ANT)" \ + -q \ + -f build.xml \ + -Dbuild.label="build-$(RSCREVISION)" \ + -DTARFILE_LOCATION="$(TARFILE_LOCATION)" \ + $(if $(filter yes,$(JAVACISGCJ))\ + ,-Dbuild.compiler=gcj \ + ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + ) \ + $(if $(debug),-Dbuild.debug="on") \ + jar && \ + touch $@ + +# vim: set noet sw=4 ts=4: diff --git a/rhino/Makefile b/rhino/Makefile new file mode 100644 index 000000000000..ccb1c85a04da --- /dev/null +++ b/rhino/Makefile @@ -0,0 +1,7 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +include $(module_directory)/../solenv/gbuild/partial_build.mk + +# vim: set noet sw=4 ts=4: diff --git a/rhino/Module_rhino.mk b/rhino/Module_rhino.mk new file mode 100644 index 000000000000..5fccae447cea --- /dev/null +++ b/rhino/Module_rhino.mk @@ -0,0 +1,22 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Module_Module,rhino)) + +ifneq ($(SOLAR_JAVA),) +ifneq ($(filter RHINO,$(BUILD_TYPE)),) +$(eval $(call gb_Module_add_targets,rhino,\ + ExternalProject_rhino \ + Package_rhino \ + UnpackedTarball_rhino \ +)) +endif +endif + +# vim: set noet sw=4 ts=4: diff --git a/rhino/OfficeScriptInfo.java b/rhino/OfficeScriptInfo.java new file mode 100644 index 000000000000..0732ca2df1dd --- /dev/null +++ b/rhino/OfficeScriptInfo.java @@ -0,0 +1,128 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + + +package org.mozilla.javascript.tools.debugger; +import java.net.URL; +import java.util.Hashtable; +import org.mozilla.javascript.Scriptable; + +public class OfficeScriptInfo +{ + private Hashtable loadedSFScripts = new Hashtable(); + + public void addScript( URL url, Scriptable scope, Runnable closeCallback ) + { + addScript( url.toString(), url, scope, closeCallback ); + } + + public void addScript( String key, URL url, Scriptable scope, Runnable closeCallback ) + { + SFScriptInfo si = (SFScriptInfo)loadedSFScripts.get( key ); + if ( si == null ) + { + si = new SFScriptInfo(); + si.url = url; + si.scope = scope; + si.closeCallback = closeCallback; + loadedSFScripts.put( key, si ); + } + } + + public void deleteScript( String key ) + { + SFScriptInfo info = (SFScriptInfo)loadedSFScripts.remove( key ); + if ( info != null ) + { + if ( info.closeCallback != null ) + { + System.out.println("** In removeSFScriptInfo have callback for " + key ); + info.closeCallback.run(); // really need to do this in seperate thread???? + } + } + } + + public Scriptable getScriptScope( String key ) + { + Scriptable result = null; + SFScriptInfo info = (SFScriptInfo)loadedSFScripts.get( key ); + if ( info != null ) + { + result = info.scope; + } + return result; + } + + public URL getScriptUrl( String key ) + { + URL result = null; + SFScriptInfo info = (SFScriptInfo)loadedSFScripts.get( key ); + if ( info != null ) + { + result = info.url; + } + return result; + } + public boolean hasScript( String key ) + { + boolean result = true; + SFScriptInfo info = (SFScriptInfo)loadedSFScripts.get( key ); + if ( info == null ) + { + result = false; + } + return result; + } + + public void setScriptRunning( String key, boolean running ) + { + SFScriptInfo info = (SFScriptInfo)loadedSFScripts.get( key ); + if ( info != null ) + { + info.isExecuting = running; + } + } + + public boolean isScriptRunning( String key ) + { + boolean result = false; + SFScriptInfo info = (SFScriptInfo)loadedSFScripts.get( key ); + if ( info != null ) + { + result = info.isExecuting; + } + return result; + } + + class SFScriptInfo + { + Scriptable scope; + boolean isExecuting; + URL url; + Runnable closeCallback; + } +} diff --git a/rhino/Package_rhino.mk b/rhino/Package_rhino.mk new file mode 100644 index 000000000000..075c49c8a401 --- /dev/null +++ b/rhino/Package_rhino.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Package_Package,rhino,$(call gb_UnpackedTarball_get_dir,rhino))) + +$(eval $(call gb_Package_use_external_project,rhino,rhino)) + +$(eval $(call gb_Package_add_file,rhino,bin/js.jar,build/rhino1_5R5/js.jar)) + +# vim: set noet sw=4 ts=4: diff --git a/rhino/UnpackedTarball_rhino.mk b/rhino/UnpackedTarball_rhino.mk new file mode 100644 index 000000000000..32c64573cd12 --- /dev/null +++ b/rhino/UnpackedTarball_rhino.mk @@ -0,0 +1,24 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,rhino)) + +$(eval $(call gb_UnpackedTarball_set_tarball,rhino,$(RHINO_TARBALL))) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,rhino,2)) + +$(eval $(call gb_UnpackedTarball_add_patches,rhino,\ + rhino/rhino1_5R5.patch \ + rhino/rhino1_5R5-find_swing.patch \ + rhino/rhino1_5R5-updateToolTip.patch \ +)) + +$(eval $(call gb_UnpackedTarball_add_file,rhino,toolsrc/org/mozilla/javascript/tools/debugger/OfficeScriptInfo.java,rhino/OfficeScriptInfo.java)) + +# vim: set noet sw=4 ts=4: diff --git a/rhino/makefile.mk b/rhino/makefile.mk deleted file mode 100644 index 8a2a80c1e8e6..000000000000 --- a/rhino/makefile.mk +++ /dev/null @@ -1,75 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=. - -PRJNAME=ooo_rhino -TARGET=ooo_rhino - -.IF "$(SOLAR_JAVA)"!="" -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : antsettings.mk - -# --- Files -------------------------------------------------------- - -TARFILE_NAME=rhino1_5R5 -TARFILE_MD5=798b2ffdc8bcfe7bca2cf92b62caf685 -TARFILE_ROOTDIR=rhino1_5R5 - -ADDITIONAL_FILES= \ - toolsrc/org/mozilla/javascript/tools/debugger/OfficeScriptInfo.java - -PATCH_FILES=rhino1_5R5.patch \ - rhino1_5R5-find_swing.patch \ - rhino1_5R5-updateToolTip.patch - -.IF "$(OS_FOR_BUILD)"=="WNT" -FIXED_TARFILE_LOCATION=`cygpath -m -s "$(TARFILE_LOCATION)"` -.ELSE -FIXED_TARFILE_LOCATION=$(TARFILE_LOCATION) -.ENDIF - -.IF "$(JAVACISGCJ)"=="yes" -JAVA_HOME= -.EXPORT : JAVA_HOME -BUILD_ACTION="$(ANT)" -DTARFILE_LOCATION="$(FIXED_TARFILE_LOCATION)" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj jar -.ELSE -BUILD_ACTION="$(ANT)" -DTARFILE_LOCATION="$(FIXED_TARFILE_LOCATION)" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) jar -.ENDIF - -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_ext.mk -.INCLUDE : target.mk -.INCLUDE : tg_ext.mk - -.ELSE -all: - @echo java disabled -.ENDIF diff --git a/rhino/prj/build.lst b/rhino/prj/build.lst index d23bc3660d7e..3e20ebe2d8b6 100644 --- a/rhino/prj/build.lst +++ b/rhino/prj/build.lst @@ -1,3 +1,2 @@ -xh rhino : soltools NULL -xh rhino usr1 - all xh_mkout NULL -xh rhino nmake - all xh_rhino NULL +xh rhino : soltools NULL +xh rhino\prj nmake - all xh_rhino NULL diff --git a/rhino/prj/d.lst b/rhino/prj/d.lst index b98f6b7e73a6..e69de29bb2d1 100644 --- a/rhino/prj/d.lst +++ b/rhino/prj/d.lst @@ -1 +0,0 @@ -..\%__SRC%\misc\build\rhino1_5R5\build\rhino1_5R5\js.jar %_DEST%\bin\js.jar diff --git a/rhino/prj/dmake b/rhino/prj/dmake deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/rhino/rhino1_5R5.patch b/rhino/rhino1_5R5.patch index 21b4a484be8e..5b10c320d015 100644 --- a/rhino/rhino1_5R5.patch +++ b/rhino/rhino1_5R5.patch @@ -1041,140 +1041,6 @@ + } ---- misc/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/OfficeScriptInfo.java Fri Mar 28 17:25:34 2008 -+++ misc/build/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/OfficeScriptInfo.java Fri Mar 28 17:24:59 2008 -@@ -1 +1,130 @@ --dummy -+/************************************************************************* -+ * -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * Copyright 2000, 2010 Oracle and/or its affiliates. -+ * -+ * OpenOffice.org - a multi-platform office productivity suite -+ * -+ * This file is part of OpenOffice.org. -+ * -+ * OpenOffice.org is free software: you can redistribute it and/or modify -+ * it under the terms of the GNU Lesser General Public License version 3 -+ * only, as published by the Free Software Foundation. -+ * -+ * OpenOffice.org is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU Lesser General Public License version 3 for more details -+ * (a copy is included in the LICENSE file that accompanied this code). -+ * -+ * You should have received a copy of the GNU Lesser General Public License -+ * version 3 along with OpenOffice.org. If not, see -+ * -+ * for a copy of the LGPLv3 License. -+ * -+ ************************************************************************/ -+ -+ -+package org.mozilla.javascript.tools.debugger; -+import java.net.URL; -+import java.util.Hashtable; -+import org.mozilla.javascript.Scriptable; -+ -+public class OfficeScriptInfo -+{ -+ private Hashtable loadedSFScripts = new Hashtable(); -+ -+ public void addScript( URL url, Scriptable scope, Runnable closeCallback ) -+ { -+ addScript( url.toString(), url, scope, closeCallback ); -+ } -+ -+ public void addScript( String key, URL url, Scriptable scope, Runnable closeCallback ) -+ { -+ SFScriptInfo si = (SFScriptInfo)loadedSFScripts.get( key ); -+ if ( si == null ) -+ { -+ si = new SFScriptInfo(); -+ si.url = url; -+ si.scope = scope; -+ si.closeCallback = closeCallback; -+ loadedSFScripts.put( key, si ); -+ } -+ } -+ -+ public void deleteScript( String key ) -+ { -+ SFScriptInfo info = (SFScriptInfo)loadedSFScripts.remove( key ); -+ if ( info != null ) -+ { -+ if ( info.closeCallback != null ) -+ { -+ System.out.println("** In removeSFScriptInfo have callback for " + key ); -+ info.closeCallback.run(); // really need to do this in seperate thread???? -+ } -+ } -+ } -+ -+ public Scriptable getScriptScope( String key ) -+ { -+ Scriptable result = null; -+ SFScriptInfo info = (SFScriptInfo)loadedSFScripts.get( key ); -+ if ( info != null ) -+ { -+ result = info.scope; -+ } -+ return result; -+ } -+ -+ public URL getScriptUrl( String key ) -+ { -+ URL result = null; -+ SFScriptInfo info = (SFScriptInfo)loadedSFScripts.get( key ); -+ if ( info != null ) -+ { -+ result = info.url; -+ } -+ return result; -+ } -+ public boolean hasScript( String key ) -+ { -+ boolean result = true; -+ SFScriptInfo info = (SFScriptInfo)loadedSFScripts.get( key ); -+ if ( info == null ) -+ { -+ result = false; -+ } -+ return result; -+ } -+ -+ public void setScriptRunning( String key, boolean running ) -+ { -+ SFScriptInfo info = (SFScriptInfo)loadedSFScripts.get( key ); -+ if ( info != null ) -+ { -+ info.isExecuting = running; -+ } -+ } -+ -+ public boolean isScriptRunning( String key ) -+ { -+ boolean result = false; -+ SFScriptInfo info = (SFScriptInfo)loadedSFScripts.get( key ); -+ if ( info != null ) -+ { -+ result = info.isExecuting; -+ } -+ return result; -+ } -+ -+ -+ -+ class SFScriptInfo -+ { -+ Scriptable scope; -+ boolean isExecuting; -+ URL url; -+ Runnable closeCallback; -+ } -+} --- misc/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java Thu Mar 25 21:54:34 2004 +++ misc/build/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java Fri Mar 28 17:24:23 2008 @@ -36,6 +36,7 @@ diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index 15d2e0efe37d..1874ebf63b75 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland stax XPDF:xpdf ZLIB:zlib external RHINO:rhino sal solenv soltools NULL +tb tail_build : BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland stax XPDF:xpdf ZLIB:zlib external sal solenv soltools NULL tb tail_build\prj nmake - all tb_prj NULL From c7e559a1e6009fd8f3dcafcf9c47593d04382a13 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 3 Oct 2012 07:27:11 +0200 Subject: [PATCH 216/863] CLI assemblies must depend on the key file used for signing Change-Id: I84c0044f3054388fd5650c14efd30f21481e493a --- cli_ure/CliLibrary_cli_basetypes.mk | 2 ++ cli_ure/CliLibrary_cli_ure.mk | 2 ++ cli_ure/CliNativeLibrary_cli_cppuhelper.mk | 2 ++ cli_ure/CliUnoApi_cli_uretypes.mk | 2 ++ 4 files changed, 8 insertions(+) diff --git a/cli_ure/CliLibrary_cli_basetypes.mk b/cli_ure/CliLibrary_cli_basetypes.mk index d9f8a04d90c6..254720ca27ea 100644 --- a/cli_ure/CliLibrary_cli_basetypes.mk +++ b/cli_ure/CliLibrary_cli_basetypes.mk @@ -13,6 +13,8 @@ $(eval $(call gb_CliLibrary_CliLibrary,cli_basetypes)) $(eval $(call gb_CliLibrary_set_configfile,cli_basetypes,cli_ure/source/basetypes/cli_basetypes_config)) +$(eval $(call gb_CliLibrary_set_keyfile,cli_basetypes,$(OUTDIR)/bin/cliuno.snk)) + $(eval $(call gb_CliLibrary_set_policy,cli_basetypes,$(CLI_BASETYPES_POLICY_ASSEMBLY),$(CLI_BASETYPES_POLICY_VERSION))) $(eval $(call gb_CliLibrary_add_csfiles,cli_basetypes,\ diff --git a/cli_ure/CliLibrary_cli_ure.mk b/cli_ure/CliLibrary_cli_ure.mk index 1b9c1163b9dd..fb5eaaae545a 100644 --- a/cli_ure/CliLibrary_cli_ure.mk +++ b/cli_ure/CliLibrary_cli_ure.mk @@ -13,6 +13,8 @@ $(eval $(call gb_CliLibrary_CliLibrary,cli_ure)) $(eval $(call gb_CliLibrary_set_configfile,cli_ure,cli_ure/source/ure/cli_ure_config)) +$(eval $(call gb_CliLibrary_set_keyfile,cli_ure,$(OUTDIR)/bin/cliuno.snk)) + $(eval $(call gb_CliLibrary_set_policy,cli_ure,$(CLI_URE_POLICY_ASSEMBLY),$(CLI_URE_POLICY_VERSION))) $(eval $(call gb_CliLibrary_use_assemblies,cli_ure,\ diff --git a/cli_ure/CliNativeLibrary_cli_cppuhelper.mk b/cli_ure/CliNativeLibrary_cli_cppuhelper.mk index 23ed5fa8afbc..cea9b8b36637 100644 --- a/cli_ure/CliNativeLibrary_cli_cppuhelper.mk +++ b/cli_ure/CliNativeLibrary_cli_cppuhelper.mk @@ -15,6 +15,8 @@ $(eval $(call gb_CliNativeLibrary_wrap_library,cli_cppuhelper,cli_cppuhelper_nat $(eval $(call gb_CliNativeLibrary_set_configfile,cli_cppuhelper,cli_ure/source/native/cli_cppuhelper_config)) +$(eval $(clal gb_CliNativeLibrary_set_keyfile,cli_cppuhelper,$(OUTDIR)/bin/clinuo.snk)) + $(eval $(call gb_CliNativeLibrary_set_policy,cli_cppuhelper,$(CLI_CPPUHELPER_POLICY_ASSEMBLY),$(CLI_CPPUHELPER_POLICY_VERSION))) $(eval $(call gb_CliNativeLibrary_use_assemblies,cli_cppuhelper,\ diff --git a/cli_ure/CliUnoApi_cli_uretypes.mk b/cli_ure/CliUnoApi_cli_uretypes.mk index af3566e92a29..f58bfd6e6694 100644 --- a/cli_ure/CliUnoApi_cli_uretypes.mk +++ b/cli_ure/CliUnoApi_cli_uretypes.mk @@ -15,6 +15,8 @@ $(eval $(call gb_CliUnoApi_set_assembly_version,cli_uretypes,$(CLI_URETYPES_NEW_ $(eval $(call gb_CliUnoApi_set_configfile,cli_uretypes,cli_ure/unotypes/cli_uretypes_config)) +$(eval $(call gb_CliUnoApi_set_keyfile,cli_uretypes,$(OUTDIR)/bin/cliuno.snk)) + $(eval $(call gb_CliUnoApi_set_policy,cli_uretypes,$(CLI_URETYPES_POLICY_ASSEMBLY),$(CLI_URETYPES_POLICY_VERSION))) $(eval $(call gb_CliUnoApi_wrap_api,cli_uretypes,udkapi)) From 0683c2f429f4729db06e68b162eeb0d198ae3cad Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 3 Oct 2012 08:48:04 +0200 Subject: [PATCH 217/863] dep on soltools_inc is only for windows Change-Id: I2f8b89573ad91477c76827d2697f0c74a14d4b8b --- soltools/Executable_makedepend.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/soltools/Executable_makedepend.mk b/soltools/Executable_makedepend.mk index 96a3682a2b0c..c3b7d2ff017f 100644 --- a/soltools/Executable_makedepend.mk +++ b/soltools/Executable_makedepend.mk @@ -13,10 +13,6 @@ $(eval $(call gb_Executable_add_exception_objects,makedepend,\ soltools/mkdepend/collectdircontent \ )) -$(eval $(call gb_Executable_use_package,makedepend,\ - soltools_inc \ -)) - $(eval $(call gb_Executable_add_defs,makedepend,\ -DNO_X11 \ -DXP_PC \ @@ -24,6 +20,10 @@ $(eval $(call gb_Executable_add_defs,makedepend,\ )) ifeq ($(COM),MSC) +$(eval $(call gb_Executable_use_packages,makedepend,\ + soltools_inc \ +)) + $(eval $(call gb_Executable_add_defs,makedepend,\ -wd4100 \ -wd4131 \ From e292cb0df0bd4de5804f875a68f9075e7129ebd4 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 3 Oct 2012 08:51:34 +0200 Subject: [PATCH 218/863] nearly all soltools executables need unistd.h Change-Id: I0177f624951943d1f241d395a38f13211a3ff9ef --- soltools/Executable_adjustvisibility.mk | 6 ++++++ soltools/Executable_checkdll.mk | 6 ++++++ soltools/Executable_cpp.mk | 6 ++++++ soltools/Executable_javadep.mk | 6 ++++++ 4 files changed, 24 insertions(+) diff --git a/soltools/Executable_adjustvisibility.mk b/soltools/Executable_adjustvisibility.mk index 6a8ce614b7dd..0e98c34b9aac 100644 --- a/soltools/Executable_adjustvisibility.mk +++ b/soltools/Executable_adjustvisibility.mk @@ -9,6 +9,12 @@ $(eval $(call gb_Executable_Executable,adjustvisibility)) +ifeq ($(COM),MSC) +$(eval $(call gb_Executable_use_packages,adjustvisibility,\ + soltools_inc \ +)) +endif + $(eval $(call gb_Executable_add_exception_objects,adjustvisibility,\ soltools/adjustvisibility/adjustvisibility \ )) diff --git a/soltools/Executable_checkdll.mk b/soltools/Executable_checkdll.mk index 45e18246d6db..de9ccbb41eed 100644 --- a/soltools/Executable_checkdll.mk +++ b/soltools/Executable_checkdll.mk @@ -9,6 +9,12 @@ $(eval $(call gb_Executable_Executable,checkdll)) +ifeq ($(COM),MSC) +$(eval $(call gb_Executable_use_packages,checkdll,\ + soltools_inc \ +)) +endif + $(eval $(call gb_Executable_add_cobjects,checkdll,\ soltools/checkdll/checkdll \ )) diff --git a/soltools/Executable_cpp.mk b/soltools/Executable_cpp.mk index 29fb1f853fa8..f0d3d113b616 100644 --- a/soltools/Executable_cpp.mk +++ b/soltools/Executable_cpp.mk @@ -9,6 +9,12 @@ $(eval $(call gb_Executable_Executable,cpp)) +ifeq ($(COM),MSC) +$(eval $(call gb_Executable_use_packages,cpp,\ + soltools_inc \ +)) +endif + $(eval $(call gb_Executable_add_cobjects,cpp,\ soltools/cpp/_cpp \ soltools/cpp/_eval \ diff --git a/soltools/Executable_javadep.mk b/soltools/Executable_javadep.mk index a0fc0369f8e1..2a44a879b388 100644 --- a/soltools/Executable_javadep.mk +++ b/soltools/Executable_javadep.mk @@ -9,6 +9,12 @@ $(eval $(call gb_Executable_Executable,javadep)) +ifeq ($(COM),MSC) +$(eval $(call gb_Executable_use_packages,javadep,\ + soltools_inc \ +)) +endif + $(eval $(call gb_Executable_add_cobjects,javadep,\ soltools/javadep/javadep \ )) From b3584b90aacd307490bfd15d2ace63e805a8b57a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 2 Oct 2012 17:05:35 +0100 Subject: [PATCH 219/863] probable attempts to find the parent dialog Change-Id: I033f3cd9b42df21c9b63dc03e8e0136971d5dc24 --- dbaccess/source/ui/dlg/tablespage.cxx | 2 +- dbaccess/source/ui/misc/WTypeSelect.cxx | 2 +- sc/source/ui/dbgui/tpsort.cxx | 4 ++-- sd/source/ui/dlg/tpaction.cxx | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 19eba7de6f98..8f76496d7ea4 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -335,7 +335,7 @@ DBG_NAME(OTableSubscriptionPage) if (aErrorInfo.isValid()) { // establishing the connection failed. Show an error window and exit. - OSQLMessageBox aMessageBox( GetParent()->GetParent(), aErrorInfo ); + OSQLMessageBox aMessageBox( GetParentDialog(), aErrorInfo ); aMessageBox.Execute(); m_aTables.Enable(sal_False); m_aTablesList.Enable(sal_False); diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index 4b3078b2cb3e..0a40d8e22c0c 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -112,7 +112,7 @@ void OWizTypeSelectControl::CellModified(long nRow, sal_uInt16 nColId ) { case FIELD_PRPOERTY_COLUMNNAME: { - OCopyTableWizard* pWiz = static_cast(GetParent()->GetParent()); + OCopyTableWizard* pWiz = static_cast(GetParentDialog()); // first we have to check if this name already exists sal_Bool bDoubleName = sal_False; sal_Bool bCase = sal_True; diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index d4f23032c388..84084d7e721d 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -96,7 +96,7 @@ ScTabPageSortFields::ScTabPageSortFields( Window* pParent, aStrRow ( SC_RESSTR( SCSTR_ROW ) ), // nWhichSort ( rArgSet.GetPool()->GetWhich( SID_SORT ) ), - pDlg ( (ScSortDlg*)(GetParent()->GetParent()) ), + pDlg ( (ScSortDlg*)(GetParentDialog()) ), pViewData ( NULL ), aSortData ( ((const ScSortItem&) rArgSet.Get( nWhichSort )). @@ -517,7 +517,7 @@ ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent, rArgSet.Get( nWhichSort )).GetSortData() ), pViewData ( NULL ), pDoc ( NULL ), - pDlg ( (ScSortDlg*)(GetParent() ? GetParent()->GetParent() : 0 ) ), + pDlg ( (ScSortDlg*)(GetParentDialog()) ), pColRes ( NULL ), pColWrap ( NULL ) { diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index d9372e4b9632..5e0753acb62c 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -708,7 +708,7 @@ IMPL_LINK_NOARG(SdTPAction, CheckFileHdl) if( aMedium.IsStorage() ) { - WaitObject aWait( GetParent()->GetParent() ); + WaitObject aWait( GetParentDialog() ); // ist es eine Draw-Datei? // mit READ oeffnen, sonst schreiben die Storages evtl. in die Datei! From cad78399e403e3635de06775c0c50bf24f74ecd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 2 Oct 2012 22:41:14 +0100 Subject: [PATCH 220/863] support loading certain stock images as button symbols Change-Id: I475a4bc7e0686fa17beceb68f1aed016ef158117 --- vcl/inc/vcl/builder.hxx | 81 ++++++----- vcl/source/control/button.cxx | 2 - vcl/source/window/builder.cxx | 265 +++++++++++++++++++++++----------- 3 files changed, 225 insertions(+), 123 deletions(-) diff --git a/vcl/inc/vcl/builder.hxx b/vcl/inc/vcl/builder.hxx index a84f6d10285c..112e2939b9e9 100644 --- a/vcl/inc/vcl/builder.hxx +++ b/vcl/inc/vcl/builder.hxx @@ -23,16 +23,16 @@ class NumericFormatter; class VCL_DLLPUBLIC VclBuilder { public: - typedef std::map stringmap; + typedef std::map stringmap; typedef Window* (*customMakeWidget)(Window *pParent, stringmap &rVec); private: struct WinAndId { - rtl::OString m_sID; + OString m_sID; Window *m_pWindow; sal_Int32 m_nPosition; bool m_bOwned; - WinAndId(const rtl::OString &rId, Window *pWindow) + WinAndId(const OString &rId, Window *pWindow) : m_sID(rId) , m_pWindow(pWindow) , m_nPosition(-1) @@ -44,15 +44,15 @@ private: struct ListStore { - typedef std::vector row; + typedef std::vector row; std::vector m_aEntries; }; struct ModelAndId { - rtl::OString m_sID; + OString m_sID; ListStore *m_pModel; - ModelAndId(const rtl::OString &rId, ListStore *pListStore) + ModelAndId(const OString &rId, ListStore *pListStore) : m_sID(rId) , m_pModel(pListStore) { @@ -61,9 +61,9 @@ private: struct StringPair { - rtl::OString m_sID; - rtl::OString m_sValue; - StringPair(const rtl::OString &rId, const rtl::OString &rValue) + OString m_sID; + OString m_sValue; + StringPair(const OString &rId, const OString &rValue) : m_sID(rId) , m_sValue(rValue) { @@ -72,17 +72,18 @@ private: typedef StringPair RadioButtonGroupMap; typedef StringPair ComboBoxModelMap; + typedef StringPair ButtonImageWidgetMap; - ListStore *get_model_by_name(rtl::OString sID); + ListStore *get_model_by_name(OString sID); static void mungemodel(ListBox &rTarget, ListStore &rStore); typedef stringmap Adjustment; struct AdjustmentAndId { - rtl::OString m_sID; + OString m_sID; Adjustment m_aAdjustment; - AdjustmentAndId(const rtl::OString &rId, Adjustment &rAdjustment) + AdjustmentAndId(const OString &rId, Adjustment &rAdjustment) : m_sID(rId) { m_aAdjustment.swap(rAdjustment); @@ -91,12 +92,13 @@ private: typedef StringPair SpinButtonAdjustmentMap; - Adjustment *get_adjustment_by_name(rtl::OString sID); + Adjustment *get_adjustment_by_name(OString sID); static void mungeadjustment(NumericFormatter &rTarget, Adjustment &rAdjustment); - typedef std::map WidgetTranslations; - typedef std::map Translations; + typedef std::map WidgetTranslations; + typedef std::map Translations; + typedef std::map StockMap; struct ParserState { std::vector m_aGroupMaps; @@ -104,22 +106,25 @@ private: std::vector m_aModels; std::vector m_aAdjustments; std::vector m_aAdjustmentMaps; + std::vector m_aButtonImageWidgetMaps; + StockMap m_aStockMap; Translations m_aTranslations; }; - rtl::OString getTranslation(const rtl::OString &rId, const rtl::OString &rProperty) const; + OString getTranslation(const OString &rId, const OString &rProperty) const; - rtl::OString m_sID; - rtl::OString m_sHelpRoot; + OString m_sID; + OString m_sHelpRoot; Window *m_pParent; ParserState *m_pParserState; - Window *get_by_name(rtl::OString sID); + Window *get_by_name(OString sID); + void delete_by_name(OString sID); public: - VclBuilder(Window *pParent, rtl::OUString sUIRootDir, rtl::OUString sUIFile, rtl::OString sID = rtl::OString()); + VclBuilder(Window *pParent, OUString sUIRootDir, OUString sUIFile, OString sID = OString()); ~VclBuilder(); Window *get_widget_root(); - template T* get(T*& ret, rtl::OString sID) + template T* get(T*& ret, OString sID) { Window *w = get_by_name(sID); ret = static_cast(w); @@ -134,7 +139,7 @@ public: return ret; } - template T* get(rtl::OString sID) + template T* get(OString sID) { Window *w = get_by_name(sID); T* ret = static_cast(w); @@ -150,18 +155,20 @@ public: return ret; } - rtl::OString get_by_window(const Window *pWindow) const; + OString get_by_window(const Window *pWindow) const; //for the purposes of retrofitting this to the existing code //look up sID, clone its properties into replacement and //splice replacement into the tree instead of it, without //taking ownership of it - bool replace(rtl::OString sID, Window &rReplacement); + bool replace(OString sID, Window &rReplacement); private: - Window *insertObject(Window *pParent, const rtl::OString &rClass, const rtl::OString &rID, stringmap &rVec); - Window *makeObject(Window *pParent, const rtl::OString &rClass, const rtl::OString &rID, stringmap &rVec); - bool extractGroup(const rtl::OString &id, stringmap &rVec); - bool extractModel(const rtl::OString &id, stringmap &rVec); - bool extractAdjustment(const rtl::OString &id, stringmap &rVec); + Window *insertObject(Window *pParent, const OString &rClass, const OString &rID, stringmap &rVec); + Window *makeObject(Window *pParent, const OString &rClass, const OString &rID, stringmap &rVec); + bool extractGroup(const OString &id, stringmap &rVec); + bool extractModel(const OString &id, stringmap &rVec); + bool extractAdjustment(const OString &id, stringmap &rVec); + bool extractImage(const OString &id, stringmap &rMap); + bool extractStock(const OString &id, stringmap &rMap); void handleTranslations(xmlreader::XmlReader &reader); @@ -169,11 +176,11 @@ private: Window* handleObject(Window *pParent, xmlreader::XmlReader &reader); void handlePacking(Window *pCurrent, xmlreader::XmlReader &reader); void applyPackingProperty(Window *pCurrent, xmlreader::XmlReader &reader); - void collectProperty(xmlreader::XmlReader &reader, const rtl::OString &rID, stringmap &rVec); + void collectProperty(xmlreader::XmlReader &reader, const OString &rID, stringmap &rVec); - void handleListStore(xmlreader::XmlReader &reader, const rtl::OString &rID); - void handleRow(xmlreader::XmlReader &reader, const rtl::OString &rID, sal_Int32 nRowIndex); - void handleAdjustment(const rtl::OString &rID, stringmap &rProperties); + void handleListStore(xmlreader::XmlReader &reader, const OString &rID); + void handleRow(xmlreader::XmlReader &reader, const OString &rID, sal_Int32 nRowIndex); + void handleAdjustment(const OString &rID, stringmap &rProperties); void handleTabChild(Window *pParent, xmlreader::XmlReader &reader); sal_Int32 get_window_packing_position(const Window *pWindow) const; @@ -205,14 +212,14 @@ protected: public: VclBuilderContainer(); virtual ~VclBuilderContainer(); - static rtl::OUString getUIRootDir(); + static OUString getUIRootDir(); static VclBuilder* overrideResourceWithUIXML(Window *pWindow, const ResId& rResId); static bool replace_buildable(Window *pParent, const ResId& rResId, Window &rReplacement); - template T* get(T*& ret, rtl::OString sID) + template T* get(T*& ret, OString sID) { return m_pUIBuilder->get(ret, sID); } - template T* get(rtl::OString sID) + template T* get(OString sID) { return m_pUIBuilder->get(sID); } @@ -221,7 +228,7 @@ public: /* * @return true if rValue is "True", "true", "1", etc. */ -bool VCL_DLLPUBLIC toBool(const rtl::OString &rValue); +bool VCL_DLLPUBLIC toBool(const OString &rValue); #endif diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index ae78dc0474e1..db244efd3218 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -904,8 +904,6 @@ void PushButton::ImplDrawPushButtonContent( OutputDevice* pDev, sal_uLong nDrawF else { Rectangle aSymbolRect; - // FIXME: (GetStyle() & WB_FLATBUTTON) != 0 is preliminary - // in the next major this should be replaced by "true" ImplDrawAlignedImage( pDev, aPos, aSize, bLayout, nImageSep, nDrawFlags, nTextStyle, IsSymbol() ? &aSymbolRect : NULL, true ); diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 33e43b606279..67bf87159a8c 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -24,23 +24,50 @@ #include #include -VclBuilder::VclBuilder(Window *pParent, rtl::OUString sUIDir, rtl::OUString sUIFile, rtl::OString sID) +namespace +{ + SymbolType mapStockToSymbol(OString sType) + { + SymbolType eRet = SYMBOL_NOSYMBOL; + if (sType == "gtk-media-next") + eRet = SYMBOL_NEXT; + else if (sType == "gtk-media-previous") + eRet = SYMBOL_PREV; + else if (sType == "gtk-go-back") + eRet = SYMBOL_ARROW_LEFT; + else if (sType == "gtk-go-forward") + eRet = SYMBOL_ARROW_RIGHT; + else if (sType == "gtk-go-up") + eRet = SYMBOL_ARROW_UP; + else if (sType == "gtk-go-down") + eRet = SYMBOL_ARROW_DOWN; + else if (sType == "gtk-missing-image") + eRet = SYMBOL_IMAGE; + else if (sType == "gtk-help") + eRet = SYMBOL_HELP; + else if (sType == "gtk-close") + eRet = SYMBOL_CLOSE; + return eRet; + } +} + +VclBuilder::VclBuilder(Window *pParent, OUString sUIDir, OUString sUIFile, OString sID) : m_sID(sID) - , m_sHelpRoot(rtl::OUStringToOString(sUIFile, RTL_TEXTENCODING_UTF8)) + , m_sHelpRoot(OUStringToOString(sUIFile, RTL_TEXTENCODING_UTF8)) , m_pParent(pParent) , m_pParserState(new ParserState) { sal_Int32 nIdx = m_sHelpRoot.lastIndexOf('.'); if (nIdx != -1) m_sHelpRoot = m_sHelpRoot.copy(0, nIdx); - m_sHelpRoot = m_sHelpRoot + rtl::OString('/'); + m_sHelpRoot = m_sHelpRoot + OString('/'); - rtl::OUString sUri = sUIDir + sUIFile; + OUString sUri = sUIDir + sUIFile; ::com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILocale(); for (int i = aLocale.Country.isEmpty() ? 1 : 0; i < 2; ++i) { - rtl::OUStringBuffer aTransBuf; + OUStringBuffer aTransBuf; sal_Int32 nLastSlash = sUri.lastIndexOf('/'); aTransBuf.append(sUri.copy(0, nLastSlash)).append("/res/").append(aLocale.Language); switch (i) @@ -53,7 +80,7 @@ VclBuilder::VclBuilder(Window *pParent, rtl::OUString sUIDir, rtl::OUString sUIF } aTransBuf.append(sUri.copy(nLastSlash)); - rtl::OUString sTransUri = aTransBuf.makeStringAndClear(); + OUString sTransUri = aTransBuf.makeStringAndClear(); try { xmlreader::XmlReader reader(sTransUri); @@ -106,7 +133,33 @@ VclBuilder::VclBuilder(Window *pParent, rtl::OUString sUIDir, rtl::OUString sUIF mungeadjustment(*pTarget, *pAdjustment); } - //drop maps, etc. now + //Set button images when everything has been imported + std::set aImagesToBeRemoved; + for (std::vector::iterator aI = m_pParserState->m_aButtonImageWidgetMaps.begin(), + aEnd = m_pParserState->m_aButtonImageWidgetMaps.end(); aI != aEnd; ++aI) + { + PushButton *pTarget = get(aI->m_sID); + FixedImage *pImage = get(aI->m_sValue); + aImagesToBeRemoved.insert(aI->m_sValue); + SymbolType eType = mapStockToSymbol(m_pParserState->m_aStockMap[aI->m_sValue]); + SAL_WARN_IF(!pTarget || !pImage || eType == SYMBOL_NOSYMBOL, + "vcl", "missing elements of button/image/stock"); + //to-do, situation where image isn't a stock image + if (pTarget && eType != SYMBOL_NOSYMBOL) + { + pTarget->SetSymbol(eType); + } + } + + //There may be duplicate use of an Image, so we used a set to collect and + //now we can remove them from the tree after their final munge + for (std::set::iterator aI = aImagesToBeRemoved.begin(), + aEnd = aImagesToBeRemoved.end(); aI != aEnd; ++aI) + { + delete_by_name(*aI); + } + + //drop maps, etc. that we don't need again delete m_pParserState; } @@ -124,9 +177,9 @@ void VclBuilder::handleTranslations(xmlreader::XmlReader &reader) { xmlreader::Span name; int nsId; - rtl::OString sType; + OString sType; - rtl::OString sID, sProperty; + OString sID, sProperty; while(1) { @@ -142,7 +195,7 @@ void VclBuilder::handleTranslations(xmlreader::XmlReader &reader) if (name.equals(RTL_CONSTASCII_STRINGPARAM("g"))) { name = reader.getAttributeValue(false); - sID = rtl::OString(name.begin, name.length); + sID = OString(name.begin, name.length); sal_Int32 nDelim = sID.indexOf(':'); if (nDelim != -1) sID = sID.copy(nDelim); @@ -150,7 +203,7 @@ void VclBuilder::handleTranslations(xmlreader::XmlReader &reader) else if (name.equals(RTL_CONSTASCII_STRINGPARAM("i"))) { name = reader.getAttributeValue(false); - sProperty = rtl::OString(name.begin, name.length); + sProperty = OString(name.begin, name.length); } } } @@ -158,12 +211,12 @@ void VclBuilder::handleTranslations(xmlreader::XmlReader &reader) if (res == xmlreader::XmlReader::RESULT_TEXT && !sID.isEmpty()) { - rtl::OString sTranslation(name.begin, name.length); + OString sTranslation(name.begin, name.length); m_pParserState->m_aTranslations[sID][sProperty] = sTranslation; } if (res == xmlreader::XmlReader::RESULT_END) - sID = rtl::OString(); + sID = OString(); if (res == xmlreader::XmlReader::RESULT_DONE) break; @@ -172,10 +225,10 @@ void VclBuilder::handleTranslations(xmlreader::XmlReader &reader) namespace { - rtl::OString extractPattern(VclBuilder::stringmap &rMap) + OString extractPattern(VclBuilder::stringmap &rMap) { - rtl::OString sPattern; - VclBuilder::stringmap::iterator aFind = rMap.find(rtl::OString(RTL_CONSTASCII_STRINGPARAM("pattern"))); + OString sPattern; + VclBuilder::stringmap::iterator aFind = rMap.find(OString(RTL_CONSTASCII_STRINGPARAM("pattern"))); if (aFind != rMap.end()) { sPattern = aFind->second; @@ -187,7 +240,7 @@ namespace bool extractResizable(VclBuilder::stringmap &rMap) { bool bResizable = true; - VclBuilder::stringmap::iterator aFind = rMap.find(rtl::OString(RTL_CONSTASCII_STRINGPARAM("resizable"))); + VclBuilder::stringmap::iterator aFind = rMap.find(OString(RTL_CONSTASCII_STRINGPARAM("resizable"))); if (aFind != rMap.end()) { bResizable = toBool(aFind->second); @@ -199,7 +252,7 @@ namespace bool extractOrientation(VclBuilder::stringmap &rMap) { bool bVertical = false; - VclBuilder::stringmap::iterator aFind = rMap.find(rtl::OString(RTL_CONSTASCII_STRINGPARAM("orientation"))); + VclBuilder::stringmap::iterator aFind = rMap.find(OString(RTL_CONSTASCII_STRINGPARAM("orientation"))); if (aFind != rMap.end()) { bVertical = aFind->second.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("vertical")); @@ -211,7 +264,7 @@ namespace bool extractInconsistent(VclBuilder::stringmap &rMap) { bool bInconsistent = false; - VclBuilder::stringmap::iterator aFind = rMap.find(rtl::OString(RTL_CONSTASCII_STRINGPARAM("inconsistent"))); + VclBuilder::stringmap::iterator aFind = rMap.find(OString(RTL_CONSTASCII_STRINGPARAM("inconsistent"))); if (aFind != rMap.end()) { bInconsistent = toBool(aFind->second); @@ -225,7 +278,7 @@ namespace WinBits nBits = WB_CENTER|WB_VCENTER|WB_3DLOOK; bool bIsStock = false; - VclBuilder::stringmap::iterator aFind = rMap.find(rtl::OString(RTL_CONSTASCII_STRINGPARAM("use-stock"))); + VclBuilder::stringmap::iterator aFind = rMap.find(OString(RTL_CONSTASCII_STRINGPARAM("use-stock"))); if (aFind != rMap.end()) { bIsStock = toBool(aFind->second); @@ -236,8 +289,8 @@ namespace if (bIsStock) { - rtl::OString sType; - aFind = rMap.find(rtl::OString(RTL_CONSTASCII_STRINGPARAM("label"))); + OString sType; + aFind = rMap.find(OString(RTL_CONSTASCII_STRINGPARAM("label"))); if (aFind != rMap.end()) { sType = aFind->second; @@ -297,7 +350,7 @@ namespace return pWindow; } - FieldUnit detectMetricUnit(rtl::OString sUnit) + FieldUnit detectMetricUnit(OString sUnit) { FieldUnit eUnit = FUNIT_NONE; @@ -333,16 +386,16 @@ namespace void ensureDefaultWidthChars(VclBuilder::stringmap &rMap) { - rtl::OString sWidthChars(RTL_CONSTASCII_STRINGPARAM("width-chars")); + OString sWidthChars(RTL_CONSTASCII_STRINGPARAM("width-chars")); VclBuilder::stringmap::iterator aFind = rMap.find(sWidthChars); if (aFind == rMap.end()) rMap[sWidthChars] = "25"; } } -bool VclBuilder::extractGroup(const rtl::OString &id, stringmap &rMap) +bool VclBuilder::extractGroup(const OString &id, stringmap &rMap) { - VclBuilder::stringmap::iterator aFind = rMap.find(rtl::OString(RTL_CONSTASCII_STRINGPARAM("group"))); + VclBuilder::stringmap::iterator aFind = rMap.find(OString(RTL_CONSTASCII_STRINGPARAM("group"))); if (aFind != rMap.end()) { m_pParserState->m_aGroupMaps.push_back(RadioButtonGroupMap(id, aFind->second)); @@ -352,9 +405,9 @@ bool VclBuilder::extractGroup(const rtl::OString &id, stringmap &rMap) return false; } -bool VclBuilder::extractAdjustment(const rtl::OString &id, stringmap &rMap) +bool VclBuilder::extractAdjustment(const OString &id, stringmap &rMap) { - VclBuilder::stringmap::iterator aFind = rMap.find(rtl::OString(RTL_CONSTASCII_STRINGPARAM("adjustment"))); + VclBuilder::stringmap::iterator aFind = rMap.find(OString(RTL_CONSTASCII_STRINGPARAM("adjustment"))); if (aFind != rMap.end()) { m_pParserState->m_aAdjustmentMaps.push_back(SpinButtonAdjustmentMap(id, aFind->second)); @@ -364,9 +417,9 @@ bool VclBuilder::extractAdjustment(const rtl::OString &id, stringmap &rMap) return false; } -bool VclBuilder::extractModel(const rtl::OString &id, stringmap &rMap) +bool VclBuilder::extractModel(const OString &id, stringmap &rMap) { - VclBuilder::stringmap::iterator aFind = rMap.find(rtl::OString(RTL_CONSTASCII_STRINGPARAM("model"))); + VclBuilder::stringmap::iterator aFind = rMap.find(OString("model")); if (aFind != rMap.end()) { m_pParserState->m_aModelMaps.push_back(ComboBoxModelMap(id, aFind->second)); @@ -376,9 +429,33 @@ bool VclBuilder::extractModel(const rtl::OString &id, stringmap &rMap) return false; } +bool VclBuilder::extractStock(const OString &id, stringmap &rMap) +{ + VclBuilder::stringmap::iterator aFind = rMap.find(OString("stock")); + if (aFind != rMap.end()) + { + m_pParserState->m_aStockMap[id] = aFind->second; + rMap.erase(aFind); + return true; + } + return false; +} + +bool VclBuilder::extractImage(const OString &id, stringmap &rMap) +{ + VclBuilder::stringmap::iterator aFind = rMap.find(OString("image")); + if (aFind != rMap.end()) + { + m_pParserState->m_aButtonImageWidgetMaps.push_back(ButtonImageWidgetMap(id, aFind->second)); + rMap.erase(aFind); + return true; + } + return false; +} + extern "C" { static void SAL_CALL thisModule() {} } -Window *VclBuilder::makeObject(Window *pParent, const rtl::OString &name, const rtl::OString &id, stringmap &rMap) +Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OString &id, stringmap &rMap) { bool bIsPlaceHolder = name.isEmpty(); @@ -393,7 +470,7 @@ Window *VclBuilder::makeObject(Window *pParent, const rtl::OString &name, const TabControl *pTabControl = static_cast(pParent); sal_uInt16 nNewPageCount = pTabControl->GetPageCount()+1; sal_uInt16 nNewPageId = -nNewPageCount; - pTabControl->InsertPage(nNewPageId, rtl::OUString()); + pTabControl->InsertPage(nNewPageId, OUString()); pTabControl->SetCurPageId(nNewPageId); if (!bIsPlaceHolder) @@ -402,9 +479,9 @@ Window *VclBuilder::makeObject(Window *pParent, const rtl::OString &name, const pPage->Show(); //Make up a name for it - rtl::OString sTabPageId = get_by_window(pParent) + - rtl::OString("-page") + - rtl::OString::valueOf(static_cast(nNewPageCount)); + OString sTabPageId = get_by_window(pParent) + + OString("-page") + + OString::valueOf(static_cast(nNewPageCount)); m_aChildren.push_back(WinAndId(sTabPageId, pPage)); pPage->SetHelpId(m_sHelpRoot + sTabPageId); @@ -412,8 +489,8 @@ Window *VclBuilder::makeObject(Window *pParent, const rtl::OString &name, const //tab page VclBin* pContainer = new VclBin(pPage); pContainer->Show(); - m_aChildren.push_back(WinAndId(rtl::OString(), pContainer)); - pContainer->SetHelpId(m_sHelpRoot + sTabPageId + rtl::OString("-bin")); + m_aChildren.push_back(WinAndId(OString(), pContainer)); + pContainer->SetHelpId(m_sHelpRoot + sTabPageId + OString("-bin")); pParent = pContainer; pTabControl->SetTabPage(nNewPageId, pPage); @@ -454,7 +531,10 @@ Window *VclBuilder::makeObject(Window *pParent, const rtl::OString &name, const else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkAlignment"))) pWindow = new VclAlignment(pParent); else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkButton"))) + { + extractImage(id, rMap); pWindow = extractStockAndBuildButton(pParent, rMap); + } else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkRadioButton"))) { extractGroup(id, rMap); @@ -474,8 +554,8 @@ Window *VclBuilder::makeObject(Window *pParent, const rtl::OString &name, const else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkSpinButton"))) { extractAdjustment(id, rMap); - rtl::OString sPattern = extractPattern(rMap); - rtl::OString sUnit = sPattern; + OString sPattern = extractPattern(rMap); + OString sUnit = sPattern; for (sal_Int32 i = 0; i < sPattern.getLength(); ++i) { @@ -527,7 +607,10 @@ Window *VclBuilder::makeObject(Window *pParent, const rtl::OString &name, const else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkLabel"))) pWindow = new FixedText(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK); else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkImage"))) + { + extractStock(id, rMap); pWindow = new FixedImage(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK); + } else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkSeparator"))) { if (extractOrientation(rMap)) @@ -549,15 +632,15 @@ Window *VclBuilder::makeObject(Window *pParent, const rtl::OString &name, const sal_Int32 nDelim = name.indexOf(':'); if (nDelim != -1) { - rtl::OUStringBuffer sModule; + OUStringBuffer sModule; #ifdef SAL_DLLPREFIX sModule.append(SAL_DLLPREFIX); #endif - sModule.append(rtl::OStringToOUString(name.copy(0, nDelim), RTL_TEXTENCODING_UTF8)); + sModule.append(OStringToOUString(name.copy(0, nDelim), RTL_TEXTENCODING_UTF8)); #ifdef SAL_DLLEXTENSION sModule.append(SAL_DLLEXTENSION); #endif - rtl::OUString sFunction(rtl::OStringToOUString(rtl::OString("make") + name.copy(nDelim+1), RTL_TEXTENCODING_UTF8)); + OUString sFunction(OStringToOUString(OString("make") + name.copy(nDelim+1), RTL_TEXTENCODING_UTF8)); osl::Module aModule; aModule.loadRelative(&thisModule, sModule.makeStringAndClear()); customMakeWidget pFunction = (customMakeWidget)aModule.getFunctionSymbol(sFunction); @@ -590,7 +673,7 @@ namespace } } -Window *VclBuilder::insertObject(Window *pParent, const rtl::OString &rClass, const rtl::OString &rID, stringmap &rMap) +Window *VclBuilder::insertObject(Window *pParent, const OString &rClass, const OString &rID, stringmap &rMap) { Window *pCurrentChild = NULL; @@ -620,8 +703,8 @@ Window *VclBuilder::insertObject(Window *pParent, const rtl::OString &rClass, co { for (stringmap::iterator aI = rMap.begin(), aEnd = rMap.end(); aI != aEnd; ++aI) { - const rtl::OString &rKey = aI->first; - const rtl::OString &rValue = aI->second; + const OString &rKey = aI->first; + const OString &rValue = aI->second; pCurrentChild->set_property(rKey, rValue); } } @@ -674,7 +757,7 @@ void VclBuilder::reorderWithinParent(Window &rWindow, sal_uInt16 nNewPosition) void VclBuilder::handleTabChild(Window *pParent, xmlreader::XmlReader &reader) { - rtl::OString sID; + OString sID; int nLevel = 1; stringmap aProperties; @@ -696,12 +779,12 @@ void VclBuilder::handleTabChild(Window *pParent, xmlreader::XmlReader &reader) if (name.equals(RTL_CONSTASCII_STRINGPARAM("id"))) { name = reader.getAttributeValue(false); - sID = rtl::OString(name.begin, name.length); + sID = OString(name.begin, name.length); sal_Int32 nDelim = sID.indexOf(':'); if (nDelim != -1) { - rtl::OString sPattern = sID.copy(nDelim+1); - aProperties[rtl::OString("pattern")] = sPattern; + OString sPattern = sID.copy(nDelim+1); + aProperties[OString("pattern")] = sPattern; sID = sID.copy(0, nDelim); } } @@ -722,10 +805,10 @@ void VclBuilder::handleTabChild(Window *pParent, xmlreader::XmlReader &reader) } TabControl *pTabControl = static_cast(pParent); - VclBuilder::stringmap::iterator aFind = aProperties.find(rtl::OString(RTL_CONSTASCII_STRINGPARAM("label"))); + VclBuilder::stringmap::iterator aFind = aProperties.find(OString(RTL_CONSTASCII_STRINGPARAM("label"))); if (aFind != aProperties.end()) { - pTabControl->SetPageText(pTabControl->GetCurPageId(), rtl::OStringToOUString(aFind->second, RTL_TEXTENCODING_UTF8)); + pTabControl->SetPageText(pTabControl->GetCurPageId(), OStringToOUString(aFind->second, RTL_TEXTENCODING_UTF8)); sal_Int32 nID = 0; //To make it easier to retro fit pre-builder dialog code we take the @@ -770,14 +853,14 @@ void VclBuilder::handleChild(Window *pParent, xmlreader::XmlReader &reader) xmlreader::Span name; int nsId; - rtl::OString sType; + OString sType; while (reader.nextAttribute(&nsId, &name)) { if (name.equals(RTL_CONSTASCII_STRINGPARAM("type"))) { name = reader.getAttributeValue(false); - sType = rtl::OString(name.begin, name.length); + sType = OString(name.begin, name.length); } } @@ -858,12 +941,12 @@ void VclBuilder::handleChild(Window *pParent, xmlreader::XmlReader &reader) } } -void VclBuilder::handleAdjustment(const rtl::OString &rID, stringmap &rProperties) +void VclBuilder::handleAdjustment(const OString &rID, stringmap &rProperties) { m_pParserState->m_aAdjustments.push_back(AdjustmentAndId(rID, rProperties)); } -void VclBuilder::handleRow(xmlreader::XmlReader &reader, const rtl::OString &rID, sal_Int32 nRowIndex) +void VclBuilder::handleRow(xmlreader::XmlReader &reader, const OString &rID, sal_Int32 nRowIndex) { int nLevel = 1; @@ -886,7 +969,7 @@ void VclBuilder::handleRow(xmlreader::XmlReader &reader, const rtl::OString &rID if (name.equals(RTL_CONSTASCII_STRINGPARAM("col"))) { bool bTranslated = false; - rtl::OString sProperty, sValue; + OString sProperty, sValue; sal_uInt32 nId = 0; while (reader.nextAttribute(&nsId, &name)) @@ -894,11 +977,11 @@ void VclBuilder::handleRow(xmlreader::XmlReader &reader, const rtl::OString &rID if (name.equals(RTL_CONSTASCII_STRINGPARAM("id"))) { name = reader.getAttributeValue(false); - nId = rtl::OString(name.begin, name.length).toInt32(); + nId = OString(name.begin, name.length).toInt32(); } else if (nId == 0 && name.equals(RTL_CONSTASCII_STRINGPARAM("translatable")) && reader.getAttributeValue(false).equals(RTL_CONSTASCII_STRINGPARAM("yes"))) { - sValue = getTranslation(rID, rtl::OString::valueOf(nRowIndex)); + sValue = getTranslation(rID, OString::valueOf(nRowIndex)); bTranslated = !sValue.isEmpty(); } } @@ -907,7 +990,7 @@ void VclBuilder::handleRow(xmlreader::XmlReader &reader, const rtl::OString &rID xmlreader::XmlReader::TEXT_RAW, &name, &nsId); if (!bTranslated) - sValue = rtl::OString(name.begin, name.length); + sValue = OString(name.begin, name.length); if (aRow.size() < nId+1) aRow.resize(nId+1); @@ -928,7 +1011,7 @@ void VclBuilder::handleRow(xmlreader::XmlReader &reader, const rtl::OString &rID m_pParserState->m_aModels.back().m_pModel->m_aEntries.push_back(aRow); } -void VclBuilder::handleListStore(xmlreader::XmlReader &reader, const rtl::OString &rID) +void VclBuilder::handleListStore(xmlreader::XmlReader &reader, const OString &rID) { m_pParserState->m_aModels.push_back(ModelAndId(rID, new ListStore)); @@ -966,9 +1049,9 @@ void VclBuilder::handleListStore(xmlreader::XmlReader &reader, const rtl::OStrin Window* VclBuilder::handleObject(Window *pParent, xmlreader::XmlReader &reader) { - rtl::OString sClass; - rtl::OString sID; - rtl::OString sPattern; + OString sClass; + OString sID; + OString sPattern; xmlreader::Span name; int nsId; @@ -978,12 +1061,12 @@ Window* VclBuilder::handleObject(Window *pParent, xmlreader::XmlReader &reader) if (name.equals(RTL_CONSTASCII_STRINGPARAM("class"))) { name = reader.getAttributeValue(false); - sClass = rtl::OString(name.begin, name.length); + sClass = OString(name.begin, name.length); } else if (name.equals(RTL_CONSTASCII_STRINGPARAM("id"))) { name = reader.getAttributeValue(false); - sID = rtl::OString(name.begin, name.length); + sID = OString(name.begin, name.length); sal_Int32 nDelim = sID.indexOf(':'); if (nDelim != -1) { @@ -1004,7 +1087,7 @@ Window* VclBuilder::handleObject(Window *pParent, xmlreader::XmlReader &reader) stringmap aProperties; if (!sPattern.isEmpty()) - aProperties[rtl::OString("pattern")] = sPattern; + aProperties[OString("pattern")] = sPattern; Window *pCurrentChild = NULL; while(1) @@ -1098,11 +1181,11 @@ void VclBuilder::applyPackingProperty(Window *pCurrent, if (name.equals(RTL_CONSTASCII_STRINGPARAM("name"))) { name = reader.getAttributeValue(false); - rtl::OString sKey(name.begin, name.length); + OString sKey(name.begin, name.length); sKey = sKey.replace('_', '-'); reader.nextItem( xmlreader::XmlReader::TEXT_RAW, &name, &nsId); - rtl::OString sValue(name.begin, name.length); + OString sValue(name.begin, name.length); if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("expand"))) { @@ -1151,7 +1234,7 @@ void VclBuilder::applyPackingProperty(Window *pCurrent, } } -rtl::OString VclBuilder::getTranslation(const rtl::OString &rID, const rtl::OString &rProperty) const +OString VclBuilder::getTranslation(const OString &rID, const OString &rProperty) const { Translations::const_iterator aWidgetFind = m_pParserState->m_aTranslations.find(rID); if (aWidgetFind != m_pParserState->m_aTranslations.end()) @@ -1161,16 +1244,16 @@ rtl::OString VclBuilder::getTranslation(const rtl::OString &rID, const rtl::OStr if (aPropertyFind != rWidgetTranslations.end()) return aPropertyFind->second; } - return rtl::OString(); + return OString(); } -void VclBuilder::collectProperty(xmlreader::XmlReader &reader, const rtl::OString &rID, stringmap &rMap) +void VclBuilder::collectProperty(xmlreader::XmlReader &reader, const OString &rID, stringmap &rMap) { xmlreader::Span name; int nsId; - rtl::OString sProperty; - rtl::OString sValue; + OString sProperty; + OString sValue; bool bTranslated = false; @@ -1179,7 +1262,7 @@ void VclBuilder::collectProperty(xmlreader::XmlReader &reader, const rtl::OStrin if (name.equals(RTL_CONSTASCII_STRINGPARAM("name"))) { name = reader.getAttributeValue(false); - sProperty = rtl::OString(name.begin, name.length); + sProperty = OString(name.begin, name.length); } else if (name.equals(RTL_CONSTASCII_STRINGPARAM("translatable")) && reader.getAttributeValue(false).equals(RTL_CONSTASCII_STRINGPARAM("yes"))) { @@ -1191,7 +1274,7 @@ void VclBuilder::collectProperty(xmlreader::XmlReader &reader, const rtl::OStrin reader.nextItem(xmlreader::XmlReader::TEXT_RAW, &name, &nsId); if (!bTranslated) - sValue = rtl::OString(name.begin, name.length); + sValue = OString(name.begin, name.length); if (!sProperty.isEmpty()) { @@ -1211,7 +1294,7 @@ Window *VclBuilder::get_widget_root() return m_aChildren.empty() ? NULL : m_aChildren[0].m_pWindow; } -Window *VclBuilder::get_by_name(rtl::OString sID) +Window *VclBuilder::get_by_name(OString sID) { for (std::vector::iterator aI = m_aChildren.begin(), aEnd = m_aChildren.end(); aI != aEnd; ++aI) @@ -1223,7 +1306,21 @@ Window *VclBuilder::get_by_name(rtl::OString sID) return NULL; } -rtl::OString VclBuilder::get_by_window(const Window *pWindow) const +void VclBuilder::delete_by_name(OString sID) +{ + for (std::vector::iterator aI = m_aChildren.begin(), + aEnd = m_aChildren.end(); aI != aEnd; ++aI) + { + if (aI->m_sID.equals(sID)) + { + delete aI->m_pWindow; + m_aChildren.erase(aI); + break; + } + } +} + +OString VclBuilder::get_by_window(const Window *pWindow) const { for (std::vector::const_iterator aI = m_aChildren.begin(), aEnd = m_aChildren.end(); aI != aEnd; ++aI) @@ -1232,7 +1329,7 @@ rtl::OString VclBuilder::get_by_window(const Window *pWindow) const return aI->m_sID; } - return rtl::OString(); + return OString(); } sal_Int32 VclBuilder::get_window_packing_position(const Window *pWindow) const @@ -1257,7 +1354,7 @@ void VclBuilder::set_window_packing_position(const Window *pWindow, sal_Int32 nP } } -VclBuilder::ListStore *VclBuilder::get_model_by_name(rtl::OString sID) +VclBuilder::ListStore *VclBuilder::get_model_by_name(OString sID) { for (std::vector::iterator aI = m_pParserState->m_aModels.begin(), aEnd = m_pParserState->m_aModels.end(); aI != aEnd; ++aI) @@ -1269,7 +1366,7 @@ VclBuilder::ListStore *VclBuilder::get_model_by_name(rtl::OString sID) return NULL; } -VclBuilder::Adjustment *VclBuilder::get_adjustment_by_name(rtl::OString sID) +VclBuilder::Adjustment *VclBuilder::get_adjustment_by_name(OString sID) { for (std::vector::iterator aI = m_pParserState->m_aAdjustments.begin(), aEnd = m_pParserState->m_aAdjustments.end(); aI != aEnd; ++aI) @@ -1292,7 +1389,7 @@ void VclBuilder::swapGuts(Window &rOrig, Window &rReplacement) assert(nPosition == getPositionWithinParent(rReplacement)); } -bool VclBuilder::replace(rtl::OString sID, Window &rReplacement) +bool VclBuilder::replace(OString sID, Window &rReplacement) { for (std::vector::iterator aI = m_aChildren.begin(), aEnd = m_aChildren.end(); aI != aEnd; ++aI) @@ -1318,7 +1415,7 @@ void VclBuilder::mungemodel(ListBox &rTarget, ListStore &rStore) aI != aEnd; ++aI) { const ListStore::row &rRow = *aI; - sal_uInt16 nEntry = rTarget.InsertEntry(rtl::OStringToOUString(rRow[0], RTL_TEXTENCODING_UTF8)); + sal_uInt16 nEntry = rTarget.InsertEntry(OStringToOUString(rRow[0], RTL_TEXTENCODING_UTF8)); if (rRow.size() > 1) { sal_IntPtr nValue = rRow[1].toInt32(); @@ -1335,8 +1432,8 @@ void VclBuilder::mungeadjustment(NumericFormatter &rTarget, Adjustment &rAdjustm for (stringmap::iterator aI = rAdjustment.begin(), aEnd = rAdjustment.end(); aI != aEnd; ++aI) { - const rtl::OString &rKey = aI->first; - const rtl::OString &rValue = aI->second; + const OString &rKey = aI->first; + const OString &rValue = aI->second; if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("upper"))) { From 4b5837d7a1f7c6e5e0e9981c0e5fb8eb7b50f586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Wed, 3 Oct 2012 09:34:06 +0100 Subject: [PATCH 221/863] XubString->OUString Change-Id: I40a4efb5ffed5f8592651ef70eb99d4285a7cddd --- svx/source/form/navigatortree.cxx | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index da67a6146b36..c0a151706e28 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -457,9 +457,8 @@ namespace svxform { case SID_FM_NEW_FORM: { - XubString aStr(SVX_RES(RID_STR_FORM)); - XubString aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_INSERT)); - aUndoStr.SearchAndReplace(rtl::OUString('#'), aStr); + OUString aStr(SVX_RESSTR(RID_STR_FORM)); + OUString aUndoStr = SVX_RESSTR(RID_STR_UNDO_CONTAINER_INSERT).replaceAll(OUString('#'), aStr); pFormModel->BegUndo(aUndoStr); // der Slot war nur verfuegbar, wenn es genau einen selektierten Eintrag gibt und dieser die Root @@ -470,9 +469,8 @@ namespace svxform } break; case SID_FM_NEW_HIDDEN: { - XubString aStr(SVX_RES(RID_STR_CONTROL)); - XubString aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_INSERT)); - aUndoStr.SearchAndReplace(rtl::OUString('#'), aStr); + OUString aStr(SVX_RESSTR(RID_STR_CONTROL)); + OUString aUndoStr = SVX_RESSTR(RID_STR_UNDO_CONTAINER_INSERT).replaceAll(OUString('#'), aStr); pFormModel->BegUndo(aUndoStr); // dieser Slot war guletig bei (genau) einem selektierten Formular @@ -1002,9 +1000,8 @@ namespace svxform // innerhalb eines Undo ... if (pFormModel) { - XubString aStr(SVX_RES(RID_STR_CONTROL)); - XubString aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_INSERT)); - aUndoStr.SearchAndReplace(rtl::OUString('#'), aStr); + OUString aStr(SVX_RESSTR(RID_STR_CONTROL)); + OUString aUndoStr = SVX_RESSTR(RID_STR_UNDO_CONTAINER_INSERT).replaceAll(OUString('#'), aStr); pFormModel->BegUndo(aUndoStr); } @@ -1078,7 +1075,7 @@ namespace svxform if( bUndo ) { - XubString strUndoDescription(SVX_RES(RID_STR_UNDO_CONTAINER_REPLACE)); + OUString strUndoDescription(SVX_RESSTR(RID_STR_UNDO_CONTAINER_REPLACE)); pFormModel->BegUndo(strUndoDescription); } @@ -1482,7 +1479,7 @@ namespace svxform ////////////////////////////////////////////////////////////////////// // BasisNamen erzeugen - rtl::OUString aBaseName; + OUString aBaseName; if( pEntryData->ISA(FmFormData) ) aBaseName = SVX_RESSTR( RID_STR_STDFORMNAME ); else if( pEntryData->ISA(FmControlData) ) From fdb42c397f1d15d05a74492a233df72d832cab1c Mon Sep 17 00:00:00 2001 From: Noel Power Date: Wed, 3 Oct 2012 10:04:29 +0100 Subject: [PATCH 222/863] fix for fdo#55565 regression, failure to export vertical text in shape Change-Id: If3d6413b1fb9e02dc26f930634f84712d7d08ca3 --- oox/source/export/drawingml.cxx | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index ce9ff77d8026..db61ef990d06 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -1241,6 +1241,27 @@ void DrawingML::WriteText( Reference< XInterface > rXIface ) } } + if ( GETA( CustomShapeGeometry ) ) + { + Sequence< PropertyValue > aProps; + if ( mAny >>= aProps ) + { + for ( sal_Int32 i = 0, nElems = aProps.getLength(); i < nElems; ++i ) + { + sal_Int32 nTextRotateAngle = 0; + if ( aProps[ i ].Name.equals( "TextPreRotateAngle" ) && ( aProps[ i ].Value >>= nTextRotateAngle ) ) + { + if ( nTextRotateAngle == -90 ) + { + sWritingMode = "vert"; + bVertical = sal_True; + } + break; + } + } + } + } + TextHorizontalAdjust eHorizontalAlignment( TextHorizontalAdjust_CENTER ); bool bHorizontalCenter = false; GET( eHorizontalAlignment, TextHorizontalAdjust ); From b6aea86fe368746ea23a2fe669b1689f4d6f43e8 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Wed, 3 Oct 2012 11:11:48 +0200 Subject: [PATCH 223/863] SwFrm::dumpAsXmlAttributes: dump Fmt pointer Change-Id: Id9030f5a260fbfce88b6b238e075a7358993b355 --- sw/source/core/text/xmldump.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx index ec6408c7109d..e3ae11ad8208 100644 --- a/sw/source/core/text/xmldump.cxx +++ b/sw/source/core/text/xmldump.cxx @@ -384,6 +384,7 @@ void SwFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer ) SwHeadFootFrm *pHeadFootFrm = (SwHeadFootFrm*)this; rtl::OUString aFmtName = pHeadFootFrm->GetFmt()->GetName(); xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "fmtName" ), "%s", BAD_CAST(rtl::OUStringToOString(aFmtName, RTL_TEXTENCODING_UTF8).getStr())); + xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "fmtPtr" ), "%p", pHeadFootFrm->GetFmt()); } } From ce7372c3bd8755accf1bc1db1f44bd78d1a55421 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Thu, 27 Sep 2012 08:44:14 +0200 Subject: [PATCH 224/863] do not overcomplicate this Change-Id: I08add6a39547dd1a674b0efd52d6d4d257b92557 --- hsqldb/ExternalProject_hsqldb.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/hsqldb/ExternalProject_hsqldb.mk b/hsqldb/ExternalProject_hsqldb.mk index b9144b659c85..c45725e8fd59 100644 --- a/hsqldb/ExternalProject_hsqldb.mk +++ b/hsqldb/ExternalProject_hsqldb.mk @@ -7,9 +7,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# for RSCREVISION -include $(SOLARENV)/inc/minor.mk - $(eval $(call gb_ExternalProject_ExternalProject,hsqldb)) $(eval $(call gb_ExternalProject_use_unpacked,hsqldb,hsqldb)) @@ -23,7 +20,7 @@ $(call gb_ExternalProject_get_state_target,hsqldb,build) : "$(ANT)" \ -q \ -f build/build.xml \ - -Dbuild.label="build-$(RSCREVISION)" \ + -Dbuild.label="build-libreoffice" \ $(if $(filter yes,$(JAVACISGCJ))\ ,-Dbuild.compiler=gcj \ ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ From 6ded01b0762554e2d90fef6557a0cdae2e0c7a2b Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 3 Oct 2012 14:11:10 +0200 Subject: [PATCH 225/863] two shall be the number thou shalt count Change-Id: If84003c6a95cee0fd6e4e985ec0655f7074b0851 --- solenv/gbuild/UnpackedTarball.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk index c96d4ced7cc2..73123622c2d4 100644 --- a/solenv/gbuild/UnpackedTarball.mk +++ b/solenv/gbuild/UnpackedTarball.mk @@ -100,7 +100,7 @@ endef # This is what dmake patches use. Once all external modules are # converted, it is better to be changed to 1. -gb_UnpackedTarball_PATCHLEVEL_DEFAULT := 3 +gb_UnpackedTarball_PATCHLEVEL_DEFAULT := 2 gb_UnpackedTarball_CONVERTTODOS = \ $(gb_AWK) 'sub("$$","\r")' $(1) > $(1).TEMP && mv $(1).TEMP $(1) From fc62c7727a08dfb8ce171845b30fb0cd937918fc Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Wed, 3 Oct 2012 14:31:34 +0200 Subject: [PATCH 226/863] Allow also make .check. Change-Id: I55257cc5dbdffdc2dd9f9222a120f0a322dda7c8 --- Makefile.top | 3 +++ solenv/gbuild/gbuild.help.txt | 1 + 2 files changed, 4 insertions(+) diff --git a/Makefile.top b/Makefile.top index bb4f73e8c11d..8e1833f0f4b3 100644 --- a/Makefile.top +++ b/Makefile.top @@ -270,6 +270,9 @@ $(1).all: bootstrap fetch ) \ $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) +$(1).check: + cd $(1) && $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) check gb_PARTIALBUILD=T + $(1).clean: cd $(1) && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) clean gb_PARTIALBUILD=T diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt index 3b15639bd326..b6707ebd8ff0 100644 --- a/solenv/gbuild/gbuild.help.txt +++ b/solenv/gbuild/gbuild.help.txt @@ -39,6 +39,7 @@ AVAILABLE TARGETS debugrun starts the dev-install instance and allows tests to be run against it build the named module + .check run unittests of the named module .clean clean the named module .all build the named module and the pre-requisite modules for it .deliver for dmake modules only, deliver the named module From d8253f42ac7ce665fe6f3235a0a55f33ce71c3de Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 3 Oct 2012 14:37:11 +0200 Subject: [PATCH 227/863] fix application of patches Change-Id: I912be00b8dafc046b229967e66f8f32e2c14a0be --- apache-commons/UnpackedTarball_apache_commons_codec.mk | 2 ++ boost/UnpackedTarball_boost.mk | 2 ++ 2 files changed, 4 insertions(+) diff --git a/apache-commons/UnpackedTarball_apache_commons_codec.mk b/apache-commons/UnpackedTarball_apache_commons_codec.mk index 17d7e50ab265..64a29e31b281 100644 --- a/apache-commons/UnpackedTarball_apache_commons_codec.mk +++ b/apache-commons/UnpackedTarball_apache_commons_codec.mk @@ -11,6 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,apache_commons_codec)) $(eval $(call gb_UnpackedTarball_set_tarball,apache_commons_codec,$(APACHE_COMMONS_CODEC_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_patchlevel,apache_commons_codec,3)) + $(eval $(call gb_UnpackedTarball_fix_end_of_line,apache_commons_codec,\ build.xml \ )) diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk index 7e3f0f2b9c69..584d479155f4 100644 --- a/boost/UnpackedTarball_boost.mk +++ b/boost/UnpackedTarball_boost.mk @@ -48,6 +48,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost)) $(eval $(call gb_UnpackedTarball_set_tarball,boost,$(BOOST_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_patchlevel,boost,3)) + $(eval $(call gb_UnpackedTarball_add_patches,boost,\ $(foreach patch,$(boost_patches),boost/$(patch)) \ )) From f1fc7c5655dde547b721b3afffabcd8bdbe0add2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= Date: Wed, 3 Oct 2012 14:11:31 +0200 Subject: [PATCH 228/863] fdo#44278: fix leaked image when import docx Unused temporary XShape need to be disposed to avoid remaining garbage in the document. Change-Id: Iaf6e720a1c47605136f7f9ccafb605cab6dc260a --- writerfilter/source/dmapper/GraphicImport.cxx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index cbd59f943ebf..9042f808beb4 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -922,6 +922,10 @@ void GraphicImport::lcl_attribute(Id nName, Value & val) uno::makeAny( aSize.Height ) ); xGraphProps->setPropertyValue("Width", uno::makeAny( aSize.Width ) ); + + // We need to drop the shape here somehow + uno::Reference< lang::XComponent > xShapeComponent( xShape, uno::UNO_QUERY ); + xShapeComponent->dispose( ); } } catch( const beans::UnknownPropertyException & ) From ecb252af18f64b99f4ecfe34512dedfb7655fb40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= Date: Wed, 3 Oct 2012 14:38:04 +0200 Subject: [PATCH 229/863] testShadow: test shadow width to be non-0 to avoid precision errors Change-Id: I956f2c7f55d7e4966971bc310858967298d2933d --- sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index ceb2381621db..acc2097a50d2 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -990,7 +990,7 @@ void Test::testShadow() table::ShadowFormat aShadow; xPropertySet->getPropertyValue("ShadowFormat") >>= aShadow; - CPPUNIT_ASSERT_EQUAL(sal_Int32(273), sal_Int32(aShadow.ShadowWidth)); + CPPUNIT_ASSERT(sal_Int32(aShadow.ShadowWidth) > 0); } void Test::testN782061() From 3413841785496171a7a91a371355a7efc6ca0a2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Thu, 20 Sep 2012 18:26:03 +0200 Subject: [PATCH 230/863] probably a rather ugly hack for inline text frame in a table (bnc#780851) Change-Id: I2bd76799cf0a5da09664d0e1b1a9adb466633be1 --- writerfilter/source/dmapper/DomainMapper.cxx | 18 ++++++++++++++++-- writerfilter/source/dmapper/PropertyMap.hxx | 2 +- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 64618bf08614..c5a42a9fa36a 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -1273,8 +1273,22 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) case NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_center :nIntValue = text::VertOrientation::CENTER;break; case NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_bottom : case NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_outside :nIntValue = text::VertOrientation::BOTTOM;break; - case NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_inline ://todo: what to do with inline - no avail. in WW97 and WW2007 - //no break; + case NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_inline : + { + // HACK: This is for bnc#780851, where a table has one cell that has w:framePr, + // which causes that paragraph to be converted to a text frame, and the original + // paragraph object no longer exists, which makes table creation fail and futhermore + // it would be missing in the table layout anyway. So actually no letting that paragraph + // be a text frame "fixes" it. I'm not sure what "inline" is supposed to mean in practice + // anyway, so as long as this doesn't cause trouble elsewhere ... + PropertyMapPtr pContext = m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH); + if( pContext.get() ) + { + ParagraphPropertyMap* pParaContext = dynamic_cast< ParagraphPropertyMap* >( pContext.get() ); + pParaContext->SetFrameMode(false); + } + nIntValue = text::VertOrientation::NONE; + } default:nIntValue = text::VertOrientation::NONE; } pParaProperties->SetyAlign( nIntValue ); diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx index fc88ddbcdf92..d19988a58537 100644 --- a/writerfilter/source/dmapper/PropertyMap.hxx +++ b/writerfilter/source/dmapper/PropertyMap.hxx @@ -305,7 +305,7 @@ public: int operator==(const ParagraphProperties&); //does not compare the starting/ending range, m_sParaStyleName and m_nDropCapLength - void SetFrameMode() { m_bFrameMode = true; } + void SetFrameMode( bool set = true ) { m_bFrameMode = set; } bool IsFrameMode()const { return m_bFrameMode; } void SetDropCap( sal_Int32 nSet ) { m_nDropCap = nSet; } From da7f5e0e946e4bad87da06754709ac29eea9ab81 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 3 Oct 2012 15:04:41 +0200 Subject: [PATCH 231/863] adjust patch level for mdds too Change-Id: I9826efc4733d1351047a35a13eaf4730da7859bb --- mdds/UnpackedTarball_mdds.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mdds/UnpackedTarball_mdds.mk b/mdds/UnpackedTarball_mdds.mk index fd0d4a18ec43..00da864fd5a1 100644 --- a/mdds/UnpackedTarball_mdds.mk +++ b/mdds/UnpackedTarball_mdds.mk @@ -11,6 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,mdds)) $(eval $(call gb_UnpackedTarball_set_tarball,mdds,$(MDDS_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,3)) + $(eval $(call gb_UnpackedTarball_add_patches,mdds,\ mdds/mdds_0.6.0.patch \ mdds/0001-Workaround-for-gcc-bug.patch \ From a29217cc273de1faad8c3522bc23a11d650addbf Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 3 Oct 2012 16:17:34 +0300 Subject: [PATCH 232/863] More information Change-Id: I9f9a85cbe74dfb22a2dff67e8a0b7dd4eca6ebf6 --- expat/README | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/expat/README b/expat/README index 9d39ccf0d927..a3f8399c4da3 100644 --- a/expat/README +++ b/expat/README @@ -1,4 +1,40 @@ Simple SAX parser library with added UCS2 support. +When we build expat internally ("bundled"), we build two variants: One +that has an "ASCII" (actually UTF-8) API, another that has a "Unicode" +(meaning UTF-16) API. Additionally, expat is split into two parts, +expat_xmlparse and expat_xmltok. It's the former which has the two +variabts, ascii_expat_xmlparse (UTF-8) and expat_xmlparse (UTF-16). + +Code that uses expat then declares in its .mk file which one it wants +to use. See the magic in ../RepositoryExternal.mk, where in the +expat_utf16 case -DXML_UNICODE is passed when compiling source code +that wants to use the UTF-16 variant. + +Now, this sounds fairly clear so far. + +But wait. LO can also be conigured to use a *system* expat +library. The System expat library is only available as one variant, +the "ASCII" one. (But the library is still called just "libexpat", no +"ascii" in the name, that is just LO/OO's convention.) So how does +this work then, how can the code that wants to use the UTF-16 expat +API then actually use the "ASCII" (UTF-8) expat API? Well, in the +SYSTEM_EXPAT case no -DXML_UNICODE is used, so the code needs to check +that and adapt. So in the system libexpat case, mentioning expat_utf16 +in a .mk file doesn't mean any UTF-16-using libexpat would actually be +used. + +Yeah, this is silly, confusing, etc. + +Furthermore, at least Debian actually *does* have also a "Unicode" +expat library, called libexpatw. Debian's LO does not use that, +though. (Using it would require modifications to the LO build +machinery.) + +Now, if LO manages just fine with just the UTF-8 (or, "ASCII") system +libexpat in builds where that is used, why is a separate Unicode one +needed when an internal expat is used? Good question. Next +question. Patches welcome. + From: [http://expat.sourceforge.net/] From 7bd77ca9974b9467df38921c55ed80b3e5d3dae3 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 3 Oct 2012 16:29:13 +0300 Subject: [PATCH 233/863] s/UCS2/UTF-16 Change-Id: I2be40b7897c3277e2d8673b440aa6dd682086267 --- expat/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/expat/README b/expat/README index a3f8399c4da3..1af988937eb0 100644 --- a/expat/README +++ b/expat/README @@ -1,4 +1,4 @@ -Simple SAX parser library with added UCS2 support. +Simple SAX parser library with added UTF-16 support. When we build expat internally ("bundled"), we build two variants: One that has an "ASCII" (actually UTF-8) API, another that has a "Unicode" From 325309a7774e10fea79d92f424ae398ea242d142 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 3 Oct 2012 16:39:54 +0300 Subject: [PATCH 234/863] Mention the disable-dynloading issue Change-Id: I6d2349b8c4d97d266faebdb630c65e0441e25b18 --- expat/README | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/expat/README b/expat/README index 1af988937eb0..9289284ec470 100644 --- a/expat/README +++ b/expat/README @@ -36,5 +36,14 @@ libexpat in builds where that is used, why is a separate Unicode one needed when an internal expat is used? Good question. Next question. Patches welcome. +Another interesting issue is the disable-dynloading case: When we link +all needed LO code into one executable (as for iOS apps) or into one +shared library (as in a tentative approach for Android apps) there is +a problem with linking two libraries (ascii_expat_xmlparse and +expat_xmlparse) that contain exactly the same symbols... Obviously +just the one that happens to be mentioned first on the linking command +line gets linked in, and code that then thinks it is calling the other +one will mysteriously crash or silently fail. Working on that... + From: [http://expat.sourceforge.net/] From 02394b10d348aeabcbaceaa7659794a6b74a3768 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= Date: Wed, 3 Oct 2012 15:38:54 +0200 Subject: [PATCH 235/863] n#782597: Allow adding external templates Change-Id: I56d5a716795b7303a77194964a612c550f25eeec --- sfx2/source/doc/doctemplates.cxx | 4 ---- sfx2/source/doc/docvor.cxx | 16 ++++++++-------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index 25ed45909bcc..281e1c762e14 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -678,8 +678,6 @@ sal_Bool SfxDocTplService_Impl::getTitleFromURL( const OUString& rURL, OUString& } catch ( Exception& ) { - // the document is not a StarOffice document - return sal_False; } try @@ -2014,7 +2012,6 @@ sal_Bool SfxDocTplService_Impl::addTemplate( const OUString& rGroupName, // Get the content type OUString aTitle, aType, aTargetURL2, aFullName; - // only StarOffice documents are acceptable sal_Bool bDocHasTitle = sal_False; if( !getTitleFromURL( rSourceURL, aTitle, aType, bDocHasTitle ) ) return sal_False; @@ -2573,7 +2570,6 @@ void SfxDocTplService_Impl::addFsysGroup( GroupList_Impl& rList, if ( aChildTitle.compareToAscii( "sfx.tlx" ) == 0 || aChildTitle == "groupuinames.xml" ) continue; - // only StarOffice templates are accepted sal_Bool bDocHasTitle = sal_False; if( !getTitleFromURL( aTargetURL, aChildTitle, aType, bDocHasTitle ) ) continue; diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx index cf016f3c5a85..2c28cd354b81 100644 --- a/sfx2/source/doc/docvor.cxx +++ b/sfx2/source/doc/docvor.cxx @@ -1548,7 +1548,7 @@ String SfxOrganizeDlg_Impl::GetPath_Impl( sal_Bool bOpen, const String& rFileNam pFileDlg->SetDisplayDirectory( aObj.GetMainURL( INetURLObject::NO_DECODE ) ); } - pFileDlg->StartExecuteModal( LINK( this, SfxOrganizeDlg_Impl, ImportHdl ) ); + pFileDlg->StartExecuteModal( LINK( this, SfxOrganizeDlg_Impl, ExportHdl ) ); return aPath; } @@ -1592,18 +1592,18 @@ String SfxOrganizeDlg_Impl::GetPath_Impl( sal_Bool bOpen, const String& rFileNam // add filters of modules which are installed SvtModuleOptions aModuleOpt; if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) ) - sFilterExt += DEFINE_CONST_UNICODE( "*.ott;*.stw;*.oth" ); + sFilterExt += DEFINE_CONST_UNICODE( "*.ott;*.stw;*.oth;*.dot;*.dotm;*.dotx" ); if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SCALC ) ) { if ( sFilterExt.Len() > 0 ) sFilterExt += ';'; - sFilterExt += DEFINE_CONST_UNICODE( "*.ots;*.stc" ); + sFilterExt += DEFINE_CONST_UNICODE( "*.ots;*.stci;*.xlt;*.xltm;*.xltm" ); } if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) ) { if ( sFilterExt.Len() > 0 ) sFilterExt += ';'; - sFilterExt += DEFINE_CONST_UNICODE( "*.otp;*.sti" ); + sFilterExt += DEFINE_CONST_UNICODE( "*.otp;*.sti;*.pot;*.potm;*.potx" ); } if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SDRAW ) ) { @@ -1644,7 +1644,7 @@ String SfxOrganizeDlg_Impl::GetPath_Impl( sal_Bool bOpen, const String& rFileNam pFileDlg->SetDisplayDirectory( aObj.GetMainURL( INetURLObject::NO_DECODE ) ); } - pFileDlg->StartExecuteModal( LINK( this, SfxOrganizeDlg_Impl, ExportHdl ) ); + pFileDlg->StartExecuteModal( LINK( this, SfxOrganizeDlg_Impl, ImportHdl ) ); return aPaths; } @@ -2225,9 +2225,9 @@ IMPL_LINK( SfxOrganizeDlg_Impl, AddFiles_Impl, Button *, pButton ) //------------------------------------------------------------------------- -IMPL_LINK_NOARG(SfxOrganizeDlg_Impl, ImportHdl) +IMPL_LINK_NOARG(SfxOrganizeDlg_Impl, ExportHdl) { - DBG_ASSERT( pFileDlg, "SfxOrganizeDlg_Impl::ImportHdl(): no file dialog" ); + DBG_ASSERT( pFileDlg, "SfxOrganizeDlg_Impl::ExportHdl(): no file dialog" ); if ( ERRCODE_NONE == pFileDlg->GetError() ) { @@ -2262,7 +2262,7 @@ IMPL_LINK_NOARG(SfxOrganizeDlg_Impl, ImportHdl) //------------------------------------------------------------------------- -IMPL_LINK_NOARG(SfxOrganizeDlg_Impl, ExportHdl) +IMPL_LINK_NOARG(SfxOrganizeDlg_Impl, ImportHdl) { DBG_ASSERT( pFileDlg, "SfxOrganizeDlg_Impl::ImportHdl(): no file dialog" ); ::com::sun::star::uno::Sequence< ::rtl::OUString > aPaths; From 55c2619f689ed2666d95b2270f4e56821dd5478c Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Wed, 3 Oct 2012 15:17:09 +0200 Subject: [PATCH 236/863] rename THIRDPARTYLICENSEREADME.html to LICENSE.html Change-Id: Idff5f43190f75f4ac8fee8fa989948ca35ca6095 --- readlicense_oo/Package_files.mk | 2 +- .../html/{THIRDPARTYLICENSEREADME.html => LICENSE.html} | 0 scp2/source/ooo/common_brand.scp | 2 +- scp2/source/ooo/scpaction_ooo.scp | 4 ++-- sfx2/source/appl/app.src | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename readlicense_oo/html/{THIRDPARTYLICENSEREADME.html => LICENSE.html} (100%) diff --git a/readlicense_oo/Package_files.mk b/readlicense_oo/Package_files.mk index 1cace5a4207f..f3f146b7f7a2 100644 --- a/readlicense_oo/Package_files.mk +++ b/readlicense_oo/Package_files.mk @@ -20,6 +20,6 @@ $(eval $(call gb_Package_add_file,readlicense_oo_files,bin/osl/LICENSE.odt,odt/L $(eval $(call gb_Package_add_file,readlicense_oo_files,bin/LICENSE.odt,odt/LICENSE.odt)) $(eval $(call gb_Package_add_file,readlicense_oo_files,bin/CREDITS.odt,odt/CREDITS.odt)) -$(eval $(call gb_Package_add_file,readlicense_oo_files,bin/THIRDPARTYLICENSEREADME.html,html/THIRDPARTYLICENSEREADME.html)) +$(eval $(call gb_Package_add_file,readlicense_oo_files,bin/LICENSE.html,html/LICENSE.html)) # vim: set noet sw=4 ts=4: diff --git a/readlicense_oo/html/THIRDPARTYLICENSEREADME.html b/readlicense_oo/html/LICENSE.html similarity index 100% rename from readlicense_oo/html/THIRDPARTYLICENSEREADME.html rename to readlicense_oo/html/LICENSE.html diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index b000c0a7492a..5c90285ecbe7 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -467,7 +467,7 @@ End // Files File gid_Brand_File_Html_Thirdpartylicensereadme - Name = "THIRDPARTYLICENSEREADME.html"; + Name = "LICENSE.html"; #ifdef MACOSX Dir = gid_Dir_Bundle_Contents; #else diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp index a54d1a078c0e..462273175237 100644 --- a/scp2/source/ooo/scpaction_ooo.scp +++ b/scp2/source/ooo/scpaction_ooo.scp @@ -29,8 +29,8 @@ #ifdef MACOSX ScpAction scp_Copy_Thirdpartylicense_Readme_Html - Copy = "THIRDPARTYLICENSEREADME.html"; - Name= "THIRDPARTYLICENSEREADME.html"; + Copy = "LICENSE.html"; + Name= "LICENSE.html"; Subdir = "LICENSEs"; End #endif diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src index f3782c7ede5f..6eae48d2f327 100644 --- a/sfx2/source/appl/app.src +++ b/sfx2/source/appl/app.src @@ -517,7 +517,7 @@ ModalDialog DLG_HELP_LICENSING { Text [ en-US ] = "Third Party Code Additional copyright notices and license terms applicable to\n" - "portions of the Software are set forth in the THIRDPARTYLICENSEREADME.html\n" + "portions of the Software are set forth in the LICENSE.html\n" "file; choose Show License to see exact details in English." ; }; String STR_LICENSING_INFORMATION_3 From bd7a079918b518710de1ff97e5d2bb621a350f96 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Wed, 3 Oct 2012 16:57:37 +0200 Subject: [PATCH 237/863] fdo#50936 fix link to license file in SDK documentation Change-Id: If3a98fceb6fa71ac10626186ef7c094dbc9e47c3 --- odk/index.html | 2 +- scp2/source/sdkoo/sdkoo.scp | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/odk/index.html b/odk/index.html index dd169c708a33..bf3963d27f35 100644 --- a/odk/index.html +++ b/odk/index.html @@ -152,7 +152,7 @@ - License + License The license for the LibreOffice %PRODUCT_RELEASE% SDK. diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp index fc363b974a56..88eb508a5f43 100644 --- a/scp2/source/sdkoo/sdkoo.scp +++ b/scp2/source/sdkoo/sdkoo.scp @@ -97,6 +97,13 @@ File gid_File_Txt_License Styles = (PACKED, SCPZIP_REPLACE); End +File gid_File_Html_License + TXT_FILE_BODY; + Dir = gid_Dir_Share_Readme_Sdk; + Name = "LICENSE.html"; + Styles = (PACKED, SCPZIP_REPLACE); +End + File gid_File_Txt_Readme TXT_FILE_BODY; Dir = gid_Dir_Share_Readme_Sdk; From 9ed34f8137e1ec4f58151eba74507102192cb8fd Mon Sep 17 00:00:00 2001 From: Rene Engelhard Date: Wed, 3 Oct 2012 16:05:51 +0200 Subject: [PATCH 238/863] fix POPPLER_NOT_0_20_0 check 0.20x is affected, not only 0.20. I think this should be checked here only, though if it was 100% sure a poppler bug. But this is at least better to the broken check before.. Change-Id: If01a4329d18d317371be11d63c66b3487f5f556b --- configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 45c3d85ef9c0..f8ccb943876d 100644 --- a/configure.in +++ b/configure.in @@ -9704,8 +9704,8 @@ if test "x$enable_ext_pdfimport" != "xno" -a "x$enable_extension_integration" != SYSTEM_POPPLER=YES PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 ) # sdext test fails with 0.20.0 - PKG_CHECK_MODULES( POPPLER_NOT_0_20_0, poppler != 0.20.0, - , [AC_MSG_ERROR([Poppler 0.20.0 is broken, do not use --with-system-poppler or use a different version])]) + PKG_CHECK_MODULES( POPPLER_NOT_0_20_0, poppler < 0.20.0, + , [AC_MSG_ERROR([Poppler 0.20.x is broken, do not use --with-system-poppler or use a different version])]) AC_LANG_PUSH([C++]) save_CXXFLAGS=$CXXFLAGS save_CPPFLAGS=$CPPFLAGS From f0b5e02b323ac7520c9e1ec77ba603291e7ed325 Mon Sep 17 00:00:00 2001 From: Takeshi Abe Date: Thu, 4 Oct 2012 00:15:11 +0900 Subject: [PATCH 239/863] sal_Bool to bool Change-Id: I6a4c4f4c8129100770ca976d508ca3a98e67a846 --- sw/inc/pam.hxx | 12 +++++------ sw/source/core/crsr/crsrsh.cxx | 30 +++++++++++++------------- sw/source/core/crsr/crstrvl.cxx | 10 ++++----- sw/source/core/crsr/findattr.cxx | 6 +++--- sw/source/core/crsr/findtxt.cxx | 4 ++-- sw/source/core/crsr/pam.cxx | 36 ++++++++++++++++---------------- sw/source/core/crsr/swcrsr.cxx | 22 +++++++++---------- sw/source/core/crsr/trvlfnfl.cxx | 4 ++-- sw/source/core/crsr/trvlreg.cxx | 4 ++-- sw/source/core/crsr/trvltbl.cxx | 11 +++++----- sw/source/core/crsr/unocrsr.cxx | 6 +++--- sw/source/core/inc/pamtyp.hxx | 2 +- 12 files changed, 74 insertions(+), 73 deletions(-) diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx index 3f4931043682..83e3489fc586 100644 --- a/sw/inc/pam.hxx +++ b/sw/inc/pam.hxx @@ -74,12 +74,12 @@ struct SW_DLLPUBLIC SwPosition */ SwDoc * GetDoc() const; - sal_Bool operator < (const SwPosition &) const; - sal_Bool operator > (const SwPosition &) const; - sal_Bool operator <=(const SwPosition &) const; - sal_Bool operator >=(const SwPosition &) const; - sal_Bool operator ==(const SwPosition &) const; - sal_Bool operator !=(const SwPosition &) const; + bool operator < (const SwPosition &) const; + bool operator > (const SwPosition &) const; + bool operator <=(const SwPosition &) const; + bool operator >=(const SwPosition &) const; + bool operator ==(const SwPosition &) const; + bool operator !=(const SwPosition &) const; }; diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index e026f9ba4e6c..f37a4b7c97a7 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -491,7 +491,7 @@ sal_Bool SwCrsrShell::LRMargin( sal_Bool bLeft, sal_Bool bAPI) if( pBlockCrsr ) pBlockCrsr->clearPoints(); - const sal_Bool bWasAtLM = + const bool bWasAtLM = ( 0 == _GetCrsr()->GetPoint()->nContent.GetIndex() ); sal_Bool bRet = pTmpCrsr->LeftRightMargin( bLeft, bAPI ); @@ -1160,11 +1160,11 @@ void SwCrsrShell::Paint( const Rectangle &rRect) // always switch off all cursors when painting SwRect aRect( rRect ); - sal_Bool bVis = sal_False; + bool bVis = false; // if a cursor is visible then hide the SV cursor if( pVisCrsr->IsVisible() && !aRect.IsOver( aCharRect ) ) { - bVis = sal_True; + bVis = true; pVisCrsr->Hide(); } @@ -1512,7 +1512,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd ) // are we perhaps in a protected / hidden Section ? { SwShellCrsr* pShellCrsr = getShellCrsr( true ); - sal_Bool bChgState = sal_True; + bool bChgState = true; const SwSectionNode* pSectNd = pShellCrsr->GetNode()->FindSectionNode(); if( pSectNd && ( pSectNd->GetSection().IsHiddenFlag() || ( !IsReadOnlyAvailable() && @@ -1526,7 +1526,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd ) // everything protected/hidden -> special mode if( bAllProtect && !IsReadOnlyAvailable() && pSectNd->GetSection().IsProtectFlag() ) - bChgState = sal_False; + bChgState = false; else { eMvState = MV_NONE; // state for cursor travelling @@ -1590,15 +1590,15 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd ) SwRect aOld( aCharRect ); - sal_Bool bFirst = sal_True; + bool bFirst = true; SwCntntFrm *pFrm; int nLoopCnt = 100; SwShellCrsr* pShellCrsr = getShellCrsr( true ); do { - sal_Bool bAgainst; + bool bAgainst; do { - bAgainst = sal_False; + bAgainst = false; pFrm = pShellCrsr->GetCntntNode()->getLayoutFrm( GetLayout(), &pShellCrsr->GetPtPos(), pShellCrsr->GetPoint(), sal_False ); // if the Frm doesn't exist anymore, the complete Layout has to be @@ -1624,13 +1624,13 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd ) !pDoc->GetDocShell()->IsReadOnly() || bAllProtect ) ) { // look for a valid position - sal_Bool bChgState = sal_True; + bool bChgState = true; if( !FindValidCntntNode(!HasDrawView() || 0 == Imp()->GetDrawView()->GetMarkedObjectList().GetMarkCount())) { // everything is protected / hidden -> special Mode if( bAllProtect ) - bChgState = sal_False; + bChgState = false; else { eMvState = MV_NONE; // state for crusor travelling @@ -1655,7 +1655,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd ) CallChgLnk(); // notify UI! } bAllProtect = sal_False; - bAgainst = sal_True; // look for the right Frm again + bAgainst = true; // look for the right Frm again } } } while( bAgainst ); @@ -1710,7 +1710,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd ) break; } aOld = aCharRect; - bFirst = sal_False; + bFirst = false; // update cursor Points to the new Positions pShellCrsr->GetPtPos().X() = aCharRect.Left(); @@ -2418,7 +2418,7 @@ void SwCrsrShell::_ParkPams( SwPaM* pDelRg, SwShellCrsr** ppDelRing ) SwPaM *pTmpDel = 0, *pTmp = *ppDelRing; // search over the whole ring - sal_Bool bGoNext; + bool bGoNext; do { const SwPosition *pTmpStt = pTmp->Start(), *pTmpEnd = pTmp->GetPoint() == pTmpStt ? @@ -2435,7 +2435,7 @@ void SwCrsrShell::_ParkPams( SwPaM* pDelRg, SwShellCrsr** ppDelRing ) if( *pStt < *pTmpEnd ) pTmpDel = pTmp; - bGoNext = sal_True; + bGoNext = true; if( pTmpDel ) // is the pam in area -> delete { sal_Bool bDelete = sal_True; @@ -2445,7 +2445,7 @@ void SwCrsrShell::_ParkPams( SwPaM* pDelRg, SwShellCrsr** ppDelRing ) { if( sal_True == ( bDelete = GoNextCrsr() )) { - bGoNext = sal_False; + bGoNext = false; pTmp = (SwPaM*)pTmp->GetNext(); } } diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx index 50f44f9dfc87..0b454ed35e22 100644 --- a/sw/source/core/crsr/crstrvl.cxx +++ b/sw/source/core/crsr/crstrvl.cxx @@ -686,7 +686,7 @@ sal_Bool SwCrsrShell::MoveFldType( const SwFieldType* pFldType, sal_Bool bNext, SwTxtFld * pTxtFld = static_cast( pTNd->GetTxtAttrForCharAt(rPos.nContent.GetIndex(), RES_TXTATR_FIELD)); - sal_Bool bDelFld = 0 == pTxtFld; + bool bDelFld = 0 == pTxtFld; if( bDelFld ) { SwFmtFld* pFmtFld = new SwFmtFld( SwDateTimeField( @@ -1957,7 +1957,7 @@ const SwRedline* SwCrsrShell::GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect sal_uInt16 nSeqNo = pTmp->GetSeqNo(); if( nSeqNo && bSelect ) { - sal_Bool bCheck = sal_False; + bool bCheck = false; int nLoopCnt = 2; sal_uInt16 nArrSavPos = nArrPos; @@ -1979,7 +1979,7 @@ const SwRedline* SwCrsrShell::GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect const SwPosition *pNStt = pNextPam->Start(), *pNEnd = pNextPam->End(); - sal_Bool bDel = sal_True; + bool bDel = true; switch( ::ComparePosition( *pCStt, *pCEnd, *pNStt, *pNEnd )) { @@ -2014,7 +2014,7 @@ const SwRedline* SwCrsrShell::GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect break; default: - bDel = sal_False; + bDel = false; } if( bDel ) @@ -2039,7 +2039,7 @@ const SwRedline* SwCrsrShell::GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect { // create new cursor CreateCrsr(); - bCheck = sal_True; + bCheck = true; } nArrPos = nFndPos; } diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx index 7e85288ea88d..8572f9c60aea 100644 --- a/sw/source/core/crsr/findattr.cxx +++ b/sw/source/core/crsr/findattr.cxx @@ -557,7 +557,7 @@ int SwAttrCheckArr::SetAttrBwd( const SwTxtAttr& rAttr ) } } - sal_Bool bContinue = sal_False; + bool bContinue = false; if( SFX_ITEM_DONTCARE == eState ) { // Will the attribute become valid? @@ -573,7 +573,7 @@ int SwAttrCheckArr::SetAttrBwd( const SwTxtAttr& rAttr ) else if( pCmp->nStt > aTmp.nStt ) // extend? pCmp->nStt = aTmp.nStt; - bContinue = sal_True; + bContinue = true; } } // Will the attribute become valid? @@ -581,7 +581,7 @@ int SwAttrCheckArr::SetAttrBwd( const SwTxtAttr& rAttr ) { pFndArr[ nWhch - nArrStart ] = aTmp; ++nFound; - bContinue = sal_True; + bContinue = true; } // then is has to go on the stack diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx index 7bdbe36037f8..ade7b397cc90 100644 --- a/sw/source/core/crsr/findtxt.cxx +++ b/sw/source/core/crsr/findtxt.cxx @@ -138,7 +138,7 @@ String& lcl_CleanStr( const SwTxtNode& rNd, xub_StrLen nStart, xub_StrLen& rEnd, // simply removed if first. If at the end, we keep the // replacement and remove afterwards all at a string's // end (might be normal 0x7f). - sal_Bool bEmpty = RES_TXTATR_FIELD != pHt->Which() || + bool bEmpty = RES_TXTATR_FIELD != pHt->Which() || !(static_cast(pHt) ->GetFld().GetFld()->ExpandField(true).Len()); if ( bEmpty && nStart == nAkt ) @@ -636,7 +636,7 @@ sal_uLong SwCursor::Find( const SearchOptions& rSearchOpt, sal_Bool bSearchInNot pDoc->GetIDocumentUndoRedo().StartUndo( UNDO_REPLACE, NULL ); } - sal_Bool bSearchSel = 0 != (rSearchOpt.searchFlag & SearchFlags::REG_NOT_BEGINOFLINE); + bool bSearchSel = 0 != (rSearchOpt.searchFlag & SearchFlags::REG_NOT_BEGINOFLINE); if( bSearchSel ) eFndRngs = (FindRanges)(eFndRngs | FND_IN_SEL); SwFindParaText aSwFindParaText( rSearchOpt, bSearchInNotes, bReplace, *this ); diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx index e1eef0996b12..81ac674a4626 100644 --- a/sw/source/core/crsr/pam.cxx +++ b/sw/source/core/crsr/pam.cxx @@ -92,10 +92,10 @@ SwPosition &SwPosition::operator=(const SwPosition &rPos) } -sal_Bool SwPosition::operator<(const SwPosition &rPos) const +bool SwPosition::operator<(const SwPosition &rPos) const { if( nNode < rPos.nNode ) - return sal_True; + return true; if( nNode == rPos.nNode ) { // note that positions with text node but no SwIndex registered are @@ -108,17 +108,17 @@ sal_Bool SwPosition::operator<(const SwPosition &rPos) const } else // by convention position with no index is smaller { - return (pOtherReg) ? sal_True : sal_False; + return (pOtherReg) ? true : false; } } - return sal_False; + return false; } -sal_Bool SwPosition::operator>(const SwPosition &rPos) const +bool SwPosition::operator>(const SwPosition &rPos) const { if(nNode > rPos.nNode ) - return sal_True; + return true; if( nNode == rPos.nNode ) { // note that positions with text node but no SwIndex registered are @@ -131,17 +131,17 @@ sal_Bool SwPosition::operator>(const SwPosition &rPos) const } else // by convention position with no index is smaller { - return (pThisReg) ? sal_True : sal_False; + return (pThisReg) ? true : false; } } - return sal_False; + return false; } -sal_Bool SwPosition::operator<=(const SwPosition &rPos) const +bool SwPosition::operator<=(const SwPosition &rPos) const { if(nNode < rPos.nNode ) - return sal_True; + return true; if( nNode == rPos.nNode ) { // note that positions with text node but no SwIndex registered are @@ -154,17 +154,17 @@ sal_Bool SwPosition::operator<=(const SwPosition &rPos) const } else // by convention position with no index is smaller { - return (pThisReg) ? sal_False : sal_True; + return (pThisReg) ? false : true; } } - return sal_False; + return false; } -sal_Bool SwPosition::operator>=(const SwPosition &rPos) const +bool SwPosition::operator>=(const SwPosition &rPos) const { if(nNode > rPos.nNode ) - return sal_True; + return true; if( nNode == rPos.nNode ) { // note that positions with text node but no SwIndex registered are @@ -177,14 +177,14 @@ sal_Bool SwPosition::operator>=(const SwPosition &rPos) const } else // by convention position with no index is smaller { - return (pOtherReg) ? sal_False : sal_True; + return (pOtherReg) ? false : true; } } - return sal_False; + return false; } -sal_Bool SwPosition::operator==(const SwPosition &rPos) const +bool SwPosition::operator==(const SwPosition &rPos) const { return (nNode == rPos.nNode) // GetIndexReg may be null for FLY_AT_PARA frame anchor position @@ -193,7 +193,7 @@ sal_Bool SwPosition::operator==(const SwPosition &rPos) const } -sal_Bool SwPosition::operator!=(const SwPosition &rPos) const +bool SwPosition::operator!=(const SwPosition &rPos) const { return (nNode != rPos.nNode) // GetIndexReg may be null for FLY_AT_PARA frame anchor position diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx index d69886514a90..fa1509366584 100644 --- a/sw/source/core/crsr/swcrsr.cxx +++ b/sw/source/core/crsr/swcrsr.cxx @@ -68,7 +68,7 @@ struct _PercentHdl { SwDocShell* pDSh; sal_uLong nActPos; - sal_Bool bBack, bNodeIdx; + bool bBack, bNodeIdx; _PercentHdl( sal_uLong nStt, sal_uLong nEnd, SwDocShell* pSh ) : pDSh( pSh ) @@ -87,13 +87,13 @@ struct _PercentHdl sal_uLong nStt, nEnd; if( rPam.GetPoint()->nNode == rPam.GetMark()->nNode ) { - bNodeIdx = sal_False; + bNodeIdx = false; nStt = rPam.GetMark()->nContent.GetIndex(); nEnd = rPam.GetPoint()->nContent.GetIndex(); } else { - bNodeIdx = sal_True; + bNodeIdx = true; nStt = rPam.GetMark()->nNode.GetIndex(); nEnd = rPam.GetPoint()->nNode.GetIndex(); } @@ -1063,7 +1063,7 @@ sal_uLong SwCursor::FindAll( SwFindParas& rParas, void SwCursor::FillFindPos( SwDocPositions ePos, SwPosition& rPos ) const { - sal_Bool bIsStart = sal_True; + bool bIsStart = true; SwCntntNode* pCNd = 0; SwNodes& rNds = GetDoc()->GetNodes(); @@ -1077,7 +1077,7 @@ void SwCursor::FillFindPos( SwDocPositions ePos, SwPosition& rPos ) const case DOCPOS_END: rPos.nNode = rNds.GetEndOfContent(); pCNd = rNds.GoPrevious( &rPos.nNode ); - bIsStart = sal_False; + bIsStart = false; break; case DOCPOS_OTHERSTART: @@ -1088,7 +1088,7 @@ void SwCursor::FillFindPos( SwDocPositions ePos, SwPosition& rPos ) const case DOCPOS_OTHEREND: rPos.nNode = *rNds.GetEndOfContent().StartOfSectionNode(); pCNd = rNds.GoPrevious( &rPos.nNode ); - bIsStart = sal_False; + bIsStart = false; break; default: rPos = *GetPoint(); @@ -1753,7 +1753,7 @@ sal_Bool SwCursor::UpDown( sal_Bool bUp, sal_uInt16 nCnt, Point* pPt, long nUpDownX ) { SwTableCursor* pTblCrsr = dynamic_cast(this); - sal_Bool bAdjustTableCrsr = sal_False; + bool bAdjustTableCrsr = false; // If the point/mark of the table cursor in the same box then set cursor to // beginning of the box @@ -1762,7 +1762,7 @@ sal_Bool SwCursor::UpDown( sal_Bool bUp, sal_uInt16 nCnt, { if ( End() != GetPoint() ) Exchange(); - bAdjustTableCrsr = sal_True; + bAdjustTableCrsr = true; } sal_Bool bRet = sal_False; @@ -2156,11 +2156,11 @@ SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCrsr ) SwPaM* pCur = pAktCrsr; do { size_t nPos; - sal_Bool bDel = sal_False; + bool bDel = false; pSttNd = pCur->GetPoint()->nNode.GetNode().FindTableBoxStartNode(); if( !pCur->HasMark() || !pSttNd || pSttNd != pCur->GetMark()->nNode.GetNode().FindTableBoxStartNode() ) - bDel = sal_True; + bDel = true; else if( lcl_SeekEntry( aTmp, pSttNd, nPos )) { @@ -2186,7 +2186,7 @@ SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCrsr ) aTmp.erase( aTmp.begin() + nPos ); } else - bDel = sal_True; + bDel = true; pCur = (SwPaM*)pCur->GetNext(); if( bDel ) diff --git a/sw/source/core/crsr/trvlfnfl.cxx b/sw/source/core/crsr/trvlfnfl.cxx index c81fd6aedc83..5355769b2801 100644 --- a/sw/source/core/crsr/trvlfnfl.cxx +++ b/sw/source/core/crsr/trvlfnfl.cxx @@ -86,13 +86,13 @@ sal_Bool SwCrsrShell::GotoFtnTxt() const SwFrm *pFrm = pTxtNd->getLayoutFrm( GetLayout(), &_GetCrsr()->GetSttPos(), _GetCrsr()->Start() ); const SwFtnBossFrm* pFtnBoss; - sal_Bool bSkip = pFrm && pFrm->IsInFtn(); + bool bSkip = pFrm && pFrm->IsInFtn(); while( pFrm && 0 != ( pFtnBoss = pFrm->FindFtnBossFrm() ) ) { if( 0 != ( pFrm = pFtnBoss->FindFtnCont() ) ) { if( bSkip ) - bSkip = sal_False; + bSkip = false; else { const SwCntntFrm* pCnt = static_cast diff --git a/sw/source/core/crsr/trvlreg.cxx b/sw/source/core/crsr/trvlreg.cxx index 84ab0f0d675e..bfef7e09e58a 100644 --- a/sw/source/core/crsr/trvlreg.cxx +++ b/sw/source/core/crsr/trvlreg.cxx @@ -148,7 +148,7 @@ sal_Bool GotoCurrRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion, return sal_False; SwPosition* pPos = rCurCrsr.GetPoint(); - sal_Bool bMoveBackward = fnPosRegion == fnMoveBackward; + bool bMoveBackward = fnPosRegion == fnMoveBackward; SwCntntNode* pCNd; if( bMoveBackward ) @@ -182,7 +182,7 @@ sal_Bool GotoCurrRegionAndSkip( SwPaM& rCurCrsr, SwPosRegion fnPosRegion, SwPosition* pPos = rCurCrsr.GetPoint(); xub_StrLen nCurrCnt = pPos->nContent.GetIndex(); - sal_Bool bMoveBackward = fnPosRegion == fnMoveBackward; + bool bMoveBackward = fnPosRegion == fnMoveBackward; do { SwCntntNode* pCNd; diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx index 1544c06749f4..84804f6998fd 100644 --- a/sw/source/core/crsr/trvltbl.cxx +++ b/sw/source/core/crsr/trvltbl.cxx @@ -666,7 +666,8 @@ sal_Bool SwCrsrShell::MoveTable( SwWhichTable fnWhichTbl, SwPosTable fnPosTbl ) SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed SwShellCrsr* pCrsr = pTblCrsr ? pTblCrsr : pCurCrsr; - sal_Bool bCheckPos, bRet; + bool bCheckPos; + sal_Bool bRet; sal_uLong nPtNd = 0; xub_StrLen nPtCnt = 0; @@ -678,11 +679,11 @@ sal_Bool SwCrsrShell::MoveTable( SwWhichTable fnWhichTbl, SwPosTable fnPosTbl ) pCurCrsr->SwSelPaintRects::Hide(); pTblCrsr->SetMark(); pCrsr = pTblCrsr; - bCheckPos = sal_False; + bCheckPos = false; } else { - bCheckPos = sal_True; + bCheckPos = true; nPtNd = pCrsr->GetPoint()->nNode.GetIndex(); nPtCnt = pCrsr->GetPoint()->nContent.GetIndex(); } @@ -873,13 +874,13 @@ void SwCrsrShell::SaveTblBoxCntnt( const SwPosition* pPos ) SwStartNode* pSttNd = pPos->nNode.GetNode().FindSttNodeByType( SwTableBoxStartNode ); - sal_Bool bCheckBox = sal_False; + bool bCheckBox = false; if( pSttNd && pBoxIdx ) { if( pSttNd == &pBoxIdx->GetNode() ) pSttNd = 0; else - bCheckBox = sal_True; + bCheckBox = true; } else bCheckBox = 0 != pBoxIdx; diff --git a/sw/source/core/crsr/unocrsr.cxx b/sw/source/core/crsr/unocrsr.cxx index a1342a9eb32f..43f3d71b9cc1 100644 --- a/sw/source/core/crsr/unocrsr.cxx +++ b/sw/source/core/crsr/unocrsr.cxx @@ -117,8 +117,8 @@ sal_Bool SwUnoCrsr::IsSelOvr( int eFlags ) *pNewSttNd = rPtIdx.GetNode().StartOfSectionNode(); if( pOldSttNd != pNewSttNd ) { - sal_Bool bMoveDown = GetSavePos()->nNode < rPtIdx.GetIndex(); - sal_Bool bValidPos = sal_False; + bool bMoveDown = GetSavePos()->nNode < rPtIdx.GetIndex(); + bool bValidPos = false; // search the correct surrounded start node - which the index // can't leave. @@ -172,7 +172,7 @@ sal_Bool SwUnoCrsr::IsSelOvr( int eFlags ) } } else - bValidPos = sal_True; + bValidPos = true; } while ( pInvalidNode ); } diff --git a/sw/source/core/inc/pamtyp.hxx b/sw/source/core/inc/pamtyp.hxx index 422be7a3509a..83dd971fefc3 100644 --- a/sw/source/core/inc/pamtyp.hxx +++ b/sw/source/core/inc/pamtyp.hxx @@ -67,7 +67,7 @@ typedef sal_Bool (*GoNd)( SwNode*, SwIndex*, sal_uInt16 ); typedef SwCntntNode* (*GoNds)( SwNodeIndex*, sal_Bool ); typedef void (*GoDoc)( SwPosition* ); typedef void (*GoSection)( SwPosition* ); -typedef sal_Bool (SwPosition:: *CmpOp)( const SwPosition& ) const; +typedef bool (SwPosition:: *CmpOp)( const SwPosition& ) const; typedef const SwTxtAttr* (*GetHint)( const SwpHints&, sal_uInt16&, xub_StrLen ); typedef int (utl::TextSearch:: *SearchTxt)( const String&, xub_StrLen*, xub_StrLen*, ::com::sun::star::util::SearchResult* ); From 3448a0e50e2ed3a0c2e8424e85aae6bd5f8a218a Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Tue, 29 Mar 2011 11:05:24 +0200 Subject: [PATCH 240/863] fs34b: integrated complex test cases into GNUMake's subsequentcheck target --- toolkit/JunitTest_toolkit_complex.mk | 56 +++++++++++++++ toolkit/Module_toolkit.mk | 1 + toolkit/qa/complex/toolkit/makefile.mk | 97 -------------------------- 3 files changed, 57 insertions(+), 97 deletions(-) create mode 100755 toolkit/JunitTest_toolkit_complex.mk delete mode 100644 toolkit/qa/complex/toolkit/makefile.mk diff --git a/toolkit/JunitTest_toolkit_complex.mk b/toolkit/JunitTest_toolkit_complex.mk new file mode 100755 index 000000000000..77bf7544afc1 --- /dev/null +++ b/toolkit/JunitTest_toolkit_complex.mk @@ -0,0 +1,56 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_JunitTest_JunitTest,toolkit_complex)) + +$(eval $(call gb_JunitTest_add_jars,toolkit_complex,\ + $(OUTDIR)/bin/OOoRunner.jar \ + $(OUTDIR)/bin/ridl.jar \ + $(OUTDIR)/bin/test.jar \ + $(OUTDIR)/bin/unoil.jar \ +)) + +$(eval $(call gb_JunitTest_add_sourcefiles,toolkit_complex,\ + toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent \ + toolkit/qa/complex/toolkit/accessibility/_XAccessibleContext \ + toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster \ + toolkit/qa/complex/toolkit/accessibility/_XAccessibleExtendedComponent \ + toolkit/qa/complex/toolkit/accessibility/_XAccessibleText \ + toolkit/qa/complex/toolkit/Assert \ + toolkit/qa/complex/toolkit/awtgrid/GridDataListener \ + toolkit/qa/complex/toolkit/awtgrid/TMutableGridDataModel \ + toolkit/qa/complex/toolkit/awtgrid/DummyColumn \ + toolkit/qa/complex/toolkit/GridControl \ + toolkit/qa/complex/toolkit/UnitConversion \ +)) + +$(eval $(call gb_JunitTest_add_classes,toolkit_complex,\ + complex.toolkit.GridControl \ + complex.toolkit.UnitConversion \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/toolkit/Module_toolkit.mk b/toolkit/Module_toolkit.mk index a35461413ed9..dc83aad16f2d 100644 --- a/toolkit/Module_toolkit.mk +++ b/toolkit/Module_toolkit.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Module_add_targets,toolkit,\ )) $(eval $(call gb_Module_add_subsequentcheck_targets,toolkit,\ + JunitTest_toolkit_complex \ JunitTest_toolkit_unoapi \ )) diff --git a/toolkit/qa/complex/toolkit/makefile.mk b/toolkit/qa/complex/toolkit/makefile.mk deleted file mode 100644 index ecb173f9bdac..000000000000 --- a/toolkit/qa/complex/toolkit/makefile.mk +++ /dev/null @@ -1,97 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -.IF "$(OOO_JUNIT_JAR)" == "" -nothing .PHONY: - @echo ----------------------------------------------------- - @echo - JUnit not available, not building anything - @echo ----------------------------------------------------- -.ELSE # IF "$(OOO_JUNIT_JAR)" != "" - -PRJ = ../../.. -PRJNAME = toolkit -TARGET = qa_complex_toolkit -PACKAGE = complex/toolkit - -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - -#----- compile .java files ----------------------------------------- - -JARFILES = OOoRunnerLight.jar ridl.jar test.jar unoil.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) - -JAVAFILES = \ - $(JAVATESTFILES) \ - accessibility/_XAccessibleComponent.java \ - accessibility/_XAccessibleContext.java \ - accessibility/_XAccessibleEventBroadcaster.java \ - accessibility/_XAccessibleExtendedComponent.java \ - accessibility/_XAccessibleText.java \ - Assert.java \ - awtgrid/GridDataListener.java \ - awtgrid/TMutableGridDataModel.java \ - awtgrid/DummyColumn.java \ - -#----- create a jar from compiled files ---------------------------- - -JARTARGET = $(TARGET).jar - -#----- JUnit tests class ------------------------------------------- - -JAVATESTFILES = \ - GridControl.java \ - UnitConversion.java \ - - -# disabled for now - the tests fail on at least one platform -# no issue, yet (not sure this is worth it. Don't know who to give the issue to, and don't know whether the test really makes sense) -DISABLED_JAVA_TEST_FILES=\ - AccessibleStatusBar.java\ - AccessibleStatusBarItem.java - - -# --- Targets ------------------------------------------------------ - -.INCLUDE: target.mk - -ALL : ALLTAR - -# --- subsequent tests --------------------------------------------- - -.IF "$(OOO_SUBSEQUENT_TESTS)" != "" - -.INCLUDE: installationtest.mk - -ALLTAR : javatest - - # Sample how to debug - # JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y - -.END # "$(OOO_SUBSEQUENT_TESTS)" == "" - -.END # ELSE "$(OOO_JUNIT_JAR)" != "" From 258548ca8116a233e91900709ed7ce7ef1804ecd Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Tue, 2 Oct 2012 16:21:32 +0100 Subject: [PATCH 241/863] toolkit: cleanup unit test, and remove obsolete src2xml. --- toolkit/JunitTest_toolkit_complex.mk | 10 +- toolkit/src2xml/README | 16 - toolkit/src2xml/dryrunall.sh | 2 - toolkit/src2xml/include-sc.lst | 8 - toolkit/src2xml/include-sd.lst | 6 - toolkit/src2xml/include-sw.lst | 5 - toolkit/src2xml/include.lst | 298 --------- toolkit/src2xml/sc.sh | 3 - toolkit/src2xml/sd.sh | 3 - toolkit/src2xml/source/boxer.py | 90 --- toolkit/src2xml/source/expression.py | 128 ---- toolkit/src2xml/source/expression_test.py | 41 -- toolkit/src2xml/source/globals.py | 133 ---- toolkit/src2xml/source/macroexpander_test.py | 88 --- toolkit/src2xml/source/macroparser.py | 147 ---- toolkit/src2xml/source/macroparser_test.py | 37 -- toolkit/src2xml/source/src2xml.py | 244 ------- toolkit/src2xml/source/srclexer.py | 506 -------------- toolkit/src2xml/source/srcparser.py | 434 ------------ toolkit/src2xml/src-sc.lst | 57 -- toolkit/src2xml/src-sd.lst | 112 ---- toolkit/src2xml/src-sw.lst | 119 ---- toolkit/src2xml/src.lst | 665 ------------------- toolkit/src2xml/sw.sh | 3 - 24 files changed, 5 insertions(+), 3150 deletions(-) mode change 100755 => 100644 toolkit/JunitTest_toolkit_complex.mk delete mode 100644 toolkit/src2xml/README delete mode 100644 toolkit/src2xml/dryrunall.sh delete mode 100644 toolkit/src2xml/include-sc.lst delete mode 100644 toolkit/src2xml/include-sd.lst delete mode 100644 toolkit/src2xml/include-sw.lst delete mode 100644 toolkit/src2xml/include.lst delete mode 100644 toolkit/src2xml/sc.sh delete mode 100644 toolkit/src2xml/sd.sh delete mode 100644 toolkit/src2xml/source/boxer.py delete mode 100644 toolkit/src2xml/source/expression.py delete mode 100644 toolkit/src2xml/source/expression_test.py delete mode 100644 toolkit/src2xml/source/globals.py delete mode 100644 toolkit/src2xml/source/macroexpander_test.py delete mode 100644 toolkit/src2xml/source/macroparser.py delete mode 100644 toolkit/src2xml/source/macroparser_test.py delete mode 100644 toolkit/src2xml/source/src2xml.py delete mode 100644 toolkit/src2xml/source/srclexer.py delete mode 100644 toolkit/src2xml/source/srcparser.py delete mode 100644 toolkit/src2xml/src-sc.lst delete mode 100644 toolkit/src2xml/src-sd.lst delete mode 100644 toolkit/src2xml/src-sw.lst delete mode 100644 toolkit/src2xml/src.lst delete mode 100644 toolkit/src2xml/sw.sh diff --git a/toolkit/JunitTest_toolkit_complex.mk b/toolkit/JunitTest_toolkit_complex.mk old mode 100755 new mode 100644 index 77bf7544afc1..2a64b2b986ff --- a/toolkit/JunitTest_toolkit_complex.mk +++ b/toolkit/JunitTest_toolkit_complex.mk @@ -27,11 +27,11 @@ $(eval $(call gb_JunitTest_JunitTest,toolkit_complex)) -$(eval $(call gb_JunitTest_add_jars,toolkit_complex,\ - $(OUTDIR)/bin/OOoRunner.jar \ - $(OUTDIR)/bin/ridl.jar \ - $(OUTDIR)/bin/test.jar \ - $(OUTDIR)/bin/unoil.jar \ +$(eval $(call gb_JunitTest_use_jars,toolkit_complex,\ + OOoRunner \ + ridl \ + test \ + unoil \ )) $(eval $(call gb_JunitTest_add_sourcefiles,toolkit_complex,\ diff --git a/toolkit/src2xml/README b/toolkit/src2xml/README deleted file mode 100644 index ef30040f2133..000000000000 --- a/toolkit/src2xml/README +++ /dev/null @@ -1,16 +0,0 @@ -SRC2XML: Convert OO.o resource to Layout XML. - -This directory contains a Python script to convert OO.o's existing dialog -resource files into XML layout files. - -The main executable file is located in ./source/src2xml.py. Run - - source/src2xml.py --help - -for more information. - -See also: source/dryrunall.sh and ../workben/run-s2x - - -Author: Kohei Yoshida -Modifications: Jan Nieuwenhuizen diff --git a/toolkit/src2xml/dryrunall.sh b/toolkit/src2xml/dryrunall.sh deleted file mode 100644 index a2bd803cc7fb..000000000000 --- a/toolkit/src2xml/dryrunall.sh +++ /dev/null @@ -1,2 +0,0 @@ -#! /bin/bash -source/src2xml.py --dry-run --includes-from=include.lst $(cat src.lst) "$@" diff --git a/toolkit/src2xml/include-sc.lst b/toolkit/src2xml/include-sc.lst deleted file mode 100644 index 7b821a2a8407..000000000000 --- a/toolkit/src2xml/include-sc.lst +++ /dev/null @@ -1,8 +0,0 @@ -../../solver/680/unxlngi6.pro/inc -../../sc -../../sc/inc -../../sc/addin/inc -../../sc/source/ui/inc -../../sc/source/core/inc -../../sc/source/filter/inc -../../sc/unxlngi6.pro/inc diff --git a/toolkit/src2xml/include-sd.lst b/toolkit/src2xml/include-sd.lst deleted file mode 100644 index 44b1f66a5ffc..000000000000 --- a/toolkit/src2xml/include-sd.lst +++ /dev/null @@ -1,6 +0,0 @@ -../../solver/680/unxlngi6.pro/inc -../../sd -../../sd/inc -../../sd/source/ui/inc -../../sd/source/ui/slidesorter/inc -../../sd/unxlngi6.pro/inc diff --git a/toolkit/src2xml/include-sw.lst b/toolkit/src2xml/include-sw.lst deleted file mode 100644 index 44fa8951eecb..000000000000 --- a/toolkit/src2xml/include-sw.lst +++ /dev/null @@ -1,5 +0,0 @@ -../../solver/680/unxlngi6.pro/inc -../../sw/source/ui/inc -../../sw/source/core/inc -../../sw/source/filter/inc -../../sw/unxlngi6.pro/inc diff --git a/toolkit/src2xml/include.lst b/toolkit/src2xml/include.lst deleted file mode 100644 index dc15fe7592b6..000000000000 --- a/toolkit/src2xml/include.lst +++ /dev/null @@ -1,298 +0,0 @@ -../../solver/680/unxlngi6.pro/inc -../../io/inc -../../io/unxlngi6.pro/inc -../../sc/inc -../../sc/addin/inc -../../sc/source/ui/inc -../../sc/source/core/inc -../../sc/source/filter/inc -../../sc/unxlngi6.pro/inc -../../sd/inc -../../sd/source/ui/inc -../../sd/source/ui/slidesorter/inc -../../sd/unxlngi6.pro/inc -../../sw/inc -../../sw/source/ui/inc -../../sw/source/core/inc -../../sw/source/filter/inc -../../sw/unxlngi6.pro/inc -../../xt/unxlngi6.pro/inc -../../agg/inc -../../icu/unxlngi6.pro/inc -../../idl/inc -../../idl/unxlngi6.pro/inc -../../nas/unxlngi6.pro/inc -../../odk/inc -../../sal/qa/inc -../../sal/inc -../../sal/unxlngi6.pro/inc -../../sax/unxlngi6.pro/inc -../../sch/inc -../../sch/source/ui/inc -../../sch/unxlngi6.pro/inc -../../sj2/inc -../../sj2/source/inc -../../sj2/unxlngi6.pro/inc -../../rsc/inc -../../rsc/unxlngi6.pro/inc -../../so3/inc -../../so3/unxlngi6.pro/inc -../../sot/inc -../../sot/unxlngi6.pro/inc -../../svx/inc -../../svx/source/inc -../../svx/source/unodialogs/inc -../../svx/unxlngi6.pro/inc -../../ucb/inc -../../ucb/source/inc -../../ucb/unxlngi6.pro/inc -../../udm/inc -../../udm/source/inc -../../vcl/inc -../../vcl/unx/inc -../../vcl/unx/source/inc -../../vcl/win/inc -../../vcl/aqua/inc -../../vcl/unxlngi6.pro/inc -../../ure/unxlngi6.pro/inc -../../uui/unxlngi6.pro/inc -../../dbaccess/inc -../../dbaccess/source/ui/inc -../../dbaccess/source/inc -../../dbaccess/source/core/inc -../../dbaccess/source/sdbtools/inc -../../dbaccess/unxlngi6.pro/inc -../../transex3/inc -../../transex3/unxlngi6.pro/inc -../../bean/unxlngi6.pro/inc -../../cosv/inc -../../cosv/source/inc -../../cppu/inc -../../cppu/unxlngi6.pro/inc -../../idlc/inc -../../idlc/unxlngi6.pro/inc -../../o3tl/inc -../../o3tl/unxlngi6.pro/inc -../../jurt/unxlngi6.pro/inc -../../sane/inc -../../scp2/inc -../../scp2/unxlngi6.pro/inc -../../sfx2/inc -../../sfx2/source/inc -../../sfx2/unxlngi6.pro/inc -../../stoc/inc -../../stoc/unxlngi6.pro/inc -../../framework/inc -../../framework/source/inc -../../framework/unxlngi6.pro/inc -../../desktop/inc -../../desktop/source/inc -../../desktop/source/deployment/inc -../../desktop/source/deployment/registry/inc -../../desktop/unxlngi6.pro/inc -../../external/unxlngi6.pro/inc -../../xml2cmp/source/inc -../../xml2cmp/unxlngi6.pro/inc -../../xmlhelp/inc -../../xmlhelp/unxlngi6.pro/inc -../../soltools/inc -../../soltools/testSHL/inc -../../soltools/unxlngi6.pro/inc -../../unixODBC/inc -../../basic/inc -../../basic/source/inc -../../basic/unxlngi6.pro/inc -../../boost/unxlngi6.pro/inc -../../XmlSearch/unxlngi6.pro/inc -../../forms/inc -../../forms/source/inc -../../forms/source/solar/inc -../../forms/unxlngi6.pro/inc -../../ridljar/unxlngi6.pro/inc -../../offuh/unxlngi6.pro/inc -../../pyuno/inc -../../pyuno/unxlngi6.pro/inc -../../shell/inc -../../shell/unxlngi6.pro/inc -../../store/inc -../../store/unxlngi6.pro/inc -../../sysui/unxlngi6.pro/inc -../../tools/inc -../../tools/win/inc -../../tools/unxlngi6.pro/inc -../../twain/inc -../../unoil/unxlngi6.pro/inc -../../cppcanvas/inc -../../cppcanvas/source/inc -../../cppcanvas/unxlngi6.pro/inc -../../eventattacher/unxlngi6.pro/inc -../../unotools/inc -../../unotools/unxlngi6.pro/inc -../../scaddins/unxlngi6.pro/inc -../../javaunohelper/inc -../../javaunohelper/unxlngi6.pro/inc -../../configmgr/inc -../../configmgr/source/inc -../../configmgr/unxlngi6.pro/inc -../../hwpfilter/inc -../../hwpfilter/unxlngi6.pro/inc -../../libxmlsec/unxlngi6.pro/inc -../../jvmaccess/inc -../../jvmaccess/unxlngi6.pro/inc -../../comphelper/inc -../../comphelper/unxlngi6.pro/inc -../../helpcontent2/unxlngi6.pro/inc -../../animations/inc -../../animations/unxlngi6.pro/inc -../../fileaccess/unxlngi6.pro/inc -../../i18npool/inc -../../i18npool/unxlngi6.pro/inc -../../i18nutil/inc -../../i18nutil/unxlngi6.pro/inc -../../accessibility/inc -../../accessibility/unxlngi6.pro/inc -../../testshl2/inc -../../testshl2/source/inc -../../testshl2/unxlngi6.pro/inc -../../lpsolve/unxlngi6.pro/inc -../../setup_native/inc -../../setup_native/unxlngi6.pro/inc -../../embedserv/source/inc -../../psprint_config/unxlngi6.pro/inc -../../basctl/inc -../../basctl/source/inc -../../basctl/unxlngi6.pro/inc -../../cpputools/unxlngi6.pro/inc -../../stlport/unxlngi6.pro/inc -../../canvas/inc -../../canvas/unxlngi6.pro/inc -../../embeddedobj/inc -../../embeddedobj/source/inc -../../embeddedobj/unxlngi6.pro/inc -../../chart2/inc -../../chart2/source/inc -../../chart2/source/view/inc -../../chart2/source/model/inc -../../chart2/source/controller/inc -../../chart2/unxlngi6.pro/inc -../../scsolver/source/inc -../../scsolver/unxlngi6.pro/inc -../../automation/inc -../../automation/source/inc -../../automation/unxlngi6.pro/inc -../../portaudio/unxlngi6.pro/inc -../../svtools/inc -../../svtools/unx/inc -../../svtools/source/inc -../../svtools/unxlngi6.pro/inc -../../dtrans/inc -../../dtrans/source/inc -../../dtrans/unxlngi6.pro/inc -../../x11_extensions/inc -../../fpicker/inc -../../fpicker/unxlngi6.pro/inc -../../filter/inc -../../filter/unxlngi6.pro/inc -../../extras/unxlngi6.pro/inc -../../writerperfect/unxlngi6.pro/inc -../../toolkit/inc -../../toolkit/unxlngi6.pro/inc -../../officecfg/unxlngi6.pro/inc -../../unodevtools/inc -../../unodevtools/unxlngi6.pro/inc -../../cppuhelper/inc -../../cppuhelper/unxlngi6.pro/inc -../../jvmfwk/inc -../../jvmfwk/unxlngi6.pro/inc -../../layout/inc -../../layout/unxlngi6.pro/inc -../../linguistic/inc -../../linguistic/unxlngi6.pro/inc -../../libegg/inc -../../libegg/unxlngi6.pro/inc -../../libwpd/unxlngi6.pro/inc -../../libwpg/unxlngi6.pro/inc -../../libwps/unxlngi6.pro/inc -../../lingucomponent/inc -../../lingucomponent/unxlngi6.pro/inc -../../np_sdk/unxlngi6.pro/inc -../../offapi/unxlngi6.pro/inc -../../xmlsecurity/inc -../../xmlsecurity/unxlngi6.pro/inc -../../padmin/unxlngi6.pro/inc -../../regexp/inc -../../regexp/unxlngi6.pro/inc -../../ucbhelper/inc -../../ucbhelper/unxlngi6.pro/inc -../../berkeleydb/unxlngi6.pro/inc -../../UnoControls/inc -../../UnoControls/source/inc -../../UnoControls/unxlngi6.pro/inc -../../msfontextract/unxlngi6.pro/inc -../../solenv/inc -../../solenv/unxmacxp/inc -../../solver/680/unxlngi6.pro/inc -../../postprocess/unxlngi6.pro/inc -../../udkapi/unxlngi6.pro/inc -../../unoxml/unxlngi6.pro/inc -../../starmath/inc -../../starmath/unxlngi6.pro/inc -../../mdbtools/unxlngi6.pro/inc -../../basebmp/inc -../../basegfx/inc -../../basegfx/source/inc -../../basegfx/unxlngi6.pro/inc -../../xmerge/inc -../../xmerge/source/inc -../../xmerge/unxlngi6.pro/inc -../../xmloff/inc -../../xmloff/unxlngi6.pro/inc -../../oovbaapi/unxlngi6.pro/inc -../../package/inc -../../package/unxlngi6.pro/inc -../../extensions/inc -../../extensions/source/inc -../../extensions/source/plugin/inc -../../extensions/unxlngi6.pro/inc -../../codemaker/inc -../../codemaker/unxlngi6.pro/inc -../../salhelper/inc -../../salhelper/unxlngi6.pro/inc -../../rdbmaker/inc -../../rdbmaker/unxlngi6.pro/inc -../../instsetoo_native/unxlngi6.pro/inc -../../autodoc/inc -../../autodoc/source/ary/inc -../../autodoc/source/inc -../../autodoc/source/display/inc -../../autodoc/source/parser_i/inc -../../autodoc/source/parser/inc -../../avmedia/inc -../../avmedia/source/inc -../../avmedia/unxlngi6.pro/inc -../../lotuswordpro/unxlngi6.pro/inc -../../remotebridges/unxlngi6.pro/inc -../../slideshow/inc -../../slideshow/source/inc -../../slideshow/unxlngi6.pro/inc -../../connectivity/inc -../../connectivity/source/inc -../../connectivity/unxlngi6.pro/inc -../../readlicense_oo/unxlngi6.pro/inc -../../scripting/inc -../../scripting/source/inc -../../scripting/unxlngi6.pro/inc -../../wizards/unxlngi6.pro/inc -../../xmlscript/inc -../../xmlscript/source/inc -../../xmlscript/unxlngi6.pro/inc -../../bridges/inc -../../bridges/unxlngi6.pro/inc -../../testtools/inc -../../testtools/unxlngi6.pro/inc -../../registry/inc -../../registry/unxlngi6.pro/inc -../../cli_ure/inc -../../cli_ure/unxlngi6.pro/inc -../../psprint/inc -../../psprint/unxlngi6.pro/inc diff --git a/toolkit/src2xml/sc.sh b/toolkit/src2xml/sc.sh deleted file mode 100644 index 1bfb213ccf12..000000000000 --- a/toolkit/src2xml/sc.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -source/src2xml.py --include-path=$(tr '\n' ':' < include-sc.lst) --dry-run $(cat src-sc.lst) "$@" diff --git a/toolkit/src2xml/sd.sh b/toolkit/src2xml/sd.sh deleted file mode 100644 index 78b47201fc00..000000000000 --- a/toolkit/src2xml/sd.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -source/src2xml.py --include-path=$(tr '\n' ':' < include-sd.lst) --dry-run $(cat src-sd.lst) "$@" diff --git a/toolkit/src2xml/source/boxer.py b/toolkit/src2xml/source/boxer.py deleted file mode 100644 index e0bc9d4cb5f0..000000000000 --- a/toolkit/src2xml/source/boxer.py +++ /dev/null @@ -1,90 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -from globals import * - - -class DlgLayoutBuilder(object): - def __init__ (self, dlgnode): - self.dlgnode = dlgnode - self.rows = {} - - def addWidget (self, elem): - x, y = int(elem.getAttr('x')), int(elem.getAttr('y')) - self.rows[y] = self.rows.get (y, {}) - while self.rows[y].has_key(x): - y += 1 - self.rows[y] = self.rows.get (y, {}) - self.rows[y][x] = elem - - def build (self): - root = Element('vbox') - ys = self.rows.keys() - ys.sort() - for y in ys: - xs = self.rows[y].keys() - xs.sort() - - if len(xs) == 1: - root.appendChild(self.rows[y][xs[0]]) - continue - - hbox = Element('hbox') - root.appendChild(hbox) - for x in xs: - elem = self.rows[y][x] - hbox.appendChild(elem) - - return root - - -class Boxer(object): - def __init__ (self, root): - self.root = root - - def layout (self): - - newroot = RootNode() - for dlgnode in self.root.children: - newdlgnode = self.__walkDlgNode(dlgnode) - newroot.children.append(newdlgnode) - - return newroot - - def __walkDlgNode (self, dlgnode): - - newnode = Element(dlgnode.name) - newnode.clone(dlgnode) - if dlgnode.name == 'string': - return newnode - newnode.setAttr("xmlns", "http://openoffice.org/2007/layout") - newnode.setAttr("xmlns:cnt", "http://openoffice.org/2007/layout/container") - mx = DlgLayoutBuilder(newnode) - - # Each dialog node is expected to have a flat list of widgets. - for widget in dlgnode.children: - if widget.hasAttr('x') and widget.hasAttr('y'): - mx.addWidget(widget) - else: - newnode.appendChild(widget) - - vbox = mx.build() - if len(vbox.children) > 0: - newnode.appendChild(vbox) - - return newnode diff --git a/toolkit/src2xml/source/expression.py b/toolkit/src2xml/source/expression.py deleted file mode 100644 index aaf48daddaa2..000000000000 --- a/toolkit/src2xml/source/expression.py +++ /dev/null @@ -1,128 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -import sys -import globals - -def toString (node): - - if node == None: - return '' - - chars = '(' - - if type(node.left) == type(0): - chars += "%d"%node.left - else: - chars += toString(node.left) - - chars += node.op - - if type(node.right) == type(0): - chars += "%d"%node.right - else: - chars += toString(node.right) - - chars += ")" - - return chars - -class Node(object): - def __init__ (self): - self.left = None - self.right = None - self.parent = None - self.op = None - -class ExpParser(object): - - def __init__ (self, tokens): - self.tokens = tokens - - def jumpToRoot (self): - while self.ptr.parent != None: - self.ptr = self.ptr.parent - - def build (self): - self.ptr = Node() - - for token in self.tokens: - - if token in '+-': - if self.ptr.left == None: - raise globals.ParseError ('') - if self.ptr.right == None: - self.ptr.op = token - else: - self.jumpToRoot() - self.ptr.parent = Node() - self.ptr.parent.left = self.ptr - self.ptr = self.ptr.parent - self.ptr.op = token - - elif token in '*/': - if self.ptr.left == None: - raise globals.ParseError ('') - elif self.ptr.right == None: - self.ptr.op = token - else: - num = self.ptr.right - self.ptr.right = Node() - self.ptr.right.parent = self.ptr - self.ptr.right.left = num - self.ptr.right.op = token - self.ptr = self.ptr.right - - elif token == '(': - if self.ptr.left == None: - self.ptr.left = Node() - self.ptr.left.parent = self.ptr - self.ptr = self.ptr.left - elif self.ptr.right == None: - self.ptr.right = Node() - self.ptr.right.parent = self.ptr - self.ptr = self.ptr.right - else: - raise globals.ParseError ('') - - elif token == ')': - if self.ptr.left == None: - raise globals.ParseError ('') - elif self.ptr.right == None: - raise globals.ParseError ('') - elif self.ptr.parent == None: - pass - else: - self.ptr = self.ptr.parent - - else: - num = int(token) - if self.ptr.left == None: - self.ptr.left = num - elif self.ptr.right == None: - self.ptr.right = num - else: - raise globals.ParseError ('') - - def dumpTree (self): - self.jumpToRoot() - print toString(self.ptr) - - - - diff --git a/toolkit/src2xml/source/expression_test.py b/toolkit/src2xml/source/expression_test.py deleted file mode 100644 index 235cd1d124be..000000000000 --- a/toolkit/src2xml/source/expression_test.py +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env python - -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -import sys -import expression - -def run (exp): - tokens = exp.split() - expparser = expression.ExpParser(tokens) - expparser.build() - expparser.dumpTree() - -def main (): - run("6 + 34") - run("6 + 34 - 10") - run("6 + 34 - 10 + 200") - run("6 + 34 - 10 * 200") - run("6 + 34 - 10 * 200 + 18") - run("6 + 34 - 10 * 200 + 18 / 2") - - run("6 * ( ( 10 + 2 ) - 10 ) * 33") - -if __name__ == '__main__': - main() diff --git a/toolkit/src2xml/source/globals.py b/toolkit/src2xml/source/globals.py deleted file mode 100644 index 34d8269402db..000000000000 --- a/toolkit/src2xml/source/globals.py +++ /dev/null @@ -1,133 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -import sys - -class ParseError (Exception): - pass - -def error (msg, exit=0): - sys.stderr.write (msg) - if exit: - sys.exit (exit) - -def progress (msg): - sys.stderr.write(msg) - - -def removeQuote (text): - """Remove quotes from a literal. -""" - if len(text) >= 2 and text[0] == text[len(text)-1] == '"': - text = text[1:-1] - return text - - -class Macro(object): - def __init__ (self, name): - self.name = name - self.tokens = [] - self.vars = {} - - -class Node(object): - def __init__ (self): - self.children = [] - - def appendChild (self, childnode): - self.children.append(childnode) - childnode.parent = self - - def getChildren (self): - return self.children - - -class RootNode(Node): - def __init__ (self): - Node.__init__(self) - - def dump (self): - chars = '' - for child in self.getChildren(): - chars += child.dump() - return chars - - -class Element(Node): - - INDENT = " " - - def __init__ (self, name, rid = None): - Node.__init__(self) - self.name = name - self.parent = None -# print "name: " + self.name - stats ... - - # The following attributes are copied when 'clone'ed. - self.rid = rid - self.attrs = {} - - def dump (self, level = 0): - chars = '' - chars += "\n" + Element.INDENT*level - chars += '<%s'%self.name - - if self.rid != None: - self.setAttr("rid", self.rid) - - chars += self.__dumpAttrs() - - if len(self.children) == 0: - chars += '/>' - else: - chars += '>' - for child in self.getChildren(): - chars += child.dump(level+1) - - chars += "\n"+Element.INDENT*level - chars += ""%self.name - - return chars - - def hasAttr (self, name): - return self.attrs.has_key(name) - - def getAttr (self, name): - return self.attrs[name] - - def setAttr (self, name, value): - if type(value) == type(0): - value = "%d"%value - self.attrs[name] = removeQuote(value) -# print "attr: " + self.name + "." + name - stats ... - return - - def clone (self, elem): - keys = elem.attrs.keys() - for key in keys: - self.attrs[key] = elem.attrs[key] - self.rid = elem.rid - - def __dumpAttrs (self): - text = '' - keys = self.attrs.keys() - keys.sort() - for key in keys: - value = self.attrs[key] - text += ' %s="%s"'%(key, value) - return text diff --git a/toolkit/src2xml/source/macroexpander_test.py b/toolkit/src2xml/source/macroexpander_test.py deleted file mode 100644 index e97848a0df6b..000000000000 --- a/toolkit/src2xml/source/macroexpander_test.py +++ /dev/null @@ -1,88 +0,0 @@ -#!/usr/bin/env python -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -import srclexer, srcparser, globals - -class TestCase: - - @staticmethod - def run (tokens, defines): - mcExpander = srcparser.MacroExpander(tokens, defines) - mcExpander.debug = True - mcExpander.expand() - tokens = mcExpander.getTokens() - print tokens - - @staticmethod - def simpleNoArgs (): - tokens = ['FUNC_FOO', '(', 'left', ',', 'right', ')'] - defines = {} - macro = globals.Macro('FUNC_FOO') - macro.tokens = ['Here', 'comes', 'X', 'and', 'Y'] - defines['FUNC_FOO'] = macro - TestCase.run(tokens, defines) - - @staticmethod - def simpleArgs (): - tokens = ['FUNC_FOO', '(', 'left', ',', 'right', ')'] - defines = {} - macro = globals.Macro('FUNC_FOO') - macro.tokens = ['Here', 'comes', 'X', 'and', 'Y'] - macro.vars['X'] = 0 - macro.vars['Y'] = 1 - defines['FUNC_FOO'] = macro - TestCase.run(tokens, defines) - - @staticmethod - def multiTokenArgs (): - tokens = ['FUNC_FOO', '(', 'left1', 'left2', 'left3', ',', 'right', ')'] - defines = {} - macro = globals.Macro('FUNC_FOO') - macro.tokens = ['Here', 'comes', 'X', 'and', 'Y'] - macro.vars['X'] = 0 - macro.vars['Y'] = 1 - defines['FUNC_FOO'] = macro - TestCase.run(tokens, defines) - - @staticmethod - def nestedTokenArgs (): - tokens = ['FUNC_BAA', '(', 'left', ',', 'right', ')'] - defines = {} - macro = globals.Macro('FUNC_FOO') - macro.tokens = ['Here', 'comes', 'X', 'and', 'Y'] - macro.vars['X'] = 0 - macro.vars['Y'] = 1 - defines['FUNC_FOO'] = macro - macro = globals.Macro('FUNC_BAA') - macro.tokens = ['FUNC_FOO'] - defines['FUNC_BAA'] = macro - TestCase.run(tokens, defines) - -def main (): - print "simple expansion with no arguments" - TestCase.simpleNoArgs() - print "simple argument expansion" - TestCase.simpleArgs() - print "multi-token argument expansion" - TestCase.multiTokenArgs() - print "nested argument expansion" - TestCase.nestedTokenArgs() - -if __name__ == '__main__': - main() diff --git a/toolkit/src2xml/source/macroparser.py b/toolkit/src2xml/source/macroparser.py deleted file mode 100644 index 1cad3d7a04e3..000000000000 --- a/toolkit/src2xml/source/macroparser.py +++ /dev/null @@ -1,147 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -import sys -from globals import * -import srclexer - -class MacroParser(object): - - def __init__ (self, buf): - self.buffer = buf - self.macro = None - self.debug = False - - def parse (self): - """ -A macro with arguments must have its open paren immediately following -its name without any whitespace. -""" - if self.debug: - print "-"*68 - print "parsing '%s'"%self.buffer - - i = 0 - bufSize = len(self.buffer) - name, buf = '', '' - while i < bufSize: - c = self.buffer[i] - if c in [' ', "\t"] and len(name) == 0: - # This is a simple macro with no arguments. - name = buf - vars = [] - content = self.buffer[i:] - self.setMacro(name, vars, content) - return - elif c == '(' and len(name) == 0: - # This one has arguments. - name = buf - buf = self.buffer[i:] - vars, content = self.parseArgs(buf) - self.setMacro(name, vars, content) - return - else: - buf += c - i += 1 - - def parseArgs (self, buffer): - """Parse arguments. - -The buffer is expected to be formatted like '(a, b, c)' where the first -character is the open paren. -""" - scope = 0 - buf = '' - vars = [] - content = '' - bufSize = len(buffer) - i = 0 - while i < bufSize: - c = buffer[i] - if c == '(': - scope += 1 - elif c == ')': - scope -= 1 - if len(buf) > 0: - vars.append(buf) - if scope == 0: - break - elif c == ',': - if len(buf) == 0: - raise globals.ParseError ('') - vars.append(buf) - buf = '' - elif c in " \t" and scope > 0: - pass - else: - buf += c - - i += 1 - - if scope > 0: - raise globals.ParseError ('') - - return vars, buffer[i+1:] - - - def setMacro (self, name, vars, content): - if self.debug: - print "-"*68 - print "name: %s"%name - for var in vars: - print "var: %s"%var - if len(vars) == 0: - print "no vars" - print "content: '%s'"%content - - if len(content) > 0: - self.macro = Macro(name) - for i in xrange(0, len(vars)): - self.macro.vars[vars[i]] = i - - # tokinize it using lexer. - mclexer = srclexer.SrcLexer(content) - mclexer.expandHeaders = False - mclexer.inMacroDefine = True - mclexer.tokenize() - self.macro.tokens = mclexer.getTokens() - if self.debug: - print self.macro.tokens - - if not self.isValidMacro(self.macro): - self.macro = None - - if self.debug: - if self.macro != None: - print "macro registered!" - else: - print "macro not registered" - - def isValidMacro (self, macro): - - n = len(macro.tokens) - if n == 0: - return False - elif len(macro.name) > 4 and macro.name[1:4] == 'ID_': - # We don't want to expand macros like HID_, SID_, WID_, etc. - return False - return True - - - def getMacro (self): - return self.macro diff --git a/toolkit/src2xml/source/macroparser_test.py b/toolkit/src2xml/source/macroparser_test.py deleted file mode 100644 index d1e6f6cba7dd..000000000000 --- a/toolkit/src2xml/source/macroparser_test.py +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env python -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -import macroparser - -def runParser (buf): - mparser = macroparser.MacroParser(buf) - mparser.debug = True - mparser.parse() - -def main (): - buf = 'FOO (asdfsdaf)' - runParser(buf) - buf = 'FOO (x, y) (x) + (y)' - runParser(buf) - buf = 'FOO(x, y) (x) + (y)' - runParser(buf) - - -if __name__ == '__main__': - main() diff --git a/toolkit/src2xml/source/src2xml.py b/toolkit/src2xml/source/src2xml.py deleted file mode 100644 index 16d143fdd5eb..000000000000 --- a/toolkit/src2xml/source/src2xml.py +++ /dev/null @@ -1,244 +0,0 @@ -#!/usr/bin/env python -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -import getopt -import os -import re -import sys -# -from srclexer import SrcLexer -from srcparser import SrcParser -from boxer import Boxer -# FIXME -from globals import * - -def option_parser (): - import optparse - p = optparse.OptionParser () - - p.usage = '''src2xml.py [OPTION]... SRC-FILE...''' - - examples = ''' -Examples: - src2xml.py --output-dir=. --post-process --ignore-includes zoom.src - src2xml.py --dry-run -I svx/inc -I svx/source/dialog zoom.src -''' - - def format_examples (self): - return examples - - if 'epilog' in p.__dict__: - p.formatter.format_epilog = format_examples - p.epilog = examples - else: - p.formatter.format_description = format_examples - p.description = examples - - p.description = '''OOo SRC To Layout XML Converter. - -Convert OO.o's existing dialog resource files into XML layout files. -''' - - p.add_option ('-l', '--debug-lexer', action='store_true', - dest='debug_lexer', default=False, - help='debug lexer') - - p.add_option ('-p', '--debug-parser', action='store_true', - dest='debug_parser', default=False, - help='debug parser') - - p.add_option ('-m', '--debug-macro', action='store_true', - dest='debug_macro', default=False, - help='debug macro') - - p.add_option ('-n', '--dry-run', action='store_true', - dest='dry_run', default=False, - help='dry run') - - p.add_option ('-k', '--keep-going', action='store_true', - dest='keep_going', default=False, - help='continue after error') - - p.add_option ('-i', '--ignore-includes', action='store_true', - dest='ignore_includes', default=False, - help='ignore #include directives') - - p.add_option ('-I', '--include-dir', action='append', - dest='include_path', - default=[], - metavar='DIR', - help='append DIR to include path') - - def from_file (option, opt_str, value, parser): - lst = getattr (parser.values, option.dest) - lst += file (value).read ().split ('\n') - setattr (parser.values, option.dest, lst) - - def from_path (option, opt_str, value, parser): - lst = getattr (parser.values, option.dest) - lst += value.split (':') - setattr (parser.values, option.dest, lst) - - # Junk me? - p.add_option ('--includes-from-file', action='callback', callback=from_file, - dest='include_path', - default=[], - type='string', - metavar='FILE', - help='append directory list from FILE to include path') - - p.add_option ('--include-path', action='callback', callback=from_path, - dest='include_path', - type='string', - default=[], - metavar='PATH', - help='append PATH to include path') - - p.add_option ('--only-expand-macros', action='store_true', - dest='only_expand_macros', default=False, - help='FIXME: better to say what NOT to expand?') - - p.add_option ('-o', '--output-dir', action='store', - dest='output_dir', default=None, - metavar='DIR', - help='Output to DIR') - - p.add_option ('-s', '--post-process', action='store_true', - dest='post_process', default=False, - help='post process output for use in Layout') - - p.add_option ('--stop-on-header', action='store_true', - dest='stopOnHeader', default=False, - help='FIXME: remove this?') - - return p - - -def convert (file_name, options): - progress ("parsing %(file_name)s ..." % locals ()) - fullpath = os.path.abspath(file_name) - if not os.path.isfile(fullpath): - error("no such file", exit=True) - - ##options.include_path.append (os.path.dirname (fullpath)) - - input = file (fullpath, 'r').read() - lexer = SrcLexer(input, fullpath) - lexer.expandHeaders = not options.ignore_includes - lexer.includeDirs = options.include_path - lexer.stopOnHeader = options.stopOnHeader - lexer.debugMacro = options.debug_macro - if options.debug_lexer: - lexer.debug = True - lexer.tokenize() - progress ("-"*68 + "\n") - progress ("** token dump\n") - lexer.dumpTokens() - progress ("** end of token dump\n") - return - - # Tokenize it using lexer - lexer.tokenize() - - parser = SrcParser(lexer.getTokens(), lexer.getDefines()) - parser.only_expand_macros = options.only_expand_macros - if options.debug_parser: - parser.debug = True - root = parser.parse() - s = root.dump() - return s - - # Parse the tokens. - root = parser.parse() - - # Box it, and return the XML tree. - root = Boxer(root).layout() - output = root.dump() - if not options.dry_run: - progress ("\n") - return output - -def dry_one_file (file_name, options): - try: - str = convert(file_name, options) - progress (" SUCCESS\n") - except Exception, e: - if options.keep_going: - progress (" FAILED\n") - else: - import traceback - print traceback.format_exc (None) - raise e - -def post_process (s): - """Make output directly usable by layout module.""" - s = re.sub ('(]*) text=', r'\1 label=', s) - s = re.sub (' (height|width|x|y)="[0-9]*"', '', s) - s = re.sub (' (label|text|title)="', r' _\1="', s) - s = re.sub ('&([^m][^p]*[^;]*)', r'&\1', s) - s = re.sub (' hide="(TRUE|true|1)"', ' show="false"', s) - - s = s.replace (' - -''' - -def do_one_file (file_name, options): - str = XML_HEADER - str += convert(file_name, options) - str += '\n' - - if options.post_process: - str = post_process (str) - h = sys.stdout - if options.output_dir: - base = os.path.basename (file_name) - root, ext = os.path.splitext (base) - out_name = options.output_dir + '/' + root + '.xml' - progress ("writing %(out_name)s ..." % locals ()) - h = file (out_name, 'w') - h.write (str) - h.flush () - progress ("\n") - -def main (): - p = option_parser () - (options, files) = option_parser ().parse_args () - if not files: - p.error ("no input files") - - for f in files: - if options.dry_run: - dry_one_file (f, options) - else: - do_one_file (f, options) - -if __name__ == '__main__': - main () diff --git a/toolkit/src2xml/source/srclexer.py b/toolkit/src2xml/source/srclexer.py deleted file mode 100644 index c79923293c69..000000000000 --- a/toolkit/src2xml/source/srclexer.py +++ /dev/null @@ -1,506 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -import sys, os.path -from globals import * -import macroparser - -class EOF(Exception): - def __init__ (self): - pass - - def str (self): - return "end of file" - -class BOF(Exception): - def __init__ (self): - pass - - def str (self): - return "beginning of file" - - -def removeHeaderQuotes (orig): - if len(orig) <= 2: - return orig - elif orig[0] == orig[-1] == '"': - return orig[1:-1] - elif orig[0] == '<' and orig[-1] == '>': - return orig[1:-1] - - return orig - - -def dumpTokens (tokens, toError=False): - - scope = 0 - indent = " " - line = '' - chars = '' - - for token in tokens: - if token in '{<': - if len(line) > 0: - chars += indent*scope + line + "\n" - line = '' - chars += indent*scope + token + "\n" - scope += 1 - - elif token in '}>': - if len(line) > 0: - chars += indent*scope + line + "\n" - line = '' - scope -= 1 - chars += indent*scope + token - - elif token == ';': - if len(line) > 0: - chars += indent*scope + line + ";\n" - line = '' - else: - chars += ";\n" - elif len(token) > 0: - line += token + ' ' - - if len(line) > 0: - chars += line - chars += "\n" - if toError: - sys.stderr.write(chars) - else: - sys.stdout.write(chars) - - -class HeaderData(object): - def __init__ (self): - self.defines = {} - self.tokens = [] - - -class SrcLexer(object): - """Lexicographical analyzer for .src format. - -The role of a lexer is to parse the source file and break it into -appropriate tokens. Such tokens are later passed to a parser to -build the syntax tree. -""" - headerCache = {} - - VISIBLE = 0 - INVISIBLE_PRE = 1 - INVISIBLE_POST = 2 - - def __init__ (self, chars, filepath = None): - self.filepath = filepath - self.parentLexer = None - self.chars = chars - self.bufsize = len(self.chars) - - # TODO: use parameters for this - # Properties that can be copied. - self.headerDict = dict () - self.debug = False - self.debugMacro = False - self.includeDirs = list () - self.expandHeaders = True - self.inMacroDefine = False - self.stopOnHeader = False - - def copyProperties (self, other): - """Copy properties from another instance of SrcLexer.""" - - # TODO: use parameters for this - self.headerDict = other.headerDict - self.debug = other.debug - self.debugMacro = other.debugMacro - self.includeDirs = other.includeDirs[:] - self.expandHeaders = other.expandHeaders - self.inMacroDefine = other.inMacroDefine - self.stopOnHeader = other.stopOnHeader - - def init (self): - self.firstNonBlank = '' - self.token = '' - self.tokens = [] - self.defines = {} - self.visibilityStack = [] - - def getTokens (self): - return self.tokens - - def getDefines (self): - return self.defines - - def nextPos (self, i): - while True: - i += 1 - try: - c = self.chars[i] - except IndexError: - raise EOF - - if ord(c) in [0x0D]: - continue - break - return i - - def prevPos (self, i): - while True: - i -= 1 - try: - c = self.chars[i] - except IndexError: - raise BOF - - if ord(c) in [0x0D]: - continue - break - return i - - def isCodeVisible (self): - if len(self.visibilityStack) == 0: - return True - for item in self.visibilityStack: - if item != SrcLexer.VISIBLE: - return False - return True - - def tokenize (self): - self.init() - - i = 0 - while True: - c = self.chars[i] - - if self.firstNonBlank == '' and not c in [' ', "\n", "\t"]: - # Store the first non-blank in a line. - self.firstNonBlank = c - elif c == "\n": - self.firstNonBlank = '' - - if c == '#': - i = self.pound(i) - elif c == '/': - i = self.slash(i) - elif c == "\n": - i = self.lineBreak(i) - elif c == '"': - i = self.doubleQuote(i) - elif c in [' ', "\t"]: - i = self.blank(i) - elif c in ";()[]{}<>,=+-*": - # Any outstanding single-character token. - i = self.anyToken(i, c) - elif self.isCodeVisible(): - self.token += c - - try: - i = self.nextPos(i) - except EOF: - break - - if len(self.token): - self.tokens.append(self.token) - - if not self.parentLexer and self.debug: - progress ("-"*68 + "\n") - progress ("All defines found in this translation unit:\n") - keys = self.defines.keys() - keys.sort() - for key in keys: - progress ("@ %s\n"%key) - - def dumpTokens (self, toError=False): - dumpTokens(self.tokens, toError) - - - def maybeAddToken (self): - if len(self.token) > 0: - self.tokens.append(self.token) - self.token = '' - - - #-------------------------------------------------------------------- - # character handlers - - def blank (self, i): - if not self.isCodeVisible(): - return i - - self.maybeAddToken() - return i - - - def pound (self, i): - - if self.inMacroDefine: - return i - - if not self.firstNonBlank == '#': - return i - - self.maybeAddToken() - # We are in preprocessing mode. - - # Get the macro command name '# .....' - - command, define, buf = '', '', '' - firstNonBlank = False - while True: - try: - i = self.nextPos(i) - c = self.chars[i] - if c == '\\' and self.chars[self.nextPos(i)] == "\n": - i = self.nextPos(i) - continue - except EOF: - break - - if c == "\n": - if len(buf) > 0 and len(command) == 0: - command = buf - i = self.prevPos(i) - break - elif c in [' ', "\t"]: - if not firstNonBlank: - # Ignore any leading blanks after the '#'. - continue - - if len(command) == 0: - command = buf - buf = '' - else: - buf += ' ' - elif c == '(': - if len(buf) > 0 and len(command) == 0: - command = buf - buf += c - else: - if not firstNonBlank: - firstNonBlank = True - buf += c - - if command == 'define': - self.handleMacroDefine(buf) - elif command == 'include': - self.handleMacroInclude(buf) - elif command == 'ifdef': - defineName = buf.strip() - if self.defines.has_key(defineName): - self.visibilityStack.append(SrcLexer.VISIBLE) - else: - self.visibilityStack.append(SrcLexer.INVISIBLE_PRE) - - elif command == 'ifndef': - defineName = buf.strip() - if self.defines.has_key(defineName): - self.visibilityStack.append(SrcLexer.INVISIBLE_PRE) - else: - self.visibilityStack.append(SrcLexer.VISIBLE) - - elif command == 'if': - if self.evalCodeVisibility(buf): - self.visibilityStack.append(SrcLexer.VISIBLE) - else: - self.visibilityStack.append(SrcLexer.INVISIBLE_PRE) - - elif command == 'elif': - if len(self.visibilityStack) == 0: - raise ParseError ('') - - if self.visibilityStack[-1] == SrcLexer.VISIBLE: - self.visibilityStack[-1] = SrcLexer.INVISIBLE_POST - elif self.visibilityStack[-1] == SrcLexer.INVISIBLE_PRE: - # Evaluate only if the current visibility is false. - if self.evalCodeVisibility(buf): - self.visibilityStack[-1] = SrcLexer.VISIBLE - - elif command == 'else': - if len(self.visibilityStack) == 0: - raise ParseError ('') - - if self.visibilityStack[-1] == SrcLexer.VISIBLE: - self.visibilityStack[-1] = SrcLexer.INVISIBLE_POST - if self.visibilityStack[-1] == SrcLexer.INVISIBLE_PRE: - self.visibilityStack[-1] = SrcLexer.VISIBLE - - elif command == 'endif': - if len(self.visibilityStack) == 0: - raise ParseError ('') - self.visibilityStack.pop() - - elif command == 'undef': - pass - elif command in ['error', 'pragma']: - pass - else: - print "'%s' '%s'"%(command, buf) - print self.filepath - sys.exit(0) - - return i - - - def evalCodeVisibility (self, buf): - try: - return eval(buf) - except: - return True - - def handleMacroDefine (self, buf): - - mparser = macroparser.MacroParser(buf) - mparser.debug = self.debugMacro - mparser.parse() - macro = mparser.getMacro() - if macro: - self.defines[macro.name] = macro - - def handleMacroInclude (self, buf): - - # Strip excess string if any. - pos = buf.find(' ') - if pos >= 0: - buf = buf[:pos] - headerSub = removeHeaderQuotes(buf) - - if not self.expandHeaders: - # We don't want to expand headers. Bail out. - if self.debug: - progress ("%s ignored\n"%headerSub) - return - - defines = {} - headerPath = None - for includeDir in self.includeDirs: - hpath = includeDir + '/' + headerSub - if os.path.isfile(hpath) and hpath != self.filepath: - headerPath = hpath - break - - if not headerPath: - error("included header file " + headerSub + " not found\n", self.stopOnHeader) - return - - if self.debug: - progress ("%s found\n"%headerPath) - - if headerPath in self.headerDict: - if self.debug: - progress ("%s already included\n"%headerPath) - return - - if SrcLexer.headerCache.has_key(headerPath): - if self.debug: - progress ("%s in cache\n"%headerPath) - for key in SrcLexer.headerCache[headerPath].defines.keys(): - self.defines[key] = SrcLexer.headerCache[headerPath].defines[key] - return - - chars = open(headerPath, 'r').read() - mclexer = SrcLexer(chars, headerPath) - mclexer.copyProperties(self) - mclexer.parentLexer = self - mclexer.tokenize() - hdrData = HeaderData() - hdrData.tokens = mclexer.getTokens() - headerDefines = mclexer.getDefines() - for key in headerDefines.keys(): - defines[key] = headerDefines[key] - hdrData.defines[key] = headerDefines[key] - - self.headerDict[headerPath] = True - SrcLexer.headerCache[headerPath] = hdrData - - # Update the list of headers that have already been expaneded. - for key in mclexer.headerDict.keys(): - self.headerDict[key] = True - - if self.debug: - progress ("defines found in header %s:\n"%headerSub) - for key in defines.keys(): - progress (" '%s'\n"%key) - - for key in defines.keys(): - self.defines[key] = defines[key] - - - def slash (self, i): - if not self.isCodeVisible(): - return i - - if i < self.bufsize - 1 and self.chars[i+1] == '/': - # Parse line comment. - line = '' - i += 2 - while i < self.bufsize: - c = self.chars[i] - if ord(c) in [0x0A, 0x0D]: - return i - 1 - line += c - i += 1 - self.token = '' - elif i < self.bufsize - 1 and self.chars[i+1] == '*': - comment = '' - i += 2 - while i < self.bufsize: - c = self.chars[i] - if c == '/' and self.chars[i-1] == '*': - return i - comment += c - i += 1 - else: - return self.anyToken(i, '/') - - return i - - - def lineBreak (self, i): - if not self.isCodeVisible(): - return i - - self.maybeAddToken() - - return i - - - def doubleQuote (self, i): - if not self.isCodeVisible(): - return i - - literal = '' - i += 1 - while i < self.bufsize: - c = self.chars[i] - if c == '"': - self.tokens.append('"'+literal+'"') - break - literal += c - i += 1 - - return i - - - def anyToken (self, i, token): - if not self.isCodeVisible(): - return i - - self.maybeAddToken() - self.token = token - self.maybeAddToken() - return i diff --git a/toolkit/src2xml/source/srcparser.py b/toolkit/src2xml/source/srcparser.py deleted file mode 100644 index 3dcd9c63ed0c..000000000000 --- a/toolkit/src2xml/source/srcparser.py +++ /dev/null @@ -1,434 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -import sys -from globals import * -import srclexer - -# simple name translation map -postTransMap = {"ok-button": "okbutton", - "cancel-button": "cancelbutton", - "help-button": "helpbutton"} - -def transName (name): - """Translate a mixed-casing name to dash-separated name. - -Translate a mixed-casing name (e.g. MyLongName) to a dash-separated name -(e.g. my-long-name). -""" - def isUpper (c): - return c >= 'A' and c <= 'Z' - - newname = '' - parts = [] - buf = '' - for c in name: - if isUpper(c) and len(buf) > 1: - parts.append(buf) - buf = c - else: - buf += c - - if len(buf) > 0: - parts.append(buf) - - first = True - for part in parts: - if first: - first = False - else: - newname += '-' - newname += part.lower() - - # special-case mapping ... - if 0: #postTransMap.has_key(newname): - newname = postTransMap[newname] - - return newname - - -def transValue (value): - """Translate certain values. - -Examples of translated values include TRUE -> true, FALSE -> false. -""" - if value.lower() in ["true", "false"]: - value = value.lower() - return value - - -def renameAttribute (name, elemName): - - # TODO: all manner of evil special cases ... - if elemName == 'metric-field' and name == 'spin-size': - return 'step-size' - - return name - - -class Statement(object): - """Container to hold information for a single statement. - -Each statement consists of the left-hand-side token(s), and right-hand-side -tokens, separated by a '=' token. This class stores the information on the -left-hand-side tokens. -""" - def __init__ (self): - self.leftTokens = [] - self.leftScope = None - - -class MacroExpander(object): - def __init__ (self, tokens, defines): - self.tokens = tokens - self.defines = defines - - def expand (self): - self.pos = 0 - while self.pos < len(self.tokens): - self.expandToken() - - def expandToken (self): - token = self.tokens[self.pos] - if not self.defines.has_key(token): - self.pos += 1 - return - - macro = self.defines[token] - nvars = len(macro.vars.keys()) - if nvars == 0: - # Simple expansion - self.tokens[self.pos:self.pos+1] = macro.tokens - return - else: - # Expansion with arguments. - values, lastPos = self.parseValues() - newtokens = [] - for mtoken in macro.tokens: - if macro.vars.has_key(mtoken): - # variable - pos = macro.vars[mtoken] - valtokens = values[pos] - for valtoken in valtokens: - newtokens.append(valtoken) - else: - # not a variable - newtokens.append(mtoken) - - self.tokens[self.pos:self.pos+lastPos+1] = newtokens - - - def parseValues (self): - """Parse tokens to get macro function variable values. - -Be aware that there is an implicit quotes around the text between the open -paren, the comma(s), and the close paren. For instance, if a macro is defined -as FOO(a, b) and is used as FOO(one two three, and four), then the 'a' must be -replaced with 'one two three', and the 'b' replaced with 'and four'. In other -words, whitespace does not end a token. - -""" - values = [] - i = 1 - scope = 0 - value = [] - while True: - try: - tk = self.tokens[self.pos+i] - except IndexError: - progress ("error parsing values (%d)\n"%i) - for j in xrange(0, i): - print self.tokens[self.pos+j], - print '' - srclexer.dumpTokens(self.tokens) - srclexer.dumpTokens(self.newtokens) - print "tokens expanded so far:" - for tk in self.expandedTokens: - print "-"*20 - print tk - srclexer.dumpTokens(self.defines[tk].tokens) - sys.exit(1) - if tk == '(': - value = [] - scope += 1 - elif tk == ',': - values.append(value) - value = [] - elif tk == ')': - scope -= 1 - values.append(value) - value = [] - if scope == 0: - break - else: - raise ParseError ('') - else: - value.append(tk) - i += 1 - - return values, i - - def getTokens (self): - return self.tokens - - -class SrcParser(object): - - def __init__ (self, tokens, defines = None): - self.tokens = tokens - self.defines = defines - self.debug = False - self.onlyExpandMacros = False - - def init (self): - self.elementStack = [RootNode()] - self.stmtData = Statement() - self.tokenBuf = [] - self.leftTokens = [] - - # Expand defined macros. - if self.debug: - progress ("-"*68+"\n") - for key in self.defines.keys(): - progress ("define: %s\n"%key) - - self.expandMacro() - self.tokenSize = len(self.tokens) - - def expandMacro (self): - macroExp = MacroExpander(self.tokens, self.defines) - macroExp.expand() - self.tokens = macroExp.getTokens() - if self.onlyExpandMacros: - srclexer.dumpTokens(self.tokens) - sys.exit(0) - - def parse (self): - """Parse it! - -This is the main loop for the parser. This is where it all begins and ends. -""" - self.init() - - i = 0 - while i < self.tokenSize: - tk = self.tokens[i] - if tk == '{': - i = self.openBrace(i) - elif tk == '}': - i = self.closeBrace(i) - elif tk == ';': - i = self.semiColon(i) - elif tk == '=': - i = self.assignment(i) - else: - self.tokenBuf.append(tk) - - i += 1 - - return self.elementStack[0] - - #------------------------------------------------------------------------- - # Token Handlers - - """ -Each token handler takes the current token position and returns the position -of the last token processed. For the most part, the current token position -and the last processed token are one and the same, in which case the handler -can simply return the position value it receives without incrementing it. - -If you need to read ahead to process more tokens than just the current token, -make sure that the new token position points to the last token that has been -processed, not the next token that has not yet been processed. This is -because the main loop increments the token position when it returns from the -handler. -""" - - # assignment token '=' - def assignment (self, i): - self.leftTokens = self.tokenBuf[:] - if self.stmtData.leftScope == None: - # Keep track of lhs data in case of compound statement. - self.stmtData.leftTokens = self.tokenBuf[:] - self.stmtData.leftScope = len(self.elementStack) - 1 - - self.tokenBuf = [] - return i - - # open brace token '{' - def openBrace (self, i): - bufSize = len(self.tokenBuf) - leftSize = len(self.leftTokens) - obj = None - if bufSize == 0 and leftSize > 0: - # Name = { ... - obj = Element(self.leftTokens[0]) - - elif bufSize > 0 and leftSize == 0: - # Type Name { ... - wgtType = self.tokenBuf[0] - wgtRID = None - if bufSize >= 2: - wgtRID = self.tokenBuf[1] - obj = Element(wgtType, wgtRID) - - else: - # LeftName = Name { ... - obj = Element(self.leftTokens[0]) - obj.setAttr("type", self.tokenBuf[0]) - - obj.name = transName(obj.name) - - if obj.name == 'string-list': - i = self.parseStringList(i) - elif obj.name == 'filter-list': - i = self.parseFilterList(i, obj) - else: - self.elementStack[-1].appendChild(obj) - self.elementStack.append(obj) - - self.tokenBuf = [] - self.leftTokens = [] - - return i - - # close brace token '}' - def closeBrace (self, i): - if len(self.tokenBuf) > 0: - if self.debug: - print self.tokenBuf - raise ParseError ('') - self.elementStack.pop() - return i - - # semi colon token ';' - def semiColon (self, i): - stackSize = len(self.elementStack) - scope = stackSize - 1 - if len(self.tokenBuf) == 0: - pass - elif scope == 0: - # We are not supposed to have any statment in global scope. - # Just ignore this statement. - pass - else: - # Statement within a scope. Import it as an attribute for the - # current element. - elem = self.elementStack[-1] - - name = "none" - if len(self.leftTokens) > 0: - # Use the leftmost token as the name for now. If we need to - # do more complex parsing of lhs, add more code here. - name = self.leftTokens[0] - name = transName(name) - - if name == 'pos': - i = self.parsePosAttr(i) - elif name == 'size': - i = self.parseSizeAttr(i) - elif len (self.tokenBuf) == 1: - # Simple value - value = transValue(self.tokenBuf[0]) - name = renameAttribute(name, elem.name) - elem.setAttr(name, value) - - if not self.stmtData.leftScope == None and self.stmtData.leftScope < scope: - # This is a nested scope within a statement. Do nothing for now. - pass - - if self.stmtData.leftScope == scope: - # end of (nested) statement. - self.stmtData.leftScope = None - - self.tokenBuf = [] - self.leftTokens = [] - - return i - - def parseStringList (self, i): - - i += 1 - while i < self.tokenSize: - tk = self.tokens[i] - if tk == '}': - break - i += 1 - - return i - - def parseFilterList (self, i, obj): - self.elementStack[-1].appendChild(obj) - self.elementStack.append(obj) - - return i - - def parsePosAttr (self, i): - - # MAP_APPFONT ( 6 , 5 ) - elem = self.elementStack[-1] - x, y = self.parseMapAppfont(self.tokenBuf) - elem.setAttr("x", x) - elem.setAttr("y", y) - - return i - - def parseSizeAttr (self, i): - - # MAP_APPFONT ( 6 , 5 ) - elem = self.elementStack[-1] - width, height = self.parseMapAppfont(self.tokenBuf) - elem.setAttr("width", width) - elem.setAttr("height", height) - - return i - - def parseMapAppfont (self, tokens): - values = [] - scope = 0 - val = '' - for tk in tokens: - if tk == '(': - scope += 1 - if scope == 1: - val = '' - else: - val += tk - elif tk == ')': - scope -= 1 - if scope == 0: - if len(val) == 0: - raise ParseError ('') - values.append(val) - break - else: - val += tk - elif tk == ',': - if len(val) == 0: - raise ParseError ('') - values.append(val) - val = '' - elif scope > 0: - val += tk - - if len(values) != 2: - raise ParseError ('') - - return eval(values[0]), eval(values[1]) - - diff --git a/toolkit/src2xml/src-sc.lst b/toolkit/src2xml/src-sc.lst deleted file mode 100644 index bb2417d47da8..000000000000 --- a/toolkit/src2xml/src-sc.lst +++ /dev/null @@ -1,57 +0,0 @@ -../../sc/util/hidother.src -../../sc/addin/datefunc/dfa.src -../../sc/addin/rot13/rot13.src -../../sc/source/ui/src/crnrdlg.src -../../sc/source/ui/src/hdrcont.src -../../sc/source/ui/src/solvrdlg.src -../../sc/source/ui/src/miscdlgs.src -../../sc/source/ui/src/tabopdlg.src -../../sc/source/ui/src/popup.src -../../sc/source/ui/src/autofmt.src -../../sc/source/ui/src/toolbox.src -../../sc/source/ui/src/opredlin.src -../../sc/source/ui/src/namedlg.src -../../sc/source/ui/src/sortdlg.src -../../sc/source/ui/src/textdlgs.src -../../sc/source/ui/src/optdlg.src -../../sc/source/ui/src/scwarngs.src -../../sc/source/ui/src/scfuncs.src -../../sc/source/ui/src/filter.src -../../sc/source/ui/src/simpref.src -../../sc/source/ui/src/attrdlg.src -../../sc/source/ui/src/sc.src -../../sc/source/ui/src/globstr.src -../../sc/source/ui/src/scstring.src -../../sc/source/ui/src/dbnamdlg.src -../../sc/source/ui/src/subtdlg.src -../../sc/source/ui/src/pseudo.src -../../sc/source/ui/src/condfrmt.src -../../sc/source/ui/src/chartdlg.src -../../sc/source/ui/src/scerrors.src -../../sc/source/ui/dbgui/outline.src -../../sc/source/ui/dbgui/pvfundlg.src -../../sc/source/ui/dbgui/scendlg.src -../../sc/source/ui/dbgui/pivot.src -../../sc/source/ui/dbgui/dpgroupdlg.src -../../sc/source/ui/dbgui/dapitype.src -../../sc/source/ui/dbgui/imoptdlg.src -../../sc/source/ui/dbgui/consdlg.src -../../sc/source/ui/dbgui/validate.src -../../sc/source/ui/dbgui/asciiopt.src -../../sc/source/ui/drawfunc/objdraw.src -../../sc/source/ui/drawfunc/drformsh.src -../../sc/source/ui/styleui/scstyles.src -../../sc/source/ui/styleui/styledlg.src -../../sc/source/ui/formdlg/parawin.src -../../sc/source/ui/formdlg/dwfunctr.src -../../sc/source/ui/formdlg/formdlgs.src -../../sc/source/ui/navipi/navipi.src -../../sc/source/ui/miscdlgs/acredlin.src -../../sc/source/ui/miscdlgs/highred.src -../../sc/source/ui/miscdlgs/linkarea.src -../../sc/source/ui/miscdlgs/instbdlg.src -../../sc/source/ui/pagedlg/pagedlg.src -../../sc/source/ui/pagedlg/tphf.src -../../sc/source/ui/pagedlg/hfedtdlg.src -../../sc/source/ui/docshell/tpstat.src -../../sc/source/core/src/compiler.src diff --git a/toolkit/src2xml/src-sd.lst b/toolkit/src2xml/src-sd.lst deleted file mode 100644 index 041f426a69e6..000000000000 --- a/toolkit/src2xml/src-sd.lst +++ /dev/null @@ -1,112 +0,0 @@ -../../sd/util/hidother.src -../../sd/source/ui/app/tbxids_tmpl.src -../../sd/source/ui/app/popup2_tmpl.src -../../sd/source/ui/app/popup.src -../../sd/source/ui/app/toolbox.src -../../sd/source/ui/app/sdstring.src -../../sd/source/ui/app/strings.src -../../sd/source/ui/app/menuids_tmpl.src -../../sd/source/ui/app/accel_tmpl.src -../../sd/source/ui/app/menuids3_tmpl.src -../../sd/source/ui/app/app.src -../../sd/source/ui/app/res_bmp.src -../../sd/source/ui/app/pseudo.src -../../sd/source/ui/app/toolbox2_tmpl.src -../../sd/source/ui/dlg/headerfooterdlg.src -../../sd/source/ui/dlg/dlgfield.src -../../sd/source/ui/dlg/sdobjpal.src -../../sd/source/ui/dlg/morphdlg.src -../../sd/source/ui/dlg/PaneDockingWindow.src -../../sd/source/ui/dlg/dlgsnap.src -../../sd/source/ui/dlg/tpoption.src -../../sd/source/ui/dlg/present.src -../../sd/source/ui/dlg/sdpreslt.src -../../sd/source/ui/dlg/dlgass.src -../../sd/source/ui/dlg/tpaction.src -../../sd/source/ui/dlg/prntopts.src -../../sd/source/ui/dlg/prltempl.src -../../sd/source/ui/dlg/custsdlg.src -../../sd/source/ui/dlg/inspagob.src -../../sd/source/ui/dlg/paragr.src -../../sd/source/ui/dlg/dlgpage.src -../../sd/source/ui/dlg/vectdlg.src -../../sd/source/ui/dlg/dlgolbul.src -../../sd/source/ui/dlg/copydlg.src -../../sd/source/ui/dlg/dlg_char.src -../../sd/source/ui/dlg/printdlg.src -../../sd/source/ui/dlg/ins_page.src -../../sd/source/ui/dlg/animobjs.src -../../sd/source/ui/dlg/ins_paste.src -../../sd/source/ui/dlg/tabtempl.src -../../sd/source/ui/dlg/LayerDialog.src -../../sd/source/ui/dlg/masterlayoutdlg.src -../../sd/source/ui/dlg/navigatr.src -../../sd/source/ui/dlg/brkdlg.src -../../sd/source/ui/slidesorter/shell/SlideSorterChildWindow.src -../../sd/source/ui/notes/NotesChildWindow.src -../../sd/source/ui/toolpanel/ToolPanelChildWindow.src -../../sd/source/ui/animations/CustomAnimationCreateDialog.src -../../sd/source/ui/animations/CustomAnimationDialog.src -../../sd/source/ui/animations/CustomAnimation.src -../../sd/source/ui/animations/CustomAnimationSchemesPane.src -../../sd/source/ui/animations/SlideTransitionPane.src -../../sd/source/ui/animations/AnimationSchemesPane.src -../../sd/source/ui/animations/CustomAnimationPane.src -../../sd/source/ui/accessibility/accessibility.src -../../sd/source/ui/slideshow/slideshow.src -../../sd/source/core/glob.src -../../sd/source/filter/html/pubdlg.src -../../sd/unxlngi6.pro/inc/menuids3.src -../../sd/unxlngi6.pro/inc/popup2.src -../../sd/unxlngi6.pro/inc/toolbox2.src -../../sd/unxlngi6.pro/inc/accel.src -../../sd/unxlngi6.pro/inc/menuids.src -../../sd/unxlngi6.pro/inc/tbxids.src -../../sd/unxlngi6.pro/misc/app/popup.src -../../sd/unxlngi6.pro/misc/app/toolbox.src -../../sd/unxlngi6.pro/misc/app/sdstring.src -../../sd/unxlngi6.pro/misc/app/strings.src -../../sd/unxlngi6.pro/misc/app/app.src -../../sd/unxlngi6.pro/misc/app/res_bmp.src -../../sd/unxlngi6.pro/misc/app/pseudo.src -../../sd/unxlngi6.pro/misc/dlg/headerfooterdlg.src -../../sd/unxlngi6.pro/misc/dlg/dlgfield.src -../../sd/unxlngi6.pro/misc/dlg/morphdlg.src -../../sd/unxlngi6.pro/misc/dlg/PaneDockingWindow.src -../../sd/unxlngi6.pro/misc/dlg/dlgsnap.src -../../sd/unxlngi6.pro/misc/dlg/tpoption.src -../../sd/unxlngi6.pro/misc/dlg/present.src -../../sd/unxlngi6.pro/misc/dlg/sdpreslt.src -../../sd/unxlngi6.pro/misc/dlg/dlgass.src -../../sd/unxlngi6.pro/misc/dlg/tpaction.src -../../sd/unxlngi6.pro/misc/dlg/prntopts.src -../../sd/unxlngi6.pro/misc/dlg/prltempl.src -../../sd/unxlngi6.pro/misc/dlg/custsdlg.src -../../sd/unxlngi6.pro/misc/dlg/inspagob.src -../../sd/unxlngi6.pro/misc/dlg/paragr.src -../../sd/unxlngi6.pro/misc/dlg/dlgpage.src -../../sd/unxlngi6.pro/misc/dlg/vectdlg.src -../../sd/unxlngi6.pro/misc/dlg/dlgolbul.src -../../sd/unxlngi6.pro/misc/dlg/copydlg.src -../../sd/unxlngi6.pro/misc/dlg/dlg_char.src -../../sd/unxlngi6.pro/misc/dlg/printdlg.src -../../sd/unxlngi6.pro/misc/dlg/ins_page.src -../../sd/unxlngi6.pro/misc/dlg/animobjs.src -../../sd/unxlngi6.pro/misc/dlg/ins_paste.src -../../sd/unxlngi6.pro/misc/dlg/tabtempl.src -../../sd/unxlngi6.pro/misc/dlg/LayerDialog.src -../../sd/unxlngi6.pro/misc/dlg/masterlayoutdlg.src -../../sd/unxlngi6.pro/misc/dlg/navigatr.src -../../sd/unxlngi6.pro/misc/dlg/brkdlg.src -../../sd/unxlngi6.pro/misc/core/glob.src -../../sd/unxlngi6.pro/misc/html/pubdlg.src -../../sd/unxlngi6.pro/misc/notes/NotesChildWindow.src -../../sd/unxlngi6.pro/misc/accessibility/accessibility.src -../../sd/unxlngi6.pro/misc/animui/CustomAnimationCreateDialog.src -../../sd/unxlngi6.pro/misc/animui/CustomAnimationDialog.src -../../sd/unxlngi6.pro/misc/animui/CustomAnimation.src -../../sd/unxlngi6.pro/misc/animui/CustomAnimationSchemesPane.src -../../sd/unxlngi6.pro/misc/animui/SlideTransitionPane.src -../../sd/unxlngi6.pro/misc/animui/AnimationSchemesPane.src -../../sd/unxlngi6.pro/misc/animui/CustomAnimationPane.src -../../sd/unxlngi6.pro/misc/slideshow/slideshow.src diff --git a/toolkit/src2xml/src-sw.lst b/toolkit/src2xml/src-sw.lst deleted file mode 100644 index 9e8c875fdb1a..000000000000 --- a/toolkit/src2xml/src-sw.lst +++ /dev/null @@ -1,119 +0,0 @@ -../../sw/sdi/swslots.src -../../sw/util/hidother.src -../../sw/source/ui/app/mn.src -../../sw/source/ui/app/app.src -../../sw/source/ui/app/error.src -../../sw/source/ui/web/web.src -../../sw/source/ui/dbui/addresslistdialog.src -../../sw/source/ui/dbui/customizeaddresslistdialog.src -../../sw/source/ui/dbui/mailmergewizard.src -../../sw/source/ui/dbui/mmlayoutpage.src -../../sw/source/ui/dbui/dbui.src -../../sw/source/ui/dbui/createaddresslistdialog.src -../../sw/source/ui/dbui/mmoutputpage.src -../../sw/source/ui/dbui/dbtablepreviewdialog.src -../../sw/source/ui/dbui/mmmergepage.src -../../sw/source/ui/dbui/dbinsdlg.src -../../sw/source/ui/dbui/selectdbtabledialog.src -../../sw/source/ui/dbui/mmoutputtypepage.src -../../sw/source/ui/dbui/mailmergechildwindow.src -../../sw/source/ui/dbui/mmpreparemergepage.src -../../sw/source/ui/dbui/mmdocselectpage.src -../../sw/source/ui/dbui/mmgreetingspage.src -../../sw/source/ui/dbui/mmaddressblockpage.src -../../sw/source/ui/misc/linenum.src -../../sw/source/ui/misc/outline.src -../../sw/source/ui/misc/glosbib.src -../../sw/source/ui/misc/pgfnote.src -../../sw/source/ui/misc/redlndlg.src -../../sw/source/ui/misc/glossary.src -../../sw/source/ui/misc/numberingtypelistbox.src -../../sw/source/ui/misc/autocorr.src -../../sw/source/ui/misc/insfnote.src -../../sw/source/ui/misc/srtdlg.src -../../sw/source/ui/misc/num.src -../../sw/source/ui/misc/pggrid.src -../../sw/source/ui/misc/bookmark.src -../../sw/source/ui/misc/docfnote.src -../../sw/source/ui/misc/insrule.src -../../sw/source/ui/docvw/docvw.src -../../sw/source/ui/docvw/access.src -../../sw/source/ui/fldui/javaedit.src -../../sw/source/ui/fldui/fldref.src -../../sw/source/ui/fldui/fldtdlg.src -../../sw/source/ui/fldui/fldfunc.src -../../sw/source/ui/fldui/flddok.src -../../sw/source/ui/fldui/flddinf.src -../../sw/source/ui/fldui/inpdlg.src -../../sw/source/ui/fldui/flddb.src -../../sw/source/ui/fldui/changedb.src -../../sw/source/ui/fldui/fldvar.src -../../sw/source/ui/fldui/DropDownFieldDialog.src -../../sw/source/ui/fldui/fldui.src -../../sw/source/ui/fmtui/tmpdlg.src -../../sw/source/ui/index/cnttab.src -../../sw/source/ui/index/multmrk.src -../../sw/source/ui/index/idxmrk.src -../../sw/source/ui/lingu/olmenu.src -../../sw/source/ui/table/colwd.src -../../sw/source/ui/table/rowht.src -../../sw/source/ui/table/tautofmt.src -../../sw/source/ui/table/splittbl.src -../../sw/source/ui/table/chartins.src -../../sw/source/ui/table/tabledlg.src -../../sw/source/ui/table/split.src -../../sw/source/ui/table/convert.src -../../sw/source/ui/table/insrc.src -../../sw/source/ui/table/table.src -../../sw/source/ui/table/mergetbl.src -../../sw/source/ui/table/instable.src -../../sw/source/ui/utlui/utlui.src -../../sw/source/ui/utlui/initui.src -../../sw/source/ui/utlui/navipi.src -../../sw/source/ui/utlui/attrdesc.src -../../sw/source/ui/utlui/gloslst.src -../../sw/source/ui/utlui/poolfmt.src -../../sw/source/ui/utlui/unotools.src -../../sw/source/ui/wrtsh/wrtsh.src -../../sw/source/ui/chrdlg/chardlg.src -../../sw/source/ui/chrdlg/swbreak.src -../../sw/source/ui/chrdlg/ccoll.src -../../sw/source/ui/chrdlg/paradlg.src -../../sw/source/ui/chrdlg/drpcps.src -../../sw/source/ui/chrdlg/chrdlg.src -../../sw/source/ui/chrdlg/numpara.src -../../sw/source/ui/config/mailconfigpage.src -../../sw/source/ui/config/optcomp.src -../../sw/source/ui/config/optdlg.src -../../sw/source/ui/config/optload.src -../../sw/source/ui/config/redlopt.src -../../sw/source/ui/dialog/abstract.src -../../sw/source/ui/dialog/docstdlg.src -../../sw/source/ui/dialog/ascfldlg.src -../../sw/source/ui/dialog/dialog.src -../../sw/source/ui/dialog/regionsw.src -../../sw/source/ui/dialog/wordcountdialog.src -../../sw/source/ui/dochdl/dochdl.src -../../sw/source/ui/dochdl/selglos.src -../../sw/source/ui/envelp/mailmrge.src -../../sw/source/ui/envelp/envelp.src -../../sw/source/ui/envelp/labprt.src -../../sw/source/ui/envelp/envlop.src -../../sw/source/ui/envelp/label.src -../../sw/source/ui/envelp/envfmt.src -../../sw/source/ui/envelp/labfmt.src -../../sw/source/ui/envelp/envprt.src -../../sw/source/ui/smartmenu/stmenu.src -../../sw/source/ui/frmdlg/frmpage.src -../../sw/source/ui/frmdlg/cption.src -../../sw/source/ui/frmdlg/column.src -../../sw/source/ui/frmdlg/wrap.src -../../sw/source/ui/frmdlg/frmui.src -../../sw/source/ui/globdoc/globdoc.src -../../sw/source/ui/ribbar/tbxanchr.src -../../sw/source/ui/ribbar/workctrl.src -../../sw/source/ui/ribbar/inputwin.src -../../sw/source/ui/shells/shells.src -../../sw/source/ui/uiview/pview.src -../../sw/source/ui/uiview/view.src -../../sw/source/core/undo/undo.src diff --git a/toolkit/src2xml/src.lst b/toolkit/src2xml/src.lst deleted file mode 100644 index fdfe91f8b2be..000000000000 --- a/toolkit/src2xml/src.lst +++ /dev/null @@ -1,665 +0,0 @@ -../../sc/util/hidother.src -../../sc/addin/datefunc/dfa.src -../../sc/addin/rot13/rot13.src -../../sc/source/ui/src/crnrdlg.src -../../sc/source/ui/src/hdrcont.src -../../sc/source/ui/src/solvrdlg.src -../../sc/source/ui/src/miscdlgs.src -../../sc/source/ui/src/tabopdlg.src -../../sc/source/ui/src/popup.src -../../sc/source/ui/src/autofmt.src -../../sc/source/ui/src/toolbox.src -../../sc/source/ui/src/opredlin.src -../../sc/source/ui/src/namedlg.src -../../sc/source/ui/src/sortdlg.src -../../sc/source/ui/src/textdlgs.src -../../sc/source/ui/src/optdlg.src -../../sc/source/ui/src/scwarngs.src -../../sc/source/ui/src/scfuncs.src -../../sc/source/ui/src/filter.src -../../sc/source/ui/src/simpref.src -../../sc/source/ui/src/attrdlg.src -../../sc/source/ui/src/sc.src -../../sc/source/ui/src/globstr.src -../../sc/source/ui/src/scstring.src -../../sc/source/ui/src/dbnamdlg.src -../../sc/source/ui/src/subtdlg.src -../../sc/source/ui/src/pseudo.src -../../sc/source/ui/src/condfrmt.src -../../sc/source/ui/src/scerrors.src -../../sc/source/ui/dbgui/outline.src -../../sc/source/ui/dbgui/pvfundlg.src -../../sc/source/ui/dbgui/scendlg.src -../../sc/source/ui/dbgui/pivot.src -../../sc/source/ui/dbgui/dpgroupdlg.src -../../sc/source/ui/dbgui/dapitype.src -../../sc/source/ui/dbgui/imoptdlg.src -../../sc/source/ui/dbgui/consdlg.src -../../sc/source/ui/dbgui/validate.src -../../sc/source/ui/dbgui/asciiopt.src -../../sc/source/ui/drawfunc/objdraw.src -../../sc/source/ui/drawfunc/drformsh.src -../../sc/source/ui/styleui/scstyles.src -../../sc/source/ui/styleui/styledlg.src -../../sc/source/ui/formdlg/parawin.src -../../sc/source/ui/formdlg/dwfunctr.src -../../sc/source/ui/formdlg/formdlgs.src -../../sc/source/ui/navipi/navipi.src -../../sc/source/ui/miscdlgs/acredlin.src -../../sc/source/ui/miscdlgs/highred.src -../../sc/source/ui/miscdlgs/linkarea.src -../../sc/source/ui/miscdlgs/instbdlg.src -../../sc/source/ui/pagedlg/pagedlg.src -../../sc/source/ui/pagedlg/tphf.src -../../sc/source/ui/pagedlg/hfedtdlg.src -../../sc/source/ui/docshell/tpstat.src -../../sc/source/core/src/compiler.src -../../sd/util/hidother.src -../../sd/source/ui/app/tbxids_tmpl.src -../../sd/source/ui/app/popup2_tmpl.src -../../sd/source/ui/app/popup.src -../../sd/source/ui/app/toolbox.src -../../sd/source/ui/app/sdstring.src -../../sd/source/ui/app/strings.src -../../sd/source/ui/app/menuids_tmpl.src -../../sd/source/ui/app/accel_tmpl.src -../../sd/source/ui/app/menuids3_tmpl.src -../../sd/source/ui/app/app.src -../../sd/source/ui/app/res_bmp.src -../../sd/source/ui/app/pseudo.src -../../sd/source/ui/app/toolbox2_tmpl.src -../../sd/source/ui/dlg/headerfooterdlg.src -../../sd/source/ui/dlg/dlgfield.src -../../sd/source/ui/dlg/sdobjpal.src -../../sd/source/ui/dlg/morphdlg.src -../../sd/source/ui/dlg/PaneDockingWindow.src -../../sd/source/ui/dlg/dlgsnap.src -../../sd/source/ui/dlg/tpoption.src -../../sd/source/ui/dlg/present.src -../../sd/source/ui/dlg/sdpreslt.src -../../sd/source/ui/dlg/dlgass.src -../../sd/source/ui/dlg/tpaction.src -../../sd/source/ui/dlg/prntopts.src -../../sd/source/ui/dlg/prltempl.src -../../sd/source/ui/dlg/custsdlg.src -../../sd/source/ui/dlg/inspagob.src -../../sd/source/ui/dlg/paragr.src -../../sd/source/ui/dlg/dlgpage.src -../../sd/source/ui/dlg/vectdlg.src -../../sd/source/ui/dlg/dlgolbul.src -../../sd/source/ui/dlg/copydlg.src -../../sd/source/ui/dlg/dlg_char.src -../../sd/source/ui/dlg/printdlg.src -../../sd/source/ui/dlg/animobjs.src -../../sd/source/ui/dlg/ins_paste.src -../../sd/source/ui/dlg/tabtempl.src -../../sd/source/ui/dlg/LayerDialog.src -../../sd/source/ui/dlg/masterlayoutdlg.src -../../sd/source/ui/dlg/navigatr.src -../../sd/source/ui/dlg/brkdlg.src -../../sd/source/ui/slidesorter/shell/SlideSorterChildWindow.src -../../sd/source/ui/notes/NotesChildWindow.src -../../sd/source/ui/toolpanel/ToolPanelChildWindow.src -../../sd/source/ui/animations/CustomAnimationCreateDialog.src -../../sd/source/ui/animations/CustomAnimationDialog.src -../../sd/source/ui/animations/CustomAnimation.src -../../sd/source/ui/animations/CustomAnimationSchemesPane.src -../../sd/source/ui/animations/SlideTransitionPane.src -../../sd/source/ui/animations/AnimationSchemesPane.src -../../sd/source/ui/animations/CustomAnimationPane.src -../../sd/source/ui/accessibility/accessibility.src -../../sd/source/ui/slideshow/slideshow.src -../../sd/source/core/glob.src -../../sd/source/filter/html/pubdlg.src -../../sw/sdi/swslots.src -../../sw/util/hidother.src -../../sw/source/ui/app/mn.src -../../sw/source/ui/app/app.src -../../sw/source/ui/app/error.src -../../sw/source/ui/web/web.src -../../sw/source/ui/dbui/addresslistdialog.src -../../sw/source/ui/dbui/customizeaddresslistdialog.src -../../sw/source/ui/dbui/mailmergewizard.src -../../sw/source/ui/dbui/mmlayoutpage.src -../../sw/source/ui/dbui/dbui.src -../../sw/source/ui/dbui/createaddresslistdialog.src -../../sw/source/ui/dbui/mmoutputpage.src -../../sw/source/ui/dbui/dbtablepreviewdialog.src -../../sw/source/ui/dbui/mmmergepage.src -../../sw/source/ui/dbui/dbinsdlg.src -../../sw/source/ui/dbui/selectdbtabledialog.src -../../sw/source/ui/dbui/mmoutputtypepage.src -../../sw/source/ui/dbui/mailmergechildwindow.src -../../sw/source/ui/dbui/mmpreparemergepage.src -../../sw/source/ui/dbui/mmdocselectpage.src -../../sw/source/ui/dbui/mmgreetingspage.src -../../sw/source/ui/dbui/mmaddressblockpage.src -../../sw/source/ui/misc/linenum.src -../../sw/source/ui/misc/outline.src -../../sw/source/ui/misc/glosbib.src -../../sw/source/ui/misc/pgfnote.src -../../sw/source/ui/misc/redlndlg.src -../../sw/source/ui/misc/glossary.src -../../sw/source/ui/misc/numberingtypelistbox.src -../../sw/source/ui/misc/autocorr.src -../../sw/source/ui/misc/insfnote.src -../../sw/source/ui/misc/srtdlg.src -../../sw/source/ui/misc/num.src -../../sw/source/ui/misc/pggrid.src -../../sw/source/ui/misc/bookmark.src -../../sw/source/ui/misc/docfnote.src -../../sw/source/ui/misc/insrule.src -../../sw/source/ui/docvw/docvw.src -../../sw/source/ui/docvw/access.src -../../sw/source/ui/fldui/javaedit.src -../../sw/source/ui/fldui/fldref.src -../../sw/source/ui/fldui/fldtdlg.src -../../sw/source/ui/fldui/fldfunc.src -../../sw/source/ui/fldui/flddok.src -../../sw/source/ui/fldui/flddinf.src -../../sw/source/ui/fldui/inpdlg.src -../../sw/source/ui/fldui/flddb.src -../../sw/source/ui/fldui/changedb.src -../../sw/source/ui/fldui/fldvar.src -../../sw/source/ui/fldui/DropDownFieldDialog.src -../../sw/source/ui/fldui/fldui.src -../../sw/source/ui/fmtui/tmpdlg.src -../../sw/source/ui/index/cnttab.src -../../sw/source/ui/index/multmrk.src -../../sw/source/ui/index/idxmrk.src -../../sw/source/ui/lingu/olmenu.src -../../sw/source/ui/table/colwd.src -../../sw/source/ui/table/rowht.src -../../sw/source/ui/table/tautofmt.src -../../sw/source/ui/table/splittbl.src -../../sw/source/ui/table/chartins.src -../../sw/source/ui/table/tabledlg.src -../../sw/source/ui/table/split.src -../../sw/source/ui/table/convert.src -../../sw/source/ui/table/insrc.src -../../sw/source/ui/table/table.src -../../sw/source/ui/table/mergetbl.src -../../sw/source/ui/table/instable.src -../../sw/source/ui/utlui/utlui.src -../../sw/source/ui/utlui/initui.src -../../sw/source/ui/utlui/navipi.src -../../sw/source/ui/utlui/attrdesc.src -../../sw/source/ui/utlui/gloslst.src -../../sw/source/ui/utlui/poolfmt.src -../../sw/source/ui/utlui/unotools.src -../../sw/source/ui/wrtsh/wrtsh.src -../../sw/source/ui/chrdlg/chardlg.src -../../sw/source/ui/chrdlg/swbreak.src -../../sw/source/ui/chrdlg/ccoll.src -../../sw/source/ui/chrdlg/paradlg.src -../../sw/source/ui/chrdlg/drpcps.src -../../sw/source/ui/chrdlg/chrdlg.src -../../sw/source/ui/chrdlg/numpara.src -../../sw/source/ui/config/mailconfigpage.src -../../sw/source/ui/config/optcomp.src -../../sw/source/ui/config/optdlg.src -../../sw/source/ui/config/optload.src -../../sw/source/ui/config/redlopt.src -../../sw/source/ui/dialog/abstract.src -../../sw/source/ui/dialog/docstdlg.src -../../sw/source/ui/dialog/ascfldlg.src -../../sw/source/ui/dialog/dialog.src -../../sw/source/ui/dialog/regionsw.src -../../sw/source/ui/dialog/wordcountdialog.src -../../sw/source/ui/dochdl/dochdl.src -../../sw/source/ui/dochdl/selglos.src -../../sw/source/ui/envelp/mailmrge.src -../../sw/source/ui/envelp/envelp.src -../../sw/source/ui/envelp/labprt.src -../../sw/source/ui/envelp/envlop.src -../../sw/source/ui/envelp/label.src -../../sw/source/ui/envelp/envfmt.src -../../sw/source/ui/envelp/labfmt.src -../../sw/source/ui/envelp/envprt.src -../../sw/source/ui/smartmenu/stmenu.src -../../sw/source/ui/frmdlg/frmpage.src -../../sw/source/ui/frmdlg/cption.src -../../sw/source/ui/frmdlg/column.src -../../sw/source/ui/frmdlg/wrap.src -../../sw/source/ui/frmdlg/frmui.src -../../sw/source/ui/globdoc/globdoc.src -../../sw/source/ui/ribbar/tbxanchr.src -../../sw/source/ui/ribbar/workctrl.src -../../sw/source/ui/ribbar/inputwin.src -../../sw/source/ui/shells/shells.src -../../sw/source/ui/uiview/pview.src -../../sw/source/ui/uiview/view.src -../../sw/source/core/undo/undo.src -../../sch/util/hidother.src -../../sch/source/ui/app/res_hc_bmp.src -../../sch/source/ui/app/menu_tmpl.src -../../sch/source/ui/app/strings.src -../../sch/source/ui/app/menuids_tmpl.src -../../sch/source/ui/app/app.src -../../sch/source/ui/app/res_bmp.src -../../sch/source/ui/dlg/axisgrid.src -../../sch/source/ui/dlg/attrib2.src -../../sch/source/ui/dlg/attrib3.src -../../sch/source/ui/dlg/attrib4.src -../../sch/source/ui/dlg/tpappopt.src -../../sch/source/ui/dlg/tplabel.src -../../sch/source/ui/dlg/attrib.src -../../sch/source/ui/dlg/title.src -../../sch/source/ui/dlg/lightdlg.src -../../sch/source/ui/dlg/viewdlg.src -../../sch/source/ui/dlg/dgrdata.src -../../sch/source/ui/dlg/dlggraut.src -../../sch/source/ui/dlg/tpscaley.src -../../sch/source/ui/dlg/datdescr.src -../../sch/source/ui/dlg/legend.src -../../sch/source/ui/dlg/diagrtyp.src -../../sch/source/ui/dlg/datstat.src -../../sch/source/core/glob.src -../../so3/src/svuidlg.src -../../so3/src/formats.src -../../so3/src/nocode.src -../../so3/util/hidother.src -../../so3/workben/ddetest/ddetest.src -../../so3/workben/paintdlg.src -../../so3/workben/svser.src -../../so3/workben/paint.src -../../svx/util/hidother.src -../../svx/source/src/app.src -../../svx/source/form/fmstring.src -../../svx/source/form/filtnav.src -../../svx/source/form/fmexpl.src -../../svx/source/form/fmsearch.src -../../svx/source/form/tbxform.src -../../svx/source/form/formshell.src -../../svx/source/form/datanavi.src -../../svx/source/intro/ooo.src -../../svx/source/intro/iso.src -../../svx/source/items/svxitems.src -../../svx/source/items/svxerr.src -../../svx/source/editeng/editeng.src -../../svx/source/accessibility/accessibility.src -../../svx/source/mnuctrls/mnuctrls.src -../../svx/source/engine3d/float3d.src -../../svx/source/engine3d/string3d.src -../../svx/source/dialog/textanim.src -../../svx/source/dialog/hyperdlg.src -../../svx/source/dialog/textattr.src -../../svx/source/dialog/tabarea.src -../../svx/source/dialog/rubydialog.src -../../svx/source/dialog/frmdirlbox.src -../../svx/source/dialog/chardlg.src -../../svx/source/dialog/numfmt.src -../../svx/source/dialog/doclinkdialog.src -../../svx/source/dialog/treeopt.src -../../svx/source/dialog/page.src -../../svx/source/dialog/opthtml.src -../../svx/source/dialog/frmsel.src -../../svx/source/dialog/ruler.src -../../svx/source/dialog/optgdlg.src -../../svx/source/dialog/fontwork.src -../../svx/source/dialog/backgrnd.src -../../svx/source/dialog/SpellDialog.src -../../svx/source/dialog/labdlg.src -../../svx/source/dialog/charmap.src -../../svx/source/dialog/zoom.src -../../svx/source/dialog/border.src -../../svx/source/dialog/svuidlg.src -../../svx/source/dialog/impgrf.src -../../svx/source/dialog/dlgname.src -../../svx/source/dialog/test.src -../../svx/source/dialog/selector.src -../../svx/source/dialog/optupdt.src -../../svx/source/dialog/numpages.src -../../svx/source/dialog/thesdlg.src -../../svx/source/dialog/tabline.src -../../svx/source/dialog/srchdlg.src -../../svx/source/dialog/contdlg.src -../../svx/source/dialog/paragrph.src -../../svx/source/dialog/commonlingui.src -../../svx/source/dialog/sdstring.src -../../svx/source/dialog/optmemory.src -../../svx/source/dialog/grfflt.src -../../svx/source/dialog/langbox.src -../../svx/source/dialog/bbdlg.src -../../svx/source/dialog/hangulhanjadlg.src -../../svx/source/dialog/txenctab.src -../../svx/source/dialog/connpooloptions.src -../../svx/source/dialog/dbregister.src -../../svx/source/dialog/macropg.src -../../svx/source/dialog/fontsubs.src -../../svx/source/dialog/align.src -../../svx/source/dialog/imapdlg.src -../../svx/source/dialog/dlgctrl.src -../../svx/source/dialog/tabstpge.src -../../svx/source/dialog/readonlyimage.src -../../svx/source/dialog/docrecovery.src -../../svx/source/dialog/hlmarkwn.src -../../svx/source/dialog/internationaloptions.src -../../svx/source/dialog/optjava.src -../../svx/source/dialog/language.src -../../svx/source/dialog/hdft.src -../../svx/source/dialog/lingu.src -../../svx/source/dialog/grfpage.src -../../svx/source/dialog/iconcdlg.src -../../svx/source/dialog/swframeposstrings.src -../../svx/source/dialog/connect.src -../../svx/source/dialog/bmpmask.src -../../svx/source/dialog/postdlg.src -../../svx/source/dialog/checklbx.src -../../svx/source/dialog/autocdlg.src -../../svx/source/dialog/measure.src -../../svx/source/dialog/cfg.src -../../svx/source/dialog/scriptdlg.src -../../svx/source/dialog/langtab.src -../../svx/source/dialog/srchxtra.src -../../svx/source/dialog/ctredlin.src -../../svx/source/dialog/passwd.src -../../svx/source/dialog/transfrm.src -../../svx/source/dialog/optfltr.src -../../svx/source/dialog/prtqry.src -../../svx/source/dialog/eventdlg.src -../../svx/source/dialog/hyphen.src -../../svx/source/dialog/swpossizetabpage.src -../../svx/source/dialog/dstribut.src -../../svx/source/svxlink/linkmgr.src -../../svx/source/fmcomp/gridctrl.src -../../svx/source/fmcomp/showcols.src -../../svx/source/outliner/outliner.src -../../svx/source/unodraw/unodraw.src -../../svx/source/svdraw/svdstr.src -../../svx/source/stbctrls/stbctrls.src -../../svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src -../../svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src -../../svx/source/toolbars/fontworkbar.src -../../svx/source/toolbars/extrusionbar.src -../../svx/source/options/optlingu.src -../../svx/source/options/optasian.src -../../svx/source/options/optdict.src -../../svx/source/options/optinet2.src -../../svx/source/options/optspell.src -../../svx/source/options/optsave.src -../../svx/source/options/optgrid.src -../../svx/source/options/multipat.src -../../svx/source/options/optcolor.src -../../svx/source/options/optpath.src -../../svx/source/options/optctl.src -../../svx/source/options/optaccessibility.src -../../svx/source/options/optjsearch.src -../../svx/source/options/optgenrl.src -../../svx/source/gallery2/gallery.src -../../svx/source/gallery2/galtheme.src -../../svx/source/tbxctrls/extrusioncontrols.src -../../svx/source/tbxctrls/tbcontrl.src -../../svx/source/tbxctrls/fontworkgallery.src -../../svx/source/tbxctrls/lboxctrl.src -../../svx/source/tbxctrls/linectrl.src -../../svx/source/tbxctrls/tbxdraw.src -../../svx/source/tbxctrls/grafctrl.src -../../svx/source/tbxctrls/colrctrl.src -../../vcl/source/src/menu.src -../../vcl/source/src/stdtext.src -../../vcl/source/src/images.src -../../vcl/source/src/helptext.src -../../vcl/source/src/btntext.src -../../vcl/source/src/units.src -../../uui/source/passworderrs.src -../../uui/source/logindlg.src -../../uui/source/passworddlg.src -../../uui/source/ids.src -../../uui/source/masterpassworddlg.src -../../uui/source/passcrtdlg.src -../../uui/source/cookiedg.src -../../uui/source/fltdlg.src -../../uui/source/masterpasscrtdlg.src -../../dbaccess/util/hidother.src -../../dbaccess/source/ui/app/app.src -../../dbaccess/source/ui/dlg/indexdialog.src -../../dbaccess/source/ui/dlg/RelationDlg.src -../../dbaccess/source/ui/dlg/queryfilter.src -../../dbaccess/source/ui/dlg/AdvancedPageDlg.src -../../dbaccess/source/ui/dlg/queryorder.src -../../dbaccess/source/ui/dlg/dbadmin.src -../../dbaccess/source/ui/dlg/dsselect.src -../../dbaccess/source/ui/dlg/paramdialog.src -../../dbaccess/source/ui/dlg/CollectionView.src -../../dbaccess/source/ui/dlg/sqlmessage.src -../../dbaccess/source/ui/dlg/UserAdmin.src -../../dbaccess/source/ui/dlg/ConnectionPage.src -../../dbaccess/source/ui/dlg/dlgattr.src -../../dbaccess/source/ui/dlg/AutoControls.src -../../dbaccess/source/ui/dlg/dlgsave.src -../../dbaccess/source/ui/dlg/UserAdminDlg.src -../../dbaccess/source/ui/dlg/directsql.src -../../dbaccess/source/ui/dlg/dlgsize.src -../../dbaccess/source/ui/dlg/AdabasStat.src -../../dbaccess/source/ui/dlg/dbfindex.src -../../dbaccess/source/ui/dlg/dbadminsetup.src -../../dbaccess/source/ui/dlg/AdabasStatDlg.src -../../dbaccess/source/ui/dlg/adtabdlg.src -../../dbaccess/source/ui/dlg/dbadmin2.src -../../dbaccess/source/ui/uno/dbinteraction.src -../../dbaccess/source/ui/misc/WizardPages.src -../../dbaccess/source/ui/misc/dbumiscres.src -../../dbaccess/source/ui/control/undosqledit.src -../../dbaccess/source/ui/control/TableGrantCtrl.src -../../dbaccess/source/ui/control/tabletree.src -../../dbaccess/source/ui/imagelists/dbimagelists.src -../../dbaccess/source/ui/relationdesign/relation.src -../../dbaccess/source/ui/tabledesign/table.src -../../dbaccess/source/ui/querydesign/querydlg.src -../../dbaccess/source/ui/querydesign/query.src -../../dbaccess/source/ui/browser/sbagrid.src -../../dbaccess/source/ui/browser/sbabrw.src -../../dbaccess/source/core/resource/strings.src -../../dbaccess/source/sdbtools/resource/sdbt_strings.src -../../sfx2/util/hidother.src -../../sfx2/source/doc/sfxbasemodel.src -../../sfx2/source/doc/doctempl.src -../../sfx2/source/doc/doc.src -../../sfx2/source/doc/secmacrowarnings.src -../../sfx2/source/doc/new.src -../../sfx2/source/doc/docvor.src -../../sfx2/source/doc/graphhelp.src -../../sfx2/source/doc/doctdlg.src -../../sfx2/source/appl/dde.src -../../sfx2/source/appl/newhelp.src -../../sfx2/source/appl/sfx.src -../../sfx2/source/appl/app.src -../../sfx2/source/menu/menu.src -../../sfx2/source/view/view.src -../../sfx2/source/bastyp/fltfnc.src -../../sfx2/source/bastyp/bastyp.src -../../sfx2/source/config/config.src -../../sfx2/source/dialog/recfloat.src -../../sfx2/source/dialog/templdlg.src -../../sfx2/source/dialog/newstyle.src -../../sfx2/source/dialog/dinfdlg.src -../../sfx2/source/dialog/alienwarn.src -../../sfx2/source/dialog/dinfedt.src -../../sfx2/source/dialog/printopt.src -../../sfx2/source/dialog/srchdlg.src -../../sfx2/source/dialog/mailwindow.src -../../sfx2/source/dialog/dialog.src -../../sfx2/source/dialog/macropg.src -../../sfx2/source/dialog/versdlg.src -../../sfx2/source/dialog/mgetempl.src -../../sfx2/source/dialog/filedlghelper.src -../../sfx2/source/dialog/cfg.src -../../sfx2/source/dialog/passwd.src -../../framework/util/hidother.src -../../framework/source/classes/resource.src -../../desktop/util/hidother.src -../../desktop/source/app/desktop.src -../../desktop/source/deployment/gui/dp_gui_dependencydialog.src -../../desktop/source/deployment/gui/dp_gui_backend.src -../../desktop/source/deployment/gui/dp_gui_versionboxes.src -../../desktop/source/deployment/gui/dp_gui_updatedialog.src -../../desktop/source/deployment/gui/dp_gui_updateinstalldialog.src -../../desktop/source/deployment/gui/dp_gui_dialog.src -../../desktop/source/deployment/misc/dp_misc.src -../../desktop/source/deployment/manager/dp_manager.src -../../desktop/source/deployment/unopkg/unopkg.src -../../desktop/source/deployment/registry/sfwk/dp_sfwk.src -../../desktop/source/deployment/registry/component/dp_component.src -../../desktop/source/deployment/registry/dp_registry.src -../../desktop/source/deployment/registry/configuration/dp_configuration.src -../../desktop/source/deployment/registry/script/dp_script.src -../../desktop/source/deployment/registry/package/dp_package.src -../../desktop/source/migration/migration.src -../../desktop/source/migration/wizard.src -../../basic/source/app/basic.src -../../basic/source/app/ttmsg.src -../../basic/source/app/svtmsg.src -../../basic/source/app/testtool.src -../../basic/source/app/basmsg.src -../../basic/source/sbx/format.src -../../basic/source/classes/sb.src -../../forms/source/resource/xforms.src -../../forms/source/resource/strings.src -../../scaddins/source/datefunc/datefunc.src -../../scaddins/source/analysis/analysis_deffuncnames.src -../../scaddins/source/analysis/analysis.src -../../scaddins/source/analysis/analysis_funcnames.src -../../basctl/util/hidother.src -../../basctl/source/dlged/dlgresid.src -../../basctl/source/dlged/managelang.src -../../basctl/source/basicide/tbxctl.src -../../basctl/source/basicide/moptions.src -../../basctl/source/basicide/macrodlg.src -../../basctl/source/basicide/objdlg.src -../../basctl/source/basicide/basidesh.src -../../basctl/source/basicide/moduldlg.src -../../basctl/source/basicide/brkdlg.src -../../chart2/source/controller/menu/ContextMenu.src -../../chart2/source/controller/menu/MainMenu.src -../../chart2/source/controller/dialogs/tp_DataLabel.src -../../chart2/source/controller/dialogs/Strings_ChartTypes.src -../../chart2/source/controller/dialogs/dlg_InsertTitle.src -../../chart2/source/controller/dialogs/Strings.src -../../chart2/source/controller/dialogs/tp_SeriesStatistic.src -../../chart2/source/controller/dialogs/dlg_InsertDataLabel.src -../../chart2/source/controller/dialogs/Strings_Statistic.src -../../chart2/source/controller/dialogs/dlg_InsertLegend.src -../../chart2/source/controller/dialogs/dlg_RotateDiagram.src -../../chart2/source/controller/dialogs/tp_PointGeometry.src -../../chart2/source/controller/dialogs/dlg_ObjectProperties.src -../../chart2/source/controller/dialogs/tp_TitleRotation.src -../../chart2/source/controller/dialogs/dlg_ChartType.src -../../chart2/source/controller/dialogs/Bitmaps.src -../../chart2/source/controller/dialogs/dlg_InsertStatistic.src -../../chart2/source/controller/dialogs/Strings_Scale.src -../../chart2/source/controller/dialogs/tp_LegendPosition.src -../../chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src -../../chart2/source/controller/dialogs/tp_AxisLabel.src -../../chart2/source/controller/dialogs/tp_SeriesToAxis.src -../../chart2/source/controller/dialogs/tp_Scale.src -../../scsolver/source/ui/scsolver.src -../../automation/source/miniapp/servres.src -../../svtools/util/hidother.src -../../svtools/bmpmaker/bmp.src -../../svtools/source/uno/unoifac2.src -../../svtools/source/java/javaerror.src -../../svtools/source/java/patchjavaerror.src -../../svtools/source/misc/imagemgr.src -../../svtools/source/misc/iniman.src -../../svtools/source/misc/config.src -../../svtools/source/misc/errtxt.src -../../svtools/source/misc/ehdl.src -../../svtools/source/misc/helpagent.src -../../svtools/source/control/ctrlbox.src -../../svtools/source/control/ctrltool.src -../../svtools/source/control/calendar.src -../../svtools/source/control/filectrl.src -../../svtools/source/dialogs/colrdlg.src -../../svtools/source/dialogs/addresstemplate.src -../../svtools/source/dialogs/prnsetup.src -../../svtools/source/dialogs/formats.src -../../svtools/source/dialogs/filedlg2.src -../../svtools/source/dialogs/so3res.src -../../svtools/source/dialogs/printdlg.src -../../svtools/source/dialogs/logindlg.src -../../svtools/source/dialogs/wizardmachine.src -../../svtools/source/misc1/mediatyp.src -../../svtools/source/brwbox/editbrowsebox.src -../../svtools/source/contnr/fileview.src -../../svtools/source/contnr/svcontnr.src -../../svtools/source/contnr/templwin.src -../../svtools/source/items1/cstitem.src -../../svtools/source/filter.vcl/filter/dlgepng.src -../../svtools/source/filter.vcl/filter/dlgexpor.src -../../svtools/source/filter.vcl/filter/dlgejpg.src -../../svtools/source/filter.vcl/filter/strings.src -../../svtools/source/Accessibility/accessiblelistboxentry.src -../../svtools/source/plugapp/commtest.src -../../svtools/source/plugapp/testtool.src -../../fpicker/source/office/OfficeFilePicker.src -../../fpicker/source/office/iodlg.src -../../filter/source/pdf/impdialog.src -../../filter/source/pdf/pdf.src -../../filter/source/t602/t602filter.src -../../filter/source/flash/impswfdialog.src -../../filter/source/xsltdialog/xmlfiltertabdialog.src -../../filter/source/xsltdialog/xmlfiltersettingsdialog.src -../../filter/source/xsltdialog/xmlfileview.src -../../filter/source/xsltdialog/xmlfilterdialogstrings.src -../../filter/source/xsltdialog/hidother.src -../../filter/source/xsltdialog/xmlfiltertabpagexslt.src -../../filter/source/xsltdialog/xmlfiltertestdialog.src -../../filter/source/xsltdialog/xmlfiltertabpagebasic.src -../../toolkit/source/awt/accessiblestrings.src -../../toolkit/source/awt/xthrobber.src -../../xmlsecurity/source/dialogs/warnings.src -../../xmlsecurity/source/dialogs/macrosecurity.src -../../xmlsecurity/source/dialogs/certificatechooser.src -../../xmlsecurity/source/dialogs/digitalsignaturesdialog.src -../../xmlsecurity/source/dialogs/certificateviewer.src -../../xmlsecurity/source/component/warnbox.src -../../padmin/source/rtsetup.src -../../padmin/source/padialog.src -../../ucbhelper/workben/ucbexplorer/ucbexplorer.src -../../starmath/util/hidother.src -../../starmath/source/commands.src -../../starmath/source/symbol.src -../../starmath/source/menu_tmpl.src -../../starmath/source/smres.src -../../extensions/qa/complex/extensions/orl_de.src -../../extensions/qa/complex/extensions/orl_en-US.src -../../extensions/util/hidother.src -../../extensions/source/bibliography/menu.src -../../extensions/source/bibliography/toolbar.src -../../extensions/source/bibliography/datman.src -../../extensions/source/bibliography/sections.src -../../extensions/source/bibliography/hidother.src -../../extensions/source/bibliography/bib.src -../../extensions/source/scanner/grid.src -../../extensions/source/scanner/sanedlg.src -../../extensions/source/dbpilots/dbpilots.src -../../extensions/source/dbpilots/gridpages.src -../../extensions/source/dbpilots/listcombopages.src -../../extensions/source/dbpilots/groupboxpages.src -../../extensions/source/dbpilots/commonpagesdbp.src -../../extensions/source/abpilot/abspilot.src -../../extensions/source/update/ui/updatecheckui.src -../../extensions/source/propctrlr/taborder.src -../../extensions/source/propctrlr/listselectiondlg.src -../../extensions/source/propctrlr/formlinkdialog.src -../../extensions/source/propctrlr/fontdialog.src -../../extensions/source/propctrlr/selectlabeldialog.src -../../extensions/source/propctrlr/pcrmiscres.src -../../extensions/source/propctrlr/formres.src -../../extensions/source/propctrlr/newdatatype.src -../../extensions/source/propctrlr/propres.src -../../extensions/source/preload/preload.src -../../extensions/workben/testresource.src -../../avmedia/util/hidother.src -../../avmedia/source/framework/mediacontrol.src -../../avmedia/source/viewer/mediawindow.src -../../connectivity/source/resource/conn_shared_res.src -../../connectivity/source/drivers/hsqldb/hsqlui.src -../../scripting/source/runtimemgr/ScriptExecDialog.src -../../wizards/util/hidother.src -../../wizards/source/euro/euro.src -../../wizards/source/imagelists/imagelists.src -../../wizards/source/template/template.src -../../wizards/source/importwizard/importwi.src -../../wizards/source/formwizard/dbwizres.src diff --git a/toolkit/src2xml/sw.sh b/toolkit/src2xml/sw.sh deleted file mode 100644 index 22f16d4b6c57..000000000000 --- a/toolkit/src2xml/sw.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/bash - -source/src2xml.py --include-path=$(tr '\n' ':' < include-sw.lst) --dry-run $(cat src-sw.lst) "$@" From c4008ef54630b560792aa288437db1179ad96095 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Tue, 2 Oct 2012 14:13:40 +0100 Subject: [PATCH 242/863] re-base on ALv2 code. Includes: tkr41: #117828# office crash fixed . (null pointer) + add unit test Patch contributed by Tobias Krause http://svn.apache.org/viewvc?view=revision&revision=1172105 Do not add targets for junit tests when junit is disabled. Patch contributed by Andre Fischer http://svn.apache.org/viewvc?view=revision&revision=1241508 remove the OutDev::GetKernPair* stubs completely Patch contributed by Herbert Duerr http://svn.apache.org/viewvc?view=revision&revision=1179221 reverting un-necessary OS/2 conditionals. --- filter/Makefile | 7 + filter/inc/filter/dllapi.h | 37 ++- filter/inc/filter/msfilter/mscodec.hxx | 37 ++- filter/inc/filter/msfilter/msocximex.hxx | 37 ++- filter/inc/filter/msfilter/msvbahelper.hxx | 37 ++- filter/inc/filter/msfilter/svdfppt.hxx | 37 ++- filter/inc/filter/msfilter/svxmsbas.hxx | 37 ++- .../detection/typeDetection/makefile.mk | 33 +-- .../filter/misc/TypeDetection6FileFormat.xcu | 17 ++ filter/source/config/cache/basecontainer.cxx | 37 ++- filter/source/config/cache/basecontainer.hxx | 37 ++- filter/source/config/cache/cacheitem.cxx | 37 ++- filter/source/config/cache/cacheitem.hxx | 37 ++- .../config/cache/cacheupdatelistener.cxx | 37 ++- .../config/cache/cacheupdatelistener.hxx | 37 ++- filter/source/config/cache/configflush.cxx | 37 ++- filter/source/config/cache/constant.hxx | 37 ++- .../config/cache/contenthandlerfactory.cxx | 37 ++- filter/source/config/cache/filtercache.cxx | 37 ++- filter/source/config/cache/filtercache.hxx | 37 ++- .../config/cache/filterconfig1.component | 43 ++-- filter/source/config/cache/filterfactory.cxx | 37 ++- .../config/cache/frameloaderfactory.cxx | 37 ++- .../source/config/cache/lateinitlistener.cxx | 37 ++- filter/source/config/cache/lateinitthread.cxx | 37 ++- filter/source/config/cache/lateinitthread.hxx | 37 ++- filter/source/config/cache/macros.hxx | 37 ++- filter/source/config/cache/querytokenizer.cxx | 37 ++- filter/source/config/cache/querytokenizer.hxx | 37 ++- filter/source/config/cache/registration.cxx | 37 ++- filter/source/config/cache/typedetection.cxx | 37 ++- filter/source/config/cache/typedetection.hxx | 37 ++- ...m_sun_star_comp_framework_SoundHandler.xcu | 17 ++ ...om_sun_star_comp_framework_oxt_handler.xcu | 17 ++ .../fragments/filters/AportisDoc_Palm_DB.xcu | 17 ++ .../fragments/filters/BMP___MS_Windows.xcu | 17 ++ .../CGM___Computer_Graphics_Metafile.xcu | 17 ++ .../fragments/filters/CorelDrawDocument.xcu | 17 ++ .../filters/CorelPresentationExchange.xcu | 17 ++ .../source/config/fragments/filters/DIF.xcu | 17 ++ .../filters/DXF___AutoCAD_Interchange.xcu | 17 ++ .../config/fragments/filters/DocBook_File.xcu | 17 ++ .../filters/EMF___MS_Windows_Metafile.xcu | 17 ++ .../filters/EPS___Encapsulated_PostScript.xcu | 17 ++ .../filters/GIF___Graphics_Interchange.xcu | 17 ++ .../source/config/fragments/filters/HTML.xcu | 17 ++ .../fragments/filters/HTML_MasterDoc.xcu | 17 ++ .../fragments/filters/HTML_MasterDoc_ui.xcu | 17 ++ .../fragments/filters/HTML__StarCalc_.xcu | 17 ++ .../fragments/filters/HTML__StarCalc__ui.xcu | 17 ++ .../fragments/filters/HTML__StarWriter_.xcu | 17 ++ .../filters/HTML__StarWriter__ui.xcu | 17 ++ .../config/fragments/filters/HTML_ui.xcu | 17 ++ .../config/fragments/filters/JPG___JPEG.xcu | 17 ++ .../source/config/fragments/filters/Lotus.xcu | 17 ++ .../config/fragments/filters/LotusWordPro.xcu | 17 ++ .../fragments/filters/MET___OS_2_Metafile.xcu | 17 ++ .../fragments/filters/MS_Excel_2003_XML.xcu | 17 ++ .../filters/MS_Excel_2003_XML_ui.xcu | 17 ++ .../config/fragments/filters/MS_Excel_4_0.xcu | 17 ++ .../filters/MS_Excel_4_0_Vorlage_Template.xcu | 17 ++ .../MS_Excel_4_0_Vorlage_Template_ui.xcu | 17 ++ .../fragments/filters/MS_Excel_5_0_95.xcu | 17 ++ .../MS_Excel_5_0_95_Vorlage_Template.xcu | 17 ++ .../MS_Excel_5_0_95_Vorlage_Template_ui.xcu | 17 ++ .../config/fragments/filters/MS_Excel_95.xcu | 17 ++ .../filters/MS_Excel_95_Vorlage_Template.xcu | 17 ++ .../MS_Excel_95_Vorlage_Template_ui.xcu | 17 ++ .../config/fragments/filters/MS_Excel_97.xcu | 17 ++ .../filters/MS_Excel_97_Vorlage_Template.xcu | 17 ++ .../MS_Excel_97_Vorlage_Template_ui.xcu | 17 ++ .../fragments/filters/MS_PowerPoint_97.xcu | 17 ++ .../filters/MS_PowerPoint_97_AutoPlay.xcu | 17 ++ .../filters/MS_PowerPoint_97_Vorlage.xcu | 17 ++ .../filters/MS_PowerPoint_97_Vorlage_ui.xcu | 17 ++ .../config/fragments/filters/MS_WinWord_5.xcu | 17 ++ .../fragments/filters/MS_WinWord_6_0.xcu | 17 ++ .../fragments/filters/MS_Word_2003_XML.xcu | 17 ++ .../fragments/filters/MS_Word_2003_XML_ui.xcu | 17 ++ .../fragments/filters/MS_Word_2007_XML.xcu | 17 ++ .../filters/MS_Word_2007_XML_Template.xcu | 17 ++ .../filters/MS_Word_2007_XML_Template_ui.xcu | 17 ++ .../fragments/filters/MS_Word_2007_XML_ui.xcu | 17 ++ .../config/fragments/filters/MS_Word_95.xcu | 17 ++ .../fragments/filters/MS_Word_95_Vorlage.xcu | 17 ++ .../filters/MS_Word_95_Vorlage_ui.xcu | 17 ++ .../config/fragments/filters/MS_Word_97.xcu | 17 ++ .../fragments/filters/MS_Word_97_Vorlage.xcu | 17 ++ .../filters/MS_Word_97_Vorlage_ui.xcu | 17 ++ .../config/fragments/filters/MS_Works.xcu | 17 ++ .../fragments/filters/MathML_XML__Math_.xcu | 17 ++ .../config/fragments/filters/MathType_3_x.xcu | 17 ++ .../fragments/filters/MiniCalc__Palm_.xcu | 17 ++ .../config/fragments/filters/ODG_FlatXML.xcu | 17 ++ .../config/fragments/filters/ODP_FlatXML.xcu | 17 ++ .../config/fragments/filters/ODS_FlatXML.xcu | 17 ++ .../config/fragments/filters/ODT_FlatXML.xcu | 17 ++ .../config/fragments/filters/OOXML_Text.xcu | 17 ++ .../fragments/filters/OOXML_Text_Template.xcu | 17 ++ .../filters/OOXML_Text_Template_ui.xcu | 17 ++ .../fragments/filters/OOXML_Text_ui.xcu | 17 ++ .../filters/PBM___Portable_Bitmap.xcu | 17 ++ .../fragments/filters/PCT___Mac_Pict.xcu | 17 ++ .../filters/PCX___Zsoft_Paintbrush.xcu | 17 ++ .../filters/PGM___Portable_Graymap.xcu | 17 ++ .../PNG___Portable_Network_Graphic.xcu | 17 ++ .../filters/PPM___Portable_Pixelmap.xcu | 17 ++ .../filters/PSD___Adobe_Photoshop.xcu | 17 ++ .../fragments/filters/PocketWord_File.xcu | 17 ++ .../config/fragments/filters/Pocket_Excel.xcu | 17 ++ .../fragments/filters/PublisherDocument.xcu | 17 ++ .../source/config/fragments/filters/QPro.xcu | 17 ++ .../filters/RAS___Sun_Rasterfile.xcu | 17 ++ .../fragments/filters/Rich_Text_Format.xcu | 17 ++ .../filters/Rich_Text_Format__StarCalc_.xcu | 17 ++ .../filters/SGF___StarOffice_Writer_SGF.xcu | 17 ++ .../fragments/filters/SGV___StarDraw_2_0.xcu | 17 ++ .../SVG___Scalable_Vector_Graphics.xcu | 17 ++ .../filters/SVM___StarView_Metafile.xcu | 17 ++ .../source/config/fragments/filters/SYLK.xcu | 17 ++ .../config/fragments/filters/StarCalc_1_0.xcu | 17 ++ .../config/fragments/filters/StarCalc_3_0.xcu | 17 ++ .../filters/StarCalc_3_0_Vorlage_Template.xcu | 17 ++ .../StarCalc_3_0_Vorlage_Template_ui.xcu | 17 ++ .../config/fragments/filters/StarCalc_4_0.xcu | 17 ++ .../filters/StarCalc_4_0_Vorlage_Template.xcu | 17 ++ .../StarCalc_4_0_Vorlage_Template_ui.xcu | 17 ++ .../config/fragments/filters/StarCalc_5_0.xcu | 17 ++ .../filters/StarCalc_5_0_Vorlage_Template.xcu | 17 ++ .../StarCalc_5_0_Vorlage_Template_ui.xcu | 17 ++ .../fragments/filters/StarChart_3_0.xcu | 17 ++ .../fragments/filters/StarChart_4_0.xcu | 17 ++ .../fragments/filters/StarChart_5_0.xcu | 17 ++ .../config/fragments/filters/StarDraw_3_0.xcu | 17 ++ .../filters/StarDraw_3_0_Vorlage.xcu | 17 ++ .../StarDraw_3_0_Vorlage__StarImpress_.xcu | 17 ++ .../StarDraw_3_0_Vorlage__StarImpress__ui.xcu | 17 ++ .../filters/StarDraw_3_0_Vorlage_ui.xcu | 17 ++ .../filters/StarDraw_3_0__StarImpress_.xcu | 17 ++ .../config/fragments/filters/StarDraw_5_0.xcu | 17 ++ .../filters/StarDraw_5_0_Vorlage.xcu | 17 ++ .../StarDraw_5_0_Vorlage__StarImpress_.xcu | 17 ++ .../StarDraw_5_0_Vorlage__StarImpress__ui.xcu | 17 ++ .../filters/StarDraw_5_0_Vorlage_ui.xcu | 17 ++ .../filters/StarDraw_5_0__StarImpress_.xcu | 17 ++ .../fragments/filters/StarImpress_4_0.xcu | 17 ++ .../filters/StarImpress_4_0_Vorlage.xcu | 17 ++ .../filters/StarImpress_4_0_Vorlage_ui.xcu | 17 ++ .../fragments/filters/StarImpress_5_0.xcu | 17 ++ .../filters/StarImpress_5_0_Vorlage.xcu | 17 ++ .../filters/StarImpress_5_0_Vorlage_ui.xcu | 17 ++ .../filters/StarImpress_5_0__packed_.xcu | 17 ++ .../filters/StarImpress_5_0__packed__ui.xcu | 17 ++ .../config/fragments/filters/StarMath_2_0.xcu | 17 ++ .../config/fragments/filters/StarMath_3_0.xcu | 17 ++ .../config/fragments/filters/StarMath_4_0.xcu | 17 ++ .../config/fragments/filters/StarMath_5_0.xcu | 17 ++ .../filters/StarOffice_XML__Base_.xcu | 17 ++ .../filters/StarOffice_XML__Base__ui.xcu | 17 ++ .../filters/StarOffice_XML__Calc_.xcu | 17 ++ .../filters/StarOffice_XML__Calc__ui.xcu | 17 ++ .../filters/StarOffice_XML__Chart_.xcu | 17 ++ .../filters/StarOffice_XML__Chart__ui.xcu | 17 ++ .../filters/StarOffice_XML__Draw_.xcu | 17 ++ .../filters/StarOffice_XML__Draw__ui.xcu | 17 ++ .../filters/StarOffice_XML__Impress_.xcu | 17 ++ .../filters/StarOffice_XML__Impress__ui.xcu | 17 ++ .../filters/StarOffice_XML__Math_.xcu | 17 ++ .../filters/StarOffice_XML__Math__ui.xcu | 17 ++ .../filters/StarOffice_XML__Writer_.xcu | 17 ++ .../filters/StarOffice_XML__Writer__ui.xcu | 17 ++ .../fragments/filters/StarWriter_1_0.xcu | 17 ++ .../fragments/filters/StarWriter_2_0.xcu | 17 ++ .../fragments/filters/StarWriter_3_0.xcu | 17 ++ .../StarWriter_3_0_Vorlage_Template.xcu | 17 ++ .../StarWriter_3_0_Vorlage_Template_ui.xcu | 17 ++ ...Writer_3_0__StarWriter_GlobalDocument_.xcu | 17 ++ .../StarWriter_3_0__StarWriter_Web_.xcu | 17 ++ .../fragments/filters/StarWriter_4_0.xcu | 17 ++ .../filters/StarWriter_4_0_GlobalDocument.xcu | 17 ++ .../StarWriter_4_0_GlobalDocument_ui.xcu | 17 ++ .../StarWriter_4_0_Vorlage_Template.xcu | 17 ++ .../StarWriter_4_0_Vorlage_Template_ui.xcu | 17 ++ ...Writer_4_0__StarWriter_GlobalDocument_.xcu | 17 ++ .../StarWriter_4_0__StarWriter_Web_.xcu | 17 ++ .../fragments/filters/StarWriter_5_0.xcu | 17 ++ .../filters/StarWriter_5_0_GlobalDocument.xcu | 17 ++ .../StarWriter_5_0_GlobalDocument_ui.xcu | 17 ++ .../StarWriter_5_0_Vorlage_Template.xcu | 17 ++ .../StarWriter_5_0_Vorlage_Template_ui.xcu | 17 ++ ...Writer_5_0__StarWriter_GlobalDocument_.xcu | 17 ++ .../StarWriter_5_0__StarWriter_Web_.xcu | 17 ++ .../fragments/filters/StarWriter_DOS.xcu | 17 ++ .../StarWriter_Web_4_0_Vorlage_Template.xcu | 17 ++ ...StarWriter_Web_4_0_Vorlage_Template_ui.xcu | 17 ++ .../StarWriter_Web_5_0_Vorlage_Template.xcu | 17 ++ ...StarWriter_Web_5_0_Vorlage_Template_ui.xcu | 17 ++ .../config/fragments/filters/T602Document.xcu | 17 ++ .../filters/TGA___Truevision_TARGA.xcu | 17 ++ .../filters/TIF___Tag_Image_File.xcu | 17 ++ .../source/config/fragments/filters/Text.xcu | 17 ++ .../filters/Text__StarWriter_Web_.xcu | 17 ++ .../filters/Text__StarWriter_Web__ui.xcu | 17 ++ .../filters/Text___txt___csv__StarCalc_.xcu | 17 ++ .../Text___txt___csv__StarCalc__ui.xcu | 17 ++ .../fragments/filters/Text__encoded_.xcu | 17 ++ ...__encoded___StarWriter_GlobalDocument_.xcu | 17 ++ ...ncoded___StarWriter_GlobalDocument__ui.xcu | 17 ++ .../Text__encoded___StarWriter_Web_.xcu | 17 ++ .../Text__encoded___StarWriter_Web__ui.xcu | 17 ++ .../fragments/filters/Text__encoded__ui.xcu | 17 ++ .../config/fragments/filters/Text_ui.xcu | 17 ++ .../fragments/filters/UOF_presentation.xcu | 17 ++ .../fragments/filters/UOF_presentation_ui.xcu | 17 ++ .../fragments/filters/UOF_spreadsheet.xcu | 17 ++ .../fragments/filters/UOF_spreadsheet_ui.xcu | 17 ++ .../config/fragments/filters/UOF_text.xcu | 17 ++ .../config/fragments/filters/UOF_text_ui.xcu | 17 ++ .../fragments/filters/VisioDocument.xcu | 17 ++ .../filters/WMF___MS_Windows_Metafile.xcu | 17 ++ .../config/fragments/filters/WordPerfect.xcu | 17 ++ .../fragments/filters/WordPerfectGraphics.xcu | 17 ++ .../fragments/filters/XBM___X_Consortium.xcu | 17 ++ .../fragments/filters/XHTML_Calc_File.xcu | 17 ++ .../fragments/filters/XHTML_Draw_File.xcu | 17 ++ .../fragments/filters/XHTML_Impress_File.xcu | 17 ++ .../fragments/filters/XHTML_Writer_File.xcu | 17 ++ .../source/config/fragments/filters/XPM.xcu | 17 ++ .../source/config/fragments/filters/calc8.xcu | 17 ++ .../fragments/filters/calc8_template.xcu | 17 ++ .../fragments/filters/calc8_template_ui.xcu | 17 ++ .../config/fragments/filters/calc8_ui.xcu | 17 ++ .../fragments/filters/calc_HTML_WebQuery.xcu | 17 ++ .../filters/calc_HTML_WebQuery_ui.xcu | 17 ++ .../filters/calc_MS_Excel_2007_Binary.xcu | 17 ++ .../filters/calc_MS_Excel_2007_Binary_ui.xcu | 17 ++ .../filters/calc_MS_Excel_2007_XML.xcu | 17 ++ .../calc_MS_Excel_2007_XML_Template.xcu | 17 ++ .../calc_MS_Excel_2007_XML_Template_ui.xcu | 17 ++ .../filters/calc_MS_Excel_2007_XML_ui.xcu | 17 ++ .../config/fragments/filters/calc_OOXML.xcu | 17 ++ .../fragments/filters/calc_OOXML_Template.xcu | 17 ++ .../filters/calc_OOXML_Template_ui.xcu | 17 ++ .../fragments/filters/calc_OOXML_ui.xcu | 17 ++ .../calc_StarOffice_XML_Calc_Template.xcu | 17 ++ .../calc_StarOffice_XML_Calc_Template_ui.xcu | 17 ++ .../fragments/filters/calc_pdf_Export.xcu | 17 ++ .../config/fragments/filters/chart8.xcu | 17 ++ .../config/fragments/filters/chart8_ui.xcu | 17 ++ .../source/config/fragments/filters/dBase.xcu | 17 ++ .../source/config/fragments/filters/draw8.xcu | 17 ++ .../fragments/filters/draw8_template.xcu | 17 ++ .../fragments/filters/draw8_template_ui.xcu | 17 ++ .../config/fragments/filters/draw8_ui.xcu | 17 ++ .../filters/draw_PCD_Photo_CD_Base.xcu | 17 ++ .../filters/draw_PCD_Photo_CD_Base16.xcu | 17 ++ .../filters/draw_PCD_Photo_CD_Base4.xcu | 17 ++ .../draw_StarOffice_XML_Draw_Template.xcu | 17 ++ .../draw_StarOffice_XML_Draw_Template_ui.xcu | 17 ++ .../fragments/filters/draw_bmp_Export.xcu | 17 ++ .../fragments/filters/draw_emf_Export.xcu | 17 ++ .../fragments/filters/draw_eps_Export.xcu | 17 ++ .../fragments/filters/draw_flash_Export.xcu | 17 ++ .../fragments/filters/draw_gif_Export.xcu | 17 ++ .../fragments/filters/draw_html_Export.xcu | 17 ++ .../fragments/filters/draw_html_Export_ui.xcu | 17 ++ .../fragments/filters/draw_jpg_Export.xcu | 17 ++ .../fragments/filters/draw_met_Export.xcu | 17 ++ .../fragments/filters/draw_pbm_Export.xcu | 17 ++ .../fragments/filters/draw_pct_Export.xcu | 17 ++ .../fragments/filters/draw_pdf_Export.xcu | 17 ++ .../fragments/filters/draw_pgm_Export.xcu | 17 ++ .../fragments/filters/draw_png_Export.xcu | 17 ++ .../fragments/filters/draw_ppm_Export.xcu | 17 ++ .../fragments/filters/draw_ras_Export.xcu | 17 ++ .../fragments/filters/draw_svg_Export.xcu | 17 ++ .../fragments/filters/draw_svm_Export.xcu | 17 ++ .../fragments/filters/draw_tif_Export.xcu | 17 ++ .../fragments/filters/draw_wmf_Export.xcu | 17 ++ .../fragments/filters/draw_xpm_Export.xcu | 17 ++ .../config/fragments/filters/impress8.xcu | 17 ++ .../fragments/filters/impress8_draw.xcu | 17 ++ .../fragments/filters/impress8_draw_ui.xcu | 17 ++ .../fragments/filters/impress8_template.xcu | 17 ++ .../filters/impress8_template_ui.xcu | 17 ++ .../config/fragments/filters/impress8_ui.xcu | 17 ++ .../impress_MS_PowerPoint_2007_XML.xcu | 17 ++ ...mpress_MS_PowerPoint_2007_XML_AutoPlay.xcu | 17 ++ ...mpress_MS_PowerPoint_2007_XML_Template.xcu | 17 ++ ...ess_MS_PowerPoint_2007_XML_Template_ui.xcu | 17 ++ .../impress_MS_PowerPoint_2007_XML_ui.xcu | 17 ++ .../fragments/filters/impress_OOXML.xcu | 17 ++ .../filters/impress_OOXML_AutoPlay.xcu | 17 ++ .../filters/impress_OOXML_Template.xcu | 17 ++ .../filters/impress_OOXML_Template_ui.xcu | 17 ++ .../fragments/filters/impress_OOXML_ui.xcu | 17 ++ .../filters/impress_StarOffice_XML_Draw.xcu | 17 ++ .../impress_StarOffice_XML_Draw_ui.xcu | 17 ++ ...mpress_StarOffice_XML_Impress_Template.xcu | 17 ++ ...ess_StarOffice_XML_Impress_Template_ui.xcu | 17 ++ .../fragments/filters/impress_bmp_Export.xcu | 17 ++ .../fragments/filters/impress_emf_Export.xcu | 17 ++ .../fragments/filters/impress_eps_Export.xcu | 17 ++ .../filters/impress_flash_Export.xcu | 17 ++ .../fragments/filters/impress_gif_Export.xcu | 17 ++ .../fragments/filters/impress_html_Export.xcu | 17 ++ .../filters/impress_html_Export_ui.xcu | 17 ++ .../fragments/filters/impress_jpg_Export.xcu | 17 ++ .../fragments/filters/impress_met_Export.xcu | 17 ++ .../fragments/filters/impress_pbm_Export.xcu | 17 ++ .../fragments/filters/impress_pct_Export.xcu | 17 ++ .../fragments/filters/impress_pdf_Export.xcu | 17 ++ .../fragments/filters/impress_pgm_Export.xcu | 17 ++ .../fragments/filters/impress_png_Export.xcu | 17 ++ .../fragments/filters/impress_ppm_Export.xcu | 17 ++ .../fragments/filters/impress_ras_Export.xcu | 17 ++ .../fragments/filters/impress_svg_Export.xcu | 17 ++ .../fragments/filters/impress_svm_Export.xcu | 17 ++ .../fragments/filters/impress_tif_Export.xcu | 17 ++ .../fragments/filters/impress_wmf_Export.xcu | 17 ++ .../fragments/filters/impress_xpm_Export.xcu | 17 ++ .../source/config/fragments/filters/math8.xcu | 17 ++ .../config/fragments/filters/math8_ui.xcu | 17 ++ .../fragments/filters/math_pdf_Export.xcu | 17 ++ .../fragments/filters/placeware_Export.xcu | 17 ++ .../config/fragments/filters/writer8.xcu | 17 ++ .../fragments/filters/writer8_template.xcu | 17 ++ .../fragments/filters/writer8_template_ui.xcu | 17 ++ .../config/fragments/filters/writer8_ui.xcu | 17 ++ .../fragments/filters/writer_MIZI_Hwp_97.xcu | 17 ++ .../writer_StarOffice_XML_Writer_Template.xcu | 17 ++ ...iter_StarOffice_XML_Writer_Template_ui.xcu | 17 ++ ...r_globaldocument_StarOffice_XML_Writer.xcu | 17 ++ ...t_StarOffice_XML_Writer_GlobalDocument.xcu | 17 ++ ...tarOffice_XML_Writer_GlobalDocument_ui.xcu | 17 ++ ...lobaldocument_StarOffice_XML_Writer_ui.xcu | 17 ++ .../writer_globaldocument_pdf_Export.xcu | 17 ++ .../fragments/filters/writer_layout_dump.xcu | 17 ++ .../fragments/filters/writer_pdf_Export.xcu | 17 ++ .../filters/writer_web_HTML_help.xcu | 17 ++ .../writer_web_StarOffice_XML_Writer.xcu | 17 ++ ...web_StarOffice_XML_Writer_Web_Template.xcu | 17 ++ ..._StarOffice_XML_Writer_Web_Template_ui.xcu | 17 ++ .../writer_web_StarOffice_XML_Writer_ui.xcu | 17 ++ .../filters/writer_web_pdf_Export.xcu | 17 ++ .../fragments/filters/writerglobal8.xcu | 17 ++ .../fragments/filters/writerglobal8_HTML.xcu | 17 ++ .../fragments/filters/writerglobal8_ui.xcu | 17 ++ .../filters/writerglobal8_writer.xcu | 17 ++ .../filters/writerglobal8_writer_ui.xcu | 17 ++ .../fragments/filters/writerweb8_writer.xcu | 17 ++ .../filters/writerweb8_writer_template.xcu | 17 ++ .../filters/writerweb8_writer_template_ui.xcu | 17 ++ .../filters/writerweb8_writer_ui.xcu | 17 ++ ..._sun_star_comp_chart2_ChartFrameLoader.xcu | 17 ++ .../com_sun_star_frame_Bibliography.xcu | 17 ++ .../com_sun_star_sdb_ContentLoader.xcu | 17 ++ ...openoffice_comp_dbflt_DBContentLoader2.xcu | 17 ++ .../internalgraphicfilters/bmp_Export.xcu | 17 ++ .../internalgraphicfilters/bmp_Import.xcu | 17 ++ .../internalgraphicfilters/dxf_Import.xcu | 17 ++ .../internalgraphicfilters/emf_Export.xcu | 17 ++ .../internalgraphicfilters/emf_Import.xcu | 17 ++ .../internalgraphicfilters/eps_Export.xcu | 17 ++ .../internalgraphicfilters/eps_Import.xcu | 17 ++ .../internalgraphicfilters/gif_Export.xcu | 17 ++ .../internalgraphicfilters/gif_Import.xcu | 17 ++ .../internalgraphicfilters/jpg_Export.xcu | 17 ++ .../internalgraphicfilters/jpg_Import.xcu | 17 ++ .../internalgraphicfilters/met_Export.xcu | 17 ++ .../internalgraphicfilters/met_Import.xcu | 17 ++ .../internalgraphicfilters/pbm_Export.xcu | 17 ++ .../internalgraphicfilters/pbm_Import.xcu | 17 ++ .../pcd_Import_Base.xcu | 17 ++ .../pcd_Import_Base16.xcu | 17 ++ .../pcd_Import_Base4.xcu | 17 ++ .../internalgraphicfilters/pct_Export.xcu | 17 ++ .../internalgraphicfilters/pct_Import.xcu | 17 ++ .../internalgraphicfilters/pcx_Import.xcu | 17 ++ .../internalgraphicfilters/pgm_Export.xcu | 17 ++ .../internalgraphicfilters/pgm_Import.xcu | 17 ++ .../internalgraphicfilters/png_Export.xcu | 17 ++ .../internalgraphicfilters/png_Import.xcu | 17 ++ .../internalgraphicfilters/ppm_Export.xcu | 17 ++ .../internalgraphicfilters/ppm_Import.xcu | 17 ++ .../internalgraphicfilters/psd_Import.xcu | 17 ++ .../internalgraphicfilters/ras_Export.xcu | 17 ++ .../internalgraphicfilters/ras_Import.xcu | 17 ++ .../internalgraphicfilters/sgf_Import.xcu | 17 ++ .../internalgraphicfilters/sgv_Import.xcu | 17 ++ .../internalgraphicfilters/svg_Export.xcu | 17 ++ .../internalgraphicfilters/svg_Import.xcu | 17 ++ .../internalgraphicfilters/svm_Export.xcu | 17 ++ .../internalgraphicfilters/svm_Import.xcu | 17 ++ .../internalgraphicfilters/tga_Import.xcu | 17 ++ .../internalgraphicfilters/tif_Export.xcu | 17 ++ .../internalgraphicfilters/tif_Import.xcu | 17 ++ .../internalgraphicfilters/wmf_Export.xcu | 17 ++ .../internalgraphicfilters/wmf_Import.xcu | 17 ++ .../internalgraphicfilters/xbm_Import.xcu | 17 ++ .../internalgraphicfilters/xpm_Export.xcu | 17 ++ .../internalgraphicfilters/xpm_Import.xcu | 17 ++ filter/source/config/fragments/langfilter.xsl | 17 ++ .../fragments/types/MS_Excel_2007_Binary.xcu | 17 ++ .../fragments/types/MS_Excel_2007_XML.xcu | 17 ++ .../types/MS_Excel_2007_XML_Template.xcu | 17 ++ .../types/MS_PowerPoint_2007_XML.xcu | 17 ++ .../types/MS_PowerPoint_2007_XML_AutoPlay.xcu | 17 ++ .../types/MS_PowerPoint_2007_XML_Template.xcu | 17 ++ .../config/fragments/types/StarBase.xcu | 17 ++ .../Unified_Office_Format_presentation.xcu | 17 ++ .../Unified_Office_Format_spreadsheet.xcu | 17 ++ .../types/Unified_Office_Format_text.xcu | 17 ++ .../config/fragments/types/XHTML_File.xcu | 17 ++ .../config/fragments/types/bmp_MS_Windows.xcu | 17 ++ .../source/config/fragments/types/calc8.xcu | 17 ++ .../config/fragments/types/calc8_template.xcu | 17 ++ .../config/fragments/types/calc_DIF.xcu | 17 ++ .../config/fragments/types/calc_Lotus.xcu | 17 ++ .../types/calc_MS_Excel_2003_XML.xcu | 17 ++ .../fragments/types/calc_MS_Excel_40.xcu | 17 ++ .../calc_MS_Excel_40_VorlageTemplate.xcu | 17 ++ .../fragments/types/calc_MS_Excel_5095.xcu | 17 ++ .../calc_MS_Excel_5095_VorlageTemplate.xcu | 17 ++ .../fragments/types/calc_MS_Excel_95.xcu | 17 ++ .../calc_MS_Excel_95_VorlageTemplate.xcu | 17 ++ .../fragments/types/calc_MS_Excel_97.xcu | 17 ++ .../calc_MS_Excel_97_VorlageTemplate.xcu | 17 ++ .../types/calc_MiniCalc_PalmDB_File.xcu | 17 ++ .../fragments/types/calc_ODS_FlatXML.xcu | 17 ++ .../config/fragments/types/calc_OOXML.xcu | 17 ++ .../fragments/types/calc_OOXML_Template.xcu | 17 ++ .../types/calc_Pocket_Excel_File.xcu | 17 ++ .../config/fragments/types/calc_QPro.xcu | 17 ++ .../config/fragments/types/calc_SYLK.xcu | 17 ++ .../fragments/types/calc_StarCalc_10.xcu | 17 ++ .../fragments/types/calc_StarCalc_30.xcu | 17 ++ .../calc_StarCalc_30_VorlageTemplate.xcu | 17 ++ .../fragments/types/calc_StarCalc_40.xcu | 17 ++ .../calc_StarCalc_40_VorlageTemplate.xcu | 17 ++ .../fragments/types/calc_StarCalc_50.xcu | 17 ++ .../calc_StarCalc_50_VorlageTemplate.xcu | 17 ++ .../types/calc_StarOffice_XML_Calc.xcu | 17 ++ .../calc_StarOffice_XML_Calc_Template.xcu | 17 ++ .../config/fragments/types/calc_dBase.xcu | 17 ++ .../source/config/fragments/types/chart8.xcu | 17 ++ .../fragments/types/chart_StarChart_30.xcu | 17 ++ .../fragments/types/chart_StarChart_40.xcu | 17 ++ .../fragments/types/chart_StarChart_50.xcu | 17 ++ .../types/chart_StarOffice_XML_Chart.xcu | 17 ++ .../types/component_Bibliography.xcu | 17 ++ .../config/fragments/types/component_DB.xcu | 17 ++ .../source/config/fragments/types/draw8.xcu | 17 ++ .../config/fragments/types/draw8_template.xcu | 17 ++ .../types/draw_CorelDraw_Document.xcu | 17 ++ .../draw_Corel_Presentation_Exchange.xcu | 17 ++ .../fragments/types/draw_ODG_FlatXML.xcu | 17 ++ .../types/draw_Publisher_Document.xcu | 17 ++ .../fragments/types/draw_StarDraw_30.xcu | 17 ++ .../types/draw_StarDraw_30_Vorlage.xcu | 17 ++ .../fragments/types/draw_StarDraw_50.xcu | 17 ++ .../types/draw_StarDraw_50_Vorlage.xcu | 17 ++ .../types/draw_StarOffice_XML_Draw.xcu | 17 ++ .../draw_StarOffice_XML_Draw_Template.xcu | 17 ++ .../fragments/types/draw_Visio_Document.xcu | 17 ++ .../types/draw_WordPerfect_Graphics.xcu | 17 ++ .../types/dxf_AutoCAD_Interchange.xcu | 17 ++ .../types/emf_MS_Windows_Metafile.xcu | 17 ++ .../types/eps_Encapsulated_PostScript.xcu | 17 ++ .../config/fragments/types/generic_HTML.xcu | 17 ++ .../config/fragments/types/generic_Text.xcu | 17 ++ .../types/gif_Graphics_Interchange.xcu | 17 ++ .../config/fragments/types/graphic_HTML.xcu | 17 ++ .../config/fragments/types/graphic_SWF.xcu | 17 ++ .../config/fragments/types/impress8.xcu | 17 ++ .../fragments/types/impress8_template.xcu | 17 ++ ...impress_CGM_Computer_Graphics_Metafile.xcu | 17 ++ .../types/impress_MS_PowerPoint_97.xcu | 17 ++ .../impress_MS_PowerPoint_97_AutoPlay.xcu | 17 ++ .../impress_MS_PowerPoint_97_Vorlage.xcu | 17 ++ .../fragments/types/impress_ODP_FlatXML.xcu | 17 ++ .../types/impress_OOXML_Presentation.xcu | 17 ++ .../impress_OOXML_Presentation_AutoPlay.xcu | 17 ++ .../impress_OOXML_Presentation_Template.xcu | 17 ++ .../types/impress_StarImpress_40.xcu | 17 ++ .../types/impress_StarImpress_40_Vorlage.xcu | 17 ++ .../types/impress_StarImpress_50.xcu | 17 ++ .../types/impress_StarImpress_50_Vorlage.xcu | 17 ++ .../types/impress_StarImpress_50_packed.xcu | 17 ++ .../types/impress_StarOffice_XML_Impress.xcu | 17 ++ ...mpress_StarOffice_XML_Impress_Template.xcu | 17 ++ .../config/fragments/types/jpg_JPEG.xcu | 17 ++ .../source/config/fragments/types/math8.xcu | 17 ++ .../fragments/types/math_MathML_XML_Math.xcu | 17 ++ .../fragments/types/math_MathType_3x.xcu | 17 ++ .../fragments/types/math_StarMath_20.xcu | 17 ++ .../fragments/types/math_StarMath_30.xcu | 17 ++ .../fragments/types/math_StarMath_40.xcu | 17 ++ .../fragments/types/math_StarMath_50.xcu | 17 ++ .../types/math_StarOffice_XML_Math.xcu | 17 ++ .../fragments/types/met_OS2_Metafile.xcu | 17 ++ .../types/oxt_OpenOffice_Extension.xcu | 17 ++ .../fragments/types/pbm_Portable_Bitmap.xcu | 17 ++ .../fragments/types/pcd_Photo_CD_Base.xcu | 17 ++ .../fragments/types/pcd_Photo_CD_Base16.xcu | 17 ++ .../fragments/types/pcd_Photo_CD_Base4.xcu | 17 ++ .../config/fragments/types/pct_Mac_Pict.xcu | 17 ++ .../fragments/types/pcx_Zsoft_Paintbrush.xcu | 17 ++ .../types/pdf_Portable_Document_Format.xcu | 17 ++ .../fragments/types/pgm_Portable_Graymap.xcu | 17 ++ .../types/png_Portable_Network_Graphic.xcu | 17 ++ .../fragments/types/ppm_Portable_Pixelmap.xcu | 17 ++ .../fragments/types/psd_Adobe_Photoshop.xcu | 17 ++ .../config/fragments/types/pwp_PlaceWare.xcu | 17 ++ .../fragments/types/ras_Sun_Rasterfile.xcu | 17 ++ .../types/sgf_StarOffice_Writer_SGF.xcu | 17 ++ .../fragments/types/sgv_StarDraw_20.xcu | 17 ++ .../types/svg_Scalable_Vector_Graphics.xcu | 17 ++ .../fragments/types/svm_StarView_Metafile.xcu | 17 ++ .../fragments/types/tga_Truevision_TARGA.xcu | 17 ++ .../fragments/types/tif_Tag_Image_File.xcu | 17 ++ .../fragments/types/wav_Wave_Audio_File.xcu | 17 ++ .../types/wmf_MS_Windows_Metafile.xcu | 17 ++ .../source/config/fragments/types/writer8.xcu | 17 ++ .../fragments/types/writer8_template.xcu | 17 ++ .../types/writer_AportisDoc_PalmDB_File.xcu | 17 ++ .../fragments/types/writer_DocBook_File.xcu | 17 ++ .../types/writer_LotusWordPro_Document.xcu | 17 ++ .../fragments/types/writer_MIZI_Hwp_97.xcu | 17 ++ .../fragments/types/writer_MS_WinWord_5.xcu | 17 ++ .../fragments/types/writer_MS_WinWord_60.xcu | 17 ++ .../types/writer_MS_Word_2003_XML.xcu | 17 ++ .../types/writer_MS_Word_2007_XML.xcu | 17 ++ .../writer_MS_Word_2007_XML_Template.xcu | 17 ++ .../fragments/types/writer_MS_Word_95.xcu | 17 ++ .../types/writer_MS_Word_95_Vorlage.xcu | 17 ++ .../fragments/types/writer_MS_Word_97.xcu | 17 ++ .../types/writer_MS_Word_97_Vorlage.xcu | 17 ++ .../types/writer_MS_Works_Document.xcu | 17 ++ .../fragments/types/writer_ODT_FlatXML.xcu | 17 ++ .../config/fragments/types/writer_OOXML.xcu | 17 ++ .../fragments/types/writer_OOXML_Template.xcu | 17 ++ .../types/writer_PocketWord_File.xcu | 17 ++ .../types/writer_Rich_Text_Format.xcu | 17 ++ .../types/writer_StarOffice_XML_Writer.xcu | 17 ++ .../writer_StarOffice_XML_Writer_Template.xcu | 17 ++ .../fragments/types/writer_StarWriter_10.xcu | 17 ++ .../fragments/types/writer_StarWriter_20.xcu | 17 ++ .../fragments/types/writer_StarWriter_30.xcu | 17 ++ .../writer_StarWriter_30_VorlageTemplate.xcu | 17 ++ .../fragments/types/writer_StarWriter_40.xcu | 17 ++ .../writer_StarWriter_40_VorlageTemplate.xcu | 17 ++ .../fragments/types/writer_StarWriter_50.xcu | 17 ++ .../writer_StarWriter_50_VorlageTemplate.xcu | 17 ++ .../fragments/types/writer_StarWriter_DOS.xcu | 17 ++ .../fragments/types/writer_T602_Document.xcu | 17 ++ .../types/writer_WordPerfect_Document.xcu | 17 ++ ...t_StarOffice_XML_Writer_GlobalDocument.xcu | 17 ++ ...aldocument_StarWriter_40GlobalDocument.xcu | 17 ++ ...aldocument_StarWriter_50GlobalDocument.xcu | 17 ++ .../types/writer_layout_dump_xml.xcu | 17 ++ .../fragments/types/writer_web_HTML_help.xcu | 17 ++ ...web_StarOffice_XML_Writer_Web_Template.xcu | 17 ++ ...r_web_StarWriterWeb_40_VorlageTemplate.xcu | 17 ++ ...r_web_StarWriterWeb_50_VorlageTemplate.xcu | 17 ++ .../config/fragments/types/writerglobal8.xcu | 17 ++ .../types/writerweb8_writer_template.xcu | 17 ++ .../fragments/types/xbm_X_Consortium.xcu | 17 ++ .../source/config/fragments/types/xpm_XPM.xcu | 17 ++ .../source/config/tools/split/FCFGSplit.cfg | 18 ++ .../source/docbook/docbooktosoffheadings.xsl | 40 ++-- .../source/docbook/sofftodocbookheadings.xsl | 39 ++- filter/source/flash/flash.component | 43 ++-- filter/source/flash/impswfdialog.cxx | 37 ++- filter/source/flash/swfdialog.cxx | 37 ++- filter/source/flash/swfexporter.cxx | 37 ++- filter/source/flash/swffilter.cxx | 37 ++- filter/source/flash/swfuno.cxx | 37 ++- filter/source/flash/swfwriter.cxx | 37 ++- filter/source/flash/swfwriter.hxx | 37 ++- filter/source/flash/swfwriter2.cxx | 37 ++- filter/source/graphicfilter/egif/egif.cxx | 37 ++- filter/source/graphicfilter/epbm/epbm.cxx | 37 ++- filter/source/graphicfilter/epgm/epgm.cxx | 37 ++- filter/source/graphicfilter/eppm/eppm.cxx | 37 ++- filter/source/graphicfilter/eras/eras.cxx | 37 ++- filter/source/graphicfilter/etiff/etiff.cxx | 37 ++- filter/source/graphicfilter/expm/expm.cxx | 37 ++- filter/source/graphicfilter/icgm/actimpr.cxx | 37 ++- filter/source/graphicfilter/icgm/bitmap.cxx | 37 ++- filter/source/graphicfilter/icgm/bitmap.hxx | 37 ++- filter/source/graphicfilter/icgm/bundles.cxx | 37 ++- filter/source/graphicfilter/icgm/bundles.hxx | 37 ++- filter/source/graphicfilter/icgm/cgm.cxx | 37 ++- filter/source/graphicfilter/icgm/cgm.hxx | 37 ++- filter/source/graphicfilter/icgm/chart.cxx | 37 ++- filter/source/graphicfilter/icgm/chart.hxx | 37 ++- filter/source/graphicfilter/icgm/class0.cxx | 37 ++- filter/source/graphicfilter/icgm/class1.cxx | 37 ++- filter/source/graphicfilter/icgm/class2.cxx | 37 ++- filter/source/graphicfilter/icgm/class3.cxx | 37 ++- filter/source/graphicfilter/icgm/class4.cxx | 37 ++- filter/source/graphicfilter/icgm/class5.cxx | 37 ++- filter/source/graphicfilter/icgm/class7.cxx | 37 ++- filter/source/graphicfilter/icgm/classx.cxx | 37 ++- filter/source/graphicfilter/icgm/elements.cxx | 37 ++- filter/source/graphicfilter/icgm/elements.hxx | 37 ++- filter/source/graphicfilter/idxf/dxf2mtf.cxx | 37 ++- filter/source/graphicfilter/idxf/dxf2mtf.hxx | 37 ++- filter/source/graphicfilter/idxf/dxfgrprd.cxx | 37 ++- filter/source/graphicfilter/idxf/dxfgrprd.hxx | 37 ++- filter/source/graphicfilter/idxf/idxf.cxx | 37 ++- filter/source/graphicfilter/ieps/ieps.cxx | 37 ++- .../source/graphicfilter/ios2met/ios2met.cxx | 37 ++- filter/source/graphicfilter/ipbm/ipbm.cxx | 37 ++- filter/source/graphicfilter/ipcd/ipcd.cxx | 37 ++- filter/source/graphicfilter/ipcx/ipcx.cxx | 37 ++- filter/source/graphicfilter/ipict/ipict.cxx | 37 ++- filter/source/graphicfilter/ipict/shape.cxx | 37 ++- filter/source/graphicfilter/ipsd/ipsd.cxx | 37 ++- filter/source/graphicfilter/iras/iras.cxx | 37 ++- filter/source/graphicfilter/itga/itga.cxx | 37 ++- .../source/graphicfilter/itiff/ccidecom.cxx | 37 ++- filter/source/graphicfilter/itiff/itiff.cxx | 37 ++- .../source/graphicfilter/itiff/lzwdecom.cxx | 37 ++- filter/source/msfilter/countryid.cxx | 37 ++- filter/source/msfilter/eschesdo.cxx | 37 ++- filter/source/msfilter/eschesdo.hxx | 37 ++- filter/source/msfilter/mscodec.cxx | 37 ++- filter/source/msfilter/msfilter.component | 43 ++-- filter/source/msfilter/msocximex.cxx | 37 ++- filter/source/msfilter/msoleexp.cxx | 37 ++- filter/source/msfilter/msvbahelper.cxx | 37 ++- filter/source/msfilter/services.cxx | 37 ++- filter/source/msfilter/svdfppt.cxx | 37 ++- filter/source/pdf/impdialog.cxx | 37 ++- filter/source/pdf/impdialog.hxx | 37 ++- filter/source/pdf/impdialog.src | 37 ++- filter/source/pdf/pdfdialog.cxx | 37 ++- filter/source/pdf/pdfexport.cxx | 37 ++- filter/source/pdf/pdfexport.hxx | 37 ++- filter/source/pdf/pdffilter.component | 43 ++-- filter/source/pdf/pdffilter.cxx | 37 ++- filter/source/pdf/pdfinteract.cxx | 37 ++- filter/source/pdf/pdfuno.cxx | 37 ++- filter/source/placeware/exporter.cxx | 37 ++- filter/source/placeware/filter.cxx | 37 ++- filter/source/placeware/placeware.component | 43 ++-- filter/source/placeware/placeware.xml | 17 ++ filter/source/placeware/tempfile.cxx | 37 ++- filter/source/placeware/uno.cxx | 37 ++- filter/source/placeware/zip.cxx | 37 ++- filter/source/svg/svgdialog.cxx | 39 ++- filter/source/svg/svgfilter.component | 43 ++-- filter/source/svg/svgfilter.cxx | 37 ++- filter/source/svg/svgfilter.hxx | 37 ++- filter/source/svg/svgfontexport.cxx | 37 ++- filter/source/svg/svgfontexport.hxx | 37 ++- filter/source/svg/svgimport.cxx | 37 ++- filter/source/t602/filterenv.cxx | 37 ++- filter/source/t602/t602filter.component | 43 ++-- filter/source/t602/t602filter.cxx | 37 ++- .../source/textfilterdetect/filterdetect.hxx | 37 ++- .../xmlfilteradaptor/XmlFilterAdaptor.cxx | 37 ++- .../source/xmlfilteradaptor/genericfilter.cxx | 37 ++- filter/source/xmlfilteradaptor/streamwrap.hxx | 37 ++- .../source/xmlfilteradaptor/xmlfa.component | 43 ++-- filter/source/xmlfilterdetect/fdcomp.cxx | 37 ++- .../source/xmlfilterdetect/filterdetect.cxx | 37 ++- filter/source/xmlfilterdetect/xmlfd.component | 43 ++-- filter/source/xslt/common/copy.xsl | 17 ++ filter/source/xslt/common/math.xsl | 39 ++- .../source/xslt/common/measure_conversion.xsl | 39 ++- .../xslt/export/common/ooo2ms_docpr.xsl | 41 ++-- .../xslt/export/spreadsheetml/formular.xsl | 41 ++-- .../spreadsheetml/ooo2spreadsheetml.xsl | 41 ++-- .../export/spreadsheetml/style_mapping.xsl | 41 ++-- .../xslt/export/spreadsheetml/styles.xsl | 41 ++-- .../xslt/export/spreadsheetml/table.xsl | 41 ++-- .../xslt/export/uof/odf2uof_presentation.xsl | 17 ++ .../xslt/export/uof/odf2uof_spreadsheet.xsl | 17 ++ .../source/xslt/export/uof/odf2uof_text.xsl | 17 ++ .../source/xslt/export/wordml/ooo2wordml.xsl | 41 ++-- .../xslt/export/wordml/ooo2wordml_border.xsl | 41 ++-- .../export/wordml/ooo2wordml_custom_draw.xsl | 41 ++-- .../xslt/export/wordml/ooo2wordml_draw.xsl | 39 ++- .../xslt/export/wordml/ooo2wordml_field.xsl | 41 ++-- .../xslt/export/wordml/ooo2wordml_list.xsl | 41 ++-- .../xslt/export/wordml/ooo2wordml_page.xsl | 41 ++-- .../xslt/export/wordml/ooo2wordml_path.xsl | 41 ++-- .../export/wordml/ooo2wordml_settings.xsl | 41 ++-- .../xslt/export/wordml/ooo2wordml_table.xsl | 41 ++-- .../xslt/export/wordml/ooo2wordml_text.xsl | 41 ++-- .../xslt/import/common/ms2ooo_docpr.xsl | 41 ++-- .../spreadsheetml/spreadsheetml2ooo.xsl | 41 ++-- .../xslt/import/uof/uof2odf_presentation.xsl | 17 ++ .../xslt/import/uof/uof2odf_spreadsheet.xsl | 17 ++ .../source/xslt/import/uof/uof2odf_text.xsl | 17 ++ .../source/xslt/import/wordml/wordml2ooo.xsl | 41 ++-- .../import/wordml/wordml2ooo_custom_draw.xsl | 41 ++-- .../xslt/import/wordml/wordml2ooo_draw.xsl | 39 ++- .../xslt/import/wordml/wordml2ooo_field.xsl | 41 ++-- .../xslt/import/wordml/wordml2ooo_list.xsl | 41 ++-- .../xslt/import/wordml/wordml2ooo_path.xsl | 39 ++- .../import/wordml/wordml2ooo_settings.xsl | 41 ++-- .../xslt/import/wordml/wordml2ooo_table.xsl | 41 ++-- .../xslt/import/wordml/wordml2ooo_text.xsl | 41 ++-- .../xslt/odf2xhtml/export/common/body.xsl | 43 ++-- .../export/common/styles/style_collector.xsl | 39 ++- .../common/styles/style_mapping_css.xsl | 43 ++-- .../odf2xhtml/export/common/table/table.xsl | 41 ++-- .../export/common/table/table_cells.xsl | 41 ++-- .../export/common/table/table_columns.xsl | 41 ++-- .../export/common/table/table_rows.xsl | 41 ++-- .../export/common/table_of_content.xsl | 39 ++- .../xslt/odf2xhtml/export/xhtml/body.xsl | 39 ++- .../xslt/odf2xhtml/export/xhtml/header.xsl | 39 ++- .../odf2xhtml/export/xhtml/opendoc2xhtml.xsl | 39 ++- .../xslt/odf2xhtml/export/xhtml/table.xsl | 41 ++-- .../source/xsltdialog/typedetectionexport.cxx | 37 ++- .../source/xsltdialog/typedetectionimport.cxx | 37 ++- filter/source/xsltdialog/xmlfileview.cxx | 37 ++- filter/source/xsltdialog/xmlfileview.hxx | 37 ++- filter/source/xsltdialog/xmlfiltercommon.hxx | 37 ++- .../xsltdialog/xmlfilterdialogcomponent.cxx | 37 ++- filter/source/xsltdialog/xmlfilterjar.cxx | 37 ++- .../xsltdialog/xmlfiltersettingsdialog.cxx | 37 ++- .../xsltdialog/xmlfiltersettingsdialog.hxx | 37 ++- .../xsltdialog/xmlfiltersettingsdialog.src | 37 ++- .../source/xsltdialog/xmlfiltertabdialog.cxx | 37 ++- .../source/xsltdialog/xmlfiltertabdialog.hxx | 37 ++- .../xsltdialog/xmlfiltertabpagebasic.cxx | 37 ++- .../xsltdialog/xmlfiltertabpagexslt.cxx | 37 ++- .../xsltdialog/xmlfiltertabpagexslt.hxx | 37 ++- .../xsltdialog/xmlfiltertabpagexslt.src | 37 ++- .../source/xsltdialog/xmlfiltertestdialog.cxx | 37 ++- .../source/xsltdialog/xmlfiltertestdialog.hxx | 37 ++- filter/source/xsltdialog/xsltdlg.component | 43 ++-- filter/source/xsltfilter/XSLTFilter.cxx | 37 ++- .../xsltfilter/XSLTFilter.jar.component | 43 ++-- .../xsltfilter/XSLTFilterOLEExtracter.java | 49 ++-- .../star/comp/xsltfilter/XSLTransformer.java | 47 ++-- filter/source/xsltfilter/xsltfilter.component | 43 ++-- .../xsltvalidate/XSLTValidate.component | 43 ++-- shell/Makefile | 7 + shell/inc/internal/basereader.hxx | 37 ++- shell/inc/internal/contentreader.hxx | 37 ++- shell/inc/internal/fileextensions.hxx | 37 ++- shell/inc/internal/metainforeader.hxx | 37 ++- shell/inc/internal/stream_helper.hxx | 37 ++- shell/inc/internal/types.hxx | 37 ++- shell/inc/internal/utilities.hxx | 37 ++- shell/inc/internal/xml_parser.hxx | 37 ++- shell/inc/internal/zipfile.hxx | 37 ++- shell/inc/shell/kde_headers.h | 37 ++- shell/qa/i_xml_parser_event_handler.hxx | 78 ------ shell/qa/makefile.mk | 68 ------ shell/qa/recent_docs.cxx | 222 ------------------ shell/qa/zip/export.map | 27 +++ shell/qa/zip/makefile.mk | 58 +++++ shell/qa/zip/simpledocument.odt | Bin 0 -> 16259 bytes shell/qa/zip/testimpl/makefile.mk | 52 ++++ shell/qa/zip/testimpl/testzipimpl.cxx | 72 ++++++ shell/qa/zip/testimpl/testzipimpl.hxx | 45 ++++ shell/qa/zip/ziptest.cxx | 76 ++++++ shell/source/all/xml_parser.cxx | 37 ++- .../backends/desktopbe/desktopbackend.cxx | 43 ++-- .../backends/desktopbe/desktopbe1.component | 43 ++-- shell/source/backends/gconfbe/gconfaccess.cxx | 43 ++-- shell/source/backends/gconfbe/gconfaccess.hxx | 43 ++-- .../source/backends/gconfbe/gconfbackend.cxx | 43 ++-- .../backends/gconfbe/gconfbe1.component | 43 ++-- shell/source/backends/kde4be/kde4access.cxx | 43 ++-- shell/source/backends/kde4be/kde4backend.cxx | 43 ++-- .../source/backends/kde4be/kde4be1.component | 43 ++-- shell/source/backends/kdebe/kdeaccess.cxx | 43 ++-- shell/source/backends/kdebe/kdebackend.cxx | 43 ++-- shell/source/backends/kdebe/kdebe1.component | 43 ++-- shell/source/backends/kdebe/tdebe1.component | 43 ++-- .../backends/localebe/localebackend.cxx | 37 ++- .../backends/localebe/localebe1.component | 43 ++-- .../source/backends/localebe/localebecdef.cxx | 37 ++- shell/source/backends/macbe/macbackend.mm | 37 ++- shell/source/backends/macbe/macbe1.component | 43 ++-- shell/source/backends/macbe/macbecdef.cxx | 37 ++- .../backends/wininetbe/wininetbackend.cxx | 37 ++- .../backends/wininetbe/wininetbe1.component | 43 ++-- .../backends/wininetbe/wininetbecdef.cxx | 37 ++- shell/source/cmdmail/cmdmail.component | 43 ++-- shell/source/cmdmail/cmdmailentry.cxx | 37 ++- shell/source/cmdmail/cmdmailmsg.cxx | 37 ++- shell/source/cmdmail/cmdmailsuppl.cxx | 37 ++- shell/source/tools/lngconvex/cmdline.cxx | 37 ++- shell/source/tools/lngconvex/cmdline.hxx | 18 ++ shell/source/tools/lngconvex/lngconvex.cxx | 37 ++- shell/source/tools/regsvrex/regsvrex.cxx | 37 ++- shell/source/unix/exec/shellexec.cxx | 37 ++- shell/source/unix/exec/shellexecentry.cxx | 37 ++- shell/source/unix/exec/syssh.component | 43 ++-- shell/source/unix/misc/cde-open-url.sh | 17 ++ shell/source/unix/misc/gnome-open-url.c | 37 ++- shell/source/unix/misc/kde-open-url.sh | 17 ++ shell/source/unix/misc/open-url.sh | 17 ++ shell/source/unix/misc/senddoc.sh | 18 ++ shell/source/unix/misc/tde-open-url.sh | 17 ++ .../unix/sysshell/recently_used_file.cxx | 37 ++- .../sysshell/recently_used_file_handler.cxx | 37 ++- shell/source/win32/SysShExec.cxx | 37 ++- shell/source/win32/SysShExec.hxx | 37 ++- shell/source/win32/SysShentry.cxx | 37 ++- .../win32/ooofilereader/autostyletag.cxx | 37 ++- .../win32/ooofilereader/autostyletag.hxx | 37 ++- .../source/win32/ooofilereader/basereader.cxx | 37 ++- .../win32/ooofilereader/contentreader.cxx | 37 ++- shell/source/win32/ooofilereader/dummytag.hxx | 37 ++- shell/source/win32/ooofilereader/itag.hxx | 37 ++- .../win32/ooofilereader/keywordstag.cxx | 37 ++- .../win32/ooofilereader/keywordstag.hxx | 37 ++- .../win32/ooofilereader/metainforeader.cxx | 37 ++- .../source/win32/ooofilereader/simpletag.cxx | 37 ++- .../source/win32/ooofilereader/simpletag.hxx | 37 ++- .../win32/shlxthandler/classfactory.cxx | 37 ++- .../shlxthandler/columninfo/columninfo.cxx | 37 ++- .../win32/shlxthandler/ooofilt/ooofilt.cxx | 37 ++- .../win32/shlxthandler/ooofilt/ooofilt.hxx | 37 ++- .../shlxthandler/ooofilt/stream_helper.cxx | 37 ++- .../shlxthandler/prophdl/propertyhdl.cxx | 37 ++- .../propsheets/listviewbuilder.cxx | 37 ++- .../source/win32/shlxthandler/res/rctmpl.txt | 17 ++ .../win32/shlxthandler/res/shlxthdl.ulf | 20 +- shell/source/win32/shlxthandler/shlxthdl.cxx | 37 ++- .../shlxthandler/util/fileextensions.cxx | 37 ++- .../shlxthandler/util/iso8601_converter.cxx | 37 ++- .../win32/shlxthandler/util/registry.cxx | 37 ++- .../win32/shlxthandler/util/utilities.cxx | 53 +++-- shell/source/win32/simplemail/senddoc.cxx | 37 ++- .../win32/simplemail/smplmail.component | 43 ++-- .../win32/simplemail/smplmailclient.cxx | 37 ++- .../source/win32/simplemail/smplmailentry.cxx | 37 ++- shell/source/win32/simplemail/smplmailmsg.hxx | 37 ++- .../source/win32/simplemail/smplmailsuppl.cxx | 37 ++- shell/source/win32/syssh.component | 43 ++-- shell/source/win32/workbench/TestProxySet.cxx | 37 ++- shell/source/win32/workbench/TestSmplMail.cxx | 37 ++- .../source/win32/workbench/TestSysShExec.cxx | 37 ++- shell/source/win32/zipfile/zipexcptn.cxx | 37 ++- shell/source/win32/zipfile/zipexcptn.hxx | 18 ++ shell/source/win32/zipfile/zipfile.cxx | 37 ++- toolkit/JunitTest_toolkit_unoapi.mk | 33 +-- toolkit/Module_toolkit.mk | 35 ++- toolkit/Package_inc.mk | 33 +-- toolkit/inc/toolkit/awt/scrollabledialog.hxx | 38 ++- toolkit/inc/toolkit/awt/vclxdevice.hxx | 37 ++- toolkit/inc/toolkit/awt/vclxgraphics.hxx | 37 ++- toolkit/inc/toolkit/awt/vclxmenu.hxx | 37 ++- .../inc/toolkit/awt/vclxtabpagecontainer.hxx | 40 ++-- toolkit/inc/toolkit/awt/vclxtabpagemodel.hxx | 40 ++-- toolkit/inc/toolkit/awt/vclxtopwindow.hxx | 37 ++- toolkit/inc/toolkit/awt/vclxwindows.hxx | 37 ++- .../controls/controlmodelcontainerbase.hxx | 37 ++- .../inc/toolkit/controls/dialogcontrol.hxx | 37 ++- .../inc/toolkit/controls/eventcontainer.hxx | 37 ++- .../toolkit/controls/geometrycontrolmodel.hxx | 37 ++- .../controls/stdtabcontrollermodel.hxx | 37 ++- .../inc/toolkit/controls/tabpagecontainer.hxx | 37 ++- toolkit/inc/toolkit/controls/tabpagemodel.hxx | 37 ++- .../inc/toolkit/controls/unocontrolbase.hxx | 37 ++- .../toolkit/controls/unocontrolcontainer.hxx | 37 ++- .../controls/unocontrolcontainermodel.hxx | 37 ++- .../inc/toolkit/controls/unocontrolmodel.hxx | 37 ++- toolkit/inc/toolkit/controls/unocontrols.hxx | 37 ++- .../inc/toolkit/helper/accessiblefactory.hxx | 37 ++- .../toolkit/helper/listenermultiplexer.hxx | 37 ++- toolkit/inc/toolkit/helper/macros.hxx | 37 ++- toolkit/inc/toolkit/helper/property.hxx | 37 ++- toolkit/inc/toolkit/helper/servicenames.hxx | 37 ++- .../toolkit/helper/unopropertyarrayhelper.hxx | 37 ++- toolkit/inc/toolkit/helper/vclunohelper.hxx | 37 ++- toolkit/qa/complex/toolkit/GridControl.java | 36 ++- .../awtgrid/TMutableGridDataModel.java | 36 ++- toolkit/qa/unoapi/knownissues.xcl | 18 ++ toolkit/source/awt/animatedimagespeer.cxx | 36 ++- .../awt/non-interactable-containers.xml | 17 ++ toolkit/source/awt/scrollabledialog.cxx | 18 ++ toolkit/source/awt/stylesettings.cxx | 36 ++- toolkit/source/awt/stylesettings.hxx | 36 ++- .../source/awt/vclxaccessiblecomponent.cxx | 37 ++- toolkit/source/awt/vclxbitmap.cxx | 37 ++- toolkit/source/awt/vclxcontainer.cxx | 37 ++- toolkit/source/awt/vclxdevice.cxx | 37 ++- toolkit/source/awt/vclxfont.cxx | 74 ++---- toolkit/source/awt/vclxgraphics.cxx | 37 ++- toolkit/source/awt/vclxmenu.cxx | 37 ++- toolkit/source/awt/vclxpointer.cxx | 37 ++- toolkit/source/awt/vclxprinter.cxx | 37 ++- toolkit/source/awt/vclxregion.cxx | 37 ++- toolkit/source/awt/vclxspinbutton.cxx | 37 ++- .../source/awt/vclxsystemdependentwindow.cxx | 37 ++- toolkit/source/awt/vclxtabpagecontainer.cxx | 37 ++- toolkit/source/awt/vclxtabpagemodel.cxx | 37 ++- toolkit/source/awt/vclxtoolkit.cxx | 37 ++- toolkit/source/awt/vclxtopwindow.cxx | 37 ++- toolkit/source/awt/vclxwindow.cxx | 37 ++- toolkit/source/awt/vclxwindow1.cxx | 37 ++- toolkit/source/awt/vclxwindows.cxx | 37 ++- toolkit/source/awt/xthrobber.cxx | 37 ++- toolkit/source/awt/xthrobber.src | 37 ++- .../controls/accessiblecontrolcontext.cxx | 37 ++- toolkit/source/controls/animatedimages.cxx | 36 ++- .../controls/controlmodelcontainerbase.cxx | 37 ++- toolkit/source/controls/dialogcontrol.cxx | 37 ++- toolkit/source/controls/eventcontainer.cxx | 37 ++- toolkit/source/controls/formattedcontrol.cxx | 37 ++- .../source/controls/geometrycontrolmodel.cxx | 37 ++- .../controls/grid/defaultgridcolumnmodel.cxx | 37 ++- .../controls/grid/defaultgriddatamodel.cxx | 37 ++- .../controls/grid/defaultgriddatamodel.hxx | 37 ++- toolkit/source/controls/grid/gridcolumn.cxx | 37 ++- toolkit/source/controls/grid/gridcontrol.cxx | 37 ++- toolkit/source/controls/grid/gridcontrol.hxx | 37 ++- .../controls/grid/sortablegriddatamodel.cxx | 36 ++- .../controls/grid/sortablegriddatamodel.hxx | 36 ++- toolkit/source/controls/roadmapcontrol.cxx | 37 ++- toolkit/source/controls/roadmapentry.cxx | 37 ++- toolkit/source/controls/spinningprogress.cxx | 36 ++- toolkit/source/controls/stdtabcontroller.cxx | 37 ++- .../source/controls/stdtabcontrollermodel.cxx | 37 ++- toolkit/source/controls/tabpagecontainer.cxx | 37 ++- toolkit/source/controls/tabpagemodel.cxx | 37 ++- toolkit/source/controls/tkscrollbar.cxx | 37 ++- toolkit/source/controls/tksimpleanimation.cxx | 37 ++- toolkit/source/controls/tkspinbutton.cxx | 37 ++- toolkit/source/controls/tkthrobber.cxx | 37 ++- toolkit/source/controls/tree/treecontrol.cxx | 37 ++- .../source/controls/tree/treedatamodel.cxx | 37 ++- toolkit/source/controls/unocontrol.cxx | 37 ++- toolkit/source/controls/unocontrolbase.cxx | 37 ++- .../source/controls/unocontrolcontainer.cxx | 37 ++- toolkit/source/controls/unocontrolmodel.cxx | 37 ++- toolkit/source/controls/unocontrols.cxx | 37 ++- toolkit/source/helper/accessibilityclient.cxx | 37 ++- toolkit/source/helper/formpdfexport.cxx | 37 ++- toolkit/source/helper/imagealign.cxx | 37 ++- toolkit/source/helper/listenermultiplexer.cxx | 37 ++- toolkit/source/helper/property.cxx | 37 ++- toolkit/source/helper/registerservices.cxx | 37 ++- toolkit/source/helper/servicenames.cxx | 37 ++- toolkit/source/helper/tkresmgr.cxx | 37 ++- .../source/helper/unopropertyarrayhelper.cxx | 37 ++- toolkit/source/helper/unowrapper.cxx | 37 ++- toolkit/source/helper/vclunohelper.cxx | 37 ++- toolkit/util/tk.component | 43 ++-- 952 files changed, 15396 insertions(+), 9347 deletions(-) delete mode 100644 shell/qa/i_xml_parser_event_handler.hxx delete mode 100644 shell/qa/makefile.mk delete mode 100644 shell/qa/recent_docs.cxx create mode 100644 shell/qa/zip/export.map create mode 100644 shell/qa/zip/makefile.mk create mode 100644 shell/qa/zip/simpledocument.odt create mode 100644 shell/qa/zip/testimpl/makefile.mk create mode 100644 shell/qa/zip/testimpl/testzipimpl.cxx create mode 100644 shell/qa/zip/testimpl/testzipimpl.hxx create mode 100644 shell/qa/zip/ziptest.cxx mode change 100755 => 100644 shell/source/unix/misc/cde-open-url.sh mode change 100755 => 100644 shell/source/unix/misc/kde-open-url.sh mode change 100755 => 100644 shell/source/unix/misc/senddoc.sh diff --git a/filter/Makefile b/filter/Makefile index ccb1c85a04da..0997e628485b 100644 --- a/filter/Makefile +++ b/filter/Makefile @@ -1,4 +1,11 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) diff --git a/filter/inc/filter/dllapi.h b/filter/inc/filter/dllapi.h index 16ff3055b2d4..9b94621feedf 100644 --- a/filter/inc/filter/dllapi.h +++ b/filter/inc/filter/dllapi.h @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _FILTER_DLLAPI_H #define _FILTER_DLLAPI_H diff --git a/filter/inc/filter/msfilter/mscodec.hxx b/filter/inc/filter/msfilter/mscodec.hxx index 63afd9456078..f321441e2941 100644 --- a/filter/inc/filter/msfilter/mscodec.hxx +++ b/filter/inc/filter/msfilter/mscodec.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef SVX_MSCODEC_HXX #define SVX_MSCODEC_HXX diff --git a/filter/inc/filter/msfilter/msocximex.hxx b/filter/inc/filter/msfilter/msocximex.hxx index 7fd3cf095db1..79815e49126e 100644 --- a/filter/inc/filter/msfilter/msocximex.hxx +++ b/filter/inc/filter/msfilter/msocximex.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _MSOCXIMEX_HXX #define _MSOCXIMEX_HXX diff --git a/filter/inc/filter/msfilter/msvbahelper.hxx b/filter/inc/filter/msfilter/msvbahelper.hxx index e7e653347626..a0405e63f447 100644 --- a/filter/inc/filter/msfilter/msvbahelper.hxx +++ b/filter/inc/filter/msfilter/msvbahelper.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _MSVBAHELPER_HXX #define _MSVBAHELPER_HXX diff --git a/filter/inc/filter/msfilter/svdfppt.hxx b/filter/inc/filter/msfilter/svdfppt.hxx index 18b8574de005..8250c7279cdc 100644 --- a/filter/inc/filter/msfilter/svdfppt.hxx +++ b/filter/inc/filter/msfilter/svdfppt.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVDFPPT_HXX #define _SVDFPPT_HXX diff --git a/filter/inc/filter/msfilter/svxmsbas.hxx b/filter/inc/filter/msfilter/svxmsbas.hxx index 352d3eac4922..66df15e03af0 100644 --- a/filter/inc/filter/msfilter/svxmsbas.hxx +++ b/filter/inc/filter/msfilter/svxmsbas.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVXMSBAS_HXX #define _SVXMSBAS_HXX diff --git a/filter/qa/complex/filter/detection/typeDetection/makefile.mk b/filter/qa/complex/filter/detection/typeDetection/makefile.mk index 87d348085200..94dca18d6c8d 100644 --- a/filter/qa/complex/filter/detection/typeDetection/makefile.mk +++ b/filter/qa/complex/filter/detection/typeDetection/makefile.mk @@ -1,29 +1,20 @@ -#************************************************************************* # -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. +# This file is part of the LibreOffice project. # -# OpenOffice.org - a multi-platform office productivity suite +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# This file is part of OpenOffice.org. +# This file incorporates work covered by the following license notice: # -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . # -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* PRJ = ..$/..$/..$/..$/.. PRJNAME = filter TARGET = TypeDetection diff --git a/filter/qa/complex/filter/misc/TypeDetection6FileFormat.xcu b/filter/qa/complex/filter/misc/TypeDetection6FileFormat.xcu index 65d1472536bd..2206e694295a 100644 --- a/filter/qa/complex/filter/misc/TypeDetection6FileFormat.xcu +++ b/filter/qa/complex/filter/misc/TypeDetection6FileFormat.xcu @@ -1,3 +1,20 @@ + diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx index c7fdc8312047..c25a8af0d9c3 100644 --- a/filter/source/config/cache/basecontainer.cxx +++ b/filter/source/config/cache/basecontainer.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "basecontainer.hxx" diff --git a/filter/source/config/cache/basecontainer.hxx b/filter/source/config/cache/basecontainer.hxx index dd07cc602170..19000c80895d 100644 --- a/filter/source/config/cache/basecontainer.hxx +++ b/filter/source/config/cache/basecontainer.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef __FILTER_CONFIG_BASECONTAINER_HXX_ #define __FILTER_CONFIG_BASECONTAINER_HXX_ diff --git a/filter/source/config/cache/cacheitem.cxx b/filter/source/config/cache/cacheitem.cxx index d323334ec60c..a743c605d445 100644 --- a/filter/source/config/cache/cacheitem.cxx +++ b/filter/source/config/cache/cacheitem.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "cacheitem.hxx" diff --git a/filter/source/config/cache/cacheitem.hxx b/filter/source/config/cache/cacheitem.hxx index 66742da7c7f2..9b24cdbd9b4f 100644 --- a/filter/source/config/cache/cacheitem.hxx +++ b/filter/source/config/cache/cacheitem.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef __FILTER_CONFIG_CACHEITEM_HXX_ #define __FILTER_CONFIG_CACHEITEM_HXX_ diff --git a/filter/source/config/cache/cacheupdatelistener.cxx b/filter/source/config/cache/cacheupdatelistener.cxx index 03fb98ee3b12..6062d2a6657f 100644 --- a/filter/source/config/cache/cacheupdatelistener.cxx +++ b/filter/source/config/cache/cacheupdatelistener.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "cacheupdatelistener.hxx" diff --git a/filter/source/config/cache/cacheupdatelistener.hxx b/filter/source/config/cache/cacheupdatelistener.hxx index ba0d60b0b784..b103406c97a9 100644 --- a/filter/source/config/cache/cacheupdatelistener.hxx +++ b/filter/source/config/cache/cacheupdatelistener.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef __FILTER_CONFIG_CACHEUPDATELISTENER_HXX_ #define __FILTER_CONFIG_CACHEUPDATELISTENER_HXX_ diff --git a/filter/source/config/cache/configflush.cxx b/filter/source/config/cache/configflush.cxx index 95b66c7a0299..ede6ce6258ac 100644 --- a/filter/source/config/cache/configflush.cxx +++ b/filter/source/config/cache/configflush.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "configflush.hxx" diff --git a/filter/source/config/cache/constant.hxx b/filter/source/config/cache/constant.hxx index 7d27ffc065fb..07762dc35c4e 100644 --- a/filter/source/config/cache/constant.hxx +++ b/filter/source/config/cache/constant.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _FILTER_CONFIG_CONSTANT_HXX_ #define _FILTER_CONFIG_CONSTANT_HXX_ diff --git a/filter/source/config/cache/contenthandlerfactory.cxx b/filter/source/config/cache/contenthandlerfactory.cxx index 6f357b6942bd..c25f01130673 100644 --- a/filter/source/config/cache/contenthandlerfactory.cxx +++ b/filter/source/config/cache/contenthandlerfactory.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "contenthandlerfactory.hxx" diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index 764c085d98c2..9159f20a19ab 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "filtercache.hxx" diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx index e47fe7430ab8..dc83f9d49a0c 100644 --- a/filter/source/config/cache/filtercache.hxx +++ b/filter/source/config/cache/filtercache.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef __FILTER_CONFIG_FILTERCACHE_HXX_ #define __FILTER_CONFIG_FILTERCACHE_HXX_ diff --git a/filter/source/config/cache/filterconfig1.component b/filter/source/config/cache/filterconfig1.component index 1d6c0153a64c..c2d3364c29c8 100644 --- a/filter/source/config/cache/filterconfig1.component +++ b/filter/source/config/cache/filterconfig1.component @@ -1,30 +1,21 @@ - + diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx index cb09da6c94ad..931b3f28df31 100644 --- a/filter/source/config/cache/filterfactory.cxx +++ b/filter/source/config/cache/filterfactory.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "filterfactory.hxx" diff --git a/filter/source/config/cache/frameloaderfactory.cxx b/filter/source/config/cache/frameloaderfactory.cxx index 12a91870d007..d393b6a89901 100644 --- a/filter/source/config/cache/frameloaderfactory.cxx +++ b/filter/source/config/cache/frameloaderfactory.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "frameloaderfactory.hxx" diff --git a/filter/source/config/cache/lateinitlistener.cxx b/filter/source/config/cache/lateinitlistener.cxx index 517b1f27e299..c3c5a265e7eb 100644 --- a/filter/source/config/cache/lateinitlistener.cxx +++ b/filter/source/config/cache/lateinitlistener.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/filter/source/config/cache/lateinitthread.cxx b/filter/source/config/cache/lateinitthread.cxx index 80b9348b9b48..744ca5e19ae8 100644 --- a/filter/source/config/cache/lateinitthread.cxx +++ b/filter/source/config/cache/lateinitthread.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/filter/source/config/cache/lateinitthread.hxx b/filter/source/config/cache/lateinitthread.hxx index 3ade96ff4e8b..db5904affb0d 100644 --- a/filter/source/config/cache/lateinitthread.hxx +++ b/filter/source/config/cache/lateinitthread.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_FILTER_SOURCE_CONFIG_CACHE_LATEINITTHREAD_HXX #define INCLUDED_FILTER_SOURCE_CONFIG_CACHE_LATEINITTHREAD_HXX diff --git a/filter/source/config/cache/macros.hxx b/filter/source/config/cache/macros.hxx index 048acec6c111..a308f1fadb22 100644 --- a/filter/source/config/cache/macros.hxx +++ b/filter/source/config/cache/macros.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _FILTER_CONFIG_MACROS_HXX_ #define _FILTER_CONFIG_MACROS_HXX_ diff --git a/filter/source/config/cache/querytokenizer.cxx b/filter/source/config/cache/querytokenizer.cxx index c66eba767c9a..a75d1290e873 100644 --- a/filter/source/config/cache/querytokenizer.cxx +++ b/filter/source/config/cache/querytokenizer.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "querytokenizer.hxx" diff --git a/filter/source/config/cache/querytokenizer.hxx b/filter/source/config/cache/querytokenizer.hxx index 3793b94c1480..30c5305af9a9 100644 --- a/filter/source/config/cache/querytokenizer.hxx +++ b/filter/source/config/cache/querytokenizer.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _FILTER_CONFIG_QUERYTOKENIZER_HXX_ #define _FILTER_CONFIG_QUERYTOKENIZER_HXX_ diff --git a/filter/source/config/cache/registration.cxx b/filter/source/config/cache/registration.cxx index 17967f4c2b3b..e4a7baea55d2 100644 --- a/filter/source/config/cache/registration.cxx +++ b/filter/source/config/cache/registration.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx index 5f3251985eee..144ea33e9388 100644 --- a/filter/source/config/cache/typedetection.cxx +++ b/filter/source/config/cache/typedetection.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "typedetection.hxx" #include "constant.hxx" diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx index 97a2252a49f2..0aa87e81d228 100644 --- a/filter/source/config/cache/typedetection.hxx +++ b/filter/source/config/cache/typedetection.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef __FILTER_CONFIG_TYPEDETECTION_HXX_ #define __FILTER_CONFIG_TYPEDETECTION_HXX_ diff --git a/filter/source/config/fragments/contenthandlers/com_sun_star_comp_framework_SoundHandler.xcu b/filter/source/config/fragments/contenthandlers/com_sun_star_comp_framework_SoundHandler.xcu index 37971f848bef..f49e237d9525 100644 --- a/filter/source/config/fragments/contenthandlers/com_sun_star_comp_framework_SoundHandler.xcu +++ b/filter/source/config/fragments/contenthandlers/com_sun_star_comp_framework_SoundHandler.xcu @@ -1,3 +1,20 @@ + wav_Wave_Audio_File diff --git a/filter/source/config/fragments/contenthandlers/com_sun_star_comp_framework_oxt_handler.xcu b/filter/source/config/fragments/contenthandlers/com_sun_star_comp_framework_oxt_handler.xcu index e2b49b8d12b0..2ae506aeaf02 100644 --- a/filter/source/config/fragments/contenthandlers/com_sun_star_comp_framework_oxt_handler.xcu +++ b/filter/source/config/fragments/contenthandlers/com_sun_star_comp_framework_oxt_handler.xcu @@ -1,3 +1,20 @@ + oxt_OpenOffice_Extension diff --git a/filter/source/config/fragments/filters/AportisDoc_Palm_DB.xcu b/filter/source/config/fragments/filters/AportisDoc_Palm_DB.xcu index d3d65abc8f8b..1ef8017faa41 100644 --- a/filter/source/config/fragments/filters/AportisDoc_Palm_DB.xcu +++ b/filter/source/config/fragments/filters/AportisDoc_Palm_DB.xcu @@ -1,3 +1,20 @@ + 0 writer_AportisDoc_PalmDB_File diff --git a/filter/source/config/fragments/filters/BMP___MS_Windows.xcu b/filter/source/config/fragments/filters/BMP___MS_Windows.xcu index 911d2841351a..184b83467a92 100644 --- a/filter/source/config/fragments/filters/BMP___MS_Windows.xcu +++ b/filter/source/config/fragments/filters/BMP___MS_Windows.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN diff --git a/filter/source/config/fragments/filters/CGM___Computer_Graphics_Metafile.xcu b/filter/source/config/fragments/filters/CGM___Computer_Graphics_Metafile.xcu index 652821c72247..3dac03d358f6 100644 --- a/filter/source/config/fragments/filters/CGM___Computer_Graphics_Metafile.xcu +++ b/filter/source/config/fragments/filters/CGM___Computer_Graphics_Metafile.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN diff --git a/filter/source/config/fragments/filters/CorelDrawDocument.xcu b/filter/source/config/fragments/filters/CorelDrawDocument.xcu index 1f3a3c44fc76..e52052faa3d2 100644 --- a/filter/source/config/fragments/filters/CorelDrawDocument.xcu +++ b/filter/source/config/fragments/filters/CorelDrawDocument.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED diff --git a/filter/source/config/fragments/filters/CorelPresentationExchange.xcu b/filter/source/config/fragments/filters/CorelPresentationExchange.xcu index 09c3e152920b..a3fb74f4581f 100644 --- a/filter/source/config/fragments/filters/CorelPresentationExchange.xcu +++ b/filter/source/config/fragments/filters/CorelPresentationExchange.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED diff --git a/filter/source/config/fragments/filters/DIF.xcu b/filter/source/config/fragments/filters/DIF.xcu index c331ba028e13..04645e7d7fc7 100644 --- a/filter/source/config/fragments/filters/DIF.xcu +++ b/filter/source/config/fragments/filters/DIF.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT ALIEN USESOPTIONS com.sun.star.comp.Calc.FilterOptionsDialog diff --git a/filter/source/config/fragments/filters/DXF___AutoCAD_Interchange.xcu b/filter/source/config/fragments/filters/DXF___AutoCAD_Interchange.xcu index 699622528196..cc27ebe942a1 100644 --- a/filter/source/config/fragments/filters/DXF___AutoCAD_Interchange.xcu +++ b/filter/source/config/fragments/filters/DXF___AutoCAD_Interchange.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN diff --git a/filter/source/config/fragments/filters/DocBook_File.xcu b/filter/source/config/fragments/filters/DocBook_File.xcu index 07eb48046acb..c76b5ca32e1d 100644 --- a/filter/source/config/fragments/filters/DocBook_File.xcu +++ b/filter/source/config/fragments/filters/DocBook_File.xcu @@ -1,3 +1,20 @@ + 0 writer_DocBook_File diff --git a/filter/source/config/fragments/filters/EMF___MS_Windows_Metafile.xcu b/filter/source/config/fragments/filters/EMF___MS_Windows_Metafile.xcu index 3420e53180e9..74c06fb2a22a 100644 --- a/filter/source/config/fragments/filters/EMF___MS_Windows_Metafile.xcu +++ b/filter/source/config/fragments/filters/EMF___MS_Windows_Metafile.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN diff --git a/filter/source/config/fragments/filters/EPS___Encapsulated_PostScript.xcu b/filter/source/config/fragments/filters/EPS___Encapsulated_PostScript.xcu index d73045dacc2d..b643c052eb70 100644 --- a/filter/source/config/fragments/filters/EPS___Encapsulated_PostScript.xcu +++ b/filter/source/config/fragments/filters/EPS___Encapsulated_PostScript.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN diff --git a/filter/source/config/fragments/filters/GIF___Graphics_Interchange.xcu b/filter/source/config/fragments/filters/GIF___Graphics_Interchange.xcu index b0db0e0b7298..bd682728e3e6 100644 --- a/filter/source/config/fragments/filters/GIF___Graphics_Interchange.xcu +++ b/filter/source/config/fragments/filters/GIF___Graphics_Interchange.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN diff --git a/filter/source/config/fragments/filters/HTML.xcu b/filter/source/config/fragments/filters/HTML.xcu index 19c341228897..1dbbbcb44a49 100644 --- a/filter/source/config/fragments/filters/HTML.xcu +++ b/filter/source/config/fragments/filters/HTML.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT ASYNCHRON PREFERRED diff --git a/filter/source/config/fragments/filters/HTML_MasterDoc.xcu b/filter/source/config/fragments/filters/HTML_MasterDoc.xcu index b17b5017509a..0dcba4332ade 100644 --- a/filter/source/config/fragments/filters/HTML_MasterDoc.xcu +++ b/filter/source/config/fragments/filters/HTML_MasterDoc.xcu @@ -1,3 +1,20 @@ + 0 generic_HTML diff --git a/filter/source/config/fragments/filters/HTML_MasterDoc_ui.xcu b/filter/source/config/fragments/filters/HTML_MasterDoc_ui.xcu index 946e7ef125c0..a3ae5b2686b4 100644 --- a/filter/source/config/fragments/filters/HTML_MasterDoc_ui.xcu +++ b/filter/source/config/fragments/filters/HTML_MasterDoc_ui.xcu @@ -1,3 +1,20 @@ + HTML Document (Master Document) diff --git a/filter/source/config/fragments/filters/HTML__StarCalc_.xcu b/filter/source/config/fragments/filters/HTML__StarCalc_.xcu index e4d3c6b1a8ab..70dc521dfb1e 100644 --- a/filter/source/config/fragments/filters/HTML__StarCalc_.xcu +++ b/filter/source/config/fragments/filters/HTML__StarCalc_.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT ALIEN USEOPTIONS com.sun.star.comp.Calc.FilterOptionsDialog diff --git a/filter/source/config/fragments/filters/HTML__StarCalc__ui.xcu b/filter/source/config/fragments/filters/HTML__StarCalc__ui.xcu index f25eee2a5168..1d13a85e3a9b 100644 --- a/filter/source/config/fragments/filters/HTML__StarCalc__ui.xcu +++ b/filter/source/config/fragments/filters/HTML__StarCalc__ui.xcu @@ -1,3 +1,20 @@ + HTML Document (Calc) diff --git a/filter/source/config/fragments/filters/HTML__StarWriter_.xcu b/filter/source/config/fragments/filters/HTML__StarWriter_.xcu index 412031d97324..84bddfd5a6a0 100644 --- a/filter/source/config/fragments/filters/HTML__StarWriter_.xcu +++ b/filter/source/config/fragments/filters/HTML__StarWriter_.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT ALIEN ASYNCHRON diff --git a/filter/source/config/fragments/filters/HTML__StarWriter__ui.xcu b/filter/source/config/fragments/filters/HTML__StarWriter__ui.xcu index 7cddf42b89c3..ad573010da0e 100644 --- a/filter/source/config/fragments/filters/HTML__StarWriter__ui.xcu +++ b/filter/source/config/fragments/filters/HTML__StarWriter__ui.xcu @@ -1,3 +1,20 @@ + HTML Document (Writer) diff --git a/filter/source/config/fragments/filters/HTML_ui.xcu b/filter/source/config/fragments/filters/HTML_ui.xcu index 2549c90d0676..3920874dd4dc 100644 --- a/filter/source/config/fragments/filters/HTML_ui.xcu +++ b/filter/source/config/fragments/filters/HTML_ui.xcu @@ -1,3 +1,20 @@ + HTML Document diff --git a/filter/source/config/fragments/filters/JPG___JPEG.xcu b/filter/source/config/fragments/filters/JPG___JPEG.xcu index cefaa6416ec8..fcf623ce4ef9 100644 --- a/filter/source/config/fragments/filters/JPG___JPEG.xcu +++ b/filter/source/config/fragments/filters/JPG___JPEG.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN diff --git a/filter/source/config/fragments/filters/Lotus.xcu b/filter/source/config/fragments/filters/Lotus.xcu index cff013910f8c..4bdc42718df2 100644 --- a/filter/source/config/fragments/filters/Lotus.xcu +++ b/filter/source/config/fragments/filters/Lotus.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN USESOPTIONS PREFERRED com.sun.star.comp.Calc.FilterOptionsDialog diff --git a/filter/source/config/fragments/filters/LotusWordPro.xcu b/filter/source/config/fragments/filters/LotusWordPro.xcu index 74ddf39b6a46..3bd2df0fa513 100644 --- a/filter/source/config/fragments/filters/LotusWordPro.xcu +++ b/filter/source/config/fragments/filters/LotusWordPro.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED diff --git a/filter/source/config/fragments/filters/MET___OS_2_Metafile.xcu b/filter/source/config/fragments/filters/MET___OS_2_Metafile.xcu index f37c131e7837..6f6256fb523b 100644 --- a/filter/source/config/fragments/filters/MET___OS_2_Metafile.xcu +++ b/filter/source/config/fragments/filters/MET___OS_2_Metafile.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN diff --git a/filter/source/config/fragments/filters/MS_Excel_2003_XML.xcu b/filter/source/config/fragments/filters/MS_Excel_2003_XML.xcu index d0d2b13e5584..6e56d00dd704 100644 --- a/filter/source/config/fragments/filters/MS_Excel_2003_XML.xcu +++ b/filter/source/config/fragments/filters/MS_Excel_2003_XML.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/MS_Excel_2003_XML_ui.xcu b/filter/source/config/fragments/filters/MS_Excel_2003_XML_ui.xcu index 5d7c7d80dbdf..9fa9d9e3f83a 100644 --- a/filter/source/config/fragments/filters/MS_Excel_2003_XML_ui.xcu +++ b/filter/source/config/fragments/filters/MS_Excel_2003_XML_ui.xcu @@ -1,3 +1,20 @@ + Microsoft Excel 2003 XML diff --git a/filter/source/config/fragments/filters/MS_Excel_4_0.xcu b/filter/source/config/fragments/filters/MS_Excel_4_0.xcu index f0c5bd97fd16..238f892f1289 100644 --- a/filter/source/config/fragments/filters/MS_Excel_4_0.xcu +++ b/filter/source/config/fragments/filters/MS_Excel_4_0.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN PREFERRED diff --git a/filter/source/config/fragments/filters/MS_Excel_4_0_Vorlage_Template.xcu b/filter/source/config/fragments/filters/MS_Excel_4_0_Vorlage_Template.xcu index 5366f1282ece..8bee0c3e392a 100644 --- a/filter/source/config/fragments/filters/MS_Excel_4_0_Vorlage_Template.xcu +++ b/filter/source/config/fragments/filters/MS_Excel_4_0_Vorlage_Template.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN TEMPLATE TEMPLATEPATH diff --git a/filter/source/config/fragments/filters/MS_Excel_4_0_Vorlage_Template_ui.xcu b/filter/source/config/fragments/filters/MS_Excel_4_0_Vorlage_Template_ui.xcu index c68e1e33ac8a..16d4cde5f383 100644 --- a/filter/source/config/fragments/filters/MS_Excel_4_0_Vorlage_Template_ui.xcu +++ b/filter/source/config/fragments/filters/MS_Excel_4_0_Vorlage_Template_ui.xcu @@ -1,3 +1,20 @@ + Microsoft Excel 4.0 Template diff --git a/filter/source/config/fragments/filters/MS_Excel_5_0_95.xcu b/filter/source/config/fragments/filters/MS_Excel_5_0_95.xcu index 21c8a0c2d67f..d7fc94471cd0 100644 --- a/filter/source/config/fragments/filters/MS_Excel_5_0_95.xcu +++ b/filter/source/config/fragments/filters/MS_Excel_5_0_95.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT ALIEN PREFERRED diff --git a/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template.xcu b/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template.xcu index 1fef8ef27461..edfb473bfa26 100644 --- a/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template.xcu +++ b/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT ALIEN TEMPLATE TEMPLATEPATH diff --git a/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template_ui.xcu b/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template_ui.xcu index d50a4aa4d941..b84d9cc7d899 100644 --- a/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template_ui.xcu +++ b/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template_ui.xcu @@ -1,3 +1,20 @@ + Microsoft Excel 5.0 Template diff --git a/filter/source/config/fragments/filters/MS_Excel_95.xcu b/filter/source/config/fragments/filters/MS_Excel_95.xcu index 1fa61477f073..79d259d79e08 100644 --- a/filter/source/config/fragments/filters/MS_Excel_95.xcu +++ b/filter/source/config/fragments/filters/MS_Excel_95.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT ALIEN PREFERRED diff --git a/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template.xcu b/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template.xcu index b14d6619be0d..1ef67567f057 100644 --- a/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template.xcu +++ b/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT ALIEN TEMPLATE TEMPLATEPATH diff --git a/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template_ui.xcu b/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template_ui.xcu index eb44244a400f..a253304ba9e2 100644 --- a/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template_ui.xcu +++ b/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template_ui.xcu @@ -1,3 +1,20 @@ + Microsoft Excel 95 Template diff --git a/filter/source/config/fragments/filters/MS_Excel_97.xcu b/filter/source/config/fragments/filters/MS_Excel_97.xcu index e7def1066420..8a98ce724d16 100644 --- a/filter/source/config/fragments/filters/MS_Excel_97.xcu +++ b/filter/source/config/fragments/filters/MS_Excel_97.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT ALIEN PREFERRED ENCRYPTION PASSWORDTOMODIFY diff --git a/filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template.xcu b/filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template.xcu index 42c997f967f9..b3185407fbc5 100644 --- a/filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template.xcu +++ b/filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT ALIEN TEMPLATE TEMPLATEPATH ENCRYPTION PASSWORDTOMODIFY diff --git a/filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template_ui.xcu b/filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template_ui.xcu index 6d8861f68c8f..884a76d3095b 100644 --- a/filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template_ui.xcu +++ b/filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template_ui.xcu @@ -1,3 +1,20 @@ + Microsoft Excel 97/2000/XP/2003 Template diff --git a/filter/source/config/fragments/filters/MS_PowerPoint_97.xcu b/filter/source/config/fragments/filters/MS_PowerPoint_97.xcu index d929bd956d71..8676f0b2f1e7 100644 --- a/filter/source/config/fragments/filters/MS_PowerPoint_97.xcu +++ b/filter/source/config/fragments/filters/MS_PowerPoint_97.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT ALIEN diff --git a/filter/source/config/fragments/filters/MS_PowerPoint_97_AutoPlay.xcu b/filter/source/config/fragments/filters/MS_PowerPoint_97_AutoPlay.xcu index 3c9fc382c1de..7a9f0b371e05 100644 --- a/filter/source/config/fragments/filters/MS_PowerPoint_97_AutoPlay.xcu +++ b/filter/source/config/fragments/filters/MS_PowerPoint_97_AutoPlay.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT ALIEN STARTPRESENTATION diff --git a/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage.xcu b/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage.xcu index b0776fda9500..6480891dc202 100644 --- a/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage.xcu +++ b/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT TEMPLATE TEMPLATEPATH ALIEN diff --git a/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage_ui.xcu b/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage_ui.xcu index 511a709af6a2..9b432cde0bad 100644 --- a/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage_ui.xcu +++ b/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage_ui.xcu @@ -1,3 +1,20 @@ + Microsoft PowerPoint 97/2000/XP/2003 Template diff --git a/filter/source/config/fragments/filters/MS_WinWord_5.xcu b/filter/source/config/fragments/filters/MS_WinWord_5.xcu index 4f0c51b95fd2..78584ccdde7b 100644 --- a/filter/source/config/fragments/filters/MS_WinWord_5.xcu +++ b/filter/source/config/fragments/filters/MS_WinWord_5.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN diff --git a/filter/source/config/fragments/filters/MS_WinWord_6_0.xcu b/filter/source/config/fragments/filters/MS_WinWord_6_0.xcu index 6c0b17451f0a..00a3aa42bfe9 100644 --- a/filter/source/config/fragments/filters/MS_WinWord_6_0.xcu +++ b/filter/source/config/fragments/filters/MS_WinWord_6_0.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT ALIEN diff --git a/filter/source/config/fragments/filters/MS_Word_2003_XML.xcu b/filter/source/config/fragments/filters/MS_Word_2003_XML.xcu index c953598dd67d..61cdad1fc891 100644 --- a/filter/source/config/fragments/filters/MS_Word_2003_XML.xcu +++ b/filter/source/config/fragments/filters/MS_Word_2003_XML.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/MS_Word_2003_XML_ui.xcu b/filter/source/config/fragments/filters/MS_Word_2003_XML_ui.xcu index d22df3101a6b..6899e9c807be 100644 --- a/filter/source/config/fragments/filters/MS_Word_2003_XML_ui.xcu +++ b/filter/source/config/fragments/filters/MS_Word_2003_XML_ui.xcu @@ -1,3 +1,20 @@ + Microsoft Word 2003 XML diff --git a/filter/source/config/fragments/filters/MS_Word_2007_XML.xcu b/filter/source/config/fragments/filters/MS_Word_2007_XML.xcu index 28667bb40391..7c0b36ad5e93 100644 --- a/filter/source/config/fragments/filters/MS_Word_2007_XML.xcu +++ b/filter/source/config/fragments/filters/MS_Word_2007_XML.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/MS_Word_2007_XML_Template.xcu b/filter/source/config/fragments/filters/MS_Word_2007_XML_Template.xcu index 01a19fd1ab2e..54c9d424f39c 100644 --- a/filter/source/config/fragments/filters/MS_Word_2007_XML_Template.xcu +++ b/filter/source/config/fragments/filters/MS_Word_2007_XML_Template.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN 3RDPARTYFILTER TEMPLATE TEMPLATEPATH diff --git a/filter/source/config/fragments/filters/MS_Word_2007_XML_Template_ui.xcu b/filter/source/config/fragments/filters/MS_Word_2007_XML_Template_ui.xcu index 58f1c30df458..f19605332ffc 100644 --- a/filter/source/config/fragments/filters/MS_Word_2007_XML_Template_ui.xcu +++ b/filter/source/config/fragments/filters/MS_Word_2007_XML_Template_ui.xcu @@ -1,3 +1,20 @@ + Microsoft Word 2007/2010 XML Template diff --git a/filter/source/config/fragments/filters/MS_Word_2007_XML_ui.xcu b/filter/source/config/fragments/filters/MS_Word_2007_XML_ui.xcu index a6d41080b307..51ce55639a48 100644 --- a/filter/source/config/fragments/filters/MS_Word_2007_XML_ui.xcu +++ b/filter/source/config/fragments/filters/MS_Word_2007_XML_ui.xcu @@ -1,3 +1,20 @@ + Microsoft Word 2007/2010 XML diff --git a/filter/source/config/fragments/filters/MS_Word_95.xcu b/filter/source/config/fragments/filters/MS_Word_95.xcu index 40af005de713..ffea860cc6bf 100644 --- a/filter/source/config/fragments/filters/MS_Word_95.xcu +++ b/filter/source/config/fragments/filters/MS_Word_95.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT ALIEN diff --git a/filter/source/config/fragments/filters/MS_Word_95_Vorlage.xcu b/filter/source/config/fragments/filters/MS_Word_95_Vorlage.xcu index 29b93c2eb79f..b13ff148307d 100644 --- a/filter/source/config/fragments/filters/MS_Word_95_Vorlage.xcu +++ b/filter/source/config/fragments/filters/MS_Word_95_Vorlage.xcu @@ -1,3 +1,20 @@ + IMPORT TEMPLATE TEMPLATEPATH ALIEN diff --git a/filter/source/config/fragments/filters/MS_Word_95_Vorlage_ui.xcu b/filter/source/config/fragments/filters/MS_Word_95_Vorlage_ui.xcu index 952bb13bb494..7f2cf5c46118 100644 --- a/filter/source/config/fragments/filters/MS_Word_95_Vorlage_ui.xcu +++ b/filter/source/config/fragments/filters/MS_Word_95_Vorlage_ui.xcu @@ -1,3 +1,20 @@ + Microsoft Word 95 Template diff --git a/filter/source/config/fragments/filters/MS_Word_97.xcu b/filter/source/config/fragments/filters/MS_Word_97.xcu index 886c61cf3175..a239c13ff0d2 100644 --- a/filter/source/config/fragments/filters/MS_Word_97.xcu +++ b/filter/source/config/fragments/filters/MS_Word_97.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT ALIEN PREFERRED ENCRYPTION PASSWORDTOMODIFY diff --git a/filter/source/config/fragments/filters/MS_Word_97_Vorlage.xcu b/filter/source/config/fragments/filters/MS_Word_97_Vorlage.xcu index 35d694a4832d..e222257ba9a6 100644 --- a/filter/source/config/fragments/filters/MS_Word_97_Vorlage.xcu +++ b/filter/source/config/fragments/filters/MS_Word_97_Vorlage.xcu @@ -1,3 +1,20 @@ + IMPORT TEMPLATE TEMPLATEPATH ALIEN ENCRYPTION PASSWORDTOMODIFY diff --git a/filter/source/config/fragments/filters/MS_Word_97_Vorlage_ui.xcu b/filter/source/config/fragments/filters/MS_Word_97_Vorlage_ui.xcu index ff8877af7cc1..62b62bc891a9 100644 --- a/filter/source/config/fragments/filters/MS_Word_97_Vorlage_ui.xcu +++ b/filter/source/config/fragments/filters/MS_Word_97_Vorlage_ui.xcu @@ -1,3 +1,20 @@ + Microsoft Word 97/2000/XP/2003 Template diff --git a/filter/source/config/fragments/filters/MS_Works.xcu b/filter/source/config/fragments/filters/MS_Works.xcu index 29d11f7c63c4..f08e5de2a025 100644 --- a/filter/source/config/fragments/filters/MS_Works.xcu +++ b/filter/source/config/fragments/filters/MS_Works.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/MathML_XML__Math_.xcu b/filter/source/config/fragments/filters/MathML_XML__Math_.xcu index 7c80e41f6030..abf0fffbddb0 100644 --- a/filter/source/config/fragments/filters/MathML_XML__Math_.xcu +++ b/filter/source/config/fragments/filters/MathML_XML__Math_.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT TEMPLATE diff --git a/filter/source/config/fragments/filters/MathType_3_x.xcu b/filter/source/config/fragments/filters/MathType_3_x.xcu index 93637ee583b2..06cb467acb59 100644 --- a/filter/source/config/fragments/filters/MathType_3_x.xcu +++ b/filter/source/config/fragments/filters/MathType_3_x.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT ALIEN NOTINFILEDIALOG NOTINCHOOSER diff --git a/filter/source/config/fragments/filters/MiniCalc__Palm_.xcu b/filter/source/config/fragments/filters/MiniCalc__Palm_.xcu index 234d187c2b08..6d3797c994bc 100644 --- a/filter/source/config/fragments/filters/MiniCalc__Palm_.xcu +++ b/filter/source/config/fragments/filters/MiniCalc__Palm_.xcu @@ -1,3 +1,20 @@ + 1 calc_MiniCalc_PalmDB_File diff --git a/filter/source/config/fragments/filters/ODG_FlatXML.xcu b/filter/source/config/fragments/filters/ODG_FlatXML.xcu index 0e386addbca6..f370f4309988 100644 --- a/filter/source/config/fragments/filters/ODG_FlatXML.xcu +++ b/filter/source/config/fragments/filters/ODG_FlatXML.xcu @@ -1,3 +1,20 @@ + 0 draw_ODG_FlatXML diff --git a/filter/source/config/fragments/filters/ODP_FlatXML.xcu b/filter/source/config/fragments/filters/ODP_FlatXML.xcu index 121cb2d3ffd7..c45962f03ee6 100644 --- a/filter/source/config/fragments/filters/ODP_FlatXML.xcu +++ b/filter/source/config/fragments/filters/ODP_FlatXML.xcu @@ -1,3 +1,20 @@ + 0 impress_ODP_FlatXML diff --git a/filter/source/config/fragments/filters/ODS_FlatXML.xcu b/filter/source/config/fragments/filters/ODS_FlatXML.xcu index 7ae34aa22818..4c8b7b6b41a4 100644 --- a/filter/source/config/fragments/filters/ODS_FlatXML.xcu +++ b/filter/source/config/fragments/filters/ODS_FlatXML.xcu @@ -1,3 +1,20 @@ + 0 calc_ODS_FlatXML diff --git a/filter/source/config/fragments/filters/ODT_FlatXML.xcu b/filter/source/config/fragments/filters/ODT_FlatXML.xcu index e08d39d3fc39..aa28ef5ef6a8 100644 --- a/filter/source/config/fragments/filters/ODT_FlatXML.xcu +++ b/filter/source/config/fragments/filters/ODT_FlatXML.xcu @@ -1,3 +1,20 @@ + 0 writer_ODT_FlatXML diff --git a/filter/source/config/fragments/filters/OOXML_Text.xcu b/filter/source/config/fragments/filters/OOXML_Text.xcu index 9943af592174..e53e1dddabc2 100644 --- a/filter/source/config/fragments/filters/OOXML_Text.xcu +++ b/filter/source/config/fragments/filters/OOXML_Text.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/OOXML_Text_Template.xcu b/filter/source/config/fragments/filters/OOXML_Text_Template.xcu index ffc9dfd6e2d7..12bcc665e8d3 100644 --- a/filter/source/config/fragments/filters/OOXML_Text_Template.xcu +++ b/filter/source/config/fragments/filters/OOXML_Text_Template.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN 3RDPARTYFILTER TEMPLATE TEMPLATEPATH diff --git a/filter/source/config/fragments/filters/OOXML_Text_Template_ui.xcu b/filter/source/config/fragments/filters/OOXML_Text_Template_ui.xcu index 0aa87182ce2b..d21ebb42d224 100644 --- a/filter/source/config/fragments/filters/OOXML_Text_Template_ui.xcu +++ b/filter/source/config/fragments/filters/OOXML_Text_Template_ui.xcu @@ -1,3 +1,20 @@ + Office Open XML Text Template diff --git a/filter/source/config/fragments/filters/OOXML_Text_ui.xcu b/filter/source/config/fragments/filters/OOXML_Text_ui.xcu index 1a4e357460dc..a23d35f8c912 100644 --- a/filter/source/config/fragments/filters/OOXML_Text_ui.xcu +++ b/filter/source/config/fragments/filters/OOXML_Text_ui.xcu @@ -1,3 +1,20 @@ + Office Open XML Text diff --git a/filter/source/config/fragments/filters/PBM___Portable_Bitmap.xcu b/filter/source/config/fragments/filters/PBM___Portable_Bitmap.xcu index b5d30b17fd5a..0e1b2750cbf4 100644 --- a/filter/source/config/fragments/filters/PBM___Portable_Bitmap.xcu +++ b/filter/source/config/fragments/filters/PBM___Portable_Bitmap.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN diff --git a/filter/source/config/fragments/filters/PCT___Mac_Pict.xcu b/filter/source/config/fragments/filters/PCT___Mac_Pict.xcu index 34816883e8d5..de6cb9a2e719 100644 --- a/filter/source/config/fragments/filters/PCT___Mac_Pict.xcu +++ b/filter/source/config/fragments/filters/PCT___Mac_Pict.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN diff --git a/filter/source/config/fragments/filters/PCX___Zsoft_Paintbrush.xcu b/filter/source/config/fragments/filters/PCX___Zsoft_Paintbrush.xcu index ad56e44c0314..c79f1b3c3237 100644 --- a/filter/source/config/fragments/filters/PCX___Zsoft_Paintbrush.xcu +++ b/filter/source/config/fragments/filters/PCX___Zsoft_Paintbrush.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN diff --git a/filter/source/config/fragments/filters/PGM___Portable_Graymap.xcu b/filter/source/config/fragments/filters/PGM___Portable_Graymap.xcu index e79262752cf5..b9f7645c1880 100644 --- a/filter/source/config/fragments/filters/PGM___Portable_Graymap.xcu +++ b/filter/source/config/fragments/filters/PGM___Portable_Graymap.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN diff --git a/filter/source/config/fragments/filters/PNG___Portable_Network_Graphic.xcu b/filter/source/config/fragments/filters/PNG___Portable_Network_Graphic.xcu index d96ce0f9fbd4..43c36f98095c 100644 --- a/filter/source/config/fragments/filters/PNG___Portable_Network_Graphic.xcu +++ b/filter/source/config/fragments/filters/PNG___Portable_Network_Graphic.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN diff --git a/filter/source/config/fragments/filters/PPM___Portable_Pixelmap.xcu b/filter/source/config/fragments/filters/PPM___Portable_Pixelmap.xcu index fec669f4ee5b..353d664fc5a9 100644 --- a/filter/source/config/fragments/filters/PPM___Portable_Pixelmap.xcu +++ b/filter/source/config/fragments/filters/PPM___Portable_Pixelmap.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN diff --git a/filter/source/config/fragments/filters/PSD___Adobe_Photoshop.xcu b/filter/source/config/fragments/filters/PSD___Adobe_Photoshop.xcu index 95683a6de6b5..b115aea1954f 100644 --- a/filter/source/config/fragments/filters/PSD___Adobe_Photoshop.xcu +++ b/filter/source/config/fragments/filters/PSD___Adobe_Photoshop.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN diff --git a/filter/source/config/fragments/filters/PocketWord_File.xcu b/filter/source/config/fragments/filters/PocketWord_File.xcu index 87d4cf74a40a..aeee0494e1a8 100644 --- a/filter/source/config/fragments/filters/PocketWord_File.xcu +++ b/filter/source/config/fragments/filters/PocketWord_File.xcu @@ -1,3 +1,20 @@ + 0 writer_PocketWord_File diff --git a/filter/source/config/fragments/filters/Pocket_Excel.xcu b/filter/source/config/fragments/filters/Pocket_Excel.xcu index 2fe86184a1cc..ae698a62f0ef 100644 --- a/filter/source/config/fragments/filters/Pocket_Excel.xcu +++ b/filter/source/config/fragments/filters/Pocket_Excel.xcu @@ -1,3 +1,20 @@ + 1 calc_Pocket_Excel_File diff --git a/filter/source/config/fragments/filters/PublisherDocument.xcu b/filter/source/config/fragments/filters/PublisherDocument.xcu index 0bf97ebff555..7f24ff8f8571 100644 --- a/filter/source/config/fragments/filters/PublisherDocument.xcu +++ b/filter/source/config/fragments/filters/PublisherDocument.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED diff --git a/filter/source/config/fragments/filters/QPro.xcu b/filter/source/config/fragments/filters/QPro.xcu index 950dcaef2758..c266e74ad5c6 100644 --- a/filter/source/config/fragments/filters/QPro.xcu +++ b/filter/source/config/fragments/filters/QPro.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN PREFERRED diff --git a/filter/source/config/fragments/filters/RAS___Sun_Rasterfile.xcu b/filter/source/config/fragments/filters/RAS___Sun_Rasterfile.xcu index 9b66385d1f82..a34e8aea9fc4 100644 --- a/filter/source/config/fragments/filters/RAS___Sun_Rasterfile.xcu +++ b/filter/source/config/fragments/filters/RAS___Sun_Rasterfile.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN diff --git a/filter/source/config/fragments/filters/Rich_Text_Format.xcu b/filter/source/config/fragments/filters/Rich_Text_Format.xcu index d8fb18c96d06..4bb6a82a0b77 100644 --- a/filter/source/config/fragments/filters/Rich_Text_Format.xcu +++ b/filter/source/config/fragments/filters/Rich_Text_Format.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT ALIEN 3RDPARTYFILTER PREFERRED diff --git a/filter/source/config/fragments/filters/Rich_Text_Format__StarCalc_.xcu b/filter/source/config/fragments/filters/Rich_Text_Format__StarCalc_.xcu index ae904dc2f574..4d5bcced7fc7 100644 --- a/filter/source/config/fragments/filters/Rich_Text_Format__StarCalc_.xcu +++ b/filter/source/config/fragments/filters/Rich_Text_Format__StarCalc_.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN diff --git a/filter/source/config/fragments/filters/SGF___StarOffice_Writer_SGF.xcu b/filter/source/config/fragments/filters/SGF___StarOffice_Writer_SGF.xcu index 41acbb993b0c..237c6f5fc68a 100644 --- a/filter/source/config/fragments/filters/SGF___StarOffice_Writer_SGF.xcu +++ b/filter/source/config/fragments/filters/SGF___StarOffice_Writer_SGF.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN diff --git a/filter/source/config/fragments/filters/SGV___StarDraw_2_0.xcu b/filter/source/config/fragments/filters/SGV___StarDraw_2_0.xcu index 94548119adcf..3f2fbc22527a 100644 --- a/filter/source/config/fragments/filters/SGV___StarDraw_2_0.xcu +++ b/filter/source/config/fragments/filters/SGV___StarDraw_2_0.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN diff --git a/filter/source/config/fragments/filters/SVG___Scalable_Vector_Graphics.xcu b/filter/source/config/fragments/filters/SVG___Scalable_Vector_Graphics.xcu index 1212e056762e..85605e2c2408 100644 --- a/filter/source/config/fragments/filters/SVG___Scalable_Vector_Graphics.xcu +++ b/filter/source/config/fragments/filters/SVG___Scalable_Vector_Graphics.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED diff --git a/filter/source/config/fragments/filters/SVM___StarView_Metafile.xcu b/filter/source/config/fragments/filters/SVM___StarView_Metafile.xcu index bb15deff047f..af1adb1fd805 100644 --- a/filter/source/config/fragments/filters/SVM___StarView_Metafile.xcu +++ b/filter/source/config/fragments/filters/SVM___StarView_Metafile.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN diff --git a/filter/source/config/fragments/filters/SYLK.xcu b/filter/source/config/fragments/filters/SYLK.xcu index e46fcbdbe3af..c9e79eb70e38 100644 --- a/filter/source/config/fragments/filters/SYLK.xcu +++ b/filter/source/config/fragments/filters/SYLK.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT ALIEN diff --git a/filter/source/config/fragments/filters/StarCalc_1_0.xcu b/filter/source/config/fragments/filters/StarCalc_1_0.xcu index ba0603cc13dc..0e70e7070ecb 100644 --- a/filter/source/config/fragments/filters/StarCalc_1_0.xcu +++ b/filter/source/config/fragments/filters/StarCalc_1_0.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN diff --git a/filter/source/config/fragments/filters/StarCalc_3_0.xcu b/filter/source/config/fragments/filters/StarCalc_3_0.xcu index 59d1682d5e91..f6c2fd5fe866 100644 --- a/filter/source/config/fragments/filters/StarCalc_3_0.xcu +++ b/filter/source/config/fragments/filters/StarCalc_3_0.xcu @@ -1,3 +1,20 @@ + IMPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarCalc_3_0_Vorlage_Template.xcu b/filter/source/config/fragments/filters/StarCalc_3_0_Vorlage_Template.xcu index d71f4625baa8..f1c437d0813c 100644 --- a/filter/source/config/fragments/filters/StarCalc_3_0_Vorlage_Template.xcu +++ b/filter/source/config/fragments/filters/StarCalc_3_0_Vorlage_Template.xcu @@ -1,3 +1,20 @@ + IMPORT TEMPLATE TEMPLATEPATH OWN ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarCalc_3_0_Vorlage_Template_ui.xcu b/filter/source/config/fragments/filters/StarCalc_3_0_Vorlage_Template_ui.xcu index e4ce9330a1c5..6fd4a027b27a 100644 --- a/filter/source/config/fragments/filters/StarCalc_3_0_Vorlage_Template_ui.xcu +++ b/filter/source/config/fragments/filters/StarCalc_3_0_Vorlage_Template_ui.xcu @@ -1,3 +1,20 @@ + StarCalc 3.0 Template diff --git a/filter/source/config/fragments/filters/StarCalc_4_0.xcu b/filter/source/config/fragments/filters/StarCalc_4_0.xcu index 8ce6a5224426..a54b4d1eea0f 100644 --- a/filter/source/config/fragments/filters/StarCalc_4_0.xcu +++ b/filter/source/config/fragments/filters/StarCalc_4_0.xcu @@ -1,3 +1,20 @@ + IMPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarCalc_4_0_Vorlage_Template.xcu b/filter/source/config/fragments/filters/StarCalc_4_0_Vorlage_Template.xcu index caa58a176d00..cbcaf3993cf1 100644 --- a/filter/source/config/fragments/filters/StarCalc_4_0_Vorlage_Template.xcu +++ b/filter/source/config/fragments/filters/StarCalc_4_0_Vorlage_Template.xcu @@ -1,3 +1,20 @@ + IMPORT TEMPLATE TEMPLATEPATH OWN ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarCalc_4_0_Vorlage_Template_ui.xcu b/filter/source/config/fragments/filters/StarCalc_4_0_Vorlage_Template_ui.xcu index 9de89570e351..67ce1d46feba 100644 --- a/filter/source/config/fragments/filters/StarCalc_4_0_Vorlage_Template_ui.xcu +++ b/filter/source/config/fragments/filters/StarCalc_4_0_Vorlage_Template_ui.xcu @@ -1,3 +1,20 @@ + StarCalc 4.0 Template diff --git a/filter/source/config/fragments/filters/StarCalc_5_0.xcu b/filter/source/config/fragments/filters/StarCalc_5_0.xcu index 4f9838bb5e95..2ade42fabf2f 100644 --- a/filter/source/config/fragments/filters/StarCalc_5_0.xcu +++ b/filter/source/config/fragments/filters/StarCalc_5_0.xcu @@ -1,3 +1,20 @@ + IMPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarCalc_5_0_Vorlage_Template.xcu b/filter/source/config/fragments/filters/StarCalc_5_0_Vorlage_Template.xcu index ad43c3b0e1c9..54d7ea2deade 100644 --- a/filter/source/config/fragments/filters/StarCalc_5_0_Vorlage_Template.xcu +++ b/filter/source/config/fragments/filters/StarCalc_5_0_Vorlage_Template.xcu @@ -1,3 +1,20 @@ + IMPORT TEMPLATE TEMPLATEPATH OWN ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarCalc_5_0_Vorlage_Template_ui.xcu b/filter/source/config/fragments/filters/StarCalc_5_0_Vorlage_Template_ui.xcu index 62b2001c0700..c3874f3afee8 100644 --- a/filter/source/config/fragments/filters/StarCalc_5_0_Vorlage_Template_ui.xcu +++ b/filter/source/config/fragments/filters/StarCalc_5_0_Vorlage_Template_ui.xcu @@ -1,3 +1,20 @@ + StarCalc 5.0 Template diff --git a/filter/source/config/fragments/filters/StarChart_3_0.xcu b/filter/source/config/fragments/filters/StarChart_3_0.xcu index fa756883f332..1759a962f8a6 100644 --- a/filter/source/config/fragments/filters/StarChart_3_0.xcu +++ b/filter/source/config/fragments/filters/StarChart_3_0.xcu @@ -1,3 +1,20 @@ + IMPORT OWN ALIEN NOTINFILEDIALOG NOTINCHOOSER 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarChart_4_0.xcu b/filter/source/config/fragments/filters/StarChart_4_0.xcu index ed5e69c88ade..a43cdee7792c 100644 --- a/filter/source/config/fragments/filters/StarChart_4_0.xcu +++ b/filter/source/config/fragments/filters/StarChart_4_0.xcu @@ -1,3 +1,20 @@ + IMPORT OWN ALIEN NOTINFILEDIALOG NOTINCHOOSER 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarChart_5_0.xcu b/filter/source/config/fragments/filters/StarChart_5_0.xcu index 43326bd6e82a..49cb3def4467 100644 --- a/filter/source/config/fragments/filters/StarChart_5_0.xcu +++ b/filter/source/config/fragments/filters/StarChart_5_0.xcu @@ -1,3 +1,20 @@ + IMPORT OWN ALIEN NOTINFILEDIALOG NOTINCHOOSER 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarDraw_3_0.xcu b/filter/source/config/fragments/filters/StarDraw_3_0.xcu index 3f9ca691236d..37bd5c0d1583 100644 --- a/filter/source/config/fragments/filters/StarDraw_3_0.xcu +++ b/filter/source/config/fragments/filters/StarDraw_3_0.xcu @@ -1,3 +1,20 @@ + IMPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarDraw_3_0_Vorlage.xcu b/filter/source/config/fragments/filters/StarDraw_3_0_Vorlage.xcu index ce8eda7943b0..a7d12799709d 100644 --- a/filter/source/config/fragments/filters/StarDraw_3_0_Vorlage.xcu +++ b/filter/source/config/fragments/filters/StarDraw_3_0_Vorlage.xcu @@ -1,3 +1,20 @@ + IMPORT TEMPLATE TEMPLATEPATH OWN ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarDraw_3_0_Vorlage__StarImpress_.xcu b/filter/source/config/fragments/filters/StarDraw_3_0_Vorlage__StarImpress_.xcu index f44f7da0dac8..5986c539b9b6 100644 --- a/filter/source/config/fragments/filters/StarDraw_3_0_Vorlage__StarImpress_.xcu +++ b/filter/source/config/fragments/filters/StarDraw_3_0_Vorlage__StarImpress_.xcu @@ -1,3 +1,20 @@ + IMPORT TEMPLATE TEMPLATEPATH OWN ALIEN NOTINFILEDIALOG NOTINCHOOSER 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarDraw_3_0_Vorlage__StarImpress__ui.xcu b/filter/source/config/fragments/filters/StarDraw_3_0_Vorlage__StarImpress__ui.xcu index 0308f2a039c0..63f5c501113c 100644 --- a/filter/source/config/fragments/filters/StarDraw_3_0_Vorlage__StarImpress__ui.xcu +++ b/filter/source/config/fragments/filters/StarDraw_3_0_Vorlage__StarImpress__ui.xcu @@ -1,3 +1,20 @@ + StarDraw 3.0 Template (Impress) diff --git a/filter/source/config/fragments/filters/StarDraw_3_0_Vorlage_ui.xcu b/filter/source/config/fragments/filters/StarDraw_3_0_Vorlage_ui.xcu index 61f15235792b..94275bfdd21d 100644 --- a/filter/source/config/fragments/filters/StarDraw_3_0_Vorlage_ui.xcu +++ b/filter/source/config/fragments/filters/StarDraw_3_0_Vorlage_ui.xcu @@ -1,3 +1,20 @@ + StarDraw 3.0 Template diff --git a/filter/source/config/fragments/filters/StarDraw_3_0__StarImpress_.xcu b/filter/source/config/fragments/filters/StarDraw_3_0__StarImpress_.xcu index e3bd1bd9a3ce..53f34d11d774 100644 --- a/filter/source/config/fragments/filters/StarDraw_3_0__StarImpress_.xcu +++ b/filter/source/config/fragments/filters/StarDraw_3_0__StarImpress_.xcu @@ -1,3 +1,20 @@ + IMPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarDraw_5_0.xcu b/filter/source/config/fragments/filters/StarDraw_5_0.xcu index ef5075ef066e..9b6d0c56d10d 100644 --- a/filter/source/config/fragments/filters/StarDraw_5_0.xcu +++ b/filter/source/config/fragments/filters/StarDraw_5_0.xcu @@ -1,3 +1,20 @@ + IMPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER PREFERRED diff --git a/filter/source/config/fragments/filters/StarDraw_5_0_Vorlage.xcu b/filter/source/config/fragments/filters/StarDraw_5_0_Vorlage.xcu index 7168ce984f8f..122e83ccbff4 100644 --- a/filter/source/config/fragments/filters/StarDraw_5_0_Vorlage.xcu +++ b/filter/source/config/fragments/filters/StarDraw_5_0_Vorlage.xcu @@ -1,3 +1,20 @@ + IMPORT TEMPLATE TEMPLATEPATH OWN ALIEN 3RDPARTYFILTER PREFERRED diff --git a/filter/source/config/fragments/filters/StarDraw_5_0_Vorlage__StarImpress_.xcu b/filter/source/config/fragments/filters/StarDraw_5_0_Vorlage__StarImpress_.xcu index 2956522f2e67..bb15dc09fc98 100644 --- a/filter/source/config/fragments/filters/StarDraw_5_0_Vorlage__StarImpress_.xcu +++ b/filter/source/config/fragments/filters/StarDraw_5_0_Vorlage__StarImpress_.xcu @@ -1,3 +1,20 @@ + IMPORT TEMPLATE TEMPLATEPATH OWN ALIEN NOTINFILEDIALOG NOTINCHOOSER 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarDraw_5_0_Vorlage__StarImpress__ui.xcu b/filter/source/config/fragments/filters/StarDraw_5_0_Vorlage__StarImpress__ui.xcu index 64a9216408c7..be1debd601f0 100644 --- a/filter/source/config/fragments/filters/StarDraw_5_0_Vorlage__StarImpress__ui.xcu +++ b/filter/source/config/fragments/filters/StarDraw_5_0_Vorlage__StarImpress__ui.xcu @@ -1,3 +1,20 @@ + StarDraw 5.0 Template (Impress) diff --git a/filter/source/config/fragments/filters/StarDraw_5_0_Vorlage_ui.xcu b/filter/source/config/fragments/filters/StarDraw_5_0_Vorlage_ui.xcu index bd057e44dc46..a348f91d7400 100644 --- a/filter/source/config/fragments/filters/StarDraw_5_0_Vorlage_ui.xcu +++ b/filter/source/config/fragments/filters/StarDraw_5_0_Vorlage_ui.xcu @@ -1,3 +1,20 @@ + StarDraw 5.0 Template diff --git a/filter/source/config/fragments/filters/StarDraw_5_0__StarImpress_.xcu b/filter/source/config/fragments/filters/StarDraw_5_0__StarImpress_.xcu index 98961bb66cbd..f78fb8764344 100644 --- a/filter/source/config/fragments/filters/StarDraw_5_0__StarImpress_.xcu +++ b/filter/source/config/fragments/filters/StarDraw_5_0__StarImpress_.xcu @@ -1,3 +1,20 @@ + IMPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarImpress_4_0.xcu b/filter/source/config/fragments/filters/StarImpress_4_0.xcu index ef28390774b5..384e13a13dc3 100644 --- a/filter/source/config/fragments/filters/StarImpress_4_0.xcu +++ b/filter/source/config/fragments/filters/StarImpress_4_0.xcu @@ -1,3 +1,20 @@ + IMPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER PREFERRED diff --git a/filter/source/config/fragments/filters/StarImpress_4_0_Vorlage.xcu b/filter/source/config/fragments/filters/StarImpress_4_0_Vorlage.xcu index b4d73953bd00..b1925bce58c0 100644 --- a/filter/source/config/fragments/filters/StarImpress_4_0_Vorlage.xcu +++ b/filter/source/config/fragments/filters/StarImpress_4_0_Vorlage.xcu @@ -1,3 +1,20 @@ + IMPORT TEMPLATE TEMPLATEPATH OWN ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarImpress_4_0_Vorlage_ui.xcu b/filter/source/config/fragments/filters/StarImpress_4_0_Vorlage_ui.xcu index 2071a51476d0..40ccf9390614 100644 --- a/filter/source/config/fragments/filters/StarImpress_4_0_Vorlage_ui.xcu +++ b/filter/source/config/fragments/filters/StarImpress_4_0_Vorlage_ui.xcu @@ -1,3 +1,20 @@ + StarImpress 4.0 Template diff --git a/filter/source/config/fragments/filters/StarImpress_5_0.xcu b/filter/source/config/fragments/filters/StarImpress_5_0.xcu index 1c1377cf3ab7..2ed7efa7a175 100644 --- a/filter/source/config/fragments/filters/StarImpress_5_0.xcu +++ b/filter/source/config/fragments/filters/StarImpress_5_0.xcu @@ -1,3 +1,20 @@ + IMPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER PREFERRED diff --git a/filter/source/config/fragments/filters/StarImpress_5_0_Vorlage.xcu b/filter/source/config/fragments/filters/StarImpress_5_0_Vorlage.xcu index 9da35f9745e4..7eae44fac771 100644 --- a/filter/source/config/fragments/filters/StarImpress_5_0_Vorlage.xcu +++ b/filter/source/config/fragments/filters/StarImpress_5_0_Vorlage.xcu @@ -1,3 +1,20 @@ + IMPORT TEMPLATE TEMPLATEPATH OWN ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarImpress_5_0_Vorlage_ui.xcu b/filter/source/config/fragments/filters/StarImpress_5_0_Vorlage_ui.xcu index e1711fec4e8d..5b0baa91c30e 100644 --- a/filter/source/config/fragments/filters/StarImpress_5_0_Vorlage_ui.xcu +++ b/filter/source/config/fragments/filters/StarImpress_5_0_Vorlage_ui.xcu @@ -1,3 +1,20 @@ + StarImpress 5.0 Template diff --git a/filter/source/config/fragments/filters/StarImpress_5_0__packed_.xcu b/filter/source/config/fragments/filters/StarImpress_5_0__packed_.xcu index e208e69b6ad1..3d03f5092147 100644 --- a/filter/source/config/fragments/filters/StarImpress_5_0__packed_.xcu +++ b/filter/source/config/fragments/filters/StarImpress_5_0__packed_.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN 3RDPARTYFILTER PACKED diff --git a/filter/source/config/fragments/filters/StarImpress_5_0__packed__ui.xcu b/filter/source/config/fragments/filters/StarImpress_5_0__packed__ui.xcu index 2f87eb815f1b..0f6ebb28396b 100644 --- a/filter/source/config/fragments/filters/StarImpress_5_0__packed__ui.xcu +++ b/filter/source/config/fragments/filters/StarImpress_5_0__packed__ui.xcu @@ -1,3 +1,20 @@ + StarImpress 5.0 Packed diff --git a/filter/source/config/fragments/filters/StarMath_2_0.xcu b/filter/source/config/fragments/filters/StarMath_2_0.xcu index bc67524cc407..161ccad58334 100644 --- a/filter/source/config/fragments/filters/StarMath_2_0.xcu +++ b/filter/source/config/fragments/filters/StarMath_2_0.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN diff --git a/filter/source/config/fragments/filters/StarMath_3_0.xcu b/filter/source/config/fragments/filters/StarMath_3_0.xcu index 916b8208e2ca..e39cc08e630b 100644 --- a/filter/source/config/fragments/filters/StarMath_3_0.xcu +++ b/filter/source/config/fragments/filters/StarMath_3_0.xcu @@ -1,3 +1,20 @@ + IMPORT OWN ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarMath_4_0.xcu b/filter/source/config/fragments/filters/StarMath_4_0.xcu index aad13996f029..bb24fd52787b 100644 --- a/filter/source/config/fragments/filters/StarMath_4_0.xcu +++ b/filter/source/config/fragments/filters/StarMath_4_0.xcu @@ -1,3 +1,20 @@ + IMPORT OWN ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarMath_5_0.xcu b/filter/source/config/fragments/filters/StarMath_5_0.xcu index 6d52188d81dd..0291d20e14a2 100644 --- a/filter/source/config/fragments/filters/StarMath_5_0.xcu +++ b/filter/source/config/fragments/filters/StarMath_5_0.xcu @@ -1,3 +1,20 @@ + IMPORT OWN ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu index c9bc143ac3d8..b1f5c033b25e 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT OWN DEFAULT 3RDPARTYFILTER ENCRYPTION diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Base__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Base__ui.xcu index 0328738a1bee..f3972edb4012 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Base__ui.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Base__ui.xcu @@ -1,3 +1,20 @@ + ODF Database diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Calc_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Calc_.xcu index 36970e6aadae..ffe412ae9a5d 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Calc_.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Calc_.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT TEMPLATE OWN ALIEN ENCRYPTION diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu index 0f8abbabf972..d8b8b6d8c97b 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu @@ -1,3 +1,20 @@ + %productname% %formatversion% Spreadsheet diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Chart_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Chart_.xcu index b7e05cb17860..96a505237357 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Chart_.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Chart_.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT OWN ALIEN NOTINFILEDIALOG NOTINCHOOSER ENCRYPTION diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu index c74974f0cea5..6625cb9c247c 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu @@ -1,3 +1,20 @@ + %productname% %formatversion% Chart diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Draw_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Draw_.xcu index 089cc612d6c6..b32c713984ec 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Draw_.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Draw_.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT TEMPLATE OWN ALIEN PREFERRED ENCRYPTION diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu index 32de3a5842a3..8d9624f87141 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu @@ -1,3 +1,20 @@ + %productname% %formatversion% Drawing diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Impress_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Impress_.xcu index 5912555177d1..258cf49c0df2 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Impress_.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Impress_.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT TEMPLATE OWN ALIEN PREFERRED ENCRYPTION diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu index 83adfb8269dd..e0b951222c1a 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu @@ -1,3 +1,20 @@ + %productname% %formatversion% Presentation diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Math_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Math_.xcu index 282bff7448ed..cb094ea73700 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Math_.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Math_.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT TEMPLATE OWN ALIEN ENCRYPTION diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu index 57315a718777..95134bcfcd2f 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu @@ -1,3 +1,20 @@ + %productname% %formatversion% Formula diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Writer_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Writer_.xcu index c86b1d3deda7..590ffafea05a 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Writer_.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Writer_.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT TEMPLATE OWN ALIEN PREFERRED ENCRYPTION diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu index 20be1b1e1c04..621e9b744268 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu @@ -1,3 +1,20 @@ + %productname% %formatversion% Text Document diff --git a/filter/source/config/fragments/filters/StarWriter_1_0.xcu b/filter/source/config/fragments/filters/StarWriter_1_0.xcu index 23c6715f728b..e270af3c241a 100644 --- a/filter/source/config/fragments/filters/StarWriter_1_0.xcu +++ b/filter/source/config/fragments/filters/StarWriter_1_0.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarWriter_2_0.xcu b/filter/source/config/fragments/filters/StarWriter_2_0.xcu index 2617a6f330de..0565a75bf1b3 100644 --- a/filter/source/config/fragments/filters/StarWriter_2_0.xcu +++ b/filter/source/config/fragments/filters/StarWriter_2_0.xcu @@ -1,3 +1,20 @@ + IMPORT TEMPLATE ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarWriter_3_0.xcu b/filter/source/config/fragments/filters/StarWriter_3_0.xcu index 30d52dde4fa8..61f725c3c576 100644 --- a/filter/source/config/fragments/filters/StarWriter_3_0.xcu +++ b/filter/source/config/fragments/filters/StarWriter_3_0.xcu @@ -1,3 +1,20 @@ + IMPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarWriter_3_0_Vorlage_Template.xcu b/filter/source/config/fragments/filters/StarWriter_3_0_Vorlage_Template.xcu index af6c79baaf6c..a7b7b173008f 100644 --- a/filter/source/config/fragments/filters/StarWriter_3_0_Vorlage_Template.xcu +++ b/filter/source/config/fragments/filters/StarWriter_3_0_Vorlage_Template.xcu @@ -1,3 +1,20 @@ + IMPORT TEMPLATE TEMPLATEPATH OWN ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarWriter_3_0_Vorlage_Template_ui.xcu b/filter/source/config/fragments/filters/StarWriter_3_0_Vorlage_Template_ui.xcu index a888cf6518d7..1710db7b59df 100644 --- a/filter/source/config/fragments/filters/StarWriter_3_0_Vorlage_Template_ui.xcu +++ b/filter/source/config/fragments/filters/StarWriter_3_0_Vorlage_Template_ui.xcu @@ -1,3 +1,20 @@ + StarWriter 3.0 Template diff --git a/filter/source/config/fragments/filters/StarWriter_3_0__StarWriter_GlobalDocument_.xcu b/filter/source/config/fragments/filters/StarWriter_3_0__StarWriter_GlobalDocument_.xcu index aedeb92e6a51..9c548133748f 100644 --- a/filter/source/config/fragments/filters/StarWriter_3_0__StarWriter_GlobalDocument_.xcu +++ b/filter/source/config/fragments/filters/StarWriter_3_0__StarWriter_GlobalDocument_.xcu @@ -1,3 +1,20 @@ + TEMPLATE ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarWriter_3_0__StarWriter_Web_.xcu b/filter/source/config/fragments/filters/StarWriter_3_0__StarWriter_Web_.xcu index 7ffdf40af3a0..dc00e44d5c53 100644 --- a/filter/source/config/fragments/filters/StarWriter_3_0__StarWriter_Web_.xcu +++ b/filter/source/config/fragments/filters/StarWriter_3_0__StarWriter_Web_.xcu @@ -1,3 +1,20 @@ + TEMPLATE ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarWriter_4_0.xcu b/filter/source/config/fragments/filters/StarWriter_4_0.xcu index a5ba428c58ad..dcdcf495cb35 100644 --- a/filter/source/config/fragments/filters/StarWriter_4_0.xcu +++ b/filter/source/config/fragments/filters/StarWriter_4_0.xcu @@ -1,3 +1,20 @@ + IMPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarWriter_4_0_GlobalDocument.xcu b/filter/source/config/fragments/filters/StarWriter_4_0_GlobalDocument.xcu index 9c0058b832d7..9cc7b4e9ad38 100644 --- a/filter/source/config/fragments/filters/StarWriter_4_0_GlobalDocument.xcu +++ b/filter/source/config/fragments/filters/StarWriter_4_0_GlobalDocument.xcu @@ -1,3 +1,20 @@ + IMPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarWriter_4_0_GlobalDocument_ui.xcu b/filter/source/config/fragments/filters/StarWriter_4_0_GlobalDocument_ui.xcu index b1aafd2309bb..f3cad85bf347 100644 --- a/filter/source/config/fragments/filters/StarWriter_4_0_GlobalDocument_ui.xcu +++ b/filter/source/config/fragments/filters/StarWriter_4_0_GlobalDocument_ui.xcu @@ -1,3 +1,20 @@ + StarWriter 4.0 Master Document diff --git a/filter/source/config/fragments/filters/StarWriter_4_0_Vorlage_Template.xcu b/filter/source/config/fragments/filters/StarWriter_4_0_Vorlage_Template.xcu index 70efeb98a308..912bc55672ae 100644 --- a/filter/source/config/fragments/filters/StarWriter_4_0_Vorlage_Template.xcu +++ b/filter/source/config/fragments/filters/StarWriter_4_0_Vorlage_Template.xcu @@ -1,3 +1,20 @@ + IMPORT TEMPLATE TEMPLATEPATH OWN ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarWriter_4_0_Vorlage_Template_ui.xcu b/filter/source/config/fragments/filters/StarWriter_4_0_Vorlage_Template_ui.xcu index 003c3274ca8a..e392bc5afbb8 100644 --- a/filter/source/config/fragments/filters/StarWriter_4_0_Vorlage_Template_ui.xcu +++ b/filter/source/config/fragments/filters/StarWriter_4_0_Vorlage_Template_ui.xcu @@ -1,3 +1,20 @@ + StarWriter 4.0 Template diff --git a/filter/source/config/fragments/filters/StarWriter_4_0__StarWriter_GlobalDocument_.xcu b/filter/source/config/fragments/filters/StarWriter_4_0__StarWriter_GlobalDocument_.xcu index 437a26106391..af56f79f45ea 100644 --- a/filter/source/config/fragments/filters/StarWriter_4_0__StarWriter_GlobalDocument_.xcu +++ b/filter/source/config/fragments/filters/StarWriter_4_0__StarWriter_GlobalDocument_.xcu @@ -1,3 +1,20 @@ + TEMPLATE ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarWriter_4_0__StarWriter_Web_.xcu b/filter/source/config/fragments/filters/StarWriter_4_0__StarWriter_Web_.xcu index 7cec0aa6dd56..7400904e9fe5 100644 --- a/filter/source/config/fragments/filters/StarWriter_4_0__StarWriter_Web_.xcu +++ b/filter/source/config/fragments/filters/StarWriter_4_0__StarWriter_Web_.xcu @@ -1,3 +1,20 @@ + TEMPLATE ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarWriter_5_0.xcu b/filter/source/config/fragments/filters/StarWriter_5_0.xcu index cdd8241af507..1308ef5974bb 100644 --- a/filter/source/config/fragments/filters/StarWriter_5_0.xcu +++ b/filter/source/config/fragments/filters/StarWriter_5_0.xcu @@ -1,3 +1,20 @@ + IMPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER PREFERRED diff --git a/filter/source/config/fragments/filters/StarWriter_5_0_GlobalDocument.xcu b/filter/source/config/fragments/filters/StarWriter_5_0_GlobalDocument.xcu index 1149f621b878..09b861895dd8 100644 --- a/filter/source/config/fragments/filters/StarWriter_5_0_GlobalDocument.xcu +++ b/filter/source/config/fragments/filters/StarWriter_5_0_GlobalDocument.xcu @@ -1,3 +1,20 @@ + IMPORT TEMPLATE OWN ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarWriter_5_0_GlobalDocument_ui.xcu b/filter/source/config/fragments/filters/StarWriter_5_0_GlobalDocument_ui.xcu index 912abc802244..16abe9af8362 100644 --- a/filter/source/config/fragments/filters/StarWriter_5_0_GlobalDocument_ui.xcu +++ b/filter/source/config/fragments/filters/StarWriter_5_0_GlobalDocument_ui.xcu @@ -1,3 +1,20 @@ + StarWriter 5.0 Master Document diff --git a/filter/source/config/fragments/filters/StarWriter_5_0_Vorlage_Template.xcu b/filter/source/config/fragments/filters/StarWriter_5_0_Vorlage_Template.xcu index b249680af26b..f8374940db61 100644 --- a/filter/source/config/fragments/filters/StarWriter_5_0_Vorlage_Template.xcu +++ b/filter/source/config/fragments/filters/StarWriter_5_0_Vorlage_Template.xcu @@ -1,3 +1,20 @@ + IMPORT TEMPLATE TEMPLATEPATH OWN ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarWriter_5_0_Vorlage_Template_ui.xcu b/filter/source/config/fragments/filters/StarWriter_5_0_Vorlage_Template_ui.xcu index caf14d0d308f..10f1ed2af6d3 100644 --- a/filter/source/config/fragments/filters/StarWriter_5_0_Vorlage_Template_ui.xcu +++ b/filter/source/config/fragments/filters/StarWriter_5_0_Vorlage_Template_ui.xcu @@ -1,3 +1,20 @@ + StarWriter 5.0 Template diff --git a/filter/source/config/fragments/filters/StarWriter_5_0__StarWriter_GlobalDocument_.xcu b/filter/source/config/fragments/filters/StarWriter_5_0__StarWriter_GlobalDocument_.xcu index fb99f014220e..57853bbeba49 100644 --- a/filter/source/config/fragments/filters/StarWriter_5_0__StarWriter_GlobalDocument_.xcu +++ b/filter/source/config/fragments/filters/StarWriter_5_0__StarWriter_GlobalDocument_.xcu @@ -1,3 +1,20 @@ + TEMPLATE ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarWriter_5_0__StarWriter_Web_.xcu b/filter/source/config/fragments/filters/StarWriter_5_0__StarWriter_Web_.xcu index dedbefdbb2a5..0b1e43360d9d 100644 --- a/filter/source/config/fragments/filters/StarWriter_5_0__StarWriter_Web_.xcu +++ b/filter/source/config/fragments/filters/StarWriter_5_0__StarWriter_Web_.xcu @@ -1,3 +1,20 @@ + TEMPLATE ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarWriter_DOS.xcu b/filter/source/config/fragments/filters/StarWriter_DOS.xcu index 493151f6f806..53958af68052 100644 --- a/filter/source/config/fragments/filters/StarWriter_DOS.xcu +++ b/filter/source/config/fragments/filters/StarWriter_DOS.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarWriter_Web_4_0_Vorlage_Template.xcu b/filter/source/config/fragments/filters/StarWriter_Web_4_0_Vorlage_Template.xcu index 33a0a82f44eb..f15eb8837ba9 100644 --- a/filter/source/config/fragments/filters/StarWriter_Web_4_0_Vorlage_Template.xcu +++ b/filter/source/config/fragments/filters/StarWriter_Web_4_0_Vorlage_Template.xcu @@ -1,3 +1,20 @@ + IMPORT TEMPLATE TEMPLATEPATH OWN ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarWriter_Web_4_0_Vorlage_Template_ui.xcu b/filter/source/config/fragments/filters/StarWriter_Web_4_0_Vorlage_Template_ui.xcu index 3dd348296d40..547bcf47cd54 100644 --- a/filter/source/config/fragments/filters/StarWriter_Web_4_0_Vorlage_Template_ui.xcu +++ b/filter/source/config/fragments/filters/StarWriter_Web_4_0_Vorlage_Template_ui.xcu @@ -1,3 +1,20 @@ + StarWriter/Web 4.0 Template diff --git a/filter/source/config/fragments/filters/StarWriter_Web_5_0_Vorlage_Template.xcu b/filter/source/config/fragments/filters/StarWriter_Web_5_0_Vorlage_Template.xcu index efdc14034980..2d8ffdb8d8fe 100644 --- a/filter/source/config/fragments/filters/StarWriter_Web_5_0_Vorlage_Template.xcu +++ b/filter/source/config/fragments/filters/StarWriter_Web_5_0_Vorlage_Template.xcu @@ -1,3 +1,20 @@ + IMPORT TEMPLATE TEMPLATEPATH OWN ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarWriter_Web_5_0_Vorlage_Template_ui.xcu b/filter/source/config/fragments/filters/StarWriter_Web_5_0_Vorlage_Template_ui.xcu index 1d194cb4ac4c..766b70cda140 100644 --- a/filter/source/config/fragments/filters/StarWriter_Web_5_0_Vorlage_Template_ui.xcu +++ b/filter/source/config/fragments/filters/StarWriter_Web_5_0_Vorlage_Template_ui.xcu @@ -1,3 +1,20 @@ + StarWriter/Web 5.0 Template diff --git a/filter/source/config/fragments/filters/T602Document.xcu b/filter/source/config/fragments/filters/T602Document.xcu index 544364913dff..c93950e51f65 100644 --- a/filter/source/config/fragments/filters/T602Document.xcu +++ b/filter/source/config/fragments/filters/T602Document.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED diff --git a/filter/source/config/fragments/filters/TGA___Truevision_TARGA.xcu b/filter/source/config/fragments/filters/TGA___Truevision_TARGA.xcu index 48cd2ad8731a..d0ddfbc65066 100644 --- a/filter/source/config/fragments/filters/TGA___Truevision_TARGA.xcu +++ b/filter/source/config/fragments/filters/TGA___Truevision_TARGA.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN diff --git a/filter/source/config/fragments/filters/TIF___Tag_Image_File.xcu b/filter/source/config/fragments/filters/TIF___Tag_Image_File.xcu index 6ed47b00d6ef..9d07521ec322 100644 --- a/filter/source/config/fragments/filters/TIF___Tag_Image_File.xcu +++ b/filter/source/config/fragments/filters/TIF___Tag_Image_File.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN diff --git a/filter/source/config/fragments/filters/Text.xcu b/filter/source/config/fragments/filters/Text.xcu index 4629f89af11c..eacf35417f69 100644 --- a/filter/source/config/fragments/filters/Text.xcu +++ b/filter/source/config/fragments/filters/Text.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT ALIEN PREFERRED diff --git a/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu b/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu index 0332e3e65d4c..44787f7e5905 100644 --- a/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu +++ b/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT ALIEN diff --git a/filter/source/config/fragments/filters/Text__StarWriter_Web__ui.xcu b/filter/source/config/fragments/filters/Text__StarWriter_Web__ui.xcu index 427f1d97ee1c..155c7c627dcc 100644 --- a/filter/source/config/fragments/filters/Text__StarWriter_Web__ui.xcu +++ b/filter/source/config/fragments/filters/Text__StarWriter_Web__ui.xcu @@ -1,3 +1,20 @@ + Text (Writer/Web) diff --git a/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu b/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu index 498057ca3e6c..905f80a1dd46 100644 --- a/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu +++ b/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT ALIEN USESOPTIONS com.sun.star.comp.Calc.FilterOptionsDialog diff --git a/filter/source/config/fragments/filters/Text___txt___csv__StarCalc__ui.xcu b/filter/source/config/fragments/filters/Text___txt___csv__StarCalc__ui.xcu index 7cf434011d1f..496e0515c324 100644 --- a/filter/source/config/fragments/filters/Text___txt___csv__StarCalc__ui.xcu +++ b/filter/source/config/fragments/filters/Text___txt___csv__StarCalc__ui.xcu @@ -1,3 +1,20 @@ + Text CSV diff --git a/filter/source/config/fragments/filters/Text__encoded_.xcu b/filter/source/config/fragments/filters/Text__encoded_.xcu index af05106394a6..f43226012033 100644 --- a/filter/source/config/fragments/filters/Text__encoded_.xcu +++ b/filter/source/config/fragments/filters/Text__encoded_.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT ALIEN com.sun.star.comp.Writer.FilterOptionsDialog diff --git a/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.xcu b/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.xcu index 239ce3135d48..0ee9f0e4ac1d 100644 --- a/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.xcu +++ b/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT ALIEN com.sun.star.comp.Writer.FilterOptionsDialog diff --git a/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument__ui.xcu b/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument__ui.xcu index 3480d3ab18a7..db127e20d17b 100644 --- a/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument__ui.xcu +++ b/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument__ui.xcu @@ -1,3 +1,20 @@ + Text Encoded (Master Document) diff --git a/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.xcu b/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.xcu index 3bde7e7c0230..03c3ce3467a4 100644 --- a/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.xcu +++ b/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT ALIEN com.sun.star.comp.Writer.FilterOptionsDialog diff --git a/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web__ui.xcu b/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web__ui.xcu index 32f8e8658ad6..3ac5fb8bbe9a 100644 --- a/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web__ui.xcu +++ b/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web__ui.xcu @@ -1,3 +1,20 @@ + Text Encoded (Writer/Web) diff --git a/filter/source/config/fragments/filters/Text__encoded__ui.xcu b/filter/source/config/fragments/filters/Text__encoded__ui.xcu index 0ed1b78d615c..56770eece7d2 100644 --- a/filter/source/config/fragments/filters/Text__encoded__ui.xcu +++ b/filter/source/config/fragments/filters/Text__encoded__ui.xcu @@ -1,3 +1,20 @@ + Text Encoded diff --git a/filter/source/config/fragments/filters/Text_ui.xcu b/filter/source/config/fragments/filters/Text_ui.xcu index f0d198f8301b..1731be4fa53f 100644 --- a/filter/source/config/fragments/filters/Text_ui.xcu +++ b/filter/source/config/fragments/filters/Text_ui.xcu @@ -1,3 +1,20 @@ + Text diff --git a/filter/source/config/fragments/filters/UOF_presentation.xcu b/filter/source/config/fragments/filters/UOF_presentation.xcu index f62c623c9af5..c02f9b19f634 100644 --- a/filter/source/config/fragments/filters/UOF_presentation.xcu +++ b/filter/source/config/fragments/filters/UOF_presentation.xcu @@ -1,3 +1,20 @@ + 0 Unified_Office_Format_presentation diff --git a/filter/source/config/fragments/filters/UOF_presentation_ui.xcu b/filter/source/config/fragments/filters/UOF_presentation_ui.xcu index 4906ebcce7ce..e1f390274ddc 100644 --- a/filter/source/config/fragments/filters/UOF_presentation_ui.xcu +++ b/filter/source/config/fragments/filters/UOF_presentation_ui.xcu @@ -1,3 +1,20 @@ + Unified Office Format presentation diff --git a/filter/source/config/fragments/filters/UOF_spreadsheet.xcu b/filter/source/config/fragments/filters/UOF_spreadsheet.xcu index 549ed79ac2e0..fda148c24f8c 100644 --- a/filter/source/config/fragments/filters/UOF_spreadsheet.xcu +++ b/filter/source/config/fragments/filters/UOF_spreadsheet.xcu @@ -1,3 +1,20 @@ + 0 Unified_Office_Format_spreadsheet diff --git a/filter/source/config/fragments/filters/UOF_spreadsheet_ui.xcu b/filter/source/config/fragments/filters/UOF_spreadsheet_ui.xcu index a878776fefb6..c5b0434fbbb4 100644 --- a/filter/source/config/fragments/filters/UOF_spreadsheet_ui.xcu +++ b/filter/source/config/fragments/filters/UOF_spreadsheet_ui.xcu @@ -1,3 +1,20 @@ + Unified Office Format spreadsheet diff --git a/filter/source/config/fragments/filters/UOF_text.xcu b/filter/source/config/fragments/filters/UOF_text.xcu index 3dd6f2bb3273..5f674c799563 100644 --- a/filter/source/config/fragments/filters/UOF_text.xcu +++ b/filter/source/config/fragments/filters/UOF_text.xcu @@ -1,3 +1,20 @@ + 0 Unified_Office_Format_text diff --git a/filter/source/config/fragments/filters/UOF_text_ui.xcu b/filter/source/config/fragments/filters/UOF_text_ui.xcu index d76f4c660d2e..09b6842e0c02 100644 --- a/filter/source/config/fragments/filters/UOF_text_ui.xcu +++ b/filter/source/config/fragments/filters/UOF_text_ui.xcu @@ -1,3 +1,20 @@ + Unified Office Format text diff --git a/filter/source/config/fragments/filters/VisioDocument.xcu b/filter/source/config/fragments/filters/VisioDocument.xcu index ed02b663ecf4..82b3569bf3dd 100644 --- a/filter/source/config/fragments/filters/VisioDocument.xcu +++ b/filter/source/config/fragments/filters/VisioDocument.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED diff --git a/filter/source/config/fragments/filters/WMF___MS_Windows_Metafile.xcu b/filter/source/config/fragments/filters/WMF___MS_Windows_Metafile.xcu index 2210b3afbf8c..06e440974a08 100644 --- a/filter/source/config/fragments/filters/WMF___MS_Windows_Metafile.xcu +++ b/filter/source/config/fragments/filters/WMF___MS_Windows_Metafile.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN diff --git a/filter/source/config/fragments/filters/WordPerfect.xcu b/filter/source/config/fragments/filters/WordPerfect.xcu index 0683be1dc48a..a5cab4fb4865 100644 --- a/filter/source/config/fragments/filters/WordPerfect.xcu +++ b/filter/source/config/fragments/filters/WordPerfect.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED diff --git a/filter/source/config/fragments/filters/WordPerfectGraphics.xcu b/filter/source/config/fragments/filters/WordPerfectGraphics.xcu index 9e5d002cc5bd..25f4d77e016e 100644 --- a/filter/source/config/fragments/filters/WordPerfectGraphics.xcu +++ b/filter/source/config/fragments/filters/WordPerfectGraphics.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED diff --git a/filter/source/config/fragments/filters/XBM___X_Consortium.xcu b/filter/source/config/fragments/filters/XBM___X_Consortium.xcu index 04aa82ce974e..32ea9372f6cc 100644 --- a/filter/source/config/fragments/filters/XBM___X_Consortium.xcu +++ b/filter/source/config/fragments/filters/XBM___X_Consortium.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN diff --git a/filter/source/config/fragments/filters/XHTML_Calc_File.xcu b/filter/source/config/fragments/filters/XHTML_Calc_File.xcu index 60486621ec5c..86dc69420026 100644 --- a/filter/source/config/fragments/filters/XHTML_Calc_File.xcu +++ b/filter/source/config/fragments/filters/XHTML_Calc_File.xcu @@ -1,3 +1,20 @@ + 0 XHTML_File diff --git a/filter/source/config/fragments/filters/XHTML_Draw_File.xcu b/filter/source/config/fragments/filters/XHTML_Draw_File.xcu index fe7aa6e85773..dd6b55ccfd28 100644 --- a/filter/source/config/fragments/filters/XHTML_Draw_File.xcu +++ b/filter/source/config/fragments/filters/XHTML_Draw_File.xcu @@ -1,3 +1,20 @@ + 0 XHTML_File diff --git a/filter/source/config/fragments/filters/XHTML_Impress_File.xcu b/filter/source/config/fragments/filters/XHTML_Impress_File.xcu index cdec23746cd0..93e41a5bc5e5 100644 --- a/filter/source/config/fragments/filters/XHTML_Impress_File.xcu +++ b/filter/source/config/fragments/filters/XHTML_Impress_File.xcu @@ -1,3 +1,20 @@ + 0 XHTML_File diff --git a/filter/source/config/fragments/filters/XHTML_Writer_File.xcu b/filter/source/config/fragments/filters/XHTML_Writer_File.xcu index 32d954ec52c6..cd17fc0d25f5 100644 --- a/filter/source/config/fragments/filters/XHTML_Writer_File.xcu +++ b/filter/source/config/fragments/filters/XHTML_Writer_File.xcu @@ -1,3 +1,20 @@ + 0 XHTML_File diff --git a/filter/source/config/fragments/filters/XPM.xcu b/filter/source/config/fragments/filters/XPM.xcu index f4b54ea308ef..464e9df7f35e 100644 --- a/filter/source/config/fragments/filters/XPM.xcu +++ b/filter/source/config/fragments/filters/XPM.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN diff --git a/filter/source/config/fragments/filters/calc8.xcu b/filter/source/config/fragments/filters/calc8.xcu index 1c77a96ad887..01564611d480 100644 --- a/filter/source/config/fragments/filters/calc8.xcu +++ b/filter/source/config/fragments/filters/calc8.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT TEMPLATE OWN DEFAULT ENCRYPTION PASSWORDTOMODIFY diff --git a/filter/source/config/fragments/filters/calc8_template.xcu b/filter/source/config/fragments/filters/calc8_template.xcu index 5b5c1d5c3d56..0b08179257d9 100644 --- a/filter/source/config/fragments/filters/calc8_template.xcu +++ b/filter/source/config/fragments/filters/calc8_template.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ENCRYPTION PASSWORDTOMODIFY diff --git a/filter/source/config/fragments/filters/calc8_template_ui.xcu b/filter/source/config/fragments/filters/calc8_template_ui.xcu index 47c22a0544ff..af9c43094cb4 100644 --- a/filter/source/config/fragments/filters/calc8_template_ui.xcu +++ b/filter/source/config/fragments/filters/calc8_template_ui.xcu @@ -1,3 +1,20 @@ + ODF Spreadsheet Template diff --git a/filter/source/config/fragments/filters/calc8_ui.xcu b/filter/source/config/fragments/filters/calc8_ui.xcu index 57daf1f9a709..8807db281111 100644 --- a/filter/source/config/fragments/filters/calc8_ui.xcu +++ b/filter/source/config/fragments/filters/calc8_ui.xcu @@ -1,3 +1,20 @@ + ODF Spreadsheet diff --git a/filter/source/config/fragments/filters/calc_HTML_WebQuery.xcu b/filter/source/config/fragments/filters/calc_HTML_WebQuery.xcu index e81ced88040a..f40a7b2391b6 100644 --- a/filter/source/config/fragments/filters/calc_HTML_WebQuery.xcu +++ b/filter/source/config/fragments/filters/calc_HTML_WebQuery.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN USEOPTIONS PREFERRED com.sun.star.comp.Calc.FilterOptionsDialog diff --git a/filter/source/config/fragments/filters/calc_HTML_WebQuery_ui.xcu b/filter/source/config/fragments/filters/calc_HTML_WebQuery_ui.xcu index 62415c218700..2ee9429bcb4c 100644 --- a/filter/source/config/fragments/filters/calc_HTML_WebQuery_ui.xcu +++ b/filter/source/config/fragments/filters/calc_HTML_WebQuery_ui.xcu @@ -1,3 +1,20 @@ + Web Page Query (Calc) diff --git a/filter/source/config/fragments/filters/calc_MS_Excel_2007_Binary.xcu b/filter/source/config/fragments/filters/calc_MS_Excel_2007_Binary.xcu index 2402d74084e3..f19ac84f3eed 100644 --- a/filter/source/config/fragments/filters/calc_MS_Excel_2007_Binary.xcu +++ b/filter/source/config/fragments/filters/calc_MS_Excel_2007_Binary.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN 3RDPARTYFILTER PREFERRED diff --git a/filter/source/config/fragments/filters/calc_MS_Excel_2007_Binary_ui.xcu b/filter/source/config/fragments/filters/calc_MS_Excel_2007_Binary_ui.xcu index 64ab882fbf84..fecefbbd06fb 100644 --- a/filter/source/config/fragments/filters/calc_MS_Excel_2007_Binary_ui.xcu +++ b/filter/source/config/fragments/filters/calc_MS_Excel_2007_Binary_ui.xcu @@ -1,3 +1,20 @@ + Microsoft Excel 2007 Binary diff --git a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML.xcu b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML.xcu index 2e98250789bf..7f1fddd8fcbf 100644 --- a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML.xcu +++ b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT ALIEN 3RDPARTYFILTER PREFERRED diff --git a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template.xcu b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template.xcu index d5a14a27d0e2..2748ae3ba33f 100644 --- a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template.xcu +++ b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN 3RDPARTYFILTER TEMPLATE TEMPLATEPATH diff --git a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template_ui.xcu b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template_ui.xcu index 501dbf8f2fc1..7b7572dfee97 100644 --- a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template_ui.xcu +++ b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template_ui.xcu @@ -1,3 +1,20 @@ + Microsoft Excel 2007/2010 XML Template diff --git a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_ui.xcu b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_ui.xcu index 87d26a1ff458..2b025b9abf96 100644 --- a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_ui.xcu +++ b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_ui.xcu @@ -1,3 +1,20 @@ + Microsoft Excel 2007/2010 XML diff --git a/filter/source/config/fragments/filters/calc_OOXML.xcu b/filter/source/config/fragments/filters/calc_OOXML.xcu index 00923f7ec1f0..f9ae1236e8e9 100644 --- a/filter/source/config/fragments/filters/calc_OOXML.xcu +++ b/filter/source/config/fragments/filters/calc_OOXML.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT ALIEN 3RDPARTYFILTER PREFERRED diff --git a/filter/source/config/fragments/filters/calc_OOXML_Template.xcu b/filter/source/config/fragments/filters/calc_OOXML_Template.xcu index 99268d99820b..2b701235c894 100644 --- a/filter/source/config/fragments/filters/calc_OOXML_Template.xcu +++ b/filter/source/config/fragments/filters/calc_OOXML_Template.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN 3RDPARTYFILTER TEMPLATE TEMPLATEPATH diff --git a/filter/source/config/fragments/filters/calc_OOXML_Template_ui.xcu b/filter/source/config/fragments/filters/calc_OOXML_Template_ui.xcu index 9e8ab8398071..e88159903273 100644 --- a/filter/source/config/fragments/filters/calc_OOXML_Template_ui.xcu +++ b/filter/source/config/fragments/filters/calc_OOXML_Template_ui.xcu @@ -1,3 +1,20 @@ + Office Open XML Spreadsheet Template diff --git a/filter/source/config/fragments/filters/calc_OOXML_ui.xcu b/filter/source/config/fragments/filters/calc_OOXML_ui.xcu index ee065a52a922..fc8b97134ab6 100644 --- a/filter/source/config/fragments/filters/calc_OOXML_ui.xcu +++ b/filter/source/config/fragments/filters/calc_OOXML_ui.xcu @@ -1,3 +1,20 @@ + Office Open XML Spreadsheet diff --git a/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template.xcu b/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template.xcu index 56e132620108..090e9a8e6001 100644 --- a/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template.xcu +++ b/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ALIEN ENCRYPTION diff --git a/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu b/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu index 8d71de15869a..9327f5258735 100644 --- a/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu +++ b/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu @@ -1,3 +1,20 @@ + %productname% %formatversion% Spreadsheet Template diff --git a/filter/source/config/fragments/filters/calc_pdf_Export.xcu b/filter/source/config/fragments/filters/calc_pdf_Export.xcu index c00ca73bfc47..20560bfffa8d 100644 --- a/filter/source/config/fragments/filters/calc_pdf_Export.xcu +++ b/filter/source/config/fragments/filters/calc_pdf_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN 3RDPARTYFILTER com.sun.star.comp.PDF.PDFDialog diff --git a/filter/source/config/fragments/filters/chart8.xcu b/filter/source/config/fragments/filters/chart8.xcu index e0f3036b1f28..6b0a183f4163 100644 --- a/filter/source/config/fragments/filters/chart8.xcu +++ b/filter/source/config/fragments/filters/chart8.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT OWN DEFAULT NOTINFILEDIALOG NOTINCHOOSER PREFERRED ENCRYPTION diff --git a/filter/source/config/fragments/filters/chart8_ui.xcu b/filter/source/config/fragments/filters/chart8_ui.xcu index d34981fa4bc9..065b1896f13c 100644 --- a/filter/source/config/fragments/filters/chart8_ui.xcu +++ b/filter/source/config/fragments/filters/chart8_ui.xcu @@ -1,3 +1,20 @@ + ODF Chart diff --git a/filter/source/config/fragments/filters/dBase.xcu b/filter/source/config/fragments/filters/dBase.xcu index 4e2939520c14..188383921b34 100644 --- a/filter/source/config/fragments/filters/dBase.xcu +++ b/filter/source/config/fragments/filters/dBase.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT ALIEN USESOPTIONS com.sun.star.comp.Calc.FilterOptionsDialog diff --git a/filter/source/config/fragments/filters/draw8.xcu b/filter/source/config/fragments/filters/draw8.xcu index 6a1df34e4af3..6738cd849b97 100644 --- a/filter/source/config/fragments/filters/draw8.xcu +++ b/filter/source/config/fragments/filters/draw8.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT TEMPLATE OWN DEFAULT PREFERRED ENCRYPTION diff --git a/filter/source/config/fragments/filters/draw8_template.xcu b/filter/source/config/fragments/filters/draw8_template.xcu index 3f42e65f5853..b81730ea9f8b 100644 --- a/filter/source/config/fragments/filters/draw8_template.xcu +++ b/filter/source/config/fragments/filters/draw8_template.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ENCRYPTION diff --git a/filter/source/config/fragments/filters/draw8_template_ui.xcu b/filter/source/config/fragments/filters/draw8_template_ui.xcu index 430766aa87fe..e2aec0f8e1cc 100644 --- a/filter/source/config/fragments/filters/draw8_template_ui.xcu +++ b/filter/source/config/fragments/filters/draw8_template_ui.xcu @@ -1,3 +1,20 @@ + ODF Drawing Template diff --git a/filter/source/config/fragments/filters/draw8_ui.xcu b/filter/source/config/fragments/filters/draw8_ui.xcu index 0852c2042470..992c5508332c 100644 --- a/filter/source/config/fragments/filters/draw8_ui.xcu +++ b/filter/source/config/fragments/filters/draw8_ui.xcu @@ -1,3 +1,20 @@ + ODF Drawing diff --git a/filter/source/config/fragments/filters/draw_PCD_Photo_CD_Base.xcu b/filter/source/config/fragments/filters/draw_PCD_Photo_CD_Base.xcu index a0878c4d3145..d329046b94c7 100644 --- a/filter/source/config/fragments/filters/draw_PCD_Photo_CD_Base.xcu +++ b/filter/source/config/fragments/filters/draw_PCD_Photo_CD_Base.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN diff --git a/filter/source/config/fragments/filters/draw_PCD_Photo_CD_Base16.xcu b/filter/source/config/fragments/filters/draw_PCD_Photo_CD_Base16.xcu index 24c17ca932e2..86e342009369 100644 --- a/filter/source/config/fragments/filters/draw_PCD_Photo_CD_Base16.xcu +++ b/filter/source/config/fragments/filters/draw_PCD_Photo_CD_Base16.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN diff --git a/filter/source/config/fragments/filters/draw_PCD_Photo_CD_Base4.xcu b/filter/source/config/fragments/filters/draw_PCD_Photo_CD_Base4.xcu index 699358d87b49..862fcb96c48a 100644 --- a/filter/source/config/fragments/filters/draw_PCD_Photo_CD_Base4.xcu +++ b/filter/source/config/fragments/filters/draw_PCD_Photo_CD_Base4.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN diff --git a/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template.xcu b/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template.xcu index 55f1f96a922f..d4cc49f57f79 100644 --- a/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template.xcu +++ b/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ALIEN ENCRYPTION diff --git a/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu b/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu index 8121a7bb9646..1e12db9ef283 100644 --- a/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu +++ b/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu @@ -1,3 +1,20 @@ + %productname% %formatversion% Drawing Template diff --git a/filter/source/config/fragments/filters/draw_bmp_Export.xcu b/filter/source/config/fragments/filters/draw_bmp_Export.xcu index fbfddfc06a0b..db45d268320d 100644 --- a/filter/source/config/fragments/filters/draw_bmp_Export.xcu +++ b/filter/source/config/fragments/filters/draw_bmp_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN SUPPORTSSELECTION com.sun.star.svtools.SvFilterOptionsDialog diff --git a/filter/source/config/fragments/filters/draw_emf_Export.xcu b/filter/source/config/fragments/filters/draw_emf_Export.xcu index c6f9d933f3f2..5d8ff35f09d1 100644 --- a/filter/source/config/fragments/filters/draw_emf_Export.xcu +++ b/filter/source/config/fragments/filters/draw_emf_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN SUPPORTSSELECTION com.sun.star.svtools.SvFilterOptionsDialog diff --git a/filter/source/config/fragments/filters/draw_eps_Export.xcu b/filter/source/config/fragments/filters/draw_eps_Export.xcu index 9cc1eb92678e..24dc3055edfe 100644 --- a/filter/source/config/fragments/filters/draw_eps_Export.xcu +++ b/filter/source/config/fragments/filters/draw_eps_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN SUPPORTSSELECTION com.sun.star.svtools.SvFilterOptionsDialog diff --git a/filter/source/config/fragments/filters/draw_flash_Export.xcu b/filter/source/config/fragments/filters/draw_flash_Export.xcu index 222138869266..7ef8e3ca784d 100644 --- a/filter/source/config/fragments/filters/draw_flash_Export.xcu +++ b/filter/source/config/fragments/filters/draw_flash_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/draw_gif_Export.xcu b/filter/source/config/fragments/filters/draw_gif_Export.xcu index 017a277030f6..a224c9de3199 100644 --- a/filter/source/config/fragments/filters/draw_gif_Export.xcu +++ b/filter/source/config/fragments/filters/draw_gif_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN SUPPORTSSELECTION com.sun.star.svtools.SvFilterOptionsDialog diff --git a/filter/source/config/fragments/filters/draw_html_Export.xcu b/filter/source/config/fragments/filters/draw_html_Export.xcu index 04ddadb4b38e..b6460b5ce142 100644 --- a/filter/source/config/fragments/filters/draw_html_Export.xcu +++ b/filter/source/config/fragments/filters/draw_html_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN com.sun.star.comp.draw.SdHtmlOptionsDialog diff --git a/filter/source/config/fragments/filters/draw_html_Export_ui.xcu b/filter/source/config/fragments/filters/draw_html_Export_ui.xcu index a1ab775912e0..e272b3301ef9 100644 --- a/filter/source/config/fragments/filters/draw_html_Export_ui.xcu +++ b/filter/source/config/fragments/filters/draw_html_Export_ui.xcu @@ -1,3 +1,20 @@ + HTML Document (Draw) diff --git a/filter/source/config/fragments/filters/draw_jpg_Export.xcu b/filter/source/config/fragments/filters/draw_jpg_Export.xcu index efa6798cf824..74dbbac671a5 100644 --- a/filter/source/config/fragments/filters/draw_jpg_Export.xcu +++ b/filter/source/config/fragments/filters/draw_jpg_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN SUPPORTSSELECTION com.sun.star.svtools.SvFilterOptionsDialog diff --git a/filter/source/config/fragments/filters/draw_met_Export.xcu b/filter/source/config/fragments/filters/draw_met_Export.xcu index e4b47ec8a5da..9168acdfca67 100644 --- a/filter/source/config/fragments/filters/draw_met_Export.xcu +++ b/filter/source/config/fragments/filters/draw_met_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN SUPPORTSSELECTION com.sun.star.svtools.SvFilterOptionsDialog diff --git a/filter/source/config/fragments/filters/draw_pbm_Export.xcu b/filter/source/config/fragments/filters/draw_pbm_Export.xcu index ff4a84d38548..0a2f814bf99e 100644 --- a/filter/source/config/fragments/filters/draw_pbm_Export.xcu +++ b/filter/source/config/fragments/filters/draw_pbm_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN SUPPORTSSELECTION com.sun.star.svtools.SvFilterOptionsDialog diff --git a/filter/source/config/fragments/filters/draw_pct_Export.xcu b/filter/source/config/fragments/filters/draw_pct_Export.xcu index 2b9069694d5a..c06fca4026dc 100644 --- a/filter/source/config/fragments/filters/draw_pct_Export.xcu +++ b/filter/source/config/fragments/filters/draw_pct_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN SUPPORTSSELECTION com.sun.star.svtools.SvFilterOptionsDialog diff --git a/filter/source/config/fragments/filters/draw_pdf_Export.xcu b/filter/source/config/fragments/filters/draw_pdf_Export.xcu index 23a76e6812ea..dd8d092ebe70 100644 --- a/filter/source/config/fragments/filters/draw_pdf_Export.xcu +++ b/filter/source/config/fragments/filters/draw_pdf_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN 3RDPARTYFILTER com.sun.star.comp.PDF.PDFDialog diff --git a/filter/source/config/fragments/filters/draw_pgm_Export.xcu b/filter/source/config/fragments/filters/draw_pgm_Export.xcu index fc187599c326..3d34e6d33a71 100644 --- a/filter/source/config/fragments/filters/draw_pgm_Export.xcu +++ b/filter/source/config/fragments/filters/draw_pgm_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN SUPPORTSSELECTION com.sun.star.svtools.SvFilterOptionsDialog diff --git a/filter/source/config/fragments/filters/draw_png_Export.xcu b/filter/source/config/fragments/filters/draw_png_Export.xcu index 08c0b2ac5a26..bf0e3835e9e7 100644 --- a/filter/source/config/fragments/filters/draw_png_Export.xcu +++ b/filter/source/config/fragments/filters/draw_png_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN SUPPORTSSELECTION com.sun.star.svtools.SvFilterOptionsDialog diff --git a/filter/source/config/fragments/filters/draw_ppm_Export.xcu b/filter/source/config/fragments/filters/draw_ppm_Export.xcu index 9631ffcee666..bef54a0e804e 100644 --- a/filter/source/config/fragments/filters/draw_ppm_Export.xcu +++ b/filter/source/config/fragments/filters/draw_ppm_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN SUPPORTSSELECTION com.sun.star.svtools.SvFilterOptionsDialog diff --git a/filter/source/config/fragments/filters/draw_ras_Export.xcu b/filter/source/config/fragments/filters/draw_ras_Export.xcu index 4cdd9e0b9989..e295e920e472 100644 --- a/filter/source/config/fragments/filters/draw_ras_Export.xcu +++ b/filter/source/config/fragments/filters/draw_ras_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN SUPPORTSSELECTION diff --git a/filter/source/config/fragments/filters/draw_svg_Export.xcu b/filter/source/config/fragments/filters/draw_svg_Export.xcu index 6e273c555060..724872738608 100644 --- a/filter/source/config/fragments/filters/draw_svg_Export.xcu +++ b/filter/source/config/fragments/filters/draw_svg_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/draw_svm_Export.xcu b/filter/source/config/fragments/filters/draw_svm_Export.xcu index 29f52d67d3ae..b1df4ba6e864 100644 --- a/filter/source/config/fragments/filters/draw_svm_Export.xcu +++ b/filter/source/config/fragments/filters/draw_svm_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN SUPPORTSSELECTION com.sun.star.svtools.SvFilterOptionsDialog diff --git a/filter/source/config/fragments/filters/draw_tif_Export.xcu b/filter/source/config/fragments/filters/draw_tif_Export.xcu index 0b03360bf75d..281ab07d7df5 100644 --- a/filter/source/config/fragments/filters/draw_tif_Export.xcu +++ b/filter/source/config/fragments/filters/draw_tif_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN SUPPORTSSELECTION diff --git a/filter/source/config/fragments/filters/draw_wmf_Export.xcu b/filter/source/config/fragments/filters/draw_wmf_Export.xcu index 667b15259e92..f0f3443588bf 100644 --- a/filter/source/config/fragments/filters/draw_wmf_Export.xcu +++ b/filter/source/config/fragments/filters/draw_wmf_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN SUPPORTSSELECTION com.sun.star.svtools.SvFilterOptionsDialog diff --git a/filter/source/config/fragments/filters/draw_xpm_Export.xcu b/filter/source/config/fragments/filters/draw_xpm_Export.xcu index 18b221c6ccbf..0bc132c75a48 100644 --- a/filter/source/config/fragments/filters/draw_xpm_Export.xcu +++ b/filter/source/config/fragments/filters/draw_xpm_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN SUPPORTSSELECTION diff --git a/filter/source/config/fragments/filters/impress8.xcu b/filter/source/config/fragments/filters/impress8.xcu index 099bce62d3c5..90e11daca149 100644 --- a/filter/source/config/fragments/filters/impress8.xcu +++ b/filter/source/config/fragments/filters/impress8.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT TEMPLATE OWN DEFAULT PREFERRED ENCRYPTION diff --git a/filter/source/config/fragments/filters/impress8_draw.xcu b/filter/source/config/fragments/filters/impress8_draw.xcu index 5781c2a3e709..5a5d5a23b003 100644 --- a/filter/source/config/fragments/filters/impress8_draw.xcu +++ b/filter/source/config/fragments/filters/impress8_draw.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT TEMPLATE OWN ENCRYPTION diff --git a/filter/source/config/fragments/filters/impress8_draw_ui.xcu b/filter/source/config/fragments/filters/impress8_draw_ui.xcu index 2ba1fcbd2a7f..a6743d0f3519 100644 --- a/filter/source/config/fragments/filters/impress8_draw_ui.xcu +++ b/filter/source/config/fragments/filters/impress8_draw_ui.xcu @@ -1,3 +1,20 @@ + ODF Drawing (Impress) diff --git a/filter/source/config/fragments/filters/impress8_template.xcu b/filter/source/config/fragments/filters/impress8_template.xcu index 891f8f86b0c4..c812fd2b240c 100644 --- a/filter/source/config/fragments/filters/impress8_template.xcu +++ b/filter/source/config/fragments/filters/impress8_template.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ENCRYPTION diff --git a/filter/source/config/fragments/filters/impress8_template_ui.xcu b/filter/source/config/fragments/filters/impress8_template_ui.xcu index d8b3d4d68fc3..67d2145e1d5a 100644 --- a/filter/source/config/fragments/filters/impress8_template_ui.xcu +++ b/filter/source/config/fragments/filters/impress8_template_ui.xcu @@ -1,3 +1,20 @@ + ODF Presentation Template diff --git a/filter/source/config/fragments/filters/impress8_ui.xcu b/filter/source/config/fragments/filters/impress8_ui.xcu index 3ac78f8d88b2..340b22c28a2e 100644 --- a/filter/source/config/fragments/filters/impress8_ui.xcu +++ b/filter/source/config/fragments/filters/impress8_ui.xcu @@ -1,3 +1,20 @@ + ODF Presentation diff --git a/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML.xcu b/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML.xcu index 30a06ca05c07..0e6d5a7b1fcf 100644 --- a/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML.xcu +++ b/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT ALIEN 3RDPARTYFILTER PREFERRED diff --git a/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_AutoPlay.xcu b/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_AutoPlay.xcu index 4823beec4994..de5136960202 100644 --- a/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_AutoPlay.xcu +++ b/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_AutoPlay.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT ALIEN 3RDPARTYFILTER PREFERRED STARTPRESENTATION diff --git a/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template.xcu b/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template.xcu index 626c449147bf..1fe459058ba4 100644 --- a/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template.xcu +++ b/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT ALIEN 3RDPARTYFILTER TEMPLATE TEMPLATEPATH PREFERRED diff --git a/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template_ui.xcu b/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template_ui.xcu index 97b580d2db5d..dc20c96a6106 100644 --- a/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template_ui.xcu +++ b/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template_ui.xcu @@ -1,3 +1,20 @@ + Microsoft PowerPoint 2007/2010 XML Template diff --git a/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_ui.xcu b/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_ui.xcu index 055baf44d7cc..df188ce77355 100644 --- a/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_ui.xcu +++ b/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_ui.xcu @@ -1,3 +1,20 @@ + Microsoft PowerPoint 2007/2010 XML diff --git a/filter/source/config/fragments/filters/impress_OOXML.xcu b/filter/source/config/fragments/filters/impress_OOXML.xcu index 17d4e188ccee..5784ae1f88b6 100644 --- a/filter/source/config/fragments/filters/impress_OOXML.xcu +++ b/filter/source/config/fragments/filters/impress_OOXML.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT ALIEN 3RDPARTYFILTER PREFERRED diff --git a/filter/source/config/fragments/filters/impress_OOXML_AutoPlay.xcu b/filter/source/config/fragments/filters/impress_OOXML_AutoPlay.xcu index 9c83f07f68ac..79fcb8e20450 100644 --- a/filter/source/config/fragments/filters/impress_OOXML_AutoPlay.xcu +++ b/filter/source/config/fragments/filters/impress_OOXML_AutoPlay.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT ALIEN 3RDPARTYFILTER PREFERRED STARTPRESENTATION diff --git a/filter/source/config/fragments/filters/impress_OOXML_Template.xcu b/filter/source/config/fragments/filters/impress_OOXML_Template.xcu index 10f9e43a5758..b7cadde333c1 100644 --- a/filter/source/config/fragments/filters/impress_OOXML_Template.xcu +++ b/filter/source/config/fragments/filters/impress_OOXML_Template.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT ALIEN 3RDPARTYFILTER TEMPLATE TEMPLATEPATH PREFERRED diff --git a/filter/source/config/fragments/filters/impress_OOXML_Template_ui.xcu b/filter/source/config/fragments/filters/impress_OOXML_Template_ui.xcu index bc4463ba8e12..077c60ce1383 100644 --- a/filter/source/config/fragments/filters/impress_OOXML_Template_ui.xcu +++ b/filter/source/config/fragments/filters/impress_OOXML_Template_ui.xcu @@ -1,3 +1,20 @@ + Office Open XML Presentation Template diff --git a/filter/source/config/fragments/filters/impress_OOXML_ui.xcu b/filter/source/config/fragments/filters/impress_OOXML_ui.xcu index 32f1c30e7896..2c462ee6d49a 100644 --- a/filter/source/config/fragments/filters/impress_OOXML_ui.xcu +++ b/filter/source/config/fragments/filters/impress_OOXML_ui.xcu @@ -1,3 +1,20 @@ + Office Open XML Presentation diff --git a/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw.xcu b/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw.xcu index 225843c661b7..96997bf50869 100644 --- a/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw.xcu +++ b/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT TEMPLATE OWN ALIEN ENCRYPTION diff --git a/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu b/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu index 5e96d80d70cd..ad053cb15acb 100644 --- a/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu +++ b/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu @@ -1,3 +1,20 @@ + %productname% %formatversion% Drawing (Impress) diff --git a/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template.xcu b/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template.xcu index 472dcf16130a..0907130a8951 100644 --- a/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template.xcu +++ b/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ALIEN ENCRYPTION diff --git a/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu b/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu index 24392c0d66dc..f869e25c536c 100644 --- a/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu +++ b/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu @@ -1,3 +1,20 @@ + %productname% %formatversion% Presentation Template diff --git a/filter/source/config/fragments/filters/impress_bmp_Export.xcu b/filter/source/config/fragments/filters/impress_bmp_Export.xcu index 74c632cfd910..f63724269c05 100644 --- a/filter/source/config/fragments/filters/impress_bmp_Export.xcu +++ b/filter/source/config/fragments/filters/impress_bmp_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN SUPPORTSSELECTION com.sun.star.svtools.SvFilterOptionsDialog diff --git a/filter/source/config/fragments/filters/impress_emf_Export.xcu b/filter/source/config/fragments/filters/impress_emf_Export.xcu index 02b575420aba..f1d56389696e 100644 --- a/filter/source/config/fragments/filters/impress_emf_Export.xcu +++ b/filter/source/config/fragments/filters/impress_emf_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN SUPPORTSSELECTION com.sun.star.svtools.SvFilterOptionsDialog diff --git a/filter/source/config/fragments/filters/impress_eps_Export.xcu b/filter/source/config/fragments/filters/impress_eps_Export.xcu index a1c7f3694a6f..d5d0b91c945c 100644 --- a/filter/source/config/fragments/filters/impress_eps_Export.xcu +++ b/filter/source/config/fragments/filters/impress_eps_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN SUPPORTSSELECTION com.sun.star.svtools.SvFilterOptionsDialog diff --git a/filter/source/config/fragments/filters/impress_flash_Export.xcu b/filter/source/config/fragments/filters/impress_flash_Export.xcu index 51fa2e39e765..1354df55a71c 100644 --- a/filter/source/config/fragments/filters/impress_flash_Export.xcu +++ b/filter/source/config/fragments/filters/impress_flash_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/impress_gif_Export.xcu b/filter/source/config/fragments/filters/impress_gif_Export.xcu index 3d65c2d165b4..f3a71899a9f0 100644 --- a/filter/source/config/fragments/filters/impress_gif_Export.xcu +++ b/filter/source/config/fragments/filters/impress_gif_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN SUPPORTSSELECTION com.sun.star.svtools.SvFilterOptionsDialog diff --git a/filter/source/config/fragments/filters/impress_html_Export.xcu b/filter/source/config/fragments/filters/impress_html_Export.xcu index 60de237501b8..30e35530c5e1 100644 --- a/filter/source/config/fragments/filters/impress_html_Export.xcu +++ b/filter/source/config/fragments/filters/impress_html_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN com.sun.star.comp.draw.SdHtmlOptionsDialog diff --git a/filter/source/config/fragments/filters/impress_html_Export_ui.xcu b/filter/source/config/fragments/filters/impress_html_Export_ui.xcu index 653d0e8e8841..2aedfc0bcf61 100644 --- a/filter/source/config/fragments/filters/impress_html_Export_ui.xcu +++ b/filter/source/config/fragments/filters/impress_html_Export_ui.xcu @@ -1,3 +1,20 @@ + HTML Document (Impress) diff --git a/filter/source/config/fragments/filters/impress_jpg_Export.xcu b/filter/source/config/fragments/filters/impress_jpg_Export.xcu index 3fca1776b2a9..9b0e9a418944 100644 --- a/filter/source/config/fragments/filters/impress_jpg_Export.xcu +++ b/filter/source/config/fragments/filters/impress_jpg_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN SUPPORTSSELECTION com.sun.star.svtools.SvFilterOptionsDialog diff --git a/filter/source/config/fragments/filters/impress_met_Export.xcu b/filter/source/config/fragments/filters/impress_met_Export.xcu index d144158465b7..d7841d0a6ef0 100644 --- a/filter/source/config/fragments/filters/impress_met_Export.xcu +++ b/filter/source/config/fragments/filters/impress_met_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN SUPPORTSSELECTION com.sun.star.svtools.SvFilterOptionsDialog diff --git a/filter/source/config/fragments/filters/impress_pbm_Export.xcu b/filter/source/config/fragments/filters/impress_pbm_Export.xcu index bf6dd89de38e..1ed57ec8031c 100644 --- a/filter/source/config/fragments/filters/impress_pbm_Export.xcu +++ b/filter/source/config/fragments/filters/impress_pbm_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN SUPPORTSSELECTION com.sun.star.svtools.SvFilterOptionsDialog diff --git a/filter/source/config/fragments/filters/impress_pct_Export.xcu b/filter/source/config/fragments/filters/impress_pct_Export.xcu index 46f44610437e..990d079210c6 100644 --- a/filter/source/config/fragments/filters/impress_pct_Export.xcu +++ b/filter/source/config/fragments/filters/impress_pct_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN SUPPORTSSELECTION com.sun.star.svtools.SvFilterOptionsDialog diff --git a/filter/source/config/fragments/filters/impress_pdf_Export.xcu b/filter/source/config/fragments/filters/impress_pdf_Export.xcu index deadf1d35291..eeedb4d20dd8 100644 --- a/filter/source/config/fragments/filters/impress_pdf_Export.xcu +++ b/filter/source/config/fragments/filters/impress_pdf_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN 3RDPARTYFILTER com.sun.star.comp.PDF.PDFDialog diff --git a/filter/source/config/fragments/filters/impress_pgm_Export.xcu b/filter/source/config/fragments/filters/impress_pgm_Export.xcu index e14eda40af44..e2617609f617 100644 --- a/filter/source/config/fragments/filters/impress_pgm_Export.xcu +++ b/filter/source/config/fragments/filters/impress_pgm_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN SUPPORTSSELECTION com.sun.star.svtools.SvFilterOptionsDialog diff --git a/filter/source/config/fragments/filters/impress_png_Export.xcu b/filter/source/config/fragments/filters/impress_png_Export.xcu index e836c6fb0ede..69332b1ebc3f 100644 --- a/filter/source/config/fragments/filters/impress_png_Export.xcu +++ b/filter/source/config/fragments/filters/impress_png_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN SUPPORTSSELECTION com.sun.star.svtools.SvFilterOptionsDialog diff --git a/filter/source/config/fragments/filters/impress_ppm_Export.xcu b/filter/source/config/fragments/filters/impress_ppm_Export.xcu index 27c970e32f54..ec992357e2b5 100644 --- a/filter/source/config/fragments/filters/impress_ppm_Export.xcu +++ b/filter/source/config/fragments/filters/impress_ppm_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN SUPPORTSSELECTION com.sun.star.svtools.SvFilterOptionsDialog diff --git a/filter/source/config/fragments/filters/impress_ras_Export.xcu b/filter/source/config/fragments/filters/impress_ras_Export.xcu index c3327e8d1b5a..31d098364c61 100644 --- a/filter/source/config/fragments/filters/impress_ras_Export.xcu +++ b/filter/source/config/fragments/filters/impress_ras_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN SUPPORTSSELECTION diff --git a/filter/source/config/fragments/filters/impress_svg_Export.xcu b/filter/source/config/fragments/filters/impress_svg_Export.xcu index 44efb45bcea4..21ebe866122a 100644 --- a/filter/source/config/fragments/filters/impress_svg_Export.xcu +++ b/filter/source/config/fragments/filters/impress_svg_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/impress_svm_Export.xcu b/filter/source/config/fragments/filters/impress_svm_Export.xcu index 6bfcd9711ca8..095e37815ab0 100644 --- a/filter/source/config/fragments/filters/impress_svm_Export.xcu +++ b/filter/source/config/fragments/filters/impress_svm_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN SUPPORTSSELECTION com.sun.star.svtools.SvFilterOptionsDialog diff --git a/filter/source/config/fragments/filters/impress_tif_Export.xcu b/filter/source/config/fragments/filters/impress_tif_Export.xcu index f4b76ab8f193..21baa04a1f34 100644 --- a/filter/source/config/fragments/filters/impress_tif_Export.xcu +++ b/filter/source/config/fragments/filters/impress_tif_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN SUPPORTSSELECTION diff --git a/filter/source/config/fragments/filters/impress_wmf_Export.xcu b/filter/source/config/fragments/filters/impress_wmf_Export.xcu index 18864e015375..58091276edb0 100644 --- a/filter/source/config/fragments/filters/impress_wmf_Export.xcu +++ b/filter/source/config/fragments/filters/impress_wmf_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN SUPPORTSSELECTION com.sun.star.svtools.SvFilterOptionsDialog diff --git a/filter/source/config/fragments/filters/impress_xpm_Export.xcu b/filter/source/config/fragments/filters/impress_xpm_Export.xcu index 0a83d3e853f1..9437dc1ebdd0 100644 --- a/filter/source/config/fragments/filters/impress_xpm_Export.xcu +++ b/filter/source/config/fragments/filters/impress_xpm_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN SUPPORTSSELECTION diff --git a/filter/source/config/fragments/filters/math8.xcu b/filter/source/config/fragments/filters/math8.xcu index 94c86a96cf83..cd588d2a8c1a 100644 --- a/filter/source/config/fragments/filters/math8.xcu +++ b/filter/source/config/fragments/filters/math8.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT TEMPLATE OWN DEFAULT ENCRYPTION diff --git a/filter/source/config/fragments/filters/math8_ui.xcu b/filter/source/config/fragments/filters/math8_ui.xcu index c892495fca90..80874e3b0133 100644 --- a/filter/source/config/fragments/filters/math8_ui.xcu +++ b/filter/source/config/fragments/filters/math8_ui.xcu @@ -1,3 +1,20 @@ + ODF Formula diff --git a/filter/source/config/fragments/filters/math_pdf_Export.xcu b/filter/source/config/fragments/filters/math_pdf_Export.xcu index 844714fbc5ec..9fedd59a4098 100644 --- a/filter/source/config/fragments/filters/math_pdf_Export.xcu +++ b/filter/source/config/fragments/filters/math_pdf_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN 3RDPARTYFILTER com.sun.star.comp.PDF.PDFDialog diff --git a/filter/source/config/fragments/filters/placeware_Export.xcu b/filter/source/config/fragments/filters/placeware_Export.xcu index a9c9a655acbb..7bde46063841 100644 --- a/filter/source/config/fragments/filters/placeware_Export.xcu +++ b/filter/source/config/fragments/filters/placeware_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/writer8.xcu b/filter/source/config/fragments/filters/writer8.xcu index bcfd55640e79..fd938e72ba13 100644 --- a/filter/source/config/fragments/filters/writer8.xcu +++ b/filter/source/config/fragments/filters/writer8.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT TEMPLATE OWN DEFAULT PREFERRED ENCRYPTION PASSWORDTOMODIFY diff --git a/filter/source/config/fragments/filters/writer8_template.xcu b/filter/source/config/fragments/filters/writer8_template.xcu index 34ee8055113c..85940e5a7f97 100644 --- a/filter/source/config/fragments/filters/writer8_template.xcu +++ b/filter/source/config/fragments/filters/writer8_template.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ENCRYPTION PASSWORDTOMODIFY diff --git a/filter/source/config/fragments/filters/writer8_template_ui.xcu b/filter/source/config/fragments/filters/writer8_template_ui.xcu index 05a5a32ac134..98e8037c1a23 100644 --- a/filter/source/config/fragments/filters/writer8_template_ui.xcu +++ b/filter/source/config/fragments/filters/writer8_template_ui.xcu @@ -1,3 +1,20 @@ + ODF Text Document Template diff --git a/filter/source/config/fragments/filters/writer8_ui.xcu b/filter/source/config/fragments/filters/writer8_ui.xcu index e70d69b759d1..086a7961c08b 100644 --- a/filter/source/config/fragments/filters/writer8_ui.xcu +++ b/filter/source/config/fragments/filters/writer8_ui.xcu @@ -1,3 +1,20 @@ + ODF Text Document diff --git a/filter/source/config/fragments/filters/writer_MIZI_Hwp_97.xcu b/filter/source/config/fragments/filters/writer_MIZI_Hwp_97.xcu index 01a305bb7eec..4633cc57ff45 100644 --- a/filter/source/config/fragments/filters/writer_MIZI_Hwp_97.xcu +++ b/filter/source/config/fragments/filters/writer_MIZI_Hwp_97.xcu @@ -1,3 +1,20 @@ + IMPORT ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template.xcu b/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template.xcu index 9c54cf04e06b..384d747e0596 100644 --- a/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template.xcu +++ b/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ALIEN ENCRYPTION diff --git a/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu b/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu index f15981efe33d..a991eb4e4386 100644 --- a/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu +++ b/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu @@ -1,3 +1,20 @@ + %productname% %formatversion% Text Document Template diff --git a/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer.xcu b/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer.xcu index b1210080e631..9575271f84bb 100644 --- a/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer.xcu +++ b/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer.xcu @@ -1,3 +1,20 @@ + EXPORT TEMPLATE ALIEN ENCRYPTION diff --git a/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument.xcu b/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument.xcu index 2dfb7fe0d21e..3d66ef4e47d4 100644 --- a/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument.xcu +++ b/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT TEMPLATE OWN ALIEN PREFERRED ENCRYPTION diff --git a/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu b/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu index 28e9b4082a7a..6d0265a28de9 100644 --- a/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu +++ b/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu @@ -1,3 +1,20 @@ + %productname% %formatversion% Master Document diff --git a/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu b/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu index 216e70c0ed1e..76712e07b742 100644 --- a/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu +++ b/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu @@ -1,3 +1,20 @@ + %productname% %formatversion% Text Document diff --git a/filter/source/config/fragments/filters/writer_globaldocument_pdf_Export.xcu b/filter/source/config/fragments/filters/writer_globaldocument_pdf_Export.xcu index cddd4936a50d..62287004a8fa 100644 --- a/filter/source/config/fragments/filters/writer_globaldocument_pdf_Export.xcu +++ b/filter/source/config/fragments/filters/writer_globaldocument_pdf_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN 3RDPARTYFILTER com.sun.star.comp.PDF.PDFDialog diff --git a/filter/source/config/fragments/filters/writer_layout_dump.xcu b/filter/source/config/fragments/filters/writer_layout_dump.xcu index c91f7ac02548..95aabd664762 100644 --- a/filter/source/config/fragments/filters/writer_layout_dump.xcu +++ b/filter/source/config/fragments/filters/writer_layout_dump.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/writer_pdf_Export.xcu b/filter/source/config/fragments/filters/writer_pdf_Export.xcu index ca3e63d3b887..23429d4ba864 100644 --- a/filter/source/config/fragments/filters/writer_pdf_Export.xcu +++ b/filter/source/config/fragments/filters/writer_pdf_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN 3RDPARTYFILTER com.sun.star.comp.PDF.PDFDialog diff --git a/filter/source/config/fragments/filters/writer_web_HTML_help.xcu b/filter/source/config/fragments/filters/writer_web_HTML_help.xcu index e03632542233..5c624b2245df 100644 --- a/filter/source/config/fragments/filters/writer_web_HTML_help.xcu +++ b/filter/source/config/fragments/filters/writer_web_HTML_help.xcu @@ -1,3 +1,20 @@ + IMPORT INTERNAL NOTINFILEDIALOG NOTINCHOOSER ASYNCHRON READONLY diff --git a/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer.xcu b/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer.xcu index 8e217e6d79a8..803ff6201a4f 100644 --- a/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer.xcu +++ b/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer.xcu @@ -1,3 +1,20 @@ + EXPORT TEMPLATE ALIEN ENCRYPTION diff --git a/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template.xcu b/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template.xcu index 64b3b8cdfe81..ec572172e608 100644 --- a/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template.xcu +++ b/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ALIEN ENCRYPTION diff --git a/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu b/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu index b02aaf02d50b..541846b8edd8 100644 --- a/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu +++ b/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu @@ -1,3 +1,20 @@ + %productname% %formatversion% HTML Template diff --git a/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu b/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu index e286de59c01f..ca19fbaee013 100644 --- a/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu +++ b/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu @@ -1,3 +1,20 @@ + %productname% %formatversion% Text Document (Writer/Web) diff --git a/filter/source/config/fragments/filters/writer_web_pdf_Export.xcu b/filter/source/config/fragments/filters/writer_web_pdf_Export.xcu index 6cdedd21eaed..c364aca0ed6b 100644 --- a/filter/source/config/fragments/filters/writer_web_pdf_Export.xcu +++ b/filter/source/config/fragments/filters/writer_web_pdf_Export.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN 3RDPARTYFILTER com.sun.star.comp.PDF.PDFDialog diff --git a/filter/source/config/fragments/filters/writerglobal8.xcu b/filter/source/config/fragments/filters/writerglobal8.xcu index df5fcb7e6d1b..b6c89786204a 100644 --- a/filter/source/config/fragments/filters/writerglobal8.xcu +++ b/filter/source/config/fragments/filters/writerglobal8.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT TEMPLATE OWN PREFERRED ENCRYPTION PASSWORDTOMODIFY diff --git a/filter/source/config/fragments/filters/writerglobal8_HTML.xcu b/filter/source/config/fragments/filters/writerglobal8_HTML.xcu index b381b7617167..c2312f959736 100644 --- a/filter/source/config/fragments/filters/writerglobal8_HTML.xcu +++ b/filter/source/config/fragments/filters/writerglobal8_HTML.xcu @@ -1,3 +1,20 @@ + EXPORT ALIEN ASYNCHRON NOTINCHOOSER diff --git a/filter/source/config/fragments/filters/writerglobal8_ui.xcu b/filter/source/config/fragments/filters/writerglobal8_ui.xcu index 1a0d5a41bd51..09146a6e35e1 100644 --- a/filter/source/config/fragments/filters/writerglobal8_ui.xcu +++ b/filter/source/config/fragments/filters/writerglobal8_ui.xcu @@ -1,3 +1,20 @@ + ODF Master Document diff --git a/filter/source/config/fragments/filters/writerglobal8_writer.xcu b/filter/source/config/fragments/filters/writerglobal8_writer.xcu index ca3794de493b..43074e9697e2 100644 --- a/filter/source/config/fragments/filters/writerglobal8_writer.xcu +++ b/filter/source/config/fragments/filters/writerglobal8_writer.xcu @@ -1,3 +1,20 @@ + EXPORT TEMPLATE DEFAULT ENCRYPTION PASSWORDTOMODIFY diff --git a/filter/source/config/fragments/filters/writerglobal8_writer_ui.xcu b/filter/source/config/fragments/filters/writerglobal8_writer_ui.xcu index ee04bbd2a547..c672033bdedc 100644 --- a/filter/source/config/fragments/filters/writerglobal8_writer_ui.xcu +++ b/filter/source/config/fragments/filters/writerglobal8_writer_ui.xcu @@ -1,3 +1,20 @@ + ODF Text Document diff --git a/filter/source/config/fragments/filters/writerweb8_writer.xcu b/filter/source/config/fragments/filters/writerweb8_writer.xcu index a3fbc783e92a..67faa856a23c 100644 --- a/filter/source/config/fragments/filters/writerweb8_writer.xcu +++ b/filter/source/config/fragments/filters/writerweb8_writer.xcu @@ -1,3 +1,20 @@ + EXPORT TEMPLATE ENCRYPTION PASSWORDTOMODIFY diff --git a/filter/source/config/fragments/filters/writerweb8_writer_template.xcu b/filter/source/config/fragments/filters/writerweb8_writer_template.xcu index eb383eafaeeb..451ce9406271 100644 --- a/filter/source/config/fragments/filters/writerweb8_writer_template.xcu +++ b/filter/source/config/fragments/filters/writerweb8_writer_template.xcu @@ -1,3 +1,20 @@ + IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ENCRYPTION PASSWORDTOMODIFY diff --git a/filter/source/config/fragments/filters/writerweb8_writer_template_ui.xcu b/filter/source/config/fragments/filters/writerweb8_writer_template_ui.xcu index 9ff5d088d15b..cd256f8b2a1a 100644 --- a/filter/source/config/fragments/filters/writerweb8_writer_template_ui.xcu +++ b/filter/source/config/fragments/filters/writerweb8_writer_template_ui.xcu @@ -1,3 +1,20 @@ + HTML Document Template diff --git a/filter/source/config/fragments/filters/writerweb8_writer_ui.xcu b/filter/source/config/fragments/filters/writerweb8_writer_ui.xcu index 44dec6cea1c4..299b59b72a57 100644 --- a/filter/source/config/fragments/filters/writerweb8_writer_ui.xcu +++ b/filter/source/config/fragments/filters/writerweb8_writer_ui.xcu @@ -1,3 +1,20 @@ + %productname% Text (Writer/Web) diff --git a/filter/source/config/fragments/frameloaders/com_sun_star_comp_chart2_ChartFrameLoader.xcu b/filter/source/config/fragments/frameloaders/com_sun_star_comp_chart2_ChartFrameLoader.xcu index 2f315761a296..0234d59ed92f 100644 --- a/filter/source/config/fragments/frameloaders/com_sun_star_comp_chart2_ChartFrameLoader.xcu +++ b/filter/source/config/fragments/frameloaders/com_sun_star_comp_chart2_ChartFrameLoader.xcu @@ -1,3 +1,20 @@ + chart_StarOffice_XML_Chart chart8 chart_StarChart_50 chart_StarChart_40 chart_StarChart_30 diff --git a/filter/source/config/fragments/frameloaders/com_sun_star_frame_Bibliography.xcu b/filter/source/config/fragments/frameloaders/com_sun_star_frame_Bibliography.xcu index 25fa8762f29d..b7d53d62e105 100644 --- a/filter/source/config/fragments/frameloaders/com_sun_star_frame_Bibliography.xcu +++ b/filter/source/config/fragments/frameloaders/com_sun_star_frame_Bibliography.xcu @@ -1,3 +1,20 @@ + component_Bibliography diff --git a/filter/source/config/fragments/frameloaders/com_sun_star_sdb_ContentLoader.xcu b/filter/source/config/fragments/frameloaders/com_sun_star_sdb_ContentLoader.xcu index cd5bb4684827..6d10acbadf51 100644 --- a/filter/source/config/fragments/frameloaders/com_sun_star_sdb_ContentLoader.xcu +++ b/filter/source/config/fragments/frameloaders/com_sun_star_sdb_ContentLoader.xcu @@ -1,3 +1,20 @@ + component_DB diff --git a/filter/source/config/fragments/frameloaders/org_openoffice_comp_dbflt_DBContentLoader2.xcu b/filter/source/config/fragments/frameloaders/org_openoffice_comp_dbflt_DBContentLoader2.xcu index 299a907fb576..62b6a6eee46c 100644 --- a/filter/source/config/fragments/frameloaders/org_openoffice_comp_dbflt_DBContentLoader2.xcu +++ b/filter/source/config/fragments/frameloaders/org_openoffice_comp_dbflt_DBContentLoader2.xcu @@ -1,3 +1,20 @@ + StarBase diff --git a/filter/source/config/fragments/internalgraphicfilters/bmp_Export.xcu b/filter/source/config/fragments/internalgraphicfilters/bmp_Export.xcu index ea5d9f14bebe..2505041087f2 100644 --- a/filter/source/config/fragments/internalgraphicfilters/bmp_Export.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/bmp_Export.xcu @@ -1,3 +1,20 @@ + bmp_MS_Windows SVBMP diff --git a/filter/source/config/fragments/internalgraphicfilters/bmp_Import.xcu b/filter/source/config/fragments/internalgraphicfilters/bmp_Import.xcu index 32a213efa594..7b5c54a64bc1 100644 --- a/filter/source/config/fragments/internalgraphicfilters/bmp_Import.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/bmp_Import.xcu @@ -1,3 +1,20 @@ + bmp_MS_Windows SVBMP diff --git a/filter/source/config/fragments/internalgraphicfilters/dxf_Import.xcu b/filter/source/config/fragments/internalgraphicfilters/dxf_Import.xcu index b132f3c59df6..1ab3279bd809 100644 --- a/filter/source/config/fragments/internalgraphicfilters/dxf_Import.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/dxf_Import.xcu @@ -1,3 +1,20 @@ + dxf_AutoCAD_Interchange idx diff --git a/filter/source/config/fragments/internalgraphicfilters/emf_Export.xcu b/filter/source/config/fragments/internalgraphicfilters/emf_Export.xcu index 4a82c5080ad4..631f90a50856 100644 --- a/filter/source/config/fragments/internalgraphicfilters/emf_Export.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/emf_Export.xcu @@ -1,3 +1,20 @@ + emf_MS_Windows_Metafile SVEMF diff --git a/filter/source/config/fragments/internalgraphicfilters/emf_Import.xcu b/filter/source/config/fragments/internalgraphicfilters/emf_Import.xcu index f84aab35b0da..e2d19bbf878c 100644 --- a/filter/source/config/fragments/internalgraphicfilters/emf_Import.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/emf_Import.xcu @@ -1,3 +1,20 @@ + emf_MS_Windows_Metafile SVEMF diff --git a/filter/source/config/fragments/internalgraphicfilters/eps_Export.xcu b/filter/source/config/fragments/internalgraphicfilters/eps_Export.xcu index ed08ed2bc783..ad5d989af762 100644 --- a/filter/source/config/fragments/internalgraphicfilters/eps_Export.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/eps_Export.xcu @@ -1,3 +1,20 @@ + eps_Encapsulated_PostScript eps diff --git a/filter/source/config/fragments/internalgraphicfilters/eps_Import.xcu b/filter/source/config/fragments/internalgraphicfilters/eps_Import.xcu index 7fcd90b66481..f2f190173e03 100644 --- a/filter/source/config/fragments/internalgraphicfilters/eps_Import.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/eps_Import.xcu @@ -1,3 +1,20 @@ + eps_Encapsulated_PostScript ips diff --git a/filter/source/config/fragments/internalgraphicfilters/gif_Export.xcu b/filter/source/config/fragments/internalgraphicfilters/gif_Export.xcu index 08d82e808fb4..7f021c1b9a7f 100644 --- a/filter/source/config/fragments/internalgraphicfilters/gif_Export.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/gif_Export.xcu @@ -1,3 +1,20 @@ + gif_Graphics_Interchange egi diff --git a/filter/source/config/fragments/internalgraphicfilters/gif_Import.xcu b/filter/source/config/fragments/internalgraphicfilters/gif_Import.xcu index 5c1b34ffcbfa..08bcff520cfa 100644 --- a/filter/source/config/fragments/internalgraphicfilters/gif_Import.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/gif_Import.xcu @@ -1,3 +1,20 @@ + gif_Graphics_Interchange SVIGIF diff --git a/filter/source/config/fragments/internalgraphicfilters/jpg_Export.xcu b/filter/source/config/fragments/internalgraphicfilters/jpg_Export.xcu index 36e53e14a7ad..82bfd4ec98d2 100644 --- a/filter/source/config/fragments/internalgraphicfilters/jpg_Export.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/jpg_Export.xcu @@ -1,3 +1,20 @@ + jpg_JPEG SVEJPEG diff --git a/filter/source/config/fragments/internalgraphicfilters/jpg_Import.xcu b/filter/source/config/fragments/internalgraphicfilters/jpg_Import.xcu index 2f4482c90a3b..0e3ac03fec41 100644 --- a/filter/source/config/fragments/internalgraphicfilters/jpg_Import.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/jpg_Import.xcu @@ -1,3 +1,20 @@ + jpg_JPEG SVIJPEG diff --git a/filter/source/config/fragments/internalgraphicfilters/met_Export.xcu b/filter/source/config/fragments/internalgraphicfilters/met_Export.xcu index 95afe373b91a..abc5cb6a273d 100644 --- a/filter/source/config/fragments/internalgraphicfilters/met_Export.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/met_Export.xcu @@ -1,3 +1,20 @@ + met_OS2_Metafile eme diff --git a/filter/source/config/fragments/internalgraphicfilters/met_Import.xcu b/filter/source/config/fragments/internalgraphicfilters/met_Import.xcu index c1084e53e812..c13a17f952db 100644 --- a/filter/source/config/fragments/internalgraphicfilters/met_Import.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/met_Import.xcu @@ -1,3 +1,20 @@ + met_OS2_Metafile ime diff --git a/filter/source/config/fragments/internalgraphicfilters/pbm_Export.xcu b/filter/source/config/fragments/internalgraphicfilters/pbm_Export.xcu index 62e728d7b268..e0d3039d6b73 100644 --- a/filter/source/config/fragments/internalgraphicfilters/pbm_Export.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/pbm_Export.xcu @@ -1,3 +1,20 @@ + pbm_Portable_Bitmap epb diff --git a/filter/source/config/fragments/internalgraphicfilters/pbm_Import.xcu b/filter/source/config/fragments/internalgraphicfilters/pbm_Import.xcu index 62736e4b8351..49db4b3c7eb4 100644 --- a/filter/source/config/fragments/internalgraphicfilters/pbm_Import.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/pbm_Import.xcu @@ -1,3 +1,20 @@ + pbm_Portable_Bitmap ipb diff --git a/filter/source/config/fragments/internalgraphicfilters/pcd_Import_Base.xcu b/filter/source/config/fragments/internalgraphicfilters/pcd_Import_Base.xcu index 5f240c1e24bc..c5a0094b86e4 100644 --- a/filter/source/config/fragments/internalgraphicfilters/pcd_Import_Base.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/pcd_Import_Base.xcu @@ -1,3 +1,20 @@ + pcd_Photo_CD_Base icd diff --git a/filter/source/config/fragments/internalgraphicfilters/pcd_Import_Base16.xcu b/filter/source/config/fragments/internalgraphicfilters/pcd_Import_Base16.xcu index 64625f1c391c..27a471a2c75f 100644 --- a/filter/source/config/fragments/internalgraphicfilters/pcd_Import_Base16.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/pcd_Import_Base16.xcu @@ -1,3 +1,20 @@ + pcd_Photo_CD_Base16 icd diff --git a/filter/source/config/fragments/internalgraphicfilters/pcd_Import_Base4.xcu b/filter/source/config/fragments/internalgraphicfilters/pcd_Import_Base4.xcu index 927d1ad54fc5..ba5f536b9a45 100644 --- a/filter/source/config/fragments/internalgraphicfilters/pcd_Import_Base4.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/pcd_Import_Base4.xcu @@ -1,3 +1,20 @@ + pcd_Photo_CD_Base4 icd diff --git a/filter/source/config/fragments/internalgraphicfilters/pct_Export.xcu b/filter/source/config/fragments/internalgraphicfilters/pct_Export.xcu index 6dcae82e07d4..707a4e23b89f 100644 --- a/filter/source/config/fragments/internalgraphicfilters/pct_Export.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/pct_Export.xcu @@ -1,3 +1,20 @@ + pct_Mac_Pict ept diff --git a/filter/source/config/fragments/internalgraphicfilters/pct_Import.xcu b/filter/source/config/fragments/internalgraphicfilters/pct_Import.xcu index b8fc4175d895..63048f9b4eb2 100644 --- a/filter/source/config/fragments/internalgraphicfilters/pct_Import.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/pct_Import.xcu @@ -1,3 +1,20 @@ + pct_Mac_Pict ipt diff --git a/filter/source/config/fragments/internalgraphicfilters/pcx_Import.xcu b/filter/source/config/fragments/internalgraphicfilters/pcx_Import.xcu index 7fa5dac0345a..4f8eb67340e4 100644 --- a/filter/source/config/fragments/internalgraphicfilters/pcx_Import.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/pcx_Import.xcu @@ -1,3 +1,20 @@ + pcx_Zsoft_Paintbrush ipx diff --git a/filter/source/config/fragments/internalgraphicfilters/pgm_Export.xcu b/filter/source/config/fragments/internalgraphicfilters/pgm_Export.xcu index 21628d9c1b02..1e4a6cedfc75 100644 --- a/filter/source/config/fragments/internalgraphicfilters/pgm_Export.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/pgm_Export.xcu @@ -1,3 +1,20 @@ + pgm_Portable_Graymap epg diff --git a/filter/source/config/fragments/internalgraphicfilters/pgm_Import.xcu b/filter/source/config/fragments/internalgraphicfilters/pgm_Import.xcu index 45cc3a83cea4..2e1d4bb27f68 100644 --- a/filter/source/config/fragments/internalgraphicfilters/pgm_Import.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/pgm_Import.xcu @@ -1,3 +1,20 @@ + pgm_Portable_Graymap ipb diff --git a/filter/source/config/fragments/internalgraphicfilters/png_Export.xcu b/filter/source/config/fragments/internalgraphicfilters/png_Export.xcu index abafad770e3a..5f94ab304a26 100644 --- a/filter/source/config/fragments/internalgraphicfilters/png_Export.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/png_Export.xcu @@ -1,3 +1,20 @@ + png_Portable_Network_Graphic SVEPNG diff --git a/filter/source/config/fragments/internalgraphicfilters/png_Import.xcu b/filter/source/config/fragments/internalgraphicfilters/png_Import.xcu index 5979e7857f28..1defed70b8f9 100644 --- a/filter/source/config/fragments/internalgraphicfilters/png_Import.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/png_Import.xcu @@ -1,3 +1,20 @@ + png_Portable_Network_Graphic SVIPNG diff --git a/filter/source/config/fragments/internalgraphicfilters/ppm_Export.xcu b/filter/source/config/fragments/internalgraphicfilters/ppm_Export.xcu index 2d7a18c34e3f..67e487e1bf9a 100644 --- a/filter/source/config/fragments/internalgraphicfilters/ppm_Export.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/ppm_Export.xcu @@ -1,3 +1,20 @@ + ppm_Portable_Pixelmap epp diff --git a/filter/source/config/fragments/internalgraphicfilters/ppm_Import.xcu b/filter/source/config/fragments/internalgraphicfilters/ppm_Import.xcu index 2d4792b7b7b5..c2213e24f8bc 100644 --- a/filter/source/config/fragments/internalgraphicfilters/ppm_Import.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/ppm_Import.xcu @@ -1,3 +1,20 @@ + ppm_Portable_Pixelmap ipb diff --git a/filter/source/config/fragments/internalgraphicfilters/psd_Import.xcu b/filter/source/config/fragments/internalgraphicfilters/psd_Import.xcu index cbfc6e4710e7..ce2c3066b8da 100644 --- a/filter/source/config/fragments/internalgraphicfilters/psd_Import.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/psd_Import.xcu @@ -1,3 +1,20 @@ + psd_Adobe_Photoshop ipd diff --git a/filter/source/config/fragments/internalgraphicfilters/ras_Export.xcu b/filter/source/config/fragments/internalgraphicfilters/ras_Export.xcu index 69aa0147ea36..5333add1e268 100644 --- a/filter/source/config/fragments/internalgraphicfilters/ras_Export.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/ras_Export.xcu @@ -1,3 +1,20 @@ + ras_Sun_Rasterfile era diff --git a/filter/source/config/fragments/internalgraphicfilters/ras_Import.xcu b/filter/source/config/fragments/internalgraphicfilters/ras_Import.xcu index ce30b3c2f00f..95108022b03a 100644 --- a/filter/source/config/fragments/internalgraphicfilters/ras_Import.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/ras_Import.xcu @@ -1,3 +1,20 @@ + ras_Sun_Rasterfile ira diff --git a/filter/source/config/fragments/internalgraphicfilters/sgf_Import.xcu b/filter/source/config/fragments/internalgraphicfilters/sgf_Import.xcu index 29da3f9f9165..242776b0730e 100644 --- a/filter/source/config/fragments/internalgraphicfilters/sgf_Import.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/sgf_Import.xcu @@ -1,3 +1,20 @@ + sgf_StarOffice_Writer_SGF SVSGF diff --git a/filter/source/config/fragments/internalgraphicfilters/sgv_Import.xcu b/filter/source/config/fragments/internalgraphicfilters/sgv_Import.xcu index cc40a3815769..63d47ce5cf04 100644 --- a/filter/source/config/fragments/internalgraphicfilters/sgv_Import.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/sgv_Import.xcu @@ -1,3 +1,20 @@ + sgv_StarDraw_20 SVSGV diff --git a/filter/source/config/fragments/internalgraphicfilters/svg_Export.xcu b/filter/source/config/fragments/internalgraphicfilters/svg_Export.xcu index 30b7122a654d..11e70d478cc3 100644 --- a/filter/source/config/fragments/internalgraphicfilters/svg_Export.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/svg_Export.xcu @@ -1,3 +1,20 @@ + svg_Scalable_Vector_Graphics SVESVG diff --git a/filter/source/config/fragments/internalgraphicfilters/svg_Import.xcu b/filter/source/config/fragments/internalgraphicfilters/svg_Import.xcu index 5e21c033947f..3577bd98d8a4 100644 --- a/filter/source/config/fragments/internalgraphicfilters/svg_Import.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/svg_Import.xcu @@ -1,3 +1,20 @@ + svg_Scalable_Vector_Graphics SVISVG diff --git a/filter/source/config/fragments/internalgraphicfilters/svm_Export.xcu b/filter/source/config/fragments/internalgraphicfilters/svm_Export.xcu index d6b55e8bf169..eeaa34cc4259 100644 --- a/filter/source/config/fragments/internalgraphicfilters/svm_Export.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/svm_Export.xcu @@ -1,3 +1,20 @@ + svm_StarView_Metafile SVMETAFILE diff --git a/filter/source/config/fragments/internalgraphicfilters/svm_Import.xcu b/filter/source/config/fragments/internalgraphicfilters/svm_Import.xcu index 8a291265710b..74dd7ec30dd4 100644 --- a/filter/source/config/fragments/internalgraphicfilters/svm_Import.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/svm_Import.xcu @@ -1,3 +1,20 @@ + svm_StarView_Metafile SVMETAFILE diff --git a/filter/source/config/fragments/internalgraphicfilters/tga_Import.xcu b/filter/source/config/fragments/internalgraphicfilters/tga_Import.xcu index af3db9b3c8fc..7ea4d49ec624 100644 --- a/filter/source/config/fragments/internalgraphicfilters/tga_Import.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/tga_Import.xcu @@ -1,3 +1,20 @@ + tga_Truevision_TARGA itg diff --git a/filter/source/config/fragments/internalgraphicfilters/tif_Export.xcu b/filter/source/config/fragments/internalgraphicfilters/tif_Export.xcu index 791335acce1f..c83701d2df88 100644 --- a/filter/source/config/fragments/internalgraphicfilters/tif_Export.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/tif_Export.xcu @@ -1,3 +1,20 @@ + tif_Tag_Image_File eti diff --git a/filter/source/config/fragments/internalgraphicfilters/tif_Import.xcu b/filter/source/config/fragments/internalgraphicfilters/tif_Import.xcu index 2737128acf05..8d4b32296bd3 100644 --- a/filter/source/config/fragments/internalgraphicfilters/tif_Import.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/tif_Import.xcu @@ -1,3 +1,20 @@ + tif_Tag_Image_File iti diff --git a/filter/source/config/fragments/internalgraphicfilters/wmf_Export.xcu b/filter/source/config/fragments/internalgraphicfilters/wmf_Export.xcu index 0a97f23b4875..a389687be900 100644 --- a/filter/source/config/fragments/internalgraphicfilters/wmf_Export.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/wmf_Export.xcu @@ -1,3 +1,20 @@ + wmf_MS_Windows_Metafile SVWMF diff --git a/filter/source/config/fragments/internalgraphicfilters/wmf_Import.xcu b/filter/source/config/fragments/internalgraphicfilters/wmf_Import.xcu index 313221f4edc4..149d7ec86d9f 100644 --- a/filter/source/config/fragments/internalgraphicfilters/wmf_Import.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/wmf_Import.xcu @@ -1,3 +1,20 @@ + wmf_MS_Windows_Metafile SVWMF diff --git a/filter/source/config/fragments/internalgraphicfilters/xbm_Import.xcu b/filter/source/config/fragments/internalgraphicfilters/xbm_Import.xcu index a433e15a7fc5..170cd89be582 100644 --- a/filter/source/config/fragments/internalgraphicfilters/xbm_Import.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/xbm_Import.xcu @@ -1,3 +1,20 @@ + xbm_X_Consortium SVIXBM diff --git a/filter/source/config/fragments/internalgraphicfilters/xpm_Export.xcu b/filter/source/config/fragments/internalgraphicfilters/xpm_Export.xcu index 660a240a6678..c10a67083a66 100644 --- a/filter/source/config/fragments/internalgraphicfilters/xpm_Export.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/xpm_Export.xcu @@ -1,3 +1,20 @@ + xpm_XPM exp diff --git a/filter/source/config/fragments/internalgraphicfilters/xpm_Import.xcu b/filter/source/config/fragments/internalgraphicfilters/xpm_Import.xcu index 886e29bfe708..bdc51fd31535 100644 --- a/filter/source/config/fragments/internalgraphicfilters/xpm_Import.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/xpm_Import.xcu @@ -1,3 +1,20 @@ + xpm_XPM SVIXPM diff --git a/filter/source/config/fragments/langfilter.xsl b/filter/source/config/fragments/langfilter.xsl index 76cfcff20ac6..d7e1f041e593 100644 --- a/filter/source/config/fragments/langfilter.xsl +++ b/filter/source/config/fragments/langfilter.xsl @@ -1,4 +1,21 @@ + diff --git a/filter/source/config/fragments/types/MS_Excel_2007_Binary.xcu b/filter/source/config/fragments/types/MS_Excel_2007_Binary.xcu index 5ab2edba92db..14a03a846288 100644 --- a/filter/source/config/fragments/types/MS_Excel_2007_Binary.xcu +++ b/filter/source/config/fragments/types/MS_Excel_2007_Binary.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.oox.FormatDetector diff --git a/filter/source/config/fragments/types/MS_Excel_2007_XML.xcu b/filter/source/config/fragments/types/MS_Excel_2007_XML.xcu index f15968ac7d62..b1a4fa87f396 100644 --- a/filter/source/config/fragments/types/MS_Excel_2007_XML.xcu +++ b/filter/source/config/fragments/types/MS_Excel_2007_XML.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.oox.FormatDetector diff --git a/filter/source/config/fragments/types/MS_Excel_2007_XML_Template.xcu b/filter/source/config/fragments/types/MS_Excel_2007_XML_Template.xcu index da959475ad21..e42d974ea426 100644 --- a/filter/source/config/fragments/types/MS_Excel_2007_XML_Template.xcu +++ b/filter/source/config/fragments/types/MS_Excel_2007_XML_Template.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.oox.FormatDetector diff --git a/filter/source/config/fragments/types/MS_PowerPoint_2007_XML.xcu b/filter/source/config/fragments/types/MS_PowerPoint_2007_XML.xcu index 9e553576b852..32238c205a46 100644 --- a/filter/source/config/fragments/types/MS_PowerPoint_2007_XML.xcu +++ b/filter/source/config/fragments/types/MS_PowerPoint_2007_XML.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.oox.FormatDetector diff --git a/filter/source/config/fragments/types/MS_PowerPoint_2007_XML_AutoPlay.xcu b/filter/source/config/fragments/types/MS_PowerPoint_2007_XML_AutoPlay.xcu index c6333dec474e..8c93ddd4b524 100644 --- a/filter/source/config/fragments/types/MS_PowerPoint_2007_XML_AutoPlay.xcu +++ b/filter/source/config/fragments/types/MS_PowerPoint_2007_XML_AutoPlay.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.oox.FormatDetector diff --git a/filter/source/config/fragments/types/MS_PowerPoint_2007_XML_Template.xcu b/filter/source/config/fragments/types/MS_PowerPoint_2007_XML_Template.xcu index 6785000a5b3e..8b64d07f54ea 100644 --- a/filter/source/config/fragments/types/MS_PowerPoint_2007_XML_Template.xcu +++ b/filter/source/config/fragments/types/MS_PowerPoint_2007_XML_Template.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.oox.FormatDetector diff --git a/filter/source/config/fragments/types/StarBase.xcu b/filter/source/config/fragments/types/StarBase.xcu index 85d8b7a7e5f1..5f335c07faa1 100644 --- a/filter/source/config/fragments/types/StarBase.xcu +++ b/filter/source/config/fragments/types/StarBase.xcu @@ -1,3 +1,20 @@ + org.openoffice.comp.dbflt.DBTypeDetection private:factory/sdatabase* diff --git a/filter/source/config/fragments/types/Unified_Office_Format_presentation.xcu b/filter/source/config/fragments/types/Unified_Office_Format_presentation.xcu index f814eb998b5f..11f2a392b61f 100644 --- a/filter/source/config/fragments/types/Unified_Office_Format_presentation.xcu +++ b/filter/source/config/fragments/types/Unified_Office_Format_presentation.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.filters.XMLFilterDetect diff --git a/filter/source/config/fragments/types/Unified_Office_Format_spreadsheet.xcu b/filter/source/config/fragments/types/Unified_Office_Format_spreadsheet.xcu index a8bae7e1ed2d..71971bd1bbb2 100644 --- a/filter/source/config/fragments/types/Unified_Office_Format_spreadsheet.xcu +++ b/filter/source/config/fragments/types/Unified_Office_Format_spreadsheet.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.filters.XMLFilterDetect diff --git a/filter/source/config/fragments/types/Unified_Office_Format_text.xcu b/filter/source/config/fragments/types/Unified_Office_Format_text.xcu index 76bf0e5fffa9..be991d4667e5 100644 --- a/filter/source/config/fragments/types/Unified_Office_Format_text.xcu +++ b/filter/source/config/fragments/types/Unified_Office_Format_text.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.filters.XMLFilterDetect diff --git a/filter/source/config/fragments/types/XHTML_File.xcu b/filter/source/config/fragments/types/XHTML_File.xcu index ea594b1aaf5f..6117ca3feca1 100644 --- a/filter/source/config/fragments/types/XHTML_File.xcu +++ b/filter/source/config/fragments/types/XHTML_File.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.filters.XMLFilterDetect diff --git a/filter/source/config/fragments/types/bmp_MS_Windows.xcu b/filter/source/config/fragments/types/bmp_MS_Windows.xcu index a344333abaa0..7f60fae33782 100644 --- a/filter/source/config/fragments/types/bmp_MS_Windows.xcu +++ b/filter/source/config/fragments/types/bmp_MS_Windows.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector diff --git a/filter/source/config/fragments/types/calc8.xcu b/filter/source/config/fragments/types/calc8.xcu index f351e0c14c5d..40d87cdfd5cf 100644 --- a/filter/source/config/fragments/types/calc8.xcu +++ b/filter/source/config/fragments/types/calc8.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.calc.FormatDetector private:factory/scalc* diff --git a/filter/source/config/fragments/types/calc8_template.xcu b/filter/source/config/fragments/types/calc8_template.xcu index 933cbc84ab34..d99d45b53ce1 100644 --- a/filter/source/config/fragments/types/calc8_template.xcu +++ b/filter/source/config/fragments/types/calc8_template.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.calc.FormatDetector diff --git a/filter/source/config/fragments/types/calc_DIF.xcu b/filter/source/config/fragments/types/calc_DIF.xcu index f2c8a8e9d247..536e75d723b6 100644 --- a/filter/source/config/fragments/types/calc_DIF.xcu +++ b/filter/source/config/fragments/types/calc_DIF.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.calc.FormatDetector diff --git a/filter/source/config/fragments/types/calc_Lotus.xcu b/filter/source/config/fragments/types/calc_Lotus.xcu index 08deadd46268..2b047e3f0b76 100644 --- a/filter/source/config/fragments/types/calc_Lotus.xcu +++ b/filter/source/config/fragments/types/calc_Lotus.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.calc.FormatDetector diff --git a/filter/source/config/fragments/types/calc_MS_Excel_2003_XML.xcu b/filter/source/config/fragments/types/calc_MS_Excel_2003_XML.xcu index f37923a6d1f0..a0b3d90f2ff3 100644 --- a/filter/source/config/fragments/types/calc_MS_Excel_2003_XML.xcu +++ b/filter/source/config/fragments/types/calc_MS_Excel_2003_XML.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.filters.XMLFilterDetect diff --git a/filter/source/config/fragments/types/calc_MS_Excel_40.xcu b/filter/source/config/fragments/types/calc_MS_Excel_40.xcu index b45c21fa33bd..1506f7e52d5b 100644 --- a/filter/source/config/fragments/types/calc_MS_Excel_40.xcu +++ b/filter/source/config/fragments/types/calc_MS_Excel_40.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.calc.FormatDetector diff --git a/filter/source/config/fragments/types/calc_MS_Excel_40_VorlageTemplate.xcu b/filter/source/config/fragments/types/calc_MS_Excel_40_VorlageTemplate.xcu index 42bb10ed09c8..ed9ccb2a5e8d 100644 --- a/filter/source/config/fragments/types/calc_MS_Excel_40_VorlageTemplate.xcu +++ b/filter/source/config/fragments/types/calc_MS_Excel_40_VorlageTemplate.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.calc.FormatDetector diff --git a/filter/source/config/fragments/types/calc_MS_Excel_5095.xcu b/filter/source/config/fragments/types/calc_MS_Excel_5095.xcu index 3f450f0cb85f..b1f7a87c5d86 100644 --- a/filter/source/config/fragments/types/calc_MS_Excel_5095.xcu +++ b/filter/source/config/fragments/types/calc_MS_Excel_5095.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.calc.FormatDetector diff --git a/filter/source/config/fragments/types/calc_MS_Excel_5095_VorlageTemplate.xcu b/filter/source/config/fragments/types/calc_MS_Excel_5095_VorlageTemplate.xcu index 8dbb02c0170e..b14111f9ace0 100644 --- a/filter/source/config/fragments/types/calc_MS_Excel_5095_VorlageTemplate.xcu +++ b/filter/source/config/fragments/types/calc_MS_Excel_5095_VorlageTemplate.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.calc.FormatDetector diff --git a/filter/source/config/fragments/types/calc_MS_Excel_95.xcu b/filter/source/config/fragments/types/calc_MS_Excel_95.xcu index 0ea10dddc31e..4e20ce8ff19a 100644 --- a/filter/source/config/fragments/types/calc_MS_Excel_95.xcu +++ b/filter/source/config/fragments/types/calc_MS_Excel_95.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.calc.FormatDetector diff --git a/filter/source/config/fragments/types/calc_MS_Excel_95_VorlageTemplate.xcu b/filter/source/config/fragments/types/calc_MS_Excel_95_VorlageTemplate.xcu index fb3e41014f85..4376a5e512e0 100644 --- a/filter/source/config/fragments/types/calc_MS_Excel_95_VorlageTemplate.xcu +++ b/filter/source/config/fragments/types/calc_MS_Excel_95_VorlageTemplate.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.calc.FormatDetector diff --git a/filter/source/config/fragments/types/calc_MS_Excel_97.xcu b/filter/source/config/fragments/types/calc_MS_Excel_97.xcu index bb232c313ad4..da3fd3929ae2 100644 --- a/filter/source/config/fragments/types/calc_MS_Excel_97.xcu +++ b/filter/source/config/fragments/types/calc_MS_Excel_97.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.calc.FormatDetector diff --git a/filter/source/config/fragments/types/calc_MS_Excel_97_VorlageTemplate.xcu b/filter/source/config/fragments/types/calc_MS_Excel_97_VorlageTemplate.xcu index 26f4bca3a725..587a9bdfd6f8 100644 --- a/filter/source/config/fragments/types/calc_MS_Excel_97_VorlageTemplate.xcu +++ b/filter/source/config/fragments/types/calc_MS_Excel_97_VorlageTemplate.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.calc.FormatDetector diff --git a/filter/source/config/fragments/types/calc_MiniCalc_PalmDB_File.xcu b/filter/source/config/fragments/types/calc_MiniCalc_PalmDB_File.xcu index 7362f8308b52..6b94ffdae596 100644 --- a/filter/source/config/fragments/types/calc_MiniCalc_PalmDB_File.xcu +++ b/filter/source/config/fragments/types/calc_MiniCalc_PalmDB_File.xcu @@ -1,3 +1,20 @@ + diff --git a/filter/source/config/fragments/types/calc_ODS_FlatXML.xcu b/filter/source/config/fragments/types/calc_ODS_FlatXML.xcu index bb9cd6d7ac71..0e778624de3c 100644 --- a/filter/source/config/fragments/types/calc_ODS_FlatXML.xcu +++ b/filter/source/config/fragments/types/calc_ODS_FlatXML.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.filters.XMLFilterDetect diff --git a/filter/source/config/fragments/types/calc_OOXML.xcu b/filter/source/config/fragments/types/calc_OOXML.xcu index f00af8ba4d18..9208038c2c20 100644 --- a/filter/source/config/fragments/types/calc_OOXML.xcu +++ b/filter/source/config/fragments/types/calc_OOXML.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.oox.FormatDetector diff --git a/filter/source/config/fragments/types/calc_OOXML_Template.xcu b/filter/source/config/fragments/types/calc_OOXML_Template.xcu index 201d522df271..e35c16775765 100644 --- a/filter/source/config/fragments/types/calc_OOXML_Template.xcu +++ b/filter/source/config/fragments/types/calc_OOXML_Template.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.oox.FormatDetector diff --git a/filter/source/config/fragments/types/calc_Pocket_Excel_File.xcu b/filter/source/config/fragments/types/calc_Pocket_Excel_File.xcu index 6be3877cdc81..ed710ab7e2c7 100644 --- a/filter/source/config/fragments/types/calc_Pocket_Excel_File.xcu +++ b/filter/source/config/fragments/types/calc_Pocket_Excel_File.xcu @@ -1,3 +1,20 @@ + diff --git a/filter/source/config/fragments/types/calc_QPro.xcu b/filter/source/config/fragments/types/calc_QPro.xcu index 751b534fb511..e43a63bae40e 100644 --- a/filter/source/config/fragments/types/calc_QPro.xcu +++ b/filter/source/config/fragments/types/calc_QPro.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.calc.FormatDetector diff --git a/filter/source/config/fragments/types/calc_SYLK.xcu b/filter/source/config/fragments/types/calc_SYLK.xcu index 3f5d1f90b019..4f0d72cab61f 100644 --- a/filter/source/config/fragments/types/calc_SYLK.xcu +++ b/filter/source/config/fragments/types/calc_SYLK.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.calc.FormatDetector diff --git a/filter/source/config/fragments/types/calc_StarCalc_10.xcu b/filter/source/config/fragments/types/calc_StarCalc_10.xcu index 0a90e4001b97..cea8cdefd2f2 100644 --- a/filter/source/config/fragments/types/calc_StarCalc_10.xcu +++ b/filter/source/config/fragments/types/calc_StarCalc_10.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.calc.FormatDetector diff --git a/filter/source/config/fragments/types/calc_StarCalc_30.xcu b/filter/source/config/fragments/types/calc_StarCalc_30.xcu index 27f46b7ad70a..7b7f54f7f7f9 100644 --- a/filter/source/config/fragments/types/calc_StarCalc_30.xcu +++ b/filter/source/config/fragments/types/calc_StarCalc_30.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.sfx2.BinaryFormatDetector diff --git a/filter/source/config/fragments/types/calc_StarCalc_30_VorlageTemplate.xcu b/filter/source/config/fragments/types/calc_StarCalc_30_VorlageTemplate.xcu index 866b5efa7c1b..ad95c6dc4ae6 100644 --- a/filter/source/config/fragments/types/calc_StarCalc_30_VorlageTemplate.xcu +++ b/filter/source/config/fragments/types/calc_StarCalc_30_VorlageTemplate.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.sfx2.BinaryFormatDetector diff --git a/filter/source/config/fragments/types/calc_StarCalc_40.xcu b/filter/source/config/fragments/types/calc_StarCalc_40.xcu index a794e57d4cc6..bd8b5d916afa 100644 --- a/filter/source/config/fragments/types/calc_StarCalc_40.xcu +++ b/filter/source/config/fragments/types/calc_StarCalc_40.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.sfx2.BinaryFormatDetector diff --git a/filter/source/config/fragments/types/calc_StarCalc_40_VorlageTemplate.xcu b/filter/source/config/fragments/types/calc_StarCalc_40_VorlageTemplate.xcu index f16c7510bf20..4bed5d44371f 100644 --- a/filter/source/config/fragments/types/calc_StarCalc_40_VorlageTemplate.xcu +++ b/filter/source/config/fragments/types/calc_StarCalc_40_VorlageTemplate.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.sfx2.BinaryFormatDetector diff --git a/filter/source/config/fragments/types/calc_StarCalc_50.xcu b/filter/source/config/fragments/types/calc_StarCalc_50.xcu index f3659cdcd203..dcecc3427acb 100644 --- a/filter/source/config/fragments/types/calc_StarCalc_50.xcu +++ b/filter/source/config/fragments/types/calc_StarCalc_50.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.sfx2.BinaryFormatDetector diff --git a/filter/source/config/fragments/types/calc_StarCalc_50_VorlageTemplate.xcu b/filter/source/config/fragments/types/calc_StarCalc_50_VorlageTemplate.xcu index e517605c5756..54c811f31c3d 100644 --- a/filter/source/config/fragments/types/calc_StarCalc_50_VorlageTemplate.xcu +++ b/filter/source/config/fragments/types/calc_StarCalc_50_VorlageTemplate.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.sfx2.BinaryFormatDetector diff --git a/filter/source/config/fragments/types/calc_StarOffice_XML_Calc.xcu b/filter/source/config/fragments/types/calc_StarOffice_XML_Calc.xcu index 9a37858f5fa7..4b998c4402b6 100644 --- a/filter/source/config/fragments/types/calc_StarOffice_XML_Calc.xcu +++ b/filter/source/config/fragments/types/calc_StarOffice_XML_Calc.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.calc.FormatDetector diff --git a/filter/source/config/fragments/types/calc_StarOffice_XML_Calc_Template.xcu b/filter/source/config/fragments/types/calc_StarOffice_XML_Calc_Template.xcu index e300b13fb0a0..0de78f4fd03f 100644 --- a/filter/source/config/fragments/types/calc_StarOffice_XML_Calc_Template.xcu +++ b/filter/source/config/fragments/types/calc_StarOffice_XML_Calc_Template.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.calc.FormatDetector diff --git a/filter/source/config/fragments/types/calc_dBase.xcu b/filter/source/config/fragments/types/calc_dBase.xcu index e2707d4b00f3..d37ec5a64ea5 100644 --- a/filter/source/config/fragments/types/calc_dBase.xcu +++ b/filter/source/config/fragments/types/calc_dBase.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.calc.FormatDetector diff --git a/filter/source/config/fragments/types/chart8.xcu b/filter/source/config/fragments/types/chart8.xcu index 22e6d7d15e36..59f0d0c38504 100644 --- a/filter/source/config/fragments/types/chart8.xcu +++ b/filter/source/config/fragments/types/chart8.xcu @@ -1,3 +1,20 @@ + private:factory/schart* diff --git a/filter/source/config/fragments/types/chart_StarChart_30.xcu b/filter/source/config/fragments/types/chart_StarChart_30.xcu index f42c5b6c9f05..f6c2f8affc95 100644 --- a/filter/source/config/fragments/types/chart_StarChart_30.xcu +++ b/filter/source/config/fragments/types/chart_StarChart_30.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.sfx2.BinaryFormatDetector diff --git a/filter/source/config/fragments/types/chart_StarChart_40.xcu b/filter/source/config/fragments/types/chart_StarChart_40.xcu index a1ce87af1abe..56b4b58ee9cf 100644 --- a/filter/source/config/fragments/types/chart_StarChart_40.xcu +++ b/filter/source/config/fragments/types/chart_StarChart_40.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.sfx2.BinaryFormatDetector diff --git a/filter/source/config/fragments/types/chart_StarChart_50.xcu b/filter/source/config/fragments/types/chart_StarChart_50.xcu index 79ff33234b6a..5ea2784c7838 100644 --- a/filter/source/config/fragments/types/chart_StarChart_50.xcu +++ b/filter/source/config/fragments/types/chart_StarChart_50.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.sfx2.BinaryFormatDetector diff --git a/filter/source/config/fragments/types/chart_StarOffice_XML_Chart.xcu b/filter/source/config/fragments/types/chart_StarOffice_XML_Chart.xcu index 1d581ae3b87c..bacd5d3da5f7 100644 --- a/filter/source/config/fragments/types/chart_StarOffice_XML_Chart.xcu +++ b/filter/source/config/fragments/types/chart_StarOffice_XML_Chart.xcu @@ -1,3 +1,20 @@ + diff --git a/filter/source/config/fragments/types/component_Bibliography.xcu b/filter/source/config/fragments/types/component_Bibliography.xcu index dac9d9e2f19c..526a4b20b020 100644 --- a/filter/source/config/fragments/types/component_Bibliography.xcu +++ b/filter/source/config/fragments/types/component_Bibliography.xcu @@ -1,3 +1,20 @@ + .component:Bibliography/* diff --git a/filter/source/config/fragments/types/component_DB.xcu b/filter/source/config/fragments/types/component_DB.xcu index 7fe591eda872..0c1f3ac5a8fb 100644 --- a/filter/source/config/fragments/types/component_DB.xcu +++ b/filter/source/config/fragments/types/component_DB.xcu @@ -1,3 +1,20 @@ + .component:DB* diff --git a/filter/source/config/fragments/types/draw8.xcu b/filter/source/config/fragments/types/draw8.xcu index b74358397bff..3637cc95c0ea 100644 --- a/filter/source/config/fragments/types/draw8.xcu +++ b/filter/source/config/fragments/types/draw8.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector private:factory/sdraw* diff --git a/filter/source/config/fragments/types/draw8_template.xcu b/filter/source/config/fragments/types/draw8_template.xcu index aac3d5e7b1eb..bf8f58f6aee2 100644 --- a/filter/source/config/fragments/types/draw8_template.xcu +++ b/filter/source/config/fragments/types/draw8_template.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector diff --git a/filter/source/config/fragments/types/draw_CorelDraw_Document.xcu b/filter/source/config/fragments/types/draw_CorelDraw_Document.xcu index d13a8fcc20ff..57c637394ab0 100644 --- a/filter/source/config/fragments/types/draw_CorelDraw_Document.xcu +++ b/filter/source/config/fragments/types/draw_CorelDraw_Document.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.Draw.CDRImportFilter diff --git a/filter/source/config/fragments/types/draw_Corel_Presentation_Exchange.xcu b/filter/source/config/fragments/types/draw_Corel_Presentation_Exchange.xcu index 7f002b0f2426..73b43832b3de 100644 --- a/filter/source/config/fragments/types/draw_Corel_Presentation_Exchange.xcu +++ b/filter/source/config/fragments/types/draw_Corel_Presentation_Exchange.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.Draw.CMXImportFilter diff --git a/filter/source/config/fragments/types/draw_ODG_FlatXML.xcu b/filter/source/config/fragments/types/draw_ODG_FlatXML.xcu index 41d8a6941b8f..69234ce2790c 100644 --- a/filter/source/config/fragments/types/draw_ODG_FlatXML.xcu +++ b/filter/source/config/fragments/types/draw_ODG_FlatXML.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.filters.XMLFilterDetect diff --git a/filter/source/config/fragments/types/draw_Publisher_Document.xcu b/filter/source/config/fragments/types/draw_Publisher_Document.xcu index 8a253a39f758..cb56d145aa55 100644 --- a/filter/source/config/fragments/types/draw_Publisher_Document.xcu +++ b/filter/source/config/fragments/types/draw_Publisher_Document.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.Draw.MSPUBImportFilter diff --git a/filter/source/config/fragments/types/draw_StarDraw_30.xcu b/filter/source/config/fragments/types/draw_StarDraw_30.xcu index 208b247662b7..83c293297121 100644 --- a/filter/source/config/fragments/types/draw_StarDraw_30.xcu +++ b/filter/source/config/fragments/types/draw_StarDraw_30.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.sfx2.BinaryFormatDetector diff --git a/filter/source/config/fragments/types/draw_StarDraw_30_Vorlage.xcu b/filter/source/config/fragments/types/draw_StarDraw_30_Vorlage.xcu index f618780b0de9..e23356c8bd96 100644 --- a/filter/source/config/fragments/types/draw_StarDraw_30_Vorlage.xcu +++ b/filter/source/config/fragments/types/draw_StarDraw_30_Vorlage.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.sfx2.BinaryFormatDetector diff --git a/filter/source/config/fragments/types/draw_StarDraw_50.xcu b/filter/source/config/fragments/types/draw_StarDraw_50.xcu index 18340f2a7937..f9a55e0470d3 100644 --- a/filter/source/config/fragments/types/draw_StarDraw_50.xcu +++ b/filter/source/config/fragments/types/draw_StarDraw_50.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.sfx2.BinaryFormatDetector diff --git a/filter/source/config/fragments/types/draw_StarDraw_50_Vorlage.xcu b/filter/source/config/fragments/types/draw_StarDraw_50_Vorlage.xcu index 5063da9bbdfb..e66ccb12cb00 100644 --- a/filter/source/config/fragments/types/draw_StarDraw_50_Vorlage.xcu +++ b/filter/source/config/fragments/types/draw_StarDraw_50_Vorlage.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.sfx2.BinaryFormatDetector diff --git a/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu b/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu index 9bae1925f977..4c454df58827 100644 --- a/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu +++ b/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector diff --git a/filter/source/config/fragments/types/draw_StarOffice_XML_Draw_Template.xcu b/filter/source/config/fragments/types/draw_StarOffice_XML_Draw_Template.xcu index a068d61a1937..2e1b9e72ab38 100644 --- a/filter/source/config/fragments/types/draw_StarOffice_XML_Draw_Template.xcu +++ b/filter/source/config/fragments/types/draw_StarOffice_XML_Draw_Template.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector diff --git a/filter/source/config/fragments/types/draw_Visio_Document.xcu b/filter/source/config/fragments/types/draw_Visio_Document.xcu index a271e2aa2d90..a7234b4e1000 100644 --- a/filter/source/config/fragments/types/draw_Visio_Document.xcu +++ b/filter/source/config/fragments/types/draw_Visio_Document.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.Draw.VisioImportFilter diff --git a/filter/source/config/fragments/types/draw_WordPerfect_Graphics.xcu b/filter/source/config/fragments/types/draw_WordPerfect_Graphics.xcu index 4968294c13cf..6e0a52ee753a 100644 --- a/filter/source/config/fragments/types/draw_WordPerfect_Graphics.xcu +++ b/filter/source/config/fragments/types/draw_WordPerfect_Graphics.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.Draw.WPGImportFilter diff --git a/filter/source/config/fragments/types/dxf_AutoCAD_Interchange.xcu b/filter/source/config/fragments/types/dxf_AutoCAD_Interchange.xcu index d7df23807f1f..a785f8569bd3 100644 --- a/filter/source/config/fragments/types/dxf_AutoCAD_Interchange.xcu +++ b/filter/source/config/fragments/types/dxf_AutoCAD_Interchange.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector diff --git a/filter/source/config/fragments/types/emf_MS_Windows_Metafile.xcu b/filter/source/config/fragments/types/emf_MS_Windows_Metafile.xcu index 3f2789c161b8..6d1564bebd07 100644 --- a/filter/source/config/fragments/types/emf_MS_Windows_Metafile.xcu +++ b/filter/source/config/fragments/types/emf_MS_Windows_Metafile.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector diff --git a/filter/source/config/fragments/types/eps_Encapsulated_PostScript.xcu b/filter/source/config/fragments/types/eps_Encapsulated_PostScript.xcu index 32fdda46d7f7..7097c98aa4fc 100644 --- a/filter/source/config/fragments/types/eps_Encapsulated_PostScript.xcu +++ b/filter/source/config/fragments/types/eps_Encapsulated_PostScript.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector diff --git a/filter/source/config/fragments/types/generic_HTML.xcu b/filter/source/config/fragments/types/generic_HTML.xcu index c0885f7b594e..ede6d2b8fefb 100644 --- a/filter/source/config/fragments/types/generic_HTML.xcu +++ b/filter/source/config/fragments/types/generic_HTML.xcu @@ -1,3 +1,20 @@ + com.sun.star.text.FormatDetector private:factory/swriter/web* diff --git a/filter/source/config/fragments/types/generic_Text.xcu b/filter/source/config/fragments/types/generic_Text.xcu index de250225c0a9..e0dc31d0f55d 100644 --- a/filter/source/config/fragments/types/generic_Text.xcu +++ b/filter/source/config/fragments/types/generic_Text.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.filters.PlainTextFilterDetect diff --git a/filter/source/config/fragments/types/gif_Graphics_Interchange.xcu b/filter/source/config/fragments/types/gif_Graphics_Interchange.xcu index 13eed4ad46ea..9fbf3ec32e0b 100644 --- a/filter/source/config/fragments/types/gif_Graphics_Interchange.xcu +++ b/filter/source/config/fragments/types/gif_Graphics_Interchange.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector diff --git a/filter/source/config/fragments/types/graphic_HTML.xcu b/filter/source/config/fragments/types/graphic_HTML.xcu index 7c834cccf687..e918bbd5003f 100644 --- a/filter/source/config/fragments/types/graphic_HTML.xcu +++ b/filter/source/config/fragments/types/graphic_HTML.xcu @@ -1,3 +1,20 @@ + diff --git a/filter/source/config/fragments/types/graphic_SWF.xcu b/filter/source/config/fragments/types/graphic_SWF.xcu index ce67250d0854..66f503d08623 100644 --- a/filter/source/config/fragments/types/graphic_SWF.xcu +++ b/filter/source/config/fragments/types/graphic_SWF.xcu @@ -1,3 +1,20 @@ + diff --git a/filter/source/config/fragments/types/impress8.xcu b/filter/source/config/fragments/types/impress8.xcu index 8242aac979ec..cd3fb6752b9e 100644 --- a/filter/source/config/fragments/types/impress8.xcu +++ b/filter/source/config/fragments/types/impress8.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector private:factory/simpress* diff --git a/filter/source/config/fragments/types/impress8_template.xcu b/filter/source/config/fragments/types/impress8_template.xcu index 9b1a49261eb9..02e7e592823a 100644 --- a/filter/source/config/fragments/types/impress8_template.xcu +++ b/filter/source/config/fragments/types/impress8_template.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector diff --git a/filter/source/config/fragments/types/impress_CGM_Computer_Graphics_Metafile.xcu b/filter/source/config/fragments/types/impress_CGM_Computer_Graphics_Metafile.xcu index ec9f85c9e9fe..5f96f709f49d 100644 --- a/filter/source/config/fragments/types/impress_CGM_Computer_Graphics_Metafile.xcu +++ b/filter/source/config/fragments/types/impress_CGM_Computer_Graphics_Metafile.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector diff --git a/filter/source/config/fragments/types/impress_MS_PowerPoint_97.xcu b/filter/source/config/fragments/types/impress_MS_PowerPoint_97.xcu index b5e25e3865cd..5903584a0d9d 100644 --- a/filter/source/config/fragments/types/impress_MS_PowerPoint_97.xcu +++ b/filter/source/config/fragments/types/impress_MS_PowerPoint_97.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector diff --git a/filter/source/config/fragments/types/impress_MS_PowerPoint_97_AutoPlay.xcu b/filter/source/config/fragments/types/impress_MS_PowerPoint_97_AutoPlay.xcu index ddbcea64ef49..c464065e9384 100644 --- a/filter/source/config/fragments/types/impress_MS_PowerPoint_97_AutoPlay.xcu +++ b/filter/source/config/fragments/types/impress_MS_PowerPoint_97_AutoPlay.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector diff --git a/filter/source/config/fragments/types/impress_MS_PowerPoint_97_Vorlage.xcu b/filter/source/config/fragments/types/impress_MS_PowerPoint_97_Vorlage.xcu index 6e9690e4c554..d28578f56c82 100644 --- a/filter/source/config/fragments/types/impress_MS_PowerPoint_97_Vorlage.xcu +++ b/filter/source/config/fragments/types/impress_MS_PowerPoint_97_Vorlage.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector diff --git a/filter/source/config/fragments/types/impress_ODP_FlatXML.xcu b/filter/source/config/fragments/types/impress_ODP_FlatXML.xcu index 915f91aa6c8b..7157d480205a 100644 --- a/filter/source/config/fragments/types/impress_ODP_FlatXML.xcu +++ b/filter/source/config/fragments/types/impress_ODP_FlatXML.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.filters.XMLFilterDetect diff --git a/filter/source/config/fragments/types/impress_OOXML_Presentation.xcu b/filter/source/config/fragments/types/impress_OOXML_Presentation.xcu index 4db4a66417ec..6264ce716787 100644 --- a/filter/source/config/fragments/types/impress_OOXML_Presentation.xcu +++ b/filter/source/config/fragments/types/impress_OOXML_Presentation.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.oox.FormatDetector diff --git a/filter/source/config/fragments/types/impress_OOXML_Presentation_AutoPlay.xcu b/filter/source/config/fragments/types/impress_OOXML_Presentation_AutoPlay.xcu index c9f5a6ecf8c8..a659cf242907 100644 --- a/filter/source/config/fragments/types/impress_OOXML_Presentation_AutoPlay.xcu +++ b/filter/source/config/fragments/types/impress_OOXML_Presentation_AutoPlay.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.oox.FormatDetector diff --git a/filter/source/config/fragments/types/impress_OOXML_Presentation_Template.xcu b/filter/source/config/fragments/types/impress_OOXML_Presentation_Template.xcu index f1af4462892d..02ff99e70449 100644 --- a/filter/source/config/fragments/types/impress_OOXML_Presentation_Template.xcu +++ b/filter/source/config/fragments/types/impress_OOXML_Presentation_Template.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.oox.FormatDetector diff --git a/filter/source/config/fragments/types/impress_StarImpress_40.xcu b/filter/source/config/fragments/types/impress_StarImpress_40.xcu index bdb4c6516b63..e6a40064641c 100644 --- a/filter/source/config/fragments/types/impress_StarImpress_40.xcu +++ b/filter/source/config/fragments/types/impress_StarImpress_40.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.sfx2.BinaryFormatDetector diff --git a/filter/source/config/fragments/types/impress_StarImpress_40_Vorlage.xcu b/filter/source/config/fragments/types/impress_StarImpress_40_Vorlage.xcu index 76db489ac6f0..f1bc020f968c 100644 --- a/filter/source/config/fragments/types/impress_StarImpress_40_Vorlage.xcu +++ b/filter/source/config/fragments/types/impress_StarImpress_40_Vorlage.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.sfx2.BinaryFormatDetector diff --git a/filter/source/config/fragments/types/impress_StarImpress_50.xcu b/filter/source/config/fragments/types/impress_StarImpress_50.xcu index 32b54804f077..47fd98890e5a 100644 --- a/filter/source/config/fragments/types/impress_StarImpress_50.xcu +++ b/filter/source/config/fragments/types/impress_StarImpress_50.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.sfx2.BinaryFormatDetector diff --git a/filter/source/config/fragments/types/impress_StarImpress_50_Vorlage.xcu b/filter/source/config/fragments/types/impress_StarImpress_50_Vorlage.xcu index e0538927e440..c64f11e1edc8 100644 --- a/filter/source/config/fragments/types/impress_StarImpress_50_Vorlage.xcu +++ b/filter/source/config/fragments/types/impress_StarImpress_50_Vorlage.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.sfx2.BinaryFormatDetector diff --git a/filter/source/config/fragments/types/impress_StarImpress_50_packed.xcu b/filter/source/config/fragments/types/impress_StarImpress_50_packed.xcu index 8a9f02a439e0..44cd845a7991 100644 --- a/filter/source/config/fragments/types/impress_StarImpress_50_packed.xcu +++ b/filter/source/config/fragments/types/impress_StarImpress_50_packed.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.sfx2.BinaryFormatDetector diff --git a/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu b/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu index e015eff35e5b..8376bb452eeb 100644 --- a/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu +++ b/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector diff --git a/filter/source/config/fragments/types/impress_StarOffice_XML_Impress_Template.xcu b/filter/source/config/fragments/types/impress_StarOffice_XML_Impress_Template.xcu index 04bfc085fb1c..4a2f7065949a 100644 --- a/filter/source/config/fragments/types/impress_StarOffice_XML_Impress_Template.xcu +++ b/filter/source/config/fragments/types/impress_StarOffice_XML_Impress_Template.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector diff --git a/filter/source/config/fragments/types/jpg_JPEG.xcu b/filter/source/config/fragments/types/jpg_JPEG.xcu index 00ca0bff41de..45f587430407 100644 --- a/filter/source/config/fragments/types/jpg_JPEG.xcu +++ b/filter/source/config/fragments/types/jpg_JPEG.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector diff --git a/filter/source/config/fragments/types/math8.xcu b/filter/source/config/fragments/types/math8.xcu index e33c2d6f88ae..159d49efe80d 100644 --- a/filter/source/config/fragments/types/math8.xcu +++ b/filter/source/config/fragments/types/math8.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.math.FormatDetector private:factory/smath* diff --git a/filter/source/config/fragments/types/math_MathML_XML_Math.xcu b/filter/source/config/fragments/types/math_MathML_XML_Math.xcu index ae79854aae5c..41891f2d8971 100644 --- a/filter/source/config/fragments/types/math_MathML_XML_Math.xcu +++ b/filter/source/config/fragments/types/math_MathML_XML_Math.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.math.FormatDetector diff --git a/filter/source/config/fragments/types/math_MathType_3x.xcu b/filter/source/config/fragments/types/math_MathType_3x.xcu index 3b3c88b3f1a7..21c22d15d12c 100644 --- a/filter/source/config/fragments/types/math_MathType_3x.xcu +++ b/filter/source/config/fragments/types/math_MathType_3x.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.math.FormatDetector diff --git a/filter/source/config/fragments/types/math_StarMath_20.xcu b/filter/source/config/fragments/types/math_StarMath_20.xcu index 3870f92cd83f..4e77dbb29a4d 100644 --- a/filter/source/config/fragments/types/math_StarMath_20.xcu +++ b/filter/source/config/fragments/types/math_StarMath_20.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.math.FormatDetector diff --git a/filter/source/config/fragments/types/math_StarMath_30.xcu b/filter/source/config/fragments/types/math_StarMath_30.xcu index f2410d3bcb77..661b7e734aaf 100644 --- a/filter/source/config/fragments/types/math_StarMath_30.xcu +++ b/filter/source/config/fragments/types/math_StarMath_30.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.sfx2.BinaryFormatDetector diff --git a/filter/source/config/fragments/types/math_StarMath_40.xcu b/filter/source/config/fragments/types/math_StarMath_40.xcu index c535af92e0e5..1af6c39d0b75 100644 --- a/filter/source/config/fragments/types/math_StarMath_40.xcu +++ b/filter/source/config/fragments/types/math_StarMath_40.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.sfx2.BinaryFormatDetector diff --git a/filter/source/config/fragments/types/math_StarMath_50.xcu b/filter/source/config/fragments/types/math_StarMath_50.xcu index 183d55a4b925..9fe61125dcb1 100644 --- a/filter/source/config/fragments/types/math_StarMath_50.xcu +++ b/filter/source/config/fragments/types/math_StarMath_50.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.sfx2.BinaryFormatDetector diff --git a/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu b/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu index 0a5b6db26f77..2373067b0a16 100644 --- a/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu +++ b/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.math.FormatDetector diff --git a/filter/source/config/fragments/types/met_OS2_Metafile.xcu b/filter/source/config/fragments/types/met_OS2_Metafile.xcu index 256714f45474..708a498ee29a 100644 --- a/filter/source/config/fragments/types/met_OS2_Metafile.xcu +++ b/filter/source/config/fragments/types/met_OS2_Metafile.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector diff --git a/filter/source/config/fragments/types/oxt_OpenOffice_Extension.xcu b/filter/source/config/fragments/types/oxt_OpenOffice_Extension.xcu index 67b9ed70d517..ee11dad05098 100644 --- a/filter/source/config/fragments/types/oxt_OpenOffice_Extension.xcu +++ b/filter/source/config/fragments/types/oxt_OpenOffice_Extension.xcu @@ -1,3 +1,20 @@ + oxt diff --git a/filter/source/config/fragments/types/pbm_Portable_Bitmap.xcu b/filter/source/config/fragments/types/pbm_Portable_Bitmap.xcu index 4617f54440d4..28e489fdb1d7 100644 --- a/filter/source/config/fragments/types/pbm_Portable_Bitmap.xcu +++ b/filter/source/config/fragments/types/pbm_Portable_Bitmap.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector diff --git a/filter/source/config/fragments/types/pcd_Photo_CD_Base.xcu b/filter/source/config/fragments/types/pcd_Photo_CD_Base.xcu index 2888c0f0ba46..6465a0f4f3d0 100644 --- a/filter/source/config/fragments/types/pcd_Photo_CD_Base.xcu +++ b/filter/source/config/fragments/types/pcd_Photo_CD_Base.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector diff --git a/filter/source/config/fragments/types/pcd_Photo_CD_Base16.xcu b/filter/source/config/fragments/types/pcd_Photo_CD_Base16.xcu index e7bcee7e4c4c..4caacf6ef01a 100644 --- a/filter/source/config/fragments/types/pcd_Photo_CD_Base16.xcu +++ b/filter/source/config/fragments/types/pcd_Photo_CD_Base16.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector diff --git a/filter/source/config/fragments/types/pcd_Photo_CD_Base4.xcu b/filter/source/config/fragments/types/pcd_Photo_CD_Base4.xcu index 966a77a47c73..8cb48b1f53e2 100644 --- a/filter/source/config/fragments/types/pcd_Photo_CD_Base4.xcu +++ b/filter/source/config/fragments/types/pcd_Photo_CD_Base4.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector diff --git a/filter/source/config/fragments/types/pct_Mac_Pict.xcu b/filter/source/config/fragments/types/pct_Mac_Pict.xcu index b15ffded9dfe..d2abc377d4d9 100644 --- a/filter/source/config/fragments/types/pct_Mac_Pict.xcu +++ b/filter/source/config/fragments/types/pct_Mac_Pict.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector diff --git a/filter/source/config/fragments/types/pcx_Zsoft_Paintbrush.xcu b/filter/source/config/fragments/types/pcx_Zsoft_Paintbrush.xcu index c4fa34f4d3e2..5365bd8aa300 100644 --- a/filter/source/config/fragments/types/pcx_Zsoft_Paintbrush.xcu +++ b/filter/source/config/fragments/types/pcx_Zsoft_Paintbrush.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector diff --git a/filter/source/config/fragments/types/pdf_Portable_Document_Format.xcu b/filter/source/config/fragments/types/pdf_Portable_Document_Format.xcu index 64a09cfc087a..056b422876c7 100644 --- a/filter/source/config/fragments/types/pdf_Portable_Document_Format.xcu +++ b/filter/source/config/fragments/types/pdf_Portable_Document_Format.xcu @@ -1,3 +1,20 @@ + diff --git a/filter/source/config/fragments/types/pgm_Portable_Graymap.xcu b/filter/source/config/fragments/types/pgm_Portable_Graymap.xcu index 35605a54f307..fd6c4c4ee90c 100644 --- a/filter/source/config/fragments/types/pgm_Portable_Graymap.xcu +++ b/filter/source/config/fragments/types/pgm_Portable_Graymap.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector diff --git a/filter/source/config/fragments/types/png_Portable_Network_Graphic.xcu b/filter/source/config/fragments/types/png_Portable_Network_Graphic.xcu index e95b961c601b..7fe5e2adbfda 100644 --- a/filter/source/config/fragments/types/png_Portable_Network_Graphic.xcu +++ b/filter/source/config/fragments/types/png_Portable_Network_Graphic.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector diff --git a/filter/source/config/fragments/types/ppm_Portable_Pixelmap.xcu b/filter/source/config/fragments/types/ppm_Portable_Pixelmap.xcu index 62d9ac07d723..9fd7b8b9ee0f 100644 --- a/filter/source/config/fragments/types/ppm_Portable_Pixelmap.xcu +++ b/filter/source/config/fragments/types/ppm_Portable_Pixelmap.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector diff --git a/filter/source/config/fragments/types/psd_Adobe_Photoshop.xcu b/filter/source/config/fragments/types/psd_Adobe_Photoshop.xcu index ad4ce367bb18..586541451d19 100644 --- a/filter/source/config/fragments/types/psd_Adobe_Photoshop.xcu +++ b/filter/source/config/fragments/types/psd_Adobe_Photoshop.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector diff --git a/filter/source/config/fragments/types/pwp_PlaceWare.xcu b/filter/source/config/fragments/types/pwp_PlaceWare.xcu index 6bcd5e6ae86e..70fc9adf4d13 100644 --- a/filter/source/config/fragments/types/pwp_PlaceWare.xcu +++ b/filter/source/config/fragments/types/pwp_PlaceWare.xcu @@ -1,3 +1,20 @@ + diff --git a/filter/source/config/fragments/types/ras_Sun_Rasterfile.xcu b/filter/source/config/fragments/types/ras_Sun_Rasterfile.xcu index aa4ae085b13e..81b9238d1abf 100644 --- a/filter/source/config/fragments/types/ras_Sun_Rasterfile.xcu +++ b/filter/source/config/fragments/types/ras_Sun_Rasterfile.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector diff --git a/filter/source/config/fragments/types/sgf_StarOffice_Writer_SGF.xcu b/filter/source/config/fragments/types/sgf_StarOffice_Writer_SGF.xcu index c0e8c5aba4df..ed2f380c86a8 100644 --- a/filter/source/config/fragments/types/sgf_StarOffice_Writer_SGF.xcu +++ b/filter/source/config/fragments/types/sgf_StarOffice_Writer_SGF.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector diff --git a/filter/source/config/fragments/types/sgv_StarDraw_20.xcu b/filter/source/config/fragments/types/sgv_StarDraw_20.xcu index c4778a602111..1c0f3ec37174 100644 --- a/filter/source/config/fragments/types/sgv_StarDraw_20.xcu +++ b/filter/source/config/fragments/types/sgv_StarDraw_20.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector diff --git a/filter/source/config/fragments/types/svg_Scalable_Vector_Graphics.xcu b/filter/source/config/fragments/types/svg_Scalable_Vector_Graphics.xcu index 8865dee4a831..caa57548a08b 100644 --- a/filter/source/config/fragments/types/svg_Scalable_Vector_Graphics.xcu +++ b/filter/source/config/fragments/types/svg_Scalable_Vector_Graphics.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.Draw.SVGFilter diff --git a/filter/source/config/fragments/types/svm_StarView_Metafile.xcu b/filter/source/config/fragments/types/svm_StarView_Metafile.xcu index d7e52dbbb11a..5d81959b59e8 100644 --- a/filter/source/config/fragments/types/svm_StarView_Metafile.xcu +++ b/filter/source/config/fragments/types/svm_StarView_Metafile.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector diff --git a/filter/source/config/fragments/types/tga_Truevision_TARGA.xcu b/filter/source/config/fragments/types/tga_Truevision_TARGA.xcu index 178d75f47c4d..248637d2f1d3 100644 --- a/filter/source/config/fragments/types/tga_Truevision_TARGA.xcu +++ b/filter/source/config/fragments/types/tga_Truevision_TARGA.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector diff --git a/filter/source/config/fragments/types/tif_Tag_Image_File.xcu b/filter/source/config/fragments/types/tif_Tag_Image_File.xcu index e08689a65e79..a84e66623e64 100644 --- a/filter/source/config/fragments/types/tif_Tag_Image_File.xcu +++ b/filter/source/config/fragments/types/tif_Tag_Image_File.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector diff --git a/filter/source/config/fragments/types/wav_Wave_Audio_File.xcu b/filter/source/config/fragments/types/wav_Wave_Audio_File.xcu index b4e7d2e65149..f30623270b1b 100644 --- a/filter/source/config/fragments/types/wav_Wave_Audio_File.xcu +++ b/filter/source/config/fragments/types/wav_Wave_Audio_File.xcu @@ -1,3 +1,20 @@ + wav diff --git a/filter/source/config/fragments/types/wmf_MS_Windows_Metafile.xcu b/filter/source/config/fragments/types/wmf_MS_Windows_Metafile.xcu index ef02dd3ce7a9..54c6bf54c33b 100644 --- a/filter/source/config/fragments/types/wmf_MS_Windows_Metafile.xcu +++ b/filter/source/config/fragments/types/wmf_MS_Windows_Metafile.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector diff --git a/filter/source/config/fragments/types/writer8.xcu b/filter/source/config/fragments/types/writer8.xcu index b57dbde222f2..7ba69bb20b17 100644 --- a/filter/source/config/fragments/types/writer8.xcu +++ b/filter/source/config/fragments/types/writer8.xcu @@ -1,3 +1,20 @@ + com.sun.star.text.FormatDetector private:factory/swriter diff --git a/filter/source/config/fragments/types/writer8_template.xcu b/filter/source/config/fragments/types/writer8_template.xcu index c9445969e37f..055b351eba13 100644 --- a/filter/source/config/fragments/types/writer8_template.xcu +++ b/filter/source/config/fragments/types/writer8_template.xcu @@ -1,3 +1,20 @@ + com.sun.star.text.FormatDetector diff --git a/filter/source/config/fragments/types/writer_AportisDoc_PalmDB_File.xcu b/filter/source/config/fragments/types/writer_AportisDoc_PalmDB_File.xcu index 516d9da0eeaf..9384437d2531 100644 --- a/filter/source/config/fragments/types/writer_AportisDoc_PalmDB_File.xcu +++ b/filter/source/config/fragments/types/writer_AportisDoc_PalmDB_File.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.filters.XMLFilterDetect diff --git a/filter/source/config/fragments/types/writer_DocBook_File.xcu b/filter/source/config/fragments/types/writer_DocBook_File.xcu index 90364b6f19b0..613588493a07 100644 --- a/filter/source/config/fragments/types/writer_DocBook_File.xcu +++ b/filter/source/config/fragments/types/writer_DocBook_File.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.filters.XMLFilterDetect diff --git a/filter/source/config/fragments/types/writer_LotusWordPro_Document.xcu b/filter/source/config/fragments/types/writer_LotusWordPro_Document.xcu index 5ebd098b5bd3..ca30d232cc06 100644 --- a/filter/source/config/fragments/types/writer_LotusWordPro_Document.xcu +++ b/filter/source/config/fragments/types/writer_LotusWordPro_Document.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.Writer.LotusWordProImportFilter diff --git a/filter/source/config/fragments/types/writer_MIZI_Hwp_97.xcu b/filter/source/config/fragments/types/writer_MIZI_Hwp_97.xcu index 91006f413b0b..063795749014 100644 --- a/filter/source/config/fragments/types/writer_MIZI_Hwp_97.xcu +++ b/filter/source/config/fragments/types/writer_MIZI_Hwp_97.xcu @@ -1,3 +1,20 @@ + com.sun.comp.hwpimport.HwpImportFilter diff --git a/filter/source/config/fragments/types/writer_MS_WinWord_5.xcu b/filter/source/config/fragments/types/writer_MS_WinWord_5.xcu index 5c8993c9c789..93d994516e73 100644 --- a/filter/source/config/fragments/types/writer_MS_WinWord_5.xcu +++ b/filter/source/config/fragments/types/writer_MS_WinWord_5.xcu @@ -1,3 +1,20 @@ + com.sun.star.text.FormatDetector diff --git a/filter/source/config/fragments/types/writer_MS_WinWord_60.xcu b/filter/source/config/fragments/types/writer_MS_WinWord_60.xcu index e56079d92ba5..21c3d854c975 100644 --- a/filter/source/config/fragments/types/writer_MS_WinWord_60.xcu +++ b/filter/source/config/fragments/types/writer_MS_WinWord_60.xcu @@ -1,3 +1,20 @@ + com.sun.star.text.FormatDetector diff --git a/filter/source/config/fragments/types/writer_MS_Word_2003_XML.xcu b/filter/source/config/fragments/types/writer_MS_Word_2003_XML.xcu index be34153ccbb9..59b99aa46894 100644 --- a/filter/source/config/fragments/types/writer_MS_Word_2003_XML.xcu +++ b/filter/source/config/fragments/types/writer_MS_Word_2003_XML.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.filters.XMLFilterDetect diff --git a/filter/source/config/fragments/types/writer_MS_Word_2007_XML.xcu b/filter/source/config/fragments/types/writer_MS_Word_2007_XML.xcu index 6934808b957e..30f14c30a8a1 100644 --- a/filter/source/config/fragments/types/writer_MS_Word_2007_XML.xcu +++ b/filter/source/config/fragments/types/writer_MS_Word_2007_XML.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.oox.FormatDetector diff --git a/filter/source/config/fragments/types/writer_MS_Word_2007_XML_Template.xcu b/filter/source/config/fragments/types/writer_MS_Word_2007_XML_Template.xcu index bc30b8db0418..00795e546571 100644 --- a/filter/source/config/fragments/types/writer_MS_Word_2007_XML_Template.xcu +++ b/filter/source/config/fragments/types/writer_MS_Word_2007_XML_Template.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.oox.FormatDetector diff --git a/filter/source/config/fragments/types/writer_MS_Word_95.xcu b/filter/source/config/fragments/types/writer_MS_Word_95.xcu index 3cb66bd5716e..2051a5135f50 100644 --- a/filter/source/config/fragments/types/writer_MS_Word_95.xcu +++ b/filter/source/config/fragments/types/writer_MS_Word_95.xcu @@ -1,3 +1,20 @@ + com.sun.star.text.FormatDetector diff --git a/filter/source/config/fragments/types/writer_MS_Word_95_Vorlage.xcu b/filter/source/config/fragments/types/writer_MS_Word_95_Vorlage.xcu index 138130b57602..be6e9bbd5787 100644 --- a/filter/source/config/fragments/types/writer_MS_Word_95_Vorlage.xcu +++ b/filter/source/config/fragments/types/writer_MS_Word_95_Vorlage.xcu @@ -1,3 +1,20 @@ + com.sun.star.text.FormatDetector diff --git a/filter/source/config/fragments/types/writer_MS_Word_97.xcu b/filter/source/config/fragments/types/writer_MS_Word_97.xcu index 4cf586005213..054ef956dfb9 100644 --- a/filter/source/config/fragments/types/writer_MS_Word_97.xcu +++ b/filter/source/config/fragments/types/writer_MS_Word_97.xcu @@ -1,3 +1,20 @@ + com.sun.star.text.FormatDetector diff --git a/filter/source/config/fragments/types/writer_MS_Word_97_Vorlage.xcu b/filter/source/config/fragments/types/writer_MS_Word_97_Vorlage.xcu index 46b3b9b03b46..8dd6db823db7 100644 --- a/filter/source/config/fragments/types/writer_MS_Word_97_Vorlage.xcu +++ b/filter/source/config/fragments/types/writer_MS_Word_97_Vorlage.xcu @@ -1,3 +1,20 @@ + com.sun.star.text.FormatDetector diff --git a/filter/source/config/fragments/types/writer_MS_Works_Document.xcu b/filter/source/config/fragments/types/writer_MS_Works_Document.xcu index 5cdd0f01a43f..51e50ed245b8 100644 --- a/filter/source/config/fragments/types/writer_MS_Works_Document.xcu +++ b/filter/source/config/fragments/types/writer_MS_Works_Document.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.Writer.MSWorksImportFilter diff --git a/filter/source/config/fragments/types/writer_ODT_FlatXML.xcu b/filter/source/config/fragments/types/writer_ODT_FlatXML.xcu index 9c0c0ed285b8..b1b789b83e72 100644 --- a/filter/source/config/fragments/types/writer_ODT_FlatXML.xcu +++ b/filter/source/config/fragments/types/writer_ODT_FlatXML.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.filters.XMLFilterDetect diff --git a/filter/source/config/fragments/types/writer_OOXML.xcu b/filter/source/config/fragments/types/writer_OOXML.xcu index 346b00ec8fca..344597f31b88 100644 --- a/filter/source/config/fragments/types/writer_OOXML.xcu +++ b/filter/source/config/fragments/types/writer_OOXML.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.oox.FormatDetector diff --git a/filter/source/config/fragments/types/writer_OOXML_Template.xcu b/filter/source/config/fragments/types/writer_OOXML_Template.xcu index 566e08d9fb98..fa628c5f82fe 100644 --- a/filter/source/config/fragments/types/writer_OOXML_Template.xcu +++ b/filter/source/config/fragments/types/writer_OOXML_Template.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.oox.FormatDetector diff --git a/filter/source/config/fragments/types/writer_PocketWord_File.xcu b/filter/source/config/fragments/types/writer_PocketWord_File.xcu index 61c50a935dbc..d07a362ea369 100644 --- a/filter/source/config/fragments/types/writer_PocketWord_File.xcu +++ b/filter/source/config/fragments/types/writer_PocketWord_File.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.filters.XMLFilterDetect diff --git a/filter/source/config/fragments/types/writer_Rich_Text_Format.xcu b/filter/source/config/fragments/types/writer_Rich_Text_Format.xcu index 80f7e6c39797..76f28fb367c7 100644 --- a/filter/source/config/fragments/types/writer_Rich_Text_Format.xcu +++ b/filter/source/config/fragments/types/writer_Rich_Text_Format.xcu @@ -1,3 +1,20 @@ + com.sun.star.text.FormatDetector diff --git a/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu b/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu index 09ebbf6b8224..fe626d38fa5e 100644 --- a/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu +++ b/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu @@ -1,3 +1,20 @@ + com.sun.star.text.FormatDetector diff --git a/filter/source/config/fragments/types/writer_StarOffice_XML_Writer_Template.xcu b/filter/source/config/fragments/types/writer_StarOffice_XML_Writer_Template.xcu index f786cb0488a0..201d00bdb245 100644 --- a/filter/source/config/fragments/types/writer_StarOffice_XML_Writer_Template.xcu +++ b/filter/source/config/fragments/types/writer_StarOffice_XML_Writer_Template.xcu @@ -1,3 +1,20 @@ + com.sun.star.text.FormatDetector diff --git a/filter/source/config/fragments/types/writer_StarWriter_10.xcu b/filter/source/config/fragments/types/writer_StarWriter_10.xcu index f5e55f95d46d..fff513a5d1c1 100644 --- a/filter/source/config/fragments/types/writer_StarWriter_10.xcu +++ b/filter/source/config/fragments/types/writer_StarWriter_10.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.sfx2.BinaryFormatDetector diff --git a/filter/source/config/fragments/types/writer_StarWriter_20.xcu b/filter/source/config/fragments/types/writer_StarWriter_20.xcu index d166b294803c..a08f47666beb 100644 --- a/filter/source/config/fragments/types/writer_StarWriter_20.xcu +++ b/filter/source/config/fragments/types/writer_StarWriter_20.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.sfx2.BinaryFormatDetector diff --git a/filter/source/config/fragments/types/writer_StarWriter_30.xcu b/filter/source/config/fragments/types/writer_StarWriter_30.xcu index 60aa093af2c6..76b8472f2241 100644 --- a/filter/source/config/fragments/types/writer_StarWriter_30.xcu +++ b/filter/source/config/fragments/types/writer_StarWriter_30.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.sfx2.BinaryFormatDetector diff --git a/filter/source/config/fragments/types/writer_StarWriter_30_VorlageTemplate.xcu b/filter/source/config/fragments/types/writer_StarWriter_30_VorlageTemplate.xcu index ad4ee7d15628..ae3ee470f396 100644 --- a/filter/source/config/fragments/types/writer_StarWriter_30_VorlageTemplate.xcu +++ b/filter/source/config/fragments/types/writer_StarWriter_30_VorlageTemplate.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.sfx2.BinaryFormatDetector diff --git a/filter/source/config/fragments/types/writer_StarWriter_40.xcu b/filter/source/config/fragments/types/writer_StarWriter_40.xcu index 9f535e018dcb..83edc7945599 100644 --- a/filter/source/config/fragments/types/writer_StarWriter_40.xcu +++ b/filter/source/config/fragments/types/writer_StarWriter_40.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.sfx2.BinaryFormatDetector diff --git a/filter/source/config/fragments/types/writer_StarWriter_40_VorlageTemplate.xcu b/filter/source/config/fragments/types/writer_StarWriter_40_VorlageTemplate.xcu index 168c63b11b42..f8a3360f8e1c 100644 --- a/filter/source/config/fragments/types/writer_StarWriter_40_VorlageTemplate.xcu +++ b/filter/source/config/fragments/types/writer_StarWriter_40_VorlageTemplate.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.sfx2.BinaryFormatDetector diff --git a/filter/source/config/fragments/types/writer_StarWriter_50.xcu b/filter/source/config/fragments/types/writer_StarWriter_50.xcu index 1cc367a3b6e8..8720e386cec0 100644 --- a/filter/source/config/fragments/types/writer_StarWriter_50.xcu +++ b/filter/source/config/fragments/types/writer_StarWriter_50.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.sfx2.BinaryFormatDetector diff --git a/filter/source/config/fragments/types/writer_StarWriter_50_VorlageTemplate.xcu b/filter/source/config/fragments/types/writer_StarWriter_50_VorlageTemplate.xcu index d46b510fc328..be6e07148771 100644 --- a/filter/source/config/fragments/types/writer_StarWriter_50_VorlageTemplate.xcu +++ b/filter/source/config/fragments/types/writer_StarWriter_50_VorlageTemplate.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.sfx2.BinaryFormatDetector diff --git a/filter/source/config/fragments/types/writer_StarWriter_DOS.xcu b/filter/source/config/fragments/types/writer_StarWriter_DOS.xcu index 00864caffe68..928c0432b18f 100644 --- a/filter/source/config/fragments/types/writer_StarWriter_DOS.xcu +++ b/filter/source/config/fragments/types/writer_StarWriter_DOS.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.sfx2.BinaryFormatDetector diff --git a/filter/source/config/fragments/types/writer_T602_Document.xcu b/filter/source/config/fragments/types/writer_T602_Document.xcu index c233c324bd3e..c34f823da4ca 100644 --- a/filter/source/config/fragments/types/writer_T602_Document.xcu +++ b/filter/source/config/fragments/types/writer_T602_Document.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.Writer.T602ImportFilter diff --git a/filter/source/config/fragments/types/writer_WordPerfect_Document.xcu b/filter/source/config/fragments/types/writer_WordPerfect_Document.xcu index 8f3811eb57f2..ba358d9b231f 100644 --- a/filter/source/config/fragments/types/writer_WordPerfect_Document.xcu +++ b/filter/source/config/fragments/types/writer_WordPerfect_Document.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.Writer.WordPerfectImportFilter diff --git a/filter/source/config/fragments/types/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument.xcu b/filter/source/config/fragments/types/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument.xcu index e0efe4d21ccd..f84fb074abbe 100644 --- a/filter/source/config/fragments/types/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument.xcu +++ b/filter/source/config/fragments/types/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument.xcu @@ -1,3 +1,20 @@ + com.sun.star.text.FormatDetector diff --git a/filter/source/config/fragments/types/writer_globaldocument_StarWriter_40GlobalDocument.xcu b/filter/source/config/fragments/types/writer_globaldocument_StarWriter_40GlobalDocument.xcu index 5f0f05204355..3c97b4480c58 100644 --- a/filter/source/config/fragments/types/writer_globaldocument_StarWriter_40GlobalDocument.xcu +++ b/filter/source/config/fragments/types/writer_globaldocument_StarWriter_40GlobalDocument.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.sfx2.BinaryFormatDetector diff --git a/filter/source/config/fragments/types/writer_globaldocument_StarWriter_50GlobalDocument.xcu b/filter/source/config/fragments/types/writer_globaldocument_StarWriter_50GlobalDocument.xcu index 0850c43becc6..28a39891c628 100644 --- a/filter/source/config/fragments/types/writer_globaldocument_StarWriter_50GlobalDocument.xcu +++ b/filter/source/config/fragments/types/writer_globaldocument_StarWriter_50GlobalDocument.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.sfx2.BinaryFormatDetector diff --git a/filter/source/config/fragments/types/writer_layout_dump_xml.xcu b/filter/source/config/fragments/types/writer_layout_dump_xml.xcu index 2a6b0a246dc3..1f3a93de8f96 100644 --- a/filter/source/config/fragments/types/writer_layout_dump_xml.xcu +++ b/filter/source/config/fragments/types/writer_layout_dump_xml.xcu @@ -1,3 +1,20 @@ + diff --git a/filter/source/config/fragments/types/writer_web_HTML_help.xcu b/filter/source/config/fragments/types/writer_web_HTML_help.xcu index 5394c7776bea..c558ebe6d2ab 100644 --- a/filter/source/config/fragments/types/writer_web_HTML_help.xcu +++ b/filter/source/config/fragments/types/writer_web_HTML_help.xcu @@ -1,3 +1,20 @@ + com.sun.star.text.FormatDetector vnd.sun.star.help://* diff --git a/filter/source/config/fragments/types/writer_web_StarOffice_XML_Writer_Web_Template.xcu b/filter/source/config/fragments/types/writer_web_StarOffice_XML_Writer_Web_Template.xcu index 7201e93fcb3a..f7bd56357cc2 100644 --- a/filter/source/config/fragments/types/writer_web_StarOffice_XML_Writer_Web_Template.xcu +++ b/filter/source/config/fragments/types/writer_web_StarOffice_XML_Writer_Web_Template.xcu @@ -1,3 +1,20 @@ + com.sun.star.text.FormatDetector diff --git a/filter/source/config/fragments/types/writer_web_StarWriterWeb_40_VorlageTemplate.xcu b/filter/source/config/fragments/types/writer_web_StarWriterWeb_40_VorlageTemplate.xcu index 1e93d6411419..b38b3987a9cf 100644 --- a/filter/source/config/fragments/types/writer_web_StarWriterWeb_40_VorlageTemplate.xcu +++ b/filter/source/config/fragments/types/writer_web_StarWriterWeb_40_VorlageTemplate.xcu @@ -1,3 +1,20 @@ + diff --git a/filter/source/config/fragments/types/writer_web_StarWriterWeb_50_VorlageTemplate.xcu b/filter/source/config/fragments/types/writer_web_StarWriterWeb_50_VorlageTemplate.xcu index 1cc98cad2e2e..6f6596c77583 100644 --- a/filter/source/config/fragments/types/writer_web_StarWriterWeb_50_VorlageTemplate.xcu +++ b/filter/source/config/fragments/types/writer_web_StarWriterWeb_50_VorlageTemplate.xcu @@ -1,3 +1,20 @@ + diff --git a/filter/source/config/fragments/types/writerglobal8.xcu b/filter/source/config/fragments/types/writerglobal8.xcu index f9f32e7c6b5d..6248bc7b3f50 100644 --- a/filter/source/config/fragments/types/writerglobal8.xcu +++ b/filter/source/config/fragments/types/writerglobal8.xcu @@ -1,3 +1,20 @@ + com.sun.star.text.FormatDetector private:factory/swriter/GlobalDocument* diff --git a/filter/source/config/fragments/types/writerweb8_writer_template.xcu b/filter/source/config/fragments/types/writerweb8_writer_template.xcu index 55ea913052ca..30aef7350b0e 100644 --- a/filter/source/config/fragments/types/writerweb8_writer_template.xcu +++ b/filter/source/config/fragments/types/writerweb8_writer_template.xcu @@ -1,3 +1,20 @@ + com.sun.star.text.FormatDetector diff --git a/filter/source/config/fragments/types/xbm_X_Consortium.xcu b/filter/source/config/fragments/types/xbm_X_Consortium.xcu index 948b77dea121..55685d500007 100644 --- a/filter/source/config/fragments/types/xbm_X_Consortium.xcu +++ b/filter/source/config/fragments/types/xbm_X_Consortium.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector diff --git a/filter/source/config/fragments/types/xpm_XPM.xcu b/filter/source/config/fragments/types/xpm_XPM.xcu index 8361ec6ac313..585211ad83e1 100644 --- a/filter/source/config/fragments/types/xpm_XPM.xcu +++ b/filter/source/config/fragments/types/xpm_XPM.xcu @@ -1,3 +1,20 @@ + com.sun.star.comp.draw.FormatDetector diff --git a/filter/source/config/tools/split/FCFGSplit.cfg b/filter/source/config/tools/split/FCFGSplit.cfg index 0c3c72b2029d..680f7a1ef0c7 100644 --- a/filter/source/config/tools/split/FCFGSplit.cfg +++ b/filter/source/config/tools/split/FCFGSplit.cfg @@ -1,3 +1,21 @@ +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# This file incorporates work covered by the following license notice: +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . +# + #------------------------------------------------------ # must be a system file name, which points to the # xcu file, should be analyzed and splitted diff --git a/filter/source/docbook/docbooktosoffheadings.xsl b/filter/source/docbook/docbooktosoffheadings.xsl index 0b583a9d1452..00f18380a315 100644 --- a/filter/source/docbook/docbooktosoffheadings.xsl +++ b/filter/source/docbook/docbooktosoffheadings.xsl @@ -1,29 +1,21 @@ + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + --> diff --git a/filter/source/docbook/sofftodocbookheadings.xsl b/filter/source/docbook/sofftodocbookheadings.xsl index 3fda55612a05..d58d10ae5d3f 100644 --- a/filter/source/docbook/sofftodocbookheadings.xsl +++ b/filter/source/docbook/sofftodocbookheadings.xsl @@ -1,29 +1,20 @@ diff --git a/filter/source/flash/flash.component b/filter/source/flash/flash.component index 79e1e68c4a1e..663a445c0d1d 100644 --- a/filter/source/flash/flash.component +++ b/filter/source/flash/flash.component @@ -1,30 +1,21 @@ - + diff --git a/filter/source/flash/impswfdialog.cxx b/filter/source/flash/impswfdialog.cxx index 2be1d2ad9089..05f0677e22ac 100644 --- a/filter/source/flash/impswfdialog.cxx +++ b/filter/source/flash/impswfdialog.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - /************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "impswfdialog.hxx" diff --git a/filter/source/flash/swfdialog.cxx b/filter/source/flash/swfdialog.cxx index be19e1b39f02..fe6bf861c46a 100644 --- a/filter/source/flash/swfdialog.cxx +++ b/filter/source/flash/swfdialog.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - /************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "swfdialog.hxx" diff --git a/filter/source/flash/swfexporter.cxx b/filter/source/flash/swfexporter.cxx index e178f269ccba..9c1f6b02187d 100644 --- a/filter/source/flash/swfexporter.cxx +++ b/filter/source/flash/swfexporter.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx index 0c8d359f1762..2b4ecac979bb 100644 --- a/filter/source/flash/swffilter.cxx +++ b/filter/source/flash/swffilter.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/filter/source/flash/swfuno.cxx b/filter/source/flash/swfuno.cxx index 49addf4a3273..0ddc437d6006 100644 --- a/filter/source/flash/swfuno.cxx +++ b/filter/source/flash/swfuno.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/filter/source/flash/swfwriter.cxx b/filter/source/flash/swfwriter.cxx index 1d4704b74062..073ae56b1d87 100644 --- a/filter/source/flash/swfwriter.cxx +++ b/filter/source/flash/swfwriter.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "swfwriter.hxx" #include diff --git a/filter/source/flash/swfwriter.hxx b/filter/source/flash/swfwriter.hxx index 41f8f8f663a9..27c2da30d3fe 100644 --- a/filter/source/flash/swfwriter.hxx +++ b/filter/source/flash/swfwriter.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SWF_WRITER_HXX_ #define _SWF_WRITER_HXX_ diff --git a/filter/source/flash/swfwriter2.cxx b/filter/source/flash/swfwriter2.cxx index 70a621e040c5..4b4c7a54137e 100644 --- a/filter/source/flash/swfwriter2.cxx +++ b/filter/source/flash/swfwriter2.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "swfwriter.hxx" #include diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx index 0891d8b7a17d..959e3a4a7ece 100644 --- a/filter/source/graphicfilter/egif/egif.cxx +++ b/filter/source/graphicfilter/egif/egif.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/filter/source/graphicfilter/epbm/epbm.cxx b/filter/source/graphicfilter/epbm/epbm.cxx index f25b1b50b9bc..12245693aba5 100644 --- a/filter/source/graphicfilter/epbm/epbm.cxx +++ b/filter/source/graphicfilter/epbm/epbm.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/filter/source/graphicfilter/epgm/epgm.cxx b/filter/source/graphicfilter/epgm/epgm.cxx index fd1e89c0604f..d64539c8e340 100644 --- a/filter/source/graphicfilter/epgm/epgm.cxx +++ b/filter/source/graphicfilter/epgm/epgm.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/filter/source/graphicfilter/eppm/eppm.cxx b/filter/source/graphicfilter/eppm/eppm.cxx index 0b114e653c29..2948c4d4e9cb 100644 --- a/filter/source/graphicfilter/eppm/eppm.cxx +++ b/filter/source/graphicfilter/eppm/eppm.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/filter/source/graphicfilter/eras/eras.cxx b/filter/source/graphicfilter/eras/eras.cxx index a22c1b49528d..16e20b3acf3a 100644 --- a/filter/source/graphicfilter/eras/eras.cxx +++ b/filter/source/graphicfilter/eras/eras.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx index efd69b641324..7ca35766c322 100644 --- a/filter/source/graphicfilter/etiff/etiff.cxx +++ b/filter/source/graphicfilter/etiff/etiff.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/filter/source/graphicfilter/expm/expm.cxx b/filter/source/graphicfilter/expm/expm.cxx index 6ffc6ffcf81f..fd582dadb472 100644 --- a/filter/source/graphicfilter/expm/expm.cxx +++ b/filter/source/graphicfilter/expm/expm.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx b/filter/source/graphicfilter/icgm/actimpr.cxx index bde6c5e33d21..6075a4f89ea0 100644 --- a/filter/source/graphicfilter/icgm/actimpr.cxx +++ b/filter/source/graphicfilter/icgm/actimpr.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/filter/source/graphicfilter/icgm/bitmap.cxx b/filter/source/graphicfilter/icgm/bitmap.cxx index bc8413518d26..311ad38377ba 100644 --- a/filter/source/graphicfilter/icgm/bitmap.cxx +++ b/filter/source/graphicfilter/icgm/bitmap.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "main.hxx" diff --git a/filter/source/graphicfilter/icgm/bitmap.hxx b/filter/source/graphicfilter/icgm/bitmap.hxx index 606f725c3619..65af1e96b507 100644 --- a/filter/source/graphicfilter/icgm/bitmap.hxx +++ b/filter/source/graphicfilter/icgm/bitmap.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef CGM_BITMAP_HXX_ #define CGM_BITMAP_HXX_ diff --git a/filter/source/graphicfilter/icgm/bundles.cxx b/filter/source/graphicfilter/icgm/bundles.cxx index 68811592009d..c4dc6e929607 100644 --- a/filter/source/graphicfilter/icgm/bundles.cxx +++ b/filter/source/graphicfilter/icgm/bundles.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "bundles.hxx" diff --git a/filter/source/graphicfilter/icgm/bundles.hxx b/filter/source/graphicfilter/icgm/bundles.hxx index a354b84d82f5..6674368b512e 100644 --- a/filter/source/graphicfilter/icgm/bundles.hxx +++ b/filter/source/graphicfilter/icgm/bundles.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef CGM_BUNDLES_HXX_ #define CGM_BUNDLES_HXX_ diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx index 3dd2ccceebed..993bfa19fdff 100644 --- a/filter/source/graphicfilter/icgm/cgm.cxx +++ b/filter/source/graphicfilter/icgm/cgm.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/filter/source/graphicfilter/icgm/cgm.hxx b/filter/source/graphicfilter/icgm/cgm.hxx index 8593dd581178..2ad26ec8f144 100644 --- a/filter/source/graphicfilter/icgm/cgm.hxx +++ b/filter/source/graphicfilter/icgm/cgm.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef CGM_HXX_ #define CGM_HXX_ diff --git a/filter/source/graphicfilter/icgm/chart.cxx b/filter/source/graphicfilter/icgm/chart.cxx index b21ae893396d..d66ca3441883 100644 --- a/filter/source/graphicfilter/icgm/chart.cxx +++ b/filter/source/graphicfilter/icgm/chart.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/filter/source/graphicfilter/icgm/chart.hxx b/filter/source/graphicfilter/icgm/chart.hxx index bfe7ff22ff52..b7dd7f8d524c 100644 --- a/filter/source/graphicfilter/icgm/chart.hxx +++ b/filter/source/graphicfilter/icgm/chart.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef CGM_CHART_HXX_ #define CGM_CHART_HXX_ diff --git a/filter/source/graphicfilter/icgm/class0.cxx b/filter/source/graphicfilter/icgm/class0.cxx index 53ef02f6dd57..8b8062a1791b 100644 --- a/filter/source/graphicfilter/icgm/class0.cxx +++ b/filter/source/graphicfilter/icgm/class0.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/filter/source/graphicfilter/icgm/class1.cxx b/filter/source/graphicfilter/icgm/class1.cxx index 8736435e1d58..de354d52c581 100644 --- a/filter/source/graphicfilter/icgm/class1.cxx +++ b/filter/source/graphicfilter/icgm/class1.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/filter/source/graphicfilter/icgm/class2.cxx b/filter/source/graphicfilter/icgm/class2.cxx index 42f8ece30a4d..44cf6eaf5f67 100644 --- a/filter/source/graphicfilter/icgm/class2.cxx +++ b/filter/source/graphicfilter/icgm/class2.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/filter/source/graphicfilter/icgm/class3.cxx b/filter/source/graphicfilter/icgm/class3.cxx index 1d06c9e0f388..98f1254acd06 100644 --- a/filter/source/graphicfilter/icgm/class3.cxx +++ b/filter/source/graphicfilter/icgm/class3.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/filter/source/graphicfilter/icgm/class4.cxx b/filter/source/graphicfilter/icgm/class4.cxx index 2e7c787e3a81..313a0853069f 100644 --- a/filter/source/graphicfilter/icgm/class4.cxx +++ b/filter/source/graphicfilter/icgm/class4.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/filter/source/graphicfilter/icgm/class5.cxx b/filter/source/graphicfilter/icgm/class5.cxx index 0155ad03fe22..c0319b7bc40e 100644 --- a/filter/source/graphicfilter/icgm/class5.cxx +++ b/filter/source/graphicfilter/icgm/class5.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ //#define VCL_NEED_BASETSD diff --git a/filter/source/graphicfilter/icgm/class7.cxx b/filter/source/graphicfilter/icgm/class7.cxx index 1a6bb9a93a85..304ba32952ff 100644 --- a/filter/source/graphicfilter/icgm/class7.cxx +++ b/filter/source/graphicfilter/icgm/class7.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/filter/source/graphicfilter/icgm/classx.cxx b/filter/source/graphicfilter/icgm/classx.cxx index aacf9c972718..d0275da39ec8 100644 --- a/filter/source/graphicfilter/icgm/classx.cxx +++ b/filter/source/graphicfilter/icgm/classx.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/filter/source/graphicfilter/icgm/elements.cxx b/filter/source/graphicfilter/icgm/elements.cxx index 07fef990457c..dcd5479ecc40 100644 --- a/filter/source/graphicfilter/icgm/elements.cxx +++ b/filter/source/graphicfilter/icgm/elements.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "elements.hxx" diff --git a/filter/source/graphicfilter/icgm/elements.hxx b/filter/source/graphicfilter/icgm/elements.hxx index 3969601b1968..26208b593963 100644 --- a/filter/source/graphicfilter/icgm/elements.hxx +++ b/filter/source/graphicfilter/icgm/elements.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef CGM_ELEMENTS_HXX_ #define CGM_ELEMENTS_HXX_ diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx b/filter/source/graphicfilter/idxf/dxf2mtf.cxx index b6ea30ed6a52..c22e0a4b4b7e 100644 --- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx +++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.hxx b/filter/source/graphicfilter/idxf/dxf2mtf.hxx index 8cf0b0a41181..b767cb0a263c 100644 --- a/filter/source/graphicfilter/idxf/dxf2mtf.hxx +++ b/filter/source/graphicfilter/idxf/dxf2mtf.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _DXF2MTF_HXX #define _DXF2MTF_HXX diff --git a/filter/source/graphicfilter/idxf/dxfgrprd.cxx b/filter/source/graphicfilter/idxf/dxfgrprd.cxx index 36808b0b6e1a..ea3d36666b99 100644 --- a/filter/source/graphicfilter/idxf/dxfgrprd.cxx +++ b/filter/source/graphicfilter/idxf/dxfgrprd.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/filter/source/graphicfilter/idxf/dxfgrprd.hxx b/filter/source/graphicfilter/idxf/dxfgrprd.hxx index ebb56788434a..5208237bce12 100644 --- a/filter/source/graphicfilter/idxf/dxfgrprd.hxx +++ b/filter/source/graphicfilter/idxf/dxfgrprd.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _DXFGRPRD_HXX #define _DXFGRPRD_HXX diff --git a/filter/source/graphicfilter/idxf/idxf.cxx b/filter/source/graphicfilter/idxf/idxf.cxx index 2e6e613136e4..e589e29b482d 100644 --- a/filter/source/graphicfilter/idxf/idxf.cxx +++ b/filter/source/graphicfilter/idxf/idxf.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx index 008e7f715410..34473493a38f 100644 --- a/filter/source/graphicfilter/ieps/ieps.cxx +++ b/filter/source/graphicfilter/ieps/ieps.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index ec79336d73db..2e3b78b874ab 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx index 58482278c4cf..1ddb08bd41d1 100644 --- a/filter/source/graphicfilter/ipbm/ipbm.cxx +++ b/filter/source/graphicfilter/ipbm/ipbm.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx index 211ad6009e4e..07e6711d3a2c 100644 --- a/filter/source/graphicfilter/ipcd/ipcd.cxx +++ b/filter/source/graphicfilter/ipcd/ipcd.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "rtl/alloc.h" diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx b/filter/source/graphicfilter/ipcx/ipcx.cxx index 0fd6d164eab5..c8651f8929e0 100644 --- a/filter/source/graphicfilter/ipcx/ipcx.cxx +++ b/filter/source/graphicfilter/ipcx/ipcx.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx index 879300be59d5..e0a7f149ef10 100644 --- a/filter/source/graphicfilter/ipict/ipict.cxx +++ b/filter/source/graphicfilter/ipict/ipict.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/filter/source/graphicfilter/ipict/shape.cxx b/filter/source/graphicfilter/ipict/shape.cxx index 47b27ebfb405..e6f9c4ddd06d 100644 --- a/filter/source/graphicfilter/ipict/shape.cxx +++ b/filter/source/graphicfilter/ipict/shape.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ /** Osnola: IMPORTANT NOTE: some Quickdraw lines/frames can not be "quickly" drawn exactly: diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx index 2066a1542fcb..73750ef3b61e 100644 --- a/filter/source/graphicfilter/ipsd/ipsd.cxx +++ b/filter/source/graphicfilter/ipsd/ipsd.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx index 6298b9f21f6f..469151a72b86 100644 --- a/filter/source/graphicfilter/iras/iras.cxx +++ b/filter/source/graphicfilter/iras/iras.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/filter/source/graphicfilter/itga/itga.cxx b/filter/source/graphicfilter/itga/itga.cxx index 080b0b98efb5..3fa410457213 100644 --- a/filter/source/graphicfilter/itga/itga.cxx +++ b/filter/source/graphicfilter/itga/itga.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/filter/source/graphicfilter/itiff/ccidecom.cxx b/filter/source/graphicfilter/itiff/ccidecom.cxx index 80880dad8acc..601b7579ac12 100644 --- a/filter/source/graphicfilter/itiff/ccidecom.cxx +++ b/filter/source/graphicfilter/itiff/ccidecom.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "ccidecom.hxx" diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx index 76b1156fc404..f5b31f668682 100644 --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ b/filter/source/graphicfilter/itiff/itiff.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/filter/source/graphicfilter/itiff/lzwdecom.cxx b/filter/source/graphicfilter/itiff/lzwdecom.cxx index c8ad403ebc75..2fdb054cd1d4 100644 --- a/filter/source/graphicfilter/itiff/lzwdecom.cxx +++ b/filter/source/graphicfilter/itiff/lzwdecom.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "lzwdecom.hxx" diff --git a/filter/source/msfilter/countryid.cxx b/filter/source/msfilter/countryid.cxx index f0cbe9c465f3..31915d369bba 100644 --- a/filter/source/msfilter/countryid.cxx +++ b/filter/source/msfilter/countryid.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "filter/msfilter/countryid.hxx" diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index 123bb36e7f8c..932046fbe449 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/filter/source/msfilter/eschesdo.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "eschesdo.hxx" #include diff --git a/filter/source/msfilter/eschesdo.hxx b/filter/source/msfilter/eschesdo.hxx index 220a5297aa29..7612c1dbb594 100644 --- a/filter/source/msfilter/eschesdo.hxx +++ b/filter/source/msfilter/eschesdo.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _ESCHESDO_HXX #define _ESCHESDO_HXX #include diff --git a/filter/source/msfilter/mscodec.cxx b/filter/source/msfilter/mscodec.cxx index 5fcd1328625b..dd7ce6660cef 100644 --- a/filter/source/msfilter/mscodec.cxx +++ b/filter/source/msfilter/mscodec.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "filter/msfilter/mscodec.hxx" diff --git a/filter/source/msfilter/msfilter.component b/filter/source/msfilter/msfilter.component index e3ea7e583876..d4e28b3747d9 100644 --- a/filter/source/msfilter/msfilter.component +++ b/filter/source/msfilter/msfilter.component @@ -1,30 +1,21 @@ - + diff --git a/filter/source/msfilter/msocximex.cxx b/filter/source/msfilter/msocximex.cxx index e2f1c0d5c1f9..f62cb70b2058 100644 --- a/filter/source/msfilter/msocximex.cxx +++ b/filter/source/msfilter/msocximex.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx index 212074265837..1235daa91407 100644 --- a/filter/source/msfilter/msoleexp.cxx +++ b/filter/source/msfilter/msoleexp.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx index 31a22726540a..be76c32806a6 100644 --- a/filter/source/msfilter/msvbahelper.cxx +++ b/filter/source/msfilter/msvbahelper.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/filter/source/msfilter/services.cxx b/filter/source/msfilter/services.cxx index 4e4a77eb88ec..e1723a31db1d 100644 --- a/filter/source/msfilter/services.cxx +++ b/filter/source/msfilter/services.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index ff3d690f72f8..677a2ae48fd6 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 3662826525af..9c80c9838dc2 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - /************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx index 2d8f7ecad21a..b6208d855f3e 100644 --- a/filter/source/pdf/impdialog.hxx +++ b/filter/source/pdf/impdialog.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef IMPDIALOG_HXX #define IMPDIALOG_HXX diff --git a/filter/source/pdf/impdialog.src b/filter/source/pdf/impdialog.src index 353c53ae6432..7833acdf5f7d 100644 --- a/filter/source/pdf/impdialog.src +++ b/filter/source/pdf/impdialog.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "impdialog.hrc" diff --git a/filter/source/pdf/pdfdialog.cxx b/filter/source/pdf/pdfdialog.cxx index 3bf1c3d9c3d8..ffe4f42a2724 100644 --- a/filter/source/pdf/pdfdialog.cxx +++ b/filter/source/pdf/pdfdialog.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - /************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "pdfdialog.hxx" diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index 9ba6f4133af6..8051cb810c24 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "pdfexport.hxx" diff --git a/filter/source/pdf/pdfexport.hxx b/filter/source/pdf/pdfexport.hxx index b52de4ca544b..a69de13f6536 100644 --- a/filter/source/pdf/pdfexport.hxx +++ b/filter/source/pdf/pdfexport.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef PDFEXPORT_HXX #define PDFEXPORT_HXX diff --git a/filter/source/pdf/pdffilter.component b/filter/source/pdf/pdffilter.component index e9b84a54ca59..acffbc95668f 100644 --- a/filter/source/pdf/pdffilter.component +++ b/filter/source/pdf/pdffilter.component @@ -1,30 +1,21 @@ - + diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx index ef8120b0b93b..29804e0ca8f2 100644 --- a/filter/source/pdf/pdffilter.cxx +++ b/filter/source/pdf/pdffilter.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - /************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "pdffilter.hxx" diff --git a/filter/source/pdf/pdfinteract.cxx b/filter/source/pdf/pdfinteract.cxx index b8adf18861a9..7e4f3bc8c9f2 100644 --- a/filter/source/pdf/pdfinteract.cxx +++ b/filter/source/pdf/pdfinteract.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - /************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "pdfinteract.hxx" diff --git a/filter/source/pdf/pdfuno.cxx b/filter/source/pdf/pdfuno.cxx index a885a8203434..7a3525f4d1cb 100644 --- a/filter/source/pdf/pdfuno.cxx +++ b/filter/source/pdf/pdfuno.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/filter/source/placeware/exporter.cxx b/filter/source/placeware/exporter.cxx index 8840d9b5dc0c..f019f52093ca 100644 --- a/filter/source/placeware/exporter.cxx +++ b/filter/source/placeware/exporter.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/filter/source/placeware/filter.cxx b/filter/source/placeware/filter.cxx index 58afed7b331a..deb97bdbfa3c 100644 --- a/filter/source/placeware/filter.cxx +++ b/filter/source/placeware/filter.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/filter/source/placeware/placeware.component b/filter/source/placeware/placeware.component index 0ec5ef8d64b0..a74520445720 100644 --- a/filter/source/placeware/placeware.component +++ b/filter/source/placeware/placeware.component @@ -1,30 +1,21 @@ - + diff --git a/filter/source/placeware/placeware.xml b/filter/source/placeware/placeware.xml index 472abd18617f..41dd97fd8e77 100644 --- a/filter/source/placeware/placeware.xml +++ b/filter/source/placeware/placeware.xml @@ -1,5 +1,22 @@ + placeware diff --git a/filter/source/placeware/tempfile.cxx b/filter/source/placeware/tempfile.cxx index 255c65f916df..2cbf2b4f45e7 100644 --- a/filter/source/placeware/tempfile.cxx +++ b/filter/source/placeware/tempfile.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/filter/source/placeware/uno.cxx b/filter/source/placeware/uno.cxx index 1574803a7240..ecb8de0cf031 100644 --- a/filter/source/placeware/uno.cxx +++ b/filter/source/placeware/uno.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/filter/source/placeware/zip.cxx b/filter/source/placeware/zip.cxx index be5dfac79bc7..a1cb56127a95 100644 --- a/filter/source/placeware/zip.cxx +++ b/filter/source/placeware/zip.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/filter/source/svg/svgdialog.cxx b/filter/source/svg/svgdialog.cxx index 98717ccbab9c..7b7ece1f9bb0 100644 --- a/filter/source/svg/svgdialog.cxx +++ b/filter/source/svg/svgdialog.cxx @@ -1,32 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - /************************************************************************* +/* + * This file is part of the LibreOffice project. * - * OpenOffice.org - a multi-platform office productivity suite + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. + * This file incorporates work covered by the following license notice: * - * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2005 by Sun Microsystems, Inc. - * 901 San Antonio Road, Palo Alto, CA 94303, USA - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "svgdialog.hxx" #include "impsvgdialog.hxx" diff --git a/filter/source/svg/svgfilter.component b/filter/source/svg/svgfilter.component index f99b514e2919..51fd50d6895e 100644 --- a/filter/source/svg/svgfilter.component +++ b/filter/source/svg/svgfilter.component @@ -1,30 +1,21 @@ - + diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx index ea25cdddf954..8907bb204940 100644 --- a/filter/source/svg/svgfilter.cxx +++ b/filter/source/svg/svgfilter.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - /************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx index d0fbfad556f0..1dac1fb18517 100644 --- a/filter/source/svg/svgfilter.hxx +++ b/filter/source/svg/svgfilter.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2008 by Sun Microsystems, Inc. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef SVGFILTER_HXX #define SVGFILTER_HXX diff --git a/filter/source/svg/svgfontexport.cxx b/filter/source/svg/svgfontexport.cxx index 3c2de0f124c2..fb6c1b50ff5a 100644 --- a/filter/source/svg/svgfontexport.cxx +++ b/filter/source/svg/svgfontexport.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - /************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2008 by Sun Microsystems, Inc. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "svgfontexport.hxx" diff --git a/filter/source/svg/svgfontexport.hxx b/filter/source/svg/svgfontexport.hxx index 9a996f577cf0..1a6face4a16a 100644 --- a/filter/source/svg/svgfontexport.hxx +++ b/filter/source/svg/svgfontexport.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - /************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2008 by Sun Microsystems, Inc. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef SVGFONTEXPORT_HXX #define SVGFONTEXPORT_HXX diff --git a/filter/source/svg/svgimport.cxx b/filter/source/svg/svgimport.cxx index cd84f4720655..15e1fe1b89c7 100644 --- a/filter/source/svg/svgimport.cxx +++ b/filter/source/svg/svgimport.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - /************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "svgfilter.hxx" diff --git a/filter/source/t602/filterenv.cxx b/filter/source/t602/filterenv.cxx index 6154dbfe3b14..1e9ff82e8bbe 100644 --- a/filter/source/t602/filterenv.cxx +++ b/filter/source/t602/filterenv.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - /************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/filter/source/t602/t602filter.component b/filter/source/t602/t602filter.component index cb36327882da..1bad1362c4ec 100644 --- a/filter/source/t602/t602filter.component +++ b/filter/source/t602/t602filter.component @@ -1,30 +1,21 @@ - + diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx index 0106a9a5f75c..ed582a0659b6 100644 --- a/filter/source/t602/t602filter.cxx +++ b/filter/source/t602/t602filter.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - /************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "t602filter.hxx" #include "t602filter.hrc" diff --git a/filter/source/textfilterdetect/filterdetect.hxx b/filter/source/textfilterdetect/filterdetect.hxx index 7f3ad158e2ae..b3b2790002c4 100644 --- a/filter/source/textfilterdetect/filterdetect.hxx +++ b/filter/source/textfilterdetect/filterdetect.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef __FILTER_TEXTFILTERDETECT_FILTERDETECT_HXX__ #define __FILTER_TEXTFILTERDETECT_FILTERDETECT_HXX__ diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx index dfa2ca5dbd62..bf089c9fc9ad 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/filter/source/xmlfilteradaptor/genericfilter.cxx b/filter/source/xmlfilteradaptor/genericfilter.cxx index 67bc53698cf7..1ce1ea13b4e9 100644 --- a/filter/source/xmlfilteradaptor/genericfilter.cxx +++ b/filter/source/xmlfilteradaptor/genericfilter.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/filter/source/xmlfilteradaptor/streamwrap.hxx b/filter/source/xmlfilteradaptor/streamwrap.hxx index 3751e3b48953..2424ea24bfb2 100644 --- a/filter/source/xmlfilteradaptor/streamwrap.hxx +++ b/filter/source/xmlfilteradaptor/streamwrap.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _OSL_FILE_WRAPPER_HXX_ #define _OSL_FILE_WRAPPER_HXX_ diff --git a/filter/source/xmlfilteradaptor/xmlfa.component b/filter/source/xmlfilteradaptor/xmlfa.component index 97ffd4eb68b7..7510db5b4982 100644 --- a/filter/source/xmlfilteradaptor/xmlfa.component +++ b/filter/source/xmlfilteradaptor/xmlfa.component @@ -1,30 +1,21 @@ - + diff --git a/filter/source/xmlfilterdetect/fdcomp.cxx b/filter/source/xmlfilterdetect/fdcomp.cxx index 004d11006e50..2f4e10e13cef 100644 --- a/filter/source/xmlfilterdetect/fdcomp.cxx +++ b/filter/source/xmlfilterdetect/fdcomp.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/filter/source/xmlfilterdetect/filterdetect.cxx b/filter/source/xmlfilterdetect/filterdetect.cxx index 9e7959ddf7aa..bec453d8ae08 100644 --- a/filter/source/xmlfilterdetect/filterdetect.cxx +++ b/filter/source/xmlfilterdetect/filterdetect.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/filter/source/xmlfilterdetect/xmlfd.component b/filter/source/xmlfilterdetect/xmlfd.component index 798e940c3ca5..23d8d5d0b59a 100644 --- a/filter/source/xmlfilterdetect/xmlfd.component +++ b/filter/source/xmlfilterdetect/xmlfd.component @@ -1,30 +1,21 @@ - + diff --git a/filter/source/xslt/common/copy.xsl b/filter/source/xslt/common/copy.xsl index a608e2cc6925..71313e82240c 100644 --- a/filter/source/xslt/common/copy.xsl +++ b/filter/source/xslt/common/copy.xsl @@ -1,4 +1,21 @@ + diff --git a/filter/source/xslt/common/math.xsl b/filter/source/xslt/common/math.xsl index 2b6ce0c89ccf..0f35645dcebd 100644 --- a/filter/source/xslt/common/math.xsl +++ b/filter/source/xslt/common/math.xsl @@ -1,29 +1,20 @@ + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + --> diff --git a/filter/source/xslt/export/spreadsheetml/formular.xsl b/filter/source/xslt/export/spreadsheetml/formular.xsl index 8134412ec8d9..f8d1246e69e7 100644 --- a/filter/source/xslt/export/spreadsheetml/formular.xsl +++ b/filter/source/xslt/export/spreadsheetml/formular.xsl @@ -1,30 +1,21 @@ + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + --> + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + --> + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + --> + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + --> + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + --> + diff --git a/filter/source/xslt/export/uof/odf2uof_spreadsheet.xsl b/filter/source/xslt/export/uof/odf2uof_spreadsheet.xsl index 78a37f9c9c14..d7dabaa6cd9a 100644 --- a/filter/source/xslt/export/uof/odf2uof_spreadsheet.xsl +++ b/filter/source/xslt/export/uof/odf2uof_spreadsheet.xsl @@ -1,4 +1,21 @@ + diff --git a/filter/source/xslt/export/uof/odf2uof_text.xsl b/filter/source/xslt/export/uof/odf2uof_text.xsl index b02108e76dbe..d1ed99ba89ae 100644 --- a/filter/source/xslt/export/uof/odf2uof_text.xsl +++ b/filter/source/xslt/export/uof/odf2uof_text.xsl @@ -1,4 +1,21 @@ + diff --git a/filter/source/xslt/export/wordml/ooo2wordml.xsl b/filter/source/xslt/export/wordml/ooo2wordml.xsl index 416581b5e3ed..6cebb3ca50db 100644 --- a/filter/source/xslt/export/wordml/ooo2wordml.xsl +++ b/filter/source/xslt/export/wordml/ooo2wordml.xsl @@ -1,30 +1,21 @@ + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + --> diff --git a/filter/source/xslt/export/wordml/ooo2wordml_border.xsl b/filter/source/xslt/export/wordml/ooo2wordml_border.xsl index 9eb2fd4dcbd1..ac3bde0e703f 100644 --- a/filter/source/xslt/export/wordml/ooo2wordml_border.xsl +++ b/filter/source/xslt/export/wordml/ooo2wordml_border.xsl @@ -1,30 +1,21 @@ + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + --> diff --git a/filter/source/xslt/export/wordml/ooo2wordml_custom_draw.xsl b/filter/source/xslt/export/wordml/ooo2wordml_custom_draw.xsl index 0548e2525d46..923b19a9e248 100644 --- a/filter/source/xslt/export/wordml/ooo2wordml_custom_draw.xsl +++ b/filter/source/xslt/export/wordml/ooo2wordml_custom_draw.xsl @@ -1,30 +1,21 @@ + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + --> diff --git a/filter/source/xslt/export/wordml/ooo2wordml_draw.xsl b/filter/source/xslt/export/wordml/ooo2wordml_draw.xsl index b978e99d8882..cdb9ebf8e8a8 100644 --- a/filter/source/xslt/export/wordml/ooo2wordml_draw.xsl +++ b/filter/source/xslt/export/wordml/ooo2wordml_draw.xsl @@ -1,29 +1,20 @@ diff --git a/filter/source/xslt/export/wordml/ooo2wordml_field.xsl b/filter/source/xslt/export/wordml/ooo2wordml_field.xsl index 48a5e4e7342c..eb1eb69bc7c0 100644 --- a/filter/source/xslt/export/wordml/ooo2wordml_field.xsl +++ b/filter/source/xslt/export/wordml/ooo2wordml_field.xsl @@ -1,30 +1,21 @@ + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + --> + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + --> diff --git a/filter/source/xslt/export/wordml/ooo2wordml_page.xsl b/filter/source/xslt/export/wordml/ooo2wordml_page.xsl index 477ee0b109f0..23d35d46f46a 100644 --- a/filter/source/xslt/export/wordml/ooo2wordml_page.xsl +++ b/filter/source/xslt/export/wordml/ooo2wordml_page.xsl @@ -1,30 +1,21 @@ + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + --> diff --git a/filter/source/xslt/export/wordml/ooo2wordml_path.xsl b/filter/source/xslt/export/wordml/ooo2wordml_path.xsl index 695bbb0c3ef8..14e9d3fbe8e8 100644 --- a/filter/source/xslt/export/wordml/ooo2wordml_path.xsl +++ b/filter/source/xslt/export/wordml/ooo2wordml_path.xsl @@ -1,30 +1,21 @@ + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + --> diff --git a/filter/source/xslt/export/wordml/ooo2wordml_settings.xsl b/filter/source/xslt/export/wordml/ooo2wordml_settings.xsl index 71312d57ed5e..b003e647d6c1 100644 --- a/filter/source/xslt/export/wordml/ooo2wordml_settings.xsl +++ b/filter/source/xslt/export/wordml/ooo2wordml_settings.xsl @@ -1,30 +1,21 @@ + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + --> diff --git a/filter/source/xslt/export/wordml/ooo2wordml_table.xsl b/filter/source/xslt/export/wordml/ooo2wordml_table.xsl index 67e4eafe01d7..5aaf70c1e497 100644 --- a/filter/source/xslt/export/wordml/ooo2wordml_table.xsl +++ b/filter/source/xslt/export/wordml/ooo2wordml_table.xsl @@ -1,30 +1,21 @@ + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + --> diff --git a/filter/source/xslt/export/wordml/ooo2wordml_text.xsl b/filter/source/xslt/export/wordml/ooo2wordml_text.xsl index 5ba97699d4fa..e1c2810f832e 100644 --- a/filter/source/xslt/export/wordml/ooo2wordml_text.xsl +++ b/filter/source/xslt/export/wordml/ooo2wordml_text.xsl @@ -1,30 +1,21 @@ + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + --> diff --git a/filter/source/xslt/import/common/ms2ooo_docpr.xsl b/filter/source/xslt/import/common/ms2ooo_docpr.xsl index 77d21306b7b7..6a10f93f7b3c 100644 --- a/filter/source/xslt/import/common/ms2ooo_docpr.xsl +++ b/filter/source/xslt/import/common/ms2ooo_docpr.xsl @@ -1,30 +1,21 @@ + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + --> diff --git a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl index fe0a01e92bb3..c36ff763ad17 100644 --- a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl +++ b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl @@ -1,30 +1,21 @@ + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + --> diff --git a/filter/source/xslt/import/uof/uof2odf_presentation.xsl b/filter/source/xslt/import/uof/uof2odf_presentation.xsl index 3c9c569e022a..9e2d2cf5ef18 100644 --- a/filter/source/xslt/import/uof/uof2odf_presentation.xsl +++ b/filter/source/xslt/import/uof/uof2odf_presentation.xsl @@ -1,4 +1,21 @@ + diff --git a/filter/source/xslt/import/uof/uof2odf_spreadsheet.xsl b/filter/source/xslt/import/uof/uof2odf_spreadsheet.xsl index 532561920791..00143a2a4d38 100644 --- a/filter/source/xslt/import/uof/uof2odf_spreadsheet.xsl +++ b/filter/source/xslt/import/uof/uof2odf_spreadsheet.xsl @@ -1,4 +1,21 @@ + diff --git a/filter/source/xslt/import/uof/uof2odf_text.xsl b/filter/source/xslt/import/uof/uof2odf_text.xsl index abf597853c97..93dd0cc3fcb6 100644 --- a/filter/source/xslt/import/uof/uof2odf_text.xsl +++ b/filter/source/xslt/import/uof/uof2odf_text.xsl @@ -1,4 +1,21 @@ + diff --git a/filter/source/xslt/import/wordml/wordml2ooo.xsl b/filter/source/xslt/import/wordml/wordml2ooo.xsl index ed661265fe5c..60676dd86857 100644 --- a/filter/source/xslt/import/wordml/wordml2ooo.xsl +++ b/filter/source/xslt/import/wordml/wordml2ooo.xsl @@ -1,30 +1,21 @@ + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + --> diff --git a/filter/source/xslt/import/wordml/wordml2ooo_custom_draw.xsl b/filter/source/xslt/import/wordml/wordml2ooo_custom_draw.xsl index 118c63301774..c286f3a968ea 100644 --- a/filter/source/xslt/import/wordml/wordml2ooo_custom_draw.xsl +++ b/filter/source/xslt/import/wordml/wordml2ooo_custom_draw.xsl @@ -1,30 +1,21 @@ + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + --> diff --git a/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl b/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl index e36d7cd0af42..f5d72492a9e3 100644 --- a/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl +++ b/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl @@ -1,29 +1,20 @@ diff --git a/filter/source/xslt/import/wordml/wordml2ooo_field.xsl b/filter/source/xslt/import/wordml/wordml2ooo_field.xsl index 6c77f63e66a6..23f75d98ff7d 100644 --- a/filter/source/xslt/import/wordml/wordml2ooo_field.xsl +++ b/filter/source/xslt/import/wordml/wordml2ooo_field.xsl @@ -1,30 +1,21 @@ + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + --> diff --git a/filter/source/xslt/import/wordml/wordml2ooo_list.xsl b/filter/source/xslt/import/wordml/wordml2ooo_list.xsl index 8bbe57a5e3ec..71f7039a5dd2 100644 --- a/filter/source/xslt/import/wordml/wordml2ooo_list.xsl +++ b/filter/source/xslt/import/wordml/wordml2ooo_list.xsl @@ -1,30 +1,21 @@ + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + --> diff --git a/filter/source/xslt/import/wordml/wordml2ooo_path.xsl b/filter/source/xslt/import/wordml/wordml2ooo_path.xsl index 736d62a38015..6f73a4b300d4 100644 --- a/filter/source/xslt/import/wordml/wordml2ooo_path.xsl +++ b/filter/source/xslt/import/wordml/wordml2ooo_path.xsl @@ -1,29 +1,20 @@ diff --git a/filter/source/xslt/import/wordml/wordml2ooo_settings.xsl b/filter/source/xslt/import/wordml/wordml2ooo_settings.xsl index 84696dcf5773..9f8ac81b07d3 100644 --- a/filter/source/xslt/import/wordml/wordml2ooo_settings.xsl +++ b/filter/source/xslt/import/wordml/wordml2ooo_settings.xsl @@ -1,30 +1,21 @@ + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + --> diff --git a/filter/source/xslt/import/wordml/wordml2ooo_table.xsl b/filter/source/xslt/import/wordml/wordml2ooo_table.xsl index 113dd391b433..ee18f4a885e2 100644 --- a/filter/source/xslt/import/wordml/wordml2ooo_table.xsl +++ b/filter/source/xslt/import/wordml/wordml2ooo_table.xsl @@ -1,30 +1,21 @@ + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + --> diff --git a/filter/source/xslt/import/wordml/wordml2ooo_text.xsl b/filter/source/xslt/import/wordml/wordml2ooo_text.xsl index a00656a9ed32..766cb9313889 100644 --- a/filter/source/xslt/import/wordml/wordml2ooo_text.xsl +++ b/filter/source/xslt/import/wordml/wordml2ooo_text.xsl @@ -1,30 +1,21 @@ + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + --> diff --git a/filter/source/xslt/odf2xhtml/export/common/body.xsl b/filter/source/xslt/odf2xhtml/export/common/body.xsl index 96f7d3ce691c..618b84245c3e 100644 --- a/filter/source/xslt/odf2xhtml/export/common/body.xsl +++ b/filter/source/xslt/odf2xhtml/export/common/body.xsl @@ -1,30 +1,21 @@ - + diff --git a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl index 5f75027d33e6..b95cda7e5caa 100644 --- a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl +++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl @@ -1,29 +1,20 @@ + diff --git a/filter/source/xslt/odf2xhtml/export/common/table/table.xsl b/filter/source/xslt/odf2xhtml/export/common/table/table.xsl index a380088a26f7..a39367e676ec 100644 --- a/filter/source/xslt/odf2xhtml/export/common/table/table.xsl +++ b/filter/source/xslt/odf2xhtml/export/common/table/table.xsl @@ -1,30 +1,21 @@ + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + --> diff --git a/filter/source/xslt/odf2xhtml/export/common/table/table_cells.xsl b/filter/source/xslt/odf2xhtml/export/common/table/table_cells.xsl index b5398742a315..164a73aa94e1 100644 --- a/filter/source/xslt/odf2xhtml/export/common/table/table_cells.xsl +++ b/filter/source/xslt/odf2xhtml/export/common/table/table_cells.xsl @@ -1,30 +1,21 @@ + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + --> diff --git a/filter/source/xslt/odf2xhtml/export/common/table/table_columns.xsl b/filter/source/xslt/odf2xhtml/export/common/table/table_columns.xsl index ee578e158a63..d310e941f6c8 100644 --- a/filter/source/xslt/odf2xhtml/export/common/table/table_columns.xsl +++ b/filter/source/xslt/odf2xhtml/export/common/table/table_columns.xsl @@ -1,30 +1,21 @@ + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + --> diff --git a/filter/source/xslt/odf2xhtml/export/common/table/table_rows.xsl b/filter/source/xslt/odf2xhtml/export/common/table/table_rows.xsl index 1cf51362b1b5..8c950154f7f5 100644 --- a/filter/source/xslt/odf2xhtml/export/common/table/table_rows.xsl +++ b/filter/source/xslt/odf2xhtml/export/common/table/table_rows.xsl @@ -1,30 +1,21 @@ + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + --> diff --git a/filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl b/filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl index acdc3dd0412d..24b90a5dc589 100644 --- a/filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl +++ b/filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl @@ -1,29 +1,20 @@ + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + --> diff --git a/filter/source/xsltdialog/typedetectionexport.cxx b/filter/source/xsltdialog/typedetectionexport.cxx index a01b462c440e..4f4bb1d32acf 100644 --- a/filter/source/xsltdialog/typedetectionexport.cxx +++ b/filter/source/xsltdialog/typedetectionexport.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/filter/source/xsltdialog/typedetectionimport.cxx b/filter/source/xsltdialog/typedetectionimport.cxx index 3d3b937fe333..ab0046ca8aa9 100644 --- a/filter/source/xsltdialog/typedetectionimport.cxx +++ b/filter/source/xsltdialog/typedetectionimport.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/filter/source/xsltdialog/xmlfileview.cxx b/filter/source/xsltdialog/xmlfileview.cxx index a200a922b01d..db3973d7f8cb 100644 --- a/filter/source/xsltdialog/xmlfileview.cxx +++ b/filter/source/xsltdialog/xmlfileview.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/filter/source/xsltdialog/xmlfileview.hxx b/filter/source/xsltdialog/xmlfileview.hxx index 51684f164559..afbf35e9d51c 100644 --- a/filter/source/xsltdialog/xmlfileview.hxx +++ b/filter/source/xsltdialog/xmlfileview.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _XMLFILEVIEW_HXX #define _XMLFILEVIEW_HXX diff --git a/filter/source/xsltdialog/xmlfiltercommon.hxx b/filter/source/xsltdialog/xmlfiltercommon.hxx index cdb767e3b6d9..85d0ff1e52e0 100644 --- a/filter/source/xsltdialog/xmlfiltercommon.hxx +++ b/filter/source/xsltdialog/xmlfiltercommon.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _XMLFILTERCOMMON_HXX_ #define _XMLFILTERCOMMON_HXX_ diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx index 3cc5b0ec59e7..3d9a3406c6a6 100644 --- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx +++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx index f497fc7e6822..fac5f89ad8b1 100644 --- a/filter/source/xsltdialog/xmlfilterjar.cxx +++ b/filter/source/xsltdialog/xmlfilterjar.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index 2e9e558cbfb9..7ecfddecc144 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx index 09dab2db6aa8..57330ef6b0fe 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _XMLFILTERSETTINGSDIALOG_HXX_ #define _XMLFILTERSETTINGSDIALOG_HXX_ diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.src b/filter/source/xsltdialog/xmlfiltersettingsdialog.src index f7dc96a8bea2..77d1d789f61b 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.src +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "xmlfiltersettingsdialog.hrc" #include "xmlfilterhelpids.hrc" diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx index eb7d7508390d..ddd50412d916 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.hxx b/filter/source/xsltdialog/xmlfiltertabdialog.hxx index 04439a7a4b6a..2d0189278073 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _XMLFILTERTABDIALOG_HXX_ #define _XMLFILTERTABDIALOG_HXX_ diff --git a/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx b/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx index 8042a2c7000f..5eb09d6fe675 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx +++ b/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx index dc1a4c852805..37be99048f71 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx +++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx index a9d80626eeab..a37d017aa71c 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx +++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _XMLFILTERTABPAGEXSLT_HXX_ #define _XMLFILTERTABPAGEXSLT_HXX_ diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.src b/filter/source/xsltdialog/xmlfiltertabpagexslt.src index 2d0391cb2007..f719dd5a1fc4 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagexslt.src +++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "xmlfiltertabpagexslt.hrc" #include "xmlfilterhelpids.hrc" diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx index 2dff65f92db3..e46728396089 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.hxx b/filter/source/xsltdialog/xmlfiltertestdialog.hxx index ef60d6d21563..d035d36306e5 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _XMLFILTERTESTDIALOG_HXX_ #define _XMLFILTERTESTDIALOG_HXX_ diff --git a/filter/source/xsltdialog/xsltdlg.component b/filter/source/xsltdialog/xsltdlg.component index 5f6815646920..5f90ceb23218 100644 --- a/filter/source/xsltdialog/xsltdlg.component +++ b/filter/source/xsltdialog/xsltdlg.component @@ -1,30 +1,21 @@ - + diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index 63de5a63dda3..7d0a18a00478 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/filter/source/xsltfilter/XSLTFilter.jar.component b/filter/source/xsltfilter/XSLTFilter.jar.component index d4ecd66f3b53..35d104ab264c 100644 --- a/filter/source/xsltfilter/XSLTFilter.jar.component +++ b/filter/source/xsltfilter/XSLTFilter.jar.component @@ -1,30 +1,21 @@ - + diff --git a/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/XSLTFilterOLEExtracter.java b/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/XSLTFilterOLEExtracter.java index a19e0e49d448..ef6d4eed73a1 100644 --- a/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/XSLTFilterOLEExtracter.java +++ b/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/XSLTFilterOLEExtracter.java @@ -1,38 +1,29 @@ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + package com.sun.star.comp.xsltfilter; -/************************************************************************ - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -//Standard Java classes +// Standard Java classes import java.io.FileWriter; import java.util.zip.Inflater; import java.util.zip.Deflater; -//StarOffice Interfaces and UNO +// StarOffice Interfaces and UNO import com.sun.star.bridge.XBridgeFactory; import com.sun.star.bridge.XBridge; import com.sun.star.connection.XConnector; diff --git a/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/XSLTransformer.java b/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/XSLTransformer.java index 1b776225d848..17ef2047353d 100644 --- a/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/XSLTransformer.java +++ b/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/XSLTransformer.java @@ -1,33 +1,24 @@ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + package com.sun.star.comp.xsltfilter; -/************************************************************************ - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -//Standard Java classes +// Standard Java classes import java.io.BufferedInputStream; import java.io.BufferedOutputStream; import java.io.File; diff --git a/filter/source/xsltfilter/xsltfilter.component b/filter/source/xsltfilter/xsltfilter.component index b1cf36275c5c..b96a13fe8432 100644 --- a/filter/source/xsltfilter/xsltfilter.component +++ b/filter/source/xsltfilter/xsltfilter.component @@ -1,30 +1,21 @@ - + diff --git a/filter/source/xsltvalidate/XSLTValidate.component b/filter/source/xsltvalidate/XSLTValidate.component index 7d357be55119..8f7f70592442 100644 --- a/filter/source/xsltvalidate/XSLTValidate.component +++ b/filter/source/xsltvalidate/XSLTValidate.component @@ -1,30 +1,21 @@ - + diff --git a/shell/Makefile b/shell/Makefile index ccb1c85a04da..0997e628485b 100644 --- a/shell/Makefile +++ b/shell/Makefile @@ -1,4 +1,11 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) diff --git a/shell/inc/internal/basereader.hxx b/shell/inc/internal/basereader.hxx index 7a154103e44c..f7442f4939fc 100644 --- a/shell/inc/internal/basereader.hxx +++ b/shell/inc/internal/basereader.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef BASEREADER_HXX_INCLUDED #define BASEREADER_HXX_INCLUDED diff --git a/shell/inc/internal/contentreader.hxx b/shell/inc/internal/contentreader.hxx index e55a76035b90..ef1671bc67db 100644 --- a/shell/inc/internal/contentreader.hxx +++ b/shell/inc/internal/contentreader.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef CONTENTREADER_HXX_INCLUDED #define CONTENTREADER_HXX_INCLUDED diff --git a/shell/inc/internal/fileextensions.hxx b/shell/inc/internal/fileextensions.hxx index 23b782219848..5fdc36fbfc18 100644 --- a/shell/inc/internal/fileextensions.hxx +++ b/shell/inc/internal/fileextensions.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef FILEEXTENSIONS_HXX_INCLUDED #define FILEEXTENSIONS_HXX_INCLUDED diff --git a/shell/inc/internal/metainforeader.hxx b/shell/inc/internal/metainforeader.hxx index a0ed7d9584c1..16dcfce6ca0c 100644 --- a/shell/inc/internal/metainforeader.hxx +++ b/shell/inc/internal/metainforeader.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef METAINFOREADER_HXX_INCLUDED #define METAINFOREADER_HXX_INCLUDED diff --git a/shell/inc/internal/stream_helper.hxx b/shell/inc/internal/stream_helper.hxx index f0d41bb98e79..77af98846630 100644 --- a/shell/inc/internal/stream_helper.hxx +++ b/shell/inc/internal/stream_helper.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2010 by Sun Microsystems, Inc. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef STREAM_HELPER_HXX_INCLUDED #define STREAM_HELPER_HXX_INCLUDED diff --git a/shell/inc/internal/types.hxx b/shell/inc/internal/types.hxx index c6fbfac5e50c..15a03ca2f9e7 100644 --- a/shell/inc/internal/types.hxx +++ b/shell/inc/internal/types.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef TYPES_HXX_INCLUDED #define TYPES_HXX_INCLUDED diff --git a/shell/inc/internal/utilities.hxx b/shell/inc/internal/utilities.hxx index 3a410bf37e08..157859a8e7f7 100644 --- a/shell/inc/internal/utilities.hxx +++ b/shell/inc/internal/utilities.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef UTILITIES_HXX_INCLUDED #define UTILITIES_HXX_INCLUDED diff --git a/shell/inc/internal/xml_parser.hxx b/shell/inc/internal/xml_parser.hxx index fbf7cf2e03ce..f10e7e6165ac 100644 --- a/shell/inc/internal/xml_parser.hxx +++ b/shell/inc/internal/xml_parser.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _XML_PARSER_HXX_ #define _XML_PARSER_HXX_ diff --git a/shell/inc/internal/zipfile.hxx b/shell/inc/internal/zipfile.hxx index dd786ccf8230..c2a5a248c21d 100644 --- a/shell/inc/internal/zipfile.hxx +++ b/shell/inc/internal/zipfile.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef ZIPFILE_HXX_INCLUDED #define ZIPFILE_HXX_INCLUDED diff --git a/shell/inc/shell/kde_headers.h b/shell/inc/shell/kde_headers.h index d92fceb34122..015fe5f4ebc5 100644 --- a/shell/inc/shell/kde_headers.h +++ b/shell/inc/shell/kde_headers.h @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_VCL_KDE_HEADERS_H #define INCLUDED_VCL_KDE_HEADERS_H diff --git a/shell/qa/i_xml_parser_event_handler.hxx b/shell/qa/i_xml_parser_event_handler.hxx deleted file mode 100644 index 5ff98ff75972..000000000000 --- a/shell/qa/i_xml_parser_event_handler.hxx +++ /dev/null @@ -1,78 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _I_XML_PARSER_EVENT_HANDLER_HXX_ -#define _I_XML_PARSER_EVENT_HANDLER_HXX_ - -#include -#include -#include - -#if defined(XML_UNICODE) || defined(XML_UNICODE_WCHAR_T) - typedef std::wstring string_t; -#else - typedef std::string string_t; -#endif - -// name-value container -typedef std::map xml_tag_attribute_container_t; - - -class i_xml_parser_event_handler -{ -public: - virtual ~i_xml_parser_event_handler() {}; - - virtual void start_document() = 0; - - virtual void end_document() = 0; - - virtual void start_element( - const string_t& raw_name, - const string_t& local_name, - const xml_tag_attribute_container_t& attributes) = 0; - - virtual void end_element( - const string_t& raw_name, - const string_t& local_name) = 0; - - virtual void characters( - const string_t& character) = 0; - - virtual void ignore_whitespace( - const string_t& whitespaces) = 0; - - virtual void processing_instruction( - const string_t& target, const string_t& data) = 0; - - virtual void comment(const string_t& comment) = 0; -}; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/qa/makefile.mk b/shell/qa/makefile.mk deleted file mode 100644 index 1420d3881d09..000000000000 --- a/shell/qa/makefile.mk +++ /dev/null @@ -1,68 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=.. - -PRJNAME=shell -TARGET=qa - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -CFLAGSCXX += $(CPPUNIT_CFLAGS) - -# BEGIN ---------------------------------------------------------------- -# auto generated Target:testjob by codegen.pl - -SHL1OBJS=$(SLO)$/recent_docs.obj $(SLO)$/xml_parser.obj -SHL1TARGET=recent_docs -SHL1STDLIBS=$(SALLIB) $(CPPUNITLIB) - -.IF "$(GUI)" == "UNX" -..$/unxsols4.pro$/slb$/libsysshell.a \ -$(EXPATASCII3RDLIB) -.ENDIF - -SHL1IMPLIB= i$(SHL1TARGET) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) -DEF1EXPORTFILE= export.exp - -# END ------------------------------------------------------------------ - - -#------------------------------- All object files ------------------------------- -# do this here, so we get right dependencies - -SLOFILES=$(SHL1OBJS) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/shell/qa/recent_docs.cxx b/shell/qa/recent_docs.cxx deleted file mode 100644 index b2fa80c0cd16..000000000000 --- a/shell/qa/recent_docs.cxx +++ /dev/null @@ -1,222 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#include - -#include "systemshell.hxx" -#include "osl/file.hxx" -#include "osl/security.hxx" -#include "rtl/ustring.hxx" - -#include -#include - -using namespace osl; - -using ::rtl::OUString; - -namespace syssh = SystemShell; - -const OUString SXW_MIME_TYPE("application/vnd.sun.xml.writer"); -const OUString SXC_MIME_TYPE("application/vnd.sun.xml.calc"); -const OUString SXI_MIME_TYPE("application/vnd.sun.xml.impress"); -const OUString SXD_MIME_TYPE("application/vnd.sun.xml.draw"); -const OUString SXM_MIME_TYPE("application/vnd.sun.xml.math"); - -class Test_AddToRecentDocs : public CppUnit::TestFixture -{ -public: - - Test_AddToRecentDocs() - { - } - - //------------------------------------------------ - void test_existing_recently_used_file_with_valid_xml() - { - system("rm $HOME/.recently-used"); - system("echo '\n\n\nfile:///home/federico/gedit.txt\ntext/plain\n1046485966\n\ngedit\n\n\n' > $HOME/.recently-used"); - - rtl::OUString url("file:///home_athene/test.sxw"); - syssh::AddToRecentDocumentList(url, SXW_MIME_TYPE); - - url = rtl::OUString("file:///home_athene/test.sxc"); - syssh::AddToRecentDocumentList(url, SXC_MIME_TYPE); - - url = rtl::OUString("file:///home_athene/test.sxi"); - syssh::AddToRecentDocumentList(url, SXI_MIME_TYPE); - - url = rtl::OUString("file:///home_athene/test.sxd"); - syssh::AddToRecentDocumentList(url, SXD_MIME_TYPE); - - url = rtl::OUString("file:///home_athene/test.sxm"); - syssh::AddToRecentDocumentList(url, SXM_MIME_TYPE); - } - - //------------------------------------------------ - void test_existing_recently_used_file_with_invalid_xml() - { - system("rm $HOME/.recently-used"); - system("echo '\n\n\nfile:///home/federico/gedit.txt\ntext/plain\n1046485966\n\ngedit\n\n\nfile:///home/federico/gedit2.txt\ntext/plain\n1046485966\n\ngedit\n\n\n' > $HOME/.recently-used"); - - rtl::OUString url("file:///home_athene/test.sxw"); - syssh::AddToRecentDocumentList(url, SXW_MIME_TYPE); - } - - //------------------------------------------------ - void test_non_existing_recently_used_file() - { - int ret = system("rm $HOME/.recently-used"); - - rtl::OUString url("file:///home_athene/test.sxw"); - syssh::AddToRecentDocumentList(url, SXW_MIME_TYPE); - - url = rtl::OUString("file:///home_athene/test.sxc"); - syssh::AddToRecentDocumentList(url, SXC_MIME_TYPE); - - url = rtl::OUString("file:///home_athene/test.sxi"); - syssh::AddToRecentDocumentList(url, SXI_MIME_TYPE); - - url = rtl::OUString("file:///home_athene/test.sxd"); - syssh::AddToRecentDocumentList(url, SXD_MIME_TYPE); - - url = rtl::OUString("file:///home_athene/test.sxm"); - syssh::AddToRecentDocumentList(url, SXM_MIME_TYPE); - - ret = system("ls $HOME/.recently-used"); - - CPPUNIT_ASSERT_MESSAGE(".recently-used doesn't exist", 0 == ret); - } - - //------------------------------------------------ - OUString get_recently_used_url() - { - Security sec; - OUString recently_used_url; - - CPPUNIT_ASSERT_MESSAGE("cannot get user home directory", sec.getHomeDir(recently_used_url)); - - if ((recently_used_url.getLength() > 0) && - ('/' != recently_used_url.pData->buffer[recently_used_url.getLength() - 1])) - recently_used_url += rtl::OUString("/"); - - recently_used_url += rtl::OUString(".recently-used"); - return recently_used_url; - } - - //------------------------------------------------ - void read_recently_used(void* buffer, size_t size) - { - File ruf(get_recently_used_url()); - FileBase::RC rc = ruf.open(osl_File_OpenFlag_Read); - - CPPUNIT_ASSERT_MESSAGE("Cannot open ~/.recently-used", FileBase::E_None == rc); - - sal_uInt64 read; - ruf.read(buffer, size, read); - ruf.close(); - CPPUNIT_ASSERT_MESSAGE("Cannot read .recently-used", (read > 0)); - } - - //------------------------------------------------ - void test_existing_recently_used_file_without_xml() - { - // remove an existing .recently-used file - // create a new one with non xml data - system("rm $HOME/.recently-used"); - system("date > $HOME/.recently-used"); - - char cnt_before[128]; - memset(cnt_before, 0, sizeof(cnt_before)); - read_recently_used(cnt_before, sizeof(cnt_before)); - - OUString url("file:///home_athene/test.sxw"); - syssh::AddToRecentDocumentList(url, SXW_MIME_TYPE); - - char cnt_after[128]; - memset(cnt_after, 0, sizeof(cnt_after)); - read_recently_used(cnt_after, sizeof(cnt_after)); - CPPUNIT_ASSERT_MESSAGE(".recently-used unexpectly touched", (0 == strcmp(cnt_before, cnt_after))); - } - - //------------------------------------------------ - void test_existing_recently_used_with_unknown_xml() - { - system("rm $HOME/.recently-used"); - - char* xml_unknown = "\ntest"; - char cmd[256]; - sprintf(cmd, "echo '%s' > $HOME/.recently-used", xml_unknown); - system(cmd); - - OUString url("file:///home_athene/test.sxw"); - syssh::AddToRecentDocumentList(url, SXW_MIME_TYPE); - - char buffer[256]; - memset(buffer, 0, sizeof(buffer)); - read_recently_used(buffer, sizeof(buffer)); - - CPPUNIT_ASSERT_MESSAGE("Unexpected recently-used content", (0 == strncmp(xml_unknown, buffer, strlen(xml_unknown)))); - } - - //------------------------------------------------ - void test_existing_empty_recently_used_file() - { - system("rm $HOME/.recently-used"); - system("touch $HOME/.recently-used"); - - OUString url("file:///home_athene/test.sxw"); - syssh::AddToRecentDocumentList(url, SXW_MIME_TYPE); - - char buffer[256]; - memset(buffer, 0, sizeof(buffer)); - read_recently_used(buffer, sizeof(buffer)); - - char* expected = "\n"; - CPPUNIT_ASSERT_MESSAGE("Unexpected recently-used content", (0 == strncmp(buffer, expected, strlen(expected)))); - } - - //------------------------------------------------ - CPPUNIT_TEST_SUITE(Test_AddToRecentDocs); - CPPUNIT_TEST(test_existing_recently_used_file_with_valid_xml); - CPPUNIT_TEST(test_non_existing_recently_used_file); - CPPUNIT_TEST(test_existing_recently_used_file_without_xml); - CPPUNIT_TEST(test_existing_recently_used_with_unknown_xml); - CPPUNIT_TEST(test_existing_empty_recently_used_file); - CPPUNIT_TEST(test_existing_recently_used_file_with_invalid_xml); - CPPUNIT_TEST_SUITE_END(); -}; - - -// register test suites -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test_AddToRecentDocs, "Test_AddToRecentDocs"); - -NOADDITIONAL; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/qa/zip/export.map b/shell/qa/zip/export.map new file mode 100644 index 000000000000..bfcb0b000f0b --- /dev/null +++ b/shell/qa/zip/export.map @@ -0,0 +1,27 @@ +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# This file incorporates work covered by the following license notice: +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . +# + + + +UDK_3_0_0 { + global: + cppunitTestPlugIn; + + local: + *; +}; diff --git a/shell/qa/zip/makefile.mk b/shell/qa/zip/makefile.mk new file mode 100644 index 000000000000..4039b918bab6 --- /dev/null +++ b/shell/qa/zip/makefile.mk @@ -0,0 +1,58 @@ +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# This file incorporates work covered by the following license notice: +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . +# + + +PRJ=../.. + +PRJNAME=shell +TARGET=qa_zip +ENABLE_EXCEPTIONS=TRUE +#USE_STLP_DEBUG= +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk + +.IF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2" + +@all: +.IF "$(GUI)" == "OS2" + @echo "Skipping, cppunit broken." +.ELIF "$(WITH_CPPUNIT)" != "YES" + @echo "cppunit disabled. nothing do do." +.END + +.ELSE + +CFLAGSCXX += $(CPPUNIT_CFLAGS) + +SHL1OBJS = $(SLOFILES) +SHL1RPATH = NONE +SHL1STDLIBS = $(SALLIB) $(CPPUNITLIB) +SHL1LIBS = $(SLB)$/..$/lib$/iqa_zipimpl.lib +SHL1TARGET = $(TARGET) +SHL1VERSIONMAP = $(PRJ)/qa/zip/export.map +DEF1NAME=$(SHL1TARGET) +SLOFILES=$(SLO)$/ziptest.obj + +.ENDIF + +# --- Targets ------------------------------------------------------ + +.INCLUDE : target.mk +.INCLUDE: _cppunit.mk + diff --git a/shell/qa/zip/simpledocument.odt b/shell/qa/zip/simpledocument.odt new file mode 100644 index 0000000000000000000000000000000000000000..bf83a648b7edc2904750b93cce5720c853d9ad59 GIT binary patch literal 16259 zcma)j1yo$g)-LV@0>K>u1Zf&~cXxMpcXua9aCZqVL4vyzGUpj+R(w z@RsV?V%1hQwTv}$viXVmWnbIdY(yoLYwVPH$0evg*$kwx*aR!mR1la0>Ni_zw(Xs3 zJQ+|8?KM7pX-t2#yYW7AcJ{jZ76gz;m@27q(};tO_>tpm!~UgalB%7) zhO8a#c8J-~y>uG0HQb}%ErGLpjT=OCIXG8faoEvocCrj;x z;yxs8pg8=@fiTonPXu)N$m3QST#lNN+N{&?v8CA(83!8=&)E9msx9|w>dam!<@ra( zGh=QJwM;{<`a;5@yZ*UqiNf;PO)>?NfCu7I@8*=U(4%b_CO6V0Lo314jmu25sVNWT zk5(2~B_wQaX-m5FPmQ;(Z$GvkRid)i5aov);)va~Twh4&xe!?y?D=oL&5+@{% zH^eOtlrcD+7Z_`e-)}pS5evLy2g|t#D3^+}J@#$G*l$Zja!w^Y&y4c>Z(v|}t z>0UXV@?#O?v(av_!itbQ5;=TV#emWu+CxO0XUFp_ zMb{8oYKXpD8+KdA7-ESiJ4;bRP$Y~H|(8Bz6tNgrSKN*64gyMdmAUVTKa@w zw){+BKWi>8a5K(0F*JCLma#RnCBp}N``H_e5Xz_Z_0b(#FpocKv^qgrD7AfkfurM+ z;my@Xf5Uag`4f{y`}6%w>bDGcIku?s}sJQC3Cvmbij}GP4fg+zqc2Rzb7gJ216_-q5a>1B4dBrHr?! z{QS!BMmu2P6=O~(nhktu5m?h+4_R0eBeruW&ky`f3LQ^bN;s z{-HF<$Zy0rdSUT^d7Qj_Vbhs^s{_SnUZ&@EO7Q7ydcFk_~Yoa zqpwNy==I?Mk7dOZ`0FVi-Hgl+0R;kb_V(8){!cFl2rq|+m7cYkv5|u#jlH4qx43WC z0kp`0C!9e>qjS7KNJ#q+LyhKH9ZbQhkihd)l;yUlIAyu~lKrgj8x_I~D^ay+M|!ve z5jCGX6&VdENQXpC>-MPFn`s&g7TFi(>Zu4)@y^Tx3bH7hT&yYCbP|IAEC`lkUvfXV zre1K$v=Dbrv)YLw^wmbez~V>pn_X>sVzZ5|!y2o|IUZ!kxZMzPMJ%xwXV<{#)yubr z)DwR4g3xr^DUJtt5SseBDz z?TzUqBq#_-0Qmn3AKXj$930&&jT~NIpO(}mqBodP+ICbh;h0&}6PrDnjxsWJKS84q zGQeAsg&dM*lP;{kA%%NyRJSu*BpQwaP_X{y=z(-B0IrW#8m`m&^K|hf3yygam52gJ zkZ0HyYMd|WCOo`kaM|CVH6d{M*le?Wew0{fm~mE1BU&7z2raycK$c{06&5WA7-H&= z9dZhTC!VF$x(JWAo?O_`#!+(afk|UuqP_ou<|eN|Zn2!#=*pn=Meo|g1dQe7S-azV zR@;^WIgeOyJ#InE=c-(As!U7(50`MG{4{%1T44$civx|bU5$FVzQ7TJG)G$r`iQNO znIz`KkYV~r+}s(u;9Bvunf6M44GpuPWH1z!=eknkid0nSqcub-W52$=CFZul&9dRt zl1JRF1AN)}+bqtW6F<|Z*5~qQNIA*r0=MXFamaEq;FSIS1=~(WvAe&NtiiE;_1DOw zhW@2=BO3@MLD$1Qwd;3ZY6a3Uh{k<^VSeDBTHh%211@t#NLPCO6*WJP#vEOOLGDsF zUk)jC_DxAB;2lUCs>PspP6OK=0#%?d>-8tYtD_JJzs%fyas<(bzZtQB=l8tX* zCH+7`5qGk@5V#*~a;*Wpr*n@U#xoXU3>dMahBSf}30uFo;E@Nhx%OlH@_Y)G1j@Fu z7C!9r=I5aR3hA4v(iNAWHwd->c6JTFvb=)J+7|6rm;$+ zD28Q1S?Vx;ndk|9?>Kb6bv<6i@j&EDOMk;4g*m$Hboe{0nZOidE$(!qWsCbs1?3O+ z3I&-}P=@ucbgCi(N>PXSmJunJUHM&LIJ=&!)M6JTnp71|yoci-ZHL3v5)6tulB?fB zbUz7GhC*(AXc{zKgv;!7B#T+V?S%#~VG)_aSaxzu*Q};29?KvmmT9?D);L98J4u|E_2H*NgJ*7b zT&|2@e4iuLxJE%@Sa#Ohq?k2%eHY%5!|{i5bdjHH-Nl@(3HqC6g8Cxg_GFDk?ydyB zce}-#D%4bV^RVNHf~a|awwKq>@C#j|1~2;vAj87~n3_EGxR&nIE7hTWp2AXwJ%BpQ zLK4Lg{g4-vSfC7sct^AMWsB923gnASLS-n`m=%fEZS1Ear6xi+=Z4ugQh8MoRlEWo zt#elb5nui3KC2^g+jo7VVu{NB)im_w#R zP>~lol|UouO!KqH#4_9@=cmm78TDB+>)El7t7uNe6#Uj@APXUa8XJHx>V_ZzyUllg zS?ox8g5l2q3=!$=nex9151f0PMHDln%hb(gINz*?#TCl|K@)7C8)VX^T z0LOa7U_3szp>;!#aWG^(pse`RX^b^Hp4X)6s_W22%msnCF`u zcwG0J)ERs(NW4}hy7}(*F6sL{v`2}^mM>3Uq$XZ&@i=EK%GauPV7=`CQfylK8uBuu z2B>||Q^8sFeXzYWE(Fq6jYjEl=Y88f?l1}SYaHJKwq0Zwnl2o|04kS)wiUQAysFxo zZ>#9cNG(KI3%HiWz7+&+L(PE7sY->tr^sRY07fQ}s(zT;c;;u!`4VsOXb0N~Uc7Dx z;>qDse)be#EDK-0*U;O^C|kRHn+k-ztw)$~JU!npSnaGM4JuFyBkDul9RbE6snj`#@=vecW^0Uo$#G)Sivr#MG?g3zmvAAv)O_Ur`n$)kNfkck#L|kwS4S>kRVp^W?$uyo5yLr)rmG~=2 zmVtZq~0TC6^$*>aVwg^J{IMqD5yP>RYwv&6{P8yQF~L2c$p5Z`BeFJ8R(F1Ix3(@oeR94CZN(VK-|9;c z8r{tU;dR6Eddjc4i0oHDgMf%q{yOD<{Zmh;B!Qgua`wM|eoNyRIqJQh@tiy_7eZ$v zdxw`q4i_;U4J|RDk+p%1p_#P_7qOC}Fo2bqhZ~O5#@N`*z=-`(-TX4V#5#HNmpw(LNli;D}5 z3j>Xfy$O(xjg1ZX+bHoLstgVOLucz`Z}}UQp#ktE_w$-?asblN&;ftZzFPSIYt$?4 zUrn;HvH6dpS08?N@i%q!w6u)C-=BYJGO;%_wEPeKUmSR$WdNE04fP!L0M2GcE+oW+ zf5h=G0jDSC{uSLE8!jZ0rqx_0hBaA~!I7p*MI*tNj|HV`8Kw26A&68nFL^ zvyAlYwDdF#bezCnQ5WMHJVqJ7WrWM*jyU}Ius_(Rj5LOK6fMeMH@aR2A&KQs4R_rIq>Uo&%xrcPG+ z)_P`^4nW6Ww=}laCPyhs3OFFM<#t7~KLpI+`62|uIckwxOvl${slN*Nt;>dc*t!6f z%S>&t)1h48I=4Jl*mzdchaJw2(prI;DRmVyWhr}ICF@Bc^esC2%qdZFf)wGU>-gQWGhTtpmaTi_k!Tgd_XZSDos4)2pN@5p1ZnllB1JHU{|=?KGmpL`&dM?jk|Fob2uG%cRZ zxrTO}dAiX@X%qT_S1)kYR!7hCHNN5D@Pzk=>)1UJAdB2Oe0e^`+YJ?J?11Sc^qX~) zmv4fCPfH3u87Cp?r^qY#62%{?1&P#jc3ZR`4ntlo&8DF_6sR%&B-eAd=K9bU-+Gq+ zttO#r!0*1r$5|$HPA(^zg(O5UYr(-oO=hq@xc`0=BKB5cN1`LsXo~Iu^4wF^KtaFV zzFAM)++=w|VMp1`3*P8Dy0*-Vkf42(vxfBheJH73q zh{|A$f3QUpiz`}Qp`%=?aVNvsZWF;xZH#!|!7MO6BymN`udSy}YPMe4P3amh^x|wu zPRtBiR(@iZEeN82mClLaG7bWoo!;UpzOzDO-Xt+E30&EKg*Y-Zjb-RKRYawXGK%Tu z1fB=N{=RP~K|Oxu);k_#z=L9+rc#@A^m>KfQh2JsFS#Pmh+O%d9NIn;8q^pRsE07x zsA!4UTna&-{xSFz>ZbN({M`fyvZB#5On;@Fjn>l@frsN~qG4kQm0B6$##;lw3(&dC z@NM1(m1=dG@lsep{u>H~!e{1N~?#A|eP@&1h@N zcpXaWkyOCL{oZwEV=Dez!BmEe^)F=me&KC&GV}-NNZ#zZ&fe6$Nn9=q^E`EuTd6Aq zX_{9u7Th>A_`FGEc9OG1(%yr8`;la}S4f2htfUEuUw{%`5!$(e`O|W@#%R6I=z9A; z+h_+}DxKb-$`fT|gmZY_rhOYo z(d;<8__%3=O(|iXeHrsOar+hRQ_&j{*L?`mHN*PLUOVa4l(wT#(JAj*cNn4fs8pBV zgBw`_M6du>wd|f9qL;TLEjDAq&|kX{_x7*}l z%^C=}xi?wo^|f@0rbF5IWTU=Tm6V=d@)%}R`+R`fG0vT3;BxW^%y z*ei^eLe~z@2eW~XzO&gc@bxL6WTsPvlNUiv8}@_KuN*|I)TDI>|E4V{n0M`rg6Nn| zMWLkCbH}qCkzkmwy_YnKA%-U2C|v$-*y?Q+Rfn6xo%_;cs0u3(Vy4Zy*)KmO-5lz9 ztD+&6H}B?@#yX_VSS-e28yZ|*6M1!iGxpP?G<@dI%t$K6WksBuLXjGMr0*rdD@k<< z@B{CwB9Vmf!>2!cP|VCwDru|3h3yK4u6U_8yj`(b_jlk%(fm$$*LqC4NxHo{#yP<*`EAP9(QdSx4j5}6F|`J$ z`|&ijU{pbiP%bKwI&`6(DWy1=%_0Q?Q#m-i7}C zp;`G-VdJ2s zXsq5it21TLd;-lK)$-*biNPc{XsBWAbroXkEomX{i-2A#%C)RjYEb;S1IRBqfR7jJ zn(j`b`yPb{_`VJq%{rM@7~u+B1z|Gfuwd_St-}&e#e!I>qGHJit#0UiuR&~m zX^*JV%O5M8oE;$OrhS4k`{o0lh|pcJnL>{m$;1shgFfLjuiGW6&)kVpdPt~_WfQ!- z&zFjEtc5K3)AdYFxOS|gUPxRH!DwHPaq6vmD8B2>;9E*^mUfa6&mSY^`?Cqj&K1j! z5f#3i4O}NSriU8*+qO34TG8y^LW3P=Xrhf$oShHTQ-~5Rb2IF+FUodmdbdWMrd*lB z)SfYlLXzOO4;;K;5w&+LL!M!#<5M3#PVgyY?3U*?Lg#>JHRCbFFnJu{h-bnxv2c8(ntTeCcD>%JG zH@1fv1cx2jrclNSF%KT@h21KRq_XWL*popF;tyt`(J52-R=nawI#`rYQ;>EwRk+*0 zWI*p?Xt}?yYSroS&1C+M?fcqx1eKq$-zri}YBY)J`$RjV#suD{Tos$Vl|nFl|Axu) zY>7n+0uqp??G+%$UXUk@Cg-u3T9;PS~;fLnW%>tgC?M%NfQw!b(k>rW( z?uo$-6@JCv4GwZ~+<*{2O@?N*iI-FJVj;;CVQ{*_`*y_Vi`~k#Y~y(?@u=j&M+xZD zgftj}DxdxBWS`U2UDUX!01p)d{(R=j}DJ)y)C zht(!M~I3cBb?UeV!dRB<8`haUpc zWf|c>)M=-RVmqNCD=G&hA7~G5`F7BT;0PRry1a4r=WvZKMiPSk6zY1%vzNH$6dX5!)RXpZFnLcjND{96lfi^4Aff%za0Q9WN~#BTMnUSbxHu+at{to=4zmwb-n_g?!{>U8`2? zi^3%po(V%a5rCT2dmEIl=8?6K!LMbML!Vf(35sgfJQTNkOEvvepL7T>oAA~nPF9?K zE$HH=TIHdU)7Bt6Mfy#HzdBH(`2#p^jNxYx5w}zG9|}7WUhGHEa)_ZTk3Z|fhV>Wl zNizki35Ickdif;AD(HKkQfss2JRcs#WC;W6-UjWDk>Xi$?RdJv3uSqjh5-u&?P4tU zX6dZ3UAYk#uAzxxB3G=1*qO2=&wA+3zC#>7?Vh)w6y|THWVvP@eF?}ZC}Z!!7(nsI zgE@EWB7x4QX4ASMFR!rL-3ju+?dYnr6j|F3m zS)h#pkh_`&J6aJ3zk5?Ska-h4RPBm+i1Hbw*lIy6p1c{3N9b$P98p2gw|Jd%OLE-X z#l%95k|5HhVCtxtq_7tCG``kqO|-{>6bF~01X@XZj`SPvZpAZpcXJWAXy^q$xZ_5> z=1%WRuXd0G4^%D~MoC-B>onzjmKjRZ<_+ZX=zF4WE1MNFMbah243@DSMviDyRSCFL z5%>{u*n(t|n@sK~M8Q_-5^4WtQD5jB;vU26%5ocR;a(XBhyWLE(`RQZZsnxIxJaw7 z^^j9XxBicz3);84gk!~m(lf3EX!pzV!YcC4@_IhpQ)}@KoGg|JQE5EMkJg%Ome%AW z@>=yB7?%Z;ZID_txEUfJQ%-H%`tMbz@U_20$vcVFgIV}P9q)>f`D=nVh%JWS7Hvp) z%@+HXni1Wn+s==W-W@19lzo;xuym37I43Is_aS(JM_mn8O!17xMG&WWMpsj}pmTal zX{}yNVKnOs=st(nh_AB^okM$kF*-Z5^dOs)Uw^ZJ(zq%x=9V`=jwy>7;=FKnSL|!? zUbhixEl!N{!)>uT4VFs7Surx_Inhr{VL{*KE40b}w5#_karF{n3@b!TR_LXg_3Do<<}Mxqkr8(-S}s16&dy}ZfW&iYtS>iTx-V5ojw zw7w*N!>TLtdgv-ndCODRq1H}G*V!dy7E5l_(9~7g=KE-8hiUzDdxUz8#PvWbnN^jxSZOOdfmd^%G z3KE)@8)|;Za2^16vp?hphUe~>jj@%8YHIW`VTpSqYB&0r)3S!soqZSzEZ2T$ov7Om z#5b{Ki2Zp7Tla1lra<2cz9`Tqbo1B#Tn1rHL9D) z#Z6yp#kXRVLT-T&qYuA11{s5nLaZzmmh&8(7BX+CQ1SWogD}Blrcys2og)%!ei@tdj;Vy@%5_ql+C`lW6vsz)14*Fh-s5I}Ri)?iK^h;Z zH64zOjREygqf89uyZYqG;U!RomW7I?IX+EsXh^qGfG~qBqNw`nh>XN%$s+?vpct>hs zsS3s3nCWK$%k>@Vl6l5R{vhw@>f?tUin+LeQe8ahK}m1lGx%o+1PMYrFf!+4ny zpLtlaQI=$H=>d20eMb4UOypI!*gBjRs18Jx|b4)ysB@l%F@PhPu3cBVn;{iE}7R#*C~vkvUk zJtoV@g7fZ$Rcp$1isRVf?Di#RAy2akq((lOImC&UqOLQMUZn!YbbSIJndWf)KzTQ*&Yn*qJ&+Z4$MeY@tY_|gf9`?7Z zKm+bjw&dxABS-d!xZ0FdM=<10V061jT-#+i>0(Q^C6v!-qw#6Ce#|Jjk9mV|3@{w& zrG?CZX&wfA1*7OjL_K?7syV~bR5>Ny1rgzRg2u@|(7v7gUG*ZY>$K`x{@x7@4?-`1 z?h(QIsi-v`#Et@5h~nCGM&{5bK4 zok_hcp7}CY%*j%0JSEl8_25`NKN zr`}0y-HsSBAjz%O8kzoVS`oP+UR*)wZfBm$z+0lyGo24Qe+4V(J?#szj_(}CgQ%o^I8H(|z%k96LcXv>4i9}vJP+AO)~dnw!H^ETUjBuw@BYN>xEz{CF7DNCmOt;0s95_SZCE@E+;kX+H9@~wU%*k}z%DI-;IEqdo(mVgpmLTWf4 z8^&?-qL#VqM~$~8&9Ipi)`379ssmIGoA|_DLAX6d0R4$m&K%p@JI?9B>twx>$IjW4PcXN;31Y!wJodv}%Kfx*iL-ljK$ z1!rIt;<7nBGCHKa-FKg;FBxh=)yF2!Px-vTQL3WCmEVb`d=|^pSHb0m^;UibM-i~K z`Gv}jlCDy2`noxxQXADps_>^mCPP1dG$NUl5{!Y6H}*M&auvau?jFOe!2xbR*|@Y> zP)}r0f_5i9ARjn`j)G&Gcg&K{!A$!g>2&i>ZR~V)G~0WHNkgK$M+3wBnaBi5o~@dq ziD8tpNQ5BtRx-@-h+ggc;NsRpK?H;bOb1FesaUJ^lzNNwoJ^(BVE(Q~NleYbkH z*}&;uaZ@L6+aSIEuu~0Zo>UgXtvTq}{s-?SSG3feVv@bdOFPUXRWHfhI}UDompRF+ zqPp;fL?7Tm;U`wnggD*BY~K1uJzbvgZ9bk8Km6`Ph`S#h=gXp+z|j)3QLU@eH>B9_=0t}IV7 zgQiC#Dz7!EYK2Pme)d2z!Io$?1-pGZe38({VH)J5MDuIC?SrY8^clkeM-FYAf(%cL z>vR7=vu|v22Mf8M-*T_uU+(vWa_bO!NSF z)AWzqDu<(@3&VaH2FkCy)aA|1(A=q7epkj0s1VJTm|3Uct}{Kw$}0pa+dKAJ*SPcZH5erk|e&b(}CL`~k3!>xfUKuv?P!v>xPwHy%}o*V0Lc&8$jYNk%0 z>zXdZx+HTH5~=C_gc`QGit|%MO4E=nwN-kkYVO>NY#= zroH7Ip=j)kl1;ft%gSe)Hl$<0!9x^d`c%p?z;1&RDbxg$nT{U@xM?J6!k9xhhV3JW zLL7U0J&4WN%28S5Vjr3@To5h^@lE48IqRlc;k)U z7#$3iA<2|<$|NlvOJ;86oI!iANDrM$GSzpQao1uBKr5n=Oe&`hv4^=0)T|KuE3njy zge`poVhdSyN%B63W zt3$x(R!ByLO3pmaXTc>7e!%gO)Zw?5_Z?^Sf{;ypN+oVV4*a1 z8BKfm_KG)=edL3XPQJ5U$K?l~@j*wKwO>a?RxIWD9GDZ~vsQrCIw&`Rf@hGdYVi|S zPa__pUwU{g#D73W+(N=+qkV3(R}n2%k1LTXGVE>dZWHfMV-!TvvAUMWg8(g&22uUY zc68jOL9v+5m}ZuOFEc_^nRd59jcaFq{h3R7bkzRsjm4{Isu5cETz1{y3G?KR%!U!i z2cw$^?>&5nWnFDkw@K_0`OMWW93Pu=f%k71HBryI{Z`wn*})?5A(^+;)(Z}+K4e=q zJ`G|)Iq5X!_NR(YKrBI9kTTCVcgief_QszB_QvEkOIE-V!G*w{Hg1@VylPB9CC=mM9hLDK~xUg09;v0}FM zHTXniFW<>0@QtUE9Ni+KkD_q370Myr3mocqZLIxJ&m8AIzX;Uk%yiO}8{`#>GK zrL;g)XT#kRh{?~AL)?0iD1mM{rJCT2&a=-jl@SA8*O~FcS|}ANu{q{PA7^1DH@tM7 zNrmOMz8fTXjE@&j8nmy#R;074|dY&v9GZgE|tcP}(vqp9sfw8@;F(*4zG;x2-7_71^$a^r)96~iv z;&c_u($Cg1=My)IDcx{PX~1)e8xoExF|fDh)nuaEEi`TWesDNc8#p45(a**#5W#5D z63X5XryOfQ|Ub0P};38#0$x1*)KjXF>UV(FYB-4-mn&c{aKl z@odEB#$sw6!o+x%xN?33uYi6|6ntrlK1d1MT)g27xkNm{sq53zpg28N&}?_})@4XA zWY1%CC`8H`uA~eKg7edqQhEYD94755r#Q!y%UNy~$81X=%>zL4(?!(e8Ox?CSp4@K zNcw8FKtRc3it-hbmM`u@IU6R#PjNg3ir6Hv#=?z8?PWw8h ze z#Y}RVKv_qc%U-zkHeAbeLYXQ*d*&|dV#W>1r1*oYytSqf46oK5JD1E(^N!B<_!ayJ zB2kSdl30`2`385~ocd!hSx5brj~L0S44*ANDU6o^97&reM0@lNWSAqScP1zV%-~QR z9e4Wx%VPrGKR;*ErdasVD%>?TJn|Z=!77h#O6(F?&Y8?R_rjqt zD^j|^^6JWS#%P&yr5JOFJE3L4=x=4y3&U&J?_B8ESQh_u4=IUlZ0;_2guN+aXq?0h zR$(G-D@|fU##~l}{S?6T*mZJ^R0PbnpZfu}zI4n{oq{UnG=2J(z50^ehWO31IJt<4G8!J*4`CLhY*Uc(zl+QRE(rkOnCY!aHo z+bqbd;?gYkps`JWbae&({pIJAQ@kkGM%;@5jDY8TrdSX8e4#(3Ht?hWUqFePiGvUv62h4uy}+81*CqUlOsoIRT$$!Gw$!%I#ygr1+3x7 z3NX3ostdG^+;0x&m8^LH26oqA;tugHd{-?f>3#@w>-O##oRJF!(VaziJPoWVr^x1S zgUt{o;~6mpBrdV6lA01*+u-F%Ee058nFjU8nNVkFK^y0lJ(`=gfRDy&UPb zj|qd%Ya=A`_G+=t|FEbBv1f+GlB)CIJ-tkqVv#T_uPcypggP}`Q{8%YbxY%@Zc z!=jm*t=$MX5ogsj#~|wqm@~moQOo=>d@vl1(QD`f$(^x<-*mUOf49%N){R92g)HaE zXVJI$?lRGzE*FF>ph=Dbwu==Qy$lL+MedZ{5&p|Ig7Y8o|F75ry_r=QGxIm?gYTvk>usHYqbZ36(`^oNY zZMq35MyL(1Vi&jc!>rJ=(DzpT^9V|Gg!?sUg@r-Hkz3B}S>o=fcHT9f%U2Rh~~CUNZLyNiMO4-l2E)^6jCiF$JOKr%>i@TRMTZ*286JEW%*z@s3Xw$ri3+ z91ADq62tr<0{j~LUjHheZ~lu1-@9Q#P2mc&p1p)xw$K5SZO1|swA#kW;C&j$&=j$$ zPtj(aP*+i6kZtg8l1RMBTy8mi2sj?a)!pYbExtczYtWA3I1IfNKBMj{dk#MHW3hP@eaCwiIuu=v=%DlXCdP4i zIumJ)%Y^B~_1RU3F5=Ngw?l}KEc~;of2`y~jy^gudkV$(k1_4cqTBu1S67owTVzZt zdPR2k!xiU#DQa=os*P`AR|4+Ae2HBr$16!|hy*ADkh!STOBVFE$f&t<*+_Di{d%Jy zmLBG2Av&2kuEiI~+M1c?9EzApf)$9b{fO&8?HS9hzxpZ8=*#&oE-=@v7IM@K*Rg;U zI8&uB4(*YmYm!@%?~#O}+9|5E+$`s`IArK7-$cK;(s|uu4daBgC?P>WDF5dki}q3! zBqgNC2N07M2L1;J@ls}29w%kpO^7Uf!xq$A|5A{nG~kT>$=&}FD6ww{_OgP5;iA6i_uxl!rNm#8U9=j;*2a^i<` zhMXzRP(#LR3!#!yLd(S_dV^TDO23KOob`4i%qW5PBeg*9eaU&l8)YJGG%oU4D2i=> zFe!BFMk>b_^}f;YmR(IUl&&h$D7$bfjkzsq?=#s1mE|4Gh& zVPyYZ(tig%@E;`o6*K$qa{fC$E&m|rPYmt3ZZ&M+5Xv#UW6I^iMjo?Vtz6H6+HBcu==y*zSI)`XPqhdr75~|C*#2c>mX&~f0kwgEynXqzec68=* expectedContents; + +TestZipImpl::TestZipImpl(const char * documentName) : + zipFile(ZipFile(string(documentName))) +{ + expectedContents.push_back("mimetype"); + expectedContents.push_back("Configurations2/statusbar/"); + expectedContents.push_back("Configurations2/accelerator/current.xml"); + expectedContents.push_back("Configurations2/floater/"); + expectedContents.push_back("Configurations2/popupmenu/"); + expectedContents.push_back("Configurations2/progressbar/"); + expectedContents.push_back("Configurations2/toolpanel/"); + expectedContents.push_back("Configurations2/menubar/"); + expectedContents.push_back("Configurations2/toolbar/"); + expectedContents.push_back("Configurations2/images/Bitmaps/"); + expectedContents.push_back("content.xml"); + expectedContents.push_back("manifest.rdf"); + expectedContents.push_back("styles.xml"); + expectedContents.push_back("meta.xml"); + expectedContents.push_back("Thumbnails/thumbnail.png"); + expectedContents.push_back("settings.xml"); + expectedContents.push_back("META-INF/manifest.xml"); + sort(expectedContents.begin(), expectedContents.end()); +} + +TestZipImpl::~TestZipImpl() +{ +} + +bool TestZipImpl::test_directory() +{ + ZipFile::DirectoryPtr_t contents = zipFile.GetDirectory(); + vector &stringVector = *contents.get(); + sort(stringVector.begin(), stringVector.end()); + return expectedContents == expectedContents; +} + +bool TestZipImpl::test_hasContentCaseInSensitive() +{ + return zipFile.HasContent("mimetype"); +} + +bool TestZipImpl::test_getContent() +{ + ZipFile::ZipContentBuffer_t contentBuf; + zipFile.GetUncompressedContent("content.xml", contentBuf); + return !contentBuf.empty(); +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/qa/zip/testimpl/testzipimpl.hxx b/shell/qa/zip/testimpl/testzipimpl.hxx new file mode 100644 index 000000000000..584305cbe27b --- /dev/null +++ b/shell/qa/zip/testimpl/testzipimpl.hxx @@ -0,0 +1,45 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#include "internal/zipfile.hxx" +#include +#include +#include +#include "sal/types.h" +#if defined(DLLIMPLEMENTATION) + #define DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#else + #define DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#endif + +using namespace std; + +class DLLPUBLIC TestZipImpl +{ + private: + ZipFile zipFile; + public: + TestZipImpl(const char * documentName); + ~TestZipImpl(); + bool test_directory(); + bool test_hasContentCaseInSensitive(); + bool test_getContent(); +}; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/qa/zip/ziptest.cxx b/shell/qa/zip/ziptest.cxx new file mode 100644 index 000000000000..2a1ff25cdb53 --- /dev/null +++ b/shell/qa/zip/ziptest.cxx @@ -0,0 +1,76 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#include "cppunit/TestAssert.h" +#include "cppunit/TestFixture.h" +#include "cppunit/extensions/HelperMacros.h" +#include "cppunit/plugin/TestPlugIn.h" +#include +#include "testimpl/testzipimpl.hxx" +using namespace std; + +class Test : public CppUnit::TestFixture +{ +private: + string documentName; +public: + Test(); + void setUp() {} + void tearDown() {} + void test_directory(); + void test_hasContentCaseInSensitive(); + void test_getContent(); + CPPUNIT_TEST_SUITE(Test); + CPPUNIT_TEST(test_directory); + CPPUNIT_TEST(test_hasContentCaseInSensitive); + CPPUNIT_TEST(test_getContent); + CPPUNIT_TEST_SUITE_END(); +}; + +CPPUNIT_TEST_SUITE_REGISTRATION(Test); + +Test::Test() : + documentName("simpledocument.odt") +{ +} + +void Test::test_directory() +{ + TestZipImpl testImpl(documentName.c_str()); + bool isPassed = testImpl.test_directory(); + CPPUNIT_ASSERT_MESSAGE("Content does not match with expected directory names.", isPassed); +} + +void Test::test_hasContentCaseInSensitive() +{ + TestZipImpl testImpl(documentName.c_str()); + bool isPassed = testImpl.test_hasContentCaseInSensitive(); + CPPUNIT_ASSERT_MESSAGE("Content in zip file was not found.", isPassed); +} + +void Test::test_getContent() +{ + TestZipImpl testImpl(documentName.c_str()); + bool isPassed = testImpl.test_getContent(); + CPPUNIT_ASSERT_MESSAGE("Couldn't recieve content buffer form zipfile.", isPassed); +} + +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/all/xml_parser.cxx b/shell/source/all/xml_parser.cxx index 24a3ce961701..54e1cffa5f41 100644 --- a/shell/source/all/xml_parser.cxx +++ b/shell/source/all/xml_parser.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "internal/xml_parser.hxx" diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx index 8f05182c1b7f..76d6c8c76349 100644 --- a/shell/source/backends/desktopbe/desktopbackend.cxx +++ b/shell/source/backends/desktopbe/desktopbackend.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* -* -* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* -* Copyright 2000, 2010 Oracle and/or its affiliates. -* -* OpenOffice.org - a multi-platform office productivity suite -* -* This file is part of OpenOffice.org. -* -* OpenOffice.org is free software: you can redistribute it and/or modify -* it under the terms of the GNU Lesser General Public License version 3 -* only, as published by the Free Software Foundation. -* -* OpenOffice.org is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU Lesser General Public License version 3 for more details -* (a copy is included in the LICENSE file that accompanied this code). -* -* You should have received a copy of the GNU Lesser General Public License -* version 3 along with OpenOffice.org. If not, see -* -* for a copy of the LGPLv3 License. -* -************************************************************************/ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/shell/source/backends/desktopbe/desktopbe1.component b/shell/source/backends/desktopbe/desktopbe1.component index 9b1df73141db..cf98e44d020d 100644 --- a/shell/source/backends/desktopbe/desktopbe1.component +++ b/shell/source/backends/desktopbe/desktopbe1.component @@ -1,30 +1,21 @@ - + diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx index 5a49e964f3b0..ce5c71085f0d 100644 --- a/shell/source/backends/gconfbe/gconfaccess.cxx +++ b/shell/source/backends/gconfbe/gconfaccess.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* -* -* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* -* Copyright 2000, 2010 Oracle and/or its affiliates. -* -* OpenOffice.org - a multi-platform office productivity suite -* -* This file is part of OpenOffice.org. -* -* OpenOffice.org is free software: you can redistribute it and/or modify -* it under the terms of the GNU Lesser General Public License version 3 -* only, as published by the Free Software Foundation. -* -* OpenOffice.org is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU Lesser General Public License version 3 for more details -* (a copy is included in the LICENSE file that accompanied this code). -* -* You should have received a copy of the GNU Lesser General Public License -* version 3 along with OpenOffice.org. If not, see -* -* for a copy of the LGPLv3 License. -* -************************************************************************/ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/shell/source/backends/gconfbe/gconfaccess.hxx b/shell/source/backends/gconfbe/gconfaccess.hxx index d2e560c86c03..98ce947b2647 100644 --- a/shell/source/backends/gconfbe/gconfaccess.hxx +++ b/shell/source/backends/gconfbe/gconfaccess.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* -* -* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* -* Copyright 2000, 2010 Oracle and/or its affiliates. -* -* OpenOffice.org - a multi-platform office productivity suite -* -* This file is part of OpenOffice.org. -* -* OpenOffice.org is free software: you can redistribute it and/or modify -* it under the terms of the GNU Lesser General Public License version 3 -* only, as published by the Free Software Foundation. -* -* OpenOffice.org is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU Lesser General Public License version 3 for more details -* (a copy is included in the LICENSE file that accompanied this code). -* -* You should have received a copy of the GNU Lesser General Public License -* version 3 along with OpenOffice.org. If not, see -* -* for a copy of the LGPLv3 License. -* -************************************************************************/ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_SHELL_SOURCE_BACKENDS_GCONFBE_GCONFACCESS_HXX #define INCLUDED_SHELL_SOURCE_BACKENDS_GCONFBE_GCONFACCESS_HXX diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx b/shell/source/backends/gconfbe/gconfbackend.cxx index 263fa7de7454..c93a06329dc1 100644 --- a/shell/source/backends/gconfbe/gconfbackend.cxx +++ b/shell/source/backends/gconfbe/gconfbackend.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* -* -* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* -* Copyright 2000, 2010 Oracle and/or its affiliates. -* -* OpenOffice.org - a multi-platform office productivity suite -* -* This file is part of OpenOffice.org. -* -* OpenOffice.org is free software: you can redistribute it and/or modify -* it under the terms of the GNU Lesser General Public License version 3 -* only, as published by the Free Software Foundation. -* -* OpenOffice.org is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU Lesser General Public License version 3 for more details -* (a copy is included in the LICENSE file that accompanied this code). -* -* You should have received a copy of the GNU Lesser General Public License -* version 3 along with OpenOffice.org. If not, see -* -* for a copy of the LGPLv3 License. -* -************************************************************************/ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/shell/source/backends/gconfbe/gconfbe1.component b/shell/source/backends/gconfbe/gconfbe1.component index b48806c827fc..1c7b887a1f60 100644 --- a/shell/source/backends/gconfbe/gconfbe1.component +++ b/shell/source/backends/gconfbe/gconfbe1.component @@ -1,30 +1,21 @@ - + diff --git a/shell/source/backends/kde4be/kde4access.cxx b/shell/source/backends/kde4be/kde4access.cxx index e4e116456efc..62d1669de27f 100644 --- a/shell/source/backends/kde4be/kde4access.cxx +++ b/shell/source/backends/kde4be/kde4access.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* -* -* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* -* Copyright 2000, 2010 Oracle and/or its affiliates. -* -* OpenOffice.org - a multi-platform office productivity suite -* -* This file is part of OpenOffice.org. -* -* OpenOffice.org is free software: you can redistribute it and/or modify -* it under the terms of the GNU Lesser General Public License version 3 -* only, as published by the Free Software Foundation. -* -* OpenOffice.org is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU Lesser General Public License version 3 for more details -* (a copy is included in the LICENSE file that accompanied this code). -* -* You should have received a copy of the GNU Lesser General Public License -* version 3 along with OpenOffice.org. If not, see -* -* for a copy of the LGPLv3 License. -* -************************************************************************/ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/shell/source/backends/kde4be/kde4backend.cxx b/shell/source/backends/kde4be/kde4backend.cxx index 314cd5aa7144..c453864cca1c 100644 --- a/shell/source/backends/kde4be/kde4backend.cxx +++ b/shell/source/backends/kde4be/kde4backend.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* -* -* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* -* Copyright 2000, 2010 Oracle and/or its affiliates. -* -* OpenOffice.org - a multi-platform office productivity suite -* -* This file is part of OpenOffice.org. -* -* OpenOffice.org is free software: you can redistribute it and/or modify -* it under the terms of the GNU Lesser General Public License version 3 -* only, as published by the Free Software Foundation. -* -* OpenOffice.org is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU Lesser General Public License version 3 for more details -* (a copy is included in the LICENSE file that accompanied this code). -* -* You should have received a copy of the GNU Lesser General Public License -* version 3 along with OpenOffice.org. If not, see -* -* for a copy of the LGPLv3 License. -* -************************************************************************/ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/shell/source/backends/kde4be/kde4be1.component b/shell/source/backends/kde4be/kde4be1.component index 9bceccc62ca6..aaa70f9baf45 100644 --- a/shell/source/backends/kde4be/kde4be1.component +++ b/shell/source/backends/kde4be/kde4be1.component @@ -1,30 +1,21 @@ - + diff --git a/shell/source/backends/kdebe/kdeaccess.cxx b/shell/source/backends/kdebe/kdeaccess.cxx index ed9df8fa417e..ccc98a7c5a21 100644 --- a/shell/source/backends/kdebe/kdeaccess.cxx +++ b/shell/source/backends/kdebe/kdeaccess.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* -* -* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* -* Copyright 2000, 2010 Oracle and/or its affiliates. -* -* OpenOffice.org - a multi-platform office productivity suite -* -* This file is part of OpenOffice.org. -* -* OpenOffice.org is free software: you can redistribute it and/or modify -* it under the terms of the GNU Lesser General Public License version 3 -* only, as published by the Free Software Foundation. -* -* OpenOffice.org is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU Lesser General Public License version 3 for more details -* (a copy is included in the LICENSE file that accompanied this code). -* -* You should have received a copy of the GNU Lesser General Public License -* version 3 along with OpenOffice.org. If not, see -* -* for a copy of the LGPLv3 License. -* -************************************************************************/ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/shell/source/backends/kdebe/kdebackend.cxx b/shell/source/backends/kdebe/kdebackend.cxx index ad82efcc2c4f..9efe8dbbf16f 100644 --- a/shell/source/backends/kdebe/kdebackend.cxx +++ b/shell/source/backends/kdebe/kdebackend.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* -* -* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* -* Copyright 2000, 2010 Oracle and/or its affiliates. -* -* OpenOffice.org - a multi-platform office productivity suite -* -* This file is part of OpenOffice.org. -* -* OpenOffice.org is free software: you can redistribute it and/or modify -* it under the terms of the GNU Lesser General Public License version 3 -* only, as published by the Free Software Foundation. -* -* OpenOffice.org is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU Lesser General Public License version 3 for more details -* (a copy is included in the LICENSE file that accompanied this code). -* -* You should have received a copy of the GNU Lesser General Public License -* version 3 along with OpenOffice.org. If not, see -* -* for a copy of the LGPLv3 License. -* -************************************************************************/ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/shell/source/backends/kdebe/kdebe1.component b/shell/source/backends/kdebe/kdebe1.component index 7e70f656f254..acaf8bdf7da1 100644 --- a/shell/source/backends/kdebe/kdebe1.component +++ b/shell/source/backends/kdebe/kdebe1.component @@ -1,30 +1,21 @@ - + diff --git a/shell/source/backends/kdebe/tdebe1.component b/shell/source/backends/kdebe/tdebe1.component index 55a3776898a4..2a7c54cf4240 100644 --- a/shell/source/backends/kdebe/tdebe1.component +++ b/shell/source/backends/kdebe/tdebe1.component @@ -1,30 +1,21 @@ - + diff --git a/shell/source/backends/localebe/localebackend.cxx b/shell/source/backends/localebe/localebackend.cxx index 3885a8bea88d..544cb42d4cf1 100644 --- a/shell/source/backends/localebe/localebackend.cxx +++ b/shell/source/backends/localebe/localebackend.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "localebackend.hxx" diff --git a/shell/source/backends/localebe/localebe1.component b/shell/source/backends/localebe/localebe1.component index 83913822a022..69dee24600e5 100644 --- a/shell/source/backends/localebe/localebe1.component +++ b/shell/source/backends/localebe/localebe1.component @@ -1,30 +1,21 @@ - + diff --git a/shell/source/backends/localebe/localebecdef.cxx b/shell/source/backends/localebe/localebecdef.cxx index b10d7919d811..4eaf340a10ea 100644 --- a/shell/source/backends/localebe/localebecdef.cxx +++ b/shell/source/backends/localebe/localebecdef.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/shell/source/backends/macbe/macbackend.mm b/shell/source/backends/macbe/macbackend.mm index d70cc4bdd2e1..e57013e5297c 100644 --- a/shell/source/backends/macbe/macbackend.mm +++ b/shell/source/backends/macbe/macbackend.mm @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ // For MAXHOSTNAMELEN constant diff --git a/shell/source/backends/macbe/macbe1.component b/shell/source/backends/macbe/macbe1.component index c76036126733..d91578f249e2 100644 --- a/shell/source/backends/macbe/macbe1.component +++ b/shell/source/backends/macbe/macbe1.component @@ -1,30 +1,21 @@ - + diff --git a/shell/source/backends/macbe/macbecdef.cxx b/shell/source/backends/macbe/macbecdef.cxx index cd1f702aec98..0e7ba99a2ab4 100644 --- a/shell/source/backends/macbe/macbecdef.cxx +++ b/shell/source/backends/macbe/macbecdef.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "macbackend.hxx" diff --git a/shell/source/backends/wininetbe/wininetbackend.cxx b/shell/source/backends/wininetbe/wininetbackend.cxx index 06855b5302ce..339940009286 100644 --- a/shell/source/backends/wininetbe/wininetbackend.cxx +++ b/shell/source/backends/wininetbe/wininetbackend.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "rtl/ustrbuf.hxx" diff --git a/shell/source/backends/wininetbe/wininetbe1.component b/shell/source/backends/wininetbe/wininetbe1.component index a6655ce680f5..221fc0ab9a71 100644 --- a/shell/source/backends/wininetbe/wininetbe1.component +++ b/shell/source/backends/wininetbe/wininetbe1.component @@ -1,30 +1,21 @@ - + diff --git a/shell/source/backends/wininetbe/wininetbecdef.cxx b/shell/source/backends/wininetbe/wininetbecdef.cxx index 8b47da586e1f..bff57de1c2b3 100644 --- a/shell/source/backends/wininetbe/wininetbecdef.cxx +++ b/shell/source/backends/wininetbe/wininetbecdef.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/shell/source/cmdmail/cmdmail.component b/shell/source/cmdmail/cmdmail.component index 7b2761d6cfb1..3872a65204ba 100644 --- a/shell/source/cmdmail/cmdmail.component +++ b/shell/source/cmdmail/cmdmail.component @@ -1,30 +1,21 @@ - + diff --git a/shell/source/cmdmail/cmdmailentry.cxx b/shell/source/cmdmail/cmdmailentry.cxx index 3dbb894bd033..a0de1f3a2ef1 100644 --- a/shell/source/cmdmail/cmdmailentry.cxx +++ b/shell/source/cmdmail/cmdmailentry.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/shell/source/cmdmail/cmdmailmsg.cxx b/shell/source/cmdmail/cmdmailmsg.cxx index 021ebbcca6d6..bf0c3f49466b 100644 --- a/shell/source/cmdmail/cmdmailmsg.cxx +++ b/shell/source/cmdmail/cmdmailmsg.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include "cmdmailmsg.hxx" diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx index f1deab7cb6f9..5c0a5bb4c032 100644 --- a/shell/source/cmdmail/cmdmailsuppl.cxx +++ b/shell/source/cmdmail/cmdmailsuppl.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/shell/source/tools/lngconvex/cmdline.cxx b/shell/source/tools/lngconvex/cmdline.cxx index 716999d0e49a..770f49fa5e37 100644 --- a/shell/source/tools/lngconvex/cmdline.cxx +++ b/shell/source/tools/lngconvex/cmdline.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/shell/source/tools/lngconvex/cmdline.hxx b/shell/source/tools/lngconvex/cmdline.hxx index 29c16c67e0a3..2edb4bf5990f 100644 --- a/shell/source/tools/lngconvex/cmdline.hxx +++ b/shell/source/tools/lngconvex/cmdline.hxx @@ -1,4 +1,22 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + #ifndef _CMDLINE_HXX_ #define _CMDLINE_HXX_ diff --git a/shell/source/tools/lngconvex/lngconvex.cxx b/shell/source/tools/lngconvex/lngconvex.cxx index dce42abc2317..473bf6999abf 100644 --- a/shell/source/tools/lngconvex/lngconvex.cxx +++ b/shell/source/tools/lngconvex/lngconvex.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifdef AIX # undef _THREAD_SAFE diff --git a/shell/source/tools/regsvrex/regsvrex.cxx b/shell/source/tools/regsvrex/regsvrex.cxx index e27d8bda7a91..fb26bfd96d96 100644 --- a/shell/source/tools/regsvrex/regsvrex.cxx +++ b/shell/source/tools/regsvrex/regsvrex.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #if defined _MSC_VER diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx index 2fc52001cb6b..a3efe312dc92 100644 --- a/shell/source/unix/exec/shellexec.cxx +++ b/shell/source/unix/exec/shellexec.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/shell/source/unix/exec/shellexecentry.cxx b/shell/source/unix/exec/shellexecentry.cxx index 997de2132d30..96f8e526bd28 100644 --- a/shell/source/unix/exec/shellexecentry.cxx +++ b/shell/source/unix/exec/shellexecentry.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/shell/source/unix/exec/syssh.component b/shell/source/unix/exec/syssh.component index d7e76945c0d3..4e9a000bde44 100644 --- a/shell/source/unix/exec/syssh.component +++ b/shell/source/unix/exec/syssh.component @@ -1,30 +1,21 @@ - + diff --git a/shell/source/unix/misc/cde-open-url.sh b/shell/source/unix/misc/cde-open-url.sh old mode 100755 new mode 100644 index c0c38145d6ee..baa74dfa0821 --- a/shell/source/unix/misc/cde-open-url.sh +++ b/shell/source/unix/misc/cde-open-url.sh @@ -1,4 +1,21 @@ #!/bin/sh +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# This file incorporates work covered by the following license notice: +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . +# if [ -x /usr/bin/mktemp ] then diff --git a/shell/source/unix/misc/gnome-open-url.c b/shell/source/unix/misc/gnome-open-url.c index ec47c2ab4cd4..cd275cd3b89e 100644 --- a/shell/source/unix/misc/gnome-open-url.c +++ b/shell/source/unix/misc/gnome-open-url.c @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/shell/source/unix/misc/kde-open-url.sh b/shell/source/unix/misc/kde-open-url.sh old mode 100755 new mode 100644 index fa05bdecbda4..43ab738cf343 --- a/shell/source/unix/misc/kde-open-url.sh +++ b/shell/source/unix/misc/kde-open-url.sh @@ -1,4 +1,21 @@ #!/bin/sh +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# This file incorporates work covered by the following license notice: +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . +# # special handling for mailto: uris if echo $1 | grep '^mailto:' > /dev/null; then diff --git a/shell/source/unix/misc/open-url.sh b/shell/source/unix/misc/open-url.sh index c9007d8d17c0..ff923751ea0f 100755 --- a/shell/source/unix/misc/open-url.sh +++ b/shell/source/unix/misc/open-url.sh @@ -1,4 +1,21 @@ #!/bin/sh +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# This file incorporates work covered by the following license notice: +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . +# # tries to locate the executable specified # as first parameter in the user's path. diff --git a/shell/source/unix/misc/senddoc.sh b/shell/source/unix/misc/senddoc.sh old mode 100755 new mode 100644 index 2a4c4142f9a7..5a755d7042c5 --- a/shell/source/unix/misc/senddoc.sh +++ b/shell/source/unix/misc/senddoc.sh @@ -1,4 +1,22 @@ #!/bin/sh +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# This file incorporates work covered by the following license notice: +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . +# + URI_ENCODE="`dirname $0`/uri-encode" FOPTS="" sd_platform=`uname -s` diff --git a/shell/source/unix/misc/tde-open-url.sh b/shell/source/unix/misc/tde-open-url.sh index fa05bdecbda4..43ab738cf343 100644 --- a/shell/source/unix/misc/tde-open-url.sh +++ b/shell/source/unix/misc/tde-open-url.sh @@ -1,4 +1,21 @@ #!/bin/sh +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# This file incorporates work covered by the following license notice: +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . +# # special handling for mailto: uris if echo $1 | grep '^mailto:' > /dev/null; then diff --git a/shell/source/unix/sysshell/recently_used_file.cxx b/shell/source/unix/sysshell/recently_used_file.cxx index 30cfca699ec1..f0430e52a5c9 100644 --- a/shell/source/unix/sysshell/recently_used_file.cxx +++ b/shell/source/unix/sysshell/recently_used_file.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "recently_used_file.hxx" #include diff --git a/shell/source/unix/sysshell/recently_used_file_handler.cxx b/shell/source/unix/sysshell/recently_used_file_handler.cxx index fd8213bad65e..4387e60142dc 100644 --- a/shell/source/unix/sysshell/recently_used_file_handler.cxx +++ b/shell/source/unix/sysshell/recently_used_file_handler.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "osl/process.h" diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx index 81f19546a09a..efc720fcb65a 100644 --- a/shell/source/win32/SysShExec.cxx +++ b/shell/source/win32/SysShExec.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include "SysShExec.hxx" diff --git a/shell/source/win32/SysShExec.hxx b/shell/source/win32/SysShExec.hxx index c6571d3dc26a..01941cc2b215 100644 --- a/shell/source/win32/SysShExec.hxx +++ b/shell/source/win32/SysShExec.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SYSSHEXEC_HXX_ #define _SYSSHEXEC_HXX_ diff --git a/shell/source/win32/SysShentry.cxx b/shell/source/win32/SysShentry.cxx index 93a4533a9f15..d37d83013eaf 100644 --- a/shell/source/win32/SysShentry.cxx +++ b/shell/source/win32/SysShentry.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/shell/source/win32/ooofilereader/autostyletag.cxx b/shell/source/win32/ooofilereader/autostyletag.cxx index 693c1d5521c8..d6c3c149b40e 100644 --- a/shell/source/win32/ooofilereader/autostyletag.cxx +++ b/shell/source/win32/ooofilereader/autostyletag.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "autostyletag.hxx" diff --git a/shell/source/win32/ooofilereader/autostyletag.hxx b/shell/source/win32/ooofilereader/autostyletag.hxx index c392b53bb0cb..c426d5c790e3 100644 --- a/shell/source/win32/ooofilereader/autostyletag.hxx +++ b/shell/source/win32/ooofilereader/autostyletag.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef AUTOSTYLETAG_HXX_INCLUDED diff --git a/shell/source/win32/ooofilereader/basereader.cxx b/shell/source/win32/ooofilereader/basereader.cxx index 754d37e87e0b..74866b631172 100644 --- a/shell/source/win32/ooofilereader/basereader.cxx +++ b/shell/source/win32/ooofilereader/basereader.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #undef OSL_DEBUG_LEVEL diff --git a/shell/source/win32/ooofilereader/contentreader.cxx b/shell/source/win32/ooofilereader/contentreader.cxx index 76cfc6cd3baa..8190f66d4fe3 100644 --- a/shell/source/win32/ooofilereader/contentreader.cxx +++ b/shell/source/win32/ooofilereader/contentreader.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #undef OSL_DEBUG_LEVEL diff --git a/shell/source/win32/ooofilereader/dummytag.hxx b/shell/source/win32/ooofilereader/dummytag.hxx index b7007f5acf7c..370697b48e45 100644 --- a/shell/source/win32/ooofilereader/dummytag.hxx +++ b/shell/source/win32/ooofilereader/dummytag.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef DUMMYTAG_HXX_INCLUDED diff --git a/shell/source/win32/ooofilereader/itag.hxx b/shell/source/win32/ooofilereader/itag.hxx index c4a7eeacf8f5..6953fc60f453 100644 --- a/shell/source/win32/ooofilereader/itag.hxx +++ b/shell/source/win32/ooofilereader/itag.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef ITAG_HXX_INCLUDED diff --git a/shell/source/win32/ooofilereader/keywordstag.cxx b/shell/source/win32/ooofilereader/keywordstag.cxx index d4b22165bb4e..4abb5af921b3 100644 --- a/shell/source/win32/ooofilereader/keywordstag.cxx +++ b/shell/source/win32/ooofilereader/keywordstag.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "keywordstag.hxx" diff --git a/shell/source/win32/ooofilereader/keywordstag.hxx b/shell/source/win32/ooofilereader/keywordstag.hxx index 9a761acf8072..43ba828dad30 100644 --- a/shell/source/win32/ooofilereader/keywordstag.hxx +++ b/shell/source/win32/ooofilereader/keywordstag.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef KEYWORDSTAG_HXX_INCLUDED diff --git a/shell/source/win32/ooofilereader/metainforeader.cxx b/shell/source/win32/ooofilereader/metainforeader.cxx index 4027b65cb150..75bca87c71e7 100644 --- a/shell/source/win32/ooofilereader/metainforeader.cxx +++ b/shell/source/win32/ooofilereader/metainforeader.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #undef OSL_DEBUG_LEVEL diff --git a/shell/source/win32/ooofilereader/simpletag.cxx b/shell/source/win32/ooofilereader/simpletag.cxx index da952c117657..717437bfdb11 100644 --- a/shell/source/win32/ooofilereader/simpletag.cxx +++ b/shell/source/win32/ooofilereader/simpletag.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "simpletag.hxx" diff --git a/shell/source/win32/ooofilereader/simpletag.hxx b/shell/source/win32/ooofilereader/simpletag.hxx index fb4b5d8399ce..01c3b7181ac6 100644 --- a/shell/source/win32/ooofilereader/simpletag.hxx +++ b/shell/source/win32/ooofilereader/simpletag.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef SIMPLETAG_HXX_INCLUDED diff --git a/shell/source/win32/shlxthandler/classfactory.cxx b/shell/source/win32/shlxthandler/classfactory.cxx index c49933a208a2..018333b154ed 100644 --- a/shell/source/win32/shlxthandler/classfactory.cxx +++ b/shell/source/win32/shlxthandler/classfactory.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #undef OSL_DEBUG_LEVEL diff --git a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx index b37d19adc460..43c5a3fe8ddf 100644 --- a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx +++ b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "internal/global.hxx" #include "internal/columninfo.hxx" diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx index 83df85f3981c..c5a57f11eef7 100644 --- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx +++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ //-------------------------------------------------------------------------- diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx index 927f6ccff2d2..94df159c5251 100644 --- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx +++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "internal/types.hxx" diff --git a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx index 1ce8dfb6e503..4f78900d9dac 100644 --- a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx +++ b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2010 by Sun Microsystems, Inc. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #if defined _MSC_VER diff --git a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx index 009786794ee8..a961c9da777a 100644 --- a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx +++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2010 by Sun Microsystems, Inc. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #undef OSL_DEBUG_LEVEL diff --git a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx index 0f1889a1f35d..c162f7755e7b 100644 --- a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx +++ b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifdef _MSC_VER diff --git a/shell/source/win32/shlxthandler/res/rctmpl.txt b/shell/source/win32/shlxthandler/res/rctmpl.txt index a512c69dd9d7..c48d7f61f568 100644 --- a/shell/source/win32/shlxthandler/res/rctmpl.txt +++ b/shell/source/win32/shlxthandler/res/rctmpl.txt @@ -1,3 +1,20 @@ +// +// This file is part of the LibreOffice project. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at http://mozilla.org/MPL/2.0/. +// +// This file incorporates work covered by the following license notice: +// +// Licensed to the Apache Software Foundation (ASF) under one or more +// contributor license agreements. See the NOTICE file distributed +// with this work for additional information regarding copyright +// ownership. The ASF licenses this file to you under the Apache +// License, Version 2.0 (the "License"); you may not use this file +// except in compliance with the License. You may obtain a copy of +// the License at http://www.apache.org/licenses/LICENSE-2.0 . +// // Dialog diff --git a/shell/source/win32/shlxthandler/res/shlxthdl.ulf b/shell/source/win32/shlxthandler/res/shlxthdl.ulf index c0e879724e5d..75c54163e18b 100644 --- a/shell/source/win32/shlxthandler/res/shlxthdl.ulf +++ b/shell/source/win32/shlxthandler/res/shlxthdl.ulf @@ -1,4 +1,22 @@ -[%TITLE%] +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +[%TITLE%] en-US = "Title" [%TITLE_COLON%] diff --git a/shell/source/win32/shlxthandler/shlxthdl.cxx b/shell/source/win32/shlxthandler/shlxthdl.cxx index b4e1d2197b31..03f07afe9bf9 100644 --- a/shell/source/win32/shlxthandler/shlxthdl.cxx +++ b/shell/source/win32/shlxthandler/shlxthdl.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "internal/config.hxx" #include "internal/global.hxx" diff --git a/shell/source/win32/shlxthandler/util/fileextensions.cxx b/shell/source/win32/shlxthandler/util/fileextensions.cxx index 2b4abfca9c7e..3e12e040cce5 100644 --- a/shell/source/win32/shlxthandler/util/fileextensions.cxx +++ b/shell/source/win32/shlxthandler/util/fileextensions.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "algorithm" #include "internal/fileextensions.hxx" diff --git a/shell/source/win32/shlxthandler/util/iso8601_converter.cxx b/shell/source/win32/shlxthandler/util/iso8601_converter.cxx index 4ab060c87436..bcf089d28abd 100644 --- a/shell/source/win32/shlxthandler/util/iso8601_converter.cxx +++ b/shell/source/win32/shlxthandler/util/iso8601_converter.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/shell/source/win32/shlxthandler/util/registry.cxx b/shell/source/win32/shlxthandler/util/registry.cxx index 06f824015e7c..69a69526836c 100644 --- a/shell/source/win32/shlxthandler/util/registry.cxx +++ b/shell/source/win32/shlxthandler/util/registry.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #if defined _MSC_VER diff --git a/shell/source/win32/shlxthandler/util/utilities.cxx b/shell/source/win32/shlxthandler/util/utilities.cxx index f42686976b8c..a92a69cce8aa 100644 --- a/shell/source/win32/shlxthandler/util/utilities.cxx +++ b/shell/source/win32/shlxthandler/util/utilities.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #undef OSL_DEBUG_LEVEL @@ -155,6 +146,22 @@ std::wstring getShortPathName( const std::wstring& aLongName ) } +/** convert LocaleSet pair into Microsoft List of Locale ID (LCID) + according to ISO-639 and ISO-3166. + http://etext.lib.virginia.edu/tei/iso639.html + http://nl.ijs.si/gnusl/cee/std/ISO_3166.html + @param + Locale, LocaleSet + @returns + Windows Locale Identifier corresponding to input LocaleSet. + @Usage Sample + LocaleSet_t myDefaultLocale( ::std::wstring( L"zh" ),::std::wstring(L"HK") ); + DWORD myLCID = LocaleSetToLCID( myDefaultLocale ); + wchar_t buffer[20]; + _ultow( myLCID, buffer, 16 ); + MessageBox( NULL, buffer,L"the LCID is:",MB_OK ); +*/ + LCID LocaleSetToLCID( const LocaleSet_t & Locale ) { if ( EMPTY_LOCALE == Locale ) diff --git a/shell/source/win32/simplemail/senddoc.cxx b/shell/source/win32/simplemail/senddoc.cxx index 867dc54638c6..5a27c849012b 100644 --- a/shell/source/win32/simplemail/senddoc.cxx +++ b/shell/source/win32/simplemail/senddoc.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/shell/source/win32/simplemail/smplmail.component b/shell/source/win32/simplemail/smplmail.component index c0a2bcb84e76..2b3d5c0cae49 100644 --- a/shell/source/win32/simplemail/smplmail.component +++ b/shell/source/win32/simplemail/smplmail.component @@ -1,30 +1,21 @@ - + diff --git a/shell/source/win32/simplemail/smplmailclient.cxx b/shell/source/win32/simplemail/smplmailclient.cxx index 322a31ff5aaa..55445ad32f7a 100644 --- a/shell/source/win32/simplemail/smplmailclient.cxx +++ b/shell/source/win32/simplemail/smplmailclient.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/shell/source/win32/simplemail/smplmailentry.cxx b/shell/source/win32/simplemail/smplmailentry.cxx index 9b6228bea516..6fa91c379b21 100644 --- a/shell/source/win32/simplemail/smplmailentry.cxx +++ b/shell/source/win32/simplemail/smplmailentry.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/shell/source/win32/simplemail/smplmailmsg.hxx b/shell/source/win32/simplemail/smplmailmsg.hxx index c385467b7aaa..addaab07adff 100644 --- a/shell/source/win32/simplemail/smplmailmsg.hxx +++ b/shell/source/win32/simplemail/smplmailmsg.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SMPLMAILMSG_HXX_ #define _SMPLMAILMSG_HXX_ diff --git a/shell/source/win32/simplemail/smplmailsuppl.cxx b/shell/source/win32/simplemail/smplmailsuppl.cxx index bf03301f184f..3dc241a911be 100644 --- a/shell/source/win32/simplemail/smplmailsuppl.cxx +++ b/shell/source/win32/simplemail/smplmailsuppl.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include "smplmailsuppl.hxx" diff --git a/shell/source/win32/syssh.component b/shell/source/win32/syssh.component index 78da5c2cae17..d949f3ff9937 100644 --- a/shell/source/win32/syssh.component +++ b/shell/source/win32/syssh.component @@ -1,30 +1,21 @@ - + diff --git a/shell/source/win32/workbench/TestProxySet.cxx b/shell/source/win32/workbench/TestProxySet.cxx index 77eac7d982e6..8d472c0c8e5c 100644 --- a/shell/source/win32/workbench/TestProxySet.cxx +++ b/shell/source/win32/workbench/TestProxySet.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/shell/source/win32/workbench/TestSmplMail.cxx b/shell/source/win32/workbench/TestSmplMail.cxx index b59563ddf2be..06bec1a86249 100644 --- a/shell/source/win32/workbench/TestSmplMail.cxx +++ b/shell/source/win32/workbench/TestSmplMail.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/shell/source/win32/workbench/TestSysShExec.cxx b/shell/source/win32/workbench/TestSysShExec.cxx index 99d08e0188ee..415826053ec5 100644 --- a/shell/source/win32/workbench/TestSysShExec.cxx +++ b/shell/source/win32/workbench/TestSysShExec.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/shell/source/win32/zipfile/zipexcptn.cxx b/shell/source/win32/zipfile/zipexcptn.cxx index 101ea2b5c8f4..0f8e7fedcde9 100644 --- a/shell/source/win32/zipfile/zipexcptn.cxx +++ b/shell/source/win32/zipfile/zipexcptn.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "internal/global.hxx" #include "zipexcptn.hxx" diff --git a/shell/source/win32/zipfile/zipexcptn.hxx b/shell/source/win32/zipfile/zipexcptn.hxx index 0b635448f482..73996c7a8f32 100644 --- a/shell/source/win32/zipfile/zipexcptn.hxx +++ b/shell/source/win32/zipfile/zipexcptn.hxx @@ -1,4 +1,22 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + // ZipException.h: interface for the ZipException class. #ifndef ZIPEXCPTN_HXX_INCLUDED diff --git a/shell/source/win32/zipfile/zipfile.cxx b/shell/source/win32/zipfile/zipfile.cxx index 70a20f765038..fb7dc88fc122 100644 --- a/shell/source/win32/zipfile/zipfile.cxx +++ b/shell/source/win32/zipfile/zipfile.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "zipexcptn.hxx" #include "internal/zipfile.hxx" diff --git a/toolkit/JunitTest_toolkit_unoapi.mk b/toolkit/JunitTest_toolkit_unoapi.mk index 54b36e9ac554..f178e868aa69 100644 --- a/toolkit/JunitTest_toolkit_unoapi.mk +++ b/toolkit/JunitTest_toolkit_unoapi.mk @@ -1,30 +1,21 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -#************************************************************************* # -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2011 Oracle and/or its affiliates. +# This file is part of the LibreOffice project. # -# OpenOffice.org - a multi-platform office productivity suite +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# This file is part of OpenOffice.org. +# This file incorporates work covered by the following license notice: # -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . # -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* $(eval $(call gb_JunitTest_JunitTest,toolkit_unoapi)) diff --git a/toolkit/Module_toolkit.mk b/toolkit/Module_toolkit.mk index dc83aad16f2d..7fba5fd7e5ac 100644 --- a/toolkit/Module_toolkit.mk +++ b/toolkit/Module_toolkit.mk @@ -1,30 +1,21 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -#************************************************************************* # -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2011 Oracle and/or its affiliates. +# This file is part of the LibreOffice project. # -# OpenOffice.org - a multi-platform office productivity suite +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# This file is part of OpenOffice.org. +# This file incorporates work covered by the following license notice: # -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . # -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* $(eval $(call gb_Module_Module,toolkit)) @@ -34,9 +25,11 @@ $(eval $(call gb_Module_add_targets,toolkit,\ Package_inc \ )) +ifneq ($(OOO_JUNIT_JAR),) $(eval $(call gb_Module_add_subsequentcheck_targets,toolkit,\ JunitTest_toolkit_complex \ JunitTest_toolkit_unoapi \ )) +endif # vim: set noet sw=4 ts=4: diff --git a/toolkit/Package_inc.mk b/toolkit/Package_inc.mk index 0e60190218dd..2bd4246d9d58 100644 --- a/toolkit/Package_inc.mk +++ b/toolkit/Package_inc.mk @@ -1,30 +1,21 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -#************************************************************************* # -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2011 Oracle and/or its affiliates. +# This file is part of the LibreOffice project. # -# OpenOffice.org - a multi-platform office productivity suite +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# This file is part of OpenOffice.org. +# This file incorporates work covered by the following license notice: # -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . # -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* $(eval $(call gb_Package_Package,toolkit_inc,$(SRCDIR)/toolkit/inc)) $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxaccessiblecomponent.hxx,toolkit/awt/vclxaccessiblecomponent.hxx)) diff --git a/toolkit/inc/toolkit/awt/scrollabledialog.hxx b/toolkit/inc/toolkit/awt/scrollabledialog.hxx index 1eaf0e7ec570..29651938806f 100644 --- a/toolkit/inc/toolkit/awt/scrollabledialog.hxx +++ b/toolkit/inc/toolkit/awt/scrollabledialog.hxx @@ -1,30 +1,22 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + #ifndef TOOLKIT_AWT_SCROLLABLEDIALOG_HXX #define TOOLKIT_AWT_SCROLLABLEDIALOG_HXX diff --git a/toolkit/inc/toolkit/awt/vclxdevice.hxx b/toolkit/inc/toolkit/awt/vclxdevice.hxx index a817c59cbd39..eb48f97d9ba6 100644 --- a/toolkit/inc/toolkit/awt/vclxdevice.hxx +++ b/toolkit/inc/toolkit/awt/vclxdevice.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _TOOLKIT_AWT_VCLXDEVICE_HXX_ #define _TOOLKIT_AWT_VCLXDEVICE_HXX_ diff --git a/toolkit/inc/toolkit/awt/vclxgraphics.hxx b/toolkit/inc/toolkit/awt/vclxgraphics.hxx index a63723d6915c..2db78ef9f624 100644 --- a/toolkit/inc/toolkit/awt/vclxgraphics.hxx +++ b/toolkit/inc/toolkit/awt/vclxgraphics.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _TOOLKIT_AWT_VCLXGRAPHICS_HXX_ #define _TOOLKIT_AWT_VCLXGRAPHICS_HXX_ diff --git a/toolkit/inc/toolkit/awt/vclxmenu.hxx b/toolkit/inc/toolkit/awt/vclxmenu.hxx index 74bdeeefa4d3..361ba46b72d7 100644 --- a/toolkit/inc/toolkit/awt/vclxmenu.hxx +++ b/toolkit/inc/toolkit/awt/vclxmenu.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _TOOLKIT_AWT_VCLXMENU_HXX_ #define _TOOLKIT_AWT_VCLXMENU_HXX_ diff --git a/toolkit/inc/toolkit/awt/vclxtabpagecontainer.hxx b/toolkit/inc/toolkit/awt/vclxtabpagecontainer.hxx index 3ef370dd1377..37438abbd235 100644 --- a/toolkit/inc/toolkit/awt/vclxtabpagecontainer.hxx +++ b/toolkit/inc/toolkit/awt/vclxtabpagecontainer.hxx @@ -1,32 +1,22 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -// ---------------------------------------------------- -// class VCLXDialog -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + #ifndef _TOOLKIT_AWT_VCLXTABPAGECONTAINER_HXX_ #define _TOOLKIT_AWT_VCLXTABPAGECONTAINER_HXX_ diff --git a/toolkit/inc/toolkit/awt/vclxtabpagemodel.hxx b/toolkit/inc/toolkit/awt/vclxtabpagemodel.hxx index ebf63960502a..2e202ed2b5c8 100644 --- a/toolkit/inc/toolkit/awt/vclxtabpagemodel.hxx +++ b/toolkit/inc/toolkit/awt/vclxtabpagemodel.hxx @@ -1,32 +1,22 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -// ---------------------------------------------------- -// class VCLXDialog -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + #ifndef _TOOLKIT_AWT_VCLXTABPAGEMODEL_HXX_ #define _TOOLKIT_AWT_VCLXTABPAGEMODEL_HXX_ diff --git a/toolkit/inc/toolkit/awt/vclxtopwindow.hxx b/toolkit/inc/toolkit/awt/vclxtopwindow.hxx index 16f9910391d0..95a742572b94 100644 --- a/toolkit/inc/toolkit/awt/vclxtopwindow.hxx +++ b/toolkit/inc/toolkit/awt/vclxtopwindow.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _TOOLKIT_AWT_VCLXTOPWINDOW_HXX_ #define _TOOLKIT_AWT_VCLXTOPWINDOW_HXX_ diff --git a/toolkit/inc/toolkit/awt/vclxwindows.hxx b/toolkit/inc/toolkit/awt/vclxwindows.hxx index 73db1b9c5e39..5871700350bc 100644 --- a/toolkit/inc/toolkit/awt/vclxwindows.hxx +++ b/toolkit/inc/toolkit/awt/vclxwindows.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _TOOLKIT_AWT_VCLXWINDOWS_HXX_ #define _TOOLKIT_AWT_VCLXWINDOWS_HXX_ diff --git a/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx b/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx index f494845633db..72da8586447c 100644 --- a/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx +++ b/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef TOOLKIT_CONTROL_MODEL_CONTAINERBASE_HXX #define TOOLKIT_CONTROL_MODEL_CONTAINERBASE_HXX diff --git a/toolkit/inc/toolkit/controls/dialogcontrol.hxx b/toolkit/inc/toolkit/controls/dialogcontrol.hxx index 169fd5d437f8..bd01be35e68d 100644 --- a/toolkit/inc/toolkit/controls/dialogcontrol.hxx +++ b/toolkit/inc/toolkit/controls/dialogcontrol.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef TOOLKIT_DIALOG_CONTROL_HXX #define TOOLKIT_DIALOG_CONTROL_HXX diff --git a/toolkit/inc/toolkit/controls/eventcontainer.hxx b/toolkit/inc/toolkit/controls/eventcontainer.hxx index ceabfb2a6fc6..24684fba4f1d 100644 --- a/toolkit/inc/toolkit/controls/eventcontainer.hxx +++ b/toolkit/inc/toolkit/controls/eventcontainer.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx b/toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx index eddabade1310..206bdc08da3b 100644 --- a/toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx +++ b/toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _TOOLKIT_HELPERS_GEOMETRYCONTROLMODEL_HXX_ #define _TOOLKIT_HELPERS_GEOMETRYCONTROLMODEL_HXX_ diff --git a/toolkit/inc/toolkit/controls/stdtabcontrollermodel.hxx b/toolkit/inc/toolkit/controls/stdtabcontrollermodel.hxx index 322faee119bb..7a7770b3b30f 100644 --- a/toolkit/inc/toolkit/controls/stdtabcontrollermodel.hxx +++ b/toolkit/inc/toolkit/controls/stdtabcontrollermodel.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _TOOLKIT_CONTROLS_STDTABCONTROLLERMODEL_HXX_ #define _TOOLKIT_CONTROLS_STDTABCONTROLLERMODEL_HXX_ diff --git a/toolkit/inc/toolkit/controls/tabpagecontainer.hxx b/toolkit/inc/toolkit/controls/tabpagecontainer.hxx index 0212a0e1c337..a713d3efedb8 100644 --- a/toolkit/inc/toolkit/controls/tabpagecontainer.hxx +++ b/toolkit/inc/toolkit/controls/tabpagecontainer.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef TOOLKIT_TABPAGE_CONTAINER_HXX #define TOOLKIT_TABPAGE_CONTAINER_HXX diff --git a/toolkit/inc/toolkit/controls/tabpagemodel.hxx b/toolkit/inc/toolkit/controls/tabpagemodel.hxx index b8ef2d573d2b..045f0c9ce4db 100644 --- a/toolkit/inc/toolkit/controls/tabpagemodel.hxx +++ b/toolkit/inc/toolkit/controls/tabpagemodel.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef TOOLKIT_TABPAGE_MODEL_HXX #define TOOLKIT_TABPAGE_MODEL_HXX diff --git a/toolkit/inc/toolkit/controls/unocontrolbase.hxx b/toolkit/inc/toolkit/controls/unocontrolbase.hxx index d5e19ea5e102..1b4564802e39 100644 --- a/toolkit/inc/toolkit/controls/unocontrolbase.hxx +++ b/toolkit/inc/toolkit/controls/unocontrolbase.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _TOOLKIT_AWT_UNOCONTROLBASE_HXX_ #define _TOOLKIT_AWT_UNOCONTROLBASE_HXX_ diff --git a/toolkit/inc/toolkit/controls/unocontrolcontainer.hxx b/toolkit/inc/toolkit/controls/unocontrolcontainer.hxx index 71df40a754dd..e8763ca8894a 100644 --- a/toolkit/inc/toolkit/controls/unocontrolcontainer.hxx +++ b/toolkit/inc/toolkit/controls/unocontrolcontainer.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _TOOLKIT_CONTROLS_UNOCONTROLCONTAINER_HXX_ #define _TOOLKIT_CONTROLS_UNOCONTROLCONTAINER_HXX_ diff --git a/toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx b/toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx index 4f61adb87acd..f15a0490b483 100644 --- a/toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx +++ b/toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _TOOLKIT_CONTROLS_UNOCONTROLCONTAINERMODEL_HXX_ #define _TOOLKIT_CONTROLS_UNOCONTROLCONTAINERMODEL_HXX_ diff --git a/toolkit/inc/toolkit/controls/unocontrolmodel.hxx b/toolkit/inc/toolkit/controls/unocontrolmodel.hxx index e0d6aa874317..416b7281ec88 100644 --- a/toolkit/inc/toolkit/controls/unocontrolmodel.hxx +++ b/toolkit/inc/toolkit/controls/unocontrolmodel.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _TOOLKIT_AWT_UNOCONTROLMODEL_HXX_ #define _TOOLKIT_AWT_UNOCONTROLMODEL_HXX_ diff --git a/toolkit/inc/toolkit/controls/unocontrols.hxx b/toolkit/inc/toolkit/controls/unocontrols.hxx index 132297a76236..cb5256f27ea1 100644 --- a/toolkit/inc/toolkit/controls/unocontrols.hxx +++ b/toolkit/inc/toolkit/controls/unocontrols.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _TOOLKIT_HELPER_UNOCONTROLS_HXX_ #define _TOOLKIT_HELPER_UNOCONTROLS_HXX_ diff --git a/toolkit/inc/toolkit/helper/accessiblefactory.hxx b/toolkit/inc/toolkit/helper/accessiblefactory.hxx index c047a55c6597..66117a6bdbba 100644 --- a/toolkit/inc/toolkit/helper/accessiblefactory.hxx +++ b/toolkit/inc/toolkit/helper/accessiblefactory.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef TOOLKIT_HELPER_ACCESSIBLE_FACTORY_HXX #define TOOLKIT_HELPER_ACCESSIBLE_FACTORY_HXX diff --git a/toolkit/inc/toolkit/helper/listenermultiplexer.hxx b/toolkit/inc/toolkit/helper/listenermultiplexer.hxx index 46de6c4ad8d5..afb0317ce636 100644 --- a/toolkit/inc/toolkit/helper/listenermultiplexer.hxx +++ b/toolkit/inc/toolkit/helper/listenermultiplexer.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _TOOLKIT_HELPER_LISTENERMULTIPLEXER_HXX_ #define _TOOLKIT_HELPER_LISTENERMULTIPLEXER_HXX_ diff --git a/toolkit/inc/toolkit/helper/macros.hxx b/toolkit/inc/toolkit/helper/macros.hxx index a8282477b3d9..7f56227cbe54 100644 --- a/toolkit/inc/toolkit/helper/macros.hxx +++ b/toolkit/inc/toolkit/helper/macros.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _TOOLKIT_HELPER_MACROS_HXX_ #define _TOOLKIT_HELPER_MACROS_HXX_ diff --git a/toolkit/inc/toolkit/helper/property.hxx b/toolkit/inc/toolkit/helper/property.hxx index 5f8eedff8720..74fa56398ad3 100644 --- a/toolkit/inc/toolkit/helper/property.hxx +++ b/toolkit/inc/toolkit/helper/property.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _TOOLKIT_HELPER_PROPERTY_HXX_ #define _TOOLKIT_HELPER_PROPERTY_HXX_ diff --git a/toolkit/inc/toolkit/helper/servicenames.hxx b/toolkit/inc/toolkit/helper/servicenames.hxx index d784f5950328..5105fc12484b 100644 --- a/toolkit/inc/toolkit/helper/servicenames.hxx +++ b/toolkit/inc/toolkit/helper/servicenames.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _TOOLKIT_HELPER_SERVICENAMES_HXX_ #define _TOOLKIT_HELPER_SERVICENAMES_HXX_ diff --git a/toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx b/toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx index 8fc5aefca230..5b6ba3b5c956 100644 --- a/toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx +++ b/toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _TOOLKIT_HELPER_UNOPROPERTYARRAYHELPER_HXX_ #define _TOOLKIT_HELPER_UNOPROPERTYARRAYHELPER_HXX_ diff --git a/toolkit/inc/toolkit/helper/vclunohelper.hxx b/toolkit/inc/toolkit/helper/vclunohelper.hxx index 1caa9c4ca2c9..7c07a87cfe72 100644 --- a/toolkit/inc/toolkit/helper/vclunohelper.hxx +++ b/toolkit/inc/toolkit/helper/vclunohelper.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #define _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ diff --git a/toolkit/qa/complex/toolkit/GridControl.java b/toolkit/qa/complex/toolkit/GridControl.java index fc2c444226b1..97e9444e2ecc 100644 --- a/toolkit/qa/complex/toolkit/GridControl.java +++ b/toolkit/qa/complex/toolkit/GridControl.java @@ -1,28 +1,20 @@ -/************************************************************************* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/* + * This file is part of the LibreOffice project. * - * Copyright 2000, 2011 Oracle and/or its affiliates. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * OpenOffice.org - a multi-platform office productivity suite + * This file incorporates work covered by the following license notice: * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - *************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ package complex.toolkit; diff --git a/toolkit/qa/complex/toolkit/awtgrid/TMutableGridDataModel.java b/toolkit/qa/complex/toolkit/awtgrid/TMutableGridDataModel.java index b16bf0c28655..c1b6904f74b3 100644 --- a/toolkit/qa/complex/toolkit/awtgrid/TMutableGridDataModel.java +++ b/toolkit/qa/complex/toolkit/awtgrid/TMutableGridDataModel.java @@ -1,28 +1,20 @@ -/************************************************************************* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/* + * This file is part of the LibreOffice project. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * OpenOffice.org - a multi-platform office productivity suite + * This file incorporates work covered by the following license notice: * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - *************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ package complex.toolkit.awtgrid; diff --git a/toolkit/qa/unoapi/knownissues.xcl b/toolkit/qa/unoapi/knownissues.xcl index a64fd8f78bd0..c9eca6f36822 100644 --- a/toolkit/qa/unoapi/knownissues.xcl +++ b/toolkit/qa/unoapi/knownissues.xcl @@ -1,3 +1,21 @@ +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# This file incorporates work covered by the following license notice: +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . +# + ### i86545 ### toolkit.AccessibleToolBoxItem::com::sun::star::accessibility::XAccessibleText diff --git a/toolkit/source/awt/animatedimagespeer.cxx b/toolkit/source/awt/animatedimagespeer.cxx index 12cc95ffdac3..ae41fad13ae5 100644 --- a/toolkit/source/awt/animatedimagespeer.cxx +++ b/toolkit/source/awt/animatedimagespeer.cxx @@ -1,29 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/* + * This file is part of the LibreOffice project. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * OpenOffice.org - a multi-platform office productivity suite + * This file incorporates work covered by the following license notice: * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "toolkit/awt/animatedimagespeer.hxx" diff --git a/toolkit/source/awt/non-interactable-containers.xml b/toolkit/source/awt/non-interactable-containers.xml index 0ffdb7e9d58d..00f3f2a93e6d 100644 --- a/toolkit/source/awt/non-interactable-containers.xml +++ b/toolkit/source/awt/non-interactable-containers.xml @@ -1,4 +1,21 @@ + #include diff --git a/toolkit/source/awt/stylesettings.cxx b/toolkit/source/awt/stylesettings.cxx index 018b48c9df1a..97d5e2997bca 100644 --- a/toolkit/source/awt/stylesettings.cxx +++ b/toolkit/source/awt/stylesettings.cxx @@ -1,29 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/* + * This file is part of the LibreOffice project. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * OpenOffice.org - a multi-platform office productivity suite + * This file incorporates work covered by the following license notice: * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "stylesettings.hxx" diff --git a/toolkit/source/awt/stylesettings.hxx b/toolkit/source/awt/stylesettings.hxx index 3385a1aa5289..b827cc42a16a 100644 --- a/toolkit/source/awt/stylesettings.hxx +++ b/toolkit/source/awt/stylesettings.hxx @@ -1,29 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/* + * This file is part of the LibreOffice project. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * OpenOffice.org - a multi-platform office productivity suite + * This file incorporates work covered by the following license notice: * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef TOOLKIT_STYLESETTINGS_HXX #define TOOLKIT_STYLESETTINGS_HXX diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx index 1a49269f42dd..6f260a4093bf 100644 --- a/toolkit/source/awt/vclxaccessiblecomponent.cxx +++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/toolkit/source/awt/vclxbitmap.cxx b/toolkit/source/awt/vclxbitmap.cxx index 773b69a7e4a4..fd9b5aea22a8 100644 --- a/toolkit/source/awt/vclxbitmap.cxx +++ b/toolkit/source/awt/vclxbitmap.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx index 1ea0e4765d5c..ead5d8602594 100644 --- a/toolkit/source/awt/vclxcontainer.cxx +++ b/toolkit/source/awt/vclxcontainer.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/toolkit/source/awt/vclxdevice.cxx b/toolkit/source/awt/vclxdevice.cxx index 1cc74ae90f26..f2573db0a923 100644 --- a/toolkit/source/awt/vclxdevice.cxx +++ b/toolkit/source/awt/vclxdevice.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/toolkit/source/awt/vclxfont.cxx b/toolkit/source/awt/vclxfont.cxx index a44526a548b2..108d4cbd8151 100644 --- a/toolkit/source/awt/vclxfont.cxx +++ b/toolkit/source/awt/vclxfont.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include @@ -192,42 +183,9 @@ sal_Int32 VCLXFont::getStringWidthArray( const ::rtl::OUString& str, ::com::sun: return nRet; } -void VCLXFont::getKernPairs( ::com::sun::star::uno::Sequence< sal_Unicode >& rnChars1, ::com::sun::star::uno::Sequence< sal_Unicode >& rnChars2, ::com::sun::star::uno::Sequence< sal_Int16 >& rnKerns ) throw(::com::sun::star::uno::RuntimeException) +void VCLXFont::getKernPairs( ::com::sun::star::uno::Sequence< sal_Unicode >& /*rnChars1*/, ::com::sun::star::uno::Sequence< sal_Unicode >& /*rnChars2*/, ::com::sun::star::uno::Sequence< sal_Int16 >& /*rnKerns*/ ) throw(::com::sun::star::uno::RuntimeException) { - ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - - OutputDevice* pOutDev = VCLUnoHelper::GetOutputDevice( mxDevice ); - if( pOutDev ) - { - Font aOldFont = pOutDev->GetFont(); - pOutDev->SetFont( maFont ); - - sal_uLong nPairs = pOutDev->GetKerningPairCount(); - if ( nPairs ) - { - KerningPair* pData = new KerningPair[ nPairs ]; - pOutDev->GetKerningPairs( nPairs, pData ); - - rnChars1 = ::com::sun::star::uno::Sequence( nPairs ); - rnChars2 = ::com::sun::star::uno::Sequence( nPairs ); - rnKerns = ::com::sun::star::uno::Sequence( nPairs ); - - sal_Unicode* pChars1 = rnChars1.getArray(); - sal_Unicode* pChars2 = rnChars2.getArray(); - sal_Int16* pKerns = rnKerns.getArray(); - - for ( sal_uLong n = 0; n < nPairs; n++ ) - { - pChars1[n] = pData[n].nChar1; - pChars2[n] = pData[n].nChar2; - pKerns[n] = sal::static_int_cast< sal_Int16 >(pData[n].nKern); - } - - - delete[] pData; - } - pOutDev->SetFont( aOldFont ); - } + // NOTE: this empty method is just used for keeping the related UNO-API stable } // ::com::sun::star::awt::XFont2 diff --git a/toolkit/source/awt/vclxgraphics.cxx b/toolkit/source/awt/vclxgraphics.cxx index 491b2855c21b..ae8e9b62d336 100644 --- a/toolkit/source/awt/vclxgraphics.cxx +++ b/toolkit/source/awt/vclxgraphics.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx index 7748aa675000..b59b9e97ce7f 100644 --- a/toolkit/source/awt/vclxmenu.cxx +++ b/toolkit/source/awt/vclxmenu.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/toolkit/source/awt/vclxpointer.cxx b/toolkit/source/awt/vclxpointer.cxx index c55c3a5cdf8a..316e4463845a 100644 --- a/toolkit/source/awt/vclxpointer.cxx +++ b/toolkit/source/awt/vclxpointer.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx index 1462087cf4a2..56e5e830ace0 100644 --- a/toolkit/source/awt/vclxprinter.cxx +++ b/toolkit/source/awt/vclxprinter.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/toolkit/source/awt/vclxregion.cxx b/toolkit/source/awt/vclxregion.cxx index 079aa2fb8a20..7ed03bfc08a2 100644 --- a/toolkit/source/awt/vclxregion.cxx +++ b/toolkit/source/awt/vclxregion.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/toolkit/source/awt/vclxspinbutton.cxx b/toolkit/source/awt/vclxspinbutton.cxx index eb8e9975ca0d..f3384dee5145 100644 --- a/toolkit/source/awt/vclxspinbutton.cxx +++ b/toolkit/source/awt/vclxspinbutton.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "toolkit/awt/vclxspinbutton.hxx" #include "toolkit/helper/property.hxx" diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx index 0a9f9e762e28..7b26d7877bf3 100644 --- a/toolkit/source/awt/vclxsystemdependentwindow.cxx +++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx b/toolkit/source/awt/vclxtabpagecontainer.cxx index 8329eb508240..91c8708c82a6 100644 --- a/toolkit/source/awt/vclxtabpagecontainer.cxx +++ b/toolkit/source/awt/vclxtabpagecontainer.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/toolkit/source/awt/vclxtabpagemodel.cxx b/toolkit/source/awt/vclxtabpagemodel.cxx index 7e0faac16d13..9f4744dacda7 100644 --- a/toolkit/source/awt/vclxtabpagemodel.cxx +++ b/toolkit/source/awt/vclxtabpagemodel.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 6053de716e7c..827b360beadb 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx index fdf6a4f2ff1f..462a5682184d 100644 --- a/toolkit/source/awt/vclxtopwindow.cxx +++ b/toolkit/source/awt/vclxtopwindow.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index 9d26ffbdd98f..5609ea7e16bc 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx index a3dba99b38e6..f38a95cb6dda 100644 --- a/toolkit/source/awt/vclxwindow1.cxx +++ b/toolkit/source/awt/vclxwindow1.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 773d64ae4f83..434ae8b61736 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include "toolkit/awt/scrollabledialog.hxx" diff --git a/toolkit/source/awt/xthrobber.cxx b/toolkit/source/awt/xthrobber.cxx index 91b35f9f9a24..b62f680e3083 100644 --- a/toolkit/source/awt/xthrobber.cxx +++ b/toolkit/source/awt/xthrobber.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "toolkit/awt/xthrobber.hxx" #include "toolkit/helper/property.hxx" diff --git a/toolkit/source/awt/xthrobber.src b/toolkit/source/awt/xthrobber.src index 94ff3ef5c55a..9cda68c108b7 100644 --- a/toolkit/source/awt/xthrobber.src +++ b/toolkit/source/awt/xthrobber.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx index f37d12a0bd6d..0513d67a7982 100644 --- a/toolkit/source/controls/accessiblecontrolcontext.cxx +++ b/toolkit/source/controls/accessiblecontrolcontext.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/toolkit/source/controls/animatedimages.cxx b/toolkit/source/controls/animatedimages.cxx index e7be773056c3..cbab23368ca3 100644 --- a/toolkit/source/controls/animatedimages.cxx +++ b/toolkit/source/controls/animatedimages.cxx @@ -1,29 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/* + * This file is part of the LibreOffice project. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * OpenOffice.org - a multi-platform office productivity suite + * This file incorporates work covered by the following license notice: * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "toolkit/controls/animatedimages.hxx" diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx index 3943007bed3b..49322e47f08d 100644 --- a/toolkit/source/controls/controlmodelcontainerbase.cxx +++ b/toolkit/source/controls/controlmodelcontainerbase.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index ba6c7517ff64..4989cd512d88 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/toolkit/source/controls/eventcontainer.cxx b/toolkit/source/controls/eventcontainer.cxx index 42c38b4fc44d..b141b85dffac 100644 --- a/toolkit/source/controls/eventcontainer.cxx +++ b/toolkit/source/controls/eventcontainer.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx index a1dbc6e21c1c..e08957dc924d 100644 --- a/toolkit/source/controls/formattedcontrol.cxx +++ b/toolkit/source/controls/formattedcontrol.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx index 82b1dd746996..7ef444192870 100644 --- a/toolkit/source/controls/geometrycontrolmodel.cxx +++ b/toolkit/source/controls/geometrycontrolmodel.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "toolkit/controls/geometrycontrolmodel.hxx" #include diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx index d0fcaa50bdee..10c7924db8de 100644 --- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx +++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "defaultgridcolumnmodel.hxx" diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.cxx b/toolkit/source/controls/grid/defaultgriddatamodel.cxx index 77a65627a555..17df3736875a 100644 --- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx +++ b/toolkit/source/controls/grid/defaultgriddatamodel.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "defaultgriddatamodel.hxx" diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.hxx b/toolkit/source/controls/grid/defaultgriddatamodel.hxx index 9d873f75016e..82fd47021e9a 100644 --- a/toolkit/source/controls/grid/defaultgriddatamodel.hxx +++ b/toolkit/source/controls/grid/defaultgriddatamodel.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/toolkit/source/controls/grid/gridcolumn.cxx b/toolkit/source/controls/grid/gridcolumn.cxx index 70c56cfce0b6..5df063d2f7e4 100644 --- a/toolkit/source/controls/grid/gridcolumn.cxx +++ b/toolkit/source/controls/grid/gridcolumn.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "gridcolumn.hxx" diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx index 72d0593f21c6..94f1d9eb41af 100644 --- a/toolkit/source/controls/grid/gridcontrol.cxx +++ b/toolkit/source/controls/grid/gridcontrol.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "gridcontrol.hxx" diff --git a/toolkit/source/controls/grid/gridcontrol.hxx b/toolkit/source/controls/grid/gridcontrol.hxx index f5088b1357e5..383d36e8e756 100644 --- a/toolkit/source/controls/grid/gridcontrol.hxx +++ b/toolkit/source/controls/grid/gridcontrol.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef TOOLKIT_GRID_CONTROL_HXX #define TOOLKIT_GRID_CONTROL_HXX diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx index 8e10e0bfffb2..109478c5b9cf 100644 --- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx +++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx @@ -1,29 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/* + * This file is part of the LibreOffice project. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * OpenOffice.org - a multi-platform office productivity suite + * This file incorporates work covered by the following license notice: * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sortablegriddatamodel.hxx" diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.hxx b/toolkit/source/controls/grid/sortablegriddatamodel.hxx index 53f95a973468..71718c5500de 100644 --- a/toolkit/source/controls/grid/sortablegriddatamodel.hxx +++ b/toolkit/source/controls/grid/sortablegriddatamodel.hxx @@ -1,29 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/* + * This file is part of the LibreOffice project. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * OpenOffice.org - a multi-platform office productivity suite + * This file incorporates work covered by the following license notice: * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef TOOLKIT_SORTABLEGRIDDATAMODEL_HXX #define TOOLKIT_SORTABLEGRIDDATAMODEL_HXX diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx index 299ef11b881a..1afd7c9e2c62 100644 --- a/toolkit/source/controls/roadmapcontrol.cxx +++ b/toolkit/source/controls/roadmapcontrol.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/toolkit/source/controls/roadmapentry.cxx b/toolkit/source/controls/roadmapentry.cxx index 3e653cbb153d..e2a8344ba6f3 100644 --- a/toolkit/source/controls/roadmapentry.cxx +++ b/toolkit/source/controls/roadmapentry.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/toolkit/source/controls/spinningprogress.cxx b/toolkit/source/controls/spinningprogress.cxx index b49d8493156c..2c4513dd286b 100644 --- a/toolkit/source/controls/spinningprogress.cxx +++ b/toolkit/source/controls/spinningprogress.cxx @@ -1,29 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/* + * This file is part of the LibreOffice project. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * OpenOffice.org - a multi-platform office productivity suite + * This file incorporates work covered by the following license notice: * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "toolkit/controls/spinningprogress.hxx" diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx index 9a88234a30de..f9d9ae1ff15c 100644 --- a/toolkit/source/controls/stdtabcontroller.cxx +++ b/toolkit/source/controls/stdtabcontroller.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/toolkit/source/controls/stdtabcontrollermodel.cxx b/toolkit/source/controls/stdtabcontrollermodel.cxx index 982d029d93f8..b857bf05bc72 100644 --- a/toolkit/source/controls/stdtabcontrollermodel.cxx +++ b/toolkit/source/controls/stdtabcontrollermodel.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/toolkit/source/controls/tabpagecontainer.cxx b/toolkit/source/controls/tabpagecontainer.cxx index 59a03359eac9..073dc03bd61a 100644 --- a/toolkit/source/controls/tabpagecontainer.cxx +++ b/toolkit/source/controls/tabpagecontainer.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx index 6192c92ce5d4..fd7703d08649 100644 --- a/toolkit/source/controls/tabpagemodel.cxx +++ b/toolkit/source/controls/tabpagemodel.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx index 08efbe7f0bc5..e71a74ebfa78 100644 --- a/toolkit/source/controls/tkscrollbar.cxx +++ b/toolkit/source/controls/tkscrollbar.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "toolkit/controls/tkscrollbar.hxx" #include "toolkit/helper/property.hxx" diff --git a/toolkit/source/controls/tksimpleanimation.cxx b/toolkit/source/controls/tksimpleanimation.cxx index 746076bc17c4..09a7f4099186 100644 --- a/toolkit/source/controls/tksimpleanimation.cxx +++ b/toolkit/source/controls/tksimpleanimation.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "toolkit/controls/tksimpleanimation.hxx" #include "toolkit/helper/property.hxx" diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx index 79fecb0451cb..b86ce17290ed 100644 --- a/toolkit/source/controls/tkspinbutton.cxx +++ b/toolkit/source/controls/tkspinbutton.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "toolkit/controls/tkspinbutton.hxx" #include "toolkit/helper/property.hxx" diff --git a/toolkit/source/controls/tkthrobber.cxx b/toolkit/source/controls/tkthrobber.cxx index 413e9584d46e..7de89801210b 100644 --- a/toolkit/source/controls/tkthrobber.cxx +++ b/toolkit/source/controls/tkthrobber.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "toolkit/controls/tkthrobber.hxx" #include "toolkit/helper/property.hxx" diff --git a/toolkit/source/controls/tree/treecontrol.cxx b/toolkit/source/controls/tree/treecontrol.cxx index 4182723b0dc4..f16245a05be5 100644 --- a/toolkit/source/controls/tree/treecontrol.cxx +++ b/toolkit/source/controls/tree/treecontrol.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/toolkit/source/controls/tree/treedatamodel.cxx b/toolkit/source/controls/tree/treedatamodel.cxx index 426f179b14d1..3b03d1a44008 100644 --- a/toolkit/source/controls/tree/treedatamodel.cxx +++ b/toolkit/source/controls/tree/treedatamodel.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index 8ad20ecac814..6cefb82b6d85 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/toolkit/source/controls/unocontrolbase.cxx b/toolkit/source/controls/unocontrolbase.cxx index 12b2b14ed7d7..961f6e0ac3ee 100644 --- a/toolkit/source/controls/unocontrolbase.cxx +++ b/toolkit/source/controls/unocontrolbase.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx index 7e6f3c97054d..f7890f18163f 100644 --- a/toolkit/source/controls/unocontrolcontainer.cxx +++ b/toolkit/source/controls/unocontrolcontainer.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 86df917f6c16..0b2dd95ce129 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index 03089bd28147..ac54f2368154 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/toolkit/source/helper/accessibilityclient.cxx b/toolkit/source/helper/accessibilityclient.cxx index 14fb13fae872..cbc729362895 100644 --- a/toolkit/source/helper/accessibilityclient.cxx +++ b/toolkit/source/helper/accessibilityclient.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx index 22fec372cf28..f8579d57e192 100644 --- a/toolkit/source/helper/formpdfexport.cxx +++ b/toolkit/source/helper/formpdfexport.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/toolkit/source/helper/imagealign.cxx b/toolkit/source/helper/imagealign.cxx index 77ea8973bcac..fa5297f5eebc 100644 --- a/toolkit/source/helper/imagealign.cxx +++ b/toolkit/source/helper/imagealign.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/toolkit/source/helper/listenermultiplexer.cxx b/toolkit/source/helper/listenermultiplexer.cxx index cdcc9327e451..12302580bf3d 100644 --- a/toolkit/source/helper/listenermultiplexer.cxx +++ b/toolkit/source/helper/listenermultiplexer.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/toolkit/source/helper/property.cxx b/toolkit/source/helper/property.cxx index 746e7cca4c31..9e116164eb83 100644 --- a/toolkit/source/helper/property.cxx +++ b/toolkit/source/helper/property.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/toolkit/source/helper/registerservices.cxx b/toolkit/source/helper/registerservices.cxx index f4a1a070d918..7100f20db65a 100644 --- a/toolkit/source/helper/registerservices.cxx +++ b/toolkit/source/helper/registerservices.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/toolkit/source/helper/servicenames.cxx b/toolkit/source/helper/servicenames.cxx index cc23feee07b6..bd33becf1c39 100644 --- a/toolkit/source/helper/servicenames.cxx +++ b/toolkit/source/helper/servicenames.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/toolkit/source/helper/tkresmgr.cxx b/toolkit/source/helper/tkresmgr.cxx index fa24f4bc8cc8..bd514d9099b6 100644 --- a/toolkit/source/helper/tkresmgr.cxx +++ b/toolkit/source/helper/tkresmgr.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/toolkit/source/helper/unopropertyarrayhelper.cxx b/toolkit/source/helper/unopropertyarrayhelper.cxx index 17f518e0c0c8..aec93eaf7f53 100644 --- a/toolkit/source/helper/unopropertyarrayhelper.cxx +++ b/toolkit/source/helper/unopropertyarrayhelper.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx index aab4433b0ecd..b7364c7d3dec 100644 --- a/toolkit/source/helper/unowrapper.cxx +++ b/toolkit/source/helper/unowrapper.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx index 7bd258714758..0cdffe41e305 100644 --- a/toolkit/source/helper/vclunohelper.cxx +++ b/toolkit/source/helper/vclunohelper.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/toolkit/util/tk.component b/toolkit/util/tk.component index f6638794de12..930d172f4ff2 100644 --- a/toolkit/util/tk.component +++ b/toolkit/util/tk.component @@ -1,30 +1,21 @@ - + From 088a01467372a945e7f311678d3cf529cab72dcd Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Wed, 3 Oct 2012 17:15:30 +0200 Subject: [PATCH 243/863] $SOLARBINDIR is not defined in gbuild, replace with $OUTDIR/bin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise build won't find jsr173_1.0_api.jar, breaking the build when using JDK 1.5 (i.e. Mac PPC and others) Change-Id: I8de0b42d4b14b4da5fe9216515fae94bbfc77b27 Reviewed-on: https://gerrit.libreoffice.org/757 Reviewed-by: LuboÅ¡ Luňák Tested-by: LuboÅ¡ Luňák --- saxon/ExternalProject_saxon.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/saxon/ExternalProject_saxon.mk b/saxon/ExternalProject_saxon.mk index 03f0b94436fa..a5c983be0b8c 100644 --- a/saxon/ExternalProject_saxon.mk +++ b/saxon/ExternalProject_saxon.mk @@ -32,7 +32,7 @@ $(call gb_ExternalProject_get_state_target,saxon,build) : -Dant.build.javac.target=$(JAVA_TARGET_VER) \ ) \ $(if $(debug),-Dbuild.debug="on") \ - -Dsolarbindir=$(SOLARBINDIR) jar-bj && \ + -Dsolarbindir=$(OUTDIR)/bin jar-bj && \ touch $@ # vim: set noet sw=4 ts=4: From a51b09f105dd69837654cf2afa93124d5ecd25ff Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Wed, 3 Oct 2012 00:21:51 +0200 Subject: [PATCH 244/863] gbuildification of languagetool It is not clear how to remove a file: REMOVE_FILES=openoffice/images/dialogh.png. Let it for now in place. Change-Id: Ie8739fd207ca7dc9343c92c93cf092b3af674bf0 Reviewed-on: https://gerrit.libreoffice.org/753 Reviewed-by: Michael Stahl Tested-by: Michael Stahl --- Makefile.top | 2 +- RepositoryModule_ooo.mk | 1 + config_host.mk.in | 1 + configure.in | 2 + languagetool/ExternalProject_languagetool.mk | 33 ++++++++++ languagetool/Makefile | 7 +++ languagetool/Module_languagetool.mk | 22 +++++++ languagetool/Package_languagetool.mk | 16 +++++ languagetool/UnpackedTarball_languagetool.mk | 19 ++++++ languagetool/makefile.mk | 64 -------------------- languagetool/prj/build.lst | 3 +- languagetool/prj/d.lst | 1 - languagetool/prj/dmake | 0 13 files changed, 103 insertions(+), 68 deletions(-) create mode 100644 languagetool/ExternalProject_languagetool.mk create mode 100644 languagetool/Makefile create mode 100644 languagetool/Module_languagetool.mk create mode 100644 languagetool/Package_languagetool.mk create mode 100644 languagetool/UnpackedTarball_languagetool.mk delete mode 100644 languagetool/makefile.mk delete mode 100644 languagetool/prj/dmake diff --git a/Makefile.top b/Makefile.top index 8e1833f0f4b3..3e6f2c413514 100644 --- a/Makefile.top +++ b/Makefile.top @@ -93,6 +93,7 @@ jurt\ jvmaccess\ jvmfwk\ l10ntools\ +languagetool\ libcdr\ libcmis\ libmspub\ @@ -221,7 +222,6 @@ icu\ instsetoo_native\ jfreereport\ jpeg\ -languagetool\ libcroco\ libexttextcat\ libgsf\ diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index a8153e103371..8be0d6ecc4bf 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -90,6 +90,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ jvmaccess \ jvmfwk \ $(call gb_Helper_optional,DESKTOP,l10ntools) \ + $(call gb_Helper_optional,LANGUAGETOOL,languagetool) \ libcdr \ libcmis \ libmspub \ diff --git a/config_host.mk.in b/config_host.mk.in index 9052d70c4693..48710b16439a 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -291,6 +291,7 @@ export KDE_GLIB_CFLAGS=@KDE_GLIB_CFLAGS@ export KDE_GLIB_LIBS=@KDE_GLIB_LIBS@ export KDE_HAVE_GLIB=@KDE_HAVE_GLIB@ export KDE_LIBS=@KDE_LIBS@ +export LANGUAGETOOL_TARBALL=@LANGUAGETOOL_TARBALL@ export L10N_MODULE=@L10N_MODULE@ export LCMS2_CFLAGS=@LCMS2_CFLAGS@ export LCMS2_LIBS=@LCMS2_LIBS@ diff --git a/configure.in b/configure.in index f8ccb943876d..3b54b1a8b055 100644 --- a/configure.in +++ b/configure.in @@ -10898,10 +10898,12 @@ AC_MSG_CHECKING([for LanguageTool extension integration]) if test "x$enable_ext_languagetool" = "xyes" -a "x$enable_extension_integration" != "xno" -a "x$with_java" != "xno"; then BUILD_TYPE="$BUILD_TYPE LANGUAGETOOL" SCPDEFS="$SCPDEFS -DWITH_EXTENSION_LANGUAGETOOL" + LANGUAGETOOL_TARBALL="b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2" AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) fi +AC_SUBST(LANGUAGETOOL_TARBALL) dnl =================================================================== dnl Test whether to include oooblogger extension diff --git a/languagetool/ExternalProject_languagetool.mk b/languagetool/ExternalProject_languagetool.mk new file mode 100644 index 000000000000..60b70e63632b --- /dev/null +++ b/languagetool/ExternalProject_languagetool.mk @@ -0,0 +1,33 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_ExternalProject_ExternalProject,languagetool)) + +$(eval $(call gb_ExternalProject_use_unpacked,languagetool,languagetool)) + +$(eval $(call gb_ExternalProject_register_targets,languagetool,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,languagetool,build) : + cd "$(call gb_UnpackedTarball_get_dir,languagetool)" && \ + "$(ANT)" \ + -q \ + -f build.xml \ + -Dbuild.label="build-libreoffice" \ + $(if $(filter yes,$(JAVACISGCJ))\ + ,-Dbuild.compiler=gcj \ + ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + ) \ + $(if $(debug),-Dbuild.debug="on") \ + -Dsolver.ooo.dir="$(OUTDIR_FOR_BUILD)/bin" dist && \ + touch $@ + +# vim: set noet sw=4 ts=4: diff --git a/languagetool/Makefile b/languagetool/Makefile new file mode 100644 index 000000000000..ccb1c85a04da --- /dev/null +++ b/languagetool/Makefile @@ -0,0 +1,7 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +include $(module_directory)/../solenv/gbuild/partial_build.mk + +# vim: set noet sw=4 ts=4: diff --git a/languagetool/Module_languagetool.mk b/languagetool/Module_languagetool.mk new file mode 100644 index 000000000000..f869d493baaf --- /dev/null +++ b/languagetool/Module_languagetool.mk @@ -0,0 +1,22 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Module_Module,languagetool)) + +ifneq ($(SOLAR_JAVA),) +ifneq ($(filter LANGUAGETOOL,$(BUILD_TYPE)),) +$(eval $(call gb_Module_add_targets,languagetool,\ + ExternalProject_languagetool \ + Package_languagetool \ + UnpackedTarball_languagetool \ +)) +endif +endif + +# vim: set noet sw=4 ts=4: diff --git a/languagetool/Package_languagetool.mk b/languagetool/Package_languagetool.mk new file mode 100644 index 000000000000..1738c868b884 --- /dev/null +++ b/languagetool/Package_languagetool.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Package_Package,languagetool,$(call gb_UnpackedTarball_get_dir,languagetool))) + +$(eval $(call gb_Package_use_external_project,languagetool,languagetool)) + +$(eval $(call gb_Package_add_file,languagetool,bin/LanguageTool.oxt,dist/LanguageTool.oxt)) + +# vim: set noet sw=4 ts=4: diff --git a/languagetool/UnpackedTarball_languagetool.mk b/languagetool/UnpackedTarball_languagetool.mk new file mode 100644 index 000000000000..6df1d1713561 --- /dev/null +++ b/languagetool/UnpackedTarball_languagetool.mk @@ -0,0 +1,19 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,languagetool)) + +$(eval $(call gb_UnpackedTarball_set_tarball,languagetool,$(LANGUAGETOOL_TARBALL))) + +$(eval $(call gb_UnpackedTarball_add_patches,languagetool,\ + languagetool/JLanguageTool-1.7.0.patch \ + languagetool/JLanguageTool-1.4.0-no-hc.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/languagetool/makefile.mk b/languagetool/makefile.mk deleted file mode 100644 index 6f7daa5ed573..000000000000 --- a/languagetool/makefile.mk +++ /dev/null @@ -1,64 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=. - -PRJNAME=languagetool -TARGET=languagetool - -.IF "$(SOLAR_JAVA)"!="" -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : antsettings.mk - -# --- Files -------------------------------------------------------- - -TARFILE_NAME=JLanguageTool-1.7.0 -TARFILE_MD5=b63e6340a02ff1cacfeadb2c42286161 -TARFILE_ROOTDIR=JLanguageTool-1.7.0 -PATCH_FILES=JLanguageTool-1.7.0.patch JLanguageTool-1.4.0-no-hc.patch -REMOVE_FILES=openoffice/images/dialogh.png - -.IF "$(JAVACISGCJ)"=="yes" -JAVA_HOME= -.EXPORT : JAVA_HOME -BUILD_ACTION="$(ANT)" -v -Dsolver.ooo.dir=$(SOLARVER)$/$(INPATH)$/bin -Dbuild.compiler=gcj dist -.ELSE -BUILD_ACTION="$(ANT)" -v -Dsolver.ooo.dir=$(SOLARVER)$/$(INPATH)$/bin -Dant.build.javac.target=$(JAVA_TARGET_VER) dist -.ENDIF - -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_ext.mk -.INCLUDE : target.mk -.INCLUDE : tg_ext.mk - -.ELSE -all: - @echo java disabled -.ENDIF diff --git a/languagetool/prj/build.lst b/languagetool/prj/build.lst index 98e25c36b3fc..cfc4052c3647 100644 --- a/languagetool/prj/build.lst +++ b/languagetool/prj/build.lst @@ -1,3 +1,2 @@ lt languagetool : javaunohelper jurt ridljar unoil NULL -lt languagetool usr1 - all lt_mkout NULL -lt languagatool nmake - all lt_languagetool NULL +lt languagatool\prj nmake - all lt_languagetool NULL diff --git a/languagetool/prj/d.lst b/languagetool/prj/d.lst index cdbabc31f919..e69de29bb2d1 100644 --- a/languagetool/prj/d.lst +++ b/languagetool/prj/d.lst @@ -1 +0,0 @@ -..\%__SRC%\misc\build\JLanguageTool*\dist\LanguageTool.oxt %_DEST%\bin\ diff --git a/languagetool/prj/dmake b/languagetool/prj/dmake deleted file mode 100644 index e69de29bb2d1..000000000000 From 703009d0c5f03c48d5e092bd88d5f8db2f9ebdbb Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Wed, 3 Oct 2012 18:11:45 +0200 Subject: [PATCH 245/863] typo Change-Id: I4fc3f6ca51d9ce0a18539b4911f6ddf06694b039 --- expat/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/expat/README b/expat/README index 9289284ec470..52496b9480a0 100644 --- a/expat/README +++ b/expat/README @@ -4,7 +4,7 @@ When we build expat internally ("bundled"), we build two variants: One that has an "ASCII" (actually UTF-8) API, another that has a "Unicode" (meaning UTF-16) API. Additionally, expat is split into two parts, expat_xmlparse and expat_xmltok. It's the former which has the two -variabts, ascii_expat_xmlparse (UTF-8) and expat_xmlparse (UTF-16). +variants, ascii_expat_xmlparse (UTF-8) and expat_xmlparse (UTF-16). Code that uses expat then declares in its .mk file which one it wants to use. See the magic in ../RepositoryExternal.mk, where in the From 93f69ad71043aa1d1d20466a2e359478b2e7b8d8 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 3 Oct 2012 11:33:30 +0200 Subject: [PATCH 246/863] -Werror,-Wheader-hygiene Change-Id: Icac29e4f433b1e72603e52a0561e60cb8a7cfdef --- soltools/mkdepend/collectdircontent.cxx | 2 ++ soltools/mkdepend/collectdircontent.hxx | 14 ++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/soltools/mkdepend/collectdircontent.cxx b/soltools/mkdepend/collectdircontent.cxx index 884456a382c9..2bb66ff61763 100644 --- a/soltools/mkdepend/collectdircontent.cxx +++ b/soltools/mkdepend/collectdircontent.cxx @@ -1,6 +1,8 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #include "collectdircontent.hxx" +using namespace std; + PathFilePair IncludesCollection::split_path(const string& filePath) { string sepU = "/"; string sepW = "\\"; diff --git a/soltools/mkdepend/collectdircontent.hxx b/soltools/mkdepend/collectdircontent.hxx index 0c6b42357855..4980632e2fe3 100644 --- a/soltools/mkdepend/collectdircontent.hxx +++ b/soltools/mkdepend/collectdircontent.hxx @@ -17,22 +17,20 @@ #include -using namespace std; - -typedef set DirContent; -typedef map DirMap; +typedef std::set DirContent; +typedef std::map DirMap; typedef DirMap::value_type EntriesPair; -typedef pair PathFilePair; +typedef std::pair PathFilePair; struct IncludesCollection { private: DirMap allIncludes; - PathFilePair split_path(const string& filePath); - void add_to_collection(const string& dirPath); + PathFilePair split_path(const std::string& filePath); + void add_to_collection(const std::string& dirPath); public: - bool exists(string filePath); + bool exists(std::string filePath); }; #else From 777d6de361cca2ee0ba2b6d41952107e8d8c0307 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 3 Oct 2012 11:33:57 +0200 Subject: [PATCH 247/863] -Werror,-Wc++98-compat-pedantic Change-Id: Ifbbca6bfb12d23c8726e35e799dc92be94844c8a --- soltools/mkdepend/collectdircontent.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/soltools/mkdepend/collectdircontent.cxx b/soltools/mkdepend/collectdircontent.cxx index 2bb66ff61763..bf23df0262d3 100644 --- a/soltools/mkdepend/collectdircontent.cxx +++ b/soltools/mkdepend/collectdircontent.cxx @@ -14,7 +14,7 @@ PathFilePair IncludesCollection::split_path(const string& filePath) { return PathFilePair(dirName, filePath.substr(pos + 1, filePath.length())); } else return PathFilePair(".", filePath); -}; +} void IncludesCollection::add_to_collection(const string& dirPath) { DirContent dirContent; @@ -47,7 +47,7 @@ void IncludesCollection::add_to_collection(const string& dirPath) { closedir(pdir); #endif // defined( WNT ) allIncludes.insert(EntriesPair(dirPath, dirContent)); -}; +} bool IncludesCollection::exists(string filePath) { #if defined( WNT ) @@ -68,7 +68,7 @@ bool IncludesCollection::exists(string filePath) { } else { return true; }; -}; +} extern "C" { From 7501beafa6d25e3f1aaf0fd0fa07e49d1692c14a Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 3 Oct 2012 12:59:03 +0200 Subject: [PATCH 248/863] Dead code Change-Id: Id851bacb21bbe289cebd635853f4d2028aed9f78 --- scripting/README | 5 - .../source/runtimemgr/ScriptExecDialog.hrc | 19 - .../source/runtimemgr/ScriptExecDialog.src | 27 - .../runtimemgr/ScriptNameResolverImpl.cxx | 611 ------------------ .../runtimemgr/ScriptNameResolverImpl.hxx | 103 --- .../runtimemgr/ScriptRuntimeManager.cxx | 466 ------------- .../runtimemgr/ScriptRuntimeManager.hxx | 142 ---- scripting/source/runtimemgr/StorageBridge.cxx | 124 ---- scripting/source/runtimemgr/StorageBridge.hxx | 78 --- .../runtimemgr/StorageBridgeFactory.cxx | 59 -- .../runtimemgr/StorageBridgeFactory.hxx | 51 -- scripting/source/runtimemgr/makefile.mk | 39 -- scripting/source/runtimemgr/runtimemgr.xml | 64 -- 13 files changed, 1788 deletions(-) delete mode 100644 scripting/source/runtimemgr/ScriptExecDialog.hrc delete mode 100644 scripting/source/runtimemgr/ScriptExecDialog.src delete mode 100644 scripting/source/runtimemgr/ScriptNameResolverImpl.cxx delete mode 100644 scripting/source/runtimemgr/ScriptNameResolverImpl.hxx delete mode 100644 scripting/source/runtimemgr/ScriptRuntimeManager.cxx delete mode 100644 scripting/source/runtimemgr/ScriptRuntimeManager.hxx delete mode 100644 scripting/source/runtimemgr/StorageBridge.cxx delete mode 100644 scripting/source/runtimemgr/StorageBridge.hxx delete mode 100644 scripting/source/runtimemgr/StorageBridgeFactory.cxx delete mode 100644 scripting/source/runtimemgr/StorageBridgeFactory.hxx delete mode 100644 scripting/source/runtimemgr/makefile.mk delete mode 100644 scripting/source/runtimemgr/runtimemgr.xml diff --git a/scripting/README b/scripting/README index 0a664ececb92..322b46c11290 100644 --- a/scripting/README +++ b/scripting/README @@ -61,8 +61,3 @@ Support for developing scripts in IDEs such as NetBeans. - source/pyprov LanguageScriptProvider for Python - -- source/storage -- source/runtimemgr - -Implementations of deprecated Scripting Framework UNO types diff --git a/scripting/source/runtimemgr/ScriptExecDialog.hrc b/scripting/source/runtimemgr/ScriptExecDialog.hrc deleted file mode 100644 index 9085e1f4fa3e..000000000000 --- a/scripting/source/runtimemgr/ScriptExecDialog.hrc +++ /dev/null @@ -1,19 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#define DLG_SCRIPTEXEC 1000 diff --git a/scripting/source/runtimemgr/ScriptExecDialog.src b/scripting/source/runtimemgr/ScriptExecDialog.src deleted file mode 100644 index 047bae74791c..000000000000 --- a/scripting/source/runtimemgr/ScriptExecDialog.src +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "ScriptExecDialog.hrc" - -QueryBox DLG_SCRIPTEXEC -{ - Buttons = WB_YES_NO ; - DefButton = WB_DEF_YES ; - Title = "Script execution" ; - Message = "You are about to execute a script. Do you want to execute this script?" ; -}; diff --git a/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx b/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx deleted file mode 100644 index 5e7b571a0970..000000000000 --- a/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx +++ /dev/null @@ -1,611 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - - -#include -#include - -#include -#include -#include -#include -#include - -#include -#include - -#include -#include - -#include "ScriptNameResolverImpl.hxx" -#include "ScriptRuntimeManager.hxx" - -using namespace ::rtl; -using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; -using namespace ::drafts::com::sun::star::script::framework; - -namespace scripting_runtimemgr -{ - -const sal_Char* const LANGUAGE_TO_RESOLVE_ON[] = { "All" }; // should be configurable -OUString nrs_implName( - "drafts.com.sun.star.script.framework.runtime.DefaultScriptNameResolver" ); -OUString nrs_serviceName( - "drafts.com.sun.star.script.framework.runtime.DefaultScriptNameResolver" ); -Sequence< OUString > nrs_serviceNames = Sequence< OUString >( &nrs_serviceName, 1 ); - -const char* const SCRIPTSTORAGEMANAGER_SERVICE = - "/singletons/drafts.com.sun.star.script.framework.storage.theScriptStorageManager"; - -extern ::rtl_StandardModuleCount s_moduleCount; - -// define storages to search -static ::std::vector< sal_Int32 >* m_pSearchIDs = NULL; - -//************************************************************************* -ScriptNameResolverImpl::ScriptNameResolverImpl( - const Reference< XComponentContext > & xContext ) : - m_xContext( xContext, UNO_SET_THROW ) -{ - OSL_TRACE( "< ScriptNameResolverImpl ctor called >" ); - validateXRef( m_xContext, "ScriptNameResolverImpl::ScriptNameResolverImpl: invalid context" ); - m_xMultiComFac.set( m_xContext->getServiceManager(), UNO_SET_THROW ); - - if( !m_pSearchIDs ) - { - osl::Guard< osl::Mutex > aGuard( m_mutex ); - if( !m_pSearchIDs ) - { - scripting_constants::ScriptingConstantsPool& scriptingConstantsPool = - scripting_constants::ScriptingConstantsPool::instance(); - m_pSearchIDs = new ::std::vector< sal_Int32 >(); - m_pSearchIDs->push_back( scriptingConstantsPool.DOC_STORAGE_ID_NOT_SET ); - m_pSearchIDs->push_back( scriptingConstantsPool.USER_STORAGE_ID ); - m_pSearchIDs->push_back( scriptingConstantsPool.SHARED_STORAGE_ID ); - } - } - - s_moduleCount.modCnt.acquire( &s_moduleCount.modCnt ); -} - -//************************************************************************* -ScriptNameResolverImpl::~ScriptNameResolverImpl() -{ - OSL_TRACE( "< ScriptNameResolverImpl dtor called >" ); - s_moduleCount.modCnt.release( &s_moduleCount.modCnt ); -} - -//************************************************************************* -Reference< storage::XScriptInfo > ScriptNameResolverImpl::resolve( -const ::rtl::OUString & scriptURI, Any& invocationCtx ) -throw ( lang::IllegalArgumentException, script::CannotConvertException, RuntimeException ) -{ - - Reference< storage::XScriptInfo > resolvedName; - Reference< beans::XPropertySet > xPropSetScriptingContext; - scripting_constants::ScriptingConstantsPool& scriptingConstantsPool = - scripting_constants::ScriptingConstantsPool::instance(); - - OSL_TRACE( "ScriptNameResolverImpl::resolve: in resolve - start" ); - - if ( sal_False == ( invocationCtx >>= xPropSetScriptingContext ) ) - { - throw RuntimeException( OUSTR( - "ScriptNameResolverImpl::resolve : unable to get XScriptingContext from param" ), - Reference< XInterface > () ); - } - - Any any; - OUString docUri; - sal_Int32 filesysScriptStorageID = -1; - Reference < storage::XScriptStorageManager > xScriptStorageMgr; - sal_Int32 docSid; - try - { - any = xPropSetScriptingContext->getPropertyValue( - scriptingConstantsPool.DOC_URI ); - OSL_TRACE( "ScriptNameResolverImpl::resolve: in resolve - got anyUri" ); - if ( sal_False == ( any >>= docUri ) ) - { - throw RuntimeException( OUSTR( - "ScriptNameResolverImpl::resolve : unable to get doc Uri from xPropSetScriptingContext" ), - Reference< XInterface > () ); - } - any = xPropSetScriptingContext->getPropertyValue( - scriptingConstantsPool.DOC_STORAGE_ID ); - if ( sal_False == ( any >>= docSid ) ) - { - throw RuntimeException( OUSTR( - "ScriptNameResolverImpl::resolve : unable to get doc storage id from xPropSetScriptingContext" ), - Reference< XInterface > () ); - } - } - catch ( const Exception & e ) - { - OUString temp = OUSTR( - "ScriptNameResolverImpl::resolve : problem with getPropertyValue" ); - throw RuntimeException( temp.concat( e.Message ), - Reference< XInterface > () ); - } -#ifdef _DEBUG - catch ( ... ) - { - throw RuntimeException( OUSTR( - "ScriptNameResolverImpl::resolve Unknown Exception caught - RuntimeException rethrown" ), - Reference< XInterface > () ); - } -#endif - - - ::rtl::OString docUriO( - ::rtl::OUStringToOString( docUri , RTL_TEXTENCODING_ASCII_US ) ); - OSL_TRACE( - "ScriptNameResolverImpl::resolve: *** >>> DOC URI: %s, doc sid is %d\n", - docUriO.pData->buffer, docSid ); - - - OSL_TRACE( "ScriptNameResolverImpl::resolve Starting..." ); - OUString docString("location=document"); - OUString userString("location=user"); - OUString shareString("location=share"); - OUString filesysString("location=filesystem"); - - // initialise vector with doc, user and share - - // m_pSearchIDs is initialised as follows, - // m_pSearchIDs [ 0 ] empty - // m_pSearchIDs [ 1 ] user storage id - // m_pSearchIDs [ 2 ] share " " - - ::std::vector< sal_Int32 > m_vSearchIDs = *m_pSearchIDs; - m_vSearchIDs[ 0 ] = docSid; - - if ( scriptURI.indexOf( docString ) != -1 ) - { - OSL_TRACE("Full resolution available, search document"); - // search in document - m_vSearchIDs.resize( 1 ); - } - else if ( scriptURI.indexOf( userString ) != -1 ) - { - OSL_TRACE("Full resolution available, search user"); - // search in user - m_vSearchIDs[ 0 ] = ( *m_pSearchIDs )[ 1 ]; - m_vSearchIDs.resize( 1 ); - } - else if ( scriptURI.indexOf( shareString ) != -1 ) - { - OSL_TRACE("Full resolution available, search share"); - // search in share - m_vSearchIDs[ 0 ] = ( *m_pSearchIDs )[ 2 ]; - m_vSearchIDs.resize( 1 ); - } - else if ( scriptURI.indexOf( filesysString ) != -1 ) - { - OSL_TRACE("Full resolution available, create & search filesystem"); - OUString filesysURL; - try - { - filesysURL = getFilesysURL( scriptURI ); - } - catch ( const lang::IllegalArgumentException & e ) - { - OUString temp = OUSTR( "ScriptNameResolverImpl::resolve: " ); - throw RuntimeException( temp.concat( e.Message ), Reference< XInterface >() ); - } - Reference < ucb::XSimpleFileAccess2 > xSimpleFileAccess = ucb::SimpleFileAccess::create(m_xContext); - - // do we need to encode this? hope not. - OSL_TRACE( ">>>> About to create storage for %s", - ::rtl::OUStringToOString( filesysURL, - RTL_TEXTENCODING_ASCII_US ).pData->buffer ); - // ask storage manager to create storage - try - { - // need to get the ScriptStorageManager - xScriptStorageMgr.set( m_xContext->getValueByName( - scriptingConstantsPool.SCRIPTSTORAGEMANAGER_SERVICE ), UNO_QUERY_THROW ); - filesysScriptStorageID = - xScriptStorageMgr->createScriptStorageWithURI( - xSimpleFileAccess, filesysURL ); - OSL_TRACE( ">>>> Created storage %d - for %s ", - filesysScriptStorageID, ::rtl::OUStringToOString( - filesysURL, RTL_TEXTENCODING_ASCII_US ).pData->buffer ); - } - catch ( const RuntimeException & e ) - { - OUString temp = OUSTR( "ScriptNameResolverImpl::resolve: " ); - throw RuntimeException( temp.concat( e.Message ), Reference< XInterface >() ); - } - m_vSearchIDs[ 0 ] = filesysScriptStorageID; - m_vSearchIDs.resize( 1 ); - } - else - { - OSL_TRACE("Only partial uri available, search doc, user & share"); - // is this illegal or do we search in a default way - // if we get to here a uri has been passed in that has: - // a) not got a location specified - // b) an illegal location - - // detect illegal location - if ( scriptURI.indexOf( "location=" ) != -1 ) - { - OSL_TRACE( - "ScriptNameResolver::resolve, throwing IllegalArgException" ); - throw lang::IllegalArgumentException( - OUSTR( "invalid URI: " ).concat( scriptURI ), - Reference < XInterface > (), 1 ); - - } - // leave vSearchIDs take care of the search... - } - - ::std::vector< sal_Int32 >::const_iterator iter; - ::std::vector< sal_Int32 >::const_iterator iterEnd = m_vSearchIDs.end(); - - for ( iter = m_vSearchIDs.begin() ; iter != iterEnd; ++iter ) - { - try - { - OSL_TRACE( "** about to resolve from storage using id %d from vector of size %d", - *iter, m_vSearchIDs.size() ); - if ( ( resolvedName = resolveURIFromStorageID( *iter, docUri, scriptURI ) ).is() ) - { - OSL_TRACE( "found match in uri from storage %d", *iter ); - xPropSetScriptingContext->setPropertyValue( - scriptingConstantsPool.RESOLVED_STORAGE_ID, makeAny(*iter) ); - break; - } - - } - catch ( css::security::AccessControlException & ) - { - // no execute permission - OSL_TRACE( "ScriptNameResolverImpl::resolve : AccessControlException " ); - continue; - } - catch ( const beans::UnknownPropertyException & e ) - { - OUString temp = OUSTR( - "ScriptNameResolverImpl::resolve : UnknownPropertyException" ); - throw RuntimeException( temp.concat( e.Message ), - Reference< XInterface > () ); - } - catch ( const beans::PropertyVetoException & e ) - { - OUString temp = OUSTR( - "ScriptNameResolverImpl::resolve : PropertyVetoException " ); - throw RuntimeException( temp.concat( e.Message ), - Reference< XInterface > () ); - } - catch ( const lang::IllegalArgumentException & e ) - { - OUString temp = OUSTR( - "ScriptNameResolverImpl::resolve : IllegalArgumentException " ); - throw lang::IllegalArgumentException( temp.concat( e.Message ), - Reference< XInterface > (), e.ArgumentPosition ); - } - catch ( const lang::WrappedTargetException & e ) - { - OUString temp = OUSTR( - "ScriptNameResolverImpl::resolve : WrappedTargetException " ); - throw RuntimeException( temp.concat( e.Message ), - Reference< XInterface > () ); - } - catch ( const Exception & e ) - { - OSL_TRACE( - "Exception thrown by storage %d, failed to match uri: %s", - *iter, - ::rtl::OUStringToOString( e.Message, - RTL_TEXTENCODING_ASCII_US ).pData->buffer ); - OUString temp = OUSTR( - "ScriptNameResolverImpl::resolve : unknown exception" ); - throw RuntimeException( temp.concat( e.Message ), - Reference< XInterface > () ); - } -#ifdef _DEBUG - catch ( ... ) - { - OSL_TRACE( - "unknown exception thrown by storage %d, failed to match uri", - *iter ); - OUString temp = OUSTR( - "ScriptNameResolverImpl::resolve Unknown exception caught - RuntimeException rethrown" ); - throw RuntimeException( temp, - Reference< XInterface > () ); - } -#endif - - } - if ( !resolvedName.is() ) - { - if( filesysScriptStorageID > 2 ) - { - // get the filesys storage and dispose of it - Reference< XInterface > xScriptStorage( xScriptStorageMgr->getScriptStorage( filesysScriptStorageID ), UNO_SET_THROW ); - Reference< storage::XScriptInfoAccess > xScriptInfoAccess = Reference< - storage::XScriptInfoAccess > ( xScriptStorage, UNO_QUERY_THROW ); - Sequence< Reference< storage::XScriptInfo > > results = - xScriptInfoAccess->getAllImplementations( ); - Reference < lang::XEventListener > xEL_ScriptStorageMgr( xScriptStorageMgr ,UNO_QUERY_THROW ); - lang::EventObject event( results[ 0 ] ); - xEL_ScriptStorageMgr->disposing( event ); - } - throw lang::IllegalArgumentException( OUSTR( - "ScriptNameResolverImpl::resolve: no script found for uri=" ).concat( scriptURI ), - Reference< XInterface > (), 0 ); - } - return resolvedName; -} - -//************************************************************************* -OUString SAL_CALL -ScriptNameResolverImpl::getImplementationName( ) -throw( RuntimeException ) -{ - return nrs_implName; -} - -//************************************************************************* -sal_Bool SAL_CALL -ScriptNameResolverImpl::supportsService( const OUString& serviceName ) -throw( RuntimeException ) -{ - OUString const * pNames = nrs_serviceNames.getConstArray(); - for ( sal_Int32 nPos = nrs_serviceNames.getLength(); nPos--; ) - { - if ( serviceName.equals( pNames[ nPos ] ) ) - { - return sal_True; - } - } - return sal_False; -} - -//************************************************************************* - -Reference< storage::XScriptInfo > -ScriptNameResolverImpl::resolveURIFromStorageID -( sal_Int32 sid, const ::rtl::OUString & docURI, - const ::rtl::OUString& scriptURI ) -SAL_THROW ( ( lang::IllegalArgumentException, css::security::AccessControlException, RuntimeException ) ) -{ - Reference< storage::XScriptInfo > resolvedScriptInfo; - scripting_constants::ScriptingConstantsPool& scriptingConstantsPool = - scripting_constants::ScriptingConstantsPool::instance(); - if ( sid == scriptingConstantsPool.DOC_STORAGE_ID_NOT_SET ) - { - OSL_TRACE( "@@@@ **** ScriptNameResolverImpl::resolve DOC_STORAGE_ID_NOT_SET" ); - return resolvedScriptInfo; - } - try - { - OUString permissionURI = docURI; - OUString filesysString("location=filesystem"); - if ( scriptURI.indexOf( filesysString ) != -1 ) - { - // in the case of filesys scripts we're checking whether the - // location of the script, rather than the location of the document, - // has execute permission - try - { - permissionURI = getFilesysURL( scriptURI ); - } - catch ( const lang::IllegalArgumentException & e ) - { - OUString temp = OUSTR( "ScriptNameResolverImpl::resolveFromURI: " ); - throw RuntimeException( temp.concat( e.Message ), Reference< XInterface >() ); - } - } - Reference< storage::XScriptInfoAccess > storage( getStorageInstance( sid, permissionURI ), UNO_SET_THROW ); - Sequence< Reference< storage::XScriptInfo > > results = - storage->getImplementations( scriptURI ); - - const sal_Int32 length = results.getLength(); - - if ( !length ) - { - return resolvedScriptInfo; - } - - OSL_TRACE( "ScriptNameResolverImpl::resolve Got some results..." ); - // if we get results, just return first in list, - // storage has already matched language, function name etc. if - // that information was in the uri - resolvedScriptInfo = results[ 0 ]; - } - catch ( const css::security::AccessControlException & ace ) - { - OUString temp = OUSTR( - "ScriptRuntimeManager::resolveURIFromStorageID AccessControlException: " ); - throw css::security::AccessControlException( temp.concat( ace.Message ), - Reference< XInterface > (), - ace.LackingPermission ); - } - catch ( const lang::IllegalArgumentException & iae ) - { - OUString temp = OUSTR( - "ScriptRuntimeManager::resolveURIFromStorageID IllegalArgumentException: " ); - throw lang::IllegalArgumentException( temp.concat( iae.Message ), - Reference< XInterface > (), - iae.ArgumentPosition ); - } - catch ( const RuntimeException & re ) - { - OUString temp = OUSTR( - "ScriptRuntimeManager::resolveURIFromStorageID RuntimeException: " ); - throw RuntimeException( temp.concat( re.Message ), - Reference< XInterface > () ); - } - catch ( const Exception & e ) - { - OUString temp = OUSTR( - "ScriptNameResolverImpl::resolveURIFromStorageID : Exception caught - RuntimeException rethrown" ); - throw RuntimeException( temp.concat( e.Message ), - Reference< XInterface > () ); - } -#ifdef _DEBUG - catch ( ... ) - { - throw RuntimeException( OUSTR( - "ScriptNameResolverImpl::resolveURIFromStorageID Unknown exception caught - RuntimeException rethrown" ), - Reference< XInterface > () ); - } -#endif - return resolvedScriptInfo; -} -//************************************************************************* - -Reference< storage::XScriptInfoAccess > - -ScriptNameResolverImpl::getStorageInstance( sal_Int32 sid, -const ::rtl::OUString & permissionURI ) SAL_THROW ( ( RuntimeException, css::security::AccessControlException, lang::IllegalArgumentException ) ) -{ - Reference< storage::XScriptInfoAccess > xScriptInfoAccess; - try - { - Reference< XInterface > xInterface( m_xContext->getValueByName( - OUString::createFromAscii( SCRIPTSTORAGEMANAGER_SERVICE ) ), UNO_QUERY_THROW ); - // check that we have permissions for this storage - Reference< ::drafts::com::sun::star::script::framework::security::XScriptSecurity > xScriptSecurity( xInterface, UNO_QUERY_THROW ); - scripting_constants::ScriptingConstantsPool& scriptingConstantsPool = - scripting_constants::ScriptingConstantsPool::instance(); - // if we dealing with a document storage (ie. not user or share - // we need to check the permission - if( ( sid != scriptingConstantsPool.USER_STORAGE_ID ) && - ( sid != scriptingConstantsPool.SHARED_STORAGE_ID ) ) - { - xScriptSecurity->checkPermission( permissionURI, - OUString("execute") ); - // if we get here, the checkPermission hasn't thrown an - // AccessControlException, ie. permission has been granted - OSL_TRACE( "ScriptNameResolverImpl::getStorageInstance: got execute permission for ID=%d", sid ); - } - Reference< storage::XScriptStorageManager > xScriptStorageManager( xInterface, UNO_QUERY_THROW ); - Reference< XInterface > xScriptStorage( ScriptStorageManager->getScriptStorage( sid ), UNO_SET_THROW ); - xScriptInfoAccess.set( xScriptStorage, UNO_QUERY_THROW ); - } - catch ( const lang::IllegalArgumentException & e ) - { - OUString temp = OUSTR( "ScriptNameResolverImpl::getStorageInstance: " ); - throw lang::IllegalArgumentException( temp.concat( e.Message ), - Reference< XInterface >(), e.ArgumentPosition ); - } - catch ( const css::security::AccessControlException & e ) - { - OUString temp = OUSTR( "ScriptNameResolverImpl::getStorageInstance: AccessControlException " ); - throw css::security::AccessControlException( temp.concat( e.Message ), Reference< XInterface >(), e.LackingPermission ); - } - catch ( const RuntimeException & re ) - { - OUString temp = OUSTR( "ScriptNameResolverImpl::getStorageInstance: " ); - throw RuntimeException( temp.concat( re.Message ), Reference< XInterface >() ); - } - catch ( const Exception & e ) - { - OUString temp = OUSTR( "ScriptNameResolverImpl::getStorageInstance: " ); - throw RuntimeException( temp.concat( e.Message ), Reference< XInterface >() ); - } - return xScriptInfoAccess; -} -//************************************************************************* -OUString -ScriptNameResolverImpl::getFilesysURL( const OUString & scriptURI ) -throw( lang::IllegalArgumentException ) -{ - OUString filePath; - OUString fileName; - OUString filesysString("location=filesystem"); - sal_Int32 locationPos = scriptURI.indexOf( filesysString ); - // expect location=filesys:file:///foo/bar/myscript.bsh etc - // except the file url at this point is encoded - // so we should be ok searching for the '&' - sal_Int32 filesysStrLen = filesysString.getLength() + 1; - sal_Int32 endOfLocn = scriptURI.indexOf( '&', locationPos ); - if (endOfLocn == -1 ) - { - filePath = scriptURI.copy( locationPos + filesysString.getLength() + 1 ); - } - else - { - filePath = scriptURI.copy( locationPos + filesysStrLen, - endOfLocn - locationPos - filesysStrLen ); - } - //file name shoul also be encoded so again ok to search for '&' - OUString functionKey("function="); - sal_Int32 functionKeyLength = functionKey.getLength(); - sal_Int32 functionNamePos = scriptURI.indexOf( functionKey ); - if ( functionNamePos > 0 ) - { - sal_Int32 endOfFn = scriptURI.indexOf( '&', functionNamePos ); - if ( endOfFn == -1 ) - { - fileName = scriptURI.copy( functionNamePos + functionKeyLength ); - } - else - { - fileName = scriptURI.copy( functionNamePos + functionKeyLength, - endOfFn - functionNamePos - functionKeyLength ); - } - } - else - { - // we need to throw - OUString temp = OUSTR( "ScriptNameResolverImpl::getFilesysURL: error getting the filesysURL" ); - throw lang::IllegalArgumentException( temp, Reference< XInterface >(), 0 ); - } - filePath+=fileName; - OSL_TRACE( "ScriptNameResolverImpl::getFilesysURL: filesys URL = %s", - ::rtl::OUStringToOString( filePath, - RTL_TEXTENCODING_ASCII_US ).pData->buffer ); - return filePath; -} -//************************************************************************* -Sequence SAL_CALL -ScriptNameResolverImpl::getSupportedServiceNames( ) -throw( RuntimeException ) -{ - return nrs_serviceNames; -} - -//************************************************************************* -Reference< XInterface > SAL_CALL scriptnri_create( - Reference< XComponentContext > const & xComponentContext ) -SAL_THROW( ( Exception ) ) -{ - return ( cppu::OWeakObject * ) new ScriptNameResolverImpl( xComponentContext ); -} - -//************************************************************************* -Sequence< OUString > scriptnri_getSupportedServiceNames() SAL_THROW(()) -{ - return nrs_serviceNames; -} - -//************************************************************************* -OUString scriptnri_getImplementationName() SAL_THROW(()) -{ - return nrs_implName; -} -} // namespace scripting_runtimemgr - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scripting/source/runtimemgr/ScriptNameResolverImpl.hxx b/scripting/source/runtimemgr/ScriptNameResolverImpl.hxx deleted file mode 100644 index 8bcc16cfb432..000000000000 --- a/scripting/source/runtimemgr/ScriptNameResolverImpl.hxx +++ /dev/null @@ -1,103 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef _FRAMEWORK_SCRIPT_SCRIPTNAMERESOLVERIMPL_HXX_ -#define _FRAMEWORK_SCRIPT_SCRIPTNAMERESOLVERIMPL_HXX_ - -#include // helper for XInterface, XTypeProvider etc. - -#include -#include -#include -#include -#include - -#include -#include -#include - -namespace css = ::com::sun::star; - -namespace scripting_runtimemgr -{ - -class ScriptNameResolverImpl : public - ::cppu::WeakImplHelper1 < ::drafts::com::sun::star::script::framework::runtime::XScriptNameResolver > -{ -public: - /********************************************** - ScriptNameResolverImpl Constructor - @param the current context - */ - ScriptNameResolverImpl( - const css::uno::Reference< css::uno::XComponentContext > & xContext ); - ~ScriptNameResolverImpl(); - - // XServiceInfo implementation - virtual ::rtl::OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) - throw( css::uno::RuntimeException ); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException ); - - /********************************************** - resolve method - @param scriptURI this is the given ScriptURI - @param invocationCtx the invocation context contains the - documentStorageID and document reference for use in script name - resolving. On full name resolution it sets the resolvedScriptStorageID to - the actual storage location of the fully resolved script. May or may not * be the - same as the documentStorageID. - @exception CannotResolveScriptNameException - @exception IllegalArgumentException - @exception NullPointerException - @return the resolved XScriptURI - */ - css::uno::Reference < ::drafts::com::sun::star::script::framework::storage::XScriptInfo > SAL_CALL resolve( - const ::rtl::OUString & scriptURI, - css::uno::Any& invocationCtx ) - throw( css::script::CannotConvertException, css::lang::IllegalArgumentException, - css::uno::RuntimeException ); -private: - css::uno::Reference < ::drafts::com::sun::star::script::framework::storage::XScriptInfo > - resolveURIFromStorageID( sal_Int32 sid, const rtl::OUString & docURI, - const ::rtl::OUString & nameToResolve ) - SAL_THROW ( ( css::lang::IllegalArgumentException, css::uno::RuntimeException ) ); - css::uno::Reference< ::drafts::com::sun::star::script::framework::storage::XScriptInfoAccess > - getStorageInstance( sal_Int32 sid, const rtl::OUString & permissionURI) - SAL_THROW ( ( css::uno::RuntimeException ) ); - ::rtl::OUString - ScriptNameResolverImpl::getFilesysURL( const ::rtl::OUString & scriptURI ) - throw( css::lang::IllegalArgumentException ); - - /********************************************** - Reference< XComponentContext > m_xContext - to obtain other services if needed - */ - css::uno::Reference< css::uno::XComponentContext > m_xContext; - css::uno::Reference< css::lang::XMultiComponentFactory > m_xMultiComFac; - ::osl::Mutex m_mutex; - -}; -} // scripting_runtimemgr - -#endif //_FRAMEWORK_SCRIPT_SCRIPTNAMERESOLVERIMPL_HXX_ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scripting/source/runtimemgr/ScriptRuntimeManager.cxx b/scripting/source/runtimemgr/ScriptRuntimeManager.cxx deleted file mode 100644 index 59f432b93ab6..000000000000 --- a/scripting/source/runtimemgr/ScriptRuntimeManager.cxx +++ /dev/null @@ -1,466 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - - -#include - -#include "ScriptExecDialog.hrc" - -#include - -#include -#include - -#include -#include -#include - -#include "ScriptNameResolverImpl.hxx" -#include "ScriptRuntimeManager.hxx" -#include -#include - -using namespace ::rtl; -using namespace ::osl; -using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; -using namespace ::drafts::com::sun::star::script::framework; - -namespace scripting_runtimemgr -{ - -static OUString s_implName( - "drafts.com.sun.star.script.framework.runtime.ScriptRuntimeManager" ); -static OUString s_serviceName( - "drafts.com.sun.star.script.framework.runtime.ScriptRuntimeManager" ); -static Sequence< OUString > s_serviceNames = Sequence< OUString >( &s_serviceName, 1 ); - -::rtl_StandardModuleCount s_moduleCount = MODULE_COUNT_INIT; - -//************************************************************************* -// ScriptRuntimeManager Constructor -ScriptRuntimeManager::ScriptRuntimeManager( - const Reference< XComponentContext > & xContext ) : - m_xContext( xContext, UNO_SET_THROW ) -{ - OSL_TRACE( "< ScriptRuntimeManager ctor called >" ); - m_xMgr.set( m_xContext->getServiceManager(), UNO_SET_THROW ); - s_moduleCount.modCnt.acquire( &s_moduleCount.modCnt ); - // test - //scripting_securitymgr::ScriptSecurityManager ssm(xContext); -} - -//************************************************************************* -// ScriptRuntimeManager Destructor -ScriptRuntimeManager::~ScriptRuntimeManager() -{ - OSL_TRACE( "< ScriptRuntimeManager dtor called >" ); - s_moduleCount.modCnt.release( &s_moduleCount.modCnt ); -} - -//************************************************************************* -// Get the proper XScriptInvocation -Reference< runtime::XScriptInvocation > SAL_CALL ScriptRuntimeManager::getScriptRuntime( -const Reference< XInterface >& scriptInfo ) -throw( RuntimeException ) -{ - OSL_TRACE( "** ==> ScriptRuntimeManager in getScriptRuntime" ); - - Reference< runtime::XScriptInvocation > xScriptInvocation; - - try - { - Reference< XInterface > xInterface; - - Reference< storage::XScriptInfo > sinfo = - Reference< storage::XScriptInfo >( scriptInfo, UNO_QUERY_THROW ); - - OUStringBuffer* buf( 80 ); - buf.appendAscii("/singletons/drafts.com.sun.star.script.framework.runtime.theScriptRuntimeFor"); - buf.append(sinfo->getLanguage()); - - xInterface.set( m_xContext->getValueByName( buf.makeStringAndClear() ), UNO_QUERY_THROW ); - xScriptInvocation.set( xInterface, UNO_QUERY_THROW ); - } - catch ( const Exception & e ) - { - OUString temp = OUSTR( "ScriptRuntimeManager::GetScriptRuntime: " ); - throw RuntimeException( temp.concat( e.Message ), Reference< XInterface >() ); - } - - return xScriptInvocation; -} - -//************************************************************************* -// Get the proper XScriptNameResolver -Reference< runtime::XScriptNameResolver > SAL_CALL -ScriptRuntimeManager::getScriptNameResolver() -throw( RuntimeException ) -{ - OSL_TRACE( "** ==> ScriptRuntimeManager in getScriptNameResolver" ); - Reference< runtime::XScriptNameResolver > xScriptNameResolver; - - try - { - Reference< XInterface > xInterface( - m_xMgr->createInstanceWithContext( - OUString( - "drafts.com.sun.star.script.framework.runtime.DefaultScriptNameResolver" ), - m_xContext - ), - UNO_SET_THROW - ); - xScriptNameResolver.set( xInterface, UNO_QUERY_THROW ); - } - catch ( const Exception & e ) - { - OUString temp = OUSTR( "ScriptRuntimeManager::GetScriptNameResolver: " ); - throw RuntimeException( temp.concat( e.Message ), Reference< XInterface >() ); - } - return xScriptNameResolver; -} - -//************************************************************************* -// XScriptInvocation implementation -Any SAL_CALL ScriptRuntimeManager::invoke( - const ::rtl::OUString & scriptURI, - const Any& invocationCtx, const Sequence< Any >& aParams, - Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam ) - throw ( lang::IllegalArgumentException, script::CannotConvertException, - reflection::InvocationTargetException, RuntimeException ) -{ - OSL_TRACE( "** ==> ScriptRuntimeManager in runtimemgr invoke" ); - - Any results; - scripting_constants::ScriptingConstantsPool& scriptingConstantsPool = - scripting_constants::ScriptingConstantsPool::instance(); - - // Initialise resolved context with invocation context, - // the resolved context (resolvedCtx will be modified by the - // resolve method to contain the storage where the script code is - // stored - Any resolvedCtx = invocationCtx; - - try - { - Reference< storage::XScriptInfo > resolvedScript = resolve( scriptURI, resolvedCtx ); - ENSURE_OR_THROW( resolvedScript.is(), "ScriptRuntimeManager::invoke: No resolvedURI" ); - - Reference< beans::XPropertySet > xPropSetResolvedCtx; - if ( sal_False == ( resolvedCtx >>= xPropSetResolvedCtx ) ) - { - throw RuntimeException( OUSTR( - "ScriptRuntimeManager::invoke : unable to get XPropSetScriptingContext from param" ), - Reference< XInterface > () ); - } - - Any any = xPropSetResolvedCtx->getPropertyValue( - scriptingConstantsPool.RESOLVED_STORAGE_ID ); - sal_Int32 resolvedSid; - if ( sal_False == ( any >>= resolvedSid ) ) - { - throw RuntimeException( OUSTR( - "ScriptRuntimeManager::invoke : unable to get resolved storage id from xPropSetResolvedCtx" ), - Reference< XInterface > () ); - } - - OSL_TRACE("Storage sid is: %d", resolvedSid); - - // modifying the XPropertySet on the resolved Context to contain the - // full script info - Any aResolvedScript; - aResolvedScript <<= resolvedScript; - - xPropSetResolvedCtx->setPropertyValue( scriptingConstantsPool.SCRIPT_INFO, - aResolvedScript ); - - Reference< runtime::XScriptInvocation > xScriptInvocation = - getScriptRuntime( resolvedScript ); - ENSURE_OR_THROW( xScriptInvocation.is(), - "ScriptRuntimeManager::invoke: cannot get instance of language specific runtime." ); - - // the scriptURI is currently passed to the language-dept runtime but - // is not used (may be useful in the future?). All of the script info - // is contained as a property(SCRIPT_INFO) within the resolvedCtx - results = xScriptInvocation->invoke( scriptURI, resolvedCtx, aParams, - aOutParamIndex, aOutParam ); - - // need to dispose of filesystem storage - OUString filesysString( "location=filesystem" ); - if ( scriptURI.indexOf( filesysString ) != -1 ) - { - Any a = m_xContext->getValueByName( - scriptingConstantsPool.SCRIPTSTORAGEMANAGER_SERVICE ); - Reference < lang::XEventListener > xEL_ScriptStorageManager( a, UNO_QUERY_THROW ); - lang::EventObject event(resolvedScript); - xEL_ScriptStorageManager->disposing( event ); - } - } - catch ( const lang::IllegalArgumentException & iae ) - { - OUString temp = OUSTR( "ScriptRuntimeManager::invoke IllegalArgumentException: " ); - throw lang::IllegalArgumentException( temp.concat( iae.Message ), - Reference< XInterface > (), - iae.ArgumentPosition ); - } - catch ( const script::CannotConvertException & cce ) - { - OUString temp = OUSTR( "ScriptRuntimeManager::invoke CannotConvertException: " ); - throw script::CannotConvertException( temp.concat( cce.Message ), - Reference< XInterface > (), - cce.DestinationTypeClass, cce.Reason, - cce.ArgumentIndex ); - } - catch ( const reflection::InvocationTargetException & ite ) - { - OUString temp = OUSTR( "ScriptRuntimeManager::invoke InvocationTargetException: " ); - throw reflection::InvocationTargetException( temp.concat( ite.Message ), - Reference< XInterface > (), ite.TargetException ); - } - catch ( const beans::UnknownPropertyException & e ) - { - OUString temp = OUSTR( "ScriptRuntimeManager::invoke UnknownPropertyException: " ); - throw RuntimeException( temp.concat( e.Message ), - Reference< XInterface > () ); - } - catch ( const lang::WrappedTargetException & e ) - { - OUString temp = OUSTR( "ScriptRuntimeManager::invoke WrappedTargetException : " ); - throw RuntimeException( temp.concat( e.Message ), - Reference< XInterface > () ); - } - catch ( const RuntimeException & re ) - { - OUString temp = OUSTR( "ScriptRuntimeManager::invoke RuntimeException: " ); - throw RuntimeException( temp.concat( re.Message ), - Reference< XInterface > () ); - } - catch ( const Exception & e ) - { - OUString temp = OUSTR( "ScriptRuntimeManager::invoke Exception: " ); - throw RuntimeException( temp.concat( e.Message ), - Reference< XInterface > () ); - } -#ifdef _DEBUG - catch ( ... ) - { - throw RuntimeException( OUSTR( "ScriptRuntimeManager::invoke UnknownException: " ), - Reference< XInterface > () ); - } -#endif - OSL_TRACE( "** ==> ScriptRuntimeManager returned from invoke: %s", ::rtl::OUStringToOString( results.getValueTypeName(), RTL_TEXTENCODING_ASCII_US ).pData->buffer ); - return results; -} - -//************************************************************************* -// XScriptNameResolver implementation -Reference< storage::XScriptInfo > SAL_CALL -ScriptRuntimeManager::resolve( const ::rtl::OUString& scriptURI, - Any& invocationCtx ) -throw( lang::IllegalArgumentException, script::CannotConvertException, RuntimeException ) -{ - OSL_TRACE( "** ==> ScriptRuntimeManager in resolve" ); - Reference< storage::XScriptInfo > resolvedURI; - - Reference< runtime::XScriptNameResolver > xScriptNameResolver = getScriptNameResolver(); - ENSURE_OR_THROW( xScriptNameResolver.is(), - "ScriptRuntimeManager::resolve: No ScriptNameResolver" ); - - try - { - resolvedURI = xScriptNameResolver->resolve( scriptURI, invocationCtx ); - } - catch ( const lang::IllegalArgumentException & iae ) - { - OUString temp = - OUSTR( "ScriptRuntimeManager::resolve IllegalArgumentException: " ); - throw lang::IllegalArgumentException( temp.concat( iae.Message ), - Reference< XInterface > (), - iae.ArgumentPosition ); - } - catch ( const script::CannotConvertException & cce ) - { - OUString temp = OUSTR( "ScriptRuntimeManager::resolve CannotConvertException: " ); - throw script::CannotConvertException( temp.concat( cce.Message ), - Reference< XInterface > (), - cce.DestinationTypeClass, cce.Reason, - cce.ArgumentIndex ); - } - catch ( const RuntimeException & re ) - { - OUString temp = OUSTR( "ScriptRuntimeManager::resolve RuntimeException: " ); - throw RuntimeException( temp.concat( re.Message ), - Reference< XInterface > () ); - } -#ifdef _DEBUG - catch ( ... ) - { - throw RuntimeException( - OUSTR( "ScriptRuntimeManager::resolve UnknownException: " ), - Reference< XInterface > () ); - } -#endif - - return resolvedURI; -} - -//************************************************************************* -OUString SAL_CALL ScriptRuntimeManager::getImplementationName( ) -throw( RuntimeException ) -{ - return s_implName; -} - -//************************************************************************* -sal_Bool SAL_CALL ScriptRuntimeManager::supportsService( const OUString& serviceName ) -throw( RuntimeException ) -{ - OUString const * pNames = s_serviceNames.getConstArray(); - for ( sal_Int32 nPos = s_serviceNames.getLength(); nPos--; ) - { - if ( serviceName.equals( pNames[ nPos ] ) ) - { - return sal_True; - } - } - return sal_False; -} - -//************************************************************************* -Sequence SAL_CALL ScriptRuntimeManager::getSupportedServiceNames( ) -throw( RuntimeException ) -{ - return s_serviceNames; -} - -//************************************************************************* -static Reference< XInterface > SAL_CALL srm_create( - const Reference< XComponentContext > & xCompC ) -{ - return ( cppu::OWeakObject * ) new ScriptRuntimeManager( xCompC ); -} - -//************************************************************************* -static Sequence srm_getSupportedServiceNames( ) -SAL_THROW(()) -{ - return s_serviceNames; -} - -//************************************************************************* -static OUString srm_getImplementationName( ) -SAL_THROW(()) -{ - return s_implName; -} - -//************************************************************************* -Reference< XInterface > SAL_CALL scriptnri_create( - Reference< XComponentContext > const & xComponentContext ) -SAL_THROW( ( Exception ) ); - -//************************************************************************* -Sequence< OUString > scriptnri_getSupportedServiceNames() SAL_THROW(()); - -//************************************************************************* -OUString scriptnri_getImplementationName() SAL_THROW(()); - -//******************** ScriptStorageMangaer defines *********************** -Reference< XInterface > SAL_CALL ssm_create( - Reference< XComponentContext > const & xComponentContext ) -SAL_THROW( ( Exception ) ); -//************************************************************************* -Sequence< OUString > ssm_getSupportedServiceNames() SAL_THROW(()); -//************************************************************************* -OUString ssm_getImplementationName() SAL_THROW(()); -//************************************************************************* - -//************ Script Provider defines ************************************ -Reference< XInterface > SAL_CALL sp_create( const Reference< XComponentContext > & xCompC ); -//******************** ScriptProvider defines *************************** -Sequence< OUString > sp_getSupportedServiceNames( ) SAL_THROW(()); -//************************************************************************* -OUString sp_getImplementationName( ) SAL_THROW(()); -//************************************************************************* - -//************ ScriptStorage defines ************************************** -Reference< XInterface > SAL_CALL ss_create( const Reference< XComponentContext > & xCompC ); -//******************** ScriptProvider defines *************************** -Sequence< OUString > ss_getSupportedServiceNames( ) SAL_THROW(()); -//************************************************************************* -OUString ss_getImplementationName( ) SAL_THROW(()); -//************************************************************************* - - -static struct cppu::ImplementationEntry s_entries [] = - { - { - srm_create, srm_getImplementationName, - srm_getSupportedServiceNames, cppu::createSingleComponentFactory, - &s_moduleCount.modCnt, 0 - }, - { - scriptnri_create, scriptnri_getImplementationName, - scriptnri_getSupportedServiceNames, cppu::createSingleComponentFactory, - &s_moduleCount.modCnt, 0 - }, - { - ssm_create, ssm_getImplementationName, - ssm_getSupportedServiceNames, cppu::createSingleComponentFactory, - 0, 0 - }, - { - ss_create, ss_getImplementationName, - ss_getSupportedServiceNames, cppu::createSingleComponentFactory, - 0, 0 - }, - { - sp_create, sp_getImplementationName, - sp_getSupportedServiceNames, cppu::createSingleComponentFactory, - 0, 0 - }, - { 0, 0, 0, 0, 0, 0 } - }; -} // Namespace - -//####################################################################################### -//#### EXPORTED ######################################################################### -//####################################################################################### - -extern "C" -{ - /** - * This function is called to get service factories for an implementation. - * - * @param pImplName name of implementation - * @param pServiceManager a service manager, need for component creation - * @param pRegistryKey the registry key for this component, need for persistent - * data - * @return a component factory - */ - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, - lang::XMultiServiceFactory * pServiceManager, - registry::XRegistryKey * pRegistryKey ) - { - return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, - pRegistryKey, ::scripting_runtimemgr::s_entries ); - } -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scripting/source/runtimemgr/ScriptRuntimeManager.hxx b/scripting/source/runtimemgr/ScriptRuntimeManager.hxx deleted file mode 100644 index 168feb72f1db..000000000000 --- a/scripting/source/runtimemgr/ScriptRuntimeManager.hxx +++ /dev/null @@ -1,142 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - - -#ifndef _FRAMEWORK_SCRIPT_SCRIPTRUNTIMEMANAGER_HXX_ -#define _FRAMEWORK_SCRIPT_SCRIPTRUNTIMEMANAGER_HXX_ - -#include - -#include -#include - -#include -#include -#include -#include -#include - -#include -#include - -namespace css = ::com::sun::star; - -namespace scripting_runtimemgr -{ - -/** - * Class responsible for managing the various ScriptRuntime implementations. - */ -class ScriptRuntimeManager : public - ::cppu::WeakImplHelper3< ::drafts::com::sun::star::script::framework::runtime::XScriptInvocation, css::lang::XServiceInfo, - ::drafts::com::sun::star::script::framework::runtime::XScriptNameResolver > -{ -public: - explicit ScriptRuntimeManager( - const css::uno::Reference< css::uno::XComponentContext > & xContext ); - ~ScriptRuntimeManager(); - - - // XServiceInfo implementation - virtual ::rtl::OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) - throw( css::uno::RuntimeException ); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException ); - - /** - * implements XScriptInvocation, invokes the script named in scriptURI - * (resolving it first, if necessary), with the args passed. - * - * @param scriptURI the URI, which may not be fully qualified, for the - * script to be invoked - * - ************************************************************* - Invoke - @param scriptUri script uri describing the script - @param invocationCtx - the invocation context contains the documentStorageID and document reference - for use in script name resolving - - @param aParams all parameters; pure, out params are undefined in sequence, - i.e., the value has to be ignored by the callee - @param aOutParamIndex out indices - @param aOutParam out parameters - - @returns - the value returned from the function being invoked - - @throws IllegalArgumentException - if there is no matching script name - - @throws CannotConvertException - if args do not match or cannot be converted the those - of the invokee - - @throws InvocationTargetException - if the running script throws an exception this information is captured and - rethrown as this exception type. - - */ - virtual css::uno::Any SAL_CALL invoke( - const ::rtl::OUString & scriptUri, - const css::uno::Any& invocationCtx, - const css::uno::Sequence< css::uno::Any >& aParams, - css::uno::Sequence< sal_Int16 >& aOutParamIndex, - css::uno::Sequence< css::uno::Any >& aOutParam ) - throw ( css::lang::IllegalArgumentException, - css::script::CannotConvertException, - css::reflection::InvocationTargetException, - css::uno::RuntimeException ); - - /** - * implements XScriptNameResolver, attempts to resolve the script URI - * passed in - * - * @param scriptURI the URI to be resolved - * @param invocationCtx the invocation context contains the - * documentStorageID and document reference for use in script name - * resolving. On full name resolution it sets the resolvedScriptStorageID to - * the actual storage location of the fully resolved script. May or may not * be the - same as the documentStorageID. - * @return the resolved URI - */ - virtual css::uno::Reference< ::drafts::com::sun::star::script::framework::storage::XScriptInfo > SAL_CALL resolve( - const ::rtl::OUString& scriptUri, - css::uno::Any& invocationCtx ) - throw( css::lang::IllegalArgumentException, css::script::CannotConvertException, - css::uno::RuntimeException ); - -private: - css::uno::Reference< ::drafts::com::sun::star::script::framework::runtime::XScriptInvocation > SAL_CALL getScriptRuntime( - const css::uno::Reference< css::uno::XInterface > & scriptInfo ) - throw( css::uno::RuntimeException ); - css::uno::Reference< ::drafts::com::sun::star::script::framework::runtime::XScriptNameResolver > SAL_CALL getScriptNameResolver() - throw( css::uno::RuntimeException ); - - css::uno::Reference< css::uno::XComponentContext > m_xContext; - css::uno::Reference< css::lang::XMultiComponentFactory > m_xMgr; - ::osl::Mutex m_mutex; -}; -} // scripting_runtimemgr - -#endif //_FRAMEWORK_SCRIPT_SCRIPTRUNTIMEMANAGER_HXX_ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scripting/source/runtimemgr/StorageBridge.cxx b/scripting/source/runtimemgr/StorageBridge.cxx deleted file mode 100644 index 7e223643c7e1..000000000000 --- a/scripting/source/runtimemgr/StorageBridge.cxx +++ /dev/null @@ -1,124 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - - -#include -#include - -#include "StorageBridge.hxx" -#include - -using namespace ::rtl; -using namespace ::osl; -using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; -using namespace ::drafts::com::sun::star::script::framework; - -namespace scripting_runtimemgr -{ - -const char* const SCRIPTIMPLACCESS_SERVICE = - "drafts.com.sun.star.script.framework.storage.StorageProxy"; -const char* const SCRIPTSTORAGEMANAGER_SERVICE = - "/singletons/drafts.com.sun.star.script.framework.storage.theScriptStorageManager"; -const int STORAGEID = 0; -const int STORAGEPROXY = 0; - - -//************************************************************************* -// StorageBridge Constructor -StorageBridge::StorageBridge( const Reference< XComponentContext >& xContext, - sal_Int32 sid ) : m_xContext( xContext, UNO_SET_THROW ), m_sid( sid ) -{ - try - { - initStorage(); - } - catch ( const RuntimeException & re ) - { - OUString temp = OUSTR( "StorageBridge::StorageBridge(salIn32&): " ); - throw RuntimeException( temp.concat( re.Message ), Reference< XInterface >() ); - } -} - -//************************************************************************* -void -StorageBridge::initStorage() throw ( ::com::sun::star::uno::RuntimeException ) -{ - try - { - Reference< lang::XMultiComponentFactory > xMultiComFac( m_xContext->getServiceManager(), UNO_SET_THROW ); - Reference< XInterface > temp( m_xContext->getValueByName( - OUString::createFromAscii( SCRIPTSTORAGEMANAGER_SERVICE ) ), UNO_QUERY_THROW ); - Reference< storage::XScriptStorageManager > xScriptStorageManager( temp, UNO_QUERY_THROW ); - Reference< XInterface > xScriptStorage( xScriptStorageManager->getScriptStorage( m_sid ), UNO_SET_THROW ); - m_xScriptInfoAccess.set( xScriptStorage, UNO_QUERY_THROW ); - } - catch ( const RuntimeException & re ) - { - OUString temp = OUSTR( "StorageBridge::StorageBridge: " ); - throw RuntimeException( temp.concat( re.Message ), Reference< XInterface >() ); - } - catch ( const Exception & e ) - { - OUString temp = OUSTR( "StorageBridge::StorageBridge: " ); - throw RuntimeException( temp.concat( e.Message ), Reference< XInterface >() ); - } -} -//************************************************************************* -Sequence< ::rtl::OUString > -StorageBridge::getScriptLogicalNames() -throw ( lang::IllegalArgumentException, - RuntimeException ) -{ - OSL_TRACE( "In StorageBridge getScriptLogicalNames..." ); - Sequence < ::rtl::OUString > results; - try - { - results = m_xScriptInfoAccess->getScriptLogicalNames(); - } - catch ( const Exception &e ) - { - OUString temp = OUSTR( "StorageBridge::getScriptLogicalNames: " ); - throw RuntimeException( temp.concat( e.Message ), Reference< XInterface >() ); - } - return results; -} - -//************************************************************************* -Sequence < Reference< storage::XScriptInfo > > -StorageBridge::getImplementations( const ::rtl::OUString& queryURI ) -throw ( lang::IllegalArgumentException, RuntimeException ) -{ - OSL_TRACE( "In StorageBridge getImplementations..." ); - Sequence < Reference< storage::XScriptInfo > > results; - try - { - results = m_xScriptInfoAccess->getImplementations( queryURI ); - } - catch ( const Exception &e ) - { - OUString temp = OUSTR( "StorageBridge::getImplementations: " ); - throw RuntimeException( temp.concat( e.Message ), Reference< XInterface >() ); - } - return results; -} -}// namespace - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scripting/source/runtimemgr/StorageBridge.hxx b/scripting/source/runtimemgr/StorageBridge.hxx deleted file mode 100644 index 36307f796081..000000000000 --- a/scripting/source/runtimemgr/StorageBridge.hxx +++ /dev/null @@ -1,78 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - - -#ifndef _FRAMEWORK_SCRIPT_STORAGEBRIDGE_HXX_ -#define _FRAMEWORK_SCRIPT_STORAGEBRIDGE_HXX_ - -#include -#include - -#include -#include "StorageBridgeFactory.hxx" - -namespace css = ::com::sun::star; - -namespace scripting_runtimemgr -{ - -class StorageBridge : public ::cppu::WeakImplHelper1< ::drafts::com::sun::star::script::framework::storage::XScriptInfoAccess > -{ - friend class StorageBridgeFactory; -public: - //XScriptInfoAccess - //========================================================================= - /** - * Get the implementations for a given URI - * - * @param queryURI - * The URI to get the implementations for - * - * @return XScriptURI - * The URIs of the implementations - */ - virtual css::uno::Sequence< css::uno::Reference< ::drafts::com::sun::star::script::framework::storage::XScriptInfo > > - SAL_CALL getImplementations( - const ::rtl::OUString& queryURI ) - throw ( css::lang::IllegalArgumentException, - css::uno::RuntimeException ); - //========================================================================= - /** - * Get the all logical names stored in this storage - * - * @return sequence < ::rtl::OUString > - * The logical names - */ - virtual css::uno::Sequence< ::rtl::OUString > - SAL_CALL getScriptLogicalNames() - throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException ); -private: - StorageBridge( const css::uno::Reference< css::uno::XComponentContext >& xContext, - sal_Int32 sid ); - - void initStorage() throw ( css::uno::RuntimeException ); - css::uno::Reference< css::uno::XComponentContext > m_xContext; - css::uno::Reference< ::drafts::com::sun::star::script::framework::storage::XScriptInfoAccess > m_xScriptInfoAccess; - sal_Int32 m_sid; -}; -} - -#endif //_COM_SUN_STAR_SCRIPTING_STORAGEBRIDGE_HXX_ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scripting/source/runtimemgr/StorageBridgeFactory.cxx b/scripting/source/runtimemgr/StorageBridgeFactory.cxx deleted file mode 100644 index 003aab07e211..000000000000 --- a/scripting/source/runtimemgr/StorageBridgeFactory.cxx +++ /dev/null @@ -1,59 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "StorageBridgeFactory.hxx" - -#include "StorageBridge.hxx" - -using namespace ::drafts::com::sun::star::script::framework; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star; - -namespace scripting_runtimemgr -{ - -//************************************************************************* -StorageBridgeFactory::StorageBridgeFactory( - const Reference< XComponentContext >& xContext ) : - m_xContext( xContext ) -{} - - - -//************************************************************************* -// StorageBridge is a bridge between us an storage, the StorageBridge implements the -// XScriptInfoAccess -// interface, it allows both the "real" storage and a java test storage component to be -// configured. -// @param location contains a url for the document. -// @returns a storage instance for the location "location". -// @see StorageBridge.cxx for flag "STORAGEPROXY", set to use java "test" component or -// use "real" storage. - -Reference< storage::XScriptInfoAccess > -StorageBridgeFactory::getStorageInstance( sal_Int32 sid ) -{ - - Reference< storage::XScriptInfoAccess > storage = new StorageBridge( m_xContext, - sid ) ; - return storage; -} -} //scripting_runtimemgr - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scripting/source/runtimemgr/StorageBridgeFactory.hxx b/scripting/source/runtimemgr/StorageBridgeFactory.hxx deleted file mode 100644 index 6ea577507eed..000000000000 --- a/scripting/source/runtimemgr/StorageBridgeFactory.hxx +++ /dev/null @@ -1,51 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - - -#ifndef _FRAMEWORK_SCRIPT_STORAGEBRIDGEFACTORY_HXX_ -#define _FRAMEWORK_SCRIPT_STORAGEBRIDGEFACTORY_HXX_ - -#include - -#include -#include - -#include - -namespace css = ::com::sun::star; - -namespace scripting_runtimemgr -{ - -class StorageBridgeFactory -{ - -public: - explicit StorageBridgeFactory( - const css::uno::Reference < css::uno::XComponentContext > & xContext ); - css::uno::Reference < ::drafts::com::sun::star::script::framework::storage::XScriptInfoAccess > - getStorageInstance( sal_Int32 sid ); -private: - StorageBridgeFactory(); // No definition for default ctor - css::uno::Reference< css::uno::XComponentContext > m_xContext; -}; -} // scripting_runtimemgr -#endif //_FRAMEWORK_SCRIPT_NAMERESOLVER_HXX_ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scripting/source/runtimemgr/makefile.mk b/scripting/source/runtimemgr/makefile.mk deleted file mode 100644 index a750b28179b3..000000000000 --- a/scripting/source/runtimemgr/makefile.mk +++ /dev/null @@ -1,39 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# -PRJ=..$/.. - -PRJNAME= scripting -TARGET= runtimemgr -USE_DEFFILE= TRUE -ENABLE_EXCEPTIONS=TRUE -COMP1TYPELIST=$(TARGET) - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# ------------------------------------------------------------------ - -SLOFILES=\ - $(SLO)$/ScriptNameResolverImpl.obj\ - $(SLO)$/ScriptRuntimeManager.obj \ - - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/scripting/source/runtimemgr/runtimemgr.xml b/scripting/source/runtimemgr/runtimemgr.xml deleted file mode 100644 index 84c912f5f0c3..000000000000 --- a/scripting/source/runtimemgr/runtimemgr.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - ScriptRuntimeManager - - Alexis Ledoux - drafts.com.sun.star.script.framework.ScriptRuntimeManager - - This component is part of the Scripting Framework - - com.sun.star.loader.SharedLibrary - c++ - - drafts.com.sun.star.script.framework.ScriptRuntimeManager - com.sun.star.lang.XSingleServiceFactory - com.sun.star.lang.XMultiComponentFactory - com.sun.star.lang.XSingleComponentFactory - com.sun.star.uno.XNamingService - com.sun.star.uno.XWeak - com.sun.star.lang.XMain - com.sun.star.uno.XAggregation - com.sun.star.lang.XMultiServiceFactory - com.sun.star.lang.XTypeProvider - com.sun.star.registry.XSimpleRegistry - com.sun.star.loader.XImplementationLoader - com.sun.star.registry.XImplementationRegistration - com.sun.star.lang.XComponent - com.sun.star.connection.XAcceptor - com.sun.star.connection.XConnector - com.sun.star.container.XHierarchicalNameAccess - com.sun.star.lang.XServiceInfo - com.sun.star.io.XOutputStream - drafts.com.sun.star.script.framework.storage.XScriptInfoAccess - drafts.com.sun.star.script.framework.storage.XScriptStorageManager - drafts.com.sun.star.script.framework.runtime.XScriptInvocation - drafts.com.sun.star.script.framework.runtime.XScriptNameResolver - - cppuhelper - cppu - sal - cppuhelper$(UDK_MAJOR)$(COM) - salhelper$(UDK_MAJOR)$(COM) - cppu$(UDK_MAJOR) - reg$(UDK_MAJOR) - store$(UDK_MAJOR) - sal$(UDK_MAJOR) - From 55745cd1ff32794df99df5403a825e34b43c9931 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 3 Oct 2012 13:09:27 +0200 Subject: [PATCH 249/863] Dead xml2cmp-related test code Change-Id: I44b7f56aa1b4b9bc290c9c15281b64947a694e5c --- .../test/excomp/example/ExampleComponent1.idl | 34 --- .../test/excomp/example/ExampleComponent2.idl | 34 --- stoc/test/excomp/example/XTest.idl | 40 --- stoc/test/excomp/excomp.cxx | 123 -------- stoc/test/excomp/excomp1.cxx | 201 ------------- stoc/test/excomp/excomp1.xml | 48 ---- stoc/test/excomp/excomp2.cxx | 272 ------------------ stoc/test/excomp/excomp2.xml | 48 ---- stoc/test/excomp/exports.dxp | 2 - stoc/test/excomp/makefile.mk | 119 -------- 10 files changed, 921 deletions(-) delete mode 100644 stoc/test/excomp/example/ExampleComponent1.idl delete mode 100644 stoc/test/excomp/example/ExampleComponent2.idl delete mode 100644 stoc/test/excomp/example/XTest.idl delete mode 100644 stoc/test/excomp/excomp.cxx delete mode 100644 stoc/test/excomp/excomp1.cxx delete mode 100644 stoc/test/excomp/excomp1.xml delete mode 100644 stoc/test/excomp/excomp2.cxx delete mode 100644 stoc/test/excomp/excomp2.xml delete mode 100644 stoc/test/excomp/exports.dxp delete mode 100644 stoc/test/excomp/makefile.mk diff --git a/stoc/test/excomp/example/ExampleComponent1.idl b/stoc/test/excomp/example/ExampleComponent1.idl deleted file mode 100644 index e32e8883f034..000000000000 --- a/stoc/test/excomp/example/ExampleComponent1.idl +++ /dev/null @@ -1,34 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef _EXCOMP_EXAMPLECOMPONENT1_IDL_ -#define _EXCOMP_EXAMPLECOMPONENT1_IDL_ - -#include - -module example -{ - -service ExampleComponent1 -{ - interface XTest; -}; - -}; // test - - -#endif diff --git a/stoc/test/excomp/example/ExampleComponent2.idl b/stoc/test/excomp/example/ExampleComponent2.idl deleted file mode 100644 index 5091ad072d0a..000000000000 --- a/stoc/test/excomp/example/ExampleComponent2.idl +++ /dev/null @@ -1,34 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef _EXCOMP_EXAMPLECOMPONENT2_IDL_ -#define _EXCOMP_EXAMPLECOMPONENT2_IDL_ - -#include - -module example -{ - -service ExampleComponent2 -{ - interface XTest; -}; - -}; // test - - -#endif diff --git a/stoc/test/excomp/example/XTest.idl b/stoc/test/excomp/example/XTest.idl deleted file mode 100644 index 68f9f121f734..000000000000 --- a/stoc/test/excomp/example/XTest.idl +++ /dev/null @@ -1,40 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef _EXCOMP_XTEST_IDL_ -#define _EXCOMP_XTEST_IDL_ - -#include - -module example -{ -/** - * Simple test interface. - * - * @author Juergen Schmidt - */ -interface XTest : com::sun::star::uno::XInterface -{ - /** - * in parameter test, tests by calls reference also (complex types) - */ - string getMessage( ); -}; - -}; // test - -#endif diff --git a/stoc/test/excomp/excomp.cxx b/stoc/test/excomp/excomp.cxx deleted file mode 100644 index 84c07d016ec4..000000000000 --- a/stoc/test/excomp/excomp.cxx +++ /dev/null @@ -1,123 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - - -#include -#include -#include - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - - -using namespace com::sun::star::uno; -using namespace com::sun::star::registry; -using namespace com::sun::star::lang; -using namespace example; -using namespace cppu; - -using ::rtl::OUString; -using ::rtl::OUStringToOString; - -OUString getExePath() -{ - OUString exe; - - OSL_VERIFY(osl_getExecutableFile( &exe.pData) == osl_Process_E_None); - -#if defined(WIN32) || defined(WNT) - exe = exe.copy(0, exe.getLength() - 10); -#else - exe = exe.copy(0, exe.getLength() - 6); -#endif - return exe; -} - -SAL_IMPLEMENT_MAIN() -{ -#ifdef UNX - OUString compName1("libexcomp1.so"); - OUString compName2("libexcomp2.so"); -#else - OUString compName1("excomp1"); - OUString compName2("excomp2"); -#endif - - OUString exePath( getExePath() ); - OUString excompRdb(exePath); - - excompRdb += OUString("excomp.rdb"); - - Reference< XMultiServiceFactory > xSMgr = ::cppu::createRegistryServiceFactory( excompRdb ); - OSL_ENSURE( xSMgr.is(), "excomp error 0" ); - - typelib_TypeDescription* pTypeDesc = NULL; - OUString sType("com.sun.star.text.XTextDocument"); - typelib_typedescription_getByName( &pTypeDesc, sType.pData); -// typelib_InterfaceTypeDescription* pInterDesc = (typelib_InterfaceTypeDescription*)pTypeDesc; - - Reference< XInterface > xIFace = xSMgr->createInstance(OUString("com.sun.star.registry.ImplementationRegistration")); - Reference< XImplementationRegistration > xImpReg( xIFace, UNO_QUERY); - OSL_ENSURE( xImpReg.is(), "excomp error 1" ); - try - { - xImpReg->registerImplementation(OUString("com.sun.star.loader.SharedLibrary"), - compName1, - Reference< XSimpleRegistry >() ); - xImpReg->registerImplementation(OUString("com.sun.star.loader.SharedLibrary"), - compName2, - Reference< XSimpleRegistry >() ); - } - catch(const CannotRegisterImplementationException& e) - { - OSL_ENSURE( e.Message.getLength(), OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US).getStr() ); - } - - Reference< XTest > xTest1( xSMgr->createInstance(OUString("example.ExampleComponent1")), - UNO_QUERY); - OSL_ENSURE( xTest1.is(), "excomp error 2" ); - Reference< XTest > xTest2( xSMgr->createInstance(OUString("example.ExampleComponent2")), - UNO_QUERY); - OSL_ENSURE( xTest2.is(), "excomp error 3" ); - - OUString m1 = xTest1->getMessage(); - OUString m2 = xTest2->getMessage(); - - fprintf(stdout, "ExampleComponent1, Message = \"%s\"\n", OUStringToOString(m1, RTL_TEXTENCODING_ASCII_US).getStr()); - fprintf(stdout, "ExampleComponent2, Message = \"%s\"\n", OUStringToOString(m2, RTL_TEXTENCODING_ASCII_US).getStr()); - - xImpReg->revokeImplementation(compName1, Reference< XSimpleRegistry >() ); - xImpReg->revokeImplementation(compName2, Reference< XSimpleRegistry >() ); - - Reference< XComponent >( xSMgr, UNO_QUERY )->dispose(); - - return(0); -} - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/stoc/test/excomp/excomp1.cxx b/stoc/test/excomp/excomp1.cxx deleted file mode 100644 index 8d467a243459..000000000000 --- a/stoc/test/excomp/excomp1.cxx +++ /dev/null @@ -1,201 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -using namespace example; -using namespace com::sun::star::uno; -using namespace com::sun::star::lang; -using namespace com::sun::star::registry; -using namespace cppu; -using namespace osl; - -using ::rtl::OUString; - -#define SERVICENAME1 "example.ExampleComponent1" -#define IMPLNAME1 "example.ExampleComponent1.Impl" - -namespace excomp_impl { - -//************************************************************************* -// ExampleComponent1Impl -//************************************************************************* -class ExampleComponent1Impl : public WeakImplHelper2< XTest, XServiceInfo > -{ -public: - ExampleComponent1Impl( const Reference & rXSMgr ); - - ~ExampleComponent1Impl(); - - // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(RuntimeException); - static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ); - - // XSimpleRegistry - virtual OUString SAL_CALL getMessage() throw(RuntimeException); - -protected: - Mutex m_mutex; - - Reference m_xSMgr; -}; - -//************************************************************************* -ExampleComponent1Impl::ExampleComponent1Impl( const Reference & rXSMgr ) - : m_xSMgr(rXSMgr) -{ -} - -//************************************************************************* -ExampleComponent1Impl::~ExampleComponent1Impl() -{ -} - -//************************************************************************* -OUString SAL_CALL ExampleComponent1Impl::getImplementationName( ) - throw(RuntimeException) -{ - Guard< Mutex > aGuard( m_mutex ); - return OUString( IMPLNAME1 ); -} - -//************************************************************************* -sal_Bool SAL_CALL ExampleComponent1Impl::supportsService( const OUString& ServiceName ) - throw(RuntimeException) -{ - Guard< Mutex > aGuard( m_mutex ); - Sequence< OUString > aSNL = getSupportedServiceNames(); - const OUString * pArray = aSNL.getArray(); - for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) - if( pArray[i] == ServiceName ) - return sal_True; - return sal_False; -} - -//************************************************************************* -Sequence SAL_CALL ExampleComponent1Impl::getSupportedServiceNames( ) - throw(RuntimeException) -{ - Guard< Mutex > aGuard( m_mutex ); - return getSupportedServiceNames_Static(); -} - -//************************************************************************* -Sequence SAL_CALL ExampleComponent1Impl::getSupportedServiceNames_Static( ) -{ - OUString aName( SERVICENAME1 ); - return Sequence< OUString >( &aName, 1 ); -} - -//************************************************************************* -OUString SAL_CALL ExampleComponent1Impl::getMessage() throw(RuntimeException) -{ - Guard< Mutex > aGuard( m_mutex ); - return OUString("Lalelu nur der Mann im Mond schaut zu ..."); -} - - -//************************************************************************* -Reference SAL_CALL ExampleComponent1_CreateInstance( const Reference& rSMgr ) -{ - Reference xRet; - - XTest *pXTest = (XTest*) new ExampleComponent1Impl(rSMgr); - - if (pXTest) - { - xRet = Reference< XInterface >::query(pXTest); - } - - return xRet; -} - -} // excomp_impl - - -extern "C" -{ -//================================================================================================== -sal_Bool SAL_CALL component_writeInfo( - void * /* pServiceManager */ , void * pRegistryKey ) -{ - if (pRegistryKey) - { - try - { - // ExampleComponent1 - Reference< XRegistryKey > xNewKey( - reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( - OUString( "/" IMPLNAME1 "/UNO/SERVICES" ) ) ); - - const Sequence< OUString > & rSNL = - ::excomp_impl::ExampleComponent1Impl::getSupportedServiceNames_Static(); - 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; -} -//================================================================================================== -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( - const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ ) -{ - void * pRet = 0; - - if (rtl_str_compare( pImplName, IMPLNAME1 ) == 0) - { - Reference< XSingleServiceFactory > xFactory( createSingleFactory( - reinterpret_cast< XMultiServiceFactory * >( pServiceManager ), - OUString( IMPLNAME1 ), - ::excomp_impl::ExampleComponent1_CreateInstance, - ::excomp_impl::ExampleComponent1Impl::getSupportedServiceNames_Static() ) ); - - if (xFactory.is()) - { - xFactory->acquire(); - pRet = xFactory.get(); - } - } - - return pRet; -} -} - - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/stoc/test/excomp/excomp1.xml b/stoc/test/excomp/excomp1.xml deleted file mode 100644 index 94f06abca00c..000000000000 --- a/stoc/test/excomp/excomp1.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - excomp1 - - Juergen Schmidt - example.ExampleComponent1.Impl - - This component provides a simple demo component. - - com.sun.star.loader.SharedLibrary - c++ - - example.ExampleComponent1 - com.sun.star.lang.XTypeProvider - com.sun.star.lang.XServiceInfo - com.sun.star.lang.XSingleServiceFactory - com.sun.star.lang.XMultiServiceFactory - com.sun.star.registry.XRegistryKey - com.sun.star.uno.XAggregation - com.sun.star.uno.XWeak - com.sun.star.uno.TypeClass - example.XTest - - cppuhelper - cppu - sal - cppuhelper - cppu - sal - diff --git a/stoc/test/excomp/excomp2.cxx b/stoc/test/excomp/excomp2.cxx deleted file mode 100644 index bacf778f6d7a..000000000000 --- a/stoc/test/excomp/excomp2.cxx +++ /dev/null @@ -1,272 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -using namespace example; -using namespace com::sun::star::uno; -using namespace com::sun::star::lang; -using namespace com::sun::star::registry; -using namespace cppu; -using namespace osl; - -using ::rtl::OUString; - -#define SERVICENAME2 "example.ExampleComponent2" -#define IMPLNAME2 "example.ExampleComponent2.Impl" - -namespace excomp2_impl { - -//************************************************************************* -// ExampleComponent2Impl -//************************************************************************* -class ExampleComponent2Impl : public OWeakObject - , public XTypeProvider - , public XServiceInfo - , public XTest -{ -public: - ExampleComponent2Impl( const Reference & rXSMgr ); - - ~ExampleComponent2Impl(); - - // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw() - { OWeakObject::acquire(); } - virtual void SAL_CALL release() throw() - { OWeakObject::release(); } - - // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException); - - // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(RuntimeException); - static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ); - - // XTest - virtual OUString SAL_CALL getMessage() throw(RuntimeException); - -protected: - Mutex m_mutex; - - Reference m_xSMgr; -}; - -//************************************************************************* -ExampleComponent2Impl::ExampleComponent2Impl( const Reference & rXSMgr ) - : m_xSMgr(rXSMgr) -{ -} - -//************************************************************************* -ExampleComponent2Impl::~ExampleComponent2Impl() -{ -} - -//************************************************************************* -Any SAL_CALL ExampleComponent2Impl::queryInterface( const ::com::sun::star::uno::Type & rType ) - throw(::com::sun::star::uno::RuntimeException) -{ - Any aRet = ::cppu::queryInterface(rType, - static_cast< XTypeProvider * >( this ), - static_cast< XServiceInfo * >( this ), - static_cast< XTest * >( this ) ); - if ( aRet.hasValue() ) - return aRet; - - return OWeakObject::queryInterface( rType ); -} - -//************************************************************************* -Sequence< Type > SAL_CALL ExampleComponent2Impl::getTypes() - throw (::com::sun::star::uno::RuntimeException) -{ - static OTypeCollection * pTypes = 0; - if (! pTypes) - { - MutexGuard aGuard( m_mutex ); - if (! pTypes) - { - static OTypeCollection aTypes( - ::getCppuType( (const Reference< XInterface > *)0 ), - ::getCppuType( (const Reference< XWeak > *)0 ), - ::getCppuType( (const Reference< XTypeProvider > *)0 ), - ::getCppuType( (const Reference< XServiceInfo > *)0 ), - ::getCppuType( (const Reference< XTest > *)0 ) ); - pTypes = &aTypes; - } - } - return pTypes->getTypes(); -} - -//************************************************************************* -Sequence< sal_Int8 > SAL_CALL ExampleComponent2Impl::getImplementationId() - throw (::com::sun::star::uno::RuntimeException) -{ - static OImplementationId * pId = 0; - if (! pId) - { - MutexGuard aGuard( m_mutex ); - if (! pId) - { - static OImplementationId aId; - pId = &aId; - } - } - return pId->getImplementationId(); -} - -//************************************************************************* -OUString SAL_CALL ExampleComponent2Impl::getImplementationName( ) - throw(RuntimeException) -{ - Guard< Mutex > aGuard( m_mutex ); - return OUString( IMPLNAME2 ); -} - -//************************************************************************* -sal_Bool SAL_CALL ExampleComponent2Impl::supportsService( const OUString& ServiceName ) - throw(RuntimeException) -{ - Guard< Mutex > aGuard( m_mutex ); - Sequence< OUString > aSNL = getSupportedServiceNames(); - const OUString * pArray = aSNL.getConstArray(); - for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) - if( pArray[i] == ServiceName ) - return sal_True; - return sal_False; -} - -//************************************************************************* -Sequence SAL_CALL ExampleComponent2Impl::getSupportedServiceNames( ) - throw(RuntimeException) -{ - Guard< Mutex > aGuard( m_mutex ); - return getSupportedServiceNames_Static(); -} - -//************************************************************************* -Sequence SAL_CALL ExampleComponent2Impl::getSupportedServiceNames_Static( ) -{ - OUString aName( SERVICENAME2 ); - return Sequence< OUString >( &aName, 1 ); -} - -//************************************************************************* -OUString SAL_CALL ExampleComponent2Impl::getMessage() throw(RuntimeException) -{ - Guard< Mutex > aGuard( m_mutex ); - return OUString("Alle meine Entchen schwimmen auf dem See, schwimmen auf dem See ..."); -} - - -//************************************************************************* -Reference SAL_CALL ExampleComponent2_CreateInstance( const Reference& rSMgr ) -{ - Reference xRet; - - XTest *pXTest = (XTest*) new ExampleComponent2Impl(rSMgr); - - if (pXTest) - { - xRet = Reference< XInterface >::query(pXTest); - } - - return xRet; -} - - -} // excomp_impl - - -extern "C" -{ -//================================================================================================== -sal_Bool SAL_CALL component_writeInfo( - void * /* pServiceManager */, void * pRegistryKey ) -{ - if (pRegistryKey) - { - try - { - // ExampleComponent2 - Reference< XRegistryKey > xNewKey( - reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( - OUString( "/" IMPLNAME2 "/UNO/SERVICES" ) ) ); - - const Sequence< OUString > & rSNL = - ::excomp2_impl::ExampleComponent2Impl::getSupportedServiceNames_Static(); - 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; -} -//================================================================================================== -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( - const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ ) -{ - void * pRet = 0; - - if (rtl_str_compare( pImplName, IMPLNAME2 ) == 0) - { - Reference< XSingleServiceFactory > xFactory( createSingleFactory( - reinterpret_cast< XMultiServiceFactory * >( pServiceManager ), - OUString( IMPLNAME2 ), - ::excomp2_impl::ExampleComponent2_CreateInstance, - ::excomp2_impl::ExampleComponent2Impl::getSupportedServiceNames_Static() ) ); - - if (xFactory.is()) - { - xFactory->acquire(); - pRet = xFactory.get(); - } - } - - return pRet; -} -} - - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/stoc/test/excomp/excomp2.xml b/stoc/test/excomp/excomp2.xml deleted file mode 100644 index d3bf6c87bd80..000000000000 --- a/stoc/test/excomp/excomp2.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - excomp2 - - Juergen Schmidt - example.ExampleComponent2.Impl - - This component provides a simple demo component. - - com.sun.star.loader.SharedLibrary - c++ - - example.ExampleComponent2 - com.sun.star.lang.XTypeProvider - com.sun.star.lang.XServiceInfo - com.sun.star.lang.XSingleServiceFactory - com.sun.star.lang.XMultiServiceFactory - com.sun.star.registry.XRegistryKey - com.sun.star.uno.XAggregation - com.sun.star.uno.XWeak - com.sun.star.uno.TypeClass - example.XTest - - cppuhelper - cppu - sal - cppuhelper - cppu - sal - diff --git a/stoc/test/excomp/exports.dxp b/stoc/test/excomp/exports.dxp deleted file mode 100644 index 51703a04666a..000000000000 --- a/stoc/test/excomp/exports.dxp +++ /dev/null @@ -1,2 +0,0 @@ -component_writeInfo -component_getFactory diff --git a/stoc/test/excomp/makefile.mk b/stoc/test/excomp/makefile.mk deleted file mode 100644 index c085a25139cb..000000000000 --- a/stoc/test/excomp/makefile.mk +++ /dev/null @@ -1,119 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# -PRJ=..$/.. - -PRJNAME= stoc -TARGET= excomp -TARGET1= excomp1 -TARGET2= excomp2 -TARGETTYPE=CUI -ENABLE_EXCEPTIONS=TRUE -USE_DEFFILE= TRUE -COMP1TYPELIST=$(TARGET1) -COMP2TYPELIST=$(TARGET2) - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# ------------------------------------------------------------------ - -UNOUCRDEP= $(BIN)$/excomp.rdb -UNOUCRRDB= $(BIN)$/excomp.rdb -UNOUCROUT= $(OUT)$/inc -INCPRE+= $(OUT)$/inc - -UNOTYPES=$($(TARGET1)_XML2CMPTYPES) -UNOTYPES+=$($(TARGET2)_XML2CMPTYPES) -UNOTYPES+= com.sun.star.registry.XImplementationRegistration \ - com.sun.star.lang.XComponent - -# --- Application excomp ------------------------------------------------ -APP1TARGET= $(TARGET) -APP1OBJS= $(OBJ)$/excomp.obj - -APP1STDLIBS= \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(SALHELPERLIB) \ - $(SALLIB) - -# ---- objects ---- -SLOFILES= \ - $(SLO)$/excomp1.obj \ - $(SLO)$/$(COMP1TYPELIST)_description.obj \ - $(SLO)$/excomp2.obj \ - $(SLO)$/$(COMP2TYPELIST)_description.obj - -# ---- excomp1 ------ -SHL1TARGET= $(TARGET1) - -SHL1STDLIBS= \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(SALHELPERLIB) \ - $(SALLIB) - -SHL1DEPN= -SHL1LIBS= -SHL1OBJS= $(SLO)$/excomp1.obj \ - $(SLO)$/$(COMP1TYPELIST)_description.obj -SHL1IMPLIB= i$(TARGET1) -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME= $(SHL1TARGET) -DEF1EXPORTFILE= exports.dxp - -# ---- excomp2 ------ -SHL2TARGET= $(TARGET2) - -SHL2STDLIBS= \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(SALHELPERLIB) \ - $(SALLIB) - -SHL2DEPN= -SHL2LIBS= -SHL2OBJS= $(SLO)$/excomp2.obj \ - $(SLO)$/$(COMP2TYPELIST)_description.obj -SHL2IMPLIB= i$(TARGET2) -SHL2DEF= $(MISC)$/$(SHL2TARGET).def - -DEF2NAME= $(SHL2TARGET) -DEF2EXPORTFILE= exports.dxp - -ALLIDLFILES:= example$/XTest.idl example$/ExampleComponent1.idl example$/ExampleComponent2.idl - -# --- Targets ------------------------------------------------------ - -.IF "$(depend)" == "" -ALL : $(BIN)$/excomp.rdb \ - ALLTAR -.ELSE -ALL: ALLDEP -.ENDIF - -.INCLUDE : target.mk - -$(BIN)$/excomp.rdb: $(ALLIDLFILES) - idlc -I$(PRJ) -I$(SOLARIDLDIR) -O$(MISC)$/excomp $? - regmerge $@ /UCR $(MISC)$/excomp$/{$(?:f:s/.idl/.urd/)} - regmerge $@ / $(SOLARBINDIR)$/udkapi.rdb - touch $@ - From 50dabec33283d6df288290014ab6e57be3d1abf1 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 3 Oct 2012 13:15:46 +0200 Subject: [PATCH 250/863] No code sets COMPnTYPELIST any more Change-Id: I6ef6a7dea7a5f594b907546e8dff39c3640d7509 --- solenv/inc/settings.mk | 47 -------------------------------- solenv/inc/target.mk | 62 ------------------------------------------ solenv/inc/tg_dep.mk | 3 +- 3 files changed, 1 insertion(+), 111 deletions(-) diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 15bd3f0c7eb0..b9db9fd38b56 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -1245,53 +1245,6 @@ TRUSTED_MANIFEST_LOCATION*=$(SOLARENV)/inc # --- Compiler ----------------------------------------------------- .INCLUDE : rules.mk -# --- include typelists -------------------------------------------- - -.IF "$(COMP1TYPELIST)"!="" -.INCLUDE .IGNORE : $(MISC)/$(COMP1TYPELIST).mk -$(COMP1TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP1TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) -.ENDIF - -.IF "$(COMP2TYPELIST)"!="" -.INCLUDE .IGNORE : $(MISC)/$(COMP2TYPELIST).mk -$(COMP2TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP2TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) -.ENDIF - -.IF "$(COMP3TYPELIST)"!="" -.INCLUDE .IGNORE : $(MISC)/$(COMP3TYPELIST).mk -$(COMP3TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP3TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) -.ENDIF - -.IF "$(COMP4TYPELIST)"!="" -.INCLUDE .IGNORE : $(MISC)/$(COMP4TYPELIST).mk -$(COMP4TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP4TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) -.ENDIF - -.IF "$(COMP5TYPELIST)"!="" -.INCLUDE .IGNORE : $(MISC)/$(COMP5TYPELIST).mk -$(COMP5TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP5TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) -.ENDIF - -.IF "$(COMP6TYPELIST)"!="" -.INCLUDE .IGNORE : $(MISC)/$(COMP6TYPELIST).mk -$(COMP6TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP6TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) -.ENDIF - -.IF "$(COMP7TYPELIST)"!="" -.INCLUDE .IGNORE : $(MISC)/$(COMP7TYPELIST).mk -$(COMP7TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP7TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) -.ENDIF - -.IF "$(COMP8TYPELIST)"!="" -.INCLUDE .IGNORE : $(MISC)/$(COMP8TYPELIST).mk -$(COMP8TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP8TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) -.ENDIF - -.IF "$(COMP9TYPELIST)"!="" -.INCLUDE .IGNORE : $(MISC)/$(COMP9TYPELIST).mk -$(COMP9TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP9TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) -.ENDIF - # some place to define these jars for SO environment XML_APIS_JAR*=$(SOLARBINDIR)/xml-apis.jar XERCES_JAR*=$(SOLARBINDIR)/xercesImpl.jar diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk index d5b4ce195806..8f20e72d8e43 100644 --- a/solenv/inc/target.mk +++ b/solenv/inc/target.mk @@ -657,70 +657,8 @@ SHL9BASEX=/BASE:$(SHL9BASE) .ENDIF .ENDIF -.IF "$(COMP1TYPELIST)$(COMP2TYPELIST)$(COMP3TYPELIST)$(COMP4TYPELIST)$(COMP5TYPELIST)$(COMP6TYPELIST)$(COMP7TYPELIST)$(COMP8TYPELIST)$(COMP9TYPELIST)"!="" -.IF "$(UNOUCRRDB)"!="" -COMPRDB*:=$(UNOUCRRDB) -.ELSE # "$(UNOUCRRDB)"!="" -COMPRDB*:=$(SOLARBINDIR)/types.rdb -.ENDIF # "$(UNOUCRRDB)"!="" -.ENDIF # "$(COMP1TYPELIST)$(COMP2TYPELIST)$(COMP3TYPELIST)$(COMP4TYPELIST)$(COMP5TYPELIST)$(COMP6TYPELIST)$(COMP7TYPELIST)$(COMP8TYPELIST)$(COMP9TYPELIST)"!="" -.IF "$(COMP1TYPELIST)"!="" -UNOTYPES+=$($(COMP1TYPELIST)_XML2CMPTYPES) -COMP1RDBTARGETN:=$(BIN)/$(COMP1TYPELIST).rdb -#COMP1TYPELISTN:=$(MISC)/$(COMP1TYPELIST).xml -.ENDIF - -.IF "$(COMP2TYPELIST)"!="" -UNOTYPES+=$($(COMP2TYPELIST)_XML2CMPTYPES) -COMP2RDBTARGETN:=$(BIN)/$(COMP2TYPELIST).rdb -#COMP2TYPELISTN:=$(MISC)/$(COMP2TYPELIST).xml -.ENDIF - -.IF "$(COMP3TYPELIST)"!="" -UNOTYPES+=$($(COMP3TYPELIST)_XML2CMPTYPES) -COMP3RDBTARGETN:=$(BIN)/$(COMP3TYPELIST).rdb -#COMP3TYPELISTN:=$(MISC)/$(COMP3TYPELIST).xml -.ENDIF - -.IF "$(COMP4TYPELIST)"!="" -UNOTYPES+=$($(COMP4TYPELIST)_XML2CMPTYPES) -COMP4RDBTARGETN:=$(BIN)/$(COMP4TYPELIST).rdb -#COMP4TYPELISTN:=$(MISC)/$(COMP4TYPELIST).xml -.ENDIF - -.IF "$(COMP5TYPELIST)"!="" -UNOTYPES+=$($(COMP5TYPELIST)_XML2CMPTYPES) -COMP5RDBTARGETN:=$(BIN)/$(COMP5TYPELIST).rdb -#COMP5TYPELISTN:=$(MISC)/$(COMP5TYPELIST).xml -.ENDIF - -.IF "$(COMP6TYPELIST)"!="" -UNOTYPES+=$($(COMP6TYPELIST)_XML2CMPTYPES) -COMP6RDBTARGETN:=$(BIN)/$(COMP6TYPELIST).rdb -#COMP6TYPELISTN:=$(MISC)/$(COMP6TYPELIST).xml -.ENDIF - -.IF "$(COMP7TYPELIST)"!="" -UNOTYPES+=$($(COMP7TYPELIST)_XML2CMPTYPES) -COMP7RDBTARGETN:=$(BIN)/$(COMP7TYPELIST).rdb -#COMP7TYPELISTN:=$(MISC)/$(COMP7TYPELIST).xml -.ENDIF - -.IF "$(COMP8TYPELIST)"!="" -UNOTYPES+=$($(COMP8TYPELIST)_XML2CMPTYPES) -COMP8RDBTARGETN:=$(BIN)/$(COMP8TYPELIST).rdb -#COMP8TYPELISTN:=$(MISC)/$(COMP8TYPELIST).xml -.ENDIF - -.IF "$(COMP9TYPELIST)"!="" -UNOTYPES+=$($(COMP9TYPELIST)_XML2CMPTYPES) -COMP9RDBTARGETN:=$(BIN)/$(COMP9TYPELIST).rdb -#COMP9TYPELISTN:=$(MISC)/$(COMP9TYPELIST).xml -.ENDIF - UNOTYPES!:=$(strip $(UNOTYPES)) -#moved here to get UNOTYPES from COMPxTYPELIST .IF "$(UNOTYPES)" != "" UNOUCRHEADER=$(foreach,j,$(subst,.,/ $(UNOTYPES)) $(UNOUCROUT)/$(j:+".hpp")) UNOUCRTARGET:=$(INCCOM)/$(TARGET)_headergen.done diff --git a/solenv/inc/tg_dep.mk b/solenv/inc/tg_dep.mk index eac13e84f247..3819a71464bd 100644 --- a/solenv/inc/tg_dep.mk +++ b/solenv/inc/tg_dep.mk @@ -16,14 +16,13 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -.IF "$(SLOFILES)$(OBJFILES)$(DEPOBJFILES)$(SRCFILES)$(SRC1FILES)$(SRC2FILES)$(SRC3FILES)$(RCFILES)$(HDBDEPNTARGET)$(IDLFILES)$(PARFILES)$(ZIP1TARGET)$(ZIP2TARGET)$(ZIP3TARGET)$(ZIP4TARGET)$(ZIP5TARGET)$(ZIP6TARGET)$(ZIP7TARGET)$(ZIP8TARGET)$(ZIP9TARGET)$(COMP1TYPELIST)$(COMP2TYPELIST)$(COMP3TYPELIST)$(COMP4TYPELIST)$(COMP5TYPELIST)$(COMP6TYPELIST)$(COMP7TYPELIST)$(COMP8TYPELIST)$(COMP9TYPELIST)"!="" +.IF "$(SLOFILES)$(OBJFILES)$(DEPOBJFILES)$(SRCFILES)$(SRC1FILES)$(SRC2FILES)$(SRC3FILES)$(RCFILES)$(HDBDEPNTARGET)$(IDLFILES)$(PARFILES)$(ZIP1TARGET)$(ZIP2TARGET)$(ZIP3TARGET)$(ZIP4TARGET)$(ZIP5TARGET)$(ZIP6TARGET)$(ZIP7TARGET)$(ZIP8TARGET)$(ZIP9TARGET)"!="" ALLDEP .PHONY: @-$(IFEXIST) $(SRS)/$(TARGET).*.dpr $(THEN) $(RM:s/+//) $(SRS)/$(TARGET).*.dpr >& $(NULLDEV) $(FI) @@-$(RM) $(MISC)/$(TARGET).dpr @@-$(RM) $(MISC)/$(TARGET).*.dprr @@-$(RM) $(MISC)/$(TARGET).dpj @@-$(RM) $(MISC)/$(TARGET).dpz - @@-$(RM) $(MISC)/$(COMP1TYPELIST).mk $(MISC)/$(COMP2TYPELIST).mk $(MISC)/$(COMP3TYPELIST).mk $(MISC)/$(COMP4TYPELIST).mk $(MISC)/$(COMP5TYPELIST).mk $(MISC)/$(COMP6TYPELIST).mk $(MISC)/$(COMP7TYPELIST).mk $(MISC)/$(COMP8TYPELIST).mk $(MISC)/$(COMP9TYPELIST).mk .IF "$(nodep)"=="" .IF "$(DEPFILE_SLO)"!="" @@-$(RM) $(DEPFILE_SLO) From 7b56aec95de01fb2e05c9320da9652513244e475 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 3 Oct 2012 13:17:24 +0200 Subject: [PATCH 251/863] Rule to generate ..._description.cxx via xml2cmp appears unused Change-Id: I59ced6720bdfd2df7a8ed7d9247887a09beeb8fd --- solenv/inc/rules.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk index 93e3b02390ff..526f8c0dda7e 100644 --- a/solenv/inc/rules.mk +++ b/solenv/inc/rules.mk @@ -623,10 +623,6 @@ $(MISC)/%.mk : $(MISC)/%$($(WINVERSIONNAMES)_MAJOR).xml @$(TOUCH) $@ @echo XML2MK_FILES += $(@:b) >> $@ -#generate descriptions from xml -$(MISC)/%$($(WINVERSIONNAMES)_MAJOR)_description.cxx : $(MISC)/%$($(WINVERSIONNAMES)_MAJOR).xml - xml2cmp -func $(MISC)/$*$($(WINVERSIONNAMES)_MAJOR)_description.cxx $< - #generate private rdb $(BIN)/%.rdb: $(MISC)/%$($(WINVERSIONNAMES)_MAJOR).xml $(COMMAND_ECHO)$(RDBMAKER) -BUCR -O$(BIN)/$*.rdb @$(mktmp $(foreach,i,$($(@:b)_XML2CMPTYPES) -T$i ) $(COMPRDB)) From 7997d8b0cb1347c1eaa6e676d0c4ff182812d345 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 3 Oct 2012 13:37:11 +0200 Subject: [PATCH 252/863] Replace set_xml with set_types, to get rid of xml2cmp Change-Id: I9ba3739f1693f5427c9ea49f2b6016f364f444ff --- solenv/gbuild/InternalUnoApi.mk | 4 +- solenv/gbuild/UnoApiTarget.mk | 24 +- stoc/InternalUnoApi_bootstrap.mk | 69 ++++- stoc/source/bootstrap/bootstrap.xml | 375 ---------------------------- 4 files changed, 78 insertions(+), 394 deletions(-) delete mode 100644 stoc/source/bootstrap/bootstrap.xml diff --git a/solenv/gbuild/InternalUnoApi.mk b/solenv/gbuild/InternalUnoApi.mk index 8949323b9c12..f80fe016e615 100644 --- a/solenv/gbuild/InternalUnoApi.mk +++ b/solenv/gbuild/InternalUnoApi.mk @@ -117,8 +117,8 @@ $(foreach dep,$(3),$(call gb_InternalUnoApi_define_api_dependency,$(1),$(2),$(de endef -define gb_InternalUnoApi_set_xmlfile -$(call gb_UnoApiTarget_set_xmlfile,$(1)_out,$(2)) +define gb_InternalUnoApi_set_types +$(call gb_UnoApiTarget_set_types,$(1)_out,$(2)) endef diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index fd7a0a333a59..b8c219efae59 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -88,14 +88,8 @@ gb_UnoApiTarget_REGCOMPARETARGET := $(call gb_Executable_get_target_for_build,re gb_UnoApiTarget_REGCOMPARECOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGCOMPARETARGET) gb_UnoApiTarget_REGMERGETARGET := $(call gb_Executable_get_target_for_build,regmerge) gb_UnoApiTarget_REGMERGECOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGMERGETARGET) -gb_UnoApiTarget_XML2CMPTARGET := $(call gb_Executable_get_target_for_build,xml2cmp) -gb_UnoApiTarget_XML2CMPCOMMAND := $(gb_Helper_set_ld_path) $(gb_UnoApiTarget_XML2CMPTARGET) -gb_UnoApiTarget_XMLRDB := $(call gb_UnoApiTarget_get_target,types) - -define gb_UnoApiTarget__get_types -$(if $(1),$(foreach type,$(shell $(gb_UnoApiTarget_XML2CMPCOMMAND) -types stdout $(1)),$(addprefix -T,$(type)))) -endef +gb_UnoApiTarget_TYPESRDB := $(call gb_UnoApiTarget_get_target,types) define gb_UnoApiTarget__command_impl RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(2)) && \ @@ -119,7 +113,7 @@ $(if $(UNOAPI_FILES),\ $(if $(UNOAPI_MERGE),\ $(call gb_UnoApiTarget__regmerge_command_impl,$(1),$(UNOAPI_ROOT),$(UNOAPI_MERGE)),\ $(call gb_UnoApiTarget__rdbmaker_command_impl,$(1),UCR,$(UNOAPI_ROOT),\ - $(call gb_UnoApiTarget__get_types,$(UNOAPI_XML)),$(gb_UnoApiTarget_XMLRDB)))) \ + $(addprefix -T,$(UNOAPI_TYPES)),$(gb_UnoApiTarget_TYPESRDB)))) \ $(if $(UNOAPI_REFERENCE), \ $(call gb_Output_announce,$*,$(true),DBc,3) \ && $(gb_UnoApiTarget_REGCOMPARECOMMAND) \ @@ -132,7 +126,7 @@ define gb_UnoApiTarget__check_mode $(if $(or $(and $(1),$(2),$(3)),$(and $(1),$(2)),$(and $(2),$(3)),$(and $(1),$(3))),\ $(error More than one mode of function of UnoApiTarget used: this is not supported),\ $(if $(or $(1),$(2),$(3)),,\ - $(error Neither IDL files nor merged RDBs nor XML desc. were used: nothing will be produced))) + $(error Neither IDL files nor merged RDBs nor type list were used: nothing will be produced))) $(if $(4),,$(error No root has been set for the rdb file)) endef @@ -143,7 +137,7 @@ $(call gb_UnoApiTarget_get_headers_target,%) : $(call gb_UnoApiTarget_get_extern mkdir -p $(dir $@) && touch $@ $(call gb_UnoApiTarget_get_target,%) : - $(call gb_UnoApiTarget__check_mode,$(UNOAPI_FILES),$(UNOAPI_MERGE),$(UNOAPI_XML),$(UNOAPI_ROOT)) + $(call gb_UnoApiTarget__check_mode,$(UNOAPI_FILES),$(UNOAPI_MERGE),$(UNOAPI_TYPES),$(UNOAPI_ROOT)) $(call gb_UnoApiTarget__command,$@,$*) .PHONY : $(call gb_UnoApiTarget_get_clean_target,%) @@ -180,7 +174,7 @@ define gb_UnoApiTarget_UnoApiTarget $(call gb_UnoApiTarget_get_target,$(1)) : INCLUDE := $(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_FILES := $(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_MERGE := -$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_XML := +$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_TYPES := $(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_REFERENCE := $(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_ROOT := @@ -254,11 +248,9 @@ $(call gb_UnoApiTarget_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(2) endef # Set XML component dependencies description. -define gb_UnoApiTarget_set_xmlfile -$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_XML := $(SRCDIR)/$(2) -$(call gb_UnoApiTarget_get_target,$(1)) : $(SRCDIR)/$(2) -$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_XMLRDB) -$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_XML2CMPTARGET) +define gb_UnoApiTarget_set_types +$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_TYPES := $(2) +$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_TYPESRDB) $(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_RDBMAKERTARGET) endef diff --git a/stoc/InternalUnoApi_bootstrap.mk b/stoc/InternalUnoApi_bootstrap.mk index ff7f7e0f2a7e..cd56224c02ec 100644 --- a/stoc/InternalUnoApi_bootstrap.mk +++ b/stoc/InternalUnoApi_bootstrap.mk @@ -27,6 +27,73 @@ $(eval $(call gb_InternalUnoApi_InternalUnoApi,bootstrap)) -$(eval $(call gb_InternalUnoApi_set_xmlfile,bootstrap,stoc/source/bootstrap/bootstrap.xml)) +$(eval $(call gb_InternalUnoApi_set_types,bootstrap, \ + com.sun.star.beans.PropertyAttribute \ + com.sun.star.beans.XPropertySet \ + com.sun.star.connection.SocketPermission \ + com.sun.star.container.NoSuchElementException \ + com.sun.star.container.XContentEnumerationAccess \ + com.sun.star.container.XEnumeration \ + com.sun.star.container.XEnumerationAccess \ + com.sun.star.container.XHierarchicalNameAccess \ + com.sun.star.container.XSet \ + com.sun.star.io.FilePermission \ + com.sun.star.lang.DisposedException \ + com.sun.star.lang.IllegalArgumentException \ + com.sun.star.lang.XComponent \ + com.sun.star.lang.XEventListener \ + com.sun.star.lang.XInitialization \ + com.sun.star.lang.XMultiComponentFactory \ + com.sun.star.lang.XMultiServiceFactory \ + com.sun.star.lang.XServiceInfo \ + com.sun.star.lang.XSingleComponentFactory \ + com.sun.star.lang.XSingleServiceFactory \ + com.sun.star.lang.XTypeProvider \ + com.sun.star.lang.XUnoTunnel \ + com.sun.star.loader.XImplementationLoader \ + com.sun.star.reflection.XArrayTypeDescription \ + com.sun.star.reflection.XCompoundTypeDescription \ + com.sun.star.reflection.XConstantsTypeDescription \ + com.sun.star.reflection.XConstantTypeDescription \ + com.sun.star.reflection.XEnumTypeDescription \ + com.sun.star.reflection.XIndirectTypeDescription \ + com.sun.star.reflection.XInterfaceAttributeTypeDescription \ + com.sun.star.reflection.XInterfaceAttributeTypeDescription2 \ + com.sun.star.reflection.XInterfaceMemberTypeDescription \ + com.sun.star.reflection.XInterfaceMethodTypeDescription \ + com.sun.star.reflection.XInterfaceTypeDescription \ + com.sun.star.reflection.XInterfaceTypeDescription2 \ + com.sun.star.reflection.XMethodParameter \ + com.sun.star.reflection.XModuleTypeDescription \ + com.sun.star.reflection.XParameter \ + com.sun.star.reflection.XPropertyTypeDescription \ + com.sun.star.reflection.XPublished \ + com.sun.star.reflection.XServiceConstructorDescription \ + com.sun.star.reflection.XServiceTypeDescription \ + com.sun.star.reflection.XServiceTypeDescription2 \ + com.sun.star.reflection.XSingletonTypeDescription \ + com.sun.star.reflection.XSingletonTypeDescription2 \ + com.sun.star.reflection.XStructTypeDescription \ + com.sun.star.reflection.XTypeDescription \ + com.sun.star.reflection.XTypeDescriptionEnumerationAccess \ + com.sun.star.reflection.XUnionTypeDescription \ + com.sun.star.registry.XImplementationRegistration2 \ + com.sun.star.registry.XRegistryKey \ + com.sun.star.registry.XSimpleRegistry \ + com.sun.star.security.AllPermission \ + com.sun.star.security.RuntimePermission \ + com.sun.star.security.XAccessController \ + com.sun.star.security.XPolicy \ + com.sun.star.uno.DeploymentException \ + com.sun.star.uno.RuntimeException \ + com.sun.star.uno.TypeClass \ + com.sun.star.uno.XAggregation \ + com.sun.star.uno.XComponentContext \ + com.sun.star.uno.XCurrentContext \ + com.sun.star.uno.XInterface \ + com.sun.star.uno.XUnloadingPreference \ + com.sun.star.uno.XWeak \ + com.sun.star.util.XMacroExpander \ +)) # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/stoc/source/bootstrap/bootstrap.xml b/stoc/source/bootstrap/bootstrap.xml deleted file mode 100644 index f8f6bbff9540..000000000000 --- a/stoc/source/bootstrap/bootstrap.xml +++ /dev/null @@ -1,375 +0,0 @@ - - - - - bootstrap.uno - - Juergen Schmidt - com.sun.star.comp.stoc.DLLComponentLoader - - This component provides a mechanism to load an external compoment implemented as - a shared library. - - com.sun.star.loader.SharedLibrary - c++ - - com.sun.star.loader.SharedLibrary - com.sun.star.util.XMacroExpander - com.sun.star.loader.XImplementationLoader - com.sun.star.lang.IllegalArgumentException - com.sun.star.lang.XInitialization - com.sun.star.lang.XTypeProvider - com.sun.star.lang.XServiceInfo - com.sun.star.lang.XSingleServiceFactory - com.sun.star.lang.XMultiServiceFactory - com.sun.star.registry.XRegistryKey - com.sun.star.beans.XPropertySet - com.sun.star.container.XSet - com.sun.star.uno.XAggregation - com.sun.star.uno.XComponentContext - com.sun.star.lang.XSingleComponentFactory - com.sun.star.uno.XWeak - com.sun.star.uno.TypeClass - com.sun.star.uno.DeploymentException - - - Juergen Schmidt - com.sun.star.comp.stoc.NestedRegistry - - This component provides access to a simple hierachical registry. The registry based on - two registry file. - - com.sun.star.loader.SharedLibrary - c++ - - com.sun.star.registry.NestedRegistry - - com.sun.star.registry.SimpleRegistry - com.sun.star.lang.XInitialization - com.sun.star.lang.XTypeProvider - com.sun.star.lang.XServiceInfo - com.sun.star.lang.XSingleServiceFactory - com.sun.star.lang.XMultiServiceFactory - com.sun.star.registry.XSimpleRegistry - com.sun.star.registry.XRegistryKey - com.sun.star.lang.XSingleComponentFactory - com.sun.star.uno.XComponentContext - com.sun.star.uno.XAggregation - com.sun.star.uno.XWeak - com.sun.star.uno.TypeClass - com.sun.star.container.XEnumerationAccess - - - Juergen Schmidt - com.sun.star.comp.stoc.ImplementationRegistration - - This component provides a mechanism to register or deregister an external component - to the current uno environment or better to the current service manager. - - com.sun.star.loader.SharedLibrary - c++ - - com.sun.star.registry.ImplementationRegistration - com.sun.star.registry.SimpleRegistry - com.sun.star.loader.SharedLibrary - com.sun.star.loader.Java - com.sun.star.loader.XImplementationLoader - com.sun.star.lang.XInitialization - com.sun.star.lang.XTypeProvider - com.sun.star.lang.XServiceInfo - com.sun.star.lang.XSingleServiceFactory - com.sun.star.lang.XSingleComponentFactory - com.sun.star.lang.XMultiServiceFactory - com.sun.star.registry.XSimpleRegistry - com.sun.star.registry.XRegistryKey - com.sun.star.registry.XImplementationRegistration2 - com.sun.star.beans.XPropertySet - com.sun.star.container.XSet - com.sun.star.container.XHierarchicalNameAccess - com.sun.star.reflection.XServiceTypeDescription - com.sun.star.uno.XAggregation - com.sun.star.uno.XWeak - com.sun.star.uno.TypeClass - com.sun.star.uno.XComponentContext - - - Daniel Boelzle - com.sun.star.comp.stoc.RegistryTypeDescriptionProvider - -This provider service supports the XHierarchicalNameAccess interface to read type descriptions -and constants from a registry source. - - com.sun.star.loader.SharedLibrary - C++ - - com.sun.star.reflection.TypeDescriptionProvider - com.sun.star.reflection.TypeDescriptionManager - com.sun.star.reflection.XTypeDescription - com.sun.star.reflection.XConstantsTypeDescription - com.sun.star.reflection.XEnumTypeDescription - com.sun.star.reflection.XIndirectTypeDescription - com.sun.star.reflection.XInterfaceMemberTypeDescription - com.sun.star.reflection.XInterfaceAttributeTypeDescription2 - com.sun.star.reflection.XMethodParameter - com.sun.star.reflection.XModuleTypeDescription - com.sun.star.reflection.XInterfaceMethodTypeDescription - com.sun.star.reflection.XInterfaceTypeDescription - com.sun.star.reflection.XInterfaceTypeDescription2 - com.sun.star.reflection.XCompoundTypeDescription - com.sun.star.reflection.XServiceConstructorDescription - com.sun.star.reflection.XServiceTypeDescription - com.sun.star.reflection.XServiceTypeDescription2 - com.sun.star.reflection.XSingletonTypeDescription2 - com.sun.star.reflection.XTypeDescriptionEnumerationAccess - com.sun.star.reflection.XParameter - com.sun.star.reflection.XPublished - com.sun.star.reflection.XStructTypeDescription - com.sun.star.lang.DisposedException - com.sun.star.lang.XComponent - com.sun.star.lang.XTypeProvider - com.sun.star.lang.XServiceInfo - com.sun.star.lang.XSingleComponentFactory - com.sun.star.lang.XMultiComponentFactory - com.sun.star.lang.XSingleServiceFactory - com.sun.star.lang.XMultiServiceFactory - com.sun.star.lang.XInitialization - com.sun.star.registry.XSimpleRegistry - com.sun.star.beans.PropertyAttribute - com.sun.star.beans.XPropertySet - com.sun.star.container.NoSuchElementException - com.sun.star.container.XHierarchicalNameAccess - com.sun.star.container.XSet - com.sun.star.uno.XAggregation - com.sun.star.uno.XComponentContext - com.sun.star.uno.XWeak - com.sun.star.uno.XInterface - com.sun.star.uno.TypeClass - com.sun.star.uno.RuntimeException - - - boelzle@sun.com - com.sun.star.security.comp.stoc.AccessController - -This service is an implementation of the com.sun.star.security.AccessController service. - - com.sun.star.loader.SharedLibrary - C++ - - com.sun.star.security.AccessController - unknown, because of used policy - com.sun.star.security.XAccessController - com.sun.star.security.XPolicy - com.sun.star.security.RuntimePermission - com.sun.star.security.AllPermission - com.sun.star.io.FilePermission - com.sun.star.connection.SocketPermission - com.sun.star.registry.XRegistryKey - com.sun.star.lang.DisposedException - com.sun.star.lang.XTypeProvider - com.sun.star.lang.XComponent - com.sun.star.lang.XServiceInfo - com.sun.star.lang.XSingleComponentFactory - com.sun.star.lang.XSingleServiceFactory - com.sun.star.lang.XMultiComponentFactory - com.sun.star.lang.XMultiServiceFactory - com.sun.star.lang.XInitialization - com.sun.star.uno.XWeak - com.sun.star.uno.XAggregation - com.sun.star.uno.DeploymentException - com.sun.star.uno.XCurrentContext - com.sun.star.uno.XComponentContext - com.sun.star.uno.TypeClass - - - boelzle@sun.com - com.sun.star.security.comp.stoc.FilePolicy - -This service is an implementation of the com.sun.star.security.Policy service. - - com.sun.star.loader.SharedLibrary - C++ - - com.sun.star.security.Policy - com.sun.star.security.XAccessController - com.sun.star.security.XPolicy - com.sun.star.security.RuntimePermission - com.sun.star.security.AllPermission - com.sun.star.io.FilePermission - com.sun.star.connection.SocketPermission - com.sun.star.registry.XRegistryKey - com.sun.star.lang.XTypeProvider - com.sun.star.lang.XComponent - com.sun.star.lang.XServiceInfo - com.sun.star.lang.XSingleComponentFactory - com.sun.star.lang.XSingleServiceFactory - com.sun.star.lang.XMultiComponentFactory - com.sun.star.lang.XMultiServiceFactory - com.sun.star.uno.XWeak - com.sun.star.uno.XAggregation - com.sun.star.uno.XCurrentContext - com.sun.star.uno.XComponentContext - com.sun.star.uno.TypeClass - - - Juergen Schmidt - com.sun.star.comp.stoc.SimpleRegistry - - This component provides access to a simple hierachical registry. The registry based on - one registry file. - - com.sun.star.loader.SharedLibrary - c++ - - com.sun.star.registry.SimpleRegistry - com.sun.star.lang.XTypeProvider - com.sun.star.lang.XServiceInfo - com.sun.star.lang.XSingleServiceFactory - com.sun.star.lang.XSingleComponentFactory - com.sun.star.lang.XMultiServiceFactory - com.sun.star.lang.XMultiComponentFactory - com.sun.star.registry.XSimpleRegistry - com.sun.star.registry.XRegistryKey - com.sun.star.uno.XAggregation - com.sun.star.uno.XWeak - com.sun.star.uno.TypeClass - com.sun.star.uno.XComponentContext - - - Juergen Schmidt - com.sun.star.comp.stoc.OServiceManager - - This component provides an administration object which manages - factories for many services. The services could be accessed with - the service name by using createInstance or createInstanceWithArguments. - To support the servicemanager with the needed information about a - service implementation, for e.g. which component implements the service, - two ways are possible: - - register a component persistent in a registry on which the servicemanager - works, using the com.sun.star.registry.ImplementationRegistration service. - - insert a corresponding factory for the service directly using the - interface XSet. - - For creating an object of a requested service the service manager checks - if a factory for this service is avaible, if not the registry will be - searched for information about this service. If there is an appropriate - entry, the component is loaded, a factory is created and announced to the - service manager. Finding a factory the service manager calls the factory - for creating new objects. - - com.sun.star.loader.SharedLibrary - c++ - - com.sun.star.lang.MultiServiceFactory - com.sun.star.lang.ServiceManager - com.sun.star.lang.XUnoTunnel - com.sun.star.lang.XComponent - com.sun.star.lang.XEventListener - com.sun.star.lang.XInitialization - com.sun.star.lang.XTypeProvider - com.sun.star.lang.XServiceInfo - com.sun.star.lang.XSingleServiceFactory - com.sun.star.lang.XSingleComponentFactory - com.sun.star.lang.XMultiServiceFactory - com.sun.star.lang.DisposedException - com.sun.star.registry.XSimpleRegistry - com.sun.star.beans.XPropertySet - com.sun.star.container.XSet - com.sun.star.container.XEnumeration - com.sun.star.container.XContentEnumerationAccess - com.sun.star.container.XHierarchicalNameAccess - com.sun.star.uno.XComponentContext - com.sun.star.uno.XAggregation - com.sun.star.uno.XWeak - com.sun.star.uno.TypeClass - com.sun.star.uno.XUnloadingPreference - com.sun.star.beans.PropertyAttribute - - - Daniel Boelzle - com.sun.star.comp.stoc.TypeDescriptionManager - -This service is the central manager supporting the XHierarchicalNameAccess interface. -At runtime there will only be at most a single instance of the service. -A manager instance is hooked into the C UNO runtime typelib and lives until the service manager -is going down. -You can manually add a provider by inserting it via the XSet interface. -At startup of this service, you must call an initialization, adding all known -providers. - - com.sun.star.loader.SharedLibrary - C++ - - com.sun.star.reflection.TypeDescriptionManager - ... - com.sun.star.beans.PropertyAttribute - com.sun.star.reflection.XTypeDescription - com.sun.star.reflection.XEnumTypeDescription - com.sun.star.reflection.XArrayTypeDescription - com.sun.star.reflection.XIndirectTypeDescription - com.sun.star.reflection.XInterfaceMemberTypeDescription - com.sun.star.reflection.XInterfaceAttributeTypeDescription - com.sun.star.reflection.XInterfaceAttributeTypeDescription2 - com.sun.star.reflection.XMethodParameter - com.sun.star.reflection.XInterfaceMethodTypeDescription - com.sun.star.reflection.XInterfaceTypeDescription2 - com.sun.star.reflection.XStructTypeDescription - com.sun.star.reflection.XServiceTypeDescription - com.sun.star.reflection.XServiceTypeDescription2 - com.sun.star.reflection.XPropertyTypeDescription - com.sun.star.reflection.XConstantTypeDescription - com.sun.star.reflection.XConstantsTypeDescription - com.sun.star.reflection.XSingletonTypeDescription - com.sun.star.reflection.XSingletonTypeDescription2 - com.sun.star.reflection.XUnionTypeDescription - com.sun.star.reflection.XTypeDescriptionEnumerationAccess - com.sun.star.lang.DisposedException - com.sun.star.lang.XComponent - com.sun.star.lang.XEventListener - com.sun.star.lang.XInitialization - com.sun.star.lang.XTypeProvider - com.sun.star.lang.XServiceInfo - com.sun.star.lang.XSingleServiceFactory - com.sun.star.lang.XSingleComponentFactory - com.sun.star.lang.XMultiComponentFactory - com.sun.star.lang.XMultiServiceFactory - com.sun.star.registry.XRegistryKey - com.sun.star.container.XSet - com.sun.star.container.XHierarchicalNameAccess - com.sun.star.container.XContentEnumerationAccess - com.sun.star.uno.XAggregation - com.sun.star.uno.XWeak - com.sun.star.uno.XComponentContext - com.sun.star.uno.TypeClass - - cppuhelper - cppu - sal - registry - store - salhelper - cppuhelper3$(COM) - cppu3 - sal3 - reg3 - store3 - reg3 - store3 - salhelper3(COM) - salhelper3(COM) - From f9b4426b9783eb989878bbb3c71f245b1cc5b780 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 3 Oct 2012 13:40:05 +0200 Subject: [PATCH 253/863] xml2cmp no longer used Change-Id: Idba65371b8778521bc767fe4893340cf13a8ff3b --- Makefile.top | 1 - Repository.mk | 1 - RepositoryModule_ooo.mk | 1 - cross_tail_build/prj/build.lst | 2 +- sal/prj/build.lst | 2 +- setup_native/prj/build.lst | 2 +- sysui/prj/build.lst | 2 +- xml2cmp/Executable_xml2cmp.mk | 49 ---- xml2cmp/Makefile | 7 - xml2cmp/Module_xml2cmp.mk | 38 --- xml2cmp/README | 3 - xml2cmp/prj/build.lst | 2 - xml2cmp/prj/d.lst | 0 xml2cmp/source/finder/dep_main.cxx | 88 ------ xml2cmp/source/inc/precomp.h | 45 --- xml2cmp/source/support/badcast.cxx | 43 --- xml2cmp/source/support/cmdline.cxx | 161 ----------- xml2cmp/source/support/cmdline.hxx | 71 ----- xml2cmp/source/support/heap.cxx | 194 ------------- xml2cmp/source/support/heap.hxx | 83 ------ xml2cmp/source/support/list.hxx | 244 ---------------- xml2cmp/source/support/sistr.cxx | 393 -------------------------- xml2cmp/source/support/sistr.hxx | 141 --------- xml2cmp/source/support/syshelp.cxx | 307 -------------------- xml2cmp/source/support/syshelp.hxx | 78 ----- xml2cmp/source/xcd/cr_html.cxx | 261 ----------------- xml2cmp/source/xcd/cr_html.hxx | 92 ------ xml2cmp/source/xcd/cr_metho.cxx | 97 ------- xml2cmp/source/xcd/cr_metho.hxx | 31 -- xml2cmp/source/xcd/dependy.cxx | 218 -------------- xml2cmp/source/xcd/dependy.hxx | 109 ------- xml2cmp/source/xcd/filebuff.cxx | 60 ---- xml2cmp/source/xcd/filebuff.hxx | 48 ---- xml2cmp/source/xcd/main.cxx | 248 ---------------- xml2cmp/source/xcd/parse.cxx | 440 ----------------------------- xml2cmp/source/xcd/parse.hxx | 136 --------- xml2cmp/source/xcd/xmlelem.cxx | 251 ---------------- xml2cmp/source/xcd/xmlelem.hxx | 229 --------------- xml2cmp/source/xcd/xmltree.cxx | 233 --------------- xml2cmp/source/xcd/xmltree.hxx | 136 --------- 40 files changed, 4 insertions(+), 4543 deletions(-) delete mode 100644 xml2cmp/Executable_xml2cmp.mk delete mode 100644 xml2cmp/Makefile delete mode 100644 xml2cmp/Module_xml2cmp.mk delete mode 100644 xml2cmp/README delete mode 100644 xml2cmp/prj/build.lst delete mode 100644 xml2cmp/prj/d.lst delete mode 100644 xml2cmp/source/finder/dep_main.cxx delete mode 100644 xml2cmp/source/inc/precomp.h delete mode 100644 xml2cmp/source/support/badcast.cxx delete mode 100644 xml2cmp/source/support/cmdline.cxx delete mode 100644 xml2cmp/source/support/cmdline.hxx delete mode 100644 xml2cmp/source/support/heap.cxx delete mode 100644 xml2cmp/source/support/heap.hxx delete mode 100644 xml2cmp/source/support/list.hxx delete mode 100644 xml2cmp/source/support/sistr.cxx delete mode 100644 xml2cmp/source/support/sistr.hxx delete mode 100644 xml2cmp/source/support/syshelp.cxx delete mode 100644 xml2cmp/source/support/syshelp.hxx delete mode 100644 xml2cmp/source/xcd/cr_html.cxx delete mode 100644 xml2cmp/source/xcd/cr_html.hxx delete mode 100644 xml2cmp/source/xcd/cr_metho.cxx delete mode 100644 xml2cmp/source/xcd/cr_metho.hxx delete mode 100644 xml2cmp/source/xcd/dependy.cxx delete mode 100644 xml2cmp/source/xcd/dependy.hxx delete mode 100644 xml2cmp/source/xcd/filebuff.cxx delete mode 100644 xml2cmp/source/xcd/filebuff.hxx delete mode 100644 xml2cmp/source/xcd/main.cxx delete mode 100644 xml2cmp/source/xcd/parse.cxx delete mode 100644 xml2cmp/source/xcd/parse.hxx delete mode 100644 xml2cmp/source/xcd/xmlelem.cxx delete mode 100644 xml2cmp/source/xcd/xmlelem.hxx delete mode 100644 xml2cmp/source/xcd/xmltree.cxx delete mode 100644 xml2cmp/source/xcd/xmltree.hxx diff --git a/Makefile.top b/Makefile.top index 3e6f2c413514..b3937aee1357 100644 --- a/Makefile.top +++ b/Makefile.top @@ -190,7 +190,6 @@ writerfilter\ writerperfect\ x11_extensions\ xmerge\ -xml2cmp\ xmlhelp\ xmloff\ xmlreader\ diff --git a/Repository.mk b/Repository.mk index a4daa93ee4d9..70cf3061d53d 100644 --- a/Repository.mk +++ b/Repository.mk @@ -74,7 +74,6 @@ $(eval $(call gb_Helper_register_executables,NONE, \ uiex \ ulfconv \ ulfex \ - xml2cmp \ xpdfimport \ xrmex \ )) diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index 8be0d6ecc4bf..b10b3239ba08 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -190,7 +190,6 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ writerperfect \ $(call gb_Helper_optional,X11_EXTENSIONS,x11_extensions) \ xmerge \ - xml2cmp \ $(call gb_Helper_optional,DESKTOP,xmlhelp) \ xmloff \ xmlreader \ diff --git a/cross_tail_build/prj/build.lst b/cross_tail_build/prj/build.lst index 995bae7aae8b..308c85155f24 100644 --- a/cross_tail_build/prj/build.lst +++ b/cross_tail_build/prj/build.lst @@ -1,2 +1,2 @@ -ctb cross_tail_build :: BERKELEYDB:berkeleydb BOOST:boost CPPUNIT:cppunit EXPAT:expat external ICU:icu LIBLANGTAG:liblangtag LIBXML2:libxml2 LIBXSLT:libxslt sal solenv soltools NATIVE:xml2cmp ZLIB:zlib NULL +ctb cross_tail_build :: BERKELEYDB:berkeleydb BOOST:boost CPPUNIT:cppunit EXPAT:expat external ICU:icu LIBLANGTAG:liblangtag LIBXML2:libxml2 LIBXSLT:libxslt sal solenv soltools ZLIB:zlib NULL ctb tail_build\prj nmake - all ctb_prj NULL diff --git a/sal/prj/build.lst b/sal/prj/build.lst index e9234c4e53da..b91a41bd219e 100644 --- a/sal/prj/build.lst +++ b/sal/prj/build.lst @@ -1,2 +1,2 @@ -sa sal : NATIVE:xml2cmp external BOOST:boost CPPUNIT:cppunit NULL +sa sal : external BOOST:boost CPPUNIT:cppunit NULL sa sal\prj nmake - all sa_prj NULL diff --git a/setup_native/prj/build.lst b/setup_native/prj/build.lst index 701f8ed97316..24d973c78708 100644 --- a/setup_native/prj/build.lst +++ b/setup_native/prj/build.lst @@ -1,4 +1,4 @@ -pk setup_native : TRANSLATIONS:translations DESKTOP:l10ntools soltools sal NATIVE:xml2cmp NULL +pk setup_native : TRANSLATIONS:translations DESKTOP:l10ntools soltools sal NULL pk setup_native usr1 - all sn_mkout NULL pk setup_native\scripts\source nmake - u sn_source NULL pk setup_native\scripts nmake - u sn_scripts sn_source.u NULL diff --git a/sysui/prj/build.lst b/sysui/prj/build.lst index 0823776398b4..c6ca96f3bdd2 100644 --- a/sysui/prj/build.lst +++ b/sysui/prj/build.lst @@ -1,4 +1,4 @@ -su sysui : TRANSLATIONS:translations offapi NATIVE:xml2cmp DESKTOP:rdbmaker DESKTOP:l10ntools NULL +su sysui : TRANSLATIONS:translations offapi DESKTOP:rdbmaker DESKTOP:l10ntools NULL #su sysui\source\win32\QuickStart nmake - w su_win32_quickstart NULL #su sysui\source\win32\QuickStart\so nmake - w su_win32_quickstart_so su_win32_quickstart.w NULL su sysui\desktop\icons nmake - w su_iconsw NULL diff --git a/xml2cmp/Executable_xml2cmp.mk b/xml2cmp/Executable_xml2cmp.mk deleted file mode 100644 index 600302977d5c..000000000000 --- a/xml2cmp/Executable_xml2cmp.mk +++ /dev/null @@ -1,49 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Initial Developer of the Original Code is -# Peter Foley -# Portions created by the Initial Developer are Copyright (C) 2011 the -# Initial Developer. All Rights Reserved. -# -# Major Contributor(s): -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. -# - -$(eval $(call gb_Executable_Executable,xml2cmp)) - -$(eval $(call gb_Executable_add_exception_objects,xml2cmp,\ - xml2cmp/source/xcd/main \ - xml2cmp/source/support/cmdline \ - xml2cmp/source/support/heap \ - xml2cmp/source/support/sistr \ - xml2cmp/source/support/syshelp \ - xml2cmp/source/support/badcast \ - xml2cmp/source/xcd/cr_html \ - xml2cmp/source/xcd/cr_metho \ - xml2cmp/source/xcd/filebuff \ - xml2cmp/source/xcd/parse \ - xml2cmp/source/xcd/xmlelem \ - xml2cmp/source/xcd/xmltree \ - xml2cmp/source/xcd/dependy \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/xml2cmp/Makefile b/xml2cmp/Makefile deleted file mode 100644 index ccb1c85a04da..000000000000 --- a/xml2cmp/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- - -module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) - -include $(module_directory)/../solenv/gbuild/partial_build.mk - -# vim: set noet sw=4 ts=4: diff --git a/xml2cmp/Module_xml2cmp.mk b/xml2cmp/Module_xml2cmp.mk deleted file mode 100644 index c4279fbffb15..000000000000 --- a/xml2cmp/Module_xml2cmp.mk +++ /dev/null @@ -1,38 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Initial Developer of the Original Code is -# Peter Foley -# Portions created by the Initial Developer are Copyright (C) 2011 the -# Initial Developer. All Rights Reserved. -# -# Major Contributor(s): -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. -# - -$(eval $(call gb_Module_Module,xml2cmp)) - -ifneq ($(CROSS_COMPILING),YES) -$(eval $(call gb_Module_add_targets,xml2cmp,\ - Executable_xml2cmp \ -)) -endif - diff --git a/xml2cmp/README b/xml2cmp/README deleted file mode 100644 index d8e12d439c51..000000000000 --- a/xml2cmp/README +++ /dev/null @@ -1,3 +0,0 @@ -Part of the LibreOffice SDK. - -Mostly used by makefiles to pull out types from xml. diff --git a/xml2cmp/prj/build.lst b/xml2cmp/prj/build.lst deleted file mode 100644 index b486de70513c..000000000000 --- a/xml2cmp/prj/build.lst +++ /dev/null @@ -1,2 +0,0 @@ -xc xml2cmp : solenv NULL -xc xml2cmp\prj nmake - all xc_prj NULL diff --git a/xml2cmp/prj/d.lst b/xml2cmp/prj/d.lst deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/xml2cmp/source/finder/dep_main.cxx b/xml2cmp/source/finder/dep_main.cxx deleted file mode 100644 index 33fd7fcc9cfb..000000000000 --- a/xml2cmp/source/finder/dep_main.cxx +++ /dev/null @@ -1,88 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include - -#include "dependy.hxx" - - -int -#ifdef WNT -_cdecl -#endif -main( int argc, - char * argv[] ) -{ - if (argc < 2 || *argv[1] == '?') - { - std::cout << "\nUse:\n" - << "srvdepy.exe \n" - << std::endl; - return 0; - } - - - DependencyFinder aDependencies; - - aDependencies.GatherData(argv[1]); - char sInput[500] = ""; - std::vector aLibs; - std::vector aServs; - - - std::cout - << "\nNow you can start to put in Service names.\n" - << "Please use correct case, but don't use namespaces.\n" - << "Just the Service's own name.\n\n" - << "To stop the program, put in a hashmark \"#\" + ENTER.\n" - << std::endl; - - - - do { - - sInput[0] = 0; - std::cin >> sInput; - Simstr sImplService(sInput); - if (*sInput != '#') - { - aLibs.erase( aLibs.begin(), aLibs.end() ); - aServs.erase( aServs.begin(), aServs.end() ); - - aDependencies.FindNeededServices( aLibs, aServs, sImplService ); - - std::cout << "\n\n\nNeeded libraries: " << std::endl; - for ( unsigned i = 0; i < aLibs.size(); ++i ) - { - std::cout << " " << aLibs[i].str() << std::endl; - } - std::cout << "\nNeeded services: " << std::endl; - for ( unsigned s= 0; s < aServs.size(); ++s ) - { - std::cout << " " << aServs[s].str() << std::endl; - } - std::cout << "\n\n" << std::endl; - } - } while (*sInput != '#'); - - return 0; -} - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xml2cmp/source/inc/precomp.h b/xml2cmp/source/inc/precomp.h deleted file mode 100644 index aa7f115a836a..000000000000 --- a/xml2cmp/source/inc/precomp.h +++ /dev/null @@ -1,45 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef CPV_PRECOMP_H -#define CPV_PRECOMP_H - -typedef short Bool; -#define True 1 -#define False 0 - - - -typedef long intt; - -#define AND && -#define OR || -#define NOT ! - - -#define REF( x ) (&(x)) -#define THIS_ pThis - - - -#endif - - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xml2cmp/source/support/badcast.cxx b/xml2cmp/source/support/badcast.cxx deleted file mode 100644 index 09afc27ddfc0..000000000000 --- a/xml2cmp/source/support/badcast.cxx +++ /dev/null @@ -1,43 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - - - -/* Include this for instantiating bad-cast, - due to problems with WNT-STL-headers. -*/ - -// If anybody who happens to read this has any idea what dark magic -// this is supposed to achieve, and whether it is needed or in any way -// relevant with MSVC2008 (or eventually newer), please add a -// comment... - -#if defined(WNT) && !defined(__MINGW32__) - -#define _NTSDK -#include - -_STD_BEGIN -bad_cast G_Dummy_Inst_bad_cast; -_STD_END -#endif // WNT - - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xml2cmp/source/support/cmdline.cxx b/xml2cmp/source/support/cmdline.cxx deleted file mode 100644 index cdf484fb52e7..000000000000 --- a/xml2cmp/source/support/cmdline.cxx +++ /dev/null @@ -1,161 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "cmdline.hxx" - -#include -#include -#include -#include - - -char C_sUseText[] = "Use: xml2cmp.exe \n" - " [-dep \n" - " [-func funcFile] \n" - " [-html htmlFile] \n" - " [-types typeFile] \n" - " [-idlpath idlPath] \n" - " Xml_FileName\n"; - - -char C_sCmdFunc[] = "-func"; -char C_sCmdDep[] = "-dep"; -char C_sCmdHtml[] = "-html"; -char C_sCmdType[] = "-types"; -char C_sCmdIdlPath[] = "-idlpath"; - - - -bool GetParameter( Simstr & o_rMemory, int & io_nCountArg, int argc, char * argv[] ); - - -CommandLine::CommandLine( int argc, - char * argv[] ) - : bIsOk(true) -{ - bool bDisplayUse = false; - - /* Check command line: */ - if ( argc < 2 ) - bDisplayUse = true; - else if ( argc == 2 && ! isalnum(argv[1][0]) ) - bDisplayUse = true; - - if (bDisplayUse) - { - std::cout << C_sUseText << std::endl; - bIsOk = false; - exit(0); - } - - ParseSingleFileCommand(argc,argv); - - if ( sXmlSourceFile.l() == 0 - && sXmlSourceDirectory.l() == 0 ) - { - bIsOk = false; - } - else if ( sXmlSourceFile.l() > 0 - && sXmlSourceDirectory.l() > 0 ) - { - bIsOk = false; - } -} - -CommandLine::~CommandLine() -{ -} - - -const char * -CommandLine::ErrorText() const -{ - static char cOut[] = "Error: Command line was incorrect. Probably there was a flag without\n" - " the corresponding parameter. Or there was no XML-sourcefile specified.\n"; - return cOut; -} - -bool -GetParameter( Simstr & o_pMemory, - int & io_pCountArg, - int argc, char * argv[] ) -{ - io_pCountArg++; - if( io_pCountArg < argc ) - { - o_pMemory = argv[io_pCountArg]; - return true; - } - return false; -} - -void -CommandLine::ParseSingleFileCommand( int argc, - char * argv[] ) -{ - for ( int nCountArg = 1; nCountArg < argc && bIsOk; ++nCountArg ) - { - if ( strcmp( argv[nCountArg], C_sCmdFunc ) == 0 ) - { - bIsOk = GetParameter( - sFuncFile, - nCountArg, - argc, - argv ); - } - else if ( strcmp( argv[nCountArg], C_sCmdHtml ) == 0 ) - { - bIsOk = GetParameter( - sHtmlFile, - nCountArg, - argc, - argv ); - } - else if ( strcmp( argv[nCountArg], C_sCmdType ) == 0 ) - { - bIsOk = GetParameter( - sTypeInfoFile, - nCountArg, - argc, - argv ); - } - else if ( strcmp( argv[nCountArg], C_sCmdIdlPath ) == 0 ) - { - bIsOk = GetParameter( - sIdlRootPath, - nCountArg, - argc, - argv ); - } - else if ( strcmp( argv[nCountArg], C_sCmdDep ) == 0 ) - { - bIsOk = GetParameter( - sDepPath, - nCountArg, - argc, - argv ); - } - else - { - sXmlSourceFile = argv[nCountArg]; - } - } /* end for */ -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xml2cmp/source/support/cmdline.hxx b/xml2cmp/source/support/cmdline.hxx deleted file mode 100644 index 89052fc3547f..000000000000 --- a/xml2cmp/source/support/cmdline.hxx +++ /dev/null @@ -1,71 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef X2C_CMDLINE_HXX -#define X2C_CMDLINE_HXX - -#include "sistr.hxx" - -class CommandLine -{ - public: - CommandLine( - int i_argc, - char * i_argv[] ); - ~CommandLine(); - - bool IsOk() const { return bIsOk; } - const char * ErrorText() const; - - const char * XmlSrcFile() const { return sXmlSourceFile.str(); } - const char * FuncFile() const { return sFuncFile.str(); } - const char * HtmlFile() const { return sHtmlFile.str(); } - const char * TypeInfoFile() const { return sTypeInfoFile.str(); } - const char * DepPath() const { return sDepPath.str(); } - - bool IsDepCommand() const { return sDepPath.l() > 0; } - const char * XmlSrcDirectory() const { return sXmlSourceDirectory.str(); } - const char * OutputDirectory() const { return sOutputDirectory.str(); } - - const char * IdlRootPath() const { return sIdlRootPath.str(); } - - private: - void ParseSingleFileCommand( - int argc, - char * argv[] ); - Simstr sXmlSourceFile; - Simstr sFuncFile; - Simstr sHtmlFile; - Simstr sTypeInfoFile; - - Simstr sXmlSourceDirectory; - Simstr sOutputDirectory; - - Simstr sIdlRootPath; - Simstr sDepPath; - - bool bIsOk; -}; - - - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xml2cmp/source/support/heap.cxx b/xml2cmp/source/support/heap.cxx deleted file mode 100644 index d0e0e961c1c7..000000000000 --- a/xml2cmp/source/support/heap.cxx +++ /dev/null @@ -1,194 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include -#include "heap.hxx" - - -#include -#include -#define AssertionOf(x) {if (!(x)) {std::cerr << "Assertion failed: " << #x << __FILE__ << __LINE__ << std::endl; exit(3); }} - -#ifdef UNX -#define stricmp strcasecmp -#endif - - - -Heap::Heap(unsigned i_nWidth) - : dpColumnsArray(new Column[i_nWidth]), - nColumnsArraySize(i_nWidth), - nActiveColumn(nColumnsArraySize-1) -{ - for ( unsigned i = 0; i < nColumnsArraySize; i++) - { - dpColumnsArray[i] = 0; - } // end for -} - -Heap::~Heap() -{ - for ( unsigned i = 0; i < nColumnsArraySize; i++) - { - HeapItem * & rColumn = dpColumnsArray[i]; - for ( HeapItem * pValue = rColumn; pValue != 0; pValue = rColumn ) - { - rColumn = rColumn->Next(); - delete pValue; - } - } // end for - - delete [] dpColumnsArray; -} - -void -Heap::InsertValue( const char * i_sKey, - const char * i_sValue ) -{ - HeapItem * pSearch1 = 0; - HeapItem * pSearch2 = 0; - HeapItem * pNew = new HeapItem(i_sKey, i_sValue); - - IncColumn(); - pSearch1 = ActiveColumn(); - - if ( pSearch1 != 0 ? *pNew < *pSearch1 : true ) - { - pNew->SetNext( pSearch1 ); - ActiveColumn() = pNew; - - if ( pNew->Next() != 0) - { - AssertionOf( *pNew <= *pNew->Next() ); - } - - return; - } - - do - { - pSearch2 = pSearch1; - pSearch1 = pSearch1->Next(); - - if ( pSearch1 != 0 ? *pNew < *pSearch1 : true ) - { - pNew->SetNext( pSearch1 ); - pSearch2->SetNext(pNew); - - - AssertionOf( *pSearch2 <= *pNew ); - if ( pNew->Next() != 0) - { - AssertionOf( *pNew <= *pNew->Next() ); - } - - } - } while (pSearch2->Next() != pNew); -} - - -Simstr sKey1; -Simstr sValue1; -Simstr sKey2; -Simstr sValue2; -int nCol1 = 0; -int nCol2 = 0; - - -HeapItem * -Heap::ReleaseTop() -{ - unsigned nRetColumn = 0; - HeapItem * ret = dpColumnsArray[0]; - HeapItem * pSearch = 0; - - for ( unsigned i = 1; i < nColumnsArraySize; ++i ) - { - pSearch = dpColumnsArray[i]; - if (pSearch != 0) - { - if ( ret == 0 ? true : *pSearch < *ret) - { - ret = pSearch; - nRetColumn = i; - } - } - } // for - - if (ret != 0) - { - dpColumnsArray[nRetColumn] = ret->Next(); - } - return ret; -} - -void -Heap::IncColumn() -{ - if (++nActiveColumn >= nColumnsArraySize) - nActiveColumn = 0; -} - - - -HeapItem::HeapItem( const char * i_sKey, - const char * i_sValue ) - : sValue(i_sValue), - sKey(i_sKey), - pNext(0) -{ -} - -HeapItem::~HeapItem() -{ -} - -bool -HeapItem::operator<( const HeapItem & i_rOther ) const -{ - int ret = stricmp(sKey.str(), i_rOther.sKey.str()); - if (ret == 0) - ret = strcmp(sKey.str(), i_rOther.sKey.str()); - if (ret == 0) - ret = stricmp(sValue.str(), i_rOther.sValue.str()); - if (ret == 0) - ret = strcmp(sValue.str(), i_rOther.sValue.str()); - return ret < 0; -} - -const Simstr & -HeapItem::Key() const -{ - return sKey; -} - -HeapItem * -HeapItem::Next() const -{ - return pNext; -} - -void -HeapItem::SetNext( HeapItem * i_pNext ) -{ - pNext = i_pNext; -} - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xml2cmp/source/support/heap.hxx b/xml2cmp/source/support/heap.hxx deleted file mode 100644 index df6969ec4b93..000000000000 --- a/xml2cmp/source/support/heap.hxx +++ /dev/null @@ -1,83 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef X2C_HEAP_HXX -#define X2C_HEAP_HXX - -#include "sistr.hxx" - -class HeapItem; - -class Heap -{ - public: - Heap( - unsigned i_nWidth ); - ~Heap(); - - void InsertValue( - const char * i_sKey, - const char * i_sValue ); - HeapItem * ReleaseTop(); /// @return must be deleted by caller of method. - - private: - typedef HeapItem * Column; - - void IncColumn(); - Column & ActiveColumn() { return dpColumnsArray[nActiveColumn]; } - - Column * dpColumnsArray; - unsigned nColumnsArraySize; - unsigned nActiveColumn; -}; - - -class HeapItem -{ - public: - HeapItem( - const char * i_sKey, - const char * i_sValue ); - ~HeapItem( ); - - bool operator<( - const HeapItem & i_rOther ) const; - bool operator<=( - const HeapItem & i_rOther ) const - { return ! (i_rOther < *this); } - const Simstr & Key() const; - HeapItem * Next() const; - - void SetNext( - HeapItem * i_pNext ); - private: - Simstr sValue; - Simstr sKey; - HeapItem * pNext; -}; - - - - - - -#endif - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xml2cmp/source/support/list.hxx b/xml2cmp/source/support/list.hxx deleted file mode 100644 index 77da1608e10a..000000000000 --- a/xml2cmp/source/support/list.hxx +++ /dev/null @@ -1,244 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef __LISTEN_123456__ -#define __LISTEN_123456__ - -#include -#include -#include - -template -class List -{ - public : - typedef XX * iterator; - typedef const XX * const_iterator; - - // LIFECYCLE - List(); - virtual ~List() { delete [] inhalt; } - - // OPERATORS - const XX & operator[]( - unsigned n) const - { return elem(n); } - XX & operator[]( - unsigned n) - { return elem(n); } - // OPERATIONS - void reserve( - unsigned i_nSize ) - { alloc(i_nSize,true); } - virtual void insert( - unsigned pos, - const XX & elem ); - void push_back( - const XX & elem_) - { insert(size(),elem_); } - - virtual void remove( - unsigned pos ); - void pop_back() { remove(size()-1); } - void erase_all() { while (size()) remove(size()-1); } - - // INQUIRY - const XX & front() const { return elem(0); } - const XX & back() const { return elem(len-1); } - - unsigned size() const { return len; } - unsigned space() const { return allocated; } - bool is_valid_index( - unsigned n) const - { return n < len; } - // ACCESS - XX & front() { return elem(0); } - XX & back() { return elem(len-1); } - - protected: - void checkSize( - unsigned newLength); - void alloc( - unsigned newSpace, - bool re = false ); - - const XX & elem( - unsigned n ) const - { return inhalt[n]; } - XX & elem( - unsigned n ) - { return inhalt[n]; } - // DATA - XX * inhalt; - unsigned len; - unsigned allocated; - - private: - // forbidden functions - List(const List & L); - List & operator=( - const List & L); - -}; - -template -class DynamicList : public List -{ - public: - virtual ~DynamicList(); - - virtual void insert( - unsigned pos, - XY * const & elem ); - virtual void remove( - unsigned pos ); -}; - - - -template -List::List() - : inhalt(0), - len(0), - allocated(0) - -{ - alloc(1); -} - - -template -void -List::insert(unsigned pos, const XX & elem_) -{ - if ( pos > len ) - return; - - checkSize(len+2); - for ( unsigned p = len; p > pos; --p) - { - inhalt[p] = inhalt[p-1]; - } - inhalt[pos] = elem_; - len++; -} - - -template -void -List::remove(unsigned pos) -{ - if ( pos >= len ) - return; - len--; - for ( unsigned p = pos; p < len; ++p) - { - inhalt[p] = inhalt[p+1]; - } -} - - -// Protected: -template -void -List::checkSize(unsigned newLength) -{ - // test new size requirement: - unsigned newSpace = space(); - if (newLength > newSpace) - { - if (!newSpace) - newSpace = 1; - const unsigned nBorder = 65536 / 2; - while(newLength > newSpace) - { - if (newSpace < nBorder) - newSpace <<= 1; - else - { - std::cerr << "List becomes too big" << std::endl; - exit(1); - } - } - } - - // change? - if (newSpace != space()) - alloc(newSpace,true); -} - -template -void -List::alloc( unsigned newSpace, - bool re ) -{ - XX * pNew = new XX[newSpace]; - - if (inhalt != 0) - { - if (re) - { - for (unsigned i = 0; i < len; ++i) - { - pNew[i] = inhalt[i]; - } // end for - } - delete [] inhalt; - } - - inhalt = pNew; - allocated = newSpace; -} - - -template -DynamicList::~DynamicList() -{ - this->erase_all(); -} - -template -void -DynamicList::insert(unsigned pos, XY * const & elem_) -{ - if ( pos > this->len ) - return; - - this->checkSize(this->len+2); - memmove(&this->inhalt[pos+1], &this->inhalt[pos], (this->len-pos) * sizeof(XY*) ); - this->inhalt[pos] = elem_; - this->len++; -} - -template -void -DynamicList::remove( unsigned pos ) -{ - if (!this->is_valid_index(pos) ) - return; - this->len--; - delete this->inhalt[pos]; - memmove(&this->inhalt[pos], &this->inhalt[pos+1], (this->len-pos) * sizeof(XY*) ); -} - - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xml2cmp/source/support/sistr.cxx b/xml2cmp/source/support/sistr.cxx deleted file mode 100644 index a3464175bf9f..000000000000 --- a/xml2cmp/source/support/sistr.cxx +++ /dev/null @@ -1,393 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - - -#include - -// The following two header-files declare -// standard ANSI-C++ functions. They may be replaced -// by the corresponding header-file-names of the -// actually used runtime library. -#include // strlen(), memcpy(), memset() -#include // tolower() -#include // INT_MAX - -#if (_MSC_VER >=1400) -#pragma warning(disable:4365) -#endif - -const char NULCH = '\0'; -const int NO_POS = -1; - - -Simstr::Simstr(const char * str_) -{ - if (str_ == 0) - { - len = 0; - sz = new char[1]; - *sz = 0; - } - else - { - len = strlen(str_); - sz = new char[len+1]; - memcpy(sz,str_,len+1); - } -} - -Simstr::Simstr( const char * anybytes, - int firstBytesPos, - int nrOfBytes) -{ - unsigned slen = strlen(anybytes); - if (anybytes == 0 || slen <= unsigned(firstBytesPos)) - { - len = 0; - sz = new char[1]; - *sz = 0; - } - else - { - int maxLen = slen - unsigned(firstBytesPos); - len = maxLen < nrOfBytes - ? maxLen - : nrOfBytes; - sz = new char[len+1]; - memcpy(sz,anybytes+firstBytesPos,len); - *(sz+len) = 0; - } -} - - -Simstr::Simstr(const Simstr & S) -{ - len = S.len; - sz = new char[len+1]; - memcpy(sz,S.sz,len+1); -} - -Simstr & Simstr::operator=(const Simstr & S) -{ - if (sz == S.sz) - return *this; - - delete [] sz; - - len = S.len; - sz = new char[len+1]; - memcpy(sz,S.sz,len+1); - - return *this; -} - -Simstr::~Simstr() -{ - delete [] sz; -} - -Simstr -Simstr::operator+(const Simstr & S) const -{ - Simstr ret = sz; - ret.push_back(S); - return ret; -} - -Simstr & -Simstr::operator+=(const Simstr & S) -{ - push_back(S); - return *this; -} - - -// REL - -bool -Simstr::operator==(const Simstr & S) const -{ return !strcmp(sz,S.sz) ? true : false; } - -bool -Simstr::operator!=(const Simstr & S) const -{ return strcmp(sz,S.sz) ? true : false; } - -bool -Simstr::operator<(const Simstr & S) const -{ return (strcmp(sz,S.sz) < 0) ? true : false; } - -bool -Simstr::operator>(const Simstr & S) const -{ return (strcmp(sz,S.sz) > 0) ? true : false; } - -bool -Simstr::operator<=(const Simstr & S) const -{ return (strcmp(sz,S.sz) <= 0) ? true : false; } - -bool -Simstr::operator>=(const Simstr & S) const -{ return (strcmp(sz,S.sz) >= 0) ? true : false; } - - - - -// ************** LIST - Funktionen ***************** - -// Insert - -void -Simstr::push_front(char c) -{ - char * result = new char[len+2]; - - result[0] = c; - memcpy(result+1,sz,len+1); - - delete [] sz; - sz = result; - len++; -} - -void -Simstr::push_back(char c) -{ - char * result = new char[len+2]; - - memcpy(result,sz,len); - result[len] = c; - result[len+1] = 0; - - delete [] sz; - sz = result; - len++; -} - -void -Simstr::push_front(const Simstr & S) -{ - char * result = new char[len+1+S.len]; - - memcpy(result,S.sz,S.len); - memcpy(result+S.len,sz,len+1); - - delete [] sz; - sz = result; - len += S.len; -} - -void -Simstr::push_back(const Simstr & S) -{ - char * result = new char[len+1+S.len]; - - memcpy(result,sz,len); - memcpy(result+len,S.sz,S.len+1); - - delete [] sz; - sz = result; - len += S.len; -} - - -// Remove - -void -Simstr::remove(int pos, int anzahl) -{ - if (pos >= len || pos < 0 || anzahl < 1) - return; - - int anz = len - pos < anzahl ? len - pos : anzahl; - - char * result = new char[len-anz+1]; - - memcpy(result,sz,pos); - memcpy(result+pos,sz+pos+anz,len-pos-anz+1); - - delete [] sz; - sz = result; - len -= anz; -} - -void -Simstr::remove_trailing_blanks() -{ - int newlen = len-1; - for ( ; newlen > 1 && sz[newlen] <= 32; --newlen ) {} - - if (newlen < len-1) - remove ( newlen+1, len-newlen); -} - -// Find - -int -Simstr::pos_first(char c) const -{ - int i = 0; - for (i = 0; i < len ? sz[i] != c : false; i++) ; - if (i >= len) - return NO_POS; - else - return i; -} - -int -Simstr::pos_last(char c) const -{ - int i = 0; - for (i = len-1; i >= 0 ? sz[i] != c : false; i--) ; - if (i < 0) - return NO_POS; - else - return i; -} - -bool -Simstr::is_no_text() const -{ - if (!len) - return true; - - int i; - for (i = 0; i < len && sz[i] <= 32 ; i++) ; - if (i < len) - return false; - return true; -} - -// Change - -void -Simstr::replace_all(char oldCh, char newCh) -{ - for (int i=0; i < len; i++) - if (sz[i] == oldCh) - sz[i] = newCh; -} - -// Simstr addition -Simstr -operator+(const char * str, const Simstr & S) -{ - Simstr ret = S; - ret.push_front(str); - return ret; -} - -Simstr -operator+(const Simstr & S, const char * str) -{ - Simstr ret = S; - ret.push_back(str); - return ret; -} - -Simstr -operator+(char c, const Simstr & S) -{ - Simstr ret = S; - ret.push_front(c); - return ret; -} - -Simstr -operator+(const Simstr & S, char c) -{ - Simstr ret = S; - ret.push_back(c); - return ret; -} - - -// Simstr-Vergleiche mit char * -bool -operator==(const Simstr & S, const char * str) -{ - return strcmp(S,str) == 0; -} - -bool -operator!=(const Simstr & S, const char * str) -{ - return strcmp(S,str) != 0; -} - -bool -operator<(const Simstr & S, const char * str) -{ - return strcmp(S,str) < 0; -} - -bool -operator>(const Simstr & S, const char * str) -{ - return strcmp(S,str) > 0; -} - -bool -operator<=(const Simstr & S, const char * str) -{ - return strcmp(S,str) <= 0; -} - -bool -operator>=(const Simstr & S, const char * str) -{ - return strcmp(S,str) >= 0; -} - -bool -operator==(const char * str, const Simstr & S) -{ - return strcmp(str,S) == 0; -} - -bool -operator!=(const char * str, const Simstr & S) -{ - return strcmp(str,S) != 0; -} - -bool -operator<(const char * str, const Simstr & S) -{ - return strcmp(str,S) < 0; -} - -bool -operator>(const char * str, const Simstr & S) -{ - return strcmp(str,S) > 0; -} - -bool -operator<=(const char * str, const Simstr & S) -{ - return strcmp(str,S) <= 0; -} - -bool -operator>=(const char * str, const Simstr & S) -{ - return strcmp(str,S) >= 0; -} - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xml2cmp/source/support/sistr.hxx b/xml2cmp/source/support/sistr.hxx deleted file mode 100644 index de2000424202..000000000000 --- a/xml2cmp/source/support/sistr.hxx +++ /dev/null @@ -1,141 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef XML2CMP_SISTR_HXX -#define XML2CMP_SISTR_HXX - - -class Simstr -{ -// INTERFACE - public: - // Constructors, destructor, '=' and typecasts - Simstr( - const char * str = 0); - Simstr( // Creates Simstr out of a copy of the described bytes within 'anyBytes'. - // Adds a '\0' at the end. - const char * anybytes, - int firstBytesPos, - int nrOfBytes); - virtual ~Simstr(); - Simstr( - const Simstr & S); - Simstr & operator=( - const Simstr & S); - operator const char*() const; - - // diverse utility functions - const char * str() const { return sz; } - char * s(); // CAUTION!!! // Only use when a function needs a 'char*' but - // still will NOT MODIFY THE STRING! - // Typecasts to 'const char*' are performed automatically. - int l() const; // Length of string without '\0' at end. - Simstr operator+( - const Simstr & S) const; - Simstr & operator+=( - const Simstr & S); - - // comparison operators - bool operator==( - const Simstr & S) const; - bool operator!=( - const Simstr & S) const; - bool operator<( - const Simstr & S) const; - bool operator>( - const Simstr & S) const; - bool operator<=( - const Simstr & S) const; - bool operator>=( - const Simstr & S) const; - - - // 'List of characters' - functions - // insert - functions - void push_front( - char c); - void push_back( - char c); - void push_front( - const Simstr & S); - void push_back( - const Simstr & S); - // remove - functions - void remove( - int pos, - int anzahl = 1); - void remove_trailing_blanks(); - - // search functions - int pos_first( - char c) const; - int pos_last( - char c) const; - bool is_empty() const; // Only true if object == "". - bool is_no_text() const; // String may contain spaces or tabs. - - // substitution functions - void replace_all( - char oldCh, - char newCh); - // token functions - // get...-functions return the token, separated by char 'c' and leave the object unchanged. - // take...-functions return the same, but remove the token and the corresponding separator from the object. - Simstr get_last_token( - char c) const; - - private: - char * sz; - int len; -}; - -// Simstr - char* / char - concatenations -Simstr operator+(const char * str, const Simstr & S); -Simstr operator+(const Simstr & S, const char * str); -Simstr operator+(char c, const Simstr & S); -Simstr operator+(const Simstr & S, char c); - -// Simstr - char* - comparison operators -bool operator==(const Simstr & S, const char * str); -bool operator!=(const Simstr & S, const char * str); -bool operator<(const Simstr & S, const char * str); -bool operator>(const Simstr & S, const char * str); -bool operator<=(const Simstr & S, const char * str); -bool operator>=(const Simstr & S, const char * str); -bool operator==(const char * str, const Simstr & S); -bool operator!=(const char * str, const Simstr & S); -bool operator<(const char * str, const Simstr & S); -bool operator>(const char * str, const Simstr & S); -bool operator<=(const char * str, const Simstr & S); -bool operator>=(const char * str, const Simstr & S); - - -inline char * -Simstr::s() { return sz; } -inline int -Simstr::l() const { return len; } -inline -Simstr::operator const char*() const { return sz; } -inline bool -Simstr::is_empty() const { return len == 0; } - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xml2cmp/source/support/syshelp.cxx b/xml2cmp/source/support/syshelp.cxx deleted file mode 100644 index 6cc915a68b12..000000000000 --- a/xml2cmp/source/support/syshelp.cxx +++ /dev/null @@ -1,307 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - - -#include - - -// NOT FULLY DEFINED SERVICES -#include -#include "sistr.hxx" -#include "list.hxx" - -#ifdef WNT -#include -#elif defined(UNX) -#include -#include -#include -#define stricmp strcasecmp -#else -#error Must run under unix or windows, please define UNX or WNT. -#endif - - -char C_sSpaceInName[] = "   "; - -void -WriteName( std::ostream & o_rFile, - const Simstr & i_rIdlDocuBaseDir, - const Simstr & i_rName, - E_LinkType i_eLinkType ) -{ - if (i_rName.l() == 0) - return; - - - const char * pNameEnd = strstr( i_rName.str(), " in " ); - - // No link: - if ( i_eLinkType == lt_nolink ) - { - if ( pNameEnd != 0 ) - { - const char * pStart = i_rName.str(); - o_rFile.write( pStart, pNameEnd - pStart ); - WriteStr( o_rFile, C_sSpaceInName ); - WriteStr( o_rFile, pNameEnd ); - } - else - { - WriteStr( o_rFile, i_rName ); - } - return; - } - - if ( i_eLinkType == lt_idl ) - { - Simstr sPath(i_rName); - sPath.replace_all('.','/'); - int nNameEnd = sPath.pos_first(' '); - int nPathStart = sPath.pos_last(' '); - WriteStr( o_rFile, " -1 ) - { - WriteStr( o_rFile, "file:///" ); - WriteStr( o_rFile, i_rIdlDocuBaseDir ); - WriteStr( o_rFile, "/" ); - WriteStr( o_rFile, sPath.str() + 1 + nPathStart ); - WriteStr( o_rFile, "/" ); - o_rFile.write( sPath.str(), nNameEnd ); - WriteStr( o_rFile, ".html\">" ); - } - else - { // Should not be reached: - WriteStr(o_rFile, i_rName); - return; - } - } - else if ( i_eLinkType == lt_html ) - { - int nKomma = i_rName.pos_first(','); - int nEnd = i_rName.pos_first(' '); - if ( nKomma > -1 ) - { - o_rFile.write( i_rName.str(), nKomma ); - WriteStr( o_rFile, ": " ); - - WriteStr( o_rFile, " -1 ) - o_rFile.write( i_rName.str() + nKomma + 1, nEnd - nKomma ); - else - WriteStr( o_rFile, i_rName.str() + nKomma + 1 ); - WriteStr( o_rFile, "\">" ); - - o_rFile.write( i_rName.str() + nKomma + 1, nEnd - nKomma ); - } - else - { - WriteStr( o_rFile, "" ); - - WriteStr( o_rFile, i_rName ); - } - WriteStr( o_rFile, "" ); - return; - } - - if ( pNameEnd != 0 ) - { - const char * pStart = i_rName.str(); - if ( pNameEnd > pStart ) - o_rFile.write( pStart, pNameEnd - pStart ); - WriteStr( o_rFile, "" ); - - WriteStr( o_rFile, C_sSpaceInName ); - WriteStr( o_rFile, pNameEnd ); - } - else - { - WriteStr( o_rFile, i_rName ); - WriteStr( o_rFile, "" ); - } -} - - -void -WriteStr( std::ostream & o_rFile, - const char * i_sStr ) -{ - o_rFile.write( i_sStr, (int) strlen(i_sStr) ); -} - -void -WriteStr( std::ostream & o_rFile, - const Simstr & i_sStr ) -{ - o_rFile.write( i_sStr.str(), i_sStr.l() ); -} - - -const char C_sXML_END[] = "\\*.xml"; - -void -GatherFileNames( List & o_sFiles, - const char * i_sSrcDirectory ) -{ - static int nAliveCounter = 0; - - char * sNextDir = 0; - Simstr sNew = 0; - -#ifdef WNT - struct _finddata_t aEntry; - long hFile = 0; - int bFindMore = 0; - char * sFilter = new char[ strlen(i_sSrcDirectory) + sizeof C_sXML_END ]; - - // Stayingalive sign - if (++nAliveCounter % 100 == 1) - std::cout << "." << std::flush; - - strcpy(sFilter, i_sSrcDirectory); // STRCPY SAFE HERE - strcat(sFilter,C_sXML_END); // STRCAT SAFE HERE - - hFile = _findfirst( sFilter, &aEntry ); - for ( bFindMore = hFile == -1; - bFindMore == 0; - bFindMore = _findnext( hFile, &aEntry ) ) - { - sNew = i_sSrcDirectory; - sNew += "\\"; - sNew += aEntry.name; - o_sFiles.push_back(sNew); - } // end for - - _findclose(hFile); - delete [] sFilter; -#elif defined(UNX) - DIR * pDir = opendir( i_sSrcDirectory ); - dirent * pEntry = 0; - char * sEnding; - - // Stayingalive sign - if (++nAliveCounter % 100 == 1) - std::cout << "." << std::flush; - - while ( (pEntry = readdir(pDir)) != 0 ) - { - sEnding = strrchr(pEntry->d_name,'.'); - if (sEnding != 0 ? stricmp(sEnding,".xml") == 0 : 0 ) - { - sNew = i_sSrcDirectory; - sNew += "/"; - sNew += pEntry->d_name; - o_sFiles.push_back(sNew); - } - } // end while - - closedir( pDir ); -#else -#error Must run on unix or windows, please define UNX or WNT. -#endif - - // gathering from subdirectories: - List aSubDirectories; - GatherSubDirectories( aSubDirectories, i_sSrcDirectory ); - - unsigned d_max = aSubDirectories.size(); - for ( unsigned d = 0; d < d_max; ++d ) - { - sNextDir = new char[ strlen(i_sSrcDirectory) + 2 + aSubDirectories[d].l() ]; - - strcpy(sNextDir, i_sSrcDirectory); - strcat(sNextDir, C_sSLASH); - strcat(sNextDir, aSubDirectories[d].str()); - GatherFileNames(o_sFiles, sNextDir); - - delete [] sNextDir; - } -} - - -const char * C_sANYDIR = "\\*.*"; - -void -GatherSubDirectories( List & o_sSubDirectories, - const char * i_sParentdDirectory ) -{ - Simstr sNew; - -#ifdef WNT - struct _finddata_t aEntry; - long hFile = 0; - int bFindMore = 0; - char * sFilter = new char[strlen(i_sParentdDirectory) + sizeof C_sANYDIR]; - - strcpy(sFilter, i_sParentdDirectory); - strcat(sFilter,C_sANYDIR); - - hFile = _findfirst( sFilter, &aEntry ); - for ( bFindMore = hFile == -1; - bFindMore == 0; - bFindMore = _findnext( hFile, &aEntry ) ) - { - if (aEntry.attrib == _A_SUBDIR) - { - // Do not gather . .. and outputtree directories - if ( strchr(aEntry.name,'.') == 0 - && strncmp(aEntry.name, "wnt", 3) != 0 - && strncmp(aEntry.name, "unx", 3) != 0 ) - { - sNew = aEntry.name; - o_sSubDirectories.push_back(sNew); - } - } // endif (aEntry.attrib == _A_SUBDIR) - } // end for - _findclose(hFile); - delete [] sFilter; - -#elif defined(UNX) - DIR * pDir = opendir( i_sParentdDirectory ); - dirent * pEntry = 0; - struct stat aEntryStatus; - - while ( ( pEntry = readdir(pDir) ) != 0 ) - { - stat(pEntry->d_name, &aEntryStatus); - if ( ( aEntryStatus.st_mode & S_IFDIR ) == S_IFDIR ) - { - // Do not gather . .. and outputtree directories - if ( strchr(pEntry->d_name,'.') == 0 - && strncmp(pEntry->d_name, "wnt", 3) != 0 - && strncmp(pEntry->d_name, "unx", 3) != 0 ) - { - sNew = pEntry->d_name; - o_sSubDirectories.push_back(sNew); - } - } // endif (aEntry.attrib == _A_SUBDIR) - } // end while - closedir( pDir ); -#else -#error Must run on unix or windows, please define UNX or WNT. -#endif -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xml2cmp/source/support/syshelp.hxx b/xml2cmp/source/support/syshelp.hxx deleted file mode 100644 index 91c231bd9187..000000000000 --- a/xml2cmp/source/support/syshelp.hxx +++ /dev/null @@ -1,78 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef X2C_SYSHELP_HXX -#define X2C_SYSHELP_HXX - - - -// USED SERVICES - // BASE CLASSES - // COMPONENTS - // PARAMETERS -#include - -class Simstr; -template class List; - - -#if defined(WNT) -const char C_sSLASH[] = "\\"; -const char C_cSLASH = '\\'; -#elif defined(UNX) -const char C_sSLASH[] = "/"; -const char C_cSLASH = '/'; -#else -#error Must run under unix or windows, please define UNX or WNT. -#endif - -enum E_LinkType -{ - lt_nolink = 0, - lt_idl, - lt_html -}; - - -void WriteName( - std::ostream & o_rFile, - const Simstr & i_rIdlDocuBaseDir, - const Simstr & i_rName, - E_LinkType i_eLinkType ); - - -void WriteStr( - std::ostream & o_rFile, - const char * i_sStr ); -void WriteStr( - std::ostream & o_rFile, - const Simstr & i_sStr ); - -void GatherFileNames( - List & o_sFiles, - const char * i_sSrcDirectory ); -void GatherSubDirectories( - List & o_sSubDirectories, - const char * i_sParentdDirectory ); - - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xml2cmp/source/xcd/cr_html.cxx b/xml2cmp/source/xcd/cr_html.cxx deleted file mode 100644 index b268d14d04b3..000000000000 --- a/xml2cmp/source/xcd/cr_html.cxx +++ /dev/null @@ -1,261 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include -#include "cr_html.hxx" -#include "xmltree.hxx" -#include "../support/syshelp.hxx" - - - - -char C_sHtmlFileHeader1[] = - "\n" - "\n" - "\n" - " "; - -char C_sHtmlFileHeader2[] = - "\n" - " \n" - "\n" - "\n


    "; - - -char C_sHtmlFileFoot[] = "\n\n"; - - -HtmlCreator::HtmlCreator( const char * i_pOutputFileName, - const XmlElement & i_rDocument, - const Simstr & i_sIDL_BaseDirectory ) - : aFile(i_pOutputFileName, std::ios::out -#if defined(WNT) - | std::ios::binary -#endif - ), - rDocument(i_rDocument), - sIdl_BaseDirectory(i_sIDL_BaseDirectory) -{ - if ( !aFile ) - { - std::cerr << "Error: " << i_pOutputFileName << " could not be created." << std::endl; - exit(0); - } -} - -HtmlCreator::~HtmlCreator() -{ - aFile.close(); -} - -void -HtmlCreator::Run() -{ - WriteStr( C_sHtmlFileHeader1 ); - WriteStr( "ModuleDescription" ); - WriteStr( C_sHtmlFileHeader2 ); - - rDocument.Write2Html(*this); - - WriteStr( "



    \n" ); - WriteStr( C_sHtmlFileFoot ); -} - -void -HtmlCreator::StartTable() -{ - WriteStr( "


    \n" ); - WriteStr( - "\n" - " \n" ); -} - -void -HtmlCreator::FinishTable() -{ - WriteStr( " \n" - "
    \n\n" ); -} - -void -HtmlCreator::StartBigCell( const char * i_sTitle ) -{ - WriteStr( "\n" - "


    " ); - WriteStr( i_sTitle ); - WriteStr( "

    \n" ); - -} - -void -HtmlCreator::FinishBigCell() -{ - WriteStr( "\n" ); -} - -void -HtmlCreator::Write_SglTextElement( const SglTextElement & i_rElement, - bool i_bStrong ) -{ - StartRow(); - - WriteElementName( i_rElement.Name(), i_bStrong ); - - StartCell( "77%"); - if (i_bStrong) - { - WriteStr( "

    " ); - } - - WriteName( aFile, sIdl_BaseDirectory, i_rElement.Data(), - i_bStrong ? lt_nolink : i_rElement.LinkType() ); - - if (i_bStrong) - WriteStr( "

    " ); - FinishCell(); - - FinishRow(); -} - -void -HtmlCreator::Write_MultiTextElement( const MultipleTextElement & i_rElement ) -{ - StartRow(); - - WriteElementName( i_rElement.Name(), false ); - - StartCell( "77%"); - unsigned i_max = i_rElement.Size(); - for ( unsigned i = 0; i < i_max; ++i ) - { - if (i > 0) - WriteStr( "
    \n" ); - WriteName( aFile, sIdl_BaseDirectory, i_rElement.Data(i), i_rElement.LinkType() ); - } // end for - FinishCell(); - - FinishRow(); -} - -void -HtmlCreator::Write_SglText( const Simstr & i_sName, - const Simstr & i_sValue ) -{ - StartRow(); - - WriteElementName( i_sName, false ); - - StartCell( "77%"); - WriteStr( i_sValue ); - FinishCell(); - - FinishRow(); -} - -void -HtmlCreator::Write_ReferenceDocu( const Simstr & i_sName, - const Simstr & i_sRef, - const Simstr & i_sRole, - const Simstr & i_sTitle ) -{ - StartRow(); - - StartCell( "23%" ); - WriteStr(i_sName); - FinishCell(); - - StartCell( "77%" ); - if ( !i_sRef.is_empty() ) - { - WriteStr(""); - if ( !i_sTitle.is_empty() ) - WriteStr( i_sTitle ); - else - WriteStr(i_sRef); - WriteStr("
    \n"); - } - else if ( !i_sTitle.is_empty() ) - { - WriteStr("Title: "); - WriteStr( i_sTitle ); - WriteStr("
    \n"); - } - if ( !i_sRole.is_empty() ) - { - WriteStr("Role: "); - WriteStr( i_sRole ); - } - FinishCell(); - - FinishRow(); -} - - -void -HtmlCreator::StartRow() -{ - WriteStr( " \n" ); -} - -void -HtmlCreator::FinishRow() -{ - WriteStr( " \n" ); -} - -void -HtmlCreator::StartCell( const char * i_pWidth) -{ - WriteStr( " \n

    " ); -} - -void -HtmlCreator::FinishCell() -{ - WriteStr( "

    \n \n" ); -} - -void -HtmlCreator::WriteElementName( const Simstr & i_sName, - bool i_bStrong ) -{ - StartCell( "23%" ); - if (i_bStrong) - WriteStr( "

    " ); - WriteStr(i_sName); - if (i_bStrong) - WriteStr( "

    " ); - FinishCell(); -} - - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xml2cmp/source/xcd/cr_html.hxx b/xml2cmp/source/xcd/cr_html.hxx deleted file mode 100644 index a49f1bd43f56..000000000000 --- a/xml2cmp/source/xcd/cr_html.hxx +++ /dev/null @@ -1,92 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef X2C_CR_HTML_HXX -#define X2C_CR_HTML_HXX - - -#include -#include -#include "../support/sistr.hxx" -#include "../support/syshelp.hxx" - - -class XmlElement; -class SglTextElement; -class MultipleTextElement; - - -class HtmlCreator -{ - public: - HtmlCreator( - const char * i_pOutputFileName, - const XmlElement & i_rDocument, - const Simstr & i_sIDL_BaseDirectory ); - ~HtmlCreator(); - - void Run(); - - void StartTable(); - void FinishTable(); - void StartBigCell( - const char * i_sTitle ); - void FinishBigCell(); - - void Write_SglTextElement( - const SglTextElement & - i_rElement, - bool i_bStrong = false ); - void Write_MultiTextElement( - const MultipleTextElement & - i_rElement ); - void Write_SglText( - const Simstr & i_sName, - const Simstr & i_sValue ); - void Write_ReferenceDocu( - const Simstr & i_sName, - const Simstr & i_sRef, - const Simstr & i_sRole, - const Simstr & i_sTitle ); - private: - void StartRow(); - void FinishRow(); - void StartCell( - const char * i_pWidth ); - void FinishCell(); - - void WriteElementName( - const Simstr & i_sName, - bool i_bStrong ); - void WriteStr( - const char * i_sStr ) - { aFile.write( i_sStr, (int) strlen(i_sStr) ); } - // DATA - std::ofstream aFile; - const XmlElement & rDocument; - Simstr sIdl_BaseDirectory; -}; - - - - -#endif - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xml2cmp/source/xcd/cr_metho.cxx b/xml2cmp/source/xcd/cr_metho.cxx deleted file mode 100644 index 3927c029d505..000000000000 --- a/xml2cmp/source/xcd/cr_metho.cxx +++ /dev/null @@ -1,97 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "cr_metho.hxx" - -#include -#include -#include - - - -const char C_sFileHeader1[] - = "/* "; -const char C_sFileHeader2[] - = " */\r\n/* Implementation of component_getDescriptionFunc() */\r\n\r\n" - "#include \r\n\r\n"; -const char C_sFuncBegin[] - = "#ifdef __cplusplus\r\n" - "extern \"C\" {\r\n" - "#endif\r\n\r\n" - "const sal_Char * SAL_CALL\r\ncomponent_getDescriptionFunc()\r\n" - "{\r\n" - " return (const sal_Char*) \r\n" - " \""; -const char C_sFuncEnd[] = "\";\r\n" - "}\r\n\r\n" - "#ifdef __cplusplus\r\n" - "} /* end of extern \"C\" */\r\n" - "#endif\r\n"; - - -void -Create_AccessMethod( const char * i_pOutputFileName, - const char * i_sText ) -{ - const char * pText = i_sText; - const char * pTrans = 0; - const char sDescrLineChange[] = "\"\r\n \""; - int sDescrLen = (int) strlen(sDescrLineChange); - - std::ofstream aFile(i_pOutputFileName, std::ios::out -#if defined(WNT) - | std::ios::binary -#endif - ); - - - if ( !aFile ) - { - std::cerr << "Error: " << i_pOutputFileName << " could not be created." << std::endl; - return; - } - - aFile.write( C_sFileHeader1, (int) strlen(C_sFileHeader1) ); - aFile.write( i_pOutputFileName, (int) strlen(i_pOutputFileName) ); - aFile.write( C_sFileHeader2, (int) strlen(C_sFileHeader2) ); - aFile.write( C_sFuncBegin, (int) strlen(C_sFuncBegin) ); - - for ( pTrans = pText; *pTrans != '\0'; pTrans++ ) - { - switch (*pTrans) - { - case '"': aFile.write( "\\\"", 2); - break; - case '\n': aFile.write( "\\n", 2); - aFile.write( sDescrLineChange, sDescrLen); - break; - case '\r': aFile.write( "\\r", 2); - break; - default: aFile.write( pTrans, 1); - } - } /* end for */ - - aFile.write( C_sFuncEnd, (int) strlen(C_sFuncEnd) ); - - - aFile.close(); -} - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xml2cmp/source/xcd/cr_metho.hxx b/xml2cmp/source/xcd/cr_metho.hxx deleted file mode 100644 index 73e6b3ba6e24..000000000000 --- a/xml2cmp/source/xcd/cr_metho.hxx +++ /dev/null @@ -1,31 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef CPV_CR_METHOD_H -#define CPV_CR_METHOD_H - - - -void Create_AccessMethod( - const char * i_pOutputFileName, - const char * i_sText ); - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xml2cmp/source/xcd/dependy.cxx b/xml2cmp/source/xcd/dependy.cxx deleted file mode 100644 index 66f99698cc4c..000000000000 --- a/xml2cmp/source/xcd/dependy.cxx +++ /dev/null @@ -1,218 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - - -#include "dependy.hxx" -#include -#include "../support/syshelp.hxx" -#include "../support/list.hxx" -#include "xmltree.hxx" -#include "parse.hxx" - - - -Simstr ShortName(const Simstr & i_rService); - - - -Service::Service( const char * i_sName ) - : sName(i_sName) - // aImplementations -{ -} - -ServiceInfo & -Service::AddImplementation( const char * i_sLibrary ) -{ - ServiceInfo * ret = new ServiceInfo(i_sLibrary); - aImplementations.push_back(ret); - return *ret; -} - -ServiceInfo::ServiceInfo( const char * i_sLibrary ) - : sImplementingLibrary(i_sLibrary) - // aNeededServices -{ -} - -void -ServiceInfo::AddDependency( const char * i_sNeededService ) -{ - aNeededServices.push_back(i_sNeededService); -} - -DependencyFinder::DependencyFinder() -{ -} - -DependencyFinder::~DependencyFinder() -{ - for (Map_Services::const_iterator aIter = aServices.begin(); aIter != aServices.end(); ++aIter) - delete aIter->second; -} - -void -DependencyFinder::GatherData( const char * i_sSearchDirectory ) -{ - List aFiles; - GatherFileNames( aFiles, i_sSearchDirectory ); - - for ( unsigned i = 0; i < aFiles.size(); ++i ) - { - ReadFile( aFiles[i].str() ); - } -} - -void -DependencyFinder::FindNeededServices( StringVector & o_rLibraries, - StringVector & o_rServices, - const Simstr & i_rService ) -{ - Map_Services::const_iterator itService = aServices.find(i_rService); - if ( itService == aServices.end() ) - { - std::cerr << "Error: Service \"" - << i_rService.str() - << "\" not found." - << std::endl; - return ; - } - - aResult_Libraries.erase( aResult_Libraries.begin(), aResult_Libraries.end() ); - aResult_Services.erase( aResult_Services.begin(), aResult_Services.end() ); - - Add2Result( *(*itService).second ); - - for ( std::set< Simstr >::const_iterator il = aResult_Libraries.begin(); - il != aResult_Libraries.end(); - ++il ) - { - o_rLibraries.push_back(*il); - } - - for ( std::set< Simstr >::const_iterator is = aResult_Services.begin(); - is != aResult_Services.end(); - ++is ) - { - o_rServices.push_back(*is); - } -} - -void -DependencyFinder::ReadFile( const char * i_sFilename ) -{ - ModuleDescription aModule; - X2CParser aParser(aModule); - - if ( !aParser.Parse(i_sFilename) ) - { - std::cerr << "Error: File \"" - << i_sFilename - << "\" could not be parsed." - << std::endl; - return; - } - - // GetResults: - Simstr sModule = aModule.ModuleName(); - - List < const MultipleTextElement* > aImplServices; - List < const MultipleTextElement* > aNeededServices; - - aModule.Get_SupportedServices(aImplServices); - aModule.Get_ServiceDependencies(aNeededServices); - - unsigned nImplServicesSize = aImplServices.size(); - unsigned nNeededServicesSize = aNeededServices.size(); - - for ( unsigned i = 0; i < nImplServicesSize; ++i ) - { - const MultipleTextElement & rImpl = *aImplServices[i]; - - unsigned nImplDataSize = rImpl.Size(); - for ( unsigned di = 0; di < nImplDataSize; ++di ) - { - Simstr sService = ShortName(rImpl.Data(di)); - Service * pService = aServices[sService]; - if (pService == 0) - { - pService = new Service(rImpl.Data(di)); - aServices[sService] = pService; - } - ServiceInfo & rSInfo = pService->AddImplementation(sModule); - - for ( unsigned n = 0; n < nNeededServicesSize; ++n ) - { - unsigned nNeededDataSize = aNeededServices[n]->Size(); - for ( unsigned dn = 0; dn < nNeededDataSize; ++dn ) - { - if (! aNeededServices[n]->Data(dn).is_no_text()) - rSInfo.AddDependency( ShortName(aNeededServices[n]->Data(dn)) ); - } // end for dn - } // end for n - } // end for di - } // end for i -} - -void -DependencyFinder::Add2Result( const Service & i_rService ) -{ - const ServiceInfo & rSInfo = i_rService.FirstImplementation(); - aResult_Libraries.insert(rSInfo.Library()); - - const ServiceInfo::List_NeededServices & rNeededs - = rSInfo.NeededServices(); - for ( StringVector::const_iterator it = rNeededs.begin(); - it != rNeededs.end(); - ++it ) - { - std::pair< std::set< Simstr >::iterator, bool > aInsertResult - = aResult_Services.insert(*it); - if (aInsertResult.second) - { // Needed service not yet known - Map_Services::const_iterator itFound = aServices.find(*it); - if ( itFound == aServices.end() ) - { - std::cerr << "Needed service \"" - << (*it).str() - << "\" not found," - << std::endl; - } - else - { - Add2Result( *(*itFound).second ); - } - } // endif (! aInsertResult.second) - } // end for (it) -} - - - -Simstr -ShortName(const Simstr & i_rService) -{ - const char * pStart = i_rService.str(); - const char * pEnd = strchr(pStart,' '); - if (pEnd != 0) - return Simstr(pStart, 0, int(pEnd-pStart)); - else - return i_rService; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xml2cmp/source/xcd/dependy.hxx b/xml2cmp/source/xcd/dependy.hxx deleted file mode 100644 index 8658eb48c937..000000000000 --- a/xml2cmp/source/xcd/dependy.hxx +++ /dev/null @@ -1,109 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef X2C_DEPENDY_HXX -#define X2C_DEPENDY_HXX - - -#include -#include -#include -#include <../support/sistr.hxx> - -class Service; -class ServiceInfo; - -typedef std::vector< Simstr> StringVector; -typedef std::vector< ServiceInfo* > List_Implementations; -typedef std::map< Simstr, Service* > Map_Services; - -class Service -{ - public: - Service( - const char * i_sName ); - - ServiceInfo & AddImplementation( - const char * i_sLibrary ); /// That is: module-name. - - const Simstr & Name() const { return sName; } - const ServiceInfo & FirstImplementation() const - { return *aImplementations[0]; } - - private: - Simstr sName; - List_Implementations - aImplementations; -}; - -class ServiceInfo -{ - public: - typedef StringVector List_NeededServices; - - ServiceInfo( - const char * i_sLibrary ); - - void AddDependency( - const char * i_sNeededService ); - - const Simstr & Library() const { return sImplementingLibrary; } - const List_NeededServices & - NeededServices() const { return aNeededServices; } - - - private: - Simstr sImplementingLibrary; - List_NeededServices aNeededServices; -}; - - -class DependencyFinder -{ - public: - DependencyFinder(); - ~DependencyFinder(); - - void GatherData( - const char * i_sSearchDirectory ); - - void FindNeededServices( - StringVector & o_rLibraries, - StringVector & o_rServices, - const Simstr & i_rService ); - private: - void ReadFile( - const char * i_sFilename ); - void Add2Result( - const Service & i_rService ); - - // Data - Map_Services aServices; - - // Temporary data - std::set< Simstr > aResult_Libraries; - std::set< Simstr > aResult_Services; -}; - - - -#endif - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xml2cmp/source/xcd/filebuff.cxx b/xml2cmp/source/xcd/filebuff.cxx deleted file mode 100644 index b271a59d5b5a..000000000000 --- a/xml2cmp/source/xcd/filebuff.cxx +++ /dev/null @@ -1,60 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifdef AIX -# undef _THREAD_SAFE -#endif - -#include "filebuff.hxx" - -#include -#include -#include - - -bool -LoadXmlFile( Buffer & o_rBuffer, - const char * i_sXmlFilePath ) -{ - std::ifstream aXmlFile; - - aXmlFile.open(i_sXmlFilePath, std::ios::in -#if defined(WNT) - | std::ios::binary -#endif // WNT - ); - - if (! aXmlFile) - return false; - - // Prepare buffer: - aXmlFile.seekg(0, std::ios::end); - unsigned long nBufferSize = (unsigned long) aXmlFile.tellg(); - o_rBuffer.SetSize(nBufferSize + 1); - o_rBuffer.Data()[nBufferSize] = '\0'; - aXmlFile.seekg(0); - - // Read file: - aXmlFile.read(o_rBuffer.Data(), (int) nBufferSize); - bool ret = aXmlFile.good() != 0; - aXmlFile.close(); - return ret; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xml2cmp/source/xcd/filebuff.hxx b/xml2cmp/source/xcd/filebuff.hxx deleted file mode 100644 index 8dafd08d6779..000000000000 --- a/xml2cmp/source/xcd/filebuff.hxx +++ /dev/null @@ -1,48 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef X2C_FILEBUFF_HXX -#define X2C_FILEBUFF_HXX - - -class Buffer -{ - public: - Buffer() : s(0) {} - ~Buffer() { if (s) delete [] s; } - operator const char *() const - { return s; } - char * Data() { return s; } - void SetSize( - unsigned long i_size ) - { if (s) delete [] s; s = new char [i_size]; } - private: - char * s; -}; - - -bool LoadXmlFile( - Buffer & o_rBuffer, - const char * i_sXmlFilePath ); - - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xml2cmp/source/xcd/main.cxx b/xml2cmp/source/xcd/main.cxx deleted file mode 100644 index 21393d3c42de..000000000000 --- a/xml2cmp/source/xcd/main.cxx +++ /dev/null @@ -1,248 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include -#include -#include - - -#include -#include "../support/cmdline.hxx" -#include "cr_metho.hxx" -#include "cr_html.hxx" -#include "xmlelem.hxx" -#include "xmltree.hxx" -#include "parse.hxx" -#include "../support/syshelp.hxx" -#include "../support/heap.hxx" -#include "dependy.hxx" - - - -void StreamOut_TypeInfo( std::ostream& o_rOut, ModuleDescription& i_rData, - const char* i_sSeparator ) -{ - Heap aTypesHeap(12); - - // Gather types: - List< const MultipleTextElement * > aTypes; - i_rData.Get_Types(aTypes); - - for ( unsigned t = 0; t < aTypes.size(); ++t ) - { - unsigned i_max = aTypes[t]->Size(); - for ( unsigned i = 0; i < i_max; ++i ) - { - aTypesHeap.InsertValue( aTypes[t]->Data(i), "" ); - } // end for - } - - // Write types: - HeapItem * pLastHeapTop = 0; - for ( HeapItem * pHeapTop = aTypesHeap.ReleaseTop(); pHeapTop != 0; pHeapTop = aTypesHeap.ReleaseTop() ) - { - if (pLastHeapTop != 0) - { - if ( 0 == strcmp(pHeapTop->Key(), pLastHeapTop->Key()) ) - continue; - delete pLastHeapTop; - } - pLastHeapTop = pHeapTop; - - WriteStr( o_rOut, i_sSeparator ); - - const char * sEnd = strchr( pHeapTop->Key(), ' ' ); - if (sEnd != 0) - { - const char * sQuali = strrchr( pHeapTop->Key(), ' ' ) + 1; - WriteStr( o_rOut, sQuali ); - WriteStr( o_rOut, "." ); - o_rOut.write( pHeapTop->Key(), sEnd - pHeapTop->Key() ); - } - else - { - WriteStr( o_rOut, pHeapTop->Key() ); - } - } // end for - - if (pLastHeapTop != 0) - { - delete pLastHeapTop; - pLastHeapTop = 0; - } -} - -void Put2StdOut_TypeInfo( ModuleDescription& i_rData ) -{ - StreamOut_TypeInfo(std::cout, i_rData, " "); -} - -void Put2File_TypeInfo( const char* i_sOutputFile, ModuleDescription& i_rData ) -{ - std::ofstream aOut(i_sOutputFile, std::ios::out -#if defined(WNT) - | std::ios::binary -#endif - ); - if ( !aOut ) - { - std::cerr << "Error: " << i_sOutputFile << " could not be created." << std::endl; - return; - } - - Simstr sLibPrefix = i_rData.ModuleName(); - WriteStr( aOut, sLibPrefix ); - WriteStr( aOut, "_XML2CMPTYPES= "); - - StreamOut_TypeInfo(aOut, i_rData, "\t\\\n\t\t"); - - aOut.close(); -} - -void Create_TypeInfo( const char* o_sOutputFile, ModuleDescription& i_rData ) -{ - if ( strcmp(o_sOutputFile, "stdout") == 0 ) - { - Put2StdOut_TypeInfo(i_rData); - } - else - { - Put2File_TypeInfo(o_sOutputFile,i_rData); - } -} - -int Do_DepCommandLine(const CommandLine & i_rCommandLine) -{ - DependencyFinder aDependencies; - - aDependencies.GatherData(i_rCommandLine.DepPath()); - char sInput[500] = ""; - std::vector aLibs; - std::vector aServs; - - - std::cout - << "\nNow you can start to put in Service names.\n" - << "Please use correct case, but don't use namespaces.\n" - << "Just the Service's own name.\n\n" - << "To stop the program, put in a hashmark \"#\" + ENTER.\n" - << std::endl; - - do - { - sInput[0] = 0; - std::cin >> sInput; - Simstr sImplService(sInput); - if (*sInput != '#') - { - aLibs.erase( aLibs.begin(), aLibs.end() ); - aServs.erase( aServs.begin(), aServs.end() ); - - aDependencies.FindNeededServices( aLibs, aServs, sImplService ); - - std::cout << "\n\n\nNeeded libraries: " << std::endl; - for ( unsigned i = 0; i < aLibs.size(); ++i ) - { - std::cout << " " << aLibs[i].str() << std::endl; - } - std::cout << "\nNeeded services: " << std::endl; - for ( unsigned s= 0; s < aServs.size(); ++s ) - { - std::cout << " " << aServs[s].str() << std::endl; - } - std::cout << "\n\n" << std::endl; - } - } - while (*sInput != '#'); - - return 0; - -} - -int Do_SingleFileCommandLine(const CommandLine & i_rCommandLine) -{ - ModuleDescription aDescr; - X2CParser aParser(aDescr); - - // Load file and create Function-file - bool bLoadResult = aParser.LoadFile(i_rCommandLine.XmlSrcFile()); - if (! bLoadResult) - { - std::cerr << "Error: File " << i_rCommandLine.XmlSrcFile() << " could not be loaded." << std::endl; - return 1; - } - - if ( strlen(i_rCommandLine.FuncFile()) > 0 ) - { - Create_AccessMethod( i_rCommandLine.FuncFile(), aParser.PureText() ); - - std::cout << "File " - << i_rCommandLine.FuncFile() - << " with component_getDescriptionFunc() is created now." - << std::endl; - } - - // Parse - aParser.Parse(); - - // Produce output - if ( strlen(i_rCommandLine.HtmlFile()) > 0 ) - { - HtmlCreator aHtmlCreator( i_rCommandLine.HtmlFile(), - aDescr, - i_rCommandLine.IdlRootPath() ); - aHtmlCreator.Run(); - } - - if (strlen(i_rCommandLine.TypeInfoFile()) > 0) - { - Create_TypeInfo( i_rCommandLine.TypeInfoFile(), aDescr ); - } - - return 0; -}; - -int -#ifdef WNT -_cdecl -#endif -main( int argc, char* argv[] ) -{ - // Variables - CommandLine aCommandLine(argc, argv); - int ret = 0; - - if (! aCommandLine.IsOk()) - { - std::cerr << aCommandLine.ErrorText() << std::endl ; - return 1; - } - - if ( aCommandLine.IsDepCommand() ) - { - ret = Do_DepCommandLine(aCommandLine); - } - else - { - ret = Do_SingleFileCommandLine(aCommandLine); - } - return ret; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xml2cmp/source/xcd/parse.cxx b/xml2cmp/source/xcd/parse.cxx deleted file mode 100644 index fab09d926e36..000000000000 --- a/xml2cmp/source/xcd/parse.cxx +++ /dev/null @@ -1,440 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - - -#include - -#include -#include -#include - -#if (_MSC_VER >=1400) -#pragma warning(disable:4365) -#endif - -#ifdef UNX -#define strnicmp strncasecmp -#endif - - - -// NOT FULLY DEFINED SERVICES - - -X2CParser::X2CParser( XmlElement & o_rDocumentData ) - : // sFileName, - nFileLine(0), - pDocumentData(&o_rDocumentData), - // sWord, - text(0) -{ -} - -X2CParser::~X2CParser() -{ -} - - -bool -X2CParser::LoadFile( const char * i_sFilename ) -{ - sFileName = i_sFilename; - nFileLine = 1; - - // Load file: - if ( ! LoadXmlFile( aFile, i_sFilename ) ) - return false; - - // Test correct end: - const char * pLastTag = strrchr(aFile.operator const char *(),'<'); - if (pLastTag == 0) - return false; - if ( strnicmp(pLastTag+2, pDocumentData->Name().str(), pDocumentData->Name().l()) != 0 - || strnicmp(pLastTag, "') == 0) - return false; - return true; -} - -void -X2CParser::Parse() -{ - // Parse: - text = aFile.operator const char *(); - - Parse_XmlDeclaration(); - Parse_Doctype(); - - // skip XML comment - Goto('<'); - if ( IsText(" - + optimize="${build.optimize}" srcdir="${temp-src-j.dir}" source="${build.compiler.source}"> @@ -441,8 +433,7 @@ http\://www.w3.org/2001/XMLSchema: com.saxonica.jaxp.SchemaFactoryImpl + optimize="${build.optimize}" srcdir="${temp-src-nj.dir}" source="${build.compiler.source}"> @@ -456,8 +447,7 @@ http\://www.w3.org/2001/XMLSchema: com.saxonica.jaxp.SchemaFactoryImpl + optimize="${build.optimize}" srcdir="${temp-src-nj.dir}" source="${build.compiler.source}"> @@ -789,8 +779,7 @@ http\://www.w3.org/2001/XMLSchema: com.saxonica.jaxp.SchemaFactoryImpl + source="${build.compiler.source}"> From 78225f2ebeb30c853395240f7cc87926349aa975 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Wed, 3 Oct 2012 18:57:54 +0200 Subject: [PATCH 258/863] Revert "add rtl::OUStringBuffer::append(bool)" This reverts commit 563fa900ba22bf83dfa58e67807ed0337f810576. --- sal/inc/rtl/ustrbuf.hxx | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx index 0b4586bcdfbe..a11dff178442 100644 --- a/sal/inc/rtl/ustrbuf.hxx +++ b/sal/inc/rtl/ustrbuf.hxx @@ -500,25 +500,6 @@ public: return *this; } - /** - Appends the string representation of the bool - argument to the string buffer. - - The argument is converted to a string as if by the method - String.valueOf, and the characters of that - string are then appended to this string buffer. - - @param b a bool. - @return this string buffer. - - @since LibreOffice 3.7 - */ - OUStringBuffer & append(bool b) - { - sal_Unicode sz[RTL_USTR_MAX_VALUEOFBOOLEAN]; - return append( sz, rtl_ustr_valueOfBoolean( sz, b ) ); - } - /** Appends the string representation of the sal_Bool argument to the string buffer. From 78c7bbc3ce92493ca98c605f92733e31ad87ef70 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 3 Oct 2012 15:21:15 +0300 Subject: [PATCH 259/863] Use different symbol names in the two expat variants we build We need to be able to link both into one binary in the disable-dynloading case. Change-Id: I499e204dfef2af488d4a350cb3a5bcfc03ca887f --- expat/expat-2.1.0.patch | 90 +++++++++++++++++++++++++++++++ fontconfig/fontconfig-2.8.0.patch | 20 +++++++ 2 files changed, 110 insertions(+) diff --git a/expat/expat-2.1.0.patch b/expat/expat-2.1.0.patch index 875e41dc4321..28d6322d3299 100644 --- a/expat/expat-2.1.0.patch +++ b/expat/expat-2.1.0.patch @@ -92,3 +92,93 @@ +.INCLUDE : set_wntx64.mk +.INCLUDE : target.mk +.INCLUDE : tg_wntx64.mk +--- misc/expat-2.1.0/lib/expat_external.h ++++ misc/build/expat-2.1.0/lib/expat_external.h +@@ -86,9 +86,11 @@ + typedef unsigned short XML_Char; + typedef char XML_LChar; + #endif /* XML_UNICODE_WCHAR_T */ ++#define EXPAT_CHARTYPE_DECORATE(s) s##_UTF16 + #else /* Information is UTF-8 encoded. */ + typedef char XML_Char; + typedef char XML_LChar; ++#define EXPAT_CHARTYPE_DECORATE(s) s##_UTF8 + #endif /* XML_UNICODE */ + + #ifdef XML_LARGE_SIZE /* Use large integers for file/stream positions. */ +--- misc/expat-2.1.0/lib/expat.h ++++ misc/build/expat-2.1.0/lib/expat.h +@@ -15,6 +15,73 @@ + #include + #include "expat_external.h" + ++#define XML_DefaultCurrent EXPAT_CHARTYPE_DECORATE(XML_DefaultCurrent) ++#define XML_ErrorString EXPAT_CHARTYPE_DECORATE(XML_ErrorString) ++#define XML_ExpatVersion EXPAT_CHARTYPE_DECORATE(XML_ExpatVersion) ++#define XML_ExpatVersionInfo EXPAT_CHARTYPE_DECORATE(XML_ExpatVersionInfo) ++#define XML_ExternalEntityParserCreate EXPAT_CHARTYPE_DECORATE(XML_ExternalEntityParserCreate) ++#define XML_FreeContentModel EXPAT_CHARTYPE_DECORATE(XML_FreeContentModel) ++#define XML_GetBase EXPAT_CHARTYPE_DECORATE(XML_GetBase) ++#define XML_GetBuffer EXPAT_CHARTYPE_DECORATE(XML_GetBuffer) ++#define XML_GetCurrentByteCount EXPAT_CHARTYPE_DECORATE(XML_GetCurrentByteCount) ++#define XML_GetCurrentByteIndex EXPAT_CHARTYPE_DECORATE(XML_GetCurrentByteIndex) ++#define XML_GetCurrentColumnNumber EXPAT_CHARTYPE_DECORATE(XML_GetCurrentColumnNumber) ++#define XML_GetCurrentLineNumber EXPAT_CHARTYPE_DECORATE(XML_GetCurrentLineNumber) ++#define XML_GetErrorCode EXPAT_CHARTYPE_DECORATE(XML_GetErrorCode) ++#define XML_GetFeatureList EXPAT_CHARTYPE_DECORATE(XML_GetFeatureList) ++#define XML_GetIdAttributeIndex EXPAT_CHARTYPE_DECORATE(XML_GetIdAttributeIndex) ++#define XML_GetInputContext EXPAT_CHARTYPE_DECORATE(XML_GetInputContext) ++#define XML_GetParsingStatus EXPAT_CHARTYPE_DECORATE(XML_GetParsingStatus) ++#define XML_GetSpecifiedAttributeCount EXPAT_CHARTYPE_DECORATE(XML_GetSpecifiedAttributeCount) ++#define XML_MemFree EXPAT_CHARTYPE_DECORATE(XML_MemFree) ++#define XML_MemMalloc EXPAT_CHARTYPE_DECORATE(XML_MemMalloc) ++#define XML_MemRealloc EXPAT_CHARTYPE_DECORATE(XML_MemRealloc) ++#define XML_Parse EXPAT_CHARTYPE_DECORATE(XML_Parse) ++#define XML_ParseBuffer EXPAT_CHARTYPE_DECORATE(XML_ParseBuffer) ++#define XML_ParserCreate EXPAT_CHARTYPE_DECORATE(XML_ParserCreate) ++#define XML_ParserCreateNS EXPAT_CHARTYPE_DECORATE(XML_ParserCreateNS) ++#define XML_ParserCreate_MM EXPAT_CHARTYPE_DECORATE(XML_ParserCreate_MM) ++#define XML_ParserFree EXPAT_CHARTYPE_DECORATE(XML_ParserFree) ++#define XML_ParserReset EXPAT_CHARTYPE_DECORATE(XML_ParserReset) ++#define XML_ResumeParser EXPAT_CHARTYPE_DECORATE(XML_ResumeParser) ++#define XML_SetAttlistDeclHandler EXPAT_CHARTYPE_DECORATE(XML_SetAttlistDeclHandler) ++#define XML_SetBase EXPAT_CHARTYPE_DECORATE(XML_SetBase) ++#define XML_SetCdataSectionHandler EXPAT_CHARTYPE_DECORATE(XML_SetCdataSectionHandler) ++#define XML_SetCharacterDataHandler EXPAT_CHARTYPE_DECORATE(XML_SetCharacterDataHandler) ++#define XML_SetCommentHandler EXPAT_CHARTYPE_DECORATE(XML_SetCommentHandler) ++#define XML_SetDefaultHandler EXPAT_CHARTYPE_DECORATE(XML_SetDefaultHandler) ++#define XML_SetDefaultHandlerExpand EXPAT_CHARTYPE_DECORATE(XML_SetDefaultHandlerExpand) ++#define XML_SetDoctypeDeclHandler EXPAT_CHARTYPE_DECORATE(XML_SetDoctypeDeclHandler) ++#define XML_SetElementDeclHandler EXPAT_CHARTYPE_DECORATE(XML_SetElementDeclHandler) ++#define XML_SetElementHandler EXPAT_CHARTYPE_DECORATE(XML_SetElementHandler) ++#define XML_SetEncoding EXPAT_CHARTYPE_DECORATE(XML_SetEncoding) ++#define XML_SetEndCdataSectionHandler EXPAT_CHARTYPE_DECORATE(XML_SetEndCdataSectionHandler) ++#define XML_SetEndDoctypeDeclHandler EXPAT_CHARTYPE_DECORATE(XML_SetEndDoctypeDeclHandler) ++#define XML_SetEndElementHandler EXPAT_CHARTYPE_DECORATE(XML_SetEndElementHandler) ++#define XML_SetEndNamespaceDeclHandler EXPAT_CHARTYPE_DECORATE(XML_SetEndNamespaceDeclHandler) ++#define XML_SetEntityDeclHandler EXPAT_CHARTYPE_DECORATE(XML_SetEntityDeclHandler) ++#define XML_SetExternalEntityRefHandler EXPAT_CHARTYPE_DECORATE(XML_SetExternalEntityRefHandler) ++#define XML_SetExternalEntityRefHandlerArg EXPAT_CHARTYPE_DECORATE(XML_SetExternalEntityRefHandlerArg) ++#define XML_SetHashSalt EXPAT_CHARTYPE_DECORATE(XML_SetHashSalt) ++#define XML_SetNamespaceDeclHandler EXPAT_CHARTYPE_DECORATE(XML_SetNamespaceDeclHandler) ++#define XML_SetNotStandaloneHandler EXPAT_CHARTYPE_DECORATE(XML_SetNotStandaloneHandler) ++#define XML_SetNotationDeclHandler EXPAT_CHARTYPE_DECORATE(XML_SetNotationDeclHandler) ++#define XML_SetParamEntityParsing EXPAT_CHARTYPE_DECORATE(XML_SetParamEntityParsing) ++#define XML_SetProcessingInstructionHandler EXPAT_CHARTYPE_DECORATE(XML_SetProcessingInstructionHandler) ++#define XML_SetReturnNSTriplet EXPAT_CHARTYPE_DECORATE(XML_SetReturnNSTriplet) ++#define XML_SetSkippedEntityHandler EXPAT_CHARTYPE_DECORATE(XML_SetSkippedEntityHandler) ++#define XML_SetStartCdataSectionHandler EXPAT_CHARTYPE_DECORATE(XML_SetStartCdataSectionHandler) ++#define XML_SetStartDoctypeDeclHandler EXPAT_CHARTYPE_DECORATE(XML_SetStartDoctypeDeclHandler) ++#define XML_SetStartElementHandler EXPAT_CHARTYPE_DECORATE(XML_SetStartElementHandler) ++#define XML_SetStartNamespaceDeclHandler EXPAT_CHARTYPE_DECORATE(XML_SetStartNamespaceDeclHandler) ++#define XML_SetUnknownEncodingHandler EXPAT_CHARTYPE_DECORATE(XML_SetUnknownEncodingHandler) ++#define XML_SetUnparsedEntityDeclHandler EXPAT_CHARTYPE_DECORATE(XML_SetUnparsedEntityDeclHandler) ++#define XML_SetUserData EXPAT_CHARTYPE_DECORATE(XML_SetUserData) ++#define XML_SetXmlDeclHandler EXPAT_CHARTYPE_DECORATE(XML_SetXmlDeclHandler) ++#define XML_StopParser EXPAT_CHARTYPE_DECORATE(XML_StopParser) ++#define XML_UseForeignDTD EXPAT_CHARTYPE_DECORATE(XML_UseForeignDTD) ++#define XML_UseParserAsHandlerArg EXPAT_CHARTYPE_DECORATE(XML_UseParserAsHandlerArg) ++ + #ifdef __cplusplus + extern "C" { + #endif diff --git a/fontconfig/fontconfig-2.8.0.patch b/fontconfig/fontconfig-2.8.0.patch index a75648a49ba2..63511fb0c7eb 100644 --- a/fontconfig/fontconfig-2.8.0.patch +++ b/fontconfig/fontconfig-2.8.0.patch @@ -20,6 +20,26 @@ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ --- misc/build/fontconfig-2.8.0/configure +++ misc/build/fontconfig-2.8.0/configure +@@ -14368,7 +14368,7 @@ + ;; + yes) + +-for ac_func in XML_SetDoctypeDeclHandler ++for ac_func in XML_SetDoctypeDeclHandler_UTF8 + do + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +@@ -14468,7 +14468,7 @@ + fi + done + +- case "$ac_cv_func_XML_SetDoctypeDeclHandler" in ++ case "$ac_cv_func_XML_SetDoctypeDeclHandler_UTF8" in + yes) + HAVE_EXPAT=1 + +--- misc/build/fontconfig-2.8.0/configure ++++ misc/build/fontconfig-2.8.0/configure @@ -8718,7 +8718,7 @@ *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; From 8ca8ea20e0aeeb26f085cbf331bf92003e1e9648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolnai=20Tam=C3=A1s?= Date: Wed, 3 Oct 2012 10:25:46 +0200 Subject: [PATCH 260/863] Correct ulfex to ignore comments Change-Id: I50e41a3946ff885783006018f7b6ff2945cc7dfc --- l10ntools/source/lngmerge.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx index 264b50c74f56..fcab6966aef1 100644 --- a/l10ntools/source/lngmerge.cxx +++ b/l10ntools/source/lngmerge.cxx @@ -232,7 +232,7 @@ sal_Bool LngParser::Merge( { sal_Int32 n = 0; rtl::OString sLang(sLine.getToken(0, '=', n)); - if (n == -1) + if (n == -1 || static_cast(sLine.match("/*"))) { ++nPos; } From 2146c00da07a0c632028cf41c4c1a5a687d82ffe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolnai=20Tam=C3=A1s?= Date: Wed, 3 Oct 2012 12:37:19 +0200 Subject: [PATCH 261/863] Ulfex ignores comments during extraction too During string extraction this does not cause real problem but causes unnecessary operations. Plus make isNextGroup not to change sLine_in parameter. Change-Id: I3db6a94ef320c096a7519f7f83dd4080d0588459 --- l10ntools/source/lngmerge.cxx | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx index fcab6966aef1..b0282f5fb4d7 100644 --- a/l10ntools/source/lngmerge.cxx +++ b/l10ntools/source/lngmerge.cxx @@ -146,12 +146,12 @@ void LngParser::WriteSDF(std::ofstream &aSDFStream, } } -bool LngParser::isNextGroup(rtl::OString &sGroup_out, rtl::OString &sLine_in) +bool LngParser::isNextGroup(rtl::OString &sGroup_out, const rtl::OString &sLine_in) { - sLine_in = sLine_in.trim(); - if ((sLine_in[0] == '[') && (sLine_in[sLine_in.getLength() - 1] == ']')) + const OString sLineTrim = sLine_in.trim(); + if ((sLineTrim[0] == '[') && (sLineTrim[sLineTrim.getLength() - 1] == ']')) { - sGroup_out = getBracketedContent(sLine_in).trim(); + sGroup_out = getBracketedContent(sLineTrim).trim(); return true; } return false; @@ -160,10 +160,13 @@ bool LngParser::isNextGroup(rtl::OString &sGroup_out, rtl::OString &sLine_in) void LngParser::ReadLine(const rtl::OString &rLine_in, OStringHashMap &rText_inout) { - rtl::OString sLang(rLine_in.getToken(0, '=').trim()); - if (!sLang.isEmpty()) { - rtl::OString sText(rLine_in.getToken(1, '"')); - rText_inout[sLang] = sText; + if (!rLine_in.match(" *") && !rLine_in.match("/*")) + { + rtl::OString sLang(rLine_in.getToken(0, '=').trim()); + if (!sLang.isEmpty()) { + rtl::OString sText(rLine_in.getToken(1, '"')); + rText_inout[sLang] = sText; + } } } From 3bde7aa0943c76cf0b8063f9c03f7b15edd749b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolnai=20Tam=C3=A1s?= Date: Wed, 3 Oct 2012 12:50:21 +0200 Subject: [PATCH 262/863] Delete german text from registryitem_math.ulf Change-Id: Ic6a6706062bc82d5e4096d0a6aa7b52a8988f1bc --- scp2/source/math/registryitem_math.ulf | 1 - 1 file changed, 1 deletion(-) diff --git a/scp2/source/math/registryitem_math.ulf b/scp2/source/math/registryitem_math.ulf index ce4e2fbb3469..0b987cb4b80c 100644 --- a/scp2/source/math/registryitem_math.ulf +++ b/scp2/source/math/registryitem_math.ulf @@ -24,4 +24,3 @@ en-US = "%SXWFORMATNAME %SXWFORMATVERSION Formula" [STR_REG_VAL_OO_FORMULA] en-US = "OpenDocument Formula" -de = "OpenDocument Formel" From 61137e5fe3478116129c748f991e8f1712564174 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 3 Oct 2012 20:50:01 +0300 Subject: [PATCH 263/863] Make isNextGroup() declaration match implementation Change-Id: I5d8a00b83fd4e9f67b98b86818d1e2180d36e69a --- l10ntools/inc/lngmerge.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/l10ntools/inc/lngmerge.hxx b/l10ntools/inc/lngmerge.hxx index 6391d1c25b3f..3995bd73c8c0 100644 --- a/l10ntools/inc/lngmerge.hxx +++ b/l10ntools/inc/lngmerge.hxx @@ -44,7 +44,7 @@ private: sal_Bool bULF; std::vector aLanguages; - bool isNextGroup(rtl::OString &sGroup_out, rtl::OString &sLine_in); + bool isNextGroup(rtl::OString &sGroup_out, const rtl::OString &sLine_in); void ReadLine(const rtl::OString &rLine_in, OStringHashMap &rText_inout); void WriteSDF(std::ofstream &aSDFStream, OStringHashMap &rText_inout, From 1d9803bacc4dc650a2ccf1c7a76e0e61759d1d27 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 3 Oct 2012 22:53:16 +0300 Subject: [PATCH 264/863] Use also the ASMOBJECTS Change-Id: Iee09fc308097ab0a5f73e321da30b7e301b9f4dd --- solenv/gbuild/platform/IOS_ARM_GCC.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index 7636cef3e8f3..fb4ba18a8dc0 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -162,6 +162,7 @@ define gb_LinkTarget__command_dynamiclink $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ $(foreach object,$(OBJCOBJECTS),$(call gb_ObjCObject_get_target,$(object))) \ $(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_target,$(object))) \ + $(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \ $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \ @@ -180,6 +181,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ $(foreach object,$(OBJCOBJECTS),$(call gb_ObjCObject_get_target,$(object))) \ $(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_target,$(object))) \ + $(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \ $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \ From ca821bf466759347089dd1938162bcd5fdd3ae00 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 3 Oct 2012 23:23:38 +0300 Subject: [PATCH 265/863] Don't try to make binaries that run on ancient OS when using current tools For some reason the current Clang linker doesn't like that and misbehaves, Apple bug 12075544. It is unclear whether binaries built using a modern Xcode and SDK to run on 10.4 actually would run on 10.4 anyway. Change-Id: Id15da5eaa4bb95af9cf6d98a658c510f4a786185 --- configure.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 3b54b1a8b055..01960afa0257 100644 --- a/configure.in +++ b/configure.in @@ -2693,7 +2693,12 @@ if test "$_os" = "Darwin"; then AC_MSG_RESULT([SDK $with_macosx_sdk at $MACOSX_SDK_PATH]) if test "$with_macosx_version_min_required" = ""; then - with_macosx_version_min_required="10.4" + case $with_macosx_sdk in + 10.4|10.5) + with_macosx_version_min_required="10.4";; + *) + with_macosx_version_min_required="10.6";; + esac fi if test "$with_macosx_version_max_allowed" = ""; then From ee70864a632e2abf219fe514b8736d887aba2602 Mon Sep 17 00:00:00 2001 From: Xisco Fauli Date: Wed, 3 Oct 2012 20:53:37 +0200 Subject: [PATCH 266/863] pyfax: Cleanup resources Change-Id: I68059a9ae31d22be3f1390eb065f13f98df8116b --- .../star/wizards/fax/FaxWizardDialogImpl.py | 15 ++++--- .../wizards/fax/FaxWizardDialogResources.py | 43 ++++++++----------- 2 files changed, 27 insertions(+), 31 deletions(-) diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py index 249c2491bc14..b678f38a0dce 100644 --- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py +++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py @@ -327,25 +327,28 @@ class FaxWizardDialogImpl(FaxWizardDialog): self.myFaxDoc.updateDateFields() def initializeSalutation(self): + #'Saludation' dropdown list self.setControlProperty("lstSalutation", "StringItemList", - self.resources.SalutationLabels) + tuple(self.resources.SalutationLabels)) def initializeGreeting(self): + #'Complimentary Close' dropdown list self.setControlProperty("lstGreeting", "StringItemList", - self.resources.GreetingLabels) + tuple(self.resources.GreetingLabels)) def initializeCommunication(self): + #'Type of message' dropdown list self.setControlProperty("lstCommunicationType", "StringItemList", - self.resources.CommunicationLabels) + tuple(self.resources.CommunicationLabels)) def __setDefaultForGreetingAndSalutationAndCommunication(self): - if self.lstSalutation.Text == "": + if not self.lstSalutation.Text: self.lstSalutation.setText(self.resources.SalutationLabels[0]) - if self.lstGreeting.Text == "": + if not self.lstGreeting.Text: self.lstGreeting.setText(self.resources.GreetingLabels[0]) - if self.lstCommunicationType.Text == "": + if not self.lstCommunicationType.Text: self.lstCommunicationType.setText( \ self.resources.CommunicationLabels[0]) diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py index ef60232fc7b0..33bda5616e36 100644 --- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py +++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py @@ -35,17 +35,13 @@ class FaxWizardDialogResources(Resource): resConsist2PlaceHolder = "#consist2#" resConsist3PlaceHolder = "#consist3#" - def __init__(self, xmsf): super(FaxWizardDialogResources,self).__init__(xmsf, FaxWizardDialogResources.MODULE_NAME) - self.RoadmapLabels = () - self.SalutationLabels = () - self.GreetingLabels = () - self.CommunicationLabels = () - - #Delete the String, uncomment the self.getResText method - + self.RoadmapLabels = [] + self.SalutationLabels = [] + self.GreetingLabels = [] + self.CommunicationLabels = [] self.resFaxWizardDialog_title = self.getResText( FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 1) @@ -145,40 +141,37 @@ class FaxWizardDialogResources(Resource): FaxWizardDialogResources.resConsist3PlaceHolder : self.getResText( FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 48)} - self.loadRoadmapResources() - self.loadSalutationResources() - self.loadGreetingResources() - self.loadCommunicationResources() - self.loadCommonResources() - - def loadCommonResources(self): + #Common Resources self.resOverwriteWarning = self.getResText( FaxWizardDialogResources.RID_RID_COMMON_START + 19) self.resTemplateDescription = self.getResText( FaxWizardDialogResources.RID_RID_COMMON_START + 20) + + self.loadRoadmapResources() + self.loadSalutationResources() + self.loadGreetingResources() + self.loadCommunicationResources() def loadRoadmapResources(self): for i in xrange(5): - self.RoadmapLabels = self.RoadmapLabels + ((self.getResText( + self.RoadmapLabels.append(self.getResText( FaxWizardDialogResources.RID_FAXWIZARDROADMAP_START + \ - + i + 1)),) + + i + 1)) def loadSalutationResources(self): - i = 1 for i in xrange(4): - self.SalutationLabels = self.SalutationLabels + ((self.getResText( + self.SalutationLabels.append(self.getResText( FaxWizardDialogResources.RID_FAXWIZARDSALUTATION_START + \ - i + 1)),) + i + 1)) def loadGreetingResources(self): for i in xrange(4): - self.GreetingLabels = self.GreetingLabels + ((self.getResText( + self.GreetingLabels.append(self.getResText( FaxWizardDialogResources.RID_FAXWIZARDGREETING_START + \ - i +1 )),) + i + 1)) def loadCommunicationResources(self): for i in xrange(3): - self.CommunicationLabels = \ - self.CommunicationLabels + ((self.getResText( + self.CommunicationLabels.append(self.getResText( FaxWizardDialogResources.RID_FAXWIZARDCOMMUNICATION_START + \ - i + 1)),) + i + 1)) From 789c48251add484f3c912b700b418a733385181d Mon Sep 17 00:00:00 2001 From: Xisco Fauli Date: Wed, 3 Oct 2012 22:04:16 +0200 Subject: [PATCH 267/863] pyfax: cleanup ugly code Change-Id: I6141e544391c6723e7d2949771be1bd5a1768163 --- .../com/sun/star/wizards/common/FileAccess.py | 52 +++---------------- .../star/wizards/fax/FaxWizardDialogImpl.py | 10 ++-- 2 files changed, 13 insertions(+), 49 deletions(-) diff --git a/wizards/com/sun/star/wizards/common/FileAccess.py b/wizards/com/sun/star/wizards/common/FileAccess.py index 6b91bc4cbf48..a213b7e4f444 100644 --- a/wizards/com/sun/star/wizards/common/FileAccess.py +++ b/wizards/com/sun/star/wizards/common/FileAccess.py @@ -17,6 +17,7 @@ # import traceback import types +from collections import OrderedDict from os import path as osPath from .NoValidPathException import NoValidPathException @@ -36,11 +37,6 @@ These Convenince methods include mainly Exception-handling. ''' class FileAccess(object): - ''' - @param xMSF - @param sPath - @param sAddPath - ''' @classmethod def addOfficePath(self, xMSF, sPath, sAddPath): @@ -312,62 +308,30 @@ class FileAccess(object): @classmethod def getFolderTitles(self, xMSF, FilterName, FolderName): - LocLayoutFiles = [[2],[]] + #Returns and ordered dict containing the template's name and path + + LocLayoutFiles = {} try: xDocInterface = xMSF.createInstance( "com.sun.star.document.DocumentProperties") xInterface = xMSF.createInstance( "com.sun.star.ucb.SimpleFileAccess") nameList = xInterface.getFolderContents(FolderName, False) - TitleVector = [] - NameVector = [] if FilterName is None or FilterName == "": FilterName = None else: - FilterName = FilterName + "-" - fileName = "" - NameVectorAppend = NameVector.append - TitleVectorAppend = TitleVector.append + FilterName += "-" + for i in nameList: fileName = self.getFilename(i) if FilterName is None or fileName.startswith(FilterName): xDocInterface.loadFromMedium(i, tuple()) - NameVectorAppend(i) - TitleVectorAppend(xDocInterface.Title) - - LocLayoutFiles[1] = NameVector - LocLayoutFiles[0] = TitleVector + LocLayoutFiles[xDocInterface.Title] = i except Exception, exception: traceback.print_exc() - return self.__bubblesortList(LocLayoutFiles) - - ''' - This function bubble sorts an array of with 2 dimensions. - The default sorting order is the first dimension - Only if sort2ndValue is True the second dimension is - the relevant for the sorting order - ''' - - @classmethod - def __bubblesortList(self, SortList): - SortCount = len(SortList[0]) - DimCount = len(SortList) - for i in xrange(SortCount): - for t in xrange(SortCount - i - 1): - if SortList[0][t] > SortList[0][t + 1]: - for k in xrange(DimCount): - DisplayDummy = SortList[k][t]; - SortList[k][t] = SortList[k][t + 1]; - SortList[k][t + 1] = DisplayDummy - return SortList - ''' - We search in all given path for a given file - @param _sPath - @param _sPath2 - @return - ''' + return OrderedDict(sorted(LocLayoutFiles.items(), key=lambda t: t[0])) @classmethod def addPath(self, _sPath, _sPath2): diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py index b678f38a0dce..b128a95ceab0 100644 --- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py +++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py @@ -302,15 +302,15 @@ class FaxWizardDialogImpl(FaxWizardDialog): self.sFaxPath) self.PrivateFiles = FileAccess.getFolderTitles(xMSF, "pri", self.sFaxPath) + self.setControlProperty("lstBusinessStyle", "StringItemList", - tuple(self.BusinessFiles[0])) + tuple(self.BusinessFiles.keys())) self.setControlProperty("lstPrivateStyle", "StringItemList", - tuple(self.PrivateFiles[0])) + tuple(self.PrivateFiles.keys())) self.setControlProperty("lstBusinessStyle", "SelectedItems", (0,)) self.setControlProperty("lstPrivateStyle", "SelectedItems" , (0,)) return True except NoValidPathException, e: - # TODO Auto-generated catch block traceback.print_exc() return False @@ -457,7 +457,7 @@ class FaxWizardDialogImpl(FaxWizardDialog): if FaxWizardDialogImpl.lstBusinessStylePos is not selectedItemPos: FaxWizardDialogImpl.lstBusinessStylePos = selectedItemPos TextDocument.xTextDocument = self.myFaxDoc.loadAsPreview( - self.BusinessFiles[1][selectedItemPos], False) + self.BusinessFiles.values()[selectedItemPos], False) self.initializeElements() self.setElements() self.drawConstants() @@ -482,7 +482,7 @@ class FaxWizardDialogImpl(FaxWizardDialog): if FaxWizardDialogImpl.lstPrivateStylePos is not selectedItemPos: FaxWizardDialogImpl.lstPrivateStylePos = selectedItemPos TextDocument.xTextDocument = self.myFaxDoc.loadAsPreview( - self.PrivateFiles[1][selectedItemPos], False) + self.PrivateFiles.values()[selectedItemPos], False) self.initializeElements() self.setElements() From 60211510d3a1c2f96bb6f6e96895f003d6beef74 Mon Sep 17 00:00:00 2001 From: Xisco Fauli Date: Wed, 3 Oct 2012 22:59:03 +0200 Subject: [PATCH 268/863] pywizard: localise listbox at runtime Change-Id: I667976f7f76776cc3ef76abe9935271a7a0c2923 --- .../com/sun/star/wizards/common/FileAccess.py | 11 +++++++--- .../star/wizards/fax/FaxWizardDialogImpl.py | 10 +++++----- .../wizards/fax/FaxWizardDialogResources.py | 20 +++++++++++++++++++ 3 files changed, 33 insertions(+), 8 deletions(-) diff --git a/wizards/com/sun/star/wizards/common/FileAccess.py b/wizards/com/sun/star/wizards/common/FileAccess.py index a213b7e4f444..0364a0ddcc99 100644 --- a/wizards/com/sun/star/wizards/common/FileAccess.py +++ b/wizards/com/sun/star/wizards/common/FileAccess.py @@ -307,7 +307,7 @@ class FileAccess(object): return False @classmethod - def getFolderTitles(self, xMSF, FilterName, FolderName): + def getFolderTitles(self, xMSF, FilterName, FolderName, resDict): #Returns and ordered dict containing the template's name and path LocLayoutFiles = {} @@ -321,12 +321,17 @@ class FileAccess(object): FilterName = None else: FilterName += "-" - + for i in nameList: fileName = self.getFilename(i) if FilterName is None or fileName.startswith(FilterName): xDocInterface.loadFromMedium(i, tuple()) - LocLayoutFiles[xDocInterface.Title] = i + if xDocInterface.Title in resDict: + # localise string at runtime + title = resDict[xDocInterface.Title] + else: + title = xDocInterface.Title + LocLayoutFiles[title] = i except Exception, exception: traceback.print_exc() diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py index b128a95ceab0..ae738009839e 100644 --- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py +++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py @@ -299,9 +299,9 @@ class FaxWizardDialogImpl(FaxWizardDialog): "/wizard/fax") self.sWorkPath = FileAccess.getOfficePath2(xMSF, "Work", "", "") self.BusinessFiles = FileAccess.getFolderTitles(xMSF, "bus", - self.sFaxPath) + self.sFaxPath, self.resources.dictBusinessTemplate) self.PrivateFiles = FileAccess.getFolderTitles(xMSF, "pri", - self.sFaxPath) + self.sFaxPath, self.resources.dictPrivateTemplate) self.setControlProperty("lstBusinessStyle", "StringItemList", tuple(self.BusinessFiles.keys())) @@ -327,17 +327,17 @@ class FaxWizardDialogImpl(FaxWizardDialog): self.myFaxDoc.updateDateFields() def initializeSalutation(self): - #'Saludation' dropdown list + #'Saludation' listbox self.setControlProperty("lstSalutation", "StringItemList", tuple(self.resources.SalutationLabels)) def initializeGreeting(self): - #'Complimentary Close' dropdown list + #'Complimentary Close' listbox self.setControlProperty("lstGreeting", "StringItemList", tuple(self.resources.GreetingLabels)) def initializeCommunication(self): - #'Type of message' dropdown list + #'Type of message' listbox self.setControlProperty("lstCommunicationType", "StringItemList", tuple(self.resources.CommunicationLabels)) diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py index 33bda5616e36..7cf37031a93b 100644 --- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py +++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py @@ -140,6 +140,26 @@ class FaxWizardDialogResources(Resource): FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 47), FaxWizardDialogResources.resConsist3PlaceHolder : self.getResText( FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 48)} + + #Create a dictionary for localising the private template + self.dictPrivateTemplate = { + "Bottle" : self.getResText( + FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 49), + "Lines" : self.getResText( + FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 50), + "Marine" : self.getResText( + FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 51)} + + #Create a dictionary for localising the business template + self.dictBusinessTemplate = { + "Classic Fax" : self.getResText( + FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 52), + "Classic Fax from Private" : self.getResText( + FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 53), + "Modern Fax" : self.getResText( + FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 54), + "Modern Fax from Private" : self.getResText( + FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 55)} #Common Resources self.resOverwriteWarning = self.getResText( From db1af9a43458bd7cc9995c3c4e901ddad4e79c8d Mon Sep 17 00:00:00 2001 From: Ricardo Montania Date: Mon, 1 Oct 2012 13:03:37 -0300 Subject: [PATCH 269/863] OUString and RTL_CONSTASCII_US... cleanup in basctl Change-Id: I440d245d013873ec2830280ad01a4d0625fc4c1a Reviewed-on: https://gerrit.libreoffice.org/741 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot --- basctl/source/basicide/basicbox.cxx | 4 +- basctl/source/basicide/basicrenderable.cxx | 36 +++++++------- basctl/source/basicide/baside2.cxx | 56 +++++++++++----------- basctl/source/basicide/baside2.hxx | 20 ++++---- 4 files changed, 58 insertions(+), 58 deletions(-) diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx index 2cc65d197c39..5d278c2b86cf 100644 --- a/basctl/source/basicide/basicbox.cxx +++ b/basctl/source/basicide/basicbox.cxx @@ -237,9 +237,9 @@ void LibBox::FillBox() void LibBox::InsertEntries( const ScriptDocument& rDocument, LibraryLocation eLocation ) { // get a sorted list of library names - Sequence< ::rtl::OUString > aLibNames = rDocument.getLibraryNames(); + Sequence< OUString > aLibNames = rDocument.getLibraryNames(); sal_Int32 nLibCount = aLibNames.getLength(); - const ::rtl::OUString* pLibNames = aLibNames.getConstArray(); + const OUString* pLibNames = aLibNames.getConstArray(); for ( sal_Int32 i = 0 ; i < nLibCount ; ++i ) { diff --git a/basctl/source/basicide/basicrenderable.cxx b/basctl/source/basicide/basicrenderable.cxx index 9fe4ae711ef5..5200c8c8fa73 100644 --- a/basctl/source/basicide/basicrenderable.cxx +++ b/basctl/source/basicide/basicrenderable.cxx @@ -46,31 +46,31 @@ Renderable::Renderable (BaseWindow* pWin) // show Subgroup for print range vcl::PrinterOptionsHelper::UIControlOptions aPrintRangeOpt; - aPrintRangeOpt.maGroupHint = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintRange" ) ); + aPrintRangeOpt.maGroupHint = "PrintRange" ; aPrintRangeOpt.mbInternalOnly = true; m_aUIProperties[0].Value = setSubgroupControlOpt("printrange", - rtl::OUString(aStrings.GetString(0)), rtl::OUString(), aPrintRangeOpt); + OUString(aStrings.GetString(0)), OUString(), aPrintRangeOpt); // create a choice for the range to print - rtl::OUString aPrintContentName( RTL_CONSTASCII_USTRINGPARAM( "PrintContent" ) ); - Sequence< rtl::OUString > aChoices( 2 ); - Sequence< rtl::OUString > aHelpIds( 2 ); - Sequence< rtl::OUString > aWidgetIds( 2 ); + OUString aPrintContentName( "PrintContent" ); + Sequence< OUString > aChoices( 2 ); + Sequence< OUString > aHelpIds( 2 ); + Sequence< OUString > aWidgetIds( 2 ); aChoices[0] = aStrings.GetString( 1 ); - aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" ) ); + aHelpIds[0] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" ; aChoices[1] = aStrings.GetString( 2 ); - aHelpIds[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" ) ); - aWidgetIds[0] = rtl::OUString("printallpages"); - aWidgetIds[1] = rtl::OUString("printpages"); - m_aUIProperties[1].Value = setChoiceRadiosControlOpt(aWidgetIds, rtl::OUString(), + aHelpIds[1] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" ; + aWidgetIds[0] = "printallpages" ; + aWidgetIds[1] = "printpages" ; + m_aUIProperties[1].Value = setChoiceRadiosControlOpt(aWidgetIds, OUString(), aHelpIds, aPrintContentName, aChoices, 0); // create a an Edit dependent on "Pages" selected vcl::PrinterOptionsHelper::UIControlOptions aPageRangeOpt(aPrintContentName, 1, true); - m_aUIProperties[2].Value = setEditControlOpt("pagerange", rtl::OUString(), - rtl::OUString(), "PageRange", - rtl::OUString(), aPageRangeOpt); + m_aUIProperties[2].Value = setEditControlOpt("pagerange", OUString(), + OUString(), "PageRange", + OUString(), aPageRangeOpt); } Renderable::~Renderable() @@ -80,7 +80,7 @@ Renderable::~Renderable() Printer* Renderable::getPrinter() { Printer* pPrinter = NULL; - Any aValue( getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RenderDevice" ) ) ) ); + Any aValue( getValue( "RenderDevice" ) ); Reference xRenderDevice; if( aValue >>= xRenderDevice ) @@ -107,7 +107,7 @@ sal_Int32 SAL_CALL Renderable::getRendererCount ( sal_Int64 nContent = getIntValue( "PrintContent", -1 ); if( nContent == 1 ) { - rtl::OUString aPageRange( getStringValue( "PageRange" ) ); + OUString aPageRange( getStringValue( "PageRange" ) ); if( !aPageRange.isEmpty() ) { StringRangeEnumerator aRangeEnum( aPageRange, 0, nCount-1 ); @@ -139,7 +139,7 @@ Sequence SAL_CALL Renderable::getRenderer ( Size aPageSize( pPrinter->PixelToLogic( pPrinter->GetPaperSizePixel(), MapMode( MAP_100TH_MM ) ) ); aVals.realloc( 1 ); - aVals[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PageSize" ) ); + aVals[0].Name = "PageSize" ; awt::Size aSize; aSize.Width = aPageSize.Width(); aSize.Height = aPageSize.Height(); @@ -165,7 +165,7 @@ void SAL_CALL Renderable::render ( sal_Int64 nContent = getIntValue( "PrintContent", -1 ); if( nContent == 1 ) { - rtl::OUString aPageRange( getStringValue( "PageRange" ) ); + OUString aPageRange( getStringValue( "PageRange" ) ); if( !aPageRange.isEmpty() ) { sal_Int32 nPageCount = mpWindow->countPages( pPrinter ); diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index 13b169152819..657182d10420 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -90,7 +90,7 @@ TYPEINIT1( ModulWindow , BaseWindow ); namespace { -void lcl_PrintHeader( Printer* pPrinter, sal_uInt16 nPages, sal_uInt16 nCurPage, const ::rtl::OUString& rTitle, bool bOutput ) +void lcl_PrintHeader( Printer* pPrinter, sal_uInt16 nPages, sal_uInt16 nCurPage, const OUString& rTitle, bool bOutput ) { Size const aSz = pPrinter->GetOutputSize(); @@ -133,8 +133,8 @@ void lcl_PrintHeader( Printer* pPrinter, sal_uInt16 nPages, sal_uInt16 nCurPage, if( bOutput ) { - ::rtl::OUStringBuffer aPageStr; - aPageStr.appendAscii( RTL_CONSTASCII_STRINGPARAM( " [" ) ); + OUStringBuffer aPageStr; + aPageStr.appendAscii( " [" ); aPageStr.append(IDE_RESSTR(RID_STR_PAGE)); aPageStr.append(' '); aPageStr.append( nCurPage ); @@ -190,7 +190,7 @@ bool bSourceLinesEnabled = false; ModulWindow::ModulWindow ( ModulWindowLayout* pParent, ScriptDocument const& rDocument, - rtl::OUString aLibName, rtl::OUString aName, rtl::OUString& aModule + OUString aLibName, OUString aName, OUString& aModule ) : BaseWindow(pParent, rDocument, aLibName, aName), rLayout(*pParent), @@ -358,7 +358,7 @@ bool ModulWindow::BasicExecute() if ( !pMethod ) { // If not in a method then prompt the user - return ( !ChooseMacro( uno::Reference< frame::XModel >(), false, rtl::OUString() ).isEmpty() ); + return ( !ChooseMacro( uno::Reference< frame::XModel >(), false, OUString() ).isEmpty() ); } if ( pMethod ) { @@ -442,20 +442,20 @@ bool ModulWindow::LoadBasic() Sequence aServiceType(1); aServiceType[0] <<= TemplateDescription::FILEOPEN_SIMPLE; xFP = Reference< XFilePicker >( xMSF->createInstanceWithArguments( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ) ), aServiceType ), UNO_QUERY ); + "com.sun.star.ui.dialogs.FilePicker", aServiceType ), UNO_QUERY ); } if ( !aCurPath.isEmpty() ) xFP->setDisplayDirectory ( aCurPath ); Reference< XFilterManager > xFltMgr(xFP, UNO_QUERY); - xFltMgr->appendFilter( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BASIC" ) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*.bas" ) ) ); - xFltMgr->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( FilterMask_All ) ) ); - xFltMgr->setCurrentFilter( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BASIC" ) ) ); + xFltMgr->appendFilter( "BASIC" , "*.bas" ); + xFltMgr->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), OUString( FilterMask_All ) ); + xFltMgr->setCurrentFilter( "BASIC" ); if( xFP->execute() == RET_OK ) { - Sequence< ::rtl::OUString > aPaths = xFP->getFiles(); + Sequence< OUString > aPaths = xFP->getFiles(); aCurPath = aPaths[0]; SfxMedium aMedium( aCurPath, STREAM_READ | STREAM_SHARE_DENYWRITE | STREAM_NOCREATE ); SvStream* pStream = aMedium.GetInStream(); @@ -496,7 +496,7 @@ bool ModulWindow::SaveBasicSource() Sequence aServiceType(1); aServiceType[0] <<= TemplateDescription::FILESAVE_AUTOEXTENSION_PASSWORD; xFP = Reference< XFilePicker >( xMSF->createInstanceWithArguments( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ) ), aServiceType ), UNO_QUERY ); + "com.sun.star.ui.dialogs.FilePicker", aServiceType ), UNO_QUERY ); } Reference< XFilePickerControlAccess > xFPControl(xFP, UNO_QUERY); @@ -509,13 +509,13 @@ bool ModulWindow::SaveBasicSource() xFP->setDisplayDirectory ( aCurPath ); Reference< XFilterManager > xFltMgr(xFP, UNO_QUERY); - xFltMgr->appendFilter( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BASIC" ) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*.bas" ) ) ); - xFltMgr->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( FilterMask_All ) ) ); - xFltMgr->setCurrentFilter( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BASIC" ) ) ); + xFltMgr->appendFilter( "BASIC", "*.bas" ); + xFltMgr->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), OUString( FilterMask_All ) ); + xFltMgr->setCurrentFilter( "BASIC" ); if( xFP->execute() == RET_OK ) { - Sequence< ::rtl::OUString > aPaths = xFP->getFiles(); + Sequence< OUString > aPaths = xFP->getFiles(); aCurPath = aPaths[0]; SfxMedium aMedium( aCurPath, STREAM_WRITE | STREAM_SHARE_DENYWRITE | STREAM_TRUNC ); SvStream* pStream = aMedium.GetOutStream(); @@ -539,12 +539,12 @@ bool ModulWindow::SaveBasicSource() return bDone; } -extern bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const ScriptDocument& rDocument, const ::rtl::OUString& aLibName ); // defined in baside3.cxx +extern bool implImportDialog( Window* pWin, const OUString& rCurPath, const ScriptDocument& rDocument, const OUString& aLibName ); // defined in baside3.cxx bool ModulWindow::ImportDialog() { const ScriptDocument& rDocument = GetDocument(); - ::rtl::OUString aLibName = GetLibName(); + OUString aLibName = GetLibName(); return implImportDialog( this, aCurPath, rDocument, aLibName ); } @@ -671,7 +671,7 @@ long ModulWindow::BasicErrorHdl( StarBASIC * pBasic ) // ReturnWert: BOOL // FALSE: cancel // TRUE: go on.... - ::rtl::OUString aErrorText( pBasic->GetErrorText() ); + OUString aErrorText( pBasic->GetErrorText() ); sal_uInt16 nErrorLine = pBasic->GetLine() - 1; sal_uInt16 nErrCol1 = pBasic->GetCol1(); sal_uInt16 nErrCol2 = pBasic->GetCol2(); @@ -681,7 +681,7 @@ long ModulWindow::BasicErrorHdl( StarBASIC * pBasic ) AssertValidEditEngine(); GetEditView()->SetSelection( TextSelection( TextPaM( nErrorLine, nErrCol1 ), TextPaM( nErrorLine, nErrCol2 ) ) ); - ::rtl::OUStringBuffer aErrorTextPrefixBuf; + OUStringBuffer aErrorTextPrefixBuf; if( pBasic->IsCompilerError() ) aErrorTextPrefixBuf.append(IDE_RESSTR(RID_STR_COMPILEERROR)); else @@ -691,7 +691,7 @@ long ModulWindow::BasicErrorHdl( StarBASIC * pBasic ) aErrorTextPrefixBuf.append(' '); rLayout.UpdateDebug(false); } - ::rtl::OUString aErrorTextPrefix(aErrorTextPrefixBuf.makeStringAndClear()); + OUString aErrorTextPrefix(aErrorTextPrefixBuf.makeStringAndClear()); // if other basic, the IDE should try to display the correct module bool const bMarkError = pBasic == GetBasic(); if ( bMarkError ) @@ -766,7 +766,7 @@ void ModulWindow::BasicAddWatch() if ( !GetEditView()->HasSelection() ) { TextPaM aWordStart; - ::rtl::OUString aWord = GetEditEngine()->GetWord( GetEditView()->GetSelection().GetEnd(), &aWordStart ); + OUString aWord = GetEditEngine()->GetWord( GetEditView()->GetSelection().GetEnd(), &aWordStart ); if ( !aWord.isEmpty() ) { TextSelection aSel( aWordStart ); @@ -918,7 +918,7 @@ sal_Int32 ModulWindow::FormatAndPrint( Printer* pPrinter, sal_Int32 nPrintPage ) // nLinepPage is not correct if there's a line break sal_uInt16 nLinespPage = (sal_uInt16) (aPaperSz.Height()/nLineHeight); - sal_uInt16 nCharspLine = (sal_uInt16) (aPaperSz.Width() / pPrinter->GetTextWidth(rtl::OUString('X')) ); + sal_uInt16 nCharspLine = (sal_uInt16) (aPaperSz.Width() / pPrinter->GetTextWidth( 'X' ) ); sal_uLong nParas = GetEditEngine()->GetParagraphCount(); sal_uInt16 nPages = (sal_uInt16) (nParas/nLinespPage+1 ); @@ -1161,7 +1161,7 @@ void ModulWindow::GetState( SfxItemSet &rSet ) String aPos( IDEResId( RID_STR_LINE ) ); aPos += ' '; aPos += String::CreateFromInt32( aSel.GetEnd().GetPara()+1 ); - aPos += String( RTL_CONSTASCII_USTRINGPARAM( ", " ) ); + aPos += String( ", " ); aPos += String( IDEResId( RID_STR_COLUMN ) ); aPos += ' '; aPos += String::CreateFromInt32( aSel.GetEnd().GetIndex()+1 ); @@ -1217,15 +1217,15 @@ void ModulWindow::GoOnTop() GetShell()->GetViewFrame()->ToTop(); } -::rtl::OUString ModulWindow::GetSbModuleName() +OUString ModulWindow::GetSbModuleName() { - ::rtl::OUString aModuleName; + OUString aModuleName; if ( XModule().Is() ) aModuleName = xModule->GetName(); return aModuleName; } -::rtl::OUString ModulWindow::GetTitle() +OUString ModulWindow::GetTitle() { return GetSbModuleName(); } @@ -1381,7 +1381,7 @@ EntryDescriptor ModulWindow::CreateEntryDescriptor() uno::Reference< container::XNameContainer > xLib = aDocument.getOrCreateLibrary( E_SCRIPTS, aLibName ); if( xLib.is() ) { - ::rtl::OUString sObjName; + OUString sObjName; ModuleInfoHelper::getObjectName( xLib, aModName, sObjName ); if( !sObjName.isEmpty() ) { @@ -1461,7 +1461,7 @@ bool ModulWindow::HasActiveEditor () const void ModulWindow::UpdateModule () { - rtl::OUString const aModule = getTextEngineText(*GetEditEngine()); + OUString const aModule = getTextEngineText(*GetEditEngine()); // update module in basic assert(xModule); diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index b7d8975d67b8..8ca38127b4df 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -64,8 +64,8 @@ DBG_NAMEEX( ModulWindow ) // using the stream interface (get/setText() only supports // tools Strings limited to 64K). // defined in baside2b.cxx -rtl::OUString getTextEngineText (ExtTextEngine&); -void setTextEngineText (ExtTextEngine&, rtl::OUString const&); +OUString getTextEngineText (ExtTextEngine&); +void setTextEngineText (ExtTextEngine&, OUString const&); class EditorWindow : public Window, public SfxListener @@ -192,7 +192,7 @@ class WatchTreeListBox : public SvHeaderTabListBox protected: virtual sal_Bool EditingEntry( SvLBoxEntry* pEntry, Selection& rSel ); - virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText ); + virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const OUString& rNewText ); bool ImplBasicEntryEdited( SvLBoxEntry* pEntry, const String& rResult ); SbxBase* ImplGetSBXForEntry( SvLBoxEntry* pEntry, bool& rbArrayElement ); @@ -294,8 +294,8 @@ private: ComplexEditorWindow aXEditorWindow; BasicStatus aStatus; SbModuleRef xModule; - ::rtl::OUString aCurPath; - ::rtl::OUString m_aModule; + OUString aCurPath; + OUString m_aModule; void CheckCompileBasic(); bool BasicExecute(); @@ -314,7 +314,7 @@ protected: public: TYPEINFO(); - ModulWindow( ModulWindowLayout* pParent, const ScriptDocument& rDocument, ::rtl::OUString aLibName, ::rtl::OUString aName, ::rtl::OUString& aModule ); + ModulWindow( ModulWindowLayout* pParent, const ScriptDocument& rDocument, OUString aLibName, OUString aName, OUString& aModule ); ~ModulWindow(); @@ -328,7 +328,7 @@ public: virtual sal_Int32 countPages( Printer* pPrinter ); // print page virtual void printPage( sal_Int32 nPage, Printer* pPrinter ); - virtual ::rtl::OUString GetTitle(); + virtual OUString GetTitle(); virtual EntryDescriptor CreateEntryDescriptor(); virtual bool AllowUndo(); virtual void SetReadOnly (bool bReadOnly); @@ -338,7 +338,7 @@ public: SbModule* GetSbModule() { return xModule; } void SetSbModule( SbModule* pModule ) { xModule = pModule; } - ::rtl::OUString GetSbModuleName(); + OUString GetSbModuleName(); bool CompileBasic(); bool BasicRun(); @@ -391,8 +391,8 @@ public: virtual ::svl::IUndoManager* GetUndoManager(); - const ::rtl::OUString& GetModule() const { return m_aModule; } - void SetModule( const ::rtl::OUString& aModule ) { m_aModule = aModule; } + const OUString& GetModule() const { return m_aModule; } + void SetModule( const OUString& aModule ) { m_aModule = aModule; } virtual void Activating (); virtual void Deactivating (); From 02235d101f934178c1e63acd09e9e28f90961a0e Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Thu, 4 Oct 2012 05:12:35 +0200 Subject: [PATCH 270/863] old Mac linker is picky about argument order - static libs last and also after stuff that references external symbols, as it only looks for symbols it has encountered so far in the object files. Stuff that comes after the specified library then results in symbols not found despite the lib being on the commandline earlier. (another solution than reordering the arguments would be to use -Wl,-all_load) Change-Id: If4add0d3f81b13874c1620406fa40fcbd25b7cf0 --- solenv/gbuild/platform/macosx.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 1aad554722ba..2e2c20302132 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -212,10 +212,10 @@ $(call gb_Helper_abbreviate_dirs,\ $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \ - $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \ + `cat $${DYLIB_FILE}` \ $(LIBS) \ - -o $(if $(SOVERSION),$(1).$(SOVERSION),$(1)) \ - `cat $${DYLIB_FILE}` && \ + $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \ + -o $(if $(SOVERSION),$(1).$(SOVERSION),$(1)) && \ $(if $(SOVERSION),ln -sf $(notdir $(1)).$(SOVERSION) $(1),:) && \ $(if $(filter Executable,$(TARGETTYPE)), \ $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Executable \ From 4fdc50d8662be6d830101d5d2045de8ead780b7b Mon Sep 17 00:00:00 2001 From: Marcos Paulo de Souza Date: Mon, 1 Oct 2012 13:28:58 -0300 Subject: [PATCH 271/863] Remove blocks of code that will never execute("#if 0" blocks) These blocks of code will never execute. So we can safely remove them. Change-Id: I63de52342ce6435b6e8e19b041e2dae59c681f34 Signed-off-by: Marcos Paulo de Souza --- .../source/drivers/ado/AStatement.cxx | 18 --- .../source/drivers/mork/MDatabaseMetaData.cxx | 9 -- .../drivers/mork/MDatabaseMetaDataHelper.cxx | 6 - .../source/drivers/mork/MResultSet.cxx | 103 ------------------ .../drivers/mork/MResultSetMetaData.cxx | 9 -- .../source/drivers/mork/mork_helper.cxx | 30 ----- 6 files changed, 175 deletions(-) diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx index 71e9d4d8094b..b76bf81d50d1 100644 --- a/connectivity/source/drivers/ado/AStatement.cxx +++ b/connectivity/source/drivers/ado/AStatement.cxx @@ -510,20 +510,6 @@ sal_Int32 OStatement_Base::getMaxRows() const throw(SQLException, RuntimeExcepti sal_Int32 OStatement_Base::getResultSetConcurrency() const throw(SQLException, RuntimeException) { return m_eLockType; -#if 0 // Huh? - sal_Int32 nValue=0; - switch(m_eLockType) - { - case adLockReadOnly: - nValue = ResultSetConcurrency::READ_ONLY; - break; - default: - nValue = ResultSetConcurrency::UPDATABLE; - break; - } - - return nValue; -#endif } //------------------------------------------------------------------------------ sal_Int32 OStatement_Base::getResultSetType() const throw(SQLException, RuntimeException) @@ -633,7 +619,6 @@ void OStatement_Base::setFetchSize(sal_Int32 _par0) throw(SQLException, RuntimeE m_nFetchSize = _par0; - // m_RecordSet.put_CacheSize(_par0); } //------------------------------------------------------------------------------ void OStatement_Base::setMaxFieldSize(sal_Int32 /*_par0*/) throw(SQLException, RuntimeException) @@ -830,6 +815,3 @@ void SAL_CALL OStatement::release() throw() { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } -// ----------------------------------------------------------------------------- - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx index fce033031631..ab6a20f7a4fa 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx @@ -23,14 +23,6 @@ #include "MorkParser.hxx" #include "connectivity/dbtools.hxx" -#if 0 -#if OSL_DEBUG_LEVEL > 0 -# define OUtoCStr( x ) ( ::rtl::OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) -#else /* OSL_DEBUG_LEVEL */ -# define OUtoCStr( x ) ("dummy") -#endif /* OSL_DEBUG_LEVEL */ -#endif - using namespace dbtools; using namespace connectivity::mork; using namespace connectivity; @@ -142,7 +134,6 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( { if ( match( columnNamePattern, compare->first, '\0' ) ) { -// OSL_TRACE( "\t\t\tColumnName = %s;", OUtoCStr( compare->first ) ); SAL_INFO("connectivity.mork", "\t\tColumnNam : " << compare->first); // COLUMN_NAME diff --git a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx index 7a28c4562d22..a22b660650a8 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx @@ -92,11 +92,6 @@ sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon, // return tables to caller if (match( tableNamePattern, aTableName, '\0' )) -#if 0 - && - 0 != ::comphelper::findValue( types, aTableType, sal_True ).getLength() || - 0 != ::comphelper::findValue( types, matchAny, sal_True ).getLength())) -#endif { if ( aTableName.isEmpty() ) { aTableName = rtl::OUString::createFromAscii("AddressBook"); @@ -105,7 +100,6 @@ sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon, SAL_INFO("connectivity.mork", "TableName: " << aTableName); aRow.push_back( new ORowSetValueDecorator( aTableName ) ); // Table name -// aRow.push_back( new ORowSetValueDecorator( aTableType ) ); // Table type aRow.push_back( new ORowSetValueDecorator( rtl::OUString::createFromAscii("TABLE") ) ); // Table type aRow.push_back( ODatabaseMetaDataResultSet::getEmptyValue() ); // Remarks aRows.push_back(aRow); diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx index 974d703a07c0..49ee90a0f387 100644 --- a/connectivity/source/drivers/mork/MResultSet.cxx +++ b/connectivity/source/drivers/mork/MResultSet.cxx @@ -1257,13 +1257,6 @@ void SAL_CALL OResultSet::executeQuery() throw( ::com::sun::star::sdbc::SQLExcep // values. OSL_TRACE("Query is to be sorted"); -#if 0 - if( ! m_aQueryHelper.queryComplete() ) - if ( !m_aQueryHelper.waitForQueryComplete() ) - { - m_pStatement->getOwnConnection()->throwSQLException( m_aQueryHelper.getError(), *this ); - } -#endif OSL_ENSURE( m_aQueryHelper.queryComplete(), "Query not complete!!"); @@ -1553,19 +1546,6 @@ sal_Bool OResultSet::seekRow( eRowPosition pos, sal_Int32 nOffset ) else //The requested row has not been retrived until now. We should get the right card for it. nCurCard = nCurPos + deletedCount(); - // davido: what is this loop for? - // it leads to infinite loop, once nCurCard is greater then nNumberOfRecords -#if 0 - while ( nCurCard > nNumberOfRecords ) { - m_aQueryHelper.checkRowAvailable( nCurCard ); - if ( m_aQueryHelper.hadError() ) - { - m_pStatement->getOwnConnection()->throwSQLException( m_aQueryHelper.getError(), *this ); - } - nNumberOfRecords = m_aQueryHelper.getResultCount(); - } -#endif - if ( nCurCard > nNumberOfRecords) { fillKeySet(nNumberOfRecords); m_nRowPos = static_cast(m_pKeySet->get().size() + 1); @@ -1841,104 +1821,21 @@ void SAL_CALL OResultSet::insertRow( ) throw(::com::sun::star::sdbc::SQLExcepti void SAL_CALL OResultSet::updateRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { OSL_FAIL( "OResultSet::updateRow( ) not implemented" ); -#if 0 - OSL_TRACE("updateRow in, m_nRowPos = %u", m_nRowPos ); - ResultSetEntryGuard aGuard( *this ); - impl_ensureKeySet(); - - if (!m_nRowPos || m_pKeySet->get().size() < m_nRowPos ) - { - m_pStatement->getOwnConnection()->throwSQLException( STR_INVALID_ROW_UPDATE, *this ); - } - - const sal_Int32 nCurrentCard = getCurrentCardNumber(); - - if (!pushCard(nCurrentCard)) - { - m_RowStates = RowStates_Error; - m_pStatement->getOwnConnection()->throwSQLException( STR_ROW_CAN_NOT_SAVE, *this ); - } - - if (!m_aQueryHelper.commitRow(nCurrentCard)) - { - m_RowStates = RowStates_Error; - m_nUpdatedRow = 0; - m_pStatement->getOwnConnection()->throwSQLException( m_aQueryHelper.getError(), *this ); - } - - m_nUpdatedRow = 0; - fetchCurrentRow(); - OSL_TRACE("updateRow out, m_nRowPos = %u", m_nRowPos ); -#endif } // ------------------------------------------------------------------------- void SAL_CALL OResultSet::deleteRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { OSL_FAIL( "OResultSet::deleteRow( ) not implemented" ); -#if 0 - OSL_TRACE("deleteRow, m_nRowPos = %u", m_nRowPos ); - ResultSetEntryGuard aGuard( *this ); - if (rowDeleted()) - m_pStatement->getOwnConnection()->throwSQLException( STR_ROW_ALREADY_DELETED, *this ); - - const sal_Int32 nCurrentRow = getCurrentCardNumber(); - //fetchRow(nCurrentRow); - if (!nCurrentRow) - m_pStatement->getOwnConnection()->throwSQLException( STR_ERROR_GET_ROW, *this ); - - sal_Bool m_bRowDeleted = ( m_aQueryHelper.deleteRow( nCurrentRow ) > 0 ); - if (!m_bRowDeleted) - m_pStatement->getOwnConnection()->throwSQLException( m_aQueryHelper.getError(), *this ); - - m_aQueryHelper.setRowStates(nCurrentRow,RowStates_Deleted); - m_pKeySet->get().erase(m_pKeySet->get().begin() + m_nRowPos -1); - m_RowStates = RowStates_Deleted; - OSL_TRACE("deleteRow out, m_nRowPos = %u", m_nRowPos ); -#endif } // ------------------------------------------------------------------------- void SAL_CALL OResultSet::cancelRowUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { OSL_FAIL( "OResultSet::cancelRowUpdates( ) not implemented" ); -#if 0 - ResultSetEntryGuard aGuard( *this ); - OSL_TRACE("cancelRowUpdates, m_nRowPos = %u", m_nRowPos ); - if (fetchRow(getCurrentCardNumber(),sal_True)) //force fetch current row will cause we lose all change to the current row - m_pStatement->getOwnConnection()->throwSQLException( STR_CAN_NOT_CANCEL_ROW_UPDATE, *this ); -#endif } // ------------------------------------------------------------------------- void SAL_CALL OResultSet::moveToInsertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { OSL_FAIL( "OResultSet::moveToInsertRow( ) not implemented" ); -#if 0 - OSL_TRACE("moveToInsertRow in, m_nRowPos = %u", m_nRowPos ); - ResultSetEntryGuard aGuard( *this ); - m_nOldRowPos = m_nRowPos; - - if (!m_nNewRow) //no new row now, insert one - { - checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - checkPendingUpdate(); - if (rowUpdated()) - { - if (m_nRowPos && !pushCard(getCurrentCardNumber())) - throw SQLException(); - } - m_nNewRow = m_aQueryHelper.createNewCard(); - if (!m_nNewRow) - m_pStatement->getOwnConnection()->throwSQLException( STR_CAN_NOT_CREATE_ROW, *this ); - - m_RowStates = RowStates_Normal; - fillKeySet(m_nNewRow); - } - else - m_nUpdatedRow = 0; - - m_nRowPos = static_cast(m_pKeySet->get().size()); - fetchCurrentRow(); - OSL_TRACE("moveToInsertRow out, m_nRowPos = %u", m_nRowPos ); -#endif } // ------------------------------------------------------------------------- void SAL_CALL OResultSet::moveToCurrentRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) diff --git a/connectivity/source/drivers/mork/MResultSetMetaData.cxx b/connectivity/source/drivers/mork/MResultSetMetaData.cxx index 581e9305a2c9..57f6dea980ac 100644 --- a/connectivity/source/drivers/mork/MResultSetMetaData.cxx +++ b/connectivity/source/drivers/mork/MResultSetMetaData.cxx @@ -168,15 +168,6 @@ sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQL return sal_False; } -#if 0 - if ( m_pTable->getConnection()->isLDAP() ) - { - const OColumnAlias& aAliases( m_pTable->getConnection()->getColumnAlias() ); - if ( !aAliases.isColumnSearchable( sColumnName ) ) - return sal_False; - } -#endif - return sal_True; } // ------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/mork/mork_helper.cxx b/connectivity/source/drivers/mork/mork_helper.cxx index 74a344f720eb..e0c75c7d3fb0 100644 --- a/connectivity/source/drivers/mork/mork_helper.cxx +++ b/connectivity/source/drivers/mork/mork_helper.cxx @@ -28,36 +28,6 @@ bool openAddressBook(const std::string& path) std::string value = mork.getValue( tableIter->first ); SAL_INFO("connectivity.mork", "table.column : " << column); SAL_INFO("connectivity.mork", "table.value : " << value); -#if 0 - MorkRowMap *Rows = 0; - // Get rows - Rows = mork.getRows( defaultScope, &tableIter->second ); - if ( Rows ) { - // Iterate all rows - for ( rowIter = Rows->begin(); rowIter != Rows->end(); rowIter++ ) - { - if ( 0 == rowIter->first ) continue; - RawAbeMap ram; - std::string column; - std::string value; - char buffer[20]; - sprintf( buffer, "%d", rowIter->first ); - abe.id = std::string( buffer ); - // Get cells - for ( MorkCells::iterator cellsIter = rowIter->second.begin(); - cellsIter != rowIter->second.end(); cellsIter++ ) - { - column = mork.getColumn( cellsIter->first ); - value = mork.getValue( cellsIter->second ); - ram[ column ] = value; - } - AbeMap::iterator abeIter; - abes_[ rowIter->first ] = abe; - abeIter = abes_.find( rowIter->first ); - addEntry( ram, abeIter->second ); - } - } -#endif } } From 0c1553a86e837b7538dc0f80316ed0798747756b Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 4 Oct 2012 07:08:02 +0300 Subject: [PATCH 272/863] Disable-dynloading updates to component list Change-Id: Idf092958e46a2ad9d56541c90c5a2beb44baff48 --- cppuhelper/source/shlib.cxx | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx index f783f870c62d..b89fc5b1ead7 100644 --- a/cppuhelper/source/shlib.cxx +++ b/cppuhelper/source/shlib.cxx @@ -462,11 +462,13 @@ extern "C" extern void * reflection_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * sfx_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * svl_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * tk_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * stocservices_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * i18npool_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * ucb_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * ucpfile_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * utl_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * vcl_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * xstor_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); } #endif @@ -525,24 +527,27 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory( oslGenericFunction pSym = NULL; #ifdef DISABLE_DYNLOADING + // First test library names that aren't app-specific. static lib_to_component_mapping non_app_specific_map[] = { { "bootstrap.uno" SAL_DLLEXTENSION, bootstrap_component_getFactory }, { "bootstrap.uno.a", bootstrap_component_getFactory }, { "configmgr.uno.a", configmgr_component_getFactory }, - { "expwrap.uno.a", expwrap_component_getFactory }, - { "fastsax.uno.a", fastsax_component_getFactory }, - { "introspection.uno.a", introspection_component_getFactory }, { "i18npool.uno.a", i18npool_component_getFactory }, + { "introspection.uno.a", introspection_component_getFactory }, { "libcomphelp" CPPU_STRINGIFY(CPPU_ENV) ".a", comphelp_component_getFactory }, + { "libexpwrap.uno.a", expwrap_component_getFactory }, + { "libfastsax.uno.a", fastsax_component_getFactory }, { "libfilterconfiglo.a", filterconfig1_component_getFactory }, { "libfwklo.a", fwk_component_getFactory }, { "libpackage2.a", package2_component_getFactory }, { "libsfxlo.a", sfx_component_getFactory }, { "libsvllo.a", svl_component_getFactory }, + { "libtklo.a", tk_component_getFactory }, { "libucb1.a", ucb_component_getFactory }, { "libucpfile1.a", ucpfile_component_getFactory }, { "libutllo.a", utl_component_getFactory }, + { "libvcllo.a", vcl_component_getFactory }, { "libxstor.a", xstor_component_getFactory }, { "reflection.uno.a", reflection_component_getFactory }, { "stocservices.uno.a", stocservices_component_getFactory }, From bd24ac7cb585392d42c113e3547c3074ca3f745c Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 4 Oct 2012 07:08:51 +0300 Subject: [PATCH 273/863] Link directly to CreateWindow (in svtools) when DISABLE_DYNLOADING Change-Id: Iaf1f6c0fc76b97b1cfca63edfb91d5a39988c8c0 --- toolkit/source/awt/vclxtoolkit.cxx | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 827b360beadb..4ee90412da7a 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -499,12 +499,14 @@ VCLXToolkit::~VCLXToolkit() void SAL_CALL VCLXToolkit::disposing() { +#ifndef DISABLE_DYNLOADING if ( hSvToolsLib ) { osl_unloadModule( hSvToolsLib ); hSvToolsLib = NULL; fnSvtCreateWindow = NULL; } +#endif { osl::Guard< osl::Mutex > aGuard( getInitMutex() ); @@ -1036,8 +1038,16 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, return pNewWindow; } +#ifndef DISABLE_DYNLOADING + extern "C" { static void SAL_CALL thisModule() {} } +#else + +extern "C" Window* SAL_CALL CreateWindow( VCLXWindow** ppNewComp, const ::com::sun::star::awt::WindowDescriptor* pDescriptor, Window* pParent, WinBits nWinBits ); + +#endif + css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( const css::awt::WindowDescriptor& rDescriptor, WinBits nForceWinBits ) @@ -1070,8 +1080,13 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( // (do this _before_ creating it on our own: The old mechanism (extended toolkit in SvTools) did it this way, // and we need to stay compatible) // try to load the lib - if ( !fnSvtCreateWindow && !hSvToolsLib ) + if ( !fnSvtCreateWindow +#ifndef DISABLE_DYNLOADING + && !hSvToolsLib +#endif + ) { +#ifndef DISABLE_DYNLOADING ::rtl::OUString aLibName = ::vcl::unohelper::CreateLibraryName( #ifdef LIBO_MERGELIBS "merged", @@ -1086,6 +1101,9 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( ::rtl::OUString aFunctionName( "CreateWindow" ); fnSvtCreateWindow = (FN_SvtCreateWindow)osl_getFunctionSymbol( hSvToolsLib, aFunctionName.pData ); } +#else + fnSvtCreateWindow = CreateWindow; +#endif } // ask the SvTool creation function if ( fnSvtCreateWindow ) From 7895ebdab0b0ed7d2a9b361d6d5ab02b0e9361d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toma=C5=BE=20Vajngerl?= Date: Wed, 3 Oct 2012 21:37:14 +0200 Subject: [PATCH 274/863] Add "External Edit" menu function for bitmaps to Impress and Draw Change-Id: I77f2c03d9e4aadebe2468c13f0a703eb389155d7 --- sd/sdi/_drvwsh.sdi | 5 ++++ sd/source/ui/app/popup2_tmpl.src | 1 + sd/source/ui/view/drviews2.cxx | 47 ++++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+) diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi index 4b09d0c9d29a..cc811d591d0a 100644 --- a/sd/sdi/_drvwsh.sdi +++ b/sd/sdi/_drvwsh.sdi @@ -80,6 +80,11 @@ interface DrawView ExecMethod = FuTemporary ; StateMethod = GetMenuState ; ] + SID_EXTERNAL_EDIT + [ + ExecMethod = FuTemporary ; + StateMethod = GetMenuState ; + ] SID_CUT // ole : no, status : ? [ ExecMethod = FuSupport ; diff --git a/sd/source/ui/app/popup2_tmpl.src b/sd/source/ui/app/popup2_tmpl.src index 67628796964c..4520e602ff4d 100644 --- a/sd/source/ui/app/popup2_tmpl.src +++ b/sd/source/ui/app/popup2_tmpl.src @@ -660,6 +660,7 @@ SEPARATOR MenuItem { ITEM_SAVE_GRAPHIC }; MenuItem { ITEM_COMPRESS_GRAPHIC }; + MenuItem { ITEM_EXTERNAL_EDIT }; }; }; diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 75ff0f135d49..53e3a760036c 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -49,6 +49,7 @@ #include #include #include +#include #include #include #include @@ -93,6 +94,34 @@ using namespace ::com::sun::star::uno; namespace sd { +class SdExternalToolEdit : public ExternalToolEdit +{ + FmFormView* m_pView; + SdrObject* m_pObj; + +public: + SdExternalToolEdit ( FmFormView* pView, SdrObject* pObj ) : + m_pView (pView), + m_pObj (pObj) + {} + + virtual void Update( Graphic& aGraphic ) + { + SdrPageView* pPageView = m_pView->GetSdrPageView(); + if( pPageView ) + { + SdrGrafObj* pNewObj = (SdrGrafObj*) m_pObj->Clone(); + String aStr( m_pView->GetDescriptionOfMarkedObjects() ); + aStr.Append( sal_Unicode(' ') ); + aStr.Append( String( "External Edit" ) ); + m_pView->BegUndo( aStr ); + pNewObj->SetGraphicObject( aGraphic ); + m_pView->ReplaceObjectAtView( m_pObj, *pPageView, pNewObj ); + m_pView->EndUndo(); + } + } +}; + /************************************************************************* |* |* SfxRequests fuer temporaere Funktionen @@ -950,6 +979,24 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) } break; + case SID_EXTERNAL_EDIT: + { + const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); + if( rMarkList.GetMarkCount() == 1 ) + { + SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); + if( pObj && pObj->ISA( SdrGrafObj ) && ( (SdrGrafObj*) pObj )->GetGraphicType() == GRAPHIC_BITMAP ) + { + GraphicObject aGraphicObject( ( (SdrGrafObj*) pObj )->GetGraphicObject() ); + SdExternalToolEdit* aExternalToolEdit = new SdExternalToolEdit( mpDrawView, pObj ); + aExternalToolEdit->Edit( &aGraphicObject ); + } + } + Cancel(); + rReq.Ignore(); + } + break; + case SID_COMPRESS_GRAPHIC: { const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); From 1e6985da53b91fd0f2a3d44cd30dd3a73dcd6919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toma=C5=BE=20Vajngerl?= Date: Wed, 3 Oct 2012 22:27:41 +0200 Subject: [PATCH 275/863] Add "Compress Graphic" menu entry for bitmaps to Calc Change-Id: I591c544f600361b5bc9c59b5627f6cdd9f9b09db --- sc/sdi/graphsh.sdi | 6 ++++ sc/source/ui/drawfunc/graphsh.cxx | 56 +++++++++++++++++++++++++++++-- sc/source/ui/drawfunc/objdraw.src | 1 + sc/source/ui/inc/graphsh.hxx | 3 ++ 4 files changed, 64 insertions(+), 2 deletions(-) diff --git a/sc/sdi/graphsh.sdi b/sc/sdi/graphsh.sdi index 6eb051bc5eaf..6c9ae7a0d440 100644 --- a/sc/sdi/graphsh.sdi +++ b/sc/sdi/graphsh.sdi @@ -140,6 +140,12 @@ interface GraphSelection ExecMethod = ExecuteExternalEdit; StateMethod = GetExternalEditState; ] + + SID_COMPRESS_GRAPHIC + [ + ExecMethod = ExecuteCompressGraphic; + StateMethod = GetCompressGraphicState; + ] } // =========================================================================== diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx index f2258e8d9750..8ecbd7d233d4 100644 --- a/sc/source/ui/drawfunc/graphsh.cxx +++ b/sc/source/ui/drawfunc/graphsh.cxx @@ -33,6 +33,8 @@ #include #include #include +#include +#include #include "graphsh.hxx" #include "sc.hrc" @@ -48,11 +50,11 @@ class ScExternalToolEdit : public ExternalToolEdit { - ScDrawView* m_pView; + FmFormView* m_pView; SdrObject* m_pObj; public: - ScExternalToolEdit ( ScDrawView* pView, SdrObject* pObj ) : + ScExternalToolEdit ( FmFormView* pView, SdrObject* pObj ) : m_pView (pView), m_pObj (pObj) {} @@ -204,4 +206,54 @@ void ScGraphicShell::ExecuteExternalEdit( SfxRequest& ) Invalidate(); } + +void ScGraphicShell::GetCompressGraphicState( SfxItemSet& rSet ) +{ + ScDrawView* pView = GetViewData()->GetScDrawView(); + const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); + bool bEnable = false; + if( rMarkList.GetMarkCount() == 1 ) + { + SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); + + if( pObj && pObj->ISA( SdrGrafObj ) && ( ( (SdrGrafObj*) pObj )->GetGraphicType() == GRAPHIC_BITMAP ) ) + bEnable = true; + } + + if( !bEnable ) + rSet.DisableItem( SID_COMPRESS_GRAPHIC ); +} + +void ScGraphicShell::ExecuteCompressGraphic( SfxRequest& ) +{ + ScDrawView* pView = GetViewData()->GetScDrawView(); + const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); + + if( rMarkList.GetMarkCount() == 1 ) + { + SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); + + if( pObj && pObj->ISA( SdrGrafObj ) && ( (SdrGrafObj*) pObj )->GetGraphicType() == GRAPHIC_BITMAP ) + { + GraphicObject aGraphicObject( ( (SdrGrafObj*) pObj )->GetGraphicObject() ); + CompressGraphicsDialog dialog( GetViewData()->GetDialogParent(), aGraphicObject.GetGraphic(), pObj->GetLogicRect().GetSize(), GetViewData()->GetBindings() ); + if ( dialog.Execute() == RET_OK ) + { + SdrGrafObj* pNewObject = (SdrGrafObj*) pObj->Clone(); + const Graphic aNewGraphic = dialog.GetCompressedGraphic(); + SdrPageView* pPageView = pView->GetSdrPageView(); + pNewObject->SetEmptyPresObj( sal_False ); + pNewObject->SetGraphic( aNewGraphic ); + String aUndoString( pView->GetDescriptionOfMarkedObjects() ); + aUndoString += (sal_Unicode) ' '; + aUndoString += String( "Compress" ); + pView->BegUndo( aUndoString ); + pView->ReplaceObjectAtView( pObj, *pPageView, pNewObject ); + pView->EndUndo(); + } + } + } + + Invalidate(); +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/objdraw.src b/sc/source/ui/drawfunc/objdraw.src index 02fc43505b1b..a2ed29eaabca 100644 --- a/sc/source/ui/drawfunc/objdraw.src +++ b/sc/source/ui/drawfunc/objdraw.src @@ -527,6 +527,7 @@ Menu RID_POPUP_GRAPHIC MN_EDITLNK MN_DELLNK MenuItem { ITEM_OPEN_HYPERLINK }; + MenuItem { ITEM_COMPRESS_GRAPHIC }; MenuItem { ITEM_EXTERNAL_EDIT }; }; }; diff --git a/sc/source/ui/inc/graphsh.hxx b/sc/source/ui/inc/graphsh.hxx index 3c700c73ad12..31d2d35bcffe 100644 --- a/sc/source/ui/inc/graphsh.hxx +++ b/sc/source/ui/inc/graphsh.hxx @@ -47,6 +47,9 @@ public: void ExecuteExternalEdit(SfxRequest& rReq); void GetExternalEditState(SfxItemSet &rSet); + + void ExecuteCompressGraphic(SfxRequest& rReq); + void GetCompressGraphicState(SfxItemSet &rSet); }; #endif From 6f221adc31e8323284720e7ccfe4818430a9bd66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toma=C5=BE=20Vajngerl?= Date: Thu, 4 Oct 2012 07:40:24 +0200 Subject: [PATCH 276/863] Improve quality of page previews in Impress/Draw with supersampling Change-Id: I9c5b28fc32b73b2147162f74919b21d99401b501 --- .../ui/slidesorter/cache/SlsBitmapFactory.cxx | 14 ++++++-------- .../ui/slidesorter/cache/SlsGenericPageCache.cxx | 4 ++-- sd/source/ui/slidesorter/view/SlideSorterView.cxx | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx index 2d901efae1ce..6b31439680f4 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx @@ -41,10 +41,6 @@ #include #include -const static sal_Int32 gnSuperSampleFactor (2); -const static bool gbAllowSuperSampling (false); - - namespace sd { namespace slidesorter { namespace view { class SlideSorterView; class PageObjectViewObjectContact; @@ -73,10 +69,12 @@ Bitmap BitmapFactory::CreateBitmap ( const bool bDoSuperSampling) { Size aSize (rPixelSize); - if (bDoSuperSampling && gbAllowSuperSampling) + if (bDoSuperSampling) { - aSize.Width() *= gnSuperSampleFactor; - aSize.Height() *= gnSuperSampleFactor; + // Supersampling factor + int aSuperSamplingFactor = 2; + aSize.Width() *= aSuperSamplingFactor; + aSize.Height() *= aSuperSamplingFactor; } Bitmap aPreview (maRenderer.RenderPage ( @@ -85,7 +83,7 @@ Bitmap BitmapFactory::CreateBitmap ( String(), true, false).GetBitmapEx().GetBitmap()); - if (bDoSuperSampling && gbAllowSuperSampling) + if (bDoSuperSampling) { aPreview.Scale(rPixelSize, BMP_SCALE_BEST); } diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx index db3f12d377ab..27c263d1a35b 100644 --- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx @@ -147,7 +147,7 @@ Bitmap GenericPageCache::GetPreviewBitmap ( // i.e. the bitmap is not empty. if (bResize && aBitmapSize.Width()>0 && aBitmapSize.Height()>0) { - aPreview.Scale(maPreviewSize, BMP_SCALE_FAST); + aPreview.Scale(maPreviewSize); } bMayBeUpToDate = false; } @@ -184,7 +184,7 @@ Bitmap GenericPageCache::GetMarkedPreviewBitmap ( // i.e. the bitmap is not empty. if (aBitmapSize.Width()>0 && aBitmapSize.Height()>0) { - aMarkedPreview.Scale(maPreviewSize, BMP_SCALE_FAST); + aMarkedPreview.Scale(maPreviewSize); } } diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index 23516a95b3a2..66c3cdf0d315 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -819,7 +819,7 @@ void SlideSorterView::ConfigurationChanged ( mpPreviewCache.reset( new cache::PageCache( mpLayouter->GetPageObjectSize(), - false, + true, cache::SharedCacheContext(new ViewCacheContext(mrSlideSorter)))); } From 232969d1c09e390c1287be8b94164ac22295e277 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 4 Oct 2012 08:24:46 +0200 Subject: [PATCH 277/863] Fix languagetool patchlevel settings Change-Id: I528b7a9187f0db869c820f7f0320194b036438ff --- languagetool/JLanguageTool-1.4.0-no-hc.patch | 4 ++-- languagetool/UnpackedTarball_languagetool.mk | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/languagetool/JLanguageTool-1.4.0-no-hc.patch b/languagetool/JLanguageTool-1.4.0-no-hc.patch index ea320877a543..4337ec6eb697 100644 --- a/languagetool/JLanguageTool-1.4.0-no-hc.patch +++ b/languagetool/JLanguageTool-1.4.0-no-hc.patch @@ -1,4 +1,4 @@ ---- misc/JLanguageTool-1.7.0/build.xml 2012-02-29 22:18:05.118789546 +0100 +--- misc/build/JLanguageTool-1.7.0/build.xml 2012-02-29 22:18:05.118789546 +0100 +++ misc/build/JLanguageTool-1.7.0/build.xml 2012-02-29 22:17:02.385235706 +0100 @@ -82,7 +82,6 @@ @@ -8,7 +8,7 @@ ---- misc/JLanguageTool-1.7.0/openoffice/Linguistic.xcu 2011-06-26 20:29:43.000000000 +0200 +--- misc/build/JLanguageTool-1.7.0/openoffice/Linguistic.xcu 2011-06-26 20:29:43.000000000 +0200 +++ misc/build/JLanguageTool-1.7.0/openoffice/Linguistic.xcu 2012-02-29 22:17:25.551071099 +0100 @@ -27,9 +27,6 @@ diff --git a/languagetool/UnpackedTarball_languagetool.mk b/languagetool/UnpackedTarball_languagetool.mk index 6df1d1713561..4b0f6328ef72 100644 --- a/languagetool/UnpackedTarball_languagetool.mk +++ b/languagetool/UnpackedTarball_languagetool.mk @@ -11,6 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,languagetool)) $(eval $(call gb_UnpackedTarball_set_tarball,languagetool,$(LANGUAGETOOL_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_patchlevel,languagetool,3)) + $(eval $(call gb_UnpackedTarball_add_patches,languagetool,\ languagetool/JLanguageTool-1.7.0.patch \ languagetool/JLanguageTool-1.4.0-no-hc.patch \ From 3c68b623660d43ef22141f46dec465f0c56859e8 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Thu, 4 Oct 2012 08:33:12 +0200 Subject: [PATCH 278/863] add gb_ExternalProject_use_package(s) There needs to be a way to depend on the output of other external packages. Change-Id: Ic0f200b6d6b6c0968a28434ba96f1a2f1efa527e --- solenv/gbuild/ExternalProject.mk | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk index d35d238316d8..0680d75e9fa2 100644 --- a/solenv/gbuild/ExternalProject.mk +++ b/solenv/gbuild/ExternalProject.mk @@ -109,4 +109,23 @@ $(call gb_ExternalProject_get_preparation_target,$(1)) : $(call gb_ExternalProje endef +# Make an external project depend on a package +# +# This is most useful for depending on output files created by another +# ExternalProject. +# +# gb_ExternalProject_use_package external package +define gb_ExternalProject_use_package +$(call gb_ExternalProject_get_preparation_target,$(1)) : $(call gb_Package_get_target,$(2)) + +endef + +# Make an external project depend on several packages at once +# +# gb_ExternalProject_use_packages external package(s) +define gb_ExternalProject_use_packages +$(foreach package,$(2),$(call gb_ExternalProject_use_package,$(1),$(package))) + +endef + # vim: set noet sw=4 ts=4: From b041f920d3156b686b5b66125200da104530d892 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Thu, 4 Oct 2012 08:35:00 +0200 Subject: [PATCH 279/863] commons-logging uses tomcat, so it should depend on it Change-Id: Ic0ad26494081c58c01a4f8ecd004d0c289a704e8 --- apache-commons/ExternalProject_apache_commons_logging.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/apache-commons/ExternalProject_apache_commons_logging.mk b/apache-commons/ExternalProject_apache_commons_logging.mk index fce2635a3e82..bc5b18b13372 100644 --- a/apache-commons/ExternalProject_apache_commons_logging.mk +++ b/apache-commons/ExternalProject_apache_commons_logging.mk @@ -14,6 +14,13 @@ $(eval $(call gb_ExternalProject_ExternalProject,apache_commons_logging)) $(eval $(call gb_ExternalProject_use_unpacked,apache_commons_logging,apache_commons_logging)) +# TODO: this should go into RepositoryExternal.mk +ifeq ($(SYSTEM_TOMCAT),YES) +$(eval $(call gb_ExternalProject_use_packages,apache_commons_logging,\ + tomcat_inc \ +)) +endif + $(eval $(call gb_ExternalProject_register_targets,apache_commons_logging,\ build \ )) From 72abe64ee0fb803d6187da176495ed765e795ccd Mon Sep 17 00:00:00 2001 From: David Tardon Date: Thu, 4 Oct 2012 09:24:38 +0200 Subject: [PATCH 280/863] fix typo Change-Id: I8c0411b440245f37be099afe3fab32d6e40b7f44 --- apache-commons/ExternalProject_apache_commons_logging.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons/ExternalProject_apache_commons_logging.mk b/apache-commons/ExternalProject_apache_commons_logging.mk index bc5b18b13372..81e6ad6fa659 100644 --- a/apache-commons/ExternalProject_apache_commons_logging.mk +++ b/apache-commons/ExternalProject_apache_commons_logging.mk @@ -15,7 +15,7 @@ $(eval $(call gb_ExternalProject_ExternalProject,apache_commons_logging)) $(eval $(call gb_ExternalProject_use_unpacked,apache_commons_logging,apache_commons_logging)) # TODO: this should go into RepositoryExternal.mk -ifeq ($(SYSTEM_TOMCAT),YES) +ifneq ($(SYSTEM_TOMCAT),YES) $(eval $(call gb_ExternalProject_use_packages,apache_commons_logging,\ tomcat_inc \ )) From 9d9f2a382d12eb3ad5335495dc8bb5f644f9fc32 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 4 Oct 2012 11:36:33 +0300 Subject: [PATCH 281/863] The "working on that" is now done Change-Id: Ib5a9decaf97817333bbac9853589af7fc9adf94c --- expat/README | 9 --------- 1 file changed, 9 deletions(-) diff --git a/expat/README b/expat/README index 52496b9480a0..d7ce6824d686 100644 --- a/expat/README +++ b/expat/README @@ -36,14 +36,5 @@ libexpat in builds where that is used, why is a separate Unicode one needed when an internal expat is used? Good question. Next question. Patches welcome. -Another interesting issue is the disable-dynloading case: When we link -all needed LO code into one executable (as for iOS apps) or into one -shared library (as in a tentative approach for Android apps) there is -a problem with linking two libraries (ascii_expat_xmlparse and -expat_xmlparse) that contain exactly the same symbols... Obviously -just the one that happens to be mentioned first on the linking command -line gets linked in, and code that then thinks it is calling the other -one will mysteriously crash or silently fail. Working on that... - From: [http://expat.sourceforge.net/] From e2b23364d4ac9f096f93aebd076b23f68e28b7a8 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 4 Oct 2012 11:53:57 +0300 Subject: [PATCH 282/863] Mention the plugin mechanism Change-Id: I51e22cceb332048552e86acb2362b907617a84cc --- jvmfwk/README | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jvmfwk/README b/jvmfwk/README index 54af22469516..dad5f435622e 100644 --- a/jvmfwk/README +++ b/jvmfwk/README @@ -1 +1,4 @@ Wrappers so you can use all the Java Runtime Environments with their slightly incompatible APIs with more ease. + +Uses an over-engineered "plugin" mechanism although there is only one +"plugin", called "sunmajor", that handles all possible JREs. From eff6d4e01b87df58cc218cf0663d0f711fe06fde Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 4 Oct 2012 11:33:19 +0200 Subject: [PATCH 283/863] Version name/dependency cleanup towards 3.7 Change-Id: Ib5da7703bf48713093bc6a3380facafd0013e039 --- cppuhelper/source/gcc3.map | 2 +- sal/util/sal.map | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cppuhelper/source/gcc3.map b/cppuhelper/source/gcc3.map index 7840b2370f5f..abce1dbee7a5 100644 --- a/cppuhelper/source/gcc3.map +++ b/cppuhelper/source/gcc3.map @@ -408,7 +408,7 @@ global: _ZThn*_N4cppu19OPropertySetHelper232enableChangeListenerNotificationEh; } UDK_3.7; -UDK_3.9 { # LibO 3.7 +LIBO_UDK_3.9 { # LibO 3.7 global: _ZN4cppu15supportsServiceEPN3com3sun4star4lang12XServiceInfoERKN3rtl8OUStringE; # cppu::supportsService(com::sun::star::lang::XServiceInfo*, rtl::OUString const&) } UDK_3.8; diff --git a/sal/util/sal.map b/sal/util/sal.map index 9efed6aaea9a..978a66ef5adf 100644 --- a/sal/util/sal.map +++ b/sal/util/sal.map @@ -631,7 +631,7 @@ LIBO_UDK_3.7 { # symbols available in >= LibO 3.7 global: rtl_string_newFromSubString; rtl_uString_newFromSubString; -} UDK_3.10; +} LIBO_UDK_3.6; PRIVATE_1.0 { global: From af4df7ac089134df888ada3cd36b27a0b62babab Mon Sep 17 00:00:00 2001 From: Jack Leigh Date: Wed, 3 Oct 2012 16:35:47 +0100 Subject: [PATCH 284/863] fdo#48257 collect function prototypes from basic/ into single header file Change-Id: I1666e64b2b611054e1a713a76575e2f06781f80a --- basic/source/inc/date.hxx | 37 +++++++++++++++++++++++++++++++ basic/source/runtime/methods.cxx | 8 +------ basic/source/runtime/methods1.cxx | 13 +---------- basic/source/sbx/sbxscan.cxx | 8 +------ 4 files changed, 40 insertions(+), 26 deletions(-) create mode 100644 basic/source/inc/date.hxx diff --git a/basic/source/inc/date.hxx b/basic/source/inc/date.hxx new file mode 100644 index 000000000000..cd38c896d1df --- /dev/null +++ b/basic/source/inc/date.hxx @@ -0,0 +1,37 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef _SBDATE_HXX +#define _SBDATE_HXX + +bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, double& rdRet ); + +sal_Int16 implGetWeekDay( double aDate, bool bFirstDayParam = false, sal_Int16 nFirstDay = 0 ); + +sal_Int16 implGetDateYear( double aDate ); +sal_Int16 implGetDateMonth( double aDate ); +sal_Int16 implGetDateDay( double aDate ); + +sal_Int16 implGetHour( double dDate ); +sal_Int16 implGetMinute( double dDate ); +sal_Int16 implGetSecond( double dDate ); + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index a90cc0e72817..054de265eb46 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -63,6 +63,7 @@ using namespace com::sun::star; #include +#include "date.hxx" #include "stdobj.hxx" #include #include "rtlproto.hxx" @@ -103,9 +104,6 @@ SbxVariable* getDefaultProp( SbxVariable* pRef ); #ifndef DISABLE_SCRIPTING -// forward decl. -bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, double& rdRet ); - // from source/classes/sbxmod.cxx uno::Reference< frame::XModel > getDocumentModel( StarBASIC* ); @@ -1701,8 +1699,6 @@ sal_Int16 implGetDateMonth( double aDate ) return nRet; } -sal_Int16 implGetDateYear( double aDate ); - // Function to convert date to ISO 8601 date format RTLFUNC(CDateToIso) { @@ -1956,8 +1952,6 @@ RTLFUNC(Hour) } } -sal_Int16 implGetMinute( double dDate ); - RTLFUNC(Minute) { (void)pBasic; diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index 3e1d94900f76..4692ca49d47d 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -32,6 +32,7 @@ #include #include +#include "date.hxx" #include "sbintern.hxx" #include "runtime.hxx" #include "stdobj.hxx" @@ -57,7 +58,6 @@ using namespace com::sun::star::i18n; void unoToSbxValue( SbxVariable* pVar, const Any& aValue ); Any sbxToUnoValue( SbxVariable* pVar, const Type& rType, com::sun::star::beans::Property* pUnoProperty = NULL ); -sal_Int16 implGetWeekDay( double aDate, bool bFirstDayParam = false, sal_Int16 nFirstDay = 0 ); static Reference< XCalendar3 > getLocaleCalendar( void ) { @@ -1906,17 +1906,6 @@ IntervalInfo* getIntervalInfo( const String& rStringCode ) return pInfo; } -// From methods.cxx -bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, double& rdRet ); -sal_Int16 implGetDateDay( double aDate ); -sal_Int16 implGetDateMonth( double aDate ); -sal_Int16 implGetDateYear( double aDate ); - -sal_Int16 implGetHour( double dDate ); -sal_Int16 implGetMinute( double dDate ); -sal_Int16 implGetSecond( double dDate ); - - inline void implGetDayMonthYear( sal_Int16& rnYear, sal_Int16& rnMonth, sal_Int16& rnDay, double dDate ) { rnDay = implGetDateDay( dDate ); diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx index bc235236d785..7ea06b5e4fb5 100644 --- a/basic/source/sbx/sbxscan.cxx +++ b/basic/source/sbx/sbxscan.cxx @@ -39,6 +39,7 @@ #include #include "basrid.hxx" +#include "date.hxx" #include "runtime.hxx" #include @@ -689,13 +690,6 @@ VbaFormatInfo* getFormatInfo( const String& rFmt ) #define VBAFORMAT_LOWERCASE "<" #define VBAFORMAT_UPPERCASE ">" -// From methods1.cxx -sal_Int16 implGetWeekDay( double aDate, bool bFirstDayParam = false, sal_Int16 nFirstDay = 0 ); -// from methods.cxx -sal_Int16 implGetMinute( double dDate ); -sal_Int16 implGetDateYear( double aDate ); -bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, double& rdRet ); - void SbxValue::Format( XubString& rRes, const XubString* pFmt ) const { short nComma = 0; From a964cf666abb0c4df4e29ea8709532b7d45c104f Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Thu, 4 Oct 2012 08:23:12 +0200 Subject: [PATCH 285/863] sw: proper fallback for first page in InsertNewPage() For left/right share, the fallback is easy: the left page always falls back to the right page, if there is a fallback. In case of first page, the situation is more complicated, as there are multiple fallbacks (left/right). Since commit 9ff68a2, first page fallback was decided during registering part of the SwPageDesc to SwPageFrm, which is bad, as without a document export/import, a changed IsFirstShared() didn't have any effect: the LeftFmt/RightFmt was in use, so FirstFmt had no SwClients -> nobody was notified when that setting changed. This commit changes first pages to always use FirstFmt, and (if a fallback is needed) sets FirstFmt to point to LeftFmt/RightFmt as necessary. Change-Id: I4654baf293d72070fcf7e9eea408a43a31079e60 --- sw/source/core/layout/frmtool.cxx | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 1f190aa0f87b..815ffcdd6d8c 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -2742,10 +2742,28 @@ SwPageFrm * InsertNewPage( SwPageDesc &rDesc, SwFrm *pUpper, SwPageFrm *pRet; SwDoc *pDoc = ((SwLayoutFrm*)pUpper)->GetFmt()->GetDoc(); SwFrmFmt *pFmt = 0; - // rDesc can't know if the first page will be 'left' or 'right', so if - // first is shared, let's ignore first here. - if (bFirst && !rDesc.IsFirstShared()) + if (bFirst) + { + if (rDesc.IsFirstShared()) + { + // We need to fallback to left or right page format, decide it now. + if (bOdd) + { + rDesc.GetFirst().SetFmtAttr( rDesc.GetMaster().GetHeader() ); + rDesc.GetFirst().SetFmtAttr( rDesc.GetMaster().GetFooter() ); + } + else + { + rDesc.GetFirst().SetFmtAttr( rDesc.GetLeft().GetHeader() ); + rDesc.GetFirst().SetFmtAttr( rDesc.GetLeft().GetFooter() ); + } + } pFmt = rDesc.GetFirstFmt(); + if (!pFmt) + { + pFmt = bOdd ? rDesc.GetRightFmt() : rDesc.GetLeftFmt(); + } + } else pFmt = bOdd ? rDesc.GetRightFmt() : rDesc.GetLeftFmt(); //Wenn ich kein FrmFmt fuer die Seite gefunden habe, muss ich eben From f954e900f4714dc4a43d5b7ae7a84a9bfb809178 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Wed, 3 Oct 2012 11:04:55 +0100 Subject: [PATCH 286/863] improve col/row spanning Change-Id: I7a8d7dd9f504183bb7d40c301f28c7a6a2153872 --- vcl/source/window/layout.cxx | 97 +++++++++++++++++++++++++++++++++--- 1 file changed, 90 insertions(+), 7 deletions(-) diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index c6761c04e063..debfcfbc9e28 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -475,6 +475,7 @@ void VclGrid::calcMaxs(const array_type &A, std::vector &rWidths, std::ve rWidths.resize(nMaxX); rHeights.resize(nMaxY); + //first use the non spanning entries to set default width/heights for (sal_Int32 x = 0; x < nMaxX; ++x) { for (sal_Int32 y = 0; y < nMaxY; ++y) @@ -483,20 +484,102 @@ void VclGrid::calcMaxs(const array_type &A, std::vector &rWidths, std::ve const Window *pChild = rEntry.pChild; if (!pChild) continue; - Size aChildSize = getLayoutRequisition(*pChild); sal_Int32 nWidth = rEntry.nSpanWidth; + sal_Int32 nHeight = rEntry.nSpanHeight; + for (sal_Int32 nSpanX = 0; nSpanX < nWidth; ++nSpanX) - { - rWidths[x+nSpanX].m_nValue = std::max(rWidths[x+nSpanX].m_nValue, aChildSize.Width()/nWidth); rWidths[x+nSpanX].m_bExpand = rWidths[x+nSpanX].m_bExpand | pChild->get_hexpand(); + + for (sal_Int32 nSpanY = 0; nSpanY < nHeight; ++nSpanY) + rHeights[y+nSpanY].m_bExpand = rHeights[y+nSpanY].m_bExpand | pChild->get_vexpand(); + + if (nWidth == 1 || nHeight == 1) + { + Size aChildSize = getLayoutRequisition(*pChild); + if (nWidth == 1) + rWidths[x].m_nValue = std::max(rWidths[x].m_nValue, aChildSize.Width()); + if (nHeight == 1) + rHeights[y].m_nValue = std::max(rHeights[y].m_nValue, aChildSize.Height()); + } + } + } + + //now use the spanning entries and split any extra sizes across expanding rows/cols + //where possible + for (sal_Int32 x = 0; x < nMaxX; ++x) + { + for (sal_Int32 y = 0; y < nMaxY; ++y) + { + const GridEntry &rEntry = A[x][y]; + const Window *pChild = rEntry.pChild; + if (!pChild) + continue; + + sal_Int32 nWidth = rEntry.nSpanWidth; + sal_Int32 nHeight = rEntry.nSpanHeight; + + if (nWidth == 1 && nHeight == 1) + continue; + + Size aChildSize = getLayoutRequisition(*pChild); + + if (nWidth > 1) + { + sal_Int32 nExistingWidth = 0; + for (sal_Int32 nSpanX = 0; nSpanX < nWidth; ++nSpanX) + nExistingWidth += rWidths[x+nSpanX].m_nValue; + + sal_Int32 nExtraWidth = aChildSize.Width() - nExistingWidth; + + if (nExtraWidth > 0) + { + bool bForceExpandAll = false; + sal_Int32 nExpandables = 0; + for (sal_Int32 nSpanX = 0; nSpanX < nWidth; ++nSpanX) + if (rWidths[x+nSpanX].m_bExpand) + ++nExpandables; + if (nExpandables == 0) + { + nExpandables = nWidth; + bForceExpandAll = true; + } + + for (sal_Int32 nSpanX = 0; nSpanX < nWidth; ++nSpanX) + { + if (rWidths[x+nSpanX].m_bExpand || bForceExpandAll) + rWidths[x+nSpanX].m_nValue += nExtraWidth/nExpandables; + } + } } - sal_Int32 nHeight = rEntry.nSpanHeight; - for (sal_Int32 nSpanY = 0; nSpanY < nHeight; ++nSpanY) + if (nHeight > 1) { - rHeights[y+nSpanY].m_nValue = std::max(rHeights[y+nSpanY].m_nValue, aChildSize.Height()/nHeight); - rHeights[y+nSpanY].m_bExpand = rHeights[y+nSpanY].m_bExpand | pChild->get_vexpand(); + sal_Int32 nExistingHeight = 0; + for (sal_Int32 nSpanY = 0; nSpanY < nHeight; ++nSpanY) + nExistingHeight += rHeights[y+nSpanY].m_nValue; + + sal_Int32 nExtraHeight = aChildSize.Height() - nExistingHeight; + + if (nExtraHeight > 0) + { + bool bForceExpandAll = false; + sal_Int32 nExpandables = 0; + for (sal_Int32 nSpanY = 0; nSpanY < nHeight; ++nSpanY) + if (rWidths[y+nSpanY].m_bExpand) + ++nExpandables; + if (nExpandables == 0) + { + nExpandables = nHeight; + bForceExpandAll = true; + } + + for (sal_Int32 nSpanY = 0; nSpanY < nHeight; ++nSpanY) + { + if (rHeights[y+nSpanY].m_bExpand || bForceExpandAll) + rHeights[y+nSpanY].m_nValue += nExtraHeight/nExpandables; + } + } } } } From a06579a77a50de08b6e5b92a35939efc87492ed5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Wed, 3 Oct 2012 11:41:30 +0100 Subject: [PATCH 287/863] unroll thesaurus dialog and its pImpl Change-Id: Ib4f5214ae8a699a0bc6abddf67636c712d7f6846 --- cui/source/dialogs/thesdlg.cxx | 161 +++++++++++++--------------- cui/source/dialogs/thesdlg_impl.hxx | 152 -------------------------- cui/source/inc/thesdlg.hxx | 147 +++++++++++++++++++++++-- 3 files changed, 214 insertions(+), 246 deletions(-) diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index c8cb1b1239ff..c794b2a9512d 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -66,7 +66,7 @@ using ::rtl::OUString; // class LookUpComboBox_Impl -------------------------------------------------- LookUpComboBox_Impl::LookUpComboBox_Impl( - Window *pParent, const ResId &rResId, SvxThesaurusDialog_Impl &rImpl ) : + Window *pParent, const ResId &rResId, SvxThesaurusDialog &rImpl ) : ComboBox (pParent, rResId), m_rDialogImpl( rImpl ) { @@ -156,7 +156,7 @@ void AlternativesString_Impl::Paint( ThesaurusAlternativesCtrl_Impl::ThesaurusAlternativesCtrl_Impl( Window* pParent, - SvxThesaurusDialog_Impl &rImpl ) : + SvxThesaurusDialog &rImpl ) : SvxCheckListBox( pParent, CUI_RES( CT_THES_ALTERNATIVES ) ), m_rDialogImpl( rImpl ) { @@ -236,64 +236,22 @@ void ThesaurusAlternativesCtrl_Impl::KeyInput( const KeyEvent& rKEvt ) void ThesaurusAlternativesCtrl_Impl::Paint( const Rectangle& rRect ) { - if (!m_rDialogImpl.m_bWordFound) + if (!m_rDialogImpl.WordFound()) { - Size aTextSize( GetTextWidth( m_rDialogImpl.aErrStr ), GetTextHeight() ); + Size aTextSize( GetTextWidth( m_rDialogImpl.getErrStr() ), GetTextHeight() ); aTextSize = LogicToPixel( aTextSize ); Point aPos; aPos.X() += GetSizePixel().Width() / 2 - aTextSize.Width() / 2; aPos.Y() += GetSizePixel().Height() / 2; aPos = PixelToLogic( aPos ); - DrawText( aPos, m_rDialogImpl.aErrStr ); + DrawText( aPos, m_rDialogImpl.getErrStr() ); } else SvxCheckListBox::Paint( rRect ); } -// struct SvxThesaurusDialog_Impl ---------------------------------------- - -SvxThesaurusDialog_Impl::SvxThesaurusDialog_Impl( SvxThesaurusDialog * pDialog ) : - m_pDialog ( pDialog ), - aVendorImageFI ( pDialog, CUI_RES( IMG_VENDOR ) ), - aLeftBtn ( pDialog, CUI_RES( BTN_LEFT ) ), - aWordText ( pDialog, CUI_RES( FT_WORD ) ), - aWordCB ( pDialog, CUI_RES( CB_WORD ), *this ), - m_aAlternativesText ( pDialog, CUI_RES( FT_THES_ALTERNATIVES ) ), - m_pAlternativesCT ( new ThesaurusAlternativesCtrl_Impl( pDialog, *this ) ), - aReplaceText ( pDialog, CUI_RES( FT_REPL ) ), - aReplaceEdit ( pDialog, CUI_RES( ED_REPL ) ), - aFL ( pDialog, CUI_RES( FL_VAR ) ), - aHelpBtn ( pDialog, CUI_RES( BTN_THES_HELP ) ), - aLangMBtn ( pDialog, CUI_RES( MB_LANGUAGE ) ), - aReplaceBtn ( pDialog, CUI_RES( BTN_THES_OK ) ), - aCancelBtn ( pDialog, CUI_RES( BTN_THES_CANCEL ) ), - aErrStr ( CUI_RES( STR_ERR_TEXTNOTFOUND ) ), - aVendorDefaultImage ( CUI_RES( IMG_DEFAULT_VENDOR ) ), - xThesaurus ( NULL ), - aLookUpText (), - nLookUpLanguage ( LANGUAGE_NONE ), - m_bWordFound( false ) -{ - // note: FreeResource must only be called in the c-tor of SvxThesaurusDialog - - aReplaceEdit.SetButton( &aReplaceBtn ); - - aLeftBtn.SetClickHdl( LINK( this, SvxThesaurusDialog_Impl, LeftBtnHdl_Impl ) ); - aWordCB.SetSelectHdl( LINK( this, SvxThesaurusDialog_Impl, WordSelectHdl_Impl ) ); - aLangMBtn.SetSelectHdl( LINK( this, SvxThesaurusDialog_Impl, LanguageHdl_Impl ) ); - m_pAlternativesCT->SetSelectHdl( LINK( this, SvxThesaurusDialog_Impl, AlternativesSelectHdl_Impl )); - m_pAlternativesCT->SetDoubleClickHdl( LINK( this, SvxThesaurusDialog_Impl, AlternativesDoubleClickHdl_Impl )); - - Application::PostUserEvent( STATIC_LINK( this, SvxThesaurusDialog_Impl, VendorImageInitHdl ) ); -} - -SvxThesaurusDialog_Impl::~SvxThesaurusDialog_Impl() -{ - delete aLangMBtn.GetPopupMenu(); -} - -uno::Sequence< uno::Reference< linguistic2::XMeaning > > SAL_CALL SvxThesaurusDialog_Impl::queryMeanings_Impl( +uno::Sequence< uno::Reference< linguistic2::XMeaning > > SvxThesaurusDialog::queryMeanings_Impl( OUString& rTerm, const lang::Locale& rLocale, const beans::PropertyValues& rProperties ) @@ -319,7 +277,7 @@ uno::Sequence< uno::Reference< linguistic2::XMeaning > > SAL_CALL SvxThesaurusDi return aMeanings; } -bool SvxThesaurusDialog_Impl::UpdateAlternativesBox_Impl() +bool SvxThesaurusDialog::UpdateAlternativesBox_Impl() { lang::Locale aLocale( SvxCreateLocale( nLookUpLanguage ) ); uno::Sequence< uno::Reference< linguistic2::XMeaning > > aMeanings = queryMeanings_Impl( @@ -352,14 +310,14 @@ bool SvxThesaurusDialog_Impl::UpdateAlternativesBox_Impl() return nMeanings > 0; } -void SvxThesaurusDialog_Impl::LookUp( const String &rText ) +void SvxThesaurusDialog::LookUp( const String &rText ) { if (rText != aWordCB.GetText()) // avoid moving of the cursor if the text is the same aWordCB.SetText( rText ); LookUp_Impl(); } -IMPL_LINK( SvxThesaurusDialog_Impl, LeftBtnHdl_Impl, Button *, pBtn ) +IMPL_LINK( SvxThesaurusDialog, LeftBtnHdl_Impl, Button *, pBtn ) { if (pBtn && aLookUpHistory.size() >= 2) { @@ -371,7 +329,7 @@ IMPL_LINK( SvxThesaurusDialog_Impl, LeftBtnHdl_Impl, Button *, pBtn ) return 0; } -IMPL_LINK( SvxThesaurusDialog_Impl, LanguageHdl_Impl, MenuButton *, pBtn ) +IMPL_LINK( SvxThesaurusDialog, LanguageHdl_Impl, MenuButton *, pBtn ) { PopupMenu *pMenu = aLangMBtn.GetPopupMenu(); if (pMenu && pBtn) @@ -382,14 +340,14 @@ IMPL_LINK( SvxThesaurusDialog_Impl, LanguageHdl_Impl, MenuButton *, pBtn ) DBG_ASSERT( nLang != LANGUAGE_NONE && nLang != LANGUAGE_DONTKNOW, "failed to get language" ); if (xThesaurus->hasLocale( SvxCreateLocale( nLang ) )) nLookUpLanguage = nLang; - m_pDialog->SetWindowTitle( nLang ); + SetWindowTitle( nLang ); UpdateVendorImage(); LookUp_Impl(); } return 0; } -void SvxThesaurusDialog_Impl::LookUp_Impl() +void SvxThesaurusDialog::LookUp_Impl() { String aText( aWordCB.GetText() ); @@ -408,7 +366,7 @@ void SvxThesaurusDialog_Impl::LookUp_Impl() aLeftBtn.Enable( aLookUpHistory.size() > 1 ); } -IMPL_LINK( SvxThesaurusDialog_Impl, WordSelectHdl_Impl, ComboBox *, pBox ) +IMPL_LINK( SvxThesaurusDialog, WordSelectHdl_Impl, ComboBox *, pBox ) { if (pBox && !aWordCB.IsTravelSelect()) // act only upon return key and not when traveling with cursor keys { @@ -422,7 +380,7 @@ IMPL_LINK( SvxThesaurusDialog_Impl, WordSelectHdl_Impl, ComboBox *, pBox ) return 0; } -IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesSelectHdl_Impl, SvxCheckListBox *, pBox ) +IMPL_LINK( SvxThesaurusDialog, AlternativesSelectHdl_Impl, SvxCheckListBox *, pBox ) { SvLBoxEntry *pEntry = pBox ? pBox->GetCurEntry() : NULL; if (pEntry) @@ -439,7 +397,7 @@ IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesSelectHdl_Impl, SvxCheckListBox return 0; } -IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesDoubleClickHdl_Impl, SvxCheckListBox *, pBox ) +IMPL_LINK( SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl, SvxCheckListBox *, pBox ) { SvLBoxEntry *pEntry = pBox ? pBox->GetCurEntry() : NULL; if (pEntry) @@ -459,11 +417,11 @@ IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesDoubleClickHdl_Impl, SvxCheckLis //! workaround to set the selection since calling SelectEntryPos within //! the double click handler does not work - Application::PostUserEvent( STATIC_LINK( this, SvxThesaurusDialog_Impl, SelectFirstHdl_Impl ), pBox ); + Application::PostUserEvent( STATIC_LINK( this, SvxThesaurusDialog, SelectFirstHdl_Impl ), pBox ); return 0; } -IMPL_STATIC_LINK( SvxThesaurusDialog_Impl, SelectFirstHdl_Impl, SvxCheckListBox *, pBox ) +IMPL_STATIC_LINK( SvxThesaurusDialog, SelectFirstHdl_Impl, SvxCheckListBox *, pBox ) { (void) pThis; if (pBox && pBox->GetEntryCount() >= 2) @@ -521,9 +479,9 @@ static String lcl_GetThesImplName( const lang::Locale &rLocale ) return aRes; } -void SvxThesaurusDialog_Impl::UpdateVendorImage() +void SvxThesaurusDialog::UpdateVendorImage() { - m_pDialog->SetUpdateMode( sal_False ); + SetUpdateMode( sal_False ); SvtLinguConfig aCfg; if (aCfg.HasVendorImages( "ThesaurusDialogImage" )) @@ -538,12 +496,12 @@ void SvxThesaurusDialog_Impl::UpdateVendorImage() aVendorImageFI.SetImage( aImage ); } - m_pDialog->SetUpdateMode( sal_True ); + SetUpdateMode( sal_True ); } -IMPL_STATIC_LINK( SvxThesaurusDialog_Impl, VendorImageInitHdl, SvxThesaurusDialog_Impl *, EMPTYARG ) +IMPL_STATIC_LINK( SvxThesaurusDialog, VendorImageInitHdl, SvxThesaurusDialog*, EMPTYARG ) { - pThis->m_pDialog->SetUpdateMode( sal_False ); + pThis->SetUpdateMode( sal_False ); SvtLinguConfig aCfg; if (aCfg.HasVendorImages( "ThesaurusDialogImage" )) @@ -587,14 +545,14 @@ IMPL_STATIC_LINK( SvxThesaurusDialog_Impl, VendorImageInitHdl, SvxThesaurusDialo aControls[nControl]->SetPosPixel(aPos); ++nControl; } - Size aDlgSize = pThis->m_pDialog->GetSizePixel(); + Size aDlgSize = pThis->GetSizePixel(); aDlgSize.Height() += nDiff; - pThis->m_pDialog->SetSizePixel( aDlgSize ); - pThis->m_pDialog->Invalidate(); + pThis->SetSizePixel( aDlgSize ); + pThis->Invalidate(); } pThis->UpdateVendorImage(); - pThis->m_pDialog->SetUpdateMode( sal_True ); + pThis->SetUpdateMode( sal_True ); return 0; }; @@ -607,15 +565,43 @@ SvxThesaurusDialog::SvxThesaurusDialog( const String &rWord, LanguageType nLanguage ) : - SvxStandardDialog( pParent, CUI_RES( RID_SVXDLG_THESAURUS ) ) -{ - m_pImpl = std::auto_ptr< SvxThesaurusDialog_Impl >(new SvxThesaurusDialog_Impl( this )); + SvxStandardDialog( pParent, CUI_RES( RID_SVXDLG_THESAURUS ) ), - m_pImpl->xThesaurus = xThes; - m_pImpl->aLookUpText = OUString( rWord ); - m_pImpl->nLookUpLanguage = nLanguage; + aVendorImageFI ( this, CUI_RES( IMG_VENDOR ) ), + aLeftBtn ( this, CUI_RES( BTN_LEFT ) ), + aWordText ( this, CUI_RES( FT_WORD ) ), + aWordCB ( this, CUI_RES( CB_WORD ), *this ), + m_aAlternativesText ( this, CUI_RES( FT_THES_ALTERNATIVES ) ), + m_pAlternativesCT ( new ThesaurusAlternativesCtrl_Impl( this, *this ) ), + aReplaceText ( this, CUI_RES( FT_REPL ) ), + aReplaceEdit ( this, CUI_RES( ED_REPL ) ), + aFL ( this, CUI_RES( FL_VAR ) ), + aHelpBtn ( this, CUI_RES( BTN_THES_HELP ) ), + aLangMBtn ( this, CUI_RES( MB_LANGUAGE ) ), + aReplaceBtn ( this, CUI_RES( BTN_THES_OK ) ), + aCancelBtn ( this, CUI_RES( BTN_THES_CANCEL ) ), + aErrStr ( CUI_RES( STR_ERR_TEXTNOTFOUND ) ), + aVendorDefaultImage ( CUI_RES( IMG_DEFAULT_VENDOR ) ), + xThesaurus ( NULL ), + aLookUpText (), + nLookUpLanguage ( LANGUAGE_NONE ), + m_bWordFound( false ) +{ + aReplaceEdit.SetButton( &aReplaceBtn ); + + aLeftBtn.SetClickHdl( LINK( this, SvxThesaurusDialog, LeftBtnHdl_Impl ) ); + aWordCB.SetSelectHdl( LINK( this, SvxThesaurusDialog, WordSelectHdl_Impl ) ); + aLangMBtn.SetSelectHdl( LINK( this, SvxThesaurusDialog, LanguageHdl_Impl ) ); + m_pAlternativesCT->SetSelectHdl( LINK( this, SvxThesaurusDialog, AlternativesSelectHdl_Impl )); + m_pAlternativesCT->SetDoubleClickHdl( LINK( this, SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl )); + + Application::PostUserEvent( STATIC_LINK( this, SvxThesaurusDialog, VendorImageInitHdl ) ); + + xThesaurus = xThes; + aLookUpText = OUString( rWord ); + nLookUpLanguage = nLanguage; if (rWord.Len() > 0) - m_pImpl->aLookUpHistory.push( rWord ); + aLookUpHistory.push( rWord ); FreeResource(); @@ -623,21 +609,21 @@ SvxThesaurusDialog::SvxThesaurusDialog( linguistic::RemoveHyphens( aTmp ); linguistic::ReplaceControlChars( aTmp ); String aTmp2( aTmp ); - m_pImpl->aReplaceEdit.SetText( aTmp2 ); - m_pImpl->aWordCB.InsertEntry( aTmp2 ); + aReplaceEdit.SetText( aTmp2 ); + aWordCB.InsertEntry( aTmp2 ); - m_pImpl->LookUp( aTmp2 ); - m_pImpl->m_pAlternativesCT->GrabFocus(); - m_pImpl->aLeftBtn.Enable( sal_False ); + LookUp( aTmp2 ); + m_pAlternativesCT->GrabFocus(); + aLeftBtn.Enable( sal_False ); // fill language menu button list SvtLanguageTable aLangTab; uno::Sequence< lang::Locale > aLocales; - if (m_pImpl->xThesaurus.is()) - aLocales = m_pImpl->xThesaurus->getLocales(); + if (xThesaurus.is()) + aLocales = xThesaurus->getLocales(); const sal_Int32 nLocales = aLocales.getLength(); const lang::Locale *pLocales = aLocales.getConstArray(); - delete m_pImpl->aLangMBtn.GetPopupMenu(); + delete aLangMBtn.GetPopupMenu(); PopupMenu* pMenu = new PopupMenu; pMenu->SetMenuFlags( MENU_FLAG_NOAUTOMNEMONICS ); std::vector< OUString > aLangVec; @@ -650,17 +636,18 @@ SvxThesaurusDialog::SvxThesaurusDialog( std::sort( aLangVec.begin(), aLangVec.end() ); for (size_t i = 0; i < aLangVec.size(); ++i) pMenu->InsertItem( (sal_uInt16)i+1, aLangVec[i] ); // menu items should be enumerated from 1 and not 0 - m_pImpl->aLangMBtn.SetPopupMenu( pMenu ); + aLangMBtn.SetPopupMenu( pMenu ); SetWindowTitle( nLanguage ); // disable controls if service is missing - if (!m_pImpl->xThesaurus.is()) + if (!xThesaurus.is()) Enable( sal_False ); } SvxThesaurusDialog::~SvxThesaurusDialog() { + delete aLangMBtn.GetPopupMenu(); } void SvxThesaurusDialog::SetWindowTitle( LanguageType nLanguage ) @@ -676,12 +663,12 @@ void SvxThesaurusDialog::SetWindowTitle( LanguageType nLanguage ) String SvxThesaurusDialog::GetWord() { - return m_pImpl->aReplaceEdit.GetText(); + return aReplaceEdit.GetText(); } sal_uInt16 SvxThesaurusDialog::GetLanguage() const { - return m_pImpl->nLookUpLanguage; + return nLookUpLanguage; } void SvxThesaurusDialog::Apply() diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx index 36ad201d59f8..f1c5209be7e9 100644 --- a/cui/source/dialogs/thesdlg_impl.hxx +++ b/cui/source/dialogs/thesdlg_impl.hxx @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include @@ -58,74 +57,6 @@ using ::rtl::OUString; class SvLBoxEntry; class ThesaurusAlternativesCtrl_Impl; - -// class LookUpComboBox_Impl -------------------------------------------------- - -class LookUpComboBox_Impl : public ComboBox -{ - Timer m_aModifyTimer; - Selection m_aSelection; - Button * m_pBtn; - SvxThesaurusDialog_Impl & m_rDialogImpl; - - /// disable copy ctor and assignment operator - LookUpComboBox_Impl( const LookUpComboBox_Impl & ); - LookUpComboBox_Impl & operator = ( const LookUpComboBox_Impl & ); - -public: - LookUpComboBox_Impl( Window *pParent, const ResId &rResId, SvxThesaurusDialog_Impl &rImpl ); - virtual ~LookUpComboBox_Impl(); - - DECL_LINK( ModifyTimer_Hdl, Timer * ); - - void SetButton( Button *pBtn ) { m_pBtn = pBtn; } - - // ComboBox - virtual void Modify(); -}; - -// class ReplaceEdit_Impl -------------------------------------------------- - -class ReplaceEdit_Impl : public Edit -{ - Button * m_pBtn; - - /// disable copy ctor and assignment operator - ReplaceEdit_Impl( const ReplaceEdit_Impl & ); - ReplaceEdit_Impl & operator = ( const ReplaceEdit_Impl & ); - -public: - ReplaceEdit_Impl( Window *pParent, const ResId &rResId ); - virtual ~ReplaceEdit_Impl(); - - void SetButton( Button *pBtn ) { m_pBtn = pBtn; } - - // Edit - virtual void Modify(); - virtual void SetText( const XubString& rStr ); - virtual void SetText( const XubString& rStr, const Selection& rNewSelection ); -}; - -// class ThesaurusAlternativesCtrl_Impl ---------------------------------- - -class AlternativesExtraData -{ - String sText; - bool bHeader; - -public: - AlternativesExtraData() : bHeader( false ) {} - AlternativesExtraData( const String &rText, bool bIsHeader ) : - sText(rText), - bHeader(bIsHeader) - { - } - - bool IsHeader() const { return bHeader; } - const String& GetText() const { return sText; } -}; - - class AlternativesString_Impl : public SvLBoxString { ThesaurusAlternativesCtrl_Impl & m_rControlImpl; @@ -137,89 +68,6 @@ public: virtual void Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry); }; - -class ThesaurusAlternativesCtrl_Impl : - public SvxCheckListBox -{ - SvxThesaurusDialog_Impl & m_rDialogImpl; - - typedef std::map< const SvLBoxEntry *, AlternativesExtraData > UserDataMap_t; - UserDataMap_t m_aUserData; - - /// disable copy ctor and assignment operator - ThesaurusAlternativesCtrl_Impl( const ThesaurusAlternativesCtrl_Impl & ); - ThesaurusAlternativesCtrl_Impl & operator = ( const ThesaurusAlternativesCtrl_Impl & ); - -public: - ThesaurusAlternativesCtrl_Impl( Window* pParent, SvxThesaurusDialog_Impl &rImpl ); - virtual ~ThesaurusAlternativesCtrl_Impl(); - - - SvLBoxEntry * AddEntry( sal_Int32 nVal, const String &rText, bool bIsHeader ); - - void ClearExtraData(); - void SetExtraData( const SvLBoxEntry *pEntry, const AlternativesExtraData &rData ); - AlternativesExtraData * GetExtraData( const SvLBoxEntry *pEntry ); - - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void Paint( const Rectangle& rRect ); -}; - - -// struct SvxThesaurusDialog_Impl ---------------------------------------- - -struct SvxThesaurusDialog_Impl -{ - SvxThesaurusDialog * m_pDialog; - - FixedImage aVendorImageFI; - ImageButton aLeftBtn; - FixedText aWordText; - LookUpComboBox_Impl aWordCB; - FixedText m_aAlternativesText; - boost::shared_ptr< ThesaurusAlternativesCtrl_Impl > m_pAlternativesCT; - FixedText aReplaceText; - ReplaceEdit_Impl aReplaceEdit; - FixedLine aFL; - HelpButton aHelpBtn; - MenuButton aLangMBtn; - OKButton aReplaceBtn; - CancelButton aCancelBtn; - - String aErrStr; - Image aVendorDefaultImage; - - uno::Reference< linguistic2::XThesaurus > xThesaurus; - OUString aLookUpText; - LanguageType nLookUpLanguage; - std::stack< OUString > aLookUpHistory; - bool m_bWordFound; - - - // Handler - DECL_LINK( LeftBtnHdl_Impl, Button * ); - DECL_LINK( LanguageHdl_Impl, MenuButton * ); - DECL_LINK( LookUpHdl_Impl, Button * ); - DECL_LINK( WordSelectHdl_Impl, ComboBox * ); - DECL_LINK( AlternativesSelectHdl_Impl, SvxCheckListBox * ); - DECL_LINK( AlternativesDoubleClickHdl_Impl, SvxCheckListBox * ); - - DECL_STATIC_LINK( SvxThesaurusDialog_Impl, SelectFirstHdl_Impl, SvxCheckListBox * ); - DECL_STATIC_LINK( SvxThesaurusDialog_Impl, VendorImageInitHdl, SvxThesaurusDialog_Impl * ); - - - SvxThesaurusDialog_Impl( SvxThesaurusDialog * pDialog ); - ~SvxThesaurusDialog_Impl(); - - uno::Sequence< uno::Reference< linguistic2::XMeaning > > SAL_CALL - queryMeanings_Impl( ::rtl::OUString& rTerm, const lang::Locale& rLocale, const beans::PropertyValues& rProperties ) throw(lang::IllegalArgumentException, uno::RuntimeException); - - bool UpdateAlternativesBox_Impl(); - void UpdateVendorImage(); - void LookUp( const String &rText ); - void LookUp_Impl(); -}; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index cdcd237865a2..8809c5a38417 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx @@ -22,25 +22,158 @@ #include -#include "svx/stddlg.hxx" -#include "svx/svxdllapi.h" +#include +#include +#include +#include +#include +#include #include +using namespace ::com::sun::star; -///////////////////////////////////////////////////////////////// +class SvxThesaurusDialog; -struct SvxThesaurusDialog_Impl; +class LookUpComboBox_Impl : public ComboBox +{ + Timer m_aModifyTimer; + Selection m_aSelection; + Button * m_pBtn; + SvxThesaurusDialog& m_rDialogImpl; + + /// disable copy ctor and assignment operator + LookUpComboBox_Impl( const LookUpComboBox_Impl & ); + LookUpComboBox_Impl & operator = ( const LookUpComboBox_Impl & ); + +public: + LookUpComboBox_Impl( Window *pParent, const ResId &rResId, SvxThesaurusDialog &rImpl ); + virtual ~LookUpComboBox_Impl(); + + DECL_LINK( ModifyTimer_Hdl, Timer * ); + + void SetButton( Button *pBtn ) { m_pBtn = pBtn; } + + // ComboBox + virtual void Modify(); +}; + +class AlternativesExtraData +{ + String sText; + bool bHeader; + +public: + AlternativesExtraData() : bHeader( false ) {} + AlternativesExtraData( const String &rText, bool bIsHeader ) : + sText(rText), + bHeader(bIsHeader) + { + } + + bool IsHeader() const { return bHeader; } + const String& GetText() const { return sText; } +}; + +class ThesaurusAlternativesCtrl_Impl : + public SvxCheckListBox +{ + SvxThesaurusDialog& m_rDialogImpl; + + typedef std::map< const SvLBoxEntry *, AlternativesExtraData > UserDataMap_t; + UserDataMap_t m_aUserData; + + /// disable copy ctor and assignment operator + ThesaurusAlternativesCtrl_Impl( const ThesaurusAlternativesCtrl_Impl & ); + ThesaurusAlternativesCtrl_Impl & operator = ( const ThesaurusAlternativesCtrl_Impl & ); + +public: + ThesaurusAlternativesCtrl_Impl( Window* pParent, SvxThesaurusDialog &rImpl ); + virtual ~ThesaurusAlternativesCtrl_Impl(); + + + SvLBoxEntry * AddEntry( sal_Int32 nVal, const String &rText, bool bIsHeader ); + + void ClearExtraData(); + void SetExtraData( const SvLBoxEntry *pEntry, const AlternativesExtraData &rData ); + AlternativesExtraData * GetExtraData( const SvLBoxEntry *pEntry ); + + virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void Paint( const Rectangle& rRect ); +}; + +class ReplaceEdit_Impl : public Edit +{ + Button * m_pBtn; + + /// disable copy ctor and assignment operator + ReplaceEdit_Impl( const ReplaceEdit_Impl & ); + ReplaceEdit_Impl & operator = ( const ReplaceEdit_Impl & ); + +public: + ReplaceEdit_Impl( Window *pParent, const ResId &rResId ); + virtual ~ReplaceEdit_Impl(); + + void SetButton( Button *pBtn ) { m_pBtn = pBtn; } + + // Edit + virtual void Modify(); + virtual void SetText( const XubString& rStr ); + virtual void SetText( const XubString& rStr, const Selection& rNewSelection ); +}; class SvxThesaurusDialog : public SvxStandardDialog { - std::auto_ptr< SvxThesaurusDialog_Impl > m_pImpl; + FixedImage aVendorImageFI; + ImageButton aLeftBtn; + FixedText aWordText; + LookUpComboBox_Impl aWordCB; + FixedText m_aAlternativesText; + boost::shared_ptr< ThesaurusAlternativesCtrl_Impl > m_pAlternativesCT; + FixedText aReplaceText; + ReplaceEdit_Impl aReplaceEdit; + FixedLine aFL; + HelpButton aHelpBtn; + MenuButton aLangMBtn; + OKButton aReplaceBtn; + CancelButton aCancelBtn; - SVX_DLLPRIVATE virtual void Apply(); + String aErrStr; + Image aVendorDefaultImage; + + uno::Reference< linguistic2::XThesaurus > xThesaurus; + OUString aLookUpText; + LanguageType nLookUpLanguage; + std::stack< OUString > aLookUpHistory; + bool m_bWordFound; + +public: + bool WordFound() const { return m_bWordFound; } + OUString getErrStr() const { return aErrStr; } + + // Handler + DECL_LINK( LeftBtnHdl_Impl, Button * ); + DECL_LINK( LanguageHdl_Impl, MenuButton * ); + DECL_LINK( LookUpHdl_Impl, Button * ); + DECL_LINK( WordSelectHdl_Impl, ComboBox * ); + DECL_LINK( AlternativesSelectHdl_Impl, SvxCheckListBox * ); + DECL_LINK( AlternativesDoubleClickHdl_Impl, SvxCheckListBox * ); + + DECL_STATIC_LINK( SvxThesaurusDialog, SelectFirstHdl_Impl, SvxCheckListBox * ); + DECL_STATIC_LINK( SvxThesaurusDialog, VendorImageInitHdl, SvxThesaurusDialog * ); + + uno::Sequence< uno::Reference< linguistic2::XMeaning > > + queryMeanings_Impl( ::rtl::OUString& rTerm, const lang::Locale& rLocale, const beans::PropertyValues& rProperties ) throw(lang::IllegalArgumentException, uno::RuntimeException); + + bool UpdateAlternativesBox_Impl(); + void UpdateVendorImage(); + void LookUp( const String &rText ); + void LookUp_Impl(); + virtual void Apply(); public: SvxThesaurusDialog( Window* pParent, - ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus > xThesaurus, + uno::Reference< linguistic2::XThesaurus > xThesaurus, const String &rWord, LanguageType nLanguage ); ~SvxThesaurusDialog(); From 7263bfec9a6511fc8f5c79135a7c853156560755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Wed, 3 Oct 2012 12:24:03 +0100 Subject: [PATCH 288/863] be more tolerant of temporary frameless parents Change-Id: I61a52d0f5a5e29d271c84fd7b85d80b7fac2e2ec --- vcl/source/window/window.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index d874d811527b..44f1a584fc31 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -1039,10 +1039,12 @@ void Window::ImplInsertWindow( Window* pParent ) mpWindowImpl->mpParent = pParent; mpWindowImpl->mpRealParent = pParent; - if ( pParent && !mpWindowImpl->mbFrame ) + Window* pFrameParent = NULL; + if (pParent && !mpWindowImpl->mbFrame) + pFrameParent = pParent->mpWindowImpl->mpFrameWindow; + if (pFrameParent) { // search frame window and set window frame data - Window* pFrameParent = pParent->mpWindowImpl->mpFrameWindow; mpWindowImpl->mpFrameData = pFrameParent->mpWindowImpl->mpFrameData; mpWindowImpl->mpFrame = pFrameParent->mpWindowImpl->mpFrame; mpWindowImpl->mpFrameWindow = pFrameParent; From ddd0e56cd787c2f86e9a154cbb0b4ad09ee40f80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Wed, 3 Oct 2012 13:03:49 +0100 Subject: [PATCH 289/863] handle children of deferred dialog better Change-Id: I86f0a23408c031a99a31cd309defec519a2e91ec --- vcl/inc/vcl/builder.hxx | 1 + vcl/inc/vcl/dialog.hxx | 2 ++ vcl/source/control/fixed.cxx | 4 ++-- vcl/source/window/builder.cxx | 8 ++++++++ vcl/source/window/dialog.cxx | 18 ++++++++++++------ vcl/source/window/window.cxx | 6 ++---- 6 files changed, 27 insertions(+), 12 deletions(-) diff --git a/vcl/inc/vcl/builder.hxx b/vcl/inc/vcl/builder.hxx index 112e2939b9e9..191079151e21 100644 --- a/vcl/inc/vcl/builder.hxx +++ b/vcl/inc/vcl/builder.hxx @@ -116,6 +116,7 @@ private: OString m_sID; OString m_sHelpRoot; Window *m_pParent; + bool m_bToplevelHasDeferredInit; ParserState *m_pParserState; Window *get_by_name(OString sID); diff --git a/vcl/inc/vcl/dialog.hxx b/vcl/inc/vcl/dialog.hxx index 63163225fb6d..107c29d1a464 100644 --- a/vcl/inc/vcl/dialog.hxx +++ b/vcl/inc/vcl/dialog.hxx @@ -58,6 +58,7 @@ private: sal_Bool mbOldSaveBack; sal_Bool mbInClose; sal_Bool mbModalMode; + bool mbIsDefferedInit; Timer maLayoutTimer; SAL_DLLPRIVATE void ImplInitDialogData(); @@ -81,6 +82,7 @@ public: SAL_DLLPRIVATE sal_Bool IsInClose() const { return mbInClose; } SAL_DLLPRIVATE bool hasPendingLayout() const { return maLayoutTimer.IsActive(); } SAL_DLLPRIVATE void doDeferredInit(bool bResizable); + SAL_DLLPRIVATE bool isDeferredInit() const { return mbIsDefferedInit; } protected: Dialog( WindowType nType ); diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index a63eb3ed8ba1..688b69961f00 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -949,7 +949,7 @@ WinBits FixedImage::ImplInitStyle( WinBits nStyle ) void FixedImage::ImplInitSettings() { Window* pParent = GetParent(); - if ( pParent->IsChildTransparentModeEnabled() && !IsControlBackground() ) + if ( pParent && pParent->IsChildTransparentModeEnabled() && !IsControlBackground() ) { EnableChildTransparentMode( sal_True ); SetParentClipMode( PARENTCLIPMODE_NOCLIP ); @@ -964,7 +964,7 @@ void FixedImage::ImplInitSettings() if ( IsControlBackground() ) SetBackground( GetControlBackground() ); - else + else if ( pParent ) SetBackground( pParent->GetBackground() ); } } diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 67bf87159a8c..63fce3934281 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -57,6 +57,8 @@ VclBuilder::VclBuilder(Window *pParent, OUString sUIDir, OUString sUIFile, OStri , m_pParent(pParent) , m_pParserState(new ParserState) { + m_bToplevelHasDeferredInit = (pParent && pParent->IsDialog()) ? ((Dialog*)pParent)->isDeferredInit() : false; + sal_Int32 nIdx = m_sHelpRoot.lastIndexOf('.'); if (nIdx != -1) m_sHelpRoot = m_sHelpRoot.copy(0, nIdx); @@ -685,6 +687,7 @@ Window *VclBuilder::insertObject(Window *pParent, const OString &rClass, const O { Dialog *pDialog = (Dialog*)pCurrentChild; pDialog->doDeferredInit(extractResizable(rMap)); + m_bToplevelHasDeferredInit = false; } if (pCurrentChild->GetHelpId().isEmpty()) { @@ -696,6 +699,11 @@ Window *VclBuilder::insertObject(Window *pParent, const OString &rClass, const O } else { + //if we're being inserting under a toplevel dialog whose init is + //deferred due to waiting to encounter it in this .ui, and it hasn't + //been seen yet, then make unattached widgets parent-less toplevels + if (pParent == m_pParent && m_bToplevelHasDeferredInit) + pParent = NULL; pCurrentChild = makeObject(pParent, rClass, rID, rMap); } diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index da9482c7c69f..65a72fbd9172 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -466,8 +466,9 @@ void Dialog::ImplInitSettings() // ----------------------------------------------------------------------- -Dialog::Dialog( WindowType nType ) : - SystemWindow( nType ) +Dialog::Dialog( WindowType nType ) + : SystemWindow( nType ) + , mbIsDefferedInit(false) { ImplInitDialogData(); } @@ -514,11 +515,13 @@ void Dialog::doDeferredInit(bool bResizable) Window *pParent = mpDialogParent; mpDialogParent = NULL; ImplInit(pParent, nBits); + mbIsDefferedInit = false; } Dialog::Dialog(Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription) : SystemWindow( WINDOW_DIALOG ) , mpDialogParent(pParent) //will be unset in doDeferredInit + , mbIsDefferedInit(true) { ImplInitDialogData(); m_pUIBuilder = new VclBuilder(this, getUIRootDir(), rUIXMLDescription, rID); @@ -527,6 +530,7 @@ Dialog::Dialog(Window* pParent, const rtl::OString& rID, const rtl::OUString& rU Dialog::Dialog(Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription, WindowType nType) : SystemWindow( nType ) , mpDialogParent(pParent) //will be unset in doDeferredInit + , mbIsDefferedInit(true) { ImplInitDialogData(); m_pUIBuilder = new VclBuilder(this, getUIRootDir(), rUIXMLDescription, rID); @@ -535,8 +539,9 @@ Dialog::Dialog(Window* pParent, const rtl::OString& rID, const rtl::OUString& rU // ----------------------------------------------------------------------- -Dialog::Dialog( Window* pParent, WinBits nStyle ) : - SystemWindow( WINDOW_DIALOG ) +Dialog::Dialog( Window* pParent, WinBits nStyle ) + : SystemWindow( WINDOW_DIALOG ) + , mbIsDefferedInit(false) { ImplInitDialogData(); ImplInit( pParent, nStyle ); @@ -544,8 +549,9 @@ Dialog::Dialog( Window* pParent, WinBits nStyle ) : // ----------------------------------------------------------------------- -Dialog::Dialog( Window* pParent, const ResId& rResId ) : - SystemWindow( WINDOW_DIALOG ) +Dialog::Dialog( Window* pParent, const ResId& rResId ) + : SystemWindow( WINDOW_DIALOG ) + , mbIsDefferedInit(false) { ImplInitDialogData(); rResId.SetRT( RSC_DIALOG ); diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 44f1a584fc31..d874d811527b 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -1039,12 +1039,10 @@ void Window::ImplInsertWindow( Window* pParent ) mpWindowImpl->mpParent = pParent; mpWindowImpl->mpRealParent = pParent; - Window* pFrameParent = NULL; - if (pParent && !mpWindowImpl->mbFrame) - pFrameParent = pParent->mpWindowImpl->mpFrameWindow; - if (pFrameParent) + if ( pParent && !mpWindowImpl->mbFrame ) { // search frame window and set window frame data + Window* pFrameParent = pParent->mpWindowImpl->mpFrameWindow; mpWindowImpl->mpFrameData = pFrameParent->mpWindowImpl->mpFrameData; mpWindowImpl->mpFrame = pFrameParent->mpWindowImpl->mpFrame; mpWindowImpl->mpFrameWindow = pFrameParent; From 96e353491215fd2b703f2cd48959176f3e401043 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Wed, 3 Oct 2012 20:56:17 +0100 Subject: [PATCH 290/863] Show lang-tag instead of Unknown for languages without unknown name Change-Id: I8e7bb96ecdc6d6edf38401394209b62b01af6784 --- svtools/source/misc/langtab.cxx | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx index 92c91a6c7229..f66ea6ce2e05 100644 --- a/svtools/source/misc/langtab.cxx +++ b/svtools/source/misc/langtab.cxx @@ -34,6 +34,7 @@ #include #include +#include #include #include @@ -149,19 +150,14 @@ const rtl::OUString SvtLanguageTable::GetString( const LanguageType eType, bool if ( RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count() ) return ResStringArray::GetString( nPos ); - else - { - // If we knew what a simple "en" should alias to (en_US?) we could - // generally raise an error. - OSL_ENSURE( - eLang == LANGUAGE_ENGLISH, "language entry not found in resource" ); - nPos = FindIndex( LANGUAGE_DONTKNOW ); - - if ( RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count() ) - return ResStringArray::GetString( nPos ); - } - return rtl::OUString(); + //Rather than return a fairly useless "Unknown" name, return a geeky but usable-in-a-pinch lang-tag + OUString sLangTag(LanguageTag(eType).getBcp47()); + SAL_WARN("svtools", "Language: 0x" + << std::hex << eType + << " with unknown name, so returning lang-tag of: " + << sLangTag); + return sLangTag; } String SvtLanguageTable::GetLanguageString( const LanguageType eType ) From d3b7a3acb481ef530094296eb4461dd343270879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 4 Oct 2012 10:11:55 +0100 Subject: [PATCH 291/863] support system dicts named using bcp47 scheme but fallback to LANG_REGION on failure Change-Id: Ic31ba142209cdea1565adef2b592fd59111d9162 --- lingucomponent/source/lingutil/lingutil.cxx | 97 ++++++++++++--------- 1 file changed, 54 insertions(+), 43 deletions(-) diff --git a/lingucomponent/source/lingutil/lingutil.cxx b/lingucomponent/source/lingutil/lingutil.cxx index 362ede900410..6259097c888a 100644 --- a/lingucomponent/source/lingutil/lingutil.cxx +++ b/lingucomponent/source/lingutil/lingutil.cxx @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -150,55 +151,65 @@ std::vector< SvtLinguConfigDictionaryEntry > GetOldStyleDics( const char *pDicTy // set of languages to remember the language where it is already // decided to make use of the dictionary. - std::set< LanguageType > aDicLangInUse; + std::set< OUString > aDicLangInUse; #ifdef SYSTEM_DICTS - osl::Directory aSystemDicts(aSystemDir); - if (aSystemDicts.open() == osl::FileBase::E_None) - { - osl::DirectoryItem aItem; - osl::FileStatus aFileStatus(osl_FileStatus_Mask_FileURL); - while (aSystemDicts.getNextItem(aItem) == osl::FileBase::E_None) - { - aItem.getFileStatus(aFileStatus); - rtl::OUString sPath = aFileStatus.getFileURL(); - if (sPath.lastIndexOf(aSystemSuffix) == sPath.getLength()-aSystemSuffix.getLength()) - { - sal_Int32 nStartIndex = sPath.lastIndexOf(sal_Unicode('/')) + 1; - if (!sPath.match(aSystemPrefix, nStartIndex)) - continue; - rtl::OUString sChunk = sPath.copy(0, sPath.getLength() - aSystemSuffix.getLength()); - sal_Int32 nIndex = nStartIndex + aSystemPrefix.getLength(); - rtl::OUString sLang = sChunk.getToken( 0, '_', nIndex ); - if (!sLang.getLength()) - continue; - rtl::OUString sRegion; - if (nIndex != -1) - sRegion = sChunk.copy( nIndex, sChunk.getLength() - nIndex ); + osl::Directory aSystemDicts(aSystemDir); + if (aSystemDicts.open() == osl::FileBase::E_None) + { + osl::DirectoryItem aItem; + osl::FileStatus aFileStatus(osl_FileStatus_Mask_FileURL); + while (aSystemDicts.getNextItem(aItem) == osl::FileBase::E_None) + { + aItem.getFileStatus(aFileStatus); + OUString sPath = aFileStatus.getFileURL(); + if (sPath.lastIndexOf(aSystemSuffix) == sPath.getLength()-aSystemSuffix.getLength()) + { + sal_Int32 nStartIndex = sPath.lastIndexOf(sal_Unicode('/')) + 1; + if (!sPath.match(aSystemPrefix, nStartIndex)) + continue; + OUString sChunk = sPath.copy(nStartIndex + aSystemPrefix.getLength(), + sPath.getLength() - aSystemSuffix.getLength() - + nStartIndex - aSystemPrefix.getLength()); + if (sChunk.isEmpty()) + continue; + //We prefer (now) to use language tags + LanguageTag aLangTag(sChunk, true); + //On failure try older basic LANG_REGION scheme + if (!aLangTag.isValidBcp47()) + { + sal_Int32 nIndex = 0; + OUString sLang = sChunk.getToken(0, '_', nIndex); + if (!sLang.getLength()) + continue; + OUString sRegion; + if (nIndex != -1) + sRegion = sChunk.copy(nIndex); + aLangTag = LanguageTag(sLang, sRegion); + } + if (!aLangTag.isValidBcp47()) + continue; - // Thus we first get the language of the dictionary - LanguageType nLang = MsLangId::convertIsoNamesToLanguage( - sLang, sRegion ); + // Thus we first get the language of the dictionary + OUString aLocaleName(aLangTag.getBcp47()); - if (aDicLangInUse.count( nLang ) == 0) - { - // remember the new language in use - aDicLangInUse.insert( nLang ); + if (aDicLangInUse.count(aLocaleName) == 0) + { + // remember the new language in use + aDicLangInUse.insert(aLocaleName); - // add the dictionary to the resulting vector - SvtLinguConfigDictionaryEntry aDicEntry; - aDicEntry.aLocations.realloc(1); - aDicEntry.aLocaleNames.realloc(1); - rtl::OUString aLocaleName( MsLangId::convertLanguageToIsoString( nLang ) ); - aDicEntry.aLocations[0] = sPath; - aDicEntry.aFormatName = aFormatName; - aDicEntry.aLocaleNames[0] = aLocaleName; - aRes.push_back( aDicEntry ); - } - } - } + // add the dictionary to the resulting vector + SvtLinguConfigDictionaryEntry aDicEntry; + aDicEntry.aLocations.realloc(1); + aDicEntry.aLocaleNames.realloc(1); + aDicEntry.aLocations[0] = sPath; + aDicEntry.aFormatName = aFormatName; + aDicEntry.aLocaleNames[0] = aLocaleName; + aRes.push_back( aDicEntry ); + } + } + } } - #endif return aRes; From c5850f4b25d2b735ea59bb0ac8c2bc58527ac17e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 4 Oct 2012 11:19:15 +0100 Subject: [PATCH 292/863] Use MenuButton for non-editable GtkComboBoxText instead of ComboBox its more similar for the non-editable list. Requires some love to MenuButton to reflect the selected entry and resize appropiately Change-Id: I4b37931e35a5f326d6fd4e445eb741bece6b55a6 --- sw/uiconfig/swriter/ui/charurlpage.ui | 34 +++++++----- vcl/inc/vcl/menu.hxx | 1 + vcl/inc/vcl/menubtn.hxx | 17 +++++- vcl/source/control/menubtn.cxx | 77 +++++++++++++++++++++++++-- vcl/source/window/builder.cxx | 34 ++++++++++-- 5 files changed, 137 insertions(+), 26 deletions(-) diff --git a/sw/uiconfig/swriter/ui/charurlpage.ui b/sw/uiconfig/swriter/ui/charurlpage.ui index 81534e38a636..794212a93bfd 100644 --- a/sw/uiconfig/swriter/ui/charurlpage.ui +++ b/sw/uiconfig/swriter/ui/charurlpage.ui @@ -95,20 +95,6 @@ 1     - - - True - False - 0 - 1 - - - 1 - 3 - 1 - 1 - - True @@ -183,6 +169,26 @@ + + + True + False + True + 0 + 1 + + + False + + + + + 1 + 3 + 1 + 1 + +     diff --git a/vcl/inc/vcl/menu.hxx b/vcl/inc/vcl/menu.hxx index cd931c74fa61..e908119a96ae 100644 --- a/vcl/inc/vcl/menu.hxx +++ b/vcl/inc/vcl/menu.hxx @@ -126,6 +126,7 @@ class VCL_DLLPUBLIC Menu : public Resource { friend class MenuBar; friend class MenuBarWindow; + friend class MenuButton; friend class MenuFloatingWindow; friend class PopupMenu; friend class SystemWindow; diff --git a/vcl/inc/vcl/menubtn.hxx b/vcl/inc/vcl/menubtn.hxx index c9906c9dd162..02e2f5dd7edd 100644 --- a/vcl/inc/vcl/menubtn.hxx +++ b/vcl/inc/vcl/menubtn.hxx @@ -35,6 +35,8 @@ class Timer; class PopupMenu; +class VclBuilder; +class VclSimpleEvent; // -------------------- // - MenuButton-Types - @@ -49,12 +51,15 @@ class PopupMenu; class VCL_DLLPUBLIC MenuButton : public PushButton { private: + friend class VclBuilder; + Rectangle maFocusRect; Timer* mpMenuTimer; PopupMenu* mpOwnMenu; PopupMenu* mpMenu; - sal_uInt16 mnCurItemId; - sal_uInt16 mnMenuMode; + sal_uInt16 mnCurItemId; + sal_uInt16 mnMenuMode; + bool mbDisplaySelectedItem; Link maActivateHdl; Link maSelectHdl; @@ -62,10 +67,14 @@ private: SAL_DLLPRIVATE void ImplExecuteMenu(); DECL_DLLPRIVATE_LINK( ImplMenuTimeoutHdl, void* ); + SAL_DLLPRIVATE void updateText(); + // Copy assignment is forbidden and not implemented. SAL_DLLPRIVATE MenuButton( const MenuButton & ); SAL_DLLPRIVATE MenuButton& operator=( const MenuButton & ); + DECL_LINK(MenuEventListener, VclSimpleEvent*); + protected: using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); @@ -95,6 +104,10 @@ public: const Link& GetActivateHdl() const { return maActivateHdl; } void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } const Link& GetSelectHdl() const { return maSelectHdl; } + + void SetShowDisplaySelectedItem(bool bShow); + + virtual Size GetOptimalSize(WindowSizeType eType) const; }; #endif // _SV_MENUBTN_HXX diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx index acc7e9ad4d2b..2d40192f69e3 100644 --- a/vcl/source/control/menubtn.cxx +++ b/vcl/source/control/menubtn.cxx @@ -84,8 +84,9 @@ void MenuButton::ImplExecuteMenu() // ----------------------------------------------------------------------- -MenuButton::MenuButton( Window* pParent, WinBits nWinBits ) : - PushButton( WINDOW_MENUBUTTON ) +MenuButton::MenuButton( Window* pParent, WinBits nWinBits ) + : PushButton( WINDOW_MENUBUTTON ) + , mbDisplaySelectedItem(false) { ImplInitMenuButtonData(); ImplInit( pParent, nWinBits ); @@ -93,8 +94,9 @@ MenuButton::MenuButton( Window* pParent, WinBits nWinBits ) : // ----------------------------------------------------------------------- -MenuButton::MenuButton( Window* pParent, const ResId& rResId ) : - PushButton( WINDOW_MENUBUTTON ) +MenuButton::MenuButton( Window* pParent, const ResId& rResId ) + : PushButton( WINDOW_MENUBUTTON ) + , mbDisplaySelectedItem(false) { ImplInitMenuButtonData(); rResId.SetRT( RSC_MENUBUTTON ); @@ -127,6 +129,8 @@ void MenuButton::ImplLoadRes( const ResId& rResId ) MenuButton::~MenuButton() { delete mpMenuTimer; + if (mbDisplaySelectedItem && mpMenu) + mpMenu->RemoveEventListener(LINK(this, MenuButton, MenuEventListener)); delete mpOwnMenu; } @@ -208,9 +212,33 @@ void MenuButton::Activate() void MenuButton::Select() { + updateText(); maSelectHdl.Call( this ); } +void MenuButton::updateText() +{ + if (mbDisplaySelectedItem) + { + if (mpMenu) + SetText(mpMenu->GetItemText(mpMenu->GetCurItemId())); + else + SetText(OUString()); + } +} + +Size MenuButton::GetOptimalSize(WindowSizeType eType) const +{ + Size aRet = PushButton::GetOptimalSize(eType); + if (mbDisplaySelectedItem && mpMenu) + { + Size aMenuSize(mpMenu->ImplCalcSize(const_cast(this))); + if (aMenuSize.Width() > aRet.Width()) + aRet.Width() = aMenuSize.Width(); + } + return aRet; +} + // ----------------------------------------------------------------------- void MenuButton::SetMenuMode( sal_uInt16 nMode ) @@ -220,13 +248,52 @@ void MenuButton::SetMenuMode( sal_uInt16 nMode ) mnMenuMode = nMode; } -// ----------------------------------------------------------------------- +void MenuButton::SetShowDisplaySelectedItem(bool bShow) +{ + if (mbDisplaySelectedItem == bShow) + return; + if (mbDisplaySelectedItem && mpMenu) + mpMenu->RemoveEventListener(LINK(this, MenuButton, MenuEventListener)); + mbDisplaySelectedItem = bShow; + if (mbDisplaySelectedItem && mpMenu) + mpMenu->AddEventListener(LINK(this, MenuButton, MenuEventListener)); +} void MenuButton::SetPopupMenu( PopupMenu* pNewMenu ) { + if (pNewMenu == mpMenu) + return; + if (mbDisplaySelectedItem && mpMenu) + mpMenu->RemoveEventListener(LINK(this, MenuButton, MenuEventListener)); // Fuer die 5.1-Auslieferung besser noch nicht inline, ansonsten kann // diese Funktion zur 6.0 inline werden mpMenu = pNewMenu; + updateText(); + if (mbDisplaySelectedItem && mpMenu) + mpMenu->AddEventListener(LINK(this, MenuButton, MenuEventListener)); +} + +IMPL_LINK(MenuButton, MenuEventListener, VclSimpleEvent*, pEvent) +{ + if (pEvent && pEvent->ISA(VclMenuEvent)) + { + VclMenuEvent* pMenuEvent = (VclMenuEvent*)pEvent; + if (pMenuEvent->GetMenu() == mpMenu) + { + switch (pMenuEvent->GetId()) + { + case VCLEVENT_MENU_INSERTITEM: + case VCLEVENT_MENU_REMOVEITEM: + case VCLEVENT_MENU_ITEMTEXTCHANGED: + queue_resize(); + break; + case VCLEVENT_MENU_SELECT: + updateText(); + break; + } + } + } + return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 63fce3934281..3ef828965363 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -242,7 +243,7 @@ namespace bool extractResizable(VclBuilder::stringmap &rMap) { bool bResizable = true; - VclBuilder::stringmap::iterator aFind = rMap.find(OString(RTL_CONSTASCII_STRINGPARAM("resizable"))); + VclBuilder::stringmap::iterator aFind = rMap.find(OString("resizable")); if (aFind != rMap.end()) { bResizable = toBool(aFind->second); @@ -251,10 +252,22 @@ namespace return bResizable; } + bool extractEntry(VclBuilder::stringmap &rMap) + { + bool bHasEntry = false; + VclBuilder::stringmap::iterator aFind = rMap.find(OString("has-entry")); + if (aFind != rMap.end()) + { + bHasEntry = toBool(aFind->second); + rMap.erase(aFind); + } + return bHasEntry; + } + bool extractOrientation(VclBuilder::stringmap &rMap) { bool bVertical = false; - VclBuilder::stringmap::iterator aFind = rMap.find(OString(RTL_CONSTASCII_STRINGPARAM("orientation"))); + VclBuilder::stringmap::iterator aFind = rMap.find(OString("orientation")); if (aFind != rMap.end()) { bVertical = aFind->second.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("vertical")); @@ -597,9 +610,20 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkComboBoxText"))) { extractModel(id, rMap); - ComboBox* pComboBox = new ComboBox(pParent, WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK); - pComboBox->SetBestDropDownLineCount(); - pWindow = pComboBox; + if (extractEntry(rMap)) + { + ComboBox* pComboBox = new ComboBox(pParent, WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK); + pComboBox->SetBestDropDownLineCount(); + pWindow = pComboBox; + } + else + { + MenuButton *pMenuButton = new MenuButton(pParent, WB_LEFT|WB_VCENTER|WB_3DLOOK); + pMenuButton->mpOwnMenu = new PopupMenu; //this now belongs to the menubutton + pMenuButton->SetPopupMenu(pMenuButton->mpOwnMenu); + pMenuButton->SetShowDisplaySelectedItem(true); + pWindow = pMenuButton; + } } else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkTreeView"))) { From 77407d7ad0cece76eed9e7767765b12229e6449d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 4 Oct 2012 11:31:10 +0100 Subject: [PATCH 293/863] convert thesaurus dialog to .ui format Change-Id: I58c128b78f19b1141b82c2cecb37ed390a5db82b --- cui/AllLangResTarget_cui.mk | 2 +- cui/UI_cui.mk | 1 + cui/source/dialogs/cuires.src | 17 ++ cui/source/dialogs/thesdlg.cxx | 345 ++++++++++------------------ cui/source/dialogs/thesdlg.hrc | 40 ---- cui/source/dialogs/thesdlg.src | 146 ------------ cui/source/dialogs/thesdlg_impl.hxx | 8 +- cui/source/inc/cuires.hrc | 3 +- cui/source/inc/helpid.hrc | 1 - cui/source/inc/thesdlg.hxx | 69 +++--- cui/uiconfig/ui/thesaurus.ui | 217 +++++++++++++++++ 11 files changed, 392 insertions(+), 457 deletions(-) create mode 100644 cui/source/dialogs/cuires.src delete mode 100644 cui/source/dialogs/thesdlg.hrc delete mode 100644 cui/source/dialogs/thesdlg.src create mode 100644 cui/uiconfig/ui/thesaurus.ui diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk index 4af405878fb3..f3d76a961c2a 100644 --- a/cui/AllLangResTarget_cui.mk +++ b/cui/AllLangResTarget_cui.mk @@ -58,6 +58,7 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\ cui/source/dialogs/colorpicker.src \ cui/source/dialogs/commonlingui.src \ cui/source/dialogs/cuiimapdlg.src \ + cui/source/dialogs/cuires.src \ cui/source/dialogs/dlgname.src \ cui/source/dialogs/fmsearch.src \ cui/source/dialogs/gallery.src \ @@ -80,7 +81,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\ cui/source/dialogs/srchxtra.src \ cui/source/dialogs/svuidlg.src \ cui/source/dialogs/tbxform.src \ - cui/source/dialogs/thesdlg.src \ cui/source/options/certpath.src \ cui/source/options/connpooloptions.src \ cui/source/options/dbregister.src \ diff --git a/cui/UI_cui.mk b/cui/UI_cui.mk index c2d51e6afb46..717107dd79d2 100644 --- a/cui/UI_cui.mk +++ b/cui/UI_cui.mk @@ -14,6 +14,7 @@ $(eval $(call gb_UI_add_uifiles,cui,\ cui/uiconfig/ui/effectspage \ cui/uiconfig/ui/positionpage \ cui/uiconfig/ui/specialcharacters \ + cui/uiconfig/ui/thesaurus \ cui/uiconfig/ui/twolinespage \ cui/uiconfig/ui/zoomdialog \ )) diff --git a/cui/source/dialogs/cuires.src b/cui/source/dialogs/cuires.src new file mode 100644 index 000000000000..6b7e8fc1aab5 --- /dev/null +++ b/cui/source/dialogs/cuires.src @@ -0,0 +1,17 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include "cuires.hrc" + +String RID_SVXSTR_ERR_TEXTNOTFOUND +{ + Text [ en-US ] = "No alternatives found." ; +}; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index c794b2a9512d..7be748a60f6b 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -26,7 +26,6 @@ * ************************************************************************/ -#include "thesdlg.hrc" #include "thesdlg.hxx" #include "thesdlg_impl.hxx" #include "cuires.hrc" @@ -63,69 +62,83 @@ using namespace ::com::sun::star; using ::rtl::OUString; -// class LookUpComboBox_Impl -------------------------------------------------- +// class LookUpComboBox -------------------------------------------------- -LookUpComboBox_Impl::LookUpComboBox_Impl( - Window *pParent, const ResId &rResId, SvxThesaurusDialog &rImpl ) : - ComboBox (pParent, rResId), - m_rDialogImpl( rImpl ) +LookUpComboBox::LookUpComboBox(Window *pParent) + : ComboBox(pParent, WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK) { - m_aModifyTimer.SetTimeoutHdl( LINK( this, LookUpComboBox_Impl, ModifyTimer_Hdl ) ); + SetBestDropDownLineCount(); + + m_aModifyTimer.SetTimeoutHdl( LINK( this, LookUpComboBox, ModifyTimer_Hdl ) ); m_aModifyTimer.SetTimeout( 500 ); EnableAutocomplete( sal_False ); } -LookUpComboBox_Impl::~LookUpComboBox_Impl() +extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeLookUpComboBox(Window *pParent, VclBuilder::stringmap &) +{ + return new LookUpComboBox(pParent); +} + +void LookUpComboBox::init(SvxThesaurusDialog *pDialog) +{ + m_pDialog = pDialog; +} + +LookUpComboBox::~LookUpComboBox() { } -void LookUpComboBox_Impl::Modify() +void LookUpComboBox::Modify() { m_aModifyTimer.Start(); } -IMPL_LINK( LookUpComboBox_Impl, ModifyTimer_Hdl, Timer *, EMPTYARG /*pTimer*/ ) +IMPL_LINK( LookUpComboBox, ModifyTimer_Hdl, Timer *, EMPTYARG /*pTimer*/ ) { - m_rDialogImpl.LookUp( GetText() ); + m_pDialog->LookUp( GetText() ); m_aModifyTimer.Stop(); return 0; } -// class ReplaceEdit_Impl -------------------------------------------------- +// class ReplaceEdit -------------------------------------------------- -ReplaceEdit_Impl::ReplaceEdit_Impl( Window *pParent, const ResId &rResId ) - : Edit(pParent, rResId) - , m_pBtn(NULL) +ReplaceEdit::ReplaceEdit(Window *pParent) + : Edit(pParent) { } -ReplaceEdit_Impl::~ReplaceEdit_Impl() +extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeReplaceEdit(Window *pParent, VclBuilder::stringmap &) +{ + return new ReplaceEdit(pParent); +} + +ReplaceEdit::~ReplaceEdit() { } -void ReplaceEdit_Impl::Modify() +void ReplaceEdit::Modify() { if (m_pBtn) m_pBtn->Enable( GetText().Len() > 0 ); } -void ReplaceEdit_Impl::SetText( const XubString& rStr ) +void ReplaceEdit::SetText( const XubString& rStr ) { Edit::SetText( rStr ); Modify(); } -void ReplaceEdit_Impl::SetText( const XubString& rStr, const Selection& rNewSelection ) +void ReplaceEdit::SetText( const XubString& rStr, const Selection& rNewSelection ) { Edit::SetText( rStr, rNewSelection ); Modify(); } -// class ThesaurusAlternativesCtrl_Impl ---------------------------------- +// class ThesaurusAlternativesCtrl ---------------------------------- -AlternativesString_Impl::AlternativesString_Impl( - ThesaurusAlternativesCtrl_Impl &rControl, +AlternativesString::AlternativesString( + ThesaurusAlternativesCtrl &rControl, SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& rStr ) : SvLBoxString( pEntry, nFlags, rStr ), @@ -133,7 +146,7 @@ AlternativesString_Impl::AlternativesString_Impl( { } -void AlternativesString_Impl::Paint( +void AlternativesString::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16, SvLBoxEntry* pEntry ) @@ -154,28 +167,35 @@ void AlternativesString_Impl::Paint( rDev.SetFont( aOldFont ); } -ThesaurusAlternativesCtrl_Impl::ThesaurusAlternativesCtrl_Impl( - Window* pParent, - SvxThesaurusDialog &rImpl ) : - SvxCheckListBox( pParent, CUI_RES( CT_THES_ALTERNATIVES ) ), - m_rDialogImpl( rImpl ) +ThesaurusAlternativesCtrl::ThesaurusAlternativesCtrl(Window* pParent) + : SvxCheckListBox(pParent) { SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_FORCE_MAKEVISIBLE ); SetHighlightRange(); } -ThesaurusAlternativesCtrl_Impl::~ThesaurusAlternativesCtrl_Impl() +extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeThesaurusAlternativesCtrl(Window *pParent, VclBuilder::stringmap &) +{ + return new ThesaurusAlternativesCtrl(pParent); +} + +void ThesaurusAlternativesCtrl::init(SvxThesaurusDialog *pDialog) +{ + m_pDialog = pDialog; +} + +ThesaurusAlternativesCtrl::~ThesaurusAlternativesCtrl() { ClearExtraData(); } -void ThesaurusAlternativesCtrl_Impl::ClearExtraData() +void ThesaurusAlternativesCtrl::ClearExtraData() { UserDataMap_t aEmpty; m_aUserData.swap( aEmpty ); } -void ThesaurusAlternativesCtrl_Impl::SetExtraData( +void ThesaurusAlternativesCtrl::SetExtraData( const SvLBoxEntry *pEntry, const AlternativesExtraData &rData ) { @@ -189,7 +209,7 @@ void ThesaurusAlternativesCtrl_Impl::SetExtraData( m_aUserData[ pEntry ] = rData; } -AlternativesExtraData * ThesaurusAlternativesCtrl_Impl::GetExtraData( +AlternativesExtraData * ThesaurusAlternativesCtrl::GetExtraData( const SvLBoxEntry *pEntry ) { AlternativesExtraData *pRes = NULL; @@ -199,7 +219,7 @@ AlternativesExtraData * ThesaurusAlternativesCtrl_Impl::GetExtraData( return pRes; } -SvLBoxEntry * ThesaurusAlternativesCtrl_Impl::AddEntry( sal_Int32 nVal, const String &rText, bool bIsHeader ) +SvLBoxEntry * ThesaurusAlternativesCtrl::AddEntry( sal_Int32 nVal, const String &rText, bool bIsHeader ) { SvLBoxEntry* pEntry = new SvLBoxEntry; String aText; @@ -211,7 +231,7 @@ SvLBoxEntry * ThesaurusAlternativesCtrl_Impl::AddEntry( sal_Int32 nVal, const St pEntry->AddItem( new SvLBoxString( pEntry, 0, String() ) ); // add empty column aText += rText; pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0 ) ); // otherwise crash - pEntry->AddItem( new AlternativesString_Impl( *this, pEntry, 0, aText ) ); + pEntry->AddItem( new AlternativesString( *this, pEntry, 0, aText ) ); SetExtraData( pEntry, AlternativesExtraData( rText, bIsHeader ) ); GetModel()->Insert( pEntry ); @@ -222,29 +242,29 @@ SvLBoxEntry * ThesaurusAlternativesCtrl_Impl::AddEntry( sal_Int32 nVal, const St return pEntry; } -void ThesaurusAlternativesCtrl_Impl::KeyInput( const KeyEvent& rKEvt ) +void ThesaurusAlternativesCtrl::KeyInput( const KeyEvent& rKEvt ) { const KeyCode& rKey = rKEvt.GetKeyCode(); if (rKey.GetCode() == KEY_RETURN || rKey.GetCode() == KEY_ESCAPE) GetParent()->KeyInput( rKEvt ); // parent will close dialog... else if (rKey.GetCode() == KEY_SPACE) - m_rDialogImpl.AlternativesDoubleClickHdl_Impl( this ); // look up current selected entry + m_pDialog->AlternativesDoubleClickHdl_Impl( this ); // look up current selected entry else if (GetEntryCount()) SvxCheckListBox::KeyInput( rKEvt ); } -void ThesaurusAlternativesCtrl_Impl::Paint( const Rectangle& rRect ) +void ThesaurusAlternativesCtrl::Paint( const Rectangle& rRect ) { - if (!m_rDialogImpl.WordFound()) + if (!m_pDialog->WordFound()) { - Size aTextSize( GetTextWidth( m_rDialogImpl.getErrStr() ), GetTextHeight() ); + Size aTextSize( GetTextWidth( m_pDialog->getErrStr() ), GetTextHeight() ); aTextSize = LogicToPixel( aTextSize ); Point aPos; aPos.X() += GetSizePixel().Width() / 2 - aTextSize.Width() / 2; aPos.Y() += GetSizePixel().Height() / 2; aPos = PixelToLogic( aPos ); - DrawText( aPos, m_rDialogImpl.getErrStr() ); + DrawText( aPos, m_pDialog->getErrStr() ); } else @@ -312,8 +332,8 @@ bool SvxThesaurusDialog::UpdateAlternativesBox_Impl() void SvxThesaurusDialog::LookUp( const String &rText ) { - if (rText != aWordCB.GetText()) // avoid moving of the cursor if the text is the same - aWordCB.SetText( rText ); + if (rText != m_pWordCB->GetText()) // avoid moving of the cursor if the text is the same + m_pWordCB->SetText( rText ); LookUp_Impl(); } @@ -322,16 +342,16 @@ IMPL_LINK( SvxThesaurusDialog, LeftBtnHdl_Impl, Button *, pBtn ) if (pBtn && aLookUpHistory.size() >= 2) { aLookUpHistory.pop(); // remove current look up word from stack - aWordCB.SetText( aLookUpHistory.top() ); // retrieve previous look up word + m_pWordCB->SetText( aLookUpHistory.top() ); // retrieve previous look up word aLookUpHistory.pop(); LookUp_Impl(); } return 0; } -IMPL_LINK( SvxThesaurusDialog, LanguageHdl_Impl, MenuButton *, pBtn ) +IMPL_LINK( SvxThesaurusDialog, LanguageHdl_Impl, MenuButton*, pBtn ) { - PopupMenu *pMenu = aLangMBtn.GetPopupMenu(); + PopupMenu *pMenu = m_pLangMBtn->GetPopupMenu(); if (pMenu && pBtn) { sal_uInt16 nItem = pBtn->GetCurItemId(); @@ -341,7 +361,6 @@ IMPL_LINK( SvxThesaurusDialog, LanguageHdl_Impl, MenuButton *, pBtn ) if (xThesaurus->hasLocale( SvxCreateLocale( nLang ) )) nLookUpLanguage = nLang; SetWindowTitle( nLang ); - UpdateVendorImage(); LookUp_Impl(); } return 0; @@ -349,7 +368,7 @@ IMPL_LINK( SvxThesaurusDialog, LanguageHdl_Impl, MenuButton *, pBtn ) void SvxThesaurusDialog::LookUp_Impl() { - String aText( aWordCB.GetText() ); + String aText( m_pWordCB->GetText() ); aLookUpText = OUString( aText ); if (!aLookUpText.isEmpty() && @@ -359,21 +378,21 @@ void SvxThesaurusDialog::LookUp_Impl() m_bWordFound = UpdateAlternativesBox_Impl(); m_pAlternativesCT->Enable( m_bWordFound ); - if ( aWordCB.GetEntryPos( aText ) == LISTBOX_ENTRY_NOTFOUND ) - aWordCB.InsertEntry( aText ); + if ( m_pWordCB->GetEntryPos( aText ) == LISTBOX_ENTRY_NOTFOUND ) + m_pWordCB->InsertEntry( aText ); - aReplaceEdit.SetText( String() ); - aLeftBtn.Enable( aLookUpHistory.size() > 1 ); + m_pReplaceEdit->SetText( String() ); + m_pLeftBtn->Enable( aLookUpHistory.size() > 1 ); } IMPL_LINK( SvxThesaurusDialog, WordSelectHdl_Impl, ComboBox *, pBox ) { - if (pBox && !aWordCB.IsTravelSelect()) // act only upon return key and not when traveling with cursor keys + if (pBox && !m_pWordCB->IsTravelSelect()) // act only upon return key and not when traveling with cursor keys { sal_uInt16 nPos = pBox->GetSelectEntryPos(); String aStr( pBox->GetEntry( nPos ) ); aStr = linguistic::GetThesaurusReplaceText( aStr ); - aWordCB.SetText( aStr ); + m_pWordCB->SetText( aStr ); LookUp_Impl(); } @@ -392,7 +411,7 @@ IMPL_LINK( SvxThesaurusDialog, AlternativesSelectHdl_Impl, SvxCheckListBox *, pB aStr = pData->GetText(); aStr = linguistic::GetThesaurusReplaceText( aStr ); } - aReplaceEdit.SetText( aStr ); + m_pReplaceEdit->SetText( aStr ); } return 0; } @@ -410,7 +429,7 @@ IMPL_LINK( SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl, SvxCheckListBox aStr = linguistic::GetThesaurusReplaceText( aStr ); } - aWordCB.SetText( aStr ); + m_pWordCB->SetText( aStr ); if (aStr.Len() > 0) LookUp_Impl(); } @@ -429,192 +448,57 @@ IMPL_STATIC_LINK( SvxThesaurusDialog, SelectFirstHdl_Impl, SvxCheckListBox *, pB return 0; } -//////////////////////////////////////////////////////////// - -static Image lcl_GetImageFromPngUrl( const OUString &rFileUrl ) -{ - Image aRes; - - OUString aTmp; - osl::FileBase::getSystemPathFromFileURL( rFileUrl, aTmp ); - - Graphic aGraphic; - const String aFilterName( RTL_CONSTASCII_USTRINGPARAM( IMP_PNG ) ); - if( GRFILTER_OK == GraphicFilter::LoadGraphic( aTmp, aFilterName, aGraphic, NULL, NULL ) ) - { - aRes = Image( aGraphic.GetBitmapEx() ); - } - return aRes; -} - -static String lcl_GetThesImplName( const lang::Locale &rLocale ) -{ - String aRes; - - uno::Reference< linguistic2::XLinguServiceManager > xLngMgr; - try - { - uno::Reference< lang::XMultiServiceFactory > xMSF( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW ); - xLngMgr = uno::Reference< linguistic2::XLinguServiceManager >( xMSF->createInstance( - OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.linguistic2.LinguServiceManager" ))), uno::UNO_QUERY_THROW ); - - DBG_ASSERT( xLngMgr.is(), "LinguServiceManager missing" ); - if (xLngMgr.is()) - { - uno::Sequence< OUString > aServiceNames = xLngMgr->getConfiguredServices( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.linguistic2.Thesaurus")), rLocale ); - // there should be at most one thesaurus configured for each language - DBG_ASSERT( aServiceNames.getLength() <= 1, "more than one thesaurus found. Should not be possible" ); - if (aServiceNames.getLength() == 1) - aRes = aServiceNames[0]; - } - } - catch (uno::Exception &e) - { - (void) e; - DBG_ASSERT( 0, "failed to get thesaurus" ); - } - - return aRes; -} - -void SvxThesaurusDialog::UpdateVendorImage() -{ - SetUpdateMode( sal_False ); - - SvtLinguConfig aCfg; - if (aCfg.HasVendorImages( "ThesaurusDialogImage" )) - { - Image aImage; - String sThesImplName( lcl_GetThesImplName( SvxCreateLocale( nLookUpLanguage ) ) ); - OUString aThesDialogImageUrl( aCfg.GetThesaurusDialogImage( sThesImplName ) ); - if (sThesImplName.Len() > 0 && !aThesDialogImageUrl.isEmpty()) - aImage = Image( lcl_GetImageFromPngUrl( aThesDialogImageUrl ) ); - else - aImage = aVendorDefaultImage; - aVendorImageFI.SetImage( aImage ); - } - - SetUpdateMode( sal_True ); -} - -IMPL_STATIC_LINK( SvxThesaurusDialog, VendorImageInitHdl, SvxThesaurusDialog*, EMPTYARG ) -{ - pThis->SetUpdateMode( sal_False ); - - SvtLinguConfig aCfg; - if (aCfg.HasVendorImages( "ThesaurusDialogImage" )) - { - Image aImage( pThis->aVendorDefaultImage ); - pThis->aVendorImageFI.SetImage( aImage ); - pThis->aVendorImageFI.Show(); - - // move down visible controls according to the vendor images height - Size aVendorSize = pThis->aVendorImageFI.GetSizePixel(); - Size aImageSize = pThis->aVendorImageFI.GetImage().GetSizePixel(); - if (aImageSize.Height()) - { - aVendorSize.Height() = aImageSize.Height(); - if(aVendorSize.Width() < aImageSize.Width()) - aVendorSize.Width() = aImageSize.Width(); - pThis->aVendorImageFI.SetSizePixel( aVendorSize ); - } - const sal_Int32 nDiff = aVendorSize.Height(); - pThis->aVendorImageFI.SetSizePixel( aVendorSize ); - Control* aControls[] = { - &pThis->aLeftBtn, - &pThis->aWordText, - &pThis->aWordCB, - &pThis->m_aAlternativesText, - pThis->m_pAlternativesCT.get(), - &pThis->aReplaceText, - &pThis->aReplaceEdit, - &pThis->aFL, - &pThis->aHelpBtn, - &pThis->aLangMBtn, - &pThis->aReplaceBtn, - &pThis->aCancelBtn, - 0 - }; - sal_Int32 nControl = 0; - while (aControls[nControl]) - { - Point aPos = aControls[nControl]->GetPosPixel(); - aPos.Y() += nDiff; - aControls[nControl]->SetPosPixel(aPos); - ++nControl; - } - Size aDlgSize = pThis->GetSizePixel(); - aDlgSize.Height() += nDiff; - pThis->SetSizePixel( aDlgSize ); - pThis->Invalidate(); - } - - pThis->UpdateVendorImage(); - pThis->SetUpdateMode( sal_True ); - - return 0; -}; - // class SvxThesaurusDialog ---------------------------------------------- SvxThesaurusDialog::SvxThesaurusDialog( Window* pParent, uno::Reference< linguistic2::XThesaurus > xThes, const String &rWord, - LanguageType nLanguage ) : - - SvxStandardDialog( pParent, CUI_RES( RID_SVXDLG_THESAURUS ) ), - - aVendorImageFI ( this, CUI_RES( IMG_VENDOR ) ), - aLeftBtn ( this, CUI_RES( BTN_LEFT ) ), - aWordText ( this, CUI_RES( FT_WORD ) ), - aWordCB ( this, CUI_RES( CB_WORD ), *this ), - m_aAlternativesText ( this, CUI_RES( FT_THES_ALTERNATIVES ) ), - m_pAlternativesCT ( new ThesaurusAlternativesCtrl_Impl( this, *this ) ), - aReplaceText ( this, CUI_RES( FT_REPL ) ), - aReplaceEdit ( this, CUI_RES( ED_REPL ) ), - aFL ( this, CUI_RES( FL_VAR ) ), - aHelpBtn ( this, CUI_RES( BTN_THES_HELP ) ), - aLangMBtn ( this, CUI_RES( MB_LANGUAGE ) ), - aReplaceBtn ( this, CUI_RES( BTN_THES_OK ) ), - aCancelBtn ( this, CUI_RES( BTN_THES_CANCEL ) ), - aErrStr ( CUI_RES( STR_ERR_TEXTNOTFOUND ) ), - aVendorDefaultImage ( CUI_RES( IMG_DEFAULT_VENDOR ) ), - xThesaurus ( NULL ), - aLookUpText (), - nLookUpLanguage ( LANGUAGE_NONE ), - m_bWordFound( false ) + LanguageType nLanguage) + : SvxStandardDialog(pParent, "ThesaurusDialog", "cui/ui/thesaurus.ui") + , m_aErrStr(CUI_RESSTR(RID_SVXSTR_ERR_TEXTNOTFOUND)) + , xThesaurus(NULL) + , aLookUpText() + , nLookUpLanguage(LANGUAGE_NONE) + , m_bWordFound(false) { - aReplaceEdit.SetButton( &aReplaceBtn ); + get(m_pLeftBtn, "left"); - aLeftBtn.SetClickHdl( LINK( this, SvxThesaurusDialog, LeftBtnHdl_Impl ) ); - aWordCB.SetSelectHdl( LINK( this, SvxThesaurusDialog, WordSelectHdl_Impl ) ); - aLangMBtn.SetSelectHdl( LINK( this, SvxThesaurusDialog, LanguageHdl_Impl ) ); + get(m_pWordCB, "wordcb"); + m_pWordCB->init(this); + + get(m_pAlternativesCT, "alternatives"); + m_pAlternativesCT->init(this); + + get(m_pReplaceEdit, "replaceed"); + PushButton *pReplaceBtn = get("replace"); + m_pReplaceEdit->init(pReplaceBtn); + + get(m_pLangMBtn, "langcb"); + + pReplaceBtn->SetClickHdl( LINK( this, SvxThesaurusDialog, ReplaceBtnHdl_Impl ) ); + m_pLeftBtn->SetClickHdl( LINK( this, SvxThesaurusDialog, LeftBtnHdl_Impl ) ); + m_pWordCB->SetSelectHdl( LINK( this, SvxThesaurusDialog, WordSelectHdl_Impl ) ); + m_pLangMBtn->SetSelectHdl( LINK( this, SvxThesaurusDialog, LanguageHdl_Impl ) ); m_pAlternativesCT->SetSelectHdl( LINK( this, SvxThesaurusDialog, AlternativesSelectHdl_Impl )); m_pAlternativesCT->SetDoubleClickHdl( LINK( this, SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl )); - Application::PostUserEvent( STATIC_LINK( this, SvxThesaurusDialog, VendorImageInitHdl ) ); - xThesaurus = xThes; aLookUpText = OUString( rWord ); nLookUpLanguage = nLanguage; if (rWord.Len() > 0) aLookUpHistory.push( rWord ); - FreeResource(); - OUString aTmp( rWord ); linguistic::RemoveHyphens( aTmp ); linguistic::ReplaceControlChars( aTmp ); String aTmp2( aTmp ); - aReplaceEdit.SetText( aTmp2 ); - aWordCB.InsertEntry( aTmp2 ); + m_pReplaceEdit->SetText( aTmp2 ); + m_pWordCB->InsertEntry( aTmp2 ); LookUp( aTmp2 ); m_pAlternativesCT->GrabFocus(); - aLeftBtn.Enable( sal_False ); + m_pLeftBtn->Enable( sal_False ); // fill language menu button list SvtLanguageTable aLangTab; @@ -623,11 +507,11 @@ SvxThesaurusDialog::SvxThesaurusDialog( aLocales = xThesaurus->getLocales(); const sal_Int32 nLocales = aLocales.getLength(); const lang::Locale *pLocales = aLocales.getConstArray(); - delete aLangMBtn.GetPopupMenu(); - PopupMenu* pMenu = new PopupMenu; - pMenu->SetMenuFlags( MENU_FLAG_NOAUTOMNEMONICS ); + PopupMenu* pMenu = m_pLangMBtn->GetPopupMenu(); + pMenu->Clear(); + pMenu->SetMenuFlags(MENU_FLAG_NOAUTOMNEMONICS); std::vector< OUString > aLangVec; - for (sal_Int32 i = 0; i < nLocales; ++i ) + for (sal_Int32 i = 0; i < nLocales; ++i) { const LanguageType nLang = SvxLocaleToLanguage( pLocales[i] ); DBG_ASSERT( nLang != LANGUAGE_NONE && nLang != LANGUAGE_DONTKNOW, "failed to get language" ); @@ -636,18 +520,29 @@ SvxThesaurusDialog::SvxThesaurusDialog( std::sort( aLangVec.begin(), aLangVec.end() ); for (size_t i = 0; i < aLangVec.size(); ++i) pMenu->InsertItem( (sal_uInt16)i+1, aLangVec[i] ); // menu items should be enumerated from 1 and not 0 - aLangMBtn.SetPopupMenu( pMenu ); - SetWindowTitle( nLanguage ); + std::vector< OUString >::iterator aI = std::find(aLangVec.begin(), aLangVec.end(), aLangTab.GetString(nLanguage)); + if (aI != aLangVec.end()) + { + pMenu->SetSelectedEntry(std::distance(aLangVec.begin(), aI) + 1); + pMenu->Select(); + } + + SetWindowTitle(nLanguage); // disable controls if service is missing if (!xThesaurus.is()) Enable( sal_False ); } +IMPL_LINK( SvxThesaurusDialog, ReplaceBtnHdl_Impl, Button *, EMPTYARG /*pBtn*/ ) +{ + EndDialog(true); + return 0; +} + SvxThesaurusDialog::~SvxThesaurusDialog() { - delete aLangMBtn.GetPopupMenu(); } void SvxThesaurusDialog::SetWindowTitle( LanguageType nLanguage ) @@ -663,7 +558,7 @@ void SvxThesaurusDialog::SetWindowTitle( LanguageType nLanguage ) String SvxThesaurusDialog::GetWord() { - return aReplaceEdit.GetText(); + return m_pReplaceEdit->GetText(); } sal_uInt16 SvxThesaurusDialog::GetLanguage() const diff --git a/cui/source/dialogs/thesdlg.hrc b/cui/source/dialogs/thesdlg.hrc deleted file mode 100644 index 56c6333e0949..000000000000 --- a/cui/source/dialogs/thesdlg.hrc +++ /dev/null @@ -1,40 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef _SVX_THESDLG_HRC -#define _SVX_THESDLG_HRC - -// defines --------------------------------------------------------------- - -#define BTN_LEFT 9 -#define BTN_THES_OK 10 -#define BTN_THES_CANCEL 11 -#define MB_LANGUAGE 12 -#define BTN_THES_HELP 13 -#define FT_WORD 15 -#define CB_WORD 16 -#define FT_REPL 21 -#define ED_REPL 22 -#define FL_VAR 23 -#define FT_THES_ALTERNATIVES 24 -#define CT_THES_ALTERNATIVES 25 -#define IMG_VENDOR 26 -#define IMG_DEFAULT_VENDOR 27 - -#define STR_ERR_TEXTNOTFOUND 101 - -#endif diff --git a/cui/source/dialogs/thesdlg.src b/cui/source/dialogs/thesdlg.src deleted file mode 100644 index 67fdced0f137..000000000000 --- a/cui/source/dialogs/thesdlg.src +++ /dev/null @@ -1,146 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "cuires.hrc" -#include "thesdlg.hrc" -#include "helpid.hrc" -#include // SID_THESAURUS - - - // RID_SVXDLG_THES ------------------------------------------------------- -ModalDialog RID_SVXDLG_THESAURUS -{ - HelpId = CMD_SID_THESAURUS ; - OutputSize = TRUE ; - Size = MAP_APPFONT ( 235, 230 ) ; - Text [ en-US ] = "Thesaurus" ; - SvLook = TRUE ; - Moveable = TRUE ; - - FixedImage IMG_VENDOR - { - Pos = MAP_APPFONT ( 0, 0 ) ; - Size = MAP_APPFONT ( 235, 0 ) ; // correct size will be applied at runtime - Hide = TRUE; - }; - - ImageButton BTN_LEFT - { - HelpID = "cui:ImageButton:RID_SVXDLG_THESAURUS:BTN_LEFT"; - Pos = MAP_APPFONT ( 5 , 15 ) ; - Size = MAP_APPFONT ( 14 , 14 ) ; - TABSTOP = TRUE ; - SYMBOL = IMAGEBUTTON_ARROW_LEFT ; - }; - FixedText FT_WORD - { - Pos = MAP_APPFONT ( 24 , 5 ) ; - Size = MAP_APPFONT ( 143 , 8 ) ; - Text [ en-US ] = "~Current word" ; - LEFT = TRUE ; - }; - ComboBox CB_WORD - { - HelpID = "cui:ComboBox:RID_SVXDLG_THESAURUS:CB_WORD"; - DropDown = TRUE ; - Pos = MAP_APPFONT ( 24 , 16 ) ; - Size = MAP_APPFONT ( 141 , 60 ) ; // have drop down space for several lines - }; - MenuButton MB_LANGUAGE - { - HelpID = "cui:MenuButton:RID_SVXDLG_THESAURUS:MB_LANGUAGE"; - Pos = MAP_APPFONT ( 170 , 16 ) ; - Size = MAP_APPFONT ( 60 , 14 ) ; - Text [ en-US ] = "~Language" ; - }; - - FixedText FT_THES_ALTERNATIVES - { - Pos = MAP_APPFONT ( 5 , 33 ) ; - Size = MAP_APPFONT ( 255 , 8 ) ; - Text [ en-US ] = "~Alternatives" ; - LEFT = TRUE ; - }; - Control CT_THES_ALTERNATIVES - { - HelpID = HID_CT_THES_ALTERNATIVES ; // also needed for automatic testing to find the control - Pos = MAP_APPFONT ( 5 , 45 ) ; - Size = MAP_APPFONT ( 225 , 121 ) ; - Border = TRUE; - TabStop = TRUE ; - }; - - FixedText FT_REPL - { - Pos = MAP_APPFONT ( 5 , 173 ) ; - Size = MAP_APPFONT ( 255 , 8 ) ; - Text [ en-US ] = "~Replace with" ; - LEFT = TRUE ; - }; - Edit ED_REPL - { - HelpID = "cui:Edit:RID_SVXDLG_THESAURUS:ED_REPL"; - BORDER = TRUE ; - Pos = MAP_APPFONT ( 5 , 184 ) ; - Size = MAP_APPFONT ( 225 , 12 ) ; - LEFT = TRUE ; - }; - FixedLine FL_VAR - { - Pos = MAP_APPFONT ( 0 , 200 ) ; - Size = MAP_APPFONT ( 235 , 8 ) ; - }; - - HelpButton BTN_THES_HELP - { - Pos = MAP_APPFONT ( 5 , 210 ) ; - Size = MAP_APPFONT ( 60 , 14 ) ; - }; - OkButton BTN_THES_OK - { - Pos = MAP_APPFONT ( 105 , 210 ) ; - Size = MAP_APPFONT ( 60 , 14 ) ; - Text [ en-US ] = "Replace" ; - DefButton = TRUE ; - }; - CancelButton BTN_THES_CANCEL - { - Pos = MAP_APPFONT ( 170 , 210 ) ; - Size = MAP_APPFONT ( 60 , 14 ) ; - }; - - String STR_ERR_TEXTNOTFOUND - { - Text [ en-US ] = "No alternatives found." ; - }; - - Image IMG_DEFAULT_VENDOR - { - ImageBitmap = Bitmap { File = "vendor01.png"; }; - }; -}; - diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx index f1c5209be7e9..a0c73bbb7b57 100644 --- a/cui/source/dialogs/thesdlg_impl.hxx +++ b/cui/source/dialogs/thesdlg_impl.hxx @@ -55,14 +55,14 @@ using namespace ::com::sun::star; using ::rtl::OUString; class SvLBoxEntry; -class ThesaurusAlternativesCtrl_Impl; +class ThesaurusAlternativesCtrl; -class AlternativesString_Impl : public SvLBoxString +class AlternativesString : public SvLBoxString { - ThesaurusAlternativesCtrl_Impl & m_rControlImpl; + ThesaurusAlternativesCtrl& m_rControlImpl; public: - AlternativesString_Impl( ThesaurusAlternativesCtrl_Impl &rControl, + AlternativesString( ThesaurusAlternativesCtrl &rControl, SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& rStr ); virtual void Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry); diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index f9e9571737b1..0899f959350b 100644 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -212,7 +212,6 @@ #define RID_SVX_GRFFILTER_DLG_EMBOSS_TAB (RID_SVX_START + 337) #define RID_SVXDLG_SEARCHATTR (RID_SVX_START + 22) #define RID_SVXDLG_HYPHENATE (RID_SVX_START + 30) -#define RID_SVXDLG_THESAURUS (RID_SVX_START + 31) #define RID_SVXSTR_HMERR_CHECKINSTALL (RID_SVX_START + 94) // hyperlink dialog @@ -429,6 +428,8 @@ #define RID_SVXSTR_EVENT_CALCULATE (RID_SVX_START + 1193) #define RID_SVXSTR_EVENT_CONTENTCHANGED (RID_SVX_START + 1194) +#define RID_SVXSTR_ERR_TEXTNOTFOUND (RID_SVX_START + 1195) + #define RID_SVXDLG_CERTPATH (RID_SVX_START + 1198) #define RID_CUI_DIALOG_COLORPICKER (RID_SVX_START + 3) diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc index 169b1ef45e3e..432992e07672 100644 --- a/cui/source/inc/helpid.hrc +++ b/cui/source/inc/helpid.hrc @@ -376,7 +376,6 @@ #define HID_OFAPAGE_QUOTE_SW_CLB "CUI_HID_OFAPAGE_QUOTE_SW_CLB" #define HID_OFAPAGE_QUOTE_CLB "CUI_HID_OFAPAGE_QUOTE_CLB" #define HID_POSTIT_DIALOG "CUI_HID_POSTIT_DIALOG" -#define HID_CT_THES_ALTERNATIVES "CUI_HID_CT_THES_ALTERNATIVES" #define HID_DLG_PASSWORD_TO_OPEN_MODIFY "CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY" #define HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_OPEN "CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_OPEN" diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index 8809c5a38417..c6b43a646e35 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx @@ -35,24 +35,23 @@ using namespace ::com::sun::star; class SvxThesaurusDialog; -class LookUpComboBox_Impl : public ComboBox +class LookUpComboBox : public ComboBox { Timer m_aModifyTimer; Selection m_aSelection; - Button * m_pBtn; - SvxThesaurusDialog& m_rDialogImpl; + SvxThesaurusDialog* m_pDialog; /// disable copy ctor and assignment operator - LookUpComboBox_Impl( const LookUpComboBox_Impl & ); - LookUpComboBox_Impl & operator = ( const LookUpComboBox_Impl & ); + LookUpComboBox( const LookUpComboBox & ); + LookUpComboBox& operator = ( const LookUpComboBox & ); public: - LookUpComboBox_Impl( Window *pParent, const ResId &rResId, SvxThesaurusDialog &rImpl ); - virtual ~LookUpComboBox_Impl(); + LookUpComboBox(Window *pParent); + virtual ~LookUpComboBox(); DECL_LINK( ModifyTimer_Hdl, Timer * ); - void SetButton( Button *pBtn ) { m_pBtn = pBtn; } + void init(SvxThesaurusDialog *pDialog); // ComboBox virtual void Modify(); @@ -75,21 +74,23 @@ public: const String& GetText() const { return sText; } }; -class ThesaurusAlternativesCtrl_Impl : - public SvxCheckListBox +class ThesaurusAlternativesCtrl + : public SvxCheckListBox { - SvxThesaurusDialog& m_rDialogImpl; + SvxThesaurusDialog* m_pDialog; typedef std::map< const SvLBoxEntry *, AlternativesExtraData > UserDataMap_t; UserDataMap_t m_aUserData; /// disable copy ctor and assignment operator - ThesaurusAlternativesCtrl_Impl( const ThesaurusAlternativesCtrl_Impl & ); - ThesaurusAlternativesCtrl_Impl & operator = ( const ThesaurusAlternativesCtrl_Impl & ); + ThesaurusAlternativesCtrl( const ThesaurusAlternativesCtrl & ); + ThesaurusAlternativesCtrl & operator = ( const ThesaurusAlternativesCtrl & ); public: - ThesaurusAlternativesCtrl_Impl( Window* pParent, SvxThesaurusDialog &rImpl ); - virtual ~ThesaurusAlternativesCtrl_Impl(); + ThesaurusAlternativesCtrl(Window* pParent); + + void init(SvxThesaurusDialog *pDialog); + virtual ~ThesaurusAlternativesCtrl(); SvLBoxEntry * AddEntry( sal_Int32 nVal, const String &rText, bool bIsHeader ); @@ -102,19 +103,19 @@ public: virtual void Paint( const Rectangle& rRect ); }; -class ReplaceEdit_Impl : public Edit +class ReplaceEdit : public Edit { Button * m_pBtn; /// disable copy ctor and assignment operator - ReplaceEdit_Impl( const ReplaceEdit_Impl & ); - ReplaceEdit_Impl & operator = ( const ReplaceEdit_Impl & ); + ReplaceEdit( const ReplaceEdit & ); + ReplaceEdit & operator = ( const ReplaceEdit & ); public: - ReplaceEdit_Impl( Window *pParent, const ResId &rResId ); - virtual ~ReplaceEdit_Impl(); + ReplaceEdit(Window *pParent); + virtual ~ReplaceEdit(); - void SetButton( Button *pBtn ) { m_pBtn = pBtn; } + void init(Button *pBtn) { m_pBtn = pBtn; } // Edit virtual void Modify(); @@ -124,22 +125,13 @@ public: class SvxThesaurusDialog : public SvxStandardDialog { - FixedImage aVendorImageFI; - ImageButton aLeftBtn; - FixedText aWordText; - LookUpComboBox_Impl aWordCB; - FixedText m_aAlternativesText; - boost::shared_ptr< ThesaurusAlternativesCtrl_Impl > m_pAlternativesCT; - FixedText aReplaceText; - ReplaceEdit_Impl aReplaceEdit; - FixedLine aFL; - HelpButton aHelpBtn; - MenuButton aLangMBtn; - OKButton aReplaceBtn; - CancelButton aCancelBtn; + PushButton* m_pLeftBtn; + LookUpComboBox* m_pWordCB; + ThesaurusAlternativesCtrl* m_pAlternativesCT; + ReplaceEdit* m_pReplaceEdit; + MenuButton* m_pLangMBtn; - String aErrStr; - Image aVendorDefaultImage; + OUString m_aErrStr; uno::Reference< linguistic2::XThesaurus > xThesaurus; OUString aLookUpText; @@ -149,9 +141,10 @@ class SvxThesaurusDialog : public SvxStandardDialog public: bool WordFound() const { return m_bWordFound; } - OUString getErrStr() const { return aErrStr; } + OUString getErrStr() const { return m_aErrStr; } // Handler + DECL_LINK( ReplaceBtnHdl_Impl, Button * ); DECL_LINK( LeftBtnHdl_Impl, Button * ); DECL_LINK( LanguageHdl_Impl, MenuButton * ); DECL_LINK( LookUpHdl_Impl, Button * ); @@ -160,13 +153,11 @@ public: DECL_LINK( AlternativesDoubleClickHdl_Impl, SvxCheckListBox * ); DECL_STATIC_LINK( SvxThesaurusDialog, SelectFirstHdl_Impl, SvxCheckListBox * ); - DECL_STATIC_LINK( SvxThesaurusDialog, VendorImageInitHdl, SvxThesaurusDialog * ); uno::Sequence< uno::Reference< linguistic2::XMeaning > > queryMeanings_Impl( ::rtl::OUString& rTerm, const lang::Locale& rLocale, const beans::PropertyValues& rProperties ) throw(lang::IllegalArgumentException, uno::RuntimeException); bool UpdateAlternativesBox_Impl(); - void UpdateVendorImage(); void LookUp( const String &rText ); void LookUp_Impl(); virtual void Apply(); diff --git a/cui/uiconfig/ui/thesaurus.ui b/cui/uiconfig/ui/thesaurus.ui new file mode 100644 index 000000000000..8df35d08561d --- /dev/null +++ b/cui/uiconfig/ui/thesaurus.ui @@ -0,0 +1,217 @@ + + + + + False + 5 + Thesaurus + dialog + + + False + vertical + 2 + + + False + end + + + gtk-help + False + True + True + True + False + True + + + False + True + 0 + + + + + Replace + False + True + True + True + True + False + + + False + True + 1 + + + + + gtk-cancel + False + True + True + True + False + True + + + False + True + 2 + + + + + False + True + end + 0 + + + + + True + False + 6 + 6 + + + True + False + 0 + Current word + + + 1 + 0 + 2 + 1 + + + + + True + False + 0 + Alternatives + + + 0 + 2 + 3 + 1 + + + + + True + False + 0 + Replace with + + + 0 + 4 + 3 + 1 + + + + + True + True + â— + + + 0 + 5 + 3 + 1 + + + + + True + False + True + 0 + 1 + + + 1 + 1 + 1 + 1 + + + + + False + True + True + True + start + False + image1 + + + 0 + 1 + 1 + 1 + + + + + True + False + + + 2 + 1 + 1 + 1 + + + + + 500 + 300 + True + False + label + + + 0 + 3 + 3 + 1 + + + + + + + + True + True + 1 + + + + + + help + replace + cancel + + + + True + False + gtk-go-back + + From b243afd8755c2a470c6aa0607f5773bedd026937 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 4 Oct 2012 11:51:36 +0100 Subject: [PATCH 294/863] callcatcher: update unused code list and remove code freshly unused post widget layout introduction Change-Id: Ifa244391f7f2b565dec10314ca3fd2958dfd87a9 --- cui/source/dialogs/cuicharmap.cxx | 7 +-- cui/source/inc/chardlg.hxx | 1 - cui/source/inc/cuicharmap.hxx | 3 -- cui/source/tabpages/chardlg.cxx | 9 +--- svtools/inc/svtools/ctrltool.hxx | 8 --- svtools/source/control/ctrltool.cxx | 77 ----------------------------- unotools/inc/unotools/lingucfg.hxx | 2 - unotools/source/config/lingucfg.cxx | 58 ---------------------- unusedcode.easy | 21 ++++---- vcl/inc/vcl/arrange.hxx | 1 - vcl/inc/vcl/dialog.hxx | 1 - vcl/inc/vcl/tabctrl.hxx | 1 - vcl/source/control/tabctrl.cxx | 9 +--- vcl/source/window/arrange.cxx | 8 --- vcl/source/window/dialog.cxx | 11 ----- 15 files changed, 15 insertions(+), 202 deletions(-) diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 06be05701243..aea38b922fab 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -170,12 +170,7 @@ short SvxCharacterMap::Execute() // class SvxShowText ===================================================== -SvxShowText::SvxShowText( Window* pParent, const ResId& rResId, sal_Bool bCenter ) -: Control( pParent, rResId ), - mbCenter( bCenter) -{} - -SvxShowText::SvxShowText( Window* pParent, sal_Bool bCenter ) +SvxShowText::SvxShowText(Window* pParent, sal_Bool bCenter) : Control( pParent ), mbCenter( bCenter) {} diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index 90abbb1ed780..ca86ac553fb0 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -60,7 +60,6 @@ protected: sal_Bool m_bPreviewBackgroundToCharacter; - SvxCharBasePage(Window* pParent, const ResId& rResIdTabPage, const SfxItemSet&); SvxCharBasePage(Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription, const SfxItemSet& rItemset); virtual ~SvxCharBasePage(); diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx index b556a4075389..58fa72bab6b2 100644 --- a/cui/source/inc/cuicharmap.hxx +++ b/cui/source/inc/cuicharmap.hxx @@ -48,9 +48,6 @@ namespace svx class SvxShowText : public Control { public: - SvxShowText( Window* pParent, - const ResId& rResId, - sal_Bool bCenter = sal_False ); SvxShowText( Window* pParent, sal_Bool bCenter = sal_False ); ~SvxShowText(); diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index c2a0228a6589..1d340290ad52 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -184,14 +184,7 @@ inline SvxFont& SvxCharBasePage::GetPreviewCTLFont() // ----------------------------------------------------------------------- -SvxCharBasePage::SvxCharBasePage( Window* pParent, const ResId& rResId, const SfxItemSet& rItemset) - : SfxTabPage( pParent, rResId, rItemset ) - , m_pPreviewWin(NULL) - , m_bPreviewBackgroundToCharacter( sal_False ) -{ -} - -SvxCharBasePage::SvxCharBasePage( Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription, const SfxItemSet& rItemset) +SvxCharBasePage::SvxCharBasePage(Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription, const SfxItemSet& rItemset) : SfxTabPage( pParent, rID, rUIXMLDescription, rItemset ) , m_pPreviewWin(NULL) , m_bPreviewBackgroundToCharacter( sal_False ) diff --git a/svtools/inc/svtools/ctrltool.hxx b/svtools/inc/svtools/ctrltool.hxx index 4fa406616330..f7c4cc59abab 100644 --- a/svtools/inc/svtools/ctrltool.hxx +++ b/svtools/inc/svtools/ctrltool.hxx @@ -92,13 +92,6 @@ Name generiert, der dem Anwender praesentiert werden kann. -------------------------------------------------------------------------- -XubString FontList::GetFontMapText( const FontInfo& rInfo ) const; - -Diese Methode gibt einen Matchstring zurueck, der dem Anwender -anzeigen soll, welche Probleme es mit diesem Font geben kann. - --------------------------------------------------------------------------- - FontInfo FontList::Get( const String& rName, const String& rStyleName ) const; Diese Methode sucht aus dem uebergebenen Namen und dem uebergebenen StyleName @@ -189,7 +182,6 @@ public: OutputDevice* GetDevice() const { return mpDev; } OutputDevice* GetDevice2() const { return mpDev2; } - XubString GetFontMapText( const FontInfo& rInfo ) const; const XubString& GetNormalStr() const { return maNormal; } const XubString& GetItalicStr() const { return maNormalItalic; } diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx index 3c8ff6c00862..25b68786465d 100644 --- a/svtools/source/control/ctrltool.cxx +++ b/svtools/source/control/ctrltool.cxx @@ -519,83 +519,6 @@ XubString FontList::GetStyleName( const FontInfo& rInfo ) const return aStyleName; } -// ----------------------------------------------------------------------- - -XubString FontList::GetFontMapText( const FontInfo& rInfo ) const -{ - if ( !rInfo.GetName().Len() ) - { - XubString aEmptryStr; - return aEmptryStr; - } - - // Search Fontname - ImplFontListNameInfo* pData = ImplFindByName( rInfo.GetName() ); - if ( !pData ) - { - if ( !maMapNotAvailable.Len() ) - ((FontList*)this)->maMapNotAvailable = SVT_RESSTR(STR_SVT_FONTMAP_NOTAVAILABLE); - return maMapNotAvailable; - } - - // search for synthetic style - sal_uInt16 nType = pData->mnType; - const XubString& rStyleName = rInfo.GetStyleName(); - if ( rStyleName.Len() ) - { - sal_Bool bNotSynthetic = sal_False; - sal_Bool bNoneAvailable = sal_False; - FontWeight eWeight = rInfo.GetWeight(); - FontItalic eItalic = rInfo.GetItalic(); - ImplFontListFontInfo* pFontInfo = pData->mpFirst; - while ( pFontInfo ) - { - if ( (eWeight == pFontInfo->GetWeight()) && - (eItalic == pFontInfo->GetItalic()) ) - { - bNotSynthetic = sal_True; - break; - } - - pFontInfo = pFontInfo->mpNext; - } - - if ( bNoneAvailable ) - { - XubString aEmptryStr; - return aEmptryStr; - } - else if ( !bNotSynthetic ) - { - if ( !maMapStyleNotAvailable.Len() ) - ((FontList*)this)->maMapStyleNotAvailable = SVT_RESSTR(STR_SVT_FONTMAP_STYLENOTAVAILABLE); - return maMapStyleNotAvailable; - } - } - - // Only Printer-Font? - if ( (nType & (FONTLIST_FONTNAMETYPE_PRINTER | FONTLIST_FONTNAMETYPE_SCREEN)) == FONTLIST_FONTNAMETYPE_PRINTER ) - { - if ( !maMapPrinterOnly.Len() ) - ((FontList*)this)->maMapPrinterOnly = SVT_RESSTR(STR_SVT_FONTMAP_PRINTERONLY); - return maMapPrinterOnly; - } - // Only Screen-Font? - else if ( (nType & (FONTLIST_FONTNAMETYPE_PRINTER | FONTLIST_FONTNAMETYPE_SCREEN)) == FONTLIST_FONTNAMETYPE_SCREEN - && rInfo.GetType() == TYPE_RASTER ) - { - if ( !maMapScreenOnly.Len() ) - ((FontList*)this)->maMapScreenOnly = SVT_RESSTR(STR_SVT_FONTMAP_SCREENONLY); - return maMapScreenOnly; - } - else - { - if ( !maMapBoth.Len() ) - ((FontList*)this)->maMapBoth = SVT_RESSTR(STR_SVT_FONTMAP_BOTH); - return maMapBoth; - } -} - namespace { FontInfo makeMissing(ImplFontListFontInfo* pFontNameInfo, const rtl::OUString &rName, diff --git a/unotools/inc/unotools/lingucfg.hxx b/unotools/inc/unotools/lingucfg.hxx index c02dabb15d67..88aaa4a5ba56 100644 --- a/unotools/inc/unotools/lingucfg.hxx +++ b/unotools/inc/unotools/lingucfg.hxx @@ -216,10 +216,8 @@ public: // functions returning file URLs to the respective images (if found) and empty string otherwise ::rtl::OUString GetSpellAndGrammarContextSuggestionImage( const ::rtl::OUString &rServiceImplName ) const; ::rtl::OUString GetSpellAndGrammarContextDictionaryImage( const ::rtl::OUString &rServiceImplName ) const; - ::rtl::OUString GetThesaurusDialogImage( const ::rtl::OUString &rServiceImplName ) const; ::rtl::OUString GetSynonymsContextImage( const ::rtl::OUString &rServiceImplName ) const; - bool HasVendorImages( const char *pImageName ) const; bool HasGrammarChecker() const; }; diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx index e8956c464d18..a291a95e3e70 100644 --- a/unotools/source/config/lingucfg.cxx +++ b/unotools/source/config/lingucfg.cxx @@ -1211,22 +1211,6 @@ rtl::OUString SvtLinguConfig::GetSpellAndGrammarContextDictionaryImage( return aRes; } - -::rtl::OUString SvtLinguConfig::GetThesaurusDialogImage( - const ::rtl::OUString &rServiceImplName -) const -{ - rtl::OUString aRes; - if (!rServiceImplName.isEmpty()) - { - rtl::OUString aImageName( A2OU( "ThesaurusDialogImage" )); - rtl::OUString aPath( GetVendorImageUrl_Impl( rServiceImplName, aImageName ) ); - aRes = aPath; - } - return aRes; -} - - ::rtl::OUString SvtLinguConfig::GetSynonymsContextImage( const ::rtl::OUString &rServiceImplName ) const @@ -1241,48 +1225,6 @@ rtl::OUString SvtLinguConfig::GetSpellAndGrammarContextDictionaryImage( return aRes; } - -bool SvtLinguConfig::HasVendorImages( const char *pImageName ) const -{ - bool bRes = false; - if (pImageName) - { - try - { - uno::Reference< container::XNameAccess > xNA( GetMainUpdateAccess(), uno::UNO_QUERY_THROW ); - xNA.set( xNA->getByName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Images")) ), uno::UNO_QUERY_THROW ); - xNA.set( xNA->getByName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VendorImages")) ), uno::UNO_QUERY_THROW ); - - uno::Sequence< rtl::OUString > aElementNames( xNA->getElementNames() ); - sal_Int32 nVendors = aElementNames.getLength(); - const rtl::OUString *pVendor = aElementNames.getConstArray(); - for (sal_Int32 i = 0; i < nVendors; ++i) - { - uno::Reference< container::XNameAccess > xNA2( xNA->getByName( pVendor[i] ), uno::UNO_QUERY_THROW ); - uno::Sequence< rtl::OUString > aPropNames( xNA2->getElementNames() ); - sal_Int32 nProps = aPropNames.getLength(); - const rtl::OUString *pPropNames = aPropNames.getConstArray(); - for (sal_Int32 k = 0; k < nProps; ++k) - { - // for a quicker check we ignore the HC image names here - const OUString &rName = pPropNames[k]; - if (rName.equalsAscii( pImageName )) - { - bRes = true; - break; - } - } - } - } - catch (uno::Exception &) - { - DBG_ASSERT( 0, "exception caught. HasVendorImages failed" ); - } - } - return bRes; -} - - bool SvtLinguConfig::HasGrammarChecker() const { bool bRes = false; diff --git a/unusedcode.easy b/unusedcode.easy index 1ac930675dc3..94904ce7dccf 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1,12 +1,18 @@ FontSelectPattern::FontSelectPattern(PhysicalFontFace const&, Size const&, float, int, bool) -PopupMenu::SetSelectedEntry(unsigned short) RelatedMultipart::getIds() SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, unsigned int, unsigned char) +ScConditionalFormat::dumpInfo(rtl::OUStringBuffer&) const ScMenuFloatingWindow::getDoc() ScVbaFormat::setNumberFormat(com::sun::star::lang::Locale, rtl::OUString const&) ScVbaFormat::getAddIndent() ScVbaFormat::setAddIndent(com::sun::star::uno::Any const&) ScVbaFormat::setNumberFormat(com::sun::star::lang::Locale, rtl::OUString const&) +SvLBoxTreeList::Clone(SvListEntry*, unsigned long&) const +SvLBoxTreeList::Prev(SvListEntry*, unsigned short*) const +SvTreeEntryList::front() +SvtToolPanelOptions::AddListenerLink(Link const&) +SvtToolPanelOptions::RemoveListenerLink(Link const&) +SvxAutoCorrect::DeleteText(String const&, unsigned short) TextEngine::GetLeftMargin() const ThumbnailView::GetItemCount() const ThumbnailView::ImplScroll(Point const&) @@ -81,14 +87,6 @@ oox::ole::AxFormPageModel::AxFormPageModel() oox::ole::AxMultiPageModel::AxMultiPageModel() oox::ole::AxTabStripModel::AxTabStripModel() oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper const&) -sd::ClientBox::GetMinOutputSizePixel() const -sd::ClientBox::RemoveUnlocked() -sd::ClientBox::SetScrollHdl(Link const&) -sd::ClientBox::checkEntries() -sd::ClientBox::checkIndex(int) const -sd::ClientBox::prepareChecking() -sd::ClientBox::removeEntry(sd::ClientInfo const*) -sd::ClientBox::updateEntry(sd::ClientInfo const*) sd::Communicator::getTransmitter() sd::ImagePreparer::notesToHtml(unsigned int) sd::LeftDrawPaneShell::RegisterInterface(SfxModule*) @@ -99,5 +97,10 @@ sd::framework::ReadOnlyModeObserver::AddStatusListener(com::sun::star::uno::Refe sd::framework::ReadOnlyModeObserver::ReadOnlyModeObserver(com::sun::star::uno::Reference const&) sd::framework::ResourceManager::Disable() sd::framework::ResourceManager::Enable() +sd::slidesorter::controller::AnimationFunction::Blend(double, double, double) +sd::slidesorter::controller::AnimationFunction::Linear(double) +sd::slidesorter::controller::Properties::IsHighContrastModeActive() const +sd::slidesorter::view::ToolTip::ShowDefaultHelpText() +sd::slidesorter::view::ToolTip::ShowHelpText(rtl::OUString const&) std::__cxx1998::vector >::~vector() std::__cxx1998::vector, std::allocator >, std::basic_string, std::allocator > >, std::allocator, std::allocator >, std::basic_string, std::allocator > > > >::~vector() diff --git a/vcl/inc/vcl/arrange.hxx b/vcl/inc/vcl/arrange.hxx index 2197f10dfd80..90316bdd7d09 100644 --- a/vcl/inc/vcl/arrange.hxx +++ b/vcl/inc/vcl/arrange.hxx @@ -347,7 +347,6 @@ namespace vcl resize(); } - void setWindow( Window*, sal_Int32 i_nExpandPrio = 0 ); void setChild( boost::shared_ptr const &, sal_Int32 i_nExpandPrio = 0 ); // convenience: use for setChild( new WindowArranger( ... ) ) constructs void setChild( WindowArranger* i_pChild, sal_Int32 i_nExpandPrio = 0 ) diff --git a/vcl/inc/vcl/dialog.hxx b/vcl/inc/vcl/dialog.hxx index 107c29d1a464..22ca60951970 100644 --- a/vcl/inc/vcl/dialog.hxx +++ b/vcl/inc/vcl/dialog.hxx @@ -91,7 +91,6 @@ protected: public: Dialog( Window* pParent, WinBits nStyle = WB_STDDIALOG ); - Dialog( Window* pParent, const ResId& rResId ); Dialog( Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription ); virtual ~Dialog(); diff --git a/vcl/inc/vcl/tabctrl.hxx b/vcl/inc/vcl/tabctrl.hxx index 1de45f3f9d84..f913c0f8188c 100644 --- a/vcl/inc/vcl/tabctrl.hxx +++ b/vcl/inc/vcl/tabctrl.hxx @@ -121,7 +121,6 @@ public: virtual long DeactivatePage(); virtual Size GetOptimalSize(WindowSizeType eType) const; - void SetMinimumSizePixel( const Size& ); void SetTabPageSizePixel( const Size& rSize ); Size GetTabPageSizePixel() const; diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index a3c6ff6d7a8b..2ad68d1f24b5 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -80,7 +80,6 @@ struct ImplTabCtrlData Point maItemsOffset; // offset of the tabitems std::vector< ImplTabItem > maItemList; ListBox* mpListBox; - Size maMinSize; }; // ----------------------------------------------------------------------- @@ -2224,18 +2223,12 @@ Size TabControl::calculateRequisition() const Size TabControl::GetOptimalSize(WindowSizeType eType) const { if (eType == WINDOWSIZE_MINIMUM) - return mpTabCtrlData ? mpTabCtrlData->maMinSize : Size(); + return Size(); return calculateRequisition(); } // ----------------------------------------------------------------------- -void TabControl::SetMinimumSizePixel( const Size& i_rSize ) -{ - if( mpTabCtrlData ) - mpTabCtrlData->maMinSize = i_rSize; -} - void TabControl::ReassignPageId(sal_uInt16 nOldId, sal_uInt16 nNewId) { for( std::vector< ImplTabItem >::iterator it = mpTabCtrlData->maItemList.begin(); diff --git a/vcl/source/window/arrange.cxx b/vcl/source/window/arrange.cxx index e24706fb459d..56ad168ef7e2 100644 --- a/vcl/source/window/arrange.cxx +++ b/vcl/source/window/arrange.cxx @@ -774,14 +774,6 @@ void Indenter::resize() m_aElement.setPosSize( aPt, aSz ); } -void Indenter::setWindow( Window* i_pWindow, sal_Int32 i_nExpandPrio ) -{ - OSL_VERIFY( (m_aElement.m_pElement == 0 && m_aElement.m_pChild == 0) || i_pWindow == 0 ); - OSL_VERIFY( i_pWindow == 0 || i_pWindow->GetParent() == m_pParentWindow ); - m_aElement.m_pElement = i_pWindow; - m_aElement.m_nExpandPriority = i_nExpandPrio; -} - void Indenter::setChild( boost::shared_ptr const & i_pChild, sal_Int32 i_nExpandPrio ) { OSL_VERIFY( (m_aElement.m_pElement == 0 && m_aElement.m_pChild == 0 ) || i_pChild == 0 ); diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 65a72fbd9172..7a17f0ffdbed 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -547,17 +547,6 @@ Dialog::Dialog( Window* pParent, WinBits nStyle ) ImplInit( pParent, nStyle ); } -// ----------------------------------------------------------------------- - -Dialog::Dialog( Window* pParent, const ResId& rResId ) - : SystemWindow( WINDOW_DIALOG ) - , mbIsDefferedInit(false) -{ - ImplInitDialogData(); - rResId.SetRT( RSC_DIALOG ); - init(pParent, rResId); -} - VclBuilder* VclBuilderContainer::overrideResourceWithUIXML(Window *pWindow, const ResId& rResId) { sal_Int32 nUIid = static_cast(rResId.GetId()); From 0f3f9cb63056715845d9c3565bde69470c73efb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 4 Oct 2012 12:49:08 +0100 Subject: [PATCH 295/863] Related: rhbz#862467 band-aid when creating embedded object fails Change-Id: Ie5ecc8f56636e692a6e17a2e8fab0cefd46cdfb4 --- writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index 8670a45ffbb6..920bf31faa94 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -2474,6 +2474,9 @@ void OOXMLFastContextHandlerMath::process() comphelper::EmbeddedObjectContainer container; OUString aName; uno::Reference< embed::XEmbeddedObject > ref = container.CreateEmbeddedObject( name.GetByteSequence(), aName ); + assert(ref.is()); + if (!ref.is()) + return; uno::Reference< uno::XInterface > component( ref->getComponent(), uno::UNO_QUERY ); // gcc4.4 (and 4.3 and possibly older) have a problem with dynamic_cast directly to the target class, // so help it with an intermediate cast. I'm not sure what exactly the problem is, seems to be unrelated From c25cb8a641723ab098980bb842caf75c0dc9b059 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 2 Oct 2012 15:03:12 +0200 Subject: [PATCH 296/863] fdo#46808, Adapt task::InteractionHandler UNO service to new style Since we don't need to expose XInitialisation, we can make the new-style service implement XInteractionHandler2. Change-Id: Ib27beed1c12df17592c6472d6f58c233d2c41558 --- basctl/source/basicide/moduldl2.cxx | 36 +++++------- comphelper/inc/comphelper/ihwrapnofilter.hxx | 15 +++-- comphelper/source/misc/ihwrapnofilter.cxx | 20 +++++++ connectivity/inc/connectivity/dbtools.hxx | 2 +- .../inc/connectivity/virtualdbtools.hxx | 2 +- connectivity/source/commontools/dbtools.cxx | 25 ++++---- .../source/simpledbt/staticdbtools_s.cxx | 4 +- .../source/simpledbt/staticdbtools_s.hxx | 2 +- cui/source/dialogs/insdlg.cxx | 25 +++----- cui/source/options/webconninfo.cxx | 10 ++-- .../core/dataaccess/databasecontext.cxx | 3 +- .../core/dataaccess/documentdefinition.cxx | 12 ++-- .../ext/macromigration/docinteraction.cxx | 3 +- dbaccess/source/filter/xml/dbloader2.cxx | 6 +- dbaccess/source/inc/stringconstants.hrc | 1 - dbaccess/source/inc/stringconstants.inc | 1 - dbaccess/source/ui/browser/brwctrlr.cxx | 7 +-- dbaccess/source/ui/browser/unodatbr.cxx | 10 ++-- dbaccess/source/ui/dlg/CollectionView.cxx | 32 +++++----- dbaccess/source/ui/dlg/ConnectionHelper.cxx | 7 ++- dbaccess/source/ui/dlg/DbAdminImpl.cxx | 6 +- dbaccess/source/ui/dlg/dbwizsetup.cxx | 7 +-- dbaccess/source/ui/dlg/tablespage.cxx | 3 +- dbaccess/source/ui/inc/UITools.hxx | 8 +-- dbaccess/source/ui/misc/TokenWriter.cxx | 2 +- dbaccess/source/ui/misc/UITools.cxx | 18 ++---- dbaccess/source/ui/misc/WCopyTable.cxx | 3 +- .../source/ui/misc/datasourceconnector.cxx | 12 ++-- dbaccess/source/ui/uno/copytablewizard.cxx | 5 +- dbaccess/source/ui/uno/dbinteraction.cxx | 4 +- dbaccess/source/ui/uno/dbinteraction.hxx | 3 + desktop/source/app/configinit.cxx | 15 +---- desktop/source/app/dispatchwatcher.cxx | 9 +-- .../gui/dp_gui_extensioncmdqueue.cxx | 6 +- .../deployment/gui/dp_gui_updatedialog.cxx | 15 ++--- embedserv/source/embed/docholder.cxx | 7 +-- .../source/abpilot/datasourcehandling.cxx | 8 +-- extensions/source/bibliography/datman.cxx | 7 +-- extensions/source/dbpilots/controlwizard.cxx | 8 ++- extensions/source/update/check/updatehdl.cxx | 7 +-- .../source/xsltdialog/xmlfiltertestdialog.cxx | 10 ++-- forms/source/xforms/submission/replace.cxx | 6 +- forms/source/xforms/submission/submission.hxx | 4 +- .../xforms/submission/submission_get.cxx | 10 ++-- .../xforms/submission/submission_get.hxx | 4 +- fpicker/source/office/fpsmartcontent.cxx | 9 +-- fpicker/source/office/iodlg.cxx | 11 ++-- offapi/UnoApi_offapi.mk | 2 +- .../com/sun/star/task/InteractionHandler.idl | 27 ++------- offapi/type_reference/types.rdb | Bin 7655424 -> 7655424 bytes .../source/core/api/ReportDefinition.cxx | 5 +- sc/CppunitTest_sc_ucalc.mk | 1 + sc/source/core/data/dpobject.cxx | 7 +-- sc/source/ui/dbgui/dapidata.cxx | 7 +-- sc/source/ui/docshell/dbdocimp.cxx | 7 +-- sfx2/source/appl/shutdownicon.cxx | 6 +- sfx2/source/bastyp/helper.cxx | 9 +-- sfx2/source/control/templateremoteview.cxx | 6 +- sfx2/source/dialog/templateinfodlg.cxx | 6 +- sfx2/source/doc/docfile.cxx | 14 ++--- sfx2/source/doc/doctemplates.cxx | 12 ++-- sfx2/source/doc/guisaveas.cxx | 5 +- sfx2/source/doc/objserv.cxx | 32 ++++------ .../passwordcontainer/passwordcontainer.cxx | 11 +++- svtools/source/contnr/fileview.cxx | 12 ++-- svtools/source/contnr/templwin.cxx | 10 ++-- .../source/dialogs/ServerDetailsControls.cxx | 6 +- svtools/source/dialogs/addresstemplate.cxx | 8 ++- svx/inc/svx/dbtoolsclient.hxx | 2 +- svx/source/fmcomp/fmgridcl.cxx | 3 +- svx/source/form/dbtoolsclient.cxx | 4 +- svx/source/form/fmvwimp.cxx | 2 +- svx/source/form/formcontroller.cxx | 4 +- sw/CppunitTest_sw_subsequent_odfexport.mk | 1 + sw/CppunitTest_sw_subsequent_odfimport.mk | 1 + sw/source/ui/dbui/addresslistdialog.cxx | 6 +- sw/source/ui/dbui/dbmgr.cxx | 10 ++-- ucb/workben/ucb/ucbdemo.cxx | 12 ++-- .../sun/star/task/XInteractionHandler2.idl | 2 +- uui/source/iahndl.cxx | 55 +++++------------- uui/source/iahndl.hxx | 8 ++- uui/source/interactionhandler.cxx | 18 +++++- uui/source/interactionhandler.hxx | 6 +- .../nss/securityenvironment_nssimpl.cxx | 48 +++++++-------- 84 files changed, 370 insertions(+), 435 deletions(-) diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index 20b4bcd99105..f14611836c2d 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -50,6 +50,7 @@ #include #include #include +#include #include #include #include "com/sun/star/ucb/XCommandEnvironment.hpp" @@ -1253,21 +1254,16 @@ void LibPage::ExportAsPackage( const String& aLibName ) { // file open dialog Reference< lang::XMultiServiceFactory > xMSF( ::comphelper::getProcessServiceFactory() ); - Reference< task::XInteractionHandler > xHandler; - Reference< XSimpleFileAccess2 > xSFA; + Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); + Reference< task::XInteractionHandler > xHandler( task::InteractionHandler::createDefault(xContext), UNO_QUERY ); + Reference< XSimpleFileAccess2 > xSFA = SimpleFileAccess::create(xContext); + Reference < XFilePicker > xFP; - if( xMSF.is() ) - { - xHandler = Reference< task::XInteractionHandler >( xMSF->createInstance - ( DEFINE_CONST_UNICODE("com.sun.star.task.InteractionHandler") ), UNO_QUERY ); + Sequence aServiceType(1); + aServiceType[0] <<= TemplateDescription::FILESAVE_SIMPLE; + xFP = Reference< XFilePicker >( xMSF->createInstanceWithArguments( + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ) ), aServiceType ), UNO_QUERY ); - xSFA = SimpleFileAccess::create(comphelper::getProcessComponentContext()); - - Sequence aServiceType(1); - aServiceType[0] <<= TemplateDescription::FILESAVE_SIMPLE; - xFP = Reference< XFilePicker >( xMSF->createInstanceWithArguments( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ) ), aServiceType ), UNO_QUERY ); - } xFP->setTitle( String( IDEResId( RID_STR_EXPORTPACKAGE ) ) ); // filter @@ -1387,16 +1383,10 @@ void LibPage::ExportAsBasic( const String& aLibName ) { // Folder picker Reference< lang::XMultiServiceFactory > xMSF( ::comphelper::getProcessServiceFactory() ); - Reference< XFolderPicker > xFolderPicker; - Reference< task::XInteractionHandler > xHandler; - if( xMSF.is() ) - { - xFolderPicker = Reference< XFolderPicker >( xMSF->createInstance( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FolderPicker" ) ) ), UNO_QUERY ); - - xHandler = Reference< task::XInteractionHandler >( xMSF->createInstance - ( DEFINE_CONST_UNICODE("com.sun.star.task.InteractionHandler") ), UNO_QUERY ); - } + Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); + Reference< XFolderPicker > xFolderPicker( xMSF->createInstance( + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FolderPicker" ) ) ), UNO_QUERY ); + Reference< task::XInteractionHandler > xHandler( task::InteractionHandler::createDefault(xContext), UNO_QUERY_THROW ); if( xFolderPicker.is() ) { diff --git a/comphelper/inc/comphelper/ihwrapnofilter.hxx b/comphelper/inc/comphelper/ihwrapnofilter.hxx index 539e41ef5921..2ac1ac93d761 100644 --- a/comphelper/inc/comphelper/ihwrapnofilter.hxx +++ b/comphelper/inc/comphelper/ihwrapnofilter.hxx @@ -20,6 +20,7 @@ #ifndef _COMPHELPER_INTERACTIONHANDLERWRAPPER_HXX_ #define _COMPHELPER_INTERACTIONHANDLERWRAPPER_HXX_ +#include #ifndef _COM_SUN_STAR_TASK_XINTERACTIONHANDLER_ #include #endif @@ -36,14 +37,13 @@ #include #endif -#include +#include #include "comphelper/comphelperdllapi.h" namespace comphelper { - class COMPHELPER_DLLPUBLIC OIHWrapNoFilterDialog : public ::cppu::WeakImplHelper3 - < ::com::sun::star::task::XInteractionHandler - , ::com::sun::star::lang::XInitialization + class COMPHELPER_DLLPUBLIC OIHWrapNoFilterDialog : public ::cppu::WeakImplHelper2 + < ::com::sun::star::task::XInteractionHandler2 , ::com::sun::star::lang::XServiceInfo > { com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > m_xInter; @@ -63,6 +63,13 @@ namespace comphelper { virtual void SAL_CALL handle( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest >& xRequest) throw( com::sun::star::uno::RuntimeException ); + //____________________________________________________________________________________________________ + // XInteractionHandler2 + //____________________________________________________________________________________________________ + + virtual sal_Bool SAL_CALL handleInteractionRequest( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest >& xRequest) + throw( com::sun::star::uno::RuntimeException ); + //____________________________________________________________________________________________________ // XInitialization //____________________________________________________________________________________________________ diff --git a/comphelper/source/misc/ihwrapnofilter.cxx b/comphelper/source/misc/ihwrapnofilter.cxx index 238a2d5fb1c5..57c55d8dfde3 100644 --- a/comphelper/source/misc/ihwrapnofilter.cxx +++ b/comphelper/source/misc/ihwrapnofilter.cxx @@ -68,6 +68,26 @@ namespace comphelper m_xInter->handle( xRequest ); } + //---------------------------------------------------------------------------------------------------- + // XInteractionHandler2 + //---------------------------------------------------------------------------------------------------- + sal_Bool SAL_CALL OIHWrapNoFilterDialog::handleInteractionRequest( const uno::Reference< task::XInteractionRequest >& xRequest) + throw( com::sun::star::uno::RuntimeException ) + { + if( !m_xInter.is() ) + return sal_False; + + uno::Any aRequest = xRequest->getRequest(); + document::NoSuchFilterRequest aNoSuchFilterRequest; + if ( aRequest >>= aNoSuchFilterRequest ) + return sal_False; + else + { + m_xInter->handle( xRequest ); + return sal_True; + } + } + //---------------------------------------------------------------------------------------------------- // XInitialization //---------------------------------------------------------------------------------------------------- diff --git a/connectivity/inc/connectivity/dbtools.hxx b/connectivity/inc/connectivity/dbtools.hxx index a0f8bc515db1..7f48e14a68c1 100644 --- a/connectivity/inc/connectivity/dbtools.hxx +++ b/connectivity/inc/connectivity/dbtools.hxx @@ -201,7 +201,7 @@ namespace dbtools const ::rtl::OUString& _rDataSourceName, const ::rtl::OUString& _rUser, const ::rtl::OUString& _rPwd, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory) + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext) SAL_THROW ( (::com::sun::star::sdbc::SQLException) ); diff --git a/connectivity/inc/connectivity/virtualdbtools.hxx b/connectivity/inc/connectivity/virtualdbtools.hxx index dafaa45c4988..0f6f6520ed7b 100644 --- a/connectivity/inc/connectivity/virtualdbtools.hxx +++ b/connectivity/inc/connectivity/virtualdbtools.hxx @@ -120,7 +120,7 @@ namespace connectivity const ::rtl::OUString& _rDataSourceName, const ::rtl::OUString& _rUser, const ::rtl::OUString& _rPwd, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext ) const SAL_THROW ( (::com::sun::star::sdbc::SQLException) ) = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> connectRowset( diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index 4674fe4d2571..e5800bc9dc4d 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -55,7 +55,7 @@ #include #include #include -#include +#include #include #include #include @@ -279,9 +279,9 @@ Reference< XConnection > getConnection_allowException( const ::rtl::OUString& _rsTitleOrPath, const ::rtl::OUString& _rsUser, const ::rtl::OUString& _rsPwd, - const Reference< XMultiServiceFactory>& _rxFactory) + const Reference< XComponentContext>& _rxContext) { - Reference< XDataSource> xDataSource( getDataSource_allowException(_rsTitleOrPath, comphelper::getComponentContext(_rxFactory)) ); + Reference< XDataSource> xDataSource( getDataSource_allowException(_rsTitleOrPath, _rxContext) ); Reference xConnection; if (xDataSource.is()) { @@ -306,12 +306,9 @@ Reference< XConnection > getConnection_allowException( Reference xConnectionCompletion(xProp, UNO_QUERY); if (xConnectionCompletion.is()) { // instantiate the default SDB interaction handler - Reference< XInteractionHandler > xHandler(_rxFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler"))), UNO_QUERY); - OSL_ENSURE(xHandler.is(), "dbtools::getConnection service com.sun.star.task.InteractionHandler not available!"); - if (xHandler.is()) - { - xConnection = xConnectionCompletion->connectWithCompletion(xHandler); - } + Reference< XInteractionHandler > xHandler( + InteractionHandler::createDefault(_rxContext), UNO_QUERY_THROW ); + xConnection = xConnectionCompletion->connectWithCompletion(xHandler); } } else @@ -325,13 +322,13 @@ Reference< XConnection > getConnection_allowException( //------------------------------------------------------------------------------ Reference< XConnection> getConnection_withFeedback(const ::rtl::OUString& _rDataSourceName, - const ::rtl::OUString& _rUser, const ::rtl::OUString& _rPwd, const Reference< XMultiServiceFactory>& _rxFactory) + const ::rtl::OUString& _rUser, const ::rtl::OUString& _rPwd, const Reference< XComponentContext>& _rxContext) SAL_THROW ( (SQLException) ) { Reference< XConnection > xReturn; try { - xReturn = getConnection_allowException(_rDataSourceName, _rUser, _rPwd, _rxFactory); + xReturn = getConnection_allowException(_rDataSourceName, _rUser, _rPwd, _rxContext); } catch(SQLException&) { @@ -350,12 +347,12 @@ Reference< XConnection> getConnection( const ::rtl::OUString& _rsTitleOrPath, const ::rtl::OUString& _rsUser, const ::rtl::OUString& _rsPwd, - const Reference< XMultiServiceFactory>& _rxFactory) + const Reference< XComponentContext>& _rxContext) { Reference< XConnection > xReturn; try { - xReturn = getConnection_allowException(_rsTitleOrPath, _rsUser, _rsPwd, _rxFactory); + xReturn = getConnection_allowException(_rsTitleOrPath, _rsUser, _rsPwd, _rxContext); } catch(Exception&) { @@ -434,7 +431,7 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R if (hasProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), xRowSetProps)) xRowSetProps->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD)) >>= sPwd; - xPureConnection = getConnection_allowException( sDataSourceName, sUser, sPwd, _rxFactory ); + xPureConnection = getConnection_allowException( sDataSourceName, sUser, sPwd, comphelper::getComponentContext(_rxFactory) ); } else if (!sURL.isEmpty()) { // the row set has no data source, but a connection url set diff --git a/connectivity/source/simpledbt/staticdbtools_s.cxx b/connectivity/source/simpledbt/staticdbtools_s.cxx index 797555c0c996..1d8939052326 100644 --- a/connectivity/source/simpledbt/staticdbtools_s.cxx +++ b/connectivity/source/simpledbt/staticdbtools_s.cxx @@ -84,9 +84,9 @@ namespace connectivity //---------------------------------------------------------------- Reference< XConnection> ODataAccessStaticTools::getConnection_withFeedback(const ::rtl::OUString& _rDataSourceName, const ::rtl::OUString& _rUser, - const ::rtl::OUString& _rPwd, const Reference< XMultiServiceFactory>& _rxFactory) const SAL_THROW ( (SQLException) ) + const ::rtl::OUString& _rPwd, const Reference< XComponentContext>& _rxContext) const SAL_THROW ( (SQLException) ) { - return ::dbtools::getConnection_withFeedback(_rDataSourceName, _rUser, _rPwd, _rxFactory); + return ::dbtools::getConnection_withFeedback(_rDataSourceName, _rUser, _rPwd, _rxContext); } //---------------------------------------------------------------- diff --git a/connectivity/source/simpledbt/staticdbtools_s.hxx b/connectivity/source/simpledbt/staticdbtools_s.hxx index 3132f00e36b4..a8597209084b 100644 --- a/connectivity/source/simpledbt/staticdbtools_s.hxx +++ b/connectivity/source/simpledbt/staticdbtools_s.hxx @@ -70,7 +70,7 @@ namespace connectivity const ::rtl::OUString& _rDataSourceName, const ::rtl::OUString& _rUser, const ::rtl::OUString& _rPwd, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext ) const SAL_THROW ( (::com::sun::star::sdbc::SQLException) ); // ------------------------------------------------ diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index f0158b61ec1d..95b2eb13f0d5 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include "insdlg.hxx" #include @@ -341,24 +341,13 @@ short SvInsertOleDlg::Execute() aMedium[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ); aMedium[0].Value <<= ::rtl::OUString( aFileName ); - uno::Reference< task::XInteractionHandler > xInteraction; - uno::Reference< lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory(); - if ( xFactory.is() ) - xInteraction = uno::Reference< task::XInteractionHandler >( - xFactory->createInstance( - DEFINE_CONST_UNICODE("com.sun.star.task.InteractionHandler") ), - uno::UNO_QUERY_THROW ); + uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); + uno::Reference< task::XInteractionHandler > xInteraction( + task::InteractionHandler::createDefault(xContext), + uno::UNO_QUERY_THROW ); - if ( xInteraction.is() ) - { - aMedium[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" ) ); - aMedium[1].Value <<= xInteraction; - } - else - { - OSL_FAIL( "Can not get InteractionHandler!\n" ); - aMedium.realloc( 1 ); - } + aMedium[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" ) ); + aMedium[1].Value <<= xInteraction; // create object from media descriptor if ( bLink ) diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index 0bfdd2527cbf..5b4ca5fcb09f 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -187,9 +188,8 @@ void WebConnectionInfoDialog::FillPasswordList() if ( xMasterPasswd->isPersistentStoringAllowed() ) { uno::Reference< task::XInteractionHandler > xInteractionHandler( - comphelper::getProcessServiceFactory()->createInstance( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.task.InteractionHandler" ) ) ), - uno::UNO_QUERY_THROW ); + task::InteractionHandler::createDefault(comphelper::getProcessComponentContext()), + uno::UNO_QUERY_THROW); uno::Sequence< task::UrlRecord > aURLEntries = xMasterPasswd->getAllPersistent( xInteractionHandler ); sal_Int32 nCount = 0; @@ -297,9 +297,7 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, ChangePasswordHdl) uno::Reference< task::XInteractionRequest > rRequest( pPasswordRequest ); uno::Reference< task::XInteractionHandler > xInteractionHandler( - comphelper::getProcessServiceFactory()->createInstance( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.task.InteractionHandler" ) ) ), + task::InteractionHandler::createDefault(comphelper::getProcessComponentContext()), uno::UNO_QUERY_THROW ); xInteractionHandler->handle( rRequest ); diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx index 4ca37127c2ca..717661d57e46 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.cxx +++ b/dbaccess/source/core/dataaccess/databasecontext.cxx @@ -44,6 +44,7 @@ #include #include #include +#include #include #include @@ -362,7 +363,7 @@ Reference< XInterface > ODatabaseContext::loadObjectFromURL(const ::rtl::OUStrin ::comphelper::NamedValueCollection aArgs; aArgs.put( "URL", _sURL ); aArgs.put( "MacroExecutionMode", MacroExecMode::USE_CONFIG ); - aArgs.put( "InteractionHandler", m_aContext.createComponent( "com.sun.star.task.InteractionHandler" ) ); + aArgs.put( "InteractionHandler", task::InteractionHandler::createDefault(m_aContext.getUNOContext()) ); Sequence< PropertyValue > aResource( aArgs.getPropertyValues() ); xLoad->load( aResource ); diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index 4593269de978..fd1ded798872 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -68,7 +68,7 @@ #include "intercept.hxx" #include #include -#include +#include #include #include #include @@ -1301,9 +1301,8 @@ sal_Bool ODocumentDefinition::save(sal_Bool _bApprove) pRequest->addContinuation(pAbort); // create the handler, let it handle the request - Reference< XInteractionHandler > xHandler( m_aContext.createComponent( (::rtl::OUString)SERVICE_TASK_INTERACTION_HANDLER ), UNO_QUERY ); - if ( xHandler.is() ) - xHandler->handle(xRequest); + Reference< XInteractionHandler > xHandler( InteractionHandler::createDefault(m_aContext.getUNOContext()), UNO_QUERY_THROW ); + xHandler->handle(xRequest); if ( pAbort->wasSelected() ) return sal_False; @@ -1376,9 +1375,8 @@ sal_Bool ODocumentDefinition::saveAs() pRequest->addContinuation(pAbort); // create the handler, let it handle the request - Reference< XInteractionHandler > xHandler(m_aContext.createComponent(::rtl::OUString(SERVICE_TASK_INTERACTION_HANDLER)), UNO_QUERY); - if ( xHandler.is() ) - xHandler->handle(xRequest); + Reference< XInteractionHandler > xHandler( InteractionHandler::createDefault(m_aContext.getUNOContext()), UNO_QUERY_THROW); + xHandler->handle(xRequest); if ( pAbort->wasSelected() ) return sal_False; diff --git a/dbaccess/source/ext/macromigration/docinteraction.cxx b/dbaccess/source/ext/macromigration/docinteraction.cxx index d0554ed0c3cd..f2f9dc5938fd 100644 --- a/dbaccess/source/ext/macromigration/docinteraction.cxx +++ b/dbaccess/source/ext/macromigration/docinteraction.cxx @@ -21,6 +21,7 @@ #include "docinteraction.hxx" #include +#include #include #include @@ -65,7 +66,7 @@ namespace dbmm } InteractionHandler_Data( const ::comphelper::ComponentContext& _rContext ) - :xHandler( _rContext.createComponent( "com.sun.star.task.InteractionHandler" ), UNO_QUERY_THROW ) + :xHandler( ::com::sun::star::task::InteractionHandler::createDefault(_rContext.getUNOContext()), UNO_QUERY_THROW ) { } }; diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx index 8b2d3939b767..52562d997540 100644 --- a/dbaccess/source/filter/xml/dbloader2.cxx +++ b/dbaccess/source/filter/xml/dbloader2.cxx @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -428,9 +429,8 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const :: // not touch it. if ( !aMediaDesc.has( "InteractionHandler" ) ) { - Reference< XInteractionHandler > xHandler; - if ( m_aContext.createComponent( "com.sun.star.task.InteractionHandler", xHandler ) ) - aMediaDesc.put( "InteractionHandler", xHandler ); + Reference< XInteractionHandler > xHandler( InteractionHandler::createDefault(m_aContext.getUNOContext()), UNO_QUERY_THROW ); + aMediaDesc.put( "InteractionHandler", xHandler ); } // it's allowed to pass an existing document diff --git a/dbaccess/source/inc/stringconstants.hrc b/dbaccess/source/inc/stringconstants.hrc index d24bdffa7710..d8a9ceb6ff8d 100644 --- a/dbaccess/source/inc/stringconstants.hrc +++ b/dbaccess/source/inc/stringconstants.hrc @@ -372,7 +372,6 @@ DECLARE_CONSTASCII_USTRING(SERVICE_SDBCX_TABLES); DECLARE_CONSTASCII_USTRING(SERVICE_SDB_QUERIES); DECLARE_CONSTASCII_USTRING(SERVICE_SDBC_DRIVERMANAGER); DECLARE_CONSTASCII_USTRING(SERVICE_SDBC_CONNECTIONPOOL); -DECLARE_CONSTASCII_USTRING(SERVICE_TASK_INTERACTION_HANDLER); DECLARE_CONSTASCII_USTRING(SERVICE_FRAME_DESKTOP); DECLARE_CONSTASCII_USTRING(SERVICE_UI_FOLDERPICKER); DECLARE_CONSTASCII_USTRING(SERVICE_I18N_COLLATOR); diff --git a/dbaccess/source/inc/stringconstants.inc b/dbaccess/source/inc/stringconstants.inc index 515ab6748b7c..133a06038360 100644 --- a/dbaccess/source/inc/stringconstants.inc +++ b/dbaccess/source/inc/stringconstants.inc @@ -211,7 +211,6 @@ IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDBC_DRIVERMANAGER, "com.sun.star.sdbc.Driv IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDBC_CONNECTIONPOOL, "com.sun.star.sdbc.ConnectionPool"); IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDBCX_INDEXCOLUMN, "com.sun.star.sdbcx.IndexColumn"); IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDBCX_KEYCOLUMN, "com.sun.star.sdbcx.KeyColumn"); -IMPLEMENT_CONSTASCII_USTRING(SERVICE_TASK_INTERACTION_HANDLER, "com.sun.star.task.InteractionHandler"); IMPLEMENT_CONSTASCII_USTRING(SERVICE_FRAME_DESKTOP, "com.sun.star.frame.Desktop"); IMPLEMENT_CONSTASCII_USTRING(SERVICE_UI_FOLDERPICKER, "com.sun.star.ui.dialogs.FolderPicker"); IMPLEMENT_CONSTASCII_USTRING(SERVICE_I18N_COLLATOR, "com.sun.star.i18n.Collator"); diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index c918fa04a3b8..d03cd2abd0bd 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -57,7 +57,7 @@ #include #include #include -#include +#include #include #include #include @@ -1471,9 +1471,8 @@ sal_Bool SbaXDataBrowserController::approveParameter(const ::com::sun::star::for pParamRequest->addContinuation(pAbort); // create the handler, let it handle the request - Reference< XInteractionHandler > xHandler(getORB()->createInstance(SERVICE_TASK_INTERACTION_HANDLER), UNO_QUERY); - if (xHandler.is()) - xHandler->handle(xParamRequest); + Reference< XInteractionHandler > xHandler( InteractionHandler::createDefault(comphelper::ComponentContext(getORB()).getUNOContext()), UNO_QUERY_THROW); + xHandler->handle(xParamRequest); if (!pParamValues->wasSelected()) { // canceled diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 2b47defe48ad..23148ba2a812 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -84,12 +84,14 @@ #include #include #include +#include #include #include #include #include #include +#include #include #include #include @@ -3528,11 +3530,9 @@ void SbaTableQueryBrowser::implAdministrate( SvLBoxEntry* _pApplyTo ) if ( xDocumentModel.is() ) { - Reference< XInteractionHandler > xInteractionHandler( - getORB()->createInstance( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.InteractionHandler" ) ) ), - UNO_QUERY ); - OSL_ENSURE( xInteractionHandler.is(), "SbaTableQueryBrowser::implAdministrate: no interaction handler available!" ); + Reference< XInteractionHandler2 > xInteractionHandler( + InteractionHandler::createDefault(comphelper::getComponentContext(getORB())), + UNO_QUERY_THROW ); ::comphelper::NamedValueCollection aLoadArgs; aLoadArgs.put( "Model", xDocumentModel ); diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx index 5dd965614e77..3c11de710096 100644 --- a/dbaccess/source/ui/dlg/CollectionView.cxx +++ b/dbaccess/source/ui/dlg/CollectionView.cxx @@ -23,6 +23,7 @@ #include #include "moduledbu.hxx" #include "dbu_dlg.hrc" +#include #include #include #include @@ -38,7 +39,7 @@ #include #include #include -#include +#include #include #include #include @@ -169,23 +170,22 @@ IMPL_LINK_NOARG(OCollectionView, Save_Click) InteractiveAugmentedIOException aException(sTemp,Reference(),eClass,eError,aValues); - Reference xIni(m_xORB->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler"))),UNO_QUERY); - if ( xIni.is() ) - { - aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Parent")); - aValue.Value <<= VCLUnoHelper::GetInterface( this ); - Sequence< Any > aArgs(1); - aArgs[0] <<= makeAny(aValue); - xIni->initialize(aArgs); - OInteractionRequest* pRequest = new OInteractionRequest(makeAny(aException)); - Reference< XInteractionRequest > xRequest(pRequest); + Reference xIni( + InteractionHandler::createDefault(comphelper::getComponentContext(m_xORB)), UNO_QUERY_THROW); + aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Parent")); + aValue.Value <<= VCLUnoHelper::GetInterface( this ); + Sequence< Any > aArgs(1); + aArgs[0] <<= makeAny(aValue); + xIni->initialize(aArgs); + OInteractionRequest* pRequest = new OInteractionRequest(makeAny(aException)); + Reference< XInteractionRequest > xRequest(pRequest); - OInteractionApprove* pApprove = new OInteractionApprove; - pRequest->addContinuation(pApprove); + OInteractionApprove* pApprove = new OInteractionApprove; + pRequest->addContinuation(pApprove); + + Reference< XInteractionHandler > xHandler(xIni,UNO_QUERY); + xHandler->handle(xRequest); - Reference< XInteractionHandler > xHandler(xIni,UNO_QUERY); - xHandler->handle(xRequest); - } return 0; } } diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index 26b32f24a33a..f3cab0081558 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include "UITools.hxx" #include @@ -71,6 +71,7 @@ #endif //_ADO_DATALINK_BROWSE_ #include +#include #include @@ -522,8 +523,8 @@ DBG_NAME(OConnectionHelper) ::ucbhelper::Content aCheckExistence; sal_Bool bExists = sal_False; IS_PATH_EXIST eExists = PATH_NOT_EXIST; - Reference< ::com::sun::star::task::XInteractionHandler > xInteractionHandler = Reference< ::com::sun::star::task::XInteractionHandler >( - m_xORB->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler") ) ), UNO_QUERY ); + Reference< ::com::sun::star::task::XInteractionHandler > xInteractionHandler( + task::InteractionHandler::createDefault(comphelper::getComponentContext(m_xORB)), UNO_QUERY_THROW ); OFilePickerInteractionHandler* pHandler = new OFilePickerInteractionHandler(xInteractionHandler); xInteractionHandler = pHandler; diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 2150c6b283a3..30118af634d3 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include #include @@ -255,9 +255,7 @@ sal_Bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< Propert if ( !xHandler.is() ) { // instantiate the default SDB interaction handler - xHandler = Reference< XInteractionHandler >( m_xORB->createInstance( SERVICE_TASK_INTERACTION_HANDLER ), UNO_QUERY ); - if ( !xHandler.is() ) - ShowServiceNotAvailableError(m_pParent->GetParent(), String(SERVICE_TASK_INTERACTION_HANDLER), sal_True); + xHandler = Reference< XInteractionHandler >( task::InteractionHandler::createDefault(comphelper::getComponentContext(m_xORB)), UNO_QUERY_THROW ); } String sName = pName ? pName->GetValue() : String(); diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index 9f05b4e298d9..dfdb2e26bb1e 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -70,6 +70,7 @@ #include #include #include +#include #include #include @@ -734,7 +735,7 @@ namespace //------------------------------------------------------------------------- sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() { - Reference< XInteractionHandler2 > xHandler( getORB()->createInstance( SERVICE_TASK_INTERACTION_HANDLER ), UNO_QUERY ); + Reference< XInteractionHandler2 > xHandler( InteractionHandler::createDefault(comphelper::getComponentContext(getORB())), UNO_QUERY_THROW ); try { if (callSaveAsDialog() == sal_True) @@ -993,9 +994,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() m_xDesktop.set( _rxORB->createInstance( SERVICE_FRAME_DESKTOP ), UNO_QUERY_THROW ); m_xFrameLoader.set( m_xDesktop, UNO_QUERY_THROW ); m_xInteractionHandler.set( - _rxORB->createInstance( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.InteractionHandler" ) ) - ), + InteractionHandler::createDefault(comphelper::getComponentContext(_rxORB)), UNO_QUERY_THROW ); } catch( const Exception& ) diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 8f76496d7ea4..3259a87d3f28 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -48,6 +48,7 @@ #include #include "TablesSingleDlg.hxx" #include +#include #include #include "AutoControls.hrc" @@ -310,7 +311,7 @@ DBG_NAME(OTableSubscriptionPage) xProp->setPropertyValue( PROPERTY_TABLETYPEFILTER, makeAny( Sequence< ::rtl::OUString >() ) ); Reference< ::com::sun::star::lang::XEventListener> xEvt; - aErrorInfo = ::dbaui::createConnection(xProp,m_xORB,xEvt,m_xCurrentConnection); + aErrorInfo = ::dbaui::createConnection(xProp,comphelper::getComponentContext(m_xORB),xEvt,m_xCurrentConnection); xProp->setPropertyValue(PROPERTY_TABLEFILTER,aTableFilter); xProp->setPropertyValue(PROPERTY_TABLETYPEFILTER,aTableTypeFilter); diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx index 574b3ad231e7..df0c4b18b675 100644 --- a/dbaccess/source/ui/inc/UITools.hxx +++ b/dbaccess/source/ui/inc/UITools.hxx @@ -80,7 +80,7 @@ namespace dbaui /** creates a new connection and appends the eventlistener @param _rsDataSourceName name of the datasource @param _xDatabaseContext the database context - @param _rMF the multi service factory + @param _rxContext the UNO component context @param _rEvtLst the eventlistener which will be added to the new created connection @param _rOUTConnection this parameter will be filled with the new created connection @return SQLExceptionInfo contains a SQLException, SQLContext or a SQLWarning when they araised else .isValid() will return false @@ -88,19 +88,19 @@ namespace dbaui ::dbtools::SQLExceptionInfo createConnection( const ::rtl::OUString& _rsDataSourceName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xDatabaseContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rMF, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener>& _rEvtLst, ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rOUTConnection ); /** creates a new connection and appends the eventlistener @param _xDataSource the datasource - @param _rMF the multi service factory + @param _rxContext the UNO component context @param _rEvtLst the eventlistener which will be added to the new created connection @param _rOUTConnection this parameter will be filled with the new created connection @return SQLExceptionInfo contains a SQLException, SQLContext or a SQLWarning when they araised else .isValid() will return false */ ::dbtools::SQLExceptionInfo createConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xDataSource, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rMF, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener>& _rEvtLst, ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rOUTConnection ); diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index 16615e4c478b..90522f2e8f80 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -281,7 +281,7 @@ void ODatabaseImportExport::initialize() Reference< XEventListener> xEvt((::cppu::OWeakObject*)this,UNO_QUERY); Reference< XConnection > xConnection; - SQLExceptionInfo aInfo = ::dbaui::createConnection( m_sDataSourceName, xDatabaseContext, m_xFactory, xEvt, xConnection ); + SQLExceptionInfo aInfo = ::dbaui::createConnection( m_sDataSourceName, xDatabaseContext, comphelper::getComponentContext(m_xFactory), xEvt, xConnection ); m_xConnection.reset( xConnection ); if(aInfo.isValid() && aInfo.getType() == SQLExceptionInfo::SQL_EXCEPTION) diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 0ac020f5e792..a705c8b7dcdf 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include #include @@ -138,7 +138,7 @@ using ::com::sun::star::frame::XModel; // ----------------------------------------------------------------------------- SQLExceptionInfo createConnection( const ::rtl::OUString& _rsDataSourceName, const Reference< ::com::sun::star::container::XNameAccess >& _xDatabaseContext, - const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rMF, + const Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, Reference< ::com::sun::star::lang::XEventListener>& _rEvtLst, Reference< ::com::sun::star::sdbc::XConnection>& _rOUTConnection ) { @@ -152,11 +152,11 @@ SQLExceptionInfo createConnection( const ::rtl::OUString& _rsDataSourceName, } SQLExceptionInfo aInfo; - return createConnection(xProp,_rMF,_rEvtLst,_rOUTConnection); + return createConnection(xProp,_rxContext,_rEvtLst,_rOUTConnection); } // ----------------------------------------------------------------------------- SQLExceptionInfo createConnection( const Reference< ::com::sun::star::beans::XPropertySet>& _xDataSource, - const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rMF, + const Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, Reference< ::com::sun::star::lang::XEventListener>& _rEvtLst, Reference< ::com::sun::star::sdbc::XConnection>& _rOUTConnection ) { @@ -192,14 +192,8 @@ SQLExceptionInfo createConnection( const Reference< ::com::sun::star::beans::XP } else { // instantiate the default SDB interaction handler - Reference< XInteractionHandler > xHandler(_rMF->createInstance(SERVICE_TASK_INTERACTION_HANDLER), UNO_QUERY); - if (!xHandler.is()) - { - OSL_FAIL("createConnection: could not instantiate an interaction handler!"); - // TODO: a real parent! - } - else - _rOUTConnection = xConnectionCompletion->connectWithCompletion(xHandler); + Reference< XInteractionHandler > xHandler( InteractionHandler::createDefault(_rxContext), UNO_QUERY_THROW); + _rOUTConnection = xConnectionCompletion->connectWithCompletion(xHandler); } } else diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index 025e7d14cef1..c63f77ce1ad9 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -45,6 +45,7 @@ #include #include #include +#include #include #include @@ -683,7 +684,7 @@ OCopyTableWizard::OCopyTableWizard( Window* pParent, const ::rtl::OUString& _rDe ::dbaui::fillTypeInfo( _xConnection, m_sTypeNames, m_aTypeInfo, m_aTypeInfoIndex ); ::dbaui::fillTypeInfo( _xConnection, m_sTypeNames, m_aDestTypeInfo, m_aDestTypeInfoIndex ); - m_xInteractionHandler.set( m_xFactory->createInstance( SERVICE_TASK_INTERACTION_HANDLER ), UNO_QUERY); + m_xInteractionHandler.set( InteractionHandler::createDefault(comphelper::getComponentContext(m_xFactory)), UNO_QUERY_THROW ); OCopyTable* pPage1( new OCopyTable( this ) ); pPage1->disallowViews(); diff --git a/dbaccess/source/ui/misc/datasourceconnector.cxx b/dbaccess/source/ui/misc/datasourceconnector.cxx index 38a84b5451d9..4f1b4af83014 100644 --- a/dbaccess/source/ui/misc/datasourceconnector.cxx +++ b/dbaccess/source/ui/misc/datasourceconnector.cxx @@ -24,11 +24,12 @@ #include #include #include -#include +#include #include #include #include #include +#include #include #include #include @@ -138,15 +139,10 @@ namespace dbaui if ( !xHandler.is() ) { // instantiate the default SDB interaction handler - xHandler = Reference< XInteractionHandler >( m_xORB->createInstance( SERVICE_TASK_INTERACTION_HANDLER ), UNO_QUERY ); - if ( !xHandler.is() ) - ShowServiceNotAvailableError(m_pErrorMessageParent, (::rtl::OUString)SERVICE_TASK_INTERACTION_HANDLER, sal_True); + xHandler = Reference< XInteractionHandler >( InteractionHandler::createDefault(comphelper::getComponentContext(m_xORB)), UNO_QUERY_THROW ); } - if ( xHandler.is() ) - { - xConnection = xConnectionCompletion->connectWithCompletion(xHandler); - } + xConnection = xConnectionCompletion->connectWithCompletion(xHandler); } else { diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index 820569a903af..d41a4967ddce 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -102,6 +102,7 @@ namespace dbaui using ::com::sun::star::sdbc::XDataSource; using ::com::sun::star::container::XNameAccess; using ::com::sun::star::container::XChild; + using ::com::sun::star::task::InteractionHandler; using ::com::sun::star::task::XInteractionHandler; using ::com::sun::star::frame::XModel; using ::com::sun::star::sdb::DatabaseContext; @@ -1553,7 +1554,7 @@ void SAL_CALL CopyTableWizard::initialize( const Sequence< Any >& _rArguments ) ); } if ( !m_xInteractionHandler.is() ) - m_xInteractionHandler.set( m_aContext.createComponent( "com.sun.star.task.InteractionHandler" ), UNO_QUERY_THROW ); + m_xInteractionHandler.set( InteractionHandler::createDefault(m_aContext.getUNOContext()), UNO_QUERY_THROW ); InteractionHandler xSourceDocHandler; Reference< XPropertySet > xSourceDescriptor( impl_ensureDataAccessDescriptor_throw( _rArguments, 0, m_xSourceConnection, xSourceDocHandler ) ); diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx index 0b31334810f7..4a8d80fb4230 100644 --- a/dbaccess/source/ui/uno/dbinteraction.cxx +++ b/dbaccess/source/ui/uno/dbinteraction.cxx @@ -25,6 +25,7 @@ #include #include #include "sqlmessage.hxx" +#include #include #include #include @@ -38,6 +39,7 @@ #include #include "CollectionView.hxx" #include "UITools.hxx" +#include //========================================================================== @@ -304,7 +306,7 @@ namespace dbaui { Reference< XInteractionHandler > xFallbackHandler; if ( m_xORB.is() ) - xFallbackHandler = xFallbackHandler.query( m_xORB->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.InteractionHandler" ) ) ) ); + xFallbackHandler = xFallbackHandler.query( InteractionHandler::createDefault(comphelper::getComponentContext(m_xORB)) ); if ( xFallbackHandler.is() ) { xFallbackHandler->handle( _rxRequest ); diff --git a/dbaccess/source/ui/uno/dbinteraction.hxx b/dbaccess/source/ui/uno/dbinteraction.hxx index 216c566d1101..f5e7496de485 100644 --- a/dbaccess/source/ui/uno/dbinteraction.hxx +++ b/dbaccess/source/ui/uno/dbinteraction.hxx @@ -73,6 +73,9 @@ namespace dbaui const bool i_bFallbackToGeneric ); + // XInitialization + void SAL_CALL initialize( com::sun::star::uno::Sequence< com::sun::star::uno::Any > const & /*rArguments*/) throw (com::sun::star::uno::Exception) {} + // XInteractionHandler2 virtual ::sal_Bool SAL_CALL handleInteractionRequest( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& Request ) throw (::com::sun::star::uno::RuntimeException); diff --git a/desktop/source/app/configinit.cxx b/desktop/source/app/configinit.cxx index 393a755ea96b..66b1c6e3d4d0 100644 --- a/desktop/source/app/configinit.cxx +++ b/desktop/source/app/configinit.cxx @@ -36,6 +36,7 @@ #include #include #include +#include // ---------------------------------------------------------------------------- @@ -45,7 +46,6 @@ using rtl::OUString; using uno::UNO_QUERY; // ---------------------------------------------------------------------------- -static char const CONFIGURATION_ERROR_HANDLER[] = "com.sun.star.configuration.backend.InteractionHandler"; // must be aligned with configmgr/source/misc/configinteractionhandler static char const CONFIG_ERROR_HANDLER[] = "configuration.interaction-handler"; @@ -164,17 +164,8 @@ void ConfigurationErrorHandler::deactivate() ConfigurationErrorHandler::InteractionHandler ConfigurationErrorHandler::getDefaultInteractionHandler() { - uno::Reference< lang::XMultiServiceFactory > xServiceManager = ::comphelper::getProcessServiceFactory(); - - OSL_ENSURE( xServiceManager.is(),"No ServiceManager set for ConfigurationErrorHandler"); - - InteractionHandler xHandler; - - if (xServiceManager.is()) - { - xHandler.set( xServiceManager->createInstance(k_ERRORHANDLER), UNO_QUERY ); - } - + uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); + InteractionHandler xHandler( com::sun::star::task::InteractionHandler::createDefault(xContext), UNO_QUERY_THROW ); return xHandler; } //------------------------------------------------------------------------------ diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx index 1ed73d59f48f..091d48465205 100644 --- a/desktop/source/app/dispatchwatcher.cxx +++ b/desktop/source/app/dispatchwatcher.cxx @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include #include @@ -73,6 +73,7 @@ using namespace ::com::sun::star::frame; using namespace ::com::sun::star::container; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::view; +using namespace ::com::sun::star::task; namespace desktop { @@ -226,9 +227,9 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch } else { - Reference < com::sun::star::task::XInteractionHandler > xInteraction( - ::comphelper::getProcessServiceFactory()->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler")) ), - com::sun::star::uno::UNO_QUERY ); + Reference < XInteractionHandler > xInteraction( + InteractionHandler::createDefault(::comphelper::getProcessComponentContext()), + UNO_QUERY_THROW ); aArgs[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" )); aArgs[1].Value <<= xInteraction; diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index 323778d4c642..b52478146734 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -50,6 +50,7 @@ #include "com/sun/star/deployment/UpdateInformationProvider.hpp" #include "com/sun/star/deployment/XPackage.hpp" +#include "com/sun/star/task/InteractionHandler.hpp" #include "com/sun/star/task/XAbortChannel.hpp" #include "com/sun/star/task/XInteractionAbort.hpp" #include "com/sun/star/task/XInteractionApprove.hpp" @@ -536,10 +537,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & handlerArgs[ 0 ] <<= beans::PropertyValue( OUSTR("Context"), -1, uno::Any( m_sTitle ), beans::PropertyState_DIRECT_VALUE ); - m_xHandler.set( m_xContext->getServiceManager() - ->createInstanceWithArgumentsAndContext( - OUSTR("com.sun.star.uui.InteractionHandler"), - handlerArgs, m_xContext ), uno::UNO_QUERY_THROW ); + m_xHandler.set( task::InteractionHandler::createWithParentAndContext(m_xContext, NULL, m_sTitle), uno::UNO_QUERY_THROW ); } m_xHandler->handle( xRequest ); } diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index 88deb2042ad0..107e7b6017cd 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -66,6 +66,7 @@ #include "com/sun/star/lang/XSingleServiceFactory.hpp" #include "com/sun/star/system/SystemShellExecuteFlags.hpp" #include "com/sun/star/system/SystemShellExecute.hpp" +#include "com/sun/star/task/InteractionHandler.hpp" #include "com/sun/star/task/XAbortChannel.hpp" #include "com/sun/star/task/XJob.hpp" #include "com/sun/star/ucb/CommandAbortedException.hpp" @@ -272,16 +273,10 @@ UpdateDialog::Thread::Thread( { if( m_context.is() ) { - uno::Reference< lang::XMultiComponentFactory > xServiceManager( m_context->getServiceManager() ); - - if( xServiceManager.is() ) - { - m_xInteractionHdl = uno::Reference< task::XInteractionHandler > ( - xServiceManager->createInstanceWithContext( OUSTR( "com.sun.star.task.InteractionHandler" ), m_context), - uno::UNO_QUERY ); - if ( m_xInteractionHdl.is() ) - m_updateInformation->setInteractionHandler( m_xInteractionHdl ); - } + m_xInteractionHdl = uno::Reference< task::XInteractionHandler > ( + task::InteractionHandler::createDefault(m_context), + uno::UNO_QUERY_THROW ); + m_updateInformation->setInteractionHandler( m_xInteractionHdl ); } } diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx index 956d638679ad..1a8f290d0f59 100644 --- a/embedserv/source/embed/docholder.cxx +++ b/embedserv/source/embed/docholder.cxx @@ -58,7 +58,7 @@ #include #include #include -#include +#include #include #include @@ -114,9 +114,8 @@ void DocumentHolder::LoadDocInFrame( sal_Bool bPluginMode ) if( xComponentLoader.is() && m_xDocument.is() ) { uno::Reference< task::XInteractionHandler > xHandler( - m_xFactory->createInstance( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.InteractionHandler" ) ) ), - uno::UNO_QUERY ); + task::InteractionHandler::create(comphelper::getComponentContext(m_xFactory)), + uno::UNO_QUERY_THROW ); uno::Any aAny; sal_Int32 nLen = 3; diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx index c37139b48e46..9b23732e70e9 100644 --- a/extensions/source/abpilot/datasourcehandling.cxx +++ b/extensions/source/abpilot/datasourcehandling.cxx @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include @@ -524,13 +524,12 @@ namespace abp // ................................................................ // create the interaction handler (needed for authentication and error handling) - static ::rtl::OUString s_sInteractionHandlerServiceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler")); Reference< XInteractionHandler > xInteractions; try { xInteractions = Reference< XInteractionHandler >( - m_pImpl->xORB->createInstance( s_sInteractionHandlerServiceName ), - UNO_QUERY + InteractionHandler::createDefault(comphelper::getComponentContext(m_pImpl->xORB)), + UNO_QUERY_THROW ); } catch(const Exception&) @@ -541,6 +540,7 @@ namespace abp // failure to create the interaction handler is a serious issue ... if (!xInteractions.is()) { + ::rtl::OUString s_sInteractionHandlerServiceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler")); if ( _pMessageParent ) ShowServiceNotAvailableError( _pMessageParent, s_sInteractionHandlerServiceName, sal_True ); return sal_False; diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 05628020b236..1146aaf64d13 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include #include @@ -96,7 +96,6 @@ Reference< XConnection > getConnection(const ::rtl::OUString& _rURL) // first get the sdb::DataSource corresponding to the url Reference< XDataSource > xDataSource; // is it a favorite title ? - Reference< XMultiServiceFactory > xMgr = comphelper::getProcessServiceFactory(); Reference xContext = comphelper::getProcessComponentContext(); Reference< XDatabaseContext > xNamingContext = DatabaseContext::create(xContext); if (xNamingContext->hasByName(_rURL)) @@ -120,9 +119,7 @@ Reference< XConnection > getConnection(const ::rtl::OUString& _rURL) Reference< XCompletedConnection > xComplConn(xDataSource, UNO_QUERY); try { - - Reference xHdl = xMgr->createInstance(C2U("com.sun.star.task.InteractionHandler")); - Reference xIHdl(xHdl, UNO_QUERY); + Reference xIHdl( task::InteractionHandler::createDefault(xContext), UNO_QUERY_THROW); xConn = xComplConn->connectWithCompletion(xIHdl); } catch (const SQLException&) diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx index 47c6bb55ed48..cb5a0d4721f1 100644 --- a/extensions/source/dbpilots/controlwizard.cxx +++ b/extensions/source/dbpilots/controlwizard.cxx @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include @@ -514,16 +515,17 @@ namespace dbp //--------------------------------------------------------------------- Reference< XInteractionHandler > OControlWizard::getInteractionHandler(Window* _pWindow) const { - const ::rtl::OUString sInteractionHandlerServiceName("com.sun.star.task.InteractionHandler"); Reference< XInteractionHandler > xHandler; try { - if (getServiceFactory().is()) - xHandler = Reference< XInteractionHandler >(getServiceFactory()->createInstance(sInteractionHandlerServiceName), UNO_QUERY); + xHandler = Reference< XInteractionHandler >( InteractionHandler::createDefault(comphelper::getComponentContext(getServiceFactory())), UNO_QUERY_THROW ); } catch(const Exception&) { } if (!xHandler.is()) + { + const ::rtl::OUString sInteractionHandlerServiceName("com.sun.star.task.InteractionHandler"); ShowServiceNotAvailableError(_pWindow, sInteractionHandlerServiceName, sal_True); + } return xHandler; } //--------------------------------------------------------------------- diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx index 2dc19c9e1e61..6ee4458f411f 100644 --- a/extensions/source/update/check/updatehdl.cxx +++ b/extensions/source/update/check/updatehdl.cxx @@ -65,6 +65,7 @@ #include "com/sun/star/frame/XDesktop.hpp" #include "com/sun/star/lang/XMultiServiceFactory.hpp" +#include "com/sun/star/task/InteractionHandler.hpp" #include "com/sun/star/task/InteractionRequestStringResolver.hpp" #include @@ -450,12 +451,8 @@ void SAL_CALL UpdateHandler::handle( uno::Reference< task::XInteractionRequest > throw uno::RuntimeException( UNISTRING( "UpdateHandler: unable to obtain service manager from component context" ), *this ); mxInteractionHdl = uno::Reference ( - xServiceManager->createInstanceWithContext( - UNISTRING( "com.sun.star.task.InteractionHandler" ), - mxContext), + task::InteractionHandler::createDefault(mxContext), uno::UNO_QUERY_THROW); - if( !mxInteractionHdl.is() ) - throw uno::RuntimeException( UNISTRING( "UpdateHandler:: could not get default interaction handler" ), *this ); } uno::Reference< task::XInteractionRequestStringResolver > xStrResolver = task::InteractionRequestStringResolver::create( mxContext ); diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx index e46728396089..670e615df960 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include @@ -424,8 +424,8 @@ void XMLFilterTestDialog::onExportBrowse() maExportRecentFile = aDlg.GetPath(); Reference< XComponentLoader > xLoader( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" )) ), UNO_QUERY ); - Reference< XInteractionHandler > xInter( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.InteractionHandler" )) ), UNO_QUERY ); - if( xLoader.is() && xInter.is() ) + Reference< XInteractionHandler > xInter( InteractionHandler::createDefault(comphelper::getComponentContext(mxMSF)), UNO_QUERY_THROW ); + if( xLoader.is() ) { OUString aFrame( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ); Sequence< PropertyValue > aArguments(1); @@ -619,8 +619,8 @@ void XMLFilterTestDialog::import( const OUString& rURL ) try { Reference< XComponentLoader > xLoader( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" )) ), UNO_QUERY ); - Reference< XInteractionHandler > xInter( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.InteractionHandler" )) ), UNO_QUERY ); - if( xLoader.is() && xInter.is() ) + Reference< XInteractionHandler > xInter( InteractionHandler::createDefault(comphelper::getComponentContext(mxMSF)), UNO_QUERY_THROW ); + if( xLoader.is() ) { OUString aFrame( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ); diff --git a/forms/source/xforms/submission/replace.cxx b/forms/source/xforms/submission/replace.cxx index 9d487cc3c9e9..902ba9cffaf5 100644 --- a/forms/source/xforms/submission/replace.cxx +++ b/forms/source/xforms/submission/replace.cxx @@ -41,6 +41,7 @@ #include #include #include +#include #include using namespace com::sun::star::uno; @@ -129,9 +130,8 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH if( _xHandler.is() ) pHelper->m_aInteractionHandler = _xHandler; else - pHelper->m_aInteractionHandler = CSS::uno::Reference< XInteractionHandler >(m_aFactory->createInstance( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler") ) ), UNO_QUERY); - OSL_ENSURE(pHelper->m_aInteractionHandler.is(), "failed to create IntreractionHandler"); + pHelper->m_aInteractionHandler = CSS::uno::Reference< XInteractionHandler >( + InteractionHandler::createDefault(m_xContext), UNO_QUERY_THROW); CProgressHandlerHelper *pProgressHelper = new CProgressHandlerHelper; pHelper->m_aProgressHandler = Reference< XProgressHandler >(pProgressHelper); diff --git a/forms/source/xforms/submission/submission.hxx b/forms/source/xforms/submission/submission.hxx index 37e0e07d7a58..eb921bc74d98 100644 --- a/forms/source/xforms/submission/submission.hxx +++ b/forms/source/xforms/submission/submission.hxx @@ -123,7 +123,7 @@ protected: CSS::uno::Reference< CSS::xml::xpath::XXPathObject > m_aXPathObject; CSS::uno::Reference< CSS::xml::dom::XDocumentFragment > m_aFragment; CSS::uno::Reference< CSS::io::XInputStream > m_aResultStream; - CSS::uno::Reference< CSS::lang::XMultiServiceFactory > m_aFactory; + CSS::uno::Reference< CSS::uno::XComponentContext > m_xContext; rtl::OUString m_aEncoding; ::std::auto_ptr< CSerialization > createSerialization(const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& aHandler @@ -142,7 +142,7 @@ public: CSubmission(const rtl::OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment) : m_aURLObj(aURL) , m_aFragment(aFragment) - , m_aFactory(::comphelper::getProcessServiceFactory()) + , m_xContext(::comphelper::getProcessComponentContext()) {} virtual ~CSubmission() {} diff --git a/forms/source/xforms/submission/submission_get.cxx b/forms/source/xforms/submission/submission_get.cxx index 9ae7b6803cc9..156972404302 100644 --- a/forms/source/xforms/submission/submission_get.cxx +++ b/forms/source/xforms/submission/submission_get.cxx @@ -39,6 +39,7 @@ #include #include #include +#include using namespace CSS::uno; using namespace CSS::ucb; @@ -72,9 +73,8 @@ CSubmission::SubmissionResult CSubmissionGet::submit(const CSS::uno::Reference< if( aInteractionHandler.is() ) pHelper->m_aInteractionHandler = aInteractionHandler; else - pHelper->m_aInteractionHandler = CSS::uno::Reference< XInteractionHandler >(m_aFactory->createInstance( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler"))), UNO_QUERY); - OSL_ENSURE(pHelper->m_aInteractionHandler.is(), "failed to create IntreractionHandler"); + pHelper->m_aInteractionHandler = CSS::uno::Reference< XInteractionHandler >( + CSS::task::InteractionHandler::createDefault(m_xContext), UNO_QUERY_THROW); CProgressHandlerHelper *pProgressHelper = new CProgressHandlerHelper; pHelper->m_aProgressHandler = CSS::uno::Reference< XProgressHandler >(pProgressHelper); @@ -98,8 +98,8 @@ CSubmission::SubmissionResult CSubmissionGet::submit(const CSS::uno::Reference< aUTF8QueryURL.append(aQueryString.makeStringAndClear()); } OUString aQueryURL = OStringToOUString(aUTF8QueryURL.makeStringAndClear(), RTL_TEXTENCODING_UTF8); - ucbhelper::Content aContent(aQueryURL, aEnvironment, comphelper::getComponentContext(m_aFactory)); - CSS::uno::Reference< XOutputStream > aPipe( CSS::io::Pipe::create(comphelper::getComponentContext(m_aFactory)), UNO_QUERY_THROW ); + ucbhelper::Content aContent(aQueryURL, aEnvironment, m_xContext); + CSS::uno::Reference< XOutputStream > aPipe( CSS::io::Pipe::create(m_xContext), UNO_QUERY_THROW ); aContent.openStream(aPipe); // get reply try { diff --git a/forms/source/xforms/submission/submission_get.hxx b/forms/source/xforms/submission/submission_get.hxx index fe7cde8ba984..2e5e6038edcb 100644 --- a/forms/source/xforms/submission/submission_get.hxx +++ b/forms/source/xforms/submission/submission_get.hxx @@ -20,14 +20,14 @@ #ifndef __SUBMISSION_GET_HXX #define __SUBMISSION_GET_HXX -#include +#include #include "submission.hxx" class CSubmissionGet : public CSubmission { private: - CSS::uno::Reference< CSS::lang::XMultiServiceFactory > m_aFactory; + CSS::uno::Reference< CSS::uno::XComponentContext > m_xContext; public: CSubmissionGet(const rtl::OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment); virtual SubmissionResult submit(const CSS::uno::Reference< CSS::task::XInteractionHandler >& aInteractionHandler); diff --git a/fpicker/source/office/fpsmartcontent.cxx b/fpicker/source/office/fpsmartcontent.cxx index 5de4395ed362..98cbd32ae464 100644 --- a/fpicker/source/office/fpsmartcontent.cxx +++ b/fpicker/source/office/fpsmartcontent.cxx @@ -20,6 +20,7 @@ #include "fpsmartcontent.hxx" #include +#include #include #include #include @@ -79,9 +80,9 @@ namespace svt //-------------------------------------------------------------------- void SmartContent::enableOwnInteractionHandler(::svt::OFilePickerInteractionHandler::EInterceptedInteractions eInterceptions) { - Reference< XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory(); + Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext(); Reference< XInteractionHandler > xGlobalInteractionHandler = Reference< XInteractionHandler >( - xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler") ) ), UNO_QUERY ); + InteractionHandler::createDefault(xContext), UNO_QUERY_THROW ); m_pOwnInteraction = new ::svt::OFilePickerInteractionHandler(xGlobalInteractionHandler); m_pOwnInteraction->enableInterceptions(eInterceptions); @@ -98,9 +99,9 @@ namespace svt m_pOwnInteraction = NULL; m_xOwnInteraction = Reference< XInteractionHandler >(); - Reference< XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory(); + Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext(); Reference< XInteractionHandler > xGlobalInteractionHandler = Reference< XInteractionHandler >( - xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler") ) ), UNO_QUERY ); + InteractionHandler::createDefault(xContext), UNO_QUERY_THROW ); m_xCmdEnv = new ucbhelper::CommandEnvironment( xGlobalInteractionHandler, Reference< XProgressHandler >() ); } diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 46e2b708f506..264e673b883d 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -72,7 +72,7 @@ #include #include -#include +#include #include "com/sun/star/ucb/InteractiveAugmentedIOException.hpp" #include "fpinteraction.hxx" #include @@ -2001,13 +2001,10 @@ void SvtFileDialog::displayIOException( const String& _rURL, IOErrorCode _eCode pRequest->addContinuation( new ::comphelper::OInteractionAbort( ) ); Reference< XInteractionHandler > xHandler( - ::comphelper::getProcessServiceFactory()->createInstance( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler") ) - ), - UNO_QUERY + InteractionHandler::createDefault( ::comphelper::getProcessComponentContext() ), + UNO_QUERY_THROW ); - if ( xHandler.is() ) - xHandler->handle( xRequest ); + xHandler->handle( xRequest ); } catch( const Exception& ) { diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 104d76c34115..e31beef09ac1 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -270,6 +270,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/system,\ SystemShellExecute \ )) $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/task,\ + InteractionHandler \ InteractionRequestStringResolver \ JobExecutor \ OfficeRestartManager \ @@ -1218,7 +1219,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/table,\ )) $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/task,\ AsyncJob \ - InteractionHandler \ Job \ )) $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text,\ diff --git a/offapi/com/sun/star/task/InteractionHandler.idl b/offapi/com/sun/star/task/InteractionHandler.idl index 1e603a2a3fac..524c385ce4ac 100644 --- a/offapi/com/sun/star/task/InteractionHandler.idl +++ b/offapi/com/sun/star/task/InteractionHandler.idl @@ -21,8 +21,8 @@ #define __com_sun_star_task_InteractionHandler_idl__ module com { module sun { module star { - module lang { published interface XInitialization; }; - module task { published interface XInteractionHandler; }; + module task { published interface XInteractionHandler2; }; + module awt { published interface XWindow; }; }; }; }; module com { module sun { module star { module task { @@ -147,28 +147,13 @@ module com { module sun { module star { module task { that the types you specify are general enough to cover all requests you want to handle, but also specific enough to not cover requests which other handlers might be interested in.

    */ -published service InteractionHandler +published service InteractionHandler : XInteractionHandler2 { - /** Handle an interaction request. - */ - interface com::sun::star::task::XInteractionHandler; + createDefault(); - /** Initialize the interaction handler. + createWithParent([in] com::sun::star::awt::XWindow parent); -

    The arguments must be a sequence of - PropertyValues. The - currently supported properties are: -

      -
    • "Parent" of type - XWindow denotes the - parent window for any GUI dialogs the interaction handler pops up; - it is strongly recommended that this property is supplied;
      • -
    • "Context" of type string is a - textual description of the current context (used, e.g., as a first - line of text in error boxes); this property is optional.
      • -

    - */ - interface com::sun::star::lang::XInitialization; + createWithParentAndContext([in] com::sun::star::awt::XWindow parent, [in] string context); }; }; }; }; }; diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb index 312d0eb217cc6fa63496fcacfe3ad316178d0215..8a14c1485672f9fc130475b709d34d984e09349d 100644 GIT binary patch delta 472 zcmY+*OHUI47=_`f%+O+6s5nxlh{(;Vpj1)tiWU$Np%lEJg335l!Aq^RKY+z+*cc^} z^dr$2Rwgdok+{^QiG+=bf54a+-MD07BA+fyJjt^;IcIk1Q_1Wf_}D-RCKjdm2~fsH zf`kZDP6ZJ*QORa(wopZsY8+zJu$5Z2QO9=bX`qoNn%O~|o$O*aEwr+Sy|j^FANy(N z00-%ylS3Tl2uC@_ak@CcNs@HaLocW3<23!8VSuv?GDM1D(u^?5InHx|i;QuJ%Uofc z39fRD>rCQuW7$i549tD`v1Y7zh9uqbiG{QkkQa`xRX)6SBJzICv1Iaz7nGKWKPZdu z`oqQVjw$AfXNz0(*T~PWo+YC%Q+4H0Bjn{XZXq)^Q0a!-Bh>Kw3<=3)g5(L-BVe0U**&Tl~)hnnyZChzICwXuf+fW delta 352 zcmWl|H%~%Q0Dw`DM^RKzv7llv*b5fK2KFxYhKfFWZ$E(HOWaJ*#G4og7k38}Rwow; z3;q}f2d^hNp_jNW^dBt==upsOz=(-Nk}#7@3aMDIl14fi*vKS{Y;v%ZOCI?+D4>uc ziYcL#GRmo-5+_wuQ$sCv)YCvCO*G@8g;v^V$4v(wI_aXD9(wWOqmO #include #include +#include #include #include #include @@ -2649,8 +2650,8 @@ uno::Reference< embed::XStorage > OReportDefinition::getStorage() const // ----------------------------------------------------------------------------- uno::Reference< task::XInteractionHandler > OReportDefinition::getInteractionHandler() const { - uno::Reference< task::XInteractionHandler > xRet( m_aProps->m_xContext->getServiceManager()->createInstanceWithContext( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.InteractionHandler")) ,m_aProps->m_xContext),uno::UNO_QUERY); + uno::Reference< task::XInteractionHandler > xRet( + task::InteractionHandler::createDefault(m_aProps->m_xContext), uno::UNO_QUERY_THROW); return xRet; } // ----------------------------------------------------------------------------- diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk index 4f761856a68a..3151f14ed5de 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -101,6 +101,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_ucalc,\ ucb/source/core/ucb1 \ ucb/source/ucp/file/ucpfile1 \ unoxml/source/service/unoxml \ + uui/util/uui \ )) $(eval $(call gb_CppunitTest_use_configuration,sc_ucalc)) diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index 8c5e0c4a0274..c3a034c4f3df 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -66,6 +66,7 @@ #include #include #include +#include #include #include #include @@ -102,7 +103,6 @@ using ::com::sun::star::beans::XPropertySet; using ::rtl::OUString; #define SC_SERVICE_ROWSET "com.sun.star.sdb.RowSet" -#define SC_SERVICE_INTHANDLER "com.sun.star.task.InteractionHandler" #define SC_DBPROP_DATASOURCENAME "DataSourceName" #define SC_DBPROP_COMMAND "Command" @@ -3058,9 +3058,8 @@ uno::Reference ScDPCollection::DBCaches::createRowSet( if ( xExecute.is() ) { uno::Reference xHandler( - comphelper::getProcessServiceFactory()->createInstance( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_SERVICE_INTHANDLER )) ), - uno::UNO_QUERY); + task::InteractionHandler::createDefault(comphelper::getProcessComponentContext()), + uno::UNO_QUERY_THROW); xExecute->executeWithCompletion( xHandler ); } else diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx index 862698318895..117a8e7ef668 100644 --- a/sc/source/ui/dbgui/dapidata.cxx +++ b/sc/source/ui/dbgui/dapidata.cxx @@ -42,6 +42,7 @@ #include #include #include +#include using namespace com::sun::star; @@ -54,7 +55,6 @@ using namespace com::sun::star; //------------------------------------------------------------------------- -#define SC_SERVICE_INTHANDLER "com.sun.star.task.InteractionHandler" // entries in the "type" ListBox #define DP_TYPELIST_TABLE 0 @@ -165,9 +165,8 @@ void ScDataPilotDatabaseDlg::FillObjects() if ( !xSource.is() ) return; uno::Reference xHandler( - comphelper::getProcessServiceFactory()->createInstance( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_SERVICE_INTHANDLER )) ), - uno::UNO_QUERY); + task::InteractionHandler::createDefault(comphelper::getProcessComponentContext()), + uno::UNO_QUERY_THROW); uno::Reference xConnection = xSource->connectWithCompletion( xHandler ); diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index 14da13deaeea..5b849909ef23 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -66,7 +67,6 @@ using namespace com::sun::star; #define SC_SERVICE_ROWSET "com.sun.star.sdb.RowSet" -#define SC_SERVICE_INTHANDLER "com.sun.star.task.InteractionHandler" //! move to a header file? #define SC_DBPROP_DATASOURCENAME "DataSourceName" @@ -252,9 +252,8 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, if ( xExecute.is() ) { uno::Reference xHandler( - comphelper::getProcessServiceFactory()->createInstance( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_SERVICE_INTHANDLER )) ), - uno::UNO_QUERY); + task::InteractionHandler::createDefault(comphelper::getProcessComponentContext()), + uno::UNO_QUERY_THROW); xExecute->executeWithCompletion( xHandler ); } else diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index 58925b5899be..96f19ec9100b 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include @@ -439,8 +439,8 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR Sequence< PropertyValue > aArgs(3); Reference < com::sun::star::task::XInteractionHandler > xInteraction( - ::comphelper::getProcessServiceFactory()->createInstance( OUString("com.sun.star.task.InteractionHandler") ), - com::sun::star::uno::UNO_QUERY ); + task::InteractionHandler::createDefault(::comphelper::getProcessComponentContext()), + com::sun::star::uno::UNO_QUERY_THROW ); aArgs[0].Name = OUString("InteractionHandler"); aArgs[0].Value <<= xInteraction; diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx index a2656b7dc62b..248595c2a453 100644 --- a/sfx2/source/bastyp/helper.cxx +++ b/sfx2/source/bastyp/helper.cxx @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -168,9 +169,9 @@ uno::Sequence< OUString > SfxContentHelper::GetHelpTreeViewContents( const Strin StringList_Impl* pProperties = NULL; try { - uno::Reference< lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory(); + uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); uno::Reference< task::XInteractionHandler > xInteractionHandler = uno::Reference< task::XInteractionHandler > ( - xFactory->createInstance( "com.sun.star.task.InteractionHandler" ), uno::UNO_QUERY ); + task::InteractionHandler::createDefault(xContext), uno::UNO_QUERY_THROW ); ::ucbhelper::Content aCnt( rURL, new ::ucbhelper::CommandEnvironment( xInteractionHandler, uno::Reference< ucb::XProgressHandler >() ), comphelper::getProcessComponentContext() ); uno::Reference< sdbc::XResultSet > xResultSet; @@ -252,9 +253,9 @@ String SfxContentHelper::GetActiveHelpString( const String& rURL ) String aRet; try { - uno::Reference< lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory(); + uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); uno::Reference< task::XInteractionHandler > xInteractionHandler = uno::Reference< task::XInteractionHandler > ( - xFactory->createInstance( "com.sun.star.task.InteractionHandler" ), uno::UNO_QUERY ); + task::InteractionHandler::createDefault(xContext), uno::UNO_QUERY_THROW ); ::ucbhelper::Content aCnt( rURL, new ::ucbhelper::CommandEnvironment( xInteractionHandler, uno::Reference< ucb::XProgressHandler >() ), comphelper::getProcessComponentContext() ); // open the "active help" stream uno::Reference< io::XInputStream > xStream = aCnt.openStream(); diff --git a/sfx2/source/control/templateremoteview.cxx b/sfx2/source/control/templateremoteview.cxx index ad414affbb71..40f9208d53ec 100644 --- a/sfx2/source/control/templateremoteview.cxx +++ b/sfx2/source/control/templateremoteview.cxx @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include @@ -52,9 +52,9 @@ TemplateRemoteView::TemplateRemoteView (Window *pParent, WinBits nWinStyle, bool mpItemView->SetColor(Color(COL_WHITE)); mpItemView->setChangeNameHdl(LINK(this,TemplateRemoteView,ChangeNameHdl)); - Reference< XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory(); + Reference< XComponentContext > xContext = comphelper::getProcessComponentContext(); Reference< XInteractionHandler > xGlobalInteractionHandler = Reference< XInteractionHandler >( - xFactory->createInstance("com.sun.star.task.InteractionHandler" ), UNO_QUERY ); + InteractionHandler::createDefault(xContext), UNO_QUERY_THROW ); m_xCmdEnv = new ucbhelper::CommandEnvironment( xGlobalInteractionHandler, Reference< XProgressHandler >() ); } diff --git a/sfx2/source/dialog/templateinfodlg.cxx b/sfx2/source/dialog/templateinfodlg.cxx index 2a77bde0336c..06ecbbf661a4 100644 --- a/sfx2/source/dialog/templateinfodlg.cxx +++ b/sfx2/source/dialog/templateinfodlg.cxx @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include @@ -71,12 +71,12 @@ void SfxTemplateInfoDlg::loadDocument(const OUString &rURL) { assert(!rURL.isEmpty()); - uno::Reference xContext(comphelper::getProcessServiceFactory()); + uno::Reference xContext(comphelper::getProcessComponentContext()); try { uno::Reference xInteractionHandler( - xContext->createInstance("com.sun.star.task.InteractionHandler"), uno::UNO_QUERY ); + task::InteractionHandler::createDefault(xContext), uno::UNO_QUERY_THROW ); uno::Sequence aProps(1); aProps[0].Name = "InteractionHandler"; diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index db5887e4220f..666d37fd915d 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -21,7 +21,7 @@ #include "sfx2/signaturestate.hxx" #include -#include +#include #include #include #include @@ -2526,14 +2526,10 @@ SfxMedium::GetInteractionHandler() return pImp->xInteraction; // create default handler and cache it! - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory(); - if ( xFactory.is() ) - { - pImp->xInteraction = ::com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler >( xFactory->createInstance( DEFINE_CONST_UNICODE("com.sun.star.task.InteractionHandler") ), ::com::sun::star::uno::UNO_QUERY ); - return pImp->xInteraction; - } - - return ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >(); + Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); + pImp->xInteraction = Reference< task::XInteractionHandler >( + task::InteractionHandler::createDefault(xContext), UNO_QUERY_THROW ); + return pImp->xInteraction; } //---------------------------------------------------------------- diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index 281e1c762e14..bb06eddb1587 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -152,7 +152,7 @@ typedef vector< NamePair_Impl* > NameList_Impl; typedef vector< GroupData_Impl* > GroupList_Impl; //============================================================================= -#include +#include #include class TplTaskEnvironment : public ::cppu::WeakImplHelper1< ucb::XCommandEnvironment > @@ -389,12 +389,10 @@ public: //----------------------------------------------------------------------------- void SfxDocTplService_Impl::init_Impl() { - uno::Reference< lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory(); - if ( xFactory.is() ) - { - uno::Reference < task::XInteractionHandler > xInteractionHandler( xFactory->createInstance( DEFINE_CONST_UNICODE("com.sun.star.task.InteractionHandler") ), uno::UNO_QUERY ); - maCmdEnv = new TplTaskEnvironment( xInteractionHandler ); - } + uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); + uno::Reference < task::XInteractionHandler > xInteractionHandler( + task::InteractionHandler::createDefault(xContext), uno::UNO_QUERY_THROW ); + maCmdEnv = new TplTaskEnvironment( xInteractionHandler ); ::osl::ClearableMutexGuard aGuard( maMutex ); sal_Bool bIsInitialized = sal_False; diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index 83eb28a3065f..7bbfd072422d 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include @@ -441,8 +441,7 @@ void ModelData_Impl::CheckInteractionHandler() try { m_aMediaDescrHM[ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InteractionHandler")) ] <<= uno::Reference< task::XInteractionHandler >( - m_pOwner->GetServiceFactory()->createInstance( - DEFINE_CONST_UNICODE("com.sun.star.task.InteractionHandler") ), + task::InteractionHandler::createDefault(comphelper::getComponentContext(m_pOwner->GetServiceFactory())), uno::UNO_QUERY ); } catch( const uno::Exception& ) diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 443294aafafd..c6caa28ff4c3 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include @@ -554,28 +554,20 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) SFX_REQUEST_ARG( rReq, pInteractionHandlerItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, sal_False ); if ( !pInteractionHandlerItem ) { - uno::Reference< task::XInteractionHandler > xInteract; - uno::Reference< lang::XMultiServiceFactory > xServiceManager = ::comphelper::getProcessServiceFactory(); - if( xServiceManager.is() ) + uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); + uno::Reference< task::XInteractionHandler > xInteract( + task::InteractionHandler::createDefault(xContext), + UNO_QUERY_THROW ); + + SfxUnoAnyItem aInteractionItem( SID_INTERACTIONHANDLER, uno::makeAny( xInteract ) ); + if ( nId == SID_SAVEDOC ) { - xInteract = Reference< XInteractionHandler >( - xServiceManager->createInstance( DEFINE_CONST_UNICODE("com.sun.star.task.InteractionHandler") ), - UNO_QUERY ); + // in case of saving it is not possible to transport the parameters from here + // but it is not clear here whether the saving will be done or saveAs operation + GetMedium()->GetItemSet()->Put( aInteractionItem ); } - OSL_ENSURE( xInteract.is(), "Can not retrieve default status indicator!\n" ); - if ( xInteract.is() ) - { - SfxUnoAnyItem aInteractionItem( SID_INTERACTIONHANDLER, uno::makeAny( xInteract ) ); - if ( nId == SID_SAVEDOC ) - { - // in case of saving it is not possible to transport the parameters from here - // but it is not clear here whether the saving will be done or saveAs operation - GetMedium()->GetItemSet()->Put( aInteractionItem ); - } - - rReq.AppendItem( aInteractionItem ); - } + rReq.AppendItem( aInteractionItem ); } else if ( nId == SID_SAVEDOC ) { diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx index 213856fc00e0..092b2bac0d3a 100644 --- a/svl/source/passwordcontainer/passwordcontainer.cxx +++ b/svl/source/passwordcontainer/passwordcontainer.cxx @@ -22,9 +22,11 @@ #include #include +#include #include #include #include +#include #include #include @@ -1124,7 +1126,8 @@ sal_Bool SAL_CALL PasswordContainer::authorizateWithMasterPassword( const uno::R if ( !xTmpHandler.is() ) { uno::Reference< lang::XMultiServiceFactory > xFactory( mComponent, uno::UNO_QUERY_THROW ); - xTmpHandler.set( xFactory->createInstance( ::rtl::OUString( "com.sun.star.task.InteractionHandler" ) ), uno::UNO_QUERY_THROW ); + uno::Reference< uno::XComponentContext > xContext( comphelper::getComponentContext(xFactory) ); + xTmpHandler.set( InteractionHandler::createDefault(xContext), uno::UNO_QUERY_THROW ); } if ( !m_aMasterPasswd.isEmpty() ) @@ -1168,7 +1171,8 @@ sal_Bool SAL_CALL PasswordContainer::changeMasterPassword( const uno::Reference< if ( !xTmpHandler.is() ) { uno::Reference< lang::XMultiServiceFactory > xFactory( mComponent, uno::UNO_QUERY_THROW ); - xTmpHandler.set( xFactory->createInstance( ::rtl::OUString( "com.sun.star.task.InteractionHandler" ) ), uno::UNO_QUERY_THROW ); + uno::Reference< uno::XComponentContext > xContext( comphelper::getComponentContext(xFactory) ); + xTmpHandler.set( InteractionHandler::createDefault(xContext), uno::UNO_QUERY_THROW ); } sal_Bool bCanChangePassword = sal_True; @@ -1284,7 +1288,8 @@ void SAL_CALL PasswordContainer::removeMasterPassword() if ( !xTmpHandler.is() ) { uno::Reference< lang::XMultiServiceFactory > xFactory( mComponent, uno::UNO_QUERY_THROW ); - xTmpHandler.set( xFactory->createInstance( ::rtl::OUString( "com.sun.star.task.InteractionHandler" ) ), uno::UNO_QUERY_THROW ); + uno::Reference< uno::XComponentContext > xContext( comphelper::getComponentContext(xFactory) ); + xTmpHandler.set( InteractionHandler::createDefault(xContext), uno::UNO_QUERY_THROW ); } sal_Bool bCanChangePassword = sal_True; diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index a390c458fd40..dc182678dd05 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include @@ -698,9 +698,9 @@ ViewTabListBox_Impl::ViewTabListBox_Impl( Window* pParentWin, maResetQuickSearch.SetTimeout( QUICK_SEARCH_TIMEOUT ); maResetQuickSearch.SetTimeoutHdl( LINK( this, ViewTabListBox_Impl, ResetQuickSearch_Impl ) ); - Reference< XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory(); + Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext(); Reference< XInteractionHandler > xInteractionHandler = Reference< XInteractionHandler > ( - xFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uui.InteractionHandler") ) ), UNO_QUERY ); + InteractionHandler::createDefault(xContext), UNO_QUERY_THROW ); mxCmdEnv = new ::ucbhelper::CommandEnvironment( xInteractionHandler, Reference< XProgressHandler >() ); @@ -1160,8 +1160,9 @@ SvtFileView::SvtFileView( Window* pParent, const ResId& rResId, if ( bMultiSelection ) nFlags |= FILEVIEW_MULTISELECTION; + Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext(); Reference< XInteractionHandler > xInteractionHandler = Reference< XInteractionHandler > ( - ::comphelper::getProcessServiceFactory()->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uui.InteractionHandler") ) ), UNO_QUERY ); + InteractionHandler::createDefault(xContext), UNO_QUERY_THROW ); Reference < XCommandEnvironment > xCmdEnv = new ::ucbhelper::CommandEnvironment( xInteractionHandler, Reference< XProgressHandler >() ); mpImp = new SvtFileView_Impl( this, xCmdEnv, nFlags, bOnlyFolder ); @@ -1177,8 +1178,9 @@ SvtFileView::SvtFileView( Window* pParent, const ResId& rResId, sal_uInt8 nFlags Control( pParent, rResId ) { + Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext(); Reference< XInteractionHandler > xInteractionHandler = Reference< XInteractionHandler > ( - ::comphelper::getProcessServiceFactory()->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uui.InteractionHandler") ) ), UNO_QUERY ); + InteractionHandler::createDefault(xContext), UNO_QUERY_THROW ); Reference < XCommandEnvironment > xCmdEnv = new ::ucbhelper::CommandEnvironment( xInteractionHandler, Reference< XProgressHandler >() ); mpImp = new SvtFileView_Impl( this, xCmdEnv, nFlags, nFlags & FILEVIEW_ONLYFOLDER ); diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx index 9a77b770a851..9579759419b3 100644 --- a/svtools/source/contnr/templwin.cxx +++ b/svtools/source/contnr/templwin.cxx @@ -71,6 +71,7 @@ #include #include #include +#include #include #include #include @@ -669,8 +670,9 @@ void SvtFrameWindow_Impl::ShowDocInfo( const String& rURL ) { try { - uno::Reference < task::XInteractionHandler > xInteractionHandler( ::comphelper::getProcessServiceFactory()->createInstance( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.InteractionHandler" )) ), uno::UNO_QUERY ); + uno::Reference < task::XInteractionHandler > xInteractionHandler( + task::InteractionHandler::createDefault(::comphelper::getProcessComponentContext()), + uno::UNO_QUERY_THROW ); uno::Sequence < beans::PropertyValue> aProps(1); aProps[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" )); aProps[0].Value <<= xInteractionHandler; @@ -752,8 +754,8 @@ void SvtFrameWindow_Impl::OpenFile( const String& rURL, sal_Bool bPreview, sal_B aArgs[1].Value.setValue( &b, ::getBooleanCppuType() ); aArgs[2].Name = ASCII_STR("AsTemplate"); // prevents getting an empty URL with getURL()! - uno::Reference < task::XInteractionHandler > xInteractionHandler( ::comphelper::getProcessServiceFactory()->createInstance( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.InteractionHandler" )) ), uno::UNO_QUERY ); + uno::Reference < task::XInteractionHandler > xInteractionHandler( + task::InteractionHandler::createDefault(::comphelper::getProcessComponentContext()), uno::UNO_QUERY_THROW ); aArgs[3].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" )); aArgs[3].Value <<= xInteractionHandler; diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx index e93be567293b..3417d5531606 100644 --- a/svtools/source/dialogs/ServerDetailsControls.cxx +++ b/svtools/source/dialogs/ServerDetailsControls.cxx @@ -27,7 +27,7 @@ */ #include -#include +#include #include #include #include @@ -292,9 +292,9 @@ CmisDetailsContainer::CmisDetailsContainer( ) : m_sUsername( ), m_xCmdEnv( ) { - Reference< XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory(); + Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext(); Reference< XInteractionHandler > xGlobalInteractionHandler = Reference< XInteractionHandler >( - xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler") ) ), UNO_QUERY ); + InteractionHandler::createDefault(xContext), UNO_QUERY ); m_xCmdEnv = new ucbhelper::CommandEnvironment( xGlobalInteractionHandler, Reference< XProgressHandler >() ); } diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 49f7ca5204ba..a59b378746a4 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -52,7 +52,7 @@ #include #include #include -#include +#include #include #include #include @@ -847,15 +847,17 @@ void AssignmentPersistentData::Commit() m_aDatasource.SaveValue(); // create an interaction handler (may be needed for connecting) - const rtl::OUString sInteractionHandlerServiceName("com.sun.star.task.InteractionHandler"); Reference< XInteractionHandler > xHandler; try { - xHandler = Reference< XInteractionHandler >(m_xORB->createInstance(sInteractionHandlerServiceName), UNO_QUERY); + xHandler = Reference< XInteractionHandler >( + InteractionHandler::createDefault(comphelper::getComponentContext(m_xORB)), + UNO_QUERY_THROW ); } catch(Exception&) { } if (!xHandler.is()) { + const rtl::OUString sInteractionHandlerServiceName("com.sun.star.task.InteractionHandler"); ShowServiceNotAvailableError(this, sInteractionHandlerServiceName, sal_True); return; } diff --git a/svx/inc/svx/dbtoolsclient.hxx b/svx/inc/svx/dbtoolsclient.hxx index 3568c20396c3..d9464f8bd4a1 100644 --- a/svx/inc/svx/dbtoolsclient.hxx +++ b/svx/inc/svx/dbtoolsclient.hxx @@ -110,7 +110,7 @@ namespace svxform const ::rtl::OUString& _rDataSourceName, const ::rtl::OUString& _rUser, const ::rtl::OUString& _rPwd, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext ) const SAL_THROW ( (::com::sun::star::sdbc::SQLException) ); // ------------------------------------------------ diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index f301612431bb..acbf420435a4 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -295,7 +295,8 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt ) try { ::rtl::OUString sSignificantSource( sDatasouce.isEmpty() ? sDatabaseLocation : sDatasouce ); - xConnection = OStaticDataAccessTools().getConnection_withFeedback(sSignificantSource, ::rtl::OUString(),::rtl::OUString(),static_cast(GetParent())->getServiceManager()); + xConnection = OStaticDataAccessTools().getConnection_withFeedback(sSignificantSource, ::rtl::OUString(),::rtl::OUString(), + comphelper::getComponentContext( static_cast(GetParent())->getServiceManager() )); } catch(NoSuchElementException&) { // allowed, means sDatasouce isn't a valid data source name .... diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx index c07be75cc19e..a7a2b03f5d8f 100644 --- a/svx/source/form/dbtoolsclient.cxx +++ b/svx/source/form/dbtoolsclient.cxx @@ -193,12 +193,12 @@ namespace svxform //-------------------------------------------------------------------- Reference< XConnection> OStaticDataAccessTools::getConnection_withFeedback(const ::rtl::OUString& _rDataSourceName, - const ::rtl::OUString& _rUser, const ::rtl::OUString& _rPwd, const Reference< XMultiServiceFactory>& _rxFactory) const + const ::rtl::OUString& _rUser, const ::rtl::OUString& _rPwd, const Reference& _rxContext) const SAL_THROW ( (SQLException) ) { Reference< XConnection > xReturn; if ( ensureLoaded() ) - xReturn = m_xDataAccessTools->getConnection_withFeedback(_rDataSourceName, _rUser, _rPwd, _rxFactory); + xReturn = m_xDataAccessTools->getConnection_withFeedback(_rDataSourceName, _rUser, _rPwd, _rxContext); return xReturn; } diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index d55071e7aff6..0814b5f92e2f 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -1185,7 +1185,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript sDataSource, ::rtl::OUString(), ::rtl::OUString(), - m_aContext.getLegacyServiceFactory() + m_aContext.getUNOContext() ) ); } catch (const SQLException&) diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index d18e6bb1cc0d..5dbb628d6b2f 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -61,6 +61,7 @@ #include #include #include +#include #include #include #include @@ -199,6 +200,7 @@ namespace svxform using ::com::sun::star::util::URL; using ::com::sun::star::frame::FeatureStateEvent; using ::com::sun::star::form::runtime::XFormControllerContext; + using ::com::sun::star::task::InteractionHandler; using ::com::sun::star::task::XInteractionHandler; using ::com::sun::star::form::runtime::FormOperations; using ::com::sun::star::container::XContainer; @@ -4272,7 +4274,7 @@ bool FormController::ensureInteractionHandler() return false; m_bAttemptedHandlerCreation = true; - m_xInteractionHandler.set( m_aContext.createComponent( ::rtl::OUString( "com.sun.star.task.InteractionHandler" ) ), UNO_QUERY ); + m_xInteractionHandler.set( InteractionHandler::createDefault(m_aContext.getUNOContext()), UNO_QUERY ); OSL_ENSURE( m_xInteractionHandler.is(), "FormController::ensureInteractionHandler: could not create an interaction handler!" ); return m_xInteractionHandler.is(); } diff --git a/sw/CppunitTest_sw_subsequent_odfexport.mk b/sw/CppunitTest_sw_subsequent_odfexport.mk index 4ba12b90b0db..ed559ba069cd 100644 --- a/sw/CppunitTest_sw_subsequent_odfexport.mk +++ b/sw/CppunitTest_sw_subsequent_odfexport.mk @@ -84,6 +84,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_odfexport,\ ucb/source/ucp/file/ucpfile1 \ unotools/util/utl \ unoxml/source/service/unoxml \ + uui/util/uui \ $(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \ )) diff --git a/sw/CppunitTest_sw_subsequent_odfimport.mk b/sw/CppunitTest_sw_subsequent_odfimport.mk index 9c9a1560d5ca..9cd82706f2cf 100644 --- a/sw/CppunitTest_sw_subsequent_odfimport.mk +++ b/sw/CppunitTest_sw_subsequent_odfimport.mk @@ -83,6 +83,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_odfimport,\ ucb/source/ucp/file/ucpfile1 \ unotools/util/utl \ unoxml/source/service/unoxml \ + uui/util/uui \ $(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \ )) diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index 8a549263be4c..045436becc2c 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -53,6 +53,7 @@ #include #include #include +#include #include #include #include @@ -559,9 +560,8 @@ void SwAddressListDialog::DetectTablesAndQueries( m_xDBContext->getByName(m_aDBData.sDataSource) >>= xComplConnection; pUserData->xSource = uno::Reference(xComplConnection, UNO_QUERY); - uno::Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ); - uno::Reference< XInteractionHandler > xHandler( - xMgr->createInstance( C2U( "com.sun.star.task.InteractionHandler" )), UNO_QUERY); + uno::Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); + uno::Reference< XInteractionHandler > xHandler( InteractionHandler::createDefault(xContext), UNO_QUERY ); pUserData->xConnection = SharedConnection( xComplConnection->connectWithCompletion( xHandler ) ); } if(pUserData->xConnection.is()) diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index f8824aea4db8..276639271d9c 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -101,6 +102,7 @@ #include #include #include +#include #include #include #include @@ -1571,7 +1573,6 @@ uno::Reference< sdbc::XConnection> SwNewDBMgr::GetConnection(const String& rData uno::Reference& rxSource) { Reference< sdbc::XConnection> xConnection; - Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ); Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); try { @@ -1579,9 +1580,8 @@ uno::Reference< sdbc::XConnection> SwNewDBMgr::GetConnection(const String& rData if ( xComplConnection.is() ) { rxSource.set(xComplConnection,UNO_QUERY); - Reference< XInteractionHandler > xHandler( - xMgr->createInstance( C2U( "com.sun.star.task.InteractionHandler" )), UNO_QUERY); - xConnection = xComplConnection->connectWithCompletion( xHandler ); + Reference< XInteractionHandler > xHandler( InteractionHandler::createDefault(xContext), UNO_QUERY_THROW ); + xConnection = xComplConnection->connectWithCompletion( xHandler ); } } catch(const Exception&) @@ -2661,7 +2661,7 @@ uno::Reference SwNewDBMgr::createCursor(const ::rtl::OUString& _sDat if ( xRowSet.is() ) { - uno::Reference< XInteractionHandler > xHandler(xMgr->createInstance(C2U("com.sun.star.task.InteractionHandler")), UNO_QUERY); + uno::Reference< XInteractionHandler > xHandler( InteractionHandler::createDefault(comphelper::getComponentContext(xMgr)), UNO_QUERY_THROW ); xRowSet->executeWithCompletion(xHandler); } xResultSet = uno::Reference(xRowSet, UNO_QUERY); diff --git a/ucb/workben/ucb/ucbdemo.cxx b/ucb/workben/ucb/ucbdemo.cxx index 00f44655aa75..d24d8e61b1f9 100644 --- a/ucb/workben/ucb/ucbdemo.cxx +++ b/ucb/workben/ucb/ucbdemo.cxx @@ -650,10 +650,8 @@ uno::Any UcbCommandProcessor::executeCommand( const rtl::OUString& rName, if (m_rUCB.getServiceFactory().is()) xInteractionHandler = uno::Reference< task::XInteractionHandler >( - m_rUCB.getServiceFactory()-> - createInstance( - rtl::OUString( "com.sun.star.task.InteractionHandler")), - uno::UNO_QUERY); + task::InteractionHandler::create(m_rUCB.getServiceFactory()), + uno::UNO_QUERY_THROW); uno::Reference< ucb::XProgressHandler > xProgressHandler(new ProgressHandler(m_rUCB)); uno::Reference< ucb::XCommandEnvironment > xEnv( @@ -1308,10 +1306,8 @@ void UcbContent::transfer( const rtl::OUString& rSourceURL, sal_Bool bMove ) if (m_rUCB.getServiceFactory().is()) xInteractionHandler = uno::Reference< task::XInteractionHandler >( - m_rUCB.getServiceFactory()-> - createInstance( - rtl::OUString( "com.sun.star.task.InteractionHandler")), - uno::UNO_QUERY); + task::InteractionHandler::createDefault(comphelper::getComponentContext(m_rUCB.getServiceFactory())), + uno::UNO_QUERY_THROW); uno::Reference< ucb::XProgressHandler > xProgressHandler( new ProgressHandler(m_rUCB)); uno::Reference< ucb::XCommandEnvironment > xEnv( diff --git a/udkapi/com/sun/star/task/XInteractionHandler2.idl b/udkapi/com/sun/star/task/XInteractionHandler2.idl index 5c76ac71edae..7cd1c7190f13 100644 --- a/udkapi/com/sun/star/task/XInteractionHandler2.idl +++ b/udkapi/com/sun/star/task/XInteractionHandler2.idl @@ -34,7 +34,7 @@ @since OOo 3.2 */ -/* published */ interface XInteractionHandler2 : com::sun::star::task::XInteractionHandler +published interface XInteractionHandler2 : com::sun::star::task::XInteractionHandler { /** Handle an interaction request. diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index 127f7d42737c..e09256d9027e 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -34,6 +34,7 @@ #include "com/sun/star/task/ErrorCodeIOException.hpp" #include "com/sun/star/task/ErrorCodeRequest.hpp" #include "com/sun/star/task/FutureDocumentVersionProductUpdateRequest.hpp" +#include "com/sun/star/task/InteractionHandler.hpp" #include "com/sun/star/task/XInteractionAbort.hpp" #include "com/sun/star/task/XInteractionApprove.hpp" #include "com/sun/star/task/XInteractionAskLater.hpp" @@ -72,6 +73,7 @@ #include "vcl/svapp.hxx" #include "unotools/configmgr.hxx" #include "toolkit/helper/vclunohelper.hxx" +#include "comphelper/processfactory.hxx" #include "comphelper/namedvaluecollection.hxx" #include "typelib/typedescription.hxx" #include "unotools/confignode.hxx" @@ -99,6 +101,7 @@ using ::com::sun::star::task::FutureDocumentVersionProductUpdateRequest; using ::com::sun::star::uno::XInterface; using ::com::sun::star::lang::XInitialization; using ::com::sun::star::uno::UNO_QUERY_THROW; +using ::com::sun::star::task::InteractionHandler; using ::com::sun::star::task::XInteractionHandler2; using ::com::sun::star::uno::Exception; using ::com::sun::star::uno::Any; @@ -129,10 +132,12 @@ public: UUIInteractionHelper::UUIInteractionHelper( uno::Reference< lang::XMultiServiceFactory > const & rServiceFactory, - uno::Sequence< uno::Any > const & rArguments) + uno::Reference< awt::XWindow > const & rxWindowParam, + const OUString & rContextParam) SAL_THROW(()): m_xServiceFactory(rServiceFactory), - m_aProperties(rArguments) + m_xWindowParam(rxWindowParam), + m_aContextParam(rContextParam) { } @@ -1092,58 +1097,24 @@ uno::Reference< awt::XWindow> UUIInteractionHelper::getParentXWindow() const SAL_THROW(()) { - osl::MutexGuard aGuard(m_aPropertyMutex); - ::comphelper::NamedValueCollection aProperties( m_aProperties ); - if ( aProperties.has( "Parent" ) ) - { - uno::Reference< awt::XWindow > xWindow; - OSL_VERIFY( aProperties.get( "Parent" ) >>= xWindow ); - return xWindow; - } - return 0; + return m_xWindowParam; } rtl::OUString UUIInteractionHelper::getContextProperty() SAL_THROW(()) { - osl::MutexGuard aGuard(m_aPropertyMutex); - for (sal_Int32 i = 0; i < m_aProperties.getLength(); ++i) - { - beans::PropertyValue aProperty; - if ((m_aProperties[i] >>= aProperty) && aProperty.Name == "Context" ) - { - rtl::OUString aContext; - aProperty.Value >>= aContext; - return aContext; - } - } - return rtl::OUString(); + return m_aContextParam; } uno::Reference< task::XInteractionHandler > UUIInteractionHelper::getInteractionHandler() SAL_THROW((uno::RuntimeException)) { - uno::Reference< task::XInteractionHandler > xIH; - try - { - xIH.set(m_xServiceFactory->createInstanceWithArguments( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.task.InteractionHandler")), - m_aProperties), - uno::UNO_QUERY); - } - catch (uno::Exception const &) - {} - - if (!xIH.is()) - throw uno::RuntimeException( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "unable to instanciate Interaction Handler service")), - uno::Reference< uno::XInterface >()); + uno::Reference< task::XInteractionHandler > xIH( + InteractionHandler::createWithParentAndContext(comphelper::getComponentContext(m_xServiceFactory), + m_xWindowParam, m_aContextParam), + UNO_QUERY_THROW); return xIH; } diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx index 358bdd5d58ae..3266f0b90216 100644 --- a/uui/source/iahndl.hxx +++ b/uui/source/iahndl.hxx @@ -88,7 +88,8 @@ class UUIInteractionHelper private: mutable osl::Mutex m_aPropertyMutex; ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; - ::com::sun::star::uno::Sequence< com::sun::star::uno::Any > m_aProperties; + ::com::sun::star::uno::Reference< com::sun::star::awt::XWindow > m_xWindowParam; + const OUString m_aContextParam; StringHashMap m_aTypedCustomHandlers; UUIInteractionHelper(UUIInteractionHelper &); // not implemented void operator =(UUIInteractionHelper); // not implemented @@ -97,8 +98,9 @@ public: UUIInteractionHelper( com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > const & rServiceFactory, - com::sun::star::uno::Sequence< - com::sun::star::uno::Any > const & rArguments) + com::sun::star::uno::Reference< + com::sun::star::awt::XWindow > const & rxWindow, + const OUString & rContextParam) SAL_THROW(()); UUIInteractionHelper( com::sun::star::uno::Reference< diff --git a/uui/source/interactionhandler.cxx b/uui/source/interactionhandler.cxx index 4054a3825f2c..821b03e632a8 100644 --- a/uui/source/interactionhandler.cxx +++ b/uui/source/interactionhandler.cxx @@ -19,6 +19,8 @@ #include "iahndl.hxx" #include "interactionhandler.hxx" +#include "comphelper/namedvaluecollection.hxx" +#include "com/sun/star/awt/XWindow.hpp" using namespace com::sun::star; @@ -67,7 +69,21 @@ UUIInteractionHandler::initialize( throw (uno::Exception) { delete m_pImpl; - m_pImpl = new UUIInteractionHelper(m_xServiceFactory, rArguments); + + uno::Reference< awt::XWindow > xWindow; + rtl::OUString aContext; + ::comphelper::NamedValueCollection aProperties( rArguments ); + if ( aProperties.has( "Parent" ) ) + { + OSL_VERIFY( aProperties.get( "Parent" ) >>= xWindow ); + } + if ( aProperties.has( "Context" ) ) + { + OSL_VERIFY( aProperties.get( "Context" ) >>= aContext ); + } + + + m_pImpl = new UUIInteractionHelper(m_xServiceFactory, xWindow, aContext); } void SAL_CALL diff --git a/uui/source/interactionhandler.hxx b/uui/source/interactionhandler.hxx index 39acd8624a22..8d2147b74641 100644 --- a/uui/source/interactionhandler.hxx +++ b/uui/source/interactionhandler.hxx @@ -20,16 +20,14 @@ #ifndef UUI_INTERACTIONHANDLER_HXX #define UUI_INTERACTIONHANDLER_HXX -#include "com/sun/star/lang/XInitialization.hpp" #include "com/sun/star/lang/XServiceInfo.hpp" #include "com/sun/star/task/XInteractionHandler2.hpp" -#include "cppuhelper/implbase3.hxx" +#include "cppuhelper/implbase2.hxx" class UUIInteractionHelper; class UUIInteractionHandler: - public cppu::WeakImplHelper3< com::sun::star::lang::XServiceInfo, - com::sun::star::lang::XInitialization, + public cppu::WeakImplHelper2< com::sun::star::lang::XServiceInfo, com::sun::star::task::XInteractionHandler2 > { public: diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx index 7f56603ecc2b..74ac0a3078a5 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include "boost/scoped_array.hpp" #include @@ -104,33 +104,27 @@ struct UsageDescription char* GetPasswordFunction( PK11SlotInfo* pSlot, PRBool bRetry, void* /*arg*/ ) { - uno::Reference< lang::XMultiServiceFactory > xMSF( ::comphelper::getProcessServiceFactory() ); - if ( xMSF.is() ) + uno::Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); + uno::Reference < task::XInteractionHandler2 > xInteractionHandler( + task::InteractionHandler::createDefault(xContext) ); + + task::PasswordRequestMode eMode = bRetry ? task::PasswordRequestMode_PASSWORD_REENTER : task::PasswordRequestMode_PASSWORD_ENTER; + ::comphelper::DocPasswordRequest* pPasswordRequest = new ::comphelper::DocPasswordRequest( + ::comphelper::DocPasswordRequestType_STANDARD, eMode, ::rtl::OUString::createFromAscii(PK11_GetTokenName(pSlot)) ); + + uno::Reference< task::XInteractionRequest > xRequest( pPasswordRequest ); + xInteractionHandler->handle( xRequest ); + + if ( pPasswordRequest->isPassword() ) { - uno::Reference < task::XInteractionHandler > xInteractionHandler( - xMSF->createInstance( rtl::OUString("com.sun.star.task.InteractionHandler") ), uno::UNO_QUERY ); - - if ( xInteractionHandler.is() ) - { - task::PasswordRequestMode eMode = bRetry ? task::PasswordRequestMode_PASSWORD_REENTER : task::PasswordRequestMode_PASSWORD_ENTER; - ::comphelper::DocPasswordRequest* pPasswordRequest = new ::comphelper::DocPasswordRequest( - ::comphelper::DocPasswordRequestType_STANDARD, eMode, ::rtl::OUString::createFromAscii(PK11_GetTokenName(pSlot)) ); - - uno::Reference< task::XInteractionRequest > xRequest( pPasswordRequest ); - xInteractionHandler->handle( xRequest ); - - if ( pPasswordRequest->isPassword() ) - { - rtl::OString aPassword(rtl::OUStringToOString( - pPasswordRequest->getPassword(), - osl_getThreadTextEncoding())); - sal_Int32 nLen = aPassword.getLength(); - char* pPassword = (char*) PORT_Alloc( nLen+1 ) ; - pPassword[nLen] = 0; - memcpy( pPassword, aPassword.getStr(), nLen ); - return pPassword; - } - } + rtl::OString aPassword(rtl::OUStringToOString( + pPasswordRequest->getPassword(), + osl_getThreadTextEncoding())); + sal_Int32 nLen = aPassword.getLength(); + char* pPassword = (char*) PORT_Alloc( nLen+1 ) ; + pPassword[nLen] = 0; + memcpy( pPassword, aPassword.getStr(), nLen ); + return pPassword; } return NULL; } From dd11a1e57a2565560803dc3fef5fccc9e7157105 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 4 Oct 2012 14:36:34 +0200 Subject: [PATCH 297/863] Fixes/improvements on previous commit * UUIInteractionHandler still needs to implement XInitialization. * Moved ambiguating InteractionHandler typedef out of the way. * Removed InteractionHandler.createDefault, as it was originally stated that "it is strongly recommended that [the "Parent"] property is supplied." * Added back documentation about Parent and Context. * Simplified some call-sites to directly use XInteractionHandler2. Change-Id: I1029b8f3cf079171c75920cafaaa44b5bbada883 --- basctl/source/basicide/moduldl2.cxx | 13 +++--- connectivity/source/commontools/dbtools.cxx | 2 +- cui/source/dialogs/insdlg.cxx | 5 +-- cui/source/options/webconninfo.cxx | 8 ++-- .../core/dataaccess/databasecontext.cxx | 2 +- .../core/dataaccess/documentdefinition.cxx | 4 +- .../ext/macromigration/docinteraction.cxx | 2 +- dbaccess/source/filter/xml/dbloader2.cxx | 2 +- dbaccess/source/ui/browser/brwctrlr.cxx | 2 +- dbaccess/source/ui/browser/unodatbr.cxx | 3 +- dbaccess/source/ui/dlg/CollectionView.cxx | 12 +----- dbaccess/source/ui/dlg/ConnectionHelper.cxx | 2 +- dbaccess/source/ui/dlg/DbAdminImpl.cxx | 2 +- dbaccess/source/ui/dlg/dbwizsetup.cxx | 9 ++-- dbaccess/source/ui/misc/UITools.cxx | 2 +- dbaccess/source/ui/misc/WCopyTable.cxx | 2 +- .../source/ui/misc/datasourceconnector.cxx | 2 +- dbaccess/source/ui/uno/copytablewizard.cxx | 25 ++++++----- dbaccess/source/ui/uno/dbinteraction.cxx | 5 +-- desktop/source/app/configinit.cxx | 2 +- desktop/source/app/dispatchwatcher.cxx | 5 +-- .../gui/dp_gui_extensioncmdqueue.cxx | 9 +--- .../deployment/gui/dp_gui_updatedialog.cxx | 6 +-- .../source/abpilot/datasourcehandling.cxx | 7 ++-- extensions/source/bibliography/datman.cxx | 2 +- extensions/source/dbpilots/controlwizard.cxx | 2 +- extensions/source/update/check/updatehdl.cxx | 6 +-- .../source/xsltdialog/xmlfiltertestdialog.cxx | 4 +- forms/source/xforms/submission/replace.cxx | 4 +- .../xforms/submission/submission_get.cxx | 4 +- fpicker/source/office/fpsmartcontent.cxx | 8 ++-- fpicker/source/office/iodlg.cxx | 6 +-- .../com/sun/star/task/InteractionHandler.idl | 17 ++++++-- .../source/core/api/ReportDefinition.cxx | 2 +- sc/source/core/data/dpobject.cxx | 2 +- sc/source/ui/dbgui/dapidata.cxx | 4 +- sc/source/ui/docshell/dbdocimp.cxx | 4 +- sfx2/source/appl/shutdownicon.cxx | 5 +-- sfx2/source/bastyp/helper.cxx | 8 ++-- sfx2/source/control/templateremoteview.cxx | 4 +- sfx2/source/dialog/templateinfodlg.cxx | 4 +- sfx2/source/doc/docfile.cxx | 4 +- sfx2/source/doc/doctemplates.cxx | 2 +- sfx2/source/doc/guisaveas.cxx | 4 +- sfx2/source/doc/objserv.cxx | 5 +-- .../passwordcontainer/passwordcontainer.cxx | 6 +-- svtools/source/contnr/fileview.cxx | 12 +++--- svtools/source/contnr/templwin.cxx | 9 ++-- .../source/dialogs/ServerDetailsControls.cxx | 4 +- svtools/source/dialogs/addresstemplate.cxx | 6 +-- svx/source/form/formcontroller.cxx | 2 +- sw/source/ui/dbui/addresslistdialog.cxx | 2 +- sw/source/ui/dbui/dbmgr.cxx | 4 +- ucb/workben/ucb/ucbdemo.cxx | 4 +- uui/source/iahndl-authentication.cxx | 2 +- uui/source/iahndl.cxx | 10 ++--- uui/source/iahndl.hxx | 4 +- uui/source/interactionhandler.hxx | 6 ++- uui/source/passwordcontainer.cxx | 41 +++++++++++++------ uui/source/passwordcontainer.hxx | 15 ++++--- .../nss/securityenvironment_nssimpl.cxx | 2 +- 61 files changed, 185 insertions(+), 178 deletions(-) diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index f14611836c2d..5de042e9262f 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -82,9 +82,9 @@ namespace class DummyInteractionHandler : public HandlerImpl_BASE { - Reference< task::XInteractionHandler > m_xHandler; + Reference< task::XInteractionHandler2 > m_xHandler; public: - DummyInteractionHandler( const Reference< task::XInteractionHandler >& xHandler ) : m_xHandler( xHandler ){} + DummyInteractionHandler( const Reference< task::XInteractionHandler2 >& xHandler ) : m_xHandler( xHandler ){} virtual void SAL_CALL handle( const Reference< task::XInteractionRequest >& rRequest ) throw (::com::sun::star::uno::RuntimeException) { @@ -1255,7 +1255,7 @@ void LibPage::ExportAsPackage( const String& aLibName ) // file open dialog Reference< lang::XMultiServiceFactory > xMSF( ::comphelper::getProcessServiceFactory() ); Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); - Reference< task::XInteractionHandler > xHandler( task::InteractionHandler::createDefault(xContext), UNO_QUERY ); + Reference< task::XInteractionHandler2 > xHandler( task::InteractionHandler::createWithParent(xContext, 0) ); Reference< XSimpleFileAccess2 > xSFA = SimpleFileAccess::create(xContext); Reference < XFilePicker > xFP; @@ -1307,7 +1307,10 @@ void LibPage::ExportAsPackage( const String& aLibName ) implExportLib( aLibName, aTmpPath, xDummyHandler ); Reference< XCommandEnvironment > xCmdEnv = - static_cast( new OLibCommandEnvironment( xHandler ) ); + static_cast( + new OLibCommandEnvironment( + Reference< task::XInteractionHandler >( + xHandler, UNO_QUERY ) ) ); ::ucbhelper::Content sourceContent( aSourcePath, xCmdEnv, comphelper::getProcessComponentContext() ); @@ -1386,7 +1389,7 @@ void LibPage::ExportAsBasic( const String& aLibName ) Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); Reference< XFolderPicker > xFolderPicker( xMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FolderPicker" ) ) ), UNO_QUERY ); - Reference< task::XInteractionHandler > xHandler( task::InteractionHandler::createDefault(xContext), UNO_QUERY_THROW ); + Reference< task::XInteractionHandler2 > xHandler( task::InteractionHandler::createWithParent(xContext, 0) ); if( xFolderPicker.is() ) { diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index e5800bc9dc4d..2afd00192482 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -307,7 +307,7 @@ Reference< XConnection > getConnection_allowException( if (xConnectionCompletion.is()) { // instantiate the default SDB interaction handler Reference< XInteractionHandler > xHandler( - InteractionHandler::createDefault(_rxContext), UNO_QUERY_THROW ); + InteractionHandler::createWithParent(_rxContext, 0), UNO_QUERY ); xConnection = xConnectionCompletion->connectWithCompletion(xHandler); } } diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 95b2eb13f0d5..e15c328af33f 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -342,9 +342,8 @@ short SvInsertOleDlg::Execute() aMedium[0].Value <<= ::rtl::OUString( aFileName ); uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); - uno::Reference< task::XInteractionHandler > xInteraction( - task::InteractionHandler::createDefault(xContext), - uno::UNO_QUERY_THROW ); + uno::Reference< task::XInteractionHandler2 > xInteraction( + task::InteractionHandler::createWithParent(xContext, 0) ); aMedium[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" ) ); aMedium[1].Value <<= xInteraction; diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index 5b4ca5fcb09f..bc7bb02b7856 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -188,8 +188,8 @@ void WebConnectionInfoDialog::FillPasswordList() if ( xMasterPasswd->isPersistentStoringAllowed() ) { uno::Reference< task::XInteractionHandler > xInteractionHandler( - task::InteractionHandler::createDefault(comphelper::getProcessComponentContext()), - uno::UNO_QUERY_THROW); + task::InteractionHandler::createWithParent(comphelper::getProcessComponentContext(), 0), + uno::UNO_QUERY); uno::Sequence< task::UrlRecord > aURLEntries = xMasterPasswd->getAllPersistent( xInteractionHandler ); sal_Int32 nCount = 0; @@ -297,8 +297,8 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, ChangePasswordHdl) uno::Reference< task::XInteractionRequest > rRequest( pPasswordRequest ); uno::Reference< task::XInteractionHandler > xInteractionHandler( - task::InteractionHandler::createDefault(comphelper::getProcessComponentContext()), - uno::UNO_QUERY_THROW ); + task::InteractionHandler::createWithParent(comphelper::getProcessComponentContext(), 0), + uno::UNO_QUERY ); xInteractionHandler->handle( rRequest ); if ( pPasswordRequest->isPassword() ) diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx index 717661d57e46..798262f941a6 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.cxx +++ b/dbaccess/source/core/dataaccess/databasecontext.cxx @@ -363,7 +363,7 @@ Reference< XInterface > ODatabaseContext::loadObjectFromURL(const ::rtl::OUStrin ::comphelper::NamedValueCollection aArgs; aArgs.put( "URL", _sURL ); aArgs.put( "MacroExecutionMode", MacroExecMode::USE_CONFIG ); - aArgs.put( "InteractionHandler", task::InteractionHandler::createDefault(m_aContext.getUNOContext()) ); + aArgs.put( "InteractionHandler", task::InteractionHandler::createWithParent(m_aContext.getUNOContext(), 0) ); Sequence< PropertyValue > aResource( aArgs.getPropertyValues() ); xLoad->load( aResource ); diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index fd1ded798872..5abe8f8bb8d9 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -1301,7 +1301,7 @@ sal_Bool ODocumentDefinition::save(sal_Bool _bApprove) pRequest->addContinuation(pAbort); // create the handler, let it handle the request - Reference< XInteractionHandler > xHandler( InteractionHandler::createDefault(m_aContext.getUNOContext()), UNO_QUERY_THROW ); + Reference< XInteractionHandler2 > xHandler( InteractionHandler::createWithParent(m_aContext.getUNOContext(), 0) ); xHandler->handle(xRequest); if ( pAbort->wasSelected() ) @@ -1375,7 +1375,7 @@ sal_Bool ODocumentDefinition::saveAs() pRequest->addContinuation(pAbort); // create the handler, let it handle the request - Reference< XInteractionHandler > xHandler( InteractionHandler::createDefault(m_aContext.getUNOContext()), UNO_QUERY_THROW); + Reference< XInteractionHandler2 > xHandler( InteractionHandler::createWithParent(m_aContext.getUNOContext(), 0) ); xHandler->handle(xRequest); if ( pAbort->wasSelected() ) diff --git a/dbaccess/source/ext/macromigration/docinteraction.cxx b/dbaccess/source/ext/macromigration/docinteraction.cxx index f2f9dc5938fd..9e21ef418541 100644 --- a/dbaccess/source/ext/macromigration/docinteraction.cxx +++ b/dbaccess/source/ext/macromigration/docinteraction.cxx @@ -66,7 +66,7 @@ namespace dbmm } InteractionHandler_Data( const ::comphelper::ComponentContext& _rContext ) - :xHandler( ::com::sun::star::task::InteractionHandler::createDefault(_rContext.getUNOContext()), UNO_QUERY_THROW ) + :xHandler( ::com::sun::star::task::InteractionHandler::createWithParent(_rContext.getUNOContext(), 0), UNO_QUERY ) { } }; diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx index 52562d997540..07fe9f25229c 100644 --- a/dbaccess/source/filter/xml/dbloader2.cxx +++ b/dbaccess/source/filter/xml/dbloader2.cxx @@ -429,7 +429,7 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const :: // not touch it. if ( !aMediaDesc.has( "InteractionHandler" ) ) { - Reference< XInteractionHandler > xHandler( InteractionHandler::createDefault(m_aContext.getUNOContext()), UNO_QUERY_THROW ); + Reference< XInteractionHandler2 > xHandler( InteractionHandler::createWithParent(m_aContext.getUNOContext(), 0) ); aMediaDesc.put( "InteractionHandler", xHandler ); } diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index d03cd2abd0bd..460b09354860 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -1471,7 +1471,7 @@ sal_Bool SbaXDataBrowserController::approveParameter(const ::com::sun::star::for pParamRequest->addContinuation(pAbort); // create the handler, let it handle the request - Reference< XInteractionHandler > xHandler( InteractionHandler::createDefault(comphelper::ComponentContext(getORB()).getUNOContext()), UNO_QUERY_THROW); + Reference< XInteractionHandler2 > xHandler( InteractionHandler::createWithParent(comphelper::getComponentContext(getORB()), 0) ); xHandler->handle(xParamRequest); if (!pParamValues->wasSelected()) diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 23148ba2a812..058aaefcadf4 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -3531,8 +3531,7 @@ void SbaTableQueryBrowser::implAdministrate( SvLBoxEntry* _pApplyTo ) if ( xDocumentModel.is() ) { Reference< XInteractionHandler2 > xInteractionHandler( - InteractionHandler::createDefault(comphelper::getComponentContext(getORB())), - UNO_QUERY_THROW ); + InteractionHandler::createWithParent(comphelper::getComponentContext(getORB()), 0) ); ::comphelper::NamedValueCollection aLoadArgs; aLoadArgs.put( "Model", xDocumentModel ); diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx index 3c11de710096..7123db850014 100644 --- a/dbaccess/source/ui/dlg/CollectionView.cxx +++ b/dbaccess/source/ui/dlg/CollectionView.cxx @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include @@ -170,20 +169,13 @@ IMPL_LINK_NOARG(OCollectionView, Save_Click) InteractiveAugmentedIOException aException(sTemp,Reference(),eClass,eError,aValues); - Reference xIni( - InteractionHandler::createDefault(comphelper::getComponentContext(m_xORB)), UNO_QUERY_THROW); - aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Parent")); - aValue.Value <<= VCLUnoHelper::GetInterface( this ); - Sequence< Any > aArgs(1); - aArgs[0] <<= makeAny(aValue); - xIni->initialize(aArgs); + Reference xHandler( + InteractionHandler::createWithParent(comphelper::getComponentContext(m_xORB), VCLUnoHelper::GetInterface( this ))); OInteractionRequest* pRequest = new OInteractionRequest(makeAny(aException)); Reference< XInteractionRequest > xRequest(pRequest); OInteractionApprove* pApprove = new OInteractionApprove; pRequest->addContinuation(pApprove); - - Reference< XInteractionHandler > xHandler(xIni,UNO_QUERY); xHandler->handle(xRequest); return 0; diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index f3cab0081558..ac7e55f21a55 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -524,7 +524,7 @@ DBG_NAME(OConnectionHelper) sal_Bool bExists = sal_False; IS_PATH_EXIST eExists = PATH_NOT_EXIST; Reference< ::com::sun::star::task::XInteractionHandler > xInteractionHandler( - task::InteractionHandler::createDefault(comphelper::getComponentContext(m_xORB)), UNO_QUERY_THROW ); + task::InteractionHandler::createWithParent(comphelper::getComponentContext(m_xORB), 0), UNO_QUERY ); OFilePickerInteractionHandler* pHandler = new OFilePickerInteractionHandler(xInteractionHandler); xInteractionHandler = pHandler; diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 30118af634d3..9082417c97ca 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -255,7 +255,7 @@ sal_Bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< Propert if ( !xHandler.is() ) { // instantiate the default SDB interaction handler - xHandler = Reference< XInteractionHandler >( task::InteractionHandler::createDefault(comphelper::getComponentContext(m_xORB)), UNO_QUERY_THROW ); + xHandler = Reference< XInteractionHandler >( task::InteractionHandler::createWithParent(comphelper::getComponentContext(m_xORB), 0), UNO_QUERY ); } String sName = pName ? pName->GetValue() : String(); diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index dfdb2e26bb1e..1f34d54c47df 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -735,7 +735,7 @@ namespace //------------------------------------------------------------------------- sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() { - Reference< XInteractionHandler2 > xHandler( InteractionHandler::createDefault(comphelper::getComponentContext(getORB())), UNO_QUERY_THROW ); + Reference< XInteractionHandler2 > xHandler( InteractionHandler::createWithParent(comphelper::getComponentContext(getORB()), 0) ); try { if (callSaveAsDialog() == sal_True) @@ -965,7 +965,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() private: Reference< XComponentLoader > m_xFrameLoader; Reference< XDesktop > m_xDesktop; - Reference< XInteractionHandler > m_xInteractionHandler; + Reference< XInteractionHandler2 > m_xInteractionHandler; ::rtl::OUString m_sURL; OAsyncronousLink m_aAsyncCaller; @@ -993,9 +993,8 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() { m_xDesktop.set( _rxORB->createInstance( SERVICE_FRAME_DESKTOP ), UNO_QUERY_THROW ); m_xFrameLoader.set( m_xDesktop, UNO_QUERY_THROW ); - m_xInteractionHandler.set( - InteractionHandler::createDefault(comphelper::getComponentContext(_rxORB)), - UNO_QUERY_THROW ); + m_xInteractionHandler = + InteractionHandler::createWithParent(comphelper::getComponentContext(_rxORB), 0); } catch( const Exception& ) { diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index a705c8b7dcdf..d43e4cdd7752 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -192,7 +192,7 @@ SQLExceptionInfo createConnection( const Reference< ::com::sun::star::beans::XP } else { // instantiate the default SDB interaction handler - Reference< XInteractionHandler > xHandler( InteractionHandler::createDefault(_rxContext), UNO_QUERY_THROW); + Reference< XInteractionHandler > xHandler( InteractionHandler::createWithParent(_rxContext, 0), UNO_QUERY); _rOUTConnection = xConnectionCompletion->connectWithCompletion(xHandler); } } diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index c63f77ce1ad9..bf3c9d35e7d4 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -684,7 +684,7 @@ OCopyTableWizard::OCopyTableWizard( Window* pParent, const ::rtl::OUString& _rDe ::dbaui::fillTypeInfo( _xConnection, m_sTypeNames, m_aTypeInfo, m_aTypeInfoIndex ); ::dbaui::fillTypeInfo( _xConnection, m_sTypeNames, m_aDestTypeInfo, m_aDestTypeInfoIndex ); - m_xInteractionHandler.set( InteractionHandler::createDefault(comphelper::getComponentContext(m_xFactory)), UNO_QUERY_THROW ); + m_xInteractionHandler.set( InteractionHandler::createWithParent(comphelper::getComponentContext(m_xFactory), 0), UNO_QUERY ); OCopyTable* pPage1( new OCopyTable( this ) ); pPage1->disallowViews(); diff --git a/dbaccess/source/ui/misc/datasourceconnector.cxx b/dbaccess/source/ui/misc/datasourceconnector.cxx index 4f1b4af83014..b4b4187038d6 100644 --- a/dbaccess/source/ui/misc/datasourceconnector.cxx +++ b/dbaccess/source/ui/misc/datasourceconnector.cxx @@ -139,7 +139,7 @@ namespace dbaui if ( !xHandler.is() ) { // instantiate the default SDB interaction handler - xHandler = Reference< XInteractionHandler >( InteractionHandler::createDefault(comphelper::getComponentContext(m_xORB)), UNO_QUERY_THROW ); + xHandler = Reference< XInteractionHandler >( InteractionHandler::createWithParent(comphelper::getComponentContext(m_xORB), 0), UNO_QUERY ); } xConnection = xConnectionCompletion->connectWithCompletion(xHandler); diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index d41a4967ddce..252564d610d8 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -136,7 +136,6 @@ namespace dbaui namespace DataType = ::com::sun::star::sdbc::DataType; typedef ::utl::SharedUNOComponent< XConnection > SharedConnection; - typedef Reference< XInteractionHandler > InteractionHandler; //========================================================================= //= CopyTableWizard @@ -239,7 +238,7 @@ namespace dbaui const Sequence< Any >& _rAllArgs, const sal_Int16 _nArgPos, SharedConnection& _out_rxConnection, - InteractionHandler& _out_rxDocInteractionHandler + Reference< XInteractionHandler >& _out_rxDocInteractionHandler ) const; /** extracts the source object (table or query) described by the given descriptor, @@ -293,7 +292,7 @@ namespace dbaui SharedConnection impl_extractConnection_throw( const Reference< XPropertySet >& _rxDataSourceDescriptor, - InteractionHandler& _out_rxDocInteractionHandler + Reference< XInteractionHandler >& _out_rxDocInteractionHandler ) const; /** actually copies the table @@ -358,7 +357,7 @@ private: SharedConnection m_xDestConnection; // other - InteractionHandler m_xInteractionHandler; + Reference< XInteractionHandler > m_xInteractionHandler; ::cppu::OInterfaceContainerHelper m_aCopyTableListeners; sal_Int16 m_nOverrideExecutionResult; @@ -635,9 +634,9 @@ namespace if it occures during invoking any of the data source's methods, or if any of the involved components violates its contract by not providing the required interfaces */ - InteractionHandler lcl_getInteractionHandler_throw( const Reference< XDataSource >& _rxDataSource, const InteractionHandler& _rFallback ) + Reference< XInteractionHandler > lcl_getInteractionHandler_throw( const Reference< XDataSource >& _rxDataSource, const Reference< XInteractionHandler >& _rFallback ) { - InteractionHandler xHandler( _rFallback ); + Reference< XInteractionHandler > xHandler( _rFallback ); // try to obtain the document model Reference< XModel > xDocumentModel; @@ -664,7 +663,7 @@ namespace if it occures during invoking any of the data source's methods, or if any of the involved components violates its contract by not providing the required interfaces */ - InteractionHandler lcl_getInteractionHandler_throw( const Reference< XConnection >& _rxConnection, const InteractionHandler& _rFallback ) + Reference< XInteractionHandler > lcl_getInteractionHandler_throw( const Reference< XConnection >& _rxConnection, const Reference< XInteractionHandler >& _rFallback ) { // try whether there is a data source which the connection belongs to Reference< XDataSource > xDataSource; @@ -682,7 +681,7 @@ namespace //------------------------------------------------------------------------- Reference< XPropertySet > CopyTableWizard::impl_ensureDataAccessDescriptor_throw( const Sequence< Any >& _rAllArgs, const sal_Int16 _nArgPos, SharedConnection& _out_rxConnection, - InteractionHandler& _out_rxDocInteractionHandler ) const + Reference< XInteractionHandler >& _out_rxDocInteractionHandler ) const { Reference< XPropertySet > xDescriptor; _rAllArgs[ _nArgPos ] >>= xDescriptor; @@ -879,7 +878,7 @@ void CopyTableWizard::impl_extractSourceResultSet_throw( const Reference< XPrope //------------------------------------------------------------------------- SharedConnection CopyTableWizard::impl_extractConnection_throw( const Reference< XPropertySet >& _rxDataSourceDescriptor, - InteractionHandler& _out_rxDocInteractionHandler ) const + Reference< XInteractionHandler >& _out_rxDocInteractionHandler ) const { SharedConnection xConnection; @@ -887,7 +886,7 @@ SharedConnection CopyTableWizard::impl_extractConnection_throw( const Reference< if ( !_rxDataSourceDescriptor.is() ) return xConnection; - InteractionHandler xInteractionHandler; + Reference< XInteractionHandler > xInteractionHandler; do { @@ -1554,15 +1553,15 @@ void SAL_CALL CopyTableWizard::initialize( const Sequence< Any >& _rArguments ) ); } if ( !m_xInteractionHandler.is() ) - m_xInteractionHandler.set( InteractionHandler::createDefault(m_aContext.getUNOContext()), UNO_QUERY_THROW ); + m_xInteractionHandler.set( InteractionHandler::createWithParent(m_aContext.getUNOContext(), 0), UNO_QUERY ); - InteractionHandler xSourceDocHandler; + Reference< XInteractionHandler > xSourceDocHandler; Reference< XPropertySet > xSourceDescriptor( impl_ensureDataAccessDescriptor_throw( _rArguments, 0, m_xSourceConnection, xSourceDocHandler ) ); impl_checkForUnsupportedSettings_throw( xSourceDescriptor ); m_pSourceObject = impl_extractSourceObject_throw( xSourceDescriptor, m_nCommandType ); impl_extractSourceResultSet_throw( xSourceDescriptor ); - InteractionHandler xDestDocHandler; + Reference< XInteractionHandler > xDestDocHandler; impl_ensureDataAccessDescriptor_throw( _rArguments, 1, m_xDestConnection, xDestDocHandler ); if ( xDestDocHandler.is() && !m_xInteractionHandler.is() ) diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx index 4a8d80fb4230..8cb12b91397a 100644 --- a/dbaccess/source/ui/uno/dbinteraction.cxx +++ b/dbaccess/source/ui/uno/dbinteraction.cxx @@ -304,11 +304,10 @@ namespace dbaui //------------------------------------------------------------------------- bool BasicInteractionHandler::implHandleUnknown( const Reference< XInteractionRequest >& _rxRequest ) { - Reference< XInteractionHandler > xFallbackHandler; if ( m_xORB.is() ) - xFallbackHandler = xFallbackHandler.query( InteractionHandler::createDefault(comphelper::getComponentContext(m_xORB)) ); - if ( xFallbackHandler.is() ) { + Reference< XInteractionHandler2 > xFallbackHandler( + InteractionHandler::createWithParent(comphelper::getComponentContext(m_xORB), 0) ); xFallbackHandler->handle( _rxRequest ); return true; } diff --git a/desktop/source/app/configinit.cxx b/desktop/source/app/configinit.cxx index 66b1c6e3d4d0..9394a9b59be5 100644 --- a/desktop/source/app/configinit.cxx +++ b/desktop/source/app/configinit.cxx @@ -165,7 +165,7 @@ void ConfigurationErrorHandler::deactivate() ConfigurationErrorHandler::InteractionHandler ConfigurationErrorHandler::getDefaultInteractionHandler() { uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); - InteractionHandler xHandler( com::sun::star::task::InteractionHandler::createDefault(xContext), UNO_QUERY_THROW ); + InteractionHandler xHandler( com::sun::star::task::InteractionHandler::createWithParent(xContext, 0), UNO_QUERY ); return xHandler; } //------------------------------------------------------------------------------ diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx index 091d48465205..261fa64572de 100644 --- a/desktop/source/app/dispatchwatcher.cxx +++ b/desktop/source/app/dispatchwatcher.cxx @@ -227,9 +227,8 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch } else { - Reference < XInteractionHandler > xInteraction( - InteractionHandler::createDefault(::comphelper::getProcessComponentContext()), - UNO_QUERY_THROW ); + Reference < XInteractionHandler2 > xInteraction( + InteractionHandler::createWithParent(::comphelper::getProcessComponentContext(), 0) ); aArgs[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" )); aArgs[1].Value <<= xInteraction; diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index b52478146734..943d37e6b33b 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -36,7 +36,6 @@ #include -#include "com/sun/star/beans/PropertyValue.hpp" #include "com/sun/star/beans/NamedValue.hpp" #include "com/sun/star/deployment/DependencyException.hpp" @@ -134,7 +133,7 @@ class ProgressCmdEnv task::XInteractionHandler, ucb::XProgressHandler > { - uno::Reference< task::XInteractionHandler> m_xHandler; + uno::Reference< task::XInteractionHandler2> m_xHandler; uno::Reference< uno::XComponentContext > m_xContext; uno::Reference< task::XAbortChannel> m_xAbortChannel; @@ -533,11 +532,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & // forward to UUI handler: if (! m_xHandler.is()) { // late init: - uno::Sequence< uno::Any > handlerArgs( 1 ); - handlerArgs[ 0 ] <<= beans::PropertyValue( - OUSTR("Context"), -1, uno::Any( m_sTitle ), - beans::PropertyState_DIRECT_VALUE ); - m_xHandler.set( task::InteractionHandler::createWithParentAndContext(m_xContext, NULL, m_sTitle), uno::UNO_QUERY_THROW ); + m_xHandler = task::InteractionHandler::createWithParentAndContext(m_xContext, NULL, m_sTitle); } m_xHandler->handle( xRequest ); } diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index 107e7b6017cd..e22463347c1d 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -273,9 +273,9 @@ UpdateDialog::Thread::Thread( { if( m_context.is() ) { - m_xInteractionHdl = uno::Reference< task::XInteractionHandler > ( - task::InteractionHandler::createDefault(m_context), - uno::UNO_QUERY_THROW ); + m_xInteractionHdl.set( + task::InteractionHandler::createWithParent(m_context, 0), + uno::UNO_QUERY ); m_updateInformation->setInteractionHandler( m_xInteractionHdl ); } } diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx index 9b23732e70e9..0577224521d7 100644 --- a/extensions/source/abpilot/datasourcehandling.cxx +++ b/extensions/source/abpilot/datasourcehandling.cxx @@ -527,10 +527,9 @@ namespace abp Reference< XInteractionHandler > xInteractions; try { - xInteractions = Reference< XInteractionHandler >( - InteractionHandler::createDefault(comphelper::getComponentContext(m_pImpl->xORB)), - UNO_QUERY_THROW - ); + xInteractions.set( + InteractionHandler::createWithParent(comphelper::getComponentContext(m_pImpl->xORB), 0), + UNO_QUERY); } catch(const Exception&) { diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 1146aaf64d13..242733b52744 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -119,7 +119,7 @@ Reference< XConnection > getConnection(const ::rtl::OUString& _rURL) Reference< XCompletedConnection > xComplConn(xDataSource, UNO_QUERY); try { - Reference xIHdl( task::InteractionHandler::createDefault(xContext), UNO_QUERY_THROW); + Reference xIHdl( task::InteractionHandler::createWithParent(xContext, 0), UNO_QUERY_THROW); xConn = xComplConn->connectWithCompletion(xIHdl); } catch (const SQLException&) diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx index cb5a0d4721f1..767088ea8fcb 100644 --- a/extensions/source/dbpilots/controlwizard.cxx +++ b/extensions/source/dbpilots/controlwizard.cxx @@ -518,7 +518,7 @@ namespace dbp Reference< XInteractionHandler > xHandler; try { - xHandler = Reference< XInteractionHandler >( InteractionHandler::createDefault(comphelper::getComponentContext(getServiceFactory())), UNO_QUERY_THROW ); + xHandler = Reference< XInteractionHandler >( InteractionHandler::createWithParent(comphelper::getComponentContext(getServiceFactory()), 0), UNO_QUERY_THROW ); } catch(const Exception&) { } if (!xHandler.is()) diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx index 6ee4458f411f..e4d125f8e20d 100644 --- a/extensions/source/update/check/updatehdl.cxx +++ b/extensions/source/update/check/updatehdl.cxx @@ -450,9 +450,9 @@ void SAL_CALL UpdateHandler::handle( uno::Reference< task::XInteractionRequest > if( !xServiceManager.is() ) throw uno::RuntimeException( UNISTRING( "UpdateHandler: unable to obtain service manager from component context" ), *this ); - mxInteractionHdl = uno::Reference ( - task::InteractionHandler::createDefault(mxContext), - uno::UNO_QUERY_THROW); + mxInteractionHdl.set( + task::InteractionHandler::createWithParent(mxContext, 0), + uno::UNO_QUERY_THROW); } uno::Reference< task::XInteractionRequestStringResolver > xStrResolver = task::InteractionRequestStringResolver::create( mxContext ); diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx index 670e615df960..6f265a5f8071 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx @@ -424,7 +424,7 @@ void XMLFilterTestDialog::onExportBrowse() maExportRecentFile = aDlg.GetPath(); Reference< XComponentLoader > xLoader( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" )) ), UNO_QUERY ); - Reference< XInteractionHandler > xInter( InteractionHandler::createDefault(comphelper::getComponentContext(mxMSF)), UNO_QUERY_THROW ); + Reference< XInteractionHandler2 > xInter( InteractionHandler::createWithParent(comphelper::getComponentContext(mxMSF), 0) ); if( xLoader.is() ) { OUString aFrame( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ); @@ -619,7 +619,7 @@ void XMLFilterTestDialog::import( const OUString& rURL ) try { Reference< XComponentLoader > xLoader( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" )) ), UNO_QUERY ); - Reference< XInteractionHandler > xInter( InteractionHandler::createDefault(comphelper::getComponentContext(mxMSF)), UNO_QUERY_THROW ); + Reference< XInteractionHandler2 > xInter( InteractionHandler::createWithParent(comphelper::getComponentContext(mxMSF), 0) ); if( xLoader.is() ) { diff --git a/forms/source/xforms/submission/replace.cxx b/forms/source/xforms/submission/replace.cxx index 902ba9cffaf5..cb53a0bf7eb3 100644 --- a/forms/source/xforms/submission/replace.cxx +++ b/forms/source/xforms/submission/replace.cxx @@ -130,8 +130,8 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH if( _xHandler.is() ) pHelper->m_aInteractionHandler = _xHandler; else - pHelper->m_aInteractionHandler = CSS::uno::Reference< XInteractionHandler >( - InteractionHandler::createDefault(m_xContext), UNO_QUERY_THROW); + pHelper->m_aInteractionHandler.set( + InteractionHandler::createWithParent(m_xContext, 0), UNO_QUERY_THROW); CProgressHandlerHelper *pProgressHelper = new CProgressHandlerHelper; pHelper->m_aProgressHandler = Reference< XProgressHandler >(pProgressHelper); diff --git a/forms/source/xforms/submission/submission_get.cxx b/forms/source/xforms/submission/submission_get.cxx index 156972404302..9a141a1bf459 100644 --- a/forms/source/xforms/submission/submission_get.cxx +++ b/forms/source/xforms/submission/submission_get.cxx @@ -73,8 +73,8 @@ CSubmission::SubmissionResult CSubmissionGet::submit(const CSS::uno::Reference< if( aInteractionHandler.is() ) pHelper->m_aInteractionHandler = aInteractionHandler; else - pHelper->m_aInteractionHandler = CSS::uno::Reference< XInteractionHandler >( - CSS::task::InteractionHandler::createDefault(m_xContext), UNO_QUERY_THROW); + pHelper->m_aInteractionHandler.set( + CSS::task::InteractionHandler::createWithParent(m_xContext, 0), UNO_QUERY_THROW); CProgressHandlerHelper *pProgressHelper = new CProgressHandlerHelper; pHelper->m_aProgressHandler = CSS::uno::Reference< XProgressHandler >(pProgressHelper); diff --git a/fpicker/source/office/fpsmartcontent.cxx b/fpicker/source/office/fpsmartcontent.cxx index 98cbd32ae464..9a68aaecb086 100644 --- a/fpicker/source/office/fpsmartcontent.cxx +++ b/fpicker/source/office/fpsmartcontent.cxx @@ -81,8 +81,8 @@ namespace svt void SmartContent::enableOwnInteractionHandler(::svt::OFilePickerInteractionHandler::EInterceptedInteractions eInterceptions) { Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext(); - Reference< XInteractionHandler > xGlobalInteractionHandler = Reference< XInteractionHandler >( - InteractionHandler::createDefault(xContext), UNO_QUERY_THROW ); + Reference< XInteractionHandler > xGlobalInteractionHandler( + InteractionHandler::createWithParent(xContext, 0), UNO_QUERY_THROW ); m_pOwnInteraction = new ::svt::OFilePickerInteractionHandler(xGlobalInteractionHandler); m_pOwnInteraction->enableInterceptions(eInterceptions); @@ -100,8 +100,8 @@ namespace svt m_xOwnInteraction = Reference< XInteractionHandler >(); Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext(); - Reference< XInteractionHandler > xGlobalInteractionHandler = Reference< XInteractionHandler >( - InteractionHandler::createDefault(xContext), UNO_QUERY_THROW ); + Reference< XInteractionHandler > xGlobalInteractionHandler( + InteractionHandler::createWithParent(xContext, 0), UNO_QUERY_THROW ); m_xCmdEnv = new ucbhelper::CommandEnvironment( xGlobalInteractionHandler, Reference< XProgressHandler >() ); } diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 264e673b883d..f44c4c3f34ce 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -2000,10 +2000,8 @@ void SvtFileDialog::displayIOException( const String& _rURL, IOErrorCode _eCode new ::comphelper::OInteractionRequest( makeAny( aException ) ); pRequest->addContinuation( new ::comphelper::OInteractionAbort( ) ); - Reference< XInteractionHandler > xHandler( - InteractionHandler::createDefault( ::comphelper::getProcessComponentContext() ), - UNO_QUERY_THROW - ); + Reference< XInteractionHandler2 > xHandler( + InteractionHandler::createWithParent( ::comphelper::getProcessComponentContext(), 0 ) ); xHandler->handle( xRequest ); } catch( const Exception& ) diff --git a/offapi/com/sun/star/task/InteractionHandler.idl b/offapi/com/sun/star/task/InteractionHandler.idl index 524c385ce4ac..74e732346531 100644 --- a/offapi/com/sun/star/task/InteractionHandler.idl +++ b/offapi/com/sun/star/task/InteractionHandler.idl @@ -149,11 +149,22 @@ module com { module sun { module star { module task { */ published service InteractionHandler : XInteractionHandler2 { - createDefault(); + /** Creates an instance. - createWithParent([in] com::sun::star::awt::XWindow parent); + @param parent denotes the parent window for any GUI dialogs the + interaction handler pops up; may be null. + */ + createWithParent([in] com::sun::star::awt::XWindow parent); - createWithParentAndContext([in] com::sun::star::awt::XWindow parent, [in] string context); + /** Creates an instance with an additional context. + + @param parent denotes the parent window for any GUI dialogs the + interaction handler pops up; may be null. + + @param context is a textual description of the current context (used, + e.g., as a first line of text in error boxes). + */ + createWithParentAndContext([in] com::sun::star::awt::XWindow parent, [in] string context); }; }; }; }; }; diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index d95c6a03062d..df133d7d816d 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -2651,7 +2651,7 @@ uno::Reference< embed::XStorage > OReportDefinition::getStorage() const uno::Reference< task::XInteractionHandler > OReportDefinition::getInteractionHandler() const { uno::Reference< task::XInteractionHandler > xRet( - task::InteractionHandler::createDefault(m_aProps->m_xContext), uno::UNO_QUERY_THROW); + task::InteractionHandler::createWithParent(m_aProps->m_xContext, 0), uno::UNO_QUERY_THROW); return xRet; } // ----------------------------------------------------------------------------- diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index c3a034c4f3df..634eeb232ef7 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -3058,7 +3058,7 @@ uno::Reference ScDPCollection::DBCaches::createRowSet( if ( xExecute.is() ) { uno::Reference xHandler( - task::InteractionHandler::createDefault(comphelper::getProcessComponentContext()), + task::InteractionHandler::createWithParent(comphelper::getProcessComponentContext(), 0), uno::UNO_QUERY_THROW); xExecute->executeWithCompletion( xHandler ); } diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx index 117a8e7ef668..4213ede828b4 100644 --- a/sc/source/ui/dbgui/dapidata.cxx +++ b/sc/source/ui/dbgui/dapidata.cxx @@ -165,8 +165,8 @@ void ScDataPilotDatabaseDlg::FillObjects() if ( !xSource.is() ) return; uno::Reference xHandler( - task::InteractionHandler::createDefault(comphelper::getProcessComponentContext()), - uno::UNO_QUERY_THROW); + task::InteractionHandler::createWithParent(comphelper::getProcessComponentContext(), 0), + uno::UNO_QUERY_THROW); uno::Reference xConnection = xSource->connectWithCompletion( xHandler ); diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index 5b849909ef23..c3be6648b2e2 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -252,8 +252,8 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, if ( xExecute.is() ) { uno::Reference xHandler( - task::InteractionHandler::createDefault(comphelper::getProcessComponentContext()), - uno::UNO_QUERY_THROW); + task::InteractionHandler::createWithParent(comphelper::getProcessComponentContext(), 0), + uno::UNO_QUERY_THROW); xExecute->executeWithCompletion( xHandler ); } else diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index 96f19ec9100b..f8cf04083351 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -438,9 +438,8 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR int nArgs=3; Sequence< PropertyValue > aArgs(3); - Reference < com::sun::star::task::XInteractionHandler > xInteraction( - task::InteractionHandler::createDefault(::comphelper::getProcessComponentContext()), - com::sun::star::uno::UNO_QUERY_THROW ); + Reference < com::sun::star::task::XInteractionHandler2 > xInteraction( + task::InteractionHandler::createWithParent(::comphelper::getProcessComponentContext(), 0) ); aArgs[0].Name = OUString("InteractionHandler"); aArgs[0].Value <<= xInteraction; diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx index 248595c2a453..c97d92f10596 100644 --- a/sfx2/source/bastyp/helper.cxx +++ b/sfx2/source/bastyp/helper.cxx @@ -170,8 +170,8 @@ uno::Sequence< OUString > SfxContentHelper::GetHelpTreeViewContents( const Strin try { uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); - uno::Reference< task::XInteractionHandler > xInteractionHandler = uno::Reference< task::XInteractionHandler > ( - task::InteractionHandler::createDefault(xContext), uno::UNO_QUERY_THROW ); + uno::Reference< task::XInteractionHandler > xInteractionHandler( + task::InteractionHandler::createWithParent(xContext, 0), uno::UNO_QUERY_THROW ); ::ucbhelper::Content aCnt( rURL, new ::ucbhelper::CommandEnvironment( xInteractionHandler, uno::Reference< ucb::XProgressHandler >() ), comphelper::getProcessComponentContext() ); uno::Reference< sdbc::XResultSet > xResultSet; @@ -254,8 +254,8 @@ String SfxContentHelper::GetActiveHelpString( const String& rURL ) try { uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); - uno::Reference< task::XInteractionHandler > xInteractionHandler = uno::Reference< task::XInteractionHandler > ( - task::InteractionHandler::createDefault(xContext), uno::UNO_QUERY_THROW ); + uno::Reference< task::XInteractionHandler > xInteractionHandler( + task::InteractionHandler::createWithParent(xContext, 0), uno::UNO_QUERY_THROW ); ::ucbhelper::Content aCnt( rURL, new ::ucbhelper::CommandEnvironment( xInteractionHandler, uno::Reference< ucb::XProgressHandler >() ), comphelper::getProcessComponentContext() ); // open the "active help" stream uno::Reference< io::XInputStream > xStream = aCnt.openStream(); diff --git a/sfx2/source/control/templateremoteview.cxx b/sfx2/source/control/templateremoteview.cxx index 40f9208d53ec..776bab1513e2 100644 --- a/sfx2/source/control/templateremoteview.cxx +++ b/sfx2/source/control/templateremoteview.cxx @@ -53,8 +53,8 @@ TemplateRemoteView::TemplateRemoteView (Window *pParent, WinBits nWinStyle, bool mpItemView->setChangeNameHdl(LINK(this,TemplateRemoteView,ChangeNameHdl)); Reference< XComponentContext > xContext = comphelper::getProcessComponentContext(); - Reference< XInteractionHandler > xGlobalInteractionHandler = Reference< XInteractionHandler >( - InteractionHandler::createDefault(xContext), UNO_QUERY_THROW ); + Reference< XInteractionHandler > xGlobalInteractionHandler( + InteractionHandler::createWithParent(xContext, 0), UNO_QUERY_THROW ); m_xCmdEnv = new ucbhelper::CommandEnvironment( xGlobalInteractionHandler, Reference< XProgressHandler >() ); } diff --git a/sfx2/source/dialog/templateinfodlg.cxx b/sfx2/source/dialog/templateinfodlg.cxx index 06ecbbf661a4..32fa7d89f6d1 100644 --- a/sfx2/source/dialog/templateinfodlg.cxx +++ b/sfx2/source/dialog/templateinfodlg.cxx @@ -75,8 +75,8 @@ void SfxTemplateInfoDlg::loadDocument(const OUString &rURL) try { - uno::Reference xInteractionHandler( - task::InteractionHandler::createDefault(xContext), uno::UNO_QUERY_THROW ); + uno::Reference xInteractionHandler( + task::InteractionHandler::createWithParent(xContext, 0) ); uno::Sequence aProps(1); aProps[0].Name = "InteractionHandler"; diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 666d37fd915d..9c199ad53fb3 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -2527,8 +2527,8 @@ SfxMedium::GetInteractionHandler() // create default handler and cache it! Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); - pImp->xInteraction = Reference< task::XInteractionHandler >( - task::InteractionHandler::createDefault(xContext), UNO_QUERY_THROW ); + pImp->xInteraction.set( + task::InteractionHandler::createWithParent(xContext, 0), UNO_QUERY_THROW ); return pImp->xInteraction; } diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index bb06eddb1587..75e294ca2b00 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -391,7 +391,7 @@ void SfxDocTplService_Impl::init_Impl() { uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); uno::Reference < task::XInteractionHandler > xInteractionHandler( - task::InteractionHandler::createDefault(xContext), uno::UNO_QUERY_THROW ); + task::InteractionHandler::createWithParent(xContext, 0), uno::UNO_QUERY_THROW ); maCmdEnv = new TplTaskEnvironment( xInteractionHandler ); ::osl::ClearableMutexGuard aGuard( maMutex ); diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index 7bbfd072422d..3add4b1aacfe 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -440,9 +440,7 @@ void ModelData_Impl::CheckInteractionHandler() { try { m_aMediaDescrHM[ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InteractionHandler")) ] - <<= uno::Reference< task::XInteractionHandler >( - task::InteractionHandler::createDefault(comphelper::getComponentContext(m_pOwner->GetServiceFactory())), - uno::UNO_QUERY ); + <<= task::InteractionHandler::createWithParent(comphelper::getComponentContext(m_pOwner->GetServiceFactory()), 0); } catch( const uno::Exception& ) { diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index c6caa28ff4c3..70a4f1dd6c48 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -555,9 +555,8 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) if ( !pInteractionHandlerItem ) { uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); - uno::Reference< task::XInteractionHandler > xInteract( - task::InteractionHandler::createDefault(xContext), - UNO_QUERY_THROW ); + uno::Reference< task::XInteractionHandler2 > xInteract( + task::InteractionHandler::createWithParent(xContext, 0) ); SfxUnoAnyItem aInteractionItem( SID_INTERACTIONHANDLER, uno::makeAny( xInteract ) ); if ( nId == SID_SAVEDOC ) diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx index 092b2bac0d3a..7280a047f1f4 100644 --- a/svl/source/passwordcontainer/passwordcontainer.cxx +++ b/svl/source/passwordcontainer/passwordcontainer.cxx @@ -1127,7 +1127,7 @@ sal_Bool SAL_CALL PasswordContainer::authorizateWithMasterPassword( const uno::R { uno::Reference< lang::XMultiServiceFactory > xFactory( mComponent, uno::UNO_QUERY_THROW ); uno::Reference< uno::XComponentContext > xContext( comphelper::getComponentContext(xFactory) ); - xTmpHandler.set( InteractionHandler::createDefault(xContext), uno::UNO_QUERY_THROW ); + xTmpHandler.set( InteractionHandler::createWithParent(xContext, 0), uno::UNO_QUERY_THROW ); } if ( !m_aMasterPasswd.isEmpty() ) @@ -1172,7 +1172,7 @@ sal_Bool SAL_CALL PasswordContainer::changeMasterPassword( const uno::Reference< { uno::Reference< lang::XMultiServiceFactory > xFactory( mComponent, uno::UNO_QUERY_THROW ); uno::Reference< uno::XComponentContext > xContext( comphelper::getComponentContext(xFactory) ); - xTmpHandler.set( InteractionHandler::createDefault(xContext), uno::UNO_QUERY_THROW ); + xTmpHandler.set( InteractionHandler::createWithParent(xContext, 0), uno::UNO_QUERY_THROW ); } sal_Bool bCanChangePassword = sal_True; @@ -1289,7 +1289,7 @@ void SAL_CALL PasswordContainer::removeMasterPassword() { uno::Reference< lang::XMultiServiceFactory > xFactory( mComponent, uno::UNO_QUERY_THROW ); uno::Reference< uno::XComponentContext > xContext( comphelper::getComponentContext(xFactory) ); - xTmpHandler.set( InteractionHandler::createDefault(xContext), uno::UNO_QUERY_THROW ); + xTmpHandler.set( InteractionHandler::createWithParent(xContext, 0), uno::UNO_QUERY_THROW ); } sal_Bool bCanChangePassword = sal_True; diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index dc182678dd05..2087bb843649 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -699,8 +699,8 @@ ViewTabListBox_Impl::ViewTabListBox_Impl( Window* pParentWin, maResetQuickSearch.SetTimeoutHdl( LINK( this, ViewTabListBox_Impl, ResetQuickSearch_Impl ) ); Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext(); - Reference< XInteractionHandler > xInteractionHandler = Reference< XInteractionHandler > ( - InteractionHandler::createDefault(xContext), UNO_QUERY_THROW ); + Reference< XInteractionHandler > xInteractionHandler( + InteractionHandler::createWithParent(xContext, 0), UNO_QUERY_THROW ); mxCmdEnv = new ::ucbhelper::CommandEnvironment( xInteractionHandler, Reference< XProgressHandler >() ); @@ -1161,8 +1161,8 @@ SvtFileView::SvtFileView( Window* pParent, const ResId& rResId, nFlags |= FILEVIEW_MULTISELECTION; Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext(); - Reference< XInteractionHandler > xInteractionHandler = Reference< XInteractionHandler > ( - InteractionHandler::createDefault(xContext), UNO_QUERY_THROW ); + Reference< XInteractionHandler > xInteractionHandler( + InteractionHandler::createWithParent(xContext, 0), UNO_QUERY_THROW ); Reference < XCommandEnvironment > xCmdEnv = new ::ucbhelper::CommandEnvironment( xInteractionHandler, Reference< XProgressHandler >() ); mpImp = new SvtFileView_Impl( this, xCmdEnv, nFlags, bOnlyFolder ); @@ -1179,8 +1179,8 @@ SvtFileView::SvtFileView( Window* pParent, const ResId& rResId, sal_uInt8 nFlags Control( pParent, rResId ) { Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext(); - Reference< XInteractionHandler > xInteractionHandler = Reference< XInteractionHandler > ( - InteractionHandler::createDefault(xContext), UNO_QUERY_THROW ); + Reference< XInteractionHandler > xInteractionHandler( + InteractionHandler::createWithParent(xContext, 0), UNO_QUERY_THROW ); Reference < XCommandEnvironment > xCmdEnv = new ::ucbhelper::CommandEnvironment( xInteractionHandler, Reference< XProgressHandler >() ); mpImp = new SvtFileView_Impl( this, xCmdEnv, nFlags, nFlags & FILEVIEW_ONLYFOLDER ); diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx index 9579759419b3..c6df3734e502 100644 --- a/svtools/source/contnr/templwin.cxx +++ b/svtools/source/contnr/templwin.cxx @@ -670,9 +670,8 @@ void SvtFrameWindow_Impl::ShowDocInfo( const String& rURL ) { try { - uno::Reference < task::XInteractionHandler > xInteractionHandler( - task::InteractionHandler::createDefault(::comphelper::getProcessComponentContext()), - uno::UNO_QUERY_THROW ); + uno::Reference < task::XInteractionHandler2 > xInteractionHandler( + task::InteractionHandler::createWithParent(::comphelper::getProcessComponentContext(), 0) ); uno::Sequence < beans::PropertyValue> aProps(1); aProps[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" )); aProps[0].Value <<= xInteractionHandler; @@ -754,8 +753,8 @@ void SvtFrameWindow_Impl::OpenFile( const String& rURL, sal_Bool bPreview, sal_B aArgs[1].Value.setValue( &b, ::getBooleanCppuType() ); aArgs[2].Name = ASCII_STR("AsTemplate"); // prevents getting an empty URL with getURL()! - uno::Reference < task::XInteractionHandler > xInteractionHandler( - task::InteractionHandler::createDefault(::comphelper::getProcessComponentContext()), uno::UNO_QUERY_THROW ); + uno::Reference < task::XInteractionHandler2 > xInteractionHandler( + task::InteractionHandler::createWithParent(::comphelper::getProcessComponentContext(), 0) ); aArgs[3].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" )); aArgs[3].Value <<= xInteractionHandler; diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx index 3417d5531606..411c6d4e65c5 100644 --- a/svtools/source/dialogs/ServerDetailsControls.cxx +++ b/svtools/source/dialogs/ServerDetailsControls.cxx @@ -293,8 +293,8 @@ CmisDetailsContainer::CmisDetailsContainer( ) : m_xCmdEnv( ) { Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext(); - Reference< XInteractionHandler > xGlobalInteractionHandler = Reference< XInteractionHandler >( - InteractionHandler::createDefault(xContext), UNO_QUERY ); + Reference< XInteractionHandler > xGlobalInteractionHandler( + InteractionHandler::createWithParent(xContext, 0), UNO_QUERY ); m_xCmdEnv = new ucbhelper::CommandEnvironment( xGlobalInteractionHandler, Reference< XProgressHandler >() ); } diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index a59b378746a4..ce329fa18ab4 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -850,9 +850,9 @@ void AssignmentPersistentData::Commit() Reference< XInteractionHandler > xHandler; try { - xHandler = Reference< XInteractionHandler >( - InteractionHandler::createDefault(comphelper::getComponentContext(m_xORB)), - UNO_QUERY_THROW ); + xHandler.set( + InteractionHandler::createWithParent(comphelper::getComponentContext(m_xORB), 0), + UNO_QUERY_THROW ); } catch(Exception&) { } if (!xHandler.is()) diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 5dbb628d6b2f..fb5f281cb80e 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -4274,7 +4274,7 @@ bool FormController::ensureInteractionHandler() return false; m_bAttemptedHandlerCreation = true; - m_xInteractionHandler.set( InteractionHandler::createDefault(m_aContext.getUNOContext()), UNO_QUERY ); + m_xInteractionHandler.set( InteractionHandler::createWithParent(m_aContext.getUNOContext(), 0), UNO_QUERY ); OSL_ENSURE( m_xInteractionHandler.is(), "FormController::ensureInteractionHandler: could not create an interaction handler!" ); return m_xInteractionHandler.is(); } diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index 045436becc2c..7fd0f05c1e3f 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -561,7 +561,7 @@ void SwAddressListDialog::DetectTablesAndQueries( pUserData->xSource = uno::Reference(xComplConnection, UNO_QUERY); uno::Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); - uno::Reference< XInteractionHandler > xHandler( InteractionHandler::createDefault(xContext), UNO_QUERY ); + uno::Reference< XInteractionHandler > xHandler( InteractionHandler::createWithParent(xContext, 0), UNO_QUERY ); pUserData->xConnection = SharedConnection( xComplConnection->connectWithCompletion( xHandler ) ); } if(pUserData->xConnection.is()) diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index 276639271d9c..9bd1fb12f917 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -1580,7 +1580,7 @@ uno::Reference< sdbc::XConnection> SwNewDBMgr::GetConnection(const String& rData if ( xComplConnection.is() ) { rxSource.set(xComplConnection,UNO_QUERY); - Reference< XInteractionHandler > xHandler( InteractionHandler::createDefault(xContext), UNO_QUERY_THROW ); + Reference< XInteractionHandler > xHandler( InteractionHandler::createWithParent(xContext, 0), UNO_QUERY_THROW ); xConnection = xComplConnection->connectWithCompletion( xHandler ); } } @@ -2661,7 +2661,7 @@ uno::Reference SwNewDBMgr::createCursor(const ::rtl::OUString& _sDat if ( xRowSet.is() ) { - uno::Reference< XInteractionHandler > xHandler( InteractionHandler::createDefault(comphelper::getComponentContext(xMgr)), UNO_QUERY_THROW ); + uno::Reference< XInteractionHandler > xHandler( InteractionHandler::createWithParent(comphelper::getComponentContext(xMgr), 0), UNO_QUERY_THROW ); xRowSet->executeWithCompletion(xHandler); } xResultSet = uno::Reference(xRowSet, UNO_QUERY); diff --git a/ucb/workben/ucb/ucbdemo.cxx b/ucb/workben/ucb/ucbdemo.cxx index d24d8e61b1f9..6d557538a0b5 100644 --- a/ucb/workben/ucb/ucbdemo.cxx +++ b/ucb/workben/ucb/ucbdemo.cxx @@ -1306,8 +1306,8 @@ void UcbContent::transfer( const rtl::OUString& rSourceURL, sal_Bool bMove ) if (m_rUCB.getServiceFactory().is()) xInteractionHandler = uno::Reference< task::XInteractionHandler >( - task::InteractionHandler::createDefault(comphelper::getComponentContext(m_rUCB.getServiceFactory())), - uno::UNO_QUERY_THROW); + task::InteractionHandler::createWithParent(comphelper::getComponentContext(m_rUCB.getServiceFactory()), 0), + uno::UNO_QUERY_THROW); uno::Reference< ucb::XProgressHandler > xProgressHandler( new ProgressHandler(m_rUCB)); uno::Reference< ucb::XCommandEnvironment > xEnv( diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx index bf09e7e3e1d1..31d26b27a679 100644 --- a/uui/source/iahndl-authentication.cxx +++ b/uui/source/iahndl-authentication.cxx @@ -186,7 +186,7 @@ void getRememberModes( void handleAuthenticationRequest_( Window * pParent, - uno::Reference< task::XInteractionHandler > const & xIH, + uno::Reference< task::XInteractionHandler2 > const & xIH, uno::Reference< lang::XMultiServiceFactory > const & xServiceFactory, ucb::AuthenticationRequest const & rRequest, uno::Sequence< uno::Reference< task::XInteractionContinuation > > const & diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index e09256d9027e..09f904cf2971 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -1107,15 +1107,13 @@ UUIInteractionHelper::getContextProperty() return m_aContextParam; } -uno::Reference< task::XInteractionHandler > +uno::Reference< task::XInteractionHandler2 > UUIInteractionHelper::getInteractionHandler() SAL_THROW((uno::RuntimeException)) { - uno::Reference< task::XInteractionHandler > xIH( - InteractionHandler::createWithParentAndContext(comphelper::getComponentContext(m_xServiceFactory), - m_xWindowParam, m_aContextParam), - UNO_QUERY_THROW); - return xIH; + return InteractionHandler::createWithParentAndContext( + comphelper::getComponentContext(m_xServiceFactory), m_xWindowParam, + m_aContextParam); } namespace { diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx index 3266f0b90216..eee766753f92 100644 --- a/uui/source/iahndl.hxx +++ b/uui/source/iahndl.hxx @@ -52,7 +52,7 @@ namespace com { namespace sun { namespace star { namespace task { class FutureDocumentVersionProductUpdateRequest; class XInteractionContinuation; - class XInteractionHandler; + class XInteractionHandler2; class XInteractionRequest; } namespace ucb { @@ -161,7 +161,7 @@ private: getContextProperty() SAL_THROW(()); - com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > + com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler2 > getInteractionHandler() SAL_THROW((com::sun::star::uno::RuntimeException)); diff --git a/uui/source/interactionhandler.hxx b/uui/source/interactionhandler.hxx index 8d2147b74641..39acd8624a22 100644 --- a/uui/source/interactionhandler.hxx +++ b/uui/source/interactionhandler.hxx @@ -20,14 +20,16 @@ #ifndef UUI_INTERACTIONHANDLER_HXX #define UUI_INTERACTIONHANDLER_HXX +#include "com/sun/star/lang/XInitialization.hpp" #include "com/sun/star/lang/XServiceInfo.hpp" #include "com/sun/star/task/XInteractionHandler2.hpp" -#include "cppuhelper/implbase2.hxx" +#include "cppuhelper/implbase3.hxx" class UUIInteractionHelper; class UUIInteractionHandler: - public cppu::WeakImplHelper2< com::sun::star::lang::XServiceInfo, + public cppu::WeakImplHelper3< com::sun::star::lang::XServiceInfo, + com::sun::star::lang::XInitialization, com::sun::star::task::XInteractionHandler2 > { public: diff --git a/uui/source/passwordcontainer.cxx b/uui/source/passwordcontainer.cxx index 5a688c622197..0005fe976668 100644 --- a/uui/source/passwordcontainer.cxx +++ b/uui/source/passwordcontainer.cxx @@ -23,7 +23,7 @@ #include "com/sun/star/lang/XMultiServiceFactory.hpp" #include "com/sun/star/task/NoMasterException.hpp" #include "com/sun/star/task/PasswordContainer.hpp" -#include "com/sun/star/task/XInteractionHandler.hpp" +#include "com/sun/star/task/XInteractionHandler2.hpp" #include "com/sun/star/ucb/AuthenticationRequest.hpp" #include "com/sun/star/ucb/URLAuthenticationRequest.hpp" #include "com/sun/star/ucb/XInteractionSupplyAuthentication.hpp" @@ -120,9 +120,11 @@ bool PasswordContainerHelper::handleAuthenticationRequest( uno::Reference< ucb::XInteractionSupplyAuthentication > const & xSupplyAuthentication, rtl::OUString const & rURL, - uno::Reference< task::XInteractionHandler > const & xIH ) + uno::Reference< task::XInteractionHandler2 > const & xIH ) SAL_THROW((uno::RuntimeException)) { + uno::Reference< task::XInteractionHandler > xIH1(xIH, uno::UNO_QUERY); + // Is continuation even a XInteractionSupplyAuthentication2, which // is derived from XInteractionSupplyAuthentication? uno::Reference< ucb::XInteractionSupplyAuthentication2 > @@ -167,12 +169,12 @@ bool PasswordContainerHelper::handleAuthenticationRequest( { task::UrlRecord aRec; if ( !rURL.isEmpty() ) - aRec = m_xPasswordContainer->find(rURL, xIH); + aRec = m_xPasswordContainer->find(rURL, xIH1); if ( aRec.UserList.getLength() == 0 ) { // compat: try server name. - aRec = m_xPasswordContainer->find(rRequest.ServerName, xIH); + aRec = m_xPasswordContainer->find(rRequest.ServerName, xIH1); } if ( fillContinuation( false, @@ -191,13 +193,13 @@ bool PasswordContainerHelper::handleAuthenticationRequest( task::UrlRecord aRec; if ( !rURL.isEmpty() ) aRec = m_xPasswordContainer->findForName( - rURL, rRequest.UserName, xIH); + rURL, rRequest.UserName, xIH1); if ( aRec.UserList.getLength() == 0 ) { // compat: try server name. aRec = m_xPasswordContainer->findForName( - rRequest.ServerName, rRequest.UserName, xIH); + rRequest.ServerName, rRequest.UserName, xIH1); } if ( fillContinuation( false, @@ -223,10 +225,12 @@ bool PasswordContainerHelper::addRecord( rtl::OUString const & rURL, rtl::OUString const & rUsername, uno::Sequence< rtl::OUString > const & rPasswords, - uno::Reference< task::XInteractionHandler > const & xIH, + uno::Reference< task::XInteractionHandler2 > const & xIH, bool bPersist ) SAL_THROW((uno::RuntimeException)) { + uno::Reference< task::XInteractionHandler > xIH1(xIH, uno::UNO_QUERY); + try { if ( !rUsername.isEmpty() ) @@ -246,13 +250,13 @@ bool PasswordContainerHelper::addRecord( m_xPasswordContainer->addPersistent( rURL, rUsername, rPasswords, - xIH ); + xIH1 ); } else m_xPasswordContainer->add( rURL, rUsername, rPasswords, - xIH ); + xIH1 ); } else { @@ -346,7 +350,7 @@ PasswordContainerInteractionHandler::getSupportedServiceNames_Static() //========================================================================= // -// XInteractionHandler methods. +// XInteractionHandler2 methods. // //========================================================================= @@ -355,15 +359,24 @@ void SAL_CALL PasswordContainerInteractionHandler::handle( const uno::Reference< task::XInteractionRequest >& rRequest ) throw ( uno::RuntimeException ) +{ + handleInteractionRequest( rRequest ); +} + +// virtual +sal_Bool SAL_CALL +PasswordContainerInteractionHandler::handleInteractionRequest( + const uno::Reference< task::XInteractionRequest >& rRequest ) + throw ( uno::RuntimeException ) { if ( !rRequest.is() ) - return; + return false; uno::Any aAnyRequest( rRequest->getRequest() ); ucb::AuthenticationRequest aAuthenticationRequest; if ( !( aAnyRequest >>= aAuthenticationRequest ) ) - return; + return false; rtl::OUString aURL; ucb::URLAuthenticationRequest aURLAuthenticationRequest; @@ -386,7 +399,7 @@ PasswordContainerInteractionHandler::handle( } if ( !xSupplyAuthentication.is() ) - return; + return false; // Try to obtain credentials from password container. if ( m_aPwContainerHelper. @@ -401,7 +414,9 @@ PasswordContainerInteractionHandler::handle( { // successfully handled xSupplyAuthentication->select(); + return true; } + return false; } //========================================================================= diff --git a/uui/source/passwordcontainer.hxx b/uui/source/passwordcontainer.hxx index 31434a3f0da1..af9fdb16dd9b 100644 --- a/uui/source/passwordcontainer.hxx +++ b/uui/source/passwordcontainer.hxx @@ -24,7 +24,7 @@ #include "com/sun/star/lang/XServiceInfo.hpp" #include "com/sun/star/lang/XSingleServiceFactory.hpp" -#include "com/sun/star/task/XInteractionHandler.hpp" +#include "com/sun/star/task/XInteractionHandler2.hpp" #include "com/sun/star/task/XPasswordContainer2.hpp" namespace com { @@ -90,7 +90,7 @@ public: xSupplyAuthentication, rtl::OUString const & rURL, com::sun::star::uno::Reference< - com::sun::star::task::XInteractionHandler > const & xIH ) + com::sun::star::task::XInteractionHandler2 > const & xIH ) SAL_THROW( (com::sun::star::uno::RuntimeException) ); /** This member function adds credentials for the given URL to the password @@ -125,7 +125,7 @@ public: com::sun::star::uno::Sequence< rtl::OUString > const & rPasswords, com::sun::star::uno::Reference< - com::sun::star::task::XInteractionHandler > const & xIH, + com::sun::star::task::XInteractionHandler2 > const & xIH, bool bPersist ) SAL_THROW( (com::sun::star::uno::RuntimeException) ); @@ -140,7 +140,7 @@ private: class PasswordContainerInteractionHandler : public cppu::WeakImplHelper2< com::sun::star::lang::XServiceInfo, - com::sun::star::task::XInteractionHandler > + com::sun::star::task::XInteractionHandler2 > { public: PasswordContainerInteractionHandler( @@ -160,12 +160,17 @@ public: getSupportedServiceNames() throw ( com::sun::star::uno::RuntimeException ); - // XInteractionHandler + // XInteractionHandler2 virtual void SAL_CALL handle( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& Request ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL + handleInteractionRequest( const ::com::sun::star::uno::Reference< + ::com::sun::star::task::XInteractionRequest >& Request ) + throw (::com::sun::star::uno::RuntimeException); + // Non-UNO interfaces static rtl::OUString getImplementationName_Static(); diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx index 74ac0a3078a5..1d7280747c24 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx @@ -106,7 +106,7 @@ char* GetPasswordFunction( PK11SlotInfo* pSlot, PRBool bRetry, void* /*arg*/ ) { uno::Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); uno::Reference < task::XInteractionHandler2 > xInteractionHandler( - task::InteractionHandler::createDefault(xContext) ); + task::InteractionHandler::createWithParent(xContext, 0) ); task::PasswordRequestMode eMode = bRetry ? task::PasswordRequestMode_PASSWORD_REENTER : task::PasswordRequestMode_PASSWORD_ENTER; ::comphelper::DocPasswordRequest* pPasswordRequest = new ::comphelper::DocPasswordRequest( From af1f72feafc00ee6658f6fa7d267f58132adba09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 4 Oct 2012 14:02:01 +0100 Subject: [PATCH 298/863] bump liberation fonts to latest stable version Change-Id: Ie8286af3e7840acc3013c192e95d0a1658618310 --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 01960afa0257..fddafcac0b08 100644 --- a/configure.in +++ b/configure.in @@ -10988,7 +10988,7 @@ if test "$with_fonts" != "no"; then FONT_DEJAVU_TARBALL="f872f4ac066433d8ff92f5e316b36ff9-dejavu-fonts-ttf-2.33.zip" FONT_GENTIUM_TARBALL="35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip" FONT_LIBERATION_NARROW_TARBALL="0be45d54cc5e1c2e3102e32b8c190346-liberation-fonts-ttf-1.07.1.tar.gz" - FONT_LIBERATION_TARBALL="cfbf1ac6f61bf6cf45342a0cc9381be5-liberation-fonts-ttf-2.00.0.tar.gz" + FONT_LIBERATION_TARBALL="82ea190587aaeeb0fffb7a39dc323eab-liberation-fonts-2.00.1.tar.gz" FONT_LINLIBERTINEG_TARBALL="e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip" else AC_MSG_RESULT([no]) From fb6fdb547bf371eb2f2bac86841a683be43c4332 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 4 Oct 2012 14:15:07 +0100 Subject: [PATCH 299/863] Revert "bump liberation fonts to latest stable version" This reverts commit af1f72feafc00ee6658f6fa7d267f58132adba09 because we would need to build the fonts from .sfd, sigh --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index fddafcac0b08..01960afa0257 100644 --- a/configure.in +++ b/configure.in @@ -10988,7 +10988,7 @@ if test "$with_fonts" != "no"; then FONT_DEJAVU_TARBALL="f872f4ac066433d8ff92f5e316b36ff9-dejavu-fonts-ttf-2.33.zip" FONT_GENTIUM_TARBALL="35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip" FONT_LIBERATION_NARROW_TARBALL="0be45d54cc5e1c2e3102e32b8c190346-liberation-fonts-ttf-1.07.1.tar.gz" - FONT_LIBERATION_TARBALL="82ea190587aaeeb0fffb7a39dc323eab-liberation-fonts-2.00.1.tar.gz" + FONT_LIBERATION_TARBALL="cfbf1ac6f61bf6cf45342a0cc9381be5-liberation-fonts-ttf-2.00.0.tar.gz" FONT_LINLIBERTINEG_TARBALL="e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip" else AC_MSG_RESULT([no]) From bd6b41bce491ac5a5f562652b7e32045cc22c35c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 4 Oct 2012 14:19:40 +0100 Subject: [PATCH 300/863] bump to latest *binary* liberation fonts Change-Id: I58255383497176984cf836faca8c7b7766335da1 --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 01960afa0257..25ab277e463a 100644 --- a/configure.in +++ b/configure.in @@ -10988,7 +10988,7 @@ if test "$with_fonts" != "no"; then FONT_DEJAVU_TARBALL="f872f4ac066433d8ff92f5e316b36ff9-dejavu-fonts-ttf-2.33.zip" FONT_GENTIUM_TARBALL="35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip" FONT_LIBERATION_NARROW_TARBALL="0be45d54cc5e1c2e3102e32b8c190346-liberation-fonts-ttf-1.07.1.tar.gz" - FONT_LIBERATION_TARBALL="cfbf1ac6f61bf6cf45342a0cc9381be5-liberation-fonts-ttf-2.00.0.tar.gz" + FONT_LIBERATION_TARBALL="5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz" FONT_LINLIBERTINEG_TARBALL="e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip" else AC_MSG_RESULT([no]) From a20f9a410fdd3f776f870434bc39219d5fc64b40 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 3 Oct 2012 13:30:43 +0200 Subject: [PATCH 301/863] fdo#46808, Adapt xml::sax::XParser UNO service to new style The xml.sax.Parser service already existed, it just did not have a new-style service to create it. Change-Id: I6f145a7504ff9e149c802f723991954a2801cbc9 --- basic/source/uno/dlgcont.cxx | 20 +-- basic/source/uno/namecont.cxx | 18 +-- basic/source/uno/scriptcont.cxx | 12 +- chart2/source/model/filter/XMLFilter.cxx | 6 +- comphelper/inc/comphelper/ofopxmlhelper.hxx | 6 +- comphelper/source/xml/ofopxmlhelper.cxx | 16 +- .../source/core/recovery/storagexmlstream.cxx | 5 +- dbaccess/source/filter/xml/xmlfilter.cxx | 23 ++- desktop/source/deployment/dp_xml.cxx | 6 +- .../deployment/registry/sfwk/dp_sfwk.cxx | 6 +- editeng/source/misc/svxacorr.cxx | 35 ++-- editeng/source/xml/xmltxtimp.cxx | 10 +- filter/Library_odfflatxml.mk | 1 + filter/source/odfflatxml/OdfFlatXml.cxx | 12 +- .../xmlfilteradaptor/XmlFilterAdaptor.cxx | 6 +- .../source/xsltdialog/typedetectionimport.cxx | 25 ++- filter/source/xsltfilter/XSLTFilter.cxx | 12 +- framework/inc/framework/configimporter.hxx | 4 +- .../inc/framework/statusbarconfiguration.hxx | 3 +- .../inc/framework/toolboxconfiguration.hxx | 3 +- framework/inc/services.h | 1 - framework/inc/xml/imagesconfiguration.hxx | 3 +- .../accelerators/acceleratorconfiguration.cxx | 5 +- .../source/fwe/helper/configimporter.cxx | 5 +- .../source/fwe/xml/menuconfiguration.cxx | 5 +- .../source/fwe/xml/statusbarconfiguration.cxx | 10 +- .../source/fwe/xml/toolboxconfiguration.cxx | 10 +- .../uiconfiguration/imagemanagerimpl.cxx | 3 +- .../moduleuiconfigurationmanager.cxx | 5 +- .../uiconfigurationmanager.cxx | 5 +- framework/source/xml/imagesconfiguration.cxx | 10 +- i18npool/Executable_saxparser.mk | 1 + i18npool/source/localedata/saxparser.cxx | 61 +++---- linguistic/source/convdic.cxx | 15 +- offapi/UnoApi_offapi.mk | 1 + offapi/com/sun/star/xml/sax/Parser.idl | 37 +++++ package/source/manifest/ManifestReader.cxx | 54 +++---- package/source/xstor/owriteablestream.cxx | 4 +- package/source/xstor/xstorage.cxx | 4 +- package/source/zippackage/ZipPackage.cxx | 2 +- reportdesign/source/filter/xml/xmlfilter.cxx | 16 +- sc/inc/xmlwrap.hxx | 4 +- sc/source/filter/xml/xmlwrap.cxx | 13 +- sd/source/core/CustomAnimationPreset.cxx | 8 +- sd/source/filter/xml/sdxmlwrp.cxx | 10 +- sfx2/source/doc/SfxDocumentMetaData.cxx | 10 +- sfx2/source/doc/doctemplates.cxx | 2 +- sfx2/source/doc/doctemplateslocal.cxx | 12 +- sfx2/source/doc/doctemplateslocal.hxx | 4 +- sfx2/source/doc/sfxbasemodel.cxx | 4 +- starmath/source/mathmlimport.cxx | 11 +- svx/source/xml/xmlexport.cxx | 6 +- svx/source/xml/xmlxtimp.cxx | 5 +- svx/workben/msview/xmlconfig.cxx | 7 +- sw/CppunitTest_sw_filters_test.mk | 1 + sw/CppunitTest_sw_subsequent_rtfimport.mk | 1 + sw/source/core/swg/SwXMLTextBlocks1.cxx | 152 +++++++----------- sw/source/filter/xml/swxml.cxx | 34 ++-- unotools/source/config/accelcfg.cxx | 6 +- writerfilter/source/ooxml/OOXMLStreamImpl.cxx | 12 +- xmloff/source/meta/xmlversion.cxx | 11 +- .../source/xmldlg_imexp/xmldlg_addfunc.cxx | 11 +- .../source/helper/xmlsignaturehelper.cxx | 9 +- 63 files changed, 337 insertions(+), 482 deletions(-) create mode 100644 offapi/com/sun/star/xml/sax/Parser.idl diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx index 2cfe035a21b7..b9ad7f19ecce 100644 --- a/basic/source/uno/dlgcont.cxx +++ b/basic/source/uno/dlgcont.cxx @@ -18,7 +18,7 @@ */ #include -#include +#include #include #include #include @@ -32,6 +32,7 @@ #include "com/sun/star/document/XGraphicObjectResolver.hpp" #include "dlgcont.hxx" #include "sbmodule.hxx" +#include #include #include #include @@ -122,12 +123,7 @@ bool writeOasis2OOoLibraryElement( Reference< lang::XMultiComponentFactory > xSMgr( xContext->getServiceManager() ); - Reference< xml::sax::XParser > xParser( - xSMgr->createInstanceWithContext( - OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.xml.sax.Parser" ) ), - xContext ), - UNO_QUERY ); + Reference< xml::sax::XParser > xParser = xml::sax::Parser::create(xContext); Reference< xml::sax::XExtendedDocumentHandler > xWriter( xSMgr->createInstanceWithContext( @@ -139,7 +135,7 @@ bool writeOasis2OOoLibraryElement( Reference< io::XActiveDataSource > xSource( xWriter, UNO_QUERY ); xSource->setOutputStream( xOutput ); - if ( !xParser.is() || !xWriter.is() ) + if ( !xWriter.is() ) { return sal_False; } @@ -297,13 +293,7 @@ Any SAL_CALL SfxDialogLibraryContainer::importLibraryElement // return aRetAny; //} - Reference< XParser > xParser( mxMSF->createInstance( - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser") ) ), UNO_QUERY ); - if( !xParser.is() ) - { - OSL_FAIL( "### couldn't create sax parser component\n" ); - return aRetAny; - } + Reference< XParser > xParser = xml::sax::Parser::create( comphelper::getComponentContext(mxMSF) ); Reference< XNameContainer > xDialogModel( mxMSF->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDialogModel" ) ) ), UNO_QUERY ); diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index 77ced57a2eec..dfce89aa5101 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include #include @@ -650,13 +650,7 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL, maLibraryPath = SvtPathOptions().GetBasicPath(); } - Reference< XParser > xParser( mxMSF->createInstance( - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser") ) ), UNO_QUERY ); - if( !xParser.is() ) - { - SAL_WARN("basic", "couldn't create sax parser component"); - return; - } + Reference< XParser > xParser = xml::sax::Parser::create(comphelper::getComponentContext(mxMSF)); uno::Reference< io::XInputStream > xInput; @@ -1603,13 +1597,7 @@ void SfxLibraryContainer::implStoreLibraryIndexFile( SfxLibrary* pLib, bool SfxLibraryContainer::implLoadLibraryIndexFile( SfxLibrary* pLib, ::xmlscript::LibDescriptor& rLib, const uno::Reference< embed::XStorage >& xStorage, const OUString& aIndexFileName ) { - Reference< XParser > xParser( mxMSF->createInstance( - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser") ) ), UNO_QUERY ); - if( !xParser.is() ) - { - SAL_WARN("basic", "couldn't create sax parser component"); - return false; - } + Reference< XParser > xParser = xml::sax::Parser::create(comphelper::getComponentContext(mxMSF)); sal_Bool bLink = sal_False; bool bStorage = false; diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index 393dc7771238..bbc8509d23c2 100644 --- a/basic/source/uno/scriptcont.cxx +++ b/basic/source/uno/scriptcont.cxx @@ -20,7 +20,7 @@ #include "scriptcont.hxx" #include "sbmodule.hxx" #include -#include +#include #include #include #include @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -238,14 +239,7 @@ Any SAL_CALL SfxScriptLibraryContainer::importLibraryElement { Any aRetAny; - Reference< XParser > xParser( mxMSF->createInstance( - OUString( "com.sun.star.xml.sax.Parser" ) ), UNO_QUERY ); - if( !xParser.is() ) - { - OSL_FAIL( "### couldn't create sax parser component\n" ); - return aRetAny; - } - + Reference< XParser > xParser = xml::sax::Parser::create( comphelper::getComponentContext(mxMSF) ); // Read from storage? sal_Bool bStorage = xInStream.is(); diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index 56f34076cca4..5f72dde8dcf5 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include #include @@ -332,9 +332,7 @@ sal_Int32 XMLFilter::impl_Import( return ERRCODE_SFX_GENERAL; // create a sax parser - Reference< xml::sax::XParser > xSaxParser( - xFactory->createInstanceWithContext( C2U( "com.sun.star.xml.sax.Parser" ), m_xContext ), - uno::UNO_QUERY_THROW ); + Reference< xml::sax::XParser > xSaxParser = xml::sax::Parser::create(m_xContext); bool bOasis = true; isOasisFormat( rMediaDescriptor, bOasis ); diff --git a/comphelper/inc/comphelper/ofopxmlhelper.hxx b/comphelper/inc/comphelper/ofopxmlhelper.hxx index 789abccd8e9f..e18d08f727ef 100644 --- a/comphelper/inc/comphelper/ofopxmlhelper.hxx +++ b/comphelper/inc/comphelper/ofopxmlhelper.hxx @@ -58,7 +58,7 @@ class COMPHELPER_DLLPUBLIC OFOPXMLHelper : public cppu::WeakImplHelper1 < com::s OFOPXMLHelper( sal_uInt16 nFormat ); // must not be created directly ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > GetParsingResult(); - static COMPHELPER_DLLPRIVATE ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > SAL_CALL ReadSequence_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream, const ::rtl::OUString& aStringID, sal_uInt16 nFormat, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory ) + static COMPHELPER_DLLPRIVATE ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > SAL_CALL ReadSequence_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream, const ::rtl::OUString& aStringID, sal_uInt16 nFormat, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext ) throw( ::com::sun::star::uno::Exception ); public: @@ -73,7 +73,7 @@ public: ReadRelationsInfoSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream, const ::rtl::OUString aStreamName, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory ) + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext ) throw( ::com::sun::star::uno::Exception ); // returns sequence containing two entries of type sequence @@ -86,7 +86,7 @@ public: SAL_CALL ReadContentTypeSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory ) + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext ) throw( ::com::sun::star::uno::Exception ); // writes sequence of elements, where each element is described by sequence of tags, diff --git a/comphelper/source/xml/ofopxmlhelper.cxx b/comphelper/source/xml/ofopxmlhelper.cxx index 8eb783d85732..739b27d1512d 100644 --- a/comphelper/source/xml/ofopxmlhelper.cxx +++ b/comphelper/source/xml/ofopxmlhelper.cxx @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include @@ -37,20 +37,20 @@ using namespace ::com::sun::star; namespace comphelper { // ----------------------------------- -uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OFOPXMLHelper::ReadRelationsInfoSequence( const uno::Reference< io::XInputStream >& xInStream, const ::rtl::OUString aStreamName, const uno::Reference< lang::XMultiServiceFactory > xFactory ) +uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OFOPXMLHelper::ReadRelationsInfoSequence( const uno::Reference< io::XInputStream >& xInStream, const ::rtl::OUString aStreamName, const uno::Reference< uno::XComponentContext > xContext ) throw( uno::Exception ) { ::rtl::OUString aStringID = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_rels/" ) ); aStringID += aStreamName; - return ReadSequence_Impl( xInStream, aStringID, RELATIONINFO_FORMAT, xFactory ); + return ReadSequence_Impl( xInStream, aStringID, RELATIONINFO_FORMAT, xContext ); } // ----------------------------------- -uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OFOPXMLHelper::ReadContentTypeSequence( const uno::Reference< io::XInputStream >& xInStream, const uno::Reference< lang::XMultiServiceFactory > xFactory ) +uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OFOPXMLHelper::ReadContentTypeSequence( const uno::Reference< io::XInputStream >& xInStream, const uno::Reference< uno::XComponentContext > xContext ) throw( uno::Exception ) { ::rtl::OUString aStringID = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "[Content_Types].xml" ) ); - return ReadSequence_Impl( xInStream, aStringID, CONTENTTYPE_FORMAT, xFactory ); + return ReadSequence_Impl( xInStream, aStringID, CONTENTTYPE_FORMAT, xContext ); } // ----------------------------------- @@ -186,15 +186,15 @@ void SAL_CALL OFOPXMLHelper::WriteContentSequence( const uno::Reference< io::XOu // ================================================================================== // ----------------------------------- -uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OFOPXMLHelper::ReadSequence_Impl( const uno::Reference< io::XInputStream >& xInStream, const ::rtl::OUString& aStringID, sal_uInt16 nFormat, const uno::Reference< lang::XMultiServiceFactory > xFactory ) +uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OFOPXMLHelper::ReadSequence_Impl( const uno::Reference< io::XInputStream >& xInStream, const ::rtl::OUString& aStringID, sal_uInt16 nFormat, const uno::Reference< uno::XComponentContext > xContext ) throw( uno::Exception ) { - if ( !xFactory.is() || !xInStream.is() || nFormat > FORMAT_MAX_ID ) + if ( !xContext.is() || !xInStream.is() || nFormat > FORMAT_MAX_ID ) throw uno::RuntimeException(); uno::Sequence< uno::Sequence< beans::StringPair > > aResult; - uno::Reference< xml::sax::XParser > xParser( xFactory->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Parser" ) ) ), uno::UNO_QUERY_THROW ); + uno::Reference< xml::sax::XParser > xParser = xml::sax::Parser::create( xContext ); OFOPXMLHelper* pHelper = new OFOPXMLHelper( nFormat ); uno::Reference< xml::sax::XDocumentHandler > xHelper( static_cast< xml::sax::XDocumentHandler* >( pHelper ) ); diff --git a/dbaccess/source/core/recovery/storagexmlstream.cxx b/dbaccess/source/core/recovery/storagexmlstream.cxx index ad5dec9df070..14b76e7eedb1 100644 --- a/dbaccess/source/core/recovery/storagexmlstream.cxx +++ b/dbaccess/source/core/recovery/storagexmlstream.cxx @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include @@ -55,6 +55,7 @@ namespace dbaccess using ::com::sun::star::io::XStream; using ::com::sun::star::io::XOutputStream; using ::com::sun::star::io::XActiveDataSource; + using ::com::sun::star::xml::sax::Parser; using ::com::sun::star::xml::sax::XParser; using ::com::sun::star::xml::sax::InputSource; /** === end UNO using === **/ @@ -163,7 +164,7 @@ namespace dbaccess :StorageInputStream( i_rContext, i_rParentStorage, i_rStreamName ) ,m_pData( new StorageXMLInputStream_Data ) { - m_pData->xParser.set( i_rContext.createComponent( "com.sun.star.xml.sax.Parser" ), UNO_QUERY_THROW ); + m_pData->xParser.set( Parser::create(i_rContext.getUNOContext()) ); } //------------------------------------------------------------------------------------------------------------------ diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index f25f7818d184..990e5ae4edaf 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include @@ -55,6 +55,7 @@ #include #include #include +#include #include #include #include @@ -213,12 +214,12 @@ namespace dbaxml sal_Int32 ReadThroughComponent( const uno::Reference& xInputStream, const uno::Reference& xModelComponent, - const uno::Reference & rFactory, + const uno::Reference & rxContext, const uno::Reference< XDocumentHandler >& _xFilter ) { OSL_ENSURE(xInputStream.is(), "input stream missing"); OSL_ENSURE(xModelComponent.is(), "document missing"); - OSL_ENSURE(rFactory.is(), "factory missing"); + OSL_ENSURE(rxContext.is(), "factory missing"); RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "dbaxml", "oj", "ReadThroughComponent" ); @@ -227,13 +228,7 @@ sal_Int32 ReadThroughComponent( aParserInput.aInputStream = xInputStream; // get parser - uno::Reference< XParser > xParser( - rFactory->createInstance( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser"))), - UNO_QUERY ); - OSL_ENSURE( xParser.is(), "Can't create parser" ); - if( !xParser.is() ) - return 1; + uno::Reference< XParser > xParser = Parser::create(rxContext); RTL_LOGFILE_CONTEXT_TRACE( aLog, "parser created" ); // get filter @@ -294,7 +289,7 @@ sal_Int32 ReadThroughComponent( const uno::Reference& xModelComponent, const sal_Char* pStreamName, const sal_Char* pCompatibilityStreamName, - const uno::Reference & rFactory, + const uno::Reference & rxContext, const uno::Reference< XDocumentHandler >& _xFilter) { OSL_ENSURE( xStorage.is(), "Need storage!"); @@ -350,7 +345,7 @@ sal_Int32 ReadThroughComponent( // read from the stream return ReadThroughComponent( xInputStream ,xModelComponent - ,rFactory + ,rxContext ,_xFilter ); } @@ -462,7 +457,7 @@ sal_Bool ODBFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) ,xModel ,"settings.xml" ,"Settings.xml" - ,getServiceFactory() + ,comphelper::getComponentContext(getServiceFactory()) ,this ); @@ -471,7 +466,7 @@ sal_Bool ODBFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) ,xModel ,"content.xml" ,"Content.xml" - ,getServiceFactory() + ,comphelper::getComponentContext(getServiceFactory()) ,this ); diff --git a/desktop/source/deployment/dp_xml.cxx b/desktop/source/deployment/dp_xml.cxx index d276818619ce..b45c4c0db5d5 100644 --- a/desktop/source/deployment/dp_xml.cxx +++ b/desktop/source/deployment/dp_xml.cxx @@ -31,7 +31,7 @@ #include "dp_xml.h" #include "rtl/ustrbuf.hxx" #include "ucbhelper/content.hxx" -#include "com/sun/star/xml/sax/XParser.hpp" +#include "com/sun/star/xml/sax/Parser.hpp" using namespace ::com::sun::star; @@ -48,9 +48,7 @@ void xml_parse( Reference const & xContext ) { // raise sax parser: - Reference xParser( - xContext->getServiceManager()->createInstanceWithContext( - OUSTR("com.sun.star.xml.sax.Parser"), xContext ), UNO_QUERY_THROW ); + Reference xParser = xml::sax::Parser::create(xContext); // error handler, entity resolver omitted xParser->setDocumentHandler( xDocHandler ); diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx index 5741ccc2bea2..f751f8b7c9d2 100644 --- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx +++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx @@ -37,6 +37,7 @@ #include "svl/inettype.hxx" #include #include +#include #include @@ -252,10 +253,7 @@ Reference BackendImpl::bindPackage_( Reference xContext( getComponentContext() ); - Reference< xml::sax::XParser > xParser( - xContext->getServiceManager()->createInstanceWithContext( - OUSTR("com.sun.star.xml.sax.Parser"), xContext ), - UNO_QUERY_THROW ); + Reference< xml::sax::XParser > xParser = xml::sax::Parser::create(xContext); xParser->setDocumentHandler( xDocHandler ); xml::sax::InputSource source; diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index 9c5809009587..a970e8aba8f9 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -58,7 +59,7 @@ #include "vcl/window.hxx" #include #include -#include +#include #include #include #include @@ -2003,21 +2004,11 @@ void SvxAutoCorrectLanguageLists::LoadXMLExceptList_Imp( xStrm->SetBufferSize( 8 * 1024 ); aParserInput.aInputStream = new utl::OInputStreamWrapper( *xStrm ); - // get parser - uno::Reference< XInterface > xXMLParser = xServiceFactory->createInstance( - OUString("com.sun.star.xml.sax.Parser") ); - OSL_ENSURE( xXMLParser.is(), - "XMLReader::Read: com.sun.star.xml.sax.Parser service missing" ); - if( !xXMLParser.is() ) - { - // Maybe throw an exception? - } - // get filter uno::Reference< xml::sax::XDocumentHandler > xFilter = new SvXMLExceptionListImport ( xServiceFactory, *rpLst ); // connect parser and filter - uno::Reference< xml::sax::XParser > xParser( xXMLParser, UNO_QUERY ); + uno::Reference< xml::sax::XParser > xParser = xml::sax::Parser::create( comphelper::getComponentContext(xServiceFactory) ); xParser->setDocumentHandler( xFilter ); // parse @@ -2130,26 +2121,22 @@ SvxAutocorrWordList* SvxAutoCorrectLanguageLists::LoadAutocorrWordList() String aXMLWordListName( pXMLImplAutocorr_ListStr, RTL_TEXTENCODING_MS_1252 ); uno::Reference < io::XStream > xStrm = xStg->openStreamElement( aXMLWordListName, embed::ElementModes::READ ); uno::Reference< lang::XMultiServiceFactory > xServiceFactory = comphelper::getProcessServiceFactory(); + uno::Reference< uno::XComponentContext > xContext = comphelper::getProcessComponentContext(); xml::sax::InputSource aParserInput; aParserInput.sSystemId = aXMLWordListName; aParserInput.aInputStream = xStrm->getInputStream(); // get parser - uno::Reference< XInterface > xXMLParser = xServiceFactory->createInstance( OUString("com.sun.star.xml.sax.Parser") ); - OSL_ENSURE( xXMLParser.is(), "XMLReader::Read: com.sun.star.xml.sax.Parser service missing" ); - if( xXMLParser.is() ) - { - RTL_LOGFILE_PRODUCT_CONTEXT( aLog, "AutoCorrect Import" ); - uno::Reference< xml::sax::XDocumentHandler > xFilter = new SvXMLAutoCorrectImport( xServiceFactory, pAutocorr_List, rAutoCorrect, xStg ); + uno::Reference< xml::sax::XParser > xParser = xml::sax::Parser::create(xContext); + RTL_LOGFILE_PRODUCT_CONTEXT( aLog, "AutoCorrect Import" ); + uno::Reference< xml::sax::XDocumentHandler > xFilter = new SvXMLAutoCorrectImport( xServiceFactory, pAutocorr_List, rAutoCorrect, xStg ); - // connect parser and filter - uno::Reference< xml::sax::XParser > xParser( xXMLParser, UNO_QUERY ); - xParser->setDocumentHandler( xFilter ); + // connect parser and filter + xParser->setDocumentHandler( xFilter ); - // parse - xParser->parseStream( aParserInput ); - } + // parse + xParser->parseStream( aParserInput ); } catch ( const uno::Exception& ) { diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx index cc5d11115436..27e6b3613a7f 100644 --- a/editeng/source/xml/xmltxtimp.cxx +++ b/editeng/source/xml/xmltxtimp.cxx @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include @@ -170,18 +170,14 @@ void SvxReadXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection& r do { uno::Reference xServiceFactory( ::comphelper::getProcessServiceFactory() ); + uno::Reference xContext( ::comphelper::getProcessComponentContext() ); if( !xServiceFactory.is() ) { OSL_FAIL( "SvxXMLXTableImport::load: got no service manager" ); break; } - uno::Reference< xml::sax::XParser > xParser( xServiceFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Parser" ) ) ), uno::UNO_QUERY ); - if( !xParser.is() ) - { - OSL_FAIL( "com.sun.star.xml.sax.Parser service missing" ); - break; - } + uno::Reference< xml::sax::XParser > xParser = xml::sax::Parser::create( xContext ); uno::Reference xInputStream = new utl::OInputStreamWrapper( rStream ); diff --git a/filter/Library_odfflatxml.mk b/filter/Library_odfflatxml.mk index b7d66b66488a..666e7282fc09 100644 --- a/filter/Library_odfflatxml.mk +++ b/filter/Library_odfflatxml.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,odfflatxml,\ xo \ tl \ ucbhelper \ + comphelper \ cppuhelper \ cppu \ sal \ diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx index 18451904a632..cad9039a9a53 100644 --- a/filter/source/odfflatxml/OdfFlatXml.cxx +++ b/filter/source/odfflatxml/OdfFlatXml.cxx @@ -28,6 +28,7 @@ */ +#include #include #include #include @@ -44,7 +45,7 @@ #include #include -#include +#include #include #include #include @@ -141,14 +142,7 @@ OdfFlatXml::importer( if (!inputStream.is()) return sal_False; - OUString SAX_PARSER_SERVICE( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")); - Reference saxParser(m_rServiceFactory->createInstance( - SAX_PARSER_SERVICE), UNO_QUERY); - - OSL_ASSERT(saxParser.is()); - if (!saxParser.is()) - return sal_False; + Reference saxParser = Parser::create(comphelper::getComponentContext(m_rServiceFactory)); InputSource inputSource; inputSource.sSystemId = url; diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx index bf089c9fc9ad..ed2901bfbbed 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -85,8 +86,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star } OUString sXMLImportService ( udImport ); - const OUString sSaxParser ( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Parser") ); - Reference < XParser > xSaxParser( mxMSF->createInstance( sSaxParser ), UNO_QUERY ); + Reference < XParser > xSaxParser = Parser::create( comphelper::getComponentContext(mxMSF) ); Sequence< Any > aAnys(1); OUString aBaseURI; diff --git a/filter/source/xsltdialog/typedetectionimport.cxx b/filter/source/xsltdialog/typedetectionimport.cxx index ab0046ca8aa9..daf6f32d2bba 100644 --- a/filter/source/xsltdialog/typedetectionimport.cxx +++ b/filter/source/xsltdialog/typedetectionimport.cxx @@ -18,10 +18,11 @@ */ #include -#include +#include #include #include +#include #include "typedetectionimport.hxx" #include "xmlfiltersettingsdialog.hxx" @@ -61,21 +62,19 @@ void TypeDetectionImporter::doImport( Reference< XMultiServiceFactory >& xMSF, R { try { - Reference< XParser > xParser( xMSF->createInstance(OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Parser" )) ), UNO_QUERY ); - if( xParser.is() ) - { - TypeDetectionImporter* pImporter = new TypeDetectionImporter( xMSF ); - Reference < XDocumentHandler > xDocHandler( pImporter ); - xParser->setDocumentHandler( xDocHandler ); + Reference< XParser > xParser = xml::sax::Parser::create( comphelper::getComponentContext(xMSF) ); - InputSource source; - source.aInputStream = xIS; + TypeDetectionImporter* pImporter = new TypeDetectionImporter( xMSF ); + Reference < XDocumentHandler > xDocHandler( pImporter ); + xParser->setDocumentHandler( xDocHandler ); - // start parsing - xParser->parseStream( source ); + InputSource source; + source.aInputStream = xIS; - pImporter->fillFilterVector( rFilters ); - } + // start parsing + xParser->parseStream( source ); + + pImporter->fillFilterVector( rFilters ); } catch( const Exception& /* e */ ) { diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index 7d0a18a00478..4bb92b011d55 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -42,7 +42,7 @@ #include -#include +#include #include #include #include @@ -283,15 +283,7 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False) // create SAX parser that will read the document file // and provide events to xHandler passed to this call - css::uno::Reference - xSaxParser( - m_rServiceFactory->createInstance( - OUString( - "com.sun.star.xml.sax.Parser" )), - UNO_QUERY); - OSL_ASSERT(xSaxParser.is()); - if (!xSaxParser.is()) - return sal_False; + css::uno::Reference xSaxParser = Parser::create(comphelper::getComponentContext(m_rServiceFactory)); // create transformer Sequence args(3); diff --git a/framework/inc/framework/configimporter.hxx b/framework/inc/framework/configimporter.hxx index 1fdca6bbcd67..ab151ee8d059 100644 --- a/framework/inc/framework/configimporter.hxx +++ b/framework/inc/framework/configimporter.hxx @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include @@ -36,7 +36,7 @@ namespace framework static sal_Bool ImportCustomToolbars( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager >& rContainerFactory, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > >& rSeqContainer, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& rToolbarStorage ); }; diff --git a/framework/inc/framework/statusbarconfiguration.hxx b/framework/inc/framework/statusbarconfiguration.hxx index 2ef90ada727b..2c405c797573 100644 --- a/framework/inc/framework/statusbarconfiguration.hxx +++ b/framework/inc/framework/statusbarconfiguration.hxx @@ -36,6 +36,7 @@ #include #include #include +#include namespace framework { @@ -44,7 +45,7 @@ class FWE_DLLPUBLIC StatusBarConfiguration { public: static sal_Bool LoadStatusBar( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInputStream, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rStatusbarConfiguration ); diff --git a/framework/inc/framework/toolboxconfiguration.hxx b/framework/inc/framework/toolboxconfiguration.hxx index e2c1270c0338..1e31bbb8dbac 100644 --- a/framework/inc/framework/toolboxconfiguration.hxx +++ b/framework/inc/framework/toolboxconfiguration.hxx @@ -28,6 +28,7 @@ #include #include #include +#include namespace framework { @@ -36,7 +37,7 @@ class FWE_DLLPUBLIC ToolBoxConfiguration { public: static sal_Bool LoadToolBox( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rInputStream, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rToolbarConfiguration ); diff --git a/framework/inc/services.h b/framework/inc/services.h index dbdd10183b9f..70956ec6d9e4 100644 --- a/framework/inc/services.h +++ b/framework/inc/services.h @@ -80,7 +80,6 @@ namespace framework{ #define SERVICENAME_GLOBALACCELERATORCONFIGURATION DECLARE_ASCII("com.sun.star.ui.GlobalAcceleratorConfiguration") #define SERVICENAME_MODULEACCELERATORCONFIGURATION DECLARE_ASCII("com.sun.star.ui.ModuleAcceleratorConfiguration") #define SERVICENAME_DOCUMENTACCELERATORCONFIGURATION DECLARE_ASCII("com.sun.star.ui.DocumentAcceleratorConfiguration") -#define SERVICENAME_SAXPARSER DECLARE_ASCII("com.sun.star.xml.sax.Parser" ) #define SERVICENAME_SAXWRITER DECLARE_ASCII("com.sun.star.xml.sax.Writer" ) #define SERVICENAME_STORAGEFACTORY DECLARE_ASCII("com.sun.star.embed.StorageFactory" ) #define SERVICENAME_FILESYSTEMSTORAGEFACTORY DECLARE_ASCII("com.sun.star.embed.FileSystemStorageFactory" ) diff --git a/framework/inc/xml/imagesconfiguration.hxx b/framework/inc/xml/imagesconfiguration.hxx index 2a5c7aea3e8b..eda31f41571b 100644 --- a/framework/inc/xml/imagesconfiguration.hxx +++ b/framework/inc/xml/imagesconfiguration.hxx @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -100,7 +101,7 @@ class ImagesConfiguration { public: static sal_Bool LoadImages( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rInputStream, ImageListsDescriptor& rItems ); diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx index d8c0732b935b..fa010e7d55bb 100644 --- a/framework/source/accelerators/acceleratorconfiguration.cxx +++ b/framework/source/accelerators/acceleratorconfiguration.cxx @@ -41,7 +41,7 @@ #include #include -#include +#include #include #include #include @@ -56,6 +56,7 @@ #include #include #include +#include #include #include #include @@ -522,7 +523,7 @@ void XMLBasedAcceleratorConfiguration::impl_ts_load(const css::uno::Reference< c css::uno::Reference< css::xml::sax::XDocumentHandler > xFilter (static_cast< ::cppu::OWeakObject* >(pFilter), css::uno::UNO_QUERY_THROW); // connect parser, filter and stream - css::uno::Reference< css::xml::sax::XParser > xParser(xSMGR->createInstance(SERVICENAME_SAXPARSER), css::uno::UNO_QUERY_THROW); + css::uno::Reference< css::xml::sax::XParser > xParser = css::xml::sax::Parser::create(comphelper::getComponentContext(xSMGR)); xParser->setDocumentHandler(xFilter); css::xml::sax::InputSource aSource; diff --git a/framework/source/fwe/helper/configimporter.cxx b/framework/source/fwe/helper/configimporter.cxx index 0aacbdaea457..ca6c1a108c59 100644 --- a/framework/source/fwe/helper/configimporter.cxx +++ b/framework/source/fwe/helper/configimporter.cxx @@ -41,11 +41,10 @@ namespace framework sal_Bool UIConfigurationImporterOOo1x::ImportCustomToolbars( const uno::Reference< ui::XUIConfigurationManager >& rContainerFactory, uno::Sequence< uno::Reference< container::XIndexContainer > >& rSeqContainer, - const uno::Reference< lang::XMultiServiceFactory >& rServiceManager, + const uno::Reference< uno::XComponentContext >& rxContext, const uno::Reference< embed::XStorage >& rToolbarStorage ) { const char USERDEFTOOLBOX[] = "userdeftoolbox0.xml"; - uno::Reference< lang::XMultiServiceFactory > rSrvMgr( rServiceManager ); sal_Bool bResult ( sal_False ); if ( rToolbarStorage.is() && rContainerFactory.is() ) @@ -66,7 +65,7 @@ sal_Bool UIConfigurationImporterOOo1x::ImportCustomToolbars( if ( xInputStream.is() ) { uno::Reference< container::XIndexContainer > xContainer = rContainerFactory->createSettings(); - if ( ToolBoxConfiguration::LoadToolBox( rSrvMgr, xInputStream, xContainer )) + if ( ToolBoxConfiguration::LoadToolBox( rxContext, xInputStream, xContainer )) { sal_uInt32 nIndex = rSeqContainer.getLength(); rSeqContainer.realloc( nIndex+1 ); diff --git a/framework/source/fwe/xml/menuconfiguration.cxx b/framework/source/fwe/xml/menuconfiguration.cxx index fe522fe3de95..c47e52d226aa 100644 --- a/framework/source/fwe/xml/menuconfiguration.cxx +++ b/framework/source/fwe/xml/menuconfiguration.cxx @@ -36,9 +36,10 @@ #include -#include +#include #include #include +#include using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -66,7 +67,7 @@ Reference< XIndexAccess > MenuConfiguration::CreateMenuBarConfigurationFromXML( Reference< XInputStream >& rInputStream ) throw ( WrappedTargetException ) { - Reference< XParser > xParser( m_rxServiceManager->createInstance(SERVICENAME_SAXPARSER),UNO_QUERY); + Reference< XParser > xParser = Parser::create( comphelper::getComponentContext(m_rxServiceManager) ); // connect stream to input stream to the parser InputSource aInputSource; diff --git a/framework/source/fwe/xml/statusbarconfiguration.cxx b/framework/source/fwe/xml/statusbarconfiguration.cxx index 17e41e381b4f..2b24554f4485 100644 --- a/framework/source/fwe/xml/statusbarconfiguration.cxx +++ b/framework/source/fwe/xml/statusbarconfiguration.cxx @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include #include @@ -51,10 +51,10 @@ namespace framework { static Reference< XParser > GetSaxParser( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) { - return Reference< XParser >( xServiceFactory->createInstance( SERVICENAME_SAXPARSER), UNO_QUERY); + return Parser::create( xContext ); } static Reference< XDocumentHandler > GetSaxWriter( @@ -65,11 +65,11 @@ static Reference< XDocumentHandler > GetSaxWriter( } sal_Bool StatusBarConfiguration::LoadStatusBar( - const Reference< XMultiServiceFactory >& xServiceFactory, + const Reference< XComponentContext >& rxContext, const Reference< XInputStream >& xInputStream, const Reference< XIndexContainer >& rStatusbarConfiguration ) { - Reference< XParser > xParser( GetSaxParser( xServiceFactory ) ); + Reference< XParser > xParser( GetSaxParser( rxContext ) ); // connect stream to input stream to the parser InputSource aInputSource; diff --git a/framework/source/fwe/xml/toolboxconfiguration.cxx b/framework/source/fwe/xml/toolboxconfiguration.cxx index 13afba4cf8ea..dcc7d48d1c51 100644 --- a/framework/source/fwe/xml/toolboxconfiguration.cxx +++ b/framework/source/fwe/xml/toolboxconfiguration.cxx @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include #include @@ -51,10 +51,10 @@ namespace framework { static Reference< XParser > GetSaxParser( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ) { - return Reference< XParser >( xServiceFactory->createInstance( SERVICENAME_SAXPARSER), UNO_QUERY); + return Parser::create(rxContext); } static Reference< XDocumentHandler > GetSaxWriter( @@ -65,11 +65,11 @@ static Reference< XDocumentHandler > GetSaxWriter( } sal_Bool ToolBoxConfiguration::LoadToolBox( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rInputStream, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rToolbarConfiguration ) { - Reference< XParser > xParser( GetSaxParser( xServiceFactory ) ); + Reference< XParser > xParser( GetSaxParser( rxContext ) ); // connect stream to input stream to the parser InputSource aInputSource; diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index 54fdc51d5093..3e3b5033290c 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -492,7 +493,7 @@ sal_Bool ImageManagerImpl::implts_loadUserImages( uno::Reference< XInputStream > xInputStream = xStream->getInputStream(); ImageListsDescriptor aUserImageListInfo; - ImagesConfiguration::LoadImages( m_xServiceManager, + ImagesConfiguration::LoadImages( comphelper::getComponentContext(m_xServiceManager), xInputStream, aUserImageListInfo ); if (( aUserImageListInfo.pImageList != 0 ) && diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index 0b9cfce04f1b..2a6b451303c3 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -47,6 +47,7 @@ #include #include +#include #include //_________________________________________________________________________________________________________________ @@ -338,7 +339,7 @@ void ModuleUIConfigurationManager::impl_requestUIElementData( sal_Int16 nElement try { Reference< XIndexContainer > xIndexContainer( static_cast< OWeakObject * >( new RootItemContainer() ), UNO_QUERY ); - ToolBoxConfiguration::LoadToolBox( m_xServiceManager, xInputStream, xIndexContainer ); + ToolBoxConfiguration::LoadToolBox( comphelper::getComponentContext(m_xServiceManager), xInputStream, xIndexContainer ); RootItemContainer* pRootItemContainer = RootItemContainer::GetImplementation( xIndexContainer ); aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, sal_True ) ), UNO_QUERY ); return; @@ -355,7 +356,7 @@ void ModuleUIConfigurationManager::impl_requestUIElementData( sal_Int16 nElement try { Reference< XIndexContainer > xIndexContainer( static_cast< OWeakObject * >( new RootItemContainer() ), UNO_QUERY ); - StatusBarConfiguration::LoadStatusBar( m_xServiceManager, xInputStream, xIndexContainer ); + StatusBarConfiguration::LoadStatusBar( comphelper::getComponentContext(m_xServiceManager), xInputStream, xIndexContainer ); RootItemContainer* pRootItemContainer = RootItemContainer::GetImplementation( xIndexContainer ); aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, sal_True ) ), UNO_QUERY ); return; diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index 0ce2e54409a4..f19853f0ed0c 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -47,6 +47,7 @@ #include #include +#include #include #include @@ -276,7 +277,7 @@ void UIConfigurationManager::impl_requestUIElementData( sal_Int16 nElementType, try { Reference< XIndexContainer > xIndexContainer( static_cast< OWeakObject * >( new RootItemContainer() ), UNO_QUERY ); - ToolBoxConfiguration::LoadToolBox( m_xServiceManager, xInputStream, xIndexContainer ); + ToolBoxConfiguration::LoadToolBox( comphelper::getComponentContext(m_xServiceManager), xInputStream, xIndexContainer ); RootItemContainer* pRootItemContainer = RootItemContainer::GetImplementation( xIndexContainer ); aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, sal_True ) ), UNO_QUERY ); return; @@ -293,7 +294,7 @@ void UIConfigurationManager::impl_requestUIElementData( sal_Int16 nElementType, try { Reference< XIndexContainer > xIndexContainer( static_cast< OWeakObject * >( new RootItemContainer() ), UNO_QUERY ); - StatusBarConfiguration::LoadStatusBar( m_xServiceManager, xInputStream, xIndexContainer ); + StatusBarConfiguration::LoadStatusBar( comphelper::getComponentContext(m_xServiceManager), xInputStream, xIndexContainer ); RootItemContainer* pRootItemContainer = RootItemContainer::GetImplementation( xIndexContainer ); aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, sal_True ) ), UNO_QUERY ); return; diff --git a/framework/source/xml/imagesconfiguration.cxx b/framework/source/xml/imagesconfiguration.cxx index b583605cec63..622b45f5eecc 100644 --- a/framework/source/xml/imagesconfiguration.cxx +++ b/framework/source/xml/imagesconfiguration.cxx @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include #include @@ -51,10 +51,10 @@ namespace framework { static Reference< XParser > GetSaxParser( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ) { - return Reference< XParser >( xServiceFactory->createInstance( SERVICENAME_SAXPARSER), UNO_QUERY); + return Parser::create(rxContext); } static Reference< XDocumentHandler > GetSaxWriter( @@ -65,11 +65,11 @@ static Reference< XDocumentHandler > GetSaxWriter( } sal_Bool ImagesConfiguration::LoadImages( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rInputStream, ImageListsDescriptor& rItems ) { - Reference< XParser > xParser( GetSaxParser( xServiceFactory ) ); + Reference< XParser > xParser( GetSaxParser( rxContext ) ); // connect stream to input stream to the parser InputSource aInputSource; diff --git a/i18npool/Executable_saxparser.mk b/i18npool/Executable_saxparser.mk index ba0be63c5fc9..ce47a701a9c8 100644 --- a/i18npool/Executable_saxparser.mk +++ b/i18npool/Executable_saxparser.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Executable_set_include,saxparser,\ $(eval $(call gb_Executable_use_sdk_api,saxparser)) $(eval $(call gb_Executable_use_libraries,saxparser,\ + comphelper \ cppu \ cppuhelper \ sal \ diff --git a/i18npool/source/localedata/saxparser.cxx b/i18npool/source/localedata/saxparser.cxx index c23d4ad389f4..6908c6fefac3 100644 --- a/i18npool/source/localedata/saxparser.cxx +++ b/i18npool/source/localedata/saxparser.cxx @@ -27,12 +27,13 @@ #include #include -#include +#include #include #include #include +#include #include #include #include @@ -322,46 +323,36 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) // parser demo // read xml from a file and count elements //-------------------------------- - Reference< XInterface > x = xSMgr->createInstance( - OUString("com.sun.star.xml.sax.Parser") ); + Reference< XParser > rParser = Parser::create(comphelper::getComponentContext(xSMgr)); + int nError = 0; - if( x.is() ) + // create and connect the document handler to the parser + TestDocumentHandler *pDocHandler = new TestDocumentHandler( argv[1], argv[3]); + + Reference < XDocumentHandler > rDocHandler( (XDocumentHandler *) pDocHandler ); + Reference< XEntityResolver > rEntityResolver( (XEntityResolver *) pDocHandler ); + + rParser->setDocumentHandler( rDocHandler ); + rParser->setEntityResolver( rEntityResolver ); + + // create the input stream + InputSource source; + source.aInputStream = createStreamFromFile( argv[2] ); + source.sSystemId = OUString::createFromAscii( argv[2] ); + + try { - Reference< XParser > rParser( x , UNO_QUERY ); - - // create and connect the document handler to the parser - TestDocumentHandler *pDocHandler = new TestDocumentHandler( argv[1], argv[3]); - - Reference < XDocumentHandler > rDocHandler( (XDocumentHandler *) pDocHandler ); - Reference< XEntityResolver > rEntityResolver( (XEntityResolver *) pDocHandler ); - - rParser->setDocumentHandler( rDocHandler ); - rParser->setEntityResolver( rEntityResolver ); - - // create the input stream - InputSource source; - source.aInputStream = createStreamFromFile( argv[2] ); - source.sSystemId = OUString::createFromAscii( argv[2] ); - - try - { - // start parsing - rParser->parseStream( source ); - } - - catch( const Exception & e ) - { - OString o1 = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8 ); - printf( "Exception during parsing : %s\n" , o1.getStr() ); - exit(1); - } - nError = pDocHandler->nError; + // start parsing + rParser->parseStream( source ); } - else + + catch( const Exception & e ) { - printf( "couldn't create sax-parser component\n" ); + OString o1 = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8 ); + printf( "Exception during parsing : %s\n" , o1.getStr() ); exit(1); } + nError = pDocHandler->nError; return nError; } diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx index 212506c4337b..347707e7683e 100644 --- a/linguistic/source/convdic.cxx +++ b/linguistic/source/convdic.cxx @@ -61,7 +61,7 @@ #include #include #include -#include +#include #include "convdic.hxx" @@ -88,7 +88,6 @@ void ReadThroughDic( const String &rMainURL, ConvDicXMLImport &rImport ) return; DBG_ASSERT(!INetURLObject( rMainURL ).HasError(), "invalid URL"); - uno::Reference< lang::XMultiServiceFactory > xServiceFactory( comphelper::getProcessServiceFactory() ); uno::Reference< uno::XComponentContext > xContext( comphelper::getProcessComponentContext() ); // get xInputStream stream @@ -112,17 +111,7 @@ void ReadThroughDic( const String &rMainURL, ConvDicXMLImport &rImport ) aParserInput.aInputStream = xIn; // get parser - uno::Reference< xml::sax::XParser > xParser; - try - { - xParser = uno::Reference< xml::sax::XParser >( xServiceFactory->createInstance( "com.sun.star.xml.sax.Parser" ), UNO_QUERY ); - } - catch (uno::Exception &) - { - } - DBG_ASSERT( xParser.is(), "Can't create parser" ); - if (!xParser.is()) - return; + uno::Reference< xml::sax::XParser > xParser = xml::sax::Parser::create( xContext ); //!! keep a reference until everything is done to //!! ensure the proper lifetime of the object diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index e31beef09ac1..1a4289922221 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -317,6 +317,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/dom,\ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/sax,\ FastShapeContextHandler \ FastTokenHandler \ + Parser \ )) diff --git a/offapi/com/sun/star/xml/sax/Parser.idl b/offapi/com/sun/star/xml/sax/Parser.idl new file mode 100644 index 000000000000..8ddee4e50e4e --- /dev/null +++ b/offapi/com/sun/star/xml/sax/Parser.idl @@ -0,0 +1,37 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ +#ifndef __com_sun_star_xml_sax_Parser_idl__ +#define __com_sun_star_xml_sax_Parser_idl__ + +#include + +module com { module sun { module star { module xml { module sax { + + +/** + Service that provides a SAX parser. + */ +published service Parser : XParser; + + +}; }; }; }; }; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/manifest/ManifestReader.cxx b/package/source/manifest/ManifestReader.cxx index f57f43bf74b3..9ff714484b81 100644 --- a/package/source/manifest/ManifestReader.cxx +++ b/package/source/manifest/ManifestReader.cxx @@ -19,10 +19,11 @@ #include #include +#include #include #include #include -#include +#include #include #include #include @@ -49,34 +50,31 @@ Sequence< Sequence< PropertyValue > > SAL_CALL ManifestReader::readManifestSeque throw (::com::sun::star::uno::RuntimeException) { Sequence < Sequence < PropertyValue > > aManifestSequence; - Reference < XParser > xParser (xFactory->createInstance ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.xml.sax.Parser" ) ) ), UNO_QUERY ); - if (xParser.is()) + Reference < XParser > xParser = Parser::create(comphelper::getComponentContext(xFactory)); + try + { + vector < Sequence < PropertyValue > > aManVector; + Reference < XDocumentHandler > xFilter = new ManifestImport( aManVector ); + InputSource aParserInput; + aParserInput.aInputStream = rStream; + aParserInput.sSystemId = OUString ( RTL_CONSTASCII_USTRINGPARAM ( "META-INF/manifest.xml" ) ); + xParser->setDocumentHandler ( xFilter ); + xParser->parseStream( aParserInput ); + aManifestSequence.realloc ( aManVector.size() ); + Sequence < PropertyValue > * pSequence = aManifestSequence.getArray(); + ::std::vector < Sequence < PropertyValue > >::const_iterator aIter = aManVector.begin(); + ::std::vector < Sequence < PropertyValue > >::const_iterator aEnd = aManVector.end(); + while( aIter != aEnd ) + *pSequence++ = (*aIter++); + } + catch (SAXParseException& ) + { + } + catch (SAXException& ) + { + } + catch (IOException& ) { - try - { - vector < Sequence < PropertyValue > > aManVector; - Reference < XDocumentHandler > xFilter = new ManifestImport( aManVector ); - InputSource aParserInput; - aParserInput.aInputStream = rStream; - aParserInput.sSystemId = OUString ( RTL_CONSTASCII_USTRINGPARAM ( "META-INF/manifest.xml" ) ); - xParser->setDocumentHandler ( xFilter ); - xParser->parseStream( aParserInput ); - aManifestSequence.realloc ( aManVector.size() ); - Sequence < PropertyValue > * pSequence = aManifestSequence.getArray(); - ::std::vector < Sequence < PropertyValue > >::const_iterator aIter = aManVector.begin(); - ::std::vector < Sequence < PropertyValue > >::const_iterator aEnd = aManVector.end(); - while( aIter != aEnd ) - *pSequence++ = (*aIter++); - } - catch (SAXParseException& ) - { - } - catch (SAXException& ) - { - } - catch (IOException& ) - { - } } xParser->setDocumentHandler ( Reference < XDocumentHandler > () ); return aManifestSequence; diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx index a8d1b925c5f5..05a3f158fee3 100644 --- a/package/source/xstor/owriteablestream.cxx +++ b/package/source/xstor/owriteablestream.cxx @@ -1082,7 +1082,7 @@ void OWriteStream_Impl::ReadRelInfoIfNecessary() m_aOrigRelInfo = ::comphelper::OFOPXMLHelper::ReadRelationsInfoSequence( m_xOrigRelInfoStream, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_rels/*.rels" ) ), - m_xFactory ); + comphelper::getComponentContext(m_xFactory) ); // in case of success the stream must be thrown away, that means that the OrigRelInfo is initialized // the reason for this is that the original stream might not be seekable ( at the same time the new @@ -1108,7 +1108,7 @@ void OWriteStream_Impl::ReadRelInfoIfNecessary() m_aNewRelInfo = ::comphelper::OFOPXMLHelper::ReadRelationsInfoSequence( m_xNewRelInfoStream, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_rels/*.rels" ) ), - m_xFactory ); + comphelper::getComponentContext(m_xFactory) ); m_nRelInfoStatus = RELINFO_CHANGED_STREAM_READ; } diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx index 3908e8acaf3d..33d4aaa79cf6 100644 --- a/package/source/xstor/xstorage.cxx +++ b/package/source/xstor/xstorage.cxx @@ -595,7 +595,7 @@ void OStorage_Impl::ReadRelInfoIfNecessary() m_aRelInfo = ::comphelper::OFOPXMLHelper::ReadRelationsInfoSequence( xRelInfoStream, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_rels/.rels" ) ), - m_xFactory ); + comphelper::getComponentContext(m_xFactory) ); m_nRelInfoStatus = RELINFO_READ; } @@ -608,7 +608,7 @@ void OStorage_Impl::ReadRelInfoIfNecessary() m_aRelInfo = ::comphelper::OFOPXMLHelper::ReadRelationsInfoSequence( m_xNewRelInfoStream, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_rels/.rels" ) ), - m_xFactory ); + comphelper::getComponentContext(m_xFactory) ); m_nRelInfoStatus = RELINFO_CHANGED_STREAM_READ; } diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index b3e1730e4462..5ab16b3dfa45 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -464,7 +464,7 @@ void ZipPackage::parseContentType() sal_Int32 nInd = 0; // here aContentTypeInfo[0] - Defaults, and aContentTypeInfo[1] - Overrides uno::Sequence< uno::Sequence< beans::StringPair > > aContentTypeInfo = - ::comphelper::OFOPXMLHelper::ReadContentTypeSequence( xInStream, m_xFactory ); + ::comphelper::OFOPXMLHelper::ReadContentTypeSequence( xInStream, comphelper::getComponentContext(m_xFactory) ); if ( aContentTypeInfo.getLength() != 2 ) throw io::IOException(OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() ); diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index b9d2daf488d1..1279e7386f93 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -21,6 +21,7 @@ #include #include #include +#include #include "xmlfilter.hxx" #include "xmlGroup.hxx" #include "xmlReport.hxx" @@ -38,6 +39,7 @@ #include #include +#include #include #include #include @@ -124,13 +126,13 @@ sal_Int32 ReadThroughComponent( const uno::Reference& xInputStream, const uno::Reference& xModelComponent, const sal_Char* /*pStreamName*/, - const uno::Reference & rFactory, + const uno::Reference & rContext, const uno::Reference< XDocumentHandler >& _xFilter, sal_Bool /*bEncrypted*/ ) { OSL_ENSURE(xInputStream.is(), "input stream missing"); OSL_ENSURE(xModelComponent.is(), "document missing"); - OSL_ENSURE(rFactory.is(), "factory missing"); + OSL_ENSURE(rContext.is(), "factory missing"); RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "rptxml", "oj", "ReadThroughComponent" ); @@ -139,13 +141,7 @@ sal_Int32 ReadThroughComponent( aParserInput.aInputStream = xInputStream; // get parser - uno::Reference< XParser > xParser( - rFactory->createInstance( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser"))), - UNO_QUERY ); - OSL_ENSURE( xParser.is(), "Can't create parser" ); - if( !xParser.is() ) - return 1; + uno::Reference< XParser > xParser = xml::sax::Parser::create(rContext); RTL_LOGFILE_CONTEXT_TRACE( aLog, "parser created" ); // get filter @@ -289,7 +285,7 @@ sal_Int32 ReadThroughComponent( return ReadThroughComponent( xInputStream ,xModelComponent ,pStreamName - ,rFactory + ,comphelper::getComponentContext(rFactory) ,xDocHandler ,bEncrypted ); } diff --git a/sc/inc/xmlwrap.hxx b/sc/inc/xmlwrap.hxx index e30df936708e..2e378a4a1d09 100644 --- a/sc/inc/xmlwrap.hxx +++ b/sc/inc/xmlwrap.hxx @@ -38,7 +38,7 @@ namespace com { namespace sun { namespace star { namespace uno { class XInterface; } namespace embed { class XStorage; } namespace xml { - namespace sax { struct InputSource; } } + namespace sax { struct InputSource; class XParser; } } } } } class ScXMLImportWrapper @@ -51,7 +51,7 @@ class ScXMLImportWrapper sal_uInt32 ImportFromComponent(com::sun::star::uno::Reference& xServiceFactory, com::sun::star::uno::Reference& xModel, - com::sun::star::uno::Reference& xXMLParser, + com::sun::star::uno::Reference& xParser, com::sun::star::xml::sax::InputSource& aParserInput, const rtl::OUString& sComponentName, const rtl::OUString& sDocName, const rtl::OUString& sOldDocName, com::sun::star::uno::Sequence& aArgs, diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index acbc1fa4380d..83ee343e29b7 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include #include @@ -110,7 +110,7 @@ uno::Reference ScXMLImportWrapper::GetStatusIndicator() } sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference& xServiceFactory, - uno::Reference& xModel, uno::Reference& xXMLParser, + uno::Reference& xModel, uno::Reference& xParser, xml::sax::InputSource& aParserInput, const rtl::OUString& sComponentName, const rtl::OUString& sDocName, const rtl::OUString& sOldDocName, uno::Sequence& aArgs, @@ -184,7 +184,6 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::ReferencesetTargetDocument( xComponent ); // connect parser and filter - uno::Reference xParser( xXMLParser, uno::UNO_QUERY ); xParser->setDocumentHandler( xDocHandler ); try @@ -325,6 +324,7 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) uno::Reference xServiceFactory = comphelper::getProcessServiceFactory(); + uno::Reference xContext = comphelper::getProcessComponentContext(); OSL_ENSURE( xServiceFactory.is(), "got no service manager" ); if( !xServiceFactory.is() ) return false; @@ -337,12 +337,7 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) xStorage = pMedium->GetStorage(); // get parser - uno::Reference xXMLParser( - xServiceFactory->createInstance( - OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Parser" )) )); - OSL_ENSURE( xXMLParser.is(), "com.sun.star.xml.sax.Parser service missing" ); - if( !xXMLParser.is() ) - return false; + uno::Reference xXMLParser = xml::sax::Parser::create(xContext); // get filter SfxObjectShell* pObjSh = rDoc.GetDocumentShell(); diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx index 8eb74eeaabcf..87e19f8ee4a5 100644 --- a/sd/source/core/CustomAnimationPreset.cxx +++ b/sd/source/core/CustomAnimationPreset.cxx @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include @@ -266,11 +266,7 @@ Reference< XAnimationNode > implImportEffects( const Reference< XMultiServiceFac aParserInput.aInputStream = xInputStream; // get parser - Reference< xml::sax::XParser > xParser( xServiceFactory->createInstance("com.sun.star.xml.sax.Parser" ), UNO_QUERY ); - - DBG_ASSERT( xParser.is(), "Can't create parser" ); - if( !xParser.is() ) - return xRootNode; + Reference< xml::sax::XParser > xParser = xml::sax::Parser::create( comphelper::getComponentContext(xServiceFactory) ); // get filter Reference< xml::sax::XDocumentHandler > xFilter( xServiceFactory->createInstance("com.sun.star.comp.Xmloff.AnimationsImport" ), UNO_QUERY ); diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index 77caf60e8467..f9cf8e3a804f 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -58,9 +58,10 @@ #include #include #include -#include +#include #include #include +#include #include #include #include @@ -228,12 +229,7 @@ sal_Int32 ReadThroughComponent( aParserInput.aInputStream = xInputStream; // get parser - Reference< xml::sax::XParser > xParser( - rFactory->createInstance("com.sun.star.xml.sax.Parser" ), - UNO_QUERY ); - DBG_ASSERT( xParser.is(), "Can't create parser" ); - if( !xParser.is() ) - return SD_XML_READERROR; + Reference< xml::sax::XParser > xParser = xml::sax::Parser::create(comphelper::getComponentContext(rFactory)); RTL_LOGFILE_CONTEXT_TRACE( aLog, "parser created" ); // get filter diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx index 8c717ed7c45d..0b97c0b8e19a 100644 --- a/sfx2/source/doc/SfxDocumentMetaData.cxx +++ b/sfx2/source/doc/SfxDocumentMetaData.cxx @@ -44,7 +44,7 @@ #include "com/sun/star/document/XImporter.hpp" #include "com/sun/star/document/XExporter.hpp" #include "com/sun/star/document/XFilter.hpp" -#include "com/sun/star/xml/sax/XParser.hpp" +#include "com/sun/star/xml/sax/Parser.hpp" #include "com/sun/star/xml/dom/XDocument.hpp" #include "com/sun/star/xml/dom/XElement.hpp" #include "com/sun/star/xml/dom/DocumentBuilder.hpp" @@ -1918,13 +1918,7 @@ SfxDocumentMetaData::loadFromStorage( // create DOM parser service css::uno::Reference xMsf ( m_xContext->getServiceManager()); - css::uno::Reference xParser ( - xMsf->createInstanceWithContext(::rtl::OUString( - "com.sun.star.xml.sax.Parser"), m_xContext), - css::uno::UNO_QUERY_THROW); - if (!xParser.is()) throw css::uno::RuntimeException( - ::rtl::OUString("SfxDocumentMetaData::loadFromStorage:" - " cannot create Parser service"), *this); + css::uno::Reference xParser = css::xml::sax::Parser::create(m_xContext); css::xml::sax::InputSource input; input.aInputStream = xInStream; diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index 75e294ca2b00..76a4f5db6257 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -1307,7 +1307,7 @@ uno::Sequence< beans::StringPair > SfxDocTplService_Impl::ReadUINamesForTemplate { uno::Reference< io::XInputStream > xLocStream = aLocContent.openStream(); if ( xLocStream.is() ) - aUINames = DocTemplLocaleHelper::ReadGroupLocalizationSequence( xLocStream, mxFactory ); + aUINames = DocTemplLocaleHelper::ReadGroupLocalizationSequence( xLocStream, comphelper::getComponentContext(mxFactory) ); } catch( uno::Exception& ) {} diff --git a/sfx2/source/doc/doctemplateslocal.cxx b/sfx2/source/doc/doctemplateslocal.cxx index 71ee17ea78ba..82452dc14a39 100644 --- a/sfx2/source/doc/doctemplateslocal.cxx +++ b/sfx2/source/doc/doctemplateslocal.cxx @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include @@ -32,11 +32,11 @@ using namespace ::com::sun::star; // ----------------------------------- -uno::Sequence< beans::StringPair > DocTemplLocaleHelper::ReadGroupLocalizationSequence( const uno::Reference< io::XInputStream >& xInStream, const uno::Reference< lang::XMultiServiceFactory > xFactory ) +uno::Sequence< beans::StringPair > DocTemplLocaleHelper::ReadGroupLocalizationSequence( const uno::Reference< io::XInputStream >& xInStream, const uno::Reference< uno::XComponentContext > xContext ) throw( uno::Exception ) { ::rtl::OUString aStringID = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "groupuinames.xml" ) ); - return ReadLocalizationSequence_Impl( xInStream, aStringID, xFactory ); + return ReadLocalizationSequence_Impl( xInStream, aStringID, xContext ); } // ----------------------------------- @@ -92,15 +92,15 @@ void SAL_CALL DocTemplLocaleHelper::WriteGroupLocalizationSequence( const uno::R // ================================================================================== // ----------------------------------- -uno::Sequence< beans::StringPair > SAL_CALL DocTemplLocaleHelper::ReadLocalizationSequence_Impl( const uno::Reference< io::XInputStream >& xInStream, const ::rtl::OUString& aStringID, const uno::Reference< lang::XMultiServiceFactory > xFactory ) +uno::Sequence< beans::StringPair > SAL_CALL DocTemplLocaleHelper::ReadLocalizationSequence_Impl( const uno::Reference< io::XInputStream >& xInStream, const ::rtl::OUString& aStringID, const uno::Reference< uno::XComponentContext > xContext ) throw( uno::Exception ) { - if ( !xFactory.is() || !xInStream.is() ) + if ( !xContext.is() || !xInStream.is() ) throw uno::RuntimeException(); uno::Sequence< beans::StringPair > aResult; - uno::Reference< xml::sax::XParser > xParser( xFactory->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Parser" ) ) ), uno::UNO_QUERY_THROW ); + uno::Reference< xml::sax::XParser > xParser = xml::sax::Parser::create( xContext ); DocTemplLocaleHelper* pHelper = new DocTemplLocaleHelper(); uno::Reference< xml::sax::XDocumentHandler > xHelper( static_cast< xml::sax::XDocumentHandler* >( pHelper ) ); diff --git a/sfx2/source/doc/doctemplateslocal.hxx b/sfx2/source/doc/doctemplateslocal.hxx index 49327eab3b75..ba0f58af2b86 100644 --- a/sfx2/source/doc/doctemplateslocal.hxx +++ b/sfx2/source/doc/doctemplateslocal.hxx @@ -41,7 +41,7 @@ class DocTemplLocaleHelper : public cppu::WeakImplHelper1 < com::sun::star::xml: DocTemplLocaleHelper(); // must not be created directly ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > GetParsingResult(); - static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > SAL_CALL ReadLocalizationSequence_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream, const ::rtl::OUString& aStringID, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory ) + static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > SAL_CALL ReadLocalizationSequence_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream, const ::rtl::OUString& aStringID, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext ) throw( ::com::sun::star::uno::Exception ); public: @@ -52,7 +52,7 @@ public: ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > ReadGroupLocalizationSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory ) + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext ) throw( ::com::sun::star::uno::Exception ); // writes sequence of elements ( GroupName, GroupUIName ) diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 2ef4d8b5bede..f7c5f30cbdfe 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -3382,11 +3382,11 @@ uno::Reference< ui::XUIConfigurationManager > SAL_CALL SfxBaseModel::getUIConfig xOOo1ConfigStorage = getDocumentSubStorage( aOOo1UIConfigFolderName, embed::ElementModes::READ ); if ( xOOo1ConfigStorage.is() ) { - uno::Reference< lang::XMultiServiceFactory > xServiceMgr( ::comphelper::getProcessServiceFactory() ); + uno::Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); uno::Sequence< uno::Reference< container::XIndexContainer > > rToolbars; sal_Bool bImported = framework::UIConfigurationImporterOOo1x::ImportCustomToolbars( - xNewUIConfMan, rToolbars, xServiceMgr, xOOo1ConfigStorage ); + xNewUIConfMan, rToolbars, xContext, xOOo1ConfigStorage ); if ( bImported ) { SfxObjectShell* pObjShell = SfxBaseModel::GetObjectShell(); diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx index a71fc36683fc..2273c10a4b46 100644 --- a/starmath/source/mathmlimport.cxx +++ b/starmath/source/mathmlimport.cxx @@ -26,7 +26,7 @@ one go*/ #include #include #include -#include +#include #include #include #include @@ -38,6 +38,7 @@ one go*/ #include #include +#include #include #include #include @@ -273,13 +274,7 @@ sal_uLong SmXMLImportWrapper::ReadThroughComponent( aParserInput.aInputStream = xInputStream; // get parser - Reference< xml::sax::XParser > xParser( - rFactory->createInstance( - "com.sun.star.xml.sax.Parser"), - UNO_QUERY ); - OSL_ENSURE( xParser.is(), "Can't create parser" ); - if ( !xParser.is() ) - return nError; + Reference< xml::sax::XParser > xParser = xml::sax::Parser::create(comphelper::getComponentContext(rFactory)); Sequence aArgs( 1 ); aArgs[0] <<= rPropSet; diff --git a/svx/source/xml/xmlexport.cxx b/svx/source/xml/xmlexport.cxx index 7273fc7e4c86..0109eff91986 100644 --- a/svx/source/xml/xmlexport.cxx +++ b/svx/source/xml/xmlexport.cxx @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include @@ -190,6 +190,7 @@ sal_Bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference xServiceFactory = comphelper::getProcessServiceFactory(); + Reference< uno::XComponentContext > xContext = comphelper::getProcessComponentContext(); DBG_ASSERT( xServiceFactory.is(), "XMLReader::Read: got no service manager" ); if( !xServiceFactory.is() ) @@ -226,8 +227,7 @@ sal_Bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference xParser( xServiceFactory->createInstance( OUString("com.sun.star.xml.sax.Parser") ), UNO_QUERY ); - DBG_ASSERT( xParser.is(), "Can't create parser" ); + Reference< xml::sax::XParser > xParser = xml::sax::Parser::create( xContext ); // prepare filter arguments Sequence aFilterArgs( 2 ); diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx index e552ddaf87e4..09cc96765948 100644 --- a/svx/source/xml/xmlxtimp.cxx +++ b/svx/source/xml/xmlxtimp.cxx @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include @@ -393,13 +393,14 @@ bool SvxXMLXTableImport::load( const rtl::OUString &rPath, try { uno::Reference xServiceFactory( ::comphelper::getProcessServiceFactory() ); + uno::Reference xContext( ::comphelper::getProcessComponentContext() ); if( !xServiceFactory.is() ) { OSL_FAIL( "SvxXMLXTableImport::load: got no service manager" ); return false; } - uno::Reference< xml::sax::XParser > xParser( xServiceFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Parser" ) ) ), uno::UNO_QUERY_THROW ); + uno::Reference< xml::sax::XParser > xParser = xml::sax::Parser::create( xContext ); xml::sax::InputSource aParserInput; comphelper::LifecycleProxy aNasty; diff --git a/svx/workben/msview/xmlconfig.cxx b/svx/workben/msview/xmlconfig.cxx index b97e5f0d7bc9..6a85448919b4 100644 --- a/svx/workben/msview/xmlconfig.cxx +++ b/svx/workben/msview/xmlconfig.cxx @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include #include @@ -323,10 +323,7 @@ void load_config( const OUString& rPath ) aParserInput.aInputStream = xInputStream; // get parser - Reference< XParser > xParser( - comphelper::getProcessServiceFactory()->createInstance( - OUString("com.sun.star.xml.sax.Parser") ), - UNO_QUERY_THROW ); + Reference< XParser > xParser = Parser::create(comphelper::getProcessComponentContext()); // get filter ConfigHandler* pConfigHandler = new ConfigHandler(); diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk index 7b0d48fa14b4..e49b46719135 100644 --- a/sw/CppunitTest_sw_filters_test.mk +++ b/sw/CppunitTest_sw_filters_test.mk @@ -80,6 +80,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\ framework/util/fwk \ i18npool/util/i18npool \ package/util/package2 \ + sax/source/expatwrap/expwrap \ sfx2/util/sfx \ svtools/util/svt \ sw/util/msword \ diff --git a/sw/CppunitTest_sw_subsequent_rtfimport.mk b/sw/CppunitTest_sw_subsequent_rtfimport.mk index 062ef8dd87f7..2cc2110594eb 100644 --- a/sw/CppunitTest_sw_subsequent_rtfimport.mk +++ b/sw/CppunitTest_sw_subsequent_rtfimport.mk @@ -72,6 +72,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_rtfimport,\ framework/util/fwk \ i18npool/util/i18npool \ package/util/package2 \ + sax/source/expatwrap/expwrap \ sw/util/sw \ sw/util/swd \ sfx2/util/sfx \ diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx index 646439badc93..714de20465f3 100644 --- a/sw/source/core/swg/SwXMLTextBlocks1.cxx +++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx @@ -32,10 +32,11 @@ #include #include #include +#include #include #include #include -#include +#include #include #include #include @@ -118,23 +119,13 @@ sal_uLong SwXMLTextBlocks::GetDoc( sal_uInt16 nIdx ) aParserInput.aInputStream = xStream->getInputStream(); - // get parser - uno::Reference< XInterface > xXMLParser = xServiceFactory->createInstance( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser"))); - OSL_ENSURE( xXMLParser.is(), - "XMLReader::Read: com.sun.star.xml.sax.Parser service missing" ); - if( !xXMLParser.is() ) - { - // Maybe throw an exception? - } - // get filter // #110680# // uno::Reference< xml::sax::XDocumentHandler > xFilter = new SwXMLTextBlockImport( *this, aCur, sal_True ); uno::Reference< xml::sax::XDocumentHandler > xFilter = new SwXMLTextBlockImport( xServiceFactory, *this, aCur, sal_True ); // connect parser and filter - uno::Reference< xml::sax::XParser > xParser( xXMLParser, UNO_QUERY ); + uno::Reference< xml::sax::XParser > xParser = xml::sax::Parser::create(comphelper::getComponentContext(xServiceFactory)); xParser->setDocumentHandler( xFilter ); // parse @@ -218,74 +209,67 @@ sal_uLong SwXMLTextBlocks::GetMacroTable( sal_uInt16 nIdx, // get service factory uno::Reference< lang::XMultiServiceFactory > xServiceFactory = comphelper::getProcessServiceFactory(); + uno::Reference< uno::XComponentContext > xContext = + comphelper::getProcessComponentContext(); if ( xServiceFactory.is() ) { // get parser - OUString sParserService( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.xml.sax.Parser" ) ); - uno::Reference< xml::sax::XParser > xParser( - xServiceFactory->createInstance(sParserService), + uno::Reference< xml::sax::XParser > xParser = xml::sax::Parser::create( xContext ); + + // create descriptor and reference to it. Either + // both or neither must be kept because of the + // reference counting! + SvMacroTableEventDescriptor* pDescriptor = + new SvMacroTableEventDescriptor(aAutotextEvents); + uno::Reference xReplace = pDescriptor; + Sequence aFilterArguments( 1 ); + aFilterArguments[0] <<= xReplace; + + // get filter + OUString sFilterComponent = bOasis + ? OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Writer.XMLOasisAutotextEventsImporter")) + : OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Writer.XMLAutotextEventsImporter")); + uno::Reference< xml::sax::XDocumentHandler > xFilter( + xServiceFactory->createInstanceWithArguments( + sFilterComponent, aFilterArguments), UNO_QUERY ); - OSL_ENSURE( xParser.is(), "Can't create parser" ); - if( xParser.is() ) + OSL_ENSURE( xFilter.is(), + "can't instantiate atevents filter"); + if ( xFilter.is() ) { - // create descriptor and reference to it. Either - // both or neither must be kept because of the - // reference counting! - SvMacroTableEventDescriptor* pDescriptor = - new SvMacroTableEventDescriptor(aAutotextEvents); - uno::Reference xReplace = pDescriptor; - Sequence aFilterArguments( 1 ); - aFilterArguments[0] <<= xReplace; + // connect parser and filter + xParser->setDocumentHandler( xFilter ); - // get filter - OUString sFilterComponent = bOasis - ? OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Writer.XMLOasisAutotextEventsImporter")) - : OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Writer.XMLAutotextEventsImporter")); - uno::Reference< xml::sax::XDocumentHandler > xFilter( - xServiceFactory->createInstanceWithArguments( - sFilterComponent, aFilterArguments), - UNO_QUERY ); - OSL_ENSURE( xFilter.is(), - "can't instantiate atevents filter"); - if ( xFilter.is() ) + // connect model and filter + uno::Reference xImporter( xFilter, + UNO_QUERY ); + + // we don't need a model + // xImporter->setTargetDocument( xModelComponent ); + + // parse the stream + try { - // connect parser and filter - xParser->setDocumentHandler( xFilter ); - - // connect model and filter - uno::Reference xImporter( xFilter, - UNO_QUERY ); - - // we don't need a model - // xImporter->setTargetDocument( xModelComponent ); - - // parse the stream - try - { - xParser->parseStream( aParserInput ); - } - catch( xml::sax::SAXParseException& ) - { - // workaround for #83452#: SetSize doesn't work - // nRet = ERR_SWG_READ_ERROR; - } - catch( xml::sax::SAXException& ) - { - nRet = ERR_SWG_READ_ERROR; - } - catch( io::IOException& ) - { - nRet = ERR_SWG_READ_ERROR; - } - - // and finally, copy macro into table - if (0 == nRet) - pDescriptor->copyMacrosIntoTable(rMacroTbl); + xParser->parseStream( aParserInput ); } - else + catch( xml::sax::SAXParseException& ) + { + // workaround for #83452#: SetSize doesn't work + // nRet = ERR_SWG_READ_ERROR; + } + catch( xml::sax::SAXException& ) + { nRet = ERR_SWG_READ_ERROR; + } + catch( io::IOException& ) + { + nRet = ERR_SWG_READ_ERROR; + } + + // and finally, copy macro into table + if (0 == nRet) + pDescriptor->copyMacrosIntoTable(rMacroTbl); } else nRet = ERR_SWG_READ_ERROR; @@ -331,6 +315,8 @@ sal_uLong SwXMLTextBlocks::GetBlockText( const String& rShort, String& rText ) uno::Reference < io::XStream > xContents = xRoot->openStreamElement( aStreamName, embed::ElementModes::READ ); uno::Reference< lang::XMultiServiceFactory > xServiceFactory = comphelper::getProcessServiceFactory(); + uno::Reference< uno::XComponentContext > xContext = + comphelper::getProcessComponentContext(); OSL_ENSURE( xServiceFactory.is(), "XMLReader::Read: got no service manager" ); if( !xServiceFactory.is() ) { @@ -341,23 +327,13 @@ sal_uLong SwXMLTextBlocks::GetBlockText( const String& rShort, String& rText ) aParserInput.sSystemId = aName; aParserInput.aInputStream = xContents->getInputStream(); - // get parser - uno::Reference< XInterface > xXMLParser = xServiceFactory->createInstance( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")) ); - OSL_ENSURE( xXMLParser.is(), - "XMLReader::Read: com.sun.star.xml.sax.Parser service missing" ); - if( !xXMLParser.is() ) - { - // Maybe throw an exception? - } - // get filter // #110680# // uno::Reference< xml::sax::XDocumentHandler > xFilter = new SwXMLTextBlockImport( *this, rText, bTextOnly ); uno::Reference< xml::sax::XDocumentHandler > xFilter = new SwXMLTextBlockImport( xServiceFactory, *this, rText, bTextOnly ); // connect parser and filter - uno::Reference< xml::sax::XParser > xParser( xXMLParser, UNO_QUERY ); + uno::Reference< xml::sax::XParser > xParser = xml::sax::Parser::create(xContext); xParser->setDocumentHandler( xFilter ); // parse @@ -483,6 +459,8 @@ void SwXMLTextBlocks::ReadInfo( void ) { uno::Reference< lang::XMultiServiceFactory > xServiceFactory = comphelper::getProcessServiceFactory(); + uno::Reference< uno::XComponentContext > xContext = + comphelper::getProcessComponentContext(); OSL_ENSURE( xServiceFactory.is(), "XMLReader::Read: got no service manager" ); if( !xServiceFactory.is() ) @@ -496,23 +474,13 @@ void SwXMLTextBlocks::ReadInfo( void ) uno::Reference < io::XStream > xDocStream = xBlkRoot->openStreamElement( sDocName, embed::ElementModes::READ ); aParserInput.aInputStream = xDocStream->getInputStream(); - // get parser - uno::Reference< XInterface > xXMLParser = xServiceFactory->createInstance( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser"))); - OSL_ENSURE( xXMLParser.is(), - "XMLReader::Read: com.sun.star.xml.sax.Parser service missing" ); - if( !xXMLParser.is() ) - { - // Maybe throw an exception? - } - // get filter // #110680# // uno::Reference< xml::sax::XDocumentHandler > xFilter = new SwXMLBlockListImport( *this ); uno::Reference< xml::sax::XDocumentHandler > xFilter = new SwXMLBlockListImport( xServiceFactory, *this ); // connect parser and filter - uno::Reference< xml::sax::XParser > xParser( xXMLParser, UNO_QUERY ); + uno::Reference< xml::sax::XParser > xParser = xml::sax::Parser::create( xContext ); xParser->setDocumentHandler( xFilter ); // parse diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index cfda96c4e7a5..c07cedac9075 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include @@ -158,13 +158,7 @@ sal_Int32 ReadThroughComponent( aParserInput.aInputStream = xInputStream; // get parser - uno::Reference< xml::sax::XParser > xParser( - rFactory->createInstance( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser"))), - UNO_QUERY ); - OSL_ENSURE( xParser.is(), "Can't create parser" ); - if( !xParser.is() ) - return ERR_SWG_READ_ERROR; + uno::Reference< xml::sax::XParser > xParser = xml::sax::Parser::create(comphelper::getComponentContext(rFactory)); RTL_LOGFILE_CONTEXT_TRACE( aLog, "parser created" ); // get filter @@ -1067,6 +1061,8 @@ size_t XMLReader::GetSectionList( SfxMedium& rMedium, { uno::Reference< lang::XMultiServiceFactory > xServiceFactory = comphelper::getProcessServiceFactory(); + uno::Reference< uno::XComponentContext > xContext = + comphelper::getProcessComponentContext(); OSL_ENSURE( xServiceFactory.is(), "XMLReader::Read: got no service manager" ); uno::Reference < embed::XStorage > xStg2; @@ -1082,23 +1078,15 @@ size_t XMLReader::GetSectionList( SfxMedium& rMedium, uno::Reference < io::XStream > xStm = xStg2->openStreamElement( sDocName, embed::ElementModes::READ ); aParserInput.aInputStream = xStm->getInputStream(); - // get parser - uno::Reference< XInterface > xXMLParser = xServiceFactory->createInstance( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")) ); - OSL_ENSURE( xXMLParser.is(), - "XMLReader::Read: com.sun.star.xml.sax.Parser service missing" ); - if( xXMLParser.is() ) - { - // get filter - uno::Reference< xml::sax::XDocumentHandler > xFilter = new SwXMLSectionList( xServiceFactory, rStrings ); + // get filter + uno::Reference< xml::sax::XDocumentHandler > xFilter = new SwXMLSectionList( xServiceFactory, rStrings ); - // connect parser and filter - uno::Reference< xml::sax::XParser > xParser( xXMLParser, UNO_QUERY ); - xParser->setDocumentHandler( xFilter ); + // connect parser and filter + uno::Reference< xml::sax::XParser > xParser = xml::sax::Parser::create(xContext); + xParser->setDocumentHandler( xFilter ); - // parse - xParser->parseStream( aParserInput ); - } + // parse + xParser->parseStream( aParserInput ); } catch( xml::sax::SAXParseException& ) { diff --git a/unotools/source/config/accelcfg.cxx b/unotools/source/config/accelcfg.cxx index 6c4a53eff2b5..e3f121ca142f 100644 --- a/unotools/source/config/accelcfg.cxx +++ b/unotools/source/config/accelcfg.cxx @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include @@ -72,9 +72,7 @@ public: SvtAcceleratorConfig_Impl::SvtAcceleratorConfig_Impl( Reference< XInputStream >& rInputStream ) : bModified( false ) { - Reference< XParser > xParser( ::comphelper::getProcessServiceFactory()->createInstance( - ::rtl::OUString("com.sun.star.xml.sax.Parser")), - UNO_QUERY); + Reference< XParser > xParser = Parser::create( ::comphelper::getProcessComponentContext() ); // connect stream to input stream to the parser InputSource aInputSource; diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx index 3ece742ab7fa..a8c62bf9e495 100644 --- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx @@ -24,6 +24,7 @@ #include #include +#include //#define DEBUG_STREAM @@ -267,16 +268,7 @@ uno::Reference OOXMLStreamImpl::getStorageStream() uno::Reference OOXMLStreamImpl::getParser() { - uno::Reference xFactory = - uno::Reference - (mxContext->getServiceManager()); - - uno::Reference xParser - (xFactory->createInstanceWithContext - ( OUString("com.sun.star.xml.sax.Parser"), - mxContext ), - uno::UNO_QUERY ); - + uno::Reference xParser = xml::sax::Parser::create(mxContext); return xParser; } diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx index c5701d0cf8bb..8729cfd91160 100644 --- a/xmloff/source/meta/xmlversion.cxx +++ b/xmloff/source/meta/xmlversion.cxx @@ -33,13 +33,14 @@ #include #include +#include #include #include #include #include #include #include -#include +#include using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::uno; @@ -435,17 +436,11 @@ uno::Sequence< util::RevisionTag > SAL_CALL XMLVersionListPersistence::load( con if ( !aParserInput.aInputStream.is() ) throw uno::RuntimeException(); - // get parser - Reference< XInterface > xXMLParser = xServiceFactory->createInstance( - OUString("com.sun.star.xml.sax.Parser") ); - DBG_ASSERT( xXMLParser.is(), - "XMLReader::Read: com.sun.star.xml.sax.Parser service missing" ); - // get filter Reference< XDocumentHandler > xFilter = new XMLVersionListImport( xServiceFactory, aVersions ); // connect parser and filter - Reference< XParser > xParser( xXMLParser, UNO_QUERY ); + Reference< XParser > xParser = xml::sax::Parser::create(comphelper::getComponentContext(xServiceFactory)); xParser->setDocumentHandler( xFilter ); // parse diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx index b01b6dcf63b2..238c612f021d 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include @@ -105,14 +105,7 @@ void SAL_CALL importDialogModel( Reference< XInterface >() ); } - Reference< xml::sax::XParser > xParser( xSMgr->createInstanceWithContext( - "com.sun.star.xml.sax.Parser", xContext ), UNO_QUERY ); - OSL_ASSERT( xParser.is() ); - if (! xParser.is()) - { - throw RuntimeException("could not create sax-parser component!", - Reference< XInterface >() ); - } + Reference< xml::sax::XParser > xParser = xml::sax::Parser::create( xContext ); // error handler, entity resolver omitted for this helper function xParser->setDocumentHandler( importDialogModel( xDialogModel, xContext, xDocument ) ); diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx index 34dc04a97507..26318d80e0a1 100644 --- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx +++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx @@ -35,6 +35,7 @@ #include #include #include +#include #include #include @@ -253,13 +254,7 @@ bool XMLSignatureHelper::ReadAndVerifySignature( const com::sun::star::uno::Refe /* * get SAX parser component */ - uno::Reference< lang::XMultiComponentFactory > xMCF( mxCtx->getServiceManager() ); - uno::Reference< xml::sax::XParser > xParser( - xMCF->createInstanceWithContext( - rtl::OUString("com.sun.star.xml.sax.Parser" ), mxCtx ), - uno::UNO_QUERY ); - - DBG_ASSERT( xParser.is(), "Can't create parser" ); + uno::Reference< xml::sax::XParser > xParser = xml::sax::Parser::create(mxCtx); /* * create a signature reader From 0d5a0d42d9104ef6422ba7078f2449dee865e206 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Thu, 4 Oct 2012 16:20:22 +0200 Subject: [PATCH 302/863] add module targets to .PHONY Change-Id: Idb83964f4a772eee42f3f24e4b43cbd903b0ff82 --- Makefile.top | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.top b/Makefile.top index b3937aee1357..c1fc74429040 100644 --- a/Makefile.top +++ b/Makefile.top @@ -255,7 +255,7 @@ zlib\ export gb_TAILBUILDTARGET=all slowcheck define gbuild_module_rules -.PHONY: $(1) $(1).all $(1).clean $(1).deliver +.PHONY: $(1) $(1).all $(1).check $(1).clean $(1).subsequentcheck $(1).deliver $(1): bootstrap fetch cd $(1) && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) gb_PARTIALBUILD=T From da6c468f337ecafd69b5e0942000ed1bb7415e34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Thu, 4 Oct 2012 16:21:47 +0200 Subject: [PATCH 303/863] add also toplevel .build target, while I'm at it Change-Id: Idd61ec8539dbed81b4500f7c041f8a2b614a7233 --- Makefile.top | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile.top b/Makefile.top index c1fc74429040..bb632a241546 100644 --- a/Makefile.top +++ b/Makefile.top @@ -255,7 +255,7 @@ zlib\ export gb_TAILBUILDTARGET=all slowcheck define gbuild_module_rules -.PHONY: $(1) $(1).all $(1).check $(1).clean $(1).subsequentcheck $(1).deliver +.PHONY: $(1) $(1).all $(1).build $(1).check $(1).clean $(1).subsequentcheck $(1).deliver $(1): bootstrap fetch cd $(1) && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) gb_PARTIALBUILD=T @@ -269,6 +269,9 @@ $(1).all: bootstrap fetch ) \ $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) +$(1).build: + cd $(1) && $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) build gb_PARTIALBUILD=T + $(1).check: cd $(1) && $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) check gb_PARTIALBUILD=T From 4bcf34ae5a524d4c35407bd087aef52c4592011c Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 4 Oct 2012 17:08:17 +0200 Subject: [PATCH 304/863] Codify the fact that GCC < 4 is not supported any more Change-Id: I8d0eb681cdfefbf7524de4478e3296ca797b4c5e --- configure.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure.in b/configure.in index 25ab277e463a..8fb72878fb6a 100644 --- a/configure.in +++ b/configure.in @@ -2919,6 +2919,9 @@ if test "$GCC" = "yes"; then else AC_MSG_RESULT([gcc $_gcc_version]) fi + if test "$GCCVER" -lt 040000; then + AC_MSG_ERROR([GCC $_gcc_version is too old, must be at least GCC 4.0.0]) + fi fi dnl =================================================================== From 4a42f84a70f38ee848b01baeaa6da5219dfe9b53 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 4 Oct 2012 17:46:32 +0200 Subject: [PATCH 305/863] Clean up HAVE_THREADSAFE_STATICS Change-Id: I042269aabaa2e9952c5d2f41cf93e55d654f6313 --- configure.in | 79 ++++++++++++-------------- solenv/gbuild/platform/com_GCC_defs.mk | 4 ++ solenv/gbuild/platform/macosx.mk | 4 -- solenv/inc/unxgcc.mk | 3 + solenv/inc/unxiosr.mk | 3 + solenv/inc/unxsogs.mk | 4 ++ solenv/inc/wntgcci.mk | 3 + 7 files changed, 52 insertions(+), 48 deletions(-) diff --git a/configure.in b/configure.in index 8fb72878fb6a..4ea7155d2db5 100644 --- a/configure.in +++ b/configure.in @@ -5166,51 +5166,42 @@ dnl =================================================================== AC_MSG_CHECKING([whether $CXX supports thread safe statics]) unset HAVE_THREADSAFE_STATICS if test "$GCC" = "yes"; then - save_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$CXXFLAGS -fthreadsafe-statics" - AC_LANG_PUSH([C++]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,)],[HAVE_THREADSAFE_STATICS=TRUE],[]) - AC_LANG_POP([C++]) - CXXFLAGS=$save_CXXFLAGS - if test "$HAVE_THREADSAFE_STATICS" = "TRUE"; then - dnl Some C++ runtimes use a single lock for all static variables, which - dnl can cause deadlock in multi-threaded applications. This is not - dnl easily tested here; for POSIX-based systems, if executing the - dnl following C++ program does not terminate then the tool chain - dnl apparently has this problem: - dnl - dnl #include - dnl int h() { return 0; } - dnl void * g(void * unused) { - dnl static int n = h(); - dnl return &n; - dnl } - dnl int f() { - dnl pthread_t t; - dnl pthread_create(&t, 0, g, 0); - dnl pthread_join(t, 0); - dnl return 0; - dnl } - dnl int main() { - dnl static int n = f(); - dnl return n; - dnl } - dnl - dnl Mac OS X up to at least 10.7.1 is known to have this problem, as is - dnl at least one instance of GCC 4.2.4 (used on a "Linux - dnl ooobuild1.osuosl.org 2.6.9-101.plus.c4smp #1 SMP Thu Jul 21 19:08:15 - dnl EDT 2011 i686 i686 i386 GNU/Linux" machine); see the definition of - dnl __cxa_guard_acquire in GCC's libstdc++-v3/libsupc++/guard.cc for - dnl what #ifdefs actually make a difference there. Conservative advice - dnl from Jakub Jelinek is to assume it working in GCC >= 4.3: - if test "$_os" = "Darwin" -o "${GCCVER?}" -lt 040300; then - unset HAVE_THREADSAFE_STATICS - AC_MSG_RESULT([broken (i.e., no)]) - else - AC_MSG_RESULT([yes]) - fi + dnl -fthreadsafe-statics is available since GCC 4, so always available for + dnl us. However, some C++ runtimes use a single lock for all static + dnl variables, which can cause deadlock in multi-threaded applications. + dnl This is not easily tested here; for POSIX-based systems, if executing + dnl the following C++ program does not terminate then the tool chain + dnl apparently has this problem: + dnl + dnl #include + dnl int h() { return 0; } + dnl void * g(void * unused) { + dnl static int n = h(); + dnl return &n; + dnl } + dnl int f() { + dnl pthread_t t; + dnl pthread_create(&t, 0, g, 0); + dnl pthread_join(t, 0); + dnl return 0; + dnl } + dnl int main() { + dnl static int n = f(); + dnl return n; + dnl } + dnl + dnl Mac OS X up to at least 10.7.1 is known to have this problem, as is at + dnl least one instance of GCC 4.2.4 (used on a "Linux ooobuild1.osuosl.org + dnl 2.6.9-101.plus.c4smp #1 SMP Thu Jul 21 19:08:15 EDT 2011 i686 i686 i386 + dnl GNU/Linux" machine); see the definition of __cxa_guard_acquire in GCC's + dnl libstdc++-v3/libsupc++/guard.cc for what #ifdefs actually make a + dnl difference there. Conservative advice from Jakub Jelinek is to assume + dnl it working in GCC >= 4.3: + if test "$_os" = "Darwin" -o "${GCCVER?}" -lt 040300; then + AC_MSG_RESULT([broken (i.e., no)]) else - AC_MSG_RESULT([no]) + HAVE_THREADSAFE_STATICS=TRUE + AC_MSG_RESULT([yes]) fi else AC_MSG_RESULT([unknown (assuming no)]) diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 0cc86e3c73d2..1e349f0a8325 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -81,6 +81,10 @@ gb_CXXFLAGS_COMMON := \ -fno-common \ -pipe \ +ifneq ($(HAVE_THREADSAFE_STATICS),TRUE) +gb_CXXFLAGS_COMMON += -fno-threadsafe-statics +endif + ifeq ($(HAVE_GCC_VISIBILITY_FEATURE),TRUE) gb_VISIBILITY_FLAGS := -DHAVE_GCC_VISIBILITY_FEATURE -fvisibility=hidden ifneq ($(HAVE_GCC_VISIBILITY_BROKEN),TRUE) diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 2e2c20302132..ecb7d71076ff 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -87,10 +87,6 @@ ifeq ($(HAVE_GCC_NO_LONG_DOUBLE),TRUE) gb_CXXFLAGS += -Wno-long-double endif -ifneq ($(HAVE_THREADSAFE_STATICS),TRUE) -gb_CXXFLAGS += -fno-threadsafe-statics -endif - # these are to get g++ to switch to Objective-C++ mode # (see toolkit module for a case where it is necessary to do it this way) gb_OBJCXXFLAGS := -x objective-c++ -fobjc-exceptions diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk index 3ac4956ff216..04419863f32a 100644 --- a/solenv/inc/unxgcc.mk +++ b/solenv/inc/unxgcc.mk @@ -93,6 +93,9 @@ CFLAGS_NO_EXCEPTIONS=-fno-exceptions # -fpermissive should be removed as soon as possible CFLAGSCXX= -pipe $(ARCH_FLAGS) +.IF "$(HAVE_THREADSAFE_STATICS)" != "TRUE" +CFLAGSCXX += -fno-threadsafe-statics +.END .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" && "$(HAVE_GCC_VISIBILITY_BROKEN)" != "TRUE" CFLAGSCXX+=-fvisibility-inlines-hidden .ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" diff --git a/solenv/inc/unxiosr.mk b/solenv/inc/unxiosr.mk index 089dc3d588aa..f1a64929e20c 100644 --- a/solenv/inc/unxiosr.mk +++ b/solenv/inc/unxiosr.mk @@ -64,6 +64,9 @@ CFLAGS_NO_EXCEPTIONS=-fno-exceptions # Normal C++ compilation flags CFLAGSCXX=-pipe -fsigned-char $(ARCH_FLAGS) -Wno-ctor-dtor-privacy +.IF "$(HAVE_THREADSAFE_STATICS)" != "TRUE" +CFLAGSCXX += -fno-threadsafe-statics +.END # No PIC needed as we don't build dynamic objects PICSWITCH:= diff --git a/solenv/inc/unxsogs.mk b/solenv/inc/unxsogs.mk index a4151439beb8..f75c4aa0883e 100644 --- a/solenv/inc/unxsogs.mk +++ b/solenv/inc/unxsogs.mk @@ -58,6 +58,10 @@ CFLAGSEXCEPTIONS=-fexceptions CFLAGS_NO_EXCEPTIONS=-fno-exceptions CFLAGSCXX= -pipe $(ARCH_FLAGS) +.IF "$(HAVE_THREADSAFE_STATICS)" != "TRUE" +CFLAGSCXX += -fno-threadsafe-statics +.END + PICSWITCH:=-fPIC CFLAGSOBJGUIMT= CFLAGSOBJCUIMT= diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk index c8e39d1570bb..496e8c22c319 100644 --- a/solenv/inc/wntgcci.mk +++ b/solenv/inc/wntgcci.mk @@ -46,6 +46,9 @@ CFLAGS+=-fmessage-length=0 -c CFLAGSCC=-pipe $(ARCH_FLAGS) CFLAGSCXX=-pipe $(ARCH_FLAGS) +.IF "$(HAVE_THREADSAFE_STATICS)" != "TRUE" +CFLAGSCXX += -fno-threadsafe-statics +.END .IF "$(HAVE_CXX0X)" == "TRUE" # FIXME still does not compile fully CFLAGSCXX+=-std=gnu++0x From 8e753f8446554822d97969b0c18eba6cb9d79e26 Mon Sep 17 00:00:00 2001 From: Noel Power Date: Thu, 4 Oct 2012 15:45:36 +0100 Subject: [PATCH 306/863] xlsx fix import/export of column widths fdo#55623 column widths were never imported or exported correctly in xlsx. Change-Id: I92d469ce52495fe77281cb22341e9c5127e6b506 --- sc/source/filter/excel/xetable.cxx | 5 +++-- sc/source/filter/inc/xetable.hxx | 1 + sc/source/filter/oox/unitconverter.cxx | 5 ++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index 89d4e01e7276..d3f6028f8747 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -1484,6 +1484,7 @@ XclExpColinfo::XclExpColinfo( const XclExpRoot& rRoot, XclExpRecord( EXC_ID_COLINFO, 12 ), XclExpRoot( rRoot ), mnWidth( 0 ), + mnScWidth( 0 ), mnFlags( 0 ), mnFirstXclCol( static_cast< sal_uInt16 >( nScCol ) ), mnLastXclCol( static_cast< sal_uInt16 >( nScCol ) ) @@ -1498,7 +1499,7 @@ XclExpColinfo::XclExpColinfo( const XclExpRoot& rRoot, // column width sal_uInt16 nScWidth = rDoc.GetColWidth( nScCol, nScTab ); mnWidth = XclTools::GetXclColumnWidth( nScWidth, GetCharWidth() ); - + mnScWidth = sc::TwipsToHMM( nScWidth ); // column flags ::set_flag( mnFlags, EXC_COLINFO_HIDDEN, rDoc.ColHidden(nScCol, nScTab) ); @@ -1564,7 +1565,7 @@ void XclExpColinfo::SaveXml( XclExpXmlStream& rStrm ) // OOXTODO: XML_outlineLevel, // OOXTODO: XML_phonetic, XML_style, lcl_GetStyleId( rStrm, maXFId.mnXFIndex ).getStr(), - XML_width, OString::valueOf( (double) (mnWidth / 255.0) ).getStr(), + XML_width, OString::valueOf( (double) (mnScWidth / (double)sc::TwipsToHMM( GetCharWidth() )) ).getStr(), FSEND ); } diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx index 598dcde8fc2f..bbf04fd1d6e1 100644 --- a/sc/source/filter/inc/xetable.hxx +++ b/sc/source/filter/inc/xetable.hxx @@ -783,6 +783,7 @@ private: private: XclExpXFId maXFId; /// The XF identifier for column default format. sal_uInt16 mnWidth; /// Excel width of the column. + sal_uInt16 mnScWidth; /// Calc width of the column. sal_uInt16 mnFlags; /// Additional column flags. sal_uInt16 mnFirstXclCol; /// Index to first column. sal_uInt16 mnLastXclCol; /// Index to last column. diff --git a/sc/source/filter/oox/unitconverter.cxx b/sc/source/filter/oox/unitconverter.cxx index e2feb875882e..2d0431b21be1 100644 --- a/sc/source/filter/oox/unitconverter.cxx +++ b/sc/source/filter/oox/unitconverter.cxx @@ -149,18 +149,17 @@ void UnitConverter::finalizeImport() { // XDevice expects pixels in font descriptor, but font contains twips FontDescriptor aDesc = pDefFont->getFontDescriptor(); - aDesc.Height = static_cast< sal_Int16 >( scaleValue( aDesc.Height, UNIT_TWIP, UNIT_REFDEVX ) + 0.5 ); Reference< XFont > xFont = xDevice->getFont( aDesc ); if( xFont.is() ) { // get maximum width of all digits sal_Int32 nDigitWidth = 0; for( sal_Unicode cChar = '0'; cChar <= '9'; ++cChar ) - nDigitWidth = ::std::max( nDigitWidth, scaleToMm100( xFont->getCharWidth( cChar ), UNIT_REFDEVX ) ); + nDigitWidth = ::std::max( nDigitWidth, scaleToMm100( xFont->getCharWidth( cChar ), UNIT_TWIP ) ); if( nDigitWidth > 0 ) maCoeffs[ UNIT_DIGIT ] = nDigitWidth; // get width of space character - sal_Int32 nSpaceWidth = scaleToMm100( xFont->getCharWidth( ' ' ), UNIT_REFDEVX ); + sal_Int32 nSpaceWidth = scaleToMm100( xFont->getCharWidth( ' ' ), UNIT_TWIP ); if( nSpaceWidth > 0 ) maCoeffs[ UNIT_SPACE ] = nSpaceWidth; } From 31713fee3c117007dbd322cbfc2971e52899d04c Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 4 Oct 2012 18:05:46 +0200 Subject: [PATCH 307/863] Fix an InteractionHandler new-style service use Change-Id: I593467dce8f1e70e1f5068d722dfa0654d3346b7 --- embedserv/source/embed/docholder.cxx | 39 +++++++++++++--------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx index 1a8f290d0f59..a2a91a524202 100644 --- a/embedserv/source/embed/docholder.cxx +++ b/embedserv/source/embed/docholder.cxx @@ -59,6 +59,7 @@ #include #include #include +#include #include #include @@ -113,9 +114,8 @@ void DocumentHolder::LoadDocInFrame( sal_Bool bPluginMode ) m_xFrame,uno::UNO_QUERY); if( xComponentLoader.is() && m_xDocument.is() ) { - uno::Reference< task::XInteractionHandler > xHandler( - task::InteractionHandler::create(comphelper::getComponentContext(m_xFactory)), - uno::UNO_QUERY_THROW ); + uno::Reference< task::XInteractionHandler2 > xHandler( + task::InteractionHandler::createWithParent(comphelper::getComponentContext(m_xFactory), 0) ); uno::Any aAny; sal_Int32 nLen = 3; @@ -158,25 +158,22 @@ void DocumentHolder::LoadDocInFrame( sal_Bool bPluginMode ) beans::PropertyState_DIRECT_VALUE); } - if ( xHandler.is() ) - { - aSeq.realloc( nLen+=2 ); - aAny <<= xHandler; - aSeq[nLen-2] = beans::PropertyValue( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("InteractionHandler")), - -1, - aAny, - beans::PropertyState_DIRECT_VALUE); + aSeq.realloc( nLen+=2 ); + aAny <<= xHandler; + aSeq[nLen-2] = beans::PropertyValue( + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM("InteractionHandler")), + -1, + aAny, + beans::PropertyState_DIRECT_VALUE); - aAny <<= m_nMacroExecMode; - aSeq[nLen-1] = beans::PropertyValue( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("MacroExecutionMode")), - -1, - aAny, - beans::PropertyState_DIRECT_VALUE); - } + aAny <<= m_nMacroExecMode; + aSeq[nLen-1] = beans::PropertyValue( + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM("MacroExecutionMode")), + -1, + aAny, + beans::PropertyState_DIRECT_VALUE); xComponentLoader->loadComponentFromURL( rtl::OUString( From e1dee0aaacd8e30e2949053ebf351d76bad14ac3 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Thu, 4 Oct 2012 19:55:04 +0200 Subject: [PATCH 308/863] limit degree for b-spline to 15 to prevent std::bad_alloc, fdo#46100 Change-Id: Ib801c6af84b52ed093be2ba5eba902513bfa4070 --- chart2/source/view/charttypes/Splines.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/chart2/source/view/charttypes/Splines.cxx b/chart2/source/view/charttypes/Splines.cxx index 7129d4450837..8cb7fcb2d7aa 100644 --- a/chart2/source/view/charttypes/Splines.cxx +++ b/chart2/source/view/charttypes/Splines.cxx @@ -24,6 +24,8 @@ #include #include +#define MAX_BSPLINE_DEGREE 15 + //............................................................................. namespace chart { @@ -691,7 +693,9 @@ void SplineCalculater::CalculateBSplines( // ODF1.2 spec variable p OSL_ASSERT( nResolution > 1 ); OSL_ASSERT( nDegree >= 1 ); - sal_uInt32 p = nDegree; + + // limit the b-spline degree to prevent insanely large sets of points + sal_uInt32 p = std::min(nDegree, MAX_BSPLINE_DEGREE); rResult.SequenceX.realloc(0); rResult.SequenceY.realloc(0); From 4113d9664c60d004474dfc1cffbcd7dc50fa6dc4 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 4 Oct 2012 19:17:56 +0200 Subject: [PATCH 309/863] rhbz#820283, fdo#55462: sw: better fix for DOCX table import crash: The fix in 6d2e09db4a677068095b0bebd08fbbb96620d60c is completely bogus. Only vertically merged boxes result in dummy boxes with negative span, while horizontally merged boxes result in different numbers of boxes per line. So instead of inserting boxes, adjust the width of the last box in rows that are missing boxes, such that all lines have the same width. Change-Id: I4e90e852b314bf6f7885bde7b450dab7c668469e --- sw/source/core/docnode/ndtbl.cxx | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index cc7e88fb5bb9..e979768de6b6 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -1305,6 +1305,29 @@ SwNodeRange * SwNodes::ExpandRangeForTableBox(const SwNodeRange & rRange) return pResult; } +static void +lcl_SetTableBoxWidths2(SwTable & rTable, size_t const nMaxBoxes, + SwTableBoxFmt & rBoxFmt, SwDoc & rDoc) +{ + // rhbz#820283, fdo#55462: set default box widths so table width is covered + SwTableLines & rLines = rTable.GetTabLines(); + for (size_t nTmpLine = 0; nTmpLine < rLines.size(); ++nTmpLine) + { + SwTableBoxes & rBoxes = rLines[nTmpLine]->GetTabBoxes(); + size_t const nMissing = nMaxBoxes - rBoxes.size(); + if (nMissing) + { + // default width for box at the end of an incomplete line + SwTableBoxFmt *const pNewFmt = rDoc.MakeTableBoxFmt(); + pNewFmt->SetFmtAttr( SwFmtFrmSize(ATT_VAR_SIZE, + (USHRT_MAX / nMaxBoxes) * (nMissing + 1)) ); + pNewFmt->Add(rBoxes.back()); + } + } + // default width for all boxes not at the end of an incomplete line + rBoxFmt.SetFmtAttr(SwFmtFrmSize(ATT_VAR_SIZE, USHRT_MAX / nMaxBoxes)); +} + SwTableNode* SwNodes::TextToTable( const SwNodes::TableRanges_t & rTableNodes, SwTableFmt* pTblFmt, SwTableLineFmt* pLineFmt, @@ -1392,10 +1415,7 @@ SwTableNode* SwNodes::TextToTable( const SwNodes::TableRanges_t & rTableNodes, nMaxBoxes = nBoxes; } - SwTxtFmtColl *const pTxtColl(const_cast( - GetDoc()->GetDfltTxtFmtColl())); - lcl_BalanceTable(*pTable, nMaxBoxes, *pTblNd, *pBoxFmt, *pTxtColl, 0, 0); - lcl_SetTableBoxWidths(*pTable, nMaxBoxes, *pBoxFmt, *pDoc, 0); + lcl_SetTableBoxWidths2(*pTable, nMaxBoxes, *pBoxFmt, *pDoc); return pTblNd; } From 1ca1a7aa9935ad33325ac7aebbbb127995337988 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Thu, 4 Oct 2012 20:16:56 +0200 Subject: [PATCH 310/863] limit polynomial degree in the dialog, related fdo#46100 Change-Id: If49db1a503548103dcf605cc1c2d8064cdd2d5b2 --- chart2/source/controller/dialogs/tp_ChartType.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chart2/source/controller/dialogs/tp_ChartType.src b/chart2/source/controller/dialogs/tp_ChartType.src index 73438f8317fc..2e5e51e61f8c 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.src +++ b/chart2/source/controller/dialogs/tp_ChartType.src @@ -244,11 +244,11 @@ ModalDialog DLG_SPLINE_PROPERTIES Repeat = TRUE ; Spin = TRUE ; Minimum = 1 ; - Maximum = 100 ; + Maximum = 15 ; StrictFormat = TRUE ; Unit = FUNIT_CUSTOM ; First = 1 ; - Last = 100 ; + Last = 15 ; SpinSize = 1 ; }; FixedLine FL_SPLINE_DIALOGBUTTONS From 5d0c1f0ac8875292c49989e4f77fafc52a7e84a6 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 4 Oct 2012 22:10:47 +0300 Subject: [PATCH 311/863] Add some notes about graphicfilters Change-Id: I1d2a51865b0e564821db7fb45b9e557e4594d4a1 --- filter/README | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/filter/README b/filter/README index dc98371e07ea..9ebd0fba2a95 100644 --- a/filter/README +++ b/filter/README @@ -1 +1,11 @@ Filter registration and some simple filters (also descriptions). + +Desperate splitting of code into small shared libraries for historical +reasons presumably (OS/2 and Windows 3.x). The libraries produced from +the code in each subdirectory of filter/source/graphicfilter are +graphic format import or export filters. But they don't have uniform +API. Some have either an GraphicImport or GraphicExport entry point, +and are loaded and used in a uniform fashion from code in +svtools/source/filter/filter.cxx. Others have different API and are +loaded from other places. For instance "icgm" has ImportCGM, and is +loaded and used by sd/source/filter/cgm/sdcgmfilter.cxx (!). From 03ded70913f957460f90608465e4d0a182879074 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Thu, 4 Oct 2012 17:17:53 +0100 Subject: [PATCH 312/863] rename ucb/source/ucp/webdav to webdav-neon --- ucb/Library_ucpdav1.mk | 44 +++++++++---------- .../ContentProperties.cxx | 0 .../ContentProperties.hxx | 0 .../DAVAuthListener.hxx | 0 .../DAVAuthListenerImpl.hxx | 0 .../{webdav => webdav-neon}/DAVException.hxx | 0 .../{webdav => webdav-neon}/DAVProperties.cxx | 0 .../{webdav => webdav-neon}/DAVProperties.hxx | 0 .../DAVRequestEnvironment.hxx | 0 .../{webdav => webdav-neon}/DAVResource.hxx | 0 .../DAVResourceAccess.cxx | 0 .../DAVResourceAccess.hxx | 0 .../{webdav => webdav-neon}/DAVSession.hxx | 0 .../DAVSessionFactory.cxx | 0 .../DAVSessionFactory.hxx | 0 .../ucp/{webdav => webdav-neon}/DAVTypes.hxx | 0 .../DateTimeHelper.cxx | 0 .../DateTimeHelper.hxx | 0 .../{webdav => webdav-neon}/LinkSequence.cxx | 0 .../{webdav => webdav-neon}/LinkSequence.hxx | 0 .../LockEntrySequence.cxx | 0 .../LockEntrySequence.hxx | 0 .../{webdav => webdav-neon}/LockSequence.cxx | 0 .../{webdav => webdav-neon}/LockSequence.hxx | 0 .../NeonHeadRequest.cxx | 0 .../NeonHeadRequest.hxx | 0 .../NeonInputStream.cxx | 0 .../NeonInputStream.hxx | 0 .../{webdav => webdav-neon}/NeonLockStore.cxx | 0 .../{webdav => webdav-neon}/NeonLockStore.hxx | 0 .../NeonPropFindRequest.cxx | 0 .../NeonPropFindRequest.hxx | 0 .../{webdav => webdav-neon}/NeonSession.cxx | 0 .../{webdav => webdav-neon}/NeonSession.hxx | 0 .../ucp/{webdav => webdav-neon}/NeonTypes.hxx | 0 .../ucp/{webdav => webdav-neon}/NeonUri.cxx | 0 .../ucp/{webdav => webdav-neon}/NeonUri.hxx | 0 .../{webdav => webdav-neon}/PropertyMap.hxx | 0 .../UCBDeadPropertyValue.cxx | 0 .../UCBDeadPropertyValue.hxx | 0 .../{webdav => webdav-neon}/ucpdav1.component | 0 .../warnings_guard_ne_locks.h | 0 .../{webdav => webdav-neon}/webdavcontent.cxx | 0 .../{webdav => webdav-neon}/webdavcontent.hxx | 0 .../webdavcontentcaps.cxx | 0 .../webdavdatasupplier.cxx | 0 .../webdavdatasupplier.hxx | 0 .../webdavprovider.cxx | 0 .../webdavprovider.hxx | 0 .../webdavresultset.cxx | 0 .../webdavresultset.hxx | 0 .../webdavservices.cxx | 0 52 files changed, 22 insertions(+), 22 deletions(-) rename ucb/source/ucp/{webdav => webdav-neon}/ContentProperties.cxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/ContentProperties.hxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/DAVAuthListener.hxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/DAVAuthListenerImpl.hxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/DAVException.hxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/DAVProperties.cxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/DAVProperties.hxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/DAVRequestEnvironment.hxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/DAVResource.hxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/DAVResourceAccess.cxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/DAVResourceAccess.hxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/DAVSession.hxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/DAVSessionFactory.cxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/DAVSessionFactory.hxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/DAVTypes.hxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/DateTimeHelper.cxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/DateTimeHelper.hxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/LinkSequence.cxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/LinkSequence.hxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/LockEntrySequence.cxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/LockEntrySequence.hxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/LockSequence.cxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/LockSequence.hxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/NeonHeadRequest.cxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/NeonHeadRequest.hxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/NeonInputStream.cxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/NeonInputStream.hxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/NeonLockStore.cxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/NeonLockStore.hxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/NeonPropFindRequest.cxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/NeonPropFindRequest.hxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/NeonSession.cxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/NeonSession.hxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/NeonTypes.hxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/NeonUri.cxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/NeonUri.hxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/PropertyMap.hxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/UCBDeadPropertyValue.cxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/UCBDeadPropertyValue.hxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/ucpdav1.component (100%) rename ucb/source/ucp/{webdav => webdav-neon}/warnings_guard_ne_locks.h (100%) rename ucb/source/ucp/{webdav => webdav-neon}/webdavcontent.cxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/webdavcontent.hxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/webdavcontentcaps.cxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/webdavdatasupplier.cxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/webdavdatasupplier.hxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/webdavprovider.cxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/webdavprovider.hxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/webdavresultset.cxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/webdavresultset.hxx (100%) rename ucb/source/ucp/{webdav => webdav-neon}/webdavservices.cxx (100%) diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk index a38a8f103146..2bdb4a66b910 100644 --- a/ucb/Library_ucpdav1.mk +++ b/ucb/Library_ucpdav1.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_Library,ucpdav1)) -$(eval $(call gb_Library_set_componentfile,ucpdav1,ucb/source/ucp/webdav/ucpdav1)) +$(eval $(call gb_Library_set_componentfile,ucpdav1,ucb/source/ucp/webdav-neon/ucpdav1)) $(eval $(call gb_Library_use_sdk_api,ucpdav1)) @@ -48,27 +48,27 @@ $(eval $(call gb_Library_use_externals,ucpdav1,\ )) $(eval $(call gb_Library_add_exception_objects,ucpdav1,\ - ucb/source/ucp/webdav/ContentProperties \ - ucb/source/ucp/webdav/DateTimeHelper \ - ucb/source/ucp/webdav/DAVProperties \ - ucb/source/ucp/webdav/DAVResourceAccess \ - ucb/source/ucp/webdav/DAVSessionFactory \ - ucb/source/ucp/webdav/LinkSequence \ - ucb/source/ucp/webdav/LockEntrySequence \ - ucb/source/ucp/webdav/LockSequence \ - ucb/source/ucp/webdav/NeonHeadRequest \ - ucb/source/ucp/webdav/NeonInputStream \ - ucb/source/ucp/webdav/NeonLockStore \ - ucb/source/ucp/webdav/NeonPropFindRequest \ - ucb/source/ucp/webdav/NeonSession \ - ucb/source/ucp/webdav/NeonUri \ - ucb/source/ucp/webdav/UCBDeadPropertyValue \ - ucb/source/ucp/webdav/webdavcontentcaps \ - ucb/source/ucp/webdav/webdavcontent \ - ucb/source/ucp/webdav/webdavdatasupplier \ - ucb/source/ucp/webdav/webdavprovider \ - ucb/source/ucp/webdav/webdavresultset \ - ucb/source/ucp/webdav/webdavservices \ + ucb/source/ucp/webdav-neon/ContentProperties \ + ucb/source/ucp/webdav-neon/DateTimeHelper \ + ucb/source/ucp/webdav-neon/DAVProperties \ + ucb/source/ucp/webdav-neon/DAVResourceAccess \ + ucb/source/ucp/webdav-neon/DAVSessionFactory \ + ucb/source/ucp/webdav-neon/LinkSequence \ + ucb/source/ucp/webdav-neon/LockEntrySequence \ + ucb/source/ucp/webdav-neon/LockSequence \ + ucb/source/ucp/webdav-neon/NeonHeadRequest \ + ucb/source/ucp/webdav-neon/NeonInputStream \ + ucb/source/ucp/webdav-neon/NeonLockStore \ + ucb/source/ucp/webdav-neon/NeonPropFindRequest \ + ucb/source/ucp/webdav-neon/NeonSession \ + ucb/source/ucp/webdav-neon/NeonUri \ + ucb/source/ucp/webdav-neon/UCBDeadPropertyValue \ + ucb/source/ucp/webdav-neon/webdavcontentcaps \ + ucb/source/ucp/webdav-neon/webdavcontent \ + ucb/source/ucp/webdav-neon/webdavdatasupplier \ + ucb/source/ucp/webdav-neon/webdavprovider \ + ucb/source/ucp/webdav-neon/webdavresultset \ + ucb/source/ucp/webdav-neon/webdavservices \ )) ifeq ($(OS),WNT) diff --git a/ucb/source/ucp/webdav/ContentProperties.cxx b/ucb/source/ucp/webdav-neon/ContentProperties.cxx similarity index 100% rename from ucb/source/ucp/webdav/ContentProperties.cxx rename to ucb/source/ucp/webdav-neon/ContentProperties.cxx diff --git a/ucb/source/ucp/webdav/ContentProperties.hxx b/ucb/source/ucp/webdav-neon/ContentProperties.hxx similarity index 100% rename from ucb/source/ucp/webdav/ContentProperties.hxx rename to ucb/source/ucp/webdav-neon/ContentProperties.hxx diff --git a/ucb/source/ucp/webdav/DAVAuthListener.hxx b/ucb/source/ucp/webdav-neon/DAVAuthListener.hxx similarity index 100% rename from ucb/source/ucp/webdav/DAVAuthListener.hxx rename to ucb/source/ucp/webdav-neon/DAVAuthListener.hxx diff --git a/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx b/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx similarity index 100% rename from ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx rename to ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx diff --git a/ucb/source/ucp/webdav/DAVException.hxx b/ucb/source/ucp/webdav-neon/DAVException.hxx similarity index 100% rename from ucb/source/ucp/webdav/DAVException.hxx rename to ucb/source/ucp/webdav-neon/DAVException.hxx diff --git a/ucb/source/ucp/webdav/DAVProperties.cxx b/ucb/source/ucp/webdav-neon/DAVProperties.cxx similarity index 100% rename from ucb/source/ucp/webdav/DAVProperties.cxx rename to ucb/source/ucp/webdav-neon/DAVProperties.cxx diff --git a/ucb/source/ucp/webdav/DAVProperties.hxx b/ucb/source/ucp/webdav-neon/DAVProperties.hxx similarity index 100% rename from ucb/source/ucp/webdav/DAVProperties.hxx rename to ucb/source/ucp/webdav-neon/DAVProperties.hxx diff --git a/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx b/ucb/source/ucp/webdav-neon/DAVRequestEnvironment.hxx similarity index 100% rename from ucb/source/ucp/webdav/DAVRequestEnvironment.hxx rename to ucb/source/ucp/webdav-neon/DAVRequestEnvironment.hxx diff --git a/ucb/source/ucp/webdav/DAVResource.hxx b/ucb/source/ucp/webdav-neon/DAVResource.hxx similarity index 100% rename from ucb/source/ucp/webdav/DAVResource.hxx rename to ucb/source/ucp/webdav-neon/DAVResource.hxx diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx similarity index 100% rename from ucb/source/ucp/webdav/DAVResourceAccess.cxx rename to ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.hxx b/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx similarity index 100% rename from ucb/source/ucp/webdav/DAVResourceAccess.hxx rename to ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx diff --git a/ucb/source/ucp/webdav/DAVSession.hxx b/ucb/source/ucp/webdav-neon/DAVSession.hxx similarity index 100% rename from ucb/source/ucp/webdav/DAVSession.hxx rename to ucb/source/ucp/webdav-neon/DAVSession.hxx diff --git a/ucb/source/ucp/webdav/DAVSessionFactory.cxx b/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx similarity index 100% rename from ucb/source/ucp/webdav/DAVSessionFactory.cxx rename to ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx diff --git a/ucb/source/ucp/webdav/DAVSessionFactory.hxx b/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx similarity index 100% rename from ucb/source/ucp/webdav/DAVSessionFactory.hxx rename to ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx diff --git a/ucb/source/ucp/webdav/DAVTypes.hxx b/ucb/source/ucp/webdav-neon/DAVTypes.hxx similarity index 100% rename from ucb/source/ucp/webdav/DAVTypes.hxx rename to ucb/source/ucp/webdav-neon/DAVTypes.hxx diff --git a/ucb/source/ucp/webdav/DateTimeHelper.cxx b/ucb/source/ucp/webdav-neon/DateTimeHelper.cxx similarity index 100% rename from ucb/source/ucp/webdav/DateTimeHelper.cxx rename to ucb/source/ucp/webdav-neon/DateTimeHelper.cxx diff --git a/ucb/source/ucp/webdav/DateTimeHelper.hxx b/ucb/source/ucp/webdav-neon/DateTimeHelper.hxx similarity index 100% rename from ucb/source/ucp/webdav/DateTimeHelper.hxx rename to ucb/source/ucp/webdav-neon/DateTimeHelper.hxx diff --git a/ucb/source/ucp/webdav/LinkSequence.cxx b/ucb/source/ucp/webdav-neon/LinkSequence.cxx similarity index 100% rename from ucb/source/ucp/webdav/LinkSequence.cxx rename to ucb/source/ucp/webdav-neon/LinkSequence.cxx diff --git a/ucb/source/ucp/webdav/LinkSequence.hxx b/ucb/source/ucp/webdav-neon/LinkSequence.hxx similarity index 100% rename from ucb/source/ucp/webdav/LinkSequence.hxx rename to ucb/source/ucp/webdav-neon/LinkSequence.hxx diff --git a/ucb/source/ucp/webdav/LockEntrySequence.cxx b/ucb/source/ucp/webdav-neon/LockEntrySequence.cxx similarity index 100% rename from ucb/source/ucp/webdav/LockEntrySequence.cxx rename to ucb/source/ucp/webdav-neon/LockEntrySequence.cxx diff --git a/ucb/source/ucp/webdav/LockEntrySequence.hxx b/ucb/source/ucp/webdav-neon/LockEntrySequence.hxx similarity index 100% rename from ucb/source/ucp/webdav/LockEntrySequence.hxx rename to ucb/source/ucp/webdav-neon/LockEntrySequence.hxx diff --git a/ucb/source/ucp/webdav/LockSequence.cxx b/ucb/source/ucp/webdav-neon/LockSequence.cxx similarity index 100% rename from ucb/source/ucp/webdav/LockSequence.cxx rename to ucb/source/ucp/webdav-neon/LockSequence.cxx diff --git a/ucb/source/ucp/webdav/LockSequence.hxx b/ucb/source/ucp/webdav-neon/LockSequence.hxx similarity index 100% rename from ucb/source/ucp/webdav/LockSequence.hxx rename to ucb/source/ucp/webdav-neon/LockSequence.hxx diff --git a/ucb/source/ucp/webdav/NeonHeadRequest.cxx b/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx similarity index 100% rename from ucb/source/ucp/webdav/NeonHeadRequest.cxx rename to ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx diff --git a/ucb/source/ucp/webdav/NeonHeadRequest.hxx b/ucb/source/ucp/webdav-neon/NeonHeadRequest.hxx similarity index 100% rename from ucb/source/ucp/webdav/NeonHeadRequest.hxx rename to ucb/source/ucp/webdav-neon/NeonHeadRequest.hxx diff --git a/ucb/source/ucp/webdav/NeonInputStream.cxx b/ucb/source/ucp/webdav-neon/NeonInputStream.cxx similarity index 100% rename from ucb/source/ucp/webdav/NeonInputStream.cxx rename to ucb/source/ucp/webdav-neon/NeonInputStream.cxx diff --git a/ucb/source/ucp/webdav/NeonInputStream.hxx b/ucb/source/ucp/webdav-neon/NeonInputStream.hxx similarity index 100% rename from ucb/source/ucp/webdav/NeonInputStream.hxx rename to ucb/source/ucp/webdav-neon/NeonInputStream.hxx diff --git a/ucb/source/ucp/webdav/NeonLockStore.cxx b/ucb/source/ucp/webdav-neon/NeonLockStore.cxx similarity index 100% rename from ucb/source/ucp/webdav/NeonLockStore.cxx rename to ucb/source/ucp/webdav-neon/NeonLockStore.cxx diff --git a/ucb/source/ucp/webdav/NeonLockStore.hxx b/ucb/source/ucp/webdav-neon/NeonLockStore.hxx similarity index 100% rename from ucb/source/ucp/webdav/NeonLockStore.hxx rename to ucb/source/ucp/webdav-neon/NeonLockStore.hxx diff --git a/ucb/source/ucp/webdav/NeonPropFindRequest.cxx b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx similarity index 100% rename from ucb/source/ucp/webdav/NeonPropFindRequest.cxx rename to ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx diff --git a/ucb/source/ucp/webdav/NeonPropFindRequest.hxx b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.hxx similarity index 100% rename from ucb/source/ucp/webdav/NeonPropFindRequest.hxx rename to ucb/source/ucp/webdav-neon/NeonPropFindRequest.hxx diff --git a/ucb/source/ucp/webdav/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx similarity index 100% rename from ucb/source/ucp/webdav/NeonSession.cxx rename to ucb/source/ucp/webdav-neon/NeonSession.cxx diff --git a/ucb/source/ucp/webdav/NeonSession.hxx b/ucb/source/ucp/webdav-neon/NeonSession.hxx similarity index 100% rename from ucb/source/ucp/webdav/NeonSession.hxx rename to ucb/source/ucp/webdav-neon/NeonSession.hxx diff --git a/ucb/source/ucp/webdav/NeonTypes.hxx b/ucb/source/ucp/webdav-neon/NeonTypes.hxx similarity index 100% rename from ucb/source/ucp/webdav/NeonTypes.hxx rename to ucb/source/ucp/webdav-neon/NeonTypes.hxx diff --git a/ucb/source/ucp/webdav/NeonUri.cxx b/ucb/source/ucp/webdav-neon/NeonUri.cxx similarity index 100% rename from ucb/source/ucp/webdav/NeonUri.cxx rename to ucb/source/ucp/webdav-neon/NeonUri.cxx diff --git a/ucb/source/ucp/webdav/NeonUri.hxx b/ucb/source/ucp/webdav-neon/NeonUri.hxx similarity index 100% rename from ucb/source/ucp/webdav/NeonUri.hxx rename to ucb/source/ucp/webdav-neon/NeonUri.hxx diff --git a/ucb/source/ucp/webdav/PropertyMap.hxx b/ucb/source/ucp/webdav-neon/PropertyMap.hxx similarity index 100% rename from ucb/source/ucp/webdav/PropertyMap.hxx rename to ucb/source/ucp/webdav-neon/PropertyMap.hxx diff --git a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx similarity index 100% rename from ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx rename to ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx diff --git a/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.hxx similarity index 100% rename from ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx rename to ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.hxx diff --git a/ucb/source/ucp/webdav/ucpdav1.component b/ucb/source/ucp/webdav-neon/ucpdav1.component similarity index 100% rename from ucb/source/ucp/webdav/ucpdav1.component rename to ucb/source/ucp/webdav-neon/ucpdav1.component diff --git a/ucb/source/ucp/webdav/warnings_guard_ne_locks.h b/ucb/source/ucp/webdav-neon/warnings_guard_ne_locks.h similarity index 100% rename from ucb/source/ucp/webdav/warnings_guard_ne_locks.h rename to ucb/source/ucp/webdav-neon/warnings_guard_ne_locks.h diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx similarity index 100% rename from ucb/source/ucp/webdav/webdavcontent.cxx rename to ucb/source/ucp/webdav-neon/webdavcontent.cxx diff --git a/ucb/source/ucp/webdav/webdavcontent.hxx b/ucb/source/ucp/webdav-neon/webdavcontent.hxx similarity index 100% rename from ucb/source/ucp/webdav/webdavcontent.hxx rename to ucb/source/ucp/webdav-neon/webdavcontent.hxx diff --git a/ucb/source/ucp/webdav/webdavcontentcaps.cxx b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx similarity index 100% rename from ucb/source/ucp/webdav/webdavcontentcaps.cxx rename to ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.cxx b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx similarity index 100% rename from ucb/source/ucp/webdav/webdavdatasupplier.cxx rename to ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.hxx b/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx similarity index 100% rename from ucb/source/ucp/webdav/webdavdatasupplier.hxx rename to ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav-neon/webdavprovider.cxx similarity index 100% rename from ucb/source/ucp/webdav/webdavprovider.cxx rename to ucb/source/ucp/webdav-neon/webdavprovider.cxx diff --git a/ucb/source/ucp/webdav/webdavprovider.hxx b/ucb/source/ucp/webdav-neon/webdavprovider.hxx similarity index 100% rename from ucb/source/ucp/webdav/webdavprovider.hxx rename to ucb/source/ucp/webdav-neon/webdavprovider.hxx diff --git a/ucb/source/ucp/webdav/webdavresultset.cxx b/ucb/source/ucp/webdav-neon/webdavresultset.cxx similarity index 100% rename from ucb/source/ucp/webdav/webdavresultset.cxx rename to ucb/source/ucp/webdav-neon/webdavresultset.cxx diff --git a/ucb/source/ucp/webdav/webdavresultset.hxx b/ucb/source/ucp/webdav-neon/webdavresultset.hxx similarity index 100% rename from ucb/source/ucp/webdav/webdavresultset.hxx rename to ucb/source/ucp/webdav-neon/webdavresultset.hxx diff --git a/ucb/source/ucp/webdav/webdavservices.cxx b/ucb/source/ucp/webdav-neon/webdavservices.cxx similarity index 100% rename from ucb/source/ucp/webdav/webdavservices.cxx rename to ucb/source/ucp/webdav-neon/webdavservices.cxx From 015b29b74aaf16f5bdf6a90f6e7d5c1d210fe281 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Thu, 4 Oct 2012 11:25:41 +0100 Subject: [PATCH 313/863] re-base on ALv2 code. Includes: clarify Option->Language UI option Patch contributed by Herbert Duerr http://svn.apache.org/viewvc?view=revision&revision=1173991 cws mba34issues01: #i117712#: fix several resource errors introduced by IAccessible2 implementation Patch contributed by Mathias Bauer http://svn.apache.org/viewvc?view=revision&revision=1173991 cws mba34issues01: #i117709#: add missing string resource Patch contributed by Mathias Bauer http://svn.apache.org/viewvc?view=revision&revision=1172348 cws mba34issues01: #i117716#: fix missing resources my removing unused code Patch contributed by Mathias Bauer http://svn.apache.org/viewvc?view=revision&revision=1172345 re-add Crystal, Tango, Oxygen icon theme listings. correct method signature Patch contributed by Jean-Louis 'Hans' Fuchs http://svn.apache.org/viewvc?view=revision&revision=1306725 i#119063 - correct serf integration Patch contributed by Oliver-Rainer Wittmann http://svn.apache.org/viewvc?view=revision&revision=1300521 i#119036 - adapt serf integration -- use transfer-encoding 'chunked' on HTTPS -- switch transfer-encoding between 'chunked' and none on 413 HTTP status code -- refactoring -- improve user experience of certification dialog - only shown once Patch contributed by Oliver-Rainer Wittmann http://svn.apache.org/viewvc?view=revision&revision=1299727 118569: Use whole certification chain for verification. Patch contributed by Andre Fischer http://svn.apache.org/viewvc?view=revision&revision=1295493 serf integration: improve credential input handling Patch contributed by Oliver-Rainer Wittmann http://svn.apache.org/viewvc?view=revision&revision=1294557 warning-free ucb/source/ucp/webdav Patch contributed by Pavel Janik http://svn.apache.org/viewvc?view=revision&revision=1294086 some refactoring to PROPPATCH and PROPFIND requests Patch contributed by Oliver-Rainer Wittmann http://svn.apache.org/viewvc?view=revision&revision=1293281 i#118569: Replace neon with serf Patch contributed by Oliver-Rainer Wittmann http://svn.apache.org/viewvc?view=revision&revision=1292832 http://svn.apache.org/viewvc?view=revision&revision=1292794 remove OS/2 conditionals for now. re-enable webdav unit tests. --- cui/Makefile | 7 + cui/source/customize/acccfg.cxx | 37 +- cui/source/customize/acccfg.src | 37 +- cui/source/customize/cfg.cxx | 37 +- cui/source/customize/cfg.src | 37 +- cui/source/customize/cfgutil.cxx | 37 +- cui/source/customize/eventdlg.cxx | 37 +- cui/source/customize/eventdlg.src | 37 +- cui/source/customize/macropg.cxx | 37 +- cui/source/customize/macropg.src | 37 +- cui/source/customize/macropg_impl.hxx | 37 +- cui/source/customize/selector.cxx | 37 +- cui/source/customize/selector.src | 37 +- cui/source/dialogs/SpellAttrib.cxx | 37 +- cui/source/dialogs/SpellAttrib.hxx | 37 +- cui/source/dialogs/SpellDialog.cxx | 37 +- cui/source/dialogs/SpellDialog.src | 37 +- cui/source/dialogs/about.cxx | 37 +- cui/source/dialogs/about.src | 37 +- cui/source/dialogs/colorpicker.cxx | 47 +- cui/source/dialogs/colorpicker.hrc | 37 +- cui/source/dialogs/colorpicker.src | 36 +- cui/source/dialogs/commonlingui.cxx | 37 +- cui/source/dialogs/cuicharmap.cxx | 37 +- cui/source/dialogs/cuifmsearch.cxx | 37 +- cui/source/dialogs/cuigaldlg.cxx | 37 +- cui/source/dialogs/cuigrfflt.cxx | 37 +- cui/source/dialogs/cuihyperdlg.cxx | 37 +- cui/source/dialogs/cuiimapwnd.cxx | 37 +- cui/source/dialogs/dlgname.cxx | 37 +- cui/source/dialogs/gallery.src | 37 +- cui/source/dialogs/grfflt.src | 37 +- cui/source/dialogs/hangulhanjadlg.cxx | 37 +- cui/source/dialogs/hldocntp.cxx | 37 +- cui/source/dialogs/hldoctp.cxx | 37 +- cui/source/dialogs/hlinettp.cxx | 37 +- cui/source/dialogs/hlmailtp.cxx | 37 +- cui/source/dialogs/hlmarkwn.cxx | 37 +- cui/source/dialogs/hltpbase.cxx | 37 +- cui/source/dialogs/hyperdlg.src | 37 +- cui/source/dialogs/hyphen.cxx | 37 +- cui/source/dialogs/hyphen.src | 37 +- cui/source/dialogs/iconcdlg.cxx | 37 +- cui/source/dialogs/insdlg.cxx | 37 +- cui/source/dialogs/insrc.cxx | 37 +- cui/source/dialogs/insrc.src | 37 +- cui/source/dialogs/linkdlg.cxx | 37 +- cui/source/dialogs/multifil.cxx | 37 +- cui/source/dialogs/multipat.cxx | 37 +- cui/source/dialogs/multipat.src | 37 +- cui/source/dialogs/passwdomdlg.cxx | 37 +- cui/source/dialogs/passwdomdlg.src | 43 +- cui/source/dialogs/pastedlg.cxx | 37 +- cui/source/dialogs/plfilter.cxx | 37 +- cui/source/dialogs/postdlg.cxx | 37 +- cui/source/dialogs/postdlg.src | 37 +- cui/source/dialogs/scriptdlg.cxx | 37 +- cui/source/dialogs/scriptdlg.src | 37 +- cui/source/dialogs/sdrcelldlg.cxx | 37 +- cui/source/dialogs/sdrcelldlg.src | 37 +- cui/source/dialogs/showcols.cxx | 37 +- cui/source/dialogs/splitcelldlg.cxx | 37 +- cui/source/dialogs/splitcelldlg.src | 37 +- cui/source/dialogs/srchxtra.cxx | 37 +- cui/source/dialogs/svuidlg.src | 37 +- cui/source/dialogs/thesdlg.cxx | 37 +- cui/source/dialogs/thesdlg_impl.hxx | 37 +- cui/source/dialogs/winpluginlib.cxx | 37 +- cui/source/dialogs/zoom.cxx | 37 +- cui/source/factory/cuiresmgr.cxx | 37 +- cui/source/factory/dlgfact.cxx | 37 +- cui/source/factory/dlgfact.hxx | 37 +- cui/source/inc/SpellDialog.hxx | 37 +- cui/source/inc/about.hxx | 37 +- cui/source/inc/acccfg.hxx | 37 +- cui/source/inc/align.hxx | 37 +- cui/source/inc/autocdlg.hxx | 37 +- cui/source/inc/backgrnd.hxx | 37 +- cui/source/inc/bbdlg.hxx | 37 +- cui/source/inc/border.hxx | 37 +- cui/source/inc/cfg.hxx | 37 +- cui/source/inc/cfgutil.hxx | 37 +- cui/source/inc/chardlg.hxx | 37 +- cui/source/inc/connect.hxx | 37 +- cui/source/inc/cuicharmap.hxx | 37 +- cui/source/inc/cuifmsearch.hxx | 37 +- cui/source/inc/cuigaldlg.hxx | 37 +- cui/source/inc/cuigrfflt.hxx | 37 +- cui/source/inc/cuires.hrc | 38 +- cui/source/inc/cuitabarea.hxx | 37 +- cui/source/inc/dbregister.hxx | 37 +- cui/source/inc/dlgname.hxx | 37 +- cui/source/inc/dstribut.hxx | 37 +- cui/source/inc/grfpage.hxx | 37 +- cui/source/inc/hangulhanjadlg.hxx | 37 +- cui/source/inc/helpid.hrc | 37 +- cui/source/inc/hldocntp.hxx | 37 +- cui/source/inc/hldoctp.hxx | 37 +- cui/source/inc/hlinettp.hxx | 37 +- cui/source/inc/hlmarkwn.hxx | 37 +- cui/source/inc/hltpbase.hxx | 37 +- cui/source/inc/iconcdlg.hxx | 37 +- cui/source/inc/insdlg.hxx | 37 +- cui/source/inc/insrc.hxx | 37 +- cui/source/inc/labdlg.hxx | 37 +- cui/source/inc/linkdlg.hxx | 37 +- cui/source/inc/macroass.hxx | 37 +- cui/source/inc/macropg.hxx | 37 +- cui/source/inc/measure.hxx | 37 +- cui/source/inc/multifil.hxx | 37 +- cui/source/inc/multipat.hxx | 37 +- cui/source/inc/numfmt.hxx | 37 +- cui/source/inc/optasian.hxx | 37 +- cui/source/inc/optdict.hxx | 37 +- cui/source/inc/optlingu.hxx | 37 +- cui/source/inc/optpath.hxx | 37 +- cui/source/inc/page.hxx | 37 +- cui/source/inc/paragrph.hxx | 37 +- cui/source/inc/pastedlg.hxx | 37 +- cui/source/inc/postdlg.hxx | 37 +- cui/source/inc/radiobtnbox.hxx | 37 +- cui/source/inc/scriptdlg.hxx | 37 +- cui/source/inc/sdrcelldlg.hxx | 37 +- cui/source/inc/selector.hxx | 37 +- cui/source/inc/showcols.hxx | 37 +- cui/source/inc/srchxtra.hxx | 37 +- cui/source/inc/tabstpge.hxx | 37 +- cui/source/inc/textanim.hxx | 37 +- cui/source/inc/textattr.hxx | 37 +- cui/source/inc/transfrm.hxx | 37 +- cui/source/inc/treeopt.hxx | 37 +- cui/source/inc/zoom.hxx | 37 +- cui/source/options/cfgchart.cxx | 37 +- cui/source/options/cfgchart.hxx | 37 +- cui/source/options/connpoolconfig.cxx | 37 +- cui/source/options/connpooloptions.cxx | 37 +- cui/source/options/connpooloptions.src | 37 +- cui/source/options/connpoolsettings.cxx | 37 +- cui/source/options/connpoolsettings.hxx | 37 +- cui/source/options/dbregister.cxx | 37 +- cui/source/options/dbregister.src | 37 +- .../options/dbregisterednamesconfig.cxx | 37 +- cui/source/options/doclinkdialog.cxx | 37 +- cui/source/options/doclinkdialog.hxx | 37 +- cui/source/options/fontsubs.cxx | 37 +- cui/source/options/fontsubs.hxx | 37 +- cui/source/options/fontsubs.src | 37 +- cui/source/options/internationaloptions.cxx | 37 +- cui/source/options/optaccessibility.src | 37 +- cui/source/options/optasian.cxx | 37 +- cui/source/options/optasian.src | 37 +- cui/source/options/optchart.cxx | 37 +- cui/source/options/optchart.hxx | 37 +- cui/source/options/optchart.src | 37 +- cui/source/options/optcolor.cxx | 37 +- cui/source/options/optcolor.hxx | 37 +- cui/source/options/optcolor.src | 37 +- cui/source/options/optctl.cxx | 37 +- cui/source/options/optctl.src | 37 +- cui/source/options/optdict.cxx | 37 +- cui/source/options/optdict.src | 37 +- cui/source/options/optfltr.cxx | 37 +- cui/source/options/optfltr.hxx | 37 +- cui/source/options/optfltr.src | 37 +- cui/source/options/optgdlg.cxx | 37 +- cui/source/options/optgdlg.hxx | 37 +- cui/source/options/optgdlg.src | 41 +- cui/source/options/optgenrl.cxx | 37 +- cui/source/options/optgenrl.src | 46 +- cui/source/options/opthtml.cxx | 37 +- cui/source/options/opthtml.src | 37 +- cui/source/options/optinet2.cxx | 37 +- cui/source/options/optinet2.hxx | 37 +- cui/source/options/optinet2.src | 37 +- cui/source/options/optjava.cxx | 37 +- cui/source/options/optjava.hxx | 37 +- cui/source/options/optjava.src | 37 +- cui/source/options/optjsearch.src | 37 +- cui/source/options/optlingu.cxx | 37 +- cui/source/options/optlingu.src | 37 +- cui/source/options/optmemory.cxx | 37 +- cui/source/options/optmemory.hxx | 37 +- cui/source/options/optmemory.src | 37 +- cui/source/options/optpath.cxx | 37 +- cui/source/options/optpath.src | 37 +- cui/source/options/optsave.cxx | 37 +- cui/source/options/optsave.hxx | 37 +- cui/source/options/optsave.src | 37 +- cui/source/options/optupdt.cxx | 37 +- cui/source/options/optupdt.hxx | 37 +- cui/source/options/optupdt.src | 37 +- cui/source/options/radiobtnbox.cxx | 37 +- cui/source/options/readonlyimage.cxx | 37 +- cui/source/options/readonlyimage.src | 37 +- cui/source/options/sdbcdriverenum.cxx | 37 +- cui/source/options/securityoptions.src | 37 +- cui/source/options/treeopt.cxx | 39 +- cui/source/options/treeopt.src | 37 +- cui/source/options/webconninfo.cxx | 37 +- cui/source/options/webconninfo.hxx | 37 +- cui/source/options/webconninfo.src | 37 +- cui/source/tabpages/align.cxx | 37 +- cui/source/tabpages/align.src | 37 +- cui/source/tabpages/autocdlg.cxx | 44 +- cui/source/tabpages/autocdlg.src | 37 +- cui/source/tabpages/backgrnd.cxx | 37 +- cui/source/tabpages/backgrnd.src | 37 +- cui/source/tabpages/bbdlg.cxx | 37 +- cui/source/tabpages/border.cxx | 37 +- cui/source/tabpages/border.src | 37 +- cui/source/tabpages/borderconn.cxx | 37 +- cui/source/tabpages/chardlg.cxx | 37 +- cui/source/tabpages/connect.cxx | 37 +- cui/source/tabpages/connect.src | 37 +- cui/source/tabpages/dstribut.cxx | 37 +- cui/source/tabpages/dstribut.src | 37 +- cui/source/tabpages/grfpage.cxx | 37 +- cui/source/tabpages/grfpage.src | 37 +- cui/source/tabpages/labdlg.cxx | 37 +- cui/source/tabpages/labdlg.src | 37 +- cui/source/tabpages/macroass.cxx | 37 +- cui/source/tabpages/macroass.src | 37 +- cui/source/tabpages/measure.cxx | 37 +- cui/source/tabpages/measure.src | 37 +- cui/source/tabpages/numfmt.cxx | 37 +- cui/source/tabpages/numfmt.src | 37 +- cui/source/tabpages/numpages.src | 37 +- cui/source/tabpages/page.cxx | 37 +- cui/source/tabpages/page.src | 37 +- cui/source/tabpages/paragrph.cxx | 37 +- cui/source/tabpages/paragrph.src | 37 +- cui/source/tabpages/strings.src | 37 +- cui/source/tabpages/swpossizetabpage.cxx | 37 +- cui/source/tabpages/swpossizetabpage.hxx | 37 +- cui/source/tabpages/swpossizetabpage.src | 37 +- cui/source/tabpages/tabarea.cxx | 37 +- cui/source/tabpages/tabarea.src | 37 +- cui/source/tabpages/tabline.cxx | 37 +- cui/source/tabpages/tabstpge.cxx | 37 +- cui/source/tabpages/tabstpge.src | 37 +- cui/source/tabpages/textanim.cxx | 37 +- cui/source/tabpages/textanim.src | 37 +- cui/source/tabpages/textattr.cxx | 37 +- cui/source/tabpages/textattr.src | 37 +- cui/source/tabpages/tparea.cxx | 37 +- cui/source/tabpages/tpbitmap.cxx | 39 +- cui/source/tabpages/tpcolor.cxx | 37 +- cui/source/tabpages/tpgradnt.cxx | 37 +- cui/source/tabpages/tphatch.cxx | 37 +- cui/source/tabpages/tplnedef.cxx | 37 +- cui/source/tabpages/tplneend.cxx | 37 +- cui/source/tabpages/tpshadow.cxx | 37 +- cui/source/tabpages/transfrm.cxx | 37 +- cui/util/cui.component | 39 +- cui/util/cui.map | 17 + postprocess/packcomponents/makefile.mk | 2 +- ucb/Makefile | 7 + ucb/qa/unoapi/knownissues.xcl | 17 + ucb/qa/unoapi/ucb.sce | 17 + ucb/source/cacher/cached1.component | 43 +- ucb/source/cacher/cachedcontentresultset.cxx | 37 +- .../cacher/cachedcontentresultsetstub.cxx | 37 +- ucb/source/cacher/cacheddynamicresultset.cxx | 37 +- .../cacher/cacheddynamicresultsetstub.cxx | 37 +- ucb/source/cacher/cacheserv.cxx | 37 +- ucb/source/cacher/contentresultsetwrapper.cxx | 37 +- ucb/source/cacher/dynamicresultsetwrapper.cxx | 37 +- ucb/source/core/identify.cxx | 37 +- ucb/source/core/provprox.cxx | 37 +- ucb/source/core/ucb.cxx | 37 +- ucb/source/core/ucb1.component | 43 +- ucb/source/core/ucbcmds.cxx | 37 +- ucb/source/core/ucbprops.cxx | 37 +- ucb/source/core/ucbserv.cxx | 37 +- ucb/source/core/ucbstore.cxx | 37 +- ucb/source/inc/regexp.hxx | 37 +- ucb/source/inc/regexpmap.tpt | 37 +- ucb/source/regexp/regexp.cxx | 37 +- ucb/source/sorter/sortdynres.cxx | 37 +- ucb/source/sorter/sortmain.cxx | 37 +- ucb/source/sorter/sortresult.cxx | 37 +- ucb/source/sorter/srtrs1.component | 43 +- ucb/source/ucp/expand/ucpexpand.cxx | 37 +- ucb/source/ucp/expand/ucpexpand1.component | 43 +- ucb/source/ucp/ext/ucpext.component | 43 +- ucb/source/ucp/ext/ucpext_content.cxx | 36 +- ucb/source/ucp/ext/ucpext_datasupplier.cxx | 36 +- ucb/source/ucp/ext/ucpext_provider.cxx | 36 +- ucb/source/ucp/ext/ucpext_services.cxx | 36 +- ucb/source/ucp/file/bc.cxx | 37 +- ucb/source/ucp/file/filcmd.cxx | 37 +- ucb/source/ucp/file/filglob.cxx | 37 +- ucb/source/ucp/file/filid.cxx | 37 +- ucb/source/ucp/file/filinpstr.cxx | 37 +- ucb/source/ucp/file/filinsreq.cxx | 37 +- ucb/source/ucp/file/filnot.hxx | 37 +- ucb/source/ucp/file/filprp.cxx | 37 +- ucb/source/ucp/file/filrec.cxx | 37 +- ucb/source/ucp/file/filrow.cxx | 37 +- ucb/source/ucp/file/filrset.cxx | 37 +- ucb/source/ucp/file/filstr.cxx | 37 +- ucb/source/ucp/file/filtask.hxx | 37 +- ucb/source/ucp/file/prov.cxx | 37 +- ucb/source/ucp/file/shell.cxx | 37 +- ucb/source/ucp/file/shell.hxx | 37 +- ucb/source/ucp/file/ucpfile1.component | 43 +- ucb/source/ucp/ftp/ftpcfunc.hxx | 37 +- ucb/source/ucp/ftp/ftpcontent.cxx | 37 +- ucb/source/ucp/ftp/ftpcontentidentifier.cxx | 37 +- ucb/source/ucp/ftp/ftpcontentprovider.cxx | 37 +- ucb/source/ucp/ftp/ftpdirp.cxx | 37 +- ucb/source/ucp/ftp/ftphandleprovider.hxx | 18 + ucb/source/ucp/ftp/ftpintreq.cxx | 37 +- ucb/source/ucp/ftp/ftpresultsetI.cxx | 37 +- ucb/source/ucp/ftp/ftpresultsetbase.cxx | 37 +- ucb/source/ucp/ftp/ftpservices.cxx | 37 +- ucb/source/ucp/ftp/ftpstrcont.hxx | 37 +- ucb/source/ucp/ftp/ftpurl.cxx | 37 +- ucb/source/ucp/ftp/ftpurl.hxx | 37 +- ucb/source/ucp/ftp/test.cxx | 37 +- ucb/source/ucp/ftp/test_activedatasink.cxx | 37 +- ucb/source/ucp/ftp/test_ftpurl.cxx | 37 +- ucb/source/ucp/ftp/test_multiservicefac.cxx | 37 +- ucb/source/ucp/ftp/ucpftp1.component | 43 +- ucb/source/ucp/gio/gio_content.cxx | 37 +- ucb/source/ucp/gio/gio_datasupplier.cxx | 37 +- ucb/source/ucp/gio/gio_mount.hxx | 37 +- ucb/source/ucp/gio/gio_provider.cxx | 37 +- ucb/source/ucp/gio/ucpgio.component | 43 +- ucb/source/ucp/gvfs/gvfs_content.cxx | 37 +- ucb/source/ucp/gvfs/gvfs_directory.cxx | 37 +- ucb/source/ucp/gvfs/gvfs_provider.cxx | 37 +- ucb/source/ucp/gvfs/gvfs_stream.cxx | 37 +- ucb/source/ucp/gvfs/ucpgvfs.component | 43 +- ucb/source/ucp/hierarchy/hierarchycontent.cxx | 37 +- ucb/source/ucp/hierarchy/hierarchycontent.hxx | 37 +- ucb/source/ucp/hierarchy/hierarchydata.cxx | 37 +- .../ucp/hierarchy/hierarchydatasource.cxx | 37 +- .../ucp/hierarchy/hierarchydatasupplier.cxx | 37 +- .../ucp/hierarchy/hierarchyprovider.cxx | 37 +- .../ucp/hierarchy/hierarchyprovider.hxx | 37 +- .../ucp/hierarchy/hierarchyservices.cxx | 37 +- ucb/source/ucp/hierarchy/hierarchyuri.cxx | 37 +- ucb/source/ucp/hierarchy/ucphier1.component | 43 +- ucb/source/ucp/inc/urihelper.hxx | 37 +- ucb/source/ucp/odma/odma.h | 275 +- ucb/source/ucp/odma/odma_content.cxx | 37 +- ucb/source/ucp/odma/odma_content.hxx | 37 +- ucb/source/ucp/odma/odma_contentcaps.cxx | 37 +- ucb/source/ucp/odma/odma_contentprops.hxx | 37 +- ucb/source/ucp/odma/odma_datasupplier.cxx | 37 +- ucb/source/ucp/odma/odma_inputstream.cxx | 37 +- ucb/source/ucp/odma/odma_lib.cxx | 37 +- ucb/source/ucp/odma/odma_lib.hxx | 37 +- ucb/source/ucp/odma/odma_main.cxx | 37 +- ucb/source/ucp/odma/odma_provider.cxx | 37 +- ucb/source/ucp/odma/odma_provider.hxx | 37 +- ucb/source/ucp/odma/odma_services.cxx | 37 +- ucb/source/ucp/odma/ucpodma1.component | 44 +- ucb/source/ucp/package/pkgcontent.cxx | 37 +- ucb/source/ucp/package/pkgdatasupplier.cxx | 37 +- ucb/source/ucp/package/pkgprovider.cxx | 37 +- ucb/source/ucp/package/pkgservices.cxx | 37 +- ucb/source/ucp/package/pkguri.cxx | 37 +- ucb/source/ucp/package/ucppkg1.component | 43 +- ucb/source/ucp/tdoc/tdoc_content.cxx | 37 +- ucb/source/ucp/tdoc/tdoc_content.hxx | 37 +- ucb/source/ucp/tdoc/tdoc_contentcaps.cxx | 37 +- ucb/source/ucp/tdoc/tdoc_datasupplier.cxx | 37 +- ucb/source/ucp/tdoc/tdoc_docmgr.cxx | 37 +- ucb/source/ucp/tdoc/tdoc_docmgr.hxx | 37 +- ucb/source/ucp/tdoc/tdoc_provider.cxx | 37 +- ucb/source/ucp/tdoc/tdoc_services.cxx | 37 +- ucb/source/ucp/tdoc/tdoc_stgelems.cxx | 37 +- ucb/source/ucp/tdoc/tdoc_storage.cxx | 37 +- ucb/source/ucp/tdoc/tdoc_uri.cxx | 37 +- ucb/source/ucp/tdoc/tdoc_uri.hxx | 37 +- ucb/source/ucp/tdoc/ucptdoc1.component | 43 +- ucb/source/ucp/webdav/AprEnv.cxx | 58 + ucb/source/ucp/webdav/AprEnv.hxx | 50 + ucb/source/ucp/webdav/ContentProperties.cxx | 666 ++++ ucb/source/ucp/webdav/ContentProperties.hxx | 223 ++ ucb/source/ucp/webdav/DAVAuthListener.hxx | 49 + ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx | 74 + ucb/source/ucp/webdav/DAVException.hxx | 171 + ucb/source/ucp/webdav/DAVProperties.cxx | 194 + ucb/source/ucp/webdav/DAVProperties.hxx | 57 + .../ucp/webdav/DAVRequestEnvironment.hxx | 58 + ucb/source/ucp/webdav/DAVResource.hxx | 63 + ucb/source/ucp/webdav/DAVResourceAccess.cxx | 1176 ++++++ ucb/source/ucp/webdav/DAVResourceAccess.hxx | 239 ++ ucb/source/ucp/webdav/DAVSession.hxx | 218 ++ ucb/source/ucp/webdav/DAVSessionFactory.cxx | 101 + ucb/source/ucp/webdav/DAVSessionFactory.hxx | 78 + ucb/source/ucp/webdav/DAVTypes.hxx | 81 + ucb/source/ucp/webdav/DateTimeHelper.cxx | 265 ++ ucb/source/ucp/webdav/DateTimeHelper.hxx | 58 + ucb/source/ucp/webdav/PropertyMap.hxx | 61 + ucb/source/ucp/webdav/SerfCallbacks.cxx | 113 + ucb/source/ucp/webdav/SerfCallbacks.hxx | 68 + ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx | 85 + ucb/source/ucp/webdav/SerfCopyReqProcImpl.hxx | 57 + .../ucp/webdav/SerfDeleteReqProcImpl.cxx | 70 + .../ucp/webdav/SerfDeleteReqProcImpl.hxx | 52 + ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx | 187 + ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx | 84 + ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx | 141 + ucb/source/ucp/webdav/SerfHeadReqProcImpl.hxx | 67 + ucb/source/ucp/webdav/SerfInputStream.cxx | 191 + ucb/source/ucp/webdav/SerfInputStream.hxx | 121 + ucb/source/ucp/webdav/SerfLockStore.cxx | 241 ++ ucb/source/ucp/webdav/SerfLockStore.hxx | 97 + .../ucp/webdav/SerfMkColReqProcImpl.cxx | 70 + .../ucp/webdav/SerfMkColReqProcImpl.hxx | 51 + ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx | 85 + ucb/source/ucp/webdav/SerfMoveReqProcImpl.hxx | 57 + ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx | 140 + ucb/source/ucp/webdav/SerfPostReqProcImpl.hxx | 76 + .../ucp/webdav/SerfPropFindReqProcImpl.cxx | 198 + .../ucp/webdav/SerfPropFindReqProcImpl.hxx | 77 + .../ucp/webdav/SerfPropPatchReqProcImpl.cxx | 183 + .../ucp/webdav/SerfPropPatchReqProcImpl.hxx | 58 + ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx | 101 + ucb/source/ucp/webdav/SerfPutReqProcImpl.hxx | 59 + .../ucp/webdav/SerfRequestProcessor.cxx | 553 +++ .../ucp/webdav/SerfRequestProcessor.hxx | 182 + .../ucp/webdav/SerfRequestProcessorImpl.cxx | 116 + .../ucp/webdav/SerfRequestProcessorImpl.hxx | 72 + .../webdav/SerfRequestProcessorImplFac.cxx | 224 ++ .../webdav/SerfRequestProcessorImplFac.hxx | 115 + ucb/source/ucp/webdav/SerfSession.cxx | 1603 ++++++++ ucb/source/ucp/webdav/SerfSession.hxx | 325 ++ ucb/source/ucp/webdav/SerfTypes.hxx | 37 + ucb/source/ucp/webdav/SerfUri.cxx | 279 ++ ucb/source/ucp/webdav/SerfUri.hxx | 102 + .../ucp/webdav/UCBDeadPropertyValue.cxx | 543 +++ .../ucp/webdav/UCBDeadPropertyValue.hxx | 61 + ucb/source/ucp/webdav/ucpdav.xml | 128 + ucb/source/ucp/webdav/ucpdav1.component | 27 + ucb/source/ucp/webdav/webdavcontent.cxx | 3245 +++++++++++++++++ ucb/source/ucp/webdav/webdavcontent.hxx | 296 ++ ucb/source/ucp/webdav/webdavcontentcaps.cxx | 659 ++++ ucb/source/ucp/webdav/webdavdatasupplier.cxx | 507 +++ ucb/source/ucp/webdav/webdavdatasupplier.hxx | 78 + ucb/source/ucp/webdav/webdavprovider.cxx | 225 ++ ucb/source/ucp/webdav/webdavprovider.hxx | 116 + .../ucp/webdav/webdavresponseparser.cxx | 888 +++++ .../ucp/webdav/webdavresponseparser.hxx | 43 + ucb/source/ucp/webdav/webdavresultset.cxx | 90 + ucb/source/ucp/webdav/webdavresultset.hxx | 55 + ucb/source/ucp/webdav/webdavservices.cxx | 71 + ucb/test/com/sun/star/comp/ucb/makefile.mk | 33 +- .../cachemap/cachemapobjectcontainer2.hxx | 37 +- ucb/workben/ucb/makefile.mk | 33 +- ucb/workben/ucb/ucbdemo.cxx | 37 +- 455 files changed, 22829 insertions(+), 8787 deletions(-) create mode 100644 ucb/source/ucp/webdav/AprEnv.cxx create mode 100644 ucb/source/ucp/webdav/AprEnv.hxx create mode 100644 ucb/source/ucp/webdav/ContentProperties.cxx create mode 100644 ucb/source/ucp/webdav/ContentProperties.hxx create mode 100644 ucb/source/ucp/webdav/DAVAuthListener.hxx create mode 100644 ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx create mode 100644 ucb/source/ucp/webdav/DAVException.hxx create mode 100644 ucb/source/ucp/webdav/DAVProperties.cxx create mode 100644 ucb/source/ucp/webdav/DAVProperties.hxx create mode 100644 ucb/source/ucp/webdav/DAVRequestEnvironment.hxx create mode 100644 ucb/source/ucp/webdav/DAVResource.hxx create mode 100644 ucb/source/ucp/webdav/DAVResourceAccess.cxx create mode 100644 ucb/source/ucp/webdav/DAVResourceAccess.hxx create mode 100644 ucb/source/ucp/webdav/DAVSession.hxx create mode 100644 ucb/source/ucp/webdav/DAVSessionFactory.cxx create mode 100644 ucb/source/ucp/webdav/DAVSessionFactory.hxx create mode 100644 ucb/source/ucp/webdav/DAVTypes.hxx create mode 100644 ucb/source/ucp/webdav/DateTimeHelper.cxx create mode 100644 ucb/source/ucp/webdav/DateTimeHelper.hxx create mode 100644 ucb/source/ucp/webdav/PropertyMap.hxx create mode 100644 ucb/source/ucp/webdav/SerfCallbacks.cxx create mode 100644 ucb/source/ucp/webdav/SerfCallbacks.hxx create mode 100644 ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx create mode 100644 ucb/source/ucp/webdav/SerfCopyReqProcImpl.hxx create mode 100644 ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx create mode 100644 ucb/source/ucp/webdav/SerfDeleteReqProcImpl.hxx create mode 100644 ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx create mode 100644 ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx create mode 100644 ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx create mode 100644 ucb/source/ucp/webdav/SerfHeadReqProcImpl.hxx create mode 100644 ucb/source/ucp/webdav/SerfInputStream.cxx create mode 100644 ucb/source/ucp/webdav/SerfInputStream.hxx create mode 100644 ucb/source/ucp/webdav/SerfLockStore.cxx create mode 100644 ucb/source/ucp/webdav/SerfLockStore.hxx create mode 100644 ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx create mode 100644 ucb/source/ucp/webdav/SerfMkColReqProcImpl.hxx create mode 100644 ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx create mode 100644 ucb/source/ucp/webdav/SerfMoveReqProcImpl.hxx create mode 100644 ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx create mode 100644 ucb/source/ucp/webdav/SerfPostReqProcImpl.hxx create mode 100644 ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx create mode 100644 ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx create mode 100644 ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx create mode 100644 ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.hxx create mode 100644 ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx create mode 100644 ucb/source/ucp/webdav/SerfPutReqProcImpl.hxx create mode 100644 ucb/source/ucp/webdav/SerfRequestProcessor.cxx create mode 100644 ucb/source/ucp/webdav/SerfRequestProcessor.hxx create mode 100644 ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx create mode 100644 ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx create mode 100644 ucb/source/ucp/webdav/SerfRequestProcessorImplFac.cxx create mode 100644 ucb/source/ucp/webdav/SerfRequestProcessorImplFac.hxx create mode 100644 ucb/source/ucp/webdav/SerfSession.cxx create mode 100644 ucb/source/ucp/webdav/SerfSession.hxx create mode 100644 ucb/source/ucp/webdav/SerfTypes.hxx create mode 100644 ucb/source/ucp/webdav/SerfUri.cxx create mode 100644 ucb/source/ucp/webdav/SerfUri.hxx create mode 100644 ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx create mode 100644 ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx create mode 100644 ucb/source/ucp/webdav/ucpdav.xml create mode 100644 ucb/source/ucp/webdav/ucpdav1.component create mode 100644 ucb/source/ucp/webdav/webdavcontent.cxx create mode 100644 ucb/source/ucp/webdav/webdavcontent.hxx create mode 100644 ucb/source/ucp/webdav/webdavcontentcaps.cxx create mode 100644 ucb/source/ucp/webdav/webdavdatasupplier.cxx create mode 100644 ucb/source/ucp/webdav/webdavdatasupplier.hxx create mode 100644 ucb/source/ucp/webdav/webdavprovider.cxx create mode 100644 ucb/source/ucp/webdav/webdavprovider.hxx create mode 100644 ucb/source/ucp/webdav/webdavresponseparser.cxx create mode 100644 ucb/source/ucp/webdav/webdavresponseparser.hxx create mode 100644 ucb/source/ucp/webdav/webdavresultset.cxx create mode 100644 ucb/source/ucp/webdav/webdavresultset.hxx create mode 100644 ucb/source/ucp/webdav/webdavservices.cxx diff --git a/cui/Makefile b/cui/Makefile index ccb1c85a04da..0997e628485b 100644 --- a/cui/Makefile +++ b/cui/Makefile @@ -1,4 +1,11 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 4ba939ee736e..a3dbed09dabd 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ //----------------------------------------------- // include own files diff --git a/cui/source/customize/acccfg.src b/cui/source/customize/acccfg.src index 912f191b28e3..c1b03221f743 100644 --- a/cui/source/customize/acccfg.src +++ b/cui/source/customize/acccfg.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "helpid.hrc" #include "cuires.hrc" diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 5b9b3170f65e..2f1945c6cd36 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/cui/source/customize/cfg.src b/cui/source/customize/cfg.src index 64e093601767..80a6c1d6d44e 100644 --- a/cui/source/customize/cfg.src +++ b/cui/source/customize/cfg.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include "cfg.hrc" #include "helpid.hrc" diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 4d2be18383e7..b457e5899d93 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "cfgutil.hxx" diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx index 8cd495f0d372..8020deb3ecd6 100644 --- a/cui/source/customize/eventdlg.cxx +++ b/cui/source/customize/eventdlg.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/customize/eventdlg.src b/cui/source/customize/eventdlg.src index 4159a2dd14a3..7cc6332ad2b3 100644 --- a/cui/source/customize/eventdlg.src +++ b/cui/source/customize/eventdlg.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "helpid.hrc" #include "eventdlg.hrc" diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index e7c0bb18eddf..c4d90cfdd529 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/cui/source/customize/macropg.src b/cui/source/customize/macropg.src index 19af3ed03f2e..900038db59c1 100644 --- a/cui/source/customize/macropg.src +++ b/cui/source/customize/macropg.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include "macropg.hrc" diff --git a/cui/source/customize/macropg_impl.hxx b/cui/source/customize/macropg_impl.hxx index e8632b8e9070..37a99380354d 100644 --- a/cui/source/customize/macropg_impl.hxx +++ b/cui/source/customize/macropg_impl.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _MACROPG_IMPL_HXX #define _MACROPG_IMPL_HXX diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index c0023032d8ea..c7424aab776f 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/customize/selector.src b/cui/source/customize/selector.src index 34e7a7726804..533e91edf54c 100644 --- a/cui/source/customize/selector.src +++ b/cui/source/customize/selector.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "helpid.hrc" #include #include "selector.hrc" diff --git a/cui/source/dialogs/SpellAttrib.cxx b/cui/source/dialogs/SpellAttrib.cxx index 34dd071e50e9..48631df3a6d7 100644 --- a/cui/source/dialogs/SpellAttrib.cxx +++ b/cui/source/dialogs/SpellAttrib.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/dialogs/SpellAttrib.hxx b/cui/source/dialogs/SpellAttrib.hxx index 1cc0304231a2..0be71ef9c33d 100644 --- a/cui/source/dialogs/SpellAttrib.hxx +++ b/cui/source/dialogs/SpellAttrib.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_SPELL_ATTRIB #define _SVX_SPELL_ATTRIB diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 833d62168237..1a43828a353c 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/dialogs/SpellDialog.src b/cui/source/dialogs/SpellDialog.src index 9781ae10868f..6a5724f71eed 100644 --- a/cui/source/dialogs/SpellDialog.src +++ b/cui/source/dialogs/SpellDialog.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include "helpid.hrc" diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index e3a9111bdb39..23b9bd5b6542 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/dialogs/about.src b/cui/source/dialogs/about.src index 70dfd3bc10b9..9cd728f2fed5 100644 --- a/cui/source/dialogs/about.src +++ b/cui/source/dialogs/about.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "about.hrc" diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 576907d7e3dc..5d19c61b83ea 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -1,32 +1,20 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* - * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * This file is part of the LibreOffice project. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License or as specified alternatively below. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * This file incorporates work covered by the following license notice: * - * The Initial Developer of the Original Code is - * Christian Lippka - * Portions created by the Initial Developer are Copyright (C) 2010 the - * Initial Developer. All Rights Reserved. - * - * Major Contributor(s): - * - * - * For minor contributions see the git repository. - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 3 or later (the "GPLv3+"), or - * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), - * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable - * instead of those above. + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include @@ -37,11 +25,8 @@ #include #include #include - #include - #include - #include #include #include @@ -50,20 +35,15 @@ #include #include #include - #include - #include #include - #include - #include - #include "dialmgr.hxx" #include "colorpicker.hrc" - #include +#include using rtl::OUString; using namespace ::com::sun::star::uno; @@ -74,7 +54,6 @@ using namespace ::basegfx; namespace cui { - const sal_uInt16 COLORMODE_RGB = 0x10; const sal_uInt16 COLORMODE_HSV = 0x20; const sal_uInt16 COLORMODE_CMYK = 0x40; diff --git a/cui/source/dialogs/colorpicker.hrc b/cui/source/dialogs/colorpicker.hrc index 0c40686dd4f1..b044d016af11 100644 --- a/cui/source/dialogs/colorpicker.hrc +++ b/cui/source/dialogs/colorpicker.hrc @@ -1,32 +1,20 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* - * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * This file is part of the LibreOffice project. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License or as specified alternatively below. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * This file incorporates work covered by the following license notice: * - * The Initial Developer of the Original Code is - * Christian Lippka - * Portions created by the Initial Developer are Copyright (C) 2010 the - * Initial Developer. All Rights Reserved. - * - * Major Contributor(s): - * - * - * For minor contributions see the git repository. - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 3 or later (the "GPLv3+"), or - * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), - * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable - * instead of those above. + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #ifndef _CUI_COLORPICKER_HRC_ @@ -34,7 +22,6 @@ #include - #define FT_BOTTOMLINE 1 #define BTN_OK 2 #define BTN_CANCEL 3 diff --git a/cui/source/dialogs/colorpicker.src b/cui/source/dialogs/colorpicker.src index 6fee862d1d8c..7f9c6af7ad91 100644 --- a/cui/source/dialogs/colorpicker.src +++ b/cui/source/dialogs/colorpicker.src @@ -1,32 +1,20 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* - * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * This file is part of the LibreOffice project. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License or as specified alternatively below. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. + * This file incorporates work covered by the following license notice: * - * The Initial Developer of the Original Code is - * Christian Lippka - * Portions created by the Initial Developer are Copyright (C) 2010 the - * Initial Developer. All Rights Reserved. - * - * Major Contributor(s): - * - * - * For minor contributions see the git repository. - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 3 or later (the "GPLv3+"), or - * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), - * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable - * instead of those above. + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include "colorpicker.hrc" diff --git a/cui/source/dialogs/commonlingui.cxx b/cui/source/dialogs/commonlingui.cxx index 4f91a0ebd3a1..e6b3d0000563 100644 --- a/cui/source/dialogs/commonlingui.cxx +++ b/cui/source/dialogs/commonlingui.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "commonlingui.hxx" diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index aea38b922fab..18e9bf8658c3 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index db1b7f8069f7..0e6ace4302de 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 1b7690a97632..fb1bbdf7897b 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index 310c54ad5e3e..4f521a1e4386 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index f73684f94325..3f3a3407884b 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/dialogs/cuiimapwnd.cxx b/cui/source/dialogs/cuiimapwnd.cxx index 63b83b468ac8..711a7b4f6fcf 100644 --- a/cui/source/dialogs/cuiimapwnd.cxx +++ b/cui/source/dialogs/cuiimapwnd.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx index a742cbd9def2..5553d0cf64c3 100644 --- a/cui/source/dialogs/dlgname.cxx +++ b/cui/source/dialogs/dlgname.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/dialogs/gallery.src b/cui/source/dialogs/gallery.src index 998e6f04979e..957a516e7a50 100644 --- a/cui/source/dialogs/gallery.src +++ b/cui/source/dialogs/gallery.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include "helpid.hrc" diff --git a/cui/source/dialogs/grfflt.src b/cui/source/dialogs/grfflt.src index 8bb22b9d247e..ffffdfa13246 100644 --- a/cui/source/dialogs/grfflt.src +++ b/cui/source/dialogs/grfflt.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index c66f7085115e..b79feb12d2d2 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "hangulhanjadlg.hxx" #include "hangulhanjadlg.hrc" diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index e38fc0f51d40..1f4157dc4271 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "hldocntp.hxx" #include diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index 57b665fb2aba..21fcce53551a 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "cuihyperdlg.hxx" #include diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index b310ddb2ecb4..1e538a7eea68 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index 49b43f7340c4..3134196fa3db 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index 86d32f3e10ff..69d9ff63fac8 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index e665a960dddb..1d040b48c039 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/dialogs/hyperdlg.src b/cui/source/dialogs/hyperdlg.src index adae8b44751a..e8b86a6879eb 100644 --- a/cui/source/dialogs/hyperdlg.src +++ b/cui/source/dialogs/hyperdlg.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx index 6d93cdec7201..4b33b04f061e 100644 --- a/cui/source/dialogs/hyphen.cxx +++ b/cui/source/dialogs/hyphen.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "hyphen.hxx" #include "hyphen.hrc" diff --git a/cui/source/dialogs/hyphen.src b/cui/source/dialogs/hyphen.src index fb01272f4342..753bde0577cf 100644 --- a/cui/source/dialogs/hyphen.src +++ b/cui/source/dialogs/hyphen.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "helpid.hrc" #include "cuires.hrc" diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index e8640042e90a..522ae5013763 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index e15c328af33f..b221f4e31d1d 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx index 643f6d6432dd..81b8c0c6019c 100644 --- a/cui/source/dialogs/insrc.cxx +++ b/cui/source/dialogs/insrc.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/dialogs/insrc.src b/cui/source/dialogs/insrc.src index 630be3da4418..101dca68a25f 100644 --- a/cui/source/dialogs/insrc.src +++ b/cui/source/dialogs/insrc.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index 95d46d60b86b..8ab01c089c1f 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/dialogs/multifil.cxx b/cui/source/dialogs/multifil.cxx index 847fa845bc44..74f836117c12 100644 --- a/cui/source/dialogs/multifil.cxx +++ b/cui/source/dialogs/multifil.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index 92ce9f4115d3..5353edad37ea 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/dialogs/multipat.src b/cui/source/dialogs/multipat.src index 59ea05308786..1c70662f7f53 100644 --- a/cui/source/dialogs/multipat.src +++ b/cui/source/dialogs/multipat.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "multipat.hrc" #include "helpid.hrc" diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index d55ae4ad8e4f..11c05b4a5b16 100644 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "passwdomdlg.hrc" #include "passwdomdlg.hxx" diff --git a/cui/source/dialogs/passwdomdlg.src b/cui/source/dialogs/passwdomdlg.src index 129874b92c45..7f28ddad649c 100644 --- a/cui/source/dialogs/passwdomdlg.src +++ b/cui/source/dialogs/passwdomdlg.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include @@ -200,4 +191,10 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY { Text [ en-US ] = "Please enter a password to open or to modify, or check the open read-only option to continue." ; }; + + // this missing string was detected late - so for 3.4 we just add an english string + String STR_INVALID_STATE_FOR_OK_BUTTON_V2 + { + Text = "Set the password by entering the same password in both boxes." ; + }; }; diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx index 83d3698e3939..14a55daea410 100644 --- a/cui/source/dialogs/pastedlg.cxx +++ b/cui/source/dialogs/pastedlg.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/cui/source/dialogs/plfilter.cxx b/cui/source/dialogs/plfilter.cxx index 587a10d6c5d0..1597e2bf2826 100644 --- a/cui/source/dialogs/plfilter.cxx +++ b/cui/source/dialogs/plfilter.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index b82bbe13cce3..4d2ecd1ce329 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/dialogs/postdlg.src b/cui/source/dialogs/postdlg.src index 22a672a874d6..a4589a16e39f 100644 --- a/cui/source/dialogs/postdlg.src +++ b/cui/source/dialogs/postdlg.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include "postdlg.hrc" diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index e91e53fb67d3..f9b0f099a785 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/********************************************************************** +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/cui/source/dialogs/scriptdlg.src b/cui/source/dialogs/scriptdlg.src index 0c58be37e1b1..2ef255848b96 100644 --- a/cui/source/dialogs/scriptdlg.src +++ b/cui/source/dialogs/scriptdlg.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include "scriptdlg.hrc" diff --git a/cui/source/dialogs/sdrcelldlg.cxx b/cui/source/dialogs/sdrcelldlg.cxx index 1f45fc831a85..43d6360a63c0 100644 --- a/cui/source/dialogs/sdrcelldlg.cxx +++ b/cui/source/dialogs/sdrcelldlg.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/dialogs/sdrcelldlg.src b/cui/source/dialogs/sdrcelldlg.src index ce0211c1912d..640b1db9520b 100644 --- a/cui/source/dialogs/sdrcelldlg.src +++ b/cui/source/dialogs/sdrcelldlg.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx index 41152a3ccc85..321dc12ebaca 100644 --- a/cui/source/dialogs/showcols.cxx +++ b/cui/source/dialogs/showcols.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "showcols.hxx" #include "fmsearch.hrc" diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx index 8b408bf71203..d1566a529514 100644 --- a/cui/source/dialogs/splitcelldlg.cxx +++ b/cui/source/dialogs/splitcelldlg.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/dialogs/splitcelldlg.src b/cui/source/dialogs/splitcelldlg.src index 6fb9a990aa38..86fd9b011752 100644 --- a/cui/source/dialogs/splitcelldlg.src +++ b/cui/source/dialogs/splitcelldlg.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include "splitcelldlg.hrc" diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx index 3f502962587e..646d55dd0c68 100644 --- a/cui/source/dialogs/srchxtra.cxx +++ b/cui/source/dialogs/srchxtra.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "srchxtra.hxx" #include diff --git a/cui/source/dialogs/svuidlg.src b/cui/source/dialogs/svuidlg.src index 88f8de00504b..f1f97034fcce 100644 --- a/cui/source/dialogs/svuidlg.src +++ b/cui/source/dialogs/svuidlg.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include "svuidlg.hrc" diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 7be748a60f6b..fea6127f3bfd 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "thesdlg.hxx" #include "thesdlg_impl.hxx" diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx index a0c73bbb7b57..5269cb30fdf9 100644 --- a/cui/source/dialogs/thesdlg_impl.hxx +++ b/cui/source/dialogs/thesdlg_impl.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2008 by Sun Microsystems, Inc. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_THESDLG_IMPL_HXX #define _SVX_THESDLG_IMPL_HXX diff --git a/cui/source/dialogs/winpluginlib.cxx b/cui/source/dialogs/winpluginlib.cxx index 237e33b1e9e1..ce4ab24ee8c0 100644 --- a/cui/source/dialogs/winpluginlib.cxx +++ b/cui/source/dialogs/winpluginlib.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #if defined _MSC_VER #pragma warning(push, 1) diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx index f6be8103d4bd..3121529213c9 100644 --- a/cui/source/dialogs/zoom.cxx +++ b/cui/source/dialogs/zoom.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/factory/cuiresmgr.cxx b/cui/source/factory/cuiresmgr.cxx index 08b1b86a12c3..b5ecaccc4189 100644 --- a/cui/source/factory/cuiresmgr.cxx +++ b/cui/source/factory/cuiresmgr.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 8c8900375032..2c9bd96fff46 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "align.hxx" //add for SvxAlignmentTabPage #include "dlgfact.hxx" diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index c1a99fc6e9e4..83d6e8e77c4c 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _CUI_DLGFACT_HXX #define _CUI_DLGFACT_HXX diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index da5cd6461f1d..b2a9f94b17d7 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_SPELLDDIALOG_HXX #define _SVX_SPELLDDIALOG_HXX diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx index 4ad99d0895b5..28e2fa5e6d2a 100644 --- a/cui/source/inc/about.hxx +++ b/cui/source/inc/about.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _ABOUT_HXX #define _ABOUT_HXX diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index 0ed82cb50341..6686cb3139c2 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _ACCCFG_HXX #define _ACCCFG_HXX diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index 72e91e9f1d85..c47afaedb14b 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_ALIGN_HXX #define _SVX_ALIGN_HXX diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 5dd0bf17a0d6..e6cd1031d512 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _OFA_AUTOCDLG_HXX #define _OFA_AUTOCDLG_HXX diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index eec42f800062..4a2e2184b211 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_BACKGRND_HXX #define _SVX_BACKGRND_HXX diff --git a/cui/source/inc/bbdlg.hxx b/cui/source/inc/bbdlg.hxx index 4fd509167314..7c89ebc0f13f 100644 --- a/cui/source/inc/bbdlg.hxx +++ b/cui/source/inc/bbdlg.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_BBDLG_HXX #define _SVX_BBDLG_HXX diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index e8169f163052..098042041210 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_BORDER_HXX #define _SVX_BORDER_HXX diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 291eb5142ac0..d37911ce86fe 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVXCFG_HXX #define _SVXCFG_HXX diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx index e34137f86bb0..fe869d957f65 100644 --- a/cui/source/inc/cfgutil.hxx +++ b/cui/source/inc/cfgutil.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _CFGUTIL_HXX #define _CFGUTIL_HXX diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index ca86ac553fb0..c5b075db638e 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_CHARDLG_HXX #define _SVX_CHARDLG_HXX diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx index e1b3472403bc..99495f0481eb 100644 --- a/cui/source/inc/connect.hxx +++ b/cui/source/inc/connect.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_CONNECT_HXX #define _SVX_CONNECT_HXX diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx index 58fa72bab6b2..e2e8e1c2486d 100644 --- a/cui/source/inc/cuicharmap.hxx +++ b/cui/source/inc/cuicharmap.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _CUI_CHARMAP_HXX #define _CUI_CHARMAP_HXX diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx index ea7f2bda4b40..36e5e0d70291 100644 --- a/cui/source/inc/cuifmsearch.hxx +++ b/cui/source/inc/cuifmsearch.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _CUI_FMSEARCH_HXX #define _CUI_FMSEARCH_HXX diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index f0d2581b3ba4..21f4cb76f07f 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _CUI_GALDLG_HXX_ #define _CUI_GALDLG_HXX_ diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx index 3c67e0dec405..66fdba231ce7 100644 --- a/cui/source/inc/cuigrfflt.hxx +++ b/cui/source/inc/cuigrfflt.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _CUI_GRFFLT_HXX #define _CUI_GRFFLT_HXX diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index 0899f959350b..24cd46857910 100644 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _CUI_RESID_HRC #define _CUI_REDID_HRC @@ -181,7 +172,6 @@ #define RID_SVXDLG_FILTER_WARNING (RID_SVX_START + 248) #define RID_SVXBMP_LOCK (RID_SVX_START + 118) #define RID_SVXSTR_READONLY_CONFIG_TIP (RID_SVX_START + 1026) -#define RID_SVXQB_CHANGEDATA (RID_SVX_START + 214) //? #define RID_SVXERR_OPT_DOUBLEPATHS (RID_SVX_START + 208) //? #define RID_SVXSTR_KEY_AUTOCORRECT_DIR (RID_SVX_START + 1004) //? #define RID_SVXSTR_KEY_DICTIONARY_PATH (RID_SVX_START + 1010)//? diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index 7a954f13e24d..ef3832c6687e 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _CUI_TAB_AREA_HXX #define _CUI_TAB_AREA_HXX diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index a7c31ea3fa35..d78e4618fe94 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef SVX_DBREGISTER_HXX #define SVX_DBREGISTER_HXX diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx index 839c00004a37..35c065d6120d 100644 --- a/cui/source/inc/dlgname.hxx +++ b/cui/source/inc/dlgname.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_DLG_NAME_HXX #define _SVX_DLG_NAME_HXX diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx index 02b58cab1836..22b9d3a8290a 100644 --- a/cui/source/inc/dstribut.hxx +++ b/cui/source/inc/dstribut.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_DSTRIBUT_HXX #define _SVX_DSTRIBUT_HXX diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index 7be560c0b91a..b1e9578c1aa5 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_GRFPAGE_HXX #define _SVX_GRFPAGE_HXX diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index 7e684154ae99..a1acd5053dc3 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef SVX_HANGUL_HANJA_DLG_HXX #define SVX_HANGUL_HANJA_DLG_HXX diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc index 432992e07672..a21f9704e7fa 100644 --- a/cui/source/inc/helpid.hrc +++ b/cui/source/inc/helpid.hrc @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _CUI_HELPID_HRC #define _CUI_HELPID_HRC diff --git a/cui/source/inc/hldocntp.hxx b/cui/source/inc/hldocntp.hxx index c32d432d8a9b..0f5832a59453 100644 --- a/cui/source/inc/hldocntp.hxx +++ b/cui/source/inc/hldocntp.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_TABPAGE_DOCNEW_HYPERLINK_HXX #define _SVX_TABPAGE_DOCNEW_HYPERLINK_HXX diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx index 2b1b2860aa7d..c610aa78fcd9 100644 --- a/cui/source/inc/hldoctp.hxx +++ b/cui/source/inc/hldoctp.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_TABPAGE_DOC_HYPERLINK_HXX #define _SVX_TABPAGE_DOC_HYPERLINK_HXX diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx index 9cecb288ee2d..8fef54dcfc25 100644 --- a/cui/source/inc/hlinettp.hxx +++ b/cui/source/inc/hlinettp.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_TABPAGE_INET_HYPERLINK_HXX #define _SVX_TABPAGE_INET_HYPERLINK_HXX diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx index 1916a80a64fd..de683b4f7299 100644 --- a/cui/source/inc/hlmarkwn.hxx +++ b/cui/source/inc/hlmarkwn.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_BKWND_HYPERLINK_HXX #define _SVX_BKWND_HYPERLINK_HXX diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx index 874da64f261a..9851c518db7f 100644 --- a/cui/source/inc/hltpbase.hxx +++ b/cui/source/inc/hltpbase.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_TABBASE_HYPERLINK_HXX #define _SVX_TABBASE_HYPERLINK_HXX diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index 36b64a817a36..73e01e5ad2c1 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _ICCDLG_HXX #define _ICCDLG_HXX diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx index e7f82b7c6411..24d0032aae0e 100644 --- a/cui/source/inc/insdlg.hxx +++ b/cui/source/inc/insdlg.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_INSDLG_HXX #define _SVX_INSDLG_HXX diff --git a/cui/source/inc/insrc.hxx b/cui/source/inc/insrc.hxx index 7e4f186059e5..4e472d43691b 100644 --- a/cui/source/inc/insrc.hxx +++ b/cui/source/inc/insrc.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_INSRC_HXX #define _SVX_INSRC_HXX diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx index bbbbbc41628d..44ca18b39430 100644 --- a/cui/source/inc/labdlg.hxx +++ b/cui/source/inc/labdlg.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_LABDLG_HXX #define _SVX_LABDLG_HXX diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx index f64c26d880fc..1c75302dda52 100644 --- a/cui/source/inc/linkdlg.hxx +++ b/cui/source/inc/linkdlg.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _LINKDLG_HXX #define _LINKDLG_HXX diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx index 74e925ce58e4..8172c0d98c84 100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _MACROASS_HXX #define _MACROASS_HXX diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index 8bac666c3073..b83d825fdf9d 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _MACROPG_HXX #define _MACROPG_HXX diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx index 3795133633d6..be0c0dbc5974 100644 --- a/cui/source/inc/measure.hxx +++ b/cui/source/inc/measure.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_MEASURE_HXX #define _SVX_MEASURE_HXX diff --git a/cui/source/inc/multifil.hxx b/cui/source/inc/multifil.hxx index 0ced5921502d..4e65a918801c 100644 --- a/cui/source/inc/multifil.hxx +++ b/cui/source/inc/multifil.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_MULTIFIL_HXX #define _SVX_MULTIFIL_HXX diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx index 3e93aa324d42..c36aa584a52d 100644 --- a/cui/source/inc/multipat.hxx +++ b/cui/source/inc/multipat.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_MULTIPAT_HXX #define _SVX_MULTIPAT_HXX diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index ba37c2776d29..0328b092069e 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_NUMFMT_HXX #define _SVX_NUMFMT_HXX diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx index 425a850ef2a9..db7b2b00e83c 100644 --- a/cui/source/inc/optasian.hxx +++ b/cui/source/inc/optasian.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_OPTASIAN_HXX #define _SVX_OPTASIAN_HXX diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx index 3bd7a47d0fdd..f1537a25a8d0 100644 --- a/cui/source/inc/optdict.hxx +++ b/cui/source/inc/optdict.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_OPTDICT_HXX #define _SVX_OPTDICT_HXX diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index e594f1d313f2..eefada0c45ff 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_OPTLINGU_HXX #define _SVX_OPTLINGU_HXX diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index 5617ea95d382..db237f0344a4 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_OPTPATH_HXX #define _SVX_OPTPATH_HXX diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index 4c78455ae38d..e731aef1526f 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_PAGE_HXX #define _SVX_PAGE_HXX diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index a9be70bbb0d1..ae9904fedcbc 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_PARAGRPH_HXX #define _SVX_PARAGRPH_HXX diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx index 45ec875f70c2..e4d020f9f0ac 100644 --- a/cui/source/inc/pastedlg.hxx +++ b/cui/source/inc/pastedlg.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _PASTEDLG_HXX #define _PASTEDLG_HXX diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx index d0d6b9a4e0ea..4918714a3545 100644 --- a/cui/source/inc/postdlg.hxx +++ b/cui/source/inc/postdlg.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_POSTDLG_HXX #define _SVX_POSTDLG_HXX diff --git a/cui/source/inc/radiobtnbox.hxx b/cui/source/inc/radiobtnbox.hxx index c0f4764b3ab2..21b10dcf87c0 100644 --- a/cui/source/inc/radiobtnbox.hxx +++ b/cui/source/inc/radiobtnbox.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_RADIOBTNBOX_HXX #define _SVX_RADIOBTNBOX_HXX diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index c3470638a225..9b0a86859bee 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SCRIPTDLG_HXX #define _SCRIPTDLG_HXX diff --git a/cui/source/inc/sdrcelldlg.hxx b/cui/source/inc/sdrcelldlg.hxx index 3714d3c59b51..0e5b503b133b 100644 --- a/cui/source/inc/sdrcelldlg.hxx +++ b/cui/source/inc/sdrcelldlg.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_FORMAT_CELLS_DLG_HXX #define _SVX_FORMAT_CELLS_DLG_HXX diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx index 2bad5986a33f..4da182f509c0 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVXSELECTOR_HXX #define _SVXSELECTOR_HXX diff --git a/cui/source/inc/showcols.hxx b/cui/source/inc/showcols.hxx index e0c0e3f1cc7c..37cce93af87e 100644 --- a/cui/source/inc/showcols.hxx +++ b/cui/source/inc/showcols.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_SHOWCOLS_HXX #define _SVX_SHOWCOLS_HXX diff --git a/cui/source/inc/srchxtra.hxx b/cui/source/inc/srchxtra.hxx index 0c76c623d568..871dfdbe36a5 100644 --- a/cui/source/inc/srchxtra.hxx +++ b/cui/source/inc/srchxtra.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_SRCHXTRA_HXX #define _SVX_SRCHXTRA_HXX diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index 27c65a8ccc62..0e4953a24d41 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_TABSTPGE_HXX #define _SVX_TABSTPGE_HXX diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx index d9ae1dc15dfb..45b95bbcc10c 100644 --- a/cui/source/inc/textanim.hxx +++ b/cui/source/inc/textanim.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_TEXTANIM_HXX #define _SVX_TEXTANIM_HXX diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx index f9352c7c697f..f032fb3c5721 100644 --- a/cui/source/inc/textattr.hxx +++ b/cui/source/inc/textattr.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_TEXTATTR_HXX #define _SVX_TEXTATTR_HXX diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index 35196b1905a7..072ecae12313 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_TRANSFRM_HXX #define _SVX_TRANSFRM_HXX diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index f10e524d6d9d..0b37efdb2561 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx index eefedb718d4b..b76d44f1fba6 100644 --- a/cui/source/inc/zoom.hxx +++ b/cui/source/inc/zoom.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_ZOOM_HXX #define _SVX_ZOOM_HXX diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx index 41c9f59a419d..4f0139974f35 100644 --- a/cui/source/options/cfgchart.cxx +++ b/cui/source/options/cfgchart.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include // header for SvStream diff --git a/cui/source/options/cfgchart.hxx b/cui/source/options/cfgchart.hxx index 7fcf8e2c0d94..d3f995ef9b01 100644 --- a/cui/source/options/cfgchart.hxx +++ b/cui/source/options/cfgchart.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_CFGCHART_HXX #define _SVX_CFGCHART_HXX diff --git a/cui/source/options/connpoolconfig.cxx b/cui/source/options/connpoolconfig.cxx index 0e625d56dadd..a20f4f38af09 100644 --- a/cui/source/options/connpoolconfig.cxx +++ b/cui/source/options/connpoolconfig.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "connpoolconfig.hxx" #include "connpoolsettings.hxx" diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index 158652898b43..56b094ccde7e 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "connpooloptions.hxx" #include "connpooloptions.hrc" diff --git a/cui/source/options/connpooloptions.src b/cui/source/options/connpooloptions.src index 929b70ba1739..a2df97092cc3 100644 --- a/cui/source/options/connpooloptions.src +++ b/cui/source/options/connpooloptions.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "connpooloptions.hrc" #include diff --git a/cui/source/options/connpoolsettings.cxx b/cui/source/options/connpoolsettings.cxx index e8ed445374d1..89753ae934b7 100644 --- a/cui/source/options/connpoolsettings.cxx +++ b/cui/source/options/connpoolsettings.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "connpoolsettings.hxx" diff --git a/cui/source/options/connpoolsettings.hxx b/cui/source/options/connpoolsettings.hxx index f39eca8cae24..4bd0d32a256e 100644 --- a/cui/source/options/connpoolsettings.hxx +++ b/cui/source/options/connpoolsettings.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _OFFAPP_CONNPOOLSETTINGS_HXX_ #define _OFFAPP_CONNPOOLSETTINGS_HXX_ diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 97030c1802da..8a619ffccc19 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "dbregister.hxx" #include "dbregister.hrc" diff --git a/cui/source/options/dbregister.src b/cui/source/options/dbregister.src index 3b518eea91d0..c0fcb941d66a 100644 --- a/cui/source/options/dbregister.src +++ b/cui/source/options/dbregister.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "dbregister.hrc" #include diff --git a/cui/source/options/dbregisterednamesconfig.cxx b/cui/source/options/dbregisterednamesconfig.cxx index ce06d0c5e3f7..e3a41a85a2fd 100644 --- a/cui/source/options/dbregisterednamesconfig.cxx +++ b/cui/source/options/dbregisterednamesconfig.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "connpooloptions.hxx" #include "dbregisterednamesconfig.hxx" diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx index d8f68ff4efbc..98b550069b38 100644 --- a/cui/source/options/doclinkdialog.cxx +++ b/cui/source/options/doclinkdialog.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "doclinkdialog.hxx" #include "doclinkdialog.hrc" diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx index 3d8e668c79cd..17b1af513d94 100644 --- a/cui/source/options/doclinkdialog.hxx +++ b/cui/source/options/doclinkdialog.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_DOCLINKDIALOG_HXX_ #define _SVX_DOCLINKDIALOG_HXX_ diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index 9d7898e6ec7b..c250a2d55299 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx index ad714bdab86a..9775991da304 100644 --- a/cui/source/options/fontsubs.hxx +++ b/cui/source/options/fontsubs.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_FONT_SUBSTITUTION_HXX #define _SVX_FONT_SUBSTITUTION_HXX diff --git a/cui/source/options/fontsubs.src b/cui/source/options/fontsubs.src index a99f9efbda69..7a896b7c6fd2 100644 --- a/cui/source/options/fontsubs.src +++ b/cui/source/options/fontsubs.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "fontsubs.hrc" #include "helpid.hrc" diff --git a/cui/source/options/internationaloptions.cxx b/cui/source/options/internationaloptions.cxx index bba058cdcd92..d1d341245b13 100644 --- a/cui/source/options/internationaloptions.cxx +++ b/cui/source/options/internationaloptions.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "internationaloptions.hxx" #include "internationaloptions.hrc" diff --git a/cui/source/options/optaccessibility.src b/cui/source/options/optaccessibility.src index ca946419d574..f20351de2777 100644 --- a/cui/source/options/optaccessibility.src +++ b/cui/source/options/optaccessibility.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "optaccessibility.hrc" #include diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index 914923d71fed..9c3df99dc5fd 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/options/optasian.src b/cui/source/options/optasian.src index 82ebe288fb70..c43cbdc9f1cc 100644 --- a/cui/source/options/optasian.src +++ b/cui/source/options/optasian.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "optasian.hrc" #include diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index e188ca08e7d7..06f25ef1ba2f 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx index f54c9b530d11..9d70ac411f42 100644 --- a/cui/source/options/optchart.hxx +++ b/cui/source/options/optchart.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_OPTCHART_HXX #define _SVX_OPTCHART_HXX diff --git a/cui/source/options/optchart.src b/cui/source/options/optchart.src index 5b5fe3450463..8432090a2cdc 100644 --- a/cui/source/options/optchart.src +++ b/cui/source/options/optchart.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "optchart.hrc" #include diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index ece061a21315..b6e834fa4392 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx index acdc43a6fc69..98a5f45ba7af 100644 --- a/cui/source/options/optcolor.hxx +++ b/cui/source/options/optcolor.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef SVX_OPTCOLOR_HXX #define SVX_OPTCOLOR_HXX diff --git a/cui/source/options/optcolor.src b/cui/source/options/optcolor.src index 72ae1820b4f2..914115c7c673 100644 --- a/cui/source/options/optcolor.src +++ b/cui/source/options/optcolor.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include "helpid.hrc" diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx index ead33dd169cd..1a62bb79e673 100644 --- a/cui/source/options/optctl.cxx +++ b/cui/source/options/optctl.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "optctl.hxx" #include diff --git a/cui/source/options/optctl.src b/cui/source/options/optctl.src index 97769ce51817..7e2b6179fd30 100644 --- a/cui/source/options/optctl.src +++ b/cui/source/options/optctl.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "optctl.hrc" #include "helpid.hrc" diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index b1f3dc6afe33..d478723adc70 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/options/optdict.src b/cui/source/options/optdict.src index 6f2d93f58282..7dbfe7dd3f6a 100644 --- a/cui/source/options/optdict.src +++ b/cui/source/options/optdict.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include "helpid.hrc" diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 5a6474ec645c..fc6a2185210d 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx index 83a6dfdd4b44..7502703073dc 100644 --- a/cui/source/options/optfltr.hxx +++ b/cui/source/options/optfltr.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _OFA_OPTFLTR_HXX #define _OFA_OPTFLTR_HXX diff --git a/cui/source/options/optfltr.src b/cui/source/options/optfltr.src index bbf66df1a11f..e85100fe7916 100644 --- a/cui/source/options/optfltr.src +++ b/cui/source/options/optfltr.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "optfltr.hrc" #include diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 3ff3b3c15396..84bcad0a711f 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index a6072125eddb..d8fc1ab922bb 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _OFA_OPTGDLG_HXX #define _OFA_OPTGDLG_HXX #include diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src index 61ea3ab7f070..ab6b34122de4 100644 --- a/cui/source/options/optgdlg.src +++ b/cui/source/options/optgdlg.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include "optgdlg.hrc" @@ -658,7 +649,7 @@ TabPage OFA_TP_LANGUAGES HelpID = "cui:CheckBox:OFA_TP_LANGUAGES:CB_ASIANSUPPORT"; Pos = MAP_APPFONT ( 12 , 173 ) ; Size = MAP_APPFONT ( 236 ,RSC_CD_CHECKBOX_HEIGHT ) ; - Text [ en-US ] = "E~nabled for Asian languages"; + Text [ en-US ] = "Show UI elements for East Asia~n writings"; }; FixedImage FI_CTLSUPPORT { @@ -671,7 +662,7 @@ TabPage OFA_TP_LANGUAGES HelpID = "cui:CheckBox:OFA_TP_LANGUAGES:CB_CTLSUPPORT"; Pos = MAP_APPFONT ( 12 , 188 ) ; Size = MAP_APPFONT ( 236 , RSC_CD_CHECKBOX_HEIGHT ) ; - Text [ en-US ] = "Ena~bled for complex text layout (CTL)"; + Text [ en-US ] = "Show UI elements for B~i-Directional writing"; }; }; diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index 1337f4f21144..72994ac146bf 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/options/optgenrl.src b/cui/source/options/optgenrl.src index 863398c57333..4393373f6432 100644 --- a/cui/source/options/optgenrl.src +++ b/cui/source/options/optgenrl.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include @@ -212,13 +203,4 @@ TabPage RID_SFXPAGE_GENERAL }; }; -// RID_SVXQB_CHANGEDATA --------------------------------------------------- - -QueryBox RID_SVXQB_CHANGEDATA -{ - BUTTONS = WB_YES_NO ; - DEFBUTTON = WB_DEF_NO ; - Message [ en-US ] = "The User Data have been changed.\nNote that, if you continue, the registration key will become invalid.\nTherefore, a new registration key is needed within 30 days.\nYou can find the registration form in the menu Help - Registration...\nDo you really want to change your User Data?"; -}; - // ********************************************************************** EOF diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx index 116f32cab068..999303046d8c 100644 --- a/cui/source/options/opthtml.cxx +++ b/cui/source/options/opthtml.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/options/opthtml.src b/cui/source/options/opthtml.src index b27b818f39ea..4aaf51f1f47e 100644 --- a/cui/source/options/opthtml.src +++ b/cui/source/options/opthtml.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "opthtml.hrc" #include diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 27e334b4801a..a4588f35e5f8 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index 54a0bedfcbc3..9e7919b5c191 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_OPTINET_HXX #define _SVX_OPTINET_HXX diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src index 03688e2554e7..14e609c4f4cd 100644 --- a/cui/source/options/optinet2.src +++ b/cui/source/options/optinet2.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include "helpid.hrc" diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index da379c2abb0d..d2d0347c5902 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "optjava.hxx" #include diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index 2d0839c4dda2..d59f507fa85d 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_OPTJAVA_HXX #define _SVX_OPTJAVA_HXX diff --git a/cui/source/options/optjava.src b/cui/source/options/optjava.src index baa449be46bc..77cd195386ba 100644 --- a/cui/source/options/optjava.src +++ b/cui/source/options/optjava.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "optjava.hrc" #include diff --git a/cui/source/options/optjsearch.src b/cui/source/options/optjsearch.src index 341a3f27d388..374f134a931b 100644 --- a/cui/source/options/optjsearch.src +++ b/cui/source/options/optjsearch.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index bf6e37dd10b6..bfbf28634f09 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/options/optlingu.src b/cui/source/options/optlingu.src index 15f37755c50f..700b85aa3317 100644 --- a/cui/source/options/optlingu.src +++ b/cui/source/options/optlingu.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "optlingu.hrc" #include "helpid.hrc" diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index c247c30f0064..4593fe7442fc 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sal/config.h" diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx index 60da400f44ce..93feff9dca91 100644 --- a/cui/source/options/optmemory.hxx +++ b/cui/source/options/optmemory.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _OFA_OPTMEMORY_HXX #define _OFA_OPTMEMORY_HXX diff --git a/cui/source/options/optmemory.src b/cui/source/options/optmemory.src index f55000555041..78f12811b56f 100644 --- a/cui/source/options/optmemory.src +++ b/cui/source/options/optmemory.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include "optmemory.hrc" diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 14829c57389b..90c0f2aa6939 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/options/optpath.src b/cui/source/options/optpath.src index 445cdd3782f8..ff4a80061de2 100644 --- a/cui/source/options/optpath.src +++ b/cui/source/options/optpath.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "optpath.hrc" #include #include diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index d6e0a76e8503..68f5312b8ed4 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx index 22a499c005ad..4ab3082ca4f2 100644 --- a/cui/source/options/optsave.hxx +++ b/cui/source/options/optsave.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_OPTSAVE_HXX #define _SVX_OPTSAVE_HXX diff --git a/cui/source/options/optsave.src b/cui/source/options/optsave.src index 7d5cf0af5ed3..6dc878ebe7df 100644 --- a/cui/source/options/optsave.src +++ b/cui/source/options/optsave.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index 7897aa9d3a9b..6450e5cb47bd 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx index 745cdcd3a811..b17876afd69c 100644 --- a/cui/source/options/optupdt.hxx +++ b/cui/source/options/optupdt.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_OPTUPDT_HXX #define _SVX_OPTUPDT_HXX diff --git a/cui/source/options/optupdt.src b/cui/source/options/optupdt.src index 2fdcf20d524b..a2371d0ebc6b 100644 --- a/cui/source/options/optupdt.src +++ b/cui/source/options/optupdt.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "optupdt.hrc" #include diff --git a/cui/source/options/radiobtnbox.cxx b/cui/source/options/radiobtnbox.cxx index 5bab2547c402..76b1a4ffca4e 100644 --- a/cui/source/options/radiobtnbox.cxx +++ b/cui/source/options/radiobtnbox.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "radiobtnbox.hxx" #include diff --git a/cui/source/options/readonlyimage.cxx b/cui/source/options/readonlyimage.cxx index b481c631b165..dd819cdcafa4 100644 --- a/cui/source/options/readonlyimage.cxx +++ b/cui/source/options/readonlyimage.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/options/readonlyimage.src b/cui/source/options/readonlyimage.src index 6adcd4986ecd..570dabe88cc5 100644 --- a/cui/source/options/readonlyimage.src +++ b/cui/source/options/readonlyimage.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/cui/source/options/sdbcdriverenum.cxx b/cui/source/options/sdbcdriverenum.cxx index 98b7bced375a..9033ebcb3ca4 100644 --- a/cui/source/options/sdbcdriverenum.cxx +++ b/cui/source/options/sdbcdriverenum.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "sdbcdriverenum.hxx" #include diff --git a/cui/source/options/securityoptions.src b/cui/source/options/securityoptions.src index 8806ab5e6fc5..d0f333dbed97 100644 --- a/cui/source/options/securityoptions.src +++ b/cui/source/options/securityoptions.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include "securityoptions.hrc" diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 57189590616b..d17ca4b3241a 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "cuires.hrc" #include "helpid.hrc" @@ -1286,7 +1277,7 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId ) pRet = new SfxItemSet( SFX_APP()->GetPool(), SID_BASIC_ENABLED, SID_BASIC_ENABLED, //SID_OPTIONS_START - ..END - SID_OPTIONS_START, SID_INET_PROXY_PORT, + SID_INET_PROXY_PORT, SID_SAVEREL_INET, SID_SAVEREL_FSYS, SID_INET_SMTPSERVER, SID_INET_SMTPSERVER, SID_INET_NOPROXY, SID_INET_SOCKS_PROXY_PORT, diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src index ad6273dcf96d..1c60cf79bcb5 100644 --- a/cui/source/options/treeopt.src +++ b/cui/source/options/treeopt.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "treeopt.hrc" #include diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index bc7bb02b7856..97a2f0acc961 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/options/webconninfo.hxx b/cui/source/options/webconninfo.hxx index 0bcbfc88a1a2..c07bdb298dc5 100644 --- a/cui/source/options/webconninfo.hxx +++ b/cui/source/options/webconninfo.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_WEBCONNINFO_HXX #define _SVX_WEBCONNINFO_HXX diff --git a/cui/source/options/webconninfo.src b/cui/source/options/webconninfo.src index af20fd461ff6..962f683fce89 100644 --- a/cui/source/options/webconninfo.src +++ b/cui/source/options/webconninfo.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include "webconninfo.hrc" diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index bcd862a7a783..b2aa8a4fdd28 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "align.hxx" diff --git a/cui/source/tabpages/align.src b/cui/source/tabpages/align.src index c6e02bbd3176..ad8c65acf356 100644 --- a/cui/source/tabpages/align.src +++ b/cui/source/tabpages/align.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include "helpid.hrc" diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 2a3ffbdc5d36..8d839d0e1203 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include @@ -1389,8 +1380,7 @@ OfaAutocorrExceptPage::OfaAutocorrExceptPage( Window* pParent, ::com::sun::star::lang::Locale aLcl( SvxCreateLocale(eLastDialogLanguage )); pCompareClass = new CollatorWrapper( GetProcessFact() ); - pCompareClass->loadDefaultCollator( aLcl, ::com::sun::star::i18n:: - CollatorOptions::CollatorOptions_IGNORE_CASE ); + pCompareClass->loadDefaultCollator( aLcl, 0 ); aNewAbbrevPB.SetClickHdl(LINK(this, OfaAutocorrExceptPage, NewDelHdl)); aDelAbbrevPB.SetClickHdl(LINK(this, OfaAutocorrExceptPage, NewDelHdl)); @@ -1564,9 +1554,7 @@ void OfaAutocorrExceptPage::SetLanguage(LanguageType eSet) eLastDialogLanguage = eSet; delete pCompareClass; pCompareClass = new CollatorWrapper( GetProcessFact() ); - pCompareClass->loadDefaultCollator( SvxCreateLocale( eLastDialogLanguage ), - ::com::sun::star::i18n:: - CollatorOptions::CollatorOptions_IGNORE_CASE ); + pCompareClass->loadDefaultCollator( SvxCreateLocale( eLastDialogLanguage ), 0 ); ModifyHdl(&aAbbrevED); ModifyHdl(&aDoubleCapsED); } diff --git a/cui/source/tabpages/autocdlg.src b/cui/source/tabpages/autocdlg.src index fd1d6e11a617..299dcf9f5863 100644 --- a/cui/source/tabpages/autocdlg.src +++ b/cui/source/tabpages/autocdlg.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "autocdlg.hrc" #include diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 87044935b294..930e380be207 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/tabpages/backgrnd.src b/cui/source/tabpages/backgrnd.src index b21a0912a84a..330337cc482d 100644 --- a/cui/source/tabpages/backgrnd.src +++ b/cui/source/tabpages/backgrnd.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include "helpid.hrc" diff --git a/cui/source/tabpages/bbdlg.cxx b/cui/source/tabpages/bbdlg.cxx index 691a6124723f..37948cddcec5 100644 --- a/cui/source/tabpages/bbdlg.cxx +++ b/cui/source/tabpages/bbdlg.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index e51a492e80b2..a79868299d7a 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/tabpages/border.src b/cui/source/tabpages/border.src index 68f1e85c10d4..fba3eaa79e9c 100644 --- a/cui/source/tabpages/border.src +++ b/cui/source/tabpages/border.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "helpid.hrc" #include diff --git a/cui/source/tabpages/borderconn.cxx b/cui/source/tabpages/borderconn.cxx index 7d04c6f96145..1365dedc76cd 100644 --- a/cui/source/tabpages/borderconn.cxx +++ b/cui/source/tabpages/borderconn.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "borderconn.hxx" #include diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 1d340290ad52..62b539c35541 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index 962d1589c2ed..f1d088d2ec39 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/tabpages/connect.src b/cui/source/tabpages/connect.src index 590f0e8278eb..a6b087d9a0d9 100644 --- a/cui/source/tabpages/connect.src +++ b/cui/source/tabpages/connect.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include "connect.hrc" diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx index 6d77934a6711..cb09e449851b 100644 --- a/cui/source/tabpages/dstribut.cxx +++ b/cui/source/tabpages/dstribut.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/tabpages/dstribut.src b/cui/source/tabpages/dstribut.src index e9c373164c2c..adbcbd8b27be 100644 --- a/cui/source/tabpages/dstribut.src +++ b/cui/source/tabpages/dstribut.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include "dstribut.hrc" diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 0547aa804f79..84de225d2471 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/tabpages/grfpage.src b/cui/source/tabpages/grfpage.src index d9d2fde34b63..89fa84665b0c 100644 --- a/cui/source/tabpages/grfpage.src +++ b/cui/source/tabpages/grfpage.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include "helpid.hrc" diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index 21cdbf6aae50..1091b4d34835 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/tabpages/labdlg.src b/cui/source/tabpages/labdlg.src index 06552335bebd..e1a10605fc4f 100644 --- a/cui/source/tabpages/labdlg.src +++ b/cui/source/tabpages/labdlg.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "helpid.hrc" #include "labdlg.hrc" diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 1821211013fc..881e59a7d2cf 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #define ITEMID_MACRO 0 #include diff --git a/cui/source/tabpages/macroass.src b/cui/source/tabpages/macroass.src index dc314c79a4aa..3414428c6738 100644 --- a/cui/source/tabpages/macroass.src +++ b/cui/source/tabpages/macroass.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "macroass.hrc" #include "cuires.hrc" diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index e83a517e21b1..215ba1b75820 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/tabpages/measure.src b/cui/source/tabpages/measure.src index d820804886af..9a0e2a84407b 100644 --- a/cui/source/tabpages/measure.src +++ b/cui/source/tabpages/measure.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include "measure.hrc" diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 855cc90e7d16..014f87b877a3 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/tabpages/numfmt.src b/cui/source/tabpages/numfmt.src index 909761683998..e71cbbca244c 100644 --- a/cui/source/tabpages/numfmt.src +++ b/cui/source/tabpages/numfmt.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include "helpid.hrc" diff --git a/cui/source/tabpages/numpages.src b/cui/source/tabpages/numpages.src index 7c0e37b922ad..48decdcf3b32 100644 --- a/cui/source/tabpages/numpages.src +++ b/cui/source/tabpages/numpages.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index ecdc05f13c6d..8baad063f297 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/tabpages/page.src b/cui/source/tabpages/page.src index e79fa45afac3..4504b691b0bb 100644 --- a/cui/source/tabpages/page.src +++ b/cui/source/tabpages/page.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include "helpid.hrc" diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 27483b9b2615..7a8348f9a44a 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/tabpages/paragrph.src b/cui/source/tabpages/paragrph.src index 6d5ae543e109..d27d636c28a3 100644 --- a/cui/source/tabpages/paragrph.src +++ b/cui/source/tabpages/paragrph.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include "helpid.hrc" diff --git a/cui/source/tabpages/strings.src b/cui/source/tabpages/strings.src index 046959574dcc..7be94ddecca6 100644 --- a/cui/source/tabpages/strings.src +++ b/cui/source/tabpages/strings.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index caa95e0706b4..db448376951d 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/tabpages/swpossizetabpage.hxx b/cui/source/tabpages/swpossizetabpage.hxx index eac4894bd9b9..f1b36b9eac1e 100644 --- a/cui/source/tabpages/swpossizetabpage.hxx +++ b/cui/source/tabpages/swpossizetabpage.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SVX_SWPOSSIZETABPAGE_HXX #define _SVX_SWPOSSIZETABPAGE_HXX diff --git a/cui/source/tabpages/swpossizetabpage.src b/cui/source/tabpages/swpossizetabpage.src index c1f51591ba66..5cde0d5a9d18 100644 --- a/cui/source/tabpages/swpossizetabpage.src +++ b/cui/source/tabpages/swpossizetabpage.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "helpid.hrc" #include diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx index 6af90bfab37e..780a7b67b35a 100644 --- a/cui/source/tabpages/tabarea.cxx +++ b/cui/source/tabpages/tabarea.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/tabpages/tabarea.src b/cui/source/tabpages/tabarea.src index c824b8a5fa0d..17ae4203f3a1 100644 --- a/cui/source/tabpages/tabarea.src +++ b/cui/source/tabpages/tabarea.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "helpid.hrc" #include diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx index bed657b8dfb9..5eac85b15f42 100644 --- a/cui/source/tabpages/tabline.cxx +++ b/cui/source/tabpages/tabline.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index 58784d8afceb..d5f1a5c6fbe1 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/tabpages/tabstpge.src b/cui/source/tabpages/tabstpge.src index 26a73a15256e..822cfb76a3ba 100644 --- a/cui/source/tabpages/tabstpge.src +++ b/cui/source/tabpages/tabstpge.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "helpid.hrc" #include diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index 6ef5aa070b52..b075c9427014 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/tabpages/textanim.src b/cui/source/tabpages/textanim.src index 1845853e2bae..29687df73bc4 100644 --- a/cui/source/tabpages/textanim.src +++ b/cui/source/tabpages/textanim.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index c56873dece75..32e0448fc2ba 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/tabpages/textattr.src b/cui/source/tabpages/textattr.src index 15f00d68f5e5..1b43d53e226e 100644 --- a/cui/source/tabpages/textattr.src +++ b/cui/source/tabpages/textattr.src @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index ea2c8120f657..87b410fff68c 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 2bb0d73024d6..c080cb355936 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include @@ -119,7 +110,7 @@ SvxBitmapTabPage::SvxBitmapTabPage aLbBackgroundColor.SetSelectHdl( LINK( this, SvxBitmapTabPage, ChangeBackgrndColorHdl_Impl ) ); - String accName = String(SVX_RES(STR_EXAMPLE)); + String accName = String(CUI_RES(STR_EXAMPLE)); aCtlPreview.SetAccessibleName(accName); aCtlPixel.SetAccessibleRelationMemberOf( &aFlProp ); aCtlPixel.SetAccessibleRelationLabeledBy( &aFtPixelEdit ); diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 8f5cfc068612..d464e68ebb84 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 46b60ee9b291..a5a37a0c8179 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index e86eecce54f6..20cfeafa42a2 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 825e9b74c07e..2bd6c2848330 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index e2d8c0fdf1d0..9f25566c6bc2 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index e88514bafc86..7213cdc6baf6 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 54d32d81e558..93d83aee0aaa 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/cui/util/cui.component b/cui/util/cui.component index ab1129353f13..158087f8f6fb 100644 --- a/cui/util/cui.component +++ b/cui/util/cui.component @@ -1,34 +1,21 @@ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . +--> diff --git a/cui/util/cui.map b/cui/util/cui.map index 5f35b1685aa2..f8eb4bb0924d 100644 --- a/cui/util/cui.map +++ b/cui/util/cui.map @@ -1,3 +1,20 @@ +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# This file incorporates work covered by the following license notice: +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . +# UDK_3_0_0 { global: CreateDialogFactory; diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 8b2aea2781c2..7ebbc855d787 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -231,7 +231,7 @@ my_components += component/embeddedobj/source/msole/emboleobj .END .IF "$(DISABLE_NEON)" != "TRUE" -my_components += component/ucb/source/ucp/webdav/ucpdav1 +my_components += component/ucb/source/ucp/webdav-neon/ucpdav1 .END .IF "$(ENABLE_CAIRO_CANVAS)" == "TRUE" diff --git a/ucb/Makefile b/ucb/Makefile index ccb1c85a04da..0997e628485b 100644 --- a/ucb/Makefile +++ b/ucb/Makefile @@ -1,4 +1,11 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) diff --git a/ucb/qa/unoapi/knownissues.xcl b/ucb/qa/unoapi/knownissues.xcl index 7929c1612c18..8f0de81ea3f9 100644 --- a/ucb/qa/unoapi/knownissues.xcl +++ b/ucb/qa/unoapi/knownissues.xcl @@ -1,2 +1,19 @@ +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# This file incorporates work covered by the following license notice: +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . +# ### i86626 ### ucb.UniversalContentBroker::com::sun::star::ucb::XCommandProcessor diff --git a/ucb/qa/unoapi/ucb.sce b/ucb/qa/unoapi/ucb.sce index 6d8cd4584ed2..0c798cfdedab 100644 --- a/ucb/qa/unoapi/ucb.sce +++ b/ucb/qa/unoapi/ucb.sce @@ -1,3 +1,20 @@ +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# This file incorporates work covered by the following license notice: +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . +# -o ucb.UcbContentProviderProxyFactory -o ucb.UcbPropertiesManager -o ucb.UcbStore diff --git a/ucb/source/cacher/cached1.component b/ucb/source/cacher/cached1.component index 13cc57684444..59cd38dcad1c 100644 --- a/ucb/source/cacher/cached1.component +++ b/ucb/source/cacher/cached1.component @@ -1,30 +1,21 @@ - + diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx index 5e26adc6cf13..5f04be9eae1e 100644 --- a/ucb/source/cacher/cachedcontentresultset.cxx +++ b/ucb/source/cacher/cachedcontentresultset.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx index a3e858c59662..4069056c0d44 100644 --- a/ucb/source/cacher/cachedcontentresultsetstub.cxx +++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/ucb/source/cacher/cacheddynamicresultset.cxx b/ucb/source/cacher/cacheddynamicresultset.cxx index 9075adc8484e..f6594f817755 100644 --- a/ucb/source/cacher/cacheddynamicresultset.cxx +++ b/ucb/source/cacher/cacheddynamicresultset.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.cxx b/ucb/source/cacher/cacheddynamicresultsetstub.cxx index 01404c285004..f85f09d46d5f 100644 --- a/ucb/source/cacher/cacheddynamicresultsetstub.cxx +++ b/ucb/source/cacher/cacheddynamicresultsetstub.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/ucb/source/cacher/cacheserv.cxx b/ucb/source/cacher/cacheserv.cxx index dcd0c185819a..79cc52af4f04 100644 --- a/ucb/source/cacher/cacheserv.cxx +++ b/ucb/source/cacher/cacheserv.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx index a31ed07fccce..6d072994e7d1 100644 --- a/ucb/source/cacher/contentresultsetwrapper.cxx +++ b/ucb/source/cacher/contentresultsetwrapper.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx index 1bd35d0ac5e2..5c098b3417a5 100644 --- a/ucb/source/cacher/dynamicresultsetwrapper.cxx +++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/ucb/source/core/identify.cxx b/ucb/source/core/identify.cxx index 51402c8b2cd6..e9e7d953ace1 100644 --- a/ucb/source/core/identify.cxx +++ b/ucb/source/core/identify.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ /************************************************************************** diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx index ec51642c9a03..a9bb3a4f4165 100644 --- a/ucb/source/core/provprox.cxx +++ b/ucb/source/core/provprox.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx index c3ad4337460f..e844b87fdc08 100644 --- a/ucb/source/core/ucb.cxx +++ b/ucb/source/core/ucb.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ /************************************************************************** diff --git a/ucb/source/core/ucb1.component b/ucb/source/core/ucb1.component index 7dff3113cbbe..00b43ee2ae9a 100644 --- a/ucb/source/core/ucb1.component +++ b/ucb/source/core/ucb1.component @@ -1,30 +1,21 @@ - + diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx index 4585efb6a3e3..62635e4f3a86 100644 --- a/ucb/source/core/ucbcmds.cxx +++ b/ucb/source/core/ucbcmds.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ /************************************************************************** diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx index 24cb44c33020..3c14a2048dd2 100644 --- a/ucb/source/core/ucbprops.cxx +++ b/ucb/source/core/ucbprops.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/ucb/source/core/ucbserv.cxx b/ucb/source/core/ucbserv.cxx index 1eb6ddbec6dc..ae327989dbe3 100644 --- a/ucb/source/core/ucbserv.cxx +++ b/ucb/source/core/ucbserv.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx index 4e847980c265..61a40c3bc474 100644 --- a/ucb/source/core/ucbstore.cxx +++ b/ucb/source/core/ucbstore.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ /************************************************************************** diff --git a/ucb/source/inc/regexp.hxx b/ucb/source/inc/regexp.hxx index faed20e2de32..b59b7187bd0c 100644 --- a/ucb/source/inc/regexp.hxx +++ b/ucb/source/inc/regexp.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _UCB_REGEXP_HXX_ #define _UCB_REGEXP_HXX_ diff --git a/ucb/source/inc/regexpmap.tpt b/ucb/source/inc/regexpmap.tpt index b4e274ae94ed..60f8474aadbf 100644 --- a/ucb/source/inc/regexpmap.tpt +++ b/ucb/source/inc/regexpmap.tpt @@ -1,29 +1,20 @@ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * OpenOffice.org - a multi-platform office productivity suite + * This file incorporates work covered by the following license notice: * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _UCB_REGEXPMAP_TPT_ #define _UCB_REGEXPMAP_TPT_ diff --git a/ucb/source/regexp/regexp.cxx b/ucb/source/regexp/regexp.cxx index 69e5b7afaba7..db3934bcb79a 100644 --- a/ucb/source/regexp/regexp.cxx +++ b/ucb/source/regexp/regexp.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx index f208402784c1..e66e323b3d40 100644 --- a/ucb/source/sorter/sortdynres.cxx +++ b/ucb/source/sorter/sortdynres.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/ucb/source/sorter/sortmain.cxx b/ucb/source/sorter/sortmain.cxx index ed2d70798eef..603105507efd 100644 --- a/ucb/source/sorter/sortmain.cxx +++ b/ucb/source/sorter/sortmain.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx index d75eaeff3c08..c1f7a643bf71 100644 --- a/ucb/source/sorter/sortresult.cxx +++ b/ucb/source/sorter/sortresult.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/ucb/source/sorter/srtrs1.component b/ucb/source/sorter/srtrs1.component index 4f59e54d7f10..fb38f62069d5 100644 --- a/ucb/source/sorter/srtrs1.component +++ b/ucb/source/sorter/srtrs1.component @@ -1,30 +1,21 @@ - + diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx index 4e2aadef6843..e41e5b2ddfa9 100644 --- a/ucb/source/ucp/expand/ucpexpand.cxx +++ b/ucb/source/ucp/expand/ucpexpand.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "rtl/uri.hxx" diff --git a/ucb/source/ucp/expand/ucpexpand1.component b/ucb/source/ucp/expand/ucpexpand1.component index 307522ce1372..32887fdabd44 100644 --- a/ucb/source/ucp/expand/ucpexpand1.component +++ b/ucb/source/ucp/expand/ucpexpand1.component @@ -1,30 +1,21 @@ - + diff --git a/ucb/source/ucp/ext/ucpext.component b/ucb/source/ucp/ext/ucpext.component index 29266f473203..6aad2e7cc227 100644 --- a/ucb/source/ucp/ext/ucpext.component +++ b/ucb/source/ucp/ext/ucpext.component @@ -1,30 +1,21 @@ - + diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx index dcfe4ed4de2c..c94be779f099 100644 --- a/ucb/source/ucp/ext/ucpext_content.cxx +++ b/ucb/source/ucp/ext/ucpext_content.cxx @@ -1,29 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/* + * This file is part of the LibreOffice project. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * OpenOffice.org - a multi-platform office productivity suite + * This file incorporates work covered by the following license notice: * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * -************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "ucpext_content.hxx" diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.cxx b/ucb/source/ucp/ext/ucpext_datasupplier.cxx index 28a7fa2aa6c2..7456a13ddc17 100644 --- a/ucb/source/ucp/ext/ucpext_datasupplier.cxx +++ b/ucb/source/ucp/ext/ucpext_datasupplier.cxx @@ -1,29 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/* + * This file is part of the LibreOffice project. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * OpenOffice.org - a multi-platform office productivity suite + * This file incorporates work covered by the following license notice: * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * -************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "ucpext_datasupplier.hxx" diff --git a/ucb/source/ucp/ext/ucpext_provider.cxx b/ucb/source/ucp/ext/ucpext_provider.cxx index e6dbe6781330..95120c3f877c 100644 --- a/ucb/source/ucp/ext/ucpext_provider.cxx +++ b/ucb/source/ucp/ext/ucpext_provider.cxx @@ -1,29 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/* + * This file is part of the LibreOffice project. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * OpenOffice.org - a multi-platform office productivity suite + * This file incorporates work covered by the following license notice: * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * -************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "ucpext_provider.hxx" #include "ucpext_content.hxx" diff --git a/ucb/source/ucp/ext/ucpext_services.cxx b/ucb/source/ucp/ext/ucpext_services.cxx index 41fef9f52117..bcf6b6164693 100644 --- a/ucb/source/ucp/ext/ucpext_services.cxx +++ b/ucb/source/ucp/ext/ucpext_services.cxx @@ -1,29 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/* + * This file is part of the LibreOffice project. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * OpenOffice.org - a multi-platform office productivity suite + * This file incorporates work covered by the following license notice: * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * -************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "ucpext_provider.hxx" diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx index 1fd46a0a354f..f6063cc67a21 100644 --- a/ucb/source/ucp/file/bc.cxx +++ b/ucb/source/ucp/file/bc.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/ucb/source/ucp/file/filcmd.cxx b/ucb/source/ucp/file/filcmd.cxx index 36569bba64f9..2a570704b4b8 100644 --- a/ucb/source/ucp/file/filcmd.cxx +++ b/ucb/source/ucp/file/filcmd.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - /************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "filcmd.hxx" #include "shell.hxx" diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx index ef9e65f1b6d4..acf69f2f6857 100644 --- a/ucb/source/ucp/file/filglob.cxx +++ b/ucb/source/ucp/file/filglob.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - /************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include "filglob.hxx" diff --git a/ucb/source/ucp/file/filid.cxx b/ucb/source/ucp/file/filid.cxx index 6feb044b8f45..0f234ca5899e 100644 --- a/ucb/source/ucp/file/filid.cxx +++ b/ucb/source/ucp/file/filid.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "filid.hxx" #include "shell.hxx" diff --git a/ucb/source/ucp/file/filinpstr.cxx b/ucb/source/ucp/file/filinpstr.cxx index 36290a563550..bc9afd016037 100644 --- a/ucb/source/ucp/file/filinpstr.cxx +++ b/ucb/source/ucp/file/filinpstr.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - /************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "filinpstr.hxx" #include "filerror.hxx" diff --git a/ucb/source/ucp/file/filinsreq.cxx b/ucb/source/ucp/file/filinsreq.cxx index 1ac3d39944c1..ef2e2cafc5aa 100644 --- a/ucb/source/ucp/file/filinsreq.cxx +++ b/ucb/source/ucp/file/filinsreq.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - /************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "filinsreq.hxx" #include "shell.hxx" diff --git a/ucb/source/ucp/file/filnot.hxx b/ucb/source/ucp/file/filnot.hxx index 44485fe2f344..ee6a2467b5ee 100644 --- a/ucb/source/ucp/file/filnot.hxx +++ b/ucb/source/ucp/file/filnot.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _FILNOT_HXX_ #define _FILNOT_HXX_ diff --git a/ucb/source/ucp/file/filprp.cxx b/ucb/source/ucp/file/filprp.cxx index db2adf886c0a..f7cec500475b 100644 --- a/ucb/source/ucp/file/filprp.cxx +++ b/ucb/source/ucp/file/filprp.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "shell.hxx" #include "prov.hxx" diff --git a/ucb/source/ucp/file/filrec.cxx b/ucb/source/ucp/file/filrec.cxx index 0ec0f125eea9..5526a791ccc9 100644 --- a/ucb/source/ucp/file/filrec.cxx +++ b/ucb/source/ucp/file/filrec.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "filrec.hxx" diff --git a/ucb/source/ucp/file/filrow.cxx b/ucb/source/ucp/file/filrow.cxx index 4ded9894b545..1c48f0a2ce7b 100644 --- a/ucb/source/ucp/file/filrow.cxx +++ b/ucb/source/ucp/file/filrow.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "filrow.hxx" #include "shell.hxx" diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx index 2c98f2924570..eb5a0cef86d9 100644 --- a/ucb/source/ucp/file/filrset.cxx +++ b/ucb/source/ucp/file/filrset.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include "filid.hxx" diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx index 499e45401131..e9d0553f249e 100644 --- a/ucb/source/ucp/file/filstr.cxx +++ b/ucb/source/ucp/file/filstr.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - /************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "com/sun/star/io/IOException.hpp" #include "com/sun/star/uno/RuntimeException.hpp" diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx index f34ef10c88d2..4053583a01a9 100644 --- a/ucb/source/ucp/file/filtask.hxx +++ b/ucb/source/ucp/file/filtask.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _FILTASK_HXX_ #define _FILTASK_HXX_ #endif diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx index d7b5a35904e5..d1468453ab76 100644 --- a/ucb/source/ucp/file/prov.cxx +++ b/ucb/source/ucp/file/prov.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx index fe5b3b68ec05..3410248d4e58 100644 --- a/ucb/source/ucp/file/shell.cxx +++ b/ucb/source/ucp/file/shell.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - /************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include "osl/diagnose.h" diff --git a/ucb/source/ucp/file/shell.hxx b/ucb/source/ucp/file/shell.hxx index 87a9f27d56d7..1d3892d0002d 100644 --- a/ucb/source/ucp/file/shell.hxx +++ b/ucb/source/ucp/file/shell.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SHELL_HXX_ diff --git a/ucb/source/ucp/file/ucpfile1.component b/ucb/source/ucp/file/ucpfile1.component index 7cfe70c8e7c0..3b8be79de734 100644 --- a/ucb/source/ucp/file/ucpfile1.component +++ b/ucb/source/ucp/file/ucpfile1.component @@ -1,30 +1,21 @@ - + diff --git a/ucb/source/ucp/ftp/ftpcfunc.hxx b/ucb/source/ucp/ftp/ftpcfunc.hxx index 607e27720dc1..27eced59eb49 100644 --- a/ucb/source/ucp/ftp/ftpcfunc.hxx +++ b/ucb/source/ucp/ftp/ftpcfunc.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ /************************************************************************** TODO diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx index 314226aaf6dc..eb4979c3307e 100644 --- a/ucb/source/ucp/ftp/ftpcontent.cxx +++ b/ucb/source/ucp/ftp/ftpcontent.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ /************************************************************************** diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx index 13d85ab65730..485647775af9 100644 --- a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx +++ b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ /************************************************************************** diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.cxx b/ucb/source/ucp/ftp/ftpcontentprovider.cxx index f05ce18bf107..9eff7864dc85 100644 --- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx +++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ /************************************************************************** diff --git a/ucb/source/ucp/ftp/ftpdirp.cxx b/ucb/source/ucp/ftp/ftpdirp.cxx index f611a3283c08..c847a32d7acf 100644 --- a/ucb/source/ucp/ftp/ftpdirp.cxx +++ b/ucb/source/ucp/ftp/ftpdirp.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ /************************************************************************** diff --git a/ucb/source/ucp/ftp/ftphandleprovider.hxx b/ucb/source/ucp/ftp/ftphandleprovider.hxx index e55d8bb1de18..5fccaf2198c2 100644 --- a/ucb/source/ucp/ftp/ftphandleprovider.hxx +++ b/ucb/source/ucp/ftp/ftphandleprovider.hxx @@ -1,4 +1,22 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + #include #include "curl.hxx" diff --git a/ucb/source/ucp/ftp/ftpintreq.cxx b/ucb/source/ucp/ftp/ftpintreq.cxx index 45a6dde67945..966e332a146a 100644 --- a/ucb/source/ucp/ftp/ftpintreq.cxx +++ b/ucb/source/ucp/ftp/ftpintreq.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/ucb/source/ucp/ftp/ftpresultsetI.cxx b/ucb/source/ucp/ftp/ftpresultsetI.cxx index a38185eac213..f723d40dea8b 100644 --- a/ucb/source/ucp/ftp/ftpresultsetI.cxx +++ b/ucb/source/ucp/ftp/ftpresultsetI.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "ucbhelper/propertyvalueset.hxx" diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.cxx b/ucb/source/ucp/ftp/ftpresultsetbase.cxx index a876bce0f6c2..701c2e77f00f 100644 --- a/ucb/source/ucp/ftp/ftpresultsetbase.cxx +++ b/ucb/source/ucp/ftp/ftpresultsetbase.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/ucb/source/ucp/ftp/ftpservices.cxx b/ucb/source/ucp/ftp/ftpservices.cxx index 059755140d7e..07b6e445bed0 100644 --- a/ucb/source/ucp/ftp/ftpservices.cxx +++ b/ucb/source/ucp/ftp/ftpservices.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/ucb/source/ucp/ftp/ftpstrcont.hxx b/ucb/source/ucp/ftp/ftpstrcont.hxx index e7f87b760906..f7017c4d8d83 100644 --- a/ucb/source/ucp/ftp/ftpstrcont.hxx +++ b/ucb/source/ucp/ftp/ftpstrcont.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ /************************************************************************** TODO diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx index 06ffa42cfe67..b3002fadab5c 100644 --- a/ucb/source/ucp/ftp/ftpurl.cxx +++ b/ucb/source/ucp/ftp/ftpurl.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ /************************************************************************** TODO diff --git a/ucb/source/ucp/ftp/ftpurl.hxx b/ucb/source/ucp/ftp/ftpurl.hxx index e411045bf1f9..b1d8b1375934 100644 --- a/ucb/source/ucp/ftp/ftpurl.hxx +++ b/ucb/source/ucp/ftp/ftpurl.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ /************************************************************************** TODO diff --git a/ucb/source/ucp/ftp/test.cxx b/ucb/source/ucp/ftp/test.cxx index dc8fd284fa09..6141e2c52916 100644 --- a/ucb/source/ucp/ftp/test.cxx +++ b/ucb/source/ucp/ftp/test.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ /************************************************************************** diff --git a/ucb/source/ucp/ftp/test_activedatasink.cxx b/ucb/source/ucp/ftp/test_activedatasink.cxx index 6acc7ee9bf84..0faa1180de64 100644 --- a/ucb/source/ucp/ftp/test_activedatasink.cxx +++ b/ucb/source/ucp/ftp/test_activedatasink.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ /************************************************************************** diff --git a/ucb/source/ucp/ftp/test_ftpurl.cxx b/ucb/source/ucp/ftp/test_ftpurl.cxx index 573453e04595..bb9fa020e865 100644 --- a/ucb/source/ucp/ftp/test_ftpurl.cxx +++ b/ucb/source/ucp/ftp/test_ftpurl.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/ucb/source/ucp/ftp/test_multiservicefac.cxx b/ucb/source/ucp/ftp/test_multiservicefac.cxx index 79429a4276ab..83dc96aefd08 100644 --- a/ucb/source/ucp/ftp/test_multiservicefac.cxx +++ b/ucb/source/ucp/ftp/test_multiservicefac.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ /************************************************************************** diff --git a/ucb/source/ucp/ftp/ucpftp1.component b/ucb/source/ucp/ftp/ucpftp1.component index c0137e9510ec..4b0af66ed2c1 100644 --- a/ucb/source/ucp/ftp/ucpftp1.component +++ b/ucb/source/ucp/ftp/ucpftp1.component @@ -1,30 +1,21 @@ - + diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx index 5029e06bf026..b19e98b33aa1 100644 --- a/ucb/source/ucp/gio/gio_content.cxx +++ b/ucb/source/ucp/gio/gio_content.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/ucb/source/ucp/gio/gio_datasupplier.cxx b/ucb/source/ucp/gio/gio_datasupplier.cxx index b41b96cc6f0f..0c6e40657c9d 100644 --- a/ucb/source/ucp/gio/gio_datasupplier.cxx +++ b/ucb/source/ucp/gio/gio_datasupplier.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/ucb/source/ucp/gio/gio_mount.hxx b/ucb/source/ucp/gio/gio_mount.hxx index f826cee26f03..7347249753b2 100644 --- a/ucb/source/ucp/gio/gio_mount.hxx +++ b/ucb/source/ucp/gio/gio_mount.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef GIO_MOUNT_HXX #define GIO_MOUNT_HXX diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx index b645aa10f1bf..40a744a29b57 100644 --- a/ucb/source/ucp/gio/gio_provider.cxx +++ b/ucb/source/ucp/gio/gio_provider.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/ucb/source/ucp/gio/ucpgio.component b/ucb/source/ucp/gio/ucpgio.component index 5993e7088445..045f951fd130 100644 --- a/ucb/source/ucp/gio/ucpgio.component +++ b/ucb/source/ucp/gio/ucpgio.component @@ -1,30 +1,21 @@ - + diff --git a/ucb/source/ucp/gvfs/gvfs_content.cxx b/ucb/source/ucp/gvfs/gvfs_content.cxx index 4ebee9119df8..6ae71a85c1a8 100644 --- a/ucb/source/ucp/gvfs/gvfs_content.cxx +++ b/ucb/source/ucp/gvfs/gvfs_content.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/ucb/source/ucp/gvfs/gvfs_directory.cxx b/ucb/source/ucp/gvfs/gvfs_directory.cxx index 354723ebe8c6..7ece3b2eb5ce 100644 --- a/ucb/source/ucp/gvfs/gvfs_directory.cxx +++ b/ucb/source/ucp/gvfs/gvfs_directory.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ /* * This file pinched from webdavdatasupplier (etc.) diff --git a/ucb/source/ucp/gvfs/gvfs_provider.cxx b/ucb/source/ucp/gvfs/gvfs_provider.cxx index 6b7ae7c17165..cefb6867ac28 100644 --- a/ucb/source/ucp/gvfs/gvfs_provider.cxx +++ b/ucb/source/ucp/gvfs/gvfs_provider.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/ucb/source/ucp/gvfs/gvfs_stream.cxx b/ucb/source/ucp/gvfs/gvfs_stream.cxx index 18dacfa50c34..462fde93d9ac 100644 --- a/ucb/source/ucp/gvfs/gvfs_stream.cxx +++ b/ucb/source/ucp/gvfs/gvfs_stream.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "gvfs_stream.hxx" #include diff --git a/ucb/source/ucp/gvfs/ucpgvfs.component b/ucb/source/ucp/gvfs/ucpgvfs.component index abb2901d46c2..a738921faa93 100644 --- a/ucb/source/ucp/gvfs/ucpgvfs.component +++ b/ucb/source/ucp/gvfs/ucpgvfs.component @@ -1,30 +1,21 @@ - + diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx index 777147bc00ee..af0ff20b0c50 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ /************************************************************************** diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.hxx b/ucb/source/ucp/hierarchy/hierarchycontent.hxx index 115721fa5ceb..052c62bb9827 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.hxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _HIERARCHYCONTENT_HXX #define _HIERARCHYCONTENT_HXX diff --git a/ucb/source/ucp/hierarchy/hierarchydata.cxx b/ucb/source/ucp/hierarchy/hierarchydata.cxx index 63a90ad8ea4c..75665a918e74 100644 --- a/ucb/source/ucp/hierarchy/hierarchydata.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydata.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ /************************************************************************** diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx index 9430c56159a0..574cff078a54 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ /************************************************************************** diff --git a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx index 6dfdf6f8c9fc..bf85e374dd4f 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ /************************************************************************** diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx index dfed6f6600be..ba11dff28586 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ /************************************************************************** diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx index e3c0c477512b..8c44691806ae 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _HIERARCHYPROVIDER_HXX #define _HIERARCHYPROVIDER_HXX diff --git a/ucb/source/ucp/hierarchy/hierarchyservices.cxx b/ucb/source/ucp/hierarchy/hierarchyservices.cxx index d020c22e0dc9..a121e668b9dd 100644 --- a/ucb/source/ucp/hierarchy/hierarchyservices.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyservices.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/ucb/source/ucp/hierarchy/hierarchyuri.cxx b/ucb/source/ucp/hierarchy/hierarchyuri.cxx index 8d6d051177f1..f4cbd0ab37ca 100644 --- a/ucb/source/ucp/hierarchy/hierarchyuri.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyuri.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ /************************************************************************** diff --git a/ucb/source/ucp/hierarchy/ucphier1.component b/ucb/source/ucp/hierarchy/ucphier1.component index 4c93da0e6d8e..ace85c72fee9 100644 --- a/ucb/source/ucp/hierarchy/ucphier1.component +++ b/ucb/source/ucp/hierarchy/ucphier1.component @@ -1,30 +1,21 @@ - + diff --git a/ucb/source/ucp/inc/urihelper.hxx b/ucb/source/ucp/inc/urihelper.hxx index ea317b90a44c..b39d9ed676e4 100644 --- a/ucb/source/ucp/inc/urihelper.hxx +++ b/ucb/source/ucp/inc/urihelper.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_URIHELPER_HXX #define INCLUDED_URIHELPER_HXX diff --git a/ucb/source/ucp/odma/odma.h b/ucb/source/ucp/odma/odma.h index f59dcca6f3c3..c75f21c844af 100644 --- a/ucb/source/ucp/odma/odma.h +++ b/ucb/source/ucp/odma/odma.h @@ -1,6 +1,49 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* odma.h - Definitions, prototypes, etc. for Open Document Managment API (ODMA) version 2.0. + OPEN DOCUMENT MANAGEMENT API LICENSE 1.0 + + ODMA 2.0 SPECIFICATIONS AND SOFTWARE + ------------------------------------ + + Copyright © 1994-1998 AIIM International + +LICENSE: + + Redistribution and use in source and binary forms, with or + without modifications, are permitted provided that the + following conditions are met: + + * Redistributions of source code must retain the above + copyright notice, this list of conditions and the + following disclaimer. + + * Redistributions in binary form must reproduce the + above copyright notice, this list of conditions and + the following disclaimer in the documentation and/or + other materials provided with the distribution. + + * Neither the name of AIIM International nor the names + of its contributors may be used to endorse or promote + products derived from this software without specific + prior written permission. + +DISCLAIMER: + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING + BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. COPYRIGHT (C) 1994, 1995 AIIM International @@ -16,201 +59,201 @@ typedef LPSTR (*ODMSAVEASCALLBACK)(DWORD dwEnvData, LPSTR lpszFormat, LPVOID pIn typedef int ODMSTATUS; /* Constants */ -#define ODM_API_VERSION 200 /* Version of the API */ +#define ODM_API_VERSION 200 /* Version of the API */ #ifdef WIN32 - #define ODM_DOCID_MAX 255 /* Win32 */ + #define ODM_DOCID_MAX 255 /* Win32 */ #elif defined( _WINDOWS_ ) || defined( _MSDOS ) - #define ODM_DOCID_MAX 80 /* Windows 3.x */ + #define ODM_DOCID_MAX 80 /* Windows 3.x */ #else - #define ODM_DOCID_MAX 255 /* Other platforms */ + #define ODM_DOCID_MAX 255 /* Other platforms */ #endif -#define ODM_DMSID_MAX 9 /* Max length of a DMS ID including the - terminating NULL character. */ +#define ODM_DMSID_MAX 9 /* Max length of a DMS ID including the + terminating NULL character. */ -#define ODM_APPID_MAX 16 /* Max length of a application ID including - the terminating NULL character. */ +#define ODM_APPID_MAX 16 /* Max length of a application ID including + the terminating NULL character. */ // ODMA 2.0 -#define ODM_QUERYID_MAX 255 // Max length of a query ID including +#define ODM_QUERYID_MAX 255 // Max length of a query ID including // the terminating NULL character. -#define ODM_FORMAT_MAX 81 // Max length of a format including +#define ODM_FORMAT_MAX 81 // Max length of a format including // the terminating NULL character. // Maximum length of a filename returned by ODMA including the terminating -// NULL character. Platform dependent. +// NULL character. Platform dependent. #ifdef WIN32 - #define ODM_FILENAME_MAX 255 /* Win32 */ + #define ODM_FILENAME_MAX 255 /* Win32 */ #elif defined( _WINDOWS_ ) || defined( _MSDOS ) - #define ODM_FILENAME_MAX 128 /* Windows 3.x */ + #define ODM_FILENAME_MAX 128 /* Windows 3.x */ #elif defined( unix ) || defined( _UNIX ) #define ODM_FILENAME_MAX 1024 /* Unix */ #else - #define ODM_FILENAME_MAX 255 /* Other platforms */ + #define ODM_FILENAME_MAX 255 /* Other platforms */ #endif /* Common format type names */ -#define ODM_FORMAT_TEXT "Text" -#define ODM_FORMAT_RTF "Rich text format" -#define ODM_FORMAT_DCA "DCA RFT" /* IBM DCA Rich Format Text */ -#define ODM_FORMAT_TIFF "Tiff" -#define ODM_FORMAT_GIF "Gif" /* Compuserve Graphics Interchange Format */ -#define ODM_FORMAT_BMP "Windows bitmap" -#define ODM_FORMAT_PCX "PCX" -#define ODM_FORMAT_CGM "CGM" /* Computer Graphics Metafile */ -#define ODM_FORMAT_EXE "Executable file" -#define ODM_FORMAT_PCL "PCL" /* HP Printer Control Language */ -#define ODM_FORMAT_PS "PostScript" +#define ODM_FORMAT_TEXT "Text" +#define ODM_FORMAT_RTF "Rich text format" +#define ODM_FORMAT_DCA "DCA RFT" /* IBM DCA Rich Format Text */ +#define ODM_FORMAT_TIFF "Tiff" +#define ODM_FORMAT_GIF "Gif" /* Compuserve Graphics Interchange Format */ +#define ODM_FORMAT_BMP "Windows bitmap" +#define ODM_FORMAT_PCX "PCX" +#define ODM_FORMAT_CGM "CGM" /* Computer Graphics Metafile */ +#define ODM_FORMAT_EXE "Executable file" +#define ODM_FORMAT_PCL "PCL" /* HP Printer Control Language */ +#define ODM_FORMAT_PS "PostScript" /* Error returns */ -#define ODM_SUCCESS 0 // Success! -#define ODM_E_FAIL 1 /* Unspecified failure */ -#define ODM_E_CANCEL 2 /* Action was cancelled at user's request */ -#define ODM_E_NODMS 3 /* DMS not registered */ -#define ODM_E_CANTINIT 4 /* DMS failed to initalize */ -#define ODM_E_VERSION 5 /* DMS doesn't support the requested +#define ODM_SUCCESS 0 // Success! +#define ODM_E_FAIL 1 /* Unspecified failure */ +#define ODM_E_CANCEL 2 /* Action was cancelled at user's request */ +#define ODM_E_NODMS 3 /* DMS not registered */ +#define ODM_E_CANTINIT 4 /* DMS failed to initalize */ +#define ODM_E_VERSION 5 /* DMS doesn't support the requested version of ODMA */ -#define ODM_E_APPSELECT 6 /* User has indicated that he wants to use +#define ODM_E_APPSELECT 6 /* User has indicated that he wants to use the application's file selection capabilities rather than those of the DMS. */ -#define ODM_E_USERINT 7 /* Requested action cannot be performed +#define ODM_E_USERINT 7 /* Requested action cannot be performed without user interaction, but silent mode was specified. */ #define ODM_E_HANDLE 8 /* The DMHANDLE argument was invalid. */ #define ODM_E_ACCESS 9 /* User does not have requested access rights to specified document. */ -#define ODM_E_INUSE 10 /* Document is currently in use and cannot +#define ODM_E_INUSE 10 /* Document is currently in use and cannot be accessed in specified mode. */ -#define ODM_E_DOCID 11 /* Invalid document ID */ -#define ODM_E_OPENMODE 12 /* The specified action is incompatible +#define ODM_E_DOCID 11 /* Invalid document ID */ +#define ODM_E_OPENMODE 12 /* The specified action is incompatible with the mode in which the document was opened. */ #define ODM_E_NOOPEN 13 /* The specified document is not open. */ -#define ODM_E_ITEM 14 /* Invalid item specifier. */ -#define ODM_E_OTHERAPP 15 /* Selected document was for another app. */ -#define ODM_E_NOMOREDATA 16 /* No more data is available */ -#define ODM_E_PARTIALSUCCESS 17 /* */ +#define ODM_E_ITEM 14 /* Invalid item specifier. */ +#define ODM_E_OTHERAPP 15 /* Selected document was for another app. */ +#define ODM_E_NOMOREDATA 16 /* No more data is available */ +#define ODM_E_PARTIALSUCCESS 17 /* */ // Additional Error code from ODMA 2.0 -#define ODM_E_REQARG 18 /* */ -#define ODM_E_NOSUPPORT 19 /* */ -#define ODM_E_TRUNCATED 20 /* */ +#define ODM_E_REQARG 18 /* */ +#define ODM_E_NOSUPPORT 19 /* */ +#define ODM_E_TRUNCATED 20 /* */ #define ODM_E_INVARG 21 -#define ODM_E_OFFLINE 22 /* */ +#define ODM_E_OFFLINE 22 /* */ // ODMOpenDoc modes -#define ODM_MODIFYMODE 1 /* Open document in a modifiable mode. */ +#define ODM_MODIFYMODE 1 /* Open document in a modifiable mode. */ #define ODM_VIEWMODE 2 /* Open document in non-modifiable mode. */ // ODMA 2.0 -#define ODM_REFCOPY 3 +#define ODM_REFCOPY 3 // Actions for ODMActivate -#define ODM_NONE 0 /* No specific action is requested. */ -#define ODM_DELETE 1 /* Delete the specified document. */ -#define ODM_SHOWATTRIBUTES 2 /* Display the specified document's profile - or attributes. */ -#define ODM_EDITATTRIBUTES 3 /* Edit the specified document's profile or - attributes. */ -#define ODM_VIEWDOC 4 /* Display the specified document in a - viewer window. */ -#define ODM_OPENDOC 5 /* Open the specified document in its - native application. */ +#define ODM_NONE 0 /* No specific action is requested. */ +#define ODM_DELETE 1 /* Delete the specified document. */ +#define ODM_SHOWATTRIBUTES 2 /* Display the specified document's profile + or attributes. */ +#define ODM_EDITATTRIBUTES 3 /* Edit the specified document's profile or + attributes. */ +#define ODM_VIEWDOC 4 /* Display the specified document in a + viewer window. */ +#define ODM_OPENDOC 5 /* Open the specified document in its + native application. */ // ODMA 2.0 -#define ODM_NEWDOC 6 -#define ODM_CHECKOUT 7 -#define ODM_CANCELCHECKOUT 8 -#define ODM_CHECKIN 9 -#define ODM_SHOWHISTORY 10 +#define ODM_NEWDOC 6 +#define ODM_CHECKOUT 7 +#define ODM_CANCELCHECKOUT 8 +#define ODM_CHECKIN 9 +#define ODM_SHOWHISTORY 10 // Item selectors for ODMGetDocInfo and ODMSetDocInfo -#define ODM_AUTHOR 1 /* Author of the document. */ -#define ODM_NAME 2 /* Descriptive name of the document. */ -#define ODM_TYPE 3 /* Type of the document. */ -#define ODM_TITLETEXT 4 /* Suggested text to display in the - document window's title bar. */ -#define ODM_DMS_DEFINED 5 /* DMS defined data. */ -#define ODM_CONTENTFORMAT 6 /* String describing document's format */ +#define ODM_AUTHOR 1 /* Author of the document. */ +#define ODM_NAME 2 /* Descriptive name of the document. */ +#define ODM_TYPE 3 /* Type of the document. */ +#define ODM_TITLETEXT 4 /* Suggested text to display in the + document window's title bar. */ +#define ODM_DMS_DEFINED 5 /* DMS defined data. */ +#define ODM_CONTENTFORMAT 6 /* String describing document's format */ // ODMA 2.0 #define ODM_ALTERNATE_RENDERINGS 7 #define ODM_CHECKEDOUTBY 8 -#define ODM_CHECKOUTCOMMENT 9 +#define ODM_CHECKOUTCOMMENT 9 #define ODM_CHECKOUTDATE 10 -#define ODM_CREATEDBY 11 -#define ODM_CREATEDDATE 12 +#define ODM_CREATEDBY 11 +#define ODM_CREATEDDATE 12 #define ODM_DOCID_LATEST 13 -#define ODM_DOCID_RELEASED 14 -#define ODM_DOCVERSION 15 -#define ODM_DOCVERSION_LATEST 16 -#define ODM_DOCVERSION_RELEASED 17 +#define ODM_DOCID_RELEASED 14 +#define ODM_DOCVERSION 15 +#define ODM_DOCVERSION_LATEST 16 +#define ODM_DOCVERSION_RELEASED 17 #define ODM_LOCATION 18 #define ODM_KEYWORDS 19 -#define ODM_LASTCHECKINBY 20 -#define ODM_LASTCHECKINDATE 21 -#define ODM_MODIFYDATE 22 -#define ODM_MODIFYDATE_LATEST 23 -#define ODM_MODIFYDATE_RELEASED 24 -#define ODM_OWNER 25 -#define ODM_SUBJECT 26 +#define ODM_LASTCHECKINBY 20 +#define ODM_LASTCHECKINDATE 21 +#define ODM_MODIFYDATE 22 +#define ODM_MODIFYDATE_LATEST 23 +#define ODM_MODIFYDATE_RELEASED 24 +#define ODM_OWNER 25 +#define ODM_SUBJECT 26 #define ODM_TITLETEXT_RO 27 -#define ODM_URL 28 +#define ODM_URL 28 // Item selectors for ODMQueryCapability ODMA 2.0 -#define ODM_QC_ACTIVATE 1 -#define ODM_QC_CLOSEDOC 2 -#define ODM_QC_CLOSEDOCEX 3 -#define ODM_QC_GETALTERNATECONTENT 4 -#define ODM_QC_GETDMSINFO 5 -#define ODM_QC_GETDOCINFO 6 -#define ODM_QC_GETDOCRELATION 7 -#define ODM_QC_GETLEADMONIKER 8 -#define ODM_QC_NEWDOC 9 -#define ODM_QC_OPENDOC 10 -#define ODM_QC_QUERYCLOSE 11 -#define ODM_QC_QUERYEXECUTE 12 -#define ODM_QC_QUERYGETRESULTS 13 -#define ODM_QC_SAVEAS 14 -#define ODM_QC_SAVEASEX 15 -#define ODM_QC_SAVEDOC 16 +#define ODM_QC_ACTIVATE 1 +#define ODM_QC_CLOSEDOC 2 +#define ODM_QC_CLOSEDOCEX 3 +#define ODM_QC_GETALTERNATECONTENT 4 +#define ODM_QC_GETDMSINFO 5 +#define ODM_QC_GETDOCINFO 6 +#define ODM_QC_GETDOCRELATION 7 +#define ODM_QC_GETLEADMONIKER 8 +#define ODM_QC_NEWDOC 9 +#define ODM_QC_OPENDOC 10 +#define ODM_QC_QUERYCLOSE 11 +#define ODM_QC_QUERYEXECUTE 12 +#define ODM_QC_QUERYGETRESULTS 13 +#define ODM_QC_SAVEAS 14 +#define ODM_QC_SAVEASEX 15 +#define ODM_QC_SAVEDOC 16 #define ODM_QC_SAVEDOCEX 17 #define ODM_QC_SELECTDOC 18 -#define ODM_QC_SELECTDOCEX 19 -#define ODM_QC_SETALTERNATECONTENT 20 -#define ODM_QC_SETDOCEVENT 21 -#define ODM_QC_SETDOCRELATION 22 -#define ODM_QC_SETDOCINFO 23 +#define ODM_QC_SELECTDOCEX 19 +#define ODM_QC_SETALTERNATECONTENT 20 +#define ODM_QC_SETDOCEVENT 21 +#define ODM_QC_SETDOCRELATION 22 +#define ODM_QC_SETDOCINFO 23 // Misc. modes, flags -#define ODM_SILENT 16 /* Don't interact with the user while - fulfilling this request. */ +#define ODM_SILENT 16 /* Don't interact with the user while + fulfilling this request. */ //ODMA 2.0 -#define ODM_VERSION_SAME 1 -#define ODM_VERSION_MAJOR 2 -#define ODM_VERSION_MINOR 4 -#define ODM_VERSION_CHANGED 8 -#define ODM_ALT_DELETE 32 +#define ODM_VERSION_SAME 1 +#define ODM_VERSION_MAJOR 2 +#define ODM_VERSION_MINOR 4 +#define ODM_VERSION_CHANGED 8 +#define ODM_ALT_DELETE 32 //ODMA 2.0 DMS Info Flags -#define ODM_EXT_QUERY 1 -#define ODM_EXT_WORKFLOW 2 +#define ODM_EXT_QUERY 1 +#define ODM_EXT_WORKFLOW 2 // Flags for Query Interface -#define ODM_ALL 1 // All DMS's should be searched -#define ODM_SPECIFIC 2 // Only specific DMS's should be searched +#define ODM_ALL 1 // All DMS's should be searched +#define ODM_SPECIFIC 2 // Only specific DMS's should be searched // Function prototypes @@ -282,7 +325,7 @@ ODMSTATUS WINAPI ODMSaveAsEx(ODMHANDLE odmHandle, LPSTR lpszDocId, LPVOID pInstanceData, LPDWORD pdwFlags); ODMSTATUS WINAPI ODMSaveDocEx(ODMHANDLE odmHandle, LPSTR lpszDocId, - LPSTR lpszNewDocId, LPDWORD pdwFlags); + LPSTR lpszNewDocId, LPDWORD pdwFlags); ODMSTATUS WINAPI ODMSelectDocEx(ODMHANDLE odmHandle, LPSTR lpszDocIds, LPWORD pwDocIdsLen, LPWORD pwDocCount, LPDWORD pdwFlags, diff --git a/ucb/source/ucp/odma/odma_content.cxx b/ucb/source/ucp/odma/odma_content.cxx index 5ca37c71461f..4c1269e36344 100644 --- a/ucb/source/ucp/odma/odma_content.cxx +++ b/ucb/source/ucp/odma/odma_content.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/ucb/source/ucp/odma/odma_content.hxx b/ucb/source/ucp/odma/odma_content.hxx index 8f9052efe5e2..1741d11c742e 100644 --- a/ucb/source/ucp/odma/odma_content.hxx +++ b/ucb/source/ucp/odma/odma_content.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef ODMA_CONTENT_HXX #define ODMA_CONTENT_HXX diff --git a/ucb/source/ucp/odma/odma_contentcaps.cxx b/ucb/source/ucp/odma/odma_contentcaps.cxx index 29fa2301c127..b27c920d188a 100644 --- a/ucb/source/ucp/odma/odma_contentcaps.cxx +++ b/ucb/source/ucp/odma/odma_contentcaps.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/ucb/source/ucp/odma/odma_contentprops.hxx b/ucb/source/ucp/odma/odma_contentprops.hxx index ba59f62e8f72..5b0aeba113a5 100644 --- a/ucb/source/ucp/odma/odma_contentprops.hxx +++ b/ucb/source/ucp/odma/odma_contentprops.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef ODMA_CONTENTPROPS_HXX #define ODMA_CONTENTPROPS_HXX diff --git a/ucb/source/ucp/odma/odma_datasupplier.cxx b/ucb/source/ucp/odma/odma_datasupplier.cxx index 4516845ad4ca..b4ed1496a728 100644 --- a/ucb/source/ucp/odma/odma_datasupplier.cxx +++ b/ucb/source/ucp/odma/odma_datasupplier.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifdef WNT diff --git a/ucb/source/ucp/odma/odma_inputstream.cxx b/ucb/source/ucp/odma/odma_inputstream.cxx index 1dd96dfd31c7..839e5ccbb273 100644 --- a/ucb/source/ucp/odma/odma_inputstream.cxx +++ b/ucb/source/ucp/odma/odma_inputstream.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "com/sun/star/io/IOException.hpp" #include diff --git a/ucb/source/ucp/odma/odma_lib.cxx b/ucb/source/ucp/odma/odma_lib.cxx index 7fc8154d9f41..157fad76196b 100644 --- a/ucb/source/ucp/odma/odma_lib.cxx +++ b/ucb/source/ucp/odma/odma_lib.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifdef WNT #include diff --git a/ucb/source/ucp/odma/odma_lib.hxx b/ucb/source/ucp/odma/odma_lib.hxx index b11546417c29..e40f0c2d012e 100644 --- a/ucb/source/ucp/odma/odma_lib.hxx +++ b/ucb/source/ucp/odma/odma_lib.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef ODMA_LIB_HXX #define ODMA_LIB_HXX diff --git a/ucb/source/ucp/odma/odma_main.cxx b/ucb/source/ucp/odma/odma_main.cxx index 4123c78ab4f5..8d47eb90c03b 100644 --- a/ucb/source/ucp/odma/odma_main.cxx +++ b/ucb/source/ucp/odma/odma_main.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifdef WNT diff --git a/ucb/source/ucp/odma/odma_provider.cxx b/ucb/source/ucp/odma/odma_provider.cxx index 90a0d7309d36..b4d4eb9bd1a6 100644 --- a/ucb/source/ucp/odma/odma_provider.cxx +++ b/ucb/source/ucp/odma/odma_provider.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifdef WNT diff --git a/ucb/source/ucp/odma/odma_provider.hxx b/ucb/source/ucp/odma/odma_provider.hxx index 7f99bbeccdb7..590e6b569d3c 100644 --- a/ucb/source/ucp/odma/odma_provider.hxx +++ b/ucb/source/ucp/odma/odma_provider.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef ODMA_PROVIDER_HXX #define ODMA_PROVIDER_HXX diff --git a/ucb/source/ucp/odma/odma_services.cxx b/ucb/source/ucp/odma/odma_services.cxx index 93d7d1f41246..e118e19d7b25 100644 --- a/ucb/source/ucp/odma/odma_services.cxx +++ b/ucb/source/ucp/odma/odma_services.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifdef WNT #include diff --git a/ucb/source/ucp/odma/ucpodma1.component b/ucb/source/ucp/odma/ucpodma1.component index 709ebea17d11..754e8ae98983 100644 --- a/ucb/source/ucp/odma/ucpodma1.component +++ b/ucb/source/ucp/odma/ucpodma1.component @@ -1,31 +1,21 @@ - - + diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx index 3b4ee22660de..0affd591f396 100644 --- a/ucb/source/ucp/package/pkgcontent.cxx +++ b/ucb/source/ucp/package/pkgcontent.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ /************************************************************************** diff --git a/ucb/source/ucp/package/pkgdatasupplier.cxx b/ucb/source/ucp/package/pkgdatasupplier.cxx index 0758a09d406d..e49b343053e6 100644 --- a/ucb/source/ucp/package/pkgdatasupplier.cxx +++ b/ucb/source/ucp/package/pkgdatasupplier.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ /************************************************************************** diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx index 38d463b9be5d..0f1cf5f6f3d8 100644 --- a/ucb/source/ucp/package/pkgprovider.cxx +++ b/ucb/source/ucp/package/pkgprovider.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ /************************************************************************** diff --git a/ucb/source/ucp/package/pkgservices.cxx b/ucb/source/ucp/package/pkgservices.cxx index b1a2841ffad7..881a7127009f 100644 --- a/ucb/source/ucp/package/pkgservices.cxx +++ b/ucb/source/ucp/package/pkgservices.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/ucb/source/ucp/package/pkguri.cxx b/ucb/source/ucp/package/pkguri.cxx index 137100375e81..b3c201786b24 100644 --- a/ucb/source/ucp/package/pkguri.cxx +++ b/ucb/source/ucp/package/pkguri.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ /************************************************************************** diff --git a/ucb/source/ucp/package/ucppkg1.component b/ucb/source/ucp/package/ucppkg1.component index c842595ade16..6501ed9f70ee 100644 --- a/ucb/source/ucp/package/ucppkg1.component +++ b/ucb/source/ucp/package/ucppkg1.component @@ -1,30 +1,21 @@ - + diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx index 76ec1aefecb2..7c0d9ac8421f 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.cxx +++ b/ucb/source/ucp/tdoc/tdoc_content.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ /************************************************************************** diff --git a/ucb/source/ucp/tdoc/tdoc_content.hxx b/ucb/source/ucp/tdoc/tdoc_content.hxx index 4221015d72c5..9ce328e37b44 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.hxx +++ b/ucb/source/ucp/tdoc/tdoc_content.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_TDOC_CONTENT_HXX #define INCLUDED_TDOC_CONTENT_HXX diff --git a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx index 90d5cc13c50c..a8d6d847ae46 100644 --- a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx +++ b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ /************************************************************************** diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx index 1bfc40a1f55b..7bbccdaee6fd 100644 --- a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx +++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ /************************************************************************** diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx index b9c7c81c1dc3..19f35caaa349 100644 --- a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx +++ b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ /************************************************************************** diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx index 086f71433c9a..02046341f1c9 100644 --- a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx +++ b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_TDOC_DOCMGR_HXX #define INCLUDED_TDOC_DOCMGR_HXX diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx index 494fa71ee7a1..dbf8b65eaad0 100644 --- a/ucb/source/ucp/tdoc/tdoc_provider.cxx +++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ /************************************************************************** diff --git a/ucb/source/ucp/tdoc/tdoc_services.cxx b/ucb/source/ucp/tdoc/tdoc_services.cxx index 77f2c04bfdc0..d4ebd499043e 100644 --- a/ucb/source/ucp/tdoc/tdoc_services.cxx +++ b/ucb/source/ucp/tdoc/tdoc_services.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "com/sun/star/lang/XMultiServiceFactory.hpp" diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx index 83c2f3260c5c..8d24314ab437 100644 --- a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx +++ b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ /************************************************************************** diff --git a/ucb/source/ucp/tdoc/tdoc_storage.cxx b/ucb/source/ucp/tdoc/tdoc_storage.cxx index 30deb334074f..b71d6149134e 100644 --- a/ucb/source/ucp/tdoc/tdoc_storage.cxx +++ b/ucb/source/ucp/tdoc/tdoc_storage.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/ucb/source/ucp/tdoc/tdoc_uri.cxx b/ucb/source/ucp/tdoc/tdoc_uri.cxx index 6526a10dc2e6..8d5584df2d14 100644 --- a/ucb/source/ucp/tdoc/tdoc_uri.cxx +++ b/ucb/source/ucp/tdoc/tdoc_uri.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ /************************************************************************** diff --git a/ucb/source/ucp/tdoc/tdoc_uri.hxx b/ucb/source/ucp/tdoc/tdoc_uri.hxx index 7bd8aa595170..bf6d19baf034 100644 --- a/ucb/source/ucp/tdoc/tdoc_uri.hxx +++ b/ucb/source/ucp/tdoc/tdoc_uri.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_TDOC_URI_HXX #define INCLUDED_TDOC_URI_HXX diff --git a/ucb/source/ucp/tdoc/ucptdoc1.component b/ucb/source/ucp/tdoc/ucptdoc1.component index bc67905480f9..116407cbd6ab 100644 --- a/ucb/source/ucp/tdoc/ucptdoc1.component +++ b/ucb/source/ucp/tdoc/ucptdoc1.component @@ -1,30 +1,21 @@ - + diff --git a/ucb/source/ucp/webdav/AprEnv.cxx b/ucb/source/ucp/webdav/AprEnv.cxx new file mode 100644 index 000000000000..4353cee7d006 --- /dev/null +++ b/ucb/source/ucp/webdav/AprEnv.cxx @@ -0,0 +1,58 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_ucb.hxx" + +#include + +namespace apr_environment +{ + +AprEnv::AprEnv() + : mpAprPool( 0 ) +{ + apr_initialize(); + + apr_pool_create(&mpAprPool, NULL); +} + +AprEnv::~AprEnv() +{ + apr_pool_destroy(mpAprPool); + + apr_terminate(); +} + +/* static */ +AprEnv* AprEnv::getAprEnv() +{ + static AprEnv rAprEnv; + + return &rAprEnv; +} + +apr_pool_t* AprEnv::getAprPool() +{ + return mpAprPool; +} + +} // namespace apr_environment + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/AprEnv.hxx b/ucb/source/ucp/webdav/AprEnv.hxx new file mode 100644 index 000000000000..a887256bf6a4 --- /dev/null +++ b/ucb/source/ucp/webdav/AprEnv.hxx @@ -0,0 +1,50 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + + +#ifndef INCLUDED_APRENV_HXX +#define INCLUDED_APRENV_HXX + +#include + +namespace apr_environment +{ + +// singleton class providing environment for APR libraries +class AprEnv +{ + public: + ~AprEnv(); + + static AprEnv* getAprEnv(); + + apr_pool_t* getAprPool(); + + private: + apr_pool_t* mpAprPool; + + AprEnv(); + +}; + +} // namespace apr_environment + +#endif // INCLUDED_APRENV_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/ContentProperties.cxx b/ucb/source/ucp/webdav/ContentProperties.cxx new file mode 100644 index 000000000000..a268acd25d73 --- /dev/null +++ b/ucb/source/ucp/webdav/ContentProperties.cxx @@ -0,0 +1,666 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + + + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_ucb.hxx" + +/************************************************************************** + TODO + ************************************************************************** + + *************************************************************************/ +#include +#include +#include "SerfUri.hxx" +#include "DAVResource.hxx" +#include "DAVProperties.hxx" +#include "DateTimeHelper.hxx" +#include "webdavprovider.hxx" +#include "ContentProperties.hxx" + +using namespace com::sun::star; +using namespace http_dav_ucp; + +/* +============================================================================= + + Property Mapping + +============================================================================= +HTTP (entity header) WebDAV (property) UCB (property) +============================================================================= + +Allow +Content-Encoding +Content-Language getcontentlanguage +Content-Length getcontentlength Size +Content-Location +Content-MD5 +Content-Range +Content-Type getcontenttype MediaType +Expires +Last-Modified getlastmodified DateModified + creationdate DateCreated + resourcetype IsFolder,IsDocument,ContentType + displayname +ETag (actually getetag +a response header ) + lockdiscovery + supportedlock + source + Title (always taken from URI) + +============================================================================= + +Important: HTTP headers will not be mapped to DAV properties; only to UCB + properties. (Content-Length,Content-Type,Last-Modified) +*/ + +//========================================================================= +//========================================================================= +// +// ContentProperties Implementation. +// +//========================================================================= +//========================================================================= + +// static member! +uno::Any ContentProperties::m_aEmptyAny; + +ContentProperties::ContentProperties( const DAVResource& rResource ) +: m_xProps( new PropertyValueMap ), + m_bTrailingSlash( false ) +{ + OSL_ENSURE( rResource.uri.getLength(), + "ContentProperties ctor - Empty resource URI!" ); + + // Title + try + { + SerfUri aURI( rResource.uri ); + m_aEscapedTitle = aURI.GetPathBaseName(); + + (*m_xProps)[ rtl::OUString::createFromAscii( "Title" ) ] + = PropertyValue( + uno::makeAny( aURI.GetPathBaseNameUnescaped() ), true ); + } + catch ( DAVException const & ) + { + (*m_xProps)[ rtl::OUString::createFromAscii( "Title" ) ] + = PropertyValue( + uno::makeAny( + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( "*** unknown ***" ) ) ), + true ); + } + + std::vector< DAVPropertyValue >::const_iterator it + = rResource.properties.begin(); + std::vector< DAVPropertyValue >::const_iterator end + = rResource.properties.end(); + + while ( it != end ) + { + addProperty( (*it) ); + ++it; + } + + if ( rResource.uri.getStr()[ rResource.uri.getLength() - 1 ] + == sal_Unicode( '/' ) ) + m_bTrailingSlash = sal_True; +} + +//========================================================================= +ContentProperties::ContentProperties( + const rtl::OUString & rTitle, sal_Bool bFolder ) +: m_xProps( new PropertyValueMap ), + m_bTrailingSlash( sal_False ) +{ + (*m_xProps)[ rtl::OUString::createFromAscii( "Title" ) ] + = PropertyValue( uno::makeAny( rTitle ), true ); + (*m_xProps)[ rtl::OUString::createFromAscii( "IsFolder" ) ] + = PropertyValue( uno::makeAny( bFolder ), true ); + (*m_xProps)[ rtl::OUString::createFromAscii( "IsDocument" ) ] + = PropertyValue( uno::makeAny( sal_Bool( !bFolder ) ), true ); +} + +//========================================================================= +ContentProperties::ContentProperties( const rtl::OUString & rTitle ) +: m_xProps( new PropertyValueMap ), + m_bTrailingSlash( sal_False ) +{ + (*m_xProps)[ rtl::OUString::createFromAscii( "Title" ) ] + = PropertyValue( uno::makeAny( rTitle ), true ); +} + +//========================================================================= +ContentProperties::ContentProperties() +: m_xProps( new PropertyValueMap ), + m_bTrailingSlash( sal_False ) +{ +} + +//========================================================================= +ContentProperties::ContentProperties( const ContentProperties & rOther ) +: m_aEscapedTitle( rOther.m_aEscapedTitle ), + m_xProps( rOther.m_xProps.get() + ? new PropertyValueMap( *rOther.m_xProps ) + : new PropertyValueMap ), + m_bTrailingSlash( rOther.m_bTrailingSlash ) +{ +} + +//========================================================================= +bool ContentProperties::contains( const rtl::OUString & rName ) const +{ + if ( get( rName ) ) + return true; + else + return false; +} + +//========================================================================= +const uno::Any & ContentProperties::getValue( + const rtl::OUString & rName ) const +{ + const PropertyValue * pProp = get( rName ); + if ( pProp ) + return pProp->value(); + else + return m_aEmptyAny; +} + +//========================================================================= +const PropertyValue * ContentProperties::get( + const rtl::OUString & rName ) const +{ + PropertyValueMap::const_iterator it = m_xProps->find( rName ); + const PropertyValueMap::const_iterator end = m_xProps->end(); + + if ( it == end ) + { + it = m_xProps->begin(); + while ( it != end ) + { + if ( (*it).first.equalsIgnoreAsciiCase( rName ) ) + return &(*it).second; + + ++it; + } + return 0; + } + else + return &(*it).second; +} + +//========================================================================= +// static +void ContentProperties::UCBNamesToDAVNames( + const uno::Sequence< beans::Property > & rProps, + std::vector< rtl::OUString > & propertyNames, + bool bIncludeUnmatched /* = true */ ) +{ + ////////////////////////////////////////////////////////////// + // Assemble list of DAV properties to obtain from server. + // Append DAV properties needed to obtain requested UCB props. + ////////////////////////////////////////////////////////////// + + // DAV UCB + // creationdate <- DateCreated + // getlastmodified <- DateModified + // getcontenttype <- MediaType + // getcontentlength <- Size + // resourcetype <- IsFolder, IsDocument, ContentType + // (taken from URI) <- Title + + sal_Bool bCreationDate = sal_False; + sal_Bool bLastModified = sal_False; + sal_Bool bContentType = sal_False; + sal_Bool bContentLength = sal_False; + sal_Bool bResourceType = sal_False; + + sal_Int32 nCount = rProps.getLength(); + for ( sal_Int32 n = 0; n < nCount; ++n ) + { + const beans::Property & rProp = rProps[ n ]; + + if ( rProp.Name.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "Title" ) ) ) + { + // Title is always obtained from resource's URI. + continue; + } + else if ( rProp.Name.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "DateCreated" ) ) + || + ( rProp.Name == DAVProperties::CREATIONDATE ) ) + { + if ( !bCreationDate ) + { + propertyNames.push_back( DAVProperties::CREATIONDATE ); + bCreationDate = sal_True; + } + } + else if ( rProp.Name.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "DateModified" ) ) + || + ( rProp.Name == DAVProperties::GETLASTMODIFIED ) ) + { + if ( !bLastModified ) + { + propertyNames.push_back( + DAVProperties::GETLASTMODIFIED ); + bLastModified = sal_True; + } + } + else if ( rProp.Name.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) + || + ( rProp.Name == DAVProperties::GETCONTENTTYPE ) ) + { + if ( !bContentType ) + { + propertyNames.push_back( + DAVProperties::GETCONTENTTYPE ); + bContentType = sal_True; + } + } + else if ( rProp.Name.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "Size" ) ) + || + ( rProp.Name == DAVProperties::GETCONTENTLENGTH ) ) + { + if ( !bContentLength ) + { + propertyNames.push_back( + DAVProperties::GETCONTENTLENGTH ); + bContentLength = sal_True; + } + } + else if ( rProp.Name.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "ContentType" ) ) + || + rProp.Name.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "IsDocument" ) ) + || + rProp.Name.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "IsFolder" ) ) + || + ( rProp.Name == DAVProperties::RESOURCETYPE ) ) + { + if ( !bResourceType ) + { + propertyNames.push_back( DAVProperties::RESOURCETYPE ); + bResourceType = sal_True; + } + } + else + { + if ( bIncludeUnmatched ) + propertyNames.push_back( rProp.Name ); + } + } +} + +//========================================================================= +// static +void ContentProperties::UCBNamesToHTTPNames( + const uno::Sequence< beans::Property > & rProps, + std::vector< rtl::OUString > & propertyNames, + bool bIncludeUnmatched /* = true */ ) +{ + ////////////////////////////////////////////////////////////// + // Assemble list of HTTP header names to obtain from server. + // Append HTTP headers needed to obtain requested UCB props. + ////////////////////////////////////////////////////////////// + + // HTTP UCB + // Last-Modified <- DateModified + // Content-Type <- MediaType + // Content-Length <- Size + + sal_Int32 nCount = rProps.getLength(); + for ( sal_Int32 n = 0; n < nCount; ++n ) + { + const beans::Property & rProp = rProps[ n ]; + + if ( rProp.Name.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "DateModified" ) ) ) + { + propertyNames.push_back( + rtl::OUString::createFromAscii( "Last-Modified" ) ); + } + else if ( rProp.Name.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) ) + { + propertyNames.push_back( + rtl::OUString::createFromAscii( "Content-Type" ) ); + } + else if ( rProp.Name.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "Size" ) ) ) + { + propertyNames.push_back( + rtl::OUString::createFromAscii( "Content-Length" ) ); + } + else + { + if ( bIncludeUnmatched ) + propertyNames.push_back( rProp.Name ); + } + } +} + +//========================================================================= +bool ContentProperties::containsAllNames( + const uno::Sequence< beans::Property >& rProps, + std::vector< rtl::OUString > & rNamesNotContained ) const +{ + rNamesNotContained.clear(); + + sal_Int32 nCount = rProps.getLength(); + for ( sal_Int32 n = 0; n < nCount; ++n ) + { + const rtl::OUString & rName = rProps[ n ].Name; + if ( !contains( rName ) ) + { + // Not found. + rNamesNotContained.push_back( rName ); + } + } + + return ( rNamesNotContained.size() == 0 ); +} + +//========================================================================= +void ContentProperties::addProperties( + const std::vector< rtl::OUString > & rProps, + const ContentProperties & rContentProps ) +{ + std::vector< rtl::OUString >::const_iterator it = rProps.begin(); + std::vector< rtl::OUString >::const_iterator end = rProps.end(); + + while ( it != end ) + { + const rtl::OUString & rName = (*it); + + if ( !contains( rName ) ) // ignore duplicates + { + const PropertyValue * pProp = rContentProps.get( rName ); + if ( pProp ) + { + // Add it. + addProperty( rName, pProp->value(), pProp->isCaseSensitive() ); + } + else + { + addProperty( rName, uno::Any(), false ); + } + } + ++it; + } +} + +//========================================================================= +void ContentProperties::addProperties( const ContentProperties & rProps ) +{ + PropertyValueMap::const_iterator it = rProps.m_xProps->begin(); + const PropertyValueMap::const_iterator end = rProps.m_xProps->end(); + + while ( it != end ) + { + addProperty( + (*it).first, (*it).second.value(), (*it).second.isCaseSensitive() ); + ++it; + } +} + +//========================================================================= +void ContentProperties::addProperties( + const std::vector< DAVPropertyValue > & rProps ) +{ + std::vector< DAVPropertyValue >::const_iterator it = rProps.begin(); + const std::vector< DAVPropertyValue >::const_iterator end = rProps.end(); + + while ( it != end ) + { + addProperty( (*it) ); + ++it; + } +} + +//========================================================================= +void ContentProperties::addProperty( const DAVPropertyValue & rProp ) +{ + addProperty( rProp.Name, rProp.Value, rProp.IsCaseSensitive ); +} + +//========================================================================= +void ContentProperties::addProperty( const rtl::OUString & rName, + const com::sun::star::uno::Any & rValue, + bool bIsCaseSensitive ) +{ + if ( rName.equals( DAVProperties::CREATIONDATE ) ) + { + // Map DAV:creationdate to UCP:DateCreated + rtl::OUString aValue; + rValue >>= aValue; + util::DateTime aDate; + DateTimeHelper::convert( aValue, aDate ); + + (*m_xProps)[ rtl::OUString::createFromAscii( "DateCreated" ) ] + = PropertyValue( uno::makeAny( aDate ), true ); + } + // else if ( rName.equals( DAVProperties::DISPLAYNAME ) ) + // { + // } + // else if ( rName.equals( DAVProperties::GETCONTENTLANGUAGE ) ) + // { + // } + else if ( rName.equals( DAVProperties::GETCONTENTLENGTH ) ) + { + // Map DAV:getcontentlength to UCP:Size + rtl::OUString aValue; + rValue >>= aValue; + + (*m_xProps)[ rtl::OUString::createFromAscii( "Size" ) ] + = PropertyValue( uno::makeAny( aValue.toInt64() ), true ); + } + else if ( rName.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "Content-Length" ) ) ) + { + // Do NOT map Content-Lenght entity header to DAV:getcontentlength! + // Only DAV resources have this property. + + // Map Content-Length entity header to UCP:Size + rtl::OUString aValue; + rValue >>= aValue; + + (*m_xProps)[ rtl::OUString::createFromAscii( "Size" ) ] + = PropertyValue( uno::makeAny( aValue.toInt64() ), true ); + } + else if ( rName.equals( DAVProperties::GETCONTENTTYPE ) ) + { + // Map DAV:getcontenttype to UCP:MediaType (1:1) + (*m_xProps)[ rtl::OUString::createFromAscii( "MediaType" ) ] + = PropertyValue( rValue, true ); + } + else if ( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Content-Type" ) ) ) + { + // Do NOT map Content-Type entity header to DAV:getcontenttype! + // Only DAV resources have this property. + + // Map DAV:getcontenttype to UCP:MediaType (1:1) + (*m_xProps)[ rtl::OUString::createFromAscii( "MediaType" ) ] + = PropertyValue( rValue, true ); + } + // else if ( rName.equals( DAVProperties::GETETAG ) ) + // { + // } + else if ( rName.equals( DAVProperties::GETLASTMODIFIED ) ) + { + // Map the DAV:getlastmodified entity header to UCP:DateModified + rtl::OUString aValue; + rValue >>= aValue; + util::DateTime aDate; + DateTimeHelper::convert( aValue, aDate ); + + (*m_xProps)[ rtl::OUString::createFromAscii( "DateModified" ) ] + = PropertyValue( uno::makeAny( aDate ), true ); + } + else if ( rName.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "Last-Modified" ) ) ) + { + // Do not map Last-Modified entity header to DAV:getlastmodified! + // Only DAV resources have this property. + + // Map the Last-Modified entity header to UCP:DateModified + rtl::OUString aValue; + rValue >>= aValue; + util::DateTime aDate; + DateTimeHelper::convert( aValue, aDate ); + + (*m_xProps)[ rtl::OUString::createFromAscii( "DateModified" ) ] + = PropertyValue( uno::makeAny( aDate ), true ); + } + // else if ( rName.equals( DAVProperties::LOCKDISCOVERY ) ) + // { + // } + else if ( rName.equals( DAVProperties::RESOURCETYPE ) ) + { + rtl::OUString aValue; + rValue >>= aValue; + + // Map DAV:resourceype to UCP:IsFolder, UCP:IsDocument, UCP:ContentType + sal_Bool bFolder = + aValue.equalsIgnoreAsciiCaseAsciiL( + RTL_CONSTASCII_STRINGPARAM( "collection" ) ); + + (*m_xProps)[ rtl::OUString::createFromAscii( "IsFolder" ) ] + = PropertyValue( uno::makeAny( bFolder ), true ); + (*m_xProps)[ rtl::OUString::createFromAscii( "IsDocument" ) ] + = PropertyValue( uno::makeAny( sal_Bool( !bFolder ) ), true ); + (*m_xProps)[ rtl::OUString::createFromAscii( "ContentType" ) ] + = PropertyValue( uno::makeAny( bFolder + ? rtl::OUString::createFromAscii( WEBDAV_COLLECTION_TYPE ) + : rtl::OUString::createFromAscii( WEBDAV_CONTENT_TYPE ) ), true ); + } + // else if ( rName.equals( DAVProperties::SUPPORTEDLOCK ) ) + // { + // } + + // Save property. + (*m_xProps)[ rName ] = PropertyValue( rValue, bIsCaseSensitive ); +} + +//========================================================================= +//========================================================================= +// +// CachableContentProperties Implementation. +// +//========================================================================= +//========================================================================= + +namespace +{ + bool isCachable( rtl::OUString const & rName, + bool isCaseSensitive ) + { + static rtl::OUString aNonCachableProps [] = + { + DAVProperties::LOCKDISCOVERY, + + DAVProperties::GETETAG, + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ETag" ) ), + + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateModified" ) ), + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Last-Modified" ) ), + DAVProperties::GETLASTMODIFIED, + + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Size" ) ), + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Content-Length" ) ), + DAVProperties::GETCONTENTLENGTH, + + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Date" ) ) + }; + + for ( sal_uInt32 n = 0; + n < ( sizeof( aNonCachableProps ) + / sizeof( aNonCachableProps[ 0 ] ) ); + ++n ) + { + if ( isCaseSensitive ) + { + if ( rName.equals( aNonCachableProps[ n ] ) ) + return false; + } + else + if ( rName.equalsIgnoreAsciiCase( aNonCachableProps[ n ] ) ) + return false; + } + return true; + } + +} // namespace + +//========================================================================= +CachableContentProperties::CachableContentProperties( + const ContentProperties & rProps ) +{ + addProperties( rProps ); +} + +//========================================================================= +void CachableContentProperties::addProperties( + const ContentProperties & rProps ) +{ + const std::auto_ptr< PropertyValueMap > & props = rProps.getProperties(); + + PropertyValueMap::const_iterator it = props->begin(); + const PropertyValueMap::const_iterator end = props->end(); + + while ( it != end ) + { + if ( isCachable( (*it).first, (*it).second.isCaseSensitive() ) ) + m_aProps.addProperty( (*it).first, + (*it).second.value(), + (*it).second.isCaseSensitive() ); + + ++it; + } +} + +//========================================================================= +void CachableContentProperties::addProperties( + const std::vector< DAVPropertyValue > & rProps ) +{ + std::vector< DAVPropertyValue >::const_iterator it = rProps.begin(); + const std::vector< DAVPropertyValue >::const_iterator end = rProps.end(); + + while ( it != end ) + { + if ( isCachable( (*it).Name, (*it).IsCaseSensitive ) ) + m_aProps.addProperty( (*it) ); + + ++it; + } +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/ContentProperties.hxx b/ucb/source/ucp/webdav/ContentProperties.hxx new file mode 100644 index 000000000000..6105879f1dda --- /dev/null +++ b/ucb/source/ucp/webdav/ContentProperties.hxx @@ -0,0 +1,223 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + + + +#ifndef _WEBDAV_UCP_CONTENTPROPERTIES_HXX +#define _WEBDAV_UCP_CONTENTPROPERTIES_HXX + +#include +#include +#include +#include +#include +#include + +namespace com { namespace sun { namespace star { namespace beans { + struct Property; +} } } } + +namespace http_dav_ucp +{ + +struct DAVResource; + +//========================================================================= + +struct equalString +{ + bool operator()( const rtl::OUString& s1, const rtl::OUString& s2 ) const + { + return !!( s1 == s2 ); + } +}; + +struct hashString +{ + size_t operator()( const rtl::OUString & rName ) const + { + return rName.hashCode(); + } +}; + +//========================================================================= +// +// PropertyValueMap. +// +//========================================================================= + +class PropertyValue +{ +private: + ::com::sun::star::uno::Any m_aValue; + bool m_bIsCaseSensitive; + +public: + PropertyValue() + : m_bIsCaseSensitive( true ) {} + + PropertyValue( const ::com::sun::star::uno::Any & rValue, + bool bIsCaseSensitive ) + : m_aValue( rValue), + m_bIsCaseSensitive( bIsCaseSensitive ) {} + + bool isCaseSensitive() const { return m_bIsCaseSensitive; } + const ::com::sun::star::uno::Any & value() const { return m_aValue; } + +}; + +typedef std::hash_map +< + rtl::OUString, + PropertyValue, + hashString, + equalString +> +PropertyValueMap; + +struct DAVResource; + +class ContentProperties +{ +public: + ContentProperties(); + + ContentProperties( const DAVResource& rResource ); + + // Mini props for transient contents. + ContentProperties( const rtl::OUString & rTitle, sal_Bool bFolder ); + + // Micro props for non-existing contents. + ContentProperties( const rtl::OUString & rTitle ); + + ContentProperties( const ContentProperties & rOther ); + + bool contains( const rtl::OUString & rName ) const; + + const com::sun::star::uno::Any & + getValue( const rtl::OUString & rName ) const; + + // Maps the UCB property names contained in rProps with their DAV property + // counterparts, if possible. All unmappable properties will be included + // unchanged in resulting vector unless bIncludeUnmatched is set to false. + // The vector filles by this method can directly be handed over to + // DAVResourceAccess::PROPFIND. The result from PROPFIND + // (vector< DAVResource >) can be used to create a ContentProperties + // instance which can map DAV properties back to UCB properties. + static void UCBNamesToDAVNames( const com::sun::star::uno::Sequence< + com::sun::star::beans::Property > & + rProps, + std::vector< rtl::OUString > & resources, + bool bIncludeUnmatched = true ); + + // Maps the UCB property names contained in rProps with their HTTP header + // counterparts, if possible. All unmappable properties will be included + // unchanged in resulting vector unless bIncludeUnmatched is set to false. + // The vector filles by this method can directly be handed over to + // DAVResourceAccess::HEAD. The result from HEAD (vector< DAVResource >) + // can be used to create a ContentProperties instance which can map header + // names back to UCB properties. + static void UCBNamesToHTTPNames( const com::sun::star::uno::Sequence< + com::sun::star::beans::Property > & + rProps, + std::vector< rtl::OUString > & resources, + bool bIncludeUnmatched = true ); + + // return true, if all properties contained in rProps are contained in + // this ContentProperties instance. Otherwiese, false will be returned. + // rNamesNotContained contain the missing names. + bool containsAllNames( + const com::sun::star::uno::Sequence< + com::sun::star::beans::Property >& rProps, + std::vector< rtl::OUString > & rNamesNotContained ) const; + + // adds all properties described by rProps that are actually contained in + // rContentProps to this instance. In case of duplicates the value + // already contained in this will left unchanged. + void addProperties( const std::vector< rtl::OUString > & rProps, + const ContentProperties & rContentProps ); + + // overwrites probably existing entries. + void addProperties( const ContentProperties & rProps ); + + // overwrites probably existing entries. + void addProperties( const std::vector< DAVPropertyValue > & rProps ); + + // overwrites probably existing entry. + void addProperty( const rtl::OUString & rName, + const com::sun::star::uno::Any & rValue, + bool bIsCaseSensitive ); + + // overwrites probably existing entry. + void addProperty( const DAVPropertyValue & rProp ); + + bool isTrailingSlash() const { return m_bTrailingSlash; } + + const rtl::OUString & getEscapedTitle() const { return m_aEscapedTitle; } + + // Not good to expose implementation details, but this is actually an + // internal class. + const std::auto_ptr< PropertyValueMap > & getProperties() const + { return m_xProps; } + +private: + ::rtl::OUString m_aEscapedTitle; + std::auto_ptr< PropertyValueMap > m_xProps; + bool m_bTrailingSlash; + + static com::sun::star::uno::Any m_aEmptyAny; + + ContentProperties & operator=( const ContentProperties & ); // n.i. + + const PropertyValue * get( const rtl::OUString & rName ) const; +}; + +class CachableContentProperties +{ +private: + ContentProperties m_aProps; + + CachableContentProperties & operator=( const CachableContentProperties & ); // n.i. + CachableContentProperties( const CachableContentProperties & ); // n.i. + +public: + CachableContentProperties( const ContentProperties & rProps ); + + void addProperties( const ContentProperties & rProps ); + + void addProperties( const std::vector< DAVPropertyValue > & rProps ); + + bool containsAllNames( + const com::sun::star::uno::Sequence< + com::sun::star::beans::Property >& rProps, + std::vector< rtl::OUString > & rNamesNotContained ) const + { return m_aProps.containsAllNames( rProps, rNamesNotContained ); } + + const com::sun::star::uno::Any & + getValue( const rtl::OUString & rName ) const + { return m_aProps.getValue( rName ); } + + operator const ContentProperties & () const { return m_aProps; } +}; + +} // namespace http_dav_ucp + +#endif /* !_WEBDAV_UCP_CONTENTPROPERTIES_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/DAVAuthListener.hxx b/ucb/source/ucp/webdav/DAVAuthListener.hxx new file mode 100644 index 000000000000..baa27bdc19ba --- /dev/null +++ b/ucb/source/ucp/webdav/DAVAuthListener.hxx @@ -0,0 +1,49 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + + +#ifndef _DAVAUTHLISTENER_HXX_ +#define _DAVAUTHLISTENER_HXX_ + +#include +#include + +#include +#include + +namespace http_dav_ucp +{ + +class DAVAuthListener : public salhelper::SimpleReferenceObject +{ + public: + virtual int authenticate( + const ::rtl::OUString & inRealm, + const ::rtl::OUString & inHostName, + ::rtl::OUString & inoutUserName, + ::rtl::OUString & outPassWord, + sal_Bool bCanUseSystemCredentials, + sal_Bool bUsePreviousCredentials = sal_True ) = 0; +}; + +} // namespace http_dav_ucp + +#endif // _DAVAUTHLISTENER_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx b/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx new file mode 100644 index 000000000000..9ffe92255ef7 --- /dev/null +++ b/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx @@ -0,0 +1,74 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + + + +#ifndef _DAVAUTHLISTENERIMPL_HXX_ +#define _DAVAUTHLISTENERIMPL_HXX_ + +#include "DAVAuthListener.hxx" + + +namespace http_dav_ucp +{ + +//========================================================================= + +//========================================================================= +//========================================================================= +// +// class DAVAuthListenerImpl. +// +//========================================================================= +//========================================================================= + + + class DAVAuthListener_Impl : public DAVAuthListener + { + public: + + DAVAuthListener_Impl( + const com::sun::star::uno::Reference< + com::sun::star::ucb::XCommandEnvironment>& xEnv, + const ::rtl::OUString & inURL ) + : m_xEnv( xEnv ), m_aURL( inURL ) + { + } + + virtual int authenticate( const ::rtl::OUString & inRealm, + const ::rtl::OUString & inHostName, + ::rtl::OUString & inoutUserName, + ::rtl::OUString & outPassWord, + sal_Bool bCanUseSystemCredentials, + sal_Bool bUsePreviousCredentials = sal_True ); + private: + + const com::sun::star::uno::Reference< + com::sun::star::ucb::XCommandEnvironment > m_xEnv; + const rtl::OUString m_aURL; + + rtl::OUString m_aPrevPassword; + rtl::OUString m_aPrevUsername; + }; + +} + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/DAVException.hxx b/ucb/source/ucp/webdav/DAVException.hxx new file mode 100644 index 000000000000..dc0dc2fd57f2 --- /dev/null +++ b/ucb/source/ucp/webdav/DAVException.hxx @@ -0,0 +1,171 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + + + +#ifndef _DAVEXCEPTION_HXX_ +#define _DAVEXCEPTION_HXX_ + +#include + +namespace http_dav_ucp +{ + +///////////////////////////////////////////////////////////////////////////// +// HTTP/WebDAV status codes +///////////////////////////////////////////////////////////////////////////// + +const sal_uInt16 SC_NONE = 0; + +// 1xx (Informational - no errors) +const sal_uInt16 SC_CONTINUE = 100; +const sal_uInt16 SC_SWITCHING_PROTOCOLS = 101; +// DAV extensions +const sal_uInt16 SC_PROCESSING = 102; + +//2xx (Successful - no errors) +const sal_uInt16 SC_OK = 200; +const sal_uInt16 SC_CREATED = 201; +const sal_uInt16 SC_ACCEPTED = 202; +const sal_uInt16 SC_NON_AUTHORITATIVE_INFORMATION = 203; +const sal_uInt16 SC_NO_CONTENT = 204; +const sal_uInt16 SC_RESET_CONTENT = 205; +const sal_uInt16 SC_PARTIAL_CONTENT = 206; +// DAV extensions +const sal_uInt16 SC_MULTISTATUS = 207; + +//3xx (Redirection) +const sal_uInt16 SC_MULTIPLE_CHOICES = 300; +const sal_uInt16 SC_MOVED_PERMANENTLY = 301; +const sal_uInt16 SC_MOVED_TEMPORARILY = 302; +const sal_uInt16 SC_SEE_OTHER = 303; +const sal_uInt16 SC_NOT_MODIFIED = 304; +const sal_uInt16 SC_USE_PROXY = 305; +const sal_uInt16 SC_TEMPORARY_REDIRECT = 307; + +//4xx (Client error) +const sal_uInt16 SC_BAD_REQUEST = 400; +const sal_uInt16 SC_UNAUTHORIZED = 401; +const sal_uInt16 SC_PAYMENT_REQUIRED = 402; +const sal_uInt16 SC_FORBIDDEN = 403; +const sal_uInt16 SC_NOT_FOUND = 404; +const sal_uInt16 SC_METHOD_NOT_ALLOWED = 405; +const sal_uInt16 SC_NOT_ACCEPTABLE = 406; +const sal_uInt16 SC_PROXY_AUTHENTICATION_REQUIRED = 407; +const sal_uInt16 SC_REQUEST_TIMEOUT = 408; +const sal_uInt16 SC_CONFLICT = 409; +const sal_uInt16 SC_GONE = 410; +const sal_uInt16 SC_LENGTH_REQUIRED = 411; +const sal_uInt16 SC_PRECONDITION_FAILED = 412; +const sal_uInt16 SC_REQUEST_ENTITY_TOO_LARGE = 413; +const sal_uInt16 SC_REQUEST_URI_TOO_LONG = 414; +const sal_uInt16 SC_UNSUPPORTED_MEDIA_TYPE = 415; +const sal_uInt16 SC_REQUESTED_RANGE_NOT_SATISFIABLE = 416; +const sal_uInt16 SC_EXPECTATION_FAILED = 417; +// DAV extensions +const sal_uInt16 SC_UNPROCESSABLE_ENTITY = 422; +const sal_uInt16 SC_LOCKED = 423; +const sal_uInt16 SC_FAILED_DEPENDENCY = 424; + +//5xx (Server error) +const sal_uInt16 SC_INTERNAL_SERVER_ERROR = 500; +const sal_uInt16 SC_NOT_IMPLEMENTED = 501; +const sal_uInt16 SC_BAD_GATEWAY = 502; +const sal_uInt16 SC_SERVICE_UNAVAILABLE = 503; +const sal_uInt16 SC_GATEWAY_TIMEOUT = 504; +const sal_uInt16 SC_HTTP_VERSION_NOT_SUPPORTED = 505; +// DAV extensions +const sal_uInt16 SC_INSUFFICIENT_STORAGE = 507; + +///////////////////////////////////////////////////////////////////////////// + +class DAVException +{ + public: + enum ExceptionCode { + DAV_HTTP_ERROR = 0, // Generic error, + // mData = server error message, + // mStatusCode = HTTP status code + DAV_HTTP_LOOKUP, // Name lookup failed, + // mData = server[:port] + DAV_HTTP_NOAUTH, // No User authentication data provided - e.g., user aborts corresponding dialog + // mData = server[:port] + DAV_HTTP_AUTH, // User authentication failed on server, + // mData = server[:port] + DAV_HTTP_AUTHPROXY, // User authentication failed on proxy, + // mData = proxy server[:port] + DAV_HTTP_CONNECT, // Could not connect to server, + // mData = server[:port] + DAV_HTTP_TIMEOUT, // Connection timed out + // mData = server[:port] + DAV_HTTP_FAILED, // The precondition failed + // mData = server[:port] + DAV_HTTP_RETRY, // Retry request + // mData = server[:port] + DAV_HTTP_REDIRECT, // Request was redirected, + // mData = new URL + DAV_SESSION_CREATE, // session creation error, + // mData = server[:port] + DAV_INVALID_ARG, // invalid argument + + DAV_LOCK_EXPIRED, // DAV lock expired + + DAV_NOT_LOCKED, // not locked + + DAV_LOCKED_SELF, // locked by this OOo session + + DAV_LOCKED // locked by third party + }; + + private: + ExceptionCode mExceptionCode; + rtl::OUString mData; + sal_uInt16 mStatusCode; + + public: + DAVException( ExceptionCode inExceptionCode ) + : mExceptionCode( inExceptionCode ) + , mData() + , mStatusCode( SC_NONE ) + {}; + DAVException( ExceptionCode inExceptionCode, + const rtl::OUString & rData ) + : mExceptionCode( inExceptionCode ) + , mData( rData ) + , mStatusCode( SC_NONE ) + {}; + DAVException( ExceptionCode inExceptionCode, + const rtl::OUString & rData, + sal_uInt16 nStatusCode ) + : mExceptionCode( inExceptionCode ) + , mData( rData ) + , mStatusCode( nStatusCode ) + {}; + ~DAVException( ) {}; + + const ExceptionCode & getError() const { return mExceptionCode; } + const rtl::OUString & getData() const { return mData; } + sal_uInt16 getStatus() const { return mStatusCode; } +}; + +} // namespace http_dav_ucp + +#endif // _DAVEXCEPTION_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/DAVProperties.cxx b/ucb/source/ucp/webdav/DAVProperties.cxx new file mode 100644 index 000000000000..618c1fb4ba8f --- /dev/null +++ b/ucb/source/ucp/webdav/DAVProperties.cxx @@ -0,0 +1,194 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + + + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_ucb.hxx" + +#include +#include "DAVProperties.hxx" + +using namespace http_dav_ucp; + +const ::rtl::OUString DAVProperties::CREATIONDATE = + ::rtl::OUString::createFromAscii( "DAV:creationdate" ); +const ::rtl::OUString DAVProperties::DISPLAYNAME = + ::rtl::OUString::createFromAscii( "DAV:displayname" ); +const ::rtl::OUString DAVProperties::GETCONTENTLANGUAGE = + ::rtl::OUString::createFromAscii( "DAV:getcontentlanguage" ); +const ::rtl::OUString DAVProperties::GETCONTENTLENGTH = + ::rtl::OUString::createFromAscii( "DAV:getcontentlength" ); +const ::rtl::OUString DAVProperties::GETCONTENTTYPE = + ::rtl::OUString::createFromAscii( "DAV:getcontenttype" ); +const ::rtl::OUString DAVProperties::GETETAG = + ::rtl::OUString::createFromAscii( "DAV:getetag" ); +const ::rtl::OUString DAVProperties::GETLASTMODIFIED = + ::rtl::OUString::createFromAscii( "DAV:getlastmodified" ); +const ::rtl::OUString DAVProperties::LOCKDISCOVERY = + ::rtl::OUString::createFromAscii( "DAV:lockdiscovery" ); +const ::rtl::OUString DAVProperties::RESOURCETYPE = + ::rtl::OUString::createFromAscii( "DAV:resourcetype" ); +const ::rtl::OUString DAVProperties::SUPPORTEDLOCK = + ::rtl::OUString::createFromAscii( "DAV:supportedlock" ); + +const ::rtl::OUString DAVProperties::EXECUTABLE = + ::rtl::OUString::createFromAscii( + "http://apache.org/dav/props/executable" ); + +// ------------------------------------------------------------------- +// static +void DAVProperties::createSerfPropName( const rtl::OUString & rFullName, + SerfPropName & rName ) +{ + if ( rFullName.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "DAV:" ) ) == 0 ) + { + rName.nspace = "DAV:"; + rName.name + = strdup( rtl::OUStringToOString( + rFullName.copy( RTL_CONSTASCII_LENGTH( "DAV:" ) ), + RTL_TEXTENCODING_UTF8 ) ); + } + else if ( rFullName.compareToAscii( RTL_CONSTASCII_STRINGPARAM( + "http://apache.org/dav/props/" ) ) == 0 ) + { + rName.nspace = "http://apache.org/dav/props/"; + rName.name + = strdup( rtl::OUStringToOString( + rFullName.copy( + RTL_CONSTASCII_LENGTH( + "http://apache.org/dav/props/" ) ), + RTL_TEXTENCODING_UTF8 ) ); + } + else if ( rFullName.compareToAscii( RTL_CONSTASCII_STRINGPARAM( + "http://ucb.openoffice.org/dav/props/" ) ) == 0 ) + { + rName.nspace = "http://ucb.openoffice.org/dav/props/"; + rName.name + = strdup( rtl::OUStringToOString( + rFullName.copy( + RTL_CONSTASCII_LENGTH( + "http://ucb.openoffice.org/dav/props/" ) ), + RTL_TEXTENCODING_UTF8 ) ); + } + else if ( rFullName.compareToAscii( RTL_CONSTASCII_STRINGPARAM( + " + + sal_Int32 nStart = RTL_CONSTASCII_LENGTH( " & xEnv ) + throw ( DAVException ) +{ + initialize(); + + sal_Int64 nNewTimeout = 0; + int errorCount = 0; + bool bRetry; + do + { + bRetry = false; + try + { + DAVRequestHeaders aHeaders; + getUserRequestHeaders( xEnv, + getRequestURI(), + rtl::OUString::createFromAscii( "LOCK" ), + aHeaders ); + + nNewTimeout = m_xSession->LOCK( getRequestURI(), + nTimeout, + DAVRequestEnvironment( + getRequestURI(), + new DAVAuthListener_Impl( + xEnv, m_aURL ), + aHeaders, xEnv ) ); + } + catch ( DAVException & e ) + { + errorCount++; + bRetry = handleException( e, errorCount ); + if ( !bRetry ) + throw; + } + } + while ( bRetry ); + + return nNewTimeout; +} +#endif + +//========================================================================= +void DAVResourceAccess::UNLOCK( + const uno::Reference< ucb::XCommandEnvironment > & xEnv ) + throw ( DAVException ) +{ + initialize(); + + int errorCount = 0; + bool bRetry; + do + { + bRetry = false; + try + { + DAVRequestHeaders aHeaders; + getUserRequestHeaders( xEnv, + getRequestURI(), + rtl::OUString::createFromAscii( "UNLOCK" ), + aHeaders ); + + m_xSession->UNLOCK( getRequestURI(), + DAVRequestEnvironment( + getRequestURI(), + new DAVAuthListener_Impl( xEnv, m_aURL ), + aHeaders, xEnv ) ); + } + catch ( DAVException & e ) + { + errorCount++; + bRetry = handleException( e, errorCount ); + if ( !bRetry ) + throw; + } + } + while ( bRetry ); +} + +//========================================================================= +void DAVResourceAccess::setURL( const rtl::OUString & rNewURL ) + throw( DAVException ) +{ + osl::Guard< osl::Mutex > aGuard( m_aMutex ); + m_aURL = rNewURL; + m_aPath = rtl::OUString(); // Next initialize() will create new session. +} + +//========================================================================= +// init dav session and path +void DAVResourceAccess::initialize() + throw ( DAVException ) +{ + osl::Guard< osl::Mutex > aGuard( m_aMutex ); + if ( m_aPath.getLength() == 0 ) + { + SerfUri aURI( m_aURL ); + rtl::OUString aPath( aURI.GetPath() ); + + /* #134089# - Check URI */ + if ( !aPath.getLength() ) + throw DAVException( DAVException::DAV_INVALID_ARG ); + + /* #134089# - Check URI */ + if ( !aURI.GetHost().getLength() ) + throw DAVException( DAVException::DAV_INVALID_ARG ); + + if ( !m_xSession.is() || !m_xSession->CanUse( m_aURL ) ) + { + m_xSession.clear(); + + // create new webdav session + m_xSession + = m_xSessionFactory->createDAVSession( m_aURL, m_xSMgr ); + + if ( !m_xSession.is() ) + return; + } + + // Own URI is needed for redirect cycle detection. + m_aRedirectURIs.push_back( aURI ); + + // Success. + m_aPath = aPath; + + // Not only the path has to be encoded + m_aURL = aURI.GetURI(); + } +} + +//========================================================================= +const rtl::OUString & DAVResourceAccess::getRequestURI() const +{ + OSL_ENSURE( m_xSession.is(), + "DAVResourceAccess::getRequestURI - Not initialized!" ); + + // In case a proxy is used we have to use the absolute URI for a request. + if ( m_xSession->UsesProxy() ) + return m_aURL; + + return m_aPath; +} + +//========================================================================= +// static +void DAVResourceAccess::getUserRequestHeaders( + const uno::Reference< ucb::XCommandEnvironment > & xEnv, + const rtl::OUString & rURI, + const rtl::OUString & rMethod, + DAVRequestHeaders & rRequestHeaders ) +{ + if ( xEnv.is() ) + { + uno::Reference< ucb::XWebDAVCommandEnvironment > xDAVEnv( + xEnv, uno::UNO_QUERY ); + + if ( xDAVEnv.is() ) + { + uno::Sequence< beans::NamedValue > aRequestHeaders + = xDAVEnv->getUserRequestHeaders( rURI, rMethod ); + + for ( sal_Int32 n = 0; n < aRequestHeaders.getLength(); ++n ) + { + rtl::OUString aValue; + sal_Bool isString = aRequestHeaders[ n ].Value >>= aValue; + + if ( !isString ) + { + OSL_ENSURE( isString, + "DAVResourceAccess::getUserRequestHeaders :" + "Value is not a string! Ignoring..." ); + } + + rRequestHeaders.push_back( + DAVRequestHeader( aRequestHeaders[ n ].Name, aValue ) ); + } + } + } +} + +//========================================================================= +sal_Bool DAVResourceAccess::detectRedirectCycle( + const rtl::OUString& rRedirectURL ) + throw ( DAVException ) +{ + osl::Guard< osl::Mutex > aGuard( m_aMutex ); + + SerfUri aUri( rRedirectURL ); + + std::vector< SerfUri >::const_iterator it = m_aRedirectURIs.begin(); + std::vector< SerfUri >::const_iterator end = m_aRedirectURIs.end(); + + while ( it != end ) + { + if ( aUri == (*it) ) + return sal_True; + + it++; + } + + return sal_False; +} + +//========================================================================= +void DAVResourceAccess::resetUri() +{ + osl::Guard< osl::Mutex > aGuard( m_aMutex ); + if ( m_aRedirectURIs.size() > 0 ) + { + std::vector< SerfUri >::const_iterator it = m_aRedirectURIs.begin(); + + SerfUri aUri( (*it) ); + m_aRedirectURIs.clear(); + setURL ( aUri.GetURI() ); + initialize(); + } +} + +//========================================================================= +sal_Bool DAVResourceAccess::handleException( DAVException & e, int errorCount ) + throw ( DAVException ) +{ + switch ( e.getError() ) + { + case DAVException::DAV_HTTP_REDIRECT: + if ( !detectRedirectCycle( e.getData() ) ) + { + // set new URL and path. + setURL( e.getData() ); + initialize(); + return sal_True; + } + return sal_False; + // --> tkr #67048# copy & paste images doesn't display. + // if we have a bad connection try again. Up to three times. + case DAVException::DAV_HTTP_ERROR: + // retry up to three times, if not a client-side error. + if ( ( e.getStatus() < 400 || e.getStatus() >= 500 || + e.getStatus() == 413 ) && + errorCount < 3 ) + { + return sal_True; + } + return sal_False; + // <-- + // --> tkr: if connection has said retry then retry! + case DAVException::DAV_HTTP_RETRY: + return sal_True; + // <-- + default: + return sal_False; // Abort + } +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.hxx b/ucb/source/ucp/webdav/DAVResourceAccess.hxx new file mode 100644 index 000000000000..792a85a354e0 --- /dev/null +++ b/ucb/source/ucp/webdav/DAVResourceAccess.hxx @@ -0,0 +1,239 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + + + +#ifndef _DAVRESOURCEACCESS_HXX_ +#define _DAVRESOURCEACCESS_HXX_ + +#include +#include +#include +#include +#include +#include +#include +#include +#include "DAVAuthListener.hxx" +#include "DAVException.hxx" +#include "DAVSession.hxx" +#include "DAVResource.hxx" +#include "DAVTypes.hxx" +#include "SerfUri.hxx" + +namespace http_dav_ucp +{ + +class DAVSessionFactory; + +class DAVResourceAccess +{ + osl::Mutex m_aMutex; + rtl::OUString m_aURL; + rtl::OUString m_aPath; + rtl::Reference< DAVSession > m_xSession; + rtl::Reference< DAVSessionFactory > m_xSessionFactory; + com::sun::star::uno::Reference< + com::sun::star::lang::XMultiServiceFactory > m_xSMgr; + std::vector< SerfUri > m_aRedirectURIs; + +public: + DAVResourceAccess() : m_xSessionFactory( 0 ) {} + DAVResourceAccess( const com::sun::star::uno::Reference< + com::sun::star::lang::XMultiServiceFactory > & rSMgr, + rtl::Reference< + DAVSessionFactory > const & rSessionFactory, + const rtl::OUString & rURL ); + DAVResourceAccess( const DAVResourceAccess & rOther ); + + DAVResourceAccess & operator=( const DAVResourceAccess & rOther ); + + void setURL( const rtl::OUString & rNewURL ) + throw ( DAVException ); + + void resetUri(); + + const rtl::OUString & getURL() const { return m_aURL; } + + rtl::Reference< DAVSessionFactory > getSessionFactory() const + { return m_xSessionFactory; } + + // DAV methods + // + + // allprop & named + void + PROPFIND( const Depth nDepth, + const std::vector< rtl::OUString > & rPropertyNames, + std::vector< DAVResource > & rResources, + const com::sun::star::uno::Reference< + com::sun::star::ucb::XCommandEnvironment > & xEnv ) + throw ( DAVException ); + + // propnames + void + PROPFIND( const Depth nDepth, + std::vector< DAVResourceInfo > & rResInfo, + const com::sun::star::uno::Reference< + com::sun::star::ucb::XCommandEnvironment > & xEnv ) + throw ( DAVException ); + + void + PROPPATCH( const std::vector< ProppatchValue > & rValues, + const com::sun::star::uno::Reference< + com::sun::star::ucb::XCommandEnvironment >& xEnv ) + throw ( DAVException ); + + void + HEAD( const std::vector< rtl::OUString > & rHeaderNames, // empty == 'all' + DAVResource & rResource, + const com::sun::star::uno::Reference< + com::sun::star::ucb::XCommandEnvironment >& xEnv ) + throw ( DAVException ); + + com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + GET( const com::sun::star::uno::Reference< + com::sun::star::ucb::XCommandEnvironment > & xEnv ) + throw ( DAVException ); + + void + GET( com::sun::star::uno::Reference< + com::sun::star::io::XOutputStream > & rStream, + const com::sun::star::uno::Reference< + com::sun::star::ucb::XCommandEnvironment > & xEnv ) + throw ( DAVException ); + + com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + GET( const std::vector< rtl::OUString > & rHeaderNames, // empty == 'all' + DAVResource & rResource, + const com::sun::star::uno::Reference< + com::sun::star::ucb::XCommandEnvironment > & xEnv ) + throw ( DAVException ); + + void + GET( com::sun::star::uno::Reference< + com::sun::star::io::XOutputStream > & rStream, + const std::vector< rtl::OUString > & rHeaderNames, // empty == 'all' + DAVResource & rResource, + const com::sun::star::uno::Reference< + com::sun::star::ucb::XCommandEnvironment > & xEnv ) + throw ( DAVException ); + + void + PUT( const com::sun::star::uno::Reference< + com::sun::star::io::XInputStream > & rStream, + const com::sun::star::uno::Reference< + com::sun::star::ucb::XCommandEnvironment > & xEnv ) + throw ( DAVException ); + + com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + POST( const rtl::OUString & rContentType, + const rtl::OUString & rReferer, + const com::sun::star::uno::Reference< + com::sun::star::io::XInputStream > & rInputStream, + const com::sun::star::uno::Reference< + com::sun::star::ucb::XCommandEnvironment >& xEnv ) + throw ( DAVException ); + + void + POST( const rtl::OUString & rContentType, + const rtl::OUString & rReferer, + const com::sun::star::uno::Reference< + com::sun::star::io::XInputStream > & rInputStream, + com::sun::star::uno::Reference< + com::sun::star::io::XOutputStream > & rOutputStream, + const com::sun::star::uno::Reference< + com::sun::star::ucb::XCommandEnvironment >& xEnv ) + throw ( DAVException ); + + void + MKCOL( const com::sun::star::uno::Reference< + com::sun::star::ucb::XCommandEnvironment > & xEnv ) + throw ( DAVException ); + + void + COPY( const ::rtl::OUString & rSourcePath, + const ::rtl::OUString & rDestinationURI, + sal_Bool bOverwrite, + const com::sun::star::uno::Reference< + com::sun::star::ucb::XCommandEnvironment > & xEnv ) + throw ( DAVException ); + + void + MOVE( const ::rtl::OUString & rSourcePath, + const ::rtl::OUString & rDestinationURI, + sal_Bool bOverwrite, + const com::sun::star::uno::Reference< + com::sun::star::ucb::XCommandEnvironment > & xEnv ) + throw ( DAVException ); + + void + DESTROY( const com::sun::star::uno::Reference< + com::sun::star::ucb::XCommandEnvironment > & xEnv ) + throw ( DAVException ); + + // set new lock. + void + LOCK( com::sun::star::ucb::Lock & inLock, + const com::sun::star::uno::Reference< + com::sun::star::ucb::XCommandEnvironment > & xEnv ) + throw( DAVException ); + +#if 0 // currently not used, but please don't remove code + // refresh existing lock. + sal_Int64 + LOCK( sal_Int64 nTimeout, + const com::sun::star::uno::Reference< + com::sun::star::ucb::XCommandEnvironment > & xEnv ) + throw ( DAVException ); +#endif + + void + UNLOCK( const com::sun::star::uno::Reference< + com::sun::star::ucb::XCommandEnvironment > & xEnv ) + throw ( DAVException ); + + void + abort() + throw ( DAVException ); + + // helper + static void + getUserRequestHeaders( + const com::sun::star::uno::Reference< + com::sun::star::ucb::XCommandEnvironment > & xEnv, + const rtl::OUString & rURI, + const rtl::OUString & rMethod, + DAVRequestHeaders & rRequestHeaders ); + +private: + const rtl::OUString & getRequestURI() const; + sal_Bool detectRedirectCycle( const rtl::OUString& rRedirectURL ) + throw ( DAVException ); + sal_Bool handleException( DAVException & e, int errorCount ) + throw ( DAVException ); + void initialize() + throw ( DAVException ); +}; + +} // namespace http_dav_ucp + +#endif // _DAVRESOURCEACCESS_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/DAVSession.hxx b/ucb/source/ucp/webdav/DAVSession.hxx new file mode 100644 index 000000000000..d0e3cc90ae7a --- /dev/null +++ b/ucb/source/ucp/webdav/DAVSession.hxx @@ -0,0 +1,218 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + + + +#ifndef _DAVSESSION_HXX_ +#define _DAVSESSION_HXX_ + +#include +#include +#include +#include +#include "DAVException.hxx" +#include "DAVProperties.hxx" +#include "DAVResource.hxx" +#include "DAVSessionFactory.hxx" +#include "DAVTypes.hxx" +#include "DAVRequestEnvironment.hxx" + +namespace com { namespace sun { namespace star { namespace ucb { + struct Lock; +} } } } + +namespace http_dav_ucp +{ + +class DAVAuthListener; + +class DAVSession +{ +public: + inline void acquire() SAL_THROW(()) + { + osl_incrementInterlockedCount( &m_nRefCount ); + } + + void release() SAL_THROW(()) + { + if ( osl_decrementInterlockedCount( &m_nRefCount ) == 0 ) + { + m_xFactory->releaseElement( this ); + delete this; + } + } + + virtual sal_Bool CanUse( const ::rtl::OUString & inPath ) = 0; + + virtual sal_Bool UsesProxy() = 0; + + // DAV methods + // + + // NOT USED + /* + virtual void OPTIONS( const ::rtl::OUString & inPath, + DAVCapabilities & outCapabilities, + const DAVRequestEnvironment & rEnv ) + throw( DAVException ) = 0; + */ + + // allprop & named + virtual void PROPFIND( const ::rtl::OUString & inPath, + const Depth inDepth, + const std::vector< ::rtl::OUString > & inPropertyNames, + std::vector< DAVResource > & ioResources, + const DAVRequestEnvironment & rEnv ) + throw( DAVException ) = 0; + + // propnames + virtual void PROPFIND( const ::rtl::OUString & inPath, + const Depth inDepth, + std::vector< DAVResourceInfo > & ioResInfo, + const DAVRequestEnvironment & rEnv ) + throw( DAVException ) = 0; + + virtual void PROPPATCH( const ::rtl::OUString & inPath, + const std::vector< ProppatchValue > & inValues, + const DAVRequestEnvironment & rEnv ) + throw( DAVException ) = 0; + + virtual void HEAD( const ::rtl::OUString & inPath, + const std::vector< ::rtl::OUString > & inHeaderNames, + DAVResource & ioResource, + const DAVRequestEnvironment & rEnv ) + throw( DAVException ) = 0; + + virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + GET( const ::rtl::OUString & inPath, + const DAVRequestEnvironment & rEnv ) + throw( DAVException ) = 0; + + virtual void GET( const ::rtl::OUString & inPath, + com::sun::star::uno::Reference< + com::sun::star::io::XOutputStream >& o, + const DAVRequestEnvironment & rEnv ) + throw( DAVException ) = 0; + + virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + GET( const ::rtl::OUString & inPath, + const std::vector< ::rtl::OUString > & inHeaderNames, + DAVResource & ioResource, + const DAVRequestEnvironment & rEnv ) + throw( DAVException ) = 0; + + virtual void + GET( const ::rtl::OUString & inPath, + com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& o, + const std::vector< ::rtl::OUString > & inHeaderNames, + DAVResource & ioResource, + const DAVRequestEnvironment & rEnv ) + throw( DAVException ) = 0; + + virtual void PUT( const ::rtl::OUString & inPath, + const com::sun::star::uno::Reference< + com::sun::star::io::XInputStream >& s, + const DAVRequestEnvironment & rEnv ) + throw( DAVException ) = 0; + + virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + POST( const rtl::OUString & inPath, + const rtl::OUString & rContentType, + const rtl::OUString & rReferer, + const com::sun::star::uno::Reference< + com::sun::star::io::XInputStream > & inInputStream, + const DAVRequestEnvironment & rEnv ) + throw ( DAVException ) = 0; + + virtual void POST( const rtl::OUString & inPath, + const rtl::OUString & rContentType, + const rtl::OUString & rReferer, + const com::sun::star::uno::Reference< + com::sun::star::io::XInputStream > & inInputStream, + com::sun::star::uno::Reference< + com::sun::star::io::XOutputStream > & oOutputStream, + const DAVRequestEnvironment & rEnv ) + throw ( DAVException ) = 0; + + virtual void MKCOL( const ::rtl::OUString & inPath, + const DAVRequestEnvironment & rEnv ) + throw( DAVException ) = 0; + + virtual void COPY( const ::rtl::OUString & inSource, + const ::rtl::OUString & inDestination, + const DAVRequestEnvironment & rEnv, + sal_Bool inOverwrite = false ) + throw( DAVException ) = 0; + + virtual void MOVE( const ::rtl::OUString & inSource, + const ::rtl::OUString & inDestination, + const DAVRequestEnvironment & rEnv, + sal_Bool inOverwrite = false ) + throw( DAVException ) = 0; + + virtual void DESTROY( const ::rtl::OUString & inPath, + const DAVRequestEnvironment & rEnv ) + throw( DAVException ) = 0; + + // set new lock. + virtual void LOCK( const ::rtl::OUString & inPath, + com::sun::star::ucb::Lock & inLock, + const DAVRequestEnvironment & rEnv ) + throw ( DAVException ) = 0; + + // refresh existing lock. + virtual sal_Int64 LOCK( const ::rtl::OUString & inPath, + sal_Int64 nTimeout, + const DAVRequestEnvironment & rEnv ) + throw ( DAVException ) = 0; + + virtual void UNLOCK( const ::rtl::OUString & inPath, + const DAVRequestEnvironment & rEnv ) + throw ( DAVException ) = 0; + + virtual void abort() + throw( DAVException ) = 0; + +protected: + rtl::Reference< DAVSessionFactory > m_xFactory; + + DAVSession( rtl::Reference< DAVSessionFactory > const & rFactory ) + : m_xFactory( rFactory ), m_nRefCount( 0 ) {} + + virtual ~DAVSession() {} + +private: + DAVSessionFactory::Map::iterator m_aContainerIt; + oslInterlockedCount m_nRefCount; + + friend class DAVSessionFactory; +#if defined WNT && _MSC_VER < 1310 + friend struct std::auto_ptr< DAVSession >; + // work around compiler bug... +#else // WNT + friend class std::auto_ptr< DAVSession >; +#endif // WNT +}; + +} // namespace http_dav_ucp + +#endif // _DAVSESSION_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/DAVSessionFactory.cxx b/ucb/source/ucp/webdav/DAVSessionFactory.cxx new file mode 100644 index 000000000000..e33eb7e1d9fb --- /dev/null +++ b/ucb/source/ucp/webdav/DAVSessionFactory.cxx @@ -0,0 +1,101 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + + + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_ucb.hxx" +#include "DAVSessionFactory.hxx" +#include "SerfSession.hxx" +#include "SerfUri.hxx" +#include + +using namespace http_dav_ucp; +using namespace com::sun::star; + +DAVSessionFactory::~DAVSessionFactory() +{ +} + +rtl::Reference< DAVSession > DAVSessionFactory::createDAVSession( + const ::rtl::OUString & inUri, + const uno::Reference< lang::XMultiServiceFactory > & rxSMgr ) + throw( DAVException ) +{ + m_xMSF = rxSMgr; + + osl::MutexGuard aGuard( m_aMutex ); + + if ( !m_xProxyDecider.get() ) + m_xProxyDecider.reset( new ucbhelper::InternetProxyDecider( rxSMgr ) ); + + Map::iterator aIt( m_aMap.begin() ); + Map::iterator aEnd( m_aMap.end() ); + + while ( aIt != aEnd ) + { + if ( (*aIt).second->CanUse( inUri ) ) + break; + + ++aIt; + } + + if ( aIt == aEnd ) + { + SerfUri aURI( inUri ); + + std::auto_ptr< DAVSession > xElement( + new SerfSession( this, inUri, *m_xProxyDecider.get() ) ); + + aIt = m_aMap.insert( Map::value_type( inUri, xElement.get() ) ).first; + aIt->second->m_aContainerIt = aIt; + xElement.release(); + return aIt->second; + } + else if ( osl_incrementInterlockedCount( &aIt->second->m_nRefCount ) > 1 ) + { + rtl::Reference< DAVSession > xElement( aIt->second ); + osl_decrementInterlockedCount( &aIt->second->m_nRefCount ); + return xElement; + } + else + { + osl_decrementInterlockedCount( &aIt->second->m_nRefCount ); + aIt->second->m_aContainerIt = m_aMap.end(); + + // If URL scheme is different from http or https we definitely + // have to use a proxy and therefore can optimize the getProxy + // call a little: + SerfUri aURI( inUri ); + + aIt->second = new SerfSession( this, inUri, *m_xProxyDecider.get() ); + aIt->second->m_aContainerIt = aIt; + return aIt->second; + } +} + +void DAVSessionFactory::releaseElement( DAVSession * pElement ) SAL_THROW(()) +{ + OSL_ASSERT( pElement ); + osl::MutexGuard aGuard( m_aMutex ); + if ( pElement->m_aContainerIt != m_aMap.end() ) + m_aMap.erase( pElement->m_aContainerIt ); +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/DAVSessionFactory.hxx b/ucb/source/ucp/webdav/DAVSessionFactory.hxx new file mode 100644 index 000000000000..403a70fff10e --- /dev/null +++ b/ucb/source/ucp/webdav/DAVSessionFactory.hxx @@ -0,0 +1,78 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + + +#ifndef _DAVSESSIONFACTORY_HXX_ +#define _DAVSESSIONFACTORY_HXX_ + +#ifdef min +#undef min // GNU libstdc++ includes which defines methods called min... +#endif +#include +#include +#include +#include +#include +#include +#include +#include "DAVException.hxx" + +using namespace com::sun::star; + +namespace com { namespace sun { namespace star { namespace lang { + class XMultiServiceFactory; +} } } } + +namespace http_dav_ucp +{ + +class DAVSession; + +class DAVSessionFactory : public salhelper::SimpleReferenceObject +{ +public: + ~DAVSessionFactory() SAL_THROW(()); + + rtl::Reference< DAVSession > + createDAVSession( const ::rtl::OUString & inUri, + const ::com::sun::star::uno::Reference< + ::com::sun::star::lang::XMultiServiceFactory >& + rxSMgr ) + throw( DAVException ); + + ::uno::Reference< ::lang::XMultiServiceFactory > getServiceFactory() { return m_xMSF; } +private: + typedef std::map< rtl::OUString, DAVSession * > Map; + + Map m_aMap; + osl::Mutex m_aMutex; + std::auto_ptr< ucbhelper::InternetProxyDecider > m_xProxyDecider; + + ::uno::Reference< ::lang::XMultiServiceFactory > m_xMSF; + + void releaseElement( DAVSession * pElement ) SAL_THROW(()); + + friend class DAVSession; +}; + +} // namespace http_dav_ucp + +#endif // _DAVSESSIONFACTORY_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/DAVTypes.hxx b/ucb/source/ucp/webdav/DAVTypes.hxx new file mode 100644 index 000000000000..a32aee65e697 --- /dev/null +++ b/ucb/source/ucp/webdav/DAVTypes.hxx @@ -0,0 +1,81 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + + + +#ifndef _DAVTYPES_HXX_ +#define _DAVTYPES_HXX_ + +#include +#include + +namespace http_dav_ucp +{ +/* RFC 2518 + +15.1 Class 1 + + A class 1 compliant resource MUST meet all "MUST" requirements in all + sections of this document. + + Class 1 compliant resources MUST return, at minimum, the value "1" in + the DAV header on all responses to the OPTIONS method. + +15.2 Class 2 + + A class 2 compliant resource MUST meet all class 1 requirements and + support the LOCK method, the supportedlock property, the + lockdiscovery property, the Time-Out response header and the Lock- + Token request header. A class "2" compliant resource SHOULD also + support the Time-Out request header and the owner XML element. + + Class 2 compliant resources MUST return, at minimum, the values "1" + and "2" in the DAV header on all responses to the OPTIONS method. +*/ + +struct DAVCapabilities +{ + bool class1; + bool class2; + bool executable; // supports "executable" property (introduced by mod_dav) + + DAVCapabilities() : class1( false ), class2( false ), executable( false ) {} +}; + +enum Depth { DAVZERO = 0, DAVONE = 1, DAVINFINITY = -1 }; + +enum ProppatchOperation { PROPSET = 0, PROPREMOVE = 1 }; + +struct ProppatchValue +{ + ProppatchOperation operation; + rtl::OUString name; + com::sun::star::uno::Any value; + + ProppatchValue( const ProppatchOperation o, + const rtl::OUString & n, + const com::sun::star::uno::Any & v ) + : operation( o ), name( n ), value( v ) {} +}; + +} // namespace http_dav_ucp + +#endif // _DAVTYPES_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/DateTimeHelper.cxx b/ucb/source/ucp/webdav/DateTimeHelper.cxx new file mode 100644 index 000000000000..6958ca887674 --- /dev/null +++ b/ucb/source/ucp/webdav/DateTimeHelper.cxx @@ -0,0 +1,265 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + + + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_ucb.hxx" + +#include +#include +#include +#include "DateTimeHelper.hxx" + +using namespace com::sun::star::util; +using namespace rtl; + +using namespace http_dav_ucp; + +bool DateTimeHelper::ISO8601_To_DateTime (const OUString& s, + DateTime& dateTime) +{ + OString aDT (s.getStr(), s.getLength(), RTL_TEXTENCODING_ASCII_US); + + int year, month, day, hours, minutes, off_hours, off_minutes, fix; + double seconds; + + // 2001-01-01T12:30:00Z + int n = sscanf( aDT.getStr(), "%04d-%02d-%02dT%02d:%02d:%lfZ", + &year, &month, &day, &hours, &minutes, &seconds ); + if ( n == 6 ) + { + fix = 0; + } + else + { + // 2001-01-01T12:30:00+03:30 + n = sscanf( aDT.getStr(), "%04d-%02d-%02dT%02d:%02d:%lf+%02d:%02d", + &year, &month, &day, &hours, &minutes, &seconds, + &off_hours, &off_minutes ); + if ( n == 8 ) + { + fix = - off_hours * 3600 - off_minutes * 60; + } + else + { + // 2001-01-01T12:30:00-03:30 + n = sscanf( aDT.getStr(), "%04d-%02d-%02dT%02d:%02d:%lf-%02d:%02d", + &year, &month, &day, &hours, &minutes, &seconds, + &off_hours, &off_minutes ); + if ( n == 8 ) + { + fix = off_hours * 3600 + off_minutes * 60; + } + else + { + return false; + } + } + } + + // Convert to local time... + + oslDateTime aDateTime; + aDateTime.NanoSeconds = 0; + aDateTime.Seconds = sal::static_int_cast< sal_uInt16 >(seconds); // 0-59 + aDateTime.Minutes = sal::static_int_cast< sal_uInt16 >(minutes); // 0-59 + aDateTime.Hours = sal::static_int_cast< sal_uInt16 >(hours); // 0-23 + aDateTime.Day = sal::static_int_cast< sal_uInt16 >(day); // 1-31 + aDateTime.DayOfWeek = 0; // 0-6, 0 = Sunday + aDateTime.Month = sal::static_int_cast< sal_uInt16 >(month); // 1-12 + aDateTime.Year = sal::static_int_cast< sal_uInt16 >(year); + + TimeValue aTimeValue; + if ( osl_getTimeValueFromDateTime( &aDateTime, &aTimeValue ) ) + { + aTimeValue.Seconds += fix; + + if ( osl_getLocalTimeFromSystemTime( &aTimeValue, &aTimeValue ) ) + { + if ( osl_getDateTimeFromTimeValue( &aTimeValue, &aDateTime ) ) + { + dateTime.Year = aDateTime.Year; + dateTime.Month = aDateTime.Month; + dateTime.Day = aDateTime.Day; + dateTime.Hours = aDateTime.Hours; + dateTime.Minutes = aDateTime.Minutes; + dateTime.Seconds = aDateTime.Seconds; + + return true; + } + } + } + + return false; +} + +/* +sal_Int32 DateTimeHelper::convertDayToInt (const OUString& day) +{ + if (day.compareToAscii ("Sun") == 0) + return 0; + else if (day.compareToAscii ("Mon") == 0) + return 1; + else if (day.compareToAscii ("Tue") == 0) + return 2; + else if (day.compareToAscii ("Wed") == 0) + return 3; + else if (day.compareToAscii ("Thu") == 0) + return 4; + else if (day.compareToAscii ("Fri") == 0) + return 5; + else if (day.compareToAscii ("Sat") == 0) + return 6; + else + return -1; +} +*/ + +sal_Int32 DateTimeHelper::convertMonthToInt (const OUString& month) +{ + if (month.compareToAscii ("Jan") == 0) + return 1; + else if (month.compareToAscii ("Feb") == 0) + return 2; + else if (month.compareToAscii ("Mar") == 0) + return 3; + else if (month.compareToAscii ("Apr") == 0) + return 4; + else if (month.compareToAscii ("May") == 0) + return 5; + else if (month.compareToAscii ("Jun") == 0) + return 6; + else if (month.compareToAscii ("Jul") == 0) + return 7; + else if (month.compareToAscii ("Aug") == 0) + return 8; + else if (month.compareToAscii ("Sep") == 0) + return 9; + else if (month.compareToAscii ("Oct") == 0) + return 10; + else if (month.compareToAscii ("Nov") == 0) + return 11; + else if (month.compareToAscii ("Dec") == 0) + return 12; + else + return 0; +} + +bool DateTimeHelper::RFC2068_To_DateTime (const OUString& s, + DateTime& dateTime) +{ + int year; + int day; + int hours; + int minutes; + int seconds; + sal_Char string_month[3 + 1]; + sal_Char string_day[3 + 1]; + + sal_Int32 found = s.indexOf (','); + if (found != -1) + { + OString aDT (s.getStr(), s.getLength(), RTL_TEXTENCODING_ASCII_US); + + // RFC 1123 + found = sscanf (aDT.getStr(), "%3s, %2d %3s %4d %2d:%2d:%2d GMT", + string_day, &day, string_month, &year, &hours, &minutes, &seconds); + if (found != 7) + { + // RFC 1036 + found = sscanf (aDT.getStr(), "%3s, %2d-%3s-%2d %2d:%2d:%2d GMT", + string_day, &day, string_month, &year, &hours, &minutes, &seconds); + } + found = (found == 7) ? 1 : 0; + } + else + { + OString aDT (s.getStr(), s.getLength(), RTL_TEXTENCODING_ASCII_US); + + // ANSI C's asctime () format + found = sscanf (aDT.getStr(), "%3s %3s %d %2d:%2d:%2d %4d", + string_day, string_month, + &day, &hours, &minutes, &seconds, &year); + found = (found == 7) ? 1 : 0; + } + + if (found) + { + found = 0; + + int month = DateTimeHelper::convertMonthToInt ( + OUString::createFromAscii (string_month)); + if (month) + { + // Convert to local time... + + oslDateTime aDateTime; + aDateTime.NanoSeconds = 0; + aDateTime.Seconds = sal::static_int_cast< sal_uInt16 >(seconds); + // 0-59 + aDateTime.Minutes = sal::static_int_cast< sal_uInt16 >(minutes); + // 0-59 + aDateTime.Hours = sal::static_int_cast< sal_uInt16 >(hours); + // 0-23 + aDateTime.Day = sal::static_int_cast< sal_uInt16 >(day); + // 1-31 + aDateTime.DayOfWeek = 0; //dayofweek; // 0-6, 0 = Sunday + aDateTime.Month = sal::static_int_cast< sal_uInt16 >(month); + // 1-12 + aDateTime.Year = sal::static_int_cast< sal_uInt16 >(year); + + TimeValue aTimeValue; + if ( osl_getTimeValueFromDateTime( &aDateTime, + &aTimeValue ) ) + { + if ( osl_getLocalTimeFromSystemTime( &aTimeValue, + &aTimeValue ) ) + { + if ( osl_getDateTimeFromTimeValue( &aTimeValue, + &aDateTime ) ) + { + dateTime.Year = aDateTime.Year; + dateTime.Month = aDateTime.Month; + dateTime.Day = aDateTime.Day; + dateTime.Hours = aDateTime.Hours; + dateTime.Minutes = aDateTime.Minutes; + dateTime.Seconds = aDateTime.Seconds; + + found = 1; + } + } + } + } + } + + return (found) ? true : false; +} + +bool DateTimeHelper::convert (const OUString& s, DateTime& dateTime) +{ + if (ISO8601_To_DateTime (s, dateTime)) + return true; + else if (RFC2068_To_DateTime (s, dateTime)) + return true; + else + return false; +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/DateTimeHelper.hxx b/ucb/source/ucp/webdav/DateTimeHelper.hxx new file mode 100644 index 000000000000..ba2be763eb74 --- /dev/null +++ b/ucb/source/ucp/webdav/DateTimeHelper.hxx @@ -0,0 +1,58 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + + + +#ifndef _WEBDAV_DATETIME_HELPER_HXX +#define _WEBDAV_DATETIME_HELPER_HXX + +#include + +namespace com { namespace sun { namespace star { namespace util { + struct DateTime; +} } } } + +namespace rtl { + class OUString; +} + +namespace http_dav_ucp +{ + +class DateTimeHelper +{ +private: + static sal_Int32 convertMonthToInt (const ::rtl::OUString& ); + + static bool ISO8601_To_DateTime (const ::rtl::OUString&, + ::com::sun::star::util::DateTime& ); + + static bool RFC2068_To_DateTime (const ::rtl::OUString&, + ::com::sun::star::util::DateTime& ); + +public: + static bool convert (const ::rtl::OUString&, + ::com::sun::star::util::DateTime& ); +}; + +} // namespace http_dav_ucp + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/PropertyMap.hxx b/ucb/source/ucp/webdav/PropertyMap.hxx new file mode 100644 index 000000000000..2cb18e69610b --- /dev/null +++ b/ucb/source/ucp/webdav/PropertyMap.hxx @@ -0,0 +1,61 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + + + +#ifndef _WEBDAV_UCP_PROPERTYMAP_HXX +#define _WEBDAV_UCP_PROPERTYMAP_HXX + +#include +#include + +namespace http_dav_ucp { + +//========================================================================= + +struct equalPropertyName +{ + bool operator()( const ::com::sun::star::beans::Property & p1, + const ::com::sun::star::beans::Property & p2 ) const + { + return !!( p1.Name == p2.Name ); + } +}; + +struct hashPropertyName +{ + size_t operator()( const ::com::sun::star::beans::Property & p ) const + { + return p.Name.hashCode(); + } +}; + +typedef std::hash_set +< + ::com::sun::star::beans::Property, + hashPropertyName, + equalPropertyName +> +PropertyMap; + +} + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/SerfCallbacks.cxx b/ucb/source/ucp/webdav/SerfCallbacks.cxx new file mode 100644 index 000000000000..007cdea70552 --- /dev/null +++ b/ucb/source/ucp/webdav/SerfCallbacks.cxx @@ -0,0 +1,113 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_ucb.hxx" + +#include + +#include +#include + +using namespace http_dav_ucp; + +extern "C" apr_status_t Serf_ConnectSetup( apr_socket_t *skt, + serf_bucket_t **read_bkt, + serf_bucket_t **write_bkt, + void *setup_baton, + apr_pool_t *pool ) +{ + SerfSession* pSerfSession = static_cast< SerfSession* >( setup_baton ); + return pSerfSession->setupSerfConnection( skt, + read_bkt, + write_bkt, + pool ); +} + +extern "C" apr_status_t Serf_Credentials( char **username, + char **password, + serf_request_t *request, + void *baton, + int code, + const char *authn_type, + const char *realm, + apr_pool_t *pool ) +{ + SerfRequestProcessor* pReqProc = static_cast< SerfRequestProcessor* >( baton ); + return pReqProc->provideSerfCredentials( username, + password, + request, + code, + authn_type, + realm, + pool ); +} + +extern "C" apr_status_t Serf_CertificateChainValidation( + void* pSerfSession, + int nFailures, + const char** pCertificateChainBase64Encoded, + int nCertificateChainLength) +{ + return static_cast(pSerfSession) + ->verifySerfCertificateChain(nFailures, pCertificateChainBase64Encoded, nCertificateChainLength); +} + +extern "C" apr_status_t Serf_SetupRequest( serf_request_t *request, + void *setup_baton, + serf_bucket_t **req_bkt, + serf_response_acceptor_t *acceptor, + void **acceptor_baton, + serf_response_handler_t *handler, + void **handler_baton, + apr_pool_t * pool ) +{ + SerfRequestProcessor* pReqProc = static_cast< SerfRequestProcessor* >( setup_baton ); + return pReqProc->setupSerfRequest( request, + req_bkt, + acceptor, + acceptor_baton, + handler, + handler_baton, + pool ); +} + +extern "C" serf_bucket_t* Serf_AcceptResponse( serf_request_t *request, + serf_bucket_t *stream, + void *acceptor_baton, + apr_pool_t *pool ) +{ + SerfRequestProcessor* pReqProc = static_cast< SerfRequestProcessor* >( acceptor_baton ); + return pReqProc->acceptSerfResponse( request, + stream, + pool ); +} + +extern "C" apr_status_t Serf_HandleResponse( serf_request_t *request, + serf_bucket_t *response, + void *handler_baton, + apr_pool_t *pool ) +{ + SerfRequestProcessor* pReqProc = static_cast< SerfRequestProcessor* >( handler_baton ); + return pReqProc->handleSerfResponse( request, + response, + pool ); +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/SerfCallbacks.hxx b/ucb/source/ucp/webdav/SerfCallbacks.hxx new file mode 100644 index 000000000000..af3be032d49a --- /dev/null +++ b/ucb/source/ucp/webdav/SerfCallbacks.hxx @@ -0,0 +1,68 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + + +#ifndef INCLUDED_CALLBACKS_HXX +#define INCLUDED_CALLBACKS_HXX + +#include + +extern "C" apr_status_t Serf_ConnectSetup( apr_socket_t *skt, + serf_bucket_t **read_bkt, + serf_bucket_t **write_bkt, + void *setup_baton, + apr_pool_t *pool ); + +extern "C" apr_status_t Serf_Credentials( char **username, + char **password, + serf_request_t *request, + void *baton, + int code, + const char *authn_type, + const char *realm, + apr_pool_t *pool ); + +extern "C" apr_status_t Serf_CertificateChainValidation( + void* pSerfSession, + int nFailures, + const char** pCertificateChainBase64Encoded, + int nCertificateChainLength); + +extern "C" apr_status_t Serf_SetupRequest( serf_request_t *request, + void *setup_baton, + serf_bucket_t **req_bkt, + serf_response_acceptor_t *acceptor, + void **acceptor_baton, + serf_response_handler_t *handler, + void **handler_baton, + apr_pool_t * pool ); + +extern "C" serf_bucket_t* Serf_AcceptResponse( serf_request_t *request, + serf_bucket_t *stream, + void *acceptor_baton, + apr_pool_t *pool ); + +extern "C" apr_status_t Serf_HandleResponse( serf_request_t *request, + serf_bucket_t *response, + void *handler_baton, + apr_pool_t *pool ); + +#endif // INCLUDED_CALLBACKS_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx new file mode 100644 index 000000000000..70a9765a4931 --- /dev/null +++ b/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx @@ -0,0 +1,85 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_ucb.hxx" + +#include + +#include + +namespace http_dav_ucp +{ + +SerfCopyReqProcImpl::SerfCopyReqProcImpl( const char* inSourcePath, + const DAVRequestHeaders& inRequestHeaders, + const char* inDestinationPath, + const bool inOverwrite ) + : SerfRequestProcessorImpl( inSourcePath, inRequestHeaders ) + , mDestPathStr( inDestinationPath ) + , mbOverwrite( inOverwrite ) +{ +} + +SerfCopyReqProcImpl::~SerfCopyReqProcImpl() +{ +} + +serf_bucket_t * SerfCopyReqProcImpl::createSerfRequestBucket( serf_request_t * inSerfRequest ) +{ + // create serf request + serf_bucket_t *req_bkt = serf_request_bucket_request_create( inSerfRequest, + "COPY", + getPathStr(), + 0, + serf_request_get_alloc( inSerfRequest ) ); + + // set request header fields + serf_bucket_t* hdrs_bkt = serf_bucket_request_get_headers( req_bkt ); + // general header fields provided by caller + setRequestHeaders( hdrs_bkt ); + + // COPY specific header fields + serf_bucket_headers_set( hdrs_bkt, "Destination", mDestPathStr ); + if ( mbOverwrite ) + { + serf_bucket_headers_set( hdrs_bkt, "Overwrite", "T" ); + } + else + { + serf_bucket_headers_set( hdrs_bkt, "Overwrite", "F" ); + } + + return req_bkt; +} + +void SerfCopyReqProcImpl::processChunkOfResponseData( const char* /*data*/, + apr_size_t /*len*/ ) +{ + // nothing to do; +} + +void SerfCopyReqProcImpl::handleEndOfResponseData( serf_bucket_t * /*inSerfResponseBucket*/ ) +{ + // nothing to do; +} + +} // namespace http_dav_ucp + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/SerfCopyReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfCopyReqProcImpl.hxx new file mode 100644 index 000000000000..75631bb03519 --- /dev/null +++ b/ucb/source/ucp/webdav/SerfCopyReqProcImpl.hxx @@ -0,0 +1,57 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef INCLUDED_SERFCOPYREQPROCIMPL_HXX +#define INCLUDED_SERFCOPYREQPROCIMPL_HXX + +#include + +namespace http_dav_ucp +{ + +class SerfCopyReqProcImpl : public SerfRequestProcessorImpl +{ +public: + SerfCopyReqProcImpl( const char* inSourcePath, + const DAVRequestHeaders& inRequestHeaders, + const char* inDestinationPath, + const bool inOverwrite ); + + virtual ~SerfCopyReqProcImpl(); + + virtual + serf_bucket_t * createSerfRequestBucket( serf_request_t * inSerfRequest ); + +protected: + virtual + void processChunkOfResponseData( const char* data, apr_size_t len ); + + virtual + void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ); + +private: + const char* mDestPathStr; + const bool mbOverwrite; +}; + +} // namespace http_dav_ucp + +#endif // INCLUDED_SERFCOPYREQPROCIMPL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx new file mode 100644 index 000000000000..2bd60d1f6c34 --- /dev/null +++ b/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx @@ -0,0 +1,70 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_ucb.hxx" + +#include + +#include + +namespace http_dav_ucp +{ + +SerfDeleteReqProcImpl::SerfDeleteReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders ) + : SerfRequestProcessorImpl( inPath, inRequestHeaders ) +{ +} + +SerfDeleteReqProcImpl::~SerfDeleteReqProcImpl() +{ +} + +serf_bucket_t * SerfDeleteReqProcImpl::createSerfRequestBucket( serf_request_t * inSerfRequest ) +{ + // create serf request + serf_bucket_t *req_bkt = serf_request_bucket_request_create( inSerfRequest, + "DELETE", + getPathStr(), + 0, + serf_request_get_alloc( inSerfRequest ) ); + + // set request header fields + serf_bucket_t* hdrs_bkt = serf_bucket_request_get_headers( req_bkt ); + // general header fields provided by caller + setRequestHeaders( hdrs_bkt ); + + return req_bkt; +} + +void SerfDeleteReqProcImpl::processChunkOfResponseData( const char* /*data*/, + apr_size_t /*len*/ ) +{ + // nothing to do; +} + +void SerfDeleteReqProcImpl::handleEndOfResponseData( serf_bucket_t * /*inSerfResponseBucket*/ ) +{ + // nothing to do; +} + +} // namespace http_dav_ucp + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.hxx new file mode 100644 index 000000000000..1cf2ec15ded8 --- /dev/null +++ b/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.hxx @@ -0,0 +1,52 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef INCLUDED_SERFDELETEREQPROCIMPL_HXX +#define INCLUDED_SERFDELETEREQPROCIMPL_HXX + +#include + +namespace http_dav_ucp +{ + +class SerfDeleteReqProcImpl : public SerfRequestProcessorImpl +{ +public: + SerfDeleteReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders ); + + virtual ~SerfDeleteReqProcImpl(); + + virtual + serf_bucket_t * createSerfRequestBucket( serf_request_t * inSerfRequest ); + +protected: + virtual + void processChunkOfResponseData( const char* data, apr_size_t len ); + + virtual + void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ); + +}; + +} // namespace http_dav_ucp + +#endif // INCLUDED_SERFDELETEREQPROCIMPL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx new file mode 100644 index 000000000000..014af709cea6 --- /dev/null +++ b/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx @@ -0,0 +1,187 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_ucb.hxx" + +#include + +using namespace com::sun::star; + +namespace http_dav_ucp +{ + +SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const com::sun::star::uno::Reference< SerfInputStream > & xioInStrm ) + : SerfRequestProcessorImpl( inPath, inRequestHeaders ) + , xInputStream( xioInStrm ) + , xOutputStream() + , mpHeaderNames( 0 ) + , mpResource( 0 ) +{ +} + +SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const com::sun::star::uno::Reference< SerfInputStream > & xioInStrm, + const std::vector< ::rtl::OUString > & inHeaderNames, + DAVResource & ioResource ) + : SerfRequestProcessorImpl( inPath, inRequestHeaders ) + , xInputStream( xioInStrm ) + , xOutputStream() + , mpHeaderNames( &inHeaderNames ) + , mpResource( &ioResource ) +{ +} + +SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & xioOutStrm ) + : SerfRequestProcessorImpl( inPath, inRequestHeaders ) + , xInputStream() + , xOutputStream( xioOutStrm ) + , mpHeaderNames( 0 ) + , mpResource( 0 ) +{ +} + +SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & xioOutStrm, + const std::vector< ::rtl::OUString > & inHeaderNames, + DAVResource & ioResource ) + : SerfRequestProcessorImpl( inPath, inRequestHeaders ) + , xInputStream() + , xOutputStream( xioOutStrm ) + , mpHeaderNames( &inHeaderNames ) + , mpResource( &ioResource ) +{ +} + +SerfGetReqProcImpl::~SerfGetReqProcImpl() +{ +} + +serf_bucket_t * SerfGetReqProcImpl::createSerfRequestBucket( serf_request_t * inSerfRequest ) +{ + // create serf request + serf_bucket_t *req_bkt = serf_request_bucket_request_create( inSerfRequest, + "GET", + getPathStr(), + 0, + serf_request_get_alloc( inSerfRequest ) ); + + // set request header fields + serf_bucket_t* hdrs_bkt = serf_bucket_request_get_headers( req_bkt ); + // general header fields provided by caller + setRequestHeaders( hdrs_bkt ); + + return req_bkt; +} + +void SerfGetReqProcImpl::processChunkOfResponseData( const char* data, + apr_size_t len ) +{ + if ( xInputStream.is() ) + { + xInputStream->AddToStream( data, len ); + } + else if ( xOutputStream.is() ) + { + const uno::Sequence< sal_Int8 > aDataSeq( (sal_Int8 *)data, len ); + xOutputStream->writeBytes( aDataSeq ); + } +} + +namespace +{ + apr_status_t Serf_ProcessResponseHeader( void* inUserData, + const char* inHeaderName, + const char* inHeaderValue ) + { + SerfGetReqProcImpl* pReqProcImpl = static_cast< SerfGetReqProcImpl* >( inUserData ); + pReqProcImpl->processSingleResponseHeader( inHeaderName, + inHeaderValue ); + + return APR_SUCCESS; + } +} // end of anonymous namespace + +void SerfGetReqProcImpl::handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ) +{ + // read response header, if requested + if ( mpHeaderNames != 0 && mpResource != 0 ) + { + serf_bucket_t* SerfHeaderBucket = serf_bucket_response_get_headers( inSerfResponseBucket ); + if ( SerfHeaderBucket != 0 ) + { + serf_bucket_headers_do( SerfHeaderBucket, + Serf_ProcessResponseHeader, + this ); + } + } +} + +void SerfGetReqProcImpl::processSingleResponseHeader( const char* inHeaderName, + const char* inHeaderValue ) +{ + rtl::OUString aHeaderName( rtl::OUString::createFromAscii( inHeaderName ) ); + + bool bStoreHeaderField = false; + + if ( mpHeaderNames->size() == 0 ) + { + // store all header fields + bStoreHeaderField = true; + } + else + { + // store only header fields which are requested + std::vector< ::rtl::OUString >::const_iterator it( mpHeaderNames->begin() ); + const std::vector< ::rtl::OUString >::const_iterator end( mpHeaderNames->end() ); + + while ( it != end ) + { + // header names are case insensitive + if ( (*it).equalsIgnoreAsciiCase( aHeaderName ) ) + { + bStoreHeaderField = true; + break; + } + else + { + ++it; + } + } + } + + if ( bStoreHeaderField ) + { + DAVPropertyValue thePropertyValue; + thePropertyValue.IsCaseSensitive = false; + thePropertyValue.Name = aHeaderName; + thePropertyValue.Value <<= rtl::OUString::createFromAscii( inHeaderValue ); + mpResource->properties.push_back( thePropertyValue ); + } +} + +} // namespace http_dav_ucp + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx new file mode 100644 index 000000000000..6497ecba2715 --- /dev/null +++ b/ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx @@ -0,0 +1,84 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef INCLUDED_SERFGETREQPROCIMPL_HXX +#define INCLUDED_SERFGETREQPROCIMPL_HXX + +#include + +#include +#include +#include + +#include +#include + +namespace http_dav_ucp +{ + +class SerfGetReqProcImpl : public SerfRequestProcessorImpl +{ +public: + SerfGetReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const com::sun::star::uno::Reference< SerfInputStream > & xioInStrm ); + + SerfGetReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const com::sun::star::uno::Reference< SerfInputStream > & xioInStrm, + const std::vector< ::rtl::OUString > & inHeaderNames, + DAVResource & ioResource ); + + SerfGetReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & xioOutStrm ); + + SerfGetReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & xioOutStrm, + const std::vector< ::rtl::OUString > & inHeaderNames, + DAVResource & ioResource ); + + virtual ~SerfGetReqProcImpl(); + + virtual + serf_bucket_t * createSerfRequestBucket( serf_request_t * inSerfRequest ); + + void processSingleResponseHeader( const char* inHeaderName, + const char* inHeaderValue ); + +protected: + virtual + void processChunkOfResponseData( const char* data, apr_size_t len ); + + virtual + void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ); + +private: + com::sun::star::uno::Reference< SerfInputStream > xInputStream; + com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > xOutputStream; + const std::vector< ::rtl::OUString > * mpHeaderNames; + DAVResource* mpResource; +}; + +} // namespace http_dav_ucp + +#endif // INCLUDED_SERFGETREQPROCIMPL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx new file mode 100644 index 000000000000..45ce6479bd73 --- /dev/null +++ b/ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx @@ -0,0 +1,141 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_ucb.hxx" + +#include + +using namespace com::sun::star; + +namespace http_dav_ucp +{ + +SerfHeadReqProcImpl::SerfHeadReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const std::vector< ::rtl::OUString > & inHeaderNames, + DAVResource & ioResource ) + : SerfRequestProcessorImpl( inPath, inRequestHeaders ) + , mpHeaderNames( &inHeaderNames ) + , mpResource( &ioResource ) +{ +} + +SerfHeadReqProcImpl::~SerfHeadReqProcImpl() +{ +} + +serf_bucket_t * SerfHeadReqProcImpl::createSerfRequestBucket( serf_request_t * inSerfRequest ) +{ + // create serf request + serf_bucket_t *req_bkt = serf_request_bucket_request_create( inSerfRequest, + "HEAD", + getPathStr(), + 0, + serf_request_get_alloc( inSerfRequest ) ); + + // set request header fields + serf_bucket_t* hdrs_bkt = serf_bucket_request_get_headers( req_bkt ); + // general header fields provided by caller + setRequestHeaders( hdrs_bkt ); + + return req_bkt; +} + +void SerfHeadReqProcImpl::processChunkOfResponseData( const char* /*data*/, + apr_size_t /*len*/ ) +{ + // nothing to do +} + +namespace +{ + apr_status_t Serf_ProcessResponseHeader( void* inUserData, + const char* inHeaderName, + const char* inHeaderValue ) + { + SerfHeadReqProcImpl* pReqProcImpl = static_cast< SerfHeadReqProcImpl* >( inUserData ); + pReqProcImpl->processSingleResponseHeader( inHeaderName, + inHeaderValue ); + + return APR_SUCCESS; + } +} // end of anonymous namespace + +void SerfHeadReqProcImpl::handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ) +{ + // read response header, if requested + if ( mpHeaderNames != 0 && mpResource != 0 ) + { + serf_bucket_t* SerfHeaderBucket = serf_bucket_response_get_headers( inSerfResponseBucket ); + if ( SerfHeaderBucket != 0 ) + { + serf_bucket_headers_do( SerfHeaderBucket, + Serf_ProcessResponseHeader, + this ); + } + } +} + +void SerfHeadReqProcImpl::processSingleResponseHeader( const char* inHeaderName, + const char* inHeaderValue ) +{ + rtl::OUString aHeaderName( rtl::OUString::createFromAscii( inHeaderName ) ); + + bool bStoreHeaderField = false; + + if ( mpHeaderNames->size() == 0 ) + { + // store all header fields + bStoreHeaderField = true; + } + else + { + // store only header fields which are requested + std::vector< ::rtl::OUString >::const_iterator it( mpHeaderNames->begin() ); + const std::vector< ::rtl::OUString >::const_iterator end( mpHeaderNames->end() ); + + while ( it != end ) + { + // header names are case insensitive + if ( (*it).equalsIgnoreAsciiCase( aHeaderName ) ) + { + bStoreHeaderField = true; + break; + } + else + { + ++it; + } + } + } + + if ( bStoreHeaderField ) + { + DAVPropertyValue thePropertyValue; + thePropertyValue.IsCaseSensitive = false; + thePropertyValue.Name = aHeaderName; + thePropertyValue.Value <<= rtl::OUString::createFromAscii( inHeaderValue ); + mpResource->properties.push_back( thePropertyValue ); + } +} + +} // namespace http_dav_ucp + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/SerfHeadReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfHeadReqProcImpl.hxx new file mode 100644 index 000000000000..46039f130b49 --- /dev/null +++ b/ucb/source/ucp/webdav/SerfHeadReqProcImpl.hxx @@ -0,0 +1,67 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef INCLUDED_SERFHEADREQPROCIMPL_HXX +#define INCLUDED_SERFHEADREQPROCIMPL_HXX + +#include + +#include +#include +#include + +#include +#include + +namespace http_dav_ucp +{ + +class SerfHeadReqProcImpl : public SerfRequestProcessorImpl +{ +public: + SerfHeadReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const std::vector< ::rtl::OUString > & inHeaderNames, + DAVResource & ioResource ); + + virtual ~SerfHeadReqProcImpl(); + + virtual + serf_bucket_t * createSerfRequestBucket( serf_request_t * inSerfRequest ); + + void processSingleResponseHeader( const char* inHeaderName, + const char* inHeaderValue ); + +protected: + virtual + void processChunkOfResponseData( const char* data, apr_size_t len ); + + virtual + void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ); + +private: + const std::vector< ::rtl::OUString > * mpHeaderNames; + DAVResource* mpResource; +}; + +} // namespace http_dav_ucp + +#endif // INCLUDED_SERFHEADREQPROCIMPL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/SerfInputStream.cxx b/ucb/source/ucp/webdav/SerfInputStream.cxx new file mode 100644 index 000000000000..d8c72227aed8 --- /dev/null +++ b/ucb/source/ucp/webdav/SerfInputStream.cxx @@ -0,0 +1,191 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + + + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_ucb.hxx" +#include "SerfInputStream.hxx" +#include + +using namespace cppu; +using namespace rtl; +using namespace com::sun::star::io; +using namespace com::sun::star::uno; +using namespace http_dav_ucp; + + +// ------------------------------------------------------------------- +// Constructor +// ------------------------------------------------------------------- +SerfInputStream::SerfInputStream( void ) +: mLen( 0 ), + mPos( 0 ) +{ +} + +// ------------------------------------------------------------------- +// Destructor +// ------------------------------------------------------------------- +SerfInputStream::~SerfInputStream( void ) +{ +} + +// ------------------------------------------------------------------- +// AddToStream +// Allows the caller to add some data to the "end" of the stream +// ------------------------------------------------------------------- +void SerfInputStream::AddToStream( const char * inBuf, sal_Int32 inLen ) +{ + mInputBuffer.realloc( sal::static_int_cast(mLen) + inLen ); + rtl_copyMemory( mInputBuffer.getArray() + mLen, inBuf, inLen ); + mLen += inLen; +} + +// ------------------------------------------------------------------- +// queryInterface +// ------------------------------------------------------------------- +Any SerfInputStream::queryInterface( const Type &type ) + throw( RuntimeException ) +{ + Any aRet = ::cppu::queryInterface( type, + static_cast< XInputStream * >( this ), + static_cast< XSeekable * >( this ) ); + return aRet.hasValue() ? aRet : OWeakObject::queryInterface( type ); +} + +// ------------------------------------------------------------------- +// readBytes +// "Reads" the specified number of bytes from the stream +// ------------------------------------------------------------------- +sal_Int32 SAL_CALL SerfInputStream::readBytes( + ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) + throw( ::com::sun::star::io::NotConnectedException, + ::com::sun::star::io::BufferSizeExceededException, + ::com::sun::star::io::IOException, + ::com::sun::star::uno::RuntimeException ) +{ + // Work out how much we're actually going to write + sal_Int32 theBytes2Read = nBytesToRead; + sal_Int32 theBytesLeft = sal::static_int_cast(mLen - mPos); + if ( theBytes2Read > theBytesLeft ) + theBytes2Read = theBytesLeft; + + // Realloc buffer. + aData.realloc( theBytes2Read ); + + // Write the data + rtl_copyMemory( + aData.getArray(), mInputBuffer.getConstArray() + mPos, theBytes2Read ); + + // Update our stream position for next time + mPos += theBytes2Read; + + return theBytes2Read; +} + +// ------------------------------------------------------------------- +// readSomeBytes +// ------------------------------------------------------------------- +sal_Int32 SAL_CALL SerfInputStream::readSomeBytes( + ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) + throw( ::com::sun::star::io::NotConnectedException, + ::com::sun::star::io::BufferSizeExceededException, + ::com::sun::star::io::IOException, + ::com::sun::star::uno::RuntimeException ) +{ + // Warning: What should this be doing ? + return readBytes( aData, nMaxBytesToRead ); +} + +// ------------------------------------------------------------------- +// skipBytes +// Moves the current stream position forward +// ------------------------------------------------------------------- +void SAL_CALL SerfInputStream::skipBytes( sal_Int32 nBytesToSkip ) + throw( ::com::sun::star::io::NotConnectedException, + ::com::sun::star::io::BufferSizeExceededException, + ::com::sun::star::io::IOException, + ::com::sun::star::uno::RuntimeException ) +{ + mPos += nBytesToSkip; + if ( mPos >= mLen ) + mPos = mLen; +} + +// ------------------------------------------------------------------- +// available +// Returns the number of unread bytes currently remaining on the stream +// ------------------------------------------------------------------- +sal_Int32 SAL_CALL SerfInputStream::available( ) + throw( ::com::sun::star::io::NotConnectedException, + ::com::sun::star::io::IOException, + ::com::sun::star::uno::RuntimeException ) +{ + return sal::static_int_cast(mLen - mPos); +} + +// ------------------------------------------------------------------- +// closeInput +// ------------------------------------------------------------------- +void SAL_CALL SerfInputStream::closeInput( void ) + throw( ::com::sun::star::io::NotConnectedException, + ::com::sun::star::io::IOException, + ::com::sun::star::uno::RuntimeException ) +{ +} + +// ------------------------------------------------------------------- +// seek +// ------------------------------------------------------------------- +void SAL_CALL SerfInputStream::seek( sal_Int64 location ) + throw( ::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::io::IOException, + ::com::sun::star::uno::RuntimeException ) +{ + if ( location < 0 ) + throw ::com::sun::star::lang::IllegalArgumentException(); + + if ( location <= mLen ) + mPos = location; + else + throw ::com::sun::star::lang::IllegalArgumentException(); +} + +// ------------------------------------------------------------------- +// getPosition +// ------------------------------------------------------------------- +sal_Int64 SAL_CALL SerfInputStream::getPosition() + throw( ::com::sun::star::io::IOException, + ::com::sun::star::uno::RuntimeException ) +{ + return mPos; +} + +// ------------------------------------------------------------------- +// getLength +// ------------------------------------------------------------------- +sal_Int64 SAL_CALL SerfInputStream::getLength() + throw( ::com::sun::star::io::IOException, + ::com::sun::star::uno::RuntimeException ) +{ + return mLen; +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/SerfInputStream.hxx b/ucb/source/ucp/webdav/SerfInputStream.hxx new file mode 100644 index 000000000000..2045df6913c4 --- /dev/null +++ b/ucb/source/ucp/webdav/SerfInputStream.hxx @@ -0,0 +1,121 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + + +#ifndef INCLUDED_NEONINPUTSTREAM_HXX +#define INCLUDED_NEONINPUTSTREAM_HXX + +#include +#include +#include +#include +#include + + +namespace http_dav_ucp +{ + +// ------------------------------------------------------------------- +// SerfInputStream +// A simple XInputStream implementation provided specifically for use +// by the DAVSession::GET method. +// ------------------------------------------------------------------- +class SerfInputStream : public ::com::sun::star::io::XInputStream, + public ::com::sun::star::io::XSeekable, + public ::cppu::OWeakObject +{ + private: + com::sun::star::uno::Sequence< sal_Int8 > mInputBuffer; + sal_Int64 mLen; + sal_Int64 mPos; + + public: + SerfInputStream( void ); + virtual ~SerfInputStream(); + + // Add some data to the end of the stream + void AddToStream( const char * inBuf, sal_Int32 inLen ); + + // XInterface + virtual com::sun::star::uno::Any SAL_CALL queryInterface( + const ::com::sun::star::uno::Type & type ) + throw( ::com::sun::star::uno::RuntimeException ); + + virtual void SAL_CALL acquire( void ) + throw () + { OWeakObject::acquire(); } + + virtual void SAL_CALL release( void ) + throw() + { OWeakObject::release(); } + + + // XInputStream + virtual sal_Int32 SAL_CALL readBytes( + ::com::sun::star::uno::Sequence< sal_Int8 > & aData, + sal_Int32 nBytesToRead ) + throw( ::com::sun::star::io::NotConnectedException, + ::com::sun::star::io::BufferSizeExceededException, + ::com::sun::star::io::IOException, + ::com::sun::star::uno::RuntimeException ); + + virtual sal_Int32 SAL_CALL readSomeBytes( + ::com::sun::star::uno::Sequence< sal_Int8 > & aData, + sal_Int32 nMaxBytesToRead ) + throw( ::com::sun::star::io::NotConnectedException, + ::com::sun::star::io::BufferSizeExceededException, + ::com::sun::star::io::IOException, + ::com::sun::star::uno::RuntimeException ); + + virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) + throw( ::com::sun::star::io::NotConnectedException, + ::com::sun::star::io::BufferSizeExceededException, + ::com::sun::star::io::IOException, + ::com::sun::star::uno::RuntimeException ); + + virtual sal_Int32 SAL_CALL available( void ) + throw( ::com::sun::star::io::NotConnectedException, + ::com::sun::star::io::IOException, + ::com::sun::star::uno::RuntimeException ); + + virtual void SAL_CALL closeInput( void ) + throw( ::com::sun::star::io::NotConnectedException, + ::com::sun::star::io::IOException, + ::com::sun::star::uno::RuntimeException ); + + // XSeekable + virtual void SAL_CALL seek( sal_Int64 location ) + throw( ::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::io::IOException, + ::com::sun::star::uno::RuntimeException ); + + virtual sal_Int64 SAL_CALL getPosition() + throw( ::com::sun::star::io::IOException, + ::com::sun::star::uno::RuntimeException ); + + virtual sal_Int64 SAL_CALL getLength() + throw( ::com::sun::star::io::IOException, + ::com::sun::star::uno::RuntimeException ); +}; + +} // namespace http_dav_ucp + +#endif // INCLUDED_NEONINPUTSTREAM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/SerfLockStore.cxx b/ucb/source/ucp/webdav/SerfLockStore.cxx new file mode 100644 index 000000000000..aa5e65c4f46e --- /dev/null +++ b/ucb/source/ucp/webdav/SerfLockStore.cxx @@ -0,0 +1,241 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + + + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_ucb.hxx" + +#include +#include +#include "rtl/ustring.hxx" +#include "osl/time.h" +#include "osl/thread.hxx" +#include "SerfSession.hxx" +#include "SerfLockStore.hxx" + +using namespace http_dav_ucp; + +namespace http_dav_ucp { + +class TickerThread : public osl::Thread +{ + bool m_bFinish; + SerfLockStore & m_rLockStore; + +public: + + TickerThread( SerfLockStore & rLockStore ) + : osl::Thread(), m_bFinish( false ), m_rLockStore( rLockStore ) {} + + void finish() { m_bFinish = true; } + +protected: + + virtual void SAL_CALL run(); +}; + +} // namespace http_dav_ucp + +// ------------------------------------------------------------------- +void TickerThread::run() +{ + OSL_TRACE( "TickerThread: start." ); + + // we have to go through the loop more often to be able to finish ~quickly + const int nNth = 25; + + int nCount = nNth; + while ( !m_bFinish ) + { + if ( nCount-- <= 0 ) + { + m_rLockStore.refreshLocks(); + nCount = nNth; + } + + TimeValue aTV; + aTV.Seconds = 0; + aTV.Nanosec = 1000000000 / nNth; + wait( aTV ); + } + + OSL_TRACE( "TickerThread: stop." ); +} + +// ------------------------------------------------------------------- +SerfLockStore::SerfLockStore() + : m_pSerfLockStore( ne_lockstore_create() ), + m_pTickerThread( 0 ) +{ + OSL_ENSURE( m_pSerfLockStore, "Unable to create neon lock store!" ); +} + +// ------------------------------------------------------------------- +SerfLockStore::~SerfLockStore() +{ + stopTicker(); + + // release active locks, if any. + OSL_ENSURE( m_aLockInfoMap.size() == 0, + "SerfLockStore::~SerfLockStore - Releasing active locks!" ); + + LockInfoMap::const_iterator it( m_aLockInfoMap.begin() ); + const LockInfoMap::const_iterator end( m_aLockInfoMap.end() ); + while ( it != end ) + { + SerfLock * pLock = (*it).first; + (*it).second.xSession->UNLOCK( pLock ); + + ne_lockstore_remove( m_pSerfLockStore, pLock ); + ne_lock_destroy( pLock ); + + ++it; + } + + ne_lockstore_destroy( m_pSerfLockStore ); +} + +// ------------------------------------------------------------------- +void SerfLockStore::startTicker() +{ + osl::MutexGuard aGuard( m_aMutex ); + + if ( !m_pTickerThread ) + { + m_pTickerThread = new TickerThread( *this ); + m_pTickerThread->create(); + } +} + +// ------------------------------------------------------------------- +void SerfLockStore::stopTicker() +{ + osl::MutexGuard aGuard( m_aMutex ); + + if ( m_pTickerThread ) + { + m_pTickerThread->finish(); + m_pTickerThread->join(); + delete m_pTickerThread; + m_pTickerThread = 0; + } +} + +// ------------------------------------------------------------------- +void SerfLockStore::registerSession( HttpSession * pHttpSession ) +{ + osl::MutexGuard aGuard( m_aMutex ); + + ne_lockstore_register( m_pSerfLockStore, pHttpSession ); +} + +// ------------------------------------------------------------------- +SerfLock * SerfLockStore::findByUri( rtl::OUString const & rUri ) +{ + osl::MutexGuard aGuard( m_aMutex ); + + ne_uri aUri; + ne_uri_parse( rtl::OUStringToOString( + rUri, RTL_TEXTENCODING_UTF8 ).getStr(), &aUri ); + return ne_lockstore_findbyuri( m_pSerfLockStore, &aUri ); +} + +// ------------------------------------------------------------------- +void SerfLockStore::addLock( SerfLock * pLock, + rtl::Reference< SerfSession > const & xSession, + sal_Int32 nLastChanceToSendRefreshRequest ) +{ + osl::MutexGuard aGuard( m_aMutex ); + + ne_lockstore_add( m_pSerfLockStore, pLock ); + m_aLockInfoMap[ pLock ] + = LockInfo( xSession, nLastChanceToSendRefreshRequest ); + + startTicker(); +} + +// ------------------------------------------------------------------- +void SerfLockStore::updateLock( SerfLock * pLock, + sal_Int32 nLastChanceToSendRefreshRequest ) +{ + osl::MutexGuard aGuard( m_aMutex ); + + LockInfoMap::iterator it( m_aLockInfoMap.find( pLock ) ); + OSL_ENSURE( it != m_aLockInfoMap.end(), + "SerfLockStore::updateLock: lock not found!" ); + + if ( it != m_aLockInfoMap.end() ) + { + (*it).second.nLastChanceToSendRefreshRequest + = nLastChanceToSendRefreshRequest; + } +} + +// ------------------------------------------------------------------- +void SerfLockStore::removeLock( SerfLock * pLock ) +{ + osl::MutexGuard aGuard( m_aMutex ); + + m_aLockInfoMap.erase( pLock ); + ne_lockstore_remove( m_pSerfLockStore, pLock ); + + if ( m_aLockInfoMap.size() == 0 ) + stopTicker(); +} + +// ------------------------------------------------------------------- +void SerfLockStore::refreshLocks() +{ + osl::MutexGuard aGuard( m_aMutex ); + + LockInfoMap::iterator it( m_aLockInfoMap.begin() ); + const LockInfoMap::const_iterator end( m_aLockInfoMap.end() ); + while ( it != end ) + { + LockInfo & rInfo = (*it).second; + if ( rInfo.nLastChanceToSendRefreshRequest != -1 ) + { + // 30 seconds or less remaining until lock expires? + TimeValue t1; + osl_getSystemTime( &t1 ); + if ( rInfo.nLastChanceToSendRefreshRequest - 30 + <= sal_Int32( t1.Seconds ) ) + { + // refresh the lock. + sal_Int32 nlastChanceToSendRefreshRequest = -1; + if ( rInfo.xSession->LOCK( + (*it).first, + /* out param */ nlastChanceToSendRefreshRequest ) ) + { + rInfo.nLastChanceToSendRefreshRequest + = nlastChanceToSendRefreshRequest; + } + else + { + // refresh failed. stop auto-refresh. + rInfo.nLastChanceToSendRefreshRequest = -1; + } + } + } + ++it; + } +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/SerfLockStore.hxx b/ucb/source/ucp/webdav/SerfLockStore.hxx new file mode 100644 index 000000000000..cc11af5e4011 --- /dev/null +++ b/ucb/source/ucp/webdav/SerfLockStore.hxx @@ -0,0 +1,97 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + + +#ifndef INCLUDED_SERFLOCKSTORE_HXX +#define INCLUDED_SERFLOCKSTORE_HXX + +#include +#include "osl/mutex.hxx" +#include "rtl/ref.hxx" +#include "SerfTypes.hxx" + +namespace http_dav_ucp +{ + +class TickerThread; +class SerfSession; + +struct ltptr +{ + bool operator()( const SerfLock * p1, const SerfLock * p2 ) const + { + return p1 < p2; + } +}; + +typedef struct _LockInfo +{ + rtl::Reference< SerfSession > xSession; + sal_Int32 nLastChanceToSendRefreshRequest; + + _LockInfo() + : nLastChanceToSendRefreshRequest( -1 ) {} + + _LockInfo( rtl::Reference< SerfSession > const & _xSession, + sal_Int32 _nLastChanceToSendRefreshRequest ) + : xSession( _xSession ), + nLastChanceToSendRefreshRequest( _nLastChanceToSendRefreshRequest ) {} + +} LockInfo; + +typedef std::map< SerfLock *, LockInfo, ltptr > LockInfoMap; + +class SerfLockStore +{ + osl::Mutex m_aMutex; +// ne_lock_store * m_pSerfLockStore; + TickerThread * m_pTickerThread; + LockInfoMap m_aLockInfoMap; + +public: + SerfLockStore(); + ~SerfLockStore(); + + void registerSession( HttpSession * pHttpSession ); + + SerfLock * findByUri( rtl::OUString const & rUri ); + + void addLock( SerfLock * pLock, + rtl::Reference< SerfSession > const & xSession, + // time in seconds since Jan 1 1970 + // -1: infinite lock, no refresh + sal_Int32 nLastChanceToSendRefreshRequest ); + + void updateLock( SerfLock * pLock, + sal_Int32 nLastChanceToSendRefreshRequest ); + + void removeLock( SerfLock * pLock ); + + void refreshLocks(); + +private: + void startTicker(); + void stopTicker(); +}; + +} // namespace http_dav_ucp + +#endif // INCLUDED_SERFLOCKSTORE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx new file mode 100644 index 000000000000..e9e7c72ed410 --- /dev/null +++ b/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx @@ -0,0 +1,70 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_ucb.hxx" + +#include + +#include + +namespace http_dav_ucp +{ + +SerfMkColReqProcImpl::SerfMkColReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders ) + : SerfRequestProcessorImpl( inPath,inRequestHeaders ) +{ +} + +SerfMkColReqProcImpl::~SerfMkColReqProcImpl() +{ +} + +serf_bucket_t * SerfMkColReqProcImpl::createSerfRequestBucket( serf_request_t * inSerfRequest ) +{ + // create serf request + serf_bucket_t *req_bkt = serf_request_bucket_request_create( inSerfRequest, + "MKCOL", + getPathStr(), + 0, + serf_request_get_alloc( inSerfRequest ) ); + + // set request header fields + serf_bucket_t* hdrs_bkt = serf_bucket_request_get_headers( req_bkt ); + // general header fields provided by caller + setRequestHeaders( hdrs_bkt ); + + return req_bkt; +} + +void SerfMkColReqProcImpl::processChunkOfResponseData( const char* /*data*/, + apr_size_t /*len*/ ) +{ + // nothing to do; +} + +void SerfMkColReqProcImpl::handleEndOfResponseData( serf_bucket_t * /*inSerfResponseBucket*/ ) +{ + // nothing to do; +} + +} // namespace http_dav_ucp + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/SerfMkColReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfMkColReqProcImpl.hxx new file mode 100644 index 000000000000..3e1ded50bca4 --- /dev/null +++ b/ucb/source/ucp/webdav/SerfMkColReqProcImpl.hxx @@ -0,0 +1,51 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef INCLUDED_SERFMKCOLREQPROCIMPL_HXX +#define INCLUDED_SERFMKCOLREQPROCIMPL_HXX + +#include + +namespace http_dav_ucp +{ + +class SerfMkColReqProcImpl : public SerfRequestProcessorImpl +{ +public: + SerfMkColReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders ); + + virtual ~SerfMkColReqProcImpl(); + + virtual + serf_bucket_t * createSerfRequestBucket( serf_request_t * inSerfRequest ); + +protected: + virtual + void processChunkOfResponseData( const char* data, apr_size_t len ); + + virtual + void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ); +}; + +} // namespace http_dav_ucp + +#endif // INCLUDED_SERFMKCOLREQPROCIMPL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx new file mode 100644 index 000000000000..39f74e37aa2b --- /dev/null +++ b/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx @@ -0,0 +1,85 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_ucb.hxx" + +#include + +#include + +namespace http_dav_ucp +{ + +SerfMoveReqProcImpl::SerfMoveReqProcImpl( const char* inSourcePath, + const DAVRequestHeaders& inRequestHeaders, + const char* inDestinationPath, + const bool inOverwrite ) + : SerfRequestProcessorImpl( inSourcePath, inRequestHeaders ) + , mDestPathStr( inDestinationPath ) + , mbOverwrite( inOverwrite ) +{ +} + +SerfMoveReqProcImpl::~SerfMoveReqProcImpl() +{ +} + +serf_bucket_t * SerfMoveReqProcImpl::createSerfRequestBucket( serf_request_t * inSerfRequest ) +{ + // create serf request + serf_bucket_t *req_bkt = serf_request_bucket_request_create( inSerfRequest, + "MOVE", + getPathStr(), + 0, + serf_request_get_alloc( inSerfRequest ) ); + + // set request header fields + serf_bucket_t* hdrs_bkt = serf_bucket_request_get_headers( req_bkt ); + // general header fields provided by caller + setRequestHeaders( hdrs_bkt ); + + // MOVE specific header fields + serf_bucket_headers_set( hdrs_bkt, "Destination", mDestPathStr ); + if ( mbOverwrite ) + { + serf_bucket_headers_set( hdrs_bkt, "Overwrite", "T" ); + } + else + { + serf_bucket_headers_set( hdrs_bkt, "Overwrite", "F" ); + } + + return req_bkt; +} + +void SerfMoveReqProcImpl::processChunkOfResponseData( const char* /*data*/, + apr_size_t /*len*/ ) +{ + // nothing to do; +} + +void SerfMoveReqProcImpl::handleEndOfResponseData( serf_bucket_t * /*inSerfResponseBucket*/ ) +{ + // nothing to do; +} + +} // namespace http_dav_ucp + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/SerfMoveReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfMoveReqProcImpl.hxx new file mode 100644 index 000000000000..0ed5d2d85d1e --- /dev/null +++ b/ucb/source/ucp/webdav/SerfMoveReqProcImpl.hxx @@ -0,0 +1,57 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef INCLUDED_SERFMOVEREQPROCIMPL_HXX +#define INCLUDED_SERFMOVEREQPROCIMPL_HXX + +#include + +namespace http_dav_ucp +{ + +class SerfMoveReqProcImpl : public SerfRequestProcessorImpl +{ +public: + SerfMoveReqProcImpl( const char* inSourcePath, + const DAVRequestHeaders& inRequestHeaders, + const char* inDestinationPath, + const bool inOverwrite ); + + virtual ~SerfMoveReqProcImpl(); + + virtual + serf_bucket_t * createSerfRequestBucket( serf_request_t * inSerfRequest ); + +protected: + virtual + void processChunkOfResponseData( const char* data, apr_size_t len ); + + virtual + void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ); + +private: + const char* mDestPathStr; + const bool mbOverwrite; +}; + +} // namespace http_dav_ucp + +#endif // INCLUDED_SERFMOVEREQPROCIMPL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx new file mode 100644 index 000000000000..e5d2060cd0d9 --- /dev/null +++ b/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx @@ -0,0 +1,140 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_ucb.hxx" + +#include + +#include + +using namespace com::sun::star; + +namespace http_dav_ucp +{ + +SerfPostReqProcImpl::SerfPostReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const char* inData, + apr_size_t inDataLen, + const char* inContentType, + const char* inReferer, + const com::sun::star::uno::Reference< SerfInputStream > & xioInStrm ) + : SerfRequestProcessorImpl( inPath, inRequestHeaders ) + , mpPostData( inData ) + , mnPostDataLen( inDataLen ) + , mpContentType( inContentType ) + , mpReferer( inReferer ) + , xInputStream( xioInStrm ) + , xOutputStream() +{ +} + +SerfPostReqProcImpl::SerfPostReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const char* inData, + apr_size_t inDataLen, + const char* inContentType, + const char* inReferer, + const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & xioOutStrm ) + : SerfRequestProcessorImpl( inPath, inRequestHeaders ) + , mpPostData( inData ) + , mnPostDataLen( inDataLen ) + , mpContentType( inContentType ) + , mpReferer( inReferer ) + , xInputStream() + , xOutputStream( xioOutStrm ) +{ +} + +SerfPostReqProcImpl::~SerfPostReqProcImpl() +{ +} + +serf_bucket_t * SerfPostReqProcImpl::createSerfRequestBucket( serf_request_t * inSerfRequest ) +{ + serf_bucket_alloc_t* pSerfBucketAlloc = serf_request_get_alloc( inSerfRequest ); + + // create body bucket + serf_bucket_t* body_bkt = 0; + if ( mpPostData != 0 && mnPostDataLen > 0 ) + { + body_bkt = SERF_BUCKET_SIMPLE_STRING_LEN( mpPostData, mnPostDataLen, pSerfBucketAlloc ); + if ( useChunkedEncoding() ) + { + body_bkt = serf_bucket_chunk_create( body_bkt, pSerfBucketAlloc ); + } + } + + // create serf request + serf_bucket_t *req_bkt = serf_request_bucket_request_create( inSerfRequest, + "POST", + getPathStr(), + body_bkt, + serf_request_get_alloc( inSerfRequest ) ); + + // set request header fields + serf_bucket_t* hdrs_bkt = serf_bucket_request_get_headers( req_bkt ); + // general header fields provided by caller + setRequestHeaders( hdrs_bkt ); + + // request specific header fields + if ( body_bkt != 0 ) + { + if ( useChunkedEncoding() ) + { + serf_bucket_headers_set( hdrs_bkt, "Transfer-Encoding", "chunked"); + } + serf_bucket_headers_set( hdrs_bkt, "Content-Length", + rtl::OUStringToOString( rtl::OUString::valueOf( (sal_Int32)mnPostDataLen ), RTL_TEXTENCODING_UTF8 ) ); + } + if ( mpContentType != 0 ) + { + serf_bucket_headers_set( hdrs_bkt, "Content-Type", mpContentType ); + } + if ( mpReferer != 0 ) + { + serf_bucket_headers_set( hdrs_bkt, "Referer", mpReferer ); + } + + return req_bkt; +} + +void SerfPostReqProcImpl::processChunkOfResponseData( const char* data, + apr_size_t len ) +{ + if ( xInputStream.is() ) + { + xInputStream->AddToStream( data, len ); + } + else if ( xOutputStream.is() ) + { + const uno::Sequence< sal_Int8 > aDataSeq( (sal_Int8 *)data, len ); + xOutputStream->writeBytes( aDataSeq ); + } +} + +void SerfPostReqProcImpl::handleEndOfResponseData( serf_bucket_t * /*inSerfResponseBucket*/ ) +{ + // nothing to do; +} + +} // namespace http_dav_ucp + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/SerfPostReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfPostReqProcImpl.hxx new file mode 100644 index 000000000000..9cb6af313088 --- /dev/null +++ b/ucb/source/ucp/webdav/SerfPostReqProcImpl.hxx @@ -0,0 +1,76 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef INCLUDED_SERFPOSTREQPROCIMPL_HXX +#define INCLUDED_SERFPOSTREQPROCIMPL_HXX + +#include + +#include +#include + +namespace http_dav_ucp +{ + +class SerfPostReqProcImpl : public SerfRequestProcessorImpl +{ +public: + SerfPostReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const char* inData, + apr_size_t inDataLen, + const char* inContentType, + const char* inReferer, + const com::sun::star::uno::Reference< SerfInputStream > & xioInStrm ); + + SerfPostReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const char* inData, + apr_size_t inDataLen, + const char* inContentType, + const char* inReferer, + const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & xioOutStrm ); + + virtual ~SerfPostReqProcImpl(); + + virtual + serf_bucket_t * createSerfRequestBucket( serf_request_t * inSerfRequest ); + +protected: + virtual + void processChunkOfResponseData( const char* data, apr_size_t len ); + + virtual + void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ); + +private: + const char* mpPostData; + apr_size_t mnPostDataLen; + const char* mpContentType; + const char* mpReferer; + com::sun::star::uno::Reference< SerfInputStream > xInputStream; + com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > xOutputStream; + +}; + +} // namespace http_dav_ucp + +#endif // INCLUDED_SERFPOSTREQPROCIMPL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx new file mode 100644 index 000000000000..d4a3f4f419b2 --- /dev/null +++ b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx @@ -0,0 +1,198 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_ucb.hxx" + +#include +#include +#include + +#include +#include + +using namespace com::sun::star; + +namespace http_dav_ucp +{ + +SerfPropFindReqProcImpl::SerfPropFindReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const Depth inDepth, + const std::vector< ::rtl::OUString > & inPropNames, + std::vector< DAVResource > & ioResources ) + : SerfRequestProcessorImpl( inPath, inRequestHeaders ) + , mDepthStr( 0 ) + , mpPropNames( &inPropNames ) + , mpResources( &ioResources ) + , mpResInfo( 0 ) + , mbOnlyPropertyNames( false ) + , xInputStream( new SerfInputStream() ) +{ + init( inDepth ); +} + +SerfPropFindReqProcImpl::SerfPropFindReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const Depth inDepth, + std::vector< DAVResourceInfo > & ioResInfo ) + : SerfRequestProcessorImpl( inPath, inRequestHeaders ) + , mDepthStr( 0 ) + , mpPropNames( 0 ) + , mpResources( 0 ) + , mpResInfo( &ioResInfo ) + , mbOnlyPropertyNames( true ) + , xInputStream( new SerfInputStream() ) +{ + init( inDepth ); +} + +void SerfPropFindReqProcImpl::init( const Depth inDepth ) +{ + switch ( inDepth ) + { + case DAVZERO: + mDepthStr = "0"; + break; + case DAVONE: + mDepthStr = "1"; + break; + case DAVINFINITY: + mDepthStr = "infinity"; + break; + } +} + +SerfPropFindReqProcImpl::~SerfPropFindReqProcImpl() +{ +} + +#define PROPFIND_HEADER "" +#define PROPFIND_TRAILER "" + +serf_bucket_t * SerfPropFindReqProcImpl::createSerfRequestBucket( serf_request_t * inSerfRequest ) +{ + serf_bucket_alloc_t* pSerfBucketAlloc = serf_request_get_alloc( inSerfRequest ); + + // body bucket - certain properties OR all properties OR only property names + serf_bucket_t* body_bkt = 0; + rtl::OUString aBodyText; + { + // create and fill body bucket with requested properties + const int nPropCount = ( !mbOnlyPropertyNames && mpPropNames ) + ? mpPropNames->size() + : 0; + if ( nPropCount > 0 ) + { + SerfPropName thePropName; + for ( int theIndex = 0; theIndex < nPropCount; theIndex ++ ) + { + // split fullname into namespace and name! + DAVProperties::createSerfPropName( (*mpPropNames)[ theIndex ], + thePropName ); + + /* <*propname* xmlns="*propns*" /> */ + aBodyText += rtl::OUString::createFromAscii( "<" ); + aBodyText += rtl::OUString::createFromAscii( thePropName.name ); + aBodyText += rtl::OUString::createFromAscii( " xmlnx=\"" ); + aBodyText += rtl::OUString::createFromAscii( thePropName.nspace ); + aBodyText += rtl::OUString::createFromAscii( "\"/>" ); + } + + aBodyText = rtl::OUString::createFromAscii( "" ) + + aBodyText + + rtl::OUString::createFromAscii( "" ); + } + else + { + if ( mbOnlyPropertyNames ) + { + aBodyText = rtl::OUString::createFromAscii( "" ); + } + else + { + aBodyText = rtl::OUString::createFromAscii( "" ); + } + } + + aBodyText = rtl::OUString::createFromAscii( PROPFIND_HEADER ) + + aBodyText + + rtl::OUString::createFromAscii( PROPFIND_TRAILER ); + body_bkt = SERF_BUCKET_SIMPLE_STRING( rtl::OUStringToOString( aBodyText, RTL_TEXTENCODING_UTF8 ), + pSerfBucketAlloc ); + if ( useChunkedEncoding() ) + { + body_bkt = serf_bucket_chunk_create( body_bkt, pSerfBucketAlloc ); + } + } + + // create serf request + serf_bucket_t *req_bkt = serf_request_bucket_request_create( inSerfRequest, + "PROPFIND", + getPathStr(), + body_bkt, + pSerfBucketAlloc ); + + // set request header fields + serf_bucket_t* hdrs_bkt = serf_bucket_request_get_headers( req_bkt ); + // general header fields provided by caller + setRequestHeaders( hdrs_bkt ); + + // request specific header fields + serf_bucket_headers_set( hdrs_bkt, "Depth", mDepthStr ); + if ( body_bkt != 0 && aBodyText.getLength() > 0 ) + { + if ( useChunkedEncoding() ) + { + serf_bucket_headers_set( hdrs_bkt, "Transfer-Encoding", "chunked"); + } + serf_bucket_headers_set( hdrs_bkt, "Content-Type", "application/xml" ); + serf_bucket_headers_set( hdrs_bkt, "Content-Length", + rtl::OUStringToOString( rtl::OUString::valueOf( aBodyText.getLength() ), RTL_TEXTENCODING_UTF8 ) ); + } + + return req_bkt; +} + +void SerfPropFindReqProcImpl::processChunkOfResponseData( const char* data, + apr_size_t len ) +{ + if ( xInputStream.is() ) + { + xInputStream->AddToStream( data, len ); + } +} + +void SerfPropFindReqProcImpl::handleEndOfResponseData( serf_bucket_t * /*inSerfResponseBucket*/ ) +{ + if ( mbOnlyPropertyNames ) + { + const std::vector< DAVResourceInfo > rResInfo( parseWebDAVPropNameResponse( xInputStream.get() ) ); + *mpResInfo = rResInfo; + } + else + { + const std::vector< DAVResource > rResources( parseWebDAVPropFindResponse( xInputStream.get() ) ); + *mpResources = rResources; + } +} + +} // namespace http_dav_ucp + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx new file mode 100644 index 000000000000..92ea5a7fed91 --- /dev/null +++ b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx @@ -0,0 +1,77 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef INCLUDED_SERFPROPFINDREQPROCIMPL_HXX +#define INCLUDED_SERFPROPFINDREQPROCIMPL_HXX + +#include + +#include +#include +#include "DAVTypes.hxx" +#include "DAVResource.hxx" + +#include + +namespace http_dav_ucp +{ + +class SerfPropFindReqProcImpl : public SerfRequestProcessorImpl +{ +public: + SerfPropFindReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const Depth inDepth, + const std::vector< ::rtl::OUString > & inPropNames, + std::vector< DAVResource > & ioResources ); + + SerfPropFindReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const Depth inDepth, + std::vector< DAVResourceInfo > & ioResInfo ); + + virtual ~SerfPropFindReqProcImpl(); + + virtual + serf_bucket_t * createSerfRequestBucket( serf_request_t * inSerfRequest ); + +protected: + virtual + void processChunkOfResponseData( const char* data, apr_size_t len ); + + virtual + void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ); + +private: + void init( const Depth inDepth ); + + const char* mDepthStr; + const std::vector< ::rtl::OUString > * mpPropNames; + std::vector< DAVResource > * mpResources; + std::vector< DAVResourceInfo > * mpResInfo; + + const bool mbOnlyPropertyNames; + com::sun::star::uno::Reference< SerfInputStream > xInputStream; +}; + +} // namespace http_dav_ucp + +#endif // INCLUDED_SERFPROPFINDREQPROCIMPL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx new file mode 100644 index 000000000000..e39e3ce63360 --- /dev/null +++ b/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx @@ -0,0 +1,183 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_ucb.hxx" + +#include +#include +#include + +#include +#include + +namespace http_dav_ucp +{ + +SerfPropPatchReqProcImpl::SerfPropPatchReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const std::vector< ProppatchValue > & inProperties ) + : SerfRequestProcessorImpl( inPath, inRequestHeaders ) + , mpProperties( &inProperties ) +{ +} + +SerfPropPatchReqProcImpl::~SerfPropPatchReqProcImpl() +{ +} + +#define PROPPATCH_HEADER "" +#define PROPPATCH_TRAILER "" + +serf_bucket_t * SerfPropPatchReqProcImpl::createSerfRequestBucket( serf_request_t * inSerfRequest ) +{ + serf_bucket_alloc_t* pSerfBucketAlloc = serf_request_get_alloc( inSerfRequest ); + + // body bucket + serf_bucket_t* body_bkt = 0; + rtl::OUString aBodyText; + { + // create and fill body bucket with properties to be set or removed + static const char* OpCodes[2] = { "set", "remove" }; + const int nPropCount = ( mpProperties != 0 ) + ? mpProperties->size() + : 0; + if ( nPropCount > 0 ) + { + // <*operation code*> + ProppatchOperation lastOp = (*mpProperties)[ 0 ].operation; + aBodyText += rtl::OUString::createFromAscii( "<" ); + aBodyText += rtl::OUString::createFromAscii( OpCodes[lastOp] ); + aBodyText += rtl::OUString::createFromAscii( ">" ); + + SerfPropName thePropName; + for ( int n = 0; n < nPropCount; ++n ) + { + const ProppatchValue & rProperty = (*mpProperties)[ n ]; + // split fullname into namespace and name! + DAVProperties::createSerfPropName( rProperty.name, + thePropName ); + + if ( rProperty.operation != lastOp ) + { + // <*operation code> + aBodyText += rtl::OUString::createFromAscii( "<" ); + aBodyText += rtl::OUString::createFromAscii( OpCodes[rProperty.operation] ); + aBodyText += rtl::OUString::createFromAscii( ">" ); + } + + // <*propname* xmlns="*propns*" + aBodyText += rtl::OUString::createFromAscii( "<" ); + aBodyText += rtl::OUString::createFromAscii( thePropName.name ); + aBodyText += rtl::OUString::createFromAscii( " xmlns=\"" ); + aBodyText += rtl::OUString::createFromAscii( thePropName.nspace ); + aBodyText += rtl::OUString::createFromAscii( "\"" ); + + if ( rProperty.operation == PROPSET ) + { + // >*property value* + aBodyText += rtl::OUString::createFromAscii( ">" ); + + rtl::OUString aStringValue; + if ( DAVProperties::isUCBDeadProperty( thePropName ) ) + { + UCBDeadPropertyValue::toXML( rProperty.value, + aStringValue ); + } + else + { + rProperty.value >>= aStringValue; + } + aBodyText += aStringValue; + aBodyText += rtl::OUString::createFromAscii( "" ); + } + else + { + // /> + aBodyText += rtl::OUString::createFromAscii( "/>" ); + } + + lastOp = rProperty.operation; + } + + // + aBodyText += rtl::OUString::createFromAscii( "" ); + + // add PropPatch xml header in front + aBodyText = rtl::OUString::createFromAscii( PROPPATCH_HEADER ) + aBodyText; + + // add PropPatch xml trailer at end + aBodyText += rtl::OUString::createFromAscii( PROPPATCH_TRAILER ); + + body_bkt = SERF_BUCKET_SIMPLE_STRING( rtl::OUStringToOString( aBodyText, RTL_TEXTENCODING_UTF8 ), + pSerfBucketAlloc ); + if ( useChunkedEncoding() ) + { + body_bkt = serf_bucket_chunk_create( body_bkt, pSerfBucketAlloc ); + } + } + } + + // create serf request + serf_bucket_t *req_bkt = serf_request_bucket_request_create( inSerfRequest, + "PROPPATCH", + getPathStr(), + body_bkt, + pSerfBucketAlloc ) ; + + // set request header fields + serf_bucket_t* hdrs_bkt = serf_bucket_request_get_headers( req_bkt ); + // general header fields provided by caller + setRequestHeaders( hdrs_bkt ); + + // request specific header fields + if ( body_bkt != 0 && aBodyText.getLength() > 0 ) + { + if ( useChunkedEncoding() ) + { + serf_bucket_headers_set( hdrs_bkt, "Transfer-Encoding", "chunked"); + } + serf_bucket_headers_set( hdrs_bkt, "Content-Type", "application/xml" ); + serf_bucket_headers_set( hdrs_bkt, "Content-Length", + rtl::OUStringToOString( rtl::OUString::valueOf( aBodyText.getLength() ), RTL_TEXTENCODING_UTF8 ) ); + } + + return req_bkt; +} + +void SerfPropPatchReqProcImpl::processChunkOfResponseData( const char* /*data*/, + apr_size_t /*len*/ ) +{ + // nothing to do; +} + +void SerfPropPatchReqProcImpl::handleEndOfResponseData( serf_bucket_t * /*inSerfResponseBucket*/ ) +{ + // nothing to do; +} + +} // namespace http_dav_ucp + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.hxx new file mode 100644 index 000000000000..c2ee2d1dac5c --- /dev/null +++ b/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.hxx @@ -0,0 +1,58 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef INCLUDED_SERFPROPPATCHREQPROCIMPL_HXX +#define INCLUDED_SERFPROPPATCHREQPROCIMPL_HXX + +#include + +#include +#include + +namespace http_dav_ucp +{ + +class SerfPropPatchReqProcImpl : public SerfRequestProcessorImpl +{ +public: + SerfPropPatchReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const std::vector< ProppatchValue > & inProperties ); + + virtual ~SerfPropPatchReqProcImpl(); + + virtual + serf_bucket_t * createSerfRequestBucket( serf_request_t * inSerfRequest ); + +protected: + virtual + void processChunkOfResponseData( const char* data, apr_size_t len ); + + virtual + void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ); + +private: + const std::vector< ProppatchValue > * mpProperties; +}; + +} // namespace http_dav_ucp + +#endif // INCLUDED_SERFPROPPATCHREQPROCIMPL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx new file mode 100644 index 000000000000..6934a3ca9aba --- /dev/null +++ b/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx @@ -0,0 +1,101 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_ucb.hxx" + +#include + +#include + +#include + +namespace http_dav_ucp +{ + +SerfPutReqProcImpl::SerfPutReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const char* inData, + apr_size_t inDataLen ) + : SerfRequestProcessorImpl( inPath, inRequestHeaders ) + , mpData( inData ) + , mnDataLen( inDataLen ) +{ +} + +SerfPutReqProcImpl::~SerfPutReqProcImpl() +{ +} + +serf_bucket_t * SerfPutReqProcImpl::createSerfRequestBucket( serf_request_t * inSerfRequest ) +{ + serf_bucket_alloc_t* pSerfBucketAlloc = serf_request_get_alloc( inSerfRequest ); + + // create body bucket + serf_bucket_t* body_bkt = 0; + if ( mpData != 0 && mnDataLen > 0 ) + { + body_bkt = SERF_BUCKET_SIMPLE_STRING_LEN( mpData, mnDataLen, pSerfBucketAlloc ); + if ( useChunkedEncoding() ) + { + body_bkt = serf_bucket_chunk_create( body_bkt, pSerfBucketAlloc ); + } + } + + // create serf request + serf_bucket_t *req_bkt = serf_request_bucket_request_create( inSerfRequest, + "PUT", + getPathStr(), + body_bkt, + serf_request_get_alloc( inSerfRequest ) ); + + // set request header fields + serf_bucket_t* hdrs_bkt = serf_bucket_request_get_headers( req_bkt ); + // general header fields provided by caller + setRequestHeaders( hdrs_bkt ); + + // request specific header fields + if ( body_bkt != 0 ) + { + if ( useChunkedEncoding() ) + { + serf_bucket_headers_set( hdrs_bkt, "Transfer-Encoding", "chunked"); + } + serf_bucket_headers_set( hdrs_bkt, "Content-Length", + rtl::OUStringToOString( rtl::OUString::valueOf( (sal_Int32)mnDataLen ), RTL_TEXTENCODING_UTF8 ) ); + } + + + return req_bkt; +} + +void SerfPutReqProcImpl::processChunkOfResponseData( const char* /*data*/, + apr_size_t /*len*/ ) +{ + // nothing to do; +} + +void SerfPutReqProcImpl::handleEndOfResponseData( serf_bucket_t * /*inSerfResponseBucket*/ ) +{ + // nothing to do; +} + +} // namespace http_dav_ucp + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/SerfPutReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfPutReqProcImpl.hxx new file mode 100644 index 000000000000..64474d727358 --- /dev/null +++ b/ucb/source/ucp/webdav/SerfPutReqProcImpl.hxx @@ -0,0 +1,59 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef INCLUDED_SERFPUTREQPROCIMPL_HXX +#define INCLUDED_SERFPUTREQPROCIMPL_HXX + +#include + +namespace http_dav_ucp +{ + +class SerfPutReqProcImpl : public SerfRequestProcessorImpl +{ +public: + SerfPutReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const char* inData, + apr_size_t inDataLen ); + + + virtual ~SerfPutReqProcImpl(); + + virtual + serf_bucket_t * createSerfRequestBucket( serf_request_t * inSerfRequest ); + +protected: + virtual + void processChunkOfResponseData( const char* data, apr_size_t len ); + + virtual + void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ); + +private: + const char* mpData; + apr_size_t mnDataLen; + +}; + +} // namespace http_dav_ucp + +#endif // INCLUDED_SERFPUTREQPROCIMPL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/SerfRequestProcessor.cxx b/ucb/source/ucp/webdav/SerfRequestProcessor.cxx new file mode 100644 index 000000000000..49115cc53194 --- /dev/null +++ b/ucb/source/ucp/webdav/SerfRequestProcessor.cxx @@ -0,0 +1,553 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_ucb.hxx" + +#include +#include +#include +#include +#include + +#include + +namespace http_dav_ucp +{ + +SerfRequestProcessor::SerfRequestProcessor( SerfSession& rSerfSession, + const rtl::OUString & inPath, + const bool bUseChunkedEncoding ) + : mrSerfSession( rSerfSession ) + , mPathStr( 0 ) + , mbUseChunkedEncoding( bUseChunkedEncoding ) + , mDestPathStr( 0 ) + , mContentType( 0 ) + , mReferer( 0 ) + , mpProcImpl( 0 ) + , mbProcessingDone( false ) + , mpDAVException() + , mnHTTPStatusCode( SC_NONE ) + , mHTTPStatusCodeText() + , mRedirectLocation() + , mnSuccessfulCredentialAttempts( 0 ) + , mbInputOfCredentialsAborted( false ) + , mbSetupSerfRequestCalled( false ) + , mbAcceptSerfResponseCalled( false ) + , mbHandleSerfResponseCalled( false ) +{ + mPathStr = apr_pstrdup( mrSerfSession.getAprPool(), + rtl::OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ) ); +} + +SerfRequestProcessor::~SerfRequestProcessor() +{ + delete mpProcImpl; + delete mpDAVException; +} + +void SerfRequestProcessor::prepareProcessor() +{ + delete mpDAVException; + mpDAVException = 0; + mnHTTPStatusCode = SC_NONE; + mHTTPStatusCodeText = rtl::OUString(); + mRedirectLocation = rtl::OUString(); + + mnSuccessfulCredentialAttempts = 0; + mbInputOfCredentialsAborted = false; + mbSetupSerfRequestCalled = false; + mbAcceptSerfResponseCalled = false; + mbHandleSerfResponseCalled = false; +} + +// PROPFIND - allprop & named +bool SerfRequestProcessor::processPropFind( const Depth inDepth, + const std::vector< ::rtl::OUString > & inPropNames, + std::vector< DAVResource > & ioResources, + apr_status_t& outSerfStatus ) +{ + mpProcImpl = createPropFindReqProcImpl( mPathStr, + mrSerfSession.getRequestEnvironment().m_aRequestHeaders, + inDepth, + inPropNames, + ioResources ); + outSerfStatus = runProcessor(); + + return outSerfStatus == APR_SUCCESS; +} + +// PROPFIND - property names +bool SerfRequestProcessor::processPropFind( const Depth inDepth, + std::vector< DAVResourceInfo > & ioResInfo, + apr_status_t& outSerfStatus ) +{ + mpProcImpl = createPropFindReqProcImpl( mPathStr, + mrSerfSession.getRequestEnvironment().m_aRequestHeaders, + inDepth, + ioResInfo ); + outSerfStatus = runProcessor(); + + return outSerfStatus == APR_SUCCESS; +} + +// PROPPATCH +bool SerfRequestProcessor::processPropPatch( const std::vector< ProppatchValue > & inProperties, + apr_status_t& outSerfStatus ) +{ + mpProcImpl = createPropPatchReqProcImpl( mPathStr, + mrSerfSession.getRequestEnvironment().m_aRequestHeaders, + inProperties ); + outSerfStatus = runProcessor(); + + return outSerfStatus == APR_SUCCESS; +} + +// GET +bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, + apr_status_t& outSerfStatus ) +{ + mpProcImpl = createGetReqProcImpl( mPathStr, + mrSerfSession.getRequestEnvironment().m_aRequestHeaders, + xioInStrm ); + outSerfStatus = runProcessor(); + + return outSerfStatus == APR_SUCCESS; +} + +// GET inclusive header fields +bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, + const std::vector< ::rtl::OUString > & inHeaderNames, + DAVResource & ioResource, + apr_status_t& outSerfStatus ) +{ + mpProcImpl = createGetReqProcImpl( mPathStr, + mrSerfSession.getRequestEnvironment().m_aRequestHeaders, + xioInStrm, + inHeaderNames, + ioResource ); + outSerfStatus = runProcessor(); + + return outSerfStatus == APR_SUCCESS; +} + +// GET +bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm, + apr_status_t& outSerfStatus ) +{ + mpProcImpl = createGetReqProcImpl( mPathStr, + mrSerfSession.getRequestEnvironment().m_aRequestHeaders, + xioOutStrm ); + outSerfStatus = runProcessor(); + + return outSerfStatus == APR_SUCCESS; +} + +// GET inclusive header fields +bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm, + const std::vector< ::rtl::OUString > & inHeaderNames, + DAVResource & ioResource, + apr_status_t& outSerfStatus ) +{ + mpProcImpl = createGetReqProcImpl( mPathStr, + mrSerfSession.getRequestEnvironment().m_aRequestHeaders, + xioOutStrm, + inHeaderNames, + ioResource ); + outSerfStatus = runProcessor(); + + return outSerfStatus == APR_SUCCESS; +} + +// HEAD +bool SerfRequestProcessor::processHead( const std::vector< ::rtl::OUString > & inHeaderNames, + DAVResource & ioResource, + apr_status_t& outSerfStatus ) +{ + mpProcImpl = createHeadReqProcImpl( mPathStr, + mrSerfSession.getRequestEnvironment().m_aRequestHeaders, + inHeaderNames, + ioResource ); + outSerfStatus = runProcessor(); + + return outSerfStatus == APR_SUCCESS; +} + +// PUT +bool SerfRequestProcessor::processPut( const char* inData, + apr_size_t inDataLen, + apr_status_t& outSerfStatus ) +{ + mpProcImpl = createPutReqProcImpl( mPathStr, + mrSerfSession.getRequestEnvironment().m_aRequestHeaders, + inData, + inDataLen ); + outSerfStatus = runProcessor(); + + return outSerfStatus == APR_SUCCESS; +} + +// POST +bool SerfRequestProcessor::processPost( const char* inData, + apr_size_t inDataLen, + const rtl::OUString & inContentType, + const rtl::OUString & inReferer, + const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, + apr_status_t& outSerfStatus ) +{ + mContentType = apr_pstrdup( mrSerfSession.getAprPool(), + rtl::OUStringToOString( inContentType, RTL_TEXTENCODING_UTF8 ) ); + mReferer = apr_pstrdup( mrSerfSession.getAprPool(), + rtl::OUStringToOString( inReferer, RTL_TEXTENCODING_UTF8 ) ); + mpProcImpl = createPostReqProcImpl( mPathStr, + mrSerfSession.getRequestEnvironment().m_aRequestHeaders, + inData, + inDataLen, + mContentType, + mReferer, + xioInStrm ); + outSerfStatus = runProcessor(); + + return outSerfStatus == APR_SUCCESS; +} + +// POST +bool SerfRequestProcessor::processPost( const char* inData, + apr_size_t inDataLen, + const rtl::OUString & inContentType, + const rtl::OUString & inReferer, + const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm, + apr_status_t& outSerfStatus ) +{ + mContentType = apr_pstrdup( mrSerfSession.getAprPool(), + rtl::OUStringToOString( inContentType, RTL_TEXTENCODING_UTF8 ) ); + mReferer = apr_pstrdup( mrSerfSession.getAprPool(), + rtl::OUStringToOString( inReferer, RTL_TEXTENCODING_UTF8 ) ); + mpProcImpl = createPostReqProcImpl( mPathStr, + mrSerfSession.getRequestEnvironment().m_aRequestHeaders, + inData, + inDataLen, + mContentType, + mReferer, + xioOutStrm ); + outSerfStatus = runProcessor(); + + return outSerfStatus == APR_SUCCESS; +} + +// DELETE +bool SerfRequestProcessor::processDelete( apr_status_t& outSerfStatus ) +{ + mpProcImpl = createDeleteReqProcImpl( mPathStr, + mrSerfSession.getRequestEnvironment().m_aRequestHeaders ); + outSerfStatus = runProcessor(); + + return outSerfStatus == APR_SUCCESS; +} + +// MKCOL +bool SerfRequestProcessor::processMkCol( apr_status_t& outSerfStatus ) +{ + mpProcImpl = createMkColReqProcImpl( mPathStr, + mrSerfSession.getRequestEnvironment().m_aRequestHeaders ); + outSerfStatus = runProcessor(); + + return outSerfStatus == APR_SUCCESS; +} + +// COPY +bool SerfRequestProcessor::processCopy( const rtl::OUString & inDestinationPath, + const bool inOverwrite, + apr_status_t& outSerfStatus ) +{ + mDestPathStr = apr_pstrdup( mrSerfSession.getAprPool(), + rtl::OUStringToOString( inDestinationPath, RTL_TEXTENCODING_UTF8 ) ); + mpProcImpl = createCopyReqProcImpl( mPathStr, + mrSerfSession.getRequestEnvironment().m_aRequestHeaders, + mDestPathStr, + inOverwrite ); + outSerfStatus = runProcessor(); + + return outSerfStatus == APR_SUCCESS; +} + +// MOVE +bool SerfRequestProcessor::processMove( const rtl::OUString & inDestinationPath, + const bool inOverwrite, + apr_status_t& outSerfStatus ) +{ + mDestPathStr = apr_pstrdup( mrSerfSession.getAprPool(), + rtl::OUStringToOString( inDestinationPath, RTL_TEXTENCODING_UTF8 ) ); + mpProcImpl = createMoveReqProcImpl( mPathStr, + mrSerfSession.getRequestEnvironment().m_aRequestHeaders, + mDestPathStr, + inOverwrite ); + outSerfStatus = runProcessor(); + + return outSerfStatus == APR_SUCCESS; +} + +apr_status_t SerfRequestProcessor::runProcessor() +{ + prepareProcessor(); + + // activate chunked encoding, if requested + if ( mbUseChunkedEncoding ) + { + mpProcImpl->activateChunkedEncoding(); + } + + // create serf request + serf_connection_request_create( mrSerfSession.getSerfConnection(), + Serf_SetupRequest, + this ); + + // perform serf request + mbProcessingDone = false; + apr_status_t status = APR_SUCCESS; + serf_context_t* pSerfContext = mrSerfSession.getSerfContext(); + apr_pool_t* pAprPool = mrSerfSession.getAprPool(); + while ( true ) + { + status = serf_context_run( pSerfContext, + SERF_DURATION_FOREVER, + pAprPool ); + if ( APR_STATUS_IS_TIMEUP( status ) ) + { + continue; + } + if ( status != APR_SUCCESS ) + { + break; + } + if ( mbProcessingDone ) + { + break; + } + } + + postprocessProcessor( status ); + + return status; +} + +void SerfRequestProcessor::postprocessProcessor( const apr_status_t inStatus ) +{ + if ( inStatus == APR_SUCCESS ) + { + return; + } + + switch ( inStatus ) + { + case APR_EGENERAL: + case SERF_ERROR_AUTHN_FAILED: + // general error; provides more information + { + switch ( mnHTTPStatusCode ) + { + case SC_NONE: + if ( !mbSetupSerfRequestCalled ) + { + mpDAVException = new DAVException( DAVException::DAV_HTTP_LOOKUP, + SerfUri::makeConnectionEndPointString( mrSerfSession.getHostName(), + mrSerfSession.getPort() ) ); + } + else if ( mbInputOfCredentialsAborted ) + { + mpDAVException = new DAVException( DAVException::DAV_HTTP_NOAUTH, + SerfUri::makeConnectionEndPointString( mrSerfSession.getHostName(), + mrSerfSession.getPort() ) ); + } + else + { + mpDAVException = new DAVException( DAVException::DAV_HTTP_ERROR, + mHTTPStatusCodeText, + mnHTTPStatusCode ); + } + break; + case SC_MOVED_PERMANENTLY: + case SC_MOVED_TEMPORARILY: + case SC_SEE_OTHER: + case SC_TEMPORARY_REDIRECT: + mpDAVException = new DAVException( DAVException::DAV_HTTP_REDIRECT, + mRedirectLocation ); + break; + default: + mpDAVException = new DAVException( DAVException::DAV_HTTP_ERROR, + mHTTPStatusCodeText, + mnHTTPStatusCode ); + break; + } + } + break; + + default: + mpDAVException = new DAVException( DAVException::DAV_HTTP_ERROR ); + break; + } + +} + +apr_status_t SerfRequestProcessor::provideSerfCredentials( char ** outUsername, + char ** outPassword, + serf_request_t * inRequest, + int inCode, + const char *inAuthProtocol, + const char *inRealm, + apr_pool_t *inAprPool ) +{ + // as each successful provided credentials are tried twice - see below - the + // number of real attempts is half of the value of + if ( (mnSuccessfulCredentialAttempts / 2) >= 5 || + mbInputOfCredentialsAborted ) + { + mbInputOfCredentialsAborted = true; + return SERF_ERROR_AUTHN_FAILED; + } + + // because serf keeps credentials only for a connection in case of digest authentication + // we give each successful provided credentials a second try in order to workaround the + // situation that the connection for which the credentials have been provided has been closed + // before the provided credentials could be applied for the request. + apr_status_t status = mrSerfSession.provideSerfCredentials( (mnSuccessfulCredentialAttempts % 2) == 1, + outUsername, + outPassword, + inRequest, + inCode, + inAuthProtocol, + inRealm, + inAprPool ); + if ( status != APR_SUCCESS ) + { + mbInputOfCredentialsAborted = true; + } + else + { + ++mnSuccessfulCredentialAttempts; + } + + return status; +} + +apr_status_t SerfRequestProcessor::setupSerfRequest( serf_request_t * inSerfRequest, + serf_bucket_t ** outSerfRequestBucket, + serf_response_acceptor_t * outSerfResponseAcceptor, + void ** outSerfResponseAcceptorBaton, + serf_response_handler_t * outSerfResponseHandler, + void ** outSerfResponseHandlerBaton, + apr_pool_t * /*inAprPool*/ ) +{ + mbSetupSerfRequestCalled = true; + *outSerfRequestBucket = mpProcImpl->createSerfRequestBucket( inSerfRequest ); + + // apply callbacks for accepting response and handling response + *outSerfResponseAcceptor = Serf_AcceptResponse; + *outSerfResponseAcceptorBaton = this; + *outSerfResponseHandler = Serf_HandleResponse; + *outSerfResponseHandlerBaton = this; + + return APR_SUCCESS; +} + +serf_bucket_t* SerfRequestProcessor::acceptSerfResponse( serf_request_t * inSerfRequest, + serf_bucket_t * inSerfStreamBucket, + apr_pool_t * inAprPool ) +{ + mbAcceptSerfResponseCalled = true; + return mrSerfSession.acceptSerfResponse( inSerfRequest, + inSerfStreamBucket, + inAprPool ); +} + +apr_status_t SerfRequestProcessor::handleSerfResponse( serf_request_t * inSerfRequest, + serf_bucket_t * inSerfResponseBucket, + apr_pool_t * inAprPool ) +{ + mbHandleSerfResponseCalled = true; + + // some general response handling and error handling + { + if ( !inSerfResponseBucket ) + { + /* A NULL response can come back if the request failed completely */ + mbProcessingDone = true; + return APR_EGENERAL; + } + + serf_status_line sl; + apr_status_t status = serf_bucket_response_status( inSerfResponseBucket, &sl ); + if ( status ) + { + mbProcessingDone = false; // allow another try in order to get a response + return status; + } + // TODO - check, if response status code handling is correct + mnHTTPStatusCode = ( sl.version != 0 && sl.code >= 0 ) + ? static_cast< sal_uInt16 >( sl.code ) + : SC_NONE; + if ( sl.reason ) + { + mHTTPStatusCodeText = ::rtl::OUString::createFromAscii( sl.reason ); + } + if ( ( sl.version == 0 || sl.code < 0 ) || + mnHTTPStatusCode >= 300 ) + { + if ( mnHTTPStatusCode == 301 || + mnHTTPStatusCode == 302 || + mnHTTPStatusCode == 303 || + mnHTTPStatusCode == 307 ) + { + // new location for certain redirections + serf_bucket_t *headers = serf_bucket_response_get_headers( inSerfResponseBucket ); + const char* location = serf_bucket_headers_get( headers, "Location" ); + if ( location ) + { + mRedirectLocation = rtl::OUString::createFromAscii( location ); + } + mbProcessingDone = true; + return APR_EGENERAL; + } + else if ( mrSerfSession.isHeadRequestInProgress() && + ( mnHTTPStatusCode == 401 || mnHTTPStatusCode == 407 ) ) + { + // keep going as authentication is not required on HEAD request. + // the response already contains header fields. + } + else + { + mbProcessingDone = true; + return APR_EGENERAL; + } + } + } + + // request specific processing of the response bucket + apr_status_t status = APR_SUCCESS; + mbProcessingDone = mpProcImpl->processSerfResponseBucket( inSerfRequest, + inSerfResponseBucket, + inAprPool, + status ); + + return status; +} + +} // namespace http_dav_ucp + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/SerfRequestProcessor.hxx b/ucb/source/ucp/webdav/SerfRequestProcessor.hxx new file mode 100644 index 000000000000..8b7fcaded928 --- /dev/null +++ b/ucb/source/ucp/webdav/SerfRequestProcessor.hxx @@ -0,0 +1,182 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + + +#ifndef INCLUDED_SERFREQUESTPROCESSOR_HXX +#define INCLUDED_SERFREQUESTPROCESSOR_HXX + +#include +#include + +#include + +#include +#include +#include + +#include +#include + +namespace http_dav_ucp +{ + +class SerfSession; +class SerfRequestProcessorImpl; + +class SerfRequestProcessor +{ +public: + SerfRequestProcessor( SerfSession& rSerfSession, + const rtl::OUString & inPath, + const bool bUseChunkedEncoding ); + ~SerfRequestProcessor(); + + // PROPFIND - allprop & named + bool processPropFind( const Depth inDepth, + const std::vector< ::rtl::OUString > & inPropNames, + std::vector< DAVResource > & ioResources, + apr_status_t& outSerfStatus ); + + // PROPFIND - property names + bool processPropFind( const Depth inDepth, + std::vector< DAVResourceInfo > & ioResInfo, + apr_status_t& outSerfStatus ); + + // PROPPATCH + bool processPropPatch( const std::vector< ProppatchValue > & inProperties, + apr_status_t& outSerfStatus ); + + // GET + bool processGet( const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, + apr_status_t& outSerfStatus ); + + // GET inclusive header fields + bool processGet( const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, + const std::vector< ::rtl::OUString > & inHeaderNames, + DAVResource & ioResource, + apr_status_t& outSerfStatus ); + + // GET + bool processGet( const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm, + apr_status_t& outSerfStatus ); + + // GET inclusive header fields + bool processGet( const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm, + const std::vector< ::rtl::OUString > & inHeaderNames, + DAVResource & ioResource, + apr_status_t& outSerfStatus ); + + // HEAD + bool processHead( const std::vector< ::rtl::OUString > & inHeaderNames, + DAVResource & ioResource, + apr_status_t& outSerfStatus ); + + // PUT + bool processPut( const char* inData, + apr_size_t inDataLen, + apr_status_t& outSerfStatus ); + + // POST + bool processPost( const char* inData, + apr_size_t inDataLen, + const rtl::OUString & inContentType, + const rtl::OUString & inReferer, + const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, + apr_status_t& outSerfStatus ); + + // POST + bool processPost( const char* inData, + apr_size_t inDataLen, + const rtl::OUString & inContentType, + const rtl::OUString & inReferer, + const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm, + apr_status_t& outSerfStatus ); + + // DELETE + bool processDelete( apr_status_t& outSerfStatus ); + + // MKCOL + bool processMkCol( apr_status_t& outSerfStatus ); + + // COPY + bool processCopy( const rtl::OUString & inDestinationPath, + const bool inOverwrite, + apr_status_t& outSerfStatus ); + + // MOVE + bool processMove( const rtl::OUString & inDestinationPath, + const bool inOverwrite, + apr_status_t& outSerfStatus ); + + apr_status_t provideSerfCredentials( char ** outUsername, + char ** outPassword, + serf_request_t * inRequest, + int inCode, + const char *inAuthProtocol, + const char *inRealm, + apr_pool_t *inAprPool ); + + apr_status_t setupSerfRequest( serf_request_t * inSerfRequest, + serf_bucket_t ** outSerfRequestBucket, + serf_response_acceptor_t * outSerfResponseAcceptor, + void ** outSerfResponseAcceptorBaton, + serf_response_handler_t * outSerfResponseHandler, + void ** outSerfResponseHandlerBaton, + apr_pool_t * inAprPool ); + + serf_bucket_t* acceptSerfResponse( serf_request_t * inSerfRequest, + serf_bucket_t * inSerfStreamBucket, + apr_pool_t* inAprPool ); + + apr_status_t handleSerfResponse( serf_request_t * inSerfRequest, + serf_bucket_t * inSerfResponseBucket, + apr_pool_t * inAprPool ); + +//private: + void prepareProcessor(); + apr_status_t runProcessor(); + void postprocessProcessor( const apr_status_t inStatus ); + + SerfSession& mrSerfSession; + const char* mPathStr; + const bool mbUseChunkedEncoding; + const char* mDestPathStr; + const char* mContentType; + const char* mReferer; + SerfRequestProcessorImpl* mpProcImpl; + + bool mbProcessingDone; + + DAVException* mpDAVException; + sal_uInt16 mnHTTPStatusCode; + rtl::OUString mHTTPStatusCodeText; + rtl::OUString mRedirectLocation; + + sal_uInt8 mnSuccessfulCredentialAttempts; + bool mbInputOfCredentialsAborted; + bool mbSetupSerfRequestCalled; + bool mbAcceptSerfResponseCalled; + bool mbHandleSerfResponseCalled; +}; + +} // namespace http_dav_ucp + +#endif // INCLUDED_SERFREQUESTPROCESSOR_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx b/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx new file mode 100644 index 000000000000..d27064c60ab7 --- /dev/null +++ b/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx @@ -0,0 +1,116 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#include + +namespace http_dav_ucp +{ + +SerfRequestProcessorImpl::SerfRequestProcessorImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders ) + : mPathStr( inPath ) + , mrRequestHeaders( inRequestHeaders ) + , mbUseChunkedEncoding( false ) +{ +} + +SerfRequestProcessorImpl::~SerfRequestProcessorImpl() +{ +} + +const char* SerfRequestProcessorImpl::getPathStr() const +{ + return mPathStr; +} + +void SerfRequestProcessorImpl::activateChunkedEncoding() +{ + mbUseChunkedEncoding = true; +} + +const bool SerfRequestProcessorImpl::useChunkedEncoding() const +{ + return mbUseChunkedEncoding; +} + +void SerfRequestProcessorImpl::setRequestHeaders( serf_bucket_t* inoutSerfHeaderBucket ) +{ + DAVRequestHeaders::const_iterator aHeaderIter( mrRequestHeaders.begin() ); + const DAVRequestHeaders::const_iterator aEnd( mrRequestHeaders.end() ); + + while ( aHeaderIter != aEnd ) + { + const rtl::OString aHeader = rtl::OUStringToOString( (*aHeaderIter).first, + RTL_TEXTENCODING_UTF8 ); + const rtl::OString aValue = rtl::OUStringToOString( (*aHeaderIter).second, + RTL_TEXTENCODING_UTF8 ); + + serf_bucket_headers_set( inoutSerfHeaderBucket, + aHeader.getStr(), + aValue.getStr() ); + + ++aHeaderIter; + } + + serf_bucket_headers_set( inoutSerfHeaderBucket, "Accept-Encoding", "gzip"); +} + +bool SerfRequestProcessorImpl::processSerfResponseBucket( serf_request_t * /*inSerfRequest*/, + serf_bucket_t * inSerfResponseBucket, + apr_pool_t * /*inAprPool*/, + apr_status_t & outStatus ) +{ + const char* data; + apr_size_t len; + + while (1) { + outStatus = serf_bucket_read(inSerfResponseBucket, 8096, &data, &len); + if (SERF_BUCKET_READ_ERROR(outStatus)) + { + return true; + } + + if ( len > 0 ) + { + processChunkOfResponseData( data, len ); + } + + /* are we done yet? */ + if (APR_STATUS_IS_EOF(outStatus)) + { + handleEndOfResponseData( inSerfResponseBucket ); + + outStatus = APR_EOF; + return true; + } + + /* have we drained the response so far? */ + if ( APR_STATUS_IS_EAGAIN( outStatus ) ) + { + return false; + } + } + + /* NOTREACHED */ + return true; +} + +} // namespace http_dav_ucp + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx b/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx new file mode 100644 index 000000000000..2d0eb1bc71d0 --- /dev/null +++ b/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx @@ -0,0 +1,72 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef INCLUDED_SERFREQUESTPROCESSORIMPL_HXX +#define INCLUDED_SERFREQUESTPROCESSORIMPL_HXX + +#include + +#include +#include + +namespace http_dav_ucp +{ + +class SerfRequestProcessorImpl +{ +public: + SerfRequestProcessorImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders ); + + virtual ~SerfRequestProcessorImpl(); + + /*pure*/ virtual + serf_bucket_t * createSerfRequestBucket( serf_request_t * inSerfRequest ) = 0; + + bool processSerfResponseBucket( serf_request_t * inSerfRequest, + + serf_bucket_t * inSerfResponseBucket, + apr_pool_t * inAprPool, + apr_status_t & outStatus ); + + void activateChunkedEncoding(); + +protected: + void setRequestHeaders( serf_bucket_t* inoutSerfHeaderBucket ); + + /*pure*/ virtual + void processChunkOfResponseData( const char* data, apr_size_t len ) = 0; + + /*pure*/ virtual + void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ) = 0; + + const char* getPathStr() const; + const bool useChunkedEncoding() const; + +private: + const char* mPathStr; + const DAVRequestHeaders& mrRequestHeaders; + bool mbUseChunkedEncoding; +}; + +} // namespace http_dav_ucp + +#endif // INCLUDED_SERFREQUESTPROCESSORIMPL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.cxx b/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.cxx new file mode 100644 index 000000000000..537f015451ee --- /dev/null +++ b/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.cxx @@ -0,0 +1,224 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_ucb.hxx" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace http_dav_ucp +{ + SerfRequestProcessorImpl* createPropFindReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const Depth inDepth, + const std::vector< ::rtl::OUString > & inPropNames, + std::vector< DAVResource > & ioResources ) + { + SerfRequestProcessorImpl* pReqProcImpl = new SerfPropFindReqProcImpl( inPath, + inRequestHeaders, + inDepth, + inPropNames, + ioResources ); + return pReqProcImpl; + } + + SerfRequestProcessorImpl* createPropFindReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const Depth inDepth, + std::vector< DAVResourceInfo > & ioResInfo ) + { + SerfRequestProcessorImpl* pReqProcImpl = new SerfPropFindReqProcImpl( inPath, + inRequestHeaders, + inDepth, + ioResInfo ); + return pReqProcImpl; + } + + SerfRequestProcessorImpl* createPropPatchReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const std::vector< ProppatchValue > & inProperties ) + { + SerfRequestProcessorImpl* pReqProcImpl = new SerfPropPatchReqProcImpl( inPath, + inRequestHeaders, + inProperties ); + return pReqProcImpl; + } + + SerfRequestProcessorImpl* createGetReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm ) + { + SerfRequestProcessorImpl* pReqProcImpl = new SerfGetReqProcImpl( inPath, + inRequestHeaders, + xioInStrm ); + return pReqProcImpl; + } + + SerfRequestProcessorImpl* createGetReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, + const std::vector< ::rtl::OUString > & inHeaderNames, + DAVResource& ioResource ) + { + SerfRequestProcessorImpl* pReqProcImpl = new SerfGetReqProcImpl( inPath, + inRequestHeaders, + xioInStrm, + inHeaderNames, + ioResource ); + return pReqProcImpl; + } + + SerfRequestProcessorImpl* createGetReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm ) + { + SerfRequestProcessorImpl* pReqProcImpl = new SerfGetReqProcImpl( inPath, + inRequestHeaders, + xioOutStrm ); + return pReqProcImpl; + } + + SerfRequestProcessorImpl* createGetReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const com::sun::star::uno::Reference& xioOutStrm, + const std::vector< ::rtl::OUString > & inHeaderNames, + DAVResource& ioResource ) + { + SerfRequestProcessorImpl* pReqProcImpl = new SerfGetReqProcImpl( inPath, + inRequestHeaders, + xioOutStrm, + inHeaderNames, + ioResource ); + return pReqProcImpl; + } + + SerfRequestProcessorImpl* createHeadReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const std::vector< ::rtl::OUString > & inHeaderNames, + DAVResource& ioResource ) + { + SerfRequestProcessorImpl* pReqProcImpl = new SerfHeadReqProcImpl( inPath, + inRequestHeaders, + inHeaderNames, + ioResource ); + return pReqProcImpl; + } + + + SerfRequestProcessorImpl* createPutReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const char* inData, + apr_size_t inDataLen ) + { + SerfRequestProcessorImpl* pReqProcImpl = new SerfPutReqProcImpl( inPath, + inRequestHeaders, + inData, + inDataLen ); + return pReqProcImpl; + } + + SerfRequestProcessorImpl* createPostReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const char* inData, + apr_size_t inDataLen, + const char* inContentType, + const char* inReferer, + const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm ) + { + SerfRequestProcessorImpl* pReqProcImpl = new SerfPostReqProcImpl( inPath, + inRequestHeaders, + inData, + inDataLen, + inContentType, + inReferer, + xioInStrm ); + return pReqProcImpl; + } + + SerfRequestProcessorImpl* createPostReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const char* inData, + apr_size_t inDataLen, + const char* inContentType, + const char* inReferer, + const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm ) + { + SerfRequestProcessorImpl* pReqProcImpl = new SerfPostReqProcImpl( inPath, + inRequestHeaders, + inData, + inDataLen, + inContentType, + inReferer, + xioOutStrm ); + return pReqProcImpl; + } + + SerfRequestProcessorImpl* createDeleteReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders ) + { + SerfRequestProcessorImpl* pReqProcImpl = new SerfDeleteReqProcImpl( inPath, + inRequestHeaders ); + return pReqProcImpl; + } + + SerfRequestProcessorImpl* createMkColReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders ) + { + SerfRequestProcessorImpl* pReqProcImpl = new SerfMkColReqProcImpl( inPath, + inRequestHeaders ); + return pReqProcImpl; + } + + SerfRequestProcessorImpl* createCopyReqProcImpl( const char* inSourcePath, + const DAVRequestHeaders& inRequestHeaders, + const char* inDestinationPath, + const bool inOverwrite ) + { + SerfRequestProcessorImpl* pReqProcImpl = new SerfCopyReqProcImpl( inSourcePath, + inRequestHeaders, + inDestinationPath, + inOverwrite ); + return pReqProcImpl; + } + + SerfRequestProcessorImpl* createMoveReqProcImpl( const char* inSourcePath, + const DAVRequestHeaders& inRequestHeaders, + const char* inDestinationPath, + const bool inOverwrite ) + { + SerfRequestProcessorImpl* pReqProcImpl = new SerfMoveReqProcImpl( inSourcePath, + inRequestHeaders, + inDestinationPath, + inOverwrite ); + return pReqProcImpl; + } + +} // namespace http_dav_ucp + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.hxx b/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.hxx new file mode 100644 index 000000000000..ee6d5b540953 --- /dev/null +++ b/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.hxx @@ -0,0 +1,115 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef INCLUDED_SERFREQUESTPROCESSORIMPLFAC_HXX +#define INCLUDED_SERFREQUESTPROCESSORIMPLFAC_HXX + +#include +#include +#include "DAVTypes.hxx" +#include "DAVResource.hxx" + +#include +#include +#include + +namespace http_dav_ucp +{ + SerfRequestProcessorImpl* createPropFindReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const Depth inDepth, + const std::vector< ::rtl::OUString > & inPropNames, + std::vector< DAVResource > & ioResources ); + + SerfRequestProcessorImpl* createPropFindReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const Depth inDepth, + std::vector< DAVResourceInfo > & ioResInfo ); + + SerfRequestProcessorImpl* createPropPatchReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const std::vector< ProppatchValue > & inProperties ); + + SerfRequestProcessorImpl* createGetReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm ); + + SerfRequestProcessorImpl* createGetReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, + const std::vector< ::rtl::OUString > & inHeaderNames, + DAVResource& ioResource ); + + SerfRequestProcessorImpl* createGetReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm ); + + SerfRequestProcessorImpl* createGetReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm, + const std::vector< ::rtl::OUString > & inHeaderNames, + DAVResource& ioResource ); + + SerfRequestProcessorImpl* createHeadReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const std::vector< ::rtl::OUString > & inHeaderNames, + DAVResource& ioResource ); + + SerfRequestProcessorImpl* createPutReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const char* inData, + apr_size_t inDataLen ); + + SerfRequestProcessorImpl* createPostReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const char* inData, + apr_size_t inDataLen, + const char* inContentType, + const char* inReferer, + const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm ); + + SerfRequestProcessorImpl* createPostReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders, + const char* inData, + apr_size_t inDataLen, + const char* inContentType, + const char* inReferer, + const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm ); + + SerfRequestProcessorImpl* createDeleteReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders ); + + SerfRequestProcessorImpl* createMkColReqProcImpl( const char* inPath, + const DAVRequestHeaders& inRequestHeaders ); + + SerfRequestProcessorImpl* createCopyReqProcImpl( const char* inSourcePath, + const DAVRequestHeaders& inRequestHeaders, + const char* inDestinationPath, + const bool inOverwrite ); + + SerfRequestProcessorImpl* createMoveReqProcImpl( const char* inSourcePath, + const DAVRequestHeaders& inRequestHeaders, + const char* inDestinationPath, + const bool inOverwrite ); + +} // namespace http_dav_ucp + +#endif // INCLUDED_SERFREQUESTPROCESSORIMPLFAC_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/SerfSession.cxx b/ucb/source/ucp/webdav/SerfSession.cxx new file mode 100644 index 000000000000..0030c211bec6 --- /dev/null +++ b/ucb/source/ucp/webdav/SerfSession.cxx @@ -0,0 +1,1603 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_ucb.hxx" + +#include +#include +#include +#include +#include "comphelper/sequence.hxx" +#include "ucbhelper/simplecertificatevalidationrequest.hxx" + +#include +#include + +#include "DAVAuthListener.hxx" +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +using namespace com::sun::star; +using namespace http_dav_ucp; + + +// ------------------------------------------------------------------- +// static members! +//SerfLockStore SerfSession::m_aSerfLockStore; + +// ------------------------------------------------------------------- +// Constructor +// ------------------------------------------------------------------- +SerfSession::SerfSession( + const rtl::Reference< DAVSessionFactory > & rSessionFactory, + const rtl::OUString& inUri, + const ucbhelper::InternetProxyDecider & rProxyDecider ) + throw ( DAVException ) + : DAVSession( rSessionFactory ) + , m_aMutex() + , m_aUri( inUri ) + , m_aProxyName() + , m_nProxyPort( 0 ) + , m_pSerfConnection( 0 ) + , m_pSerfContext( 0 ) + , m_bIsHeadRequestInProgress( false ) + , m_bUseChunkedEncoding( false ) + , m_bNoOfTransferEncodingSwitches( 0 ) + , m_rProxyDecider( rProxyDecider ) + , m_aEnv() +{ + m_pSerfContext = serf_context_create( getAprPool() ); + + m_pSerfBucket_Alloc = serf_bucket_allocator_create( getAprPool(), NULL, NULL ); +} + +// ------------------------------------------------------------------- +// Destructor +// ------------------------------------------------------------------- +SerfSession::~SerfSession( ) +{ + if ( m_pSerfConnection ) + { + serf_connection_close( m_pSerfConnection ); + m_pSerfConnection = 0; + } +} + +// ------------------------------------------------------------------- +void SerfSession::Init( const DAVRequestEnvironment & rEnv ) + throw ( DAVException ) +{ + osl::Guard< osl::Mutex > theGuard( m_aMutex ); + m_aEnv = rEnv; + Init(); +} + +// ------------------------------------------------------------------- +void SerfSession::Init() + throw ( DAVException ) +{ + osl::Guard< osl::Mutex > theGuard( m_aMutex ); + + bool bCreateNewSession = false; + + if ( m_pSerfConnection == 0 ) + { + const ucbhelper::InternetProxyServer & rProxyCfg = getProxySettings(); + + m_aProxyName = rProxyCfg.aName; + m_nProxyPort = rProxyCfg.nPort; + + // Not yet initialized. Create new session. + bCreateNewSession = true; + } + else + { + const ucbhelper::InternetProxyServer & rProxyCfg = getProxySettings(); + + if ( ( rProxyCfg.aName != m_aProxyName ) + || ( rProxyCfg.nPort != m_nProxyPort ) ) + { + m_aProxyName = rProxyCfg.aName; + m_nProxyPort = rProxyCfg.nPort; + + // new session needed, destroy old first + serf_connection_close( m_pSerfConnection ); + m_pSerfConnection = 0; + bCreateNewSession = true; + } + } + + if ( bCreateNewSession ) + { + // TODO - close_connection callback + apr_status_t status = serf_connection_create2( &m_pSerfConnection, + m_pSerfContext, + *(m_aUri.getAprUri()), + Serf_ConnectSetup, this, + 0 /* close connection callback */, 0 /* close connection baton */, + getAprPool() ); + + if ( m_pSerfConnection == 0 ||status != APR_SUCCESS ) + { + throw DAVException( DAVException::DAV_SESSION_CREATE, + SerfUri::makeConnectionEndPointString( m_aUri.GetHost(), m_aUri.GetPort() ) ); + } + + // Register the session with the lock store +// m_aSerfLockStore.registerSession( m_pSerfConnection ); + + if ( m_aProxyName.getLength() ) + { + apr_sockaddr_t *proxy_address = NULL; + const apr_status_t status = apr_sockaddr_info_get( &proxy_address, + rtl::OUStringToOString( m_aProxyName, RTL_TEXTENCODING_UTF8 ), + APR_UNSPEC, + static_cast(m_nProxyPort), + 0, getAprPool() ); + + if ( status != APR_SUCCESS ) + { + throw DAVException( DAVException::DAV_SESSION_CREATE, + SerfUri::makeConnectionEndPointString( m_aUri.GetHost(), m_aUri.GetPort() ) ); + } + + serf_config_proxy( m_pSerfContext, proxy_address ); + } + + + serf_config_credentials_callback( m_pSerfContext, Serf_Credentials ); + + m_bUseChunkedEncoding = isSSLNeeded(); + } +} + +apr_pool_t* SerfSession::getAprPool() +{ + return apr_environment::AprEnv::getAprEnv()->getAprPool(); +} + +serf_bucket_alloc_t* SerfSession::getSerfBktAlloc() +{ + return m_pSerfBucket_Alloc; +} + +serf_context_t* SerfSession::getSerfContext() +{ + return m_pSerfContext; +} + +SerfConnection* SerfSession::getSerfConnection() +{ + return m_pSerfConnection; +} + +bool SerfSession::isHeadRequestInProgress() +{ + return m_bIsHeadRequestInProgress; +} + +bool SerfSession::isSSLNeeded() +{ + return m_aUri.GetScheme().equalsIgnoreAsciiCase( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "https" ) ) ); +} + +char* SerfSession::getHostinfo() +{ + return m_aUri.getAprUri()->hostinfo; +} + + +// ------------------------------------------------------------------- +// virtual +sal_Bool SerfSession::CanUse( const rtl::OUString & inUri ) +{ + try + { + SerfUri theUri( inUri ); + if ( ( theUri.GetPort() == m_aUri.GetPort() ) && + ( theUri.GetHost() == m_aUri.GetHost() ) && + ( theUri.GetScheme() == m_aUri.GetScheme() ) ) + { + return sal_True; + } + } + catch ( DAVException const & ) + { + return sal_False; + } + return sal_False; +} + +// ------------------------------------------------------------------- +// virtual +sal_Bool SerfSession::UsesProxy() +{ + Init(); + return ( m_aProxyName.getLength() > 0 ); +} + +apr_status_t SerfSession::setupSerfConnection( apr_socket_t * inAprSocket, + serf_bucket_t **outSerfInputBucket, + serf_bucket_t **outSerfOutputBucket, + apr_pool_t* /*inAprPool*/ ) +{ + serf_bucket_t *tmpInputBkt; + tmpInputBkt = serf_context_bucket_socket_create( getSerfContext(), + inAprSocket, + getSerfBktAlloc() ); + + if ( isSSLNeeded() ) + { + tmpInputBkt = serf_bucket_ssl_decrypt_create( tmpInputBkt, + 0, + getSerfBktAlloc() ); + /** Set the callback that is called to authenticate the + certifcate (chain). + */ + serf_ssl_server_cert_chain_callback_set( + serf_bucket_ssl_decrypt_context_get(tmpInputBkt), + Serf_CertificateChainValidation, + this); + serf_ssl_set_hostname( serf_bucket_ssl_decrypt_context_get( tmpInputBkt ), + getHostinfo() ); + + *outSerfOutputBucket = serf_bucket_ssl_encrypt_create( *outSerfOutputBucket, + serf_bucket_ssl_decrypt_context_get( tmpInputBkt ), + getSerfBktAlloc() ); + } + + *outSerfInputBucket = tmpInputBkt; + + return APR_SUCCESS; +} + +apr_status_t SerfSession::provideSerfCredentials( bool bGiveProvidedCredentialsASecondTry, + char ** outUsername, + char ** outPassword, + serf_request_t * /*inRequest*/, + int /*inCode*/, + const char *inAuthProtocol, + const char *inRealm, + apr_pool_t *inAprPool ) +{ + DAVAuthListener * pListener = getRequestEnvironment().m_xAuthListener.get(); + if ( !pListener ) + { + // abort + return SERF_ERROR_AUTHN_FAILED; + } + + rtl::OUString theUserName; + rtl::OUString thePassWord; + try + { + SerfUri uri( getRequestEnvironment().m_aRequestURI ); + rtl::OUString aUserInfo( uri.GetUserInfo() ); + if ( aUserInfo.getLength() ) + { + sal_Int32 nPos = aUserInfo.indexOf( '@' ); + if ( nPos == -1 ) + { + theUserName = aUserInfo; + } + else + { + theUserName = aUserInfo.copy( 0, nPos ); + thePassWord = aUserInfo.copy( nPos + 1 ); + } + } + } + catch ( DAVException const & ) + { + // abort + return SERF_ERROR_AUTHN_FAILED; + } + + const bool bCanUseSystemCreds = ( ( strcasecmp( inAuthProtocol, "NTLM" ) == 0 ) || + ( strcasecmp( inAuthProtocol, "Negotiate" ) == 0 ) ); + + int theRetVal = pListener->authenticate( rtl::OUString::createFromAscii( inRealm ), + getHostName(), + theUserName, + thePassWord, + bCanUseSystemCreds, + bGiveProvidedCredentialsASecondTry ? sal_False : sal_True ); + + if ( theRetVal == 0 ) + { + *outUsername = apr_pstrdup( inAprPool, rtl::OUStringToOString( theUserName, RTL_TEXTENCODING_UTF8 ) ); + *outPassword = apr_pstrdup( inAprPool, rtl::OUStringToOString( thePassWord, RTL_TEXTENCODING_UTF8 ) ); + } + + return theRetVal != 0 ? SERF_ERROR_AUTHN_FAILED : APR_SUCCESS; +} + +namespace { + // ------------------------------------------------------------------- + // Helper function + ::rtl::OUString GetHostnamePart( const ::rtl::OUString& _rRawString ) + { + ::rtl::OUString sPart; + ::rtl::OUString sPartId = ::rtl::OUString::createFromAscii( "CN=" ); + sal_Int32 nContStart = _rRawString.indexOf( sPartId ); + if ( nContStart != -1 ) + { + nContStart = nContStart + sPartId.getLength(); + sal_Int32 nContEnd + = _rRawString.indexOf( sal_Unicode( ',' ), nContStart ); + sPart = _rRawString.copy( nContStart, nContEnd - nContStart ); + } + return sPart; + } +} // namespace + + +apr_status_t SerfSession::verifySerfCertificateChain ( + int, + const char** pCertificateChainBase64Encoded, + int nCertificateChainLength) +{ + // Check arguments. + if (pCertificateChainBase64Encoded == NULL || nCertificateChainLength<=0) + { + OSL_ASSERT(pCertificateChainBase64Encoded != NULL); + OSL_ASSERT(nCertificateChainLength>0); + return SERF_SSL_CERT_UNKNOWN_FAILURE; + } + + // Create some crypto objects to decode and handle the base64 + // encoded certificate chain. + uno::Reference< xml::crypto::XSEInitializer > xSEInitializer; + uno::Reference< security::XCertificateContainer > xCertificateContainer; + uno::Reference< xml::crypto::XXMLSecurityContext > xSecurityContext; + uno::Reference< xml::crypto::XSecurityEnvironment > xSecurityEnv; + try + { + // Create a certificate container. + xCertificateContainer = uno::Reference< security::XCertificateContainer >( + getMSF()->createInstance( + rtl::OUString::createFromAscii( + "com.sun.star.security.CertificateContainer" ) ), + uno::UNO_QUERY_THROW); + + xSEInitializer = uno::Reference< xml::crypto::XSEInitializer >( + getMSF()->createInstance( + rtl::OUString::createFromAscii( "com.sun.star.xml.crypto.SEInitializer" ) ), + uno::UNO_QUERY_THROW); + + xSecurityContext = xSEInitializer->createSecurityContext( rtl::OUString() ); + if (xSecurityContext.is()) + xSecurityEnv = xSecurityContext->getSecurityEnvironment(); + + if ( ! xSecurityContext.is() || ! xSecurityEnv.is()) + { + // Do we have to dispose xSEInitializer or xCertificateContainer? + return SERF_SSL_CERT_UNKNOWN_FAILURE; + } + } + catch ( uno::Exception const &) + { + return SERF_SSL_CERT_UNKNOWN_FAILURE; + } + + // Decode the server certificate. + uno::Reference< security::XCertificate > xServerCertificate( + xSecurityEnv->createCertificateFromAscii( + rtl::OUString::createFromAscii(pCertificateChainBase64Encoded[0]))); + if ( ! xServerCertificate.is()) + return SERF_SSL_CERT_UNKNOWN_FAILURE; + + // Get the subject from the server certificate. + ::rtl::OUString sServerCertificateSubject (xServerCertificate->getSubjectName()); + sal_Int32 nIndex = 0; + while (nIndex >= 0) + { + const ::rtl::OUString sToken (sServerCertificateSubject.getToken(0, ',', nIndex)); + if (sToken.compareToAscii("CN=", 3) == 0) + { + sServerCertificateSubject = sToken.copy(3); + break; + } + else if (sToken.compareToAscii(" CN=", 4) == 0) + { + sServerCertificateSubject = sToken.copy(4); + break; + } + } + + // When the certificate container already contains a (trusted) + // entry for the server then we do not have to authenticate any + // certificate. + const security::CertificateContainerStatus eStatus ( + xCertificateContainer->hasCertificate( + getHostName(), sServerCertificateSubject ) ); + if (eStatus != security::CertificateContainerStatus_NOCERT) + { + return eStatus == security::CertificateContainerStatus_TRUSTED + ? APR_SUCCESS + : SERF_SSL_CERT_UNKNOWN_FAILURE; + } + + // The shortcut failed, so try to verify the whole chain. This is + // done outside the isDomainMatch() block because the result is + // used by the interaction handler. + std::vector< uno::Reference< security::XCertificate > > aChain; + for (int nIndex=1; nIndex xCertificate( + xSecurityEnv->createCertificateFromAscii( + rtl::OUString::createFromAscii(pCertificateChainBase64Encoded[nIndex]))); + if ( ! xCertificate.is()) + return SERF_SSL_CERT_UNKNOWN_FAILURE; + aChain.push_back(xCertificate); + } + const sal_Int64 nVerificationResult (xSecurityEnv->verifyCertificate( + xServerCertificate, + ::comphelper::containerToSequence(aChain))); + + // When the certificate matches the host name then we can use the + // result of the verification. + if (isDomainMatch(sServerCertificateSubject)) + { + + if (nVerificationResult == 0) + { + // Certificate (chain) is valid. + xCertificateContainer->addCertificate(getHostName(), sServerCertificateSubject, sal_True); + return APR_SUCCESS; + } + else if ((nVerificationResult & security::CertificateValidity::CHAIN_INCOMPLETE) != 0) + { + // We do not have enough information for verification, + // neither automatically (as we just discovered) nor + // manually (so there is no point in showing any dialog.) + return SERF_SSL_CERT_UNKNOWN_FAILURE; + } + else if ((nVerificationResult & + (security::CertificateValidity::INVALID | security::CertificateValidity::REVOKED)) != 0) + { + // Certificate (chain) is invalid. + xCertificateContainer->addCertificate(getHostName(), sServerCertificateSubject, sal_False); + return SERF_SSL_CERT_UNKNOWN_FAILURE; + } + else + { + // For all other we have to ask the user. + } + } + + // We have not been able to automatically verify (or falsify) the + // certificate chain. To resolve this we have to ask the user. + const uno::Reference< ucb::XCommandEnvironment > xEnv( getRequestEnvironment().m_xEnv ); + if ( xEnv.is() ) + { + uno::Reference< task::XInteractionHandler > xIH( xEnv->getInteractionHandler() ); + if ( xIH.is() ) + { + rtl::Reference< ucbhelper::SimpleCertificateValidationRequest > + xRequest( new ucbhelper::SimpleCertificateValidationRequest( + static_cast(nVerificationResult), xServerCertificate, getHostName() ) ); + xIH->handle( xRequest.get() ); + + rtl::Reference< ucbhelper::InteractionContinuation > xSelection + = xRequest->getSelection(); + + if ( xSelection.is() ) + { + uno::Reference< task::XInteractionApprove > xApprove( + xSelection.get(), uno::UNO_QUERY ); + if ( xApprove.is() ) + { + xCertificateContainer->addCertificate( getHostName(), sServerCertificateSubject, sal_True ); + return APR_SUCCESS; + } + else + { + // Don't trust cert + xCertificateContainer->addCertificate( getHostName(), sServerCertificateSubject, sal_False ); + return SERF_SSL_CERT_UNKNOWN_FAILURE; + } + } + } + else + { + // Don't trust cert + xCertificateContainer->addCertificate( getHostName(), sServerCertificateSubject, sal_False ); + return SERF_SSL_CERT_UNKNOWN_FAILURE; + } + } + + return SERF_SSL_CERT_UNKNOWN_FAILURE; +} + +serf_bucket_t* SerfSession::acceptSerfResponse( serf_request_t * inSerfRequest, + serf_bucket_t * inSerfStreamBucket, + apr_pool_t* /*inAprPool*/ ) +{ + // get the per-request bucket allocator + serf_bucket_alloc_t* SerfBktAlloc = serf_request_get_alloc( inSerfRequest ); + + // create a barrier bucket so the response doesn't eat us! + serf_bucket_t *responseBkt = serf_bucket_barrier_create( inSerfStreamBucket, + SerfBktAlloc ); + + // create response bucket + responseBkt = serf_bucket_response_create( responseBkt, + SerfBktAlloc ); + + if ( isHeadRequestInProgress() ) + { + // advise the response bucket that this was from a HEAD request and that it should not expect to see a response body. + serf_bucket_response_set_head( responseBkt ); + } + + return responseBkt; +} + +SerfRequestProcessor* SerfSession::createReqProc( const rtl::OUString & inPath ) +{ + return new SerfRequestProcessor( *this, + inPath, + m_bUseChunkedEncoding ); +} + +// ------------------------------------------------------------------- +// PROPFIND - allprop & named +// ------------------------------------------------------------------- +void SerfSession::PROPFIND( const rtl::OUString & inPath, + const Depth inDepth, + const std::vector< rtl::OUString > & inPropNames, + std::vector< DAVResource > & ioResources, + const DAVRequestEnvironment & rEnv ) + throw ( DAVException ) +{ + osl::Guard< osl::Mutex > theGuard( m_aMutex ); + + Init( rEnv ); + + apr_status_t status = APR_SUCCESS; + boost::shared_ptr aReqProc( createReqProc( inPath ) ); + aReqProc->processPropFind( inDepth, + inPropNames, + ioResources, + status ); + + if ( status == APR_SUCCESS && + aReqProc->mpDAVException == 0 && + ioResources.empty() ) + { + m_aEnv = DAVRequestEnvironment(); + throw DAVException( DAVException::DAV_HTTP_ERROR, inPath, (sal_uInt16)APR_EGENERAL ); + } + HandleError( aReqProc ); +} + +// ------------------------------------------------------------------- +// PROPFIND - propnames +// ------------------------------------------------------------------- +void SerfSession::PROPFIND( const rtl::OUString & inPath, + const Depth inDepth, + std::vector< DAVResourceInfo > & ioResInfo, + const DAVRequestEnvironment & rEnv ) + throw( DAVException ) +{ + osl::Guard< osl::Mutex > theGuard( m_aMutex ); + + Init( rEnv ); + + apr_status_t status = APR_SUCCESS; + boost::shared_ptr aReqProc( createReqProc( inPath ) ); + aReqProc->processPropFind( inDepth, + ioResInfo, + status ); + + if ( status == APR_SUCCESS && + aReqProc->mpDAVException == 0 && + ioResInfo.empty() ) + { + m_aEnv = DAVRequestEnvironment(); + throw DAVException( DAVException::DAV_HTTP_ERROR, inPath, (sal_uInt16)APR_EGENERAL ); + } + HandleError( aReqProc ); +} + +// ------------------------------------------------------------------- +// PROPPATCH +// ------------------------------------------------------------------- +void SerfSession::PROPPATCH( const rtl::OUString & inPath, + const std::vector< ProppatchValue > & inValues, + const DAVRequestEnvironment & rEnv ) + throw( DAVException ) +{ + osl::Guard< osl::Mutex > theGuard( m_aMutex ); + + Init( rEnv ); + + apr_status_t status = APR_SUCCESS; + boost::shared_ptr aReqProc( createReqProc( inPath ) ); + aReqProc->processPropPatch( inValues, + status ); + + HandleError( aReqProc ); +} + +// ------------------------------------------------------------------- +// HEAD +// ------------------------------------------------------------------- +void SerfSession::HEAD( const ::rtl::OUString & inPath, + const std::vector< ::rtl::OUString > & inHeaderNames, + DAVResource & ioResource, + const DAVRequestEnvironment & rEnv ) + throw( DAVException ) +{ + osl::Guard< osl::Mutex > theGuard( m_aMutex ); + + Init( rEnv ); + + m_bIsHeadRequestInProgress = true; + + boost::shared_ptr aReqProc( createReqProc( inPath ) ); + ioResource.uri = inPath; + ioResource.properties.clear(); + apr_status_t status = APR_SUCCESS; + aReqProc->processHead( inHeaderNames, + ioResource, + status ); + + m_bIsHeadRequestInProgress = false; + + HandleError( aReqProc ); +} + +// ------------------------------------------------------------------- +// GET +// ------------------------------------------------------------------- +uno::Reference< io::XInputStream > +SerfSession::GET( const rtl::OUString & inPath, + const DAVRequestEnvironment & rEnv ) + throw ( DAVException ) +{ + osl::Guard< osl::Mutex > theGuard( m_aMutex ); + + Init( rEnv ); + + uno::Reference< SerfInputStream > xInputStream( new SerfInputStream ); + apr_status_t status = APR_SUCCESS; + boost::shared_ptr aReqProc( createReqProc( inPath ) ); + aReqProc->processGet( xInputStream, + status ); + + HandleError( aReqProc ); + + return uno::Reference< io::XInputStream >( xInputStream.get() ); +} + +// ------------------------------------------------------------------- +// GET +// ------------------------------------------------------------------- +void SerfSession::GET( const rtl::OUString & inPath, + uno::Reference< io::XOutputStream > & ioOutputStream, + const DAVRequestEnvironment & rEnv ) + throw ( DAVException ) +{ + osl::Guard< osl::Mutex > theGuard( m_aMutex ); + + Init( rEnv ); + + apr_status_t status = APR_SUCCESS; + boost::shared_ptr aReqProc( createReqProc( inPath ) ); + aReqProc->processGet( ioOutputStream, + status ); + + HandleError( aReqProc ); +} + +// ------------------------------------------------------------------- +// GET +// ------------------------------------------------------------------- +uno::Reference< io::XInputStream > +SerfSession::GET( const rtl::OUString & inPath, + const std::vector< ::rtl::OUString > & inHeaderNames, + DAVResource & ioResource, + const DAVRequestEnvironment & rEnv ) + throw ( DAVException ) +{ + osl::Guard< osl::Mutex > theGuard( m_aMutex ); + + Init( rEnv ); + + boost::shared_ptr aReqProc( createReqProc( inPath ) ); + uno::Reference< SerfInputStream > xInputStream( new SerfInputStream ); + ioResource.uri = inPath; + ioResource.properties.clear(); + apr_status_t status = APR_SUCCESS; + aReqProc->processGet( xInputStream, + inHeaderNames, + ioResource, + status ); + + HandleError( aReqProc ); + + return uno::Reference< io::XInputStream >( xInputStream.get() ); +} + + +// ------------------------------------------------------------------- +// GET +// ------------------------------------------------------------------- +void SerfSession::GET( const rtl::OUString & inPath, + uno::Reference< io::XOutputStream > & ioOutputStream, + const std::vector< ::rtl::OUString > & inHeaderNames, + DAVResource & ioResource, + const DAVRequestEnvironment & rEnv ) + throw ( DAVException ) +{ + osl::Guard< osl::Mutex > theGuard( m_aMutex ); + + Init( rEnv ); + + boost::shared_ptr aReqProc( createReqProc( inPath ) ); + ioResource.uri = inPath; + ioResource.properties.clear(); + apr_status_t status = APR_SUCCESS; + aReqProc->processGet( ioOutputStream, + inHeaderNames, + ioResource, + status ); + + HandleError( aReqProc ); +} + +// ------------------------------------------------------------------- +// PUT +// ------------------------------------------------------------------- +void SerfSession::PUT( const rtl::OUString & inPath, + const uno::Reference< io::XInputStream > & inInputStream, + const DAVRequestEnvironment & rEnv ) + throw ( DAVException ) +{ + osl::Guard< osl::Mutex > theGuard( m_aMutex ); + + Init( rEnv ); + + boost::shared_ptr aReqProc( createReqProc( inPath ) ); + uno::Sequence< sal_Int8 > aDataToSend; + if ( !getDataFromInputStream( inInputStream, aDataToSend, false ) ) + throw DAVException( DAVException::DAV_INVALID_ARG ); + apr_status_t status = APR_SUCCESS; + aReqProc->processPut( reinterpret_cast< const char * >( aDataToSend.getConstArray() ), + aDataToSend.getLength(), + status ); + + HandleError( aReqProc ); +} + +// ------------------------------------------------------------------- +// POST +// ------------------------------------------------------------------- +uno::Reference< io::XInputStream > +SerfSession::POST( const rtl::OUString & inPath, + const rtl::OUString & rContentType, + const rtl::OUString & rReferer, + const uno::Reference< io::XInputStream > & inInputStream, + const DAVRequestEnvironment & rEnv ) + throw ( DAVException ) +{ + osl::Guard< osl::Mutex > theGuard( m_aMutex ); + + uno::Sequence< sal_Int8 > aDataToSend; + if ( !getDataFromInputStream( inInputStream, aDataToSend, true ) ) + { + throw DAVException( DAVException::DAV_INVALID_ARG ); + } + + Init( rEnv ); + + boost::shared_ptr aReqProc( createReqProc( inPath ) ); + uno::Reference< SerfInputStream > xInputStream( new SerfInputStream ); + apr_status_t status = APR_SUCCESS; + aReqProc->processPost( reinterpret_cast< const char * >( aDataToSend.getConstArray() ), + aDataToSend.getLength(), + rContentType, + rReferer, + xInputStream, + status ); + + HandleError( aReqProc ); + return uno::Reference< io::XInputStream >( xInputStream.get() ); +} + +// ------------------------------------------------------------------- +// POST +// ------------------------------------------------------------------- +void SerfSession::POST( const rtl::OUString & inPath, + const rtl::OUString & rContentType, + const rtl::OUString & rReferer, + const uno::Reference< io::XInputStream > & inInputStream, + uno::Reference< io::XOutputStream > & oOutputStream, + const DAVRequestEnvironment & rEnv ) + throw ( DAVException ) +{ + osl::Guard< osl::Mutex > theGuard( m_aMutex ); + + uno::Sequence< sal_Int8 > aDataToSend; + if ( !getDataFromInputStream( inInputStream, aDataToSend, true ) ) + { + throw DAVException( DAVException::DAV_INVALID_ARG ); + } + + Init( rEnv ); + + boost::shared_ptr aReqProc( createReqProc( inPath ) ); + apr_status_t status = APR_SUCCESS; + aReqProc->processPost( reinterpret_cast< const char * >( aDataToSend.getConstArray() ), + aDataToSend.getLength(), + rContentType, + rReferer, + oOutputStream, + status ); + + HandleError( aReqProc ); +} + +// ------------------------------------------------------------------- +// MKCOL +// ------------------------------------------------------------------- +void SerfSession::MKCOL( const rtl::OUString & inPath, + const DAVRequestEnvironment & rEnv ) + throw ( DAVException ) +{ + osl::Guard< osl::Mutex > theGuard( m_aMutex ); + + Init( rEnv ); + + boost::shared_ptr aReqProc( createReqProc( inPath ) ); + apr_status_t status = APR_SUCCESS; + aReqProc->processMkCol( status ); + + HandleError( aReqProc ); +} + +// ------------------------------------------------------------------- +// COPY +// ------------------------------------------------------------------- +void SerfSession::COPY( const rtl::OUString & inSourceURL, + const rtl::OUString & inDestinationURL, + const DAVRequestEnvironment & rEnv, + sal_Bool inOverWrite ) + throw ( DAVException ) +{ + osl::Guard< osl::Mutex > theGuard( m_aMutex ); + + Init( rEnv ); + + SerfUri theSourceUri( inSourceURL ); + boost::shared_ptr aReqProc( createReqProc( theSourceUri.GetPath() ) ); + apr_status_t status = APR_SUCCESS; + aReqProc->processCopy( inDestinationURL, + (inOverWrite ? true : false), + status ); + + HandleError( aReqProc ); +} + +// ------------------------------------------------------------------- +// MOVE +// ------------------------------------------------------------------- +void SerfSession::MOVE( const rtl::OUString & inSourceURL, + const rtl::OUString & inDestinationURL, + const DAVRequestEnvironment & rEnv, + sal_Bool inOverWrite ) + throw ( DAVException ) +{ + osl::Guard< osl::Mutex > theGuard( m_aMutex ); + + Init( rEnv ); + + SerfUri theSourceUri( inSourceURL ); + boost::shared_ptr aReqProc( createReqProc( theSourceUri.GetPath() ) ); + apr_status_t status = APR_SUCCESS; + aReqProc->processMove( inDestinationURL, + (inOverWrite ? true : false), + status ); + + HandleError( aReqProc ); +} + +// ------------------------------------------------------------------- +// DESTROY +// ------------------------------------------------------------------- +void SerfSession::DESTROY( const rtl::OUString & inPath, + const DAVRequestEnvironment & rEnv ) + throw ( DAVException ) +{ + osl::Guard< osl::Mutex > theGuard( m_aMutex ); + + Init( rEnv ); + + boost::shared_ptr aReqProc( createReqProc( inPath ) ); + apr_status_t status = APR_SUCCESS; + aReqProc->processDelete( status ); + + HandleError( aReqProc ); +} + +// ------------------------------------------------------------------- +/* +namespace +{ + sal_Int32 lastChanceToSendRefreshRequest( TimeValue const & rStart, + int timeout ) + { + TimeValue aEnd; + osl_getSystemTime( &aEnd ); + + // Try to estimate a safe absolute time for sending the + // lock refresh request. + sal_Int32 lastChanceToSendRefreshRequest = -1; + if ( timeout != NE_TIMEOUT_INFINITE ) + { + sal_Int32 calltime = aEnd.Seconds - rStart.Seconds; + if ( calltime <= timeout ) + { + lastChanceToSendRefreshRequest + = aEnd.Seconds + timeout - calltime; + } + else + { + OSL_TRACE( "No chance to refresh lock before timeout!" ); + } + } + return lastChanceToSendRefreshRequest; + } + +} // namespace +*/ +// ------------------------------------------------------------------- +// LOCK (set new lock) +// ------------------------------------------------------------------- +void SerfSession::LOCK( const ::rtl::OUString & inPath, + ucb::Lock & /*rLock*/, + const DAVRequestEnvironment & rEnv ) + throw ( DAVException ) +{ + osl::Guard< osl::Mutex > theGuard( m_aMutex ); + + Init( rEnv ); + + boost::shared_ptr aReqProc( createReqProc( inPath ) ); + HandleError( aReqProc ); + /* Create a depth zero, exclusive write lock, with default timeout + * (allowing a server to pick a default). token, owner and uri are + * unset. */ + /* + SerfLock * theLock = ne_lock_create(); + + // Set the lock uri + ne_uri aUri; + ne_uri_parse( rtl::OUStringToOString( makeAbsoluteURL( inPath ), + RTL_TEXTENCODING_UTF8 ).getStr(), + &aUri ); + theLock->uri = aUri; + + // Set the lock depth + switch( rLock.Depth ) + { + case ucb::LockDepth_ZERO: + theLock->depth = NE_DEPTH_ZERO; + break; + case ucb::LockDepth_ONE: + theLock->depth = NE_DEPTH_ONE; + break; + case ucb::LockDepth_INFINITY: + theLock->depth = NE_DEPTH_INFINITE; + break; + default: + throw DAVException( DAVException::DAV_INVALID_ARG ); + } + + // Set the lock scope + switch ( rLock.Scope ) + { + case ucb::LockScope_EXCLUSIVE: + theLock->scope = ne_lockscope_exclusive; + break; + case ucb::LockScope_SHARED: + theLock->scope = ne_lockscope_shared; + break; + default: + throw DAVException( DAVException::DAV_INVALID_ARG ); + } + + // Set the lock timeout + theLock->timeout = (long)rLock.Timeout; + + // Set the lock owner + rtl::OUString aValue; + rLock.Owner >>= aValue; + theLock->owner = + ne_strdup( rtl::OUStringToOString( aValue, + RTL_TEXTENCODING_UTF8 ).getStr() ); + TimeValue startCall; + osl_getSystemTime( &startCall ); + + int theRetVal = ne_lock( m_pHttpSession, theLock ); + + if ( theRetVal == NE_OK ) + { + m_aSerfLockStore.addLock( theLock, + this, + lastChanceToSendRefreshRequest( + startCall, theLock->timeout ) ); + + uno::Sequence< rtl::OUString > aTokens( 1 ); + aTokens[ 0 ] = rtl::OUString::createFromAscii( theLock->token ); + rLock.LockTokens = aTokens; + + OSL_TRACE( "SerfSession::LOCK: created lock for %s. token: %s", + rtl::OUStringToOString( makeAbsoluteURL( inPath ), + RTL_TEXTENCODING_UTF8 ).getStr(), + theLock->token ); + } + else + { + ne_lock_destroy( theLock ); + + OSL_TRACE( "SerfSession::LOCK: obtaining lock for %s failed!", + rtl::OUStringToOString( makeAbsoluteURL( inPath ), + RTL_TEXTENCODING_UTF8 ).getStr() ); + } + + HandleError( theRetVal, inPath, rEnv ); + */ +} + +// ------------------------------------------------------------------- +// LOCK (refresh existing lock) +// ------------------------------------------------------------------- +sal_Int64 SerfSession::LOCK( const ::rtl::OUString & /*inPath*/, + sal_Int64 nTimeout, + const DAVRequestEnvironment & /*rEnv*/ ) + throw ( DAVException ) +{ + osl::Guard< osl::Mutex > theGuard( m_aMutex ); + + return nTimeout; + /* + // Try to get the neon lock from lock store + SerfLock * theLock + = m_aSerfLockStore.findByUri( makeAbsoluteURL( inPath ) ); + if ( !theLock ) + throw DAVException( DAVException::DAV_NOT_LOCKED ); + + Init( rEnv ); + + // refresh existing lock. + theLock->timeout = static_cast< long >( nTimeout ); + + TimeValue startCall; + osl_getSystemTime( &startCall ); + + int theRetVal = ne_lock_refresh( m_pHttpSession, theLock ); + + if ( theRetVal == NE_OK ) + { + m_aSerfLockStore.updateLock( theLock, + lastChanceToSendRefreshRequest( + startCall, theLock->timeout ) ); + } + + HandleError( theRetVal, inPath, rEnv ); + + return theLock->timeout; + */ +} + +// ------------------------------------------------------------------- +// LOCK (refresh existing lock) +// ------------------------------------------------------------------- +bool SerfSession::LOCK( SerfLock * /*pLock*/, + sal_Int32 & /*rlastChanceToSendRefreshRequest*/ ) +{ + osl::Guard< osl::Mutex > theGuard( m_aMutex ); + + return true; + /* + // refresh existing lock. + + TimeValue startCall; + osl_getSystemTime( &startCall ); + + if ( ne_lock_refresh( m_pHttpSession, pLock ) == NE_OK ) + { + rlastChanceToSendRefreshRequest + = lastChanceToSendRefreshRequest( startCall, pLock->timeout ); + + OSL_TRACE( "Lock successfully refreshed." ); + return true; + } + else + { + OSL_TRACE( "Lock not refreshed!" ); + return false; + } + */ +} + +// ------------------------------------------------------------------- +// UNLOCK +// ------------------------------------------------------------------- +void SerfSession::UNLOCK( const ::rtl::OUString & /*inPath*/, + const DAVRequestEnvironment & /*rEnv*/ ) + throw ( DAVException ) +{ + osl::Guard< osl::Mutex > theGuard( m_aMutex ); + + /* + // get the neon lock from lock store + SerfLock * theLock + = m_aSerfLockStore.findByUri( makeAbsoluteURL( inPath ) ); + if ( !theLock ) + throw DAVException( DAVException::DAV_NOT_LOCKED ); + + Init( rEnv ); + + int theRetVal = ne_unlock( m_pHttpSession, theLock ); + + if ( theRetVal == NE_OK ) + { + m_aSerfLockStore.removeLock( theLock ); + ne_lock_destroy( theLock ); + } + else + { + OSL_TRACE( "SerfSession::UNLOCK: unlocking of %s failed.", + rtl::OUStringToOString( makeAbsoluteURL( inPath ), + RTL_TEXTENCODING_UTF8 ).getStr() ); + } + + HandleError( theRetVal, inPath, rEnv ); + */ +} + +// ------------------------------------------------------------------- +// UNLOCK +// ------------------------------------------------------------------- +bool SerfSession::UNLOCK( SerfLock * /*pLock*/ ) +{ + osl::Guard< osl::Mutex > theGuard( m_aMutex ); + + return true; + /* + if ( ne_unlock( m_pHttpSession, pLock ) == NE_OK ) + { + OSL_TRACE( "UNLOCK succeeded." ); + return true; + } + else + { + OSL_TRACE( "UNLOCK failed!" ); + return false; + } + */ +} + +// ------------------------------------------------------------------- +void SerfSession::abort() + throw ( DAVException ) +{ + // 11.11.09 (tkr): The following code lines causing crashes if + // closing a ongoing connection. It turned out that this existing + // solution doesn't work in multi-threading environments. + // So I disabled them in 3.2. . Issue #73893# should fix it in OOo 3.3. + //if ( m_pHttpSession ) + // ne_close_connection( m_pHttpSession ); +} + +// ------------------------------------------------------------------- +const ucbhelper::InternetProxyServer & SerfSession::getProxySettings() const +{ + if ( m_aUri.GetScheme().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "http" ) ) || + m_aUri.GetScheme().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "https" ) ) ) + { + return m_rProxyDecider.getProxy( m_aUri.GetScheme(), + m_aUri.GetHost(), + m_aUri.GetPort() ); + } + else + { + // TODO: figure out, if this case can occur + return m_rProxyDecider.getProxy( m_aUri.GetScheme(), + rtl::OUString() /* not used */, + -1 /* not used */ ); + } +} + +/* +// ------------------------------------------------------------------- +namespace { + +bool containsLocktoken( const uno::Sequence< ucb::Lock > & rLocks, + const char * token ) +{ + for ( sal_Int32 n = 0; n < rLocks.getLength(); ++n ) + { + const uno::Sequence< rtl::OUString > & rTokens + = rLocks[ n ].LockTokens; + for ( sal_Int32 m = 0; m < rTokens.getLength(); ++m ) + { + if ( rTokens[ m ].equalsAscii( token ) ) + return true; + } + } + return false; +} + +} // namespace +*/ + +// ------------------------------------------------------------------- +bool SerfSession::removeExpiredLocktoken( const rtl::OUString & /*inURL*/, + const DAVRequestEnvironment & /*rEnv*/ ) +{ + return true; + /* + SerfLock * theLock = m_aSerfLockStore.findByUri( inURL ); + if ( !theLock ) + return false; + + // do a lockdiscovery to check whether this lock is still valid. + try + { + // @@@ Alternative: use ne_lock_discover() => less overhead + + std::vector< DAVResource > aResources; + std::vector< rtl::OUString > aPropNames; + aPropNames.push_back( DAVProperties::LOCKDISCOVERY ); + + PROPFIND( rEnv.m_aRequestURI, DAVZERO, aPropNames, aResources, rEnv ); + + if ( aResources.size() == 0 ) + return false; + + std::vector< DAVPropertyValue >::const_iterator it + = aResources[ 0 ].properties.begin(); + std::vector< DAVPropertyValue >::const_iterator end + = aResources[ 0 ].properties.end(); + + while ( it != end ) + { + if ( (*it).Name.equals( DAVProperties::LOCKDISCOVERY ) ) + { + uno::Sequence< ucb::Lock > aLocks; + if ( !( (*it).Value >>= aLocks ) ) + return false; + + if ( !containsLocktoken( aLocks, theLock->token ) ) + { + // expired! + break; + } + + // still valid. + return false; + } + ++it; + } + + // No lockdiscovery prop in propfind result / locktoken not found + // in propfind result -> not locked + OSL_TRACE( "SerfSession::removeExpiredLocktoken: Removing " + " expired lock token for %s. token: %s", + rtl::OUStringToOString( inURL, + RTL_TEXTENCODING_UTF8 ).getStr(), + theLock->token ); + + m_aSerfLockStore.removeLock( theLock ); + ne_lock_destroy( theLock ); + return true; + } + catch ( DAVException const & ) + { + } + return false; + */ +} + +// ------------------------------------------------------------------- +// HandleError +// Common Error Handler +// ------------------------------------------------------------------- +void SerfSession::HandleError( boost::shared_ptr rReqProc ) + throw ( DAVException ) +{ + m_aEnv = DAVRequestEnvironment(); + + if ( rReqProc->mpDAVException ) + { + DAVException* mpDAVExp( rReqProc->mpDAVException ); + + serf_connection_reset( getSerfConnection() ); + + if ( mpDAVExp->getStatus() == 413 && + m_bNoOfTransferEncodingSwitches < 2 ) + { + m_bUseChunkedEncoding = !m_bUseChunkedEncoding; + ++m_bNoOfTransferEncodingSwitches; + } + + throw DAVException( mpDAVExp->getError(), + mpDAVExp->getData(), + mpDAVExp->getStatus() ); + } + + /* + // Map error code to DAVException. + switch ( nError ) + { + case NE_OK: + return; + + case NE_ERROR: // Generic error + { + rtl::OUString aText = rtl::OUString::createFromAscii( + ne_get_error( m_pHttpSession ) ); + + sal_uInt16 code = makeStatusCode( aText ); + + if ( code == SC_LOCKED ) + { + if ( m_aSerfLockStore.findByUri( + makeAbsoluteURL( inPath ) ) == 0 ) + { + // locked by 3rd party + throw DAVException( DAVException::DAV_LOCKED ); + } + else + { + // locked by ourself + throw DAVException( DAVException::DAV_LOCKED_SELF ); + } + } + + // Special handling for 400 and 412 status codes, which may indicate + // that a lock previously obtained by us has been released meanwhile + // by the server. Unfortunately, RFC is not clear at this point, + // thus server implementations behave different... + else if ( code == SC_BAD_REQUEST || code == SC_PRECONDITION_FAILED ) + { + if ( removeExpiredLocktoken( makeAbsoluteURL( inPath ), rEnv ) ) + throw DAVException( DAVException::DAV_LOCK_EXPIRED ); + } + + throw DAVException( DAVException::DAV_HTTP_ERROR, aText, code ); + } + case NE_LOOKUP: // Name lookup failed. + throw DAVException( DAVException::DAV_HTTP_LOOKUP, + SerfUri::makeConnectionEndPointString( + m_aHostName, m_nPort ) ); + + case NE_AUTH: // User authentication failed on server + throw DAVException( DAVException::DAV_HTTP_AUTH, + SerfUri::makeConnectionEndPointString( + m_aHostName, m_nPort ) ); + + case NE_PROXYAUTH: // User authentication failed on proxy + throw DAVException( DAVException::DAV_HTTP_AUTHPROXY, + SerfUri::makeConnectionEndPointString( + m_aProxyName, m_nProxyPort ) ); + + case NE_CONNECT: // Could not connect to server + throw DAVException( DAVException::DAV_HTTP_CONNECT, + SerfUri::makeConnectionEndPointString( + m_aHostName, m_nPort ) ); + + case NE_TIMEOUT: // Connection timed out + throw DAVException( DAVException::DAV_HTTP_TIMEOUT, + SerfUri::makeConnectionEndPointString( + m_aHostName, m_nPort ) ); + + case NE_FAILED: // The precondition failed + throw DAVException( DAVException::DAV_HTTP_FAILED, + SerfUri::makeConnectionEndPointString( + m_aHostName, m_nPort ) ); + + case NE_RETRY: // Retry request (ne_end_request ONLY) + throw DAVException( DAVException::DAV_HTTP_RETRY, + SerfUri::makeConnectionEndPointString( + m_aHostName, m_nPort ) ); + + case NE_REDIRECT: + { + SerfUri aUri( ne_redirect_location( m_pHttpSession ) ); + throw DAVException( + DAVException::DAV_HTTP_REDIRECT, aUri.GetURI() ); + } + default: + { + OSL_TRACE( "SerfSession::HandleError : Unknown Serf error code!" ); + throw DAVException( DAVException::DAV_HTTP_ERROR, + rtl::OUString::createFromAscii( + ne_get_error( m_pHttpSession ) ) ); + } + } + */ +} + +// ------------------------------------------------------------------- +// static +bool +SerfSession::getDataFromInputStream( + const uno::Reference< io::XInputStream > & xStream, + uno::Sequence< sal_Int8 > & rData, + bool bAppendTrailingZeroByte ) +{ + if ( xStream.is() ) + { + uno::Reference< io::XSeekable > xSeekable( xStream, uno::UNO_QUERY ); + if ( xSeekable.is() ) + { + try + { + sal_Int32 nSize + = sal::static_int_cast(xSeekable->getLength()); + sal_Int32 nRead + = xStream->readBytes( rData, nSize ); + + if ( nRead == nSize ) + { + if ( bAppendTrailingZeroByte ) + { + rData.realloc( nSize + 1 ); + rData[ nSize ] = sal_Int8( 0 ); + } + return true; + } + } + catch ( io::NotConnectedException const & ) + { + // readBytes + } + catch ( io::BufferSizeExceededException const & ) + { + // readBytes + } + catch ( io::IOException const & ) + { + // getLength, readBytes + } + } + else + { + try + { + uno::Sequence< sal_Int8 > aBuffer; + sal_Int32 nPos = 0; + + sal_Int32 nRead = xStream->readSomeBytes( aBuffer, 65536 ); + while ( nRead > 0 ) + { + if ( rData.getLength() < ( nPos + nRead ) ) + rData.realloc( nPos + nRead ); + + aBuffer.realloc( nRead ); + rtl_copyMemory( (void*)( rData.getArray() + nPos ), + (const void*)aBuffer.getConstArray(), + nRead ); + nPos += nRead; + + aBuffer.realloc( 0 ); + nRead = xStream->readSomeBytes( aBuffer, 65536 ); + } + + if ( bAppendTrailingZeroByte ) + { + rData.realloc( nPos + 1 ); + rData[ nPos ] = sal_Int8( 0 ); + } + return true; + } + catch ( io::NotConnectedException const & ) + { + // readBytes + } + catch ( io::BufferSizeExceededException const & ) + { + // readBytes + } + catch ( io::IOException const & ) + { + // readBytes + } + } + } + return false; +} + +// --------------------------------------------------------------------- +sal_Bool +SerfSession::isDomainMatch( rtl::OUString certHostName ) +{ + rtl::OUString hostName = getHostName(); + + if (hostName.equalsIgnoreAsciiCase( certHostName ) ) + return sal_True; + + if ( 0 == certHostName.indexOf( rtl::OUString::createFromAscii( "*" ) ) && + hostName.getLength() >= certHostName.getLength() ) + { + rtl::OUString cmpStr = certHostName.copy( 1 ); + + if ( hostName.matchIgnoreAsciiCase( + cmpStr, hostName.getLength() - cmpStr.getLength() ) ) + return sal_True; + } + return sal_False; +} + +/* +// --------------------------------------------------------------------- +rtl::OUString SerfSession::makeAbsoluteURL( rtl::OUString const & rURL ) const +{ + try + { + // Is URL relative or already absolute? + if ( rURL[ 0 ] != sal_Unicode( '/' ) ) + { + // absolute. + return rtl::OUString( rURL ); + } + else + { + ne_uri aUri; + memset( &aUri, 0, sizeof( aUri ) ); + + ne_fill_server_uri( m_pHttpSession, &aUri ); + aUri.path + = ne_strdup( rtl::OUStringToOString( + rURL, RTL_TEXTENCODING_UTF8 ).getStr() ); + SerfUri aSerfUri( &aUri ); + ne_uri_free( &aUri ); + return aSerfUri.GetURI(); + } + } + catch ( DAVException const & ) + { + } + // error. + return rtl::OUString(); +} +*/ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/SerfSession.hxx b/ucb/source/ucp/webdav/SerfSession.hxx new file mode 100644 index 000000000000..73a44021cddd --- /dev/null +++ b/ucb/source/ucp/webdav/SerfSession.hxx @@ -0,0 +1,325 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + + + +#ifndef INCLUDED_SERFSESSION_HXX +#define INCLUDED_SERFSESSION_HXX + +#include +#include +#include +#include +#include +//#include "SerfLockStore.hxx" +#include +#include + +namespace ucbhelper { class ProxyDecider; } + +namespace http_dav_ucp +{ + +class SerfRequestProcessor; + +// ------------------------------------------------------------------- +// SerfSession +// A DAVSession implementation using the neon/expat library +// ------------------------------------------------------------------- + +class SerfSession : public DAVSession +{ +private: + osl::Mutex m_aMutex; + + SerfUri m_aUri; + + rtl::OUString m_aProxyName; + sal_Int32 m_nProxyPort; + + SerfConnection* m_pSerfConnection; + serf_context_t* m_pSerfContext; + serf_bucket_alloc_t* m_pSerfBucket_Alloc; + bool m_bIsHeadRequestInProgress; + bool m_bUseChunkedEncoding; + sal_Int16 m_bNoOfTransferEncodingSwitches; + + const ucbhelper::InternetProxyDecider & m_rProxyDecider; + + DAVRequestEnvironment m_aEnv; + +// static SerfLockStore m_aSerfLockStore; + + char* getHostinfo(); + bool isSSLNeeded(); + + SerfRequestProcessor* createReqProc( const rtl::OUString & inPath ); + +protected: + virtual ~SerfSession(); + +public: + SerfSession( const rtl::Reference< DAVSessionFactory > & rSessionFactory, + const rtl::OUString& inUri, + const ucbhelper::InternetProxyDecider & rProxyDecider ) + throw ( DAVException ); + + // Serf library callbacks + apr_status_t setupSerfConnection( apr_socket_t * inAprSocket, + serf_bucket_t **outSerfInputBucket, + serf_bucket_t **outSerfOutputBucket, + apr_pool_t* inAprPool ); + + apr_status_t provideSerfCredentials( bool bGiveProvidedCredentialsASecondTry, + char ** outUsername, + char ** outPassword, + serf_request_t * inRequest, + int inCode, + const char *inAuthProtocol, + const char *inRealm, + apr_pool_t *inAprPool ); + + apr_status_t verifySerfCertificateChain ( + int nFailures, + const char** pCertificateChainBase64Encoded, + int nCertificateChainLength); + + serf_bucket_t* acceptSerfResponse( serf_request_t * inSerfRequest, + serf_bucket_t * inSerfStreamBucket, + apr_pool_t* inAprPool ); + + // Serf-related data structures + apr_pool_t* getAprPool(); + serf_bucket_alloc_t* getSerfBktAlloc(); + serf_context_t* getSerfContext(); + SerfConnection* getSerfConnection(); + + // DAVSession methods + virtual sal_Bool CanUse( const ::rtl::OUString & inUri ); + + virtual sal_Bool UsesProxy(); + + const DAVRequestEnvironment & getRequestEnvironment() const + { return m_aEnv; } + + // allprop & named + virtual void + PROPFIND( const ::rtl::OUString & inPath, + const Depth inDepth, + const std::vector< ::rtl::OUString > & inPropNames, + std::vector< DAVResource > & ioResources, + const DAVRequestEnvironment & rEnv ) + throw ( DAVException ); + + // propnames + virtual void + PROPFIND( const ::rtl::OUString & inPath, + const Depth inDepth, + std::vector< DAVResourceInfo >& ioResInfo, + const DAVRequestEnvironment & rEnv ) + throw ( DAVException ); + + virtual void + PROPPATCH( const ::rtl::OUString & inPath, + const std::vector< ProppatchValue > & inValues, + const DAVRequestEnvironment & rEnv ) + throw ( DAVException ); + + virtual void + HEAD( const ::rtl::OUString & inPath, + const std::vector< ::rtl::OUString > & inHeaderNames, + DAVResource & ioResource, + const DAVRequestEnvironment & rEnv ) + throw ( DAVException ); + + bool isHeadRequestInProgress(); + + virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + GET( const ::rtl::OUString & inPath, + const DAVRequestEnvironment & rEnv ) + throw ( DAVException ); + + virtual void + GET( const ::rtl::OUString & inPath, + com::sun::star::uno::Reference< + com::sun::star::io::XOutputStream > & ioOutputStream, + const DAVRequestEnvironment & rEnv ) + throw ( DAVException ); + + virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + GET( const ::rtl::OUString & inPath, + const std::vector< ::rtl::OUString > & inHeaderNames, + DAVResource & ioResource, + const DAVRequestEnvironment & rEnv ) + throw ( DAVException ); + + virtual void + GET( const ::rtl::OUString & inPath, + com::sun::star::uno::Reference< + com::sun::star::io::XOutputStream > & ioOutputStream, + const std::vector< ::rtl::OUString > & inHeaderNames, + DAVResource & ioResource, + const DAVRequestEnvironment & rEnv ) + throw ( DAVException ); + + virtual void + PUT( const ::rtl::OUString & inPath, + const com::sun::star::uno::Reference< + com::sun::star::io::XInputStream > & inInputStream, + const DAVRequestEnvironment & rEnv ) + throw ( DAVException ); + + virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + POST( const rtl::OUString & inPath, + const rtl::OUString & rContentType, + const rtl::OUString & rReferer, + const com::sun::star::uno::Reference< + com::sun::star::io::XInputStream > & inInputStream, + const DAVRequestEnvironment & rEnv ) + throw ( DAVException ); + + virtual void + POST( const rtl::OUString & inPath, + const rtl::OUString & rContentType, + const rtl::OUString & rReferer, + const com::sun::star::uno::Reference< + com::sun::star::io::XInputStream > & inInputStream, + com::sun::star::uno::Reference< + com::sun::star::io::XOutputStream > & oOutputStream, + const DAVRequestEnvironment & rEnv ) + throw ( DAVException ); + + virtual void + MKCOL( const ::rtl::OUString & inPath, + const DAVRequestEnvironment & rEnv ) + throw ( DAVException ); + + virtual void + COPY( const ::rtl::OUString & inSourceURL, + const ::rtl::OUString & inDestinationURL, + const DAVRequestEnvironment & rEnv, + sal_Bool inOverWrite ) + throw ( DAVException ); + + virtual void + MOVE( const ::rtl::OUString & inSourceURL, + const ::rtl::OUString & inDestinationURL, + const DAVRequestEnvironment & rEnv, + sal_Bool inOverWrite ) + throw ( DAVException ); + + virtual void DESTROY( const ::rtl::OUString & inPath, + const DAVRequestEnvironment & rEnv ) + throw ( DAVException ); + + // set new lock. + virtual void LOCK( const ::rtl::OUString & inURL, + com::sun::star::ucb::Lock & inLock, + const DAVRequestEnvironment & rEnv ) + throw ( DAVException ); + + // refresh existing lock. + virtual sal_Int64 LOCK( const ::rtl::OUString & inURL, + sal_Int64 nTimeout, + const DAVRequestEnvironment & rEnv ) + throw ( DAVException ); + + virtual void UNLOCK( const ::rtl::OUString & inURL, + const DAVRequestEnvironment & rEnv ) + throw ( DAVException ); + + // helpers + virtual void abort() + throw ( DAVException ); + + const rtl::OUString & getHostName() const { return m_aUri.GetHost(); } + int getPort() const { return m_aUri.GetPort(); } + + const ::uno::Reference< ::lang::XMultiServiceFactory > getMSF() + { return m_xFactory->getServiceFactory(); } + + sal_Bool isDomainMatch( rtl::OUString certHostName ); + +private: + friend class SerfLockStore; + + void Init( void ) + throw ( DAVException ); + + void Init( const DAVRequestEnvironment & rEnv ) + throw ( DAVException ); + + void HandleError( boost::shared_ptr rReqProc ) + throw ( DAVException ); + + const ucbhelper::InternetProxyServer & getProxySettings() const; + + bool removeExpiredLocktoken( const rtl::OUString & inURL, + const DAVRequestEnvironment & rEnv ); + + // refresh lock, called by SerfLockStore::refreshLocks + bool LOCK( SerfLock * pLock, + sal_Int32 & rlastChanceToSendRefreshRequest ); + + // unlock, called by SerfLockStore::~SerfLockStore + bool UNLOCK( SerfLock * pLock ); + + /* + // low level GET implementation, used by public GET implementations + static int GET( SerfConnection * sess, + const char * uri, + //ne_block_reader reader, + bool getheaders, + void * userdata ); + + // Buffer-based PUT implementation. Serf only has file descriptor- + // based API. + static int PUT( SerfConnection * sess, + const char * uri, + const char * buffer, + size_t size ); + + // Buffer-based POST implementation. Serf only has file descriptor- + // based API. + int POST( SerfConnection * sess, + const char * uri, + const char * buffer, + //ne_block_reader reader, + void * userdata, + const rtl::OUString & rContentType, + const rtl::OUString & rReferer ); + */ + + // Helper: XInputStream -> Sequence< sal_Int8 > + static bool getDataFromInputStream( + const com::sun::star::uno::Reference< + com::sun::star::io::XInputStream > & xStream, + com::sun::star::uno::Sequence< sal_Int8 > & rData, + bool bAppendTrailingZeroByte ); + + /* + rtl::OUString makeAbsoluteURL( rtl::OUString const & rURL ) const; + */ +}; + +} // namespace http_dav_ucp + +#endif // INCLUDED_SERFSESSION_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/SerfTypes.hxx b/ucb/source/ucp/webdav/SerfTypes.hxx new file mode 100644 index 000000000000..b396697be9f7 --- /dev/null +++ b/ucb/source/ucp/webdav/SerfTypes.hxx @@ -0,0 +1,37 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + + + +#ifndef INCLUDED_SERFTYPES_HXX +#define INCLUDED_SERFTYPES_HXX + +#include + +typedef serf_connection_t SerfConnection; + +// TODO, figure out type of +typedef int SerfLock; + +// TODO, check if we need it later on +typedef struct { const char *nspace, *name; } SerfPropName; + +#endif // INCLUDED_SERFTYPES_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/SerfUri.cxx b/ucb/source/ucp/webdav/SerfUri.cxx new file mode 100644 index 000000000000..4dc38997a872 --- /dev/null +++ b/ucb/source/ucp/webdav/SerfUri.cxx @@ -0,0 +1,279 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_ucb.hxx" + +#include +#include +#include +#include +#include "SerfUri.hxx" +#include "DAVException.hxx" +#include + +#include "../inc/urihelper.hxx" + +using namespace http_dav_ucp; + +# if defined __SUNPRO_CC +# pragma enable_warn +#endif + +// ------------------------------------------------------------------- +// Constructor +// ------------------------------------------------------------------- + +namespace { + +inline bool matchIgnoreAsciiCase(rtl::OString const & rStr1, + sal_Char const * pStr2, + sal_Int32 nStr2Len) SAL_THROW(()) +{ + return + rtl_str_shortenedCompareIgnoreAsciiCase_WithLength( + rStr1.getStr(), rStr1.getLength(), pStr2, nStr2Len, nStr2Len) + == 0; +} + +} + +SerfUri::SerfUri( const apr_uri_t * inUri ) + throw ( DAVException ) + : mAprUri( *inUri ) + , mURI() + , mScheme() + , mUserInfo() + , mHostName() + , mPort() + , mPath() +{ + if ( inUri == 0 ) + throw DAVException( DAVException::DAV_INVALID_ARG ); + + char * uri = apr_uri_unparse( apr_environment::AprEnv::getAprEnv()->getAprPool(), &mAprUri, 0 ); + + if ( uri == 0 ) + throw DAVException( DAVException::DAV_INVALID_ARG ); + + init( &mAprUri ); + + calculateURI(); +} + +SerfUri::SerfUri( const rtl::OUString & inUri ) + throw ( DAVException ) + : mAprUri() + , mURI() + , mScheme() + , mUserInfo() + , mHostName() + , mPort() + , mPath() +{ + if ( inUri.getLength() <= 0 ) + throw DAVException( DAVException::DAV_INVALID_ARG ); + + // #i77023# + rtl::OUString aEscapedUri( ucb_impl::urihelper::encodeURI( inUri ) ); + + rtl::OString theInputUri( + aEscapedUri.getStr(), aEscapedUri.getLength(), RTL_TEXTENCODING_UTF8 ); + + if ( apr_uri_parse( apr_environment::AprEnv::getAprEnv()->getAprPool(), + theInputUri.getStr(), &mAprUri ) != APR_SUCCESS ) + { + throw DAVException( DAVException::DAV_INVALID_ARG ); + } + if ( !mAprUri.port ) + { + mAprUri.port = apr_uri_port_of_scheme( mAprUri.scheme ); + } + if ( !mAprUri.path ) + { + mAprUri.path = "/"; + } + + init( &mAprUri ); + + calculateURI(); +} + +void SerfUri::init( const apr_uri_t * pUri ) +{ + mScheme = rtl::OStringToOUString( pUri->scheme, RTL_TEXTENCODING_UTF8 ); + mUserInfo = rtl::OStringToOUString( pUri->user, RTL_TEXTENCODING_UTF8 ); + mHostName = rtl::OStringToOUString( pUri->hostname, RTL_TEXTENCODING_UTF8 ); + mPort = pUri->port; + mPath = rtl::OStringToOUString( pUri->path, RTL_TEXTENCODING_UTF8 ); + + if ( pUri->query ) + { + mPath += rtl::OUString::createFromAscii( "?" ); + mPath += rtl::OStringToOUString( pUri->query, RTL_TEXTENCODING_UTF8 ); + } + + if ( pUri->fragment ) + { + mPath += rtl::OUString::createFromAscii( "#" ); + mPath += rtl::OStringToOUString( pUri->fragment, RTL_TEXTENCODING_UTF8 ); + } +} + +SerfUri::~SerfUri( ) +{ +} + +void SerfUri::calculateURI () +{ + rtl::OUStringBuffer aBuf( mScheme ); + aBuf.appendAscii( "://" ); + if ( mUserInfo.getLength() > 0 ) + { + aBuf.append( mUserInfo ); + aBuf.appendAscii( "@" ); + } + // Is host a numeric IPv6 address? + if ( ( mHostName.indexOf( ':' ) != -1 ) && + ( mHostName[ 0 ] != sal_Unicode( '[' ) ) ) + { + aBuf.appendAscii( "[" ); + aBuf.append( mHostName ); + aBuf.appendAscii( "]" ); + } + else + { + aBuf.append( mHostName ); + } + + // append port, but only, if not default port. + bool bAppendPort = true; + switch ( mPort ) + { + case DEFAULT_HTTP_PORT: + bAppendPort = !mScheme.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "http" ) ); + break; + + case DEFAULT_HTTPS_PORT: + bAppendPort = !mScheme.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "https" ) ); + break; + } + if ( bAppendPort ) + { + aBuf.appendAscii( ":" ); + aBuf.append( rtl::OUString::valueOf( mPort ) ); + } + aBuf.append( mPath ); + + mURI = aBuf.makeStringAndClear(); +} + +::rtl::OUString SerfUri::GetPathBaseName () const +{ + sal_Int32 nPos = mPath.lastIndexOf ('/'); + sal_Int32 nTrail = 0; + if (nPos == mPath.getLength () - 1) + { + // Trailing slash found. Skip. + nTrail = 1; + nPos = mPath.lastIndexOf ('/', nPos); + } + if (nPos != -1) + { + rtl::OUString aTemp( + mPath.copy (nPos + 1, mPath.getLength () - nPos - 1 - nTrail) ); + + // query, fragment present? + nPos = aTemp.indexOf( '?' ); + if ( nPos == -1 ) + nPos = aTemp.indexOf( '#' ); + + if ( nPos != -1 ) + aTemp = aTemp.copy( 0, nPos ); + + return aTemp; + } + else + return rtl::OUString::createFromAscii ("/"); +} + +bool SerfUri::operator== ( const SerfUri & rOther ) const +{ + return ( mURI == rOther.mURI ); +} + +::rtl::OUString SerfUri::GetPathBaseNameUnescaped () const +{ + return unescape( GetPathBaseName() ); +} + +void SerfUri::AppendPath (const rtl::OUString& rPath) +{ + if (mPath.lastIndexOf ('/') != mPath.getLength () - 1) + mPath += rtl::OUString::createFromAscii ("/"); + + mPath += rPath; + calculateURI (); +}; + +// static +rtl::OUString SerfUri::escapeSegment( const rtl::OUString& segment ) +{ + return rtl::Uri::encode( segment, + rtl_UriCharClassPchar, + rtl_UriEncodeIgnoreEscapes, + RTL_TEXTENCODING_UTF8 ); +} + +// static +rtl::OUString SerfUri::unescape( const rtl::OUString& segment ) +{ + return rtl::Uri::decode( segment, + rtl_UriDecodeWithCharset, + RTL_TEXTENCODING_UTF8 ); +} + +// static +rtl::OUString SerfUri::makeConnectionEndPointString( + const rtl::OUString & rHostName, int nPort ) +{ + rtl::OUStringBuffer aBuf; + + // Is host a numeric IPv6 address? + if ( ( rHostName.indexOf( ':' ) != -1 ) && + ( rHostName[ 0 ] != sal_Unicode( '[' ) ) ) + { + aBuf.appendAscii( "[" ); + aBuf.append( rHostName ); + aBuf.appendAscii( "]" ); + } + else + { + aBuf.append( rHostName ); + } + + if ( ( nPort != DEFAULT_HTTP_PORT ) && ( nPort != DEFAULT_HTTPS_PORT ) ) + { + aBuf.appendAscii( ":" ); + aBuf.append( rtl::OUString::valueOf( sal_Int32( nPort ) ) ); + } + return aBuf.makeStringAndClear(); +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/SerfUri.hxx b/ucb/source/ucp/webdav/SerfUri.hxx new file mode 100644 index 000000000000..89298c09b2bb --- /dev/null +++ b/ucb/source/ucp/webdav/SerfUri.hxx @@ -0,0 +1,102 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + + +#ifndef INCLUDED_SERFURI_HXX +#define INCLUDED_SERFURI_HXX + +#include +#include +#include + +namespace http_dav_ucp +{ + +#define DEFAULT_HTTP_PORT 80 +#define DEFAULT_HTTPS_PORT 443 + +// ------------------------------------------------------------------- +// SerfUri +// A URI implementation for use with the neon/expat library +// ------------------------------------------------------------------- +class SerfUri +{ + private: + apr_uri_t mAprUri; + ::rtl::OUString mURI; + ::rtl::OUString mScheme; + ::rtl::OUString mUserInfo; + ::rtl::OUString mHostName; + sal_Int32 mPort; + ::rtl::OUString mPath; + + void init( const apr_uri_t * pUri ); + void calculateURI (); + + public: + SerfUri( const ::rtl::OUString & inUri ) throw ( DAVException ); + SerfUri( const apr_uri_t * inUri ) throw ( DAVException ); + ~SerfUri( ); + + bool operator== ( const SerfUri & rOther ) const; + bool operator!= ( const SerfUri & rOther ) const + { return !operator==( rOther ); } + + apr_uri_t* getAprUri() + { + return &mAprUri; + } + const ::rtl::OUString & GetURI( void ) const + { return mURI; }; + const ::rtl::OUString & GetScheme( void ) const + { return mScheme; }; + const ::rtl::OUString & GetUserInfo( void ) const + { return mUserInfo; }; + const ::rtl::OUString & GetHost( void ) const + { return mHostName; }; + sal_Int32 GetPort( void ) const + { return mPort; }; + const ::rtl::OUString & GetPath( void ) const + { return mPath; }; + + ::rtl::OUString GetPathBaseName ( void ) const; + + ::rtl::OUString GetPathBaseNameUnescaped ( void ) const; + + void SetScheme (const ::rtl::OUString& scheme) + { mScheme = scheme; calculateURI (); }; + + void AppendPath (const ::rtl::OUString& rPath); + + static ::rtl::OUString escapeSegment( const ::rtl::OUString& segment ); + static ::rtl::OUString unescape( const ::rtl::OUString& string ); + + // "host:port", omit ":port" for port 80 and 443 + static rtl::OUString makeConnectionEndPointString( + const rtl::OUString & rHostName, + int nPort ); + rtl::OUString makeConnectionEndPointString() const + { return makeConnectionEndPointString( GetHost(), GetPort() ); } +}; + +} // namespace http_dav_ucp + +#endif // INCLUDED_SERFURI_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx new file mode 100644 index 000000000000..d284e2b75132 --- /dev/null +++ b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx @@ -0,0 +1,543 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + + + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_ucb.hxx" + +#include +//#include +#include +#include +#include "UCBDeadPropertyValue.hxx" + +using namespace http_dav_ucp; +using namespace com::sun::star; + +////////////////////////////////////////////////////////////////////////// + +struct UCBDeadPropertyValueParseContext +{ + rtl::OUString * pType; + rtl::OUString * pValue; + + UCBDeadPropertyValueParseContext() : pType( 0 ), pValue( 0 ) {} + ~UCBDeadPropertyValueParseContext() { delete pType; delete pValue; } +}; + +// static +const rtl::OUString UCBDeadPropertyValue::aTypeString + = rtl::OUString::createFromAscii( "string" ); +const rtl::OUString UCBDeadPropertyValue::aTypeLong + = rtl::OUString::createFromAscii( "long" ); +const rtl::OUString UCBDeadPropertyValue::aTypeShort + = rtl::OUString::createFromAscii( "short" ); +const rtl::OUString UCBDeadPropertyValue::aTypeBoolean + = rtl::OUString::createFromAscii( "boolean" ); +const rtl::OUString UCBDeadPropertyValue::aTypeChar + = rtl::OUString::createFromAscii( "char" ); +const rtl::OUString UCBDeadPropertyValue::aTypeByte + = rtl::OUString::createFromAscii( "byte" ); +const rtl::OUString UCBDeadPropertyValue::aTypeHyper + = rtl::OUString::createFromAscii( "hyper" ); +const rtl::OUString UCBDeadPropertyValue::aTypeFloat + = rtl::OUString::createFromAscii( "float" ); +const rtl::OUString UCBDeadPropertyValue::aTypeDouble + = rtl::OUString::createFromAscii( "double" ); + +// static +const rtl::OUString UCBDeadPropertyValue::aXMLPre + = rtl::OUString::createFromAscii( "" ); +const rtl::OUString UCBDeadPropertyValue::aXMLMid + = rtl::OUString::createFromAscii( "" ); +const rtl::OUString UCBDeadPropertyValue::aXMLEnd + = rtl::OUString::createFromAscii( "" ); + +#define STATE_TOP (1) + +#define STATE_UCBPROP (STATE_TOP) +#define STATE_TYPE (STATE_TOP + 1) +#define STATE_VALUE (STATE_TOP + 2) + +/* +////////////////////////////////////////////////////////////////////////// +extern "C" int UCBDeadPropertyValue_startelement_callback( + void *, + int parent, + const char * nspace, + const char *name, + const char ** ) +{ + if ( name != 0 ) + { + switch ( parent ) + { + case NE_XML_STATEROOT: + if ( strcmp( name, "ucbprop" ) == 0 ) + return STATE_UCBPROP; + break; + + case STATE_UCBPROP: + if ( strcmp( name, "type" ) == 0 ) + return STATE_TYPE; + else if ( strcmp( name, "value" ) == 0 ) + return STATE_VALUE; + break; + } + } + return NE_XML_DECLINE; +} + +////////////////////////////////////////////////////////////////////////// +extern "C" int UCBDeadPropertyValue_chardata_callback( + void *userdata, + int state, + const char *buf, + size_t len ) +{ + UCBDeadPropertyValueParseContext * pCtx + = static_cast< UCBDeadPropertyValueParseContext * >( userdata ); + + switch ( state ) + { + case STATE_TYPE: + OSL_ENSURE( !pCtx->pType, + "UCBDeadPropertyValue_endelement_callback - " + "Type already set!" ); + pCtx->pType + = new rtl::OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); + break; + + case STATE_VALUE: + OSL_ENSURE( !pCtx->pValue, + "UCBDeadPropertyValue_endelement_callback - " + "Value already set!" ); + pCtx->pValue + = new rtl::OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); + break; + } + return 0; // zero to continue, non-zero to abort parsing +} + +////////////////////////////////////////////////////////////////////////// +extern "C" int UCBDeadPropertyValue_endelement_callback( + void *userdata, + int state, + const char *, + const char * ) +{ + UCBDeadPropertyValueParseContext * pCtx + = static_cast< UCBDeadPropertyValueParseContext * >( userdata ); + + switch ( state ) + { + case STATE_TYPE: + if ( !pCtx->pType ) + return 1; // abort + break; + + case STATE_VALUE: + if ( !pCtx->pValue ) + return 1; // abort + break; + + case STATE_UCBPROP: + if ( !pCtx->pType || ! pCtx->pValue ) + return 1; // abort + break; + } + return 0; // zero to continue, non-zero to abort parsing +} +*/ + +////////////////////////////////////////////////////////////////////////// +static rtl::OUString encodeValue( const rtl::OUString & rValue ) +{ + // Note: I do not use the usual & + < + > encoding, because + // I want to prevent any XML parser from trying to 'understand' + // the value. This caused problems: + // + // Example: + // - Unencoded property value: xstringx<z + // PROPFIND: + // - parser replaces < by > ==> error (not well formed) + + rtl::OUStringBuffer aResult; + const sal_Unicode * pValue = rValue.getStr(); + + sal_Int32 nCount = rValue.getLength(); + for ( sal_Int32 n = 0; n < nCount; ++n ) + { + const sal_Unicode c = pValue[ n ]; + + if ( '%' == c ) + aResult.appendAscii( "%per;" ); + else if ( '<' == c ) + aResult.appendAscii( "%lt;" ); + else if ( '>' == c ) + aResult.appendAscii( "%gt;" ); + else + aResult.append( c ); + } + return rtl::OUString( aResult ); +} + +/* +////////////////////////////////////////////////////////////////////////// +static rtl::OUString decodeValue( const rtl::OUString & rValue ) +{ + rtl::OUStringBuffer aResult; + const sal_Unicode * pValue = rValue.getStr(); + + sal_Int32 nPos = 0; + sal_Int32 nEnd = rValue.getLength(); + + while ( nPos < nEnd ) + { + sal_Unicode c = pValue[ nPos ]; + + if ( '%' == c ) + { + nPos++; + + if ( nPos == nEnd ) + { + OSL_ENSURE( sal_False, + "UCBDeadPropertyValue::decodeValue - syntax error!" ); + return rtl::OUString(); + } + + c = pValue[ nPos ]; + + if ( 'p' == c ) + { + // %per; + + if ( nPos > nEnd - 4 ) + { + OSL_ENSURE( sal_False, + "UCBDeadPropertyValue::decodeValue - syntax error!" ); + return rtl::OUString(); + } + + if ( ( 'e' == pValue[ nPos + 1 ] ) + && + ( 'r' == pValue[ nPos + 2 ] ) + && + ( ';' == pValue[ nPos + 3 ] ) ) + { + aResult.append( sal_Unicode( '%' ) ); + nPos += 3; + } + else + { + OSL_ENSURE( sal_False, + "UCBDeadPropertyValue::decodeValue - syntax error!" ); + return rtl::OUString(); + } + } + else if ( 'l' == c ) + { + // %lt; + + if ( nPos > nEnd - 3 ) + { + OSL_ENSURE( sal_False, + "UCBDeadPropertyValue::decodeValue - syntax error!" ); + return rtl::OUString(); + } + + if ( ( 't' == pValue[ nPos + 1 ] ) + && + ( ';' == pValue[ nPos + 2 ] ) ) + { + aResult.append( sal_Unicode( '<' ) ); + nPos += 2; + } + else + { + OSL_ENSURE( sal_False, + "UCBDeadPropertyValue::decodeValue - syntax error!" ); + return rtl::OUString(); + } + } + else if ( 'g' == c ) + { + // %gt; + + if ( nPos > nEnd - 3 ) + { + OSL_ENSURE( sal_False, + "UCBDeadPropertyValue::decodeValue - syntax error!" ); + return rtl::OUString(); + } + + if ( ( 't' == pValue[ nPos + 1 ] ) + && + ( ';' == pValue[ nPos + 2 ] ) ) + { + aResult.append( sal_Unicode( '>' ) ); + nPos += 2; + } + else + { + OSL_ENSURE( sal_False, + "UCBDeadPropertyValue::decodeValue - syntax error!" ); + return rtl::OUString(); + } + } + else + { + OSL_ENSURE( sal_False, + "UCBDeadPropertyValue::decodeValue - syntax error!" ); + return rtl::OUString(); + } + } + else + aResult.append( c ); + + nPos++; + } + + return rtl::OUString( aResult ); +} +*/ + +////////////////////////////////////////////////////////////////////////// +// static +bool UCBDeadPropertyValue::supportsType( const uno::Type & rType ) +{ + if ( ( rType != getCppuType( static_cast< const rtl::OUString * >( 0 ) ) ) + && + ( rType != getCppuType( static_cast< const sal_Int32 * >( 0 ) ) ) + && + ( rType != getCppuType( static_cast< const sal_Int16 * >( 0 ) ) ) + && + ( rType != getCppuBooleanType() ) + && + ( rType != getCppuCharType() ) + && + ( rType != getCppuType( static_cast< const sal_Int8 * >( 0 ) ) ) + && + ( rType != getCppuType( static_cast< const sal_Int64 * >( 0 ) ) ) + && + ( rType != getCppuType( static_cast< const float * >( 0 ) ) ) + && + ( rType != getCppuType( static_cast< const double * >( 0 ) ) ) ) + { + return false; + } + + return true; +} + +////////////////////////////////////////////////////////////////////////// +// static +bool UCBDeadPropertyValue::createFromXML( const rtl::OString & /*rInData*/, + uno::Any & /*rOutData*/ ) +{ + bool success = false; + + /* + ne_xml_parser * parser = ne_xml_create(); + if ( parser ) + { + UCBDeadPropertyValueParseContext aCtx; + ne_xml_push_handler( parser, + UCBDeadPropertyValue_startelement_callback, + UCBDeadPropertyValue_chardata_callback, + UCBDeadPropertyValue_endelement_callback, + &aCtx ); + + ne_xml_parse( parser, rInData.getStr(), rInData.getLength() ); + + success = !ne_xml_failed( parser ); + + ne_xml_destroy( parser ); + + if ( success ) + { + if ( aCtx.pType && aCtx.pValue ) + { + // Decode aCtx.pValue! It may contain XML reserved chars. + rtl::OUString aStringValue = decodeValue( *aCtx.pValue ); + if ( aCtx.pType->equalsIgnoreAsciiCase( aTypeString ) ) + { + rOutData <<= aStringValue; + } + else if ( aCtx.pType->equalsIgnoreAsciiCase( aTypeLong ) ) + { + rOutData <<= aStringValue.toInt32(); + } + else if ( aCtx.pType->equalsIgnoreAsciiCase( aTypeShort ) ) + { + rOutData <<= sal_Int16( aStringValue.toInt32() ); + } + else if ( aCtx.pType->equalsIgnoreAsciiCase( aTypeBoolean ) ) + { + if ( aStringValue.equalsIgnoreAsciiCase( + rtl::OUString::createFromAscii( "true" ) ) ) + rOutData <<= sal_Bool( sal_True ); + else + rOutData <<= sal_Bool( sal_False ); + } + else if ( aCtx.pType->equalsIgnoreAsciiCase( aTypeChar ) ) + { + rOutData <<= aStringValue.toChar(); + } + else if ( aCtx.pType->equalsIgnoreAsciiCase( aTypeByte ) ) + { + rOutData <<= sal_Int8( aStringValue.toChar() ); + } + else if ( aCtx.pType->equalsIgnoreAsciiCase( aTypeHyper ) ) + { + rOutData <<= aStringValue.toInt64(); + } + else if ( aCtx.pType->equalsIgnoreAsciiCase( aTypeFloat ) ) + { + rOutData <<= aStringValue.toFloat(); + } + else if ( aCtx.pType->equalsIgnoreAsciiCase( aTypeDouble ) ) + { + rOutData <<= aStringValue.toDouble(); + } + else + { + OSL_ENSURE( sal_False, + "UCBDeadPropertyValue::createFromXML - " + "Unsupported property type!" ); + success = false; + } + } + else + success = false; + } + } + */ + return success; +} + +////////////////////////////////////////////////////////////////////////// +// static +bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, + rtl::OUString & rOutData ) +{ + // the_typethe_value + + // Check property type. Extract type and value as string. + + const uno::Type& rType = rInData.getValueType(); + rtl::OUString aStringValue; + rtl::OUString aStringType; + + if ( rType == getCppuType( static_cast< const rtl::OUString * >( 0 ) ) ) + { + // string + rInData >>= aStringValue; + aStringType = aTypeString; + } + else if ( rType == getCppuType( static_cast< const sal_Int32 * >( 0 ) ) ) + { + // long + sal_Int32 nValue = 0; + rInData >>= nValue; + aStringValue = rtl::OUString::valueOf( nValue ); + aStringType = aTypeLong; + } + else if ( rType == getCppuType( static_cast< const sal_Int16 * >( 0 ) ) ) + { + // short + sal_Int32 nValue = 0; + rInData >>= nValue; + aStringValue = rtl::OUString::valueOf( nValue ); + aStringType = aTypeShort; + } + else if ( rType == getCppuBooleanType() ) + { + // boolean + sal_Bool bValue = false; + rInData >>= bValue; + aStringValue = rtl::OUString::valueOf( bValue ); + aStringType = aTypeBoolean; + } + else if ( rType == getCppuCharType() ) + { + // char + sal_Unicode cValue = 0; + rInData >>= cValue; + aStringValue = rtl::OUString::valueOf( cValue ); + aStringType = aTypeChar; + } + else if ( rType == getCppuType( static_cast< const sal_Int8 * >( 0 ) ) ) + { + // byte + sal_Int8 nValue = 0; + rInData >>= nValue; + aStringValue = rtl::OUString::valueOf( sal_Unicode( nValue ) ); + aStringType = aTypeByte; + } + else if ( rType == getCppuType( static_cast< const sal_Int64 * >( 0 ) ) ) + { + // hyper + sal_Int64 nValue = 0; + rInData >>= nValue; + aStringValue = rtl::OUString::valueOf( nValue ); + aStringType = aTypeHyper; + } + else if ( rType == getCppuType( static_cast< const float * >( 0 ) ) ) + { + // float + float nValue = 0; + rInData >>= nValue; + aStringValue = rtl::OUString::valueOf( nValue ); + aStringType = aTypeFloat; + } + else if ( rType == getCppuType( static_cast< const double * >( 0 ) ) ) + { + // double + double nValue = 0; + rInData >>= nValue; + aStringValue = rtl::OUString::valueOf( nValue ); + aStringType = aTypeDouble; + } + else + { + OSL_ENSURE( sal_False, + "UCBDeadPropertyValue::toXML - " + "Unsupported property type!" ); + return false; + } + + // Encode value! It must not contain XML reserved chars! + aStringValue = encodeValue( aStringValue ); + + rOutData = aXMLPre; + rOutData += aStringType; + rOutData += aXMLMid; + rOutData += aStringValue; + rOutData += aXMLEnd; + return true; +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx b/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx new file mode 100644 index 000000000000..7ed138fa7c86 --- /dev/null +++ b/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx @@ -0,0 +1,61 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + + + +#ifndef _UCBDEADPROPERTYVALUE_HXX_ +#define _UCBDEADPROPERTYVALUE_HXX_ + +#include +#include + +namespace http_dav_ucp +{ + +class UCBDeadPropertyValue +{ +private: + static const rtl::OUString aTypeString; + static const rtl::OUString aTypeLong; + static const rtl::OUString aTypeShort; + static const rtl::OUString aTypeBoolean; + static const rtl::OUString aTypeChar; + static const rtl::OUString aTypeByte; + static const rtl::OUString aTypeHyper; + static const rtl::OUString aTypeFloat; + static const rtl::OUString aTypeDouble; + + static const rtl::OUString aXMLPre; + static const rtl::OUString aXMLMid; + static const rtl::OUString aXMLEnd; + +public: + static bool supportsType( const com::sun::star::uno::Type & rType ); + + static bool createFromXML( const rtl::OString & rInData, + com::sun::star::uno::Any & rOutData ); + static bool toXML( const com::sun::star::uno::Any & rInData, + rtl::OUString & rOutData ); +}; + +} + +#endif /* _UCBDEADPROPERTYVALUE_HXX_ */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/ucpdav.xml b/ucb/source/ucp/webdav/ucpdav.xml new file mode 100644 index 000000000000..6dd0498a1eca --- /dev/null +++ b/ucb/source/ucp/webdav/ucpdav.xml @@ -0,0 +1,128 @@ + + + + + + + + + ucpdav + + + + + Kai Sommerfeld + + + com.sun.star.comp.ucb.WebDAVContentProvider + + + This component implements a Content Provider for the Universal + Content Broker. It provides access to contents stored on an HTTP/WebDAV + server. + + + com.sun.star.loader.SharedLibrary + + + c++ + + + + com.sun.star.ucb.WebDAVContentProvider + + + + external + sal + cppu + cppuhelper + ucbhelper + + sal3 + cppu3 + cppuhelper3$(COM) + ucbhelper4$(COM) + + com.sun.star.beans.PropertyAttribute + com.sun.star.beans.PropertyValue + com.sun.star.beans.XPropertiesChangeNotifier + com.sun.star.beans.XPropertyAccess + com.sun.star.beans.XPropertyContainer + com.sun.star.beans.XPropertySetInfoChangeNotifier + com.sun.star.container.XChild + com.sun.star.io.XActiveDataSink + com.sun.star.io.XInputStream + com.sun.star.io.XOutputStream + com.sun.star.io.XSeekable + com.sun.star.lang.IllegalAccessException + com.sun.star.lang.XComponent + com.sun.star.lang.XMultiServiceFactory + com.sun.star.lang.XServiceInfo + com.sun.star.lang.XSingleServiceFactory + com.sun.star.lang.XTypeProvider + com.sun.star.registry.XRegistryKey + com.sun.star.sdbc.XCloseable + com.sun.star.sdbc.XColumnLocate + com.sun.star.sdbc.XResultSetMetaDataSupplier + com.sun.star.sdbc.XRow + com.sun.star.task.InteractionClassification + com.sun.star.task.XInteractionAbort + com.sun.star.task.XInteractionReply + com.sun.star.ucb.AuthenticationRequest + com.sun.star.ucb.CommandFailedException + com.sun.star.ucb.ContentCreationException + com.sun.star.ucb.ContentInfoAttribute + com.sun.star.ucb.InsertCommandArgument + com.sun.star.ucb.InteractiveAugmentedIOException + com.sun.star.ucb.InteractiveBadTransferURLException + com.sun.star.ucb.InteractiveNetworkConnectException + com.sun.star.ucb.InteractiveNetworkGeneralException + com.sun.star.ucb.InteractiveNetworkReadException + com.sun.star.ucb.InteractiveNetworkResolveNameException + com.sun.star.ucb.InteractiveNetworkWriteException + com.sun.star.ucb.Link + com.sun.star.ucb.Lock + com.sun.star.ucb.MissingInputStreamException + com.sun.star.ucb.MissingPropertiesException + com.sun.star.ucb.NameClash + com.sun.star.ucb.NameClashException + com.sun.star.ucb.OpenCommandArgument2 + com.sun.star.ucb.OpenMode + com.sun.star.ucb.PostCommandArgument2 + com.sun.star.ucb.RememberAuthentication + com.sun.star.ucb.ResultSetException + com.sun.star.ucb.TransferInfo + com.sun.star.ucb.XCommandEnvironment + com.sun.star.ucb.UnsupportedCommandException + com.sun.star.ucb.UnsupportedDataSinkException + com.sun.star.ucb.UnsupportedNameClashException + com.sun.star.ucb.UnsupportedOpenModeException + com.sun.star.ucb.XCommandInfo + com.sun.star.ucb.XCommandInfoChangeNotifier + com.sun.star.ucb.XCommandProcessor + com.sun.star.ucb.XContentAccess + com.sun.star.ucb.XContentCreator + com.sun.star.ucb.XContentProvider + com.sun.star.ucb.XDynamicResultSet + com.sun.star.ucb.XInteractionSupplyAuthentication + com.sun.star.ucb.XPersistentPropertySet + com.sun.star.uno.XAggregation + com.sun.star.util.DateTime + diff --git a/ucb/source/ucp/webdav/ucpdav1.component b/ucb/source/ucp/webdav/ucpdav1.component new file mode 100644 index 000000000000..50a3d87b28e0 --- /dev/null +++ b/ucb/source/ucp/webdav/ucpdav1.component @@ -0,0 +1,27 @@ + + + + + + + + + + diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx new file mode 100644 index 000000000000..7bfd880f9d0f --- /dev/null +++ b/ucb/source/ucp/webdav/webdavcontent.cxx @@ -0,0 +1,3245 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + + + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_ucb.hxx" + +/************************************************************************** + TODO + ************************************************************************** + + *************************************************************************/ + +#include +#include "osl/doublecheckedlocking.h" +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "com/sun/star/ucb/InteractiveLockingLockedException.hpp" +#include "com/sun/star/ucb/InteractiveLockingLockExpiredException.hpp" +#include "com/sun/star/ucb/InteractiveLockingNotLockedException.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "webdavcontent.hxx" +#include "webdavprovider.hxx" +#include "webdavresultset.hxx" +#include "ContentProperties.hxx" +#include "SerfUri.hxx" +#include "UCBDeadPropertyValue.hxx" + +using namespace com::sun::star; +using namespace http_dav_ucp; + +//========================================================================= +//========================================================================= +// +// Content Implementation. +// +//========================================================================= +//========================================================================= + +//========================================================================= +// ctr for content on an existing webdav resource +Content::Content( + const uno::Reference< lang::XMultiServiceFactory >& rxSMgr, + ContentProvider* pProvider, + const uno::Reference< ucb::XContentIdentifier >& Identifier, + rtl::Reference< DAVSessionFactory > const & rSessionFactory ) + throw ( ucb::ContentCreationException ) +: ContentImplHelper( rxSMgr, pProvider, Identifier ), + m_eResourceType( UNKNOWN ), + m_pProvider( pProvider ), + m_bTransient( false ), + m_bCollection( false ), + m_bDidGetOrHead( false ) +{ + try + { + m_xResAccess.reset( new DAVResourceAccess( + rxSMgr, + rSessionFactory, + Identifier->getContentIdentifier() ) ); + + SerfUri aURI( Identifier->getContentIdentifier() ); + m_aEscapedTitle = aURI.GetPathBaseName(); + } + catch ( DAVException const & ) + { + throw ucb::ContentCreationException(); + } +} + +//========================================================================= +// ctr for content on an non-existing webdav resource +Content::Content( + const uno::Reference< lang::XMultiServiceFactory >& rxSMgr, + ContentProvider* pProvider, + const uno::Reference< ucb::XContentIdentifier >& Identifier, + rtl::Reference< DAVSessionFactory > const & rSessionFactory, + sal_Bool isCollection ) + throw ( ucb::ContentCreationException ) +: ContentImplHelper( rxSMgr, pProvider, Identifier ), + m_eResourceType( UNKNOWN ), + m_pProvider( pProvider ), + m_bTransient( true ), + m_bCollection( isCollection ), + m_bDidGetOrHead( false ) +{ + try + { + m_xResAccess.reset( new DAVResourceAccess( + rxSMgr, rSessionFactory, Identifier->getContentIdentifier() ) ); + } + catch ( DAVException const & ) + { + throw ucb::ContentCreationException(); + } + + // Do not set m_aEscapedTitle here! Content::insert relays on this!!! +} + +//========================================================================= +// virtual +Content::~Content() +{ +} + +//========================================================================= +// +// XInterface methods. +// +//========================================================================= + +// virtual +void SAL_CALL Content::acquire() + throw( ) +{ + ContentImplHelper::acquire(); +} + +//========================================================================= +// virtual +void SAL_CALL Content::release() + throw( ) +{ + ContentImplHelper::release(); +} + +//========================================================================= +// virtual +uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) + throw ( uno::RuntimeException ) +{ + // Note: isFolder may require network activities! So call it only + // if it is really necessary!!! + uno::Any aRet = cppu::queryInterface( + rType, + static_cast< ucb::XContentCreator * >( this ) ); + if ( aRet.hasValue() ) + { + try + { + uno::Reference< beans::XPropertySet > const xProps( + m_xSMgr, uno::UNO_QUERY_THROW ); + uno::Reference< uno::XComponentContext > xCtx; + xCtx.set( xProps->getPropertyValue( + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ), + uno::UNO_QUERY_THROW ); + + uno::Reference< task::XInteractionHandler > xIH( + task::PasswordContainerInteractionHandler::create( xCtx ) ); + + // Supply a command env to isFolder() that contains an interaction + // handler that uses the password container service to obtain + // credentials without displaying a password gui. + + uno::Reference< ucb::XCommandEnvironment > xCmdEnv( + ucb::CommandEnvironment::create( + xCtx, + xIH, + uno::Reference< ucb::XProgressHandler >() ) ); + + return isFolder( xCmdEnv ) ? aRet : uno::Any(); + } + catch ( uno::RuntimeException const & ) + { + throw; + } + catch ( uno::Exception const & ) + { + return uno::Any(); + } + } + return aRet.hasValue() ? aRet : ContentImplHelper::queryInterface( rType ); +} + +//========================================================================= +// +// XTypeProvider methods. +// +//========================================================================= + +XTYPEPROVIDER_COMMON_IMPL( Content ); + +//========================================================================= +// virtual +uno::Sequence< uno::Type > SAL_CALL Content::getTypes() + throw( uno::RuntimeException ) +{ + sal_Bool bFolder = sal_False; + try + { + bFolder + = isFolder( uno::Reference< ucb::XCommandEnvironment >() ); + } + catch ( uno::RuntimeException const & ) + { + throw; + } + catch ( uno::Exception const & ) + { + } + + cppu::OTypeCollection * pCollection = 0; + + if ( bFolder ) + { + static cppu::OTypeCollection* pFolderTypes = 0; + + pCollection = pFolderTypes; + if ( !pCollection ) + { + osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() ); + + pCollection = pFolderTypes; + if ( !pCollection ) + { + static cppu::OTypeCollection aCollection( + CPPU_TYPE_REF( lang::XTypeProvider ), + CPPU_TYPE_REF( lang::XServiceInfo ), + CPPU_TYPE_REF( lang::XComponent ), + CPPU_TYPE_REF( ucb::XContent ), + CPPU_TYPE_REF( ucb::XCommandProcessor ), + CPPU_TYPE_REF( beans::XPropertiesChangeNotifier ), + CPPU_TYPE_REF( ucb::XCommandInfoChangeNotifier ), + CPPU_TYPE_REF( beans::XPropertyContainer ), + CPPU_TYPE_REF( beans::XPropertySetInfoChangeNotifier ), + CPPU_TYPE_REF( container::XChild ), + CPPU_TYPE_REF( ucb::XContentCreator ) ); // !! + pCollection = &aCollection; + OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER(); + pFolderTypes = pCollection; + } + } + else { + OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER(); + } + } + else + { + static cppu::OTypeCollection* pDocumentTypes = 0; + + pCollection = pDocumentTypes; + if ( !pCollection ) + { + osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() ); + + pCollection = pDocumentTypes; + if ( !pCollection ) + { + static cppu::OTypeCollection aCollection( + CPPU_TYPE_REF( lang::XTypeProvider ), + CPPU_TYPE_REF( lang::XServiceInfo ), + CPPU_TYPE_REF( lang::XComponent ), + CPPU_TYPE_REF( ucb::XContent ), + CPPU_TYPE_REF( ucb::XCommandProcessor ), + CPPU_TYPE_REF( beans::XPropertiesChangeNotifier ), + CPPU_TYPE_REF( ucb::XCommandInfoChangeNotifier ), + CPPU_TYPE_REF( beans::XPropertyContainer ), + CPPU_TYPE_REF( beans::XPropertySetInfoChangeNotifier ), + CPPU_TYPE_REF( container::XChild ) ); + pCollection = &aCollection; + OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER(); + pDocumentTypes = pCollection; + } + } + else { + OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER(); + } + } + + return (*pCollection).getTypes(); +} + +//========================================================================= +// +// XServiceInfo methods. +// +//========================================================================= + +// virtual +rtl::OUString SAL_CALL Content::getImplementationName() + throw( uno::RuntimeException ) +{ + return rtl::OUString::createFromAscii( + "com.sun.star.comp.ucb.WebDAVContent" ); +} + +//========================================================================= +// virtual +uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames() + throw( uno::RuntimeException ) +{ + uno::Sequence< rtl::OUString > aSNS( 1 ); + aSNS.getArray()[ 0 ] + = rtl::OUString::createFromAscii( WEBDAV_CONTENT_SERVICE_NAME ); + return aSNS; +} + +//========================================================================= +// +// XContent methods. +// +//========================================================================= + +// virtual +rtl::OUString SAL_CALL Content::getContentType() + throw( uno::RuntimeException ) +{ + sal_Bool bFolder = sal_False; + try + { + bFolder + = isFolder( uno::Reference< ucb::XCommandEnvironment >() ); + } + catch ( uno::RuntimeException const & ) + { + throw; + } + catch ( uno::Exception const & ) + { + } + + if ( bFolder ) + return rtl::OUString::createFromAscii( WEBDAV_COLLECTION_TYPE ); + + return rtl::OUString::createFromAscii( WEBDAV_CONTENT_TYPE ); +} + +//========================================================================= +// +// XCommandProcessor methods. +// +//========================================================================= + +// virtual +uno::Any SAL_CALL Content::execute( + const ucb::Command& aCommand, + sal_Int32 /*CommandId*/, + const uno::Reference< ucb::XCommandEnvironment >& Environment ) + throw( uno::Exception, + ucb::CommandAbortedException, + uno::RuntimeException ) +{ + OSL_TRACE( ">>>>> Content::execute: start: command: %s, env: %s", + rtl::OUStringToOString( aCommand.Name, + RTL_TEXTENCODING_UTF8 ).getStr(), + Environment.is() ? "present" : "missing" ); + + uno::Any aRet; + + if ( aCommand.Name.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "getPropertyValues" ) ) ) + { + ////////////////////////////////////////////////////////////////// + // getPropertyValues + ////////////////////////////////////////////////////////////////// + + uno::Sequence< beans::Property > Properties; + if ( !( aCommand.Argument >>= Properties ) ) + { + ucbhelper::cancelCommandExecution( + uno::makeAny( lang::IllegalArgumentException( + rtl::OUString::createFromAscii( + "Wrong argument type!" ), + static_cast< cppu::OWeakObject * >( this ), + -1 ) ), + Environment ); + // Unreachable + } + + aRet <<= getPropertyValues( Properties, Environment ); + } + else if ( aCommand.Name.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "setPropertyValues" ) ) ) + { + ////////////////////////////////////////////////////////////////// + // setPropertyValues + ////////////////////////////////////////////////////////////////// + + uno::Sequence< beans::PropertyValue > aProperties; + if ( !( aCommand.Argument >>= aProperties ) ) + { + ucbhelper::cancelCommandExecution( + uno::makeAny( lang::IllegalArgumentException( + rtl::OUString::createFromAscii( + "Wrong argument type!" ), + static_cast< cppu::OWeakObject * >( this ), + -1 ) ), + Environment ); + // Unreachable + } + + if ( !aProperties.getLength() ) + { + ucbhelper::cancelCommandExecution( + uno::makeAny( lang::IllegalArgumentException( + rtl::OUString::createFromAscii( + "No properties!" ), + static_cast< cppu::OWeakObject * >( this ), + -1 ) ), + Environment ); + // Unreachable + } + + aRet <<= setPropertyValues( aProperties, Environment ); + } + else if ( aCommand.Name.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "getPropertySetInfo" ) ) ) + { + ////////////////////////////////////////////////////////////////// + // getPropertySetInfo + ////////////////////////////////////////////////////////////////// + + // Note: Implemented by base class. + aRet <<= getPropertySetInfo( Environment, + sal_False /* don't cache data */ ); + } + else if ( aCommand.Name.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "getCommandInfo" ) ) ) + { + ////////////////////////////////////////////////////////////////// + // getCommandInfo + ////////////////////////////////////////////////////////////////// + + // Note: Implemented by base class. + aRet <<= getCommandInfo( Environment, sal_False ); + } + else if ( aCommand.Name.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "open" ) ) ) + { + ////////////////////////////////////////////////////////////////// + // open + ////////////////////////////////////////////////////////////////// + + ucb::OpenCommandArgument2 aOpenCommand; + if ( !( aCommand.Argument >>= aOpenCommand ) ) + { + ucbhelper::cancelCommandExecution( + uno::makeAny( lang::IllegalArgumentException( + rtl::OUString::createFromAscii( + "Wrong argument type!" ), + static_cast< cppu::OWeakObject * >( this ), + -1 ) ), + Environment ); + // Unreachable + } + + aRet = open( aOpenCommand, Environment ); + } + else if ( aCommand.Name.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "insert" ) ) ) + { + ////////////////////////////////////////////////////////////////// + // insert + ////////////////////////////////////////////////////////////////// + + ucb::InsertCommandArgument arg; + if ( !( aCommand.Argument >>= arg ) ) + { + ucbhelper::cancelCommandExecution( + uno::makeAny( lang::IllegalArgumentException( + rtl::OUString::createFromAscii( + "Wrong argument type!" ), + static_cast< cppu::OWeakObject * >( this ), + -1 ) ), + Environment ); + // Unreachable + } + + insert( arg.Data, arg.ReplaceExisting, Environment ); + } + else if ( aCommand.Name.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "delete" ) ) ) + { + ////////////////////////////////////////////////////////////////// + // delete + ////////////////////////////////////////////////////////////////// + + sal_Bool bDeletePhysical = sal_False; + aCommand.Argument >>= bDeletePhysical; + +// KSO: Ignore parameter and destroy the content, if you don't support +// putting objects into trashcan. ( Since we do not have a trash can +// service yet (src603), you actually have no other choice. ) +// if ( bDeletePhysical ) +// { + try + { + std::auto_ptr< DAVResourceAccess > xResAccess; + { + osl::Guard< osl::Mutex > aGuard( m_aMutex ); + xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) ); + } + xResAccess->DESTROY( Environment ); + { + osl::Guard< osl::Mutex > aGuard( m_aMutex ); + m_xResAccess.reset( new DAVResourceAccess( *xResAccess.get() ) ); + } + } + catch ( DAVException const & e ) + { + cancelCommandExecution( e, Environment, sal_True ); + // Unreachable + } +// } + + // Propagate destruction. + destroy( bDeletePhysical ); + + // Remove own and all children's Additional Core Properties. + removeAdditionalPropertySet( sal_True ); + } + else if ( aCommand.Name.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "transfer" ) ) + && isFolder( Environment ) ) + { + ////////////////////////////////////////////////////////////////// + // transfer + // ( Not available at documents ) + ////////////////////////////////////////////////////////////////// + + ucb::TransferInfo transferArgs; + if ( !( aCommand.Argument >>= transferArgs ) ) + { + ucbhelper::cancelCommandExecution( + uno::makeAny( lang::IllegalArgumentException( + rtl::OUString::createFromAscii( + "Wrong argument type!" ), + static_cast< cppu::OWeakObject * >( this ), + -1 ) ), + Environment ); + // Unreachable + } + + transfer( transferArgs, Environment ); + } + else if ( aCommand.Name.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "post" ) ) ) + { + ////////////////////////////////////////////////////////////////// + // post + ////////////////////////////////////////////////////////////////// + + ucb::PostCommandArgument2 aArg; + if ( !( aCommand.Argument >>= aArg ) ) + { + ucbhelper::cancelCommandExecution( + uno::makeAny( lang::IllegalArgumentException( + rtl::OUString::createFromAscii( + "Wrong argument type!" ), + static_cast< cppu::OWeakObject * >( this ), + -1 ) ), + Environment ); + // Unreachable + } + + post( aArg, Environment ); + } + else if ( aCommand.Name.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "lock" ) ) && + supportsExclusiveWriteLock( Environment ) ) + { + ////////////////////////////////////////////////////////////////// + // lock + ////////////////////////////////////////////////////////////////// + + lock( Environment ); + } + else if ( aCommand.Name.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "unlock" ) ) && + supportsExclusiveWriteLock( Environment ) ) + { + ////////////////////////////////////////////////////////////////// + // unlock + ////////////////////////////////////////////////////////////////// + + unlock( Environment ); + } + else if ( aCommand.Name.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "createNewContent" ) ) && + isFolder( Environment ) ) + { + ////////////////////////////////////////////////////////////////// + // createNewContent + ////////////////////////////////////////////////////////////////// + + ucb::ContentInfo aArg; + if ( !( aCommand.Argument >>= aArg ) ) + { + ucbhelper::cancelCommandExecution( + uno::makeAny( lang::IllegalArgumentException( + rtl::OUString::createFromAscii( + "Wrong argument type!" ), + static_cast< cppu::OWeakObject * >( this ), + -1 ) ), + Environment ); + // Unreachable + } + + aRet = uno::makeAny( createNewContent( aArg ) ); + } + else + { + ////////////////////////////////////////////////////////////////// + // Unsupported command + ////////////////////////////////////////////////////////////////// + + ucbhelper::cancelCommandExecution( + uno::makeAny( ucb::UnsupportedCommandException( + aCommand.Name, + static_cast< cppu::OWeakObject * >( this ) ) ), + Environment ); + // Unreachable + } + + OSL_TRACE( "<<<<< Content::execute: end: command: %s", + rtl::OUStringToOString( aCommand.Name, + RTL_TEXTENCODING_UTF8 ).getStr() ); + + return aRet; +} + +//========================================================================= +// virtual +void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) + throw( uno::RuntimeException ) +{ + try + { + std::auto_ptr< DAVResourceAccess > xResAccess; + { + osl::MutexGuard aGuard( m_aMutex ); + xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) ); + } + xResAccess->abort(); + { + osl::Guard< osl::Mutex > aGuard( m_aMutex ); + m_xResAccess.reset( new DAVResourceAccess( *xResAccess.get() ) ); + } + } + catch ( DAVException const & ) + { + // abort failed! + } +} + +//========================================================================= +// +// XPropertyContainer methods. +// +//========================================================================= + +// virtual +void SAL_CALL Content::addProperty( const rtl::OUString& Name, + sal_Int16 Attributes, + const uno::Any& DefaultValue ) + throw( beans::PropertyExistException, + beans::IllegalTypeException, + lang::IllegalArgumentException, + uno::RuntimeException ) +{ +// if ( m_bTransient ) +// @@@ ??? + + if ( !Name.getLength() ) + throw lang::IllegalArgumentException(); + + // Check property type. + if ( !UCBDeadPropertyValue::supportsType( DefaultValue.getValueType() ) ) + { + OSL_ENSURE( sal_False, + "Content::addProperty - Unsupported property type!" ); + throw beans::IllegalTypeException(); + } + + ////////////////////////////////////////////////////////////////////// + // Make sure a property with the requested name does not already + // exist in dynamic and static(!) properties. + ////////////////////////////////////////////////////////////////////// + + // @@@ Need real command environment here, but where to get it from? + // XPropertyContainer interface should be replaced by + // XCommandProcessor commands! + uno::Reference< ucb::XCommandEnvironment > xEnv; + + // Note: This requires network access! + if ( getPropertySetInfo( xEnv, sal_False /* don't cache data */ ) + ->hasPropertyByName( Name ) ) + { + // Property does already exist. + throw beans::PropertyExistException(); + } + + ////////////////////////////////////////////////////////////////////// + // Add a new dynamic property. + ////////////////////////////////////////////////////////////////////// + + ProppatchValue aValue( PROPSET, Name, DefaultValue ); + + std::vector< ProppatchValue > aProppatchValues; + aProppatchValues.push_back( aValue ); + + try + { + // Set property value at server. + std::auto_ptr< DAVResourceAccess > xResAccess; + { + osl::Guard< osl::Mutex > aGuard( m_aMutex ); + xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) ); + } + xResAccess->PROPPATCH( aProppatchValues, xEnv ); + { + osl::Guard< osl::Mutex > aGuard( m_aMutex ); + m_xResAccess.reset( new DAVResourceAccess( *xResAccess.get() ) ); + } + + // Notify propertyset info change listeners. + beans::PropertySetInfoChangeEvent evt( + static_cast< cppu::OWeakObject * >( this ), + Name, + -1, // No handle available + beans::PropertySetInfoChange::PROPERTY_INSERTED ); + notifyPropertySetInfoChange( evt ); + } + catch ( DAVException const & e ) + { + if ( e.getStatus() == SC_FORBIDDEN ) + { + // Support for setting arbitrary dead properties is optional! + + // Store property locally. + ContentImplHelper::addProperty( + Name, Attributes, DefaultValue ); + } + else + { + if ( shouldAccessNetworkAfterException( e ) ) + { + try + { + const ResourceType & rType = getResourceType( xEnv ); + switch ( rType ) + { + case UNKNOWN: + case DAV: + throw lang::IllegalArgumentException(); + + case NON_DAV: + // Store property locally. + ContentImplHelper::addProperty( Name, + Attributes, + DefaultValue ); + break; + + default: + OSL_ENSURE( sal_False, + "Content::addProperty - " + "Unsupported resource type!" ); + break; + } + } + catch ( uno::Exception const & ) + { + OSL_ENSURE( sal_False, + "Content::addProperty - " + "Unable to determine resource type!" ); + } + } + else + { + OSL_ENSURE( sal_False, + "Content::addProperty - " + "Unable to determine resource type!" ); + } + } + } +} + +//========================================================================= +// virtual +void SAL_CALL Content::removeProperty( const rtl::OUString& Name ) + throw( beans::UnknownPropertyException, + beans::NotRemoveableException, + uno::RuntimeException ) +{ + // @@@ Need real command environment here, but where to get it from? + // XPropertyContainer interface should be replaced by + // XCommandProcessor commands! + uno::Reference< ucb::XCommandEnvironment > xEnv; + +#if 0 + // @@@ REMOVEABLE z.Z. nicht richtig an der PropSetInfo gesetzt!!! + try + { + beans::Property aProp + = getPropertySetInfo( xEnv, sal_False /* don't cache data */ ) + ->getPropertyByName( Name ); + + if ( !( aProp.Attributes & beans::PropertyAttribute::REMOVEABLE ) ) + { + // Not removeable! + throw beans::NotRemoveableException(); + } + } + catch ( beans::UnknownPropertyException const & ) + { + //OSL_ENSURE( sal_False, "removeProperty - Unknown property!" ); + throw; + } +#endif + + ////////////////////////////////////////////////////////////////////// + // Try to remove property from server. + ////////////////////////////////////////////////////////////////////// + + try + { + std::vector< ProppatchValue > aProppatchValues; + ProppatchValue aValue( PROPREMOVE, Name, uno::Any() ); + aProppatchValues.push_back( aValue ); + + // Remove property value from server. + std::auto_ptr< DAVResourceAccess > xResAccess; + { + osl::Guard< osl::Mutex > aGuard( m_aMutex ); + xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) ); + } + xResAccess->PROPPATCH( aProppatchValues, xEnv ); + { + osl::Guard< osl::Mutex > aGuard( m_aMutex ); + m_xResAccess.reset( new DAVResourceAccess( *xResAccess.get() ) ); + } + + // Notify propertyset info change listeners. + beans::PropertySetInfoChangeEvent evt( + static_cast< cppu::OWeakObject * >( this ), + Name, + -1, // No handle available + beans::PropertySetInfoChange::PROPERTY_REMOVED ); + notifyPropertySetInfoChange( evt ); + } + catch ( DAVException const & e ) + { + if ( e.getStatus() == SC_FORBIDDEN ) + { + // Support for setting arbitrary dead properties is optional! + + // Try to remove property from local store. + ContentImplHelper::removeProperty( Name ); + } + else + { + if ( shouldAccessNetworkAfterException( e ) ) + { + try + { + const ResourceType & rType = getResourceType( xEnv ); + switch ( rType ) + { + case UNKNOWN: + case DAV: + throw beans::UnknownPropertyException(); + + case NON_DAV: + // Try to remove property from local store. + ContentImplHelper::removeProperty( Name ); + break; + + default: + OSL_ENSURE( sal_False, + "Content::removeProperty - " + "Unsupported resource type!" ); + break; + } + } + catch ( uno::Exception const & ) + { + OSL_ENSURE( sal_False, + "Content::removeProperty - " + "Unable to determine resource type!" ); + } + } + else + { + OSL_ENSURE( sal_False, + "Content::removeProperty - " + "Unable to determine resource type!" ); +// throw beans::UnknownPropertyException(); + } + } + } +} + +//========================================================================= +// +// XContentCreator methods. +// +//========================================================================= + +// virtual +uno::Sequence< ucb::ContentInfo > SAL_CALL +Content::queryCreatableContentsInfo() + throw( uno::RuntimeException ) +{ + osl::Guard< osl::Mutex > aGuard( m_aMutex ); + + uno::Sequence< ucb::ContentInfo > aSeq( 2 ); + + // document. + aSeq.getArray()[ 0 ].Type + = rtl::OUString::createFromAscii( WEBDAV_CONTENT_TYPE ); + aSeq.getArray()[ 0 ].Attributes + = ucb::ContentInfoAttribute::INSERT_WITH_INPUTSTREAM + | ucb::ContentInfoAttribute::KIND_DOCUMENT; + + beans::Property aProp; + m_pProvider->getProperty( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), aProp ); + + uno::Sequence< beans::Property > aDocProps( 1 ); + aDocProps.getArray()[ 0 ] = aProp; + aSeq.getArray()[ 0 ].Properties = aDocProps; + + // folder. + aSeq.getArray()[ 1 ].Type + = rtl::OUString::createFromAscii( WEBDAV_COLLECTION_TYPE ); + aSeq.getArray()[ 1 ].Attributes + = ucb::ContentInfoAttribute::KIND_FOLDER; + + uno::Sequence< beans::Property > aFolderProps( 1 ); + aFolderProps.getArray()[ 0 ] = aProp; + aSeq.getArray()[ 1 ].Properties = aFolderProps; + return aSeq; +} + +//========================================================================= +// virtual +uno::Reference< ucb::XContent > SAL_CALL +Content::createNewContent( const ucb::ContentInfo& Info ) + throw( uno::RuntimeException ) +{ + osl::Guard< osl::Mutex > aGuard( m_aMutex ); + + if ( !Info.Type.getLength() ) + return uno::Reference< ucb::XContent >(); + + if ( ( !Info.Type.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( WEBDAV_COLLECTION_TYPE ) ) ) + && + ( !Info.Type.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( WEBDAV_CONTENT_TYPE ) ) ) ) + return uno::Reference< ucb::XContent >(); + + rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + + OSL_ENSURE( aURL.getLength() > 0, + "WebdavContent::createNewContent - empty identifier!" ); + + if ( ( aURL.lastIndexOf( '/' ) + 1 ) != aURL.getLength() ) + aURL += rtl::OUString::createFromAscii( "/" ); + + sal_Bool isCollection; + if ( Info.Type.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( WEBDAV_COLLECTION_TYPE ) ) ) + { + aURL += rtl::OUString::createFromAscii( "New_Collection" ); + isCollection = sal_True; + } + else + { + aURL += rtl::OUString::createFromAscii( "New_Content" ); + isCollection = sal_False; + } + + uno::Reference< ucb::XContentIdentifier > xId( + new ::ucbhelper::ContentIdentifier( m_xSMgr, aURL ) ); + + // create the local content + try + { + return new ::http_dav_ucp::Content( m_xSMgr, + m_pProvider, + xId, + m_xResAccess->getSessionFactory(), + isCollection ); + } + catch ( ucb::ContentCreationException & ) + { + return uno::Reference< ucb::XContent >(); + } +} + +//========================================================================= +// virtual +rtl::OUString Content::getParentURL() +{ + // :// -> "" + // ://foo -> "" + // ://foo/ -> "" + // ://foo/bar -> ://foo/ + // ://foo/bar/ -> ://foo/ + // ://foo/bar/abc -> ://foo/bar/ + + rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + + sal_Int32 nPos = aURL.lastIndexOf( '/' ); + if ( nPos == ( aURL.getLength() - 1 ) ) + { + // Trailing slash found. Skip. + nPos = aURL.lastIndexOf( '/', nPos ); + } + + sal_Int32 nPos1 = aURL.lastIndexOf( '/', nPos ); + if ( nPos1 != -1 ) + nPos1 = aURL.lastIndexOf( '/', nPos1 ); + + if ( nPos1 == -1 ) + return rtl::OUString(); + + return rtl::OUString( aURL.copy( 0, nPos + 1 ) ); +} + +//========================================================================= +// +// Non-interface methods. +// +//========================================================================= + +// static +uno::Reference< sdbc::XRow > Content::getPropertyValues( + const uno::Reference< lang::XMultiServiceFactory >& rSMgr, + const uno::Sequence< beans::Property >& rProperties, + const ContentProperties& rData, + const rtl::Reference< ::ucbhelper::ContentProviderImplHelper >& rProvider, + const rtl::OUString& rContentId ) +{ + // Note: Empty sequence means "get values of all supported properties". + + rtl::Reference< ::ucbhelper::PropertyValueSet > xRow + = new ::ucbhelper::PropertyValueSet( rSMgr ); + + sal_Int32 nCount = rProperties.getLength(); + if ( nCount ) + { + uno::Reference< beans::XPropertySet > xAdditionalPropSet; + sal_Bool bTriedToGetAdditonalPropSet = sal_False; + + const beans::Property* pProps = rProperties.getConstArray(); + for ( sal_Int32 n = 0; n < nCount; ++n ) + { + const beans::Property& rProp = pProps[ n ]; + + // Process standard UCB, DAV and HTTP properties. + const uno::Any & rValue = rData.getValue( rProp.Name ); + if ( rValue.hasValue() ) + { + xRow->appendObject( rProp, rValue ); + } + else + { + // Process local Additional Properties. + if ( !bTriedToGetAdditonalPropSet && !xAdditionalPropSet.is() ) + { + xAdditionalPropSet + = uno::Reference< beans::XPropertySet >( + rProvider->getAdditionalPropertySet( rContentId, + sal_False ), + uno::UNO_QUERY ); + bTriedToGetAdditonalPropSet = sal_True; + } + + if ( !xAdditionalPropSet.is() || + !xRow->appendPropertySetValue( + xAdditionalPropSet, rProp ) ) + { + // Append empty entry. + xRow->appendVoid( rProp ); + } + } + } + } + else + { + // Append all standard UCB, DAV and HTTP properties. + + const std::auto_ptr< PropertyValueMap > & xProps = rData.getProperties(); + + PropertyValueMap::const_iterator it = xProps->begin(); + PropertyValueMap::const_iterator end = xProps->end(); + + ContentProvider * pProvider + = static_cast< ContentProvider * >( rProvider.get() ); + beans::Property aProp; + + while ( it != end ) + { + if ( pProvider->getProperty( (*it).first, aProp ) ) + xRow->appendObject( aProp, (*it).second.value() ); + + ++it; + } + + // Append all local Additional Properties. + uno::Reference< beans::XPropertySet > xSet( + rProvider->getAdditionalPropertySet( rContentId, sal_False ), + uno::UNO_QUERY ); + xRow->appendPropertySet( xSet ); + } + + return uno::Reference< sdbc::XRow >( xRow.get() ); +} + +//========================================================================= +uno::Reference< sdbc::XRow > Content::getPropertyValues( + const uno::Sequence< beans::Property >& rProperties, + const uno::Reference< ucb::XCommandEnvironment >& xEnv ) + throw ( uno::Exception ) +{ + std::auto_ptr< ContentProperties > xProps; + std::auto_ptr< ContentProperties > xCachedProps; + std::auto_ptr< DAVResourceAccess > xResAccess; + rtl::OUString aUnescapedTitle; + bool bHasAll = false; + uno::Reference< lang::XMultiServiceFactory > xSMgr; + uno::Reference< ucb::XContentIdentifier > xIdentifier; + rtl::Reference< ::ucbhelper::ContentProviderImplHelper > xProvider; + + { + osl::Guard< osl::Mutex > aGuard( m_aMutex ); + + aUnescapedTitle = SerfUri::unescape( m_aEscapedTitle ); + xSMgr.set( m_xSMgr ); + xIdentifier.set( m_xIdentifier ); + xProvider.set( m_xProvider.get() ); + xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) ); + + // First, ask cache... + if ( m_xCachedProps.get() ) + { + xCachedProps.reset( new ContentProperties( *m_xCachedProps.get() ) ); + + std::vector< rtl::OUString > aMissingProps; + if ( xCachedProps->containsAllNames( rProperties, aMissingProps ) ) + { + // All properties are already in cache! No server access needed. + bHasAll = true; + } + + // use the cached ContentProperties instance + xProps.reset( new ContentProperties( *xCachedProps.get() ) ); + } + } + + if ( !m_bTransient && !bHasAll ) + { + ///////////////////////////////////////////////////////////////////// + // Obtain values from server... + ///////////////////////////////////////////////////////////////////// + + // First, identify whether resource is DAV or not + const ResourceType & rType = getResourceType( xEnv, xResAccess ); + + bool bNetworkAccessAllowed = true; + + if ( DAV == rType ) + { + // cache lookup... getResourceType may fill the props cache via + // PROPFIND! + if ( m_xCachedProps.get() ) + { + xCachedProps.reset( + new ContentProperties( *m_xCachedProps.get() ) ); + + std::vector< rtl::OUString > aMissingProps; + if ( xCachedProps->containsAllNames( + rProperties, aMissingProps ) ) + { + // All properties are already in cache! No server access + // needed. + bHasAll = true; + } + + // use the cached ContentProperties instance + xProps.reset( new ContentProperties( *xCachedProps.get() ) ); + } + + if ( !bHasAll ) + { + // Only DAV resources support PROPFIND + std::vector< rtl::OUString > aPropNames; + + uno::Sequence< beans::Property > aProperties( + rProperties.getLength() ); + + if ( m_aFailedPropNames.size() > 0 ) + { + sal_Int32 nProps = 0; + sal_Int32 nCount = rProperties.getLength(); + for ( sal_Int32 n = 0; n < nCount; ++n ) + { + const rtl::OUString & rName = rProperties[ n ].Name; + + std::vector< rtl::OUString >::const_iterator it + = m_aFailedPropNames.begin(); + std::vector< rtl::OUString >::const_iterator end + = m_aFailedPropNames.end(); + + while ( it != end ) + { + if ( *it == rName ) + break; + + ++it; + } + + if ( it == end ) + { + aProperties[ nProps ] = rProperties[ n ]; + nProps++; + } + } + + aProperties.realloc( nProps ); + } + else + { + aProperties = rProperties; + } + + if ( aProperties.getLength() > 0 ) + ContentProperties::UCBNamesToDAVNames( + aProperties, aPropNames ); + + if ( aPropNames.size() > 0 ) + { + std::vector< DAVResource > resources; + try + { + xResAccess->PROPFIND( + DAVZERO, aPropNames, resources, xEnv ); + + if ( 1 == resources.size() ) + { + if ( xProps.get()) + xProps->addProperties( + aPropNames, + ContentProperties( resources[ 0 ] )); + else + xProps.reset( + new ContentProperties( resources[ 0 ] ) ); + } + } + catch ( DAVException const & e ) + { + bNetworkAccessAllowed + = shouldAccessNetworkAfterException( e ); + + if ( !bNetworkAccessAllowed ) + { + cancelCommandExecution( e, xEnv ); + // unreachable + } + } + } + } + } + + if ( bNetworkAccessAllowed ) + { + // All properties obtained already? + std::vector< rtl::OUString > aMissingProps; + if ( !( xProps.get() + && xProps->containsAllNames( + rProperties, aMissingProps ) ) + && !m_bDidGetOrHead ) + { + // Possibly the missing props can be obtained using a HEAD + // request. + + std::vector< rtl::OUString > aHeaderNames; + ContentProperties::UCBNamesToHTTPNames( + rProperties, + aHeaderNames, + true /* bIncludeUnmatched */ ); + + if ( aHeaderNames.size() > 0 ) + { + try + { + DAVResource resource; + xResAccess->HEAD( aHeaderNames, resource, xEnv ); + m_bDidGetOrHead = true; + + if ( xProps.get() ) + xProps->addProperties( + aMissingProps, + ContentProperties( resource ) ); + else + xProps.reset ( new ContentProperties( resource ) ); + + if ( m_eResourceType == NON_DAV ) + xProps->addProperties( aMissingProps, + ContentProperties( + aUnescapedTitle, + false ) ); + } + catch ( DAVException const & e ) + { + bNetworkAccessAllowed + = shouldAccessNetworkAfterException( e ); + + if ( !bNetworkAccessAllowed ) + { + cancelCommandExecution( e, xEnv ); + // unreachable + } + } + } + } + } + + // might trigger HTTP redirect. + // Therefore, title must be updated here. + SerfUri aUri( xResAccess->getURL() ); + aUnescapedTitle = aUri.GetPathBaseNameUnescaped(); + + if ( rType == UNKNOWN ) + { + xProps.reset( new ContentProperties( aUnescapedTitle ) ); + } + + // For DAV resources we only know the Title, for non-DAV + // resources we additionally know that it is a document. + + if ( rType == DAV ) + { + //xProps.reset( + // new ContentProperties( aUnescapedTitle ) ); + xProps->addProperty( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + uno::makeAny( aUnescapedTitle ), + true ); + } + else + { + if ( !xProps.get() ) + xProps.reset( new ContentProperties( aUnescapedTitle, false ) ); + else + xProps->addProperty( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + uno::makeAny( aUnescapedTitle ), + true ); + + xProps->addProperty( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ), + uno::makeAny( false ), + true ); + xProps->addProperty( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ), + uno::makeAny( true ), + true ); + } + } + else + { + // No server access for just created (not yet committed) objects. + // Only a minimal set of properties supported at this stage. + if (m_bTransient) + xProps.reset( new ContentProperties( aUnescapedTitle, + m_bCollection ) ); + } + + sal_Int32 nCount = rProperties.getLength(); + for ( sal_Int32 n = 0; n < nCount; ++n ) + { + const rtl::OUString rName = rProperties[ n ].Name; + if ( rName.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "BaseURI" ) ) ) + { + // Add BaseURI property, if requested. + xProps->addProperty( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BaseURI" ) ), + uno::makeAny( getBaseURI( xResAccess ) ), + true ); + } + else if ( rName.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "CreatableContentsInfo" ) ) ) + { + // Add CreatableContentsInfo property, if requested. + sal_Bool bFolder = sal_False; + xProps->getValue( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ) ) + >>= bFolder; + xProps->addProperty( + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( "CreatableContentsInfo" ) ), + uno::makeAny( bFolder + ? queryCreatableContentsInfo() + : uno::Sequence< ucb::ContentInfo >() ), + true ); + } + } + + uno::Reference< sdbc::XRow > xResultRow + = getPropertyValues( xSMgr, + rProperties, + *xProps, + xProvider, + xIdentifier->getContentIdentifier() ); + + { + osl::Guard< osl::Mutex > aGuard( m_aMutex ); + + if ( !m_xCachedProps.get() ) + m_xCachedProps.reset( new CachableContentProperties( *xProps.get() ) ); + else + m_xCachedProps->addProperties( *xProps.get() ); + + m_xResAccess.reset( new DAVResourceAccess( *xResAccess.get() ) ); + m_aEscapedTitle = SerfUri::escapeSegment( aUnescapedTitle ); + } + + return xResultRow; +} + +//========================================================================= +uno::Sequence< uno::Any > Content::setPropertyValues( + const uno::Sequence< beans::PropertyValue >& rValues, + const uno::Reference< ucb::XCommandEnvironment >& xEnv ) + throw ( uno::Exception ) +{ + uno::Reference< lang::XMultiServiceFactory > xSMgr; + uno::Reference< ucb::XContentIdentifier > xIdentifier; + rtl::Reference< ContentProvider > xProvider; + sal_Bool bTransient; + std::auto_ptr< DAVResourceAccess > xResAccess; + + { + osl::Guard< osl::Mutex > aGuard( m_aMutex ); + + xProvider.set( m_pProvider ); + xIdentifier.set( m_xIdentifier ); + bTransient = m_bTransient; + xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) ); + xSMgr.set( m_xSMgr ); + } + + uno::Sequence< uno::Any > aRet( rValues.getLength() ); + uno::Sequence< beans::PropertyChangeEvent > aChanges( rValues.getLength() ); + sal_Int32 nChanged = 0; + + beans::PropertyChangeEvent aEvent; + aEvent.Source = static_cast< cppu::OWeakObject * >( this ); + aEvent.Further = sal_False; + // aEvent.PropertyName = + aEvent.PropertyHandle = -1; + // aEvent.OldValue = + // aEvent.NewValue = + + std::vector< ProppatchValue > aProppatchValues; + std::vector< sal_Int32 > aProppatchPropsPositions; + + uno::Reference< ucb::XPersistentPropertySet > xAdditionalPropSet; + sal_Bool bTriedToGetAdditonalPropSet = sal_False; + + sal_Bool bExchange = sal_False; + rtl::OUString aNewTitle; + rtl::OUString aOldTitle; + sal_Int32 nTitlePos = -1; + + uno::Reference< beans::XPropertySetInfo > xInfo; + + const beans::PropertyValue* pValues = rValues.getConstArray(); + sal_Int32 nCount = rValues.getLength(); + for ( sal_Int32 n = 0; n < nCount; ++n ) + { + const beans::PropertyValue& rValue = pValues[ n ]; + const rtl::OUString & rName = rValue.Name; + + beans::Property aTmpProp; + xProvider->getProperty( rName, aTmpProp ); + + if ( aTmpProp.Attributes & beans::PropertyAttribute::READONLY ) + { + // Read-only property! + aRet[ n ] <<= lang::IllegalAccessException( + rtl::OUString::createFromAscii( + "Property is read-only!" ), + static_cast< cppu::OWeakObject * >( this ) ); + continue; + } + + ////////////////////////////////////////////////////////////////// + // Mandatory props. + ////////////////////////////////////////////////////////////////// + + if ( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ContentType" ) ) ) + { + // Read-only property! + aRet[ n ] <<= lang::IllegalAccessException( + rtl::OUString::createFromAscii( + "Property is read-only!" ), + static_cast< cppu::OWeakObject * >( this ) ); + } + else if ( rName.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "IsDocument" ) ) ) + { + // Read-only property! + aRet[ n ] <<= lang::IllegalAccessException( + rtl::OUString::createFromAscii( + "Property is read-only!" ), + static_cast< cppu::OWeakObject * >( this ) ); + } + else if ( rName.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "IsFolder" ) ) ) + { + // Read-only property! + aRet[ n ] <<= lang::IllegalAccessException( + rtl::OUString::createFromAscii( + "Property is read-only!" ), + static_cast< cppu::OWeakObject * >( this ) ); + } + else if ( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Title" ) ) ) + { + rtl::OUString aNewValue; + if ( rValue.Value >>= aNewValue ) + { + // No empty titles! + if ( aNewValue.getLength() > 0 ) + { + try + { + SerfUri aURI( xIdentifier->getContentIdentifier() ); + aOldTitle = aURI.GetPathBaseNameUnescaped(); + + if ( aNewValue != aOldTitle ) + { + // modified title -> modified URL -> exchange ! + if ( !bTransient ) + bExchange = sal_True; + + // new value will be set later... + aNewTitle = aNewValue; + + // remember position within sequence of values (for + // error handling). + nTitlePos = n; + } + } + catch ( DAVException const & ) + { + aRet[ n ] <<= lang::IllegalArgumentException( + rtl::OUString::createFromAscii( + "Invalid content identifier!" ), + static_cast< cppu::OWeakObject * >( this ), + -1 ); + } + } + else + { + aRet[ n ] <<= lang::IllegalArgumentException( + rtl::OUString::createFromAscii( + "Empty title not allowed!" ), + static_cast< cppu::OWeakObject * >( this ), + -1 ); + } + } + else + { + aRet[ n ] <<= beans::IllegalTypeException( + rtl::OUString::createFromAscii( + "Property value has wrong type!" ), + static_cast< cppu::OWeakObject * >( this ) ); + } + } + else + { + ////////////////////////////////////////////////////////////// + // Optional props. + ////////////////////////////////////////////////////////////// + + if ( !xInfo.is() ) + xInfo = getPropertySetInfo( xEnv, + sal_False /* don't cache data */ ); + + if ( !xInfo->hasPropertyByName( rName ) ) + { + // Check, whether property exists. Skip otherwise. + // PROPPATCH::set would add the property automatically, which + // is not allowed for "setPropertyValues" command! + aRet[ n ] <<= beans::UnknownPropertyException( + rtl::OUString::createFromAscii( + "Property is unknown!" ), + static_cast< cppu::OWeakObject * >( this ) ); + continue; + } + + if ( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Size" ) ) ) + { + // Read-only property! + aRet[ n ] <<= lang::IllegalAccessException( + rtl::OUString::createFromAscii( + "Property is read-only!" ), + static_cast< cppu::OWeakObject * >( this ) ); + } + else if ( rName.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "DateCreated" ) ) ) + { + // Read-only property! + aRet[ n ] <<= lang::IllegalAccessException( + rtl::OUString::createFromAscii( + "Property is read-only!" ), + static_cast< cppu::OWeakObject * >( this ) ); + } + else if ( rName.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "DateModified" ) ) ) + { + // Read-only property! + aRet[ n ] <<= lang::IllegalAccessException( + rtl::OUString::createFromAscii( + "Property is read-only!" ), + static_cast< cppu::OWeakObject * >( this ) ); + } + else if ( rName.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) ) + { + // Read-only property! + // (but could be writable, if 'getcontenttype' would be) + aRet[ n ] <<= lang::IllegalAccessException( + rtl::OUString::createFromAscii( + "Property is read-only!" ), + static_cast< cppu::OWeakObject * >( this ) ); + } + if ( rName.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "CreatableContentsInfo" ) ) ) + { + // Read-only property! + aRet[ n ] <<= lang::IllegalAccessException( + rtl::OUString::createFromAscii( + "Property is read-only!" ), + static_cast< cppu::OWeakObject * >( this ) ); + } + else + { + if ( getResourceType( xEnv, xResAccess ) == DAV ) + { + // Property value will be set on server. + ProppatchValue aValue( PROPSET, rName, rValue.Value ); + aProppatchValues.push_back( aValue ); + + // remember position within sequence of values (for + // error handling). + aProppatchPropsPositions.push_back( n ); + } + else + { + // Property value will be stored in local property store. + if ( !bTriedToGetAdditonalPropSet && + !xAdditionalPropSet.is() ) + { + xAdditionalPropSet + = getAdditionalPropertySet( sal_False ); + bTriedToGetAdditonalPropSet = sal_True; + } + + if ( xAdditionalPropSet.is() ) + { + try + { + uno::Any aOldValue + = xAdditionalPropSet->getPropertyValue( rName ); + if ( aOldValue != rValue.Value ) + { + xAdditionalPropSet->setPropertyValue( + rName, rValue.Value ); + + aEvent.PropertyName = rName; + aEvent.OldValue = aOldValue; + aEvent.NewValue = rValue.Value; + + aChanges.getArray()[ nChanged ] = aEvent; + nChanged++; + } + } + catch ( beans::UnknownPropertyException const & e ) + { + aRet[ n ] <<= e; + } + catch ( lang::WrappedTargetException const & e ) + { + aRet[ n ] <<= e; + } + catch ( beans::PropertyVetoException const & e ) + { + aRet[ n ] <<= e; + } + catch ( lang::IllegalArgumentException const & e ) + { + aRet[ n ] <<= e; + } + } + else + { + aRet[ n ] <<= uno::Exception( + rtl::OUString::createFromAscii( + "No property set for storing the value!" ), + static_cast< cppu::OWeakObject * >( this ) ); + } + } + } + } + } // for + + if ( !bTransient && aProppatchValues.size() ) + { + try + { + // Set property values at server. + xResAccess->PROPPATCH( aProppatchValues, xEnv ); + + std::vector< ProppatchValue >::const_iterator it + = aProppatchValues.begin(); + std::vector< ProppatchValue >::const_iterator end + = aProppatchValues.end(); + + while ( it != end ) + { + aEvent.PropertyName = (*it).name; + aEvent.OldValue = uno::Any(); // @@@ to expensive to obtain! + aEvent.NewValue = (*it).value; + + aChanges.getArray()[ nChanged ] = aEvent; + nChanged++; + + ++it; + } + } + catch ( DAVException const & e ) + { +// OSL_ENSURE( sal_False, +// "Content::setPropertyValues - PROPPATCH failed!" ); + +#if 1 + cancelCommandExecution( e, xEnv ); + // unreachable +#else + // Note: PROPPATCH either sets ALL property values OR NOTHING. + + std::vector< sal_Int32 >::const_iterator it + = aProppatchPropsPositions.begin(); + std::vector< sal_Int32 >::const_iterator end + = aProppatchPropsPositions.end(); + + while ( it != end ) + { + // Set error. + aRet[ (*it) ] <<= MapDAVException( e, sal_True ); + ++it; + } +#endif + } + } + + if ( bExchange ) + { + // Assemble new content identifier... + + rtl::OUString aNewURL = getParentURL(); + if ( aNewURL.lastIndexOf( '/' ) != ( aNewURL.getLength() - 1 ) ) + aNewURL += rtl::OUString::createFromAscii( "/" ); + + aNewURL += SerfUri::escapeSegment( aNewTitle ); + + uno::Reference< ucb::XContentIdentifier > xNewId + = new ::ucbhelper::ContentIdentifier( xSMgr, aNewURL ); + uno::Reference< ucb::XContentIdentifier > xOldId = xIdentifier; + + try + { + SerfUri sourceURI( xOldId->getContentIdentifier() ); + SerfUri targetURI( xNewId->getContentIdentifier() ); + targetURI.SetScheme( sourceURI.GetScheme() ); + + xResAccess->MOVE( + sourceURI.GetPath(), targetURI.GetURI(), sal_False, xEnv ); + // @@@ Should check for resources that could not be moved + // (due to source access or target overwrite) and send + // this information through the interaction handler. + + // @@@ Existing content should be checked to see if it needs + // to be deleted at the source + + // @@@ Existing content should be checked to see if it has + // been overwritten at the target + + if ( exchangeIdentity( xNewId ) ) + { + xResAccess->setURL( aNewURL ); + +// DAV resources store all additional props on server! +// // Adapt Additional Core Properties. +// renameAdditionalPropertySet( xOldId->getContentIdentifier(), +// xNewId->getContentIdentifier(), +// sal_True ); + } + else + { + // Do not set new title! + aNewTitle = rtl::OUString(); + + // Set error . + aRet[ nTitlePos ] <<= uno::Exception( + rtl::OUString::createFromAscii( "Exchange failed!" ), + static_cast< cppu::OWeakObject * >( this ) ); + } + } + catch ( DAVException const & e ) + { + // Do not set new title! + aNewTitle = rtl::OUString(); + + // Set error . + aRet[ nTitlePos ] <<= MapDAVException( e, sal_True ); + } + } + + if ( aNewTitle.getLength() ) + { + osl::Guard< osl::Mutex > aGuard( m_aMutex ); + + aEvent.PropertyName = rtl::OUString::createFromAscii( "Title" ); + aEvent.OldValue = uno::makeAny( aOldTitle ); + aEvent.NewValue = uno::makeAny( aNewTitle ); + + m_aEscapedTitle = SerfUri::escapeSegment( aNewTitle ); + + aChanges.getArray()[ nChanged ] = aEvent; + nChanged++; + } + + if ( nChanged > 0 ) + { + aChanges.realloc( nChanged ); + notifyPropertiesChange( aChanges ); + } + + { + osl::Guard< osl::Mutex > aGuard( m_aMutex ); + m_xResAccess.reset( new DAVResourceAccess( *xResAccess.get() ) ); + } + + return aRet; +} + +//========================================================================= +uno::Any Content::open( + const ucb::OpenCommandArgument2 & rArg, + const uno::Reference< ucb::XCommandEnvironment > & xEnv ) + throw( uno::Exception ) +{ + uno::Any aRet; + + sal_Bool bOpenFolder = ( ( rArg.Mode == ucb::OpenMode::ALL ) || + ( rArg.Mode == ucb::OpenMode::FOLDERS ) || + ( rArg.Mode == ucb::OpenMode::DOCUMENTS ) ); + if ( bOpenFolder ) + { + if ( isFolder( xEnv ) ) + { + // Open collection. + + uno::Reference< ucb::XDynamicResultSet > xSet + = new DynamicResultSet( m_xSMgr, this, rArg, xEnv ); + aRet <<= xSet; + } + else + { + // Error: Not a folder! + + rtl::OUStringBuffer aMsg; + aMsg.appendAscii( "Non-folder resource cannot be " + "opened as folder! Wrong Open Mode!" ); + + ucbhelper::cancelCommandExecution( + uno::makeAny( + lang::IllegalArgumentException( + aMsg.makeStringAndClear(), + static_cast< cppu::OWeakObject * >( this ), + -1 ) ), + xEnv ); + // Unreachable + } + } + + if ( rArg.Sink.is() ) + { + // Open document. + + if ( ( rArg.Mode == ucb::OpenMode::DOCUMENT_SHARE_DENY_NONE ) || + ( rArg.Mode == ucb::OpenMode::DOCUMENT_SHARE_DENY_WRITE ) ) + { + // Currently(?) unsupported. + ucbhelper::cancelCommandExecution( + uno::makeAny( + ucb::UnsupportedOpenModeException( + rtl::OUString(), + static_cast< cppu::OWeakObject * >( this ), + sal_Int16( rArg.Mode ) ) ), + xEnv ); + // Unreachable + } + + rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + uno::Reference< io::XOutputStream > xOut + = uno::Reference< io::XOutputStream >( rArg.Sink, uno::UNO_QUERY ); + if ( xOut.is() ) + { + // PUSH: write data + try + { + std::auto_ptr< DAVResourceAccess > xResAccess; + + { + osl::MutexGuard aGuard( m_aMutex ); + + xResAccess.reset( + new DAVResourceAccess( *m_xResAccess.get() ) ); + } + + DAVResource aResource; + std::vector< rtl::OUString > aHeaders; + + xResAccess->GET( xOut, aHeaders, aResource, xEnv ); + m_bDidGetOrHead = true; + + { + osl::MutexGuard aGuard( m_aMutex ); + + // cache headers. + if ( !m_xCachedProps.get()) + m_xCachedProps.reset( + new CachableContentProperties( aResource ) ); + else + m_xCachedProps->addProperties( aResource ); + + m_xResAccess.reset( + new DAVResourceAccess( *xResAccess.get() ) ); + } + } + catch ( DAVException const & e ) + { + cancelCommandExecution( e, xEnv ); + // Unreachable + } + } + else + { + uno::Reference< io::XActiveDataSink > xDataSink + = uno::Reference< io::XActiveDataSink >( rArg.Sink, + uno::UNO_QUERY ); + if ( xDataSink.is() ) + { + // PULL: wait for client read + try + { + std::auto_ptr< DAVResourceAccess > xResAccess; + { + osl::MutexGuard aGuard( m_aMutex ); + + xResAccess.reset( + new DAVResourceAccess( *m_xResAccess.get() ) ); + } + + // fill inputsream sync; return if all data present + DAVResource aResource; + std::vector< rtl::OUString > aHeaders; + + uno::Reference< io::XInputStream > xIn + = xResAccess->GET( aHeaders, aResource, xEnv ); + m_bDidGetOrHead = true; + + { + osl::MutexGuard aGuard( m_aMutex ); + + // cache headers. + if ( !m_xCachedProps.get()) + m_xCachedProps.reset( + new CachableContentProperties( aResource ) ); + else + m_xCachedProps->addProperties( + aResource.properties ); + + m_xResAccess.reset( + new DAVResourceAccess( *xResAccess.get() ) ); + } + + xDataSink->setInputStream( xIn ); + } + catch ( DAVException const & e ) + { + cancelCommandExecution( e, xEnv ); + // Unreachable + } + } + else + { + // Note: aOpenCommand.Sink may contain an XStream + // implementation. Support for this type of + // sink is optional... + ucbhelper::cancelCommandExecution( + uno::makeAny( + ucb::UnsupportedDataSinkException( + rtl::OUString(), + static_cast< cppu::OWeakObject * >( this ), + rArg.Sink ) ), + xEnv ); + // Unreachable + } + } + } + + return aRet; +} + +//========================================================================= +void Content::post( + const ucb::PostCommandArgument2 & rArg, + const uno::Reference< ucb::XCommandEnvironment > & xEnv ) + throw( uno::Exception ) +{ + uno::Reference< io::XActiveDataSink > xSink( rArg.Sink, uno::UNO_QUERY ); + if ( xSink.is() ) + { + try + { + std::auto_ptr< DAVResourceAccess > xResAccess; + { + osl::MutexGuard aGuard( m_aMutex ); + xResAccess.reset( + new DAVResourceAccess( *m_xResAccess.get() ) ); + } + + uno::Reference< io::XInputStream > xResult + = xResAccess->POST( rArg.MediaType, + rArg.Referer, + rArg.Source, + xEnv ); + + { + osl::MutexGuard aGuard( m_aMutex ); + m_xResAccess.reset( + new DAVResourceAccess( *xResAccess.get() ) ); + } + + xSink->setInputStream( xResult ); + } + catch ( DAVException const & e ) + { + cancelCommandExecution( e, xEnv, sal_True ); + // Unreachable + } + } + else + { + uno::Reference< io::XOutputStream > xResult( rArg.Sink, uno::UNO_QUERY ); + if ( xResult.is() ) + { + try + { + std::auto_ptr< DAVResourceAccess > xResAccess; + { + osl::MutexGuard aGuard( m_aMutex ); + xResAccess.reset( + new DAVResourceAccess( *m_xResAccess.get() ) ); + } + + xResAccess->POST( rArg.MediaType, + rArg.Referer, + rArg.Source, + xResult, + xEnv ); + + { + osl::MutexGuard aGuard( m_aMutex ); + m_xResAccess.reset( + new DAVResourceAccess( *xResAccess.get() ) ); + } + } + catch ( DAVException const & e ) + { + cancelCommandExecution( e, xEnv, sal_True ); + // Unreachable + } + } + else + { + ucbhelper::cancelCommandExecution( + uno::makeAny( + ucb::UnsupportedDataSinkException( + rtl::OUString(), + static_cast< cppu::OWeakObject * >( this ), + rArg.Sink ) ), + xEnv ); + // Unreachable + } + } +} + +//========================================================================= +void Content::queryChildren( ContentRefList& rChildren ) +{ + // Obtain a list with a snapshot of all currently instanciated contents + // from provider and extract the contents which are direct children + // of this content. + + ::ucbhelper::ContentRefList aAllContents; + m_xProvider->queryExistingContents( aAllContents ); + + rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + sal_Int32 nURLPos = aURL.lastIndexOf( '/' ); + + if ( nURLPos != ( aURL.getLength() - 1 ) ) + { + // No trailing slash found. Append. + aURL += rtl::OUString::createFromAscii( "/" ); + } + + sal_Int32 nLen = aURL.getLength(); + + ::ucbhelper::ContentRefList::const_iterator it = aAllContents.begin(); + ::ucbhelper::ContentRefList::const_iterator end = aAllContents.end(); + + while ( it != end ) + { + ::ucbhelper::ContentImplHelperRef xChild = (*it); + rtl::OUString aChildURL + = xChild->getIdentifier()->getContentIdentifier(); + + // Is aURL a prefix of aChildURL? + if ( ( aChildURL.getLength() > nLen ) && + ( aChildURL.compareTo( aURL, nLen ) == 0 ) ) + { + sal_Int32 nPos = nLen; + nPos = aChildURL.indexOf( '/', nPos ); + + if ( ( nPos == -1 ) || + ( nPos == ( aChildURL.getLength() - 1 ) ) ) + { + // No further slashes / only a final slash. It's a child! + rChildren.push_back( + ::http_dav_ucp::Content::ContentRef( + static_cast< ::http_dav_ucp::Content * >( + xChild.get() ) ) ); + } + } + ++it; + } +} + +//========================================================================= +void Content::insert( + const uno::Reference< io::XInputStream > & xInputStream, + sal_Bool bReplaceExisting, + const uno::Reference< ucb::XCommandEnvironment >& Environment ) + throw( uno::Exception ) +{ + sal_Bool bTransient, bCollection; + rtl::OUString aEscapedTitle; + std::auto_ptr< DAVResourceAccess > xResAccess; + + { + osl::Guard< osl::Mutex > aGuard( m_aMutex ); + + bTransient = m_bTransient; + bCollection = m_bCollection; + aEscapedTitle = m_aEscapedTitle; + xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) ); + } + + // Check, if all required properties are present. + + if ( aEscapedTitle.getLength() == 0 ) + { + OSL_ENSURE( sal_False, "Content::insert - Title missing!" ); + + uno::Sequence< rtl::OUString > aProps( 1 ); + aProps[ 0 ] = rtl::OUString::createFromAscii( "Title" ); + ucbhelper::cancelCommandExecution( + uno::makeAny( ucb::MissingPropertiesException( + rtl::OUString(), + static_cast< cppu::OWeakObject * >( this ), + aProps ) ), + Environment ); + // Unreachable + } + + if ( !bReplaceExisting ) + { + /* [RFC 2616] - HTTP + + The PUT method requests that the enclosed entity be stored under the + supplied Request-URI. If the Request-URI refers to an already + existing resource, the enclosed entity SHOULD be considered as a + modified version of the one residing on the origin server. + */ + + /* [RFC 2518] - WebDAV + + MKCOL creates a new collection resource at the location specified by + the Request-URI. If the resource identified by the Request-URI is + non-null then the MKCOL MUST fail. + */ + + // ==> Complain on PUT, continue on MKCOL. + if ( !bTransient || ( bTransient && !bCollection ) ) + { +#undef ERROR + ucb::UnsupportedNameClashException aEx( + rtl::OUString::createFromAscii( "Unable to write without overwrite!" ), + static_cast< cppu::OWeakObject * >( this ), + ucb::NameClash::ERROR ); + + uno::Reference< task::XInteractionHandler > xIH; + + if ( Environment.is() ) + xIH = Environment->getInteractionHandler(); + + if ( xIH.is() ) + { + uno::Any aExAsAny( uno::makeAny( aEx ) ); + + rtl::Reference< ucbhelper::SimpleInteractionRequest > xRequest + = new ucbhelper::SimpleInteractionRequest( + aExAsAny, + ucbhelper::CONTINUATION_APPROVE + | ucbhelper::CONTINUATION_DISAPPROVE ); + xIH->handle( xRequest.get() ); + + const sal_Int32 nResp = xRequest->getResponse(); + + switch ( nResp ) + { + case ucbhelper::CONTINUATION_UNKNOWN: + // Not handled; throw. + throw aEx; +// break; + + case ucbhelper::CONTINUATION_APPROVE: + // Continue -> Overwrite. + bReplaceExisting = sal_True; + break; + + case ucbhelper::CONTINUATION_DISAPPROVE: + // Abort. + throw ucb::CommandFailedException( + rtl::OUString(), + uno::Reference< uno::XInterface >(), + aExAsAny ); +// break; + + default: + OSL_ENSURE( sal_False, + "Content::insert - " + "Unknown interaction selection!" ); + throw ucb::CommandFailedException( + rtl::OUString::createFromAscii( + "Unknown interaction selection!" ), + uno::Reference< uno::XInterface >(), + aExAsAny ); +// break; + } + } + else + { + // No IH; throw. + throw aEx; + } + } + } + + if ( bTransient ) + { + // Assemble new content identifier... + rtl::OUString aURL = getParentURL(); + if ( aURL.lastIndexOf( '/' ) != ( aURL.getLength() - 1 ) ) + aURL += rtl::OUString::createFromAscii( "/" ); + + aURL += aEscapedTitle; + + try + { + xResAccess->setURL( aURL ); + + if ( bCollection ) + xResAccess->MKCOL( Environment ); + else + xResAccess->PUT( xInputStream, Environment ); + } + catch ( DAVException const & except ) + { + if ( bCollection ) + { + if ( except.getStatus() == SC_METHOD_NOT_ALLOWED ) + { + // [RFC 2518] - WebDAV + // 405 (Method Not Allowed) - MKCOL can only be + // executed on a deleted/non-existent resource. + + if ( bReplaceExisting ) + { + // Destroy old resource. + try + { + xResAccess->DESTROY( Environment ); + } + catch ( DAVException const & e ) + { + cancelCommandExecution( e, Environment, sal_True ); + // Unreachable + } + + // Insert (recursion!). + insert( xInputStream, bReplaceExisting, Environment ); + + { + osl::Guard< osl::Mutex > aGuard( m_aMutex ); + m_xResAccess.reset( + new DAVResourceAccess( *xResAccess.get() ) ); + } + + // Success! + return; + } + else + { + rtl::OUString aTitle; + try + { + SerfUri aURI( aURL ); + aTitle = aURI.GetPathBaseNameUnescaped(); + } + catch ( DAVException const & ) + { + } + + ucbhelper::cancelCommandExecution( + uno::makeAny( + ucb::NameClashException( + rtl::OUString(), + static_cast< cppu::OWeakObject * >( this ), + task::InteractionClassification_ERROR, + aTitle ) ), + Environment ); + // Unreachable + } + } + } + + cancelCommandExecution( except, Environment, sal_True ); + // Unreachable + } + + { + osl::Guard< osl::Mutex > aGuard( m_aMutex ); + m_xIdentifier + = new ::ucbhelper::ContentIdentifier( m_xSMgr, aURL ); + } + + inserted(); + + { + osl::Guard< osl::Mutex > aGuard( m_aMutex ); + m_bTransient = sal_False; + } + } + else + { + if ( !xInputStream.is() ) + { + ucbhelper::cancelCommandExecution( + uno::makeAny( + ucb::MissingInputStreamException( + rtl::OUString(), + static_cast< cppu::OWeakObject * >( this ) ) ), + Environment ); + // Unreachable + } + + try + { + xResAccess->PUT( xInputStream, Environment ); + } + catch ( DAVException const & e ) + { + cancelCommandExecution( e, Environment, sal_True ); + // Unreachable + } + } + + { + osl::Guard< osl::Mutex > aGuard( m_aMutex ); + m_xResAccess.reset( new DAVResourceAccess( *xResAccess.get() ) ); + } +} + +//========================================================================= +void Content::transfer( + const ucb::TransferInfo & rArgs, + const uno::Reference< ucb::XCommandEnvironment >& Environment ) + throw( uno::Exception ) +{ + uno::Reference< lang::XMultiServiceFactory > xSMgr; + uno::Reference< ucb::XContentIdentifier > xIdentifier; + uno::Reference< ucb::XContentProvider > xProvider; + std::auto_ptr< DAVResourceAccess > xResAccess; + + { + osl::Guard< osl::Mutex > aGuard( m_aMutex ); + + xSMgr.set( m_xSMgr ); + xIdentifier.set( m_xIdentifier ); + xProvider.set( m_xProvider.get() ); + xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) ); + } + + rtl::OUString aTargetURI; + try + { + SerfUri sourceURI( rArgs.SourceURL ); + SerfUri targetURI( xIdentifier->getContentIdentifier() ); + aTargetURI = targetURI.GetPathBaseNameUnescaped(); + + // Check source's and target's URL scheme + // + const rtl::OUString aScheme = sourceURI.GetScheme().toAsciiLowerCase(); + if ( aScheme.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( WEBDAV_URL_SCHEME ) ) ) + { + sourceURI.SetScheme( + rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) ); + } + else if ( aScheme.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) ) + { + sourceURI.SetScheme( + rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) ); + } + else if ( aScheme.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( DAVS_URL_SCHEME ) ) ) + { + sourceURI.SetScheme( + rtl::OUString::createFromAscii( HTTPS_URL_SCHEME ) ); + } + else + { + if ( !aScheme.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( HTTP_URL_SCHEME ) ) && + !aScheme.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( HTTPS_URL_SCHEME ) ) ) + { + ucbhelper::cancelCommandExecution( + uno::makeAny( + ucb::InteractiveBadTransferURLException( + rtl::OUString::createFromAscii( + "Unsupported URL scheme!" ), + static_cast< cppu::OWeakObject * >( this ) ) ), + Environment ); + // Unreachable + } + } + + if ( targetURI.GetScheme().toAsciiLowerCase().equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( WEBDAV_URL_SCHEME ) ) ) + targetURI.SetScheme( + rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) ); + else if ( targetURI.GetScheme().toAsciiLowerCase().equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) ) + targetURI.SetScheme( + rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) ); + + // @@@ This implementation of 'transfer' only works + // if the source and target are located at same host. + // (Neon does not support cross-server copy/move) + + // Check for same host + // + if ( sourceURI.GetHost().getLength() && + ( sourceURI.GetHost() != targetURI.GetHost() ) ) + { + ucbhelper::cancelCommandExecution( + uno::makeAny( ucb::InteractiveBadTransferURLException( + rtl::OUString::createFromAscii( + "Different hosts!" ), + static_cast< cppu::OWeakObject * >( this ) ) ), + Environment ); + // Unreachable + } + + rtl::OUString aTitle = rArgs.NewTitle; + + if ( !aTitle.getLength() ) + aTitle = sourceURI.GetPathBaseNameUnescaped(); + + if ( aTitle.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "/" ) ) ) + { + // kso: ??? + aTitle = rtl::OUString(); + } + + targetURI.AppendPath( aTitle ); + + rtl::OUString aTargetURL = xIdentifier->getContentIdentifier(); + if ( ( aTargetURL.lastIndexOf( '/' ) + 1 ) + != aTargetURL.getLength() ) + aTargetURL += rtl::OUString::createFromAscii( "/" ); + + aTargetURL += aTitle; + + uno::Reference< ucb::XContentIdentifier > xTargetId + = new ::ucbhelper::ContentIdentifier( xSMgr, aTargetURL ); + + DAVResourceAccess aSourceAccess( xSMgr, + xResAccess->getSessionFactory(), + sourceURI.GetURI() ); + + if ( rArgs.MoveData == sal_True ) + { + uno::Reference< ucb::XContentIdentifier > xId + = new ::ucbhelper::ContentIdentifier( xSMgr, rArgs.SourceURL ); + + // Note: The static cast is okay here, because its sure that + // xProvider is always the WebDAVContentProvider. + rtl::Reference< Content > xSource + = static_cast< Content * >( + xProvider->queryContent( xId ).get() ); + + // [RFC 2518] - WebDAV + // If a resource exists at the destination and the Overwrite + // header is "T" then prior to performing the move the server + // MUST perform a DELETE with "Depth: infinity" on the + // destination resource. If the Overwrite header is set to + // "F" then the operation will fail. + + aSourceAccess.MOVE( sourceURI.GetPath(), + targetURI.GetURI(), + rArgs.NameClash + == ucb::NameClash::OVERWRITE, + Environment ); + + if ( xSource.is() ) + { + // Propagate destruction to listeners. + xSource->destroy( sal_True ); + } + +// DAV resources store all additional props on server! +// // Rename own and all children's Additional Core Properties. +// renameAdditionalPropertySet( xId->getContentIdentifier(), +// xTargetId->getContentIdentifier(), +// sal_True ); + } + else + { + // [RFC 2518] - WebDAV + // If a resource exists at the destination and the Overwrite + // header is "T" then prior to performing the copy the server + // MUST perform a DELETE with "Depth: infinity" on the + // destination resource. If the Overwrite header is set to + // "F" then the operation will fail. + + aSourceAccess.COPY( sourceURI.GetPath(), + targetURI.GetURI(), + rArgs.NameClash + == ucb::NameClash::OVERWRITE, + Environment ); + +// DAV resources store all additional props on server! +// // Copy own and all children's Additional Core Properties. +// copyAdditionalPropertySet( xId->getContentIdentifier(), +// xTargetId->getContentIdentifier(), +// sal_True ); + } + + // Note: The static cast is okay here, because its sure that + // xProvider is always the WebDAVContentProvider. + rtl::Reference< Content > xTarget + = static_cast< Content * >( + xProvider->queryContent( xTargetId ).get() ); + + // Announce transfered content in its new folder. + xTarget->inserted(); + } + catch ( ucb::IllegalIdentifierException const & ) + { + // queryContent + } + catch ( DAVException const & e ) + { + // [RFC 2518] - WebDAV + // 412 (Precondition Failed) - The server was unable to maintain + // the liveness of the properties listed in the propertybehavior + // XML element or the Overwrite header is "F" and the state of + // the destination resource is non-null. + + if ( e.getStatus() == SC_PRECONDITION_FAILED ) + { + switch ( rArgs.NameClash ) + { + case 0/*ucb::NameClash::ERROR*/: + { + ucbhelper::cancelCommandExecution( + uno::makeAny( + ucb::NameClashException( + rtl::OUString(), + static_cast< cppu::OWeakObject * >( this ), + task::InteractionClassification_ERROR, + aTargetURI ) ), + Environment ); + // Unreachable + } + + case ucb::NameClash::OVERWRITE: + break; + + case ucb::NameClash::KEEP: // deprecated + case ucb::NameClash::RENAME: + case ucb::NameClash::ASK: + default: + { + ucbhelper::cancelCommandExecution( + uno::makeAny( + ucb::UnsupportedNameClashException( + rtl::OUString(), + static_cast< cppu::OWeakObject * >( this ), + rArgs.NameClash ) ), + Environment ); + // Unreachable + } + } + } + + cancelCommandExecution( e, Environment, sal_True ); + // Unreachable + } + + { + osl::Guard< osl::Mutex > aGuard( m_aMutex ); + m_xResAccess.reset( new DAVResourceAccess( *xResAccess.get() ) ); + } +} + +//========================================================================= +void Content::destroy( sal_Bool bDeletePhysical ) + throw( uno::Exception ) +{ + // @@@ take care about bDeletePhysical -> trashcan support + rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + + uno::Reference< ucb::XContent > xThis = this; + + deleted(); + + osl::Guard< osl::Mutex > aGuard( m_aMutex ); + + // Process instanciated children... + + ::http_dav_ucp::Content::ContentRefList aChildren; + queryChildren( aChildren ); + + ContentRefList::const_iterator it = aChildren.begin(); + ContentRefList::const_iterator end = aChildren.end(); + + while ( it != end ) + { + (*it)->destroy( bDeletePhysical ); + ++it; + } +} + +//========================================================================= +bool Content::supportsExclusiveWriteLock( + const uno::Reference< ucb::XCommandEnvironment >& Environment ) +{ + if ( getResourceType( Environment ) == DAV ) + { + if ( m_xCachedProps.get() ) + { + uno::Sequence< ucb::LockEntry > aSupportedLocks; + if ( m_xCachedProps->getValue( DAVProperties::SUPPORTEDLOCK ) + >>= aSupportedLocks ) + { + for ( sal_Int32 n = 0; n < aSupportedLocks.getLength(); ++n ) + { + if ( aSupportedLocks[ n ].Scope + == ucb::LockScope_EXCLUSIVE && + aSupportedLocks[ n ].Type + == ucb::LockType_WRITE ) + return true; + } + } + } + } + return false; +} + +//========================================================================= +void Content::lock( + const uno::Reference< ucb::XCommandEnvironment >& Environment ) + throw( uno::Exception ) +{ + try + { + std::auto_ptr< DAVResourceAccess > xResAccess; + { + osl::Guard< osl::Mutex > aGuard( m_aMutex ); + xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) ); + } + + uno::Any aOwnerAny; + aOwnerAny + <<= rtl::OUString::createFromAscii( "http://ucb.openoffice.org" ); + + ucb::Lock aLock( + ucb::LockScope_EXCLUSIVE, + ucb::LockType_WRITE, + ucb::LockDepth_ZERO, + aOwnerAny, + 180, // lock timeout in secs + //-1, // infinite lock + uno::Sequence< ::rtl::OUString >() ); + + xResAccess->LOCK( aLock, Environment ); + + { + osl::Guard< osl::Mutex > aGuard( m_aMutex ); + m_xResAccess.reset( new DAVResourceAccess( *xResAccess.get() ) ); + } + } + catch ( DAVException const & e ) + { + cancelCommandExecution( e, Environment, sal_False ); + // Unreachable + } +} + +//========================================================================= +void Content::unlock( + const uno::Reference< ucb::XCommandEnvironment >& Environment ) + throw( uno::Exception ) +{ + try + { + std::auto_ptr< DAVResourceAccess > xResAccess; + { + osl::Guard< osl::Mutex > aGuard( m_aMutex ); + xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) ); + } + + xResAccess->UNLOCK( Environment ); + + { + osl::Guard< osl::Mutex > aGuard( m_aMutex ); + m_xResAccess.reset( new DAVResourceAccess( *xResAccess.get() ) ); + } + } + catch ( DAVException const & e ) + { + cancelCommandExecution( e, Environment, sal_False ); + // Unreachable + } +} + +//========================================================================= +sal_Bool Content::exchangeIdentity( + const uno::Reference< ucb::XContentIdentifier >& xNewId ) +{ + if ( !xNewId.is() ) + return sal_False; + + osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex ); + + uno::Reference< ucb::XContent > xThis = this; + + // Already persistent? + if ( m_bTransient ) + { + OSL_ENSURE( sal_False, "Content::exchangeIdentity - Not persistent!" ); + return sal_False; + } + + // Exchange own identitity. + + // Fail, if a content with given id already exists. +// if ( !hasData( xNewId ) ) + { + rtl::OUString aOldURL = m_xIdentifier->getContentIdentifier(); + + aGuard.clear(); + if ( exchange( xNewId ) ) + { + // Process instanciated children... + + ContentRefList aChildren; + queryChildren( aChildren ); + + ContentRefList::const_iterator it = aChildren.begin(); + ContentRefList::const_iterator end = aChildren.end(); + + while ( it != end ) + { + ContentRef xChild = (*it); + + // Create new content identifier for the child... + uno::Reference< ucb::XContentIdentifier > + xOldChildId = xChild->getIdentifier(); + rtl::OUString aOldChildURL + = xOldChildId->getContentIdentifier(); + rtl::OUString aNewChildURL + = aOldChildURL.replaceAt( + 0, + aOldURL.getLength(), + xNewId->getContentIdentifier() ); + uno::Reference< ucb::XContentIdentifier > xNewChildId + = new ::ucbhelper::ContentIdentifier( + m_xSMgr, aNewChildURL ); + + if ( !xChild->exchangeIdentity( xNewChildId ) ) + return sal_False; + + ++it; + } + return sal_True; + } + } + + OSL_ENSURE( sal_False, + "Content::exchangeIdentity - " + "Panic! Cannot exchange identity!" ); + return sal_False; +} + +//========================================================================= +sal_Bool Content::isFolder( + const uno::Reference< ucb::XCommandEnvironment >& xEnv ) + throw( uno::Exception ) +{ + { + osl::MutexGuard aGuard( m_aMutex ); + + if ( m_bTransient ) + return m_bCollection; + } + + uno::Sequence< beans::Property > aProperties( 1 ); + aProperties[ 0 ].Name = rtl::OUString::createFromAscii( "IsFolder" ); + aProperties[ 0 ].Handle = -1; + uno::Reference< sdbc::XRow > xRow( getPropertyValues( aProperties, xEnv ) ); + if ( xRow.is() ) + { + try + { + return xRow->getBoolean( 1 ); + } + catch ( sdbc::SQLException const & ) + { + } + } + + return sal_False; +} + +//========================================================================= +uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) +{ + // Map DAVException... + uno::Any aException; + + rtl::OUString aURL; + if ( m_bTransient ) + { + aURL = getParentURL(); + if ( aURL.lastIndexOf( '/' ) != ( aURL.getLength() - 1 ) ) + aURL += rtl::OUString::createFromAscii( "/" ); + + aURL += m_aEscapedTitle; + } + else + { + aURL = m_xIdentifier->getContentIdentifier(); + } + + switch ( e.getStatus() ) + { + case SC_NOT_FOUND: + { + uno::Sequence< uno::Any > aArgs( 1 ); + aArgs[ 0 ] <<= beans::PropertyValue( + rtl::OUString::createFromAscii("Uri"), -1, + uno::makeAny(aURL), + beans::PropertyState_DIRECT_VALUE); + + aException <<= + ucb::InteractiveAugmentedIOException( + rtl::OUString::createFromAscii( "Not found!" ), + static_cast< cppu::OWeakObject * >( this ), + task::InteractionClassification_ERROR, + ucb::IOErrorCode_NOT_EXISTING, + aArgs ); + return aException; + } + default: + break; + } + + switch ( e.getError() ) + { + case DAVException::DAV_HTTP_ERROR: + { + if ( bWrite ) + aException <<= + ucb::InteractiveNetworkWriteException( + e.getData(), + static_cast< cppu::OWeakObject * >( this ), + task::InteractionClassification_ERROR, + e.getData() ); + else + aException <<= + ucb::InteractiveNetworkReadException( + e.getData(), + static_cast< cppu::OWeakObject * >( this ), + task::InteractionClassification_ERROR, + e.getData() ); + break; + } + + case DAVException::DAV_HTTP_LOOKUP: + aException <<= + ucb::InteractiveNetworkResolveNameException( + rtl::OUString(), + static_cast< cppu::OWeakObject * >( this ), + task::InteractionClassification_ERROR, + e.getData() ); + break; + +// @@@ No matching InteractiveNetwork*Exception +// case DAVException::DAV_HTTP_AUTH: +// break; + +// @@@ No matching InteractiveNetwork*Exception +// case DAVException::DAV_HTTP_AUTHPROXY: +// break; + + case DAVException::DAV_HTTP_CONNECT: + aException <<= + ucb::InteractiveNetworkConnectException( + rtl::OUString(), + static_cast< cppu::OWeakObject * >( this ), + task::InteractionClassification_ERROR, + e.getData() ); + break; + +// @@@ No matching InteractiveNetwork*Exception +// case DAVException::DAV_HTTP_TIMEOUT: +// break; + +// @@@ No matching InteractiveNetwork*Exception +// case DAVException::DAV_HTTP_REDIRECT: +// break; + +// @@@ No matching InteractiveNetwork*Exception +// case DAVException::DAV_SESSION_CREATE: +// break; + + case DAVException::DAV_INVALID_ARG: + aException <<= + lang::IllegalArgumentException( + rtl::OUString(), + static_cast< cppu::OWeakObject * >( this ), + -1 ); + break; + + case DAVException::DAV_LOCKED: +#if 1 + aException <<= + ucb::InteractiveLockingLockedException( + rtl::OUString::createFromAscii( "Locked!" ), + static_cast< cppu::OWeakObject * >( this ), + task::InteractionClassification_ERROR, + aURL, + sal_False ); // not SelfOwned +#else + { + uno::Sequence< uno::Any > aArgs( 1 ); + aArgs[ 0 ] <<= beans::PropertyValue( + rtl::OUString::createFromAscii("Uri"), -1, + uno::makeAny(aURL), + beans::PropertyState_DIRECT_VALUE); + + aException <<= + ucb::InteractiveAugmentedIOException( + rtl::OUString::createFromAscii( "Locked!" ), + static_cast< cppu::OWeakObject * >( this ), + task::InteractionClassification_ERROR, + ucb::IOErrorCode_LOCKING_VIOLATION, + aArgs ); + } +#endif + break; + + case DAVException::DAV_LOCKED_SELF: + aException <<= + ucb::InteractiveLockingLockedException( + rtl::OUString::createFromAscii( "Locked (self)!" ), + static_cast< cppu::OWeakObject * >( this ), + task::InteractionClassification_ERROR, + aURL, + sal_True ); // SelfOwned + break; + + case DAVException::DAV_NOT_LOCKED: + aException <<= + ucb::InteractiveLockingNotLockedException( + rtl::OUString::createFromAscii( "Not locked!" ), + static_cast< cppu::OWeakObject * >( this ), + task::InteractionClassification_ERROR, + aURL ); + break; + + case DAVException::DAV_LOCK_EXPIRED: + aException <<= + ucb::InteractiveLockingLockExpiredException( + rtl::OUString::createFromAscii( "Lock expired!" ), + static_cast< cppu::OWeakObject * >( this ), + task::InteractionClassification_ERROR, + aURL ); + break; + + default: + aException <<= + ucb::InteractiveNetworkGeneralException( + rtl::OUString(), + static_cast< cppu::OWeakObject * >( this ), + task::InteractionClassification_ERROR ); + break; + } + + return aException; +} + +//========================================================================= +// static +bool Content::shouldAccessNetworkAfterException( const DAVException & e ) +{ + if ( ( e.getStatus() == SC_NOT_FOUND ) || + ( e.getError() == DAVException::DAV_HTTP_LOOKUP ) || + ( e.getError() == DAVException::DAV_HTTP_CONNECT ) || + ( e.getError() == DAVException::DAV_HTTP_AUTH ) || + ( e.getError() == DAVException::DAV_HTTP_AUTHPROXY ) ) + return false; + + return true; +} + +//========================================================================= +void Content::cancelCommandExecution( + const DAVException & e, + const uno::Reference< ucb::XCommandEnvironment > & xEnv, + sal_Bool bWrite /* = sal_False */ ) + throw ( uno::Exception ) +{ + ucbhelper::cancelCommandExecution( MapDAVException( e, bWrite ), xEnv ); + // Unreachable +} + +//========================================================================= +const rtl::OUString +Content::getBaseURI( const std::auto_ptr< DAVResourceAccess > & rResAccess ) +{ + osl::Guard< osl::Mutex > aGuard( m_aMutex ); + + // First, try to obtain value of response header "Content-Location". + if ( m_xCachedProps.get() ) + { + rtl::OUString aLocation; + m_xCachedProps->getValue( rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( + "Content-Location" ) ) ) >>= aLocation; + if ( aLocation.getLength() ) + { + try + { + // Do not use m_xIdentifier->getContentIdentifier() because it + // for example does not reflect redirects applied to requests + // done using the original URI but m_xResAccess' URI does. + return rtl::Uri::convertRelToAbs( rResAccess->getURL(), + aLocation ); + } + catch ( rtl::MalformedUriException const & ) + { + } + } + } + + return rtl::OUString( rResAccess->getURL() ); +} + +//========================================================================= +const Content::ResourceType & Content::getResourceType( + const uno::Reference< ucb::XCommandEnvironment >& xEnv, + const std::auto_ptr< DAVResourceAccess > & rResAccess ) + throw ( uno::Exception ) +{ + if ( m_eResourceType == UNKNOWN ) + { + osl::Guard< osl::Mutex > aGuard( m_aMutex ); + + ResourceType eResourceType; + eResourceType = m_eResourceType; + + const rtl::OUString & rURL = rResAccess->getURL(); + const rtl::OUString aScheme( + rURL.copy( 0, rURL.indexOf( ':' ) ).toAsciiLowerCase() ); + + try + { + // Try to fetch some frequently used property value, e.g. those + // used when loading documents... along with identifying whether + // this is a DAV resource. + std::vector< DAVResource > resources; + std::vector< rtl::OUString > aPropNames; + uno::Sequence< beans::Property > aProperties( 5 ); + aProperties[ 0 ].Name + = rtl::OUString::createFromAscii( "IsFolder" ); + aProperties[ 1 ].Name + = rtl::OUString::createFromAscii( "IsDocument" ); + aProperties[ 2 ].Name + = rtl::OUString::createFromAscii( "IsReadOnly" ); + aProperties[ 3 ].Name + = rtl::OUString::createFromAscii( "MediaType" ); + aProperties[ 4 ].Name + = DAVProperties::SUPPORTEDLOCK; + + ContentProperties::UCBNamesToDAVNames( + aProperties, aPropNames ); + + rResAccess->PROPFIND( + DAVZERO, aPropNames, resources, xEnv ); + + // TODO - is this really only one? + if ( resources.size() == 1 ) + { + m_xCachedProps.reset( + new CachableContentProperties( resources[ 0 ] ) ); + m_xCachedProps->containsAllNames( + aProperties, m_aFailedPropNames ); + } + + eResourceType = DAV; + } + catch ( DAVException const & e ) + { + rResAccess->resetUri(); + + if ( e.getStatus() == SC_METHOD_NOT_ALLOWED ) + { + // Status SC_METHOD_NOT_ALLOWED is a safe indicator that the + // resource is NON_DAV + eResourceType = NON_DAV; + } + // cancel command execution is case that no user authentication data has been provided. + if ( e.getError() == DAVException::DAV_HTTP_NOAUTH ) + { + cancelCommandExecution( e, uno::Reference< ucb::XCommandEnvironment >() ); + } + } + m_eResourceType = eResourceType; + } + return m_eResourceType; +} + +//========================================================================= +const Content::ResourceType & Content::getResourceType( + const uno::Reference< ucb::XCommandEnvironment >& xEnv ) + throw ( uno::Exception ) +{ + return getResourceType( xEnv, m_xResAccess ); +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/webdavcontent.hxx b/ucb/source/ucp/webdav/webdavcontent.hxx new file mode 100644 index 000000000000..1e649f3071c1 --- /dev/null +++ b/ucb/source/ucp/webdav/webdavcontent.hxx @@ -0,0 +1,296 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + + + +#ifndef _WEBDAV_UCP_CONTENT_HXX +#define _WEBDAV_UCP_CONTENT_HXX + +#include +#include +#include +#include +#include +#include +#include "DAVResourceAccess.hxx" +#include "PropertyMap.hxx" + +namespace com { namespace sun { namespace star { namespace beans { + struct Property; + struct PropertyValue; +} } } } + +namespace com { namespace sun { namespace star { namespace io { + class XInputStream; +} } } } + +namespace com { namespace sun { namespace star { namespace sdbc { + class XRow; +} } } } + +namespace com { namespace sun { namespace star { namespace ucb { + struct OpenCommandArgument2; + struct PostCommandArgument2; + struct TransferInfo; +} } } } + +namespace http_dav_ucp +{ + +//========================================================================= + +// UNO service name for the content. +#define WEBDAV_CONTENT_SERVICE_NAME "com.sun.star.ucb.WebDAVContent" + +//========================================================================= + +class ContentProvider; +class ContentProperties; +class CachableContentProperties; + +class Content : public ::ucbhelper::ContentImplHelper, + public com::sun::star::ucb::XContentCreator +{ + enum ResourceType + { + UNKNOWN, + NON_DAV, + DAV + }; + + std::auto_ptr< DAVResourceAccess > m_xResAccess; + std::auto_ptr< CachableContentProperties > + m_xCachedProps; // locally cached props + rtl::OUString m_aEscapedTitle; + ResourceType m_eResourceType; + ContentProvider* m_pProvider; // No need for a ref, base class holds object + bool m_bTransient; + bool m_bCollection; + bool m_bDidGetOrHead; + std::vector< rtl::OUString > m_aFailedPropNames; + +private: + virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > + getProperties( const com::sun::star::uno::Reference< + com::sun::star::ucb::XCommandEnvironment > & xEnv ); + virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo > + getCommands( const com::sun::star::uno::Reference< + com::sun::star::ucb::XCommandEnvironment > & xEnv ); + virtual ::rtl::OUString getParentURL(); + + sal_Bool isFolder( const ::com::sun::star::uno::Reference< + ::com::sun::star::ucb::XCommandEnvironment >& xEnv ) + throw ( ::com::sun::star::uno::Exception ); + + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > + getPropertyValues( const ::com::sun::star::uno::Sequence< + ::com::sun::star::beans::Property >& rProperties, + const ::com::sun::star::uno::Reference< + ::com::sun::star::ucb::XCommandEnvironment >& xEnv ) + throw ( ::com::sun::star::uno::Exception ); + + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > + setPropertyValues( const ::com::sun::star::uno::Sequence< + ::com::sun::star::beans::PropertyValue >& rValues, + const ::com::sun::star::uno::Reference< + ::com::sun::star::ucb::XCommandEnvironment >& xEnv ) + throw ( ::com::sun::star::uno::Exception ); + + typedef rtl::Reference< Content > ContentRef; + typedef std::list< ContentRef > ContentRefList; + void queryChildren( ContentRefList& rChildren); + + sal_Bool + exchangeIdentity( const ::com::sun::star::uno::Reference< + ::com::sun::star::ucb::XContentIdentifier >& xNewId ); + + const rtl::OUString + getBaseURI( const std::auto_ptr< DAVResourceAccess > & rResAccess ); + + const ResourceType & + getResourceType( const ::com::sun::star::uno::Reference< + ::com::sun::star::ucb::XCommandEnvironment >& xEnv ) + throw ( ::com::sun::star::uno::Exception ); + + const ResourceType & + getResourceType( const ::com::sun::star::uno::Reference< + ::com::sun::star::ucb::XCommandEnvironment >& xEnv, + const std::auto_ptr< DAVResourceAccess > & rResAccess ) + throw ( ::com::sun::star::uno::Exception ); + + // Command "open" + com::sun::star::uno::Any open( + const com::sun::star::ucb::OpenCommandArgument2 & rArg, + const com::sun::star::uno::Reference< + com::sun::star::ucb::XCommandEnvironment > & xEnv ) + throw( ::com::sun::star::uno::Exception ); + + // Command "post" + void post( const com::sun::star::ucb::PostCommandArgument2 & rArg, + const com::sun::star::uno::Reference< + com::sun::star::ucb::XCommandEnvironment > & xEnv ) + throw( ::com::sun::star::uno::Exception ); + + // Command "insert" + void insert( const ::com::sun::star::uno::Reference< + ::com::sun::star::io::XInputStream > & xInputStream, + sal_Bool bReplaceExisting, + const com::sun::star::uno::Reference< + com::sun::star::ucb::XCommandEnvironment >& Environment ) + throw( ::com::sun::star::uno::Exception ); + + // Command "transfer" + void transfer( const ::com::sun::star::ucb::TransferInfo & rArgs, + const com::sun::star::uno::Reference< + com::sun::star::ucb::XCommandEnvironment >& Environment ) + throw( ::com::sun::star::uno::Exception ); + + // Command "delete" + void destroy( sal_Bool bDeletePhysical ) + throw( ::com::sun::star::uno::Exception ); + + // Command "lock" + void lock( const com::sun::star::uno::Reference< + com::sun::star::ucb::XCommandEnvironment >& Environment ) + throw( ::com::sun::star::uno::Exception ); + + // Command "unlock" + void unlock( const com::sun::star::uno::Reference< + com::sun::star::ucb::XCommandEnvironment >& Environment ) + throw( ::com::sun::star::uno::Exception ); + + ::com::sun::star::uno::Any MapDAVException( const DAVException & e, + sal_Bool bWrite ); + void cancelCommandExecution( + const DAVException & e, + const ::com::sun::star::uno::Reference< + com::sun::star::ucb::XCommandEnvironment > & xEnv, + sal_Bool bWrite = sal_False ) + throw( ::com::sun::star::uno::Exception ); + + static bool shouldAccessNetworkAfterException( const DAVException & e ); + + bool supportsExclusiveWriteLock( + const com::sun::star::uno::Reference< + com::sun::star::ucb::XCommandEnvironment >& Environment ); + +public: + Content( const ::com::sun::star::uno::Reference< + ::com::sun::star::lang::XMultiServiceFactory >& rxSMgr, + ContentProvider* pProvider, + const ::com::sun::star::uno::Reference< + ::com::sun::star::ucb::XContentIdentifier >& Identifier, + rtl::Reference< DAVSessionFactory > const & rSessionFactory ) + throw ( ::com::sun::star::ucb::ContentCreationException ); + Content( const ::com::sun::star::uno::Reference< + ::com::sun::star::lang::XMultiServiceFactory >& rxSMgr, + ContentProvider* pProvider, + const ::com::sun::star::uno::Reference< + ::com::sun::star::ucb::XContentIdentifier >& Identifier, + rtl::Reference< DAVSessionFactory > const & rSessionFactory, + sal_Bool isCollection ) + throw ( ::com::sun::star::ucb::ContentCreationException ); + virtual ~Content(); + + // XInterface + XINTERFACE_DECL() + + // XTypeProvider + XTYPEPROVIDER_DECL() + + // XServiceInfo + virtual ::rtl::OUString SAL_CALL + getImplementationName() + throw( ::com::sun::star::uno::RuntimeException ); + + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + getSupportedServiceNames() + throw( ::com::sun::star::uno::RuntimeException ); + + // XContent + virtual rtl::OUString SAL_CALL + getContentType() + throw( com::sun::star::uno::RuntimeException ); + + // XCommandProcessor + virtual com::sun::star::uno::Any SAL_CALL + execute( const com::sun::star::ucb::Command& aCommand, + sal_Int32 CommandId, + const com::sun::star::uno::Reference< + com::sun::star::ucb::XCommandEnvironment >& Environment ) + throw( com::sun::star::uno::Exception, + com::sun::star::ucb::CommandAbortedException, + com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL + abort( sal_Int32 CommandId ) + throw( com::sun::star::uno::RuntimeException ); + + // XPropertyContainer + virtual void SAL_CALL + addProperty( const rtl::OUString& Name, + sal_Int16 Attributes, + const com::sun::star::uno::Any& DefaultValue ) + throw( com::sun::star::beans::PropertyExistException, + com::sun::star::beans::IllegalTypeException, + com::sun::star::lang::IllegalArgumentException, + com::sun::star::uno::RuntimeException ); + + virtual void SAL_CALL + removeProperty( const rtl::OUString& Name ) + throw( com::sun::star::beans::UnknownPropertyException, + com::sun::star::beans::NotRemoveableException, + com::sun::star::uno::RuntimeException ); + + ////////////////////////////////////////////////////////////////////// + // Additional interfaces + ////////////////////////////////////////////////////////////////////// + + // XContentCreator + virtual com::sun::star::uno::Sequence< + com::sun::star::ucb::ContentInfo > SAL_CALL + queryCreatableContentsInfo() + throw( com::sun::star::uno::RuntimeException ); + virtual com::sun::star::uno::Reference< + com::sun::star::ucb::XContent > SAL_CALL + createNewContent( const com::sun::star::ucb::ContentInfo& Info ) + throw( com::sun::star::uno::RuntimeException ); + + ////////////////////////////////////////////////////////////////////// + // Non-interface methods. + ////////////////////////////////////////////////////////////////////// + + DAVResourceAccess & getResourceAccess() { return *m_xResAccess; } + + // Called from resultset data supplier. + static ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > + getPropertyValues( const ::com::sun::star::uno::Reference< + ::com::sun::star::lang::XMultiServiceFactory >& rSMgr, + const ::com::sun::star::uno::Sequence< + ::com::sun::star::beans::Property >& rProperties, + const ContentProperties& rData, + const rtl::Reference< + ::ucbhelper::ContentProviderImplHelper >& rProvider, + const ::rtl::OUString& rContentId ); +}; + +} + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/webdavcontentcaps.cxx b/ucb/source/ucp/webdav/webdavcontentcaps.cxx new file mode 100644 index 000000000000..76da92893613 --- /dev/null +++ b/ucb/source/ucp/webdav/webdavcontentcaps.cxx @@ -0,0 +1,659 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + + + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_ucb.hxx" +/************************************************************************** + TODO + ************************************************************************** + + *************************************************************************/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "webdavcontent.hxx" +#include "webdavprovider.hxx" +#include "DAVSession.hxx" +#include "ContentProperties.hxx" + +using namespace com::sun::star; +using namespace http_dav_ucp; + +//========================================================================= +// +// ContentProvider implementation. +// +//========================================================================= + +bool ContentProvider::getProperty( + const rtl::OUString & rPropName, beans::Property & rProp, bool bStrict ) +{ + if ( !m_pProps ) + { + osl::MutexGuard aGuard( m_aMutex ); + if ( !m_pProps ) + { + m_pProps = new PropertyMap; + + ////////////////////////////////////////////////////////////// + // Fill map of known properties... + ////////////////////////////////////////////////////////////// + + // Mandatory UCB properties. + m_pProps->insert( + beans::Property( + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ), + -1, + getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + beans::PropertyAttribute::BOUND + | beans::PropertyAttribute::READONLY ) ); + + m_pProps->insert( + beans::Property( + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ), + -1, + getCppuBooleanType(), + beans::PropertyAttribute::BOUND + | beans::PropertyAttribute::READONLY ) ); + + m_pProps->insert( + beans::Property( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ), + -1, + getCppuBooleanType(), + beans::PropertyAttribute::BOUND + | beans::PropertyAttribute::READONLY ) ); + + m_pProps->insert( + beans::Property( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), + -1, + getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + beans::PropertyAttribute::BOUND ) ); + + // Optional UCB properties. + + m_pProps->insert( + beans::Property( + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( "DateCreated" ) ), + -1, + getCppuType( static_cast< const util::DateTime * >( 0 ) ), + beans::PropertyAttribute::BOUND + | beans::PropertyAttribute::READONLY ) ); + + m_pProps->insert( + beans::Property( + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( "DateModified" ) ), + -1, + getCppuType( static_cast< const util::DateTime * >( 0 ) ), + beans::PropertyAttribute::BOUND + | beans::PropertyAttribute::READONLY ) ); + + m_pProps->insert( + beans::Property( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ), + -1, + getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + beans::PropertyAttribute::BOUND + | beans::PropertyAttribute::READONLY ) ); + + m_pProps->insert( + beans::Property( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Size" ) ), + -1, + getCppuType( static_cast< const sal_Int64 * >( 0 ) ), + beans::PropertyAttribute::BOUND + | beans::PropertyAttribute::READONLY ) ); + + m_pProps->insert( + beans::Property( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BaseURI" ) ), + -1, + getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + beans::PropertyAttribute::BOUND + | beans::PropertyAttribute::READONLY ) ); + + m_pProps->insert( + beans::Property( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( + "CreatableContentsInfo" ) ), + -1, + getCppuType( static_cast< + const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), + beans::PropertyAttribute::BOUND + | beans::PropertyAttribute::READONLY ) ); + + // Standard DAV properties. + + m_pProps->insert( + beans::Property( + DAVProperties::CREATIONDATE, + -1, + getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + beans::PropertyAttribute::BOUND + | beans::PropertyAttribute::READONLY ) ); + + m_pProps->insert( + beans::Property( + DAVProperties::DISPLAYNAME, + -1, + getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + beans::PropertyAttribute::BOUND ) ); + + m_pProps->insert( + beans::Property( + DAVProperties::GETCONTENTLANGUAGE, + -1, + getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + beans::PropertyAttribute::BOUND + | beans::PropertyAttribute::READONLY ) ); + + m_pProps->insert( + beans::Property( + DAVProperties::GETCONTENTLENGTH, + -1, + getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + beans::PropertyAttribute::BOUND + | beans::PropertyAttribute::READONLY ) ); + + m_pProps->insert( + beans::Property( + DAVProperties::GETCONTENTTYPE , + -1, + getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + beans::PropertyAttribute::BOUND + | beans::PropertyAttribute::READONLY ) ); + + m_pProps->insert( + beans::Property( + DAVProperties::GETETAG, + -1, + getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + beans::PropertyAttribute::BOUND + | beans::PropertyAttribute::READONLY ) ); + + m_pProps->insert( + beans::Property( + DAVProperties::GETLASTMODIFIED, + -1, + getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + beans::PropertyAttribute::BOUND + | beans::PropertyAttribute::READONLY ) ); + + m_pProps->insert( + beans::Property( + DAVProperties::LOCKDISCOVERY, + -1, + getCppuType( static_cast< + const uno::Sequence< ucb::Lock > * >( 0 ) ), + beans::PropertyAttribute::BOUND + | beans::PropertyAttribute::READONLY ) ); + + m_pProps->insert( + beans::Property( + DAVProperties::RESOURCETYPE, + -1, + getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + beans::PropertyAttribute::BOUND + | beans::PropertyAttribute::READONLY ) ); + + m_pProps->insert( + beans::Property( + DAVProperties::SUPPORTEDLOCK, + -1, + getCppuType( static_cast< + const uno::Sequence< + ucb::LockEntry > * >( 0 ) ), + beans::PropertyAttribute::BOUND + | beans::PropertyAttribute::READONLY ) ); + + m_pProps->insert( + beans::Property( + DAVProperties::EXECUTABLE, + -1, + getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + beans::PropertyAttribute::BOUND ) ); + } + } + + ////////////////////////////////////////////////////////////// + // Lookup property. + ////////////////////////////////////////////////////////////// + + beans::Property aProp; + aProp.Name = rPropName; + const PropertyMap::const_iterator it = m_pProps->find( aProp ); + if ( it != m_pProps->end() ) + { + rProp = (*it); + } + else + { + if ( bStrict ) + return false; + + // All unknown props are treated as: + rProp = beans::Property( + rPropName, + - 1, + getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + beans::PropertyAttribute::BOUND ); + } + + return true; +} + +//========================================================================= +// +// Content implementation. +// +//========================================================================= + +// virtual +uno::Sequence< beans::Property > Content::getProperties( + const uno::Reference< ucb::XCommandEnvironment > & xEnv ) +{ + sal_Bool bTransient; + std::auto_ptr< DAVResourceAccess > xResAccess; + std::auto_ptr< ContentProperties > xCachedProps; + rtl::Reference< ContentProvider > xProvider; + + { + osl::Guard< osl::Mutex > aGuard( m_aMutex ); + + bTransient = m_bTransient; + xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) ); + if ( m_xCachedProps.get() ) + xCachedProps.reset( + new ContentProperties( *m_xCachedProps.get() ) ); + xProvider.set( m_pProvider ); + } + + typedef std::set< rtl::OUString > StringSet; + StringSet aPropSet; + + // No server access for just created (not yet committed) objects. + // Only a minimal set of properties supported at this stage. + if ( !bTransient ) + { + // Obtain all properties supported for this resource from server. + try + { + std::vector< DAVResourceInfo > props; + xResAccess->PROPFIND( DAVZERO, props, xEnv ); + + // Note: vector always contains exactly one resource info, because + // we used a depth of DAVZERO for PROPFIND. + aPropSet.insert( (*props.begin()).properties.begin(), + (*props.begin()).properties.end() ); + } + catch ( DAVException const & ) + { + } + } + + // Add DAV properties, map DAV properties to UCB properties. + sal_Bool bHasCreationDate = sal_False; // creationdate <-> DateCreated + sal_Bool bHasGetLastModified = sal_False; // getlastmodified <-> DateModified + sal_Bool bHasGetContentType = sal_False; // getcontenttype <-> MediaType + sal_Bool bHasGetContentLength = sal_False; // getcontentlength <-> Size + + sal_Bool bHasContentType = sal_False; + sal_Bool bHasIsDocument = sal_False; + sal_Bool bHasIsFolder = sal_False; + sal_Bool bHasTitle = sal_False; + sal_Bool bHasBaseURI = sal_False; + sal_Bool bHasDateCreated = sal_False; + sal_Bool bHasDateModified = sal_False; + sal_Bool bHasMediaType = sal_False; + sal_Bool bHasSize = sal_False; + sal_Bool bHasCreatableInfos = sal_False; + + { + std::set< rtl::OUString >::const_iterator it = aPropSet.begin(); + std::set< rtl::OUString >::const_iterator end = aPropSet.end(); + while ( it != end ) + { + if ( !bHasCreationDate && + ( (*it) == DAVProperties::CREATIONDATE ) ) + { + bHasCreationDate = sal_True; + } + else if ( !bHasGetLastModified && + ( (*it) == DAVProperties::GETLASTMODIFIED ) ) + { + bHasGetLastModified = sal_True; + } + else if ( !bHasGetContentType && + ( (*it) == DAVProperties::GETCONTENTTYPE ) ) + { + bHasGetContentType = sal_True; + } + else if ( !bHasGetContentLength && + ( (*it) == DAVProperties::GETCONTENTLENGTH ) ) + { + bHasGetContentLength = sal_True; + } + else if ( !bHasContentType && + (*it).equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "ContentType" ) ) ) + { + bHasContentType = sal_True; + } + else if ( !bHasIsDocument && + (*it).equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "IsDocument" ) ) ) + { + bHasIsDocument = sal_True; + } + else if ( !bHasIsFolder && + (*it).equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "IsFolder" ) ) ) + { + bHasIsFolder = sal_True; + } + else if ( !bHasTitle && + (*it).equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "Title" ) ) ) + { + bHasTitle = sal_True; + } + else if ( !bHasBaseURI && + (*it).equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "BaseURI" ) ) ) + { + bHasBaseURI = sal_True; + } + else if ( !bHasDateCreated && + (*it).equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "DateCreated" ) ) ) + { + bHasDateCreated = sal_True; + } + else if ( !bHasDateModified && + (*it).equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "DateModified" ) ) ) + { + bHasDateModified = sal_True; + } + else if ( !bHasMediaType && + (*it).equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) ) + { + bHasMediaType = sal_True; + } + else if ( !bHasSize && + (*it).equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "Size" ) ) ) + { + bHasSize = sal_True; + } + else if ( !bHasCreatableInfos && + (*it).equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( + "CreatableContentsInfo" ) ) ) + { + bHasCreatableInfos = sal_True; + } + it++; + } + } + + // Add mandatory properties. + if ( !bHasContentType ) + aPropSet.insert( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ) ); + + if ( !bHasIsDocument ) + aPropSet.insert( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ) ); + + if ( !bHasIsFolder ) + aPropSet.insert( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ) ); + + if ( !bHasTitle ) + { + // Always present since it can be calculated from content's URI. + aPropSet.insert( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ) ); + } + + // Add optional properties. + + if ( !bHasBaseURI ) + { + // Always present since it can be calculated from content's URI. + aPropSet.insert( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BaseURI" ) ) ); + } + + if ( !bHasDateCreated && bHasCreationDate ) + aPropSet.insert( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateCreated" ) ) ); + + if ( !bHasDateModified && bHasGetLastModified ) + aPropSet.insert( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateModified" ) ) ); + + if ( !bHasMediaType && bHasGetContentType ) + aPropSet.insert( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ) ); + + if ( !bHasSize && bHasGetContentLength ) + aPropSet.insert( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Size" ) ) ); + + if ( !bHasCreatableInfos ) + aPropSet.insert( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( + "CreatableContentsInfo" ) ) ); + + // Add cached properties, if present and still missing. + if ( xCachedProps.get() ) + { + const std::set< rtl::OUString >::const_iterator set_end + = aPropSet.end(); + + const std::auto_ptr< PropertyValueMap > & xProps + = xCachedProps->getProperties(); + + PropertyValueMap::const_iterator map_it = xProps->begin(); + const PropertyValueMap::const_iterator map_end = xProps->end(); + + while ( map_it != map_end ) + { + if ( aPropSet.find( (*map_it).first ) == set_end ) + aPropSet.insert( (*map_it).first ); + + ++map_it; + } + } + + // std::set -> uno::Sequence + sal_Int32 nCount = aPropSet.size(); + uno::Sequence< beans::Property > aProperties( nCount ); + + std::set< rtl::OUString >::const_iterator it = aPropSet.begin(); + beans::Property aProp; + + for ( sal_Int32 n = 0; n < nCount; ++n, ++it ) + { + xProvider->getProperty( (*it), aProp ); + aProperties[ n ] = aProp; + } + + return aProperties; +} + +//========================================================================= +// virtual +uno::Sequence< ucb::CommandInfo > Content::getCommands( + const uno::Reference< ucb::XCommandEnvironment > & xEnv ) +{ + osl::Guard< osl::Mutex > aGuard( m_aMutex ); + + uno::Sequence< ucb::CommandInfo > aCmdInfo( 8 ); + + /////////////////////////////////////////////////////////////// + // Mandatory commands + /////////////////////////////////////////////////////////////// + + aCmdInfo[ 0 ] = + ucb::CommandInfo( + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ), + -1, + getCppuVoidType() ); + aCmdInfo[ 1 ] = + ucb::CommandInfo( + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ), + -1, + getCppuVoidType() ); + aCmdInfo[ 2 ] = + ucb::CommandInfo( + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ), + -1, + getCppuType( static_cast< + uno::Sequence< beans::Property > * >( 0 ) ) ); + aCmdInfo[ 3 ] = + ucb::CommandInfo( + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), + -1, + getCppuType( static_cast< + uno::Sequence< beans::PropertyValue > * >( 0 ) ) ); + + /////////////////////////////////////////////////////////////// + // Optional standard commands + /////////////////////////////////////////////////////////////// + + aCmdInfo[ 4 ] = + ucb::CommandInfo( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" ) ), + -1, + getCppuBooleanType() ); + aCmdInfo[ 5 ] = + ucb::CommandInfo( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "insert" ) ), + -1, + getCppuType( static_cast< + ucb::InsertCommandArgument * >( 0 ) ) ); + aCmdInfo[ 6 ] = + ucb::CommandInfo( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ), + -1, + getCppuType( static_cast< + ucb::OpenCommandArgument2 * >( 0 ) ) ); + + /////////////////////////////////////////////////////////////// + // New commands + /////////////////////////////////////////////////////////////// + + aCmdInfo[ 7 ] = + ucb::CommandInfo( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "post" ) ), + -1, + getCppuType( static_cast< + ucb::PostCommandArgument2 * >( 0 ) ) ); + + sal_Bool bFolder = sal_False; + + try + { + bFolder = isFolder( xEnv ); + } + catch ( uno::Exception const & ) + { + return aCmdInfo; + } + + sal_Bool bSupportsLocking = supportsExclusiveWriteLock( xEnv ); + + sal_Int32 nPos = aCmdInfo.getLength(); + sal_Int32 nMoreCmds = ( bFolder ? 2 : 0 ) + ( bSupportsLocking ? 2 : 0 ); + if ( nMoreCmds ) + aCmdInfo.realloc( nPos + nMoreCmds ); + else + return aCmdInfo; + + if ( bFolder ) + { + /////////////////////////////////////////////////////////////// + // Optional standard commands + /////////////////////////////////////////////////////////////// + + aCmdInfo[ nPos ] = + ucb::CommandInfo( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "transfer" ) ), + -1, + getCppuType( static_cast< ucb::TransferInfo * >( 0 ) ) ); + nPos++; + aCmdInfo[ nPos ] = + ucb::CommandInfo( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( + "createNewContent" ) ), + -1, + getCppuType( static_cast< ucb::ContentInfo * >( 0 ) ) ); + nPos++; + } + else + { + // no document-only commands at the moment. + } + + if ( bSupportsLocking ) + { + aCmdInfo[ nPos ] = + ucb::CommandInfo( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "lock" ) ), + -1, + getCppuVoidType() ); + nPos++; + aCmdInfo[ nPos ] = + ucb::CommandInfo( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "unlock" ) ), + -1, + getCppuVoidType() ); + nPos++; + } + return aCmdInfo; +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.cxx b/ucb/source/ucp/webdav/webdavdatasupplier.cxx new file mode 100644 index 000000000000..bb4c396d4b5b --- /dev/null +++ b/ucb/source/ucp/webdav/webdavdatasupplier.cxx @@ -0,0 +1,507 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + + + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_ucb.hxx" + +/************************************************************************** + TODO + ************************************************************************** + + *************************************************************************/ +#include +#include +#include +#include +#include "webdavdatasupplier.hxx" +#include "webdavcontent.hxx" +#include "ContentProperties.hxx" +#ifndef _WEBDAV_SESSION_HXX +#include "DAVSession.hxx" +#endif +#include "SerfUri.hxx" + +using namespace com::sun::star; +using namespace http_dav_ucp; + +namespace http_dav_ucp +{ + +//========================================================================= +// +// struct ResultListEntry. +// +//========================================================================= + +struct ResultListEntry +{ + rtl::OUString aId; + uno::Reference< ucb::XContentIdentifier > xId; + uno::Reference< ucb::XContent > xContent; + uno::Reference< sdbc::XRow > xRow; + const ContentProperties* pData; + + ResultListEntry( const ContentProperties* pEntry ) : pData( pEntry ) {}; + ~ResultListEntry() { delete pData; } +}; + +//========================================================================= +// +// ResultList. +// +//========================================================================= + +typedef std::vector< ResultListEntry* > ResultList; + +//========================================================================= +// +// struct DataSupplier_Impl. +// +//========================================================================= + +struct DataSupplier_Impl +{ + osl::Mutex m_aMutex; + ResultList m_aResults; + rtl::Reference< Content > m_xContent; + uno::Reference< lang::XMultiServiceFactory > m_xSMgr; + sal_Int32 m_nOpenMode; + sal_Bool m_bCountFinal; + sal_Bool m_bThrowException; + + DataSupplier_Impl( + const uno::Reference< lang::XMultiServiceFactory >& rxSMgr, + const rtl::Reference< Content >& rContent, + sal_Int32 nOpenMode ) + : m_xContent( rContent ), m_xSMgr( rxSMgr ), m_nOpenMode( nOpenMode ), + m_bCountFinal( sal_False ), m_bThrowException( sal_False ) {} + ~DataSupplier_Impl(); +}; + +//========================================================================= +DataSupplier_Impl::~DataSupplier_Impl() +{ + ResultList::const_iterator it = m_aResults.begin(); + ResultList::const_iterator end = m_aResults.end(); + + while ( it != end ) + { + delete (*it); + it++; + } +} + +} + +//========================================================================= +//========================================================================= +// +// DataSupplier Implementation. +// +//========================================================================= +//========================================================================= + +DataSupplier::DataSupplier( + const uno::Reference< lang::XMultiServiceFactory >& rxSMgr, + const rtl::Reference< Content >& rContent, + sal_Int32 nOpenMode ) +: m_pImpl( new DataSupplier_Impl( rxSMgr, rContent, nOpenMode ) ) +{ +} + +//========================================================================= +// virtual +DataSupplier::~DataSupplier() +{ + delete m_pImpl; +} + +//========================================================================= +// virtual +rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) +{ + osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); + + if ( nIndex < m_pImpl->m_aResults.size() ) + { + rtl::OUString aId = m_pImpl->m_aResults[ nIndex ]->aId; + if ( aId.getLength() ) + { + // Already cached. + return aId; + } + } + + if ( getResult( nIndex ) ) + { + rtl::OUString aId = m_pImpl->m_xContent->getResourceAccess().getURL(); + + const ContentProperties& props + = *( m_pImpl->m_aResults[ nIndex ]->pData ); + + if ( ( aId.lastIndexOf( '/' ) + 1 ) != aId.getLength() ) + aId += rtl::OUString::createFromAscii( "/" ); + + aId += props.getEscapedTitle(); + + if ( props.isTrailingSlash() ) + aId += rtl::OUString::createFromAscii( "/" ); + + m_pImpl->m_aResults[ nIndex ]->aId = aId; + return aId; + } + return rtl::OUString(); +} + +//========================================================================= +// virtual +uno::Reference< ucb::XContentIdentifier > +DataSupplier::queryContentIdentifier( sal_uInt32 nIndex ) +{ + osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); + + if ( nIndex < m_pImpl->m_aResults.size() ) + { + uno::Reference< ucb::XContentIdentifier > xId + = m_pImpl->m_aResults[ nIndex ]->xId; + if ( xId.is() ) + { + // Already cached. + return xId; + } + } + + rtl::OUString aId = queryContentIdentifierString( nIndex ); + if ( aId.getLength() ) + { + uno::Reference< ucb::XContentIdentifier > xId + = new ::ucbhelper::ContentIdentifier( aId ); + m_pImpl->m_aResults[ nIndex ]->xId = xId; + return xId; + } + return uno::Reference< ucb::XContentIdentifier >(); +} + +//========================================================================= +// virtual +uno::Reference< ucb::XContent > +DataSupplier::queryContent( sal_uInt32 nIndex ) +{ + osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); + + if ( nIndex < m_pImpl->m_aResults.size() ) + { + uno::Reference< ucb::XContent > xContent + = m_pImpl->m_aResults[ nIndex ]->xContent; + if ( xContent.is() ) + { + // Already cached. + return xContent; + } + } + + uno::Reference< ucb::XContentIdentifier > xId + = queryContentIdentifier( nIndex ); + if ( xId.is() ) + { + try + { + uno::Reference< ucb::XContent > xContent + = m_pImpl->m_xContent->getProvider()->queryContent( xId ); + m_pImpl->m_aResults[ nIndex ]->xContent = xContent; + return xContent; + + } + catch ( ucb::IllegalIdentifierException& ) + { + } + } + return uno::Reference< ucb::XContent >(); +} + +//========================================================================= +// virtual +sal_Bool DataSupplier::getResult( sal_uInt32 nIndex ) +{ + osl::ClearableGuard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); + + if ( m_pImpl->m_aResults.size() > nIndex ) + { + // Result already present. + return sal_True; + } + + // Obtain values... + if ( getData() ) + { + if ( m_pImpl->m_aResults.size() > nIndex ) + { + // Result already present. + return sal_True; + } + } + + return sal_False; +} + +//========================================================================= +// virtual +sal_uInt32 DataSupplier::totalCount() +{ + // Obtain values... + getData(); + + return m_pImpl->m_aResults.size(); +} + +//========================================================================= +// virtual +sal_uInt32 DataSupplier::currentCount() +{ + return m_pImpl->m_aResults.size(); +} + +//========================================================================= +// virtual +sal_Bool DataSupplier::isCountFinal() +{ + return m_pImpl->m_bCountFinal; +} + +//========================================================================= +// virtual +uno::Reference< sdbc::XRow > DataSupplier::queryPropertyValues( + sal_uInt32 nIndex ) +{ + osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); + + if ( nIndex < m_pImpl->m_aResults.size() ) + { + uno::Reference< sdbc::XRow > xRow = m_pImpl->m_aResults[ nIndex ]->xRow; + if ( xRow.is() ) + { + // Already cached. + return xRow; + } + } + + if ( getResult( nIndex ) ) + { + uno::Reference< sdbc::XRow > xRow + = Content::getPropertyValues( + m_pImpl->m_xSMgr, + getResultSet()->getProperties(), + *(m_pImpl->m_aResults[ nIndex ]->pData), + rtl::Reference< ::ucbhelper::ContentProviderImplHelper >( + m_pImpl->m_xContent->getProvider().get() ), + queryContentIdentifierString( nIndex ) ); + m_pImpl->m_aResults[ nIndex ]->xRow = xRow; + return xRow; + } + + return uno::Reference< sdbc::XRow >(); +} + +//========================================================================= +// virtual +void DataSupplier::releasePropertyValues( sal_uInt32 nIndex ) +{ + osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); + + if ( nIndex < m_pImpl->m_aResults.size() ) + m_pImpl->m_aResults[ nIndex ]->xRow = uno::Reference< sdbc::XRow >(); +} + +//========================================================================= +// virtual +void DataSupplier::close() +{ +} + +//========================================================================= +// virtual +void DataSupplier::validate() + throw( ucb::ResultSetException ) +{ + if ( m_pImpl->m_bThrowException ) + throw ucb::ResultSetException(); +} + +//========================================================================= +sal_Bool DataSupplier::getData() +{ + osl::ClearableGuard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); + + if ( !m_pImpl->m_bCountFinal ) + { + std::vector< rtl::OUString > propertyNames; + ContentProperties::UCBNamesToDAVNames( + getResultSet()->getProperties(), propertyNames ); + + // Append "resourcetype", if not already present. It's value is + // needed to get a valid ContentProperties::pIsFolder value, which + // is needed for OpenMode handling. + + std::vector< rtl::OUString >::const_iterator it + = propertyNames.begin(); + std::vector< rtl::OUString >::const_iterator end + = propertyNames.end(); + + while ( it != end ) + { + if ( (*it).equals( DAVProperties::RESOURCETYPE ) ) + break; + + it++; + } + + if ( it == end ) + propertyNames.push_back( DAVProperties::RESOURCETYPE ); + + std::vector< DAVResource > resources; + try + { + // propfind depth 1, get property values for parent AND for each + // child + m_pImpl->m_xContent->getResourceAccess() + .PROPFIND( DAVONE, + propertyNames, + resources, + getResultSet()->getEnvironment() ); + } + catch ( DAVException & ) + { +// OSL_ENSURE( sal_False, "PROPFIND : DAVException" ); + m_pImpl->m_bThrowException = sal_True; + } + + if ( !m_pImpl->m_bThrowException ) + { + try + { + SerfUri aURI( + m_pImpl->m_xContent->getResourceAccess().getURL() ); + rtl::OUString aPath = aURI.GetPath(); + + if ( aPath.getStr()[ aPath.getLength() - 1 ] + == sal_Unicode( '/' ) ) + aPath = aPath.copy( 0, aPath.getLength() - 1 ); + + aPath = SerfUri::unescape( aPath ); + bool bFoundParent = false; + + for ( sal_uInt32 n = 0; n < resources.size(); ++n ) + { + const DAVResource & rRes = resources[ n ]; + + // Filter parent, which is contained somewhere(!) in + // the vector. + if ( !bFoundParent ) + { + try + { + SerfUri aCurrURI( rRes.uri ); + rtl::OUString aCurrPath = aCurrURI.GetPath(); + if ( aCurrPath.getStr()[ + aCurrPath.getLength() - 1 ] + == sal_Unicode( '/' ) ) + aCurrPath + = aCurrPath.copy( + 0, + aCurrPath.getLength() - 1 ); + + aCurrPath = SerfUri::unescape( aCurrPath ); + if ( aPath == aCurrPath ) + { + bFoundParent = true; + continue; + } + } + catch ( DAVException const & ) + { + // do nothing, ignore error. continue. + } + } + + ContentProperties* pContentProperties + = new ContentProperties( rRes ); + + // Check resource against open mode. + switch ( m_pImpl->m_nOpenMode ) + { + case ucb::OpenMode::FOLDERS: + { + sal_Bool bFolder = sal_False; + + const uno::Any & rValue + = pContentProperties->getValue( + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( + "IsFolder" ) ) ); + rValue >>= bFolder; + + if ( !bFolder ) + continue; + + break; + } + + case ucb::OpenMode::DOCUMENTS: + { + sal_Bool bDocument = sal_False; + + const uno::Any & rValue + = pContentProperties->getValue( + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( + "IsDocument" ) ) ); + rValue >>= bDocument; + + if ( !bDocument ) + continue; + + break; + } + + case ucb::OpenMode::ALL: + default: + break; + } + + m_pImpl->m_aResults.push_back( + new ResultListEntry( pContentProperties ) ); + } + } + catch ( DAVException const & ) + { + } + } + + m_pImpl->m_bCountFinal = sal_True; + + // Callback possible, because listeners may be informed! + aGuard.clear(); + getResultSet()->rowCountFinal(); + } + return !m_pImpl->m_bThrowException; +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.hxx b/ucb/source/ucp/webdav/webdavdatasupplier.hxx new file mode 100644 index 000000000000..32db6aa01f1a --- /dev/null +++ b/ucb/source/ucp/webdav/webdavdatasupplier.hxx @@ -0,0 +1,78 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + + + +#ifndef _WEBDAV_UCP_DATASUPPLIER_HXX +#define _WEBDAV_UCP_DATASUPPLIER_HXX + +#include +#include +#include + +namespace http_dav_ucp { + +struct DataSupplier_Impl; +class Content; +struct DAVResource; +class ContentProperties; + +class DataSupplier : public ucbhelper::ResultSetDataSupplier +{ + DataSupplier_Impl* m_pImpl; + +private: + sal_Bool getData(); + +public: + DataSupplier( const com::sun::star::uno::Reference< + com::sun::star::lang::XMultiServiceFactory >& rxSMgr, + const rtl::Reference< Content >& rContent, + sal_Int32 nOpenMode); + + virtual ~DataSupplier(); + + virtual rtl::OUString queryContentIdentifierString( sal_uInt32 nIndex ); + virtual com::sun::star::uno::Reference< + com::sun::star::ucb::XContentIdentifier > + queryContentIdentifier( sal_uInt32 nIndex ); + virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > + queryContent( sal_uInt32 nIndex ); + + virtual sal_Bool getResult( sal_uInt32 nIndex ); + + virtual sal_uInt32 totalCount(); + virtual sal_uInt32 currentCount(); + virtual sal_Bool isCountFinal(); + + virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > + queryPropertyValues( sal_uInt32 nIndex ); + virtual void releasePropertyValues( sal_uInt32 nIndex ); + + virtual void close(); + + virtual void validate() + throw( com::sun::star::ucb::ResultSetException ); +}; + +} + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx new file mode 100644 index 000000000000..318b9e952056 --- /dev/null +++ b/ucb/source/ucp/webdav/webdavprovider.cxx @@ -0,0 +1,225 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + + + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_ucb.hxx" + +/************************************************************************** + TODO + ************************************************************************** + + *************************************************************************/ +#include +#include "webdavprovider.hxx" +#include "webdavcontent.hxx" + +#include "osl/mutex.hxx" + +using namespace com::sun::star; +using namespace http_dav_ucp; + +//========================================================================= +//========================================================================= +// +// ContentProvider Implementation. +// +//========================================================================= +//========================================================================= + +ContentProvider::ContentProvider( + const uno::Reference< lang::XMultiServiceFactory >& rSMgr ) +: ::ucbhelper::ContentProviderImplHelper( rSMgr ), + m_xDAVSessionFactory( new DAVSessionFactory() ), + m_pProps( 0 ) +{ +} + +//========================================================================= +// virtual +ContentProvider::~ContentProvider() +{ + delete m_pProps; +} + +//========================================================================= +// +// XInterface methods. +// +//========================================================================= + +XINTERFACE_IMPL_3( ContentProvider, + lang::XTypeProvider, + lang::XServiceInfo, + ucb::XContentProvider ); + +//========================================================================= +// +// XTypeProvider methods. +// +//========================================================================= + +XTYPEPROVIDER_IMPL_3( ContentProvider, + lang::XTypeProvider, + lang::XServiceInfo, + ucb::XContentProvider ); + +//========================================================================= +// +// XServiceInfo methods. +// +//========================================================================= + +XSERVICEINFO_IMPL_1( ContentProvider, + rtl::OUString::createFromAscii( + "com.sun.star.comp.WebDAVContentProvider" ), + rtl::OUString::createFromAscii( + WEBDAV_CONTENT_PROVIDER_SERVICE_NAME ) ); + +//========================================================================= +// +// Service factory implementation. +// +//========================================================================= + +ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider ); + +//========================================================================= +// +// XContentProvider methods. +// +//========================================================================= + +// virtual +uno::Reference< ucb::XContent > SAL_CALL +ContentProvider::queryContent( + const uno::Reference< + ucb::XContentIdentifier >& Identifier ) + throw( ucb::IllegalIdentifierException, + uno::RuntimeException ) +{ + // Check URL scheme... + + const rtl::OUString aScheme + = Identifier->getContentProviderScheme().toAsciiLowerCase(); + if ( !aScheme.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( HTTP_URL_SCHEME ) ) && + !aScheme.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( HTTPS_URL_SCHEME ) ) && + !aScheme.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( WEBDAV_URL_SCHEME ) ) && + !aScheme.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) && + !aScheme.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( DAVS_URL_SCHEME ) ) ) + throw ucb::IllegalIdentifierException(); + + // Normalize URL and create new Id, if nessacary. + rtl::OUString aURL = Identifier->getContentIdentifier(); + + // At least: + "://" + if ( aURL.getLength() < ( aScheme.getLength() + 3 ) ) + throw ucb::IllegalIdentifierException(); + + if ( ( aURL.getStr()[ aScheme.getLength() ] != sal_Unicode( ':' ) ) || + ( aURL.getStr()[ aScheme.getLength() + 1 ] != sal_Unicode( '/' ) ) || + ( aURL.getStr()[ aScheme.getLength() + 2 ] != sal_Unicode( '/' ) ) ) + throw ucb::IllegalIdentifierException(); + + uno::Reference< ucb::XContentIdentifier > xCanonicId; + + bool bNewId = false; + if ( aScheme.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( WEBDAV_URL_SCHEME ) ) ) + { + aURL = aURL.replaceAt( 0, + WEBDAV_URL_SCHEME_LENGTH, + rtl::OUString::createFromAscii( + HTTP_URL_SCHEME ) ); + bNewId = true; + } + else if ( aScheme.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) ) + { + aURL = aURL.replaceAt( 0, + DAV_URL_SCHEME_LENGTH, + rtl::OUString::createFromAscii( + HTTP_URL_SCHEME ) ); + bNewId = true; + } + else if ( aScheme.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( DAVS_URL_SCHEME ) ) ) + { + aURL = aURL.replaceAt( 0, + DAVS_URL_SCHEME_LENGTH, + rtl::OUString::createFromAscii( + HTTPS_URL_SCHEME ) ); + bNewId = true; + } + + sal_Int32 nPos = aURL.lastIndexOf( '/' ); + if ( nPos != aURL.getLength() - 1 ) + { + // Find second slash in URL. + nPos = aURL.indexOf( '/', aURL.indexOf( '/' ) + 1 ); + if ( nPos == -1 ) + throw ucb::IllegalIdentifierException(); + + nPos = aURL.indexOf( '/', nPos + 1 ); + if ( nPos == -1 ) + { + aURL += rtl::OUString::createFromAscii( "/" ); + bNewId = true; + } + } + + if ( bNewId ) + xCanonicId = new ::ucbhelper::ContentIdentifier( m_xSMgr, aURL ); + else + xCanonicId = Identifier; + + osl::MutexGuard aGuard( m_aMutex ); + + // Check, if a content with given id already exists... + uno::Reference< ucb::XContent > xContent + = queryExistingContent( xCanonicId ).get(); + if ( xContent.is() ) + return xContent; + + // Create a new content. + + try + { + xContent = new ::http_dav_ucp::Content( + m_xSMgr, this, xCanonicId, m_xDAVSessionFactory ); + registerNewContent( xContent ); + } + catch ( ucb::ContentCreationException const & ) + { + throw ucb::IllegalIdentifierException(); + } + + if ( !xContent->getIdentifier().is() ) + throw ucb::IllegalIdentifierException(); + + return xContent; +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/webdavprovider.hxx b/ucb/source/ucp/webdav/webdavprovider.hxx new file mode 100644 index 000000000000..a09e420c91b2 --- /dev/null +++ b/ucb/source/ucp/webdav/webdavprovider.hxx @@ -0,0 +1,116 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + + + +#ifndef _WEBDAV_UCP_PROVIDER_HXX +#define _WEBDAV_UCP_PROVIDER_HXX + +#include +#include +#include "DAVSessionFactory.hxx" +#include +#include "PropertyMap.hxx" + +namespace http_dav_ucp { + +//========================================================================= + +// UNO service name for the provider. This name will be used by the UCB to +// create instances of the provider. +#define WEBDAV_CONTENT_PROVIDER_SERVICE_NAME \ + "com.sun.star.ucb.WebDAVContentProvider" +#define WEBDAV_CONTENT_PROVIDER_SERVICE_NAME_LENGTH 38 + +// URL scheme. This is the scheme the provider will be able to create +// contents for. The UCB will select the provider ( i.e. in order to create +// contents ) according to this scheme. +#define WEBDAV_URL_SCHEME \ + "vnd.sun.star.webdav" +#define WEBDAV_URL_SCHEME_LENGTH 19 + +#define HTTP_URL_SCHEME "http" +#define HTTP_URL_SCHEME_LENGTH 4 + +#define HTTPS_URL_SCHEME "https" +#define HTTPS_URL_SCHEME_LENGTH 5 + +#define DAV_URL_SCHEME "dav" +#define DAV_URL_SCHEME_LENGTH 3 + +#define DAVS_URL_SCHEME "davs" +#define DAVS_URL_SCHEME_LENGTH 4 + +#define HTTP_CONTENT_TYPE \ + "application/" HTTP_URL_SCHEME "-content" + +#define WEBDAV_CONTENT_TYPE HTTP_CONTENT_TYPE +#define WEBDAV_COLLECTION_TYPE \ + "application/" WEBDAV_URL_SCHEME "-collection" + +//========================================================================= + +class ContentProvider : public ::ucbhelper::ContentProviderImplHelper +{ + rtl::Reference< DAVSessionFactory > m_xDAVSessionFactory; + PropertyMap * m_pProps; + +public: + ContentProvider( const ::com::sun::star::uno::Reference< + ::com::sun::star::lang::XMultiServiceFactory >& rSMgr ); + virtual ~ContentProvider(); + + // XInterface + XINTERFACE_DECL() + + // XTypeProvider + XTYPEPROVIDER_DECL() + + // XServiceInfo + XSERVICEINFO_DECL() + + // XContentProvider + virtual ::com::sun::star::uno::Reference< + ::com::sun::star::ucb::XContent > SAL_CALL + queryContent( const ::com::sun::star::uno::Reference< + ::com::sun::star::ucb::XContentIdentifier >& Identifier ) + throw( ::com::sun::star::ucb::IllegalIdentifierException, + ::com::sun::star::uno::RuntimeException ); + + ////////////////////////////////////////////////////////////////////// + // Additional interfaces + ////////////////////////////////////////////////////////////////////// + + ////////////////////////////////////////////////////////////////////// + // Non-interface methods. + ////////////////////////////////////////////////////////////////////// + + rtl::Reference< DAVSessionFactory > getDAVSessionFactory() + { return m_xDAVSessionFactory; } + + bool getProperty( const ::rtl::OUString & rPropName, + ::com::sun::star::beans::Property & rProp, + bool bStrict = false ); +}; + +} + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/webdavresponseparser.cxx b/ucb/source/ucp/webdav/webdavresponseparser.cxx new file mode 100644 index 000000000000..cc28ef1039da --- /dev/null +++ b/ucb/source/ucp/webdav/webdavresponseparser.cxx @@ -0,0 +1,888 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_ucb.hxx" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +////////////////////////////////////////////////////////////////////////////// + +using namespace com::sun::star; + +////////////////////////////////////////////////////////////////////////////// +// WebDAVNamespace enum and StringToEnum converter + +namespace +{ + enum WebDAVNamespace + { + WebDAVNamespace_unknown = 0, + WebDAVNamespace_DAV, + WebDAVNamespace_ucb_openoffice_org_dav_props, + + WebDAVNamespace_last + }; + + WebDAVNamespace StrToWebDAVNamespace(const rtl::OUString& rStr) + { + static ::rtl::OUString aStrDAV(::rtl::OUString::createFromAscii("DAV:")); + static ::rtl::OUString aStrUcbOpenofficeOrgDAVProps(::rtl::OUString::createFromAscii("http://ucb.openoffice.org/dav/props/")); + + if(rStr.equals(aStrDAV)) + { + return WebDAVNamespace_DAV; + } + else if(rStr.equals(aStrUcbOpenofficeOrgDAVProps)) + { + return WebDAVNamespace_ucb_openoffice_org_dav_props; + } + + return WebDAVNamespace_unknown; + } +} // end of anonymous namespace + +////////////////////////////////////////////////////////////////////////////// +// WebDAVName enum and StringToEnum converter using hash_map + +namespace +{ + enum WebDAVName + { + WebDAVName_unknown = 0, + WebDAVName_multistatus, + WebDAVName_response, + WebDAVName_href, + WebDAVName_propstat, + WebDAVName_prop, + WebDAVName_resourcetype, + WebDAVName_collection, + WebDAVName_getcontenttype, + WebDAVName_supportedlock, + WebDAVName_lockentry, + WebDAVName_lockscope, + WebDAVName_exclusive, + WebDAVName_locktype, + WebDAVName_write, + WebDAVName_shared, + WebDAVName_status, + WebDAVName_getlastmodified, + WebDAVName_creationdate, + WebDAVName_getcontentlength, + + WebDAVName_last + }; + + WebDAVName StrToWebDAVName(const rtl::OUString& rStr) + { + typedef std::hash_map< rtl::OUString, WebDAVName, rtl::OUStringHash > WebDAVNameMapper; + typedef std::pair< rtl::OUString, WebDAVName > WebDAVNameValueType; + static WebDAVNameMapper aWebDAVNameMapperList; + + if(aWebDAVNameMapperList.empty()) + { + aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("multistatus"), WebDAVName_multistatus)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("response"), WebDAVName_response)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("href"), WebDAVName_href)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("propstat"), WebDAVName_propstat)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("prop"), WebDAVName_prop)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("resourcetype"), WebDAVName_resourcetype)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("collection"), WebDAVName_collection)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("getcontenttype"), WebDAVName_getcontenttype)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("supportedlock"), WebDAVName_supportedlock)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("lockentry"), WebDAVName_lockentry)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("lockscope"), WebDAVName_lockscope)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("exclusive"), WebDAVName_exclusive)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("locktype"), WebDAVName_locktype)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("write"), WebDAVName_write)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("shared"), WebDAVName_shared)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("status"), WebDAVName_status)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("getlastmodified"), WebDAVName_getlastmodified)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("creationdate"), WebDAVName_creationdate)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("getcontentlength"), WebDAVName_getcontentlength)); + } + + const WebDAVNameMapper::const_iterator aResult(aWebDAVNameMapperList.find(rStr)); + + if(aResult == aWebDAVNameMapperList.end()) + { + return WebDAVName_unknown; + } + else + { + return aResult->second; + } + } +} // end of anonymous namespace + +////////////////////////////////////////////////////////////////////////////// +// WebDAVContext, holding information for each start/endElement pair + +namespace +{ + typedef std::map< ::rtl::OUString, ::rtl::OUString > NamespaceMap; + typedef std::pair< const ::rtl::OUString, ::rtl::OUString > NamespaceValueType; + + class WebDAVContext + { + private: + WebDAVContext* mpParent; + NamespaceMap maNamespaceMap; + ::rtl::OUString maWhiteSpace; + + ::rtl::OUString maNamespace; + ::rtl::OUString maName; + + WebDAVNamespace maWebDAVNamespace; + WebDAVName maWebDAVName; + + // local helpers + void parseForNamespaceTokens(const uno::Reference< xml::sax::XAttributeList >& xAttribs); + ::rtl::OUString mapNamespaceToken(const ::rtl::OUString& rToken) const; + void splitName(const ::rtl::OUString& rSource); + + public: + WebDAVContext(WebDAVContext* pParent, const ::rtl::OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs); + ~WebDAVContext(); + + WebDAVContext* getParent() const { return mpParent; } + ::rtl::OUString& getWhiteSpace() { return maWhiteSpace; } + void setWhiteSpace(const ::rtl::OUString& rNew) { maWhiteSpace = rNew; } + + const ::rtl::OUString& getNamespace() const { return maNamespace; } + const ::rtl::OUString& getName() const { return maName; } + const WebDAVNamespace getWebDAVNamespace() const { return maWebDAVNamespace; } + const WebDAVName getWebDAVName() const { return maWebDAVName; } + }; + + void WebDAVContext::parseForNamespaceTokens(const uno::Reference< xml::sax::XAttributeList >& xAttribs) + { + const sal_Int16 nAttributes(xAttribs->getLength()); + static ::rtl::OUString aStrXmlns(::rtl::OUString::createFromAscii("xmlns")); + + for(sal_Int16 a(0); a < nAttributes; a++) + { + const ::rtl::OUString aName(xAttribs->getNameByIndex(a)); + const sal_Int32 nLen(aName.getLength()); + + if(nLen) + { + if(aName.match(aStrXmlns, 0)) + { + const sal_Int32 nIndex(aName.indexOf(sal_Unicode(':'), 0)); + + if(-1 != nIndex && nIndex + 1 < nLen) + { + const ::rtl::OUString aToken(aName.copy(nIndex + 1)); + + maNamespaceMap.insert(NamespaceValueType(aToken, xAttribs->getValueByIndex(a))); + } + } + } + } + } + + ::rtl::OUString WebDAVContext::mapNamespaceToken(const ::rtl::OUString& rToken) const + { + NamespaceMap::const_iterator iter = maNamespaceMap.find(rToken); + + if(maNamespaceMap.end() == iter) + { + if(getParent()) + { + return getParent()->mapNamespaceToken(rToken); + } + else + { + return rToken; + } + } + else + { + return (*iter).second; + } + } + + void WebDAVContext::splitName(const ::rtl::OUString& rSource) + { + const sal_Int32 nLen(rSource.getLength()); + maNamespace = ::rtl::OUString(); + maName = rSource; + + if(nLen) + { + const sal_Int32 nIndex(rSource.indexOf(sal_Unicode(':'), 0)); + + if(-1 != nIndex && nIndex > 0 && nIndex + 1 < nLen) + { + maNamespace = mapNamespaceToken(rSource.copy(0, nIndex)); + maName = rSource.copy(nIndex + 1); + } + } + } + + WebDAVContext::WebDAVContext(WebDAVContext* pParent, const ::rtl::OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs) + : mpParent(pParent), + maNamespaceMap(), + maWhiteSpace(), + maNamespace(), + maName(), + maWebDAVNamespace(WebDAVNamespace_unknown), + maWebDAVName(WebDAVName_unknown) + { + const sal_Int16 nAttributes(xAttribs->getLength()); + + if(nAttributes) + { + // parse evtl. namespace entries + parseForNamespaceTokens(xAttribs); + } + + // split name to namespace and name + splitName(aName); + + // evaluate enums for namespace and name + maWebDAVNamespace = StrToWebDAVNamespace(maNamespace); + maWebDAVName = StrToWebDAVName(maName); + } + + WebDAVContext::~WebDAVContext() + { + } +} // end of anonymous namespace + +////////////////////////////////////////////////////////////////////////////// +// the Xml parser itself + +namespace +{ + enum WebDAVResponseParserMode + { + WebDAVResponseParserMode_PropFind = 0, + WebDAVResponseParserMode_PropName + }; + + class WebDAVResponseParser : public cppu::WeakImplHelper1< com::sun::star::xml::sax::XDocumentHandler > + { + private: + std::vector< http_dav_ucp::DAVResource > maResult_PropFind; + std::vector< http_dav_ucp::DAVResourceInfo > maResult_PropName; + + WebDAVContext* mpContext; + ::rtl::OUString maHref; + ::rtl::OUString maStatus; + std::vector< http_dav_ucp::DAVPropertyValue > maResponseProperties; + std::vector< http_dav_ucp::DAVPropertyValue > maPropStatProperties; + std::vector< ::rtl::OUString > maResponseNames; + std::vector< ::rtl::OUString > maPropStatNames; + uno::Sequence< ucb::LockEntry > maLockEntries; + ucb::LockScope maLockScope; + ucb::LockType maLockType; + WebDAVResponseParserMode meWebDAVResponseParserMode; + + // bitfield + bool mbResourceTypeCollection : 1; + bool mbLockScopeSet : 1; + bool mbLockTypeSet : 1; + + // local helpers + bool whitespaceIsAvailable() const + { + return mpContext && mpContext->getWhiteSpace().getLength(); + } + bool hasParent(WebDAVName aWebDAVName) const + { + return mpContext && mpContext->getParent() && aWebDAVName == mpContext->getParent()->getWebDAVName(); + } + bool propertyIsReady() const + { + return hasParent(WebDAVName_prop) && whitespaceIsAvailable(); + } + bool isCollectingProperties() const + { + return WebDAVResponseParserMode_PropFind == meWebDAVResponseParserMode; + } + bool isCollectingPropNames() const + { + return WebDAVResponseParserMode_PropName == meWebDAVResponseParserMode; + } + bool collectThisPropertyAsName() const + { + return isCollectingPropNames() && hasParent(WebDAVName_prop); + } + void pop_context() + { + if(mpContext) + { + WebDAVContext* pTemp = mpContext; + mpContext = mpContext->getParent(); + delete pTemp; + } + else + { + OSL_ENSURE(false, "Parser context pop without context (!)"); + } + } + + public: + WebDAVResponseParser(WebDAVResponseParserMode eWebDAVResponseParserMode); + ~WebDAVResponseParser(); + + // Methods XDocumentHandler + virtual void SAL_CALL startDocument( ) throw (xml::sax::SAXException, uno::RuntimeException); + virtual void SAL_CALL endDocument( ) throw (xml::sax::SAXException, uno::RuntimeException); + virtual void SAL_CALL startElement( const ::rtl::OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException); + virtual void SAL_CALL endElement( const ::rtl::OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException); + virtual void SAL_CALL characters( const ::rtl::OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException); + virtual void SAL_CALL ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw (xml::sax::SAXException, uno::RuntimeException); + virtual void SAL_CALL processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData ) throw (xml::sax::SAXException, uno::RuntimeException); + virtual void SAL_CALL setDocumentLocator( const uno::Reference< xml::sax::XLocator >& xLocator ) throw (xml::sax::SAXException, uno::RuntimeException); + + const std::vector< http_dav_ucp::DAVResource >& getResult_PropFind() const { return maResult_PropFind; } + const std::vector< http_dav_ucp::DAVResourceInfo >& getResult_PropName() const { return maResult_PropName; } + }; + + WebDAVResponseParser::WebDAVResponseParser(WebDAVResponseParserMode eWebDAVResponseParserMode) + : maResult_PropFind(), + maResult_PropName(), + mpContext(0), + maHref(), + maStatus(), + maResponseProperties(), + maPropStatProperties(), + maResponseNames(), + maPropStatNames(), + maLockEntries(), + maLockScope(ucb::LockScope_EXCLUSIVE), + maLockType(ucb::LockType_WRITE), + meWebDAVResponseParserMode(eWebDAVResponseParserMode), + mbResourceTypeCollection(false), + mbLockScopeSet(false), + mbLockTypeSet(false) + { + } + + WebDAVResponseParser::~WebDAVResponseParser() + { + OSL_ENSURE(!mpContext, "Parser destructed with existing content (!)"); + while(mpContext) + { + pop_context(); + } + } + + void SAL_CALL WebDAVResponseParser::startDocument( ) throw (xml::sax::SAXException, uno::RuntimeException) + { + OSL_ENSURE(!mpContext, "Parser start with existing content (!)"); + } + + void SAL_CALL WebDAVResponseParser::endDocument( ) throw (xml::sax::SAXException, uno::RuntimeException) + { + OSL_ENSURE(!mpContext, "Parser end with existing content (!)"); + } + + void SAL_CALL WebDAVResponseParser::startElement( const ::rtl::OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException) + { + const sal_Int32 nLen(aName.getLength()); + + if(nLen) + { + // create new context (push) + mpContext = new WebDAVContext(mpContext, aName, xAttribs); + + if(collectThisPropertyAsName()) + { + // When collecting property names and parent is prop there is no need + // to handle the content of this property deeper (evtl. preparations) + } + else + { + switch(mpContext->getWebDAVNamespace()) + { + default: // WebDAVNamespace_unknown, WebDAVNamespace_last or unhandled + { + break; + } + case WebDAVNamespace_DAV: + { + switch(mpContext->getWebDAVName()) + { + default: // WebDAVName_unknown, WebDAVName_last or unhandled + { + break; + } + case WebDAVName_propstat: + { + // propstat start + if(isCollectingProperties()) + { + // reset maPropStatProperties + maPropStatProperties.clear(); + } + else + { + // when collecting properties reset maPropStatNames + maPropStatNames.clear(); + } + break; + } + case WebDAVName_response: + { + // response start, reset Href and status and maResponseProperties + maHref = maStatus = ::rtl::OUString(); + + if(isCollectingProperties()) + { + // reset maResponseProperties + maResponseProperties.clear(); + } + else + { + // reset maResponseNames when collecting properties + maResponseNames.clear(); + } + break; + } + case WebDAVName_resourcetype: + { + // resourcetype start, reset collection + mbResourceTypeCollection = false; + break; + } + case WebDAVName_supportedlock: + { + // supportedlock start, reset maLockEntries + maLockEntries.realloc(0); + break; + } + case WebDAVName_lockentry: + { + // lockentry start, reset maLockEntries + mbLockScopeSet = false; + mbLockTypeSet = false; + break; + } + } + break; + } + case WebDAVNamespace_ucb_openoffice_org_dav_props: + { + break; + } + } + } + } + } + + void SAL_CALL WebDAVResponseParser::endElement( const ::rtl::OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException) + { + const sal_Int32 nLen(aName.getLength()); + OSL_ENSURE(mpContext, "Parser EndElement without content (!)"); + + if(mpContext && nLen) + { + if(collectThisPropertyAsName()) + { + // When collecting property names and parent is prop, just append the prop name + // to the collection, no need to parse deeper + maPropStatNames.push_back(mpContext->getNamespace() + mpContext->getName()); + } + else + { + switch(mpContext->getWebDAVNamespace()) + { + default: // WebDAVNamespace_unknown, WebDAVNamespace_last or unhandled + { + break; + } + case WebDAVNamespace_DAV: + { + switch(mpContext->getWebDAVName()) + { + default: // WebDAVName_unknown, WebDAVName_last or unhandled + { + break; + } + case WebDAVName_href: + { + // href end, save it if we have whitespace + if(whitespaceIsAvailable()) + { + maHref = mpContext->getWhiteSpace(); + } + break; + } + case WebDAVName_status: + { + // status end, save it if we have whitespace + if(whitespaceIsAvailable()) + { + maStatus = mpContext->getWhiteSpace(); + } + break; + } + case WebDAVName_getlastmodified: + { + // getlastmodified end, safe if content is correct + if(propertyIsReady()) + { + static rtl::OUString aStr(rtl::OUString::createFromAscii("DAV:getlastmodified")); + http_dav_ucp::DAVPropertyValue aDAVPropertyValue; + + aDAVPropertyValue.Name = aStr; + aDAVPropertyValue.Value <<= mpContext->getWhiteSpace(); + maPropStatProperties.push_back(aDAVPropertyValue); + } + break; + } + case WebDAVName_creationdate: + { + // creationdate end, safe if content is correct + if(propertyIsReady()) + { + static rtl::OUString aStr(rtl::OUString::createFromAscii("DAV:creationdate")); + http_dav_ucp::DAVPropertyValue aDAVPropertyValue; + + aDAVPropertyValue.Name = aStr; + aDAVPropertyValue.Value <<= mpContext->getWhiteSpace(); + maPropStatProperties.push_back(aDAVPropertyValue); + } + break; + } + case WebDAVName_collection: + { + // collection end, check and set + if(hasParent(WebDAVName_resourcetype)) + { + mbResourceTypeCollection = true; + } + break; + } + case WebDAVName_resourcetype: + { + // resourcetype end, check for collection + if(hasParent(WebDAVName_prop)) + { + static rtl::OUString aStrA(rtl::OUString::createFromAscii("DAV:resourcetype")); + static rtl::OUString aStrB(rtl::OUString::createFromAscii("collection")); + http_dav_ucp::DAVPropertyValue aDAVPropertyValue; + + aDAVPropertyValue.Name = aStrA; + aDAVPropertyValue.Value <<= (mbResourceTypeCollection ? aStrB : rtl::OUString()); + maPropStatProperties.push_back(aDAVPropertyValue); + } + break; + } + case WebDAVName_getcontentlength: + { + // getcontentlength end, safe if content is correct + if(propertyIsReady()) + { + static rtl::OUString aStr(rtl::OUString::createFromAscii("DAV:getcontentlength")); + http_dav_ucp::DAVPropertyValue aDAVPropertyValue; + + aDAVPropertyValue.Name = aStr; + aDAVPropertyValue.Value <<= mpContext->getWhiteSpace(); + maPropStatProperties.push_back(aDAVPropertyValue); + } + break; + } + case WebDAVName_getcontenttype: + { + // getcontenttype end, safe if content is correct + if(propertyIsReady()) + { + static rtl::OUString aStr(rtl::OUString::createFromAscii("DAV:getcontenttype")); + http_dav_ucp::DAVPropertyValue aDAVPropertyValue; + + aDAVPropertyValue.Name = aStr; + aDAVPropertyValue.Value <<= mpContext->getWhiteSpace(); + maPropStatProperties.push_back(aDAVPropertyValue); + } + break; + } + case WebDAVName_supportedlock: + { + // supportedlock end + if(hasParent(WebDAVName_prop) && maLockEntries.hasElements()) + { + static rtl::OUString aStr(rtl::OUString::createFromAscii("DAV:supportedlock")); + http_dav_ucp::DAVPropertyValue aDAVPropertyValue; + + aDAVPropertyValue.Name = aStr; + aDAVPropertyValue.Value <<= maLockEntries; + maPropStatProperties.push_back(aDAVPropertyValue); + } + break; + } + case WebDAVName_lockentry: + { + // lockentry end + if(hasParent(WebDAVName_supportedlock) && (mbLockScopeSet && mbLockTypeSet)) + { + const sal_Int32 nLength(maLockEntries.getLength()); + ucb::LockEntry aEntry; + + aEntry.Scope = maLockScope; + aEntry.Type = maLockType; + maLockEntries.realloc(nLength + 1); + maLockEntries[nLength] = aEntry; + } + break; + } + case WebDAVName_exclusive: + { + // exclusive lockscope end + if(hasParent(WebDAVName_lockscope)) + { + maLockScope = ucb::LockScope_EXCLUSIVE; + mbLockScopeSet = true; + } + break; + } + case WebDAVName_shared: + { + // shared lockscope end + if(hasParent(WebDAVName_lockscope)) + { + maLockScope = ucb::LockScope_SHARED; + mbLockScopeSet = true; + } + break; + } + case WebDAVName_write: + { + // write locktype end + if(hasParent(WebDAVName_locktype)) + { + maLockType = ucb::LockType_WRITE; + mbLockTypeSet = true; + } + break; + } + case WebDAVName_propstat: + { + // propstat end, check status + if(maStatus.getLength()) + { + static ::rtl::OUString aStrStatusOkay(::rtl::OUString::createFromAscii("HTTP/1.1 200 OK")); + + if(maStatus.equals(aStrStatusOkay)) + { + if(isCollectingProperties()) + { + if(maPropStatProperties.size()) + { + // append to maResponseProperties if okay + maResponseProperties.insert(maResponseProperties.end(), maPropStatProperties.begin(), maPropStatProperties.end()); + } + } + else + { + if(maPropStatNames.size()) + { + // when collecting properties append to + maResponseNames.insert(maResponseNames.end(), maPropStatNames.begin(), maPropStatNames.end()); + } + } + } + } + break; + } + case WebDAVName_response: + { + // respose end + if(maHref.getLength()) + { + if(isCollectingProperties()) + { + // create DAVResource when we have content + if(maResponseProperties.size()) + { + http_dav_ucp::DAVResource aDAVResource; + + aDAVResource.uri = maHref; + aDAVResource.properties = maResponseProperties; + maResult_PropFind.push_back(aDAVResource); + } + } + else + { + // when collecting properties add them to result when there are some + if(maResponseNames.size()) + { + http_dav_ucp::DAVResourceInfo aDAVResourceInfo(maHref); + + aDAVResourceInfo.properties = maResponseNames; + maResult_PropName.push_back(aDAVResourceInfo); + } + } + } + break; + } + } + break; + } + case WebDAVNamespace_ucb_openoffice_org_dav_props: + { + break; + } + } + } + + // destroy last context (pop) + pop_context(); + } + } + + void SAL_CALL WebDAVResponseParser::characters( const ::rtl::OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException) + { + // collect whitespace over evtl. several calls in mpContext + OSL_ENSURE(mpContext, "Parser characters without content (!)"); + const sal_Int32 nLen(aChars.getLength()); + + if(mpContext && nLen) + { + // remove leading/trailing blanks and CRLF + const ::rtl::OUString aTrimmedChars(aChars.trim()); + + if(aTrimmedChars.getLength()) + { + ::rtl::OUString aNew(mpContext->getWhiteSpace()); + + if(aNew.getLength()) + { + // add one char when appending (see html1.1 spec) + aNew += ::rtl::OUString(sal_Unicode(' ')); + } + + aNew += aTrimmedChars; + mpContext->setWhiteSpace(aNew); + } + } + } + + void SAL_CALL WebDAVResponseParser::ignorableWhitespace( const ::rtl::OUString& /*aWhitespaces*/ ) throw (xml::sax::SAXException, uno::RuntimeException) + { + } + + void SAL_CALL WebDAVResponseParser::processingInstruction( const ::rtl::OUString& /*aTarget*/, const ::rtl::OUString& /*aData*/ ) throw (xml::sax::SAXException, uno::RuntimeException) + { + } + + void SAL_CALL WebDAVResponseParser::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& /*xLocator*/ ) throw (xml::sax::SAXException, uno::RuntimeException) + { + } +} // end of anonymous namespace + +////////////////////////////////////////////////////////////////////////////// +// wrapper for various calls to the parser + +namespace +{ + void parseWebDAVPropNameResponse( + const uno::Reference< io::XInputStream >& xInputStream, + std::vector< http_dav_ucp::DAVResource >& rPropFind, + std::vector< http_dav_ucp::DAVResourceInfo >& rPropName, + WebDAVResponseParserMode eWebDAVResponseParserMode) + { + if(xInputStream.is()) + { + try + { + // prepare ParserInputSrouce + xml::sax::InputSource myInputSource; + myInputSource.aInputStream = xInputStream; + + // get parser + uno::Reference< xml::sax::XParser > xParser( + comphelper::getProcessServiceFactory()->createInstance( + rtl::OUString::createFromAscii("com.sun.star.xml.sax.Parser") ), + uno::UNO_QUERY_THROW ); + + // create parser; connect parser and filter + WebDAVResponseParser* pWebDAVResponseParser = new WebDAVResponseParser(eWebDAVResponseParserMode); + uno::Reference< xml::sax::XDocumentHandler > xWebDAVHdl(pWebDAVResponseParser); + xParser->setDocumentHandler(xWebDAVHdl); + + // finally, parse the stream + xParser->parseStream(myInputSource); + + // get result + switch(eWebDAVResponseParserMode) + { + case WebDAVResponseParserMode_PropFind: + { + rPropFind = pWebDAVResponseParser->getResult_PropFind(); + break; + } + case WebDAVResponseParserMode_PropName: + { + rPropName = pWebDAVResponseParser->getResult_PropName(); + break; + } + } + } + catch(uno::Exception&) + { + OSL_ENSURE(false, "WebDAV Parse error (!)"); + } + } + } +} // end of anonymous namespace + +////////////////////////////////////////////////////////////////////////////// +// helper to parse a XML WebDAV response + +namespace http_dav_ucp +{ + std::vector< DAVResource > parseWebDAVPropFindResponse(const uno::Reference< io::XInputStream >& xInputStream) + { + std::vector< DAVResource > aRetval; + std::vector< DAVResourceInfo > aFoo; + + parseWebDAVPropNameResponse(xInputStream, aRetval, aFoo, WebDAVResponseParserMode_PropFind); + return aRetval; + } + + std::vector< DAVResourceInfo > parseWebDAVPropNameResponse(const uno::Reference< io::XInputStream >& xInputStream) + { + std::vector< DAVResource > aFoo; + std::vector< DAVResourceInfo > aRetval; + + parseWebDAVPropNameResponse(xInputStream, aFoo, aRetval, WebDAVResponseParserMode_PropName); + return aRetval; + } +} // namespace http_dav_ucp + +////////////////////////////////////////////////////////////////////////////// +// eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/webdavresponseparser.hxx b/ucb/source/ucp/webdav/webdavresponseparser.hxx new file mode 100644 index 000000000000..d59cb2ad7a53 --- /dev/null +++ b/ucb/source/ucp/webdav/webdavresponseparser.hxx @@ -0,0 +1,43 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef _WEBDAVRESPONSEPARSER_HXX_ +#define _WEBDAVRESPONSEPARSER_HXX_ + +#include +#include +#include +#include + +////////////////////////////////////////////////////////////////////////////// + +namespace http_dav_ucp +{ + std::vector< DAVResource > parseWebDAVPropFindResponse(const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& xInputStream); + std::vector< DAVResourceInfo > parseWebDAVPropNameResponse(const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& xInputStream); +} // namespace http_dav_ucp + +////////////////////////////////////////////////////////////////////////////// + +#endif // _WEBDAVRESPONSEPARSER_HXX_ + +////////////////////////////////////////////////////////////////////////////// +// eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/webdavresultset.cxx b/ucb/source/ucp/webdav/webdavresultset.cxx new file mode 100644 index 000000000000..22232ebabfe7 --- /dev/null +++ b/ucb/source/ucp/webdav/webdavresultset.cxx @@ -0,0 +1,90 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + + + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_ucb.hxx" + +/************************************************************************** + TODO + ************************************************************************** + + - This implementation is not a dynamic result set!!! It only implements + the necessary interfaces, but never recognizes/notifies changes!!! + + *************************************************************************/ +#include "webdavresultset.hxx" +#ifndef _WEBDAV_SESSION_HXX +#include "DAVSession.hxx" +#endif + +using namespace com::sun::star; +using namespace http_dav_ucp; + +//========================================================================= +//========================================================================= +// +// DynamicResultSet Implementation. +// +//========================================================================= +//========================================================================= + +DynamicResultSet::DynamicResultSet( + const uno::Reference< lang::XMultiServiceFactory >& rxSMgr, + const rtl::Reference< Content >& rxContent, + const ucb::OpenCommandArgument2& rCommand, + const uno::Reference< ucb::XCommandEnvironment >& rxEnv ) +: ResultSetImplHelper( rxSMgr, rCommand ), + m_xContent( rxContent ), + m_xEnv( rxEnv ) +{ +} + +//========================================================================= +// +// Non-interface methods. +// +//========================================================================= + +void DynamicResultSet::initStatic() +{ + m_xResultSet1 + = new ::ucbhelper::ResultSet( m_xSMgr, + m_aCommand.Properties, + new DataSupplier( m_xSMgr, + m_xContent, + m_aCommand.Mode ), + m_xEnv ); +} + +//========================================================================= +void DynamicResultSet::initDynamic() +{ + m_xResultSet1 + = new ::ucbhelper::ResultSet( m_xSMgr, + m_aCommand.Properties, + new DataSupplier( m_xSMgr, + m_xContent, + m_aCommand.Mode ), + m_xEnv ); + m_xResultSet2 = m_xResultSet1; +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/webdavresultset.hxx b/ucb/source/ucp/webdav/webdavresultset.hxx new file mode 100644 index 000000000000..998867277308 --- /dev/null +++ b/ucb/source/ucp/webdav/webdavresultset.hxx @@ -0,0 +1,55 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + + + +#ifndef _WEBDAV_UCP_RESULTSET_HXX +#define _WEBDAV_UCP_RESULTSET_HXX + +#include +#include +#include "webdavcontent.hxx" +#include "webdavdatasupplier.hxx" + +namespace http_dav_ucp { + +class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper +{ + rtl::Reference< Content > m_xContent; + com::sun::star::uno::Reference< + com::sun::star::ucb::XCommandEnvironment > m_xEnv; + +private: + virtual void initStatic(); + virtual void initDynamic(); + +public: + DynamicResultSet( const com::sun::star::uno::Reference< + com::sun::star::lang::XMultiServiceFactory >& rxSMgr, + const rtl::Reference< Content >& rxContent, + const com::sun::star::ucb::OpenCommandArgument2& rCommand, + const com::sun::star::uno::Reference< + com::sun::star::ucb::XCommandEnvironment >& rxEnv ); +}; + +} + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/webdavservices.cxx b/ucb/source/ucp/webdav/webdavservices.cxx new file mode 100644 index 000000000000..fb8fd6e01bf9 --- /dev/null +++ b/ucb/source/ucp/webdav/webdavservices.cxx @@ -0,0 +1,71 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + + + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_ucb.hxx" +#include +#include +#include +#include "webdavprovider.hxx" + +using namespace com::sun::star; + +//========================================================================= +extern "C" void SAL_CALL component_getImplementationEnvironment( + const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) +{ + *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; +} + +//========================================================================= +extern "C" void * SAL_CALL component_getFactory( + const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) +{ + void * pRet = 0; + + uno::Reference< lang::XMultiServiceFactory > xSMgr( + reinterpret_cast< lang::XMultiServiceFactory * >( + pServiceManager ) ); + uno::Reference< lang::XSingleServiceFactory > xFactory; + + ////////////////////////////////////////////////////////////////////// + // WebDAV Content Provider. + ////////////////////////////////////////////////////////////////////// + + if ( ::http_dav_ucp::ContentProvider::getImplementationName_Static(). + compareToAscii( pImplName ) == 0 ) + { + xFactory = ::http_dav_ucp::ContentProvider::createServiceFactory( xSMgr ); + } + + ////////////////////////////////////////////////////////////////////// + + if ( xFactory.is() ) + { + xFactory->acquire(); + pRet = xFactory.get(); + } + + return pRet; +} + + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/test/com/sun/star/comp/ucb/makefile.mk b/ucb/test/com/sun/star/comp/ucb/makefile.mk index bab29edc8fbc..99fe6e11993b 100644 --- a/ucb/test/com/sun/star/comp/ucb/makefile.mk +++ b/ucb/test/com/sun/star/comp/ucb/makefile.mk @@ -1,29 +1,20 @@ -#************************************************************************* # -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. +# This file is part of the LibreOffice project. # -# OpenOffice.org - a multi-platform office productivity suite +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# This file is part of OpenOffice.org. +# This file incorporates work covered by the following license notice: # -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . # -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* PRJ := ..$/..$/..$/..$/..$/.. PRJNAME := ucb diff --git a/ucb/workben/cachemap/cachemapobjectcontainer2.hxx b/ucb/workben/cachemap/cachemapobjectcontainer2.hxx index c875bb3333b7..99b6a65895ac 100644 --- a/ucb/workben/cachemap/cachemapobjectcontainer2.hxx +++ b/ucb/workben/cachemap/cachemapobjectcontainer2.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_UCB_CACHEMAPOBJECTCONTAINER2_HXX #define INCLUDED_UCB_CACHEMAPOBJECTCONTAINER2_HXX diff --git a/ucb/workben/ucb/makefile.mk b/ucb/workben/ucb/makefile.mk index a711ef7df909..fc30c5912fab 100644 --- a/ucb/workben/ucb/makefile.mk +++ b/ucb/workben/ucb/makefile.mk @@ -1,29 +1,20 @@ -#************************************************************************* # -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. +# This file is part of the LibreOffice project. # -# OpenOffice.org - a multi-platform office productivity suite +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# This file is part of OpenOffice.org. +# This file incorporates work covered by the following license notice: # -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . # -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* PRJ=..$/.. diff --git a/ucb/workben/ucb/ucbdemo.cxx b/ucb/workben/ucb/ucbdemo.cxx index 6d557538a0b5..667bcd54b74f 100644 --- a/ucb/workben/ucb/ucbdemo.cxx +++ b/ucb/workben/ucb/ucbdemo.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include From 31cccbfb880c97118056153e32225177b6de4884 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Thu, 4 Oct 2012 21:22:19 +0200 Subject: [PATCH 314/863] use correct LangID in currency key Change-Id: Id93dbccac2495491350c2cbcd7348d98f54a211a --- i18npool/source/localedata/data/tyx_CG.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/i18npool/source/localedata/data/tyx_CG.xml b/i18npool/source/localedata/data/tyx_CG.xml index b9b8ed1733e8..9ccd6a9a67e0 100644 --- a/i18npool/source/localedata/data/tyx_CG.xml +++ b/i18npool/source/localedata/data/tyx_CG.xml @@ -51,7 +51,7 @@ LK metric - + D/M General From b738599956964c0e6b5bbdc0baa9b3eb5c1a2302 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Thu, 4 Oct 2012 21:24:41 +0200 Subject: [PATCH 315/863] use correct LangID in currency key Change-Id: I2607e2cfcee151f4fda05f2eb47d860ac9d1079a --- i18npool/source/localedata/data/ebo_CG.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/i18npool/source/localedata/data/ebo_CG.xml b/i18npool/source/localedata/data/ebo_CG.xml index cec85210d3de..244a0063ba5a 100644 --- a/i18npool/source/localedata/data/ebo_CG.xml +++ b/i18npool/source/localedata/data/ebo_CG.xml @@ -51,7 +51,7 @@ LK metric - + D/M General From 5a651522acb42fcffa6defc212cb8d0e9b9b7d3f Mon Sep 17 00:00:00 2001 From: Noel Power Date: Thu, 4 Oct 2012 17:02:18 +0100 Subject: [PATCH 316/863] really export default row heights for xlsx fdo#55621 Change-Id: Icdf581cd7ae245f2749fecf00957bc9524f717d8 --- sc/source/filter/excel/xetable.cxx | 7 +++++++ sc/source/filter/inc/xetable.hxx | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index d3f6028f8747..bebb239e9289 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -2450,6 +2450,13 @@ void XclExpCellTable::Save( XclExpStream& rStrm ) void XclExpCellTable::SaveXml( XclExpXmlStream& rStrm ) { + // DEFAULT row height + XclExpDefaultRowData& rDefData = mxDefrowheight->GetDefaultData(); + sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream(); + rWorksheet->startElement( XML_sheetFormatPr, + XML_defaultRowHeight, OString::valueOf( (double) rDefData.mnHeight / 20.0 ).getStr(), FSEND ); + rWorksheet->endElement( XML_sheetFormatPr ); + maColInfoBfr.SaveXml( rStrm ); maRowBfr.SaveXml( rStrm ); mxExtLst->SaveXml( rStrm ); diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx index bbf04fd1d6e1..6fff7ddcc589 100644 --- a/sc/source/filter/inc/xetable.hxx +++ b/sc/source/filter/inc/xetable.hxx @@ -852,7 +852,7 @@ public: /** Sets the passed default data as current record contents. */ void SetDefaultData( const XclExpDefaultRowData& rDefData ); - + XclExpDefaultRowData& GetDefaultData() { return maDefData; } private: /** Writes the contents of the record. */ virtual void WriteBody( XclExpStream& rStrm ); From 414ac85bfee7d034668e954e0f68751852c24062 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 25 Sep 2012 15:11:54 +0200 Subject: [PATCH 317/863] sal_Bool -> bool in comphelper Change-Id: Id9f4aef6c7453cebd83dcaedf2ad7427e03cc960 --- comphelper/inc/comphelper/propagg.hxx | 12 ++++++------ comphelper/source/property/propagg.cxx | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/comphelper/inc/comphelper/propagg.hxx b/comphelper/inc/comphelper/propagg.hxx index 305c5524d898..f499b2091a33 100644 --- a/comphelper/inc/comphelper/propagg.hxx +++ b/comphelper/inc/comphelper/propagg.hxx @@ -45,15 +45,15 @@ namespace internal { sal_Int32 nOriginalHandle; sal_Int32 nPos; - sal_Bool bAggregate; + bool bAggregate; - OPropertyAccessor(sal_Int32 _nOriginalHandle, sal_Int32 _nPos, sal_Bool _bAggregate) + OPropertyAccessor(sal_Int32 _nOriginalHandle, sal_Int32 _nPos, bool _bAggregate) :nOriginalHandle(_nOriginalHandle) ,nPos(_nPos) ,bAggregate(_bAggregate) { } OPropertyAccessor() - :nOriginalHandle(-1) ,nPos(-1) ,bAggregate(sal_False) { } + :nOriginalHandle(-1) ,nPos(-1) ,bAggregate(false) { } - sal_Bool operator==(const OPropertyAccessor& rOb) const { return nPos == rOb.nPos; } - sal_Bool operator <(const OPropertyAccessor& rOb) const { return nPos < rOb.nPos; } + bool operator==(const OPropertyAccessor& rOb) const { return nPos == rOb.nPos; } + bool operator <(const OPropertyAccessor& rOb) const { return nPos < rOb.nPos; } }; typedef std::map< sal_Int32, OPropertyAccessor, ::std::less< sal_Int32 > > PropertyAccessorMap; @@ -149,7 +149,7 @@ public: @return sal_True, if _nHandle marks an aggregate property, otherwise sal_False */ - virtual sal_Bool SAL_CALL fillAggregatePropertyInfoByHandle(::rtl::OUString* _pPropName, sal_Int32* _pOriginalHandle, + virtual bool SAL_CALL fillAggregatePropertyInfoByHandle(::rtl::OUString* _pPropName, sal_Int32* _pOriginalHandle, sal_Int32 _nHandle) const; /** returns information about a property given by handle diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx index a2d9ff08cebc..bc24d9499527 100644 --- a/comphelper/source/property/propagg.cxx +++ b/comphelper/source/property/propagg.cxx @@ -226,11 +226,11 @@ sal_Bool OPropertyArrayAggregationHelper::getPropertyByHandle( sal_Int32 _nHandl } //------------------------------------------------------------------------------ -sal_Bool OPropertyArrayAggregationHelper::fillAggregatePropertyInfoByHandle( +bool OPropertyArrayAggregationHelper::fillAggregatePropertyInfoByHandle( ::rtl::OUString* _pPropName, sal_Int32* _pOriginalHandle, sal_Int32 _nHandle) const { ConstPropertyAccessorMapIterator i = m_aPropertyAccessors.find(_nHandle); - sal_Bool bRet = i != m_aPropertyAccessors.end() && (*i).second.bAggregate; + bool bRet = i != m_aPropertyAccessors.end() && (*i).second.bAggregate; if (bRet) { if (_pOriginalHandle) From 4aa117b81ed236bea291007f4722a8ca6fef732e Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 25 Sep 2012 15:13:24 +0200 Subject: [PATCH 318/863] sal_Bool -> bool in comphelper Change-Id: Ib7f2a10a4ff0227a5d5c137602c3c2f353334d24 --- .../source/container/embeddedobjectcontainer.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx index e525478a5f75..13dcb7de8182 100644 --- a/comphelper/source/container/embeddedobjectcontainer.cxx +++ b/comphelper/source/container/embeddedobjectcontainer.cxx @@ -86,7 +86,7 @@ struct EmbedImpl uno::WeakReference < uno::XInterface > m_xModel; //EmbeddedObjectContainerNameMap maTempObjectContainer; //uno::Reference < embed::XStorage > mxTempStorage; - sal_Bool bOwnsStorage; + bool bOwnsStorage; const uno::Reference < embed::XStorage >& GetReplacements(); }; @@ -117,7 +117,7 @@ EmbeddedObjectContainer::EmbeddedObjectContainer() { pImpl = new EmbedImpl; pImpl->mxStorage = ::comphelper::OStorageHelper::GetTemporaryStorage(); - pImpl->bOwnsStorage = sal_True; + pImpl->bOwnsStorage = true; pImpl->mpTempObjectContainer = 0; } @@ -125,7 +125,7 @@ EmbeddedObjectContainer::EmbeddedObjectContainer( const uno::Reference < embed:: { pImpl = new EmbedImpl; pImpl->mxStorage = rStor; - pImpl->bOwnsStorage = sal_False; + pImpl->bOwnsStorage = false; pImpl->mpTempObjectContainer = 0; } @@ -133,7 +133,7 @@ EmbeddedObjectContainer::EmbeddedObjectContainer( const uno::Reference < embed:: { pImpl = new EmbedImpl; pImpl->mxStorage = rStor; - pImpl->bOwnsStorage = sal_False; + pImpl->bOwnsStorage = false; pImpl->mpTempObjectContainer = 0; pImpl->m_xModel = xModel; } @@ -146,7 +146,7 @@ void EmbeddedObjectContainer::SwitchPersistence( const uno::Reference < embed::X pImpl->mxStorage->dispose(); pImpl->mxStorage = rStor; - pImpl->bOwnsStorage = sal_False; + pImpl->bOwnsStorage = false; } sal_Bool EmbeddedObjectContainer::CommitImageSubStorage() From 9ee020af1cece4c8ad09cf6b2522647133ccffd2 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 25 Sep 2012 15:19:10 +0200 Subject: [PATCH 319/863] sal_Bool -> bool in chart2 Change-Id: I60f2ead9986afb13157ac9e6a394ff02bcf4de6f --- .../source/controller/dialogs/ChartTypeDialogController.cxx | 6 +++--- .../source/controller/dialogs/ChartTypeDialogController.hxx | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index ad05e71f9431..ceb5a150f88b 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -62,7 +62,7 @@ ChartTypeParameter::ChartTypeParameter() , nSplineOrder(3) , nGeometry3D(DataPointGeometry3D::CUBOID) , eThreeDLookScheme(ThreeDLookScheme_Realistic) - , bSortByXValues(sal_False) + , bSortByXValues(false) { } @@ -81,7 +81,7 @@ ChartTypeParameter::ChartTypeParameter( sal_Int32 SubTypeIndex, bool HasXAxisWit , nSplineOrder(3) , nGeometry3D(DataPointGeometry3D::CUBOID) , eThreeDLookScheme(ThreeDLookScheme_Realistic) - , bSortByXValues(sal_False) + , bSortByXValues(false) { } ChartTypeParameter::~ChartTypeParameter() @@ -218,7 +218,7 @@ void ChartTypeDialogController::adjustParameterToMainType( ChartTypeParameter& r sal_Int32 nSplineOrder = rParameter.nSplineOrder; CurveStyle eCurveStyle = rParameter.eCurveStyle; sal_Int32 nGeometry3D = rParameter.nGeometry3D; - sal_Bool bSortByXValues = rParameter.bSortByXValues; + bool bSortByXValues = rParameter.bSortByXValues; rParameter = (*aIter).second; diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx index 0904445788d7..43ee9d836df4 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx @@ -82,8 +82,8 @@ public: sal_Int32 nGeometry3D; - ThreeDLookScheme eThreeDLookScheme; - sal_Bool bSortByXValues; + ThreeDLookScheme eThreeDLookScheme; + bool bSortByXValues; }; typedef ::comphelper::MakeMap< ::rtl::OUString, ChartTypeParameter > tTemplateServiceChartTypeParameterMap; From c69280ab4ef3d24d255605620ce5a4faca3ea184 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 25 Sep 2012 15:25:26 +0200 Subject: [PATCH 320/863] sal_Bool -> bool in chart2 Change-Id: Idba76b64746fb1eec0a723a9fcbac025eda3d9a1 --- chart2/source/view/axes/VAxisProperties.cxx | 6 ++---- chart2/source/view/axes/VAxisProperties.hxx | 10 +++++----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx index 049d0e9d08e1..86ec8f2ac6b9 100644 --- a/chart2/source/view/axes/VAxisProperties.cxx +++ b/chart2/source/view/axes/VAxisProperties.cxx @@ -430,11 +430,9 @@ void AxisLabelProperties::init( const uno::Reference< XAxis >& xAxisModel ) } } -sal_Bool AxisLabelProperties::getIsStaggered() const +bool AxisLabelProperties::getIsStaggered() const { - if( STAGGER_ODD == eStaggering || STAGGER_EVEN == eStaggering ) - return sal_True; - return sal_False; + return ( STAGGER_ODD == eStaggering || STAGGER_EVEN == eStaggering ); } //............................................................................. diff --git a/chart2/source/view/axes/VAxisProperties.hxx b/chart2/source/view/axes/VAxisProperties.hxx index 573173cbf859..eda2862bb2ee 100644 --- a/chart2/source/view/axes/VAxisProperties.hxx +++ b/chart2/source/view/axes/VAxisProperties.hxx @@ -70,10 +70,10 @@ struct AxisLabelProperties AxisLabelStaggering eStaggering; - sal_Bool bLineBreakAllowed; - sal_Bool bOverlapAllowed; + bool bLineBreakAllowed; + bool bOverlapAllowed; - sal_Bool bStackCharacters; + bool bStackCharacters; double fRotationAngleDegree; sal_Int32 nRhythm; //show only each nth label with n==nRhythm @@ -83,7 +83,7 @@ struct AxisLabelProperties void init( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxisModel ); - sal_Bool getIsStaggered() const; + bool getIsStaggered() const; }; struct AxisProperties @@ -109,7 +109,7 @@ struct AxisProperties //this direction is used to indicate in which direction inner tickmarks are to be drawn double m_fInnerDirectionSign; LabelAlignment m_aLabelAlignment; - sal_Bool m_bDisplayLabels; + bool m_bDisplayLabels; sal_Int32 m_nNumberFormatKey; From dea967349cea054b20fdfb22d6c59eee08f3faeb Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 25 Sep 2012 15:30:51 +0200 Subject: [PATCH 321/863] sal_Bool -> bool in hwpfilter Change-Id: Ia1b6830ef9ab06a1914abb7f6d5857ce9d845061 --- hwpfilter/source/hwpreader.cxx | 56 +++++++++++++++++----------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx index 44e85441f26c..b3568362d958 100644 --- a/hwpfilter/source/hwpreader.cxx +++ b/hwpfilter/source/hwpreader.cxx @@ -94,16 +94,16 @@ struct HwpReaderPrivate { HwpReaderPrivate() { - bFirstPara = sal_True; - bInBody = sal_False; - bInHeader = sal_False; + bFirstPara = true; + bInBody = false; + bInHeader = false; nPnPos = 0; pPn = 0L; } - sal_Bool bFirstPara; - sal_Bool bInBody; - sal_Bool bInHeader; + bool bFirstPara; + bool bInBody; + bool bInHeader; ShowPageNum *pPn; int nPnPos; }; @@ -196,10 +196,10 @@ void HwpReader::makeBody() rstartEl(ascii("office:body"), rList); makeTextDecls(); HWPPara *hwppara = hwpfile.GetFirstPara(); - d->bInBody = sal_True; + d->bInBody = true; parsePara(hwppara); rendEl(ascii("office:body")); - d->bInBody = sal_False; + d->bInBody = false; } @@ -1109,11 +1109,11 @@ void HwpReader::makeMasterStyles() rstartEl(ascii("style:header"), rList); if( pPage->pagenumber && pPage->pagenumber->where < 4 ) { - d->bInHeader = sal_True; + d->bInHeader = true; d->pPn = pPage->pagenumber; } parsePara(pPage->header->plist.front()); - d->bInHeader = sal_False; + d->bInHeader = false; d->pPn = 0L; rendEl(ascii("style:header")); } @@ -1123,12 +1123,12 @@ void HwpReader::makeMasterStyles() if( pPage->pagenumber && ( pPage->pagenumber->where < 4 || pPage->pagenumber->where == 7 ) ) { - d->bInHeader = sal_True; + d->bInHeader = true; d->pPn = pPage->pagenumber; d->nPnPos = 3; } parsePara(pPage->header_even->plist.front()); - d->bInHeader = sal_False; + d->bInHeader = false; d->pPn = 0L; d->nPnPos = 0; rendEl(ascii("style:header")); @@ -1158,12 +1158,12 @@ void HwpReader::makeMasterStyles() if( pPage->pagenumber && ( pPage->pagenumber->where < 4 || pPage->pagenumber->where == 7 ) ) { - d->bInHeader = sal_True; + d->bInHeader = true; d->nPnPos = 1; d->pPn = pPage->pagenumber; } parsePara(pPage->header_odd->plist.front()); - d->bInHeader = sal_False; + d->bInHeader = false; d->pPn = 0L; d->nPnPos = 0; rendEl(ascii("style:header-left")); @@ -1210,11 +1210,11 @@ void HwpReader::makeMasterStyles() if( pPage->pagenumber && pPage->pagenumber->where >= 4 && pPage->pagenumber->where != 7 ) { - d->bInHeader = sal_True; + d->bInHeader = true; d->pPn = pPage->pagenumber; } parsePara(pPage->footer->plist.front()); - d->bInHeader = sal_False; + d->bInHeader = false; d->pPn = 0L; rendEl(ascii("style:footer")); } @@ -1224,12 +1224,12 @@ void HwpReader::makeMasterStyles() if( pPage->pagenumber && pPage->pagenumber->where >= 4 && pPage->pagenumber->where != 7 ) { - d->bInHeader = sal_True; + d->bInHeader = true; d->pPn = pPage->pagenumber; d->nPnPos = 3; } parsePara(pPage->footer_even->plist.front()); - d->bInHeader = sal_False; + d->bInHeader = false; d->pPn = 0L; d->nPnPos = 0; rendEl(ascii("style:footer")); @@ -1259,12 +1259,12 @@ void HwpReader::makeMasterStyles() if( pPage->pagenumber && pPage->pagenumber->where >= 4 && pPage->pagenumber->where != 7 ) { - d->bInHeader = sal_True; + d->bInHeader = true; d->pPn = pPage->pagenumber; d->nPnPos = 1; } parsePara(pPage->footer_odd->plist.front()); - d->bInHeader = sal_False; + d->bInHeader = false; d->pPn = 0L; d->nPnPos = 0; rendEl(ascii("style:footer-left")); @@ -2722,12 +2722,12 @@ void HwpReader::make_text_p0(HWPPara * para, sal_Bool bParaStart) rstartEl(ascii("text:bookmark"), rList); pList->clear(); rendEl(ascii("text:bookmark")); - d->bFirstPara = sal_False; + d->bFirstPara = false; } if( d->bInHeader ) { makeShowPageNum(); - d->bInHeader = sal_False; + d->bInHeader = false; } padd(ascii("text:style-name"), sXML_CDATA, ascii(getTStyleName(para->cshape.index, buf))); @@ -2793,12 +2793,12 @@ void HwpReader::make_text_p1(HWPPara * para,sal_Bool bParaStart) rstartEl(ascii("text:bookmark"), rList); pList->clear(); rendEl(ascii("text:bookmark")); - d->bFirstPara = sal_False; + d->bFirstPara = false; } if( d->bInHeader ) { makeShowPageNum(); - d->bInHeader = sal_False; + d->bInHeader = false; } padd(ascii("text:style-name"), sXML_CDATA, ascii(getTStyleName(curr, buf))); @@ -2871,14 +2871,14 @@ void HwpReader::make_text_p3(HWPPara * para,sal_Bool bParaStart) rstartEl(ascii("text:bookmark"), rList); pList->clear(); rendEl(ascii("text:bookmark")); - d->bFirstPara = sal_False; + d->bFirstPara = false; } if( d->bInHeader ) { if( !pstart ) STARTP; makeShowPageNum(); - d->bInHeader = sal_False; + d->bInHeader = false; } for (n = 0; n < para->nch && para->hhstr[n]->hh; @@ -4811,12 +4811,12 @@ void HwpReader::parsePara(HWPPara * para, sal_Bool bParaStart) rstartEl(ascii("text:bookmark"), rList); pList->clear(); rendEl(ascii("text:bookmark")); - d->bFirstPara = sal_False; + d->bFirstPara = false; } if( d->bInHeader ) { makeShowPageNum(); - d->bInHeader = sal_False; + d->bInHeader = false; } rendEl( ascii("text:p") ); From b377ccca01070ce096fdf13aafc34020d5bc80ca Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 25 Sep 2012 15:37:34 +0200 Subject: [PATCH 322/863] sal_Bool->bool in lingucomponent Change-Id: Ic3b55606faf60648d3a680b7a60c331047151ab5 --- .../source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx | 4 ++-- .../source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx | 4 ++-- lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx | 2 +- lingucomponent/source/spellcheck/macosxspell/macspellimp.mm | 4 ++-- lingucomponent/source/spellcheck/spell/sspellimp.cxx | 4 ++-- lingucomponent/source/spellcheck/spell/sspellimp.hxx | 4 ++-- lingucomponent/source/thesaurus/libnth/nthesimp.cxx | 4 ++-- lingucomponent/source/thesaurus/libnth/nthesimp.hxx | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx index b3106a054163..f55505285575 100644 --- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx +++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx @@ -84,7 +84,7 @@ using ::rtl::OUString; Hyphenator::Hyphenator() : aEvtListeners ( GetLinguMutex() ) { - bDisposing = sal_False; + bDisposing = false; pPropHelper = NULL; aDicts = NULL; numdict = 0; @@ -860,7 +860,7 @@ void SAL_CALL Hyphenator::dispose() if (!bDisposing) { - bDisposing = sal_True; + bDisposing = true; EventObject aEvtObj( (XHyphenator *) this ); aEvtListeners.disposeAndClear( aEvtObj ); if (pPropHelper) diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx index 933155b3ac02..504c3707347e 100644 --- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx +++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx @@ -88,8 +88,8 @@ class Hyphenator : ::cppu::OInterfaceContainerHelper aEvtListeners; Reference< XMultiServiceFactory > rSMgr; - linguistic::PropertyHelper_Hyphenation* pPropHelper; - sal_Bool bDisposing; + linguistic::PropertyHelper_Hyphenation* pPropHelper; + bool bDisposing; // disallow copy-constructor and assignment-operator for now Hyphenator(const Hyphenator &); diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx index 1f88342c7ea7..d02055113145 100644 --- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx +++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx @@ -88,7 +88,7 @@ class MacSpellChecker : ::cppu::OInterfaceContainerHelper aEvtListeners; Reference< XPropertyChangeListener > xPropHelper; linguistic::PropertyHelper_Spell * pPropHelper; - sal_Bool bDisposing; + bool bDisposing; // disallow copy-constructor and assignment-operator for now MacSpellChecker(const MacSpellChecker &); diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm index c094195b589c..f09e5aa3b5ea 100644 --- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm +++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm @@ -66,7 +66,7 @@ MacSpellChecker::MacSpellChecker() : aDEncs = NULL; aDLocs = NULL; aDNames = NULL; - bDisposing = sal_False; + bDisposing = false; pPropHelper = NULL; numdict = 0; NSApplicationLoad(); @@ -523,7 +523,7 @@ void SAL_CALL if (!bDisposing) { - bDisposing = sal_True; + bDisposing = true; EventObject aEvtObj( (XSpellChecker *) this ); aEvtListeners.disposeAndClear( aEvtObj ); } diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx index 39d67d22fe0f..de1b7b64dc86 100644 --- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx +++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx @@ -81,7 +81,7 @@ SpellChecker::SpellChecker() : numdict(0), aEvtListeners(GetLinguMutex()), pPropHelper(NULL), - bDisposing(sal_False) + bDisposing(false) { } @@ -587,7 +587,7 @@ void SAL_CALL SpellChecker::dispose() if (!bDisposing) { - bDisposing = sal_True; + bDisposing = true; EventObject aEvtObj( (XSpellChecker *) this ); aEvtListeners.disposeAndClear( aEvtObj ); if (pPropHelper) diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.hxx b/lingucomponent/source/spellcheck/spell/sspellimp.hxx index d862dbdf2b20..998d4e8c17ab 100644 --- a/lingucomponent/source/spellcheck/spell/sspellimp.hxx +++ b/lingucomponent/source/spellcheck/spell/sspellimp.hxx @@ -76,8 +76,8 @@ class SpellChecker : sal_Int32 numdict; ::cppu::OInterfaceContainerHelper aEvtListeners; - linguistic::PropertyHelper_Spelling* pPropHelper; - sal_Bool bDisposing; + linguistic::PropertyHelper_Spelling* pPropHelper; + bool bDisposing; // disallow copy-constructor and assignment-operator for now SpellChecker(const SpellChecker &); diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx index ae88aead865b..6ae4d25cc4e8 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx +++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx @@ -93,7 +93,7 @@ static uno::Reference< XLinguServiceManager > GetLngSvcMgr_Impl() Thesaurus::Thesaurus() : aEvtListeners ( GetLinguMutex() ) { - bDisposing = sal_False; + bDisposing = false; pPropHelper = NULL; aThes = NULL; aCharSetInfo = NULL; @@ -682,7 +682,7 @@ void SAL_CALL Thesaurus::dispose() if (!bDisposing) { - bDisposing = sal_True; + bDisposing = true; EventObject aEvtObj( (XThesaurus *) this ); aEvtListeners.disposeAndClear( aEvtObj ); if (pPropHelper) diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx index 58957f969e0d..9a84b4bc02f4 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx +++ b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx @@ -85,7 +85,7 @@ class Thesaurus : ::cppu::OInterfaceContainerHelper aEvtListeners; linguistic::PropertyHelper_Thesaurus* pPropHelper; - sal_Bool bDisposing; + bool bDisposing; CharClass ** aCharSetInfo; MyThes ** aThes; rtl_TextEncoding * aTEncs; From 6972b7a0af1b1f674988e42643491e2597ceef24 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 25 Sep 2012 16:08:38 +0200 Subject: [PATCH 323/863] sal_Bool->bool in i18nutil Change-Id: Iafb0095a1320ad785e1d0ccbaeac9f26cc4dd02f --- i18nutil/inc/i18nutil/oneToOneMapping.hxx | 2 +- i18nutil/source/utility/oneToOneMapping.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/i18nutil/inc/i18nutil/oneToOneMapping.hxx b/i18nutil/inc/i18nutil/oneToOneMapping.hxx index 4d1fb2e540f6..533e4ad52c59 100644 --- a/i18nutil/inc/i18nutil/oneToOneMapping.hxx +++ b/i18nutil/inc/i18nutil/oneToOneMapping.hxx @@ -75,7 +75,7 @@ protected: UnicodePairWithFlag *mpTableWF; UnicodePairFlag mnFlag; UnicodePairWithFlag **mpIndex[256]; - sal_Bool mbHasIndex; + bool mbHasIndex; }; } } } } diff --git a/i18nutil/source/utility/oneToOneMapping.cxx b/i18nutil/source/utility/oneToOneMapping.cxx index d36188b8c0b5..39c74ded40bf 100644 --- a/i18nutil/source/utility/oneToOneMapping.cxx +++ b/i18nutil/source/utility/oneToOneMapping.cxx @@ -61,7 +61,7 @@ oneToOneMappingWithFlag::oneToOneMappingWithFlag( UnicodePairWithFlag *rpTableWF : oneToOneMapping( NULL, rnSize, sizeof(UnicodePairWithFlag) ), mpTableWF ( rpTableWF ), mnFlag ( rnFlag ), - mbHasIndex( sal_False ) + mbHasIndex( false ) { } @@ -98,7 +98,7 @@ void oneToOneMappingWithFlag::makeIndex() mpIndex[high][low] = &mpTableWF[k]; } - mbHasIndex = sal_True; + mbHasIndex = true; } } From 4faa36e42fd421d2abebd448f5ae3a6f7944f098 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 25 Sep 2012 16:12:58 +0200 Subject: [PATCH 324/863] sal_Bool->bool in jvmfwk Change-Id: I8821bc7e4615421a710e6fdf913e646059dd5665 --- jvmfwk/source/elements.cxx | 4 ++-- jvmfwk/source/elements.hxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx index aab9b6752caa..17d1f273449a 100644 --- a/jvmfwk/source/elements.cxx +++ b/jvmfwk/source/elements.cxx @@ -1031,7 +1031,7 @@ JavaInfo * CNodeJavaInfo::makeJavaInfo() const //================================================================================ MergedSettings::MergedSettings(): - m_bEnabled(sal_False), + m_bEnabled(false), m_sClassPath(), m_vmParams(), m_JRELocations(), @@ -1078,7 +1078,7 @@ void MergedSettings::merge(const NodeJava & share, const NodeJava & user) m_JRELocations = * share.getJRELocations(); } -sal_Bool MergedSettings::getEnabled() const +bool MergedSettings::getEnabled() const { return m_bEnabled; } diff --git a/jvmfwk/source/elements.hxx b/jvmfwk/source/elements.hxx index 524efebece1b..7c99c507b1a4 100644 --- a/jvmfwk/source/elements.hxx +++ b/jvmfwk/source/elements.hxx @@ -275,7 +275,7 @@ private: void merge(const NodeJava & share, const NodeJava & user); - sal_Bool m_bEnabled; + bool m_bEnabled; ::rtl::OUString m_sClassPath; @@ -291,7 +291,7 @@ public: /** the default is true. */ - sal_Bool getEnabled() const; + bool getEnabled() const; const ::rtl::OUString & getUserClassPath() const; From 2e7c6b8684a40f30b2af38be035802d222b24d20 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 25 Sep 2012 16:48:37 +0200 Subject: [PATCH 325/863] sal_Bool->bool in padmin Change-Id: Ica624c28b4e423531be3ef6a601f266d1cad1d07 --- padmin/source/progress.cxx | 6 +++--- padmin/source/progress.hxx | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/padmin/source/progress.cxx b/padmin/source/progress.cxx index 135a5dcb257a..a87a3d0c70a3 100644 --- a/padmin/source/progress.cxx +++ b/padmin/source/progress.cxx @@ -40,7 +40,7 @@ ProgressDialog::ProgressDialog( Window* pParent, maProgressBar( this, PaResId( RID_PROGRESS_STATUSBAR ) ), mnMax( nMax ), mnMin( nMin ), - mbCanceled( sal_False ) + mbCanceled( false ) { maFilename.SetStyle( maFilename.GetStyle() | WB_PATHELLIPSIS ); if( ! bCancelable ) @@ -64,7 +64,7 @@ void ProgressDialog::startOperation( const String& rOperation ) { maOperation.SetText( rOperation ); maProgressBar.SetValue( 0 ); - mbCanceled = sal_False; + mbCanceled = false; if( ! IsVisible() ) Show( sal_True ); } @@ -86,7 +86,7 @@ IMPL_LINK( ProgressDialog, ClickBtnHdl, Button*, pButton ) { if( pButton == &maCancelButton ) { - mbCanceled = sal_True; + mbCanceled = true; } return 0; } diff --git a/padmin/source/progress.hxx b/padmin/source/progress.hxx index 890f0a1cf835..dcb8a09a90db 100644 --- a/padmin/source/progress.hxx +++ b/padmin/source/progress.hxx @@ -37,7 +37,7 @@ namespace padmin { ProgressBar maProgressBar; int mnMax, mnMin; - sal_Bool mbCanceled; + bool mbCanceled; public: ProgressDialog( Window*, sal_Bool bCancelable = sal_True, int nMin = 0, int nMax = 100 ); @@ -50,7 +50,7 @@ namespace padmin { void startOperation( const String& ); void setFilename( const String& ); - sal_Bool isCanceled() { return mbCanceled; } + bool isCanceled() { return mbCanceled; } }; } // namespace From c849c4b987021d933690ec77b714b9202df0686a Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 25 Sep 2012 16:52:21 +0200 Subject: [PATCH 326/863] sal_Bool->bool in hwpfilter Change-Id: Ief6d6678a04084a90d07d87780689b92af2e3ba4 --- hwpfilter/source/hwpreader.cxx | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx index b3568362d958..201c1f5af61d 100644 --- a/hwpfilter/source/hwpreader.cxx +++ b/hwpfilter/source/hwpreader.cxx @@ -371,20 +371,14 @@ void HwpReader::makeMeta() static struct { const char *name; - sal_Bool bMade; + bool bMade; } - - ArrowShape[] = { - { "", sal_False }, - { - "Arrow", sal_False - }, - { "Line Arrow", sal_False }, - { - "Square", sal_False - } + { "", false }, + { "Arrow", false }, + { "Line Arrow", false }, + { "Square", false } }; static struct @@ -449,7 +443,7 @@ void HwpReader::makeDrawMiscStyle( HWPDrawingObject *hdo ) { if( prop->line_tstyle && !ArrowShape[prop->line_tstyle].bMade ) { - ArrowShape[prop->line_tstyle].bMade = sal_True; + ArrowShape[prop->line_tstyle].bMade = true; padd(ascii("draw:name"), sXML_CDATA, ascii(ArrowShape[prop->line_tstyle].name)); if( prop->line_tstyle == 1 ) @@ -473,7 +467,7 @@ void HwpReader::makeDrawMiscStyle( HWPDrawingObject *hdo ) } if( prop->line_hstyle && !ArrowShape[prop->line_hstyle].bMade) { - ArrowShape[prop->line_hstyle].bMade = sal_True; + ArrowShape[prop->line_hstyle].bMade = true; padd(ascii("draw:name"), sXML_CDATA, ascii(ArrowShape[prop->line_hstyle].name)); if( prop->line_hstyle == 1 ) @@ -927,7 +921,7 @@ struct PageSetting footer_odd = 0L; footer_even = 0L; pagenumber=0L; - bIsSet = sal_False; + bIsSet = false; } HeaderFooter *header ; HeaderFooter *header_odd ; @@ -936,7 +930,7 @@ struct PageSetting HeaderFooter *footer_odd ; HeaderFooter *footer_even ; ShowPageNum *pagenumber; - sal_Bool bIsSet; + bool bIsSet; }; void HwpReader::makeMasterStyles() @@ -951,12 +945,12 @@ void HwpReader::makeMasterStyles() { ShowPageNum *pn = hwpfile.getPageNumber(i); pSet[pn->m_nPageNumber].pagenumber = pn; - pSet[pn->m_nPageNumber].bIsSet = sal_True; + pSet[pn->m_nPageNumber].bIsSet = true; } for( i = 0 ; i < hwpfile.getHeaderFooterCount() ; i++ ) { HeaderFooter* hf = hwpfile.getHeaderFooter(i); - pSet[hf->m_nPageNumber].bIsSet = sal_True; + pSet[hf->m_nPageNumber].bIsSet = true; if( hf->type == 0 ) // header { switch( hf->where ) From 9d7c5393309d6e50554a18e2e50b4b97bb26cb57 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 25 Sep 2012 16:55:02 +0200 Subject: [PATCH 327/863] sal_Bool->bool in regexp Change-Id: I45301c519037ac6c027bfb5a44e8a2a2d53b3ad2 --- regexp/inc/regexp/reclass.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/regexp/inc/regexp/reclass.hxx b/regexp/inc/regexp/reclass.hxx index d59664f0613b..71a3f1824f05 100644 --- a/regexp/inc/regexp/reclass.hxx +++ b/regexp/inc/regexp/reclass.hxx @@ -307,7 +307,7 @@ class REGEXP_DLLPUBLIC Regexpr struct re_pattern_buffer *bufp; - sal_Bool isIgnoreCase; + bool isIgnoreCase; /** Either a translate table to apply to all characters before comparing them, or zero for no translation. The translation is applied to a From f649c5acd4269eb6df4303127fb780d18ffe388a Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 25 Sep 2012 16:57:23 +0200 Subject: [PATCH 328/863] sal_Bool->bool in scripting Change-Id: Ibb61dc696c4341a0b58d8fd7c2fdfb4c5b991596 --- scripting/source/basprov/basmethnode.cxx | 2 +- scripting/source/basprov/basmethnode.hxx | 2 +- scripting/source/vbaevents/eventhelper.cxx | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripting/source/basprov/basmethnode.cxx b/scripting/source/basprov/basmethnode.cxx index a1d7c5cd8fb2..d81b7133f32f 100644 --- a/scripting/source/basprov/basmethnode.cxx +++ b/scripting/source/basprov/basmethnode.cxx @@ -66,7 +66,7 @@ namespace basprov ,m_sScriptingContext( sScriptingContext ) ,m_pMethod( pMethod ) ,m_bIsAppScript( isAppScript ) - ,m_bEditable( sal_True ) + ,m_bEditable( true ) { if ( m_pMethod ) { diff --git a/scripting/source/basprov/basmethnode.hxx b/scripting/source/basprov/basmethnode.hxx index 6f9fd1dd607c..65e4d4120a1b 100644 --- a/scripting/source/basprov/basmethnode.hxx +++ b/scripting/source/basprov/basmethnode.hxx @@ -61,7 +61,7 @@ namespace basprov // properties ::rtl::OUString m_sURI; - sal_Bool m_bEditable; + bool m_bEditable; protected: // OPropertySetHelper diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx index 7249d143a8d0..ef33f8c5172f 100644 --- a/scripting/source/vbaevents/eventhelper.cxx +++ b/scripting/source/vbaevents/eventhelper.cxx @@ -631,13 +631,13 @@ private: Reference< XComponentContext > m_xContext; Reference< frame::XModel > m_xModel; - sal_Bool m_bDocClosed; + bool m_bDocClosed; SfxObjectShell* mpShell; rtl::OUString msProject; }; EventListener::EventListener( const Reference< XComponentContext >& rxContext ) : -OPropertyContainer(GetBroadcastHelper()), m_xContext( rxContext ), m_bDocClosed(sal_False), mpShell( 0 ) +OPropertyContainer(GetBroadcastHelper()), m_xContext( rxContext ), m_bDocClosed(false), mpShell( 0 ) { registerProperty( EVENTLSTNR_PROPERTY_MODEL, EVENTLSTNR_PROPERTY_ID_MODEL, beans::PropertyAttribute::TRANSIENT, &m_xModel, ::getCppuType( &m_xModel ) ); @@ -731,7 +731,7 @@ EventListener::queryClosing( const lang::EventObject& /*Source*/, ::sal_Bool /*G void SAL_CALL EventListener::notifyClosing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException) { - m_bDocClosed = sal_True; + m_bDocClosed = true; uno::Reference< util::XCloseBroadcaster > xCloseBroadcaster( m_xModel, uno::UNO_QUERY ); if (xCloseBroadcaster.is()) { From b6831de354009a09b0606c0efe04b5601dd77f4c Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 25 Sep 2012 17:00:42 +0200 Subject: [PATCH 329/863] sal_Bool->bool in testtools Change-Id: I716c0a08565e874bcb0667e72ed5261231a4743d --- testtools/source/bridgetest/cppobj.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx index def69d93af37..e10a47b95c70 100644 --- a/testtools/source/bridgetest/cppobj.cxx +++ b/testtools/source/bridgetest/cppobj.cxx @@ -130,8 +130,8 @@ class Test_Impl : { TestData _aData, _aStructData; sal_Int32 m_nLastCallId; - sal_Bool m_bFirstCall; - sal_Bool m_bSequenceOfCallTestPassed; + bool m_bFirstCall; + bool m_bSequenceOfCallTestPassed; Mutex m_mutex; Sequence _arBool; @@ -155,8 +155,8 @@ class Test_Impl : public: Test_Impl() : m_nLastCallId( 0 ), - m_bFirstCall( sal_True ), - m_bSequenceOfCallTestPassed( sal_True ) + m_bFirstCall( true ), + m_bSequenceOfCallTestPassed( true ) {} virtual ~Test_Impl() { @@ -514,7 +514,7 @@ void Test_Impl::call( sal_Int32 nCallId , sal_Int32 nWaitMUSEC ) throw(::com::su wait(nWaitMUSEC); if( m_bFirstCall ) { - m_bFirstCall = sal_False; + m_bFirstCall = false; } else { From 2765cf0ca81b606f169d8ec723d41d509f336628 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 25 Sep 2012 17:09:01 +0200 Subject: [PATCH 330/863] sal_Bool->bool in rdbmaker Change-Id: I454e5f4522cd5c5c1f04fde7cb79feab5ae63528 --- rdbmaker/inc/codemaker/registry.hxx | 6 +++--- rdbmaker/inc/codemaker/typemanager.hxx | 4 ++-- rdbmaker/source/codemaker/typemanager.cxx | 4 ++-- rdbmaker/source/rdbmaker/rdboptions.cxx | 2 +- rdbmaker/source/rdbmaker/rdboptions.hxx | 6 +++--- rdbmaker/source/rdbmaker/specialtypemanager.cxx | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/rdbmaker/inc/codemaker/registry.hxx b/rdbmaker/inc/codemaker/registry.hxx index bb30b85fb1e6..67eae3818838 100644 --- a/rdbmaker/inc/codemaker/registry.hxx +++ b/rdbmaker/inc/codemaker/registry.hxx @@ -33,7 +33,7 @@ struct TypeReader_Impl { TypeReader_Impl(const sal_uInt8* buffer, sal_uInt32 bufferLen, - sal_Bool copyData) + bool copyData) : m_refCount(0) , m_copyData(copyData) , m_blopSize(bufferLen) @@ -62,7 +62,7 @@ struct TypeReader_Impl } sal_Int32 m_refCount; - sal_Bool m_copyData; + bool m_copyData; sal_Int32 m_blopSize; const sal_uInt8* m_pBlop; typereg::Reader* m_pReader; @@ -77,7 +77,7 @@ public: inline TypeReader( const sal_uInt8* buffer, sal_uInt32 bufferLen, - sal_Bool copyData) + bool copyData) { m_pImpl = new TypeReader_Impl(buffer, bufferLen, copyData); acquire(); diff --git a/rdbmaker/inc/codemaker/typemanager.hxx b/rdbmaker/inc/codemaker/typemanager.hxx index 086ce75224ff..a6da27d29db0 100644 --- a/rdbmaker/inc/codemaker/typemanager.hxx +++ b/rdbmaker/inc/codemaker/typemanager.hxx @@ -94,14 +94,14 @@ struct RegistryTypeManagerImpl RegistryTypeManagerImpl() : m_pMergedRegistry(NULL) , m_base("/") - , m_isMerged(sal_False) + , m_isMerged(false) {} T2TypeClassMap m_t2TypeClass; RegistryList m_registries; Registry* m_pMergedRegistry; ::rtl::OString m_base; - sal_Bool m_isMerged; + bool m_isMerged; }; class RegistryTypeManager : public TypeManager diff --git a/rdbmaker/source/codemaker/typemanager.cxx b/rdbmaker/source/codemaker/typemanager.cxx index b0d0a14ca8a0..1348a1e94b70 100644 --- a/rdbmaker/source/codemaker/typemanager.cxx +++ b/rdbmaker/source/codemaker/typemanager.cxx @@ -168,7 +168,7 @@ TypeReader RegistryTypeManager::getTypeReader(const OString& name) sal_uInt8* pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize); if (!key.getValue(OUString(), pBuffer)) { - reader = TypeReader(pBuffer, valueSize, sal_True); + reader = TypeReader(pBuffer, valueSize, true); } rtl_freeMemory(pBuffer); } @@ -195,7 +195,7 @@ RTTypeClass RegistryTypeManager::getTypeClass(const OString& name) sal_uInt8* pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize); if (!key.getValue(OUString(), pBuffer)) { - TypeReader reader(pBuffer, valueSize, sal_False); + TypeReader reader(pBuffer, valueSize, false); RTTypeClass ret = reader.getTypeClass(); diff --git a/rdbmaker/source/rdbmaker/rdboptions.cxx b/rdbmaker/source/rdbmaker/rdboptions.cxx index 6353f413ea9c..54d92eb1921c 100644 --- a/rdbmaker/source/rdbmaker/rdboptions.cxx +++ b/rdbmaker/source/rdbmaker/rdboptions.cxx @@ -277,7 +277,7 @@ sal_Bool RdbOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) } m_options["-L"] = OString(); - m_generateTypeList = sal_True; + m_generateTypeList = true; break; default: throw IllegalArgument("the option is unknown" + OString(av[i])); diff --git a/rdbmaker/source/rdbmaker/rdboptions.hxx b/rdbmaker/source/rdbmaker/rdboptions.hxx index 7352cd4acce0..aebf6d1323ef 100644 --- a/rdbmaker/source/rdbmaker/rdboptions.hxx +++ b/rdbmaker/source/rdbmaker/rdboptions.hxx @@ -27,7 +27,7 @@ class RdbOptions : public Options public: RdbOptions() : Options() - , m_generateTypeList(sal_False) + , m_generateTypeList(false) {} ~RdbOptions() {} @@ -39,11 +39,11 @@ public: ::rtl::OString prepareVersion(); - sal_Bool generateTypeList() + bool generateTypeList() { return m_generateTypeList; } protected: - sal_Bool m_generateTypeList; + bool m_generateTypeList; }; #endif // _RDBMAKER_RDBOPTIONS_HXX_ diff --git a/rdbmaker/source/rdbmaker/specialtypemanager.cxx b/rdbmaker/source/rdbmaker/specialtypemanager.cxx index b643adb421e4..72f8341107c7 100644 --- a/rdbmaker/source/rdbmaker/specialtypemanager.cxx +++ b/rdbmaker/source/rdbmaker/specialtypemanager.cxx @@ -66,7 +66,7 @@ TypeReader SpecialTypeManager::getTypeReader(const OString& name) if ( (blopSize = getTypeBlop( name.getStr(), &pBlop)) > 0 ) { - reader = TypeReader(pBlop, blopSize, sal_True); + reader = TypeReader(pBlop, blopSize, true); } if ( pBlop ) From ab7bc4f4c29dbeb206098b5a7e56682834af04b0 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 25 Sep 2012 17:11:17 +0200 Subject: [PATCH 331/863] sal_Bool->bool in registry Change-Id: I6afabf33e1d1ab890c979193c25381e0d38c1f50 --- registry/source/reflread.cxx | 6 +++--- registry/source/regimpl.hxx | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx index 3c103c23a344..e51178867671 100644 --- a/registry/source/reflread.cxx +++ b/registry/source/reflread.cxx @@ -53,9 +53,9 @@ class BlopObject public: const sal_uInt8* m_pBuffer; sal_uInt32 m_bufferLen; - sal_Bool m_isCopied; + bool m_isCopied; - BlopObject(const sal_uInt8* buffer, sal_uInt32 len, sal_Bool copyBuffer); + BlopObject(const sal_uInt8* buffer, sal_uInt32 len, bool copyBuffer); // throws std::bad_alloc ~BlopObject(); @@ -124,7 +124,7 @@ public: } }; -BlopObject::BlopObject(const sal_uInt8* buffer, sal_uInt32 len, sal_Bool copyBuffer) +BlopObject::BlopObject(const sal_uInt8* buffer, sal_uInt32 len, bool copyBuffer) : m_bufferLen(len) , m_isCopied(copyBuffer) { diff --git a/registry/source/regimpl.hxx b/registry/source/regimpl.hxx index dda3b3c9e517..f89d2e5262f8 100644 --- a/registry/source/regimpl.hxx +++ b/registry/source/regimpl.hxx @@ -103,10 +103,10 @@ public: ~ORegistry(); - sal_Bool isReadOnly() const + bool isReadOnly() const { return m_readOnly; } - sal_Bool isOpen() const + bool isOpen() const { return m_isOpen; } ORegKey* getRootKey(); @@ -160,8 +160,8 @@ private: sal_uInt32 m_refCount; osl::Mutex m_mutex; - sal_Bool m_readOnly; - sal_Bool m_isOpen; + bool m_readOnly; + bool m_isOpen; rtl::OUString m_name; store::OStoreFile m_file; KeyMap m_openKeyTable; From 8e995db6a2dd2becb2e88903a28877db2591ae06 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 25 Sep 2012 17:18:19 +0200 Subject: [PATCH 332/863] sal_Bool->bool in codemaker Change-Id: Icea58e7c1dea14f524d6a8d479b7d85e79d6266b --- codemaker/source/cppumaker/cpputype.cxx | 14 +++++++------- codemaker/source/cppumaker/cpputype.hxx | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx index f4f130403249..eca01435a4e2 100644 --- a/codemaker/source/cppumaker/cpputype.cxx +++ b/codemaker/source/cppumaker/cpputype.cxx @@ -152,8 +152,8 @@ CppuType::CppuType(typereg::Reader& typeReader, const OString& typeName, const TypeManager& typeMgr) : m_inheritedMemberCount(0) - , m_cppuTypeLeak(sal_False) - , m_cppuTypeDynamic(sal_True) + , m_cppuTypeLeak(false) + , m_cppuTypeDynamic(true) , m_indentLength(0) , m_typeName(typeName) , m_name(typeName.copy(typeName.lastIndexOf('/') + 1)) @@ -294,9 +294,9 @@ sal_Bool CppuType::dump(CppuOptions* pOptions) // meaningful (getCppuType is just a forward to cppu::UnoType::get now), // and -CS is handled the same way as -C now: if (pOptions->isValid("-L")) - m_cppuTypeLeak = sal_True; + m_cppuTypeLeak = true; if (pOptions->isValid("-C") || pOptions->isValid("-CS")) - m_cppuTypeDynamic = sal_False; + m_cppuTypeDynamic = false; } OString outPath; @@ -1360,8 +1360,8 @@ InterfaceType::InterfaceType(typereg::Reader& typeReader, : CppuType(typeReader, typeName, typeMgr) { m_inheritedMemberCount = 0; - m_hasAttributes = sal_False; - m_hasMethods = sal_False; + m_hasAttributes = false; + m_hasMethods = false; } InterfaceType::~InterfaceType() @@ -2320,7 +2320,7 @@ sal_Bool ConstantsType::dump(CppuOptions* pOptions) addSpecialDependencies(); if (pOptions->isValid("-U")) - m_cppuTypeDynamic = sal_True; + m_cppuTypeDynamic = true; OString outPath; if (pOptions->isValid("-O")) diff --git a/codemaker/source/cppumaker/cpputype.hxx b/codemaker/source/cppumaker/cpputype.hxx index 83a3807f9746..a2781cba2557 100644 --- a/codemaker/source/cppumaker/cpputype.hxx +++ b/codemaker/source/cppumaker/cpputype.hxx @@ -138,8 +138,8 @@ protected: protected: sal_uInt32 m_inheritedMemberCount; - sal_Bool m_cppuTypeLeak; - sal_Bool m_cppuTypeDynamic; + bool m_cppuTypeLeak; + bool m_cppuTypeDynamic; sal_Int32 m_indentLength; ::rtl::OString m_typeName; ::rtl::OString m_name; @@ -189,8 +189,8 @@ protected: protected: sal_uInt32 m_inheritedMemberCount; - sal_Bool m_hasAttributes; - sal_Bool m_hasMethods; + bool m_hasAttributes; + bool m_hasMethods; private: void dumpExceptionSpecification( From b3c13b940a4b023bdbf37bfc0b9385a54e3d8b3f Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 25 Sep 2012 17:21:29 +0200 Subject: [PATCH 333/863] sal_Bool->bool in xmlhelp Change-Id: I509cf60e4bbbe7dfb25a3943d97c9d35a22e0bb6 --- xmlhelp/source/cxxhelp/provider/databases.hxx | 2 +- xmlhelp/source/cxxhelp/provider/resultsetbase.hxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx index 9803dc50b4d2..1722972e55b4 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.hxx +++ b/xmlhelp/source/cxxhelp/provider/databases.hxx @@ -298,7 +298,7 @@ namespace chelp { com::sun::star::uno::Reference< com::sun::star::lang::XMultiComponentFactory > m_xSMgr; com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess2 > m_xSFA; - sal_Bool m_bShowBasic; + bool m_bShowBasic; char* m_pErrorDoc; int m_nCustomCSSDocLength; diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx index 6e7f68dda340..f592d113047a 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx @@ -536,9 +536,9 @@ namespace chelp { com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xMSF; com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider > m_xProvider; sal_Int32 m_nRow; - sal_Bool m_nWasNull; + bool m_nWasNull; sal_Int32 m_nOpenMode; - sal_Bool m_bRowCountFinal; + bool m_bRowCountFinal; typedef std::vector< com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > > IdentSet; typedef std::vector< com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > > ItemSet; From 14916972c532bc4713c2bc11acd3c4f9c74e93a1 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 25 Sep 2012 17:28:22 +0200 Subject: [PATCH 334/863] sal_Bool->bool in xmlsecurity Change-Id: I80b20f5df179f994e5004c1ef390457c252478ef --- xmlsecurity/inc/xmlsecurity/certificatechooser.hxx | 2 +- xmlsecurity/inc/xmlsecurity/certificateviewer.hxx | 4 ++-- xmlsecurity/inc/xmlsecurity/macrosecurity.hxx | 4 ++-- xmlsecurity/source/dialogs/certificatechooser.cxx | 4 ++-- xmlsecurity/source/dialogs/certificateviewer.cxx | 4 ++-- xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 2 +- xmlsecurity/source/dialogs/macrosecurity.cxx | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx index 52d5730a17e6..cf858008c681 100644 --- a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx +++ b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx @@ -62,7 +62,7 @@ private: CancelButton maCancelBtn; HelpButton maHelpBtn; - sal_Bool mbInitialized; + bool mbInitialized; sal_uInt16 GetSelectedEntryPos( void ) const; DECL_LINK(ViewButtonHdl, void *); diff --git a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx index 2bbbe08668f8..26b03fb06582 100644 --- a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx +++ b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx @@ -54,12 +54,12 @@ private: OKButton maOkBtn; HelpButton maHelpBtn; - sal_Bool mbCheckForPrivateKey; + bool mbCheckForPrivateKey; cssu::Reference< dcss::xml::crypto::XSecurityEnvironment > mxSecurityEnvironment; cssu::Reference< dcss::security::XCertificate > mxCert; public: - CertificateViewer( Window* pParent, const cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment, const cssu::Reference< dcss::security::XCertificate >& rXCert, sal_Bool bCheckForPrivateKey ); + CertificateViewer( Window* pParent, const cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment, const cssu::Reference< dcss::security::XCertificate >& rXCert, bool bCheckForPrivateKey ); virtual ~CertificateViewer(); }; diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx index 7c6e44cf08fd..967dc59a989f 100644 --- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx +++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx @@ -143,8 +143,8 @@ private: cssu::Sequence< SvtSecurityOptions::Certificate > maTrustedAuthors; - sal_Bool mbAuthorsReadonly; - sal_Bool mbURLsReadonly; + bool mbAuthorsReadonly; + bool mbURLsReadonly; DECL_LINK( ViewCertPBHdl, void* ); DECL_LINK( RemoveCertPBHdl, void* ); diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx index c93e6922d0da..27a486dca6fd 100644 --- a/xmlsecurity/source/dialogs/certificatechooser.cxx +++ b/xmlsecurity/source/dialogs/certificatechooser.cxx @@ -76,7 +76,7 @@ CertificateChooser::CertificateChooser( Window* _pParent, uno::Reference< uno::X mxCtx = _rxCtx; mxSecurityEnvironment = _rxSecurityEnvironment; - mbInitialized = sal_False; + mbInitialized = false; // disable buttons CertificateHighlightHdl( NULL ); @@ -183,7 +183,7 @@ void CertificateChooser::ImplInitialize() // enable/disable buttons CertificateHighlightHdl( NULL ); - mbInitialized = sal_True; + mbInitialized = true; } } diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index 27e0cbcba048..7a7486e229c8 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -51,7 +51,7 @@ namespace CertificateViewer::CertificateViewer( Window* _pParent, const cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment, - const cssu::Reference< dcss::security::XCertificate >& _rXCert, sal_Bool bCheckForPrivateKey ) + const cssu::Reference< dcss::security::XCertificate >& _rXCert, bool bCheckForPrivateKey ) :TabDialog ( _pParent, XMLSEC_RES( RID_XMLSECDLG_CERTVIEWER ) ) ,maTabCtrl ( this, XMLSEC_RES( 1 ) ) ,maOkBtn ( this, XMLSEC_RES( BTN_OK ) ) @@ -456,7 +456,7 @@ IMPL_LINK_NOARG(CertificateViewerCertPathTP, ViewCertHdl) SvLBoxEntry* pEntry = maCertPathLB.FirstSelected(); if( pEntry ) { - CertificateViewer aViewer( this, mpDlg->mxSecurityEnvironment, ((CertPath_UserData*)pEntry->GetUserData())->mxCert, sal_False ); + CertificateViewer aViewer( this, mpDlg->mxSecurityEnvironment, ((CertPath_UserData*)pEntry->GetUserData())->mxCert, false ); aViewer.Execute(); } diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index 32616ae78ea8..951ed3171c72 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -751,7 +751,7 @@ void DigitalSignaturesDialog::ImplShowSignaturesDetails() DBG_ASSERT( xCert.is(), "Error getting cCertificate!" ); if ( xCert.is() ) { - CertificateViewer aViewer( this, maSignatureHelper.GetSecurityEnvironment(), xCert, sal_False ); + CertificateViewer aViewer( this, maSignatureHelper.GetSecurityEnvironment(), xCert, false ); aViewer.Execute(); } } diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index 4d951ed18b33..c814c5968cba 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -203,7 +203,7 @@ IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, ViewCertPBHdl) if ( xCert.is() ) { - CertificateViewer aViewer( this, mpDlg->mxSecurityEnvironment, xCert, sal_False ); + CertificateViewer aViewer( this, mpDlg->mxSecurityEnvironment, xCert, false ); aViewer.Execute(); } } From e247cb585c749ac1ea2abdb29c872fb977ab3fe3 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 26 Sep 2012 11:24:31 +0200 Subject: [PATCH 335/863] sal_Bool->bool in svl::DECL_PTRHINT Change-Id: Ib9a0aa8e22cb84b07b7346e5647b2a2667f05c6a --- svl/inc/svl/hint.hxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/svl/inc/svl/hint.hxx b/svl/inc/svl/hint.hxx index 8c5c5d9f5394..52401e25409a 100644 --- a/svl/inc/svl/hint.hxx +++ b/svl/inc/svl/hint.hxx @@ -36,20 +36,20 @@ public: class Visibility Name: public SfxHint \ { \ Type* pObj; \ - sal_Bool bIsOwner; \ + bool bIsOwner; \ \ public: \ TYPEINFO(); \ - Name( Type* Object, sal_Bool bOwnedByHint = sal_False ); \ + Name( Type* Object, bool bOwnedByHint = false ); \ ~Name(); \ \ Type* GetObject() const { return pObj; } \ - sal_Bool IsOwner() const { return bIsOwner; } \ + bool IsOwner() const { return bIsOwner; } \ } #define IMPL_PTRHINT(Name, Type) \ TYPEINIT1(Name, SfxHint); \ - Name::Name( Type* pObject, sal_Bool bOwnedByHint ) \ + Name::Name( Type* pObject, bool bOwnedByHint ) \ { pObj = pObject; bIsOwner = bOwnedByHint; } \ Name::~Name() {} From 055b6f1271cf90240caa3ab0f22f3e760fcefd51 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 26 Sep 2012 13:43:26 +0200 Subject: [PATCH 336/863] sal_Bool->bool in svl::SvxSearchItem Change-Id: I60230e57993ee24fc80eb26d16588f131ec1f8dc --- svl/inc/svl/srchitem.hxx | 90 +++++++++++++++++------------------ svl/source/items/srchitem.cxx | 14 +++--- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/svl/inc/svl/srchitem.hxx b/svl/inc/svl/srchitem.hxx index 719219cb9045..0e83ebcfd0bc 100644 --- a/svl/inc/svl/srchitem.hxx +++ b/svl/inc/svl/srchitem.hxx @@ -63,17 +63,17 @@ class SVL_DLLPUBLIC SvxSearchItem : // Calc-Spezifische Daten sal_uInt16 nCellType; // Suche in Formeln/Werten/Notizen sal_uInt16 nAppFlag; // Fuer welche Applikation ist der Dialog ueberhaupt - sal_Bool bRowDirection; // Suchrichtung Zeilenweise/Spaltenweise - sal_Bool bAllTables; // in alle Tabellen suchen - sal_Bool bSearchFiltered; // search filtered cells. + bool bRowDirection; // Suchrichtung Zeilenweise/Spaltenweise + bool bAllTables; // in alle Tabellen suchen + bool bSearchFiltered; // search filtered cells. // Writer-spezifisch - sal_Bool bNotes; + bool bNotes; - sal_Bool bBackward; // Suche Rueckwaerts - sal_Bool bPattern; // Suche nach Vorlagen - sal_Bool bContent; // Suche im Inhalt - sal_Bool bAsianOptions; // use asian options? + bool bBackward; // Suche Rueckwaerts + bool bPattern; // Suche nach Vorlagen + bool bContent; // Suche im Inhalt + bool bAsianOptions; // use asian options? public: TYPEINFO(); @@ -104,54 +104,54 @@ public: inline const String GetReplaceString() const; inline void SetReplaceString(const String& rNewString); - inline sal_Bool GetWordOnly() const; - void SetWordOnly(sal_Bool bNewWordOnly); + inline bool GetWordOnly() const; + void SetWordOnly(bool bNewWordOnly); - inline sal_Bool GetExact() const; - void SetExact(sal_Bool bNewExact); + inline bool GetExact() const; + void SetExact(bool bNewExact); - sal_Bool GetBackward() const { return bBackward; } - void SetBackward(sal_Bool bNewBackward) { bBackward = bNewBackward; } + bool GetBackward() const { return bBackward; } + void SetBackward(bool bNewBackward) { bBackward = bNewBackward; } - inline sal_Bool GetSelection() const; - void SetSelection(sal_Bool bNewSelection); + inline bool GetSelection() const; + void SetSelection(bool bNewSelection); - inline sal_Bool GetRegExp() const; - void SetRegExp( sal_Bool bVal ); + inline bool GetRegExp() const; + void SetRegExp( bool bVal ); - sal_Bool GetPattern() const { return bPattern; } - void SetPattern(sal_Bool bNewPattern) { bPattern = bNewPattern; } + bool GetPattern() const { return bPattern; } + void SetPattern(bool bNewPattern) { bPattern = bNewPattern; } - sal_Bool IsContent() const { return bContent; } - void SetContent( sal_Bool bNew ) { bContent = bNew; } + bool IsContent() const { return bContent; } + void SetContent( bool bNew ) { bContent = bNew; } SfxStyleFamily GetFamily() const { return eFamily; } void SetFamily( SfxStyleFamily eNewFamily ) { eFamily = eNewFamily; } - sal_Bool GetRowDirection() const { return bRowDirection; } - void SetRowDirection(sal_Bool bNewRowDirection) { bRowDirection = bNewRowDirection; } + bool GetRowDirection() const { return bRowDirection; } + void SetRowDirection(bool bNewRowDirection) { bRowDirection = bNewRowDirection; } - sal_Bool IsAllTables() const { return bAllTables; } - void SetAllTables(sal_Bool bNew) { bAllTables = bNew; } + bool IsAllTables() const { return bAllTables; } + void SetAllTables(bool bNew) { bAllTables = bNew; } - sal_Bool IsSearchFiltered() const { return bSearchFiltered; } - void SetSearchFiltered(sal_Bool b) { bSearchFiltered = b; } + bool IsSearchFiltered() const { return bSearchFiltered; } + void SetSearchFiltered(bool b) { bSearchFiltered = b; } sal_uInt16 GetCellType() const { return nCellType; } void SetCellType(sal_uInt16 nNewCellType) { nCellType = nNewCellType; } - sal_Bool GetNotes() const { return bNotes; } - void SetNotes(sal_Bool bNew) { bNotes = bNew; } + bool GetNotes() const { return bNotes; } + void SetNotes(bool bNew) { bNotes = bNew; } sal_uInt16 GetAppFlag() const { return nAppFlag; } void SetAppFlag(sal_uInt16 nNewAppFlag) { nAppFlag = nNewAppFlag; } - inline sal_Bool IsLevenshtein() const; - void SetLevenshtein( sal_Bool bVal ); + inline bool IsLevenshtein() const; + void SetLevenshtein( bool bVal ); - inline sal_Bool IsLEVRelaxed() const; - void SetLEVRelaxed(sal_Bool bSet); + inline bool IsLEVRelaxed() const; + void SetLEVRelaxed(bool bSet); inline sal_uInt16 GetLEVOther() const; inline void SetLEVOther(sal_uInt16 nSet); @@ -169,11 +169,11 @@ public: inline sal_Int32 GetTransliterationFlags() const; void SetTransliterationFlags( sal_Int32 nFlags ); - inline sal_Bool IsMatchFullHalfWidthForms() const; - void SetMatchFullHalfWidthForms( sal_Bool bVal ); + inline bool IsMatchFullHalfWidthForms() const; + void SetMatchFullHalfWidthForms( bool bVal ); - inline sal_Bool IsUseAsianOptions() const { return bAsianOptions; } - inline void SetUseAsianOptions( sal_Bool bVal ) { bAsianOptions = bVal; } + inline bool IsUseAsianOptions() const { return bAsianOptions; } + inline void SetUseAsianOptions( bool bVal ) { bAsianOptions = bVal; } }; const String SvxSearchItem::GetSearchString() const @@ -196,30 +196,30 @@ void SvxSearchItem::SetReplaceString(const String& rNewString) aSearchOpt.replaceString = rNewString; } -sal_Bool SvxSearchItem::GetWordOnly() const +bool SvxSearchItem::GetWordOnly() const { return 0 != (aSearchOpt.searchFlag & com::sun::star::util::SearchFlags::NORM_WORD_ONLY); } -sal_Bool SvxSearchItem::GetExact() const +bool SvxSearchItem::GetExact() const { return 0 == (aSearchOpt.transliterateFlags & com::sun::star::i18n::TransliterationModules_IGNORE_CASE); } -sal_Bool SvxSearchItem::GetSelection() const +bool SvxSearchItem::GetSelection() const { return 0 != (aSearchOpt.searchFlag & com::sun::star::util::SearchFlags::REG_NOT_BEGINOFLINE); } -sal_Bool SvxSearchItem::GetRegExp() const +bool SvxSearchItem::GetRegExp() const { return aSearchOpt.algorithmType == com::sun::star::util::SearchAlgorithms_REGEXP ; } -sal_Bool SvxSearchItem::IsLEVRelaxed() const +bool SvxSearchItem::IsLEVRelaxed() const { return 0 != (aSearchOpt.searchFlag & com::sun::star::util::SearchFlags::LEV_RELAXED); @@ -255,7 +255,7 @@ void SvxSearchItem::SetLEVLonger( sal_uInt16 nVal ) aSearchOpt.deletedChars = nVal; } -sal_Bool SvxSearchItem::IsLevenshtein() const +bool SvxSearchItem::IsLevenshtein() const { return aSearchOpt.algorithmType == com::sun::star::util::SearchAlgorithms_APPROXIMATE; } @@ -275,7 +275,7 @@ sal_Int32 SvxSearchItem::GetTransliterationFlags() const return aSearchOpt.transliterateFlags; } -sal_Bool SvxSearchItem::IsMatchFullHalfWidthForms() const +bool SvxSearchItem::IsMatchFullHalfWidthForms() const { return 0 != (aSearchOpt.transliterateFlags & com::sun::star::i18n::TransliterationModules_IGNORE_WIDTH); diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx index 2aa8e311ff48..d68a887259af 100644 --- a/svl/source/items/srchitem.cxx +++ b/svl/source/items/srchitem.cxx @@ -279,7 +279,7 @@ void SvxSearchItem::Commit() { } -void SvxSearchItem::SetMatchFullHalfWidthForms( sal_Bool bVal ) +void SvxSearchItem::SetMatchFullHalfWidthForms( bool bVal ) { if (bVal) aSearchOpt.transliterateFlags |= TransliterationModules_IGNORE_WIDTH; @@ -288,7 +288,7 @@ void SvxSearchItem::SetMatchFullHalfWidthForms( sal_Bool bVal ) } -void SvxSearchItem::SetWordOnly( sal_Bool bVal ) +void SvxSearchItem::SetWordOnly( bool bVal ) { if (bVal) aSearchOpt.searchFlag |= SearchFlags::NORM_WORD_ONLY; @@ -297,7 +297,7 @@ void SvxSearchItem::SetWordOnly( sal_Bool bVal ) } -void SvxSearchItem::SetExact( sal_Bool bVal ) +void SvxSearchItem::SetExact( bool bVal ) { if (!bVal) aSearchOpt.transliterateFlags |= TransliterationModules_IGNORE_CASE; @@ -306,7 +306,7 @@ void SvxSearchItem::SetExact( sal_Bool bVal ) } -void SvxSearchItem::SetSelection( sal_Bool bVal ) +void SvxSearchItem::SetSelection( bool bVal ) { if (bVal) { @@ -321,7 +321,7 @@ void SvxSearchItem::SetSelection( sal_Bool bVal ) } -void SvxSearchItem::SetRegExp( sal_Bool bVal ) +void SvxSearchItem::SetRegExp( bool bVal ) { if ( bVal ) aSearchOpt.algorithmType = SearchAlgorithms_REGEXP; @@ -330,7 +330,7 @@ void SvxSearchItem::SetRegExp( sal_Bool bVal ) } -void SvxSearchItem::SetLEVRelaxed( sal_Bool bVal ) +void SvxSearchItem::SetLEVRelaxed( bool bVal ) { if (bVal) aSearchOpt.searchFlag |= SearchFlags::LEV_RELAXED; @@ -339,7 +339,7 @@ void SvxSearchItem::SetLEVRelaxed( sal_Bool bVal ) } -void SvxSearchItem::SetLevenshtein( sal_Bool bVal ) +void SvxSearchItem::SetLevenshtein( bool bVal ) { if ( bVal ) aSearchOpt.algorithmType = SearchAlgorithms_APPROXIMATE; From c29633988bc1877c5f6e2a89be4840c70afde418 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 26 Sep 2012 16:05:01 +0200 Subject: [PATCH 337/863] sal_Bool->bool in svl::SfxStyleSheetBase Change-Id: Id506fa56d07be56d63715703e354625715275933 --- sc/inc/stlsheet.hxx | 10 ++--- sc/source/core/data/stlsheet.cxx | 18 ++++----- sd/inc/stlsheet.hxx | 12 +++--- sd/source/core/stlsheet.cxx | 28 +++++++------- svl/inc/svl/style.hxx | 45 +++++++++++----------- svl/source/items/style.cxx | 57 ++++++++++++++-------------- sw/inc/docstyle.hxx | 16 ++++---- sw/source/ui/app/docstyle.cxx | 64 ++++++++++++++++---------------- 8 files changed, 125 insertions(+), 125 deletions(-) diff --git a/sc/inc/stlsheet.hxx b/sc/inc/stlsheet.hxx index 2e5c13072869..c66d53642b4e 100644 --- a/sc/inc/stlsheet.hxx +++ b/sc/inc/stlsheet.hxx @@ -51,17 +51,17 @@ public: ScStyleSheet( const ScStyleSheet& rStyle ); - virtual sal_Bool SetParent ( const String& rParentName ); + virtual bool SetParent ( const String& rParentName ); virtual SfxItemSet& GetItemSet (); - virtual sal_Bool IsUsed () const; - virtual sal_Bool HasFollowSupport () const; - virtual sal_Bool HasParentSupport () const; + virtual bool IsUsed () const; + virtual bool HasFollowSupport () const; + virtual bool HasParentSupport () const; virtual const String& GetName() const; virtual const String& GetParent() const; virtual const String& GetFollow() const; - virtual sal_Bool SetName( const String& ); + virtual bool SetName( const String& ); void SetUsage( ScStyleSheet::Usage eUse ) const { eUsage = eUse; } diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx index 0b5fd7212454..abb8c3d5dd32 100644 --- a/sc/source/core/data/stlsheet.cxx +++ b/sc/source/core/data/stlsheet.cxx @@ -85,20 +85,20 @@ ScStyleSheet::~ScStyleSheet() //------------------------------------------------------------------------ -sal_Bool ScStyleSheet::HasFollowSupport() const +bool ScStyleSheet::HasFollowSupport() const { return false; } //------------------------------------------------------------------------ -sal_Bool ScStyleSheet::HasParentSupport () const +bool ScStyleSheet::HasParentSupport () const { - sal_Bool bHasParentSupport = false; + bool bHasParentSupport = false; switch ( GetFamily() ) { - case SFX_STYLE_FAMILY_PARA: bHasParentSupport = sal_True; break; + case SFX_STYLE_FAMILY_PARA: bHasParentSupport = true; break; case SFX_STYLE_FAMILY_PAGE: bHasParentSupport = false; break; default: { @@ -111,9 +111,9 @@ sal_Bool ScStyleSheet::HasParentSupport () const //------------------------------------------------------------------------ -sal_Bool ScStyleSheet::SetParent( const String& rParentName ) +bool ScStyleSheet::SetParent( const String& rParentName ) { - sal_Bool bResult = false; + bool bResult = false; String aEffName = rParentName; SfxStyleSheetBase* pStyle = pPool->Find( aEffName, nFamily ); if (!pStyle) @@ -263,7 +263,7 @@ SfxItemSet& ScStyleSheet::GetItemSet() //------------------------------------------------------------------------ -sal_Bool ScStyleSheet::IsUsed() const +bool ScStyleSheet::IsUsed() const { if ( GetFamily() == SFX_STYLE_FAMILY_PARA ) { @@ -277,7 +277,7 @@ sal_Bool ScStyleSheet::IsUsed() const return eUsage == USED; } else - return sal_True; + return true; } //------------------------------------------------------------------------ @@ -332,7 +332,7 @@ const String& ScStyleSheet::GetFollow() const //! Flag gesetzt und abgefragt werden. //! Die ganze Abfrage muss raus, wenn fuer eine neue Datei-Version die Namens-Umsetzung wegfaellt. -sal_Bool ScStyleSheet::SetName( const String& rNew ) +bool ScStyleSheet::SetName( const String& rNew ) { String aFileStdName = rtl::OUString(STRING_STANDARD); if ( rNew == aFileStdName && aFileStdName != ScGlobal::GetRscString(STR_STYLENAME_STANDARD) ) diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx index 364df812206a..191bcf97b471 100644 --- a/sd/inc/stlsheet.hxx +++ b/sd/inc/stlsheet.hxx @@ -54,13 +54,13 @@ public: SdStyleSheet( const rtl::OUString& rDisplayName, SfxStyleSheetBasePool& rPool, SfxStyleFamily eFamily, sal_uInt16 nMask ); SdStyleSheet( const SdStyleSheet& ); - virtual sal_Bool SetParent (const String& rParentName); + virtual bool SetParent (const String& rParentName); virtual SfxItemSet& GetItemSet(); - virtual sal_Bool IsUsed() const; - virtual sal_Bool HasFollowSupport() const; - virtual sal_Bool HasParentSupport() const; - virtual sal_Bool HasClearParentSupport() const; - virtual sal_Bool SetName( const UniString& ); + virtual bool IsUsed() const; + virtual bool HasFollowSupport() const; + virtual bool HasParentSupport() const; + virtual bool HasClearParentSupport() const; + virtual bool SetName( const UniString& ); virtual void SetHelpId( const String& r, sal_uLong nId ); void AdjustToFontHeight(SfxItemSet& rSet, sal_Bool bOnlyMissingItems = sal_True); diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 4bedcc0fdbfc..5c56cfbf97d9 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -197,9 +197,9 @@ void SdStyleSheet::Store(SvStream& rOut) |* \************************************************************************/ -sal_Bool SdStyleSheet::SetParent(const String& rParentName) +bool SdStyleSheet::SetParent(const String& rParentName) { - sal_Bool bResult = sal_False; + bool bResult = sal_False; if (SfxStyleSheet::SetParent(rParentName)) { @@ -211,7 +211,7 @@ sal_Bool SdStyleSheet::SetParent(const String& rParentName) SfxStyleSheetBase* pStyle = pPool->Find(rParentName, nFamily); if (pStyle) { - bResult = sal_True; + bResult = true; SfxItemSet& rParentSet = pStyle->GetItemSet(); GetItemSet().SetParent(&rParentSet); Broadcast( SfxSimpleHint( SFX_HINT_DATACHANGED ) ); @@ -219,14 +219,14 @@ sal_Bool SdStyleSheet::SetParent(const String& rParentName) } else { - bResult = sal_True; + bResult = true; GetItemSet().SetParent(NULL); Broadcast( SfxSimpleHint( SFX_HINT_DATACHANGED ) ); } } else { - bResult = sal_True; + bResult = true; } } return bResult; @@ -342,9 +342,9 @@ SfxItemSet& SdStyleSheet::GetItemSet() |* \************************************************************************/ -sal_Bool SdStyleSheet::IsUsed() const +bool SdStyleSheet::IsUsed() const { - sal_Bool bResult = sal_False; + bool bResult = false; sal_uInt16 nListenerCount = GetListenerCount(); if (nListenerCount > 0) @@ -636,28 +636,28 @@ void SdStyleSheet::AdjustToFontHeight(SfxItemSet& rSet, sal_Bool bOnlyMissingIte // -------------------------------------------------------------------- -sal_Bool SdStyleSheet::HasFollowSupport() const +bool SdStyleSheet::HasFollowSupport() const { - return sal_False; + return false; } // -------------------------------------------------------------------- -sal_Bool SdStyleSheet::HasParentSupport() const +bool SdStyleSheet::HasParentSupport() const { - return sal_True; + return true; } // -------------------------------------------------------------------- -sal_Bool SdStyleSheet::HasClearParentSupport() const +bool SdStyleSheet::HasClearParentSupport() const { - return sal_True; + return true; } // -------------------------------------------------------------------- -sal_Bool SdStyleSheet::SetName( const UniString& rName ) +bool SdStyleSheet::SetName( const UniString& rName ) { return SfxStyleSheet::SetName( rName ); } diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx index e8eb492aae2e..f0878c46967a 100644 --- a/svl/inc/svl/style.hxx +++ b/svl/inc/svl/style.hxx @@ -85,11 +85,11 @@ protected: rtl::OUString maDisplayName; String aHelpFile; // Name der Hilfedatei SfxItemSet* pSet; // ItemSet - sal_uInt16 nMask; // Flags + sal_uInt16 nMask; // Flags - sal_uLong nHelpId; // Hilfe-ID + sal_uLong nHelpId; // Hilfe-ID - sal_Bool bMySet; // sal_True: Set loeschen im dtor + bool bMySet; // sal_True: Set loeschen im dtor SfxStyleSheetBase( const UniString&, SfxStyleSheetBasePool*, SfxStyleFamily eFam, sal_uInt16 mask ); SfxStyleSheetBase( const SfxStyleSheetBase& ); @@ -104,7 +104,7 @@ public: virtual const UniString& GetName() const; // sets the internal name of this style - virtual sal_Bool SetName( const UniString& ); + virtual bool SetName( const UniString& ); /** returns the display name of this style, it is used at the user interface. If the display name is empty, this method returns the internal name. */ @@ -114,13 +114,13 @@ public: virtual void SetDisplayName( const rtl::OUString& ); virtual const UniString& GetParent() const; - virtual sal_Bool SetParent( const UniString& ); + virtual bool SetParent( const UniString& ); virtual const UniString& GetFollow() const; - virtual sal_Bool SetFollow( const UniString& ); - virtual sal_Bool HasFollowSupport() const; // Default sal_True - virtual sal_Bool HasParentSupport() const; // Default sal_True - virtual sal_Bool HasClearParentSupport() const; // Default sal_False - virtual sal_Bool IsUsed() const; // Default sal_True + virtual bool SetFollow( const UniString& ); + virtual bool HasFollowSupport() const; // Default true + virtual bool HasParentSupport() const; // Default true + virtual bool HasClearParentSupport() const; // Default false + virtual bool IsUsed() const; // Default true // Default aus dem Itemset; entweder dem uebergebenen // oder aus dem per GetItemSet() zurueckgelieferten Set virtual UniString GetDescription(); @@ -130,8 +130,8 @@ public: SfxStyleFamily GetFamily() const { return nFamily; } sal_uInt16 GetMask() const { return nMask; } void SetMask( sal_uInt16 mask) { nMask = mask; } - sal_Bool IsUserDefined() const - { return sal_Bool( ( nMask & SFXSTYLEBIT_USERDEF) != 0 ); } + bool IsUserDefined() const + { return ( nMask & SFXSTYLEBIT_USERDEF) != 0; } virtual sal_uLong GetHelpId( String& rFile ); virtual void SetHelpId( const String& r, sal_uLong nId ); @@ -171,17 +171,18 @@ protected: SfxStyleSheetBasePool* pBasePool; SfxStyleFamily nSearchFamily; - sal_uInt16 nMask; - sal_Bool SearchUsed() const { return bSearchUsed; } + sal_uInt16 nMask; + + bool SearchUsed() const { return bSearchUsed; } private: - sal_uInt16 GetPos(){return nAktPosition;} - SVL_DLLPRIVATE sal_Bool IsTrivialSearch(); - SVL_DLLPRIVATE sal_Bool DoesStyleMatch(SfxStyleSheetBase *pStyle); + sal_uInt16 GetPos() { return nAktPosition; } + SVL_DLLPRIVATE bool IsTrivialSearch(); + SVL_DLLPRIVATE bool DoesStyleMatch(SfxStyleSheetBase *pStyle); SfxStyleSheetBase* pAktStyle; - sal_uInt16 nAktPosition; - sal_Bool bSearchUsed; + sal_uInt16 nAktPosition; + bool bSearchUsed; friend class SfxStyleSheetBasePool; }; @@ -207,7 +208,7 @@ protected: sal_uInt16 nMask; SfxStyleSheetBase& Add( SfxStyleSheetBase& ); - void ChangeParent( const UniString&, const UniString&, sal_Bool bVirtual = sal_True ); + void ChangeParent( const UniString&, const UniString&, bool bVirtual = true ); virtual SfxStyleSheetBase* Create( const UniString&, SfxStyleFamily, sal_uInt16 ); virtual SfxStyleSheetBase* Create( const SfxStyleSheetBase& ); @@ -247,7 +248,7 @@ public: virtual SfxStyleSheetBase* Next(); virtual SfxStyleSheetBase* Find( const UniString&, SfxStyleFamily eFam, sal_uInt16 n=0xFFFF ); - virtual sal_Bool SetParent(SfxStyleFamily eFam, + virtual bool SetParent(SfxStyleFamily eFam, const UniString &rStyle, const UniString &rParent); @@ -271,7 +272,7 @@ public: SfxStyleSheet( const SfxStyleSheet& ); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - virtual sal_Bool SetParent( const UniString& ); + virtual bool SetParent( const UniString& ); protected: SfxStyleSheet() // do not use! needed by MSVC at compile time to satisfy ImplInheritanceHelper2 diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index 2a434b857a1b..1c8a7c858bbf 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -162,7 +162,7 @@ const XubString& SfxStyleSheetBase::GetName() const return aName; } -sal_Bool SfxStyleSheetBase::SetName( const XubString& rName ) +bool SfxStyleSheetBase::SetName( const XubString& rName ) { if(rName.Len() == 0) return sal_False; @@ -214,10 +214,10 @@ const XubString& SfxStyleSheetBase::GetParent() const return aParent; } -sal_Bool SfxStyleSheetBase::SetParent( const XubString& rName ) +bool SfxStyleSheetBase::SetParent( const XubString& rName ) { if ( rName == aName ) - return sal_False; + return false; if( aParent != rName ) { @@ -225,20 +225,20 @@ sal_Bool SfxStyleSheetBase::SetParent( const XubString& rName ) if( rName.Len() && !pIter ) { OSL_FAIL( "StyleSheet-Parent nicht gefunden" ); - return sal_False; + return false; } // rekursive Verknuepfungen verhindern if( aName.Len() ) while(pIter) { if(pIter->GetName() == aName) - return sal_False; + return false; pIter = pPool->Find(pIter->GetParent(), nFamily); } aParent = rName; } pPool->Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_MODIFIED, *this ) ); - return sal_True; + return true; } // Follow aendern @@ -248,19 +248,19 @@ const XubString& SfxStyleSheetBase::GetFollow() const return aFollow; } -sal_Bool SfxStyleSheetBase::SetFollow( const XubString& rName ) +bool SfxStyleSheetBase::SetFollow( const XubString& rName ) { if( aFollow != rName ) { if( !pPool->Find( rName, nFamily ) ) { OSL_FAIL( "StyleSheet-Follow nicht gefunden" ); - return sal_False; + return false; } aFollow = rName; } pPool->Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_MODIFIED, *this ) ); - return sal_True; + return true; } // Itemset setzen. Die Dflt-Implementation legt ein neues Set an. @@ -291,30 +291,30 @@ void SfxStyleSheetBase::SetHelpId( const String& rFile, sal_uLong nId ) // Folgevorlage m"oglich? Default: Ja -sal_Bool SfxStyleSheetBase::HasFollowSupport() const +bool SfxStyleSheetBase::HasFollowSupport() const { - return sal_True; + return true; } // Basisvorlage m"oglich? Default: Ja -sal_Bool SfxStyleSheetBase::HasParentSupport() const +bool SfxStyleSheetBase::HasParentSupport() const { - return sal_True; + return true; } // Basisvorlage uf NULL setzen m"oglich? Default: Nein -sal_Bool SfxStyleSheetBase::HasClearParentSupport() const +bool SfxStyleSheetBase::HasClearParentSupport() const { - return sal_False; + return false; } // Defaultmaessig sind alle StyleSheets Used -sal_Bool SfxStyleSheetBase::IsUsed() const +bool SfxStyleSheetBase::IsUsed() const { - return sal_True; + return true; } // eingestellte Attribute ausgeben @@ -361,17 +361,17 @@ SfxStyleFamily SfxStyleSheetIterator::GetSearchFamily() const return nSearchFamily; } -inline sal_Bool SfxStyleSheetIterator::IsTrivialSearch() +inline bool SfxStyleSheetIterator::IsTrivialSearch() { return nMask == 0xFFFF && GetSearchFamily() == SFX_STYLE_FAMILY_ALL; } -sal_Bool SfxStyleSheetIterator::DoesStyleMatch(SfxStyleSheetBase *pStyle) +bool SfxStyleSheetIterator::DoesStyleMatch(SfxStyleSheetBase *pStyle) { return ((GetSearchFamily() == SFX_STYLE_FAMILY_ALL) || ( pStyle->GetFamily() == GetSearchFamily() )) && (( pStyle->GetMask() & ( GetSearchMask() & ~SFXSTYLEBIT_USED )) || - ( bSearchUsed ? pStyle->IsUsed() : sal_False ) || + ( bSearchUsed ? pStyle->IsUsed() : false ) || GetSearchMask() == SFXSTYLEBIT_ALL ); } @@ -581,16 +581,15 @@ SfxStyleSheetBasePool::~SfxStyleSheetBasePool() delete pImp; } -sal_Bool SfxStyleSheetBasePool::SetParent(SfxStyleFamily eFam, const XubString& rStyle, const XubString& rParent) +bool SfxStyleSheetBasePool::SetParent(SfxStyleFamily eFam, const XubString& rStyle, const XubString& rParent) { SfxStyleSheetIterator aIter(this,eFam,SFXSTYLEBIT_ALL); - SfxStyleSheetBase *pStyle = - aIter.Find(rStyle); + SfxStyleSheetBase *pStyle = aIter.Find(rStyle); OSL_ENSURE(pStyle, "Vorlage nicht gefunden. Writer mit Solar <2541??"); if(pStyle) return pStyle->SetParent(rParent); else - return sal_False; + return false; } @@ -807,7 +806,7 @@ void SfxStyleSheetBasePool::Clear() void SfxStyleSheetBasePool::ChangeParent(const XubString& rOld, const XubString& rNew, - sal_Bool bVirtual) + bool bVirtual) { const sal_uInt16 nTmpMask = GetSearchMask(); SetSearchMask(GetSearchFamily(), 0xffff); @@ -865,10 +864,10 @@ SfxStyleSheet::~SfxStyleSheet() } -sal_Bool SfxStyleSheet::SetParent( const XubString& rName ) +bool SfxStyleSheet::SetParent( const XubString& rName ) { if(aParent == rName) - return sal_True; + return true; const XubString aOldParent(aParent); if(SfxStyleSheetBase::SetParent(rName)) { // aus der Benachrichtigungskette des alten @@ -885,9 +884,9 @@ sal_Bool SfxStyleSheet::SetParent( const XubString& rName ) if(pParent) StartListening(*pParent); } - return sal_True; + return true; } - return sal_False; + return false; } // alle Zuhoerer benachtichtigen diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx index 576e5d2f39ca..82b4788cac91 100644 --- a/sw/inc/docstyle.hxx +++ b/sw/inc/docstyle.hxx @@ -130,13 +130,13 @@ public: void PresetParent(const String& rName){ aParent = rName; } void PresetFollow(const String& rName){ aFollow = rName; } - virtual sal_Bool SetName( const String& rStr); - virtual sal_Bool SetParent( const String& rStr); - virtual sal_Bool SetFollow( const String& rStr); + virtual bool SetName( const String& rStr); + virtual bool SetParent( const String& rStr); + virtual bool SetFollow( const String& rStr); - virtual sal_Bool HasFollowSupport() const; - virtual sal_Bool HasParentSupport() const; - virtual sal_Bool HasClearParentSupport() const; + virtual bool HasFollowSupport() const; + virtual bool HasParentSupport() const; + virtual bool HasClearParentSupport() const; virtual String GetDescription(); virtual String GetDescription(SfxMapUnit eUnit); @@ -147,7 +147,7 @@ public: const SwNumRule* GetNumRule(); void SetNumRule(const SwNumRule& rRule); - virtual sal_Bool IsUsed() const; + virtual bool IsUsed() const; }; /*-------------------------------------------------------------------- @@ -204,7 +204,7 @@ public: virtual SfxStyleSheetBase* Find( const String&, SfxStyleFamily eFam, sal_uInt16 n=0xFFFF ); - virtual sal_Bool SetParent( SfxStyleFamily eFam, const String &rStyle, + virtual bool SetParent( SfxStyleFamily eFam, const String &rStyle, const String &rParent ); virtual void Remove( SfxStyleSheetBase* pStyle); diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx index 8276247910f6..ae984bdc9d11 100644 --- a/sw/source/ui/app/docstyle.cxx +++ b/sw/source/ui/app/docstyle.cxx @@ -530,19 +530,19 @@ const String& SwDocStyleSheet::GetFollow() const --------------------------------------------------------------------*/ -sal_Bool SwDocStyleSheet::HasFollowSupport() const +bool SwDocStyleSheet::HasFollowSupport() const { switch(nFamily) { case SFX_STYLE_FAMILY_PARA : - case SFX_STYLE_FAMILY_PAGE : return sal_True; + case SFX_STYLE_FAMILY_PAGE : return true; case SFX_STYLE_FAMILY_FRAME: case SFX_STYLE_FAMILY_CHAR : - case SFX_STYLE_FAMILY_PSEUDO: return sal_False; + case SFX_STYLE_FAMILY_PSEUDO: return false; default: OSL_ENSURE(!this, "unknown style family"); } - return sal_False; + return false; } /*-------------------------------------------------------------------- @@ -550,28 +550,28 @@ sal_Bool SwDocStyleSheet::HasFollowSupport() const --------------------------------------------------------------------*/ -sal_Bool SwDocStyleSheet::HasParentSupport() const +bool SwDocStyleSheet::HasParentSupport() const { - sal_Bool bRet = sal_False; + bool bRet = false; switch(nFamily) { case SFX_STYLE_FAMILY_CHAR : case SFX_STYLE_FAMILY_PARA : - case SFX_STYLE_FAMILY_FRAME: bRet = sal_True; + case SFX_STYLE_FAMILY_FRAME: bRet = true; default:; //prevent warning } return bRet; } -sal_Bool SwDocStyleSheet::HasClearParentSupport() const +bool SwDocStyleSheet::HasClearParentSupport() const { - sal_Bool bRet = sal_False; + bool bRet = false; switch(nFamily) { case SFX_STYLE_FAMILY_PARA : case SFX_STYLE_FAMILY_CHAR : - case SFX_STYLE_FAMILY_FRAME: bRet = sal_True; + case SFX_STYLE_FAMILY_FRAME: bRet = true; default:; //prevent warning } return bRet; @@ -758,20 +758,20 @@ String SwDocStyleSheet::GetDescription() --------------------------------------------------------------------*/ -sal_Bool SwDocStyleSheet::SetName( const String& rStr) +bool SwDocStyleSheet::SetName( const String& rStr) { if( !rStr.Len() ) - return sal_False; + return false; if( aName != rStr ) { if( !SfxStyleSheetBase::SetName( rStr )) - return sal_False; + return false; } else if(!bPhysical) FillStyleSheet( FillPhysical ); - int bChg = sal_False; + int bChg = false; switch(nFamily) { case SFX_STYLE_FAMILY_CHAR : @@ -780,7 +780,7 @@ sal_Bool SwDocStyleSheet::SetName( const String& rStr) if( pCharFmt && pCharFmt->GetName() != rStr ) { pCharFmt->SetName( rStr ); - bChg = sal_True; + bChg = true; } break; } @@ -794,7 +794,7 @@ sal_Bool SwDocStyleSheet::SetName( const String& rStr) else pColl->SetName(rStr); - bChg = sal_True; + bChg = true; } break; } @@ -808,7 +808,7 @@ sal_Bool SwDocStyleSheet::SetName( const String& rStr) else pFrmFmt->SetName( rStr ); - bChg = sal_True; + bChg = true; } break; } @@ -830,7 +830,7 @@ sal_Bool SwDocStyleSheet::SetName( const String& rStr) rDoc.GetIDocumentUndoRedo().DoUndo(bDoesUndo); rDoc.SetModified(); - bChg = sal_True; + bChg = true; } break; case SFX_STYLE_FAMILY_PSEUDO: @@ -848,7 +848,7 @@ sal_Bool SwDocStyleSheet::SetName( const String& rStr) pNumRule = rDoc.FindNumRulePtr(rStr); rDoc.SetModified(); - bChg = sal_True; + bChg = true; } } else @@ -857,7 +857,7 @@ sal_Bool SwDocStyleSheet::SetName( const String& rStr) ((SwNumRule*)pNumRule)->SetName( rStr, rDoc ); rDoc.SetModified(); - bChg = sal_True; + bChg = true; } } @@ -875,7 +875,7 @@ sal_Bool SwDocStyleSheet::SetName( const String& rStr) if( pSh ) pSh->CallChgLnk(); } - return sal_True; + return true; } /*-------------------------------------------------------------------- @@ -883,7 +883,7 @@ sal_Bool SwDocStyleSheet::SetName( const String& rStr) --------------------------------------------------------------------*/ -sal_Bool SwDocStyleSheet::SetParent( const String& rStr) +bool SwDocStyleSheet::SetParent( const String& rStr) { SwFmt* pFmt = 0, *pParent = 0; switch(nFamily) @@ -913,7 +913,7 @@ sal_Bool SwDocStyleSheet::SetParent( const String& rStr) OSL_ENSURE(!this, "unknown style family"); } - sal_Bool bRet = sal_False; + bool bRet = false; if( pFmt && pFmt->DerivedFrom() && pFmt->DerivedFrom()->GetName() != rStr ) { @@ -938,10 +938,10 @@ sal_Bool SwDocStyleSheet::SetParent( const String& rStr) --------------------------------------------------------------------*/ -sal_Bool SwDocStyleSheet::SetFollow( const String& rStr) +bool SwDocStyleSheet::SetFollow( const String& rStr) { if( rStr.Len() && !SfxStyleSheetBase::SetFollow( rStr )) - return sal_False; + return false; SwImplShellAction aTmpSh( rDoc ); switch(nFamily) @@ -987,7 +987,7 @@ sal_Bool SwDocStyleSheet::SetFollow( const String& rStr) OSL_ENSURE(!this, "unknwown style family"); } - return sal_True; + return true; } /*-------------------------------------------------------------------- @@ -1843,7 +1843,7 @@ SwFrmFmt* SwDocStyleSheet::GetFrmFmt() return pFrmFmt; } -sal_Bool SwDocStyleSheet::IsUsed() const +bool SwDocStyleSheet::IsUsed() const { if( !bPhysical ) { @@ -1852,7 +1852,7 @@ sal_Bool SwDocStyleSheet::IsUsed() const } if( !bPhysical ) - return sal_False; + return false; const SwModify* pMod; switch( nFamily ) @@ -1863,11 +1863,11 @@ sal_Bool SwDocStyleSheet::IsUsed() const case SFX_STYLE_FAMILY_PAGE : pMod = pDesc; break; case SFX_STYLE_FAMILY_PSEUDO: - return pNumRule ? rDoc.IsUsed( *pNumRule ) : sal_False; + return pNumRule ? rDoc.IsUsed( *pNumRule ) : false; default: OSL_ENSURE(!this, "unknown style family"); - return sal_False; + return false; } return rDoc.IsUsed( *pMod ); } @@ -2230,7 +2230,7 @@ void SwDocStyleSheetPool::Remove( SfxStyleSheetBase* pStyle) -sal_Bool SwDocStyleSheetPool::SetParent( SfxStyleFamily eFam, +bool SwDocStyleSheetPool::SetParent( SfxStyleFamily eFam, const String &rStyle, const String &rParent ) { SwFmt* pFmt = 0, *pParent = 0; @@ -2259,7 +2259,7 @@ sal_Bool SwDocStyleSheetPool::SetParent( SfxStyleFamily eFam, OSL_ENSURE(!this, "unknown style family"); } - sal_Bool bRet = sal_False; + bool bRet = false; if( pFmt && pFmt->DerivedFrom() && pFmt->DerivedFrom()->GetName() != rParent ) { From 4338d2f80ac68c6b55a9006254151f370bb8c6ab Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 26 Sep 2012 14:19:01 +0200 Subject: [PATCH 338/863] sal_Bool->bool in svl::DdeTransaction Change-Id: I97dd4411b5293b8f61527505e54608442eb18cca --- svl/inc/svl/svdde.hxx | 4 ++-- svl/source/svdde/ddecli.cxx | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/svl/inc/svl/svdde.hxx b/svl/inc/svl/svdde.hxx index 0d8bc212c04e..785c1f4183da 100644 --- a/svl/inc/svl/svdde.hxx +++ b/svl/inc/svl/svdde.hxx @@ -100,14 +100,14 @@ protected: long nTime; Link aData; Link aDone; - sal_Bool bBusy; + bool bBusy; DdeTransaction( DdeConnection&, SAL_UNUSED_PARAMETER const String&, SAL_UNUSED_PARAMETER long = 0 ); public: virtual ~DdeTransaction(); - sal_Bool IsBusy() { return bBusy; } + bool IsBusy() { return bBusy; } const rtl::OUString GetName() const; void Execute(); diff --git a/svl/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx index 368ef13e7663..007fb3670624 100644 --- a/svl/source/svdde/ddecli.cxx +++ b/svl/source/svdde/ddecli.cxx @@ -85,7 +85,7 @@ HDDEDATA CALLBACK DdeInternal::CliCallback( if( (DWORD)(*iter)->nId == nInfo1 ) { nCode = (*iter)->nType & (XCLASS_MASK | XTYP_MASK); - (*iter)->bBusy = sal_False; + (*iter)->bBusy = false; (*iter)->Done( 0 != hData ); bFound = sal_True; } @@ -266,7 +266,7 @@ DdeTransaction::DdeTransaction( DdeConnection& d, const String& rItemName, nTime = n; nId = 0; nType = 0; - bBusy = sal_False; + bBusy = false; rDde.aTransactions.push_back( this ); } @@ -329,7 +329,7 @@ void DdeTransaction::Execute() if ( nId && rDde.pImp->hConv ) DdeAbandonTransaction( pInst->hDdeInstCli, rDde.pImp->hConv, nId); nId = 0; - bBusy = sal_True; + bBusy = true; HDDEDATA hRet = DdeClientTransaction( (unsigned char*)pData, nData, rDde.pImp->hConv, hItem, nExtFmt, (UINT)nType, TIMEOUT_ASYNC, From a51833bf79eed21a7cddd6da45dc9d3dc07b4983 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 4 Oct 2012 22:46:10 +0200 Subject: [PATCH 339/863] fdo#52022: Simple/LargeControlPoints actually can have nil values ...in old LO 3.5 registrymodifications.xcu, which causes trouble when migrating to >= LO 3.6, see for all the details. Change-Id: I8fa1e67998c9588b9d8bf3a3b52e4b0684d3d705 --- officecfg/registry/schema/org/openoffice/Office/Calc.xcs | 4 ++-- officecfg/registry/schema/org/openoffice/Office/Writer.xcs | 4 ++-- officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs index 97516da174f1..0b31aec224b0 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs @@ -340,7 +340,7 @@ false - + @@ -351,7 +351,7 @@ false - + diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs index cffc7406f643..c91f75dd8e7d 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs @@ -1306,7 +1306,7 @@ false - + @@ -1317,7 +1317,7 @@ false - + diff --git a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs index 79f581a42928..6b998699903d 100644 --- a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs @@ -210,7 +210,7 @@ false - + @@ -221,7 +221,7 @@ false - + From 554a45f266791c32543fcf96a979036becf41f8a Mon Sep 17 00:00:00 2001 From: Ricardo Montania Date: Tue, 2 Oct 2012 11:31:09 -0300 Subject: [PATCH 340/863] ::rtl::OUString to OUString in basctl Change-Id: I34228049e15ee8a899a4c5e1484d7ed3bc541dd4 Reviewed-on: https://gerrit.libreoffice.org/748 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot --- basctl/source/basicide/baside3.cxx | 90 +++++++++++++------------- basctl/source/basicide/basidectrlr.cxx | 2 +- basctl/source/basicide/basides1.cxx | 74 ++++++++++----------- basctl/source/basicide/bastype2.hxx | 62 +++++++++--------- 4 files changed, 114 insertions(+), 114 deletions(-) diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index e5fc1ce20e04..27bdba100164 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -77,7 +77,7 @@ TYPEINIT1( DialogWindow, BaseWindow ); DialogWindow::DialogWindow ( DialogWindowLayout* pParent, ScriptDocument const& rDocument, - rtl::OUString aLibName, rtl::OUString aName, + OUString aLibName, OUString aName, com::sun::star::uno::Reference const& xDialogModel ) : BaseWindow(pParent, rDocument, aLibName, aName), @@ -256,7 +256,7 @@ void DialogWindow::GetState( SfxItemSet& rSet ) if ( xModel.is() ) { Reference< lang::XServiceInfo > xServiceInfo ( xModel, UNO_QUERY ); - if ( xServiceInfo.is() && xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument") ) ) ) + if ( xServiceInfo.is() && xServiceInfo->supportsService( "com.sun.star.sheet.SpreadsheetDocument" ) ) bIsCalc = true; } } @@ -662,7 +662,7 @@ Reference< container::XNameContainer > DialogWindow::GetDialog() const return pEditor->GetDialog(); } -bool DialogWindow::RenameDialog( const ::rtl::OUString& rNewName ) +bool DialogWindow::RenameDialog( const OUString& rNewName ) { if ( !basctl::RenameDialog( this, GetDocument(), GetLibName(), GetName(), rNewName ) ) return false; @@ -683,7 +683,7 @@ void DialogWindow::UpdateBrowser() rLayout.UpdatePropertyBrowser(); } -static ::rtl::OUString aResourceResolverPropName( RTL_CONSTASCII_USTRINGPARAM( "ResourceResolver" )); +static OUString aResourceResolverPropName( "ResourceResolver" ); bool DialogWindow::SaveDialog() { @@ -697,7 +697,7 @@ bool DialogWindow::SaveDialog() Sequence aServiceType(1); aServiceType[0] <<= TemplateDescription::FILESAVE_AUTOEXTENSION_PASSWORD; xFP = Reference< XFilePicker >( xMSF->createInstanceWithArguments( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ) ), aServiceType ), UNO_QUERY ); + "com.sun.star.ui.dialogs.FilePicker", aServiceType ), UNO_QUERY ); } Reference< XFilePickerControlAccess > xFPControl(xFP, UNO_QUERY); @@ -709,17 +709,17 @@ bool DialogWindow::SaveDialog() if ( !aCurPath.isEmpty() ) xFP->setDisplayDirectory ( aCurPath ); - xFP->setDefaultName( ::rtl::OUString( GetName() ) ); + xFP->setDefaultName( OUString( GetName() ) ); - ::rtl::OUString aDialogStr(IDE_RESSTR(RID_STR_STDDIALOGNAME)); + OUString aDialogStr(IDE_RESSTR(RID_STR_STDDIALOGNAME)); Reference< XFilterManager > xFltMgr(xFP, UNO_QUERY); - xFltMgr->appendFilter( aDialogStr, String( RTL_CONSTASCII_USTRINGPARAM( "*.xdl" ) ) ); - xFltMgr->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), String( RTL_CONSTASCII_USTRINGPARAM( FilterMask_All ) ) ); + xFltMgr->appendFilter( aDialogStr, String( "*.xdl" ) ); + xFltMgr->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), String( FilterMask_All ) ); xFltMgr->setCurrentFilter( aDialogStr ); if( xFP->execute() == RET_OK ) { - Sequence< ::rtl::OUString > aPaths = xFP->getFiles(); + Sequence< OUString > aPaths = xFP->getFiles(); aCurPath = aPaths[0]; // export dialog model to xml @@ -782,29 +782,29 @@ bool DialogWindow::SaveDialog() { INetURLObject aURLObj( aCurPath ); aURLObj.removeExtension(); - ::rtl::OUString aDialogName( aURLObj.getName() ); + OUString aDialogName( aURLObj.getName() ); aURLObj.removeSegment(); - ::rtl::OUString aURL( aURLObj.GetMainURL( INetURLObject::NO_DECODE ) ); + OUString aURL( aURLObj.GetMainURL( INetURLObject::NO_DECODE ) ); bool bReadOnly = false; - ::rtl::OUString aComment( RTL_CONSTASCII_USTRINGPARAM( "# " )); + OUString aComment( "# " ); aComment += aDialogName; - aComment += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " strings" )); + aComment += " strings" ; Reference< task::XInteractionHandler > xDummyHandler; // Remove old properties files in case of overwriting Dialog files if( xSFI->isFolder( aURL ) ) { - Sequence< ::rtl::OUString > aContentSeq = xSFI->getFolderContents( aURL, false ); + Sequence< OUString > aContentSeq = xSFI->getFolderContents( aURL, false ); - ::rtl::OUString aDialogName_( aDialogName ); - aDialogName_ += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_" )); + OUString aDialogName_( aDialogName ); + aDialogName_ += "_" ; sal_Int32 nCount = aContentSeq.getLength(); - const ::rtl::OUString* pFiles = aContentSeq.getConstArray(); + const OUString* pFiles = aContentSeq.getConstArray(); for( int i = 0 ; i < nCount ; i++ ) { - ::rtl::OUString aCompleteName = pFiles[i]; - rtl::OUString aPureName; - rtl::OUString aExtension; + OUString aCompleteName = pFiles[i]; + OUString aPureName; + OUString aExtension; sal_Int32 iDot = aCompleteName.lastIndexOf( '.' ); sal_Int32 iSlash = aCompleteName.lastIndexOf( '/' ); if( iDot != -1 ) @@ -946,7 +946,7 @@ LanguageMismatchQueryBox::LanguageMismatchQueryBox( Window* pParent, } -bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const ScriptDocument& rDocument, const ::rtl::OUString& aLibName ) +bool implImportDialog( Window* pWin, const OUString& rCurPath, const ScriptDocument& rDocument, const OUString& aLibName ) { bool bDone = false; @@ -957,7 +957,7 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri Sequence aServiceType(1); aServiceType[0] <<= TemplateDescription::FILEOPEN_SIMPLE; xFP = Reference< XFilePicker >( xMSF->createInstanceWithArguments( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ) ), aServiceType ), UNO_QUERY ); + "com.sun.star.ui.dialogs.FilePicker", aServiceType ), UNO_QUERY ); } Reference< XFilePickerControlAccess > xFPControl(xFP, UNO_QUERY); @@ -966,23 +966,23 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri aValue <<= sal_True; xFPControl->setValue(ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION, 0, aValue); - ::rtl::OUString aCurPath( rCurPath ); + OUString aCurPath( rCurPath ); if ( !aCurPath.isEmpty() ) xFP->setDisplayDirectory ( aCurPath ); - ::rtl::OUString aDialogStr(IDE_RESSTR(RID_STR_STDDIALOGNAME)); + OUString aDialogStr(IDE_RESSTR(RID_STR_STDDIALOGNAME)); Reference< XFilterManager > xFltMgr(xFP, UNO_QUERY); - xFltMgr->appendFilter( aDialogStr, String( RTL_CONSTASCII_USTRINGPARAM( "*.xdl" ) ) ); - xFltMgr->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), String( RTL_CONSTASCII_USTRINGPARAM( FilterMask_All ) ) ); + xFltMgr->appendFilter( aDialogStr, String( "*.xdl" ) ); + xFltMgr->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), String( FilterMask_All ) ); xFltMgr->setCurrentFilter( aDialogStr ); if( xFP->execute() == RET_OK ) { - Sequence< ::rtl::OUString > aPaths = xFP->getFiles(); + Sequence< OUString > aPaths = xFP->getFiles(); aCurPath = aPaths[0]; - ::rtl::OUString aBasePath; - ::rtl::OUString aOUCurPath( aCurPath ); + OUString aBasePath; + OUString aOUCurPath( aCurPath ); sal_Int32 iSlash = aOUCurPath.lastIndexOf( '/' ); if( iSlash != -1 ) aBasePath = aOUCurPath.copy( 0, iSlash + 1 ); @@ -991,7 +991,7 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri { // create dialog model Reference< container::XNameContainer > xDialogModel( xMSF->createInstance - ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDialogModel" ) ) ), UNO_QUERY_THROW ); + ( "com.sun.star.awt.UnoControlDialogModel" ), UNO_QUERY_THROW ); Reference< XSimpleFileAccess2 > xSFI( SimpleFileAccess::create(comphelper::getProcessComponentContext()) ); @@ -1003,14 +1003,14 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri comphelper::getComponentContext( xMSF ) ); ::xmlscript::importDialogModel( xInput, xDialogModel, xContext, rDocument.isDocument() ? rDocument.getDocument() : Reference< frame::XModel >() ); - ::rtl::OUString aXmlDlgName; + OUString aXmlDlgName; Reference< beans::XPropertySet > xDialogModelPropSet( xDialogModel, UNO_QUERY ); if( xDialogModelPropSet.is() ) { try { Any aXmlDialogNameAny = xDialogModelPropSet->getPropertyValue( DLGED_PROP_NAME ); - ::rtl::OUString aOUXmlDialogName; + OUString aOUXmlDialogName; aXmlDialogNameAny >>= aOUXmlDialogName; aXmlDlgName = aOUXmlDialogName; } @@ -1024,7 +1024,7 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri bool bDialogAlreadyExists = rDocument.hasDialog( aLibName, aXmlDlgName ); - ::rtl::OUString aNewDlgName = aXmlDlgName; + OUString aNewDlgName = aXmlDlgName; enum NameClashMode { NO_CLASH, @@ -1034,8 +1034,8 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri NameClashMode eNameClashMode = NO_CLASH; if( bDialogAlreadyExists ) { - ::rtl::OUString aQueryBoxTitle(IDE_RESSTR(RID_STR_DLGIMP_CLASH_TITLE)); - ::rtl::OUString aQueryBoxText(IDE_RESSTR(RID_STR_DLGIMP_CLASH_TEXT)); + OUString aQueryBoxTitle(IDE_RESSTR(RID_STR_DLGIMP_CLASH_TITLE)); + OUString aQueryBoxText(IDE_RESSTR(RID_STR_DLGIMP_CLASH_TEXT)); aQueryBoxText = aQueryBoxText.replaceAll("$(ARG1)", aXmlDlgName); NameClashQueryBox aQueryBox( pWin, aQueryBoxTitle, aQueryBoxText ); @@ -1071,7 +1071,7 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri bool bReadOnly = true; Reference< XStringResourceWithLocation > xImportStringResource = StringResourceWithLocation::create( xContext, aBasePath, bReadOnly, - aLocale, aXmlDlgName, ::rtl::OUString(), xDummyHandler ); + aLocale, aXmlDlgName, OUString(), xDummyHandler ); Sequence< lang::Locale > aImportLocaleSeq = xImportStringResource->getLocales(); sal_Int32 nImportLocaleCount = aImportLocaleSeq.getLength(); @@ -1098,8 +1098,8 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri bool bAddDialogLanguagesToLib = false; if( nOnlyInImportLanguageCount > 0 ) { - ::rtl::OUString aQueryBoxTitle(IDE_RESSTR(RID_STR_DLGIMP_MISMATCH_TITLE)); - ::rtl::OUString aQueryBoxText(IDE_RESSTR(RID_STR_DLGIMP_MISMATCH_TEXT)); + OUString aQueryBoxTitle(IDE_RESSTR(RID_STR_DLGIMP_MISMATCH_TITLE)); + OUString aQueryBoxText(IDE_RESSTR(RID_STR_DLGIMP_MISMATCH_TEXT)); LanguageMismatchQueryBox aQueryBox( pWin, aQueryBoxTitle, aQueryBoxText ); sal_uInt16 nRet = aQueryBox.Execute(); if( RET_YES == nRet ) @@ -1207,7 +1207,7 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri try { Any aXmlDialogNameAny; - aXmlDialogNameAny <<= ::rtl::OUString( aNewDlgName ); + aXmlDialogNameAny <<= OUString( aNewDlgName ); xDialogModelPropSet->setPropertyValue( DLGED_PROP_NAME, aXmlDialogNameAny ); bRenamed = true; } @@ -1250,7 +1250,7 @@ bool DialogWindow::ImportDialog() DBG_CHKTHIS( DialogWindow, 0 ); const ScriptDocument& rDocument = GetDocument(); - ::rtl::OUString aLibName = GetLibName(); + OUString aLibName = GetLibName(); return implImportDialog( this, aCurPath, rDocument, aLibName ); } @@ -1279,7 +1279,7 @@ bool DialogWindow::IsModified() return pUndoMgr.get(); } -::rtl::OUString DialogWindow::GetTitle() +OUString DialogWindow::GetTitle() { return GetName(); } @@ -1287,8 +1287,8 @@ bool DialogWindow::IsModified() EntryDescriptor DialogWindow::CreateEntryDescriptor() { ScriptDocument aDocument( GetDocument() ); - ::rtl::OUString aLibName( GetLibName() ); - ::rtl::OUString aLibSubName; + OUString aLibName( GetLibName() ); + OUString aLibSubName; LibraryLocation eLocation = aDocument.getLibraryLocation( aLibName ); return EntryDescriptor( aDocument, eLocation, aLibName, aLibSubName, GetName(), OBJ_TYPE_DIALOG ); } @@ -1325,7 +1325,7 @@ void DialogWindow::StoreData() Reference< XComponentContext > xContext( comphelper::getProcessComponentContext() ); Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, GetDocument().isDocument() ? GetDocument().getDocument() : Reference< frame::XModel >() ); - xLib->replaceByName( ::rtl::OUString( GetName() ), makeAny( xISP ) ); + xLib->replaceByName( OUString( GetName() ), makeAny( xISP ) ); } } } diff --git a/basctl/source/basicide/basidectrlr.cxx b/basctl/source/basicide/basidectrlr.cxx index 6af458723822..855ad1ee3f6f 100644 --- a/basctl/source/basicide/basidectrlr.cxx +++ b/basctl/source/basicide/basidectrlr.cxx @@ -38,7 +38,7 @@ namespace { int const nPropertyIconId = 1; -rtl::OUString const sPropertyIconId("IconId"); +OUString const sPropertyIconId("IconId"); } diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index 7244f092098d..42644e5762a0 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -114,8 +114,8 @@ void Shell::ExecuteCurrent( SfxRequest& rReq ) else nFound = pCurWin->StartSearchAndReplace(rSearchItem); - rtl::OUString aReplStr(IDE_RESSTR(RID_STR_SEARCHREPLACES)); - aReplStr = aReplStr.replaceAll("XX", rtl::OUString::valueOf(nFound)); + OUString aReplStr(IDE_RESSTR(RID_STR_SEARCHREPLACES)); + aReplStr = aReplStr.replaceAll("XX", OUString::valueOf(nFound)); InfoBox( pCurWin, aReplStr ).Execute(); } else @@ -272,7 +272,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) break; case SID_BASICIDE_CHOOSEMACRO: { - ChooseMacro( NULL, false, ::rtl::OUString() ); + ChooseMacro( NULL, false, OUString() ); } break; case SID_BASICIDE_CREATEMACRO: @@ -286,9 +286,9 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) ScriptDocument aDocument( ScriptDocument::getDocumentForBasicManager( pBasMgr ) ); StartListening( *pBasMgr, true /* log on only once */ ); - ::rtl::OUString aLibName( rInfo.GetLib() ); + OUString aLibName( rInfo.GetLib() ); if ( aLibName.isEmpty() ) - aLibName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Standard")); + aLibName = "Standard" ; StarBASIC* pBasic = pBasMgr->GetLib( aLibName ); if ( !pBasic ) { @@ -310,9 +310,9 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) { if ( rInfo.GetModule().Len() || !pBasic->GetModules()->Count() ) { - ::rtl::OUString aModName = rInfo.GetModule(); + OUString aModName = rInfo.GetModule(); - ::rtl::OUString sModuleCode; + OUString sModuleCode; if ( aDocument.createModule( aLibName, aModName, false, sModuleCode ) ) pModule = pBasic->FindModule( aModName ); } @@ -351,14 +351,14 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) if ( aWindowTable.find( rTabId.GetValue() ) != aWindowTable.end() ) { BaseWindow* pWin = aWindowTable[ rTabId.GetValue() ]; - ::rtl::OUString aNewName( rModName.GetValue() ); - ::rtl::OUString aOldName( pWin->GetName() ); + OUString aNewName( rModName.GetValue() ); + OUString aOldName( pWin->GetName() ); if ( aNewName != aOldName ) { bool bRenameOk = false; if (ModulWindow* pModWin = dynamic_cast(pWin)) { - rtl::OUString aLibName = pModWin->GetLibName(); + OUString aLibName = pModWin->GetLibName(); ScriptDocument aDocument( pWin->GetDocument() ); if (RenameModule(pModWin, aDocument, aLibName, aOldName, aNewName)) @@ -437,7 +437,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) uno::Reference< frame::XModel > xModel( rShellItem.GetValue(), UNO_QUERY ); ScriptDocument aDocument( xModel.is() ? ScriptDocument( xModel ) : ScriptDocument::getApplicationScriptDocument() ); const SfxStringItem& rLibNameItem = (const SfxStringItem&)rReq.GetArgs()->Get( SID_BASICIDE_ARG_LIBNAME ); - ::rtl::OUString aLibName( rLibNameItem.GetValue() ); + OUString aLibName( rLibNameItem.GetValue() ); if ( nSlot == SID_BASICIDE_LIBSELECTED ) { @@ -453,7 +453,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) Reference< script::XLibraryContainerPassword > xPasswd( xModLibContainer, UNO_QUERY ); if ( xPasswd.is() && xPasswd->isLibraryPasswordProtected( aLibName ) && !xPasswd->isLibraryPasswordVerified( aLibName ) ) { - ::rtl::OUString aPassword; + OUString aPassword; bOK = QueryPassword( xModLibContainer, aLibName, aPassword ); } } @@ -512,8 +512,8 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) DBG_ASSERT( rReq.GetArgs(), "arguments expected" ); const SbxItem& rSbxItem = (const SbxItem&)rReq.GetArgs()->Get(SID_BASICIDE_ARG_SBX ); ScriptDocument aDocument( rSbxItem.GetDocument() ); - ::rtl::OUString aLibName( rSbxItem.GetLibName() ); - ::rtl::OUString aName( rSbxItem.GetName() ); + OUString aLibName( rSbxItem.GetLibName() ); + OUString aName( rSbxItem.GetName() ); if ( m_aCurLibName.isEmpty() || ( aDocument == m_aCurDocument && aLibName == m_aCurLibName ) ) { if ( rSbxItem.GetType() == TYPE_MODULE ) @@ -538,8 +538,8 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) DBG_ASSERT( rReq.GetArgs(), "arguments expected" ); const SbxItem& rSbxItem = (const SbxItem&)rReq.GetArgs()->Get(SID_BASICIDE_ARG_SBX ); ScriptDocument aDocument( rSbxItem.GetDocument() ); - ::rtl::OUString aLibName( rSbxItem.GetLibName() ); - ::rtl::OUString aName( rSbxItem.GetName() ); + OUString aLibName( rSbxItem.GetLibName() ); + OUString aName( rSbxItem.GetName() ); SetCurLib( aDocument, aLibName ); BaseWindow* pWin = 0; if ( rSbxItem.GetType() == TYPE_DIALOG ) @@ -567,7 +567,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) SFX_REQUEST_ARG( rReq, pDocumentItem, SfxStringItem, SID_BASICIDE_ARG_DOCUMENT, false ); if ( pDocumentItem ) { - ::rtl::OUString sDocumentCaption = pDocumentItem->GetValue(); + OUString sDocumentCaption = pDocumentItem->GetValue(); if ( !sDocumentCaption.isEmpty() ) pDocument.reset( new ScriptDocument( ScriptDocument::getDocumentWithURLOrCaption( sDocumentCaption ) ) ); } @@ -587,16 +587,16 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) if ( !pLibNameItem ) break; - ::rtl::OUString aLibName( pLibNameItem->GetValue() ); + OUString aLibName( pLibNameItem->GetValue() ); pDocument->loadLibraryIfExists( E_SCRIPTS, aLibName ); SetCurLib( *pDocument, aLibName ); SFX_REQUEST_ARG( rReq, pNameItem, SfxStringItem, SID_BASICIDE_ARG_NAME, false ); if ( pNameItem ) { - ::rtl::OUString aName( pNameItem->GetValue() ); - ::rtl::OUString aModType(RTL_CONSTASCII_USTRINGPARAM("Module")); - ::rtl::OUString aDlgType(RTL_CONSTASCII_USTRINGPARAM("Dialog")); - ::rtl::OUString aType( aModType ); + OUString aName( pNameItem->GetValue() ); + OUString aModType( "Module" ); + OUString aDlgType( "Dialog" ); + OUString aType( aModType ); SFX_REQUEST_ARG( rReq, pTypeItem, SfxStringItem, SID_BASICIDE_ARG_TYPE, false ); if ( pTypeItem ) aType = pTypeItem->GetValue(); @@ -839,7 +839,7 @@ void Shell::GetState(SfxItemSet &rSet) break; case SID_BASICIDE_LIBSELECTOR: { - ::rtl::OUString aName; + OUString aName; if ( !m_aCurLibName.isEmpty() ) { LibraryLocation eLocation = m_aCurDocument.getLibraryLocation( m_aCurLibName ); @@ -851,7 +851,7 @@ void Shell::GetState(SfxItemSet &rSet) break; case SID_SEARCH_ITEM: { - ::rtl::OUString aSelected = GetSelectionText(true); + OUString aSelected = GetSelectionText(true); SvxSearchItem& rItem = GetExtraData()->GetSearchItem(); rItem.SetSearchString( aSelected ); rSet.Put( rItem ); @@ -859,7 +859,7 @@ void Shell::GetState(SfxItemSet &rSet) break; case SID_BASICIDE_STAT_DATE: { - ::rtl::OUString aDate(RTL_CONSTASCII_USTRINGPARAM("Datum?!")); + OUString aDate( "Datum?!" ); SfxStringItem aItem( SID_BASICIDE_STAT_DATE, aDate ); rSet.Put( aItem ); } @@ -887,7 +887,7 @@ void Shell::GetState(SfxItemSet &rSet) { if ( pCurWin ) { - ::rtl::OUString aTitle = pCurWin->CreateQualifiedName(); + OUString aTitle = pCurWin->CreateQualifiedName(); SfxStringItem aItem( SID_BASICIDE_STAT_TITLE, aTitle ); rSet.Put( aItem ); } @@ -910,7 +910,7 @@ void Shell::GetState(SfxItemSet &rSet) rSet.DisableItem( nWh ); else { - ::rtl::OUString aItemStr; + OUString aItemStr; boost::shared_ptr pCurMgr(GetCurLocalizationMgr()); if ( pCurMgr->isLibraryLocalized() ) { @@ -919,7 +919,7 @@ void Shell::GetState(SfxItemSet &rSet) sal_Int32 i, nCount = aLocaleSeq.getLength(); // Force different results for any combination of locales and default locale - ::rtl::OUString aLangStr; + OUString aLangStr; for ( i = 0; i <= nCount; ++i ) { lang::Locale aLocale; @@ -1051,11 +1051,11 @@ void Shell::SetCurWindow( BaseWindow* pNewWin, bool bUpdateTabBar, bool bRemembe void Shell::ManageToolbars() { - static ::rtl::OUString aLayoutManagerName( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )); - static ::rtl::OUString aMacroBarResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/macrobar" )); - static ::rtl::OUString aDialogBarResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/dialogbar" )); - static ::rtl::OUString aInsertControlsBarResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/insertcontrolsbar" )); - static ::rtl::OUString aFormControlsBarResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/formcontrolsbar" )); + static OUString aLayoutManagerName( "LayoutManager" ); + static OUString aMacroBarResName( "private:resource/toolbar/macrobar" ); + static OUString aDialogBarResName( "private:resource/toolbar/dialogbar" ); + static OUString aInsertControlsBarResName( "private:resource/toolbar/insertcontrolsbar" ); + static OUString aFormControlsBarResName( "private:resource/toolbar/formcontrolsbar" ); (void)aInsertControlsBarResName; if( !pCurWin ) @@ -1099,7 +1099,7 @@ BaseWindow* Shell::FindApplicationWindow() BaseWindow* Shell::FindWindow( ScriptDocument const& rDocument, - rtl::OUString const& rLibName, rtl::OUString const& rName, + OUString const& rLibName, OUString const& rName, ItemType eType, bool bFindSuspended ) { @@ -1153,7 +1153,7 @@ long Shell::CallBasicBreakHdl( StarBASIC* pBasic ) ModulWindow* Shell::ShowActiveModuleWindow( StarBASIC* pBasic ) { - SetCurLib( ScriptDocument::getApplicationScriptDocument(), ::rtl::OUString(), false ); + SetCurLib( ScriptDocument::getApplicationScriptDocument(), OUString(), false ); SbModule* pActiveModule = StarBASIC::GetActiveModule(); if (SbClassModuleObject* pCMO = dynamic_cast(pActiveModule)) @@ -1169,7 +1169,7 @@ ModulWindow* Shell::ShowActiveModuleWindow( StarBASIC* pBasic ) if (BasicManager* pBasMgr = FindBasicManager(pLib)) { ScriptDocument aDocument( ScriptDocument::getDocumentForBasicManager( pBasMgr ) ); - ::rtl::OUString aLibName = pLib->GetName(); + OUString aLibName = pLib->GetName(); pWin = FindBasWin( aDocument, aLibName, pActiveModule->GetName(), true ); DBG_ASSERT( pWin, "Error/Step-Hdl: Fenster wurde nicht erzeugt/gefunden!" ); SetCurLib( aDocument, aLibName ); @@ -1260,7 +1260,7 @@ void Shell::Deactivate( sal_Bool bMDI ) if ( /* !pWin->IsSuspended() && */ !pWin->CanClose() ) { if ( !m_aCurLibName.isEmpty() && ( pWin->IsDocument( m_aCurDocument ) || pWin->GetLibName() != m_aCurLibName ) ) - SetCurLib( ScriptDocument::getApplicationScriptDocument(), ::rtl::OUString(), false ); + SetCurLib( ScriptDocument::getApplicationScriptDocument(), OUString(), false ); SetCurWindow( pWin, true ); break; } diff --git a/basctl/source/basicide/bastype2.hxx b/basctl/source/basicide/bastype2.hxx index acd531f60f4a..b718ce2df6de 100644 --- a/basctl/source/basicide/bastype2.hxx +++ b/basctl/source/basicide/bastype2.hxx @@ -91,28 +91,28 @@ public: class LibEntry : public DocumentEntry { private: - rtl::OUString m_aLibName; + OUString m_aLibName; public: LibEntry ( ScriptDocument const& rDocument, LibraryLocation eLocation, - rtl::OUString const& rLibName, + OUString const& rLibName, EntryType eType = OBJ_TYPE_LIBRARY ); virtual ~LibEntry (); - rtl::OUString const& GetLibName () const { return m_aLibName; } + OUString const& GetLibName () const { return m_aLibName; } }; class EntryDescriptor { ScriptDocument m_aDocument; LibraryLocation m_eLocation; - rtl::OUString m_aLibName; - rtl::OUString m_aLibSubName; // for vba entry: Document Objects, Class Modules, Forms and Normal Modules - rtl::OUString m_aName; - rtl::OUString m_aMethodName; + OUString m_aLibName; + OUString m_aLibSubName; // for vba entry: Document Objects, Class Modules, Forms and Normal Modules + OUString m_aName; + OUString m_aMethodName; EntryType m_eType; public: @@ -120,41 +120,41 @@ public: EntryDescriptor ( ScriptDocument const& rDocument, LibraryLocation eLocation, - rtl::OUString const& rLibName, - rtl::OUString const& rLibSubName, - rtl::OUString const& rName, + OUString const& rLibName, + OUString const& rLibSubName, + OUString const& rName, EntryType eType ); EntryDescriptor ( ScriptDocument const& rDocument, LibraryLocation eLocation, - rtl::OUString const& rLibName, - rtl::OUString const& rLibSubName, - rtl::OUString const& rName, - rtl::OUString const& rMethodName, + OUString const& rLibName, + OUString const& rLibSubName, + OUString const& rName, + OUString const& rMethodName, EntryType eType ); virtual ~EntryDescriptor (); bool operator == (EntryDescriptor const& rDesc) const; - ScriptDocument const& GetDocument() const { return m_aDocument; } - void SetDocument( const ScriptDocument& rDocument ) { m_aDocument = rDocument; } + ScriptDocument const& GetDocument() const { return m_aDocument; } + void SetDocument( const ScriptDocument& rDocument ) { m_aDocument = rDocument; } LibraryLocation GetLocation() const { return m_eLocation; } void SetLocation( LibraryLocation eLocation ) { m_eLocation = eLocation; } - const ::rtl::OUString& GetLibName() const { return m_aLibName; } - void SetLibName( const ::rtl::OUString& aLibName ) { m_aLibName = aLibName; } + const OUString& GetLibName() const { return m_aLibName; } + void SetLibName( const OUString& aLibName ) { m_aLibName = aLibName; } - const ::rtl::OUString& GetLibSubName() const { return m_aLibSubName; } - void SetLibSubName( const ::rtl::OUString& aLibSubName ) { m_aLibSubName = aLibSubName; } + const OUString& GetLibSubName() const { return m_aLibSubName; } + void SetLibSubName( const OUString& aLibSubName ) { m_aLibSubName = aLibSubName; } - const ::rtl::OUString& GetName() const { return m_aName; } - void SetName( const ::rtl::OUString& aName ) { m_aName = aName; } + const OUString& GetName() const { return m_aName; } + void SetName( const OUString& aName ) { m_aName = aName; } - const ::rtl::OUString& GetMethodName() const { return m_aMethodName; } - void SetMethodName( const ::rtl::OUString& aMethodName ) { m_aMethodName = aMethodName; } + const OUString& GetMethodName() const { return m_aMethodName; } + void SetMethodName( const OUString& aMethodName ) { m_aMethodName = aMethodName; } EntryType GetType() const { return m_eType; } void SetType( EntryType eType ) { m_eType = eType; } @@ -188,10 +188,10 @@ protected: virtual long ExpandingHdl(); void ImpCreateLibEntries( SvLBoxEntry* pShellRootEntry, const ScriptDocument& rDocument, LibraryLocation eLocation ); - void ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const ::rtl::OUString& rLibName ); - void ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const ::rtl::OUString& rLibName ); - void ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubRootEntry, const ScriptDocument& rDocument, const ::rtl::OUString& rLibName ); - SvLBoxEntry* ImpFindEntry( SvLBoxEntry* pParent, const ::rtl::OUString& rText ); + void ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName ); + void ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName ); + void ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubRootEntry, const ScriptDocument& rDocument, const OUString& rLibName ); + SvLBoxEntry* ImpFindEntry( SvLBoxEntry* pParent, const OUString& rText ); // DocumentEventListener virtual void onDocumentCreated( const ScriptDocument& _rDocument ); @@ -220,7 +220,7 @@ public: SbModule* FindModule( SvLBoxEntry* pEntry ); SbxVariable* FindVariable( SvLBoxEntry* pEntry ); SvLBoxEntry* FindRootEntry( const ScriptDocument& rDocument, LibraryLocation eLocation ); - SvLBoxEntry* FindEntry( SvLBoxEntry* pParent, const ::rtl::OUString& rText, EntryType eType ); + SvLBoxEntry* FindEntry( SvLBoxEntry* pParent, const OUString& rText, EntryType eType ); EntryDescriptor GetEntryDescriptor( SvLBoxEntry* pEntry ); @@ -228,14 +228,14 @@ public: bool IsValidEntry( SvLBoxEntry* pEntry ); SvLBoxEntry* AddEntry( - const ::rtl::OUString& rText, const Image& rImage, + const OUString& rText, const Image& rImage, SvLBoxEntry* pParent, bool bChildrenOnDemand, std::auto_ptr aUserData ); void RemoveEntry (SvLBoxEntry*); void RemoveEntry (ScriptDocument const&); - ::rtl::OUString GetRootEntryName( const ScriptDocument& rDocument, LibraryLocation eLocation ) const; + OUString GetRootEntryName( const ScriptDocument& rDocument, LibraryLocation eLocation ) const; void GetRootEntryBitmaps( const ScriptDocument& rDocument, Image& rImage ); void SetCurrentEntry (EntryDescriptor&); From b29ecc914b78216ea9a355c431ca4748eb056b06 Mon Sep 17 00:00:00 2001 From: Ricardo Montania Date: Thu, 4 Oct 2012 00:32:16 -0300 Subject: [PATCH 341/863] More ::rtl::OUString cleanup in basctl Change-Id: If7cefe8d2e188e65a465a25a5d5f77e6daebcd17 Reviewed-on: https://gerrit.libreoffice.org/760 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot --- basctl/source/basicide/basidesh.cxx | 41 +++++++++++------------ basctl/source/basicide/basobj2.cxx | 52 ++++++++++++++--------------- 2 files changed, 46 insertions(+), 47 deletions(-) diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index 5b64d24aa854..4639b4eaf734 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -65,7 +65,6 @@ namespace basctl using namespace ::com::sun::star::uno; using namespace ::com::sun::star; -using ::rtl::OUString; typedef ::cppu::WeakImplHelper1< container::XContainerListener > ContainerListenerBASE; @@ -79,7 +78,7 @@ public: ~ContainerListenerImpl() { } - void addContainerListener( const ScriptDocument& rScriptDocument, const ::rtl::OUString& aLibName ) + void addContainerListener( const ScriptDocument& rScriptDocument, const OUString& aLibName ) { try { @@ -92,7 +91,7 @@ public: } catch(const uno::Exception& ) {} } - void removeContainerListener( const ScriptDocument& rScriptDocument, const ::rtl::OUString& aLibName ) + void removeContainerListener( const ScriptDocument& rScriptDocument, const OUString& aLibName ) { try { @@ -112,14 +111,14 @@ public: // XContainerListener virtual void SAL_CALL elementInserted( const container::ContainerEvent& Event ) throw( uno::RuntimeException ) { - rtl::OUString sModuleName; + OUString sModuleName; if( mpShell && ( Event.Accessor >>= sModuleName ) ) mpShell->FindBasWin( mpShell->m_aCurDocument, mpShell->m_aCurLibName, sModuleName, true, false ); } virtual void SAL_CALL elementReplaced( const container::ContainerEvent& ) throw( com::sun::star::uno::RuntimeException ) { } virtual void SAL_CALL elementRemoved( const container::ContainerEvent& Event ) throw( com::sun::star::uno::RuntimeException ) { - rtl::OUString sModuleName; + OUString sModuleName; if( mpShell && ( Event.Accessor >>= sModuleName ) ) { ModulWindow* pWin = mpShell->FindBasWin(mpShell->m_aCurDocument, mpShell->m_aCurLibName, sModuleName, false, true); @@ -186,7 +185,7 @@ void Shell::Init() GetExtraData()->ShellInCriticalSection() = true; - SetName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BasicIDE" ) ) ); + SetName( OUString( "BasicIDE" ) ); SetHelpId( SVX_INTERFACE_BASIDE_VIEWSH ); LibBoxControl::RegisterControl( SID_BASICIDE_LIBSELECTOR ); @@ -208,7 +207,7 @@ void Shell::Init() InitScrollBars(); InitTabBar(); - SetCurLib( ScriptDocument::getApplicationScriptDocument(), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Standard")), false, false ); + SetCurLib( ScriptDocument::getApplicationScriptDocument(), "Standard", false, false ); ShellCreated(this); @@ -330,7 +329,7 @@ void Shell::onDocumentClosed( const ScriptDocument& _rDocument ) pData->GetLibInfos().RemoveInfoFor( _rDocument ); if ( bSetCurLib ) - SetCurLib( ScriptDocument::getApplicationScriptDocument(), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Standard")), true, false ); + SetCurLib( ScriptDocument::getApplicationScriptDocument(), "Standard", true, false ); else if ( bSetCurWindow ) SetCurWindow( FindApplicationWindow(), true ); } @@ -401,7 +400,7 @@ sal_uInt16 Shell::PrepareClose( sal_Bool bUI, sal_Bool bForBrowsing ) if ( !pWin->CanClose() ) { if ( !m_aCurLibName.isEmpty() && ( pWin->IsDocument( m_aCurDocument ) || pWin->GetLibName() != m_aCurLibName ) ) - SetCurLib( ScriptDocument::getApplicationScriptDocument(), ::rtl::OUString(), false ); + SetCurLib( ScriptDocument::getApplicationScriptDocument(), OUString(), false ); SetCurWindow( pWin, true ); bCanClose = false; } @@ -626,7 +625,7 @@ void Shell::CheckWindows() -void Shell::RemoveWindows( const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, bool bDestroy ) +void Shell::RemoveWindows( const ScriptDocument& rDocument, const OUString& rLibName, bool bDestroy ) { bool bChangeCurWindow = pCurWin ? false : true; std::vector aDeleteVec; @@ -693,13 +692,13 @@ void Shell::UpdateWindows() StartListening( *doc->getBasicManager(), true /* log on only once */ ); // libraries - Sequence< ::rtl::OUString > aLibNames( doc->getLibraryNames() ); + Sequence< OUString > aLibNames( doc->getLibraryNames() ); sal_Int32 nLibCount = aLibNames.getLength(); - const ::rtl::OUString* pLibNames = aLibNames.getConstArray(); + const OUString* pLibNames = aLibNames.getConstArray(); for ( sal_Int32 i = 0 ; i < nLibCount ; i++ ) { - ::rtl::OUString aLibName = pLibNames[ i ]; + OUString aLibName = pLibNames[ i ]; if ( m_aCurLibName.isEmpty() || ( *doc == m_aCurDocument && aLibName == m_aCurLibName ) ) { @@ -730,13 +729,13 @@ void Shell::UpdateWindows() try { - Sequence< ::rtl::OUString > aModNames( doc->getObjectNames( E_SCRIPTS, aLibName ) ); + Sequence< OUString > aModNames( doc->getObjectNames( E_SCRIPTS, aLibName ) ); sal_Int32 nModCount = aModNames.getLength(); - const ::rtl::OUString* pModNames = aModNames.getConstArray(); + const OUString* pModNames = aModNames.getConstArray(); for ( sal_Int32 j = 0 ; j < nModCount ; j++ ) { - ::rtl::OUString aModName = pModNames[ j ]; + OUString aModName = pModNames[ j ]; ModulWindow* pWin = FindBasWin( *doc, aLibName, aModName, false ); if ( !pWin ) pWin = CreateBasWin( *doc, aLibName, aModName ); @@ -759,13 +758,13 @@ void Shell::UpdateWindows() { try { - Sequence< ::rtl::OUString > aDlgNames = doc->getObjectNames( E_DIALOGS, aLibName ); + Sequence< OUString > aDlgNames = doc->getObjectNames( E_DIALOGS, aLibName ); sal_Int32 nDlgCount = aDlgNames.getLength(); - const ::rtl::OUString* pDlgNames = aDlgNames.getConstArray(); + const OUString* pDlgNames = aDlgNames.getConstArray(); for ( sal_Int32 j = 0 ; j < nDlgCount ; j++ ) { - ::rtl::OUString aDlgName = pDlgNames[ j ]; + OUString aDlgName = pDlgNames[ j ]; // this find only looks for non-suspended windows; // suspended windows are handled in CreateDlgWin DialogWindow* pWin = FindDlgWin( *doc, aLibName, aDlgName, false ); @@ -907,7 +906,7 @@ void Shell::EnableScrollbars( bool bEnable ) aVScrollBar.Enable(bEnable); } -void Shell::SetCurLib( const ScriptDocument& rDocument, ::rtl::OUString aLibName, bool bUpdateWindows, bool bCheck ) +void Shell::SetCurLib( const ScriptDocument& rDocument, OUString aLibName, bool bUpdateWindows, bool bCheck ) { if ( !bCheck || ( rDocument != m_aCurDocument || aLibName != m_aCurLibName ) ) { @@ -938,7 +937,7 @@ void Shell::SetCurLib( const ScriptDocument& rDocument, ::rtl::OUString aLibName } } -void Shell::SetCurLibForLocalization( const ScriptDocument& rDocument, ::rtl::OUString aLibName ) +void Shell::SetCurLibForLocalization( const ScriptDocument& rDocument, OUString aLibName ) { // Create LocalizationMgr Reference< resource::XStringResourceManager > xStringResourceManager; diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx index e7a9b4e0119e..25d43a0d74d8 100644 --- a/basctl/source/basicide/basobj2.cxx +++ b/basctl/source/basicide/basobj2.cxx @@ -56,9 +56,9 @@ using namespace ::com::sun::star::container; extern "C" { SAL_DLLPUBLIC_EXPORT rtl_uString* basicide_choose_macro( void* pOnlyInDocument_AsXModel, sal_Bool bChooseOnly, rtl_uString* pMacroDesc ) { - ::rtl::OUString aMacroDesc( pMacroDesc ); + OUString aMacroDesc( pMacroDesc ); Reference< frame::XModel > aDocument( static_cast< frame::XModel* >( pOnlyInDocument_AsXModel ) ); - ::rtl::OUString aScriptURL = basctl::ChooseMacro( aDocument, bChooseOnly, aMacroDesc ); + OUString aScriptURL = basctl::ChooseMacro( aDocument, bChooseOnly, aMacroDesc ); rtl_uString* pScriptURL = aScriptURL.pData; rtl_uString_acquire( pScriptURL ); @@ -112,15 +112,15 @@ static bool StringCompareLessThan( const String& rStr1, const String& rStr2 ) //---------------------------------------------------------------------------- -Sequence< ::rtl::OUString > GetMergedLibraryNames( const Reference< script::XLibraryContainer >& xModLibContainer, const Reference< script::XLibraryContainer >& xDlgLibContainer ) +Sequence< OUString > GetMergedLibraryNames( const Reference< script::XLibraryContainer >& xModLibContainer, const Reference< script::XLibraryContainer >& xDlgLibContainer ) { // create a sorted list of module library names ::std::vector aModLibList; if ( xModLibContainer.is() ) { - Sequence< ::rtl::OUString > aModLibNames = xModLibContainer->getElementNames(); + Sequence< OUString > aModLibNames = xModLibContainer->getElementNames(); sal_Int32 nModLibCount = aModLibNames.getLength(); - const ::rtl::OUString* pModLibNames = aModLibNames.getConstArray(); + const OUString* pModLibNames = aModLibNames.getConstArray(); for ( sal_Int32 i = 0 ; i < nModLibCount ; i++ ) aModLibList.push_back( pModLibNames[ i ] ); ::std::sort( aModLibList.begin() , aModLibList.end() , StringCompareLessThan ); @@ -130,9 +130,9 @@ Sequence< ::rtl::OUString > GetMergedLibraryNames( const Reference< script::XLib ::std::vector aDlgLibList; if ( xDlgLibContainer.is() ) { - Sequence< ::rtl::OUString > aDlgLibNames = xDlgLibContainer->getElementNames(); + Sequence< OUString > aDlgLibNames = xDlgLibContainer->getElementNames(); sal_Int32 nDlgLibCount = aDlgLibNames.getLength(); - const ::rtl::OUString* pDlgLibNames = aDlgLibNames.getConstArray(); + const OUString* pDlgLibNames = aDlgLibNames.getConstArray(); for ( sal_Int32 i = 0 ; i < nDlgLibCount ; i++ ) aDlgLibList.push_back( pDlgLibNames[ i ] ); ::std::sort( aDlgLibList.begin() , aDlgLibList.end() , StringCompareLessThan ); @@ -146,7 +146,7 @@ Sequence< ::rtl::OUString > GetMergedLibraryNames( const Reference< script::XLib // copy to sequence sal_Int32 nLibCount = aLibList.size(); - Sequence< ::rtl::OUString > aSeqLibNames( nLibCount ); + Sequence< OUString > aSeqLibNames( nLibCount ); for ( sal_Int32 i = 0 ; i < nLibCount ; i++ ) aSeqLibNames.getArray()[ i ] = aLibList[ i ]; @@ -158,9 +158,9 @@ Sequence< ::rtl::OUString > GetMergedLibraryNames( const Reference< script::XLib bool RenameModule ( Window* pErrorParent, const ScriptDocument& rDocument, - const ::rtl::OUString& rLibName, - const ::rtl::OUString& rOldName, - const ::rtl::OUString& rNewName + const OUString& rLibName, + const OUString& rOldName, + const OUString& rNewName ) { if ( !rDocument.hasModule( rLibName, rOldName ) ) @@ -259,7 +259,7 @@ namespace //---------------------------------------------------------------------------- -::rtl::OUString ChooseMacro( const uno::Reference< frame::XModel >& rxLimitToDocument, bool bChooseOnly, const ::rtl::OUString& rMacroDesc ) +OUString ChooseMacro( const uno::Reference< frame::XModel >& rxLimitToDocument, bool bChooseOnly, const OUString& rMacroDesc ) { (void)rMacroDesc; @@ -324,15 +324,15 @@ namespace aName += pMethod->GetName(); // language - rtl::OUString aLanguage("Basic"); + OUString aLanguage("Basic"); // location - rtl::OUString aLocation; + OUString aLocation; ScriptDocument aDocument( ScriptDocument::getDocumentForBasicManager( pBasMgr ) ); if ( aDocument.isDocument() ) { // document basic - aLocation = rtl::OUString("document"); + aLocation = "document" ; if ( rxLimitToDocument.is() ) { @@ -366,17 +366,17 @@ namespace else { // application basic - aLocation = rtl::OUString("application"); + aLocation = "application" ; } // script URL if ( !bError ) { - aScriptURL = rtl::OUString("vnd.sun.star.script:"); + aScriptURL = "vnd.sun.star.script:" ; aScriptURL += aName; - aScriptURL += rtl::OUString("?language="); + aScriptURL += "?language=" ; aScriptURL += aLanguage; - aScriptURL += rtl::OUString("&location="); + aScriptURL += "&location=" ; aScriptURL += aLocation; } @@ -396,13 +396,13 @@ namespace //---------------------------------------------------------------------------- -Sequence< ::rtl::OUString > GetMethodNames( const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, const ::rtl::OUString& rModName ) +Sequence< OUString > GetMethodNames( const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rModName ) throw(NoSuchElementException ) { - Sequence< ::rtl::OUString > aSeqMethods; + Sequence< OUString > aSeqMethods; // get module - ::rtl::OUString aOUSource; + OUString aOUSource; if ( rDocument.getModule( rLibName, rModName, aOUSource ) ) { SbModuleRef xModule = new SbModule( rModName ); @@ -435,14 +435,14 @@ Sequence< ::rtl::OUString > GetMethodNames( const ScriptDocument& rDocument, con bool HasMethod ( ScriptDocument const& rDocument, - rtl::OUString const& rLibName, - rtl::OUString const& rModName, - rtl::OUString const& rMethName + OUString const& rLibName, + OUString const& rModName, + OUString const& rMethName ) { bool bHasMethod = false; - ::rtl::OUString aOUSource; + OUString aOUSource; if ( rDocument.hasModule( rLibName, rModName ) && rDocument.getModule( rLibName, rModName, aOUSource ) ) { SbModuleRef xModule = new SbModule( rModName ); From cf5593ae02ec8fabf47662f84bee7913a74d1e7e Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 5 Oct 2012 10:07:15 +0200 Subject: [PATCH 342/863] cui: kill C2U and UNISTRING macros Change-Id: I69d883e623f7fffd37c05b85a6655009da9c23a8 --- cui/source/options/optasian.cxx | 14 +++-- cui/source/options/optgdlg.cxx | 26 +++++----- cui/source/options/optinet2.cxx | 6 +-- cui/source/options/optlingu.cxx | 59 +++++++++++---------- cui/source/options/optsave.cxx | 24 ++++----- cui/source/options/optupdt.cxx | 42 +++++++-------- cui/source/options/treeopt.cxx | 90 +++++++++++++++------------------ 7 files changed, 121 insertions(+), 140 deletions(-) diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index 9c3df99dc5fd..229af974baf2 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -44,8 +44,6 @@ using namespace com::sun::star::frame; using namespace com::sun::star::beans; using rtl::OUString; -#define C2U(cChar) rtl::OUString::createFromAscii(cChar) - const sal_Char cIsKernAsianPunctuation[] = "IsKernAsianPunctuation"; const sal_Char cCharacterCompressionType[] = "CharacterCompressionType"; @@ -171,7 +169,7 @@ sal_Bool SvxAsianLayoutPage::FillItemSet( SfxItemSet& ) if(aCharKerningRB.IsChecked() != aCharKerningRB.GetSavedValue()) { pImpl->aConfig.SetKerningWesternTextOnly(aCharKerningRB.IsChecked()); - OUString sPunct(C2U(cIsKernAsianPunctuation)); + OUString sPunct(cIsKernAsianPunctuation); if(pImpl->xPrSetInfo.is() && pImpl->xPrSetInfo->hasPropertyByName(sPunct)) { Any aVal; @@ -187,7 +185,7 @@ sal_Bool SvxAsianLayoutPage::FillItemSet( SfxItemSet& ) sal_Int16 nSet = aNoCompressionRB.IsChecked() ? 0 : aPunctCompressionRB.IsChecked() ? 1 : 2; pImpl->aConfig.SetCharDistanceCompression(nSet); - OUString sCompress(C2U(cCharacterCompressionType)); + OUString sCompress(cCharacterCompressionType); if(pImpl->xPrSetInfo.is() && pImpl->xPrSetInfo->hasPropertyByName(sCompress)) { Any aVal; @@ -233,11 +231,11 @@ void SvxAsianLayoutPage::Reset( const SfxItemSet& ) if(xFact.is()) { pImpl->xPrSet = Reference( - xFact->createInstance(C2U("com.sun.star.document.Settings")), UNO_QUERY); + xFact->createInstance("com.sun.star.document.Settings"), UNO_QUERY); } if( pImpl->xPrSet.is() ) pImpl->xPrSetInfo = pImpl->xPrSet->getPropertySetInfo(); - OUString sForbidden(C2U("ForbiddenCharacters")); + OUString sForbidden("ForbiddenCharacters"); sal_Bool bKernWesternText = pImpl->aConfig.IsKerningWesternTextOnly(); sal_Int16 nCompress = pImpl->aConfig.GetCharDistanceCompression(); if(pImpl->xPrSetInfo.is()) @@ -247,13 +245,13 @@ void SvxAsianLayoutPage::Reset( const SfxItemSet& ) Any aForbidden = pImpl->xPrSet->getPropertyValue(sForbidden); aForbidden >>= pImpl->xForbidden; } - OUString sCompress(C2U(cCharacterCompressionType)); + OUString sCompress(cCharacterCompressionType); if(pImpl->xPrSetInfo->hasPropertyByName(sCompress)) { Any aVal = pImpl->xPrSet->getPropertyValue(sCompress); aVal >>= nCompress; } - OUString sPunct(C2U(cIsKernAsianPunctuation)); + OUString sPunct(cIsKernAsianPunctuation); if(pImpl->xPrSetInfo->hasPropertyByName(sPunct)) { Any aVal = pImpl->xPrSet->getPropertyValue(sPunct); diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 84bcad0a711f..5484fd832fa4 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -98,8 +98,6 @@ using namespace ::utl; using ::rtl::OString; using ::rtl::OUString; -#define C2U(cChar) OUString::createFromAscii(cChar) - // class OfaMiscTabPage -------------------------------------------------- int OfaMiscTabPage::DeactivatePage( SfxItemSet* pSet_ ) @@ -1496,7 +1494,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) sNewLang = aLocale.Language; if ( !aLocale.Country.isEmpty() ) { - sNewLang += C2U("-"); + sNewLang += "-"; sNewLang += aLocale.Country; } } @@ -1549,7 +1547,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) Any aValue; Locale aLocale = MsLangId::convertLanguageToLocale( eSelectLang, false ); aValue <<= aLocale; - OUString aPropName( C2U("DefaultLocale") ); + OUString aPropName( "DefaultLocale" ); pLangConfig->aLinguConfig.SetProperty( aPropName, aValue ); if (xLinguProp.is()) xLinguProp->setPropertyValue( aPropName, aValue ); @@ -1569,7 +1567,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) Any aValue; Locale aLocale = MsLangId::convertLanguageToLocale( eSelectLang, false ); aValue <<= aLocale; - OUString aPropName( C2U("DefaultLocale_CJK") ); + OUString aPropName( "DefaultLocale_CJK" ); pLangConfig->aLinguConfig.SetProperty( aPropName, aValue ); if (xLinguProp.is()) xLinguProp->setPropertyValue( aPropName, aValue ); @@ -1589,7 +1587,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) Any aValue; Locale aLocale = MsLangId::convertLanguageToLocale( eSelectLang, false ); aValue <<= aLocale; - OUString aPropName( C2U("DefaultLocale_CTL") ); + OUString aPropName( "DefaultLocale_CTL" ); pLangConfig->aLinguConfig.SetProperty( aPropName, aValue ); if (xLinguProp.is()) xLinguProp->setPropertyValue( aPropName, aValue ); @@ -1713,18 +1711,18 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) Any aCTLLang; try { - aWestLang = pLangConfig->aLinguConfig.GetProperty(C2U("DefaultLocale")); + aWestLang = pLangConfig->aLinguConfig.GetProperty("DefaultLocale"); Locale aLocale; aWestLang >>= aLocale; eCurLang = MsLangId::convertLocaleToLanguage( aLocale ); - aCJKLang = pLangConfig->aLinguConfig.GetProperty(C2U("DefaultLocale_CJK")); + aCJKLang = pLangConfig->aLinguConfig.GetProperty("DefaultLocale_CJK"); aLocale = Locale(); aCJKLang >>= aLocale; eCurLangCJK = MsLangId::convertLocaleToLanguage( aLocale ); - aCTLLang = pLangConfig->aLinguConfig.GetProperty(C2U("DefaultLocale_CTL")); + aCTLLang = pLangConfig->aLinguConfig.GetProperty("DefaultLocale_CTL"); aLocale = Locale(); aCTLLang >>= aLocale; eCurLangCTL = MsLangId::convertLocaleToLanguage( aLocale ); @@ -1779,7 +1777,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) aComplexLanguageLB.SaveValue(); aCurrentDocCB.SaveValue(); - sal_Bool bEnable = !pLangConfig->aLinguConfig.IsReadOnly( C2U("DefaultLocale") ); + sal_Bool bEnable = !pLangConfig->aLinguConfig.IsReadOnly( "DefaultLocale" ); aWesternLanguageFT.Enable( bEnable ); aWesternLanguageLB.Enable( bEnable ); @@ -1788,11 +1786,11 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) // #i15812# controls for CJK/CTL already enabled/disabled from LocaleSettingHdl #if 0 - bEnable = ( !pLangConfig->aLinguConfig.IsReadOnly( C2U("DefaultLocale_CJK") ) && aAsianSupportCB.IsChecked() ); + bEnable = ( !pLangConfig->aLinguConfig.IsReadOnly( "DefaultLocale_CJK" ) && aAsianSupportCB.IsChecked() ); aAsianLanguageFT.Enable( bEnable ); aAsianLanguageLB.Enable( bEnable ); - bEnable = ( !pLangConfig->aLinguConfig.IsReadOnly( C2U("DefaultLocale_CTL") ) && aCTLSupportCB.IsChecked() ); + bEnable = ( !pLangConfig->aLinguConfig.IsReadOnly( "DefaultLocale_CTL" ) && aCTLSupportCB.IsChecked() ); aComplexLanguageFT.Enable( bEnable ); aComplexLanguageLB.Enable( bEnable ); #endif @@ -1814,7 +1812,7 @@ IMPL_LINK( OfaLanguagesTabPage, SupportHdl, CheckBox*, pBox ) sal_Bool bCheck = pBox->IsChecked(); if ( &aAsianSupportCB == pBox ) { - sal_Bool bReadonly = pLangConfig->aLinguConfig.IsReadOnly( C2U("DefaultLocale_CJK")); + sal_Bool bReadonly = pLangConfig->aLinguConfig.IsReadOnly("DefaultLocale_CJK"); bCheck = ( bCheck && !bReadonly ); aAsianLanguageFT.Enable( bCheck ); aAsianLanguageLB.Enable( bCheck ); @@ -1824,7 +1822,7 @@ IMPL_LINK( OfaLanguagesTabPage, SupportHdl, CheckBox*, pBox ) } else if ( &aCTLSupportCB == pBox ) { - sal_Bool bReadonly = pLangConfig->aLinguConfig.IsReadOnly( C2U("DefaultLocale_CTL")); + sal_Bool bReadonly = pLangConfig->aLinguConfig.IsReadOnly("DefaultLocale_CTL"); bCheck = ( bCheck && !bReadonly ); aComplexLanguageFT.Enable( bCheck ); aComplexLanguageLB.Enable( bCheck ); diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index a4588f35e5f8..240cb876684a 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -97,8 +97,6 @@ using ::rtl::OUString; // static ---------------------------------------------------------------- -#define C2U(cChar) OUString::createFromAscii(cChar) - #include // ----------------------------------------------------------------------- @@ -1251,7 +1249,7 @@ public: /* -------------------------------------------------------------------------*/ MailerProgramCfg_Impl::MailerProgramCfg_Impl() : - utl::ConfigItem(C2U("Office.Common/ExternalMailer")), + utl::ConfigItem("Office.Common/ExternalMailer"), bROProgram(sal_False) { const Sequence< OUString > aNames = GetPropertyNames(); @@ -1288,7 +1286,7 @@ const Sequence MailerProgramCfg_Impl::GetPropertyNames() { Sequence aRet(1); OUString* pRet = aRet.getArray(); - pRet[0] = C2U("Program"); + pRet[0] = "Program"; return aRet; } diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index bfbf28634f09..3ea970e72d3b 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -78,7 +78,6 @@ using namespace ::com::sun::star::linguistic2; using namespace ::com::sun::star::beans; namespace css = com::sun::star; -#define C2U(cChar) OUString::createFromAscii(cChar) #define CBCOL_FIRST 0 #define CBCOL_SECOND 1 #define CBCOL_BOTH 2 @@ -733,7 +732,7 @@ SvxLinguData_Impl::SvxLinguData_Impl() : { xMSF = ::comphelper::getProcessServiceFactory(); uno::Reference < XInterface > xI = xMSF->createInstance( - C2U( "com.sun.star.linguistic2.LinguServiceManager" ) ); + "com.sun.star.linguistic2.LinguServiceManager" ); xLinguSrvcMgr = uno::Reference(xI, UNO_QUERY); DBG_ASSERT(xLinguSrvcMgr.is(), "No linguistic service available!"); if(xLinguSrvcMgr.is()) @@ -746,7 +745,7 @@ SvxLinguData_Impl::SvxLinguData_Impl() : //read spell checker Sequence< OUString > aSpellNames = xLinguSrvcMgr->getAvailableServices( - C2U(cSpell), Locale() ); + cSpell, Locale() ); const OUString* pSpellNames = aSpellNames.getConstArray(); sal_Int32 nIdx; @@ -772,7 +771,7 @@ SvxLinguData_Impl::SvxLinguData_Impl() : //read grammar checker Sequence< OUString > aGrammarNames = xLinguSrvcMgr->getAvailableServices( - C2U(cGrammar), Locale() ); + cGrammar, Locale() ); const OUString* pGrammarNames = aGrammarNames.getConstArray(); for(nIdx = 0; nIdx < aGrammarNames.getLength(); nIdx++) { @@ -796,7 +795,7 @@ SvxLinguData_Impl::SvxLinguData_Impl() : //read hyphenator Sequence< OUString > aHyphNames = xLinguSrvcMgr->getAvailableServices( - C2U(cHyph), Locale() ); + cHyph, Locale() ); const OUString* pHyphNames = aHyphNames.getConstArray(); for(nIdx = 0; nIdx < aHyphNames.getLength(); nIdx++) { @@ -820,7 +819,7 @@ SvxLinguData_Impl::SvxLinguData_Impl() : //read thesauri Sequence< OUString > aThesNames = xLinguSrvcMgr->getAvailableServices( - C2U(cThes), Locale() ); + cThes, Locale() ); const OUString* pThesNames = aThesNames.getConstArray(); for(nIdx = 0; nIdx < aThesNames.getLength(); nIdx++) { @@ -848,22 +847,22 @@ SvxLinguData_Impl::SvxLinguData_Impl() : { sal_Int16 nLang = SvxLocaleToLanguage( pAllLocales[nLocale] ); - aCfgSvcs = xLinguSrvcMgr->getConfiguredServices(C2U(cSpell), pAllLocales[nLocale]); + aCfgSvcs = xLinguSrvcMgr->getConfiguredServices(cSpell, pAllLocales[nLocale]); SetChecked( aCfgSvcs ); if (aCfgSvcs.getLength()) aCfgSpellTable[ nLang ] = aCfgSvcs; - aCfgSvcs = xLinguSrvcMgr->getConfiguredServices(C2U(cGrammar), pAllLocales[nLocale]); + aCfgSvcs = xLinguSrvcMgr->getConfiguredServices(cGrammar, pAllLocales[nLocale]); SetChecked( aCfgSvcs ); if (aCfgSvcs.getLength()) aCfgGrammarTable[ nLang ] = aCfgSvcs; - aCfgSvcs = xLinguSrvcMgr->getConfiguredServices(C2U(cHyph), pAllLocales[nLocale]); + aCfgSvcs = xLinguSrvcMgr->getConfiguredServices(cHyph, pAllLocales[nLocale]); SetChecked( aCfgSvcs ); if (aCfgSvcs.getLength()) aCfgHyphTable[ nLang ] = aCfgSvcs; - aCfgSvcs = xLinguSrvcMgr->getConfiguredServices(C2U(cThes), pAllLocales[nLocale]); + aCfgSvcs = xLinguSrvcMgr->getConfiguredServices(cThes, pAllLocales[nLocale]); SetChecked( aCfgSvcs ); if (aCfgSvcs.getLength()) aCfgThesTable[ nLang ] = aCfgSvcs; @@ -1231,7 +1230,7 @@ sal_Bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet ) uno::Reference< XLinguServiceManager > xMgr( pLinguData->GetManager() ); Locale aLocale( SvxCreateLocale(nLang) ); if (xMgr.is()) - xMgr->setConfiguredServices( C2U(cSpell), aLocale, aImplNames ); + xMgr->setConfiguredServices( cSpell, aLocale, aImplNames ); } // update grammar checker configuration entries @@ -1243,7 +1242,7 @@ sal_Bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet ) uno::Reference< XLinguServiceManager > xMgr( pLinguData->GetManager() ); Locale aLocale( SvxCreateLocale(nLang) ); if (xMgr.is()) - xMgr->setConfiguredServices( C2U(cGrammar), aLocale, aImplNames ); + xMgr->setConfiguredServices( cGrammar, aLocale, aImplNames ); } // update hyphenator configuration entries @@ -1255,7 +1254,7 @@ sal_Bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet ) uno::Reference< XLinguServiceManager > xMgr( pLinguData->GetManager() ); Locale aLocale( SvxCreateLocale(nLang) ); if (xMgr.is()) - xMgr->setConfiguredServices( C2U(cHyph), aLocale, aImplNames ); + xMgr->setConfiguredServices( cHyph, aLocale, aImplNames ); } // update thesaurus configuration entries @@ -1267,7 +1266,7 @@ sal_Bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet ) uno::Reference< XLinguServiceManager > xMgr( pLinguData->GetManager() ); Locale aLocale( SvxCreateLocale(nLang) ); if (xMgr.is()) - xMgr->setConfiguredServices( C2U(cThes), aLocale, aImplNames ); + xMgr->setConfiguredServices( cThes, aLocale, aImplNames ); } } @@ -1487,7 +1486,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) sal_uLong nUserData = 0; pEntry = CreateEntry( sSpellAuto, CBCOL_FIRST ); - aLngCfg.GetProperty( C2U(UPN_IS_SPELL_AUTO) ) >>= bVal; + aLngCfg.GetProperty( UPN_IS_SPELL_AUTO ) >>= bVal; const SfxPoolItem* pItem = GetItem( rSet, SID_AUTOSPELL_CHECK ); if (pItem) bVal = ((SfxBoolItem *) pItem)->GetValue(); @@ -1497,42 +1496,42 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) lcl_SetCheckButton( pEntry, bVal ); pEntry = CreateEntry( sGrammarAuto, CBCOL_FIRST ); - aLngCfg.GetProperty( C2U(UPN_IS_GRAMMAR_AUTO) ) >>= bVal; + aLngCfg.GetProperty( UPN_IS_GRAMMAR_AUTO ) >>= bVal; nUserData = OptionsUserData( EID_GRAMMAR_AUTO, sal_False, 0, sal_True, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); lcl_SetCheckButton( pEntry, bVal ); pEntry = CreateEntry( sCapitalWords, CBCOL_FIRST ); - aLngCfg.GetProperty( C2U(UPN_IS_SPELL_UPPER_CASE) ) >>= bVal; + aLngCfg.GetProperty( UPN_IS_SPELL_UPPER_CASE ) >>= bVal; nUserData = OptionsUserData( EID_CAPITAL_WORDS, sal_False, 0, sal_True, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); lcl_SetCheckButton( pEntry, bVal ); pEntry = CreateEntry( sWordsWithDigits, CBCOL_FIRST ); - aLngCfg.GetProperty( C2U(UPN_IS_SPELL_WITH_DIGITS) ) >>= bVal; + aLngCfg.GetProperty( UPN_IS_SPELL_WITH_DIGITS ) >>= bVal; nUserData = OptionsUserData( EID_WORDS_WITH_DIGITS, sal_False, 0, sal_True, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); lcl_SetCheckButton( pEntry, bVal ); pEntry = CreateEntry( sCapitalization, CBCOL_FIRST ); - aLngCfg.GetProperty( C2U(UPN_IS_SPELL_CAPITALIZATION) ) >>= bVal; + aLngCfg.GetProperty( UPN_IS_SPELL_CAPITALIZATION ) >>= bVal; nUserData = OptionsUserData( EID_CAPITALIZATION, sal_False, 0, sal_True, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); lcl_SetCheckButton( pEntry, bVal ); pEntry = CreateEntry( sSpellSpecial, CBCOL_FIRST ); - aLngCfg.GetProperty( C2U(UPN_IS_SPELL_SPECIAL) ) >>= bVal; + aLngCfg.GetProperty( UPN_IS_SPELL_SPECIAL ) >>= bVal; nUserData = OptionsUserData( EID_SPELL_SPECIAL, sal_False, 0, sal_True, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); lcl_SetCheckButton( pEntry, bVal ); pEntry = CreateEntry( sNumMinWordlen, CBCOL_SECOND ); - aLngCfg.GetProperty( C2U(UPN_HYPH_MIN_WORD_LENGTH) ) >>= nVal; + aLngCfg.GetProperty( UPN_HYPH_MIN_WORD_LENGTH ) >>= nVal; nUserData = OptionsUserData( EID_NUM_MIN_WORDLEN, sal_True, (sal_uInt16)nVal, sal_False, sal_False).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); @@ -1543,7 +1542,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) pHyp = &( (const SfxHyphenRegionItem &) rSet.Get( nWhich ) ); pEntry = CreateEntry( sNumPreBreak, CBCOL_SECOND ); - aLngCfg.GetProperty( C2U(UPN_HYPH_MIN_LEADING) ) >>= nVal; + aLngCfg.GetProperty( UPN_HYPH_MIN_LEADING ) >>= nVal; if (pHyp) nVal = (sal_Int16) pHyp->GetMinLead(); nUserData = OptionsUserData( EID_NUM_PRE_BREAK, sal_True, (sal_uInt16)nVal, sal_False, sal_False).GetUserData(); @@ -1551,7 +1550,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) pModel->Insert( pEntry ); pEntry = CreateEntry( sNumPostBreak, CBCOL_SECOND ); - aLngCfg.GetProperty( C2U(UPN_HYPH_MIN_TRAILING) ) >>= nVal; + aLngCfg.GetProperty( UPN_HYPH_MIN_TRAILING ) >>= nVal; if (pHyp) nVal = (sal_Int16) pHyp->GetMinTrail(); nUserData = OptionsUserData( EID_NUM_POST_BREAK, sal_True, (sal_uInt16)nVal, sal_False, sal_False).GetUserData(); @@ -1559,14 +1558,14 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) pModel->Insert( pEntry ); pEntry = CreateEntry( sHyphAuto, CBCOL_FIRST ); - aLngCfg.GetProperty( C2U(UPN_IS_HYPH_AUTO) ) >>= bVal; + aLngCfg.GetProperty( UPN_IS_HYPH_AUTO ) >>= bVal; nUserData = OptionsUserData( EID_HYPH_AUTO, sal_False, 0, sal_True, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); lcl_SetCheckButton( pEntry, bVal ); pEntry = CreateEntry( sHyphSpecial, CBCOL_FIRST ); - aLngCfg.GetProperty( C2U(UPN_IS_HYPH_SPECIAL) ) >>= bVal; + aLngCfg.GetProperty( UPN_IS_HYPH_SPECIAL ) >>= bVal; nUserData = OptionsUserData( EID_HYPH_SPECIAL, sal_False, 0, sal_True, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); @@ -2009,7 +2008,7 @@ SvxEditModulesDlg::SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl& rData) if (xAvail.is()) { aAvailLang = lcl_LocaleSeqToLangSeq( - xAvail->getAvailableLocales( C2U(cSpell) ) ); + xAvail->getAvailableLocales( cSpell ) ); } const Sequence< Locale >& rLoc = rLinguData.GetAllSupportedLocales(); const Locale* pLocales = rLoc.getConstArray(); @@ -2125,10 +2124,10 @@ OUString lcl_GetServiceName(sal_uInt8 nType) { switch(nType) { - case TYPE_SPELL : return C2U(cSpell); - case TYPE_GRAMMAR : return C2U(cGrammar); - case TYPE_HYPH : return C2U(cHyph); - case TYPE_THES : return C2U(cThes); + case TYPE_SPELL : return OUString(cSpell); + case TYPE_GRAMMAR : return OUString(cGrammar); + case TYPE_HYPH : return OUString(cHyph); + case TYPE_THES : return OUString(cThes); } return OUString(); } diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index 68f5312b8ed4..f8a5b0192db9 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -52,9 +52,7 @@ using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::container; using namespace comphelper; -using rtl::OUString; -#define C2U(cChar) OUString::createFromAscii(cChar) #define C2S(cChar) String( RTL_CONSTASCII_USTRINGPARAM(cChar) ) #define CFG_PAGE_AND_GROUP C2S("General"), C2S("LoadSave") // !! you have to update these index, if you changed the list of the child windows !! @@ -415,7 +413,7 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) { Reference< XMultiServiceFactory > xMSF = comphelper::getProcessServiceFactory(); pImpl->xFact = Reference( - xMSF->createInstance(C2U("com.sun.star.document.FilterFactory")), UNO_QUERY); + xMSF->createInstance("com.sun.star.document.FilterFactory"), UNO_QUERY); DBG_ASSERT(pImpl->xFact.is(), "service com.sun.star.document.FilterFactory unavailable"); Reference< XContainerQuery > xQuery(pImpl->xFact, UNO_QUERY); @@ -425,21 +423,21 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) { long nData = (long) aDocTypeLB.GetEntryData(n); OUString sCommand; - sCommand = C2U("matchByDocumentService=%1:iflags="); + sCommand = "matchByDocumentService=%1:iflags="; sCommand += String::CreateFromInt32(SFX_FILTER_IMPORT|SFX_FILTER_EXPORT); - sCommand += C2U(":eflags="); + sCommand += ":eflags="; sCommand += String::CreateFromInt32(SFX_FILTER_NOTINFILEDLG); - sCommand += C2U(":default_first"); + sCommand += ":default_first"; String sReplace; switch(nData) { - case APP_WRITER : sReplace = C2U("com.sun.star.text.TextDocument"); break; - case APP_WRITER_WEB : sReplace = C2U("com.sun.star.text.WebDocument"); break; - case APP_WRITER_GLOBAL : sReplace = C2U("com.sun.star.text.GlobalDocument"); break; - case APP_CALC : sReplace = C2U("com.sun.star.sheet.SpreadsheetDocument");break; - case APP_IMPRESS : sReplace = C2U("com.sun.star.presentation.PresentationDocument");break; - case APP_DRAW : sReplace = C2U("com.sun.star.drawing.DrawingDocument");break; - case APP_MATH : sReplace = C2U("com.sun.star.formula.FormulaProperties");break; + case APP_WRITER : sReplace = "com.sun.star.text.TextDocument"; break; + case APP_WRITER_WEB : sReplace = "com.sun.star.text.WebDocument"; break; + case APP_WRITER_GLOBAL : sReplace = "com.sun.star.text.GlobalDocument"; break; + case APP_CALC : sReplace = "com.sun.star.sheet.SpreadsheetDocument";break; + case APP_IMPRESS : sReplace = "com.sun.star.presentation.PresentationDocument";break; + case APP_DRAW : sReplace = "com.sun.star.drawing.DrawingDocument";break; + case APP_MATH : sReplace = "com.sun.star.formula.FormulaProperties";break; default: OSL_FAIL("illegal user data"); } String sTmp(sCommand); diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index 6450e5cb47bd..0e81360bc4f5 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -46,10 +46,6 @@ namespace lang = ::com::sun::star::lang; namespace uno = ::com::sun::star::uno; namespace util = ::com::sun::star::util; -// define ---------------------------------------------------------------- - -#define UNISTRING(s) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s)) - // class SvxOnlineUpdateTabPage -------------------------------------------------- SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage( Window* pParent, const SfxItemSet& rSet ) : @@ -77,11 +73,11 @@ SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage( Window* pParent, const SfxItemSe uno::Reference < lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); m_xUpdateAccess = uno::Reference < container::XNameReplace >( - xFactory->createInstance( UNISTRING( "com.sun.star.setup.UpdateCheckConfig" ) ), + xFactory->createInstance( "com.sun.star.setup.UpdateCheckConfig" ), uno::UNO_QUERY_THROW ); sal_Bool bDownloadSupported = sal_False; - m_xUpdateAccess->getByName( UNISTRING( "DownloadSupported") ) >>= bDownloadSupported; + m_xUpdateAccess->getByName( "DownloadSupported" ) >>= bDownloadSupported; WinBits nStyle = m_aDestPath.GetStyle(); nStyle |= WB_PATHELLIPSIS; @@ -114,7 +110,7 @@ void SvxOnlineUpdateTabPage::UpdateLastCheckedText() rtl::OUString aText; sal_Int64 lastChecked = 0; - m_xUpdateAccess->getByName( UNISTRING( "LastCheck") ) >>= lastChecked; + m_xUpdateAccess->getByName("LastCheck") >>= lastChecked; if( lastChecked == 0 ) // never checked { @@ -155,11 +151,11 @@ void SvxOnlineUpdateTabPage::UpdateLastCheckedText() delete pNumberFormatter; aText = m_aLastCheckedTemplate; - sal_Int32 nIndex = aText.indexOf( UNISTRING( "%DATE%" ) ); + sal_Int32 nIndex = aText.indexOf( "%DATE%" ); if ( nIndex != -1 ) aText = aText.replaceAt( nIndex, 6, aDateStr ); - nIndex = aText.indexOf( UNISTRING( "%TIME%" ) ); + nIndex = aText.indexOf( "%TIME%" ); if ( nIndex != -1 ) aText = aText.replaceAt( nIndex, 6, aTimeStr ); } @@ -188,7 +184,7 @@ sal_Bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet& ) if( m_aAutoCheckCheckBox.GetSavedValue() != m_aAutoCheckCheckBox.IsChecked() ) { bValue = (sal_True == m_aAutoCheckCheckBox.IsChecked()); - m_xUpdateAccess->replaceByName( UNISTRING("AutoCheckEnabled"), uno::makeAny( bValue ) ); + m_xUpdateAccess->replaceByName( "AutoCheckEnabled", uno::makeAny( bValue ) ); bModified = sal_True; } @@ -211,24 +207,24 @@ sal_Bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet& ) if( nValue > 0 ) { - m_xUpdateAccess->replaceByName( UNISTRING("CheckInterval"), uno::makeAny( nValue ) ); + m_xUpdateAccess->replaceByName( "CheckInterval", uno::makeAny( nValue ) ); bModified = sal_True; } if( m_aAutoDownloadCheckBox.GetSavedValue() != m_aAutoDownloadCheckBox.IsChecked() ) { bValue = (sal_True == m_aAutoDownloadCheckBox.IsChecked()); - m_xUpdateAccess->replaceByName( UNISTRING("AutoDownloadEnabled"), uno::makeAny( bValue ) ); + m_xUpdateAccess->replaceByName( "AutoDownloadEnabled", uno::makeAny( bValue ) ); bModified = sal_True; } rtl::OUString sValue, aURL; - m_xUpdateAccess->getByName( UNISTRING("DownloadDestination") ) >>= sValue; + m_xUpdateAccess->getByName( "DownloadDestination" ) >>= sValue; if( ( osl::FileBase::E_None == osl::FileBase::getFileURLFromSystemPath(m_aDestPath.GetText(), aURL) ) && ( ! aURL.equals( sValue ) ) ) { - m_xUpdateAccess->replaceByName( UNISTRING("DownloadDestination"), uno::makeAny( aURL ) ); + m_xUpdateAccess->replaceByName( "DownloadDestination", uno::makeAny( aURL ) ); bModified = sal_True; } @@ -244,7 +240,7 @@ sal_Bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet& ) void SvxOnlineUpdateTabPage::Reset( const SfxItemSet& ) { sal_Bool bValue = sal_Bool(); - m_xUpdateAccess->getByName( UNISTRING("AutoCheckEnabled") ) >>= bValue; + m_xUpdateAccess->getByName( "AutoCheckEnabled" ) >>= bValue; m_aAutoCheckCheckBox.Check(bValue); m_aEveryDayButton.Enable(bValue); @@ -252,7 +248,7 @@ void SvxOnlineUpdateTabPage::Reset( const SfxItemSet& ) m_aEveryMonthButton.Enable(bValue); sal_Int64 nValue = 0; - m_xUpdateAccess->getByName( UNISTRING("CheckInterval") ) >>= nValue; + m_xUpdateAccess->getByName( "CheckInterval" ) >>= nValue; if( nValue == 86400 ) m_aEveryDayButton.Check(); @@ -266,14 +262,14 @@ void SvxOnlineUpdateTabPage::Reset( const SfxItemSet& ) m_aEveryWeekButton.SaveValue(); m_aEveryMonthButton.SaveValue(); - m_xUpdateAccess->getByName( UNISTRING("AutoDownloadEnabled") ) >>= bValue; + m_xUpdateAccess->getByName( "AutoDownloadEnabled" ) >>= bValue; m_aAutoDownloadCheckBox.Check(bValue); m_aDestPathLabel.Enable(sal_True); m_aDestPath.Enable(sal_True); m_aChangePathButton.Enable(sal_True); rtl::OUString sValue, aPath; - m_xUpdateAccess->getByName( UNISTRING("DownloadDestination") ) >>= sValue; + m_xUpdateAccess->getByName( "DownloadDestination" ) >>= sValue; if( osl::FileBase::E_None == osl::FileBase::getSystemPathFromFileURL(sValue, aPath) ) m_aDestPath.SetText(aPath); @@ -339,19 +335,19 @@ IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, CheckNowHdl_Impl) comphelper::getProcessComponentContext() ) ); beans::NamedValue aProperty; - aProperty.Name = UNISTRING( "nodepath" ); - aProperty.Value = uno::makeAny( UNISTRING("org.openoffice.Office.Addons/AddonUI/OfficeHelp/UpdateCheckJob") ); + aProperty.Name = "nodepath"; + aProperty.Value = uno::makeAny( OUString("org.openoffice.Office.Addons/AddonUI/OfficeHelp/UpdateCheckJob") ); uno::Sequence< uno::Any > aArgumentList( 1 ); aArgumentList[0] = uno::makeAny( aProperty ); uno::Reference< container::XNameAccess > xNameAccess( xConfigProvider->createInstanceWithArguments( - UNISTRING("com.sun.star.configuration.ConfigurationAccess"), aArgumentList ), + "com.sun.star.configuration.ConfigurationAccess", aArgumentList ), uno::UNO_QUERY_THROW ); util::URL aURL; - xNameAccess->getByName(UNISTRING("URL")) >>= aURL.Complete; + xNameAccess->getByName("URL") >>= aURL.Complete; uno::Reference < util::XURLTransformer > xTransformer( util::URLTransformer::create( comphelper::getProcessComponentContext() ) ); @@ -359,7 +355,7 @@ IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, CheckNowHdl_Impl) xTransformer->parseStrict(aURL); uno::Reference < frame::XDesktop > xDesktop( - xFactory->createInstance( UNISTRING( "com.sun.star.frame.Desktop" ) ), + xFactory->createInstance( "com.sun.star.frame.Desktop" ), uno::UNO_QUERY_THROW ); uno::Reference< frame::XDispatchProvider > xDispatchProvider( diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index d17ca4b3241a..0403d1a31199 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -109,12 +109,6 @@ using namespace ::com::sun::star::linguistic2; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; -#ifdef C2U - #error "Who define C2U before! I use it to create const ascii strings ..." -#else - #define C2U(cChar) rtl::OUString( cChar ) -#endif - #define EXPAND_PROTOCOL "vnd.sun.star.expand:" LastPageSaver* OfaTreeOptionsDialog::pLastPageSaver = NULL; @@ -203,19 +197,19 @@ static String getGroupName( const rtl::OUString& rModule, bool bForced ) if ( !pPageRes ) pPageRes = new OfaPageResource; - if ( rModule == C2U("Writer") ) + if ( rModule == "Writer" ) sGroupName = pPageRes->GetTextArray().GetString(0); - else if ( rModule == C2U("WriterWeb") ) + else if ( rModule == "WriterWeb" ) sGroupName = pPageRes->GetHTMLArray().GetString(0); - else if ( rModule == C2U("Calc") ) + else if ( rModule == "Calc" ) sGroupName = pPageRes->GetCalcArray().GetString(0); - else if ( rModule == C2U("Impress") ) + else if ( rModule == "Impress" ) sGroupName = pPageRes->GetImpressArray().GetString(0); - else if ( rModule == C2U("Draw") ) + else if ( rModule == "Draw" ) sGroupName = pPageRes->GetDrawArray().GetString(0); - else if ( rModule == C2U("Math") ) + else if ( rModule == "Math" ) sGroupName = pPageRes->GetStarMathArray().GetString(0); - else if ( rModule == C2U("Base") ) + else if ( rModule == "Base" ) sGroupName = pPageRes->GetDatasourcesArray().GetString(0); } return sGroupName; @@ -264,11 +258,11 @@ public: }; MailMergeCfg_Impl::MailMergeCfg_Impl() : - utl::ConfigItem(C2U("Office.Writer/MailMergeWizard")), + utl::ConfigItem("Office.Writer/MailMergeWizard"), bIsEmailSupported(sal_False) { Sequence aNames(1); - aNames.getArray()[0] = C2U("EMailSupported"); + aNames.getArray()[0] = "EMailSupported"; const Sequence< Any > aValues = GetProperties(aNames); const Any* pValues = aValues.getConstArray(); if(aValues.getLength() && pValues[0].hasValue()) @@ -1083,7 +1077,7 @@ void OfaTreeOptionsDialog::SelectHdl_Impl() Reference < XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); m_xContainerWinProvider = Reference < awt::XContainerWindowProvider >( xFactory->createInstance( - C2U("com.sun.star.awt.ContainerWindowProvider") ), UNO_QUERY ); + "com.sun.star.awt.ContainerWindowProvider" ), UNO_QUERY ); DBG_ASSERT( m_xContainerWinProvider.is(), "service com.sun.star.awt.ContainerWindowProvider could not be loaded" ); } @@ -1520,7 +1514,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) if ( !lcl_isOptionHidden( SID_GENERAL_OPTIONS, aOptionsDlgOpt ) ) { ResStringArray& rGeneralArray = aDlgResource.GetGeneralArray(); - setGroupName( C2U("ProductName"), rGeneralArray.GetString(0) ); + setGroupName( "ProductName", rGeneralArray.GetString(0) ); nGroup = AddGroup( rGeneralArray.GetString(0), 0, 0, SID_GENERAL_OPTIONS ); sal_uInt16 nEnd = static_cast< sal_uInt16 >( rGeneralArray.Count() ); String sPageTitle; @@ -1535,7 +1529,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) // Disable Online Update page if service not installed if( RID_SVXPAGE_ONLINEUPDATE == nPageId ) { - const ::rtl::OUString sService = C2U("com.sun.star.setup.UpdateCheck"); + const ::rtl::OUString sService = "com.sun.star.setup.UpdateCheck"; try { @@ -1558,7 +1552,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) if ( !lcl_isOptionHidden( SID_FILTER_DLG, aOptionsDlgOpt ) ) { ResStringArray& rFilterArray = aDlgResource.GetFilterArray(); - setGroupName( C2U("LoadSave"), rFilterArray.GetString(0) ); + setGroupName( "LoadSave", rFilterArray.GetString(0) ); nGroup = AddGroup( rFilterArray.GetString(0), 0, 0, SID_FILTER_DLG ); for ( i = 1; i < rFilterArray.Count(); ++i ) { @@ -1573,7 +1567,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) if ( !lcl_isOptionHidden( SID_LANGUAGE_OPTIONS, aOptionsDlgOpt ) ) { ResStringArray& rLangArray = aDlgResource.GetLangArray(); - setGroupName( C2U("LanguageSettings"), rLangArray.GetString(0) ); + setGroupName( "LanguageSettings", rLangArray.GetString(0) ); nGroup = AddGroup( rLangArray.GetString(0), 0, 0, SID_LANGUAGE_OPTIONS ); for ( i = 1; i < rLangArray.Count(); ++i ) { @@ -1606,9 +1600,9 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) if ( !lcl_isOptionHidden( SID_SW_EDITOPTIONS, aOptionsDlgOpt ) ) { if ( aFactory == "com.sun.star.text.WebDocument" ) - setGroupName( C2U("WriterWeb"), rTextArray.GetString(0) ); + setGroupName( "WriterWeb", rTextArray.GetString(0) ); else - setGroupName( C2U("Writer"), rTextArray.GetString(0) ); + setGroupName( "Writer", rTextArray.GetString(0) ); nGroup = AddGroup(rTextArray.GetString(0), pSwMod, pSwMod, SID_SW_EDITOPTIONS ); for ( i = 1; i < rTextArray.Count(); ++i ) { @@ -1652,7 +1646,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) { ResStringArray& rCalcArray = aDlgResource.GetCalcArray(); SfxModule* pScMod = ( *( SfxModule** ) GetAppData( SHL_CALC ) ); - setGroupName( C2U("Calc"), rCalcArray.GetString(0) ); + setGroupName( "Calc", rCalcArray.GetString(0) ); nGroup = AddGroup( rCalcArray.GetString( 0 ), pScMod, pScMod, SID_SC_EDITOPTIONS ); const sal_uInt16 nCount = static_cast< const sal_uInt16 >( rCalcArray.Count() ); for ( i = 1; i < nCount; ++i ) @@ -1678,7 +1672,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) if ( !lcl_isOptionHidden( SID_SD_EDITOPTIONS, aOptionsDlgOpt ) ) { ResStringArray& rImpressArray = aDlgResource.GetImpressArray(); - setGroupName( C2U("Impress"), rImpressArray.GetString(0) ); + setGroupName( "Impress", rImpressArray.GetString(0) ); nGroup = AddGroup( rImpressArray.GetString( 0 ), pSdMod, pSdMod, SID_SD_EDITOPTIONS ); const sal_Bool bCTL = aLanguageOptions.IsCTLFontEnabled(); const sal_uInt16 nCount = static_cast< const sal_uInt16 >( rImpressArray.Count() ); @@ -1702,7 +1696,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) if ( !lcl_isOptionHidden( SID_SD_GRAPHIC_OPTIONS, aOptionsDlgOpt ) ) { ResStringArray& rDrawArray = aDlgResource.GetDrawArray(); - setGroupName( C2U("Draw"), rDrawArray.GetString(0) ); + setGroupName( "Draw", rDrawArray.GetString(0) ); nGroup = AddGroup( rDrawArray.GetString( 0 ), pSdMod, pSdMod, SID_SD_GRAPHIC_OPTIONS ); const sal_Bool bCTL = aLanguageOptions.IsCTLFontEnabled(); const sal_uInt16 nCount = static_cast< const sal_uInt16 >( rDrawArray.Count() ); @@ -1727,7 +1721,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) { ResStringArray& rStarMathArray = aDlgResource.GetStarMathArray(); SfxModule* pSmMod = (*(SfxModule**) GetAppData(SHL_SM)); - setGroupName( C2U("Math"), rStarMathArray.GetString(0) ); + setGroupName( "Math", rStarMathArray.GetString(0) ); nGroup = AddGroup(rStarMathArray.GetString(0), pSmMod, pSmMod, SID_SM_EDITOPTIONS ); for ( i = 1; i < rStarMathArray.Count(); ++i ) { @@ -1747,7 +1741,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) ) ) { ResStringArray& rDSArray = aDlgResource.GetDatasourcesArray(); - setGroupName( C2U("Base"), rDSArray.GetString(0) ); + setGroupName( "Base", rDSArray.GetString(0) ); nGroup = AddGroup( rDSArray.GetString(0), 0, NULL, SID_SB_STARBASEOPTIONS ); for ( i = 1; i < rDSArray.Count(); ++i ) { @@ -1761,7 +1755,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) if ( !lcl_isOptionHidden( SID_SCH_EDITOPTIONS, aOptionsDlgOpt ) ) { ResStringArray& rChartArray = aDlgResource.GetChartArray(); - setGroupName( C2U("Charts"), rChartArray.GetString(0) ); + setGroupName( "Charts", rChartArray.GetString(0) ); nGroup = AddGroup( rChartArray.GetString(0), 0, 0, SID_SCH_EDITOPTIONS ); for ( i = 1; i < rChartArray.Count(); ++i ) { @@ -1775,7 +1769,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) if ( !lcl_isOptionHidden( SID_INET_DLG, aOptionsDlgOpt ) ) { ResStringArray& rInetArray = aDlgResource.GetInetArray(); - setGroupName( C2U("Internet"), rInetArray.GetString(0) ); + setGroupName( "Internet", rInetArray.GetString(0) ); nGroup = AddGroup(rInetArray.GetString(0), 0, 0, SID_INET_DLG ); for ( i = 1; i < rInetArray.Count(); ++i ) @@ -1937,7 +1931,7 @@ rtl::OUString OfaTreeOptionsDialog::GetModuleIdentifier( if ( !xCurrentFrame.is() ) { Reference < XDesktop > xDesktop( xMFac->createInstance( - C2U("com.sun.star.frame.Desktop") ), UNO_QUERY ); + "com.sun.star.frame.Desktop" ), UNO_QUERY ); if ( xDesktop.is() ) xCurrentFrame = xDesktop->getCurrentFrame(); } @@ -1983,7 +1977,7 @@ Module* OfaTreeOptionsDialog::LoadModule( { // load the nodes of this module Reference< XNameAccess > xNodeAccess; - xModAccess->getByName( C2U("Nodes") ) >>= xNodeAccess; + xModAccess->getByName( "Nodes" ) >>= xNodeAccess; if ( xNodeAccess.is() ) { Sequence< rtl::OUString > xTemp = xNodeAccess->getElementNames(); @@ -1994,7 +1988,7 @@ Module* OfaTreeOptionsDialog::LoadModule( xNodeAccess->getByName( xTemp[x] ) >>= xAccess; if ( xAccess.is() ) { - xAccess->getByName( C2U("Index") ) >>= nIndex; + xAccess->getByName( "Index" ) >>= nIndex; if ( nIndex < 0 ) // append nodes with index < 0 pModule->m_aNodeList.push_back( @@ -2046,11 +2040,11 @@ VectorOfNodes OfaTreeOptionsDialog::LoadNodes( sal_Int32 nGroupIndex = 0; sNodeId = seqNames[i]; - xNodeAccess->getByName( C2U("Label") ) >>= sLabel; - xNodeAccess->getByName( C2U("OptionsPage") ) >>= sPageURL; - xNodeAccess->getByName( C2U("AllModules") ) >>= bAllModules; - xNodeAccess->getByName( C2U("GroupId") ) >>= sGroupId; - xNodeAccess->getByName( C2U("GroupIndex") ) >>= nGroupIndex; + xNodeAccess->getByName( "Label" ) >>= sLabel; + xNodeAccess->getByName( "OptionsPage" ) >>= sPageURL; + xNodeAccess->getByName( "AllModules" ) >>= bAllModules; + xNodeAccess->getByName( "GroupId" ) >>= sGroupId; + xNodeAccess->getByName( "GroupIndex" ) >>= nGroupIndex; if ( sLabel.isEmpty() ) sLabel = sGroupName; @@ -2067,7 +2061,7 @@ VectorOfNodes OfaTreeOptionsDialog::LoadNodes( } Reference< XNameAccess > xLeavesSet; - xNodeAccess->getByName( C2U( "Leaves" ) ) >>= xLeavesSet; + xNodeAccess->getByName( "Leaves" ) >>= xLeavesSet; if ( xLeavesSet.is() ) { Sequence< rtl::OUString > seqLeaves = xLeavesSet->getElementNames(); @@ -2081,12 +2075,12 @@ VectorOfNodes OfaTreeOptionsDialog::LoadNodes( rtl::OUString sId, sLeafLabel, sEventHdl, sLeafURL, sLeafGrpId; sal_Int32 nLeafGrpIdx = 0; - xLeaveAccess->getByName( C2U("Id") ) >>= sId; - xLeaveAccess->getByName( C2U("Label") ) >>= sLeafLabel; - xLeaveAccess->getByName( C2U("OptionsPage") ) >>= sLeafURL; - xLeaveAccess->getByName( C2U("EventHandlerService") ) >>= sEventHdl; - xLeaveAccess->getByName( C2U("GroupId") ) >>= sLeafGrpId; - xLeaveAccess->getByName( C2U("GroupIndex") ) >>= nLeafGrpIdx; + xLeaveAccess->getByName( "Id" ) >>= sId; + xLeaveAccess->getByName( "Label" ) >>= sLeafLabel; + xLeaveAccess->getByName( "OptionsPage" ) >>= sLeafURL; + xLeaveAccess->getByName( "EventHandlerService" ) >>= sEventHdl; + xLeaveAccess->getByName( "GroupId" ) >>= sLeafGrpId; + xLeaveAccess->getByName( "GroupIndex" ) >>= nLeafGrpIdx; if ( rExtensionId.isEmpty() || sId == rExtensionId ) { @@ -2340,7 +2334,7 @@ sal_Bool ExtensionsTabPage::DispatchAction( const rtl::OUString& rAction ) { try { - bRet = m_xEventHdl->callHandlerMethod( m_xPage, makeAny( rAction ), C2U("external_event") ); + bRet = m_xEventHdl->callHandlerMethod( m_xPage, makeAny( rAction ), "external_event" ); } catch ( Exception& ) { @@ -2367,7 +2361,7 @@ void ExtensionsTabPage::ActivatePage() m_xPage->setPosSize( aPos.X() + 1, aPos.Y() + 1, aSize.Width() - 2, aSize.Height() - 2, awt::PosSize::POSSIZE ); if ( !m_sEventHdl.isEmpty() ) - DispatchAction( C2U("initialize") ); + DispatchAction( "initialize" ); } } @@ -2392,7 +2386,7 @@ void ExtensionsTabPage::DeactivatePage() void ExtensionsTabPage::ResetPage() { - DispatchAction( C2U("back") ); + DispatchAction( "back" ); ActivatePage(); } @@ -2400,7 +2394,7 @@ void ExtensionsTabPage::ResetPage() void ExtensionsTabPage::SavePage() { - DispatchAction( C2U("ok") ); + DispatchAction( "ok" ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ From 6f4a8f93c8944628d6d56b21d9a9c4b360884d1d Mon Sep 17 00:00:00 2001 From: David Tardon Date: Thu, 4 Oct 2012 10:37:52 +0200 Subject: [PATCH 343/863] directly use udkapi Change-Id: I44c3b830a61ef1f65833732b5bc66c061ed27c21 --- stoc/InternalUnoApi_bootstrap.mk | 99 -------------------------------- stoc/Library_bootstrap.mk | 2 +- stoc/Module_stoc.mk | 1 - 3 files changed, 1 insertion(+), 101 deletions(-) delete mode 100644 stoc/InternalUnoApi_bootstrap.mk diff --git a/stoc/InternalUnoApi_bootstrap.mk b/stoc/InternalUnoApi_bootstrap.mk deleted file mode 100644 index cd56224c02ec..000000000000 --- a/stoc/InternalUnoApi_bootstrap.mk +++ /dev/null @@ -1,99 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2012 Red Hat, Inc., David Tardon -# (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_InternalUnoApi_InternalUnoApi,bootstrap)) - -$(eval $(call gb_InternalUnoApi_set_types,bootstrap, \ - com.sun.star.beans.PropertyAttribute \ - com.sun.star.beans.XPropertySet \ - com.sun.star.connection.SocketPermission \ - com.sun.star.container.NoSuchElementException \ - com.sun.star.container.XContentEnumerationAccess \ - com.sun.star.container.XEnumeration \ - com.sun.star.container.XEnumerationAccess \ - com.sun.star.container.XHierarchicalNameAccess \ - com.sun.star.container.XSet \ - com.sun.star.io.FilePermission \ - com.sun.star.lang.DisposedException \ - com.sun.star.lang.IllegalArgumentException \ - com.sun.star.lang.XComponent \ - com.sun.star.lang.XEventListener \ - com.sun.star.lang.XInitialization \ - com.sun.star.lang.XMultiComponentFactory \ - com.sun.star.lang.XMultiServiceFactory \ - com.sun.star.lang.XServiceInfo \ - com.sun.star.lang.XSingleComponentFactory \ - com.sun.star.lang.XSingleServiceFactory \ - com.sun.star.lang.XTypeProvider \ - com.sun.star.lang.XUnoTunnel \ - com.sun.star.loader.XImplementationLoader \ - com.sun.star.reflection.XArrayTypeDescription \ - com.sun.star.reflection.XCompoundTypeDescription \ - com.sun.star.reflection.XConstantsTypeDescription \ - com.sun.star.reflection.XConstantTypeDescription \ - com.sun.star.reflection.XEnumTypeDescription \ - com.sun.star.reflection.XIndirectTypeDescription \ - com.sun.star.reflection.XInterfaceAttributeTypeDescription \ - com.sun.star.reflection.XInterfaceAttributeTypeDescription2 \ - com.sun.star.reflection.XInterfaceMemberTypeDescription \ - com.sun.star.reflection.XInterfaceMethodTypeDescription \ - com.sun.star.reflection.XInterfaceTypeDescription \ - com.sun.star.reflection.XInterfaceTypeDescription2 \ - com.sun.star.reflection.XMethodParameter \ - com.sun.star.reflection.XModuleTypeDescription \ - com.sun.star.reflection.XParameter \ - com.sun.star.reflection.XPropertyTypeDescription \ - com.sun.star.reflection.XPublished \ - com.sun.star.reflection.XServiceConstructorDescription \ - com.sun.star.reflection.XServiceTypeDescription \ - com.sun.star.reflection.XServiceTypeDescription2 \ - com.sun.star.reflection.XSingletonTypeDescription \ - com.sun.star.reflection.XSingletonTypeDescription2 \ - com.sun.star.reflection.XStructTypeDescription \ - com.sun.star.reflection.XTypeDescription \ - com.sun.star.reflection.XTypeDescriptionEnumerationAccess \ - com.sun.star.reflection.XUnionTypeDescription \ - com.sun.star.registry.XImplementationRegistration2 \ - com.sun.star.registry.XRegistryKey \ - com.sun.star.registry.XSimpleRegistry \ - com.sun.star.security.AllPermission \ - com.sun.star.security.RuntimePermission \ - com.sun.star.security.XAccessController \ - com.sun.star.security.XPolicy \ - com.sun.star.uno.DeploymentException \ - com.sun.star.uno.RuntimeException \ - com.sun.star.uno.TypeClass \ - com.sun.star.uno.XAggregation \ - com.sun.star.uno.XComponentContext \ - com.sun.star.uno.XCurrentContext \ - com.sun.star.uno.XInterface \ - com.sun.star.uno.XUnloadingPreference \ - com.sun.star.uno.XWeak \ - com.sun.star.util.XMacroExpander \ -)) - -# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/stoc/Library_bootstrap.mk b/stoc/Library_bootstrap.mk index a7576114f947..b9d0f18f033c 100644 --- a/stoc/Library_bootstrap.mk +++ b/stoc/Library_bootstrap.mk @@ -43,7 +43,7 @@ $(eval $(call gb_Library_set_include,bootstrap,\ )) $(eval $(call gb_Library_use_internal_bootstrap_api,bootstrap,\ - bootstrap \ + udkapi \ )) $(eval $(call gb_Library_use_libraries,bootstrap,\ diff --git a/stoc/Module_stoc.mk b/stoc/Module_stoc.mk index a6d31813e0e3..1d3e7a65929c 100644 --- a/stoc/Module_stoc.mk +++ b/stoc/Module_stoc.mk @@ -28,7 +28,6 @@ $(eval $(call gb_Module_Module,stoc)) $(eval $(call gb_Module_add_targets,stoc,\ - InternalUnoApi_bootstrap \ Library_bootstrap \ Library_introspection \ Library_invocadapt \ From 3a282cc97cb846efd065983aa17f9b1875fbef66 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Thu, 4 Oct 2012 10:58:14 +0200 Subject: [PATCH 344/863] drop rdbmaker support from UnoApiTarget Change-Id: I02ca44cc33d1d8e1ebc9f158f859c9218d2ed832 --- solenv/gbuild/InternalUnoApi.mk | 5 ---- solenv/gbuild/UnoApiTarget.mk | 46 ++++++++------------------------- 2 files changed, 11 insertions(+), 40 deletions(-) diff --git a/solenv/gbuild/InternalUnoApi.mk b/solenv/gbuild/InternalUnoApi.mk index f80fe016e615..587e62456620 100644 --- a/solenv/gbuild/InternalUnoApi.mk +++ b/solenv/gbuild/InternalUnoApi.mk @@ -117,11 +117,6 @@ $(foreach dep,$(3),$(call gb_InternalUnoApi_define_api_dependency,$(1),$(2),$(de endef -define gb_InternalUnoApi_set_types -$(call gb_UnoApiTarget_set_types,$(1)_out,$(2)) - -endef - define gb_InternalUnoApi_set_include $(call gb_UnoApiTarget_set_include,$(1)_out,$(2)) diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index b8c219efae59..a5d69fe1ec98 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -82,8 +82,6 @@ endif # UnoApiTarget -gb_UnoApiTarget_RDBMAKERTARGET := $(call gb_Executable_get_target_for_build,rdbmaker) -gb_UnoApiTarget_RDBMAKERCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_RDBMAKERTARGET) gb_UnoApiTarget_REGCOMPARETARGET := $(call gb_Executable_get_target_for_build,regcompare) gb_UnoApiTarget_REGCOMPARECOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGCOMPARETARGET) gb_UnoApiTarget_REGMERGETARGET := $(call gb_Executable_get_target_for_build,regmerge) @@ -92,30 +90,17 @@ gb_UnoApiTarget_REGMERGECOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR gb_UnoApiTarget_TYPESRDB := $(call gb_UnoApiTarget_get_target,types) define gb_UnoApiTarget__command_impl -RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(2)) && \ -$(1) @$${RESPONSEFILE} && \ +RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(1) $(2) $(3)) && \ +$(gb_UnoApiTarget_REGMERGECOMMAND) @$${RESPONSEFILE} && \ rm -f $${RESPONSEFILE} endef -define gb_UnoApiTarget__regmerge_command_impl -$(call gb_UnoApiTarget__command_impl,$(gb_UnoApiTarget_REGMERGECOMMAND),$(1) $(2) $(3)) -endef - -define gb_UnoApiTarget__rdbmaker_command_impl -$(call gb_UnoApiTarget__command_impl,$(gb_UnoApiTarget_RDBMAKERCOMMAND),-O$(1) -B$(2) -b$(3) $(4) $(5)) -endef - define gb_UnoApiTarget__command -$(call gb_Output_announce,$*,$(true),UNO,4) +$(call gb_Output_announce,$(2),$(true),UNO,4) mkdir -p $(dir $(1)) && \ -$(if $(UNOAPI_FILES),\ - $(call gb_UnoApiTarget__regmerge_command_impl,$(1),$(UNOAPI_ROOT),$(UNOAPI_FILES)),\ - $(if $(UNOAPI_MERGE),\ - $(call gb_UnoApiTarget__regmerge_command_impl,$(1),$(UNOAPI_ROOT),$(UNOAPI_MERGE)),\ - $(call gb_UnoApiTarget__rdbmaker_command_impl,$(1),UCR,$(UNOAPI_ROOT),\ - $(addprefix -T,$(UNOAPI_TYPES)),$(gb_UnoApiTarget_TYPESRDB)))) \ +$(call gb_UnoApiTarget__command_impl,$(1),$(UNOAPI_ROOT),$(if $(UNOAPI_FILES),$(UNOAPI_FILES),$(UNOAPI_MERGE))) \ $(if $(UNOAPI_REFERENCE), \ - $(call gb_Output_announce,$*,$(true),DBc,3) \ + $(call gb_Output_announce,$(2),$(true),DBc,3) \ && $(gb_UnoApiTarget_REGCOMPARECOMMAND) \ -f -t \ -r1 $(UNOAPI_REFERENCE) \ @@ -123,11 +108,11 @@ $(if $(UNOAPI_REFERENCE), \ endef define gb_UnoApiTarget__check_mode -$(if $(or $(and $(1),$(2),$(3)),$(and $(1),$(2)),$(and $(2),$(3)),$(and $(1),$(3))),\ - $(error More than one mode of function of UnoApiTarget used: this is not supported),\ - $(if $(or $(1),$(2),$(3)),,\ - $(error Neither IDL files nor merged RDBs nor type list were used: nothing will be produced))) -$(if $(4),,$(error No root has been set for the rdb file)) +$(if $(and $(UNOAPI_FILES),$(UNOAPI_MERGE)),\ + $(error Both IDL files and merged RDBs were used: this is not supported)) +$(if $(or $(UNOAPI_FILES),$(UNOAPI_MERGE)),,\ + $(error Neither IDL files nor merged RDBs were used: nothing will be produced)) +$(if $(UNOAPI_ROOT),,$(error No root has been set for the rdb file)) endef $(call gb_UnoApiTarget_get_external_headers_target,%) : @@ -137,7 +122,7 @@ $(call gb_UnoApiTarget_get_headers_target,%) : $(call gb_UnoApiTarget_get_extern mkdir -p $(dir $@) && touch $@ $(call gb_UnoApiTarget_get_target,%) : - $(call gb_UnoApiTarget__check_mode,$(UNOAPI_FILES),$(UNOAPI_MERGE),$(UNOAPI_TYPES),$(UNOAPI_ROOT)) + $(call gb_UnoApiTarget__check_mode) $(call gb_UnoApiTarget__command,$@,$*) .PHONY : $(call gb_UnoApiTarget_get_clean_target,%) @@ -174,7 +159,6 @@ define gb_UnoApiTarget_UnoApiTarget $(call gb_UnoApiTarget_get_target,$(1)) : INCLUDE := $(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_FILES := $(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_MERGE := -$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_TYPES := $(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_REFERENCE := $(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_ROOT := @@ -247,14 +231,6 @@ $(call gb_UnoApiTarget_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(2) endef -# Set XML component dependencies description. -define gb_UnoApiTarget_set_types -$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_TYPES := $(2) -$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_TYPESRDB) -$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_RDBMAKERTARGET) - -endef - define gb_UnoApiTarget_add_reference_rdbfile $$(call gb_Output_error,gb_UnoApiTarget_add_reference_rdbfile: use gb_UnoApiTarget_set_reference_rdbfile instead.) endef From fbd30b2a09e7e92ad83db669d81199d7f3a4a8a1 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Thu, 4 Oct 2012 13:47:13 +0200 Subject: [PATCH 345/863] re-add accidentally dropped modeline Change-Id: Ie59b0bab6bec6957f13a3931b6be46985e3db2c4 --- connectivity/source/drivers/ado/AStatement.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx index b76bf81d50d1..6e97e8ebd729 100644 --- a/connectivity/source/drivers/ado/AStatement.cxx +++ b/connectivity/source/drivers/ado/AStatement.cxx @@ -815,3 +815,5 @@ void SAL_CALL OStatement::release() throw() { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ From 5ef8d9b771bd0918644695772dd58a9e74f9f1d4 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 5 Oct 2012 13:28:50 +0300 Subject: [PATCH 346/863] Clarification to comment Change-Id: I0143516455f5abad2da6b13a985d08b37e5c3cae --- configure.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/configure.in b/configure.in index 4ea7155d2db5..c81931c97584 100644 --- a/configure.in +++ b/configure.in @@ -2350,6 +2350,12 @@ if test -z "$enable_database_connectivity"; then # And actually, do enable it for iOS, too. Let's get back to # figuring out what to do with this later, if ever. + + # (Note that with "enable", I mean "enable building the related + # code". Very likely little of it will make any sense at run-time + # on Android or iOS and won't even be shipped with/linked into any + # app.) + #if test $_os != iOS; then enable_database_connectivity=yes #fi From 2ba5fe6952c8b5aaf81b13a037854becd31c9a9c Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Fri, 5 Oct 2012 13:00:24 +0200 Subject: [PATCH 347/863] add ODMA license Change-Id: Ie1dfa8bac9d894d86d15fed98341d4700d656fb9 --- readlicense_oo/html/LICENSE.html | 42 ++++++++++++++++++++++++ readlicense_oo/odt/LICENSE.odt | Bin 137265 -> 139824 bytes readlicense_oo/txt/license.txt | 53 +++++++++++++++++++++++++++++++ 3 files changed, 95 insertions(+) diff --git a/readlicense_oo/html/LICENSE.html b/readlicense_oo/html/LICENSE.html index 46fc32f771f0..7753ed92fddc 100644 --- a/readlicense_oo/html/LICENSE.html +++ b/readlicense_oo/html/LICENSE.html @@ -5284,6 +5284,48 @@ advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.

    +

    ODMA header

    +

    The +following software may be included in this product: odma.h - +Definitions, prototypes, etc. for Open Document Managment API (ODMA) +version 2.0. Use of any of this software is governed by the terms of +the license below:

    +

    OPEN DOCUMENT MANAGEMENT API LICENSE 1.0

    +

    ODMA +2.0 SPECIFICATIONS AND SOFTWARE

    +

    Copyright +© 1994-1998 AIIM International. All Right Reserved.

    +

    LICENSE:

    +
      +

    • + Redistribution and use in source and binary forms, with or without + modifications, are permitted provided that the following conditions + are met:

      +

    • + Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer.

      +

    • + Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution.

      +

    • + Neither the name of AIIM International nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission.

      +
    +

    DISCLAIMER:

    +

    THIS +SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS +IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

    GNU Lesser General Public License Version 3

    Copyright diff --git a/readlicense_oo/odt/LICENSE.odt b/readlicense_oo/odt/LICENSE.odt index 05e768f32a60a32687da412247bc46ede2c5a144..456ce3da79feccfd93a917a22a9f049668e76a08 100644 GIT binary patch delta 136755 zcmbTdWk4Ox(k_a-ySoN=*8~Xe5G1%0+$9VIcf!IoxVyW%2Y0vN?r_Pw_dee_-~G=0 zao3NYr=P0onwd3K)vKphRV7?yFC2=JEF=^b7#JKF7>l}u*iRH`31qbH^JwXu=uyIh3*_b*T^1InNnlKsL zx!5`jQE+o{v9W_#pz&ZhS-IKS*+BBp^ib^YACMybT~XE$B&5a1L_Tp(TY<Z>JG6=T~mUub~7UNVepyd_Cny9)kvNUGzq^@ zutw4OST~((BeIgB{0?Mv8QeulFLPP&G-<;{P_>*%;7GYQNC!R$^u@Zt5jlEk_rkvV z70JjB>lYYTHvxLjR96^h)el9pjLh7)44J}uoWj`gB|rFrhqGco*Fm0sx~4*b6-?hCu2oKhyoh7G`jI4f3vE$d`iw$Y6Xs;Q@jAIc z*=*UzLwWMiF9iZt(SJSBIm`DDA9p<=sdc%fIQ|9fW)PTevGOEOkW-C*1>MTH=vnd1 z-QzvT?LX>eua%IeLUt@qp(A=+bY2&aU?tV>UK-Fd9wrxVR3cLubhNiyaU*j3DVIhr zesl+abpu<`6xp&zk#;It^Jg2H&HoXd9KYrhETRNN$D`mZlQ-pMK(u)pP?)vKrtL2N zkR9@ySOC0>*$8qFaW6&{;~0{_ zj2Jf;Q~HlySTvz45Y_Ujzvd8Q*=b^bjnaMLladC!?{V&h;rzJ-z&M%^eh&h%jA6%} z-+rBnA!tI&MHp`$CbelM7RwmuTy_NfT+_C~k2bR9hot0x(Z2ge_Hwf$bp_C=J!u#g z4QG>;pX(#Mzc`EHGvV}}+n8Wl;;Ck3N{&*RjIs`ulh_k7Q4{mZ zwVI(xt_+`xy?QSy&0|EM`aPWeYTH>SGq8O0RQrRbi01cKS2L zxu1%m>AjFlW@f7}j3mg3BUnJ2Sw+2odPxm*?;!Z`AJ#uyBK`)&rJtc}gVQZ#L{6_U z8Mw`)5H$s#WD#VaYL3~GC9PygPGhEW9Q`H@BVdG(0-%{zNvN=;KM&6uV>Rcn!E7`{IZn0%R zXjkD+R_&8XUvvrEE(e>O5()Hm49`4#uaami{4*Mzcr2t(9P&SyL+{FFM3Ep(O=Hms zRd%{qVm>pS@~oDPJ`d|{m_IJBf4=7ZK)9c2;+$zC<7X$OhcSLhcphJh0fTxrM&H+m z`tt#kUl!}R@IVuLzk-Hi{qSpF*;y(wkUwTxJyIl2rGPg3hiwzQK~(N8C)?8gwzv^| zPBY5swwaJ;We_HZ_se7Q1bzQ+hN*oF9D^Vp&HJz8gSH6Cp_r|j|9&myxIX;KFgnm9FUNc0?9(s~b<({jRP2H3!2(O@ADbq|lQ1Zl*?$0<`KEyh* z9D)|l;$%kF_5D{t4S`2O8KyH-{&WCbNfs9FCJfR%_Pu&+QG$W}tG>X&!TnQTKwl7v zfg{K5&($>dKqf>kNjJ|+`cGif^(>AVCaXdezMX+sU8!{R{o`s3@MN|mo3Bm5`mZ-4&v*;{ zLRa1+Ed5TU*Pgz z@YW;0TdygsbF`KEtX_-;TZ;6%87j|Cw4BzGzMY>K%?GNJB8_#*L~I4y@VSZD0N4Ho z_qJY7o10nJl{$`XYpxIX_wK0~L6Ek=XUI|+@^&su%cEus$sJ#r;~REcAaRnWqfpn? zgLfie8b(t+Ek`@$lxI86QA1f>^PiSU2%GiLnC09&gWzY11B{PgA-$d*1_~}`fsFY>lXirj z#nqr3RM-l4yQ*MdDa7G&h;WOyiadl#_y)cWi$s>pqqnwAk504sbkI-Cj}Zg0+XpGx ze3NoIe`2jqJH$aXeDSg|2y)O0CP}gyXrZz3l?z}L&I$`OT`u_wRs|ajpz7%Ztnj^ zIPfyvkN>p#%+8*Y4>m1n~=A8KrTR)|I5pnu3 z*_AIx;&rF!tisn~Y@n;m+MF{>&^tR>HP)p5&^h9dg!S?BRz)a2Ku{HQabpzCR|(aL z25TGap>Q0Zgl2s*y)1oOf5P z!1#GHY2hJ+kpcit>cvPn43e zcr|LMFYHUIRFDN=^&yE>y2(}4kP}Mo=@LP>nd=#_ttKM4DcJA~fYIJ2CtHMQ&o>cIa5Sjeie1gSIPRtge)gp`Gp(`p-Ch?cKOWfMbATr| zmy7Kc$D#ptPAJjn`bqXO4&=bHOrd?%GE#QS21Z-9m`F5(PHr8MztI?w-Kl3>ajdhN z|3Cl;n!xEFUqJ?44X+5Kac)6flGlV%+BkF@8Uho5f%y-xK?4UNyVddS+|3`a^MqZ0 zUTVAU%WYaHY0rNprkZ7ljZ@{TcPG-u3a0saATl-f%%E0d&No0*ixI`4L@^9Z6(N!Y zPf`*qKY)<a`n8@R7cZorwXSoG|6|)6<(NLWuvs={kP2`P4f?&166G#a;GlBF81Flf6IeEWFhs0-i%?;!+ZDny(@OY z94Z!1>r}W(?NE4Wf>YN*g#*3HOsabVFo#aZ({e1VQdc!!nxM3_FzWFn_nk6_&a2bZ zEUcQ6R}C?`x=FW|v;P;{Mt#vdY=YC$K&7XdJZf~8(0lX&q;`YvuMYdMSN0?=~TiRpDRK7Esd+@EY4Vb85m|*FnWxCy*?A!V)Tb z@-BaRw{8I~_WeujTJ=}Vll=AguUJTIncAVKZ3x2xcpv*Ll&OxfWp0PbrINAdpToPV zh!zAfM{sCg3OzzZ^wX-bWd>Ie>Z`lEe5Y94Dj zJ>h+3iSw+>nJJyS2P8c-pWbSOeT6OtE&ncu)uz9_Q0s8wU94B3^)xaM2Wgkh_@&fu z4^o@B-DO7RqyytqmR2nL+S;%}B->FZ4(6K|ECHw8Tk(g%X+Ppskv;rSWXrIc(|CWt zv5z8PrIZrqj%T2XKuq=6_H|5q1-LMxE00XHJpVdb%JJL20*pfeoI~es3LCnP8@Vpy zxT$DHSHT8R}72Ur^V1;>URI;CKUZ~vpmnN{>oY6q5i5+So}+QuK2D7 z^xp^YA!vo0^|E_Ww^NYBkAoj^Yn4L$j0)T61ANMXE%C>W=w8S;3H(rP&3e|8^U^ju z?&XHOhuqw~*%h|m)_`**EXcd^^`!M~-e4^RHcCVA%)c(_Zgb7SwC+k+*WcqT;e(d| zL&n{d_UMy+L#q*=Yb(sv8iV?WcY996K$qQ$- zhl;oDJ{40JO{S*9pMgvILi^e`tFpGmCWlxR8E$2_>@+;`)z|6s6HOZ40-)3nT1yKh z`}!p<pS@}2`Ep0Jb-yC7H7w4D%B33ms0CK9>G{fzPdNavKQ-< zH|XD=tly5Lu*+U5@P%q`I}+5Umfjwx{s)o(V^_lBEm-?$e(4P{H+1fGKKg_9lRk&1 z#R;_Y+#z8 zuDmEh@?{gT8u+%OZ44L_-w>od?TjX>(8r~|5Ur}^S()d%SA~|N@ zJ_K^(F)l`u-FawLd3%)X{aD#I?YrEKBtX0zP8=@Y9ns;!-VtO0;?+kId93IL8T3Dt zB(T`c$;CW%GD>#taACv^5WvsnJI-jUxW9yRTgwP35_KaMP1GgSYM)_DrpQcS)|`uf z_*F(I=})Swh?G$?#kOJm~w*QaUj|XI zzyx{8p%(vPz^hi{8nE}3mDq8wKOqDfp&g_-kuk==dc5L^)`FLezXK?#kTuy0UXT-Lfk zGDl_3un7uo*~OL(U+i%r$I{T1Yaqk!$loh=Yk%{ij71@g@ zE#AS@*(H}>Vi_R_9Ic>M*EsYpt?91F;kjJm6D_4yclLYW$_Zv>eGfXVJjkm@zP?g=WxY>+ z50^hR-s&FTAS|{cSuo~`wm0?LKV9Ii8cCs!!Ac?N?co|A&Kfw}5Pt=d;O}k1pSK7x!ua=V{Qq&mt2e0MCQX~1waRD5brN?y+dYn| zbxTqkm`85XuI5aeG`P-q^b$&d>IMZjLBwDuhE}#@n;<912JAKAQT85a(b~G2eHNmK zvPo{?5hPr&77Yu__eaSIvb3&diJ3^IY!Zck8EGFzo}re0{9V5@=cZSSqN z^fM$masVgV@BaYL643+E|Hl0mJt%_!vOfMFihnJ#8V~}a{x{=)kFxdwjX=Ne%l~^6 z7s#yD3ocZy|8nPJw%wWC0K|W`&_OGb_uke>6v$OM#`u;Zo==ghBzh{L1C3^=oeytZb zkngzxAhSc>EBilW1Uq9em;IU;lmB?#c(6 z%r3~I1La-4Hxqg1FbsDowt&gwpJqb%uT?GenT?;I&5##5nWAQ^J4%ds+xy@>t@_Y| zsg`RMV8G58>zO9_rCG`y!~5u?PwKv{$$KvdqH9Q3KEz~p`Jp0&gVWe7wbY6_?}NQJ z8QBXwU@hR{pSwe9be78-?x7fua4kf%fFZV5AkmJzrLh!SdVQ6 zy_KkMKq|E2k5)`irh27ol(*J})6_LZ!nfB3Ak|ELMylKnI^hUQzCd-Sgv(xFl2jjW zy54i#mrqQiCRFp&^0o1Noz0z}OISnnB$hWuQUjsP{<&gOy8zPDKwm-5g3J1*wZzDw zXsU<}7P!qYEadbN`Pdhpm@~>eno&1K;)m*8;C+?{mj0hv9?>54@TN>rEOc~1&M@#o z%98M5SC@*uB9=s}^5uQv=2&~F8XNG|&R%RnkNrN`i+36ZU0Ur*Cv?A82u(c?6}>9K zA(a6=p||243Te~$>p>OF_xWM*PCRWq_6UfP`gZoJTt>k|MXOA3NUc&|n@ zKf!orcP4f(xki6&G91hUyX@3E_TA@W^=T$LEkcIrCRmE{mc;?1 zyiY{&DSz5H(bhn0pK~R}pW{!!b`#GDIwq*iN?B*76OZFwGHSwfxLj6p z3AfxxS_1ZlFki5`8{lox1-53GR+C{#n9vj1P^p$ZwR!KF0`6_$nI4H+*1k(9x-niz zjCa1@dCc0=%ELsMIC3u4(81x3(I`1-K8eOI+hFb8-0J7^J=3F~c8?Vm#$KqouB^Um zpg)3T^vaO2-*%{wz{c%9B-8MHdA)oBS*LZDn|M2+tDmIn6CkS4gqkOqvtN<){wm59 z>#az4m~HEgBBbGBGjYlw#HoNSc%lz(43!Ue=?HJ0CSzL_ja0I3np_MKvTOIER8NGJ zh_}N=6#BDflce|5&*-i$$?Q(wpz`4LM@QvUvRx86ma1Q>EQ-GVgj);T!f4pt^xf@0 zPz;QnMX4wfM*)e$b2UneRd@R%!kmf0cq zdPstjC*6cmd_C?;K_%-8d`GFmXrX+Pgk;iSp!V;a+5qb!M^%5n6cuUuE(F@I6HigQ zds-rQQN(DN&ghsCNY{%MKX4Ie!`%&?SnD|^1N;dVJYi#1J4gwGMVw#M<7=|z^UG`Z zteb|lTE5U-8@|rOIADlFQUqP9!Il0TYnQq{@#=&~h7XLuHsm1xtpdB!{U69uQWCNi z%_zH`Zh(N5XxRpm?3F?G*l2sWiZn818ZvE>=d^Dsi09i*{`mpU1~a3(BMj73m~BJI z2$9k8f|8-ruq+LkJJ_2Eaj2lt03dzppD`in_HgsWb4Ejt?VAvu{>Oc3K)3SgTqP3VtAdhNJNI$+`I9_sl#>e~P} zJdNhw>)KDbQX$c6iZ81lY$g=UV0ynMsR4Q4vk-)z_F8He;7Y|z@_e~4RO&UCp3;08pLQf{yQsJE+vMxFBH5ZJ*F>75DCw^$Z4E7) zS^%!lpWnwFt9e7scFKu+8z;>2b9uqdoWXW(mer@EGkJWTEwUgN_+QLp7t3E$O(FXHIlxE6D;^WF$pJOx#XzD66drYogy!>4P zV=rHxx~9l~MW?r=UtXO0;K)cD05xU6@a zqsB4MTlZCOZFP}PSa_+-1U{l^PvZ&wSJk8oJ8eTp$I2r3>W7h>WhtJe@C!>~mQ;)Q zOZHG#v$`Q}URy;HBIfjOUL%w`vxp?RXUx_{yXm_V#|9o8EtSvQH8#_Rr*t6uT_8Ot z?`(8<6T{66MZk0Kc|<_A;B4yhK;Y$=A@+COv-EbC8uY#hf#Lm`HI%? z;eH3gM4_Yl_>h#C37vN1+I;DzMHUu4zHOB{^D+6L&8^belLcL0w-KoGO^r@<^cclo z*JrOoWf+J*YZ=&G?P*KjR#$9R0hWf+uEk6b1Ab#4%=Z)0aHu!-g`#pG9q3-)!BY?U&uL3aLzi`43D zw~X_x;0L&j1nTS2t>@&m1~AkJ4$=G-@&$a52OBP?={!m%1eazPuY3_#`^l3m{C{ z@9xMo&9w`@LhKbLy0RjYeV7X0{X_EakJBA9g-)aAH(uQ%wVp4OveJPX^{J8-@)%1I z9ED8$B3e>0f2~})6%dYN85?H?eSRoxS*ew>VzxIVds|>AK{r;e+%i^*G10uGw?Tz+o2zB^Kf7Oem2KylE=lG-+qjB z#<$;rQW??jZ)*k`h`5$og$IgUC(o3ZH=YqsbW~n$9XvCjS z9b{Q1lVr^0j5;5WGte)1&cPoJef%J9Cg) zGP+XPNnWa7z)=#->&~(v>-jkSGdJH7MO~KIizye7o!uvr5BVB1=xh=CXGur1jymjE z5z{H(3{Zm3B8$&jY%ZhI0~JGs8{XXRDaT8V6wQpZrUA-y_4~kyFmHtTfVYqQJhgpfT(PekFTFaI`akrt1&E-e8CQj^~O-3I7?cJoD*#$`^V_y?cRYd!WLpZwr zB7!GJi)i1*^Gja?%fySMX#2=!5=chaRNCh-{*7vUlfpBVFX`3lGW}8q#E&K-Uvyfd zE?a?^wjjuvI1BHgcxaOVIa8A!D=onoNILM7d2qAFbIL8`D#oJd-QaUt*HgstD_$s+ zKnejWR2LyuAQ-pjSAUELrSrZY%_}8XFZd~96w`&J(T^Y=$7g9m-bcd^T{lf@oGF^5 zI{GD%Dd2!UPkH;ygq3;!5KoSWUddNLpbV(b=6QYIx5Cuh?hJUFFVxHEdV4dQ@oBN0 zNs-?!Hk@H8pE#O?^PVo$tN&AH)>WvVk+GgO%OZju0ZL79@R(&EKf=AiX`O5SfLAtA z7cmi065TIR=J1IBswGsEIj^&h&_CdLgdy+V3sIN+czmG(5?6UHpK@`'b=|7nQJ4-M$g)YDa|=yEFg7uJbyW(VIb#qv3%VjW zL(ccmu$xiP;mtg#Q2oM=N9Mb`=Wr*oc^`BEzW7DkW%J(lnm5mAMZnSst%!E9M93M%R6`Gz$w zTKYOa!FAu}Hv(H@#Z}x0HKvi{v!tT$|EjGSnZPc!U447l`dZ}bq1{uUxd05$d)C0f zH7eU}A-b%c%zwD{_^8_d6+CAP_@GlK>df(nH1f}4B0q{wE7G;y+ymZyY`PE5h>+AE zL3cL9t6So0i`3gHt=W=+&<*1{FHRA@p!?}eEz<^Ol<7EXM*jg03ySIq@d=UnDu24B zqhWE6rf(7Z-g!S8cIjYVb~vy-floW)kTdYf6^TgwBdc*fsjuefVP^$a3S13dBRJ?o zk{wvDZ;*gsHb=S35af@l3U~1hO2moCVDp~Mg5JB#q-Tg-w#x=dWIT%!Y2B0sJ7TB- z^_(V@*yKkq8D2&5pji*cMSOYH5o4xk>Bm?kVKRJgWQf^rLB8H&VRpd8xffSBbxp{- z{5*=svX_^CkkjaR52I14LUhAybTblhg_6mh7H(x?wm;FzzsA5|sX}QZYU)EHQNr|q z7L|F$?zwe*Pt96d+UrGhe`xrg$YyDK7-F1S!Gue6H!ONSRP5cCz9hSkQ-x8UbcVyh zVx&$R$8wuT_%{y3mm)wK9L62r+)NBi2G$T2FQKbo9=_!NumvxB2( zNRi*l?i*=@pV&)@dkapO688vWf^a9$M^>N~mVW>Vp$+rkh%*Ju2LBdo?*Et>@H2J> zo+U&o!}#Gl^KX9UQhC4QKKS4S`}Oe+4$!C=^|_d89z+?-o|U*h!51HyG)=T%@wIlR zIEo_CRB=%((I)p7qU>3Rg9#vr(x6UQ{Rh=bs^lMK(cL;o@H}2cu;a zgGcg$y|NBeYIvHD1}4Zek)t&%%6c3F!S;X6nT z3fDW@$eR$9U5BU%QSf3|!@TLm^t0D9RTQ zyv^KX`>ByARiG)BN%WC3`)CNXeR+ep{Rp*OX@vvbVMUGZ{W9XbaUYQ1S|Fd_cdMzh zlJbAbxOlGEnWf+k`$Fa{U??KDq5zf@Sc8bmaL#j~>wyphLFBMa>9X1Qwe z9A=Zi`Jn8S5>(Dg2uOHE*6e{3_bp$;<#H0y!YCu)6dG3{Q0FZ9Z>zEfp?`G$gQPfu zjsxAd5KT_x`@R#3%?Q=weaG2}fHn2h=j}&5!r%$YW@$ber(TpwnrZfOU)NuSQx~Y} zQ>sB-8T}rj8^gSHY{Hi_5@&gfPrW-18Lu?-OC6|FrIs4&>yuFj~w zMpTr;PF|Nl7alUSKsW8)yLUtIdjA!l|Ph4OMV-jv~Mrjq9zr4 z8|bD`{O<671#Hkb@DdOyYM8S|^d-;Fz<}bgNA7dkuKReca>t5hF5q*z0ZQ`2vQB)d z_erCUEFv3)`?%w07f_l2Pi5O)imkZx zo?!(>Gs~bea}^ik7WfyDaHx2*Ot#|-hh;V*vf~ka{>o(^_+IBw7s<&HHA0<3haeQD zftpd3dH=ONA<`@49h7m6p>K&kq}@swuuR`PMniRW_R_6_$MG=b+5ps+c#;AyNJ@fiM(n4+XfNeJh0IkHG+mrnH^f_==&L!WRDo zO#pjkwb62>$Lyo4WJav=Cj%Xm8?>mnJfMu4?_+if;OgS(|M)!~YljUd;zy(R1{=II z(_8iY}2RI@>=G%7@oq@h^ zVPWka42JW=i%o_2)qp7AcfI#X5RE~;T%_P*pkG|%fK=z$pgpEff-1|aTs_6qK0!*j zt4u%skv0mf^aGN4hQObxex>hth{K(4f}G24WO$8$Th~1Y^Cv`HeUs}rRC}pUs8uVB z=VqJO3P}trpomU}4(6C3yr(H8w)igsAdH^-{=H=Q?k9{-KBKkbuVhh zLuyOT!Y9D4FC9^nut^Fo5*3AJHS#SvBgA!bG1%)$%O*RV!c3W|_V^RSvw(=JzfCq& z|Hn{g*HbvqbUaj+2`1f1)30yHpE6ndMWlQJfoG}K#{FOjea^v#*c{7dnIEf0L8v*& zfm8-4liJ+zIv0uN!I#pZh;B(J>r#LAehOp#?oV8S`0$zBZqDK-f*?*m2E8oiQrY=D zRY^Cb=UEJg)k2mtm{{8v*C^6J<}cn^w5S?HX{?)=j`2UYqho^a@E1Agj-c!{E_v#f zDBpj2ckg^RZjEhv@mtXuTF!|)WV46fv?*HIPcR&E*?lR|nr0P^Ohqsh^q8d3+2pBZLAkciv+|P;d$C|nF{NCQcxW4HH zM;umJ-*6BP`;F}11IOG6p-nulg-b2$3SR!n(}QF& zD~MF;5j5!?04^BD(f`>bjoEDvAHKgVi0Mj}<N_TbXenIpwVCDo_U9t+q>R$+n5i&MWH3iYr8HxW=5eT?C~RpY+(Jy$^aXc+pu@`f zY*xA`qkHXq$ko4WUuk*vkMqQ@M)TpJbG(&o3D+-n98s5I##}5=;~2wxt|;%zcJJ4N zw{uV;9ML%yCql>NrrhLI#x%iv1-U9-4PerjYR!wNc*Jq z>IeGGPlf51Gl(Wjy$ufcyWa>0D{#eiRR9DpKnR3rhMN>ZL%Y-6GD;z_#jql~mZ`bc zAOvQT?q%zlZhwTm+pCs#6ZrGMR&C#cwutJ6Me2iA1Ad1)~)Dl8vX1G zeNr@caPLlAVs!tYT+X$WE<9G_SWv)h@m$YhT%?|v#5ez3W9`PfZx=0yaQ3-t@JFNO z_ATH!9LvmVG4S2~8*WXVzo10<4>lsfY2iMO&+~j4yF}|wF&*-2?U=z&$o#gcC z`XW}Vvb}ew2jduISQENL7+}uLCl0R5)f-(OBI>@?eI_I6les|ugEm^$L&jPd`-X44 zz;4f}8^RmpDo73VaIWX(#Bqf1D{vfl<2I05y{Tp`e!mB_s$Y2%OV^k0$=u z?c_=0jA#!KXs9Z}HsnVj>C9bCLJSSbamwz=WI9qwSo)~GY={ehn<+i^Hb6n=X1q?T zG^4ka@7y7OSc8%Z`y&G`=;oe)Gj${`udaApM&B^^IxhCUTBEi$RM&9(pyG|&koW4= z^Z~jD{>^Ay2-<|n>_#FH9&@KVfwy3CNdMNPxR};XoVokrODJoAk6s|uOwz?z8Zwbi zn}>wug+@{!OU|;UgJb?0cJMUoO~h)Y?^w)o{Kq0SM#;uQJE1n&@*#F1RyGx|Cz~!r z%o2L@wl{FPg&0!jCE$4*>(iL6p%JlOV zUk0rRi36w=VSbB}^cCkBuVRgZU3*D6+qwP(N>`R|wdWC`-rtEOF9L7Jta8(fyM9e0;bzk|4{<;sxn?hg-ZKocT_ z7+01*Kn-JIaowe2g3$>{T(Rb$XAx##G{U(*Y1q79;Ei453QM>uH@wg_AWoxta(DZ} zHrNd!<6h3yN8yskLW4dNP1s^nAi4khnUT`~VNNPrZ)|=oZz$D=H8g~?*eyPx9F*hN$OJxT*pbOY3FR3@W z%aum4X9mOKOdsyuoDH@K%d7!WX-nN{xMJZ=n8q4^kn{6xl0 zb2)25&I_SczSHWX-STbjUgT4LPpJ;*0wxU$kBLq;$ptg^Q|#viuaW&a7$z13E}X7r zLu)~mU}%nfq0`5&VF5p<1eaayED|5PI-}lSMSo{<#u~y^w?vGBl)GmGwh=z5SRkR| zY3_a4hd^@Y;H(Khy0Y&NUGJf{ovQ1>%9BRG^q8DcFpC{w$$*tVk*ighEzD?vnk@y} zcDhpBH>WKT#ceI%8V%=`ENHWu5t(Hv*$>)itQ?bdqpqR4XEhCn=IXHmf|cWckY-oU zV38Qf1o4Np!!n0TeD*K`=)+QDs5@tC%>{F#Sma91P&TmiBUshTaWxoTh@ysk`(On3 zqk^txTNhEM*(0q*I9^oPrBEW#@ac{bs3js|9eRKd^qjWQtdMpTLsyLf%&k6HBe?KM zv@9b=;cNR_v8p>P@JFyL-nq%-gBa9K)PiyuXj2~|-lC!9_LFOY6iCQS>Gqg9HhSnF z@1MMIG`iu`LrRE3MjGS=kR8=@C(z*vMvMZ|X_id1gpz`Nr75s-R9!L!6I+(1@k>`l zTYT3DTbIsem0zM3X=4MFx5{SBYiN)-?0=Zw(9G5rrAL;;Ts4v{ z4nZoLiYpj8MX2!y0t3V{f|K>w%50I%)NH&NA|@W2A9|a?LKW-?)b@ktqeLw0|CFU_ zjNLoCxJZ_)mU6ZG3R<@Fj8~-8n#9!}mo62n3`|0m;tB?JDB7mDXg58YmdshK=o%v| zGLhYBen|})4Gog@cA>96nky%WvpOk??fMdVUz^t+^e|HikSKBfZ!59k>hMblHS2RM zfw6b;G~JPTuo~RE5s^=(iPSOp#gQZ zF!mkULS>ke-oyc+-HH<*O>-aGy4rzHk`jt|Nb${;tbUbLrG#2s1@(8P+@2(LGWoI& z4UCSxo2p6hu9VqFpj-FR@=D^lLZ6islS}nc*JR@+xZqe>(SV@uH;y#A-Xbf4K9>-| zpWK7KHFAM}iLNLaR+T|SAN4WF);OIVXR((FYITEuIze!hcxaR>;OQoWXg>rTnxOA@ zUiYdEDzs(f>u(_-mFqmbY(|%(dxS@lv%MtS6@@IzE9_s`Ec6ilp%EadX6hoBtioT+ zt}QXcmi7By!^mX05r45X-Do_*(c(@IG|MUN8(moq=rL})BsEJeiPJD zsRmwnT_>z`lO>bZgwo?+QRIc!jfIWOP>Q8Cp0#0V;6-)-o5fp6Oz-3v!5Vu{p*RJW zLquh_6dB^dXcp_B=>@X9XyK#&JOQrDWL5?9HulDT<7FAu^QppQ3nrj77Pxr2t>0gC zg#49-6KQyh=xQlG9-{}p?)%VJ)Ul-R(>-am*+IT^vDgV(QGAAZ!&8wA5(CD%*gqLP zyx;^`mzn%$(Y890IiWsO4Om^!J@6Wp>C#-7hH0woF$bM@M9|PZJF5&$PN5vte2GVL z`2?*c7#RMkN_1xaW9BiCG<=}k9VLnqBY;MI9SAKur%YmJxP}$@^`1OpkT&cjrH7oO z%~?5m0qy>75*hoamZ(0(vTL)Pw6N?qre(C$*d@iGqgF0~A!hEWPVJ=bW`xqs%Ree} z>v1&Fbx;L`rF?t+T$UF7o3bDdQXwQ9VQP-dLY8#y_E?w1i12%WMN3OH#b`iVyN4xr z_vUEds>DOWY=SKen(<=H15xwZc>529%~$n^61G$e?ANonu!QdApMIP@x6-#$kF)Zs z-b$ZwAlhOj=SG%_==_%+OXo@<^pFvql=Cz&aenKj*5Kgq<{&L3nn zl(0cVV8GYm;{0F)4CLq?I0kIwhB~}a`dD{Y1jO)koBQxaVfjbs#|#cDnB}5X&d@nE z+b&t#@Tu-&C4{Kbzz4|JX27m~|{q1BzkQtn#;m@^I{Rrcw5P zFuV2zQxD7Z?+wwF{+_J+B(I~FY4AB-1UXe1!IP2Ux>F9HB zM5=M{+vo0n)4;KeP_=;Yw3kObq8El6@7fLvGd=6EI-zU{WZGEWz(vIHqa5T_R8|P` zrr*)jjZiJV#tuQr4B|X|SBOeq1cGzNOCmb!I#^83qHVNb%@`ZioG0R_PPj<6XC3&a zJ4tt*8Vq({dTg?SnjRWOH`255<>Rq8qbSmc{|7`syT2yn1I37cD9CL+M7;hTS#?}> z$g<21jXHm{iaNqnSQMP~uu5(%^I*w;0C#2=E@OUf3C1!LYEz5{8=@T;|Quz zQ5d5Kdqs#`gZ%0E?F1KxA&?er8TaITmTP_{oXyIe`a>5X6IzH7X3tRG0MuGJd}>#wNF z!4Il@B+e}y3#omEDKsu`jOr+G@lDVS66N5Z2#Mx(&6Ue1O2g2N`lp!`fSl|KRq&Dsi;_*Y(wnAJMStB1|cqoUaxafZn zntuJ{0*-s@59VO_zQqCR1+3)g7F2ahS&Yw&wsWdmP+Dm-qS|Cfz5)`YMuvK|jB9v* z#~8K$Q36q((xVWrI$@Gjw|Ikn%NWM*58Qk8xX{G`pMI#6ZZ@s#(F^A83z-Gd%;WH~ zhZYN5HUSR!x5e$EmKdi+k8{R>v=BAKDyh1z z$*ZLD@bgdgkFx%9OD5yMi8?(#^={T4PSiA37fN>+{Dl_hX;IK`* z=hDu3pKve;7lD@m#fvJB^I;NVT)g2UoGgK9IBoL7bRcb?Uj=fN3s^CxM!~B>i{qr|{!lfYp27-`ny6P}$^mgz$kY@m zFv(4SK+Tv2zKJ^E1%QaD+R1c()R@%}J4Utm7c%2}t+Wx_R4&Ea>2Pyx( z+WP)`#~pk>yJ~%Rz1|;sIo0C55|%!Ha_rKwj|MalOQE?pTB!m>SmArAHH>cH`Q;go zq44B#L^utb3aidvm=3UG0uGB@hq@CQ77K{5M7zc&3g(VWlNTa%E7BOHvM6>gY>XmV z&f;4*y;r>yliPN~__~OH!}FwmSkySO8PUvfAor$?e+r{i$P#j~EGgF`$s?!at7bAK z$wZ1Cc~jV6avr2qx}0_RYm~lb2H(p>q8@IHm8(aKCuDDrBN-|KFTHzhx90-$zXw&F zK-g?4io%IlWZm4RRA)dgz$V=qji*kvvt=o1dmnZD3N*C|xxzsKh zowLo|!tX18gg?c9UvJgJel-O{U$J{VZs|c-hG*%g2fEV7M<1V8b$mRx?XK$lU|-L5 zfYxkR%|o)0x019DqN_Eq)AA^t1EYxM+G9{9Ovhrj(F~Y#%e-EJuw#dQ{JC%b_)+p% zZWGA@qj+X;c}qCArHsB^#m`pn)kgm}Vf0_H3lCNV_PZ;>3DDEp>+>s1V=@Q88#=ueQ4D%| zE{e5eOjOhq4o8Sle2RKz_4#olSFae8&fXqz+%8OG^^2LNY<@*FUN>9lc0 zf(Ir;x2St5|HF=zxB-#O?H zjO3YSJYo;<;4+WVOLGj7-a!$+F+SPMag2tEPx~*{HTtIxHA}zl>nV@uKWID#>8ZM$x!x2ktGb%r39m zJ}t?1czT~_A=XamASbc>6;P{b4P2*qZDFXIaSAeujebn|Y0bm>0VP<+M`)un zhy)XJes>?q4W4*%S1D0bPDFq(CV=8P}FkE_Th49VouEJZ65%9x1XOtr(!9 z`(2aLQAQ~NKrbaX5eE$cQGNglh@?e-!4cs=rtD3I4bLQ!c1p*{+f0W94iC?dc-sz& zs|(X>_kmeS);9%by+7R-7iP~H`Nn70 z9`r!UOuIon)-xI|Xkp!Hc{Cn@mgzWI)1PKT?uXlMU)_#CZI!njOuHrb3;b61)9BIQ zr~(d)?U)!CM@3EcD!h8@G^720C`6nTTcKhbkGT$0`f`h5*8UPs*=f}e&7@trt`hO` ziVDtXyDIy6_Feka3C;ZI4AUN6p!5c1+n$=qC0BmR@2){^<2M7VGwmlWYhZk3y(#w| z8aS>mKN$@sf!BG2BQR2u$|$D{z;X06C1l2J5#Mhii&L{4SPX!QNK}M>c{HL_MdPdl z&}$(h5hk|}M6Ke+Nu({}*+nyK8?jVIk-NYY^ET4c%vcJZz6bzkl+J+?nNYg#0_|`4 zSKGoY78u+~Hv{+w`+*gffl3)m!mEDr1S$b0mJrENV1@b?ARn|x@PN`NGA7JbL7O4n zW@>j7c&TlxiwBcAi9FkQ~0 z47*GsY9#Z0G6BmZ!3LX|G%!ikJP_(oRhzXM@@rg|}@Lf@)?=;pGOg@|QC5t;h1?LsoRN~A6cqs=jV?!g_|m^Cefoep8&@x04Z zkt+R5RmeC1V&8jzEchOR8FAs+9Xahlu%$4ri?fZ;a2`k(1^$hB3&b3Uac`Z zWDc|A7|cQwbT@fd|14ltAvKfD%bWA_t*wl~WGsh`S(@e6z_2o76DCIcgtkb5-}H|> zpKZmU0yo!Z3Dl@y1Ptxg^h)qQGP2X@#2@`W>=~O!M?ZFd%Ukh>ut${dHjn9*sc3%A zQ8tYAs#!Nq(SwOnI9v@ukTvPv@zdgxG(*A(jUFzl@8_&`r<&+lG>Tgbz3RU!&{(iB^sN7ln|RWXXtlP2T> zj^2-fU0D&yu&d{ynFz+8P z@;9V?k0&Px(=VEsuFk@H=5XvIkt?rbb;+z3q)aS-SP2KKU4*?uqjRMG!uwP74B3_O zWM3FcZBI?vmXS1F*LGTPZ6}{jKEIYRS5oIGo-95y$RdB)gWQ34+&3`69n^|Zm~r(M zQzVkXJTwj`7UXr+cPbjW!}3%EV5V>VS@p7B1A$SipF>k;YZH8jb6xxJy994sv)DT_ ztM{!Z!2*Nre)#sP!tAiCHLTkxF<6)Ky3;6Sr4Wh@%(+0RgqvmVkNHBApI8|bDr22^ z?jt5uKLt5pTg*6d|H?3|KM`eg%VP8*nyP1ADSK42b zhLKMEtNb4A(I>{TRf-K}p^FP_)NvnfdGQ>E&X7L$izE-vZTWE9_uAXPf1CH_w!?yL zzZ*U<9$1nJJZ!+Y23R3tdKwl2(GDQuksV;^209#A=q+ppmgNpTK2^s<&XDIIglxSO zz>rLDx_xFD-(0_Mbs74eo?d5_ipIF^%G3<1lul~7T&?25YI`pJYJ9P% z((CCT|A<)a$Y_jUQx0TM6YSPiz}Otac{ab;`f1||sT0vtq{1;;wZ=trwzj_1n>W>S zWx6+Tk}k06lLl-v%#QZk(E*&o>cJkJl-~~afU}EyXKKWEe{Dp5v*d=FDW*XYhEXV z3R(hX2JtAu$Ed70cLEah#p!f7N0z=lAah1-nM3t~8tMf)ZZu_#sn ztHj2NnTONQv%vrUf46@#M#BzHyO8%g3K$_06hvSiGG1U4K0~>U5&<;+0c@s5~YxR z8T1{7LeiR%WR>|v7 zUZKZOtqFo-`Io}GkhGU&~f8q>&i<7Vlk*I&Olr&%FR&`UO6-2 z%{=pN2|UyByCSt=#8ji>Q3s}DQO+Y2DKG+&esnM#p;?p)m{RRc+W?G5+y;joCKQ#cpD+>0Jf`yF0?bTi zt&q8Da?NVLghm2Xi5oSZ?HH!koFJ|hQ_PKHq3~*Afpn5<2r=Pk@{n(j^+q=5lS%rd ze*_rNr2|48_7Qjb7t<4IL?^TyvAUFM5ubz4`1i61t(w9D!A=J|=RIO#7ES??)@5$r1Ey~2l0e_dw zWRXS`s#W839r`{s>ad_NnJu{>k;(oPF4%Pwj54dSTysAv8P)4+K(u6(I>k=*t$Oc#Gxu#O1R=oM`(y87^12oF)2Z|e`v~Q zz(pKpDB?6i84kKOY5mAxdN6*j@KN1^E=Xa@Pelg`^D?w8psAl=8uU~$Y8qnPv>-;S z0CGMA)p9Kc#S{ASMlkKq2(!h(t_Dy>lf$l1EA5&V=dmoXln0!nz$CqVd;PX#T#W)B zk4}mLIjBc=Ej~ejlY#drQ##A_e=!63WCor1xMZByK2^_++Q*Nz)A5H9Ib7SbZh_ho z>haUP_gE7G*6d(bRjTyF(=H; zWjvJ%roHMhKCGz*jRvH#&qOJ6adBY<;f+K-g?*=_B;7`(SQ_io8W!a?e@mGEg$jL! z{Jq*N)|(~d@8MF6LEvccIH^^+g}PC1{>qCeP(1>5mqez^PxUXgCRyplt$|wP;?qqP z|E|@9vHtR`otZ?4;XAV#qG=LPlJ9 z@bA^DrC4E*0v7RT$(kKXF%em7gx|HuY9rzFa#sUTE;u8}mRIiqb{+J2mNVN7q9me` z@*SCC(N6;T&!&GOvfK{a;+3Q$Q$<*7$G1p&bDb@G45F;(nFIg*EVkWD!A%YvCZ?Q< zev?_B3r25b(v3DLkKq+6OpG9Ll&!A-x=GKrdW_N@hi-N#ND~%^$dr{*)bp8AgUD=; zUWQXx2hLIzq80~`Y3`GKwm0bMst_t!G zquS}9-N`s{-MfNud2KY$eqDQqL=f4tCS6%VvXzU+=AX_n>z>0fE&2B8AOE-lQl^~% zGsf}!_56P-J3EI(x@zUatDaEKa|*>jHku=O>G_EMZ9dOby1bM^OUimQ`_4hr$4bsU z_4K?4JB5K`yJXi8>9}!JsGt6tQ6BQof98I7CVr zb$v)(A96C3a99}Fu~Z;|{X7?pz`l)GGH#LB=@`-Eq4A5$j4Kaq?tid@_rJUB=K+kc zYhi!VDz`Mc`$I1)3-Yz}2B!Q{smIx!?HDb0FtChY-N6X+mowfc{aA{A{Mov*N?j|v z<8dutGrWQXh0LcmhrsG@e{Q?B>tRra)n#~NHD#0Kf>L`!6ovVSUh)|cIOFOBqynq= zK$J1-2coZbAG9#n_-LD;CDU+CeDw2xp#y(Ysq1$!YGazgQoFxcChW#@W>HfhN_?Ou z`?N%O2ojmJ{I%U1w? zhP8ExI{j;n5BH8GlTfF0UJj#J@XaE6icg4#svM@~ z{ye6K?aU$1IEB|>lbCNo@I0ug9-;x@2%#tZvCGV0|sZ~ls3Mq${#Lt9uCua5l z62y1WvpvO{pZ9dG#o>&8nB!t&qBRrkLE*wQu6{uWiz%#^XiRz;_RFjZ;?P@7ZNz*V zM$D&Ofl^GQ?L7_ybh8=uK|hY9jo_TOqIBsucLdyN6SSSstu@rObGJGYKlrIj>fhwS~2%nB2&9ppx zU|M$IzDo^%<3sAFh<#^RClMeeM`rrr=+Ie7#0WWD{2^?J1LN=j(^5!y(i zXM;*Ihjk$6vJ(@{MS2rA^@w=6P`T~9HX3N)>wIT*%G2aA*nNMnh|#{~GFLdGM8kaC8?^m$RWN#)cCZ#ifK!&%|2Krtoo?ZT7cg(YrH zFHkIGd^=(vf)BRg%-)7Ti#9%DKw2I&AOS}8ab#v7y&KUo<^`i6k9|szdDC_9%#mXx zZ(%D#5f#&Y<#vCQ-JQeTOuNZ$F1yK5Uc1RUSxnM{f8!RDqp`ZcS{YL2MOi}UMOpCR zdY~*5+l;j;v=_mEY}N(3!XXuL9G;71i7~cKmi?B@i`Qu;HYvGke6-RQ{jRvRFq(J3!fZMb0=;8Z7OEqxDyLt7t1XfH5%`Mbc8@LAve5 zbRJ>SOyOup=_4X;BKbY>8epB$BuU|Nfa&OFGW7*pFJ zKv@M5Ck`MU$c3?9U3ggJ=~=KW;VnAC(jQ%yLfGjq58bioZ$M8lXa1*ab}*w0;t%M{ zw@_-+KYhYy)?e`{o+w_lasAy));>-5we@3QuEc*!k@sY50_leI=d)2SJ_C#E@*u_| zuM-NB2CaAK5}+Hnlzl^qYglNc1-Gow#4u8i#EGyzgh?ypY$>9j0=Ri<03Nqzb7RnB z6hUrwcuGN^+4n5;YA2O0fBv*+sO96MLv&d@I->s`ll$UPJVKD1T0VhRF`VQNm~6>7 zvwDA40H>q&mytCb@am&s!o|rg9UoHw(;g3FGJa*KR9>Uy!|P1?l3Y8RBSc_NxmnVy zv4%0>ugnOC)BX*8IFAnG#oAO&@)7UTe-HWS>Ay6e@(zY&7@y54+cGY#Hf$x+H!dt@ z+fTf{Z=9R3=YDnIAb`#|7``|DBTUR_j6i=S22k(8@0h{s$!5YgjcW6Wmk%*nzGDP(nk zq4a97BkKR}j8A9vRfLBdPmjXb>~*Z6J@QK(`}x$H>+@O_r~})*_HKa*utO(kK94Z1 znaC5t?=zL3;U&uYz{4S>qY}Sr;ujfTlqxeCpo=n|Csw4`^~iaS3krUrC#@vM=y*9?j5a&7*+{hjV}PYBDl_WEOBGW^oKwAYRT`6DZiR+9cv(s z>SymhfBfxx_`MAkGWAGicMzKdmIXCF}6KI-e$ov$GMLvUsGJ-P`gb#WEUziSX1Ue&4;+<*zVG~6c!(erhJjj=G z@hLrD?3d&Ht$afgP%srBa!>?4rBWbfs0{p*?cTz2opJY88aFpNETq#t-d}_D@Tkj8 zapPEYRlrjuor05`Y$<;q%qYuumEm6?U>gIdh46A4;nK5zWTz>=A z`O>JAcJnMyS$Kc&rQ5Xpuuu@mc3P3_QkvP=dy{WK7;$L0k{q<|bSz-QBcA2%%Ileq zth+0|68J&dyhQ4BvZ-N}gFu!69?@@Na4`2+u3h2ZhWec1EG8w*I0Ibn>LziclqhH8 zbW$O`xXfZtRHLleNKsWvg)gB7<$yNGa|fdG>A8=l9Xx*)(fn9Imngeae87anp^D>1 zUU0bDrv3O=G*2=gIsy$+&VQSilOXpl={10|kqvoZP3S3r@$r7#>X%%9rmnte3-wiG zI#!wzt_YC`E*O3H0Rw{yTo~g<;c9GpnW$Ig1tFw)#TqWSc|dhRaKL2!$DK0WK2+$x zyZlaN!k&MAPlo3Pw~RJ~;aP@YVci!N6}QeceYwcQG9;n%rgp0HBZ=uSgJ`#imi@Tr z7-cx1^~D1%%^EbswlI3YC(0Zo;xfHJx}6E6MVk}07!_e4$HqiAk>3ftCF*6Eibo{2 zhBq*TsKarK%}=n6+L!)nViCzXnzwJt+yH)?2$m57LpmMXAFn`)JYPJ~O+M|iCY zPiqPEAwX8FKS~iC!!hv@CHpZ z^~Qghz^tNPRnB4+I8lz1vGEuj76Oe%79}T!p*5O`!O2-=I?s*un7e9lKR2Lz6{}_3 zoD&`<-1CiaAuKxg-lKo124<0YI~qeljuNn3{R@!g3l$)1)UG~G7q?o0%3x3s0GQpm27{~ zc}rTH@TxPg{smbo4rw9%+%qv(K|w4b69?+tQixCt8cz$0@)ZKCU0v5MOQ%;CPeJ3I z{LRXb>F?&%P2;qd(F>_m@K&y3ol{}&6NYv(w2w+?%zp_nb>F<_uozaeOO}hkC?D(? zO%p`B+cS+SZ1E9njwb9*(>S%^_X2+?e#Y_s&VG3uCLe?8=ZESE9cosPE<0B*SH%F9 ziQoC!%e|k0=EVz>0DW=&5q<0~ejZFuHr>oMBMWi_q7$A1tHIG?WD(+v&wDP+C%DHd zVPCS#XG4B5Yt>S)A7FJc+u7h>Y=jF1fCTLd5e_uS7#ktMM77%0Eg)DrR~=)f{q(gTO;Ma3>R3cN0Z@b8XQvf>QQPn4^BUSuk`)q=sP zXmuPu^_LD%mBNV>`_F^3NvcFHa4{JoIIivXTwmeRIqtlbTm2z52`%_^2ThHZ`oX}C zrFR+oR(LfnZOS~Pu-$e&?n{3rs#=BX?#sIGcBlvRZAdC}Ota)2?0K!YhOIdCbjen*GoUZP`IuHi&$AIpm<9*{AeJ`PnuYD{= zd*%_!YtU~6<4YAiQ;*9MyyApcWgDlZdwJGz+7n}xkyl|g=X99|W77sMnrJvz-;=*` zHVd0BrhAZ#6(_~~Es}FIQUwhM=&21`nLH|_)1qf=hOROuutTR~Ggt%Ufu%}iyS!80 z9Y4%4lm`aHo#kb^Jjz${mvC7(IW*U~u5$SJp8J!$a~?oPRijVTz6n0B4SrVypT$Cy|^4Sy6#_C(rv)8o00_=rTRF14=ob>yPCS1|UuG(4Q3 z(5{Qghq&T`4L*}Js+V+23EPY$yg1!LexIJ!u3J)okAff!;j!Qd5%i`0Z}VPr3cmil z7oCD?{FU}k8%G;|pzhF&7iEF@`h)>yr*vG}0r}Lpy7}}O7NwHM7?aX0%SKVu3u=O7 z>XS-!VPb4QoEaZ@@F}d2HyRk#0jM8d#~g6y^-EH6Y-rbyDSq?iAzgw0ddy?J%h-G# z>KWeV!ioeRiozmhkShu{YE#7MP$E2aN`c%qaokFxI^-ZE zJ1_60=adXxNfn=~77764&vajNQ3W^#{{iUz*?^WR0_r2r@7ej!3n%3Mcikoj-paW>FGthu31B;aa9+{_fr~k!SzR1deE& zu=X7bf+$T8{qMw*Y&*Op+YJ5RQZYEYWVTDAI~YQLJV5G%KaJuNv&@~j_zixqEWR%a zF>(J35f6DU_`8U;^%-hM6fYcx(-B|BU$`BWl0xQ;L0Z2APzx%HRxVYCpxZJzxb%SH z&y}I=j2qhQe8c|>n$F?q{%OR#$JMfpMBihS0nJP_GttcCB`_1#L0yPWbX7?M{LzCp z&=jV=6W5aU;~ z?}b%dFX}B(<5YA}GE&io2iuera6q5m!Pn?EHhg+jxDzqyvEL!|GtCzJ^&$aRr_ zrM##UL1Ohr$dfhv#D%M@Ddtio*jV)}pXUj@#hY$&{o1r>L*$F#qXkn7!9@XOeRs%& zzk_gt;g?U{kzK&s;ZQy)*?qpf4-pAE=uta(hA~egY)-^lv}2RkG$3A|Oye^fIXkRv zlVc#wRIT$v5inh|4G6T!ShRh7(F(tReuM@9`C+kP_G1V-x~blyMNKSrbY2(#M;vbIjwn0s=u#JR#@W<+~btH<9q8$+JkJ z&7tX}-)h0SpST{(^&@)u1Eudp)A;@e8Eo=Y6Vgv8_H8Qq8~+(VgMOEh^IbfDRz;0Z zL5clTpMr?-E;GGS6c3bqi54EAp$7+R*^uWHc}S5zm2jq-X^hfEhAX6z%ld3<9QtLM zw;1CiHtJYsQf|CNHJMkh65QwukEucj zS4#XQ?xdF#9O2xEz0VIuqoK*~cCbB7`^I65qWF2JER;@^O$t;Pr$ z81CJCj%f0PB^Ywjxh!Q8jAu(#9LuDANfJ92lI6zImm2ZW2$g}NHmD?jG2i}*TO3FD zlsmk`g+_*F+oS=As>sr=6}p;Hd+3lH_Mqw@VYSt4%USN4dovw5l(WiGP+TS2-rDY9 zNC=!pISZ5AeCYGYE?3rhryTKoA-19{xae|BGDMjC6r*dt8<$0`LDqO@S^>dX5)P76 z)lfdz-7RO z@7~+Uw%rGQm5noiAzhP{D5)Rn10Of_=x(0Y%Ocf%&z(CsE|QyMwTe}AJ)~9#8Q6(~ z0LcI|g8_p1V_r9Z1h@kvaAG_0*s%?`lmGjCg?y4(kG*&8Di+m$EQ&2reFWTlTB3@z zUu&=T`Yjnzp<_-kncYNhaTf^{Xb4|gAQLA0R!^)V{h)03t?e!GN?v+0j;pE-71jyh zZ03vhBEWWK`-y0|AkYJB+eM9iBYG=PW~k7>Bh`Xx-a($ATc{gcQm!k!6}fT?jQ?HH zmffKrc)?(n{Pq)nEIs^e3bJ*v@Ej?yF;5=y?4n{BbC7G(D1|B;vHXDwx{2VGrwQht z@Jgb@jX^i`RMh-hky;bY_3?$lrLExRcu~>Q8e*L?*;@-u9 z#7cew%kS)cvh1yK+ix4qquV$^8fXdKintz{n?8@So55dx8-!GYNc~x~Z?Kz0aWF!J z3(G zI8SE|-BXK`0eprt$gqeN7rulA+rSm^mf%y98ldv+g>WD)GU_<8lIyaI zgb744H!(d8f*eX)vu0P83*3{w!&Iklewbx{ctIEy9;d!mj8Z_fNu+u0waZ@KrM!Sg z*qB=ZEtoAq2B|)>_eG~T;C1xmqVFPJ0ocLBGr20++nBw7*`nRDmvLUjW{OdH=DXxQ z-aXhmg)ND3A+WtJ(!gz~L27)B`B5~DyDyKxf_yGbP}60{SYgt#*egT=Y3n)RT3mmB zo*IXQ$EG3+V**YBa!!9Nt$(=N%xbB(kx!cQrzx`GUtI%ho+emh14Howzos=uxJLS& z*`)0m-*06Q8{n%11!aOZX0l3M$)v`EbhyM5bBq?8 z(C$P!G4Q!zSDk%c4NJJ+hAP* z9pu5-rew0`)7NqOI+2}c50j;o@Fqgg!T9^r6Wp`#5}!wxsC;ek5*gZp2c{)|(O=)R zn9#5B8iD#{w?}X_bStZ(8h6F97z3CRD2O@l<9eu-6y*pRr$TNb^V-2QB$ac(Iva`z z>;kPWcJx_6!N4n~9cu!gh8n_HBR=LPy(s+;#N+$py`A0LQ0fvj)`L6prl)q{f~IvF zM@9oJp*wPl*@DY_(|mc_5DmP4yK#D6Wj1RCWTnL96Q>{RM%^;>Cf=FvYJL4;wu%?C z1*$YmegyVs*#pHKJ!34Vz6d-KpuvdxH^kZe3${Eihc4(Tyitk-NX_b1*!7V{q=*%n zlsG(f;G&U)**ZRhVmo?Mx~dixX~8zWQ-dC9feT;9h8yMqr?SVU&9;Rf~06 zSI(2mD%5W=oT+M!Gc?M^ggEO0N0vhO2IUo1rle8zFK3oXjA*Xc*QC;P6? zdtc^s^T6V-i07-Ymf9pTCy=Vj20hS~fCCZhkkdSq-z2 zT2!&!v4EU-I!85=pp#LsRRe((15{BT1yU!c+*Kvc@euZKz~q3bu{PDrv2*%&Ei4MR z@Iaq&f5O|ZwR-YDP3ZbMMJepjZ8dhpCE9Q1woPn3yhee;;rSqc+n!@(KLm+dj7z0b z6$N;}E*-L2K;n`Qfa1R@HQInovgNC^uhchYPFrE^l%Lp(P-1p!Lql7uS&pQGHZY#Q zA84pSc3*H=5cxCV8d2bxz}T&?gs@$}Krx!7>xAG@Vy>aII2N2=O4tz+w#A&`Gkm-& zff_NvV2;I|ruyxB+Fb5T{sjt;#f zt)Su^i9n}zS)U%uU`$@~i@>|kxu~!?m_e|D^>gH7Rm!#UjFam?kL;Q{@H`=MfQ#U3 z4Ku+^G!-2ifj$W=%t2UUm=pV35p7k*d?+Ir0Y-Irw=s8re^C-!D}kiwlws`kw5E{c z4{p`~S+sKrAHl(NV4Fwz()%2fu)tB7F%&wSvOXC+Z+(u^PQEwkrV}}lm0ZXsk9MGf z1~8|xEl%1~7nL$QrI+Ml9lG$-$ua4)S&vz^ACOXj%lF9<>EYN36 zz}G;7HI@Nt*B=WMWLPRUyJ7~mGn>W*UrAV+_@yF>C`OL*EMG2jn z>5gg0P@gyPb>v*Guc;#KmxJrK8ab63v|HmHQ_dJWtVUr-jxk25Iy7;6%8d3XC3Z{B zo47T9n_9dHSz-?u1BHSUbcnK>#5xQ)D&py7+Z$kcjXlbMJQ<3U+M!9S(X5`JK}GK) zn@Dw*R7<FAHnb7SZ#iVhN;bq{F%@n_ltu2zJ}bNAb$h))ST^+OJng@QS0`GR1cD zeFl#`$CquVM;=5u=fay4L-}cqJ;w*lozupD=?{|tG33FvYw#!C=$WP}#-pCPKXBexvracLK)H>UJm2u=BAE`z#`^TsB zgn_qN2yU|?p+&ig-)`=T7P(5XDxIXxF6_-ptFe14iLKX-zl82doNn_ZjcBM?P??>7 zN_p8o{1ySyHZY$I_~lzH(tRsCl(dJ5+sUXRRt`Zi2PFu&S`3V<>FZ`}u*ft8yJG&3 z_M(HAox%f{kt2Z_!V@Tc;IDs_!0$1B)KHypsI}Q^=?0bqY4zrqiBq)P&sDq~0jt)> z#r1A&+nTw^DlbGonk3S#JxUYhwMo~14H6H%9zbK*qhh`ush69SXOSM!+JPK6UYdAO z)%1yIIZxN0Y^-OJHRkyKT(FB7BEyQZDpA_}D+bb^Mx|zgK(2EP;B}+g$c<~Vm%u19 z(YrO`90R(3=sLB22&3Kf+T3g+=Wyi^!Svl2rjomV=FL+s;v$K6CJLR445`e29Iq(# zyt5p;sadamw~>{oO09xOt(2o^l^fKWbkAPO@AI+K$kJz1VPvo=cdpU|B?Z}_b8NKd zfJ6*VwnDbziX}+oDyOujmLy>|0aNQ$c-$xs0_7(o-xwu&U!~@V-8^#=7@?HiIkncw z0<)T-v`N+Wt42|%_hwTUKi9N>1pj%=*TzOXLqz%*I$_ zWTdo}F@7uQ;AlI}QY8I&V|{DAut@q*nIh@Ub)^+0SY`%)HY$wDAEEG;P6-wluDsL@ z88b06+s#ZU3%TxQmQ0?%k{TzAR^=E3k9?1DKkD>V1QlYr2P>&Z5e>3`q853g*{3GN zg5C=BDWV}FWu(n_v$Q}a^2+cE$HF}$T@iyOAySn2h!WgltoMi4DY;ITpYl79%RA^@ zY3=d4O+*v=*+k1vVzi=BAqsiR2hY7 zzu8Mk###@g6fvb#+Q}JNmRWYCG}a3_ z9x0*N>H*m=P&U!IfvYRu$1S7aOz+z^#e$w_=O)^2%$h?wN$qKwJw2Yg37_JfRX30)W`|5K@Q_GmZ$|JPUoS~;}>o8_)EugH0%DNp#d6b=~K#= z3McoMhj0gEHwlql=-}we`;iyP?yZD#uARUV#&dXP6~X^jgE0&ddFJJ01SsohUEMp^_DVqC#Lw}r!{y580U|1E4Ym0NR z|GKsR19l*Q2bQG|4leLZbi!F^5nqNme&PB(m_n(7J@Rx7-BCG3>T|NE3IazLdn}=N znds-XsR6&mv5yP71{&c(jNNxJ_VbljCsSU+o^o9@#4%*XV>T$@crJ~T=A=41rR~WI zNHGOAhD}a?5Hnq;0neGGGU9YdP?yKT3ea%hrfs z`W5{Js7l5KH7Z$9C_H+eyd_y zrKH%htBZ3ei%J(-E2z#nqIeMud(e8NqhG9rk;2!6X&x7q>pV1b27PJV>)(ok1moOQ zAPfLeK(4>%jN@OIkjpjIcDotWa-N8n-qm<0e#aS&f4@c0lBsU-gM-~URQs9no<0Zk zG#RnWpgb))NcX{WJGVhKIL=*Bjp`Zwh|5mCmyTcc5G?zp13dnUNa)ZB&qbr>$*^=q zfxUn<*@5&=C#t#;|Cpi|W&;6j3lf*03F-w*;v9PAQ?}15}Df| z`&u)-e}OMlC*H6gkEzrOGwIq~5L>ghkm0SK$&uBu5z(+*Zh)9aHR)4j`Zda}-B+y? zjnr#aW!EHe63B?x-jgHSuZXYG%tE+<> zBS1^>gG*2L1`NHW+KBTL`OG<;f)3k@fH7n^e-Va1ms)Fdl(KLd4Llf9waCG!G_^?M zpCI&ri^cYYjY7rW=p|D{AXB$bIJ%yuc#}#(Vzg5w->$109oM@2a%6cLT3Q(rYa=js;SmM*P59DjM{(}wU}@Tz zf4pA(Rr5r@MZLbFQk-48#7IA@CCVHLCR55F>x$9A|Fn9J0<{V}v%00Zvl-qLIJHU5 zW?-@lnJtyHapcmPiL9sDD!QCi#P-RT4F9dUI33(9bS8sovW6eP?`wK`?0qizg;e-{ zX1~w|B9ef3)j*8I=g$fjnMky-ZWi&BJyt6cB@wI%#*` zY*$_5h+)IYTrvY+MMuZ1DJxwf8Rz^3voy@DuVYz^)-NjJ`(WscodjJ(ubt2nd(MRm z^6!-cYGF_8N&lRlLN(!WhQgb74BK90zydWhe(Yczo%CQhXY85CI2tM||%4z;_7Q=vC5- z@TDhC;)&O;1j_zUp_%vK*D&f1I}VnJqe})4$5Qm^%L@pJB$3t;^DN##!DFZ~|I*~D`T59sA z0jPxi2)EM}XO|K_03E~AZ*DoB8+8%{581;a$=1llwb37aaaa?r?(kCf9JNic3sY{5 zT}gA<4I<##q8%nNJkapt07wJX@u76zNxdT%z}R*q+*SDC6j}3Ihl*Sdf8BE_-VT8c zEFxNPjk=lU)>d-KwWc|;(!0;$ASwk4XjboJ*Op=G_*fjJ?y&1L(TPSDcK-_1)MBEK z#e@QjQ&*xzsj!4@uCtGew9cTHRs^{Nf9^FI`W2%%sFo#a11hPXjuyx6Jzd?okdn57g<-oa>==Ee z>OoD{=oCyTQi4TgW}0>C-e3z}Do$ylC(xSlBkNY`7K1Ql-x)QRbhHT1NRrRo_Hw6P zmE6cCSf#@`rsJ15^MB=zTQ7d8cgd=(hfm+SA6B!NdXe<{RoMB^f9X<{gcEj$pdo&n zx{`H4tzlyH#*F%yMpLr!dmkm9Culm3@5?ZYWU37TV;`$IGx{eUWp810qzxu*DOIah zFC#R_a8?vxBFmf<>6Tizvf3wsbi5zKHFnuf)0rnp%xL3ls>ly@L^HxIbvW=8#^?FNiUPF*r zN)QsVtM1%hNn5v@lgxbut6Ff-+#x7T)fuK?gkLBTpHF`N{J?gR9tkfNToYrPTgaiO zLj7|^$(RdRs0lpgPz8#IPeUqQXY7KwRgs}+RjaxuK^I|5f9b+%J%Rsu>;6jPK8Na~ zL#GRm<+KT$Jm?Noj%0`XV8y8(KV{>&s|#@`;7dcdLo=uIv(JF*;H{2SFpKI=G9YEe z9Ez-tKm|rpMm>fji5WZe?DSv-SI(rzUC{^u!#qL0HC;}uso3gXv_U{$hQOm$-mF`bt9#E`5Dv@kzy9^$ogi z6DR7g3q0B)+!vYjfhEjUg3jKBNikEgP)UE)91H|pE)YE; zH#eSqgSj}WAT!Fn3M#)jHo zx0xcde=3a&X0yWXZBRH#Xqd zlJsggtF{E5SS_1)9|Xa;7WHesj8k|Z`@^{q^u7+NJ09zu#)!zq%ODtdaxdscu+3oG zf1nk>St779`~_JgJtOd;iuhG91Z(T9?Cdq(+y?0`a=v$4!9L;9&RmO=@Piy(MV@mh zPLq*){#8-t$&>n2f_#<%Ru z@3%rb*NwmQm>J7`vdA1^pJ6-h;#{YW{=f{DmSot@!9U&xiKL_56-nrPC)(Dvoz|Yf z%#5lD5LqO%J4rHP#h3K26JyB54_F271u?dU$#?R)b|UFk2v0FY?v%aK3P7Zqe{LtucWw(213(;`R3j}nO@&J z7f!1iy5pFfL(&3l!`&-scpaS`f9~v`w)cP8R>Ip4{ z<73weJanEPc8?rTCV(>{OIV%xj$z0z4xV-4HI6@e9?IU(iEG_p^v!pZf1k~D#}ql~ z3xuR|v55pu&h4KedAG3NW=MSXC?Jd#Py$a_l8xZoUwiFHO1~t%;N`6Z2-rm=2Os}kQ{G!A?hfC& zelNJZ4cfDYd!W9XQ{R*}e{D-ll#9zudi?as#*bU;TkG}h%|~0`tbO+)@Z(Y`NfU3# z-GF)TRHGNbB{&J9n9b#X_;;f5;*e2TZsU?ojQj#ezN`DjyRnN|9h;BR>9DV1v%aP3 z&G)flLY9i{rv-sJ-ya4j-gZh5>S8Xe<0G7k+C#)5sW8NfY5``OfBx6?(b70Q*LUK| zBJC?Umuy>i%3k9XN34-Gu=nZI@d3QVUXNnjOM)^7g12 zG|eb78PWLcO0@c|jnD5=!n#A6rcSfdU#JN_`xfi}D#08}F~->5Ttkn9A^^5CaCBC^ z&M?hXWm~gdRJvaIe?-X5Z2sb&eCLQaN!cvO&H1w+=T7S2nZkF0Mcx%7ApT6GhIYV? z8v{9`L?z!Vy>7KeGkueo4o9lUn=x}lkGiqfm}5jLjIUFp8=<`51)4G1&c)~*);#Pu zLwlG7;nb8TphwxGPxk;ssUvuUQpB>7boFR{x+=hng|j!)f3whHC)#u6)_^#eX$u}C zn%rCFuRU7?WSZ0zqGUnZK2p>53j25IEEJS%Ng!JMs>v9&(P+~$r>vymJX8Byb0e%> zgRC|kO)WR{=ONWHU${$LHOKDvluFbaz^wHJ7B%WL)S?X%s8v(xQ0X33+4m@}t)*o} zmr_*H(j%-^f5FwLvOu?+cn(J^dNOhcTueA%Zitnla1)$vj9spj>}Hmd8;R+;$AbX$@DB2We~~-1IyvDt5^tr=`sj=x@g0&hqSClKcb#M zzQRA1&y_wf(hBZ7&Iv7 zo81kDo0SZ|NDMc|O;Zi_Dyom4)w-{eYu#4_5WLfDx7w%sjYAEV_VVcX5O?eBXpb8R z&IR*kfAw*KFTC78+CRl!OA}3(=t(#Q*olM6)DBFGgpIQR;hIOf)Bw&1KbxczY|4n8 zorU#I5X zZoE1C{urm-c=e!U-?fsBHzaeJmsNkx>TI9ai(~!#b5_A>@Xy`FIJUDY>`R0lOGafC zf8p)hk8!A(-ffIy(vgnXjZa0Zc>q=u4B|UV0az)SMt}g7k?UoXrR@(*5PnrfCAEpb zbbMq1rKqi%Kq`S*&MWaJ)Kf2;Ad1_Hn}A8T{IG#Z&}jtN!iqs&_5L#=B?@{viHer@ z1WlBJpsG#@FB*RU*5$LZ`56%fizBm-f5$Hl%>EYqZN3DY#o4VJ>p2t^+SQZ&BWA+~ z&E0(v9rmV*s;G+>vJ)l}GoOtA?y29m>!8b8HS82AlV4bwaqgyo00mVMg@ zV3aVX-Vwe;8uP-3a~is1l}CV5qP$WH+lKa3a2eU$tEc9`jovuZA&SAi#UC;nw2h?F zQy7amxVS5mg`hQ1_;3U|=mjR0f3&qxV%yNB9SI)~ZV$qdIoMwW6k)&T;Y8%9BhlQc z_1Hz81KeL9m@Vb0h1;_~BiuLEv@VojI*2Ig6q-Y~cX8VhNj1`?YvnKUCK zfx=c5a26aa1LSPA#p4hNi;r6&#xkSEALT_2Q;?;hW(E@||M; zcx#lL*C!9gH=YJlma2@hq5Ar<5^hs0qttJL_<%$g zuq|^;^jM?zDb8MaJjfAce^*0KW@R!u=mMYGH9A?7dHV6qG0#KIS*Fc1#}`JxesKoq z8$tR;d_JJ7n9%!l*DE(p2+y%v)qGQdr800Td~BsPSqs&oCbxGL9FW)nwSXXUVq20otU92?Xii($&Ppo0n7kHo1-{7Drh)t3`>52oe@3F0kmLCTN$GTlOb*H&zzWUhy6M>h803pmF^r|Cb{<(aF16}- zgj)^!pvB5C899Cx75&0q`@9V5;tuD3fx72Z5PlCeYO%dlBqj}u#6 zZVEs=ML{BSqNS}>VNR*~j+(Q?29sCf!j+dPUxph{uApucf5$$1NtoBiA53YJEi!G@0*P1TE(*-U~wZGim3Pq+5_bpo#*QCRSFEvv8NUgZo8{`uOp`2~B!VCU8#+mZM3!l{@P(jYw-^eRFB$NN zorC6X>OCClf_w3=L`OE{PMuNTmGdAiRW4!NG@ufWIm&URB?&BM_gbZ5`z4(tap zip)JNe|srzP?11H+ zORqpqqAS3SMhM71#qgu6QUMLQCtf+Rs)tz7E+qO;(=BPjk*%HT2X{fa_04mRxpKNh zi#*8VB#aVxgMPs^P{kLujkHrjdQ<2cqJMkHf0vn!Vf0ohza?FJhZTkNSc-#(h24ny^TXS%`k#N&w5{eo;dtQ2gj5+hHQxaKEb2IL}PfUm*(rJzTY+RLy#y8 ze|qJ3*KP~#n_$01L6Vx;oq10^rO@>J=fN9Y`)gX72DZmRQ?@an3n*+L6M7Ddqe#G_F;`Qq*)*p>FZd@B+Gi$>YOv1z?ubr70 zM?Jd8Hd28%eOHx5ns)awC2BBQL_3{;m>1z>OO zCw=OumIrE6Gku5%Vg4d(=JQuE;pj?{C$2_ST3ShiW?c9UpSX0Rp_NfczF3(b)A+JE zIz= zPPVzbC?5E_t24;9kSl%`q|YK!+7^ z(xL21YJKXKUP7CQ#r2y^bd#c2tV5RHktO8z(oNa#v=3lsfj8+qg%P+JE`jP5e_11JfZ}Z$o&U<&1jC2-l z+6qqj!7S2pE-N|yV>P^Uf6_*;nf91vx?{4tPeB{z`9Q9bh>E&k4@l6uW7Vg!0{iV( zUB8dY8PgD<^ymP|klb~d&`WT=^wF$Aneu@VDR_qK@?Luse>VWdb(P57F0Ew7=9 zx2u<`o^u7PU3XkDZcG`5xDtwng^KYB>Ng&#G>e|ZfOaRHSEiU^fBpdXmZBar(NkDS z&sE9#2d>)s&r?+AYJ!~fzN^@k;ms-=5{o*dgsBMjkNLU)PAQn zRe1r6@xIH)Lcd4O1to7z>x)|06xHS_)cMBk+e;&(NiD=ApF6z^mnfcJ4wRBYS@hLc zc+TbA={2nw5}Tx0e<|M4Of$!nV^hS{>*?$s5L&RAU5Oi9VLDBt5>CHQLI(3(7uhQY9bo(f&R z4+KX?NbgT4mWE06ZB%bOQnfzR&&F3#C3+y6dD(J2n&QhKf9OT_Hld%t)R|?Vq^L)C zRty*Q>9#G;&xr9m^NK#ndqw@^J-ZuYZ0h_{F%bN8$HfB%uJN+0bLa-Oa>W^^#kseS zE8=7b)IJ`IS2b}0_HyaeTU;P~td>840m1?_12fBusCrp7XDx@T-KoiC855i;5@oyg?(95~SjFAzrzBAzA%lfk34-&ywH zIMLxd^6H>qRdO>T|A=n$c5*QT(2Dqf}Y9kmw|rdj3Hf50N#8mKfUdoPUU!SkUtG6YUW z>3}D3%9mifDQ@kuD+0}N^iWUDNwbnGqCkM9=^5pZ_QqJ>bEJdM?0et5f$#m|bH4ZM zA;}*6Tn~P(+w^laOyQ@;w=-p61$7c8Gd?Y(v@x>orZ!`}hDk-X8zdh&bghQus$doN zssqoCe>kZt<+u-Z9y4fR+vVy!)&S*+Po! zyKINk7b&PH$bnYLoe?@%I#-<2Y25OBBuoHKf2In8Izm0cPZZXCBd8op8sKO}VK(kh17~=kdRT$TfF=rLVLkY&cEy0+QJwI1r#tfwx zRuu-vv{h^q4=)JQFxA9$#d^pn)!2YxCrYxL5H$NZBr6___Jx~YQED{@k(Jf%_G#dl ze~#R|l??GYH0jxjKJHz`$9*sN(B%^oRUXb&nIeyeYKyNFg6W~G;)|A5EUq0(ePg4Z z!wK1Af#OhKk8+-<{Hqq!nWg-aa&;Yze(0V%j$e8`*Vl*Knp3f!OUZAIK|QB{fBV^#)cuUqhMa>BfaZGE_*Weu@XLLo(fFbLhcMz+$p7g zo8tS{T~Lnod$ltYr~XvzVK*$je_ab=cI9PKE)z&Iv_`-0zNcnkWku3rV7PZxC!D=Y z=gOC22QH<&x~r4Me&e#I6WR>@x+DOZcqvC7&Jz)##G4>eHZ}64T$}@6flcS9SWma7 zjpX8uudc>J$$5HUKE{}|S6b1!1LVn6I1dXJumn()Ov#VL3(&-S(gQ8Tf9v;4rxAE= zCqy?I$}@B;>ot7KNi&Y0aXM1RJqCYKnI7;#N`9F|e(9U^*)OHn%&~L5)PcOf)f(SV z+7#hi?bkHfNVU3NlF6We^{+TFr;Y^V^I9cJpg!r-l1Xl6-%P?Yhfc@sF39F6G8t~; zlF=G&S>eAvsfRTIc+acEf2Vm>oscUn9G+}CN6Ny~kBJrfr#qD0a~ZBaqizp`6I&67 z!H^K$U&~GpgfqrjdbM-@1qo?Y3_wfwYTaP;MUwLB>$PiYPff|Yb+=9qfbQ4L4O*Ld zsHY_^Gu*7KV8l=67_(ll9R?p<&vT}YRJTVugn{bTKmwRs)ywdVf0>n1bm*p0Qkz7r zW~9?NZBg18e_H=e5+=9Of>?3uSdV#EJX&+s?TTnSLr44y%dwJk;HxqG`r`-n zD|IDuE}hN;Uwz=K4}A53ua?lcfz=HHUmC)_zxp*VW0_R!DfUdh(yLw@{ zSa~-d!7u6S6T~eDt@q0)-)VY5vZOS#tgi z_%+Tp1|~g_R04@PR2N>cSj zpcK1KS(w56i|)6`Nw;B{WX>*Ck6d7?)o6sO!|Z%{f2%g}xT-Cz6KQzvxfGkV zb#dln^0Vxv3~hI}y7NP|)tIlSk=#+w#G!lcc#bR1dO^=g1j?fke^g88qvythghHyI zz?Omw&%~$SeEOSDfA{G>eEPFb|LN1e|MYi1{jvD;XFvU4Km8Nw(|+ap0ci0TWS{H=p&NP51?VlYyqMHR4#8$ob_*srIK3c>VFTa?A0GcYCEJoX z@l&$8b3c9oE&V)5VUbp7E(dwniNPu;ZGtXICiBL^Gnw;myp1cS&S04Y^u$%$;1;&u ze+MwnL+ZBa2NBtov)&`LH{;;hyHW5Q7tp0eqp#|l?G4PvjxuAoh22As?_&%gTKW( zFh7VZT=Z>fx~H5n1Nc?MqixZacp=1z=X9m0idKSO-`rfUfa(*)_~>CntZ&ro^(wHR zClztlYJAaV7c-kyMSxqIUyIJHIj^lTPq9tzT9Llr2Yjn4t3K7`Q&_jP00nEtfB*Pf zlArJ3ljkG)MAo_-MHJO)l{gAX#E<_^DGv=#_Zc4On&lX|M^v`RDVFvn>6soZ;6hAS z+;>07?r=eB^X*5GNq(J#l)~9eP(4^;>HceyE6lGzL|=62Z^^_<7&0 zA=X!|3!f`i&*OA|@0wK)8ng|}=FA8c4J{pU1yhQ6w@YBUmz)e|9w zf>A1PMc5E95nVb{*H67*F$Fq{{DLz};n%na0k53Kyd0{!Em{Gp_DSfof3}?>I4&A4 zrac4fiB%q^{$xgeipFJOYcaR0hM-Wekf?@uq(Q$AKT{GI{&8*325ekw9ju+r=g!wfKF^9}mMCd{~3ue?OGmmE!ld>W|Gf-pXimZKN>}vxg#_o-I-v*@JaU^lhPR@03q8opNQnh ztuhl)EW|+i6|xV4e~LeAzo9=U4?hr2;*TAic<+TrSBwC zA>0k6H&##R^T2ENOjN~dC-e}`1dM;eV;x{LAW=af7_1i=%w@QubVVZgTHEOc;#DBe zFEQ4_-HBAd1W_l$03UjVrT(wrhWq?(I8P$a#CN;2f6U0>CeT;so1H((^b8{4zH2pxr>K8HCjT zAj?ZoQ8@sDT|mapD-EZeIvA8E*+(dg_Aj%~I3MSn8lvIU8BrPZh`>wO^)seSdDA8_#UO8= zy(Dyes;y(P>SF8^-9Q*oyp#wcEqmn20d>Ee~@4a#2Wqlnn{#_r>H9gZ4hXg z*eAQxVXF=vnsF)KX-=pjfaDq87r03>M!v-+VhB6yQQx=ScH@XDij(h6KGpyI(8Z`sCNHKTa5x>enMsg;A+AknG$F)9foK1HT6G%H5Dd zvmJa#BI43lWCauI`-H&fY2izdZS#Cbq?N$f#EZ;l>Rl9HhcCE(-%F_XDKP?)e^)$= z^dfnwxWlhI64BqoAQ@{v@UP*D@d90LL8R2Is_0AUv7~1AuHn4q_Jim^b6WGKGNkfW z3PjpvCWdE79e-kM^XVZTJ?JJTJz{{morBu%*hNtqqBUalD~EQM+sUGI=Zp>GwBMZ@$uh;=kdqCdMCp#;Z)FGuFK0>l-<-?fA2i4J}mzG zT>b<0Au8PYP!_fkOsSNb4XKtbx=KAyDpZvEe&juKd%yP${<68T^|-$INZ(3(9tZU& z-&kL(x}Y0RpY_S+<{f0`&z2~=R=9|Ai<%vzV-ByAaf)4B>v6iRb!?U^5LeG0TJx{Z zHvja4nKLvkwgtZ#SVL~#e}GQ1JsBg5i@<_vAy=r1U;qn1sp`a}=SJsFr_426X;WyG zxMnNpx-w=!t^*Ap;ZQ$YHGo{Lly=es%jiYk1RLSc%tkH>%IB`)G-?ZPIZAUca%0ri z+(vRtfe3iCwZ66fSnUJ?;<$bSYfG>ZAgtr}zKO#`E>c1~h=K=Ee{dsFFjcEHH^@?I zbJ42J+IqQG8}NQ5P>#c12c$_=w66TXzZ#WOG~p#j61@kWJdd!ZK02>Pa)h}&(K*Hj ze2E@tXGRf*AMQ%*P0t=4d@`0`oO;2)t%%nj|EeQ>FthzA%{Y^BnF;H*^f%VO=QatG zcwxDY1r{N@(CLk0MnuaU!HRdnAh|?zxtdd>2Qct0jwIOL9=dH~ zhnQbmz6TNCe+d)!9Hu-7134};y~i~zRHJ7p0XXi6f<(HTJP@BU|Jk*fJ3NwhHPH?P za1HEfhv(c01E(huh6=0_-6Jmh74j?SroN_CcIsYG9ko5TLmG_1(o?;4du{|1wA*=8 zuRHM;=mcc5KY-VUlKrebU_)&Vx3Pd2v;|NW6SXN6GupRX9IghWQ~H*IT;=(_ZuB!12%nZ*IoyU%5eTM1G~M z1h`Kb7>-#d+mo_av%Jf*eqmv2+X0@C16!)tXiEgKw2~-{r8$83ZkcF0S8FiivUHRG z*0Ph1f0}P8>dAg*t`$B38LkpUG=H`@H7H(=0CS)U0=N&FF$OR}E60Yu+-DxxA*KRQ zcxNR7$?L5G^YtCSi#hyJ?#?I)oIHl=_cVv>S_ctNe^NgAMTkI^Ii6OJsYkN_l7 zG@?S*5R(g7a=Vx^<57+jb^PfD3ARKh`~I1ze?O`{-l%PE)Sf)usED2B?lW=P*f~Br z*f^_*=1$}2nK(Ll`V>D~uRnUcvAF>cBD-(JZg)uSm(ASQ(jU`m)|zN?8372QRFtuj@6r#C1M+1(&&v`AFD|CI}UCb%t3Xg4%mv( ze@6KZ{ENr7;&=nl{NUAof{h~sFn4+?2aHuM_)_C&r@2}aC-bX9AW$93)9JZDpK;Ci z)*Qd%rYg|12j-&Or!_=0g>!Pjh=9rNgBZM`oRgF!ux2KG#w?D4mwmW39jALvRXN=R z5q9|~u_hn)g!R-=go!U+IpGDS5rO>Qf4QI+3af@>4oP~j_K|z&v#aXqsC?-f9q4Y zCEO2{a`oU0Vi-yGgw9*bk5dtD4c=fQdsa+kS4?eTt;(fKOcmkG7u~ZwcieC~6r|_M zEVaE_9UWn&9Hpt~8m2Vlu5_S z8_sD)(K&s~q5#Jnzb@cHvzr-L0|KKF}$S$ zyA{Pr5d*`Bf3v%*!|EMxwQ^| z@*J36ttZQ-V4KwcFYmxNe=<~w0%rDc>*aB$(~svH^SIG!w$j2?e3L#byv_x&I`yuI z6QX6|2qm+x-H22w7t|kKhvV5!CdyLP$;_$0in1H+4T(WnCv(a4f1K4tH0-3ZQwE}; zJJvb#rDofhI4Z@vCo-vYQ+Ji{snWVpr`6kbKKXN{ZRdg93Gs0V%e33ynK{=&b`OZ*eYK~9i9g8zvXtDCUi06Svi8bg`$%CX*} zlq)ku1X5WE_q$m0UZeu4D{|*JIb?yFY>KMblSv$PQOMe#f9gaCbkc}M6a^n#qP>ZJ z(6givTg1I38tn&4EpK9jesP|o()(s%;}Vw1z%HBg_0XiRY?Howr^OJ7E|U`T^>DC# ze?UnND~$vLIG*dQ-fw@bgs+4kM{lf{Z(Zp`CAG@~eyV(aPp<8`d(@AXtZOvL_Ar%zMDBi%hdJUKo)+B-cv z*cU7HD6WWly&exMm=3xg2^n{5Gk8^sr*b4O#p(Wuz#@o9tSF!l8^Hx{tkdmcqJK}N zMpGVuf9S(kM{tJD`AnT+KerW+Hy>@)VJj4r$1i%AP}Fq@UDo{K&P~&$59#3JZ=w(0 z$3GWGAAdWNa3tholk_7<-{a$2Fq>;_K{S)Y^13x*O}UpiWtMPTBcJX!_73;icZgI7 za^|e1a?eoW6ms3$njF_gXZSseUd@VAfXJFAExBVQ4$46@qZyyFx4joMFyTSFu-JkE|(xYY=95+WJU&VwkU zZ)Ebi=GIVDh*Lw*q=QA5(h1eHknVz>e{-et2_mkZzO~EogEBSyE-)>+sKmbduyhom z<Iy^C4J;^d|5 z2u_(aEJWL)DnXQxXL7TfcU--h)gIb}1SFa6s=#VVI}P>LsLDWy1J^%3JKf!He=+>g z?&emNUM6P*VwbPGf-fU>#FtqPokFsu1qll3Ih+cDz_#&z*{e=dk)cILjA=ykv?(m7451%)to?y<5fy+=6 zqJz7^1y!#}&)SVr$BL2hJO}g8t*S=d0F=KjmH7ZSImZd69#2rM*Q-?FJYl)xIbF^K zgj78C6o(^~BA7m6W=kR~H~mIVq0)PlFW%X}&W^Ke&|OZ@YK2nVQp9pBf8(8tnAXu? zK#_98GtEo|1rNjH0mYztL)J&s4c)Q+JV;_hsneE;sn699Epj@#R;XtKt+NXOyTK&k z7<2q4`p1~;{=Sq8oe$O|yJU$BRmJGEo+#rnsEtvs-3csbk+Y#mbOK^a@Kc$_EIdD$ z-XiCtk~Zz+N>wnGV@7DZe-dCb=zk%Qv3hQ9$yG=?9aY`|^2r5@!6o2n?c2uAjaPX> zGKC%LlovT21(}J-rV23Aw3U31dqDY%`NopBCR!TUC2j|7AC>Lsdhguu`8enV?`xoS zQHmI6sY-;Zg~P-09xV4`5L^^5Lqw9E|N7%i>2YTwD&e9t&`yu~f5x7R)kHRyJe!3M z5YxM01_*=VQB9Fg5Ngw7|A?CBm}K$_m5%wCH;QnnKCKw*xSSEy9R~fmZGBaZ#)-j- zpE}BMtFR$xlZh*1U#o!He4;VLO|0e}xn+{nS2H;71R)Mo7$Q?6W`BXkkSG2qarFIR z<@Yv~p87hg_F5O?e{}6S2y>8-Q7pJl)&#oPR$sAm?C0Gl9Op0q!LrgmT&0i+D8Ehd z-yhPC|AVH-)e6F*CY?yeS{E|2o1ZdiQM?#s`Zf_A2kpcaXW$_8Y^IKYCaUMSTDgg| z=~H2#k7ica14Tg8AG4s}p$6!$rFWjKsW^LWwqFO9=C+bif6sow6X;%vT^!$}mh))0 zN_~9RhV`Ix3|KapC@yZ#7#rD|4#Q&(VD|!qbH6jCck3HANr@ml`QGhfN{^~lB|}XW z%n$_3{03vuxKzwco5B$L6T3p8<_hVs3scQ-;83DLRDrYU%5cmu(Me?Yk`Mv^2(ydv zrME^!MbpIwf5msaK(Zo1iJ1~i7kwz#( zAk+>e0B~Z!A_s>XgylU}+eP%I>bhUc-k}}=)k{#v?)12{=M~O@d#dE9ntClH6kqLf z%_|)4T~7FAi2XI*I*T(8@vWO%TiaMz0QQF1o!j$KfB5P~*rm3YyN%TAv;FANM!mZA z^y$`JZsh>C@;QiIxE!brFLKrD-EbF%-N1?B8@zum;WkxzGsegDV%YfMZl;W?tgpSh z6`E+I?GdO%%K@E#{i*mq@yKHY|9Q6YLZRH-8Ci+-))ug|+) zt?P_xe@?fSoZn`4K%oVTMqrclpUVK9G8tnCqRx@`&D@zV+hE-=l%|E_75_)0XHbkYc2vs;{0n{+o(a#t zgh#||j6NWADPIKWeyNFrpo`(ys>Z9xx&bLnf9=oBb_zXMv|*yw70D{|FKx7qfkGc^<0T?obRAN3IdE@7P zok&buOL=sC``Kpw+2+=bc=WszEN&1`z!h2nW%Xdnc;s9eyq1(JWhH7>$Nc@fj9JgL?nS&j|BYUgQ=6)fN+u1;?z`C?S$uM+**Y@S1CZtTjX?zf3YAe zZ-qA|ii4oX2~7l?N6ybHlg$z7T9yUJWTa7jw}ont`tr;c z*5@NLfqXH4l&@$qVQ}Sm@zrGVKt*Ju{1&+eHuWqvl3&RD>_EP0=8AZRq)@2f=t57( zjX*PTN7%@gvj>!UPdRWZX#kF@e{pc2a~hOgq-kcMtR+J*8Dg>bAdfet&J2?b7C9Lt zPve{?P$OjnjS6INB3?jdo+F(b^aAhm+IeH_g5MJ>{rswBSSKi@--uPMb%&fBWs@qeX7Z z*-`V&{%Nb({(kPqn0>66)<1S{cmDI?*1?F&-n2oC(=AT zIcVhk6yqry+oS-VUe?e3w63j8-d%=hJk@VO%^%) z+&*pW?H@KyU(%pM08z~@e zcJ$yJ#$4c}ayl}ojX6=f;6zJQ-;Jqk<+i)Ar&J%4742vB#EP&5^SkXWcoqO$W?L5w(Yjb$FGOt)&!Z%sJJEFTPJ_-S|8ri?t@ z@kr&8X)pIyZSMFMe^4h9MSY_;#hG;Ao=bWppc?5YPWnvH>3kLwP|W6=+~yHHnmB@t zA2R3v6ZML&cgwo}ZjwW(+i^cq-oHGk=VzRNbMHAHH=7L!EF>hra#J^F=C!3~G*)$7 zF!GHnS6yjWfi^@>Vu87pNeLz$Oo_OEWKkKHc2KXXxl;s#f3ZsTb39mnU-G}i9dNxo zWabGyj+~2Z#}aS$5ykxZ(xQ1&wBLfW)H%&~zS% zS#6g+^B-{q{N;J)f@7*2)~xM~eFF8!g^>Zf+R%*@0xEJbg@1)Uf5{>81^6*^1Q=ky zRPIoo40Thp^38czUO?iz@2m8%&IY=X&{jmTrV2cR@b;=7NODgE>!v7A8$o}o6T1Ck z1!~^agWe_PSD?(Clw`Ys{xF%Zdz+{5xSam9&XNtT4;|LrS0Ed9Rf>vHovsa`G9K2v zBVQAF6`n&?;eSSjVbN{y;xo#N*s5%AJ)XY~1$7oZfX@vLH!DxKp9t#@Muo{H#NR4? zJSnUMd9qb`1VThrOjvLxDZJ1P&S;}v*?#(1Z318V;+@b5)J2n++bxdaaiI!-ro_@K zX)vAju6#g!?t9UrEG$d#SSOGnLYmeiIFEB{hb)`&27g6TX2Dhoh8C0)%<492@o6C~ zPF9aOT&$}#)Efy&_4c&Kh}n}Bta})9gA06Sl>^Zx`?Ary!1j7Qu^V2EW7y4kr?6)z zTZ#RZv)7H?JvE+I`nj215?U4@(Zmmpw+Du9=cY@=qU!6F`u1b4Ho5+4-YSz)hh%Oi z5~dOrhkw7`4agA1JYSgRAjGD8-gA`a=vdOlmh)Fp7Hf}poJC>wWaMB!J^OYLV$ngX zUD1J93e3}+J!-bgm=ufj=9#*roPyo(bt}QXiuS6sN;}9$A1v4v%qh4&CvjY1PBQ4( zaZMZrD((&2Fi879rcGwJ6^pyrm>n+K54eAz&VSKOTN!F)KMKfS4O3Wgxg85k)#G4! z2mS~VhReGA9e2D#o7Vm)efWd1oeF2(WmmK^f(9sl-0e8f>fee}!vR72C z^2yJ$v1hRNO~+DB;B`Z=%!iKGSGht9&1dL47eNRIBDzCRQ{$^uEa-BhY;Gy;(!lM< zx_{QW)eW6a$6IJ90W~174dbhd>Qw4@6g1~PicCJ*6whbnM>X*hT`AlR74(ONQV>@B zBa!Os4T3ue$3aL_!-P1+i%jJr9M}NWKHWrgp|jx>S{2cut|qDs9P8;5GBXs|Pt4S7 z1T1ofc%hRa!sUC+r$*~G$51itEv+r$JAbEOh8LRlp*ws=v715Tp{DWN?lU_$l`80O z{lX98Uo3Ju)K1#7Yd9zq#FUllB1Rhl{O0MBg&7`t_X%c$hp;z7UHMANr90m3h2iYNzTEd8pcGHWrLueeFM9$7%#|>{yFC!hbf-2be;xvdNu>-0`)PG05 zgQ{2vA3g7cS5e^CdJ?^m-9VLGWm8n=HnEp1v(e7Mr;J072)_=k*r!2~-6YrwFpm zw9q9F)VU?9A+x~9#Z2K@d~V&2mvk@nyG5?w#8B;Tc2iaAPa@ZGIBevZr(D2 z4Iz(T5b9cwg&NsbX+VW&h@cShi((SX(N@xR_0B>aeOPcW@0M8WHGgqBVWz61=>|Qe z4Th3I_9p=@7quUcU@okGR#*?zk%M&WjlP(kOIn|@FzgxJl#Pi^fyG-ysyBtrY`M() za>D>q(R8v|w<=SZ_1BRCu1Ya8Q<&sM)WsB@)+QUJxw4NQ*BVat$8kTHdB{8fhTU_M48iFkFPMkBxXMeMg+_Bp&tZwm!|aN%ogc)@{o@xe#Ot&Dqkp63(Mzfb1D&^h+T1y7 zAD_0wAO2yZwa|jB7Q0QA^AyL!qNB9>OQ@2qOmSHAX!qc34<=}ewH8}^bl7aei0$JF zl{ih#z^=p6rBgU{RXerF$xsTz(`)Vj0nE1ze-wL-!^TTEzm=4N7CE0x<)ES^=lrr_fJpH zPOzG8RlGWWi@lZ>IhWnW85Z;56#)Yp$pY@x@hO#EBE8TJs))C*_NjCZD43|KfrQfn z>e^lK{Wc?FCFAjF+oA_?wEyy;`Evhgci+_Vy=}JkSK-1nTlhe8p*5hm8B~CJ)>d_t zX-TEUr++JSp+)nBXzaad;$|+s=#qPDsX|bs)ZJI=!sO-EjT_Cj;BQ0G=%XL$YiT!| zS<~G&o&Bnti=X+Fit`%2(F;aj3k9iFO>vj&#XgYM{G>Jg>|b4thf-xPjgeV~#us+0 zhi^`KSTLcxI_90$UX}g=6YxEEL^D;;N0q$s&wu@^Q(uLdsOlAFxg?cIOc3pM(u`woz7+?-IWSSCv%n^6p^|2Ss7VsynBQJCQF zIOjkEN#bEqnOJ%EZajVtG!oP#P}!`ui0=P>d0A86UHc#LO=~oc46PRNQy(#AiCEPs z*+k%obz!QKOy5Hkh(m`PNQ>tFfmmt!QS8Pj`PIgmBRO#VK|*<&u@jzOIHB`go`1VA zgH;Z=n*25R;{NMqdNf9h#x4_%>p9fOF`j2zc)&IIXN}(4m9=3!@-q7}<(br8quEj? zXP9a3AUS&zT8`Ix%J6tuYXqqc@y%wGI#v*lv3uFrK-t4{8lXX)%#W8)84Z@ z*_L_5+3CTv8_=sBd98?0%^#<^6F{%S&FO&>cU*A;8ov2trS}k0a=Ac+h0N6UdxE;N@}uGRU-XFA|O&(Uw;Z(#Ykn{ zZyPg1G!vVm*%ze`mg4T$?_V^e;s6vHFht_h0#w$B(;d>v1Z}{`>7_STZP5&|)N~?8 z(xq*nRNK$ef9}M9k*rbyaaw!360PcQ>k}iJ5_7vzs~=;}8r7j$+iX1vr$%Y^3K58_ z?)c}5E>(aP`%ywwz&eE(tbZdf<9CsB?ExN!;)!S#Ur|8@%BS2iFn5(Ui;CW;o&u9- zq9K04;hG?_T$~UNNl}p5Lr?D^S$Tm@`my=0c^0U%*{;U2JM;rD7@+EUDMDxL_OQwZ zIVv!GBW5GiOJ)j}r3|ITinY@qh}?6egUA(+Cq10|`_=k-y}m8l4zg0e;E5JkyUiI=<0oY) z?2i_s6R$lPBBaCbIHU2m;)V16nfTq!CmYqrTlMs;xt*Z&+iu}t?TmCY$)wDcqZNW&_^0pRh2= zsrG*4J#%}%_YMBCxv}+Vd*jj5ZzkV%P=ET3^|h)S%h5HNlbc)Le0O+K!u#;w)i-O0 z!3Qw)oN2eTZr{==&t9a@rVJV+%Mj#{w9a&`a3!;@>}9!?Z4fK^91lv@cFoflh99ke z!Sx-KTz}yDyu9}FU%Mz^z%wm4{otM|!HS74lL~xHy4W+Zql?t=b$R76M%@hI611iy zR^GtrZLAV}&c^!s##$ZzSEnwwCAsCu4Z|R;bzw%t4z*8Y&6>bkI)6q>Q0vu?^b6nVmz0kQ*c%~itjMrXJ`*g^OG(?W=H|?6pS^T2o#VczCg@cxlQBk_knm^tx`ytdI24TXBJ2h= z@x8;w8g}3~4SM0ne>+Iz2XYY|I(|18ef(>`f?ZSMFc9#?Q`whz6J1A0(UReX`ys%} zWnqPk;UZ%C*wZo-r8DaeW%nFr!#!J827lg<`>mSO?^gu>2>ZFpA*Dkn6uVA@lRCjL z7yL`m=PKZ$FnG-hO5LkH3y8}SiEstfW%)wRo%$@c%jV?mv@hr8!mnoX&OwCZdww<5 zDwgSL&P*8F%SacmB;4}L`%M+RhGn7&V%NP)I+=wDy1R;Ob-fDz*{+Bq(CRP5D}N_s zRDyj^toT>M=OZUZ!>T*U=O+!*ol~8~-h(Ibahy8-^C+WhyILm3AP;xw&td zley*&I10x%8m6cE0!KG0;R^(?Bsa~sI!DErKPEKFZ=*bu6-Pl<2jsR`C4XY_5Ufal zuhd<)Y;~>t9yrklFAzr(+Z9x}egYAuO*;pe)vLs3f;#hEg08{_FF`m9^5fh_+U%a| zA~v(Ja4Dbo11G%qmYG?`QgJLexQ*KS+5!JiUps_<>$SRo+gVkwE$bA;P8?XdG`SA7 zM@d$s&U(e)q_;Ix7jXr@!hc0MumJvHm9xZVav;9R`adRKdSKpKA;@JcOKBdxtg+t_ znFRM%(#2W$Ijju_9>^H?3C^Yyk`~3@bJvgUMuwcc`uRXu;p`5JCwEv@4KXaTS7dZX zGEEXE#V~z_>RAiwqdHFHMiue4*?xs!Evf>EYMZd)=XLXFucCRde1AWtj1F{O0!MPO ztys&TTa!PFI;V0Lp++7v$&q|72=ARM!MGrH-p4<`e=PZ)AyzDAx=%|5p7k6Lttr+QpL#bDrP6fR=Fx%Gs!|=-acu6JoDq@psdEtBbX@ym9D`wNuEEjqX%|$FQRHGv$=E3 zhY3g5c4gw)-oJY_ujSQ@9q-=TU1|}_WOYqYS)IhwhIk1R^?#DCBicy_W|VuKyGVU? zgTA^+|J|B+fpWT1wG0-2J2Sj-i{AB!B_{p%NeY=-?p>fen{PHS;Q*MNjJjYNxnJZK z-KC#&`7+8h<$pO9Zi?1Af2NswAwR02VrR%cgGugsPSSG&&cREZqmUQy-K&L zm+1Smd|Js?g*Y@ZXyniMpQjjHb0z4JZvro#h0#9+Iu0%zAH>A35?tvl@+LdrgD@zo zQ@u{Yo*Uisf)BNbWzwmT#!`wqmF~z1#VhIdR0`ry2Y*r=1o#R;fWWM=Y&jg1Wuaq&#`G&y#U)#)A44V_CbLk!Bj>xCX;lPP6?!6(b7O_lBd(xV%lAiEA=pvEWcO&OK zs)%=v-;JL4E^6LI={jm$V~xI=*4d?>r6or9+kX>z-z-y2ipv>X&`Nfd(s923_^*)| z-?*NOEeYRU&=1c+X2QCGhJL1`bE}q^rkCZj#2y&dtrlqoIg&xM_Pmar2&d z;>L~a#0|U8iAA-HTS8+l)n%5+p3@=4=@G*gJb+BL9U#anOOH2K_zAovPGD!jjs-7dXAO5AGO081-xLQwAF7^N(BBfq!N# zuoy4q=)6purr83fIckeD5C1YM2 z=SYqn@1EDX@*0-Qwi%5HBo7muQt zCGhb4-09>R&J=`~a&YgRFJ>9b#DAaeL#F8R>7MCPE|cnczt8e^*}gfzJLmlO;nb${ z=HqS`jG24Rnbjhei7!tkz=@qO@!>QZ2M3MQcDcNrhw}JqFW-a;dcW`FN#Nc4R6kzB zGTq2LJ`HBP(eyY44JWB4jW3A`fLti6?127@`9v$liAaoCvx~6!?u8U!7=Iu(gJ@x= zmxkw_TXoSZSbts81JqS7?(%yXr&PUgEppcCwRPkEnc-POyA!qF_f4l$hqp`$-Q48~ zdg5a2X|UOf;j5dqb*CcU%APNyo^u7n2wPKsf>llBUu{{$G?w*)20|C-7%fgTDq>3SQqlT z)R#&97K-~O%;j0k;nFtd!lgyI;mv`>r+un+SqZgC4iOO|vT95kVGPn0E`!tkaP?pR zG&*3F zb81#r%I$WnDS}oFR-v4QRo7Pk%y5AZK>V>{Qs{#=-o? zo^zF3KG-6DaOuh3fI8|u6IqRk#iRAA6ntFqC@luK@#?PQxo}p#3j$(ChUe0gS8QSB z@(CBVL(_5`?Vs7|F?+^6#xH2$*((G(tk2rmdV38Bgo2$?1h2&zQ$cRJ^;6sVr3_EKDdYWNz; zduPwZ6hXFlZt5+|G&%ySCI|;kFSvh-@;z~V8EUz(Z3P1C7bDwJx3OLCk#w5WQ|`OM480%!Y8uv8SQuJyYP!IFLnFFXc3cweIr5( z9r!4iKDF#~W`ZSQ`X~H%RmMuPsRTPR1d$>Zbhd};FC+ZqIhbF5Iw$Nb;9XCdcWpoLuJZcYX)yW2`FRn` zB>1!NLiO!!g7JKcX)p47Hx`zwvu zV+X#|=F3-Y@#^?sZ~wF?c0bW9?;gkN)Ab&|J=#CLzj6BqjH0hR>aMk+WwOi?A2Yl1 zz<=-e8N);G@}1i|rq)N->dcdLaOj>7v5nyCAPl^#;DVf`qjUA!^D7i??`vUF)<>#~ z$v*urpZ@(%fBfmsKK{PZs>;?w_G6Q6$b>2L7&Pk;8)AOG|}3HZ-H{pnAB z`jbz8{pqiM`e#4=3jsg=)u+FOC;k@xRe#?UpZ*Fy|LLE>Z-4RWZ-4ri^x&tz|MYkG z^nZrm|K!u({Pa%+Jo+zb!2kH^FF*aQ`|1CK(f;>O|LN0T)Wl}>(_g~)e*tg!`x^Z4 ze}DS(8djmz^HBQpnp&-H5XV?W^U^^y|NCuQ z6`3hfm9(7{vBLEnQCNcyEBLR|@58@C_4^QiU&ZOE$e4~Jg7NY$@w-$WZJhUAt3uL_ z8k!E)YvljENd3R|pNJ^!Z>E17xEHva7_P(J=nexI4)-STO(JnTqeB7#!!JRQ%#n0c^a12#N>(F4!; ztsiVO+82zw?SANDmFhRt7+AkRFd&;-?2DzI-Gtcao&y?Bp>*dI1g|k!9^$Nqk9|{R^$7!VV=R8 z;H|Fj_}2a+PbU+3!6E#0wjEKKKF|0d`89m})%+5MKZ-BX|NL*rd>G-c|M(J4VYYLX zz_Zes7V(za(Qb}+wPZOh1qXIrQEYWb;UaJc6;nVw%8pHkfTZQ|-;x%6(mRlfv z+g@XK_~O}n`qcP=9}pt`ic^tmYxGX^A{pd!ytZHrPw#3BOE3#)if#!QWqZZD+C`0j z94XSD*oFKvI^|<&&3_-0Eq@RI^Nsb)^*$v|a4Dk_8RtBwEe+ZIGM>fJ{^cYY{Qdv_ zKD++=|G3TOFkTaLv}Hl#&dQxK%O;?WTVgwh*EQOcFNYWD&LEwAd7UOV_;>jE%PiX& z7GE~K(sy*agJ(IptPy^#5q*SXJ8?|wC+*^+YahQ)%&7k3j(?4dsDAd)cnHD}5~00& z(Rn(61NA(9pLL=|mZ$HLo?<&HemmVQ-glyZF-m6dv*;unWrNw@|Nounw^vz#Q5pJF zwLSS-BRO#?TAVHtm%&Ug@)-Nnb~tu}Y52<+4oC+@16S$_6f?pU1_()@`gqFYyA>Rv zCANi2#OYPE%zyY_+w_c40-`S|d$QUzkDMo%h#xY3gSQbMuYaDT(^PW%_*FrhloU7W z&=5MpE&~5eXvBhx@Aw=){IVeNX9^Gj2^82V7@m+OZhLWL9flob0wj@{(>rf2C2T=6 zKo*pFK4SQt$dnjj}_OB0p=Cj=jX((boZ{(n?}4>_rxjMz*#$AK2`mJ-7+ zS6Obj*m#2N_+ei5D1S>CY?q&}W!*c`+y41W%#%v8oD!axKmE3UbkJ!?#+wX$L%NyL zrz`XBoi&o~M+flOqyEv0Q+Nwyu9s!ryRTvNr&1|j1s&AW?v%&xxYW5Oke6hpyYT<_ zF};n`@PBD)%1GPXbI0YLUz{Gp<0b8Utm*Be9zO+_I&vF>xou5M>o^X2-9vZ|CfD5u z+XYWod%Vd{AIa~g@niCPfA($u2~^X0$@?++4nK?DKd}ZeUJO6G4gFKw*cF%K6*eyZ ziBpuzBtF{3SVUW3rq;;$itUdnIuAb}dvJYQ_J80f#1Q;*B=Do1mydRx|9oJ6J}@8S zzr#+Q;$PISq-3K0gOd^Y)dvo|>@Y!!^k|sBb=q5(l!k#V@m(Ete>Dgj7Nxo+! zXR(-Nvjq&`CgnVdut39Si!3kQFjKIiGyGA$5Yc+Kly`a^yqbFn;X#C-ui`W>cE6ua z2npwsQwWa66{9>{srYEjHQ{$%{c3^Lo`3SC&C`%?(u<2M`Zk`;qHoV%5@%7nq)-1W zdeuGeonnEYEzG2p4<~z~?(?(b!`J7%!*`fbad{s}^aWUn>iUAyM9EAQacXif7FX(Oo?m6SGp3weGjg14D+Gdusee&M z4*NvgZe#`kuaiy)jPV^Mnrk#&6Q){3On=9Nqp8_72fzu;STljH_?@1I=fk~$x?0Hz zcaqhdYrLzh(0MYMU(A2nCIHXj$7BKEt@Ls}qY>%w+(~+y)ZvN}}ERIg&EPvX+gll~gD^74$F>7nqZq=4~6m^4H-QZ*htLY%0 zu$2AT=rEnlzwbofUV_}TqEh*}v&miAML#mmq0bfO6G{CsCGD!G>M5}iUS?pxonK;2 z<*a36B3v7pr(I?PEVTV08jgl(PO(n-&{v}wj1fqWgBWF|N8ozqdE+Aw{eLrmdbJ66 zgdY6-KF$jB;WGY-hp})5KPJ=RA5VDc_4^#Li9dC~k(7vZR2hG4tTx8ds=vDl_06+UAn=J6b z9SmXR=^{E^6zOb@N8XR##D9}yRxV~>M@_OR0&CyEKSqn`B9C6}qA8qSzi%)}Yma&q zyt@{E2D9f5d6U&t;%{4g2G?(Lud_wL_Y$q6;_cyMMjnECp;2HDB?k zceZ~Lp>r>OKepgG{4fymgRi3>{@2~;hd+n^{ZBvq-@pIe4}bl`U;h5zbfO>rmmmHX ze)`+r|0`rh`r-dYrX%J}LSCf5HZ)1U|DS*O|KNXr75)BS|M1sHfAsr*2fzHUfB)aY z7ytJ6|1M$@r62wiJb&{){P34Q{9nKS@7sxMYyrfs& z#y{W0Ki|Y3>^i+klM+AvQ}0dg=ka55o|YKdTs&KRUH2FI*MD$1d=uxxlsknChpA1aAYyhc6^o0j;Z+xC8!3rDWcg^6JDeg0A+Pgu$>E>et68wfB2jKF*>^V zhrjvnhS7iiAAkPgZ~kKVVMDWYJ(M4#{yQ7>Pycaf+)eevznD+%Drfh(jDDQLkJR4R zXhR48?~~|7o+hJY61~kP97 zm9p<1fA!?ycMtD9ytnuC!J~&?fI`j7n=F4{c}jvA_J6gX(MrmfADC|sdeMHqfEi3s zOr{`6!|c-t`jS_FE-_y=oV6l(X#M&%SR`>?(EPgC_Ps2)C%Y1?eVp9w>QmAth1&@k z+=A@w=ZC9(mXQ5nFM`AtH1j+|#GmteF$!_Ty0qmSz;+AzM z>H9=@C4Whde-PQ>R|umxIMl z5q}9|Gn^*tectUI)&3_05t<};2jWgwmj#^dCwtLZf}{m7e-P=i6P?XrIid&m?sYJK z41yldhG3XxooGLvq+rO+z+ip)a1XDt*Jrg#@_*Z{ub4GB5iH8KFiOiLeUFY`^_10w zfA#ey-2yLW*_2xV2F(H8uRn5<_0jI_f@tONia?3=6S}{@<7iMn*Dd@wxItfmM1Tz) z&ys9jw7iQSe~i1hJIdg~Jjv4;%KAZ44D*!WG0_WTE&UXC@-0L7{3ht$)32WF>^*(@ zNPmWU1{Zb$ujtQ)Sq`#?1W~PyGqwggWwMsjO`E;Im5O2LB4WXrxbY^Ksns*&b^gt-D_Zh%26*?-bF z31QB`lHlO+Pz*1@+M;b%t|t7<%ai(HE8`0xQ_?5lhTt~7Om5Kh*dah_KEf;T3Wvz7 zMYd599=#E9(h-9=HY+0gH7$vgO4+C^gxYBZ!$Dr{TGa6ki>Q5(X2sc60R~b$NGCYDntxnZ_TjD&)vx06^3`EZ{bu&Z+zPSb)u~g9Qb5d?0-(vayJ>x z*BJe)xG3V`C8&e4M2n;-(-Ku2NYZ&Syqv-PcCpxSCLcJFbe5;_?l@m#7CP?eNH1pC zjnf2SMDV`|G*N%X^z!L%=J0cgzv|A*On&ouCip%{v)y>O`|GPUruZ#<7+q!xbCjEH z$@Xs4WIEo_QSp-h{wtc`_m5 zR%Ayms87fs!Ed=6e4vF!s(miA36_JJaEQMHG^-IkUwE3w4&1`T_Q(-4d=lUI@G=~1 zhhl77Mx!U&QG7wQYnNP%5M9RCSez7(I{e4>dE4=kE+J{A!*pz~xvp(Q<}X87`~b z(Um2GDIr&3NNX7kJ#3hXwvR^BP^gk@Y-u>{B#MrIIod+&FsMIza{o~?gSun4T8ljV zsaPy?kQe;3GdSelMt?IATt6Nt1?Q-cn0GgK3tQHu=V#iZhI&?!JAKkY6=|n|13g zsvwNhV;~gusDG&S==EveJ=Uo)iZ$I_ro&5Lzni+|yt{YTDj{sJi$2i7@&0S%!R-=} ztgY-eVT+FGq+4ghebxOI-KyxchtUju7DY8|f8Dl>znxp!?80*b!r!BJO_aYxhTA<4 zTebH58o=MfC3xG1TNOv5EWy%iwtsp+&&Ri%!>3_JZhtA@-{+^@gWjv|>9>abm;cr( zWLRHaH=cER{Yrn|UHdT5 z#$liHv}B9Hk4B>(f&GM<0j`B?n3C}wnp0%Z#w8H|lyI*jfM`nTNVE=X^IRhabn@ih zZEdiceSeoHU;N_u;8hnaNm%Nx+5~z<-2v#J96g>)aOx` zxyWg@5|oPeT$=ALw~_<}>xD>Dyy)+Xu13wSr+Kz#Z0?kU*^$skN{|Jc`27WMQOoPwFQc)`fj0Z66;kOjcfmu(pGSQ2#sCGZK zms8bH5&OhhE8b37bFtQO0M^pc2mLeZVt>&)U8Vjuwjlz~!}=M|-;wQEw|v>#I66P= zgL8nrIO>U1{0Q2x%M+>OdN?+4@@@;UH*w|5zV3A)9!OjpgFM*PH&-yVV2 zz_z=e^*VMxOc2%*#(C&`0Cc!|Fsbh8yUucdU~9Dp2Aj11`jm|mSdO#T&(F^L=YOxy zd(k(?#|O0DXT8%maBH4Diw=*^XwhC{;}UEzLhpq~z>2}2;or|+gY$uF*FQS%ou0lv zLE~c^HvBCt3JkIP8d<_{k&lnW?dlz$QsB{${8%!{<-}adVbhY#Z2+2_swDd zo8HlWFKDx}?cAb1zxHkSoq9-t-+yRCxI_CG^}&Zac+)3xGyX7$z*%2iR9v$Cm$KTc z?3j;=+}gW;|NfKj_8#232S(R}`%k|3vPF}~2W^mD4R30bU9Ga$JXry;?a#ni;XK?df;mi*2KnG)xWG}7~r!5n87p%-21vfcg=Pp_&A4_D1WM4dZ-dy z(Je7nly*}8X>G`J>LFo;@uI?5H9pRfd*4olgdm+=6OS{qD@JM5sM0}SUSJYwQCPr?%I9$(EVM^$;0B{++Hc+upHyo z_D*dGE%vHEW`D#A7yH?^wdT%*596t2^3-Z1G=hta53V&R#`D=w4Ffvi@Y_MchHT1r zQRUj93w>UQ+3X&=Wo-_;|3O1uaK_^b?q8Iu%VZXQhw2!vGf<7#UKjtosEeeZr(=AU zi)|g~&f`Z9_Zp+u_aC;2UO&9IH0&O4J0O}h!Rk;aG=G9%Mi*HIx-!N~I2n%-`9cA= zVxA{*=SWZzWPMgvSAUcxY!1;5u`yEJ!%n!$MTzM=#Ok24!*>(>Kml~v6!;~qC)o`e z8dPu>XZ;GgMnH(i^9jOw?jpE}>p9pq2tH8{63{1nknH*r|Ea2nVqPS{OVOgE?5x5< z)uM|VDt{yXbz1DuvpG}w&%Y@1d9sO~del-+J%A5A*o}_)f=6q>)H{*hk_a|mziI`( zq+v?sR$E0@9b-$#zBNWD%+Fqdm2*@A#z%Kyc%DQo`Cu*$q0Pqlgotop6IU*|Vh(1n zeZPpH=1@s>4lgrGDFkO2&LuzE3~S`aC0+`3`hVsK$qck#4)dAdz+e?h!pD)4EkHPi zC7$?63~wws@DLA&!~nwJxnhdx_h~%LGlJ%z%(Xzan2m_k4}CP z4}UKMrEmAjrR|LOrof6+i{UCCQJgC}pJ=nIjZ^WN?*uc6(*v#69S)_~raA$dVtA>E z;`3e5tHH9Lo(8K1NpI6&SS9;#H?;2C>!c3|&DIRz&}~_+B1AEiaI>RTf03XK)WLfl zX9kPAz*C2M0i3rIltGxFRvD-|qAI(>0)L?Jld3y~B9r6gT_CLT0{#H{h7q&TC>hKz zD7s1-uVM_QY)z7b4+Eq_w~1PK^!VwM2aRgsaVxcOzqMMZ`|3Yx#c;ntF;oICcdQy( zjcvFcy=Vv@(3(k0p?Vo|5sl^~Z^`$`aBf2eNu^*zc2a{3ZU?3rJN!lBVdF7kO@9%7 zhH)|SRFH&1x*=(R0O9ZolM9OkKHZv)wxfeAGKT8Plhg9y_qN6Hq$jTmm^HJ$SWiSF z*{efHTzo**7}tMt%`Jc3YCsYSP6c&>%^*xLN)Hu*Bp9`<276S>tDc-!d=w{J;%RBt z4&J4J5c8-?=ub4}G@i{cjKPS6B!7raJgy4On2Lkc-)~y&JCmNhZG!p5ez6NA%NRKx zplO2nv9#b8P8tHP$9%i~3H~dv{V15URa@wwqPq_N&gU}%bT$VN;6A_tC#w0t!eEVF z;s*aw3?AXLg36rcNdHh!jE==)3v}C!aWbVeM9ZO8?Ki(zEqE7j-yua=rhfz5Eo^BN zb){YOVf&P9W4%A2+p(|#OmY@vSHqwY%xnhJm3#Gu3Q$bK0$u6f%+s751BJ`e&7ArN zg(0_^c=B4)dqnlYh;f@}^=c18ha^FVf)+S~ztQmNA*`{J6+07N1U5CH$6S&Ve9%=f zw?FH;o6(kpxF}1+angsQdw;BAmMuNw!{XptU8yW_@~ibA)hE@)vBxeHy-v4p<-k6Y z`e{`y(TKy|`!qg4+r;uC_|PNc1Gw0KYd_!vlFI4_fW0$JoFy0<`XCWf$As-c$NOS>SgFZ7%`P#ff89Xo2?y%GPs~eEPqKwbH}WTeTXXi zu%N+{2hFk9C#}4L2jm@u#&c~h4fZp2mt49}SjX$0!rw-~{gU12$XYh{fx3H#;Q=`e zD?FmcMPS>^MRHAYxp@WnE&y?7b$)|r3cM@Eso0E8wc?-6dTG=ySmqCnRD3Gs^ssFL z?=gJn@osdQT&IP}|9`BFCTXj~Y6EN;UtI<)W97z7j~F?i*+@2cmfYwK-GVuiGrDL| zqDcb(-Hpyr*#uA1=CnmRO%a!Xc>b$2PhD$dwKwG(Y*67?!EzWgN_&Ku_X*{!MkDxm zL9c+L0T$x4;NGX;Cn6JWD|j2m71S`n+8Q`;sIf;}@H~fwLVwBEPt4}iL6Vb+5ZKKH z=}NGS5`spj4g&4ecr@htE_p=V9J+n2|M0s%Z|ZM>xqnK2B$U!augvikQ2g;qLrsQ~ zU>V>|@Z>ZmR3(lT)QvXR(xhMz>+^@Mvv@wqMXQJrxo`(s;J92y@iJq+g2nnPzr+vK z4dJ}m+7oXhmwy`w7@URg7eo|0g1=y}`I4=S@tiUZ?GHEeSfOk!gfxNPp{^j;E_&WK z5{w~Y9O9WTKQ@O8g9b5OWHFJ(r@xg7VGt^u9->Nlm*{2s%}Us4ood6o7QCyy|!%-$94DX-A2O653?RB`-*=o4)8h@n_jjwyOM+~a(VVNDn>Wg#? z7RrlBhVi54SyAFkUUhx3z`gr>d-rzWj@$FUdwtg3bPOK?Qr`5P9}(N!_`)yS4)9M2 z7@Z1CBh78I;i@Yx0)27_+PM_mAIJyhCHec{L2zy|&>o_lsw&qNvv#6O3f|%uDheD< z$L^oq5q}m4<{wYN4rps8DZMahm??;y5F z5=an~x+Fg8wcEEt?I*g;R&thssJ&fMWYdH%Eq{3bLKc@&=x&f#+}OK-i7c)#aXwjy zXOrSDMe>#!w-gGVA5((ORxwR3pYR}X*DR`VT>yo_;2L0%_JDm z9)Gj_7Lisrv>WkzG7PO4b?{HPv`n%igaj&u1dmRL<_D|$hG6g?&zA{6Q9DOgJT0*n z=_oJgMqT^#PB6-7OO8Q)p@}7|L`?E)BFL3EEEs0n&-|;zehQGU=sAEeTqGswYWX6Z zKlssn6+a_~E;v|PqYQ%_YHcNMB6=q@V1Gr)KJ!^fO1;vdN40GsVr0E#k`hDFyJ&ep zDY#rB-hgxm*#QOZD1vm|4rn%72(#erFp@!P?#YY+f}>=%VB3s_#Lpv12S==UuVx$U zXr5?T#C?tc=|%NzpxX-c9q4`*r-%ccMLN*fmzsncg=&(A^3sRY;Nxk4kW9-~3x9{% z&*b|U3#&TozO>`izy%_$XjvG9O$@XyUW`5^eGkMhh3C+A#j$SmIFw*2wdgkS*(IgJuP}YCIP88V9eAG~ zne?g9)ZeuBq9`7hR8&nF10@$y%6}k}nWrqnRXSlCY8RW-`7suk*$qEmP71lQG!PgA z@*(5DQkDO9$}wp=LK4nL_3(t@foQgX;(hrxu*-G7ef!ZHq@ z&CzICIB$)V-^67p!K8EmI@9XJC5JFx4i*CO!cBx%P;kTOJXDU4P`t@brPRtkoF=LaoP_0&Tj1KW)Cic9ry_JhbZd}D!=?auK!?9b3im=GNlrG6=)=zH z8VE#+Rd2c#?Zbo2|FeJ*`!_CEA%PQ^!K)vWkr9TCf>a5 zL`3v&ayizLTwYoj)ot>1iW|LMu2--z$jzV#BvnMep_VBejm5Qdg*>+yyCh)qA_)y; z%5%zV-Met1;b{ydVJANFnPrr5`%#3~X0x5Z!fI~=$4*vhbd--4MPIw)G0Y`C2@GFK z1S_D8j>*ad06(}k=oP5j;Q@bSc=H2%28vKCv8AC@1gt6}r%lh-a5G9hM6#F#X90Cd z6|O)!VpgVkIPNiifmlNFlmO0ZfWsN#_pc6u={u(xVVuAB&#`Eh6&6X`JA23$m60-h z7&B?`P=!@v$$$sRFcyc9qR;pp!D`S2S;fIPXXTPRAm4rxG_WEDRv~}0551ZZ1~m{n zBO_p7d_1}a%?`I$gbIQbb3$0S`WX9TX7k7h0E%AQ_EeL6(1pIq<%OKJWskKUi=*gQkpv_exN}%Py)ES}7x6x1@hX+hjy$sxDy2MMDP> zvLjs7#Mzj$hAl{Dh?m1Hyg*wC9_rIdS4no|IG6Dvpa_F92M06WjRI+`k4SIheUD3C zH5@u~TEvfyXZo)7kv{+V@&ELc%J~i_6UA29M4ok5l(K_}#^qr{2dKVN4aN2e^I>9XFgsgp})6z;}9HLrg zLy9ZjBxKw0g;z&^Eb)ls#F&;q!6U-5&)~ys5Kt^D*P4HYg0J-oSy&i5!Rv^BNlk2x zk#12rfyZcUMA*l>DkeVfoxXCETnBw-jeJ48QYY_-S?i#G#-vq!B5yi~UL7AehRHU0 zhgDQ!XW%39PAQpD6sMY3i2Cs@)f&WeAty&DmRL;E%m z&3WYNkfXP(6vZ&oaez*su+T0P)bjmiQ{drU>#XFVd6v=4*GS zpb-~iz>YsF2Se>1`(!QF;!uA_2jH^G!bMu)S{G4p!S4|zesCPHOR#7o^u}hinu0)# zXBU5S(9XNj)=Q!|qQGg#JwYH9j-Oa*7|31=Ajr6^vZQuQavZkX2nB!V%m(FW z6EcptCJg~tkUqp-#rs-o4#qF-N-dJRDqJW!U_#|nC~@>EmkE{5W}`WpRcYxI9T;ho zc~K?5_B1~uM`opz`1E;t12wxW97QJOcQb$P`;tz41~RpX@GuJ1PWPbc#K{oDtgxoZ za0@v28HY;AXrGsiQ^o)RJU!vd9D7T`;Ngyy=v`HO_ zutf)^VF)E8rHCelGPy;?DxCFJ3Mcvs(@wL}n3&bt5<*~?Sw=lBiHnpkD!4h`x-@^T zXn}l=GJwy-0vZ=pcF!V9m0I5DUjpOQnMd~X8#KjU-#pk0%>!S^x+XcFSE{DIr*_st z_!+4^$x~00Q97SCv0dOMUV$@~&5H?-1unHbyUOv*O*{-0mf06~Vywe|s$M}TQ&RR` zn1bdVo<;AI06}6y+iZm+HM{IvFTi%G7Yt0-F3L7c+kFKnwMVZ?tQPb91g;tyG zcl*bAZOSCNjLOyJq98f}Ih=GAXo^0TBvGt+GI&ZXDJ+Ko#reBLjrwPNQzYLjq(n2A zA60JeH_NRgw73v~);Mn#SH0vbmvMPHC)aAqOL7bHz3G(HtEHV8(_qCai_?D|vr;#m zgJrBSXxmPcgk_Z{S0pPsgf$gdJlT7EuemSPSFH*x9=6}Wc)Q}47+jZH)!EykYA_$c0cJsm89!|}oR*6w?R)8)kLftaUR8OJZ%Hj8%{XsmipQKD?gUOG=$@j;W8cWOe zbn8{!EThZ<%YsU8VRFmavl_g)ioKxk51Bh#vuIfoEr%W1gmEff!8k=4(yjrmz(?eq zS_d(Ug0K}tW6eHsTRk7PmKx@$_|2SfZdnHJza+u|9fewioEpPI=45{|*-;MB2E)^= zSdhRzn-8?!^ZrPyfHjbhZixThjuV^O>ay3NR=oSO2F&<^k0)PiMsL;rY1zJ+edUR~ zc}=Tym)*Jq8b%8;Wl$6|nq}b;yb+Gtn3WP?no?YP_%j#ID@CDJt?)O*1*%0LLlXdm zeV~akc-kT){Pf$5A1;3|go9cfUr@-QnZgZsofLBP>Lr*c+oS+HN(E!4iK6C)f1_tN zY=Az+$%n7rjh-_IwdwPm2Xar1JujB5pr_ScX(4f3x!#SOpW#Grwp_(ykT=t0u+X-R zT?kPlb_JKQJ1bnW(exT6ub7kSB|m{m772+&)5???O zj{_l0w(rrY#~2j|`X2@iNuFyF0>wscL*z3gwuDlLFqgFIyLPa$>?6r)|mIljK z2;w&W97osLWIlhD>}*kHl)}Z>s$B_oM!mutP75C z!nZI%M2x^{Q+7y(lKXy}C8PWP>MDuzz;40|L8}gfDl~r`nSqw?5(5xQ8XH=!d|WF* zX5!V!8g3$6Rlo6=>uE5ACNELG?pd(as?5@y8NyQG^NAcYrfl1Kt7Q{RAQ%N&H3Cgw z_nh45Fybx)lZ&^`$GMJHMpX5c2D`xs0&~#cdx~5n(YEA|Lm_ex!+>-cs>x)!kT(j@ zwmtk0*AIWyRdu9EI^-3A7+Q0z(li!vf1A>zhINq4Vod{aG=6z3qrhMW4ClTy+Nwu1 zJl#rK23!OjI2;DNB~ygM%#s}>7Gi77#}yU)thU50DZ?cLr0YRc{}7&(P2)UO?8}&V z&b0^%ImU0mTnw5pFNd>g%F-|`X?D_p9am~QjEON?DYyH zMUa2g6!wHz(4b+*0jI61nau_oaQub9KgTeH!sU7H#_(|vK-ZdL%?Z|5a!3d)3UwGI zrRuo}59>6e!ECziUP7h0-4T0RLMyG1EoNL?yeBKWj4{%w;>TPZFAgB{a#j=xMN>9S z(hG=r&84SbZ^)zEsUB^YmEd5n;w@K;W<`I~ger~2+a~3td>NB+7>e=5qj)+gKtC%r z;=yTq_U6qw#FTh24K5UO-$)CMQF|kR_8hAy3Pip5;zEw?>2SCJk`P{0&g#0$OyYLc zn0*m~cxFqjc(*7$`XM~h6t*x#(&iU6Mrq=ZX6k5EW_bNr3h7bV%w~Uq ztFAe3E1RW?gs({qnE5?_8bTlj8iPgxDK)>0I+yBmIFN-3uwo-UZijm~E``ajQx%>S z`pHv|RPNrTr)Wij=`mKoEv%vlm&QfCFs;-yVPD9ATtAukYMhRt)4~L+lLjxH56E3O zFKw^*$CWEyZVA&y1;^>^Ldn6o^e2DQ7&uB&s!H7aq6%0?t0kW;@F-*vJJHEyOEvQ%&!8jtmaxV&{wiG0SgI=EE`n@f>C}~I)0gW z;24F%T{}w2zo*q8v=r_tIWB+33ea|y&M{heF3rYm<0D^<;l^xUw=y^OQ4dQ6(D12v zrT1>-m39UF8}Le7cTG@_o|e$*t@t9l^sRl0uFl>QEv_PW^KGEocZVezpZm!UcN+L)5H{JDHTm5%uEe5d$q$SP9bv zh$9}-?-op?&K74bPiTKdXnSkfYH-UdrG>D|*QME1Jv1WK=c1Aw!l24fj%zSMNaj0BQA(jXXc)+hO{D-jP$HZs;E0rIYCgwCYV%r?dl z$N+RkBLi7zI7*vH77_J=sXfxi5tP3&b&$rw4~#4jbrwlM>i`(%jCTX^PfdF+aaYhJ7&H>G3^~!O_`DHPf2f2p+K? zeq{+O0MM4G*w)pE6}AGZ%%`{zmk+LjINh?W>@5iaU_}kc5iTf)Yx`1M2IN`ze-~yh zt@0@vb>vqwwCCm=EiIkB(y&Lnff7!qSK4r3JkRL@4=wXqI4NaDaqwTcYDBBiNrIKR zq-yZp%Fz}2RKfTqNGv;4cnYf(F&_=MN3PdTgniwsl&bc};$I@*p0I>NC0~L=Q%1j@ zk1n{Y0AW!L*jNYv)7co~B8h%ze=Jgz$x;*5)mEh^vwpWI=1H;Lu?LJ0Vzg%@ekie9 znll|NWK_gH0t0u<8wzK~8*f`(MfHm`I<2p$;o~U@D_RO}U38gtQkRCmdinfaO^0&07>e=uiY$$^il z>T!3O4_zhWjjNoG++U9n7@QH!vqd~97tE_<^h_P&MI~7TZN|fiR)AJD3y{_2!SMo` zxu43*oKPz;I|GFve1@>XqlCbybkWK6by-VmIMBxil57~~Xa%_90NVK#!*7c$se#>0 zAp`vLGMQkkm1DO^YdB-of01y}5y?fBj@(eUv05I)6MwlS_VJe0UfPIg96&$i3ws*B zKu}ha!Obb-`axBPR(Lg(b-;GdMS$ri)-Q&1vSJ}Dk2e^gn*Q_J{n&)bIv z6|QXbiss7%WMt@3B>Dnz;h;ZQyU9x&b2HM-MLFToEftRSNA&=4vq~OZ%1J|(o>^qb zS#91;%eweW&&0=@U%9e<;v)KTl+Aegh4CL02i^ZsaY?d;2D^~i2g*{$s^jxoPX@_M zSdL#v^sU_Ptndl8f6*SJDQ#9l|aGMLFfNvT%e-)ot555|7u3=UbE-)s1 zh+ha+WAj2@kc^1Sku{5OIhx^v$CiOI$r*%7F=97DWD6X-ES_Y^mFMu&Nlv9E3f!_g zYhU+s>$=-p*ZDSL%{|tv;X+qQ&}xp9Bj=-PE#VYua%auxK3)sDhJJH;F@|fhvYp&V zYzNo+R6VTee`8xPWz+(hb~W@Y!728hVI^fO4Qh+%#I>YyUT#Ivb^C}ax_q!%9sr*@rk{I%a^5>Sk4}20ulncb@U-Xe zqVCBFe>}YV{186geY*>v+3%g4M{i&Dj-q3H`rAGX=j^HA&;<+dwtxQe`1QG; z1aB&W~e2}j50@E({V zeC+&~)<{3APsd@w^I!E&VIhysyU+WFeRw6ZqQ2;#AHgeV5xYEx{nv+Gn9l3dljF1A zE-xiK0~Y?YfA(zzvycV;)$6W%4y-af;#K!(pEj(rp*Y*<-SKO}a0@-_m;`aLJ5ZCjx_p8^iWDP=xTh~Sz0>YtCptUn?f3B?@OKb%kfuXkc{s4YdX0htzmSJSU62@j0!q3_1s->l z<|CCtcz0C=Z25QBB|JJjJ|l5H=$>~Y8ZrF$c@IB*+B<^vqNCg0-+z4y#~43>f8T)7 zoV|vF-9O?@!TFNn=${_AvrC8IMYn(W`m`p-@aAJ!LVP5Nv)_=j;}_>}(t6t+l7XoI z0$#QMQg$y2G{n2;C2Ym>9(=5O@TN~^o8JSc?W`|rax71fb!=y49`Pd^7?SUZeEB8z z@X4sb{X&vE=VT4SFW=$4cm&q+f1x5)+Hft4)gwI>m^&cs&18DLi9aod5c9%UdjqJ= zPmTmNry;cP6xmCJ&onJ7_c)oZi8d(Z{#aorCuIY3jR`3wM7}P2g!tS_P_xFHi%FCY zQ#Z_F?$Xm)h5@*x>BDy0CQ^>LLI=~qY;Y{FDsSjJDv6-o7j?$KXh=N9e+5UA(0zHT zpXD~aFn+2W5p)gh5_lC(B9m*zwWBr4j+;054bA6V$<|rG>;_BcYrSYku5(eMaiLBj?5a1nduajm>`rRMR zC0=|ZH?bGfXBYy8n`%|OWQ`F$L4bSMPQDX;+Q#stOf&j_moM^cAjp|5&+xKvA2xaC+PDUtBcZg(b69zSXJA@_7~23hug8t3nSci3B?-|=_9 z`|dOut2g@H<0p?EefQPFy+>a?dGO=`Yz1j!k(?zL${RI9Dz75q%C%qA#(RC^S@C{3 z2g@Ed43y%XnC0}S<*{=-$D6(=)cUP7ekWQ>(>K4jryh2YNY$FR)vXXVeWxbKG*>jr zhD6oONkH=IB_yEKP2BQ-@000_KRs6t9rQ}myg;ZRdbdl-C2;Sw=qMS4Q8lDHlP^p*QY zpcz+Mn}`nKqMt7W5Loz*d`py!CeS<-@&IjU4hHFvr}n*=xhQ~>Yi$w9AVGM zi`_M}O9jCa^c`NUL4&5l)W6E}Ihi8XrMZ9KLRmU?RO?~{)n90Gu}~n8)a~PDXoO9q zbF6lkdjgtVS-XWG60VzsoBC2_+wKHK35h>D(N-POIFq^`GK&@ zDRv_yM&Ua!W)gzeqgO73D66iRC&a2)4XR5tEitBV&FDG|6bsS`ykl?Hx;t9zeKh z9I$GGl+dyn$KSw0Vn8U5#?wSgwp;Lpuzh*r0yq3At!@Z^-=a;!Y`bm;`PRBSk!4r< z(6se|f51#=glEt|QoALq!gSYrtwO3Vu&A_fz-{a}V@PXU4AaBo9V4+4Y!j7I5?!F+ z!xs(3Pvv+Z%9;*#$BC{HSC&I3$qra8bWyHjVx`?s$OS4&z#1ty`O?16hh=7>yuTP0E+qyklcdFbH{b3(#%6Jygcm5W?B27Rc` zDQDY+*&&%s*wN9E3>I|H;wz{Yi{l#w*EjgV;r(xf6UHjifXB;;DP1oHM(x0r4)~^0 zP4Hm_x1~s0kEm)I&XOP%-QtC>sDrB#qcU0{<6b5Ax_J9}ay2i7pRAqU!iO;yeG%L) zY$;QJ=5Iy?fynwoy*US_r>X!@ccZt7160LWrpS<2Jf4naTbTfYdadvRrdea50jQ8U zSwq=?ge0taD5SX+77I|OOWJ=qmJ>6J8B;L1a(~~inr=Dn^1`I=Hx}cKJgS5>_WQ_V z(E4K6{f7>K$gc`MO^YB&OfYC$1#z`Ui#>XOg(f&!%HEFh99?8R8k5cR6O?4cTD0@5 zN04>LnN~QjDtm_1SO=!=?E!|8he@bNg8-^|m}w{$LTEt|{=R{a_G8Oo)M z1c~WOEhZIafNaKFgO$7mHc!xP<@!t})k{t9_}GzUxi?L;+NhmtpdD45e8rw}pi+5% zzzp4XLtUeLQappnJa=I7RNB-~hj~6Nq*%4-bx_8MEi2gE_P023f?yhCA)PGoqC9jY z#=&K8I*@86#rgDMq?Oibhu43j&voeG4P(iEfQDpwnuynkMQZfe(~ zpA@L-0M>P!8a-5jvjz)5HYT@3+SP95D+8;Q;uk6CGi%*A3GwNTEkri~sPsu<(YHa^ zgwifV@1(@r_IbuF4Idjh#utN|)|4)s#;v!Bsfb54B&jAOXH2f8T}NC9A#&ktczA-L z-!3?8=rksOc_hcE;k$&R9@5c&_k?(ra=~pXsGzj7*Q!zsg*X>l^Ko3Dhaqb|l>mRZ z2<>kGA;)f2&EC|@nDIlq(FvmNClueoG>&Be*1K}(Z-RJf7x94LU0^(I*x=FR;^WMW z^A!H5bs01Mu5w9EaNN1nj8a{GNCLF6Q*xA*9#w$xZ^f*QZ69sdbAE|`rPO>pEe)d* z5Gf-Vm?5=+ZW_340vHmK0O6~I%XLsx_!E7Qu&Vw2F8-oTytger_g=L^$<)MjT_L#b zkTWyxf@1)^_KDKpCS2FQz&7@hbP!VhTSdR*{?PCy}F1dXhxsg>g`Uk^{OG=X<5&!ne&SIsN9F=FH)|~G)hAcmKg$4IdQaQSh5ejG7F<|$gl!aJ90zRE4Yn-M zZc))=OgFpom<@J;BxRiq)syf+@C4eVasCQadI&5ZkS!g1>a;BbNpU zB1^~H!m$BLKU7$MtQ={)1Q)|~qQpEGV;NVdu|d3?LkZAUnYO9@L^hfe8?*1#(%}vc z)CILDvSAtrRlJ59 z^wNQG-7)v$b)?!921`qBe7~F%lxO`OZxsweWt}W7cI~vqMUaL|xq&mDBW{D%)P^2+ z@hTn8nF5A?tlle*5yGjP__AuOV|C3LxD&K~s@}{%rX)bL5Mlp5Nv`lPqwKEVOHz}& z9@X;o{)Z;PrXq>Fh6GW2d=aCL33dbPKcv_3+!t$j;R~c7&IhhiD45Iwb0RNbGoiF zV$WE?-Hb>}+BGmF^KMMs4ow7(Y#KiTfjEKGi^f zFZv_?dpk~UYRk*+hg$RQ&zddeYd)TQt*t~>ZD1*4ebE#JI8af(oE7!XpOX;p5a7qwp__~1SRPKGaQarEG0+pkYK7zyfMy4j$fmhKu%wh zyFm4{2ngV5Ra-x1;OS*$(i&oR4)4%T=88O_Y>}roGyHwzhZww_^6*&{lI!SyE4)`u zl?=$reI^0#j(ru!q#Q46sTedHd1%@fn^VnQjM8;SZ`$B?%hR7xlAAN4Qv?mg7Z!&x1gc2JibUm3T0{yLCv|H${XY^ck4&z zO_S#K#2?lBdC=_rWLKqUqO2T$sI@>Q6oA4kTLbZPER0>YEYL~8dB$+o)HW96immmX z=}w3=G@n@$A#?3ZQ0zpq%Fb+&xi(8~3>g<0ODiz{%a@F<{Hv=3L-fXW!aG6fxdJ*c z9hm_u?`}s2tkv1ra!7H-<%xwnY;LX&*~<$jNc8(53UhDYlKH85Q0@ zD;9_5wwA_h7ME>%&>yZJpsOlGlWoW=a2Yh-!hXB=w~4>ev{)o7*!Nn(D13uAw#1Wb z?k3q3+;HtksK9*l7MTivk6W{~$dUol6(Q=Mo6>T>#kqnAeN_sE{p+sz8h2p5jhbEd z59y>vy2pKMbw{-z=TYyWCbZDn70R}83hOi~&+1fKrdwy;rxm7G38iKm22_cHnx*-; z2dzTQ)(sE6OM}m{%2BEjRvX(F;W23u6vBk9U=7FjAW{1J6jw%nT3u>VmqO-+X0+Gs z3GF&xF=!3}ltng?qDiO6s=3bUEF>nyt|;~DE?nN{j?5p23Y$1&#)n8HPi4Nocb2+}kkQa%18Uf?Nz=hPeBA6YIjxME5f@_3kM zh51D~BSt3=DcM4Y6@N$GEqT|VgWyKGD7ii_aeZ~2!EFYN*4xY`hO1t>G~^>0BOo!g zNw0_unEO3{9zt|R8g`YYbp4VO&j>`0X`v3R*iVmJf+3De>A_L&t-V}Dc{bn51-$ee zt;je%<~CS=$+ER^5im?YHO<(U#z_H%Lj}lralI&NN}7+z$Gy-iB$Zvc5`-*Q-O8}N zoL^uDkV#{0xr{&HRw`|e@hVDaiNw|VCHg&)ZPhL1Y$uWWH#JY>&k0aD0D4qmHDr5} z+3Oo!XE$7a%oTg+7h-Vj0!}rXnRE*!gZTy38Pv0XpBp5wT|s4YhdrO~4^mE5v_&d# z8?GC1Ww`bu8d;_Jt-68Tuq683oWgh2Z8V_KoXv1LU=%`63$U#h#WJU<3Rke96m3jf zUN*oQbnD!-h=U)4zSOb^lMWpEricn*6!>gvSc_X*XYT3siE$mF8_p=BzUnR+EuApe zNkl(?eDdV!qsBz^{Z@(SukN@NW@wpj;DOe*!54tJT$Q5XZ!q?$(&^s5b(;&@?6qza z!lZtY1QxLMCITf>pK@)I>uEibHG2~YZZYrgB1o1(10CGq~J~O zl4@Q}3PXZ1o7V+q#RsIgH#jYW^-fFdQWF$;=x`Syh5>nMQmoBD+Dsy>@YV7ZaA56o zXG)oXZ@u+LJw@Pw8I*DU};}} z;}3}kF<@(T9Ejsye!cx3G(?3y--=c67H?pT8drBGm;&(=)LO2^Vui-Aurj8BZAV6; z-z~J(P0g3uqBvnGJDRnFQiQu>)%#Pga4XJ8``fE}GVRHD`DU}6W6U}m1MPF1C8 zC(g9er*f!gbaYf9T8R!*93r+PMJc5>rVtmoGH|7&KBGC>R2_`f;G#tIOl!i2nVYCPfgv>FJ0U z8MP5CFQpGz=mSad7-4^F(YX+U@Ns>^C(W08H32DqUvmiy-IuW6c#{|CupdjWn#Ng4 zTbI%$zZ*uJ7N(1~BeN5{RxRb@X^(EQHjcxihxZ;mXmlJNv~nDt-m&9QYxXW?k@Zkr z`}HL#8Pm0$zg^)9v&$`I%4;UN>Oqb>y2PK}Stp)~q4~{n&%bfGwY6kS{cGdW00M7C zClL&P=zBQ#>^TS}eg;OqC@-fN@y}+L>>cek_YQ4@wrluRvqocG@;DXlj^uk2WjcDCywh)fRpvv1X$a_BBW&rxR8Q`;Tmn=iQ#TGLT_K>l3(u|5QiXt zD{7^}BCcGQZTJXy#D4gdC9L51+M*j^P(W%^;I#_Z!*edYKE$hk-laPQ_6oDM# z!gNJ6lthjs2LGb{k3;e`qmcY^hPK|E<6Nb)Wg0eVH&DaUfR{MD=6T6I->um`3n!(t zVGhQry>eNv(NThxxugQ$-OAY&u0_FrZ*h-o#TQ8bVm2)eJfjAa`>3L^S8e#%sdr{4 zkS6!B|Mh%yq5bO-1mPj0LiwfLuk}M?5u!|1n%JGTnCEMn3fHoJw4&Y+S;nm0aNmckzW(t2JD2+=NFL6Z?p>ZDzhE>D<~L zF3b^Fa^971t;)|CS19F#35XKqoXpCzMLa1N%(YYLI8{mCVi64iQ8Qv>%v?39fDv7? z5^tKB`$@ZO!!%67nkiA3Q5i)q0Y;^(Oa8CRH(3*bJ~ohW@Hof&-hsJki&qT4H2|On zOG<(bo&qY@0 zCsrkfQLyj?CKy#okhp|XaMCkEFA@gu)4EFAdq;7>pL`a+oJd9~f;I_8XgEpn&$vDp zxjd1)oq&@ukQ@nVx$+F;b|dY?22q91?kY#yiI(;i%{R&5d5Pn5 zy}@8dPN-r_WMZ9CJwl`nWpF7cc36C7TrE?Sj+Vxzr`?yHi9TKGS!l!hY{5(_xKXumsLKc;x~XTFF8U43dgD9 zII*~hNH1?BggStQB;qZ`e-qWNP_`N8t)nvzq)I&Tr4VUXf!Bp$gg|Lg zMoQmUUIN5};D`cxW0%g86z3otHQ)h0s^~nZ5?C$o*2ZyL;eyDM>y*lkS+0tRhN+maZg8p!ag9U3Z!;VZI2f6++_Ezn+7S87Ia)RKHs zjpb5pr|sj$7rOQxKo`!3iP%5zG}LO|SbcxX>aOY<7j%HUVVX2l00rN^F5y`?{4RIE zK%0X$TD1b4v5_AN<~S}gN;i)!&!@NH94#rjCqBN#c|0KlHO*aSN?AY6oOP&#tPIhU z>(qVaf>qt*e;0GA({Fmz zEB>^HpD<%54oCBVj<$R6{mD5tIQMPDYpu<9;WPWalk@29%ia+;y?)z=;hdd!W5 z>vhh3-NQELXWGQvcgx0}+}Iwze-O@zm1y@2hA#Pkf9w~VRY2nhtcA<&U&YB`unsBr@fPI|CGDBpPu4Vj*mXFUanx3 zK~g{>v6=dL^!n%!7xc9EtJnS0CaI&Y?cac8Q+IeHWN-U0LllClq;=>ku75lCWqOdAZ(jI3Ek(%xX{n>f6p{57znQV3u;eKJ=~3)(W}4d9raGT zhn=MbgeSfIKK>oP2I3D=cE~#d2l-d8QGnnV^6aP!l7tV&6Cl!pY5=ADNTm~oR8Lgro-`~+dq7LS`%-0^D(R}K9a=T@6*}wi*q=Ez3mQ(M$~@+uiAepn;He0 z<6ZO;cIbHzKGr>W)2B1f?}1Zz)|WLomM6$Mu0@gZ0Bp=7ep&+q?j4cqzGOb?E=7Vk z!*foyApG(jUW!LxEFUVQr45&^m^?xqf6Z0kAz{4f10^1{SV0$DSypbr1=J5loujrmt8`9ZYAJZqeI0+N{5T^XE9U9 zca}i}ZlP7)Zrz;9aS-TeI+zrW1!Cpxe8&n9^alcCoMIbAJjNAAgV23>s-NYqf0-}= zDhLpy7#E&p%z$r6^NBE*jWTkSwV7Z@(?^e@XV|952FRLJJKM?)Or=j8F}lhq?m*?9 z3@E@E&pAU(ZOYJygpFA1zWYd?eZqVF`R<&AQp`3Ce*yKHD& zs)Z{2VJwoAVEAXP+|0dZH`CD`53=n2G|u1eus=b+F3a-j>o30?7vtS5zxeWtUsQe}1C4+2M;GwW zHd!q7je{JhmaVNrOrL&um-|hF7vbL8eZ7)q?|ZO`n>K!5f5qL08XKLA4z1H98GGnd zz+FX21WMz8#v3u22BB%&HhEdqh2FhG5GF8QhM#^we|jxdDO$Cuufi!>G^t13V^hfP zCayHBM=Y994u_$hhNksz1wOU>AZkJIiYd7Tmn@NYD^uUviOh@AcAh7TB2O@wkqABw z7k)sL9NMqee@C4JibVk!S}V=?aohRU)I$G=y3Qkr=||UXUSW3YbenG(&%3SJyte6; z-pCASOt@~QskeMwymxt@~V^T_HRc~TqO9b4;@Wc)=s zXmGO7a<}zcxBG6~I0C{q(@nPY?FC4Ye{V=u?>H{ptvWzRUH+b1?ny_CfF~r)Jub@C zSq-SGf2Ky#;L6Ap&yM#U4@V#u*D0b`^?j|D{0w{L!Fp4MqI$cac9T}Lo>xH{cv0Qh zeAY1CiZ;S82$ABHay6dIZW_<#Skwr|G50wjss3dC{!xsEEfu{q0&F7W7Z1_IcI(U? z*l_DGZyjS{v9<m5fk0l>Sz(+)!+3wo)z#i^cq)kmCDZYslS#09z`GoY9n-ecp+%;BR-MGiIlh z;Ffc(96*<^R6_Lz&3lQbqJmn=W(r)|QCPgRlE|g;FiD*2vN6hN$rZ~MW2q>Mvrtxy zP{4)qLkAQ~rws1MVk{{s>Y)2Dtu^0Pe^v#eJy*krxzAO?u!Fr*dipv+kPi~q2hbQj z`eyAN-P#$un(-g%9R3Ek3ELuhdXg!kXgoQa=4r*ql3Ge(ABSeQjSGh z$8HQ1oP`Vv&Bat>2EIotd`W9^@x#?mw#&cZ)0FE3zfGG|?ae!%xlxK-nc)QW!Sd$~ z_7Jstd;xm8X&XnGCoU2??uc7nX*Shv&W*o1*v<2Wg`jjYd~HfSo0V8Uf2>`V;yW&b zVrDzjb-1H^3_>f(flQ*U*XuE?07qXEA;pP^#EDFlJ5f-~`#to-^xr(#__x)*wp>l&wV@OYJ$579peiMV!O_yO;Gv>OL*rcz0 zrVS%fEL#`48@)=D?Vm{of0W)uSnH&A%&-0|DVc7aJ_l}&dHMJHDpC4FDA`N9AMClhhxTZ}7{4^y&$@S^QX z(wlJph`x<3^%DEv4eFK-t={7<6Xcnv<6o%Rw!&Fe22D8~4Rez(e`q5Dr7+RRo$n*X z{WTm|EZ|YDQZY%Q_&QB)ZsUaYJ0#^n%um1}T&BXzrr`69_)fZ#s%pKMu`R`H-r?Ag zP~)UhO35isjNc>)#e7i7V?sY~fVzA%Q)=%4m{NP-1#nDgA7esovl}3@CZvQ?de_~- z;SI;0qtxFws5H>@e^wZwJU8C(Qqv!!zHYmHl@SJ3N_^QdX=^ryL8He~=rar%d`$4t z3ouux4LpCKpdvjCY`P|lSoueRVpjoaI39UTO>MWr3vku6d3=W$ewC*W>wL8j3Kt;y zFcd8j-9(}QRzRu0V_pCGwk`}V9M|4DaIY97Az_?YOd+RW%`B?4{C|^!z7=nCLWqkc zb-|bl&+YqFJbWKt@CEvcI0pBX_>a9$7pS1zgtO-01+|ZpN*ioPSo@1DzrxhAweS>3uGKS;p>}t6wv+TP;5%aaT%h<1fI<1`NRAu+2eM>YS=yR$(P++DvaU86(Vv z6ST2&QDnoEIKb$D8?<^6m@tMZqe3lC$!Vp%bN$m6Aa=rgBoyDpeBf5bu|KNsr)P^f zS4}iq!t~zY7=KW`XF4UyNMw^m^JG4A+zh#shB3zY24MCkiH79t7z`4?7L~TXSMfYG zuKz78vmBylq_v)y3S$(z==Cu+z3y(t9G?EF=H<96GG91q!B1ty-N%5~{oUw!T!02X z@jX{t*>YXbTNR?JCR(99aevk`fKfqQ{#sJ*L{p-aaDPHS0NWI1>?0eNQ7)-Xg6JoH ze43P!JJHuGeFJJ1u(>d5N*TlXOevzmbe^hDqhFS|I~s?e01Rvbc!n%v@Q4{36*lU@ zWz3C?uR{DFMLP7PjuiDHVnaykI~bZ(}^qvo1ln_M%8pH5lVyudx{ zf_1U8PwRsTG@Qes*CcCQGe=pdN5Mqm@|h9x@r``T@|jQJ!SjZfvuu)G5GE1qYy!Oa zjWeNFBo7_WCu1Rys7~YcIa9tyu z@IgAN52tZ$i%K|-sfmKGVmm(CAii6K^OA~Om(lq0Np%pdtfq&2Ij>e1&`h{Tx_?~h zbkVDy$yV*s23Zn>i#Z?fI5m;}5$_alXRDh-hG$1A(P;3VZBtGKFRO3$-fmq#+1Y-G zXZzu90(+FneTTOsi)?sGum8k-P?Rs&WfvaIA@R$ z*^oXCJ@Fh;NZI51i`^2feipq?l7B0dC``GzVL!Hvm{@&Az@y(hSn`t{l}C6~9@(SvN`IXNasA#@ zkZ7BnnH9-T4ijEhEm0HuTH>^%rDvLT&ywhZ@_4J~ z>ouA{Jh}Ju$vtt#;FCgREHoyi(2P_%3*e}VG1uvbXRboF+uCE z5!O8dePLv7^F9kW(!oX}Wq-t+1N*O_^|hYz$kX~e#Un1H?L;F>Q11?o(F~OW6uLkB z?$4L#D1>d?)d~%_J&0MoKC(E7U{}onlL}~94MwP7(t}#TWmAsmWyJT96pA6#c2MV` zEuuwg)X7;nZ@t#67?wt-k9g_fS{IrOWmY9_Tw{QQtnd`4s#O

      ?fFiwL9UO!fe-w3L&Qp&vk3>xOywgs}ZhTDmYa z8^ze)Zi04$%T;!S4V9oT*V$w)Y#*Qlvpl{?!p;rUt%^-U1Av;Lc8V`9@DMTbC)LsV zWs0RotjAG#Gf+pbSt52P$nauBc$SAIepY*a;4Faa3JPe%1b-|H8c?K~gjP6wfDEsO z!loKcr2blNUjD#xd;6NwvsPt85ZpcJli5&@(S~|#ZKxx#mc@K}0n+e+wo`SrYRR|d zrcD928cM{Yr528Xj?@~dHl_j^d0H&c1V?C_?Se91%T{{)^ugZ4MqBAoD_d!gY^8la zuP|9k24^xIfLTRA&I@5wE*Awim}eM0w)E3{qWNpX0p0GHj(Uzpra6a_e$Uo#jJ=jQ z51>!xhe&H-bVqx;)U4PBepj9bJCHj$AiBownu9P&Fm07G{G%;gn^cI@6aG|LNw zSRB`D3D-BLWZA+sOm~EI;Rrcr(6Zq$e=f+(mgvtcn-NW4K1{jrh0@fLY_sK&%_C;> z#2vJ1$i{Rm9^Bc=j+UyHhUUOangT~#)k;#{{%u)+ldlvw=Gb`dnb5q0S zGjtlbl4OF)ye>gW6-&R_k>f%g>?B3P<}j#Q2M(5Ij2^)g-Z&oAq>Xgg)-j=l;?53I zvh*O$Dd%vNB>7I6?cjeIzU{#Mf5Db8Yn1DXL{Laa_*ey5HHuS^Uw|(T64vwML|X6R zUj+cANIk2yHBw{r&FC)uMRo(}GPKQvg4uP1{@um~Q{Rok2Nj#oFCM=D5C*!~X@r48 zSB=6nc1m<`7XA5b0MCl69VwUS%bf0QxZiP6#lYTSd+tTk^M0lNfC*%_j73n)ijQ_;IN(EU|F0RNV%NQ@!rA#kB8v_dF)no=S7brmzIrh_A(AGQtFCM@s#rcrSXNEO;kaC0kZM+s{;s z^oj77K(a}5rG7nBKw=gQPz#kPQ&miM_yDZS@ilOZyZ` zEM`{I;x;tz`eCu_>^cMoDAuvCVVIy*=LkkrZp`IxmBT0Z+j?QT+So(Zj*RLqlAR$ zM%!ctngo<#G8sDzo`Nt&s4o+S;L_zu*N+F}@F~+5!BDQ#Y~q@i<@1RE;W6o-4Y6ck zEVhBis>j1TD+>Fdmgv3}CyRB=QgKj!p%x-&Jc?Wde@2e0v~bu>Fw%!!;PVg8OSPig9C;Ig`1TX?F`e31bfOk)*pFhiBFawc!IPMPe2xZ z@|5~Rw54t^-}lK&rVq$99Pd1KDY{yYvmGoHhibb;QE9;}iIjU<>;l^+x_KD<=2+6n zk~mf*e;wzwH67`!a)KK&H-cvp0w;uPm~F*d(090AE$gz#93QR~r6cAW<12CV(D@?J zN;g|ngcToAb~Oi=f!<3pCkg4N!VTjPn)idX6>D;De!* z9L{V4RZ;`VfS?|So(a%$$%2X#9hXu-j+&ede@|)B%VM<~Z7q={Sz`^Y`hp)x+-5g2 z3izIFw@FUljn1!9CAPcm;PVpWYkoPkX=JtE5rl~Z$mkXcmng)f6M{fV=P04jh{rQ+ z;@WK7QC6Z*P#vw}$6c3S;b*F)6TDA3!2Y7M<>*cw!-_QJbLNIGlQwA@PU1UoWv-nHm4lAPuI`~PGsrbK zz7zm*3t@7X?d5+G2BKSf9fFTaFARuATYwXdu~lmI}B3S^;|;p=dkL! zIG*>9*gV}*-w;hiVWR6!TwMEJdFov*!e|>LO{5mzH5Zayww_ReH6DjkAr^f62g9a_ zY%sUHgPi{7sov!Qf1tgz?t4@X!l`mwj!7>rC&|i7{9sf~|f0~H* zLHknN<*3K@z#*DwItwuNeiaRyWKGa0WM~n3c-a=gQe(@jX5mZAZB~`c8cne~VriR- zp+>_nzG%gD8jBZeJ|lJ#V^|xX>9~KSX?Ujfv5gbH!@xZPZ0R1Wz|5;?Lo)HG`}&A( zF0hF;L+8p)#3IJU6K#euIn77Af9fNbZc}?KMCmhFRu<7)EFD#Al!fE=SPdxFr8b>~ zSaJkK{iZl-n2EoY#pL2mOpxpVt=SrByd7S{^T-xuOcp_HU6mG>M+Ze=p%vjQ!6xIu z%X2vKzy|Q7HHP9o1SR1&nnvwg8_(gyUkiS7+4x(TR1)8#X=%&827KBQe^1zQ8ly$& z0O$@_Z42i+1owlbno66Aial=}I0JIS^Cw@Yc#1Y<0~2t_f>+O&S`W-Rn(L*SY7k#@ zBD3ll?WnCTHGmZaer#PNHRmU$`IUSvE{qrYOag7$b(m3=WszVV+`OO6gZ~OW_^)=! zZBJ($T-*fH$IS3rIqaCvf2txUv{1AtXxbD^XmV3N%n`fV%UDMt zTd-?dmd6%6skNoi7dAncP{d z9N-=Z6m)BJhe~k{eYv${L`=S{>g;e~0tFR0oVD#8E=J=>eu{$af8gd%8hxgqf*(FP zW)fS!*kK*GXX3%r7BiJu$76mg4tiaf3x}L}P zq7j+2V{M^CmAPeGU-ea%C)u@hoBx2tUgB_=C0V*6v=C`hv|EY}3rxzE+BnS-g_uqg z@83HUK~yn3da1xEf4j{>IBmkfh#jsk7aPt6li{E0w&y{xJp#{z;as^3g$LCxap1L@ zD@3m!c|E4?Hug#a-|Nmi(NQr^A=6*4M4hH6Iny|VEEXPlE={&_tf9ENuFs`U1AKh?qO$3zj zk_jC)ENj(*0Gn-Qvhq-fsdiz+=tk38fw(XNETm%+>CT35tHfOP>BFm{V+SfJnogj5L_*=!LKUSq6B!ZM`ByL=Y% za_mY==y<4ce;1}tH5x!$Y_OO%>_EU9kAZtfn9A%Nyuvl6mX6@Q$W)ZO+%G^)S21^N zQR|fR@i-Xop@^e1)>ZRE1|$C3L3RTN8GBEG*elAim6#JFv(w*8$OFQ(cW4TUWEIBS zsz-R7gWM73osO3V%N4`ap7hRQ&dFjj^6gHC2UFU-e+UH8mGLu|N=n-}u*qstyUtJ9 zgs!_wbw-%2z^H-GH{_AG9DKL`zX5T)C6Y68#LJu-Txj zKVzEY7cBOc1RF1k)p~}@p%iC4i|W&pQaeugm)g(6OcgIPBMboqoB)wnPUAj+fK*g2 z{&vwqe@V`VGeFDrwFWDHL>wp_gmsN1FXItAw@A`V83k`jyJjKIng&;GGRMIQn@6=6 zbSdy6pd?l4UNRDC9!uINYo% z%wA}Z5r5VaUn*eGTQt1h>jCU)lxK^0BFKl#e}KjLyqclhN-!1@1~4cCJaN<;2(cE~ z4hn7vDX_zAAuJ|T)*x+uMy!q~Av?LO8+Fa=IkTo$jkS8K@Op zf4Yq7BAeXg&^$7H@BuUEiEm>)k1^P%~8V$Y7-{A@zftSq1&IOy^-vP*^XcoDMzvE|~raR9!ckGMjXAWT=~6mQi_ zmFZOc1dZ(-Q|!@kvtjRod@@3=XQzgDm})f$Lxr4WRl!{%wH+nd?=Tt~_g>VWf6;xc z_&jGQv-Yhp|9A+xN=pQ(T?AVLu2?_DDwvl*Yyt{9W6OwOO;n-H78+uV;NyverWuiz zmK>xPRsqDzW#V;nk4r-S5-}l#bm;k8jsbq=o?P{rqnZ?Wv!W|YRpUI!F zEho0Aj}gp>Bm*a+T?oTnr$|1Ve{-%ihI9<%Vz?y}UOF{PoJG&wB-60O13{Kcm>~HZ z6L#!owJCXk@U2Fi((Z)?Oq`8$t^Vk&U>$^V9F15ka(uCzlb7f^o*2bwLuLiRv3!CmN@>Bjw+`$Z!i}_I z=y9x-27$h~b$(roAyNYTf4L|v4z1rtDLKDu;Zp;mfPpJY;#@`PVgyRvv{cH3k&T&= zy({rY8k@p~sKU`G{G2XB8w}AkhseWjZawPcVm2}on=YQQy5 zX$ZGyK98vSnOq;UCX?8sQvsV`L1!Fw&u7L2M=1q-h#3Uad&sx+3m z$U=*RnHSyAkbA6be-*8RK_iRCd5MMETjjsn`dY7@q~4u$V8ITDxRl%G^mi89yApAw zv?SYd1=SECRSUcx*I*-a4~T<)z@V;B)6)1{r6k_O(`X@W23~H^yurhY<5FMAO)w<> zf_nJ0x^jm`zpwagGATnLc`F{YjFPknv8`Ime~-vmjfWkwTaGC~}me$-z;2DfvfM4GcS?gLcl-^Kv4G;uA2G9nKs2yyHUytzY zbA-jDM5s2*?HX=73CzsY`?l3kUQw0nUx+_$_IJ(~f07Mw*8f&gkHUdktv$i~%ryu= zo{Z-svjEKPOf~Z*6y{1$L+Q$gFdEL>{fw{IQj}m(R`2HCiV(H15XKZe4-1Rh)|DCw z1cDT}_aP1g(1+quqt>uM7*^dXg=2nYl;&9bH-+8_ZqbD%W%?4RS6MaW=;kL`GFZQ8 zTmmPUf9V@$pn<5JLdvuKYoG@3^#QrW@Dv^FLZ6y5|A9ZX0}+Gt9vamZ(Zd^5|62pO z2%k9l$_gHE>`FOHx$~ zZCXTw@|7i>InqH^cGp&zTe4tNGzms4$H0%4FiT zT*R!2AjJzSY5ofo1ZK~@$KZNH$bg~ip}%mNWQjFC1y8^W=E5MUvLAjhfHvR}iW$-R zf8r}F(K`7|u>I?$xG>}?rwXcvkuL=;OE?5`vqB(G@{P$H!1zn`%hCuUj)HB9qVM~y z{`ah?af_sW9I9Y6+b(gCGe4oyFR0_E5~bGB$Qp`oj`c`waCwx(Kw2Dw$c#%B)Ja%r zgW#|ZDe+pNL z|Kr^VM{pw??b@a}Iv$_7ZEn4L;6wMK8}u%N)3e}n=i;Jsdi5oEcXkn&e+bSm&fZ^i zK8C^78UDTdm#gmSRdC+D_}II;>b?!$dbJ--S*f9ReD zXYlmTy~}QJdDVgM_fCV)7rm?Af9ZRC-tpP_my6!}4_Cp5vy->oi_4&M`u3@LIsPy> z?_6BciQmD>weLcjiG~f3N-<7Ase}K&MKXxyU zKbXIE-t>-{?{RX2Fseb+s{>iyOY;fv-i zm!Cd%dBrcUaCuHng46D?e;IA(;!AMZz4)znjH__bJ@51`V2zH?E-v6HXQz)R*v~<* zpYKxtoXxAANTbwxKJF>VboV!q*iWY?urU|ifBj_EzCvzc!kzaQUEFsqrk{Ier9ha9 zvKrz~%s)6;{bHp4Eckf#w)YOCgk|~o?DV(pmrHM(%)Yxr)Om9Te>?TY45WwSF(ZI& z12KBr`Pg~iy;OpV?|k1q?Ot?F!r=0}d)$LRn144%#K_|b?cM36nJb8z`G6l1bd1cw z6X2|{TzxWU6VAh_$gz1he5MDx<=$OBBf-hpB_4>kovTiOBR2ni(}izebWhDf;j!-= zAAhfDcPZyh^Kb$qXgjT&+h;)j04d|{3(_aXObyTc4w53AOjBJd&CEPK~eUDR; zMx!WDnZT)jf7=6ve7Tkc?pI6T{xS)?P48wY1WrB>Eqw>~go>rFq#5rE*hQzt&Egs7 zYl1qqzlW#lD1f7S-9*%eoMhtM?^af-w_ZGs$N zU1P55?_ts>kA^U3n6LfuSiWmq18SDVYFgF)NVLt6p34pj-F7cV*r#zPHEQyDZ-i`vntmRDO?myqmUavWTW9w3E9d8FP9KcD3 z2jO4vy{UkCto;0^E502utf#JG(G&1rBzW$NbuyC>52cycoG?;FR@A2~^=PBq^U2qI z@!W_BRvGG;D06 zrAL%2U>=$w+Xb=cXp$$uz%61dt#YTyfAt0T$irMQHR^{r%uu*GZ!XVHK3#QBzUY|I zYdlSSkN{gb4*tkt*Y4=9UH1mRVl&OVx}05zhFU!8r(;e$dN`n-8Qi=hLsSe*j6#t2OS9e)UW0VUR(e+t3$HW{UP zI=x*yy}MoPnC;jZ-AqTjx3lr6QZAPLps}ck?NbqOIDh`4I?k|Hj5F+zAF84azyE#_ z4<%yp``-Tk;lb~F2hX0pdiC;PAA(>@q?5DZ!G7T-Si8N(EAEe7oMV&s7_eLh5LdY} zUwBgR^!8r8d=&y2``!}Qf223*uW}t$zU~Mf98JEO6%Hwz6A>I72bLD5>f3Bbw-?e6yhX>EjXmAFJ!E_F2PIO z4_17KHCoYEEG_Yk^*fRd*FhmbEdE=dgJ*SD20m3i9E7ToFE#G>1B^F6#I z9&zD2P&Qz(lp7u)lWIam76a&?w^0A6j@eF|DIlJZghvoAq%t#sw)erjPs6~wkSjt7 zWM_yKfA8FEWI=uSR^|A)-mTHnQ%{W11vubU|koZIKDMpjC-qC5J!yncnauk6XD@gD^|NA_hz2*W5`b!9X(CJ;M z*$B-%&{$BDaUB>DKLsb|HD7wq@p{8@hyhc7h{Q12mq&6p7U{k04M>V-vPaAwg9 zS5#R7Ggreq{+cdZ^dROl2$bUWjNQ*9d5|XqXsh|8v}=jrE|Re=)KhrFQfkZgf8nX0 z$Vi0RS`bpu7{DtsnV}gK)CwvfWDVjeSpQU@eoGjcmKPAFSux^mbH`fVN|w)T4xS-A zD<`NXMk&`V1r6?@rMOiMG})f7$-da=_Pw#QLOq!aJUHLe2gb+KmrR)A5{TxDDDK<^ zm`{`bocbV9zqo|b$Tj{z*8~Cnf8a=K=yF)C@=PkK310_a<9G^(8w67P7+b|e))BL_ zm%1;7Sm`?MTj^-7S4%g07v%2)-KML^}Z%5MT;^mnd1I62p5%e!q#x?^laF`&Eo&GG!o(e+o&jM5lvL z${dZpF)duJk_p*REFUnUjq$D_zG$oN_Dks65kBJK8R0wG6XP2^u64#$@u6Yw!FPI;#qIlx+bhrli+O5^wIQ{sDhO1K3$&C&d>9ee z7XBu|X~us<*9rKs_{vB0HaMiZScVvRc_29=5g2nY!Y=(O+_eLL^7f_3V|l~d1>tME#;ywamcFVznW?n zYQ9g%`}V0G>osXO+s(i9Zsxud=lKXU9zH{YPwAvy5r&*ufAdH!t@kgUTy6o}Jf2g0 zjkr5=yb38w3&rdZ_-cht@rB%|tA+XUkHEgj9dPSRXPDPV>1 zMdDV1Tq&m$uQO4?YIN@Mwg6;}aaQlO$`6`YZ7v zlD9>le|~~}YNb|+Rls;4_4^)%ju00 z#48QUd~V(`haf@X9BE;`0L+a%Py2~P`>C8<0ig?-B7UFl(kz)$8P`BtD+>IOK@*K9 zInp#=v6_)W2tk8iFr_T3VOW}uKC4&;qtQmqObEVEV$s%1(m&gR@EoN=_{nC8uE}$S ze_h&k2V@-mjS(Hw3A!v>G(i~gS0L>ik;R(B{kJU>G-d|ZVCRc`W(<0dut067@vd{* z-ONCJ{3`JQbvJWi@z!jmDH@S#9AKlX^OWQ^4XQ zHEP#vJZxe%9#)%;G${yOQ&=}tlmww?Li^@qd-R!gZ(s8Awx~6gLb;DlFLZo*;W9!! zSMnm|jEUwaa-4cb2cWnx44uN39!JOoL=DuAgQ{H_I%*FD&6^VBq)4;PWOj_}rI4pL?zpj$LQ%XSXde)KwNG`UQy= zWll5H#WfXDKFaut3|%gN%Efi}e^7SaVs%Cv)ObaQv8r3rBR^7lM%j|`lIsP#Rw-66JLXi*k`K&9*@q%j%vRdJ34kqvf8Ni8?cqL9 zXTtj^*dX^}IWHOhx{g92!|w&d%^z=Lq#&U{5Hv|lnDhr-3C3sV{HxGaCs}_!&hgS? z0HA2(ZopVSUN6#<%_Tb7IYJtQVe7&CrUV}%ysq=Cmg5d>#CCZ2FfpiYtzzoNqhr?AdrnE z)*BwYF$k#+W1AYJAHC*G&wOeNf0wXK{plc`(E2k1 ztWg|z{|EUk3K!V^+#glr@p{UVr(l7rt=8kQQxe;jG_t=t33s;t)<79d0TaA@;ml(Rpy>V3Bl~`pq7*N~~q}j;rO`IYp z9hRzjQ&c6jj)_C)On54;xx@RZ*D*}-Rw82>r-b^)3qdMyE>s^tui2ZhR*J~%@F>p( zfPkl}MhINDLz_(y4xDsQu8e3^x?VMqu2;nx_ZAV^{~L{ce-$+LYLIbl5aAW&;i{u{ zrDE_B{+HDEw}!m_!vWWed=-xmuYP}3_Om8c+0ROla>7z2onemPzzqdjId9Tvl#{_2V{<|z{^W)f;b=WR&=ooXnuMSfT$UET2EB5t%Xy*w;7#|q zQ^a@fT?Qw;V?LGABF(m`9j^8UqoQd8>L;dTLglyE0g_ieE5G5eE2m^!YaMQul!!!WhmkPv+wN! zepT58{OH}%M|-PwOCw78+92iYtx9P$|BZ3J9=gm=0cNfk>^4I)Cu_pm-E3Su6sCD4 z9^0~OfAKeC3`2nY$*=3dpHHfh&(||kR{_XdZSV{8Kkq7E?PosbZ3}~6hV@)I*`>(q zukS%#Z@R)3#b|v9_NK2aAh+M+QWmh-_nW@84B;NM1Iqp&d*41@d*y2%9Jsymtq+Xg zUir?Jq1;>9^v6JXuRej*aPO}X#yBkom%OvNe;O!f5wSE3HozYJdjo;@dm?`T@_Y3G zn51K&6BcFq{8bn?Zt*zZ*#Yw&vo-lVp%Ph(0Q=ae{rL5I=>CGI zrQl`Q>ADBN{{#2!M^Myn7WXyv3*k>-HmhKB)ZO`ubg-Djaxa3LcfGI!qy`x~@TPCU zTLb)GwjJea`a>zql~qIK8@9Of(A;e~f8jmm0XK(0?@7KbdGyAn=_2?SSn1$H)c+c1 zk7ksuc9l`{2!N#;{c*K0w`e-iM=lKZf{xKMBSdvyP5<&^!oUnHPXy)aH=~KxuC@7Z zHU`VaKudN%Z^Hk*zk5F^v8ML*>+eb%IfmU<-pLRnREtzlb_8By;TvE05Hs||}=A>gTM z<5$UDH(CT*0<{1WfvDYd_83Tof6C$6f(s5QoGqvpWCGi`Fa9e>WIyUA)rXq-KF)l< zV&-yaHeCTWG@;*9*GivB_1-Zy4jM&iUg=GldR?IuJW#`O0FC~arGXL`S(QSopFY$Y z9^e`txHWXL+{WU0D;1PhiEY38mKc}K`z0YLM_gH`prN=H9p4UMUJtcye}}kkhq7*6 z7ruC_b;idS5->?V-gGemJ%AtO%3-)Y%ta<$VKgPHuvG*+rTHYWsN%5>wg`?PBE>|r z=%Lo@2-oY#u9xj6-gIF+?aQ#4)IRV0zDvq09k14l+h~5sdB6Ky=GTLp&q(iE+J|^! zT}0#eNV>oF#(0Se@wgM>0m@*teEE8 zCE+82Pr?=s!1sV=h8b#AIuyhxAl7f6vIwG59_n{gMp+^aTELuz&bsfA9IxlZy2?c=1I2YzJa$OX2}9 z4p!W%oycrfXO%^@c-urFk&I%E%wAf}nw4}*@U(I=?N08RCx?_qSfC+2rv%L}AgY!2 zTcb(158C#ao{`J+OpcW|*iDa>zGc%P#^L6(Sk-;wg=34qe+MzZ<6Ju%Zq-{Fj!MB1 zK|l<6a9C7&MEXKRmKCi;mXHrHu@?U6^smK-zX|umtKU;@{W zf{tw9z)A05o<>+fsUuZ^x(l3-QD!Ls;6wA-0MVr(b{z^NI{?E&SW6U*h~^AnE1kP3Qrf5D2fVpz#OeE z+ekJns_%SmftLi#^EqfwXgE@X!yeD#@-QG8ogbcqBi=Em0`yice;MIT5Hha1kk5?A z)FOq4e+Xx0o=>mmc5~-RxziZh^dSDwBf!~;wn=}acd&MZlb|sZLIS{->;iqrvN?_> zksx$1fgerGc?H)(d)oKGG^if!dK)i;EWb^r@CXM$IZTE#gq!Tc)3=VE{gZ=oo6nHg z4G#nmpi(DrJTVi-h_v@eHL8c9w5mEMa7fGvf6=O;aGkG~A2_HU!%EiVKHl&9Af8v1 z;fnWg5w4Ik@CzTx&*6+N<47U24a5mXgB?&&p$F;#2Eb&8tBSu_@c+=q=&`|kyj&1T z8FYXJYoKd>73bvn{^7x4rE~If9p~g|)fGqQgidSq&{wTe}@=++qLH^fJON-j{xEm6G*D z3p_9EV)b1ruoYPDJfApXVQ9<^fAvW!-m-;U%cI@8EAMad)?Mw=4GXvKlB~U6U0z41 z?YC=zmBCI`;aWmauA*qc-yQK3)UUVIg^#jBcYE<(SGK^CD;_oeiW9388)~}SuT;k? zK6kU#Xy>L~S(KI;9~S-Je9;;n_~)g@hn_Z>9aPQf7c*7G&K`O0%dL$4f3>X)B%QOC zhIh{ZVmDeHik+!KJZg-O%5Sb@f4G~mKruM1l+JonWF6Tr*e6>KUt8x?D&D{C5Chqw zK}+j!JGfWd6$>XY;O8hhR~vqd_ET+GV>9~+3Y-ph{i>WZhbH=XVUGh0dmKR6qvL}Q z)!bGm7t&5c7^L2S4H8i%a|P}hD}}rejpc)e>g4%9Etk^KiNxR z%90=K9<3MF-0W=a?Yq1tqbki;uRtEJQO zcGVf>SdIaWd%z;Iu9&9}?JSb8HK>qpi3vxYy029Sgo_mGgXrsD==y27`nCkgFvm`V{6(b{|<;ehI zK%KwUJFrQt#@S?k(EIlssaq0Ep-Qpxl6v)rJiT;D!!;dKW_DQ_`F~2sw@4^F8u^z{ z-N}{CWXzOeor`Ee(SL-flC$olN3lj=>&W+nos{}4%T;%gV{!&iJxX9%$taXS33+K) zgDB2KC4Mx_rg!<$FNZxT>+Jwysm)FdagiQejt^0e4*~a9MUl=Wiu4gW+_HQvlk>28Kr6XyW+)ih zf(^RDlYNe!4Y>nrVjva0Gbm9Q#e*9bdq<7IsP0;qNO{82;2M?zIv$xa)2VZ{t72N7 z#g}8y+k9#))6n}`;l#n5>73ifHm!lZ2B29ogX}k#xOU%nPJcLKO#&*y$!#M@11smB zJxbR!ME?w^yz?PshvB3P-YzYtBO^hG5m;`zm>qZm_TK5qrPoxAhl}Gj$laDj9a6Zu zqFQ6Fu!{LDXjD*FQ&2pL+XUBzRum39_0T41K3>m4B-Ymfkqj!sXBfUK@_i++q_#7x;Wemxr>~v;*Y1uV@|5V=B|kU3UQU*Octr z(t}4SD-x^OBaGmDgH0qmHq92>48a#cvLkc!Hh|YNLiI2*%TI|9dr|JCl0kKXq z!ju+A5Hg8`0ALaJ)T7mlBhrFb<8pB;3eU~ELVsOXm0J*^!B*So(ITL|>>I(-xTlw& z7R9rQ>q0-CiOip&was)Tp1JHe#R(xEniz-^7mXRI;{^98MkhA3NMw+poI0vHut=jq6}hn5uuGr*Q}r^)=`^x?XaZo&WoBn(}gl2h%-`Ni}>@W|mZ&y7Ns zUOtH@=*D1<<2=ij`G9hg^mF)d=JU}^LvG$bWeRJ-gmAi#sd%5G;(cC-{+rP&2b2>j z4Rmp&nSx8{lx~4!T6n4{M2q*pScKg=Eq@0Pr$%G@VD})z`xbW9TppCorEpU`V}($N zHiQz1`+_`@;^MGYf{4Psk*2Eh{6t&o_k=6GVtrOjHkt#VNYtVtnhPg2oR7>^GGdEc zYY4YA!GUBLcs3GY1w@mnxtxe%jwd}>G3pT3#2m2xX@vNb=3G=qAnJ6j)~lsZM1N2r zI2fy|2#6H2CRI9IJZ;OFJ0w*|T>!$(#lSBZ)1pnYeF~B=)f=cf0J!>#Xz4ZUqxF@m zW7g#LvY1)MOuoY^=4#P!gd!O3bjUIh38Of#cFDzDl)yo`aY~+S6ThB9cScs-t)fhErF&zhvOyd;Ab-Z4(q7=gSKkq^Sj*IR<(2kRUnur6{ekzz3%oC0 z?CN5rW)}koguSvSYB_)!0Z$Rg-m4WG3Qai1A-w0#BgEusG@as>v)w%Ix=B+5L|rlFYE2F>X`#<1cuVfdB~a8*%I+e*nSYNw0;5%< zB;+w+M%N{9z7Uxswe@gM&&1}7tM?4Q1(_f&#{{fGrkkz2fZ4~&X%Zn&)N(%wvBIKD zFSGJ}uV2t#*Q2W+*7AP(*EXW>1>s#WKyHJbT+tI7RfFYD%ulAR0lB{Qh236wrY?v{ z)>P@;wi8Q7d-F=ixl54}UVkcCB9B8nce3VoC8QHqwFEAXVYY}uzc`CGILlU zAeMiHfH3ngvg3}I64qo@5OqJ?(K~VkFGZjDs8r`t6@OW=*hOm|$K%%bGI`Zk4}^+{ zcz_Mes(=Z5wqgzb7&Qjoit$y%Arbj|^!}{pSg3^UgTS~U<5_3JPJiQB-jAj+Rxr*d zHtcsSAcqk1q2!5tmD@7c5X>7uTLc{N@2vq`^j zbJ+BRgZUThRR#45&Y$%JY)ou)7cHm(G?~y{1UdCOrUJ)!xT_wKrz)TXKWBqbjke-x zWEEDIX1LAwNDM@vjDPfUfXUVDTe%cMWQ!@IGFVLM=nAe15i%Q3ECVS#rr;c);9$*! zFz%7Tx~5suSvybXIUhF}N{Ei5GT2U4YE5J+q41LSC#5HL3`$mN4|oxUo3r1J`nfI z9G4+>5tvmF7FHSq5^&s()wrElxXn-ynxEFMEux)6GMw#Ivd#P+Yje zS(0a4M3;IG6{6>rP^Iv4d&G+P-COUNADd0RrDY{yx#LUwj`E0Q@pjH4Q#mGleVjuX zS&p@*v2kmJ%7404=k1;7B2d7?-T&Zy8sBqW6Zow~)Yfs?3QYf%6vDc1m-E}_NTH1$ zDdlLxQy7M0)?KLg-~*%ji=e((@tWX4`kG7zq0~Xf-xYQRGoh%UV^|5!!cR;jJxNZA zKX9ZB01(6&uHhUIT{5WDVx*5@GGm)uU7QSUfVBo@1An=^-uxehDxqi$5*ta5jyO9F z|2~hhk9{b=$tG7OyQD&+EKTtFTs+>JZ`uIIQGd7CV@Y15jVF(J{uIH zMG}3mhin_LROaKDN0r+sjmyj<6>J}uJ&UJNl2PO|V?O^>9ZVQ2t)-BCQ>FimZP& zmp&g&_m>2%PzuPF%Bb8@p?N&xVIhlg3Uw2GEU4v-!jQ?py=Ven5`=+=Z?Rv3C=!}@ zHSQt&2U2GVurve*&w>Him}Yyg0cZyE2h^)e$A5ypZd^(;PS*vQS4G)XJqeYVjTUys zbSLCU>UG7yQ z3;QSw`!=*qXMYBF{YXOdE$rjP#Lgf#9~mz$H7ek5^T7>% zD}SOC*0#kus*X$h{e-pAVlPn455(d(6h!3q!w6y}@Xn#d|FR*&YoL9WGknYj^dNMNC0_Y!B6Y?Y~ z6~s!tDc%+QXc#9M3cmzf$u_4tAc2=9l9Zboe?`CDcsp~bM;&oy1YJH`h!#snyF`04 z;MkavuA^QgzLu&R=8CIH@Iufs2vZtl(Ve(4_DIrsD+Y;c8UXF-D82|!ePP+`LVtxA zTP#hHn70;mp5dBi4FIYX3p64sRXt}TTAwWY4J z8Ha19N#;RC(87rH7~PYk=8iB+&Vb5L=hjY(?aId=N;)y>VcDy0jl!otS=@?H2Q}7E z7InP>_i2m5-tcBrDU0$3VNWo%L4QjZbQXV0znbT`Zs^Dc^srNcv^+IJGnS39^7C|r z-43>I5Le_j8t}K4w5;lbu_5H>dUx;v-oXd<4yMa?=}jvq+EY^c+FEDF*V%9`%%BE) zIjKekr6VYZwl#X!3+K@RJi=^7wYl3&guu#*tqneHRnv8ffkln7j#e#wi+@J*xDcOM zepS`>0I;P6Nvr5Ttb))SN1qRcZ zq_n`jCGAR& z%wi-1WlnQZ0=tmvNy@cwLVuwq;M?KqUmh>r0?^v8)(^LwxbA1ODYgjWvEnVCa7_VC zGs*h%F=2DlzRl&I2=LJePns#f!x>OrZn^TTNqjR(ZlK+NJG4-UVF3$~_GyvM!|Lck zSRFeEt3(39ke%CZzXJt?qlBUZoIA&Z&1OVMwZ4{9XM*U9IakHPUw<7UBwpRo2m?Y$ zi~xVen8bur2srv^9Nok=zX0{DX6o3>wls_+zk~OV(i|Uflcoc3p2NVCfNGz2-OWZ) zgM5}w;US@ek_IPxPB>QMXf&Kp`ZPdZ4~tlj+fp&El?Tvw03>$NXzs8t*o2y>-CD4` zIE6tS81X=~I8_ta=6`HTiqn%hWHG8fUn-hQi3KbXlYb<_%!r@>Njk7_?{D*L!8Jx8 z^5}WE(OLp^dlCwXeU$?m8ADz2{M=vVMhbwM~6OAB~vtQc>1tg=so* zt(Df0G8|@w+;d=~)q@0mz%CGk4Sz_SixAeI?FOHAFLybugMSyN+(~OCsjjLjQZ00> zl~6F@LJlcM66rNJOCXrDlpr{K865Av+r8KY^WfQDuyqC%DtoV99g!Z)DKiY)QhG%R z%w1kL8LaSSzsgh%Rn@&ks<5e^Q_no{uzoe)oQ_E;t--y-q(=4#qbju;-4m1 z;RU6HWPdw!%t1F34Y?ZD208o+@T%qYFopelLoUj9@c@g@kJGv0Mm~k3WOjxd8mL^v zZ4hJhnQPg&EQB%+^>2{Gf}ZaTqOWso+9>@7U91$5W@+h)NEMI)%I{-A0D|TjeU)7a z>&%&>VBQxmq+EU&v)LMdpQ2+&IkTu(GG-V4)PL3xO~55eh)w>O4cFY(phD|?M$Uv; zzsrbP;NBZM4O`4PfjC;Q?8SrK0I*&_-uyyJk}4~aLh?fVQm{qsIW5T> zlYcNneKVV$z@~u4c^%*dh$EAo%x7jc|6%3GYnUh%P-9?5s^W=B49-OLMD!$B5lQtm z!@hXSNl9-grKTlJKka~JM#l!2VPwQ7(`%Zwc|F)=&G9)I{_Dc5InJ$4+tu><;eclkdDLR7+MyF3=+ zMJAegs9Zz2x@S-%W~voOzV-3^M55x@)-s{8Es1Tp%hJW5YkMmAS}NB&*YfzaFAXuh z3UgMj@Mfo`K4^uS-)bgs+N-NupE(PUF-||qN_T4Y2pUqC|Ef5cDQQ{3(zpHEmVd*6 zb|+p686jIrNn;ZBnutPGPnOMIOYtRPQ+QB!u68nNOl?nJzn{4P%M7Aq1oc!SNh+hj5s~_t$f|?i8wc z^(z?KW4fTy>aF8#{$kTt*G&aWfi6e{jR_lP-^%Da54Ii32;9oIfBD&@rGMj$3$Tl4 zwKpeYvCeZ((_tv8>3*?Hk}%ksX4TyFl<)I@Ghg^?;NPL4bLWxRdjn0T0u^RR|3*9T zS9kAa9;hn#X~q_!)k&LM3RE%xp&l>>?x2eWk`@>Q=0cH0srp)W10pz^t54O65!1Z? z>Uld@3Mym5U`)>x3*C1}SJF~*8 zUx-jC)L&rAw4t7-a#i!q43EJ7;g~U!x z_lG!1=1Ya~LDpxD(SP0B=y?93iL>f>2XmrAHHMV^WChpsu7KC+GL z&Wp1mMKUJ)WVwj>!r7uo$9BN%3x&#Hiy)%9Exbkle{=8AD}T@Tz@Kk}i58cd!obzz zTzOcBJS_jw>kdupop*?8se7ZPc%ulUcVBlj*^dec%+Z zUmU^(AI;X@vwzAU;G1HHgvb{3DYjAB>J7JaHtwPl#%zV5`b~w`02DpSq#j6x1H!;e zpGzw8w6a;ayv>^ydy-T=N2w~DfOQWiMC~;NHs%>r8E^4$tSs{{aC8dwW$lsCSm@?K z6&_cpIfYR(24pO*vjTh>OTU9oOeQ4T_&_f9ZhS$#q<`7bcCLRZL9mXiE>?c!EA>j) z?$zH~6Q!lW+(zHTQ?YI5SV$S(1HIyE`1qJ1&H;;&Xb3_+MW7{Vmj~D1s|OqELi<&b zQR_{iXShzDs&8^Acv!;}98$AFt90cYzIeX(s#4ePucd2`o?x-Pz*UzoP!M4%Amesx zMUi5*Eq^3WPN2p@LbELMSL*1?gK1)(48UY8pOEeGCYZ3=levM)+#^HTq=jTJZCD}pu81%^S%IawK zRzKzBA(U>`wf!C!M0kJtDR>`Gu)f9jAw%s%hW5)R&>Wnt@S8pNn+_~xdhc%z;5~w9 z2iIBwVFqg1Bt5(Onvs`LJbX=Ds*=SpwVjSb0@6q6SQcBTA0~MnU(z{@40smlZ{X8z zuYY+k3odQsJGIQ^ppr%v*eS3^`e#`C?Z(G&U8Ds(XBnhB9l}F`8D~_KnMsQnt${J5tPx4945mVR>=3^>03w7{%Kp}$LL1O z+L+%ORgVhd+MJLfHt!fmKk@ynP3GbM(?SPu0kPOlu+vw7JVjSiQoIz#O zrhT{_8W@hmTxc|g`$I)n<^y=+bvjr)`L+819LlTMNY4+C4xd-rNC)fKNY4+Sw0}a4 zeBY&7!GjD1tBS^}&bqFpOLl2`y7wI@PW*j3N&(QZcx8qwu^<=tkJCrsI(FOOb9%~2 zEv)4_?7(7G_)BCBjLocz`)$ZarB$~rr#sMSD$MF#+lcx$nypa0<{$8@s`f+&Jo$hA zH}oME`?)=YUQB`k?uBLuMt(R?cYkort8J4l)KqfItdsh@AR24;*ELa@suX0$s4iTO zoxE?f1+Ml1sC0)JYNmr)HMoRtw6*ehgS+L&WG~);P$FMwX0EbCPSXmSOV{+7TR1^3 zyK#9bk1)#qg8NBIF_r3fSMn>P6s^dwT#Bc!bX`2(d$w13T^z1;T^KL4On>bhl_Ho~ zJWjvK$~}}zEQ6_~dT-bs44_DyX3S0XtZSiabbJbFN7GT%%pL+gzTN zd7`b*mbs!!6Wlb0P(0slA9_HkGe3#Fqh=?ROyD?sbplF32ZH;Xi(SOkoe%y|6MAdWav z$RPpjEcs?EdY~D8@O3LV=P!2aeerwOu8#DE2yYHi{@nX&VL*~v9%OAeJy-<8>-I@d z{T>urs*;lCZGU65*?$S$lR1VScfbwC5$%;ZkT^OCfys5Zu2aCuue5C|vJW0RP=Q~a z71T=n>Y)YCzlV;r z+&8Glx!)6Ys-1%|PM472RArGLUi4y{CU@euzm$Tji3pb2dVi_}uvoNWR%o(X={U}Q zg~IV?kdp=`;Ak>ISQzm6m??0Qs`xbdM}#Kpvn!{*aJLsZdtOP{hVv^f$-VSulwh|m zw?IxgE-3t6k$*)?-CR{XSorF7Nw8Kp{L2yQf3nD2QIAABBMhVNK-vqn$U#|)c(K-X zbx4t{$){5Cxtn+;MJPO)wF<^Gq&q0Mj7#~HiVR9N8xMu!m_k;AAy@-H$WUFc!=*j? z*3z7t<+8X?HEWk|KM>DVit9pua?(S~WJ%729Fz}{2P&R0m_ zxX%Q^oS-mh@=}(sFvpye!~Ymc5YztML3HODElX9=^eOoG8n9Qk89oE=&mH^wH zU!p7_I)D1|gnYac+xLM4LgRR_K(_OVao8wRW)5k;KhGlLBtL?SrT{chi`uicgOVy# z)CFp$j*IGCsphZsRq4;b8SHdtE4;zY=z(Wd^uRTqYIz01hoB8!m&@_tIDqYbSe9BR ze>DoA*k)Wnhm$sC&a7!jod@&%6CoVjnWZ~)+kfv2<}v(@N#J(UY{wzWG@~hO;2Hf0 zrb5>||BuU7h@FH3_IG0F0i!a@m3RbKO8))B@C!COQ3?q52{H(-#gyTngCkaB^%jr^1+|q7VfZEoUMtxPj;f z-~`%aN1>O1V8cq4f(sTt*vJ02fplEo>!|;gFrD2acY}|{L`dcOmsza0sueS>oG8vO ziSq_CWM3)adQU9jzyg0eMdUevTsbEl5r4+tdp7IJqU;oh>5PP;T)JgGC@!eM+~_KBe2r7a%(um0-_h0yiDzsUmT+Aq~`s|Mj2$3mM#?9=Z{ITj*6oYXx)uD>CcJH7`^0U!md?YVu6BV}6IR6l zSGBN;1+GGJTcm?)TJ0`!i~zUdynhnyqt7dFQs5P6`OyCm7J-7CO4|*@bM9_auWYrn zxlj~mYj^m1@n`|iM7N{^)PM1VcmdF1GYZBioia;6E0F&G*s%OqarqC6$^T_-O#Y_I zMl5UMoIJ6AU%T34MR;p2o4iJB`56US6G`|Aigo0pT@&LF7EYUsZZe1vyMHL*_Egwb zW3Ekr-DgD67kGw6=7zQAZMVa##4tCK;>gMM0NjDbwmOlw`@qNry|++m&M!A64jRmn zl4lk3yT%Sr?RAiVY0u=r%+9e!!zTuuH39N{;b;z$&$*+&7ohwfgAp#+d;$QS&0~Kh ztk=8@cBVDyk=|H16K23tbbribAHR8>v$pH`!HeG}@tq)41D%o@+lW8n13*CzAvb-aqeY`90%)_(+YQ{FAxfCW?9 zWZx>Pd{)ig!(Y6*bBFiK49T_*Q3|4=l}I9U)oJCL;&jXlma5%(k6meDQPv)OkEGSH zuss0sE=`b4cZSgqxzfh=ykH-PS5a9kqC^x;CIFQ>ow_tCoDN-Og%^S2(Oi_veZZfL z0^8zQ*LaZ7=#6<0jelcrZzxnXPMJ*F8WA=;fWPo-m+gU9{3&K3xKj!TZATPbtKm$`SCCwJw?6&Frv4z7KC0}EX0~pD2 zdN^vDH?s9ugMls+p_;0htIA4;s=Ul1Sv>d|xi)8H72Q`pFK^6wSp%%F)f2S(d%5(S z==0bzx#x_nf^GYvC2ZU0FJB)1e)#P0+1{&zBS4SsOn*T)THnKe*isV9U|_N_4!IGA$2jzwH8fs1-S~l#E>voDj&1Au0;%V zjfWvZ5q}=9t{X#io?I|=RT6`bTk*SMmS6%@ zLMf}G_mu{Uf&MPOy?U_oi85dymu}uEqxAyQg4+~mV5U%7`3k^H&J(LbX2K^h{175E zVVrsyN|O+9;zK-or>*2iVl@FOfQPJ93DLwAt$(#pP4X=Bum*@tD~N%)XL->83Cw=R z^1H2Nq6GJ)MM#5vVa_I}aD__OuL(C<94TFBJXq{?D#)vckv6UcO4IF#f-Q@odkVN& zFO^JSCav~3T=}0u(L}@K284N7pjsOb$T%J(Q2-QCO_l`u zHL4X8VdxH7XTmvfhtjptnKhtQ_szf5O)peOXGTP>7)v!yJ?Hn$lf-yJ*{TWm;qY;!e2(zVH8xY4QKj9o zi%VHvp#E_@ek(}Dlh-m%>>NGwM1LcL$AGVAEbF8n!bV(kp~77TKbxSXG@nT0P99He z5X7z+qq1puk#F&Rcb)%S^M7s}kdFn-i2%AeG39MIH#uNuZO3i+d1)$pPVD;D1UCVGrczqiTjsv^belDB?2*tE6$^KoOGZltC z!hsTma}DhM_bCMmpp2Unr22$8nYW98fEET+VSQqJgs?#2jzefr`hWlTpny94O2J>Q zyWun#6lKB9XDcf}U2CZJoWHvqR2_4IT#AvXih2o!B$=nVwy<8G8$!_uFY*sn{J{2= zp;%jlnG#Yaeis3*_|8_{3&O;07kpV4gQ}K{blH!p`k}v5P(HfL=gF+th+qedMa!Q0 zUZ#(|VqF*a=(~kqRDZQqZ~{R=;+JrjSi-B?mSi_^0EIpT5MMT=5W=)rzQyU5RhT?i zQ65>WBYzE)$RU6^>1X)5Ly{9#8yEGb(cOt-pu5jDmLhNPm*-;!8wT@_i_{9?i--v5 zYTURoEX6pENs=trhSG7X;Nlz|?(bFO;yhmm7w1S2Ss%8VMl%&#A2tQjo00ZGNUBDLy=bL-F zU3)><)M<4gdw)vq9P5Bs_-9wW<1Sm|@O!49_fcE5#$aVy29fZ!gP$(E+;-|m5iu& z(^}h~x`SC1IPPKRQ}98Wz>75w4k!@W1}5DRx_q3Mq9}oSpl{!Oq854(Ak{06bJuCU z5}1EoXp;_aP27?ZI=m2=tr#zsm)+-}iphxGLw`Y>9LX zC4VY&88KVrx~x4_0gHImyE^HHX0uOs zdZ+I$dZ+KZAG@blVeqkgas0uItn;RK(!2VC()zA5G%!KYrE?q!_Ro5;o#nIeQz;z$+x)T2KzP@1=@g7)C4CAmulP{Y24f=fN z_nstMX*!5U$u%0%IG`H{i;WicH3->3IP=vfud=1Mx+T~)Yx>~Rt#=7W85O-0P|}Kk zkZ|5uVb1B3L?eR9l|V{lY0|FHcYplYoyOaRR^uYW3#OE!!M7w|tl*FuXck@AMRDyh|d<^BGa&mH7D=$E%8qItnn(5IFt*sKCx^d+1jjd(TTAy}JDJ<`nvYvii&7b*3?AH#hRcz@{ni?AA- zk!DhYIimh!irAOI5JPS_7O3`7#bs@lc#H~dDNG`%2+DB~T9NDO49h3O0%*hV7f3y1 zSFMB?sVgjujM?|Ebym8kZ^1UGDlT5Dcc@8~Jhr_k0>Sq66_&woblv3U)H1qxRX zOe3zxxK`kY%uAQUPiQTmb05wEXkK2ONE*Wn#dJhL8l^ zs6BjP9}xxLp>psSsEPg4lN_A0_z8b@Yo7I|C)`^6l)ry5Gdz(JCGxrpUndYi*)$$#N*^?Y5%v9~yKyIA~X z3w%Ls-NhyVFH2WDoEOzE*XX^aeR}M!v*%u`7~Ih((N+AH;5xKlXMH`jWGJ`s@C)XD@f29qp{r&(_Xh+=aaN>eVY~rQ6?uQP46U$U3(r z+_27Fz(2k8e)8P1op8{J+PNyZcUZum#6tTL58E4HXZ7w@20~qEdf%| z5e0YAg8aAzLlw-4qDrE4-Z-1Sd_IxcnI$)KdNhfHgUOYy!5^PLbgw>iFEE_(;p}s8 zb>^C(yMMvwvx`4p2A@vfnr~cv=v@k`0Xf=@jWle}3b9}<$0E>dF1XU%-NiL|)~$|Q z?w=cPnyZFX+GwH7BJ)6#Ii{Fo+_|LE6{F3ZtOmQJ&Ks?iN*`$`C8nn0GpTggCR#y? z^RQ{`E`}6A?Es3fKX9EleK#Jvn)y81+J9zL8GqkG3Wem?6%wljL7Ao+Orsu}Pd`S) zYD6mPX0tW;qd&a4nHyELYu-SLcawwthmoJc<0Sa0%p$L-iJ)h0jFq%%(a4Xn zkl%LS^-e3}@oO8&k7y_NCcfQgH{Oq{bForJIF`j4^GA(3{egYt8%bi7!`2aF_d512 zevfeM$ z@jIcQNf$Q<$-golVw%S*Oaytbh|Q(+TW#*1g%ri>EcWDfv2h}4D={l*&~m(jXhfsis4|YE3VpZb4(0Aggv1SR{?UO>7>-@2IU|O{dnD~ z5TiD={k-P<%+h{3V&VkjCcnEnhkteZa7F*UUJ&vWHM+H`Q5g|JUVJ%csmz1Zc!p-e zI~eOFelOTMeRsJED9!^axMRUVdLZkl5_1LBoGqk7^_S=N0-z2j>cvi4O@k!TDLjJk zE*{^MQt4blNc&d|vhn~CWh-h`aHTGW3Vo5AZ^U?3!>A8lH7Fk2^}>Bw*ne8o`WGIDfSrrxr}Qm^LD$5VwACMrbmm*lI!;nX59B5%8B-z@ zy_9o+0sY}JvmesYKo)7U%zsy<(N*#ff2?@CfjCnS;2NeGbR|55D+ovDCX2@0=>rNi z5X>UmEjo$gf%NsvCll&^XjkF#B!zb~L(~Y^eKxO#W!dx=>ql)AEn;z}h!i3Qls&|@ z`fff0|59n{YeLn|TQziq;y{u%SPbdVQFg)omvm!eE8Jw{siD%Q zL9s}iBl!bE**ov>+pJ^Aox#*iMBPaQJ^|UA$&DrBid$7iJdmLtNMschRxComR}vt9 zKmcCi5%l$+HRQg2F@KUOx;yn?w=o0#@$7ByUGKQF8V>ipA^iLP_gKnxPaVvTH8eGi zkq@g)T_bh2UE}PJRiZ?%Bly81fqOA8SYU<$K$D?AAK3tnL9XjSdW~&eS1m#cAtIh4 zxp^H@2!#-`7?z}u*4zXryPLk3t7C~OnQ#*caZw1=h&phwVVf^}^+g+B64lF$~tFsTjtn3thG*SD~2p1Y(Q=SXWLKV(U8%wB43IK0d; z%%-pYtV$24)pbxyNYftymeHfh#=(8E;RRO;Q4fck)3r%uhJw^0Iv5N9;I#cwkh7Oaga>j!5Cv*HbFe0v8Afx@ z;_G3SL(<)DlMBMo^u;!O^<$EVhvoW=h*?g{AqHPja4(JR%x|s>=@!DyUWL#hcI`YT z8Z>h7bONP(S{rXabeI*OM7>mvqh3{mwH?n*U+YOwUVqde#X;zsLVesgxKcR9sBp*8 zWI`+vH6ox3`!M^^yh1UUPX{>LZv`^WM?C>Y)h7V#qcu(e3vSC9GAxKHs{Z9?!Xe>r z99SmU9+XfL4*j0;D17}a!`S39@Pz-d058YIfIeumM;$ z;_4J2Hq=@)IIyJ~zddEwqqOk5O`o}OgmNF^f|iER8(KjdUj?>mps)i%7sZ?54PA8i6$l5$Y&y>@zJH4DUp1BE8?TNcRE0Qe&z}ro>yt zgpo`M=47&v+Ojo3^6p+^6|Dg7QV8e zK9`Amj8qLqTrd-7nOT#NSWOD(?`@8vP=6=NmNzn0a3uytsTkQ-FEHvgNbRnW z@mmPs{}4y5>Vyq;i%{gtvAumnZJxmo>-+%7mA&1dvswzGy>gDdXP^!Ke}xl&s=WP-T}An*K4hMSFY9FC%J#nAEVkP|pFNlO0_b;%_M6 zu1#!lQUVj?R*Q50h9Tz}Nj3_DiEeH{m&`UO?4iymoRkj)V9mhj@lalV-P`v&?ry0! z(O(ZCxhLy5B+doAWPdO<1s_c_q~+MOuu&r{!+IExNa6{&Sjd*)HBW0>;K9rQ=((lxj_9ZBdfR{q@`QDmaS%fC|l=QSmk{ zIdq%_X>kRRDm=Vrjl==+Ob=#$GZafzL2`PG*(I*R)v9 z*F=HFQRC2V1-nx{xsz}?F2GJ}E@&7Ys zSq2tLhSDb01fk=3GLAvc48qM*Q)UGrSyQ}k&q3Fl7XB-`Riuy#`EOI~onCcMJEzB8WET2Bkh?9nK0c!1MpAdn z@qMtv=DD$sPzZJe=`$V(?qs#_G@ZUGG(bZ@>XB>#u(?AcG9v|Tyj0WM+-7uVPS9a( z?J2g(U4KL4p)7!nKDRV=IA36@Ep$sOuFB3hn^s4oE7fX`Xt5GL+nNU4pHlh6KE(A|i_UM!`2@#SVfPHf+@Rei#hE zLD=36dNbEbs~Bu+k{*b3`*o7ujpD&gbITc#bbo^Rlv+G;UP7)}dc2^5l{_!VR4aaF z@_)=HwNlwQ>4ZLPd9gzQ0bvLm_E*g)uI=75eP=mweaC8udEPUK4`PfwG57L?2?Zz}x2W06={L?M@lD^Na zPh)6#817rP7Vd6$C|n_4K8vUMV;9~%^9CQCN36X`4@+yusO+q<9w+UMxfn#xY-xZO%&FvxsqLRDaf_ zzRX58+}I`a4Pv!b15v1dP@+LiDZIzC1yvH`P-RK%#rHtVp;W_G;i3~pqdP7Mz(y=$ zr){-I$Ov-i#A336W z4?Rnw&1rEAQe*@HTx)g}S;nGY${cVO0ax?ovLWFcxJyL01k=C5K{Xqc(8-uOhcSeOK0U}Cy=smu~SQl zU)k;0jAkd%`&GGyHr6jp-A{rd(JoC z*j;7qN6n=by@XnH3-%S3W4AMT0FT_QIiH-_a zcLI*OZ=Ys5pw=EjS7k*%J4}KcByvC=6sTq>S}W~LtwvD%h!6AHg35>eVB9Gz*v1@% z=fLb(&CVLjS@<6JR@mcUp>?P^{Up&U{m;ftnxJ89JiN~l5^u1s$YL35UH@ zWH!#OTBC?So#a%IS5*fkcYYRFExiaH81L0DE*&t2;lieuqNSWF0Ph4&>`(c!80OtQ zsHoON6ND5qLVEHr#=j%jEp(?d0kB7Ih#$-WQiB0!7*x;J+_2d$m>zIu_wW2BAz@== zCDEHLY$q_Y8IhUW{3_F6x>exjA_&AR>J-Xuwk?fYHdJ<8p|r?upo#^}}Z1lnnjuDXAcTNGb%atpT3FOgt15Q(y`7 zJbDM$0lNxD$__O+2e>`h;`BNTWoulyhd$yVN4MR@`)HSQw0j~lbIBle!ols475{@E zr~rN!Adr&z{(W#Z2X$Ig(0R#b`dI9-9YwRUCX{-dex2AB5Dl{dl2E(-m_tZNAyUsx zJ63bl2B;fwgx!fD;88cKB&hChU5(2LXLwQ`DM|5HaBZHmJXqs3TI}kgB{IjwJga5b z^H7c|==Qe@)8}}&Q3t|Ufa8!nWHNBPui%Lo3g1XFcr8xW{g6)RmrgOCyX47A2WUNV z*9g&YcW`MyWF{=xW>-uKYo}iEah|g%&BKuZgfK3_M5j{tH3sc8o6(#(B_!WaGmr!Y z0U4~-T>#!1g@)$iINQ(MzLqD&%eGdomv`Pc=Zjy92bTW=QrFpkw#2Q{V&6l<3;VdY z^}8dEe3}z{?m9C%pB)T%hUxKUPL=1^113- z>uYNnJWT^~Euas@z`I$(j?`NYy)kv6S*f9hc*B9cbo?l^US=D(o1J## zUdd#Oo>D;qlT~hPT{^*GPA(L&&2`Z%*Ga%nNOvA2+4UiPceMRHuI1y&aBh6dov3FG z)jtCi7cJ-O&+F)h&$Gi@&}+t)-WHEHI-_NKhO{oKh(q}kE2%A7S%D2AL=9kSDo7uh z6g)ndBNgi7C@bp`MnpFW8zp2cSQt^$Uf1?2Q8We*w}YaH6FeR+bM^ts)d8=uPY-DL z_5ykcQ*sg#u!WQa>MQu{PcHa@Xn6y5i31=RS_U zP?zMA*b)rytC0U06;%)vlsN^7lBNIl21$J;FhWz@v>Ugxz0oU>0qMSXp~uj?-A7o& zrmsaQ`z^~CiX$8_ouOcqQ~+!> zh6nqeYJJzBx{tR={N5VU)^t>c2>B~B-2@Dl3pbKw(tsx;!a(qsL2#Ssltv8>NLu-6 z_tSl5La9*kCYfk~UO`4NIZ@`w(#N>3nLdNU+=H3HMKy6+`rKdBLAtZj*k?F#{<)_w zhi?s5GSSR*NV8pLHh6I|_7RS5lpqkryph}wqGOm_z#iguB}|qV1}{eQ*S()S4Nu0H zN$APQ%4kRP)So(V{4B%!aLCA9))2qF=}9N5?seCWfREw8+0k z!B)C4ipHE{&f|Zsk0w~Sf|38wHgU?0gkCr0p%V1R3^H#1p!qPBnh?D?BEAP z?qmLr6_h-*Dk28@uF=v>@fVvDleSVvY{*+Py(-jzP*I(H6;-*~7(}yyge9w*`xlVm zh{Y8-(gC>>fzV|TG-Bl7L^%Mw=2kzRU$k)5ai!6&lBl1V24pR)l6{B~n+8I%8qE0* zE-?l(|B~Vc5mxRyMK7>sC+LTh3Sc#k{Pd`F-at{ zSXNi}{5PO>-nH5t2bUpi$k2un+`u2E=DHw;BhXEVB3%k|#qz9QFcJoMvO?eV5F<@b z-CilPJPWjOU|o~QApahS^y45DA=alJ`30=qvUwLL2vqVEC-y_3IIm}d$r2=Xo9oD3 z2<4s)dpu`8uv9Uy5d+EVV+Y17ZNl_Vnv0lNapcFHkvxG{W|8io;)BzmTH63l&*V|# ze<3ar=tC)B2R`4Q!-0IP&Q9Jn9{1;+Er^I6Y?$g!;=)mEoBD|{9Xp=n#sP`b2-MnN zP_2`G@@P%kJA&JZNBI?RLRsh5@2EOya8}61{*;{rx{f@m?VBy#*UN*^rp3tzomhva zSO>MWvpFs}|H1l|xm9q><+|AV6e5diJK1vg{M^56+updo1r)q?IG}1dGkTxmyD++F zzk>6Ep*(192E4L$G+Sn2J62RoFvzv)I!DR7ug{im<$3sBcD_yVY$8aJ?k(!fICvCa zPB8G#xQ>6O4!+-ZPR=f$PVCEF#(iM79cw)>&}Q9L-E}@ZIUwO zcyo6?T1%8q0j<3J$9McaW8Ajxl|1lbPH$9u3@w--BShEuIA|G~K; zJvNS!M}=!C;?b!=@%XPvK5~YZFNY^QU;6xx<8+HXTjR3k<}d@X{l%^J1hJqC#(%?6$?pTL z1DPrRmEOqU{;51J9{SI%$^#7#>ib~uMtT;`5Nu@Y*M(ibtok($x4vQ}c;%;BA-wX>1h% z1P2BrE>=4rX+FQ|TR=7Z@Qk5HUgS#eetmr-yB$WS`T_Ee`MIMvV7K;55q!aaI%1}fDOv8Wm>|o4`xuI!q8gqyPKVm9)d!UP2=zc znz^d$pl(P<;qcEYPRQf8mNE9gDb6Nc1y_l+R*T_#=NRTxMv8Y$(o&Nf@)o+PHMCkk z9<@XH+i$FUdRA-3YC=9RNjxBgM*PNs^2(cLD;IPE|9BITJfzkc7`O_(8s|-(fcnFq z_`)1OuI*+BSUh+2HR<9 z;&yD3u8uy@%bU-m~(7!T^^7v6o$7X zNKB*88;QJ}J~v5}CFJPFvdbprsKt{ITf_m*5sXmaMi5;o&iQ-juR1ZvJxqqp&$Ia? zn-a+^TVmd^m=kdQ*M{&x>d)f|<>^pvXMIj2$|8(m5=oW)qa_IA`x8mx6v=y*g?#j(K@D=MmO|(PuOjAuD~`u0M{VqWrz~yofHfBsB)7;u^h#e1w8i ziToqaBl$8$9x_f?d^67|0O$sx#{89FSB9p^Mkc;r_`b?3ee-Sl$FlCK5%NSUYbn)d zY2PyYuX*WzA_{A1k_g{0c-@D|mlnLaWnuLd&5nL2eb>UNs6?{)0}3}z8WveIBEB0u zQZ&;lnX%tEd?(JRW+!}_JPsDyE^A{mZ0T&>f#;P=g|02{7<7zp#sDCWZ0%z&(GW!G zIx*pdS_}5d0+&pLU4d&c1qaCO)1Nbm6FZzG&KhoRwAM}&Y*LJGF^N6r)vd{ zl**TD8MF>f&`lI5Rfv2`x5PCP#mgbR1DUsHmz|2n%$DUljnY*Nt~-Z<1l@_d95v=1 zxs%F`C6jmmeGULOW)=Dt1mjC(C8KosMtchHYt0h6g>|*-i?U%R){XM)(31atxd=^d zis&0@wN`x-vR&YNPuXAL|NQj*Pu_(NEg`|G|4pCU=0S4J+kqt2bm7)8em+{6jD9jUbTA(ADG)zD_If*= z@PREqcFC*<0);bhk!AYp=WDMs()~b0p9S*>L5XkIldi*2LtZ+7C##5%CUBs;tNxj^ zL{Y=JfkS3k6979=2ewG_Zwj8_PmNn8v4qsEs6R_YHVzO@{xP+hOx*_*R^m#tz_pX2&{{9jwl zs)7B4P2)u2E*&!uO*5B^9= z$Z-mh`mla9n>`QMi_AfHguyJrQC1!>F1WqnSUI3hP}&k!Sdj*STZd)O*Uc1E5QRt2 zoIsvZz&*P}V2o~yD|Cw`So#dzx!Pw^ovTJ?C?oCyo<;p(oQO=_Tk5F#-JmIoHKquT zRkvCCXsH*7-JbT!&Z1ULih5}8STug4`-*yi_4!T;Y7sTK_z5^IF3b(Y27ZntWGl?4 zAOKO;M5RuNpa%JW;r}vFc;n@NlgBh!!hy+qd*NHWm~}vjqo-_@XJ?xAdSO{Vyve*I zTJ`zuv^yBuybz1@tF%o%oy=}N?(nQ)3f*x1o@slL6HZDD_{`7L<4DZ)!LQwAQ54dc zywXlwACnkbL>c?@$Qze&@vE?6bnf$v3<)s0w^qi_SfWlKZ*4B`e4)iI&La{ywKcON zb%d`MjqY91;IzkkG7PGNLC2@QcI%9QpAy0lc;&O}*j5thE4oL@lveX4_TL6uSXxI| z!1zZ5Fi(RTZR+yBZ(g=8zdjO^83JX2Q9AO=MwJ078RjEn3Ev_lr z6HQe;j<0awP#o9)$DJ45xTZ>9Dk5WPD>6FVEV8x%lC(_nXvHCm@Ae_Ol?y0xlQ_F2 zc57qu+QoCph6hBR!x&9YYY@tz)3Mvca-OHc3YUC+R~6ssl$0-K3PgU|fJ%qUrF&E{ zC{%Tcl2%YCLf83iq6GyHJ29?yBu)G=sqXqF)`jsa6uBGHa4+1{VwETy^hfR;Ut~Jc zjpm($elgn9(^h9SNWc&(3^c&nMCi2W?7W-D9`){@y>=Yt(a8VLUHiU{XNlg@K_2oo z7Ecby3o!vMBuwp!1$(K^#3<@A1#}k<2Z}$r@LJ?0ABGYkx}0@3y1U!$ReScnCoHl0 zz@3W+2#INL4iuCzNsKpsUxurzuwSZG&IDt+J2vcj&(o8BTzR|{wgfOF^~$93nohnu zb0DnUnmLZ7-qFxvmVbh9#31%&_9|Wk|HS=6byoo8`130Yn`PhQOmOPIm(qvd3}mN!31e-zj@C5 z8$w2@=^kCGvNrgynCt4j;_(Ctn6LYMvSu;Qzwrk6@;pH}3F&yIb$et*3KrCyS3f)3 z<$6C~bQRm?>s8Q!2*UkOBB5bv)Y8_5b-_x_9~J$z1X6U@Qdue3 zp*&YUPBp-a;!ne=b6!%sEcnDIHG#y%cD2tG5}j&dTY@Io4&N?FsTX6=OObZo3sxeI zHV7dFt3j2nm=Oh0iY-Z0rRRF_b#^g=52~YBS-VJ&9#aYHm`DG@>CW(9?GoEPe$eZ` z2nu7=k`p+O?-kAlf0w5J)LJP{!M2rmtOenH-0K8dQ8I$JEH9f)$g+`^h*jV6czh(N zetS2JQ)Z?p5vM!iw=vN5o$ejMykV3Qm|uqoNzd4|9kO*1+fs2$ESeD+SkV76XEWGw zVz|LU6@z7`Gs8_Uq1(-+A^*2tujLQ!$#MJeMh=B*RI+1LR+fUeKtuOW$+o0riQn1r zo-Gi_?OyF)`lWAxKubR!&Hn#(?CbH;a<$UU(lTdgx&eJt3z;F5Ma zr{KlU_KVO1@TP?rx~q=-KF6P@y}p=N@|1}tV3<|?qnxnl96}$zvWw24M}(}Rs^sx} zH-#|CxL)R_D?z-S)y6Z?sRmgWqpO=&D^vnNQ;!|q8-nZ4p>A(8x;)AU0rwbWjiV1Fi7+VoKrVwNQw5{H?P;dr)f@`2){8I!Xincvg+9VXP zx-K{q`m54n%=@g7(p|2`a@!ImJ5n8_+iEqH97)m3Gp}oU;_=9<9_MYWOb*jxprTi$ zglsf%L^_f54-yhG$GJ=sMQ|4-C^6_oLVhp`hqCrcoqyV*9r-IXyUC1E=_&?Zg^dt(nky1Spg zPJB(H*XSv8!+?C3^iM=?B+p{;5JYCY$g@9&U{OlAVIb%IWh}j0lbg$U4Egs^$^Cl4 zl(hVy3o}h?X_8(;nxu*^&4}Cx8^eS`4*~VYQwe-e8D#V=+)CO4)ZQiiLOp+o1xRlY6j?1N;W_)AIcX%uUi2q#0LGdb2LX=F}Mu z)hS^uqp)aD0a^P1!4C}s73{ulLwyQ=BJ0jQ_BcD2l|di0bNwNL&6u?$YGA}~WAWHA zF82?^1j=5;+Ab5$HC|WjQEi{P<5iTaVQ^i_{Zx^e^;$b=)usY&9)2)T;3nGK<(LK0 zy>3Xa6SN5lsqhpY;H9}nfnFh_l@~ZV(Rjg)7(gS8p63o|PB1GU$q|-k*V>noZdDjH zE%(|JgXncWH9;qGk)$iCwfxA_{W(1DL9xmclDe#?ZfOLja@~?{Qi=1M1#RutKePC_ zeHTvF(H>`i@^8A{CGX% zBsAai{BgEWB)n{Unb9Inz_xbSCo9v5l|DixZlnITOf5F|a<5j4X$A+u^$j4Vx*g~D z+MqVEqYZl`G3 zd#gc9kR=BDV-KYDi3yu@e9oJ-*;OFK`q{BoV2Oz_wmBfxpFCkVT@#~Crn9DrV6D%Q4Yv*iJ*d#Nx!IO{>stnPy5xiNl zS+0P<#U&&7%JAYRuU zRNNH1{Rs@QLumKP-xZH8KgXmDZe?~?f~6es*X68Py)!%5ZYTY{ogEe{u?y@cb7tke zW%*po_F20c{WykNx-5R-JR1qM(iOKO#|LJOdBAal)hNx^8;t6?Jsn(K=P*-&+jaKX z=f=%;R}O0t{d66U0EsIML97*_J-KNaDk_AyHeeHdx+k5G%~k~I zUN8Air&HApuce|h9_2~9Dyn0#-!IsHxN~c}p2KaU+~7uOz?|V#+Ch$>7-rlPf`a%FOa>Rtw!%+aI4UQLW^O*W%3Kr!65H}_?<^UT>*=&Eu#OWI>;e&)#Lx?TyW9;5SL~?<}yHRfB z!>oh2>3BoD@~ydz0B&yfHQ=fd#35DGrN2Xg1O}N$5Z@XRcbDXrHoIu9mik=|hzg`X z>>^}}iu!J6L^&fx|24QOXl!sobbSoB9~_C zy2aRBClt9=3A89}c?Fu!QBdJ2*!w25ZCO{setVIs50~OqUwFB^@MACz{V)^Yr`ziw zN|}>SAf+|0m)iC>A3|K~#$q$pi|^GjMAnC_D=U2!+_yLk{V+ON)C4Yo_qaMLr_C1} zgetF{@Vo<;#;$Yh$0c=GHcTnlK;rv;UYmk8CHwDG{2X%;V%qCm@hAgbnW6%P#!+^6 zZ?WBc41fL{D=Sv-r4qM>zDRL)r(O=Fr>r?dS^HiL1Va?VwQ+~#`|tJ|mj2;jxbV-) zS@z#;gnAn+-`)?ThU66mc;~|ixx6h2n(IQ(63X_Qd3%%B*2eAMSZLKWHak!ZqpREk zI>fI5^&W`l6E;cjE)*8|n=YqLzd|DMnj_mhrF^lsklY857EH342+&MyfhO2mQ%w7| zp=oaMyl--7k9L!&0yTd1jt}5_iOU zuh1%f=Lxrrg-y0Z2$R$w?J7?G?r1Dfp`ANvVMBbzGd=Z0f66hcrBxtsjPXOyBUEi2 zO(iv|SHAm;lU;}b7T-xRpR7!iSj-Ufq0%b?5yY%FD;^EDjjLml1{x;KKlPEY8{r&V%M!+JH*v z?XSA#_fh=5aU8oNB*a8hpa9X>m-u9i#8o7f0Zr=Q5emrk&_c@PZyZ4!seA zeX+)&y#*Q4LnYD5%~IgxkQPlvqfFQbW1>a8oR|>{R8+5L)RMaNq)_{-#+Y5}Sd2GQ za!iAWWg=EAaKR=*!dsYK_BU%sr#MISGEZm-TP}Ek?5jFaD?#Z`-GJnAGNETDBMRc^ zia!k->>kzCOe_YV?z(Va0oCy$oxOc;ufhE%-_lBsygi9KU*X;7Hg*3J^LSs|j1!7( z?Pa38+v;)mx_WnIzsqNbJ&$}A)W_<=_CB_Lf+|Qu(Lnc}8(3=ZeFKU2g$GfP1_MV2 z0f7bqVN?+nL^cfER>T1T`HzMT0+Q^74vLe^cJ_@Fz`>Rj5&Y$vah};}vn$as5Z=Wv z^ytX#OO`Xgf|WCky=4-Irf=6hm)h0^X_PnCWdLHkCjv_m!&2P0B^0{%*Ecip9yCAk zn^ox1eYOgj6P>bsW9#ATw^>r<{xXvLP!(>ciPFw9XCBBdf{&Ye9uOVYDX1JD zeh`Q|;2TvA($8;RAh1VZ3O@;bKwm)6|Ie}i*CCxC{tJdl_TJZ~Yps2+hTU2?XU#*$ z#&sb=*TV6F+9lbR`WMGF3_e0#Wx}_ljk=3|gfC*TY)8#(jgJ_9UW`tpRksl_bs*AR z21?FZw0NJKPhjE;HElBT7hUMUWb9EiiE^ui3WsRjfVW)^^rAJ{ZOeG}hH9r~eW}c)cbY`X;~--pvaI;YEXIr7OF=7Q(i+Vs82=Yrk!`p(kVIEZr{~{YW_|hd zx~Fr;aNqbyxTn+a?Rl(I?9Fgz6X?%uqt*1n@>d_&xuudxx_ED}wdUAaTSXw`gq4|P z<;_XC@UcjC(bJ}5&spRczCl;46L_U>)tY-TX|Ri74l0ey*}n;Ab(j(-!Q^&%HQ4-r@(PeFSV4xqedh{%2F^7vO2so* z*B&3eBs{L2jrQhYp zXRGCA$g_*|8~w&5<_M3i_5HQnsOMr!{JKpXM^PA;Y{F~IXEz~e1A8TbX;O|Uyd2>O z+sVW!(2wHOp<5iL7Xh~(4oI^B2s%?w_UMs2P@jGluSw53ci*z0{&O|#V0*1a4vs(h zY#yv$bB6DJzy0ekU&p7&So4n0Q#U!7X}=dLZa?B|c_fVMqK1u_x7vbFaYcKI}ODl+DJy^^vNAUm(w$LvGiZkSe`8cL1n|Tc_Eb9>mE~tP9gR zo|JlSZp8PtK5(+#bpsj3*4O+-T5) zJn(5%eYZo0!3L0(w#465z@9?lM!S{bNUI92Y`3Q|KpkHH@m`Q2UCsXBjxGN2PF>

      Tk(;i3Nmoin3AoelJ{j z$l2pxINs~Ojras};DvW)224e1E88glxhs|Il{^o&phW^Jh5m2+fw``20V@m5S{3)2 zZ|=|8$DXZ+-(3S0TWhuC)V=fSW7wX*4TyO;cXv|c$1Gx`Hgez4ufAk$P-s#4`%+EW zMWeklw|{4vEkyM%Z(`HDwXxKGr4PIOX^AgUz8O^=Q6K#1^|55u(0q{e=C9HppvbT` zYdtG9#vlstz49b&UZE+;6C&L6W?+Zknk5Ve-zMpbuBHqipc%r@s0Fr^6=~a;AC!icl~eP&^t##FkZ0rWx!}@f zwBp&Qhdm*BD!*TEJjg(iGaD27$+Z!7HX!v0F>@cruDZ=e!=KU&OI+^d%>2-`g| zRBQy$7}rfQafk=Xm0{^S6sv-tvCOPHp|N1u*#nt9o;?mpd^_+Q#X-+Bn`zTIds^u5 zp~V09!se+GYZ|swUq^Tcor{RF)|p-Z*3v;iHd4h_C6o3LT?hBG4VBN3sdqoK4YL|3 zu#kSi>R)Au`WSUwM?uRUy6kMx#{V6dK{l*ObBO7DVp7>p+;Tpdwy3qOh#uLvZu(5F zEl+5HXN?~0{6Uh{)c;0a6Po(FB$0)$@1VCzt(B#>^ao=#4(GXJ@##1V>^~;c0aC{{ zH4alRyUVay(8s=|E-9aD z*zo4Sxaqa|pnQMqy-z-6n|7&5xTW?#Y*=|g{QS|A-o}jpC14{EF<80#l=y0D`7Uky zVv=x;M#$jr_`L&1sR{c=-!E%^UmQhr|-k{V@43qvVNq7*hI!fOD(-?)71u;>|hJi+qEZ zL{evM?c(x#Ic^1kw=44X=4(-w>TNARnVDU1od9=A-*;_XBGBZ5)>@pq#fAV^XcZGv@>VED0|FORVKkas&g5rZ&mUe^Z-+mq5#0P?= zTzL7W1lgmBFm+Y)Dtr1fpheYao@*Q?x{ax1t0#B&2p*%jUcA!r&j&|0b?zG^PQ*Hf zLr{+PwkrCViL!MM`2@|H?W12K^jI2uk;h-KXfQ~UC~=Lcb*@i1FTdG) zb6|b|ZZwbvT{AhRZ|4c4dOx6z0(ayJxg~@K@i^szXQ~;aorXlVhg?k2uQ4-emsw9k zvkH!nPIUMqmAqjxyAvd%Sr`qv*p1$xRj#^)bSiJYTS+DhZfBXbQsPgc4&G0}i2Qk@ zMhc0)($tS_$J`w>&&1N4(Ptj9*Bujjzc;oAdY&MUb#33aSMvKM)`+keq8{!e*5z83 z>7WDt(bZnkC({mgZ??c65F_4*ilPe{U-=$BQ)WDiHNrU)rTcdrpwL6wbEK2$&6P0)Op!u{)RuZ|EB4lJ)e*cH=8{KW@Ufgq8DnWA5n$ zHWAKKhX{R)DS0(F9G)AA5w)jdT(`OLxxHN*v~`{po+D|Xlx7`;dEZ1RnmgqBn2&Et zg)NIs*aaF^KWlV62mfL?A3`NsTdI}h{lh-fhF_e^s8$6%=l|HYCx zLg=0FEGY|aFu^fXXLC{uCm$dL-gYi+UXjL61$yq*&)YqGb*xGw;O}ShpSyFp!)Dp( zRaw8v^rb+OTdkOWNW9i_QGE3C!?f;SPvY36zDl_CVy`##^Zq7bG(TZg{DxKxDXRa% zGTiC0pA#I04XQ5sF@^}5>SXoYI`>x{UCZ0-VefNUyqU_(famKSY5Hma&7xrM)T;Np?gX!D?Inb*^g)Tq>*5;U!+h8f22wMc@EXi+eTS;RAfKzD`KFn zEH++@;tIBejGcrqwACdv8+?jcE%@2u59Kk0d$*?&uu7#l_}NQWQK2bUgDxnXHYs`# zZ`|#!Cc&HB+n=l39G=%dM^&R?{V!oqTK)RQpuy>~B%3b!C`C*Belc^=V=Oa}eZjj7 z2MAq~7BsBvcXJt0`=$Q#mx_i81Le27^ZpZ>Ge53!S-wvsWAI<{Ood~A`Mx_#t1GvB za2FdA0(7e!?V{5{7U;_V)(Z8fF4%b1e4pJM#6ufAw1M?3z~0 z9B`W9+N;bPlCYX9uW%V*yKjR-BDVJERv`sde>rnn{Ef4+8m7O~d30N`!lwTCHdI@+ zzEPX5-i*N?+PopxqI>wb`6!3rg^p!Ni`L#hFkNo3J%>-%uA=_q3QMVNAEyu2(9I1M z43HaDt5<#vNoTfLnv}sd3g4!eZ28L1J?|-1;D60pDrn z-~4FdJk!U%CKFueii!d|hTl&u7L4xfHKQ8JCiI3a5b8vm$>u19i(km54(m3Cy=ED= zbl*H-%xh>;<3(DzL?BTLA|U3RUON)4{?7@Eg?2vzf#KbsA^v0Veo2gpGDebwMo`MGQ7rNQ;G!%B=Ev+ zxb)`^UlauU6U)0V0{2)oa+y@3#n{o(wWzZAR(p#lo_4I9VxdA-tXT`l9ciuhe=agKBgf?;1s#2%s<$b%lDv1(;eHpDvaE^6BeyeYLc3H3Ahl9cy~acyMk z1RM9Gpa0H1aJ7ei9+*sxv4Xwz1$Wzg>YAIrK~1 zuJ<|WIM&Aqi@DNgP8QM^#!QP^E9;XG3)%kI;05xBbK1F-sUJqD&4iL%Zi>(`?Dmf= z`1z$pTnDM-t4(Vb$=&1#s#U9Mz{3bTX9#*zxS3f^hL!*Hyg44|4d3%~BuM7Vbz7;V zqE^@kFRhgnS}Mq18F>Hk+5Ga|xOfNZ%(5s^pf5mB{08rCwEOLiWH7G8}nZWs6F=vMcw{7?I$38B6@W)Z3oCSw1}v40$S`DDFhJ&c@+1Umxjgv#Nw@WB*7Z#z%f9j2<}5mY zx>&94H8tDd0c@i|RoO6!7h#ZBfF`-sOgQ0dx&XeJ{2Skrk#c4eMFSrfL-uI+#j29` zN`ALiz4dqT3CxYvmxoQ3dYDW@{3WA8=v|$6U!mH*eG!~NR8OAJ#|p2GJq6}u4~n$P zfI3^e8YOL}pz%e^i_}{IGC1Ol=e(ABL(9N+=5D{BZVu z2=~11=q4~4psNN`cIefp&!Ta!Uo@DeYR{@yVb$fLn5Jl|M{DVMxbuG3ac}iR zG!xTm^tLUFO%USTrw-KbNa$S9B!xoP9nCCV6U|-K<9&jkIw@w8Qj9Ul?q0Kg-fwy0~#6 zo!B4jZkCx4W*?rZ@M(Ilzd2g-4-D$GkpX5}H`SLN`X8*e$AOL8t{J7*^KjA`DIriC zytOeK6`I(!w1x!tTj%?L>nWx`Vf&r)KC*;Yl&3Yz)XCLAn-beHi?H0HuE4C*$uF0< z(sd%s=Uhqw{g3E0ONM3f^tXw1%W|x@F|D~?;kU#62?vXXL9~BFE{6>5!m4L) zqK!!I=55Gfv=uGNfJBp{S}5P*O)O<^G~eW7)}G+Wh6_eWlw@^HD2C@Iq;q$jV+-!u z6#TUDe?l#FI`|QFaXrdtHSRSj@9((_Zf#PrutZ&Cyw{R;E1g{2)F*15OT>Q@kDqq{ zM?+`S1O~7iBsKQEiY~Datgn7t`dRb#YXAr08mg17YPO<^)1of7<#Aa(dU;a#`X2|r zOon3Rd+yHENT&`KXHAZu9MK^Omo$rvrkC=*3MsY3 zXh7%zIC4}9ZGZfs_XzBVT7M}62IC$6NOz(yZdP)eS>N0 zqC!Ln+3z6jB$W@_3%PQrmKfRn4n4ON%F#Q`$OWpiB{pltT-eFA%Oi4mtIS#;To3cv z?S)2qX3+&SDg|(@_8-X`>Ezwz;%O|JiepT@BT1L}yZBo)h{tJ7z0;{tiauDr1ts<) ztqNxTm#!iS)$BEJ`)(PQ?sx7$JbTWqpY`zXcd;qU9JhXHe9`XFK7{=NgWJJOd)Vl) ztElCqnHT@?TV2LSP8Ub~#MT~grat?@?nk?9ciK2WD+3O@)SZP?XwJWr=GE!Yc*c9$ z;jriUv9MK#_xi?EUgKPKn18_iNaFDD&VbbNFmzi;2_kMk_CiniyNE?tu(x95Cil(; zKS5k;kY00A$U1mgcQ zWd47r1^gEj{y!}7{~Zwi|GyUSKYcs@|7ZMPoAB5Fy655l;Su{k!76HN8NR2bUL;q2 ze!~R+55G(D$mcgA09_F~$kfy+(_C`8tDx$Lq!w;8Cr_sT=ky1iFw2NUAUL%ITFZ1e z3u{mIP)}syU%Ci*lma+}6B^>700}7(`hpy|QfL~Xp$+Yc+OhT9j9afut{)BuPjuNT zpIqHFQB6r0SatA!p&CHBP}I!T%>(^(B}(-$xu}P7J21`kfELNAvmg1|GLK+{zMDSh zKQbl#NDLOFD$wF#tiW!3^1G-FEWpveMW0Erl4DUd({c8_oRbCkQqD!fJSaVeO}qGc zMKDa&LBAE+s56C`1_GXs_5yH?Ga}9)t8pGh_^N?s9%5N^2 zcV{=lYzE|a zUrZvAK0`r<$s4+@<$JPvLLd1q7d@D&W~Vqbncpp2x@TR|3xCpBsF$gqgd{u20??%o zmL+hODb4<3_Ib~7hYCA`)mwKVq+P%{&$3c+by>)x@qQjS4AUEB;EU-(ODg+GedMYS zBS|Gu!2p~|iTwuDajVs|lgx+Y?uhsf38XcmHz5KB!G>bD;P?p%oLPoy6vv`8WKL(L zBg~g9FVb9)8oo9)9uN?$d=U|-98~K4Vk%c-fPr)DD3~JNdy7P{@)3_|6c^Y^jQ8=U;qMC`9FL3kf3;g zcHAmEs`sXHNy12nA}V>L*o=F|3a8}1a^8uHsQ5*65g}BAFg@QbiJM4!-*z9y1_U1> zLD+(vY@ET`bSTxJ^{3aDQ?Y!QlX;g`**Uj9I&#*I)0cL^M*m%(pfAExC*b)ip5xs6 z@rAMS$X*hZ7s))v`p;NiL*m{w6YqW7`+qk;nJeO}Z|7cpPt}7J|0~M$fS1n-?C`c%-2A}lsp0x=qw&0G% zp1uWCa20Z{(lI#%LE1U$&EMJWkA)1XfU$OeXEwEw*e`Pv&u#r`%g+8!E!`BeAAHdJ z0*{wc3{{b*YC?^mDqRvgZ8C+{4aEtV$`}X<{v*eTQ2uth@789vn)8hjf5zbNb5!_# zDk>1kaj;MQoV@f83MPb*tq0iA!fno;izfdF;V@FvIQ}1HU3oZ^-Txj#vW%GuLkzNv z?EBtWBOzNTTV$7g%?y(#G-9$P3@yYfOWC(-Vv1~$T|+eJoyrhd$5NKB-tX_dzTWqD z{&}u*U+4bZpX)r&^T+3$`#J|^b+f-Fq*`^_uxaiLD9l_$)|5fWql&H7_YDyk)9YMHOYHEHFIxc z>mT2J!hRNA{6Jmln6U)(4Dfn?@CE6qBdN{eiAUj&$`Hu0o4UciNe<4|CM>X1Uu53_ z(A!my6SB27RZ8T(W#Mzm3p48MgIuF1OOm@=S!=QTdTKC-fV?0{4192EP@_GRE!8q(5*XqA_UiIYA-mX9{O`Dw@*{j z&TG!j@yRsPug-9V2S<$wtYd-sd*f2mLOq(EMuK8@$IUpo^w_>vN{SYgjf-S8=?0C& za*aS_h&4-En=z05zpEO{#eWT8b&Z+7T4QMKXCJn z?DGciDv1B;0iAoadE6imcu1Tdw0}YyNf2XC?u#9KWx|Gy*mV4PtrEGd;kf*5*DYP- zZThmsKoi+R_{zQL0vv7eR}iaj$DA{&wnp!Hwkc>Lx}YLdW<*NfK$z)<#xG2KHD7wd(JRV`6YJ!yo->iRwx1`5N#1dN^QNnKD<#Y~@1OBL@{k zF5fb5E4%+LUg`6Zc(-Gu`n^}jY7>FvVwlTr*T17s$HQ;6n+&XU(rV|sU;VPe88GgL`Qo{P9H6nrv zj?$OU3u#yStTzN-9Pv;bJ#p&m%OSaq$&9F)&-wMk@J!<(v!jl7_6iYKgNTOt9;MeA3b~eXH^r~h$QXG zTz0YXLf6PsLvcG|rnYZtMN`T-ZBE%!)d|WRh(8|&7F+c`$?3e#PeclKf^aCIwmhcb z&yf08B1e)IsG?>_^wI2Kidl`wjzp&7YuO^f zLL#shXhN42f2JA$u=C;iE)dKig$D;LZ8RZM`5k%K>UK5H@jd6iwu4KxO_9HT)AV$y zeYNb0f;2vmp>n9FR7^b5=Zrx-yM@D;*SnfW$hY$EGu;6GlM|bEcV}TF)y)wW`E7k- zd)A7-r4y(0n2cj)cK3w+lWdJj4EN`ignoT6rAD9tPMn`xuQmVKFzCJ1LOSc3P8MQG zU$!~6A?y@Vzw|JrmG6Y{`?OW->~@hl@Ov;XKTowt?7&5foES?k=+y>Uug~S4xmvh7 z{D;!gj;FwVJATK4YxPz#Yz!CKYIn? zNPn;MLILE?ch#hD1X}}>-*u0?`vNwLY_r0V<%Zf5k8N#RjIOxMV#g%V8jHQrxptVQ z;SVFq7cbCDUUw4o&Ek4DF19#62+(d6IM{9YGB^WdnGz%xSo}s2RXxzcQB03xS$+q< zn>I#rK0{w#WAjX(ZDfW_)6-|py?5jr^n+FSDY3hWgET=pejro!vM!IhO!w(~F*dllro&Tz4M9*2+D0JZ=W z76zCYIk2PP=m({AVQx)3^AfqWb;u;YvTuu6xRxE?JnD#DztlSFq+Rr0#h%ET^lYz& z>)==$A(86bN~k}$N4JY${Uc32QT`9zGY)&%)^hUGSfjZoMx%Solxp-MkEzNuzRo7a zi(E~@)?rG>^SM$T9Yvxa(sr6A)fu;f0j)BM%ddt>yJ~W~iX3#ft{wvK99^{R=*~JP z7GU);(+X=W2BTb0#j1VPZjPUzp9y@Wbl+CKG0z6ooa24%a<`}1<|@+1_QUJgPh$Qn zC(|ferqwo=!x}APs-ndNT4bhobnb|BXwxz0-h#6oOG~H?Iv!7RU`9_3TDsM;0r$cW z!KR;beo4piR?K^rOt<*2ziQSmU49+Kvo&q2F|)tB#1uX!&($AVhLCak;2dNpYZoc0 z`zm0M3Qf)-U`)&;m+f0?8%t=-_|3X2E_=ZoP@K0vmZlD)GrDBvj>}yW@W)uU@47Q> zZ&T9gtY@&QqR&Jmpk%IL-8>cGe)%}nk2I3Zy0cHpEH0DYDjA!vwnlZEGRWOWu;ikv z!!j1KU7O2tK0NnMY#{G|_+Rqv!n?qCGb8-*tC5yfRZk5Y&*+CXt&EyMsg()M2}SqG zD=J2q*dKAvx*^BD54aD4+gDW!w-(-$1I>|3PCCxR5=Bmk=sPV$7%Pw*J;vL-HC2cb zf{boI&X0`#x)yB#NjJMy*?Z&~XJ#5N%$2v3%AC@5J*8_PZiR+(!;aisNfn?zn0u;yKwwzRS0c)ABJIZ0>v9jtPR&QSMj6a`dxevW- zU;PUbicmAp7(ZS1iYF;cxrSo|9cQqs*ZDaH%8$axBOz@-!^@O*hI_A@#D}%0r3RkC zU*&Hl;YHU?z?STzA**sOw>GX$^|0>ieB8Qn=VIkWQ6$DXe1hKs4@-M;^$}0sjn^AJ zq^52x7wB$G*6|g8>z6MjsgUDAgO1`MBa;(~3i~NbR#qentt{^CnYd!K&l4k})yQfL z0$(x3yoiqk?(kV|k0`!0z|*C>5YP346<(<7bdq0J%*eLmtUl^VrFz@kIpK((e0WKq zULx=k!AjzXrF6f9c=;>@t5Yyiv!l?1)mG)@z1!Z;)-u(&lG6|ze-(vVDEqP`>=v#c z3pAQ~P%ru~a$D2wN;Q2FXo=IK#HC4~Y?Tf$SeYS?vLK=2%ry3clI7yROBMqA39vX| zYZmnO)G^8|7ksj3(A%z1!@+Q#b(rzO^0W5MPgJc{xC+`c<7^B}!&px>(I-yaQ_wpj9~uB&8K12Wjk>+C$wWqW z5dK&wyP@Z<-B8xKB?CWtquZHJ;pjsJY6~)H_kC#WFVBhxtXyZwy$ih)%zgnD52zxFv65=?)N*uozKUmZE<95 z!oi#b6K*i~soxTZltDs=J0K905X%jgJw(=q5_-A868}ROBcWhID-&1%`mgEMg&$~D zLJ3ZAu=xLzLHt983jLjt)PIBi#S?%Lz8~-oAvQ3ABG2E56VE~HWEdfe2dw&6?8Cnj l+dpE@zzFYoz`TErI{bNX|6>#gL15wqpJombI9Nge{Raj?tTg}t delta 134255 zcmbSxWmp|emo4t@4#C~so#4UUf`{O)jYDuaXmAJ++=2yn_u%gC?w7pZd^69?-23PL zsouTzs#Vqf>{WeEbyxMkRae2Ge3FNR!U6+>0|Wb#eJL7`B8&X@s6$$t&H@bv#!_u| z3Xaao!^Fm`&d$cq#mCRa!_3D4GKJ8G;N=5#LU4j}fo>r_(6DiHnegzLF!8W*@v-u8 zF`2V*eE!VA!(?G@!NF(3$;8LS%3;RFTPp`;HF2C9T60aTn9dC~mZjp8r7 z<;XbaSmB8!dt@^!SI4Tb8X94CH0`qr83R#&=W-)_+O&=}LR zz(G5zvg&o?j=PFK04BkV+pv0PefAu5SN$@FJhmt3uNf|e5x}`e5S2^y7*#L7GGw^s z^(}$P?E6u&8Tx)QJfMpgv}|kBYPceoWUf3LI9#M>Z>_LgGNV~K(>${ypdP9F^7!~W zxow3B`P10Lrnbhy;amyYg;e}X95J=VY-6L z+uv+k?2{9p2PA4oFb&=&TH5Goo)FJ_+3%Kb?oviki{P^v9l1i|#F2i>Q{(2`VU3_c zvmVq%%dK+~`!1+7PM!OIz>>}8$c@DTNUHBMhS6rxNFM1$+NOjO@xM4{^gnH^s?@1q zwHPjiI&EF2GXfEt_EZyi`^bF%)Pbb0vDjgnAC-~;p{fT|k&TG9n((Arj9n)s6Z zdJ9Pvet0tztRosO>IkENLJ*Ty+dAUG$8lCR&0er9vFC2F;72`-Q8Fg585_cQebWH9 zo{T?h0?(nlHhIX|_AqA2e%lrg9cEpUVII98NYK=9TFpX_v7q>p$wKI);ugjPHSeL^uY?_-;3=qPPVGoF+J4qDtIo1d5j*_=e3Q58Mn9E#_2 zao7}ApN$T(S#Zo?#D&YcXfNewaTlF3nH&fwA@kLlqQPcCckp$&jdlX8SD=*ijS|maB|1x*RGSDHY!BbZ@;RFXYHX@0PeE+uL zqXc|img0;LMF)SOv;a5n!Y8!zJ0U>fWJ)4rFkPic9A z|AuppZ8_F~o;Zpk;8}n*__!I^G?@VLlJSM}W*cWyXQ3xn#baLY_p2D6_(Bhj=$9u{nlQBt(C4oNBAz(pYhwG`*LKjxK8j820YYs^)Y zYtRIM#f?f*Q*(&n^v{~TsePp8I1u;#P&=7aaSbL=i2IN&c}jww77y$HF$1ou>uVta z6#LdT`f0ZJ{RYe1#Zw12N$Q?n#np7Wll5J6XGZ-}b;hc)y`3Iu1ki8)y7lz7!D827 zQ@5}bvqXZNiix#Uf!P5ddn{e7T^a#i9G4jl6$g5+di_MKZ?+SDM<{6&YhI(MlGk-Ri%gRZL=^xWY}etY{D49^sK{Q?x~|y z96*si{n>yeEF)_XF{yAV${;@SX)4dnRBAw4Udh`;x|fXLbswW*v%Qzv8L}6z(rWA2 z_4dlq&oh*f9Fb7!eu0#8iWg^3^b=@%R$HU{uV0H7v$!(6fbY-NH@|~I96vm>v8cP< zk8gDQS$>^vH!$Q}^5tgD4=djzW!8-$O;!5EPJ&@_tbpn!$nDZfrk{FxjfDAA1HOM2 z73TJSE2e!&2Jkj40zJ?oS=z(K2otqz2KAD>Nkow~2F% zv)oWnAmkBuT<^~7+;s@EPioi_oFw$guHainvnxvf%I3(s*w&6~RxVar9n_AkLJ2mF zDMXi7b-CM`=>0r$FR+1Y5C`;DELilS*etz1wL83G1AeyW?T*VLt$db1YPO8@w2Lth zL~TMWGUL-h5f8u~R`I6f846rjSpJqak@`JeAAzbkcU*9AtbcxvoX9sD)KVQRmMDp1cMc1>8b9T zj^&~h085XbQn95Zq2$GCYGu)XLxj=%J{i}QC-a!65^Ln|6f~xdlPnB6zc}U&So_0L z3U!*!4=j_wahJk5&nVXg^=(FP~Ey2`GVjQNiMX z@?2zV9V1*|W#8LGYZSPGhI_SNMTu}sP*!V z6X-bN=Yy$h_$^kf7x4B8it;o679bsETYJ_-QztU~!%i?XZy5<<_Ca&uWj2s61QUr6 z_&DNZ>?Jfz2XlH}#M4~R%Ki0ze@TD`4$bH^`BqtJaYIM65g|ecy=ht5{%a-P@=oef zr`MS6BRo-s1w^FwQGSZfkyQEhh4|PlheW*&581ibrDk+9{dqc>V>SDDJ904XfhO{43i!sQ(3! z)&FA8p0a3!k+PURQgEBnQ*irFXTY(zb?|u8_@8_;ul9RBdxRM!`8`il8yWO2{_-Db zfc-t4Y+&>E@IP2-jp`$zf^A2ZW2awJz|>rQSs$KB#(K&NkG(GOg)_dH`hKSNTKasp zv$N_?G}g2Dd5f@tQ=a5rVMGPM_b|ssfez!im>N-0avf}V636uk<6t|}*=?GCn(Iz$ ze1rb#O7siw4H4Ow8lF7NuP^iF2~^z0t7u*X-e*Z0*0Me#PQybfxKN; zPSE`bTjdt+_c?_coiQ3z$W-|$;!(=H855;Gv|K#Svm9vm)JJi*%|}h3<0U7Sd;wh$ zIhO~6^FxS@OT?*Vwd{}@2x%|qJ9yyN8SjTLQ*FL z0|l;aXntfa9f6O;(4=hu6hZJ78c-zL$Da%ry5;eyZNlwjvg6``t}|AOpOJN!XUJX1 zIW^(6I4c1&*SO`QWDm7-fDfZrhXv|LvS4h+EAlIapR#GLh(@7@R4n|!U_Od?6O zi%NryuT0+$pFsoYYB4^bz}tK@fdb^+3dip~Nt(C!>)es^Y~2zdGmFibsr{}fNWNIe z(p+KN99yQ=0;#&mAezS`x0eu4Z&|KiLS$YH*1Iybu_~sY5jqwq!!~5DgzuLr8AH@l z@{Fd=yC5_m5A!-Sv|n`xIgzW%KR+%5bI~{Sv+516$*PxSUKOur|He3_Iqxv>qK z(`{nSLWAG)-c=l{3gf_&f4_t#5cbFn|Ktz4@XzY!$W@haZ+ zS|Weh8SIp^Y;Az4U1iX?Wnjp>c_kPjFy6cvl(Y1$f~ke!t#WUi0(3|#I?LjZ&dOb8 zWo%fFwp7jQK*EMWve}8Zv6>8xO0&kZ=5cdLGjhz5sVpM)aq}{W@dkY0E1lY+?mRWN zI6W!!rUgm|)${C=9M3o8nm?ZoM%&+(fF*5*w##PhHYdJ;gb>~$is83Mz?M}<({CXm zomD5tgTL#UV8N?i^fRAn?2qR@MIQLw8qvlgz*if-)) zQMBtaqqD5ciZ6eLq2bY~`O~j8-e4@zfDBe*Z!Gi7l&pr8Xy zOFR6ug<6!ZN;8|}4y>b$sz)!Q()kr_Yzv=n3uW^W$Cg4HQ0uZH?EIb}wFEbt!1~Uu za9O}2?2NBRe}^sp3r_w=g6glthrbev|47LFm5~3d@O#Q!?JHFOqI8ZeRJ!bc!n*$` zB>xo-{j0$Bj{@Ca1*X3WM}S<4Vl{fkyF%^IKKQr~NCtnW(u$$eDQWUjMahN9Xi_t9 z2V>WRXYX5lrIkRZ)6C?{%km>FAhiUaTpD*uvLncLiET@#&1@1g#HSqPBc+FsT$*rt zviA?p@Qy28E(-22ENWKiXI@ujT=fiS{i-uAPUNH4Kye}g@E?XE%ArL`ZJ9mB^sCzS z25p$vE3KS6o$97mS~JE--o=^UMNnd$vhW@vxN#Zh^s5@u|50f&ZVKjG829|V&9JCn zrSII?sWOI1VKliLxbvkT$?4zm`|L&jnf<%yDD+eRKeJ3nO#aGDo8kdDVxVuGs{ALX~n|%%fg%Lhc`eOWzZ0Aio&dd~Vgo>IqHk z){}R#m87y&EW?dVosWAAvXQMA{W)A-eDiq{n?uu^QR^4DB%!FGNcAspv!HrtP91k2SWOW!S>+tq<@@SE!AMw{ zg+gdj<8h-tkEYjyDjJ5&%HHBd|26z(eP-H(Vgy1244Yeg4Y+ZcN0NGlCF}09+J8Dq zoC?4^iRnb~Pj;7=dFoj@XaHx%M&F)1gz|m%eA|{RoBx4dM#%wmF!C{fi%S zqW>`wUPHK&h>${#nI=ehPa(WwF zJ&afBgt6tBLO|z$O$cCd@i)<@o9pYD{4g3_I6J1$tiAk8+&5Lxla0G2hiH;cpo8OXBxGkZimy=1#EFwASBS zrGX6fCVq{`Rx%~%?*5p=F=TR{vWaX;<~wkO{ydyM?bHgcm8FvrT8 z;8oheFe- zfR47+Ol=n7hn*}}9C6*7vb{dVCd#|84Ytf+aY~1`%QT*8kP#T_rtWzt3{r2s)49EiT+HRHq$6lBc`O z2s|&{WVRA)a+LK*%YWY@^@c&zg=56)3Vj6$kp}}U(kF1ThA(7ItrYxy-7Vg?73xiiJZF%hsTdcv@Ib=NYuho+@yM*y{Vik7)hZ>4Jj-1T*-KKVUk5@y~%Bo0LhlySP2Z$IWv2;u_Dqw={a8Q z5^|bhW18yTVxRw9{Q&a$p)XF}#7hVVtC8gKdG=H0<2l3oI@Uw9jz~OP z&(Xdu1Js&6NG$o#|IP=)3B-nG0A)mtm)k8-h@4w-^JX*=*i3GGZ^pjob*I?NdVtH| z+YCu77JKWV1$)aVYqLH{dsbQ6v+=>pJJcG3V=&1SmF{kToG??LrvJHa88AVY{Xw# z&|F$KHSM$9ePG2gtu#}Qt{3p>nyZSAjOD=%Wy<=J9^=?=Y#M7!PR6v{ubMS^B{Ndi zjU^EAma9L+w)sXMez*I=lHZB8r(}u(;8Jj|?de-pnl7h$#Egsj;LRxYi+|}9b?_7{ z1?EtZV8`qUp%|w$D$tEwwoM(X;%QlPa*sBe+w}iXe{7POmS^1mGmN>u9?DzKbM_5k z1Ixrn47Q4mp9~{jem75fCe(DJGnpWDRVX{D--~P^t)KspWuAQmw(YoEd4gsPng-`m zSXgB^2MPNzV+}*ta>@C?n+GhOgQklQ$vZGKpf^lQV z>epeUR8(&~3-PlDUa(!EDy0fP)4ekLM^VaMJX?QCaD~UyL90%)@m>N#(l{TNWJFQ_ z`Xlhx4Q1YQf1E5Nf6@;ru*aKCkdSTrT|=GClyhYQ9qd^~tUi5(t1uBAHB6%N89-}_ zer3be?n^Lf{wM?^91QG_qbe}%kHS;WQh9PTM|9&mpX#~sx-NBI)9=WR=Jf_eH_Gp- z{5<>}jQHA+5p6mgzBbq{&aUZv#wDDKc`^HwL9#y5c0m@yEoef)6Ow((SOkffl>sjH zD{qNulYPsnC=4N8Z4o(O9sGHa9|Q30*^b9etrxfty2*Nd9S4@fLI=%o!AxWf(=XgH zov3`^rH9*aArn!1{lRS=AB(FqFK~SI2b4#8;5XyfjUv)4>NxGp&Ve(!Nuw{pps@H< zaQo^Np0ExIH+H|S7hOsH>@JcXDH{qzzvQ8##574PC8o{gw*` z*=QSnS@&ZK5FzxP@Hg5;z2Jvo!uppXT@FNySRrm@Rkk*QlLS>oM zol?KH`Px)fd{S-m6%Z7LxUOz)*Are47!aqUJ02(Xtnxv;uH5XASu^sNw(-KbqL_}M z>>PV)-AkJHw9u?bR32Iz@@{UXq3QQdVhmuLTmG^J$%*q@X?Gh1B^eM9$k8+Rba`5r z_GS|<2bp7*s~S>Ij+JvS!1SLCcIOv>YynTRQm@YZqZLcVvXr5R!-OaHP6PfW0z|;NUTF8*Zw{!XH=V!@^@!A z4p)w9%&~l1u=0hsDmyr>(zihAez;$LGnCcYkzzv`~7m8YILIo|(K1p21(O05*j#(gg6<6|K3}dGg;E z7{yPEIy3dBY1LYbTz14Qs+O4}=DeD$ktJtNCjxqU*_(aNmR)(FI9UR7t^EQ{8tz&Z zNAA@8IFb!3S`nrJf|E=xj33b&vq>U<;26v*wuK}HX|U{jP+-|PB)P6 zPGx^#PC9N<2gD7@+!XUBE$tpAZ@TIYT+Y~h4iec|vnS}fofdC@cJt>dhn&ND*z|aF z)-Q_oyLEO5+|}E5+R@|Xs9mocHOvJSHpurep-r3+?4yWQpik(}llq)Cp?VMu)RFBr z1pyz&F`RBZo}SUOdp8R8BWnNrQd4}s`}&Yz=`1Wi0T_*Vb9&)3xleEhVNY?bRu>wO zEUvIkUp(cgRR$WGSh7e_IAI>@a^D0H8FG6fP}pn^7;^}vO4pv~NI1bAYWvatk;{ce zZ-POuB}Eq4@1)!tBkmqC#wp6Na#dv(yU4b1inEEypxoXTXV`;am-uKbLP^9#i^04x zmO5z;1)R7?Gx_W)1B6YT0v8-_rcap{+c8#BlPgx+90i28t)rpfc1$k#^-R;&99xqJ zkIN774WP?!SgjHi@n<_e46ow5FKnH9AfLv}rS=k|-Yh)u z=wW9L5qG8Dss&JIwBGe>1Z6_NV&vqf?Bb8>CI30Ozt|N&mU2PkBze+ow*RFl;__WG znDJR+&=VV1)$v0ekqFr7uz>pp*A)t$?%+>%Ya5X~H6kJmOdVQVhZMhaapk7@YyIm2 zLV$y1Rp6ZHas;IK`y8~lwKji$pPVn9&V$Q4gYsJ_f(MLZlF@O_C3Q5MlzLbB3L~aS zV(IHN1acnaAhF#6I05LfqW_hu^(w@jb~)YNoeJZfHZoKK9=gfYqlWoV@4mj>!vG_?l9ikh!=Lu;qN2|WnD}@n%mAp zE#C76%6mnn{=zEuEFr#|6$?8c&ZUDEv;PDFA1w z_q>ZjnbMzc_Y7f)@4$QBE?Sm~=@xL$Fwh!+or6cA=|4<#Z89$wMM?Id(eHFx9ukLA z3tnO^>J0L!eCFW*`L)`pf{6Hp#N0E-pyvu-8=O#~iawEHuo!ctCqw0k6NX}cS>nz% z3}y`9id{Un!yP&ri{R5+CsH+M zCgprz2RO47Ob3pTsHER7Z1H$ZiDP+vbiuYsr;ZJtB{*5d{!JOJZ+H;!cGqHzkjlJ}{WiT|@Mi$=s9wSUl&X)Ks<;9Lk zTs8O#<(tCEme+|#Rog#E_de5&ulgdDnS@0~(YsRRZdW&DixFA(FLz%sNwzwI-)z(? z$2Q)Kq8IIXqIGMn^?9NmcSfa%2?E>+W=b_%XBqKsN^2vRt{!Ll0|7^`CH9I6y*{az zn$^I5-8ty|o8sh)?~X5>jb&V8!kyVO(~nZEH+9B7KN~8l@=+($W*UpRb#H2yBENJu zHrX!g^VmQWbtWSz=L|w8DXOjYpG^_g#5%;u0uW*q%4P|Hd>Zk z&o=~m532UFVBkE5iat4G%`d7U!uHlfjSR->&-pbPh>|?{ubn@$fQqfE-fq!1i_F*n zmW2hH>SbriGT;Lv{d&9i^_lRCx9G^PPOn3qHdjVf4v*vIG;6&M8lvG0Qo-m+CThf8jo={qRC}-<|4;$J9F7XtLCC<|N)PdMD#Y>VFu<~Vqp0UDJM9@_hwZXK8X3>3 zR964{yge~gziWOIN!a!&tq+=sG?{0t zM$`j0R`lV|FpNSUtZO#tu~V#yEEQ6o4{zPyjK@e)CB`|3!BC*t^AczeO}&0W7(8_m zfK6XFUCiEi6`H;n%x4X5DlC+JRzi2gto>pbGYph*Gw16|VFVXHIW^&Jj_EH8;F4eH zvPy1Nh*K`C%iCRGQGb?WfSjjIc94DE?h-bZ0I{$6D{R;m;cX=jO<=W(iVl+*jgkL; z{PbCB&f^%ws_MkQ0evyx%-B9IrQ07;M;F)1yD@=rx`gjzkwEtoO4zDIJ?ExZU2$I? zau`tdyh7OgG_d3zqe_Wwr3M!cL5o|NE%A#VB^^uLxy5VQp^a4`(!7lBL9~(ko9BJh z@E|UMkyjQaMZbkG(HOdyN;q@NwfD9-RO`I5lPg@Ym@{PUiVVq*)Byt}{H}bV-?}&` z%!R=v`%`=nDq(_9n#=C3K6C~CDHdJOZNmT`Wlk&^`eC{9KxGILO<$zXvld!>2vSrI zSP)XR%vT?~Vcr4RxCPqb1ei<5@AnHgqjSHGAXGw0<__vH^cgF%*BSfY#vszb5P=zf1O@T=1e4EsJQ`#rG}z=K;*!K{JU_NpT`h43R;wj~2&;?00*Y@qeL>AN1_5SMt?Re(*v>gr6-G5#VaT6L z#H^0-A6rB+$VdeZel5-tBga~(uo?q3eH4?UfzkcZFbOv4!a+26tb>lP4nqiWTG1IQ zN)1KSrtrmGH0Ty=P=hltTo-gL!z6i;nu+GtjjF4EN}j62Vch9l;hf`M?Gv3XIQXN@&@iuQit2Ii1rmggEp0K zIYUY7MmB^T8VMH=zpc)+u_2$fDvlpT5b3VL z7E-h&>*;sOwm^2yZlY{4^_;r&HI34oV6xttn?{}|95Cb~f^8Ip^|#oCx5P7{$>aO> zZ+~~dfOe~s(yqq7A305qV!)%9{(&G_FVsdL9I43p3(OJ87J{edSjh+B0>!`Q9QsA| z(qNnC*%|g8`x#WuMhXaKU0hdg&yc_GLzB4(n5-!-D}kkk)FR?CoTqtI2tt1Zk7>N1 zaouRtKKr55Vhy$!39~`qvR{6R`OS3$LqU-1S`1v+UjkMfS!Q(t`z3bYp*PG=(L1_! z7o51a`5NvAClL*d3Ifhg(`p2&{KcRxHP%pc36E1GFH8>-2VTaSi>VdJL1W%)ih_b^vcPqSA9xaItuyg=2MXQ;(AL6ZL6TTdg zIxARs3KJgw;~bJM5k2j+&wwv+KKbgw4POjlApFYXJ&OQisO5S)nC)+p&8gD{n; z^TrsK^3{mEiZ6FmmzIR7`TK}QxbE6hKLaV49U3Fw%sD$hkQla;@>Jft62dxFl` zNdcPn*qmw4yySg>*LlZ5{O%-X$Cm$|z4*V18i>&ZR`roxe=QY#107m_f;8qsE(OBT;F= z71R4B86I!J@S)gB1F>UEKabRyKo4WY$I#9;+RCOZ}< zmy@htZ5t62nQk~d6;YX9SAs}MEeb*G5J?ft*Z4DihjWY}mR;Z@%-nSEpL+mgAl+b< z^<=i#sg`_+;f~ae4N{@InDLh-yN}3!nD5x~Lj1k|@n_^yNRxraQ@Dl@on$8J$Wx*L zH%IX4xfu&bu$@TC-9msrA4PhK4?-?NKMd4P@gdykLFeb#OAD}pgODS%c8ZT{+{}H& z2rzn5{N5g1@GK6c(qM8pR$|Z;f0)dCK`~sEK=~`?ZHSHZI_jttiQUh0h6C@$=u!A; zr4*MIBoz2 z407V2*{dwSxiLoS`H2j5SsRt<5n>Iw9sUWL0QT}qqwSw=3kf&rtOONFV?DDQw3x&K z;Dm}#BJVrk=j#^v=$nMK&4v>d*yyv)1~1F>R`bYE;vk(LT8OZKLw8rAY-T7gy@5aX z(Tc`mpz-m$`4Aa&`(nh?bT2a41=YPO>_!Ad{4DAQnznt0+S9x|A_XqOq-w{WX1vj=|k88pvL z3O)k5=l%e|c8m@q{t(!USvGC*uYjwWmpD9buhFu$A#iO4Sr%v(iQ+= zbl>;QHo_g_K4wQv~aywv=FUz;BzE>m|H>7UFPL7CUu)1NdCWpZNWA3>gLbQ^au@+a^G; z3@A#e=kQHK0~ay_-A_@+_=&C%ybKTNx+n2~t(VDV8=K+a@~h}+`S!_V-!)!i;Q250 zQ|IBT?cbNLGiBCzIem&DtXVCVyd0{E)W3r?u=1j!i`NAhc!(jxhxZ9S`>+Xd%4}a9 z!>*s_s+88Xt^Pq1dWHB%2}3!<`h8E|;s`2(TD4UtO~B*ivs#Ftstb8o-`ZaiYVOx|16W59`~({DBZe9*OOAEc0icl*x>tt3soP z@E(Hw?E{4b+`^=PfN-Orgy9rva0pBjD=k>-7yo!Hs6DM9xW>sCORkYi5v{Y%V$eRl z;8^j_H)-IPz`FYvtD-{_rHjm^3@z$rZOr;#KW5G{Ta@>@h;6o|tsjgNNFJmf_u=Vl zraw+&??H8u(9&~{yEJ537c!8ZSzu$e@D7+43MlmUD@CDexFI{9GmSwD|6-OaU(DLt5?D zJP7SHfx&{Aq6qikoq!9%ZLQ9{vq%YAvsM8gjoxP4b;=c?zhUGA>7T>MD&8JbJ9{v-B!;J4P zQRw}*!azF~Z4vM@kquh#=u;e-N))w8@Wax@qsg^|;-v1Mvk=qDXYiYX^9JXgiSe8> z^_P8Vw3ML+FO(xQGOvu9nq>WodQbX&(S=uW!mRN54cjJG=qx>+Rnl*cZB20>e=#VQ zv6C9eMi}VDp@lc5VXb^fQ1QJ;M3g3CeF*8Em6AICRvKqCbmeq*iK}{OJ|KR-k~6SC zc*5*gJjA3$+@xTZtvbqSdfxsUCvp@2iK?Yn%$Cu<33fw}RPgsc-IptG>+EYvzd2+Z zraAMH40UgsFr9)W78K{)?0lZH<}Rh%+Gl?dqaY;^pFe;mPqhUOH`VtU2PzVV4Dz@mZFop~+*Pnvq}fksXb;+3Mj0fwI9BKz6lMCI5r*A- z{XYVJS8YMw&I>=93E$rh>ogjK+l33o$pqWP?|^$>%6JrG4N*9PZ7}?TqiVo8F;XtwP5viU8`Z?AK-O5Byo^k@ z*zwAn29mG4YC-Y@xr;-OC>N}PU{iicl1$KX!<&ktUHKTR6GT%Wn8cMG`AD=k&2z;E zX#)NV8W*AhVy)X`W#}x?Tr(`@Ls;xY{=626*M`w}r`5NB1Zzlq%c04k%swOLA7>r} zsUAZabOvv0pbJ`ig6)jNAh9trcI74ENgkk1Zxy6MA?jPvbRfx*J|yS(|EYbeO0?^# zV0iEiis0#t&-<S$fVkPltkwcrZSFvTLS#P3Ns{BXemXaij)fuH5ckD&lF=_!#S^;%eP-NY?`D~+jGs#&G*N59tYO%w zDNURR4B4wd)ar;p!GKGm7qvMP>`nntq9{Eo>~uXXR)ULId}7BBPSse@s3;jAB3x1C z2lwFl+Fr;ohxq<|kX$0K*z*N9{i?v(cvnwq@FT!>Cga}6g4DFrT3zD{;;K<7N4~pX zScr^?L^aVo+9tQ=S(xC<%xW08*se`tR=*e~7#p?@1T~CCBzBdFwL~SSawXtu5cW@6 zu3Qh4IgXWUGhc`2#tf;@udRW;is2%TMY;5)4q5gIyzzr##E2n1+%!QIVgx`b2h*c} ztXg}PQI?KO!mOyJaBD3sJZ?pJ449jnVfV;e9)F1SHDlteMG++7L`vF;o$i|P>Drg< zHeV}s78~i4&2I5=nj>Vhm#LT+WL{bv=11;hciMq|9|xvu_EYcylU0-)wTns7VN{3j z#_>UXu$ibr+3wQYU_##{Io1F*@7*fY+C=xy!>yUgnXNuUH$!%w4aS^DxH(P<4egEL znGLij^!kF-nlfqQ-H?$7E?1B4+lHi6_A*MgCS#E~z506!Vj=jfu7b~^#>Nq%9w=}k zwI9gQ2r(bN)SwXsFlsreh?E*|**v4hAFv+Hnzew_KuaSIVOXpLQ^o_72|Jyap5b%(Rd(|Pv42cDqpV|_{ZhzH%s9tmRtOgh{8+2Ds@Y6Q5s9TPr8E`;x4 z7pyn`WaJ77OHIg)$vX>>|BSAhr5&+JZ3geab%KvtyoES@*bK?rn?j+GbQCfpClX@H zZd?sM-ju)L!)1@s^-E!Eaa^H2aU@=XLJ|g{SzH!9-)#9jTOI+3UZNQ3NdI^#$efE< zN!oiU1+hCgTr;0{*VMR;^&sE%*ojDLZ2?y!Ij9eh3Zjwxg|PKz3O?;gUB27Vu|{b$ zu$Y<%AtC&c2nw^JH^J;@2nkzh+;o7wPU3B#6b)N)Cgs?#WDqh%)@RL8Na_URf@#Z( zUo~l+wqPhSm@ zElxZAwN)(1&{?aYX*2hbg--D*L|Hk>|7-xV(l1Aoc)-Q1F^ZkzsW zZoQjX+foakmNwy{8M|46Y_TlPe{JTn%jvoq+G-S=0#*>Sh<>5tMGd3;<@zrr8aAAE z_N*bt+;LBcWr`BJlHF8oZ5Ru#Hgm{wb+`J1#%0nzv#O-sK3}v^X}{+?YCL(UylFS{ zm-d!G*@i9HA8CmXKG9=t^i4rB5H^Z#a~_gL9X{;wqv#1D5$5Qmq=h>UjtPI;!I7ox zHie;?1B#Zh9TG_Oy`l8OO7QqUFkE<+i=t^lO5&>UHpYG*BtA-abI0h{R&PT|JWM?4m#^ZC4w)Lj6K$)DAU&+mp zEmd7yX<8>8vZ9pijt5_^v{F6_MmK^r$vdCE`h;)oXJ0iQuQG`VBT>N2s6fUDexQBkL__p*0V0qb_2r%>F=c(L7SEA1X0OMJC?e z26*vdGPjZ1k%)K(NRSIka4)BUmG#eQ?9dg2z*(%ZsW9Aq*~8_fl2~mHesP0t%Jb1L zoF?2r24A~wT!!#*0-SZKw3rI0^_DtB)ooV|39oLatHzxQ_p{>9)Rey;G3WzG-{-oF z1G>QAT}|`r7vEnV`z{9O-STA1|M2wupr2`K8Ovo)4o$osUdiG0W1! z!V=CXhi-|r_fN5Q-Fq4QT+*vdp--zgbjD9-Kg5jjn*_*bJ+TzKGpNY0?T|9Wt{3o{ z=W8sVPhQCHdNOzNmtyyQW;z#BwbPZK%maZ2Bpo}XlqMGo<_IN^_8#~@-gd?C4c^Z{@u*u3DjD&s-^p)IBny}T+! zkzn)($!Y^SXnVh zKk)07Yhq_B?bA0y#B0#@fjZ6_!Fd5%#qBO;)Kzuhn|IU` zNnuHAiA?%_OQSEO`x5j?dvLxaR|Q>wWTD157Un-xCPzts@w4gp4oGt zq^27?MTmcablSA*v?fD=Q(ce@Sd})ih8f(1wKi!)itK*v&rM#^7$9VlGCZT$IO%EM z>wLik9dcYa|gp#$jseMSZK%Fl&P}l(?C(kVRO(=yxguycK|++qA?cDLYE`l{c+ky zOsr>&ub4BX$Z-8vXv_udKWR@BM_lqQ1JTee)=5EgmV2h)pFgpEAf=U-6tg?}uz7Pf zSh7_jk!WelzvqG3-_6$t_TJ$oNgr%l&pYe+}a@w}+ zns^aZa82-;$e!88hcq!W&H27Z@R|j5kf<#l3ABaCZ^&xK7G6X z!G&K7@l`y?hfJLzj)T!pTa_XGC*DB11_R7&CJG@$iWDw@o3OgQM=s%Ce_M}iKIba+ zSgc^pe4G1)ptqa8L_e22{850Fz@>icE5)*n74kKcG9&!JOM7(cw8g7H8&VAhab*g0 z3-dK&4i5ir$FbuKDq%Bh9^+5J&gEX{f`Lzw2$#_X{|940oWIl+v{M;6$Cenx!ioVe zu@);cI6E6b?NHKA+JAFL5pcr^@b#Aky*cXl46!x&-)VGD=7lyAnF@l5LR0Z=!=0is zoT0D~+ZbUXaHv}Ko3@N^6(MpB@~7js6I>jIKw7kAJdpEQu7CNNa5gLVj#p~q-bjJ{ z*fq=DlWHfy;L#E=3%q+eXQRMx_d!~?HrIPRiv_66Nr$<(A_lsyjSLwvJG>81`}{ax zGRJm}8xyzxS+!)uhlg7?5gebi?TF%)A+N{F8_dav#iGP3BOj|E$7UAOM8=2EVik_I zHROr^LX=9JS%0itO!Ntmp9la}Hu_dmO);X(70)HHPZ?9X9laD5ScHSuW{DM|n<&OQ z{N^i6tcdbi1mf}{c0uHYsPZgMbD0={Y>a%0E~&Jph$Dr+dakHyVfHZ68{f)(*Ldq# z-;r2dt2YwXUs08VA5{61IJa;tr1lx6(73uas-wWgCx1aRNR)$rCM25g4PRbB#;zZE z31S~PU7re?Aw_T}E5<-RR^Qm-<1F@Bna98}|nB_@QcBAufxo zk&iGulz&50T=YK*O}~D63CF$lCvz}-*Wv*65>|3_2dcWIEXF5B+d0)OD6O;^QEjp# zUjYeHBSXDf#x=ZSjN1PofhbSuQ3zL^FiEOgyurR>4CD6)?t^+<=;DA+KU7M$npXDc z1#|a>%mQiVad_E7iv=#500(^Cpr22pZg&7DZGS)~(jqdC9NW5QR36o&DtIz10k7*q zjOgP3M;uv8jMJjW zIpaWDh#F#*R9)BPRZ@BQ`N#SPS%0}DlX2igogSZYVG>4{tcC@*8O%Q)E6le)FEM1#SbL4S%HV^P51faRDdB%qVzMXmOYnT_38J(=%A$ zQ4`f_%s3!!3YnTA1?ITr52zW_z$Z}!yaWs}RXdq}8nfDA$7mM6oL^tA!X%6RynMnH zkpgs=B8QA$klUgwGaf3E0>-Jwg21?JUzniXzzSx^{r(ssMCDX`^J1fjBHlK47=KYE zHPnSi5=Em`0*GkQ`RM(W5$dJFi}pA~BxRVh5IlSWsnSBImtpe<291peGCpK}AKoU& zqPBmsgLlZyLCAlrw!Zz*aR=YduUp?-ulJ{3POW&qgq6>q9lJE_qx}q|QfTdsR;oY& zR`^_M4WkQqes_jrC_K9y5lq9T!hfRkm!<>km~g`)*P-r&cEth$EYYs9g>t#$(&U8% z-HsGSsVj<|3mc!1m`KqhZw4F8&4ZLmSF;Ykjk4Fw;Ch+J)5C4Ca`kBOgn#VqaU?@k z;H7h~?e<(?{tuw369$_tLs2*pi;SB))N1xr)hA}lOEf+(@b};OT@0Dd_`k`3KMc3p zjF3Ors zd_1@9uIl_?UoUll)@)bJL$Z;#lB^D*t2MCG@*tfHTbOpsgkkfT`&qjyype zb8vk40e@_V7n;lF`+re~>%skj?eD?<2WoyCJ&D^{%&~r2`n*ymzq!|U#pT}KE$;Fz zHP9a;3t-V0m+&up*Xx9TuP5POe7@ITu6Wp~Hv0b%M*ju7@L)k;zq=xw06nd}KEJXo zCUXG1q0?It#h|B`qF76YL`6;EaD=$_W6^e9ULBq)MLaN2?0=oM8m3owjJ8RWkWrjY zcmQx#D9-^Sm`)p4BzR;pa*Mi`@;~fYDLaJg)93ih^3#pS*EXDjD)zbdVq+~esi_P- zhL`T8bbIMT zIrdYu(bBE+oqvPwz(}5H#v}Fsk1g{U-PCnrIhSaJwk)eSMU&zcQFX^R%B4!_5cJ+r z50PT|fC_x?BUL;MQi9(PO67v_f!%o{M3sB^K)Fm~rdYnL*3@KJ7(?fE!tf*E#jhYyo|!5vp?}8bS;Xlbq+1RVXv7zyt6hOGgFcml5nZUXy)SB^k`w zC>q!8z`cW&+2cjqrzP1g&+hXg#M&(#<|LNC0%|p_f$J1+ER0k$&Ok=7(f27|t$A2J zpakpq1b=OGrhMz8WutfaXPB?)1k;S0+zry}6o$vj^@(UO6+_G%U5iKEqx~t0X)`hM zfg+}Wk$2$%44j}5kziuZAMO)*TybeOWmhtrBHDYy4!RypjeOr?4*3~_BEbaRPuUym zf*_@uN|L*Za>5{#x+A-b{}m{JCY6qj&)8#`J%2$D7|-P=BMOwdlW}bsgDzaX<47!RgnG~0dCx}R;&9G{>(bQs-zMH_||9`*}uq@!tf$|3EPBctkc zFs{rvx9lFvU?b;?*cr#iFR?S8rOPjF-!V?nS9V(d`73(>P;&~rgFQ_vTFn7w4(wy< z{psGgG<(j-H$J)cpa)WB+70Tlp3!hY3xDfQ%cJoKv`ojzn*KB!@*v!H2kLeNYOB2M zaM~?-P~f+^A4g9HM-^~bY{$g7II3x~U*W}Dry1=BA>yRi3KiRU$aR>}ms>rJ`$(7M9D#w7R7E*u0FI-lDIqg%i}-#ES)7{Wz+wPY zM4lo{qY-5)8fPVdUJDs{Fu8poY85w5B5M&(E}CK6h-EU0+y$nXw~?M^#!~R?MF2RX zYz~yigtC1XXn)I3Z3~lFU~DJd41eGU_8ki>1C=tCgctqf`BMVSD>D;KztLwV4RYbPRS6mGRTBmE`u2{k#l!af|+Q;P^Nv1LU$b= z*_Ck~qNEk#&~u|Kclbw}Ykx*!n(XXE*#~Zn3K2_&A`6PF=GP2X@#DDr@*fX|{kH7Dgx8py; z9#P)gI-y6VqWJ|!*)Z1YX5BbL4<^dsa6JS;*5v!L8K&B1fAU zc~BO%o}33AzD!U5e$|u(P7$13j%hzuN@2kjLSwL=^O-DYiV1 ztjFQ1Vich#O~?ftz3&6NvLcdUS1&~~5sbmp&PO2=pyWnAPJgO)yv0huD5STPkICoy zrFMZXY)b7=a|}GoXKP6NSRo$5Dpf*2z!S{ z=Scm9_owI?vM1xoJ~Ncso|>{PBWJoU?X=+1PClJ{el26Jq|8%1SA1rWMgFP>xdZRG zZ(xEus0E`i;eYBKW=JH1d1xF?EXeCB?^HB$hvlgTz)auz^XgT-1_Gm2zksIB*CzN5 z=eqXccM0COX0dl!bAeI`H_O}~ zb3>%=7*wx?u@=T!7;9myh4GxicxpMcFu@}VW1V{L6AtE7KLa^nTg*6h|IRR>lO|dy ze|}&q(Fu81+JZkXDKADah?S6x_q1Ay-IU+FuMW*NyecM2k7Rq>W3(zcbBZ@IDoo9g z?Q4iNwvtb^_C%ETltUL^RSUm?z#%Y&#jbGh9vy88<-?uvEe{`*A z#p?AcR&r0Tvr0u{Tz6$^231NYwOp=NacQ+Z7r!+=TU6-v?9YEjtafZPMzARdGN=i5 z>ndPuj^VtRUu^xXagEf8=qXa+7_D04vN>B@pX<%r>V-1hTR2IV*z{=wwi#we`|bD; zPGR+MpH9kehx@?UMZPmQPG`Rwf90GuB0pLNzBXLc7-kQ|6$P5eq(u=~&O{|ZWO7?- zHE-^_gK;mm^?-3?4wLBs%`S*2lw3ZKSAd5U8_5l?lR@r_@q^-uEbAgh-J8U74S;$Vub#0*^es#Vq5XO1q+wJnwg90a-s3=p)C*uu*Pw5sTfH zbsd4Dp~LF6fU6J;fBduFtG{Zyv8#u5=%`S zP?f!lMd}pD5a_#hM}$O1?2C#B_u$O?w1&PrNTAo)*pF+gzU?p?=U1XP~>Mg<#=+sj?1NQ zAu7DCZZy71_1e_smzJLa_e6i5bqHc0PB!NFmbybk3RdJ5H=kjVf3Z~vR0wD1lw zO^|8ls)~nWeRN?cria#}>DM=RFCLb(_c2pZ4^ST79%9kr!4RWVDNx=AZIKOdE2{kz zr2h;B_B)YSh2AI_7Rj90#>s8x7sl=3T(cMhM{#lk^PcfDe=~;1P(^1EB%E~!c)T*~ zQ{m(ro6us0kK+_NZhUNAd8t4w26e?5h>JD3IV!>{XC}OvXWlJ=XF7gYq&AHBikDor z^jUcaPvyouNe0HlfWv_4@Ou#H0nb|E<(CzECF2w@@9hmKfEm(@b`gTmJF|U18pbky zW^nwk3j4K!fADa4OiIDndwE8>Ujndjc8lsP30~E~EV2R7(Zd?*z;rCid4wVbMj+CU z4u&H%i&6nos=a9&fbodi;IPAlqH^^UCL)=~RK8q*naQjbGFMHmSsj$nNPsGFqsFrx z!_=A+#I<6IxpgcQUQMizPI3()CLB#3^6jzS$mV=9e@UN|00X*oK&Zn$;!gi!dLoVJ zgq9;#mr^a_bMP5|UlyTNQ&=F_>0sx)M@-DZDIn4sh`*EuF+Gry=Txa7SfE0IXzCwG zu~dSo?(jLlG08=pLqJluH$)zp5gX16Ynw7BL5wv2{%`-giFt1e|Nd|P2bSfPDI`Ru zyp$F|f7{6la*gN+_6umVpe$EEHfqUx@;GjbGVyW1-z76yq!EQ`)i_;;-cOA>EGSH7 zOD;%cvOk3jcHIP{%xWyx+>c8}_2vc;Eg7XQs$X)wZIPY)v0)305qq~_ zd@=n#?4|&=u8&`Fs7jU+t~k>X8e$2CsH#Xze@c)on(`TN5r-LyIE_$-gRV_lKQfpe zjGrrfRQI3@Qke2n(SgFe3~dW&>L-{6{VEwX4KZ$75TjK9IUj;*xfX-s34M7ZnD%Fc z+2UYV11O`(VOOY?c1?@(SQc2y51gaGB)xol{jOwOj{+Z$PKp9Ks7H1!K0$z!f%ha+ ze>%(cF$4L_3_9^i$+)O}tX>$k4fj%b0{J@DS4V$J7ho-X_7LSXD-PMDj^cq$c4d(~rnSW^ue4M<~u z6Q#_>#f24wHxl_2_T7?_bQ_goX{=9ce^`{;EMfi^D)c$>_iD3PZPEf!D=(rz^$65m5}7VP)<4&pWTh9k25OOukGEC)T&oFV{ndFri4?HM%j#F- zQ}r`Qhjab_+Ct&6Tbwz!P#CvY=kNzS-7qe$&)@;zq|n)?`q?L54Iz{)##!|W6sZ;|xoI$QWNh_aq%4*Yks*mg4oH#u;am~txmPG)^B7`>56H`=5;hF7RC zF@nTVw!Q-BCOzBgF-m(Jy4j&1O;{WvQ&vh*&u2;vBC|b`PbT1t40-nsd!+l;J|)T` z;etuE9D`C(afuSo&qsO`&wme?z$pACSlKqvF#8Uq^m$$*j-NyI0wvR(K;JPz5k5&) zHNGyg74kNZI_Sod9mbOwMvjbPv17Xg3IoS>$(|w7ZBWWB{k9? zqvGQp-=6CJ@FVD&Ab%7b<+jaCFO?OyWSsJ)^5Sb4x`*)gqXe?gv>84gX61dM<(XI^ z^4Hqu`V}#T+SPfZe)elddC1>?=YDr4fXjFM-%TwLnK4~mA5zzcoD3x#76x`K6-Zz| zF9jp8ZzGnBTO@WmK{R<}{Ngg>+C!WBpX}h>A1?cO03+;Ln18g&EsgH~)XU0(d?USq zDZfu9e;KxR!4iUO|FF=2M$PVD)!D zw_V%yFet<7GQ6>xvdMBmsl6eJ!hAq4`HTphadiSxfz|sU%9!;X(O0_vu6~W17KIyT4c_?8XabQBxpFe4r-#xx?(ycUE%SPRU`VKZet` zhwFJ@e752I3@lhu=CQv!);+B5&xVLHA@72A>3heb@RFY%2E!Qwq^3^0y2e3tSK^+# z$=V|iO*2h-qqlX{Y;LcDxuk|LMsbLbOq(lm(HT>KH-DQKtDvXo>g7t%GC2fTPuIS; z0=%Vsl9x`VLFF>TU>U2#O2(Zlu&km`D9O{YElEA8XM}|%;74XYMMbhyzXvgZT&TFo z#I(cPa}T-@a?(X*1xc*=j0r*7QU1pxL){iPo{R1>uiSP(I`a2{ z{nqOI^alUfFINta%g5z6=_y^5!zdPfvWTAI6XKyNd#SmTsRot(0?|c64Q^@T6rsi=kmmp2kCQ6d{Ue{ z_2-sgzQ)$HLR$$6SGZa{T3r1hl+xRx+RB3H&=R>hWZ9C$j8e5r5(^@JSIak1A`f8b z%;~ru_kERlJ7kd^SZ9wyctmk7m899JI-;1&lJOz)`@#&8W4@)knPN6d87HiR#1hLW zmVeK2J$f?hHxTm7lt&np3{I@)Rw)T7q#RljKNHfOnAsyp5Z^`5_7rP=+0(fehco(O zj*E?n)=abqg$vWT{skQ@rm$Y3F=;dGmsu0Up|_gai1}j}F`st@N->eP_cRR9&1TpK z{Wy{~f^*)9(xqSB5pbt1(6WA}H>3miwtomp8_%4SmasbMr%?yv0k(oa`pK3SrMV=u z!ud29Zq7R>q8jteQp~N(@Rd|jzBo7ss({KOd^(0S)AI0vY1x7MHZ}Y=?^9nz>^s9c zi2x}%GSd%7ht5hOM#$mf4`K5a3;eb@g#Cf$i5VQ(!t%6~awHLYgJ{fgoucy9NPpDK zc2Tw_>j@_mII|Ccf-ss$#gqA97&uL7E;{(w$cbz)s`xLEm4>U0jkEoN(P#n(v$2{3 zurm}PENGVs)XY1ALw_JJpwt*Zcl?@<1pkUFDWUC0Xd{W94JyeT)`6hQPE0fx=}p|! zBjV*k<+ktIXrO_&^PSZxPm{-B_kY16M*Eh_T;Yr!l^}geSEZ2Pg;%-ssCov{Au0q4 zGEwM3${7mN=S9^fl~W_U<)94=XN9K%#gxFe3r~g@mbf*&K(UbV?TCE{KG=pcdlv#N z+W3e8X?f6q1Q^xFk(q(?ZbZwN7mS8H_9;Q;E!V*_M~;!ah3yPQR804E+kZ`tjt|QR znRb)CTy~TFympgyvY4a?|ASjh_Q&c1Yh_587i9^Z7iGbt>w&UNY%|uX&|U-svRN1C z3Wrq0adON-FtMM{Dm4u-=uIZxBrNU8BK7JiPG%ub*p_0A&?KoH&4ZAQ#4Zb>YV% zPtSs73GdJmmOgY{3Sp;D9=c=EXFyLdXa3POJDAZ0@dxzfTPU^ZPoMCa^>_RgPZTfO zxc+V?YoDh3#`-=mSAXKA$a^xjfOJFp_+r$H&%olkJc#kg>x9CjLF*m51n34XW#3TZ z8WtL9!7VE^F^tqBaU!e_VbTgYTZ-tX0B)WdfXD6G+!*u}MUa~vo>I_f_5%yO+DWC$ zpFb@cYWd{&2wfJBkLlkNa$h`-M+lNr%SX^EhLijOlPwwNR)5b5;B?gfHnN5TUVSu7 zxH!3`lM@PH+UH?R#;**O${VzNc%4aal51ykgb3_8H%odn)-Wdgl^Nl1+P|R>=kcMu zSevRzKH>xV_lS?4{-ybpcQGu(_+(DmmT_gZVJn%wacMEze&+E5 zNlCr8;u?wrTLaDBCfS3wbs41vW&RGusZIgDD41(g$m#$?>D6FI)c@ZaAJ6Nn2oE=& zABC~i>sUj3oxmEH9z1YQ4~z!x zJ*|isRtX-BF95nCxXw;2abwB!hu`^X$@h#Y-g~mNXE*}v#AD=O+fh=gDGywPz>un|qHQQ6BBX#u zWy>}_iRez7=g9mNi$y+zgffD26NC?X0AHF8a0EIdP2!zt{b3757sFt6kvzzkbMYxX zU+kNcgYA4n5>PM|AaYm)J*840W~dDOqwU_oa-DM=_f{G=H#sb%(|z7wgZ1#J%T00X zSaemuQzV^%lk;sUe=p1^%XgRvFhg@oduTkXDo7!BOXQ+{*};i`fgCkvld+vj=K<4)q{AtHVKWNxfTnP z%*C=KN0((2=k=+IU>_b_(v{kzzG<00)ZrUSiN`N%o8mU`e}yiNOK~kD)B{1isPQC+ z^(Mb5O{<2+X|-8Lx(h(+MBQ#EoF>`w6!6B36ijvINw z;cA=q)8ElN$$aPtG)OuB9bQg?+`FXL0Ln%-vL?XCg^xa1c3@UJ8j2nfkvFT-^UX=%gkmeO@xZvgi)dj%;ll32W%XIrtp?~-I zoyvqgfBlXO&kb%FZ3x4&48g*>FDxoNNf#n zUmhB{nf-Gl5;d~-?;NE)`f2de*-+ug3)rn6(7dcp`N43(Yf~?{iPb1Mds~j3S`x*yu*tv!=7gE>=&FeRqS##?q!IpV_)?BfikGH~Hem^b3Cf`sB=1(Te@W*p zX>rP{&cON?WT`l$h4gdJ#9Rdhv4l(u3oN+0W1^0 z^R<_IKLgE+2POgf;`$@{*j@ZQn4WC9nQKNCk6>SDID!N1rD7YYCg+7%)kXpk{BLV}5EwX4T{2WyG@f5xNH5bUYO zHdB^`!WgHzG! zIDG0a9iS?O6Djte2WOL1iCo}fGDL7(+wHl&!liTEc`LX2LuwLQ@aYbk8ZGsMfgMZl zGWMzPYFgTqc}QWq?Rwmoe@s-h3fJA2cTt9{5BbRMjA7nD=A%4NUG=M20a%~awtaTh zs82@l<f#tr&jLK|QDSd8}E zBb3*m?+V7}Dte}#lqGn@39rgFPD{6W)^XYsW0a9sVKwJ;nFnLjlMr+T0iTl=bT$iH zE~a~sj1?!v{B4t0bTm>84F~9{4O^K!Dx}k*XKaP8GA6J?r(-i%1LT3FN@b_KTizQ# z%rKM(2E?7^Wx71dSMvRd&;!PwOfkya#>Lybg1_IfOMJ{FXm&>(btv{HJd@pYB!4e` zkHeR6SvNT}*SW58`1oG>GKWT?uX7YNC68K9oE-zmD7XnkxXpM5a^OH9g@PwlqfgYp zem2fYHXOP7L1V-j3yJ!b#IUIHseA{!4OMCKOfO{E7|zIn`H=zKq$T`pc|9v(XprAY z=|0KuaODO#7mOeuJldhqPbr%4!ATtnxN3Gi^+$$;(`r6lQgPL zx}}6|MiO3}ZXv(V&T2O;DZocT5QgwraD)i@QvY{(uQ>%@f7y#pK{ftJ`=>X@Z+}4D zp&2jA0`uh=1I%veq_hk2sd0V#@e?dcC66&CrCFAZqNo?t1j*DVmFm*O*nT)OKJef( zSRrpTFscJkKfI1P;Lht;q~zGpt{+qU=F3C60{``x$9k8s`8?D!yv>Cb30@S1Ma&>q z6l~O{h|!@$c5rnqtR;IUaCMG5Ub+hO);U3 z+Q(``#L>o5MMX~a_*!lU@j^z%uxAFEj+xD@w>}mY6N(joegVaxc}*F*IDbZ#A+qU= zUrNHSX+m%_@^MjEZvFbUDPBlL9*hsi72&rxwFb=jvP!Kc!V?zdk=`(e0c^6y`3D3U zmW@0iH5e{KRtG)`Ijo&`aaCW!t!u_W6r zFUdAT|94aj&Mukl(&!$B5PuJlI_1Acafw;x&RqNk-&Ypj7loL(|AmN$d=UIy#M=4{ zwIhlb4#Vk)FXK1dj!H=(bH*U8UjnEFl|?I;szcCinH*etK=I#|q3w08c9lCo1rYo9uMj(-a6$^(lQ|IO-EZ51@aeqM@1z6k)dXf&~;0SNOddCnSFnDX89 zpJIZXm%uy15_l&D2m6<w!0m9(9IK}jRFawU>fuvSYh!>BeIuLSQWPd3y>O_!Oy%F+c4L@<= zDr<_lR0%d#J#vZA78Y>uYVt*0YH9OY?yr?f{t#g_h?ZQi{c{Ycl1<0-ChYRk)3IlKO32Xp;^ zUj9Jo2hlV>|6T^0JlBNu6N=pX*Z)G2UgSSBm0+ zk}uK16EyVbU@aT+oFWe?@~0BcR5OiHy2x;aG;&#=ZH+^}Eb|Uye8ff_>rBdxm#8N5 z>QzF#q9-K%n&oSXUseZL<-iQh2h>9Mc?Yn$9KZ4{1vdyF@(YW4s-_7E=y0GZYl3e? zdEK5PrhlRK%7e=MF&l5>h#F&4aPOPSn`9*vs#KDFI;Y1}p@XZX1U7IZ7T{FNml^fR ziPXIFU3-MFM6fUs{sSQ8p^3Rekr*5umOvNa&>Hb?z|&S^gbWP#em+MudBPG5Iq6)M zG6}}Br7DhP(!L~#9Sg~FW9dtc_-KU6Kv5f1l7E z>%3Erc)k$ZQ5IZuIVKq*On!>dHQ$ZPqShd5yfdwU;4BFT$*F26A0Ab9GixaC=c=K6 zz<*aI7O5wkilxTMH(!QdC9n8AsWxivabz*`%me+{CvQmRQ=nr)Fomm$*5Wp9RM zpVDHiPzW_XLPti+b?tjAFt+}G_TIg>ktMqm{3?OFfFZR>N|aO&)rGH%dX!34dRe5Z z`u6nVI!Ok}EG0A9`H)IAm_>WW0|PS)>@F4<>>vB;`D1`yU2Xhu;Pv!%Ha=qG+9A@;jd6qLB|yFm=Bx zjn_5XnpWHuuddkq8%rK1Tz?7N1VmK|BBClqZb%i)gu@>ov@4%9L_+YkUI_0}8Ph#$ znXYtX6_QHNjeYD2`w3|kI|-I!GN;lcTF=e_EUY@`@J(H32m&4GReI=MH>9$`s4nv- z%GPr{8a83d;AgUO>7}Dzb!InV!%$S1+66o*c4A;9<65qmRNl05Tz`(L%SFOQL~BZG zHcZR}n&~}W41!{|Cv+Z|#89W^yO^9DcpC4B!vOs8uI6mFDMSE1wd68O8AwN^zw4S> z91P$yoI!>~EV=LyCTs& e}SjZ1*awim*JxX7sE$O^8@4iY*L$y~>DHwbblEzO!8 zSkejuOR+b5b z!Sjas3MOi=J9KHK|vX(jp?isS2CgTa5`M#iaACK&dCyKFO2+eUWj9{*TtBS zXy+g?=wDDb;CMmRtJ2}>gii2c|6sRCG2dyuLc6fuy)Ce=fDZCtY!f2c^Wp2*eI3Zo zy@$?HNccWN&_VmVlLOqd@DiU#m#BPg@Ddr?f*U3U(SKiGw3yJZaT|g7WtT^AHFPVB zq8fL_u^0oW5_k}E+{g7$D=EqmGERluMC!GJVMr?GfMqs3BCray+St)&4+;ieG38hj zxEg8*V~zNj>-4c<8t7FoWc{ONPxtwZiP)BsYi-fkqL>zRR=B_N$9QPGbpyB zC#9ouQIQsG zYNQRygwXCp1I7aPk|_H=!t}*dl)z^kM?2A?9DAL-v^%or`aJh#RyPkU{*rjUa%-tc z;=${wf;B($yb#y*b%2J8ir5bN*ffa3DsF=nAeH?!NurXF6Sz~OLxkbiB@FtYE1L=DEJRH=#rJYbU!=`3*Kk_~|T zzbZ7^fK0OHtE8{gHfB~^VeORf*o#nNbZSFGTdQ6UrGq*!uD>5>s6jSga9R-AGhrK% z7a4Rv_P+A-d)-NUO2npL_&TtKH??|9V3^15saHlCh(|-}> zJze(#2ZSkQSP6lW*E)_b-T|w`_*7+tAP8@^(RN)Fm9e5jH%T+7ct#?Ssa=+*M=}_Z z)%+sxE_5s^Ob$j6EMfi}*;tiutt{hYI?yelaC_724-H^i~o?f=R0jAg3t@O!~p*X4SnzRbd>JA!I^d7Q_RAxy}iQN9>!y2VU zw0tRF0*M-Fv#yG!SG+xf*|y?QymGYlgwGLe*DEA=#nJ6E#WwSO29G_*mu;g*9z;23 z!kZC8`Du+U#|Qgcr+;E$WpGeuR5MLjjg+x1e=1X~(Yc|O_tQ`*v3)Cnt=F}`faXc;?*2*Y(NMmiGJi9b^0I&UEdr#iVLTb| z%eR=M`&PCoXb%IolVL?H9fDvELJ)AZ7#P>SuZyw4Akz@+iuoa}MF%fCg&Qy;M*=g1 zJMi>@Uw@Ur_ZTlVR3#iLZT4Eafn`8izBy*%1S$7(8E;3xs`YYlzFW)IW-hYA3(=1z ziF9g@(m;8w(tmY=#6znG&=}UJn5{P#5lr8WpewokXWl$vBhHg}r=rlA$dJ;^aes?a%{$Amo2vENb{koNs#Ge7 z#7a4gmbpN!3HR)#{66nHjVyUKJ&X)C<tk=mqk`&FSRlzX$G zi=Qjnf`4h%9JK%W`Yo*Nn;=qcBPOQK=;9$4V+nFwG2pHX@9QA0hXa4ha?)uDsL*88bdJ+ssTT3%TlM)|q^R zOls&XYLz26c;tKZ`%$H@BB&6{JXlFBil~qkm4C<+`#mZ`EaWu5+X&JOBCQ1W4=GUPMzzd`6;^tnY@GUm6jf_n?zKhpN*CL)xz1s zk@;|B-t@?1+M3rsJu+JdDO*>J4f0k$go;_P(ayw>n7vZ1gsjE`i7I#DJT+c9%PgoI4hBCY{@ynS|PioV)56)S47 zqI_idz&J=P)|8#8hVAu1jg`+>U1qL8o5!!sPQm9((w;P0a5s#|Oa**yoi=uM4;!bi zEll1SYS)g>uIbOXwTI0*se#ATrk!l*$$wc-@GaBKN@=VYGCWd1u~h@IS0HSnaRWzJ zzK&Z)z?odPZGr|pR?bbd+?XYYw3FJ>GJSYFSI3RXhloyKOmZNf1<8nG!!I?jKd;xt z&rc;u=et;17W-XxVP>%}6*heL873@UtcqrW7Ra)wDDVJuJyNbJr-p~o*;=<(-{=V;dbMO_2b(87n5FBDGh&ktb_$W9U>yU@0&1vZ97PJa+HU55eB z7^O1ghR7=cuf+dX>$UngcF1)%rsyH2YfMQIN1LZE*dQOzuMCD=LN(7!1H2_yQpx0w z40VzXw#0Z89&Ald1@LFud=NbzM33n-_%RXuK_a=ve9$~-i9;tIfEIsHUL={>XfWRF z0-6epBy=MwtDXkByu}nVe9wU!i6K`Gs!Zntu?LP^c2^qCn`R zYS{RZn>wjr33~~>vn}IGsY*xc7pjV$DG6s=pg6I4sn~CoPpi}^w&>#G48o$4g;ol( zbB@Sg1kD~aUuy3cOJOAN?L#+@i_&!-iaCS4H0t(lML>df?#dB{ea7~$3&`c1YP;MF zN;yx&o_94Gh~IODqknG^v}B@L{NP}F2GM?Myr<6rJ&k+pGAK{;cG7+D-1coy4YqSv zRHJG}KjO5LSJLsT9)e}>Il$wuh=dNE@LV*yo(xN86xahugB?izbfT&o@y8Us7zck{ z#DmyJ>4~ZwtLn(H!AQc~1CX)3u8k#32PESOk0Wy%WM8YNH-E5&>cAV8<1v(4VJ2N0 z3t~&w7Bak5GdZ#{`)Ga3y!sS)G%m=AdRZ=*uhj&Rfeh~Knt81$Gsl5 z2CIk}KOfvtt-~)zmZzbml_Ie+1a%i~QE=acFP&Bt=Xws7q>X>U>(yWEpXj%!*H=`C zvumdq>3j8wGDCpLgfz&yVs!AI7SHiOtpd-iZfNdonl}kfEfTXCnCwDkQzdO2xin`Y zYiYKUE~hrXX5g!6 z>6kTTPnSr>IeWo01#_QbR*V)eD&kcz@Wobw7NXZq=!qTY!iD4Sr2|r7SL{gtobEy? zinB`z7eK`D z^qZTG=SJ-Wu|sw+N3uC|acuOXFAi&>*%@5QuA`>n0{GgNgsln}PLVUebtuQ>&^>>b;_U#qz&xA<*GQXbXl*4ITWe|~ zE3x|=7NSxhe`du_wrm-mj<>~8Y7M(i5FM*yVVAE^H7&-pm?DNpOI^=P1x0k0Sq|g^ zxYvIK=vR!~pemNA38z>P6D)Rbl2sr$c{95>D6|fPnaIYDw1lw1$b%8#B^l>P*SH z?|nS+JVD)Yd|!rHAXBXe81-27nZZACDZ6u{BdsrKMX6e~N*SR(hP@*H5^qo2`z1{V!kSQkm6m-rpdnWcZ? zNMuL5g6?Cc2(bT9p}i8sUB>_bo3|2Zm#w2ztJf=nv+9AwQi70xU3KC1N?N(ytYq#H zOlrYKbBmxLRj25NIs8J2@O<*~>j$cf^yu*7gKMm9vkTetR49HfsWavR25S6{IZ%P( z=2MSK#~HbB+$zUVw5%oFlc0mBrL=!xwVc5Jymfz}VV^^F>CoxGZ8>QII}fr0Wh2?% zJ{WN-#!r}dF6u%Y3i#5%ZBx%_{p>a1G%vd*M#aQRYt(?jn#RPwnU9qtx zELc^|na9>TdtowJs9&t>xQPqsqo*Xq;L_Jy7VlKtRqvqdCUGqNy1<})^0;1X$F6JP zr5yz4$abp0wqP~s8bABP52v!HE#g1a*Xo<~AL{F?tDBoo*MVDOD2~dBS#Pc#Q zDq~GQCe&f82Awp$pbdlb0aSlTg@8bsieyH{QU*OGOWDS#7$nMh`IWZdfQHs?!%3i; zy8Db+^cd`X{EhFT_6>@8J75v-^~c|ML%1%Q9~?O4O8W{FU?;_FU}TIQ)H8#Wo!1SN zWT#McGQi%MQD5U)av~j*lFk@Hyr#bH7YIV8l2lb)Lv5~GPk~vL#07u7Sz_xp2%ID| zF4ICGN|Jf5WS)C=YU~ICMcf0Bhm?RA8|Oc8%U? zC>gemkL`={lH!&ZgSCIGt*$;@fj^s~3jGYlQIK3lUxX;i)EFwDje{>r96PRqTmCkv zK{a*v%l{9*6)m?7YyL6_{i~0^Ij3{w`2AI1`s(mL34@*_xf<50C4nba%f{UYK`^RC zy_zrM6dlOEI1_;0*Fkm1BR$jT5Lw#`g1#qrf=&d}47v?!0UUoM0wcpO$Rg<;fj3pe zFM5^vq7w#DR3(HtiKTR~R(;#KmE-cWowzH~!DF(zwpw2$x8cFZ-$Wn0kG~T~AAdWP z=*LlSentWquFrp0MK@D%v;)WQC$O!sXt&sdV-ECIu|1HWyx$7#T-W}>LuM@Y$|7@w zd4}n@i*=pY`U5jqSdw8q2YEH##<4BIFR3}Kl)SuT=tdwa!nIu6}zpQ*chK?v_Ybo?H8#$;$?#IvntsgY3gqnufde8%HRBwU&AbEzcCL|70+ z^3!9tS?x@0c|pGq-TeQ4{lAJs89SG<4Og^#>Gst{-Jyjrd~7>`hsN{6&XEJc1aL-V z3CmOOF?9LG!Lts$#_@;GL)jfTajg>!zxi(b+Dw0YOp%k`Ku9_l>qy{a-2MrYcN5EP zhQwEo0)kipA@GDxvLQVEwWp4x^h>7~yu6tJ0lTOq>$r@vfT>>xWwfqF0Y#o%iPr6z zDaKoUP(>D&MBX@_3leZ}E0kdxyL(pgVB^1Q%6sd?oxxkz?*^B*L3>tn57c*a>YGrd zZGnG@a(y~TO(>IAJ zaHMj)88Sz7sTg~WIYy-1_&PMY5y}f5plPG!Tnyh~&cl{7u$!3^Oig(LdX!!IbPnJs zbp%gP3RqT>t{%-!R|Rmfu=b{V7Fd7mSaq)47!U?Ct-ymslY7hTxo7i0Op}^I)LD>L zkJNO%#P(fU3xy4|y+l(n9~q(&WvS~NidrD{qYDqW%~`yR!$^=VnrsT7qo^$4?7a5R4^Ezs>G zp2OaXu8iD1ClmIW8)Bv?>;$J1W05O$b~8)KwZ!z?8QqWcZO}c8#dkB? ziDVcYGTqBb83gjdxN^Ac$`^tUT?S!SCv6z^kfzn>ThtxMSNK!;Sm^_ETETwDKB3DC zhkp^cW>^wa31Xd&s)~8?%wd0ob9V7j>={t*lk~GQnsXebo~7JCMLHm!srjTlPav-- z@VeQwLJ!$xn4b6=*^N`B46~emA7q+pW9&UJ zG*)wo?u1oNl!Gc?9uzaXT}vTj=0||7rDSpFG<~Rq zsG}kleR{cy9GMqpWO;vK{7F_`CjH@tBKVUzir|ltmD(E2A{HH5TzR^%s&0Y8^&oRU z$lO0QncLW12zoeh{%=OhSVFIwkK`Qj*vyKsdk8z049g0_o40@O<4`@lTOY@`AswL` zpNi)G0ccIoi0>!?V5wvn0pe3eu9pp#wl5kd{Ic>&Y88R$_{aiEQByUBR06%6^~4_& zPrYn_C{8O*0tVgk%?2hxhY?@}E5>-$^Ur{kc+k^IRP=dI&_pQ)sw$N5qVY$dT|O%t zpAnI>I5P8i{NjJW%x}SOvjyPHPj6jY&7r8!te)&1F&jSE-`<6z!=6-86?O4Kw!;J= zW)MlV+-@FgvCM8hLCY1Mnz*g|0b;GGO*TdeVhN^qndDmZ0>|z!!C+#PNxkkRVh?q3 z)`Ag%;S$c92Lup=41|RH9=QQ3Kv5;{NTy$@{u|DU?Dc;L84MXj2UQtNs~})Hzn>s> zSch;56NHw1TBHW#UaR` z7Z_O5(n^1ctwWn?B)mL0JqSnUV0jS`g#E6E9g)MfM0KZ<>xI^wu{GY`1VF9j=}cUO zSzlv|%eTv=4!8n})m^q5n0ujngWwWqETn!KL~O!j(u|A_6xOPMvtVNx9A~R49_QHT zHGpe~<*2!##pSwzQru7zy3%GBgZi8;TA1p8tg(N&p*?_7q_ea8V*h9#Mabr4ON*fN zW@A86xV~(oF*Bpi(Dd+o3CkwKrD(Zmyg2C{crqMAzEkWUca1vdHHs58i1;-w(1YU2 z;}tDR4WGw1en^gu8&`uVOJzpcP<_2v9c~jeqttGK_<%$gFfB85^jM?zDb8NFJjfAc zM?-&4X3u0a&;>qKYjm{bCQ$HiGnx_XWg*dVb3ssKSUIc+GoOog@7M$0MV(0787l>UVq z20pIk3=`BKjbXyHpn(b5kHoG?{G^g03F&_{mYso5_?4)B0O1+kMHy*fI#TT6tPN?# zdaApphx^SYs+p=D%rU5}%rm}(H92P%)s|K~x2|#qS2{V;nsWB>!3Q>3T{8z=;+wD6 zT4U#JMy)T4Bg+(*B`ZG-%0pnl6f)f+WIR_>Dn?-N+%AJVZf+r3TfV-HVjGoe*PMUo zCC>4DfTVOf111M$4q$=ibH()R0~pR1C1My&QO!KEY#eIU@d&pX=0P7TgJkIVRbbd% z(kBM+0e2;{80x_YIyyp}Q5wBgEb5%MFuB>jO{QRJPBWPBA)`r~;&-U;YXDkx7fw$(!DnNcL^WRxP|Zt` z^rEcd%(AU}vvW9Zh)Ru3$jZAx$aW@eoRYK)@(WZ^;L^k@O&J@h<})p?_?dq`>sV;3 z)1d*>b;IixveYa-;#thGP8&WsWw({0W4mGs;@AuWO%ow1Amftbc!ivC!+$EC-?~^n z`zhPPQ}&31IWh*2V*iQTv&9|F9S!EW*3^J6mD30In`F}7JuR>RFL*f41nK)0eFZRM z<{jeY@xjjSjO7;}d?OuOd&Bfv$xNQQH5B#zwvO5UsPdj_JHg8VDLFR|nfq~Q2 z6$CPN6HGVD<(HWnSvp7rK?K%xkO&=Frrg38f`Z*(C|KTPz$3N}_P0|T>h39NK3}HN za@K8R6d_Gy3FO>u*a1R^S@ z4@xARwoJNFJ}1bCU=&>eWS@*c5>F+_R4xf+AKpunta`R9Jr`bj1?ME10^Debfcz5_ zKiVo4kdV9Lr4y@sh$U@8qKletNfM51=~Umi4Z^K&?sLqR(b};5MQY4K^!-)vP9iUsB-cVP`#PwgW2{dB9w=F7 z(u=GP=vook;`RC#*H?qrudi4?8fn~^Hb7_AiYusuiAPpD(=+yZbdYVN2j1jaRT^np z-N&@2JOa?W3&wv2*ml~hOV#KV6vo1jkCxjT3~@OD>gkS!yj zYo2778Yz*k4^u(~h@CY5HNPZw@9fS~wJa548ljnEtmA=pD`KZZ*^yNF)Gf!6C+J9P zHHu6i#{pU$PeQDy6kn-G;{rBLW;$iA%-Sfm?=LrTm8_elf-1EHF6wv4wj06_6ZP&O z?8907AuWGU9$YGkRUNZ@7dcA#)Ms~K481q9W;R$=nFE|l9E%%!GA|t%>A?(!JP%6a zS4QVdUN;8qp%vP&GGzl&)&#?z9avi0CvXe-UvqWq($L3@wSo`2^oUZ$ST?k>!;TF+Xdl6qw2_*X!IMcU?PAu#lp03I?n4Fx zue@}wxDoy4Ak2iBnW4;N7g`7TNY$-+Yl@z?xbH*fy*o^XI*K+e1*hy_7HK(`l^p-E z3f_M?X`R-$UVyX%ek;ZtNpV zCLjho8e1VU)Xd5l0#>b9fdQ&|+gOO9v_t#QQzWG(d`-HR)lm7{)k{^)xdPU%E3Ozb zrVK+I33%W)%&INgdMhWXSWOthK5DD(n}vbv3|7TKIHgy;Ga2ynv7Kp3BQZ-y`RO zf;T7CMJ+6fYV#DTeB<`)p^?(024aHGo$iH86wfaQN=czCdg>AGb2)Q*O$&y^Cdq$S zihDFu%rWKI6F_}7vy zqk7|!%JrdoHoo#I(GA(i%ckQ|7x#aHpc~oKgm(T?YnFkMq7vQNW4NeHx2<`8<`};- ztLT%wRn$-3v$-+GqRxAYf#B6G7Z(_~#$H+D&<%3siX%>oV{ac<#K{1teKZm;YvKg- z<e>9Xwdoxfzjt zM3;FxIiO125gbTZe3Fo9PGlEloK7Up zr5p*WQOvC>UZvw5wG|V(S>=Dxz#!Zjh%_fVFO1~D{h={31WrcifIG3vm!P{TZtb!u z0@ZP}P*03Wvw|z4K!B#{8R3uS#%SL&go96QdtbkS?fv3&w)g8H$sX)n4|cBGv~x8~ z;-|;EGi6`}c@icvK24;wF|zI^H)FMiK}EJ1B=0$Nt%Bq#VHM`84flTzIjAe;xDRyFuF4mre9g3imCidH4_M9bYcJ<6h-e6M%n{$-*$%7X@h+Glb^r@3)s@aSI6+Sugl)q+8^t@s83hCTKqo zSr`vl7zG??+AIu1++Q#YSm0;wyzwwI|>6)yTw&@Z%+-t{7vT^V~>2_H011tx4Ew}#5^lv2M<@jYuVD8u@_nwhax ze=2sc8kT>at~oKg@@G;m5=b+&Mz80-r($7ckEHp)aBr(hI6Ifll`q8>Y)W}`S1XP6 z#${Irv>Ez!=>TNnr5JfwPeg8x(lJhsdyc!K8$LWFk z7-P_0X+i4_kSEi_c~CHb1%RStN`53>fF$0P9!P&7Uawa=jKFi-A)3+fJVUdx9>cdB zG~@Ugqa#(^WAGOh=>Zo~^2-eJOYfx5K9p`V$By+<3-SU-YivJhQG{=`UDHG()#`dk zCV~RSzvRRmIuel0Yndp4>ZDH!Cb^k@GY-!jI&HTzC!M26Ww?z^Mq{{Tf&coT9+m{) zJuiO~pZZmGLe8{sxU*>=DGF2HCYI=*&Omm~Ww`u|syz@+Y(*Rf1449vE!$lVHteo?{8UnPG)-zQGn3&f!l#vlK^FF%N-ccUSENnf8JZb4|h zUq<;#({nmYN;BK~OiX=qnj>pHb7Wnt|NaaOJ(=A=W;ZBW`V{GuIz{xWS8Hpw2Z4-g zOOF4;ZnFkkVL43!#^~8tg)WdOq!WZA$_^Sh7n1LxQwJV+>z=zK*>xS-6kPobv(zU#_<-4WcQj0G98b=!glkQ7Ofy5Z9 zi;lTxC3gCe`Bs%t)$v!9WwHvQjy0rtzST~|yrYELwVXG5OL`6n#jaBpW-$Mv`+el3 z)38Wq&NgL_TwtixaEPMA^n8DLqc-+%BQ{Z7)h6bNG(7iQiuKy6IP)?1S$0!~w!K~5 z`o7w1%$C$h=BQ`l&^>oN#}#MYpz9<8&!ZtQwq8KIsKKO9^*Lkunh!H;}t2?*j7tqpAgB0ee zh2~DJf3|;FYHM7=_EmoX{XC>AV}#NMsTyBp&3JlM1H)sOGZU@ z4}y{8yiQC2Q_z%2BzuX+m^s=vW2FFnpMri8BqF{ihv7-|n9C8uUVko2sGK`Wd4H~% z_a3bqg?UrRG(&%}N6>e#%cfX^m7Gm*zHTikIaGzdrxW}w=7IS^T;Zf|lhZw6l^MXV zA|7pumc$JqPCTb0MO8Ete0+UzX)$v)&V@SDk@(RZ-uX!|+2z{L>ML(v=84|Fh>kw}x0>wGLcYte)HH{J}T% zRgn0P4&Z;3Zdb$$r;~Ur6SL1dfIH;Wn-gb_F!$ckNRhfRzAE^a}K198+Vt;nv zy9rD}6a|S{A}qz>Zx-INL42@bz4Xs%>MzNkfL!}*jkM3 zsv#&83?!-{9%<0)!Dk8r!yi|6Y{15q=E2GtHu?kf=?AM%Kj=RF;QBuxBx@!JXB4npZxT{8@i1gWvtTbR z9BgPAj*tD(-PdQX+ zX9-R5y#&sVWe{1qK9`t^6>zatPOO5{jnS)Ig3P7l76lz&%Tk^n5RxHPA~mRr-=@!_ zdHiX$4Z4)-82Lcp)NRvjU8;Jch&|{9PL~L{7X(Zq3OoRP2KZw-smt@4)h>TxK*E{* z3I-R$G>F&o5))wGbsP+0^gxU6D7@1~7!Q(AoJ!CseJ7C$;cg(kk-9^#2X3=xqAFfH zp@(oLp!^daYahJ_-FFc$Hk*+8o4hgAO{%S%vDIRJv4L&VNY4X2$N zAB>{Bf}cFuQ^k&{h+~+U4=ynzP2N}>$IrV=hu$+HD^p?v3yc|np zAUn{&>qNw`dwU6$urwJ;&N<1fs-Pa+iQ{I3do?E(4k=gl#H=O;JWmG%ugEYxUB!ag zM<|QtFEh{BALpD3qG8t=Q5ocjz)RTlGona&QzkLRAa9-R5jsBQ)-hRi(07VvAoM6+ zN(7OXU9w~WS?cl|`0RflC71%SLZ4qVi8AmMRfV7l0x1*gWS3fORl!3uF2y^|3RMJ< zJj43}H%Ugww^&6CVP-w5`?lR`98qsB)xjfZpWy!1)nDj`2%`mD#UD$jMQ8~So~rV} zJ|-NdKUoPIc-ThgL`68)Tmp~t-kNWYhzCS&9E1!QkE`R7YZrfA#RxR~Ese~jLbOs( z0VlK&ayOHnl23G1QJ$1i3$djb7*UgcDN$TCr7ay5ilH2lA+$K8bzn6S^tho?jXXM_ zU=6sSo+nG~)~fiW*CCjDpoO17=h`mNrvEdRB=)g@4XSNJ34{UjRTW&U*V6BdB!at{ zkMk<;E+kpCkGX$(i5eL4Qd|N$ObpT&atfgIXX2Oo)fMqeOSn_TO?qn6vo^^E3A%wc zzgD>P$uC`hlrSpQFNYusqflue*|`*^nO6`7ehJ4bS3?fXbnqUDh)Z9Q7EGw`V+THW z3txh4oBKN?sRY_4USzJRcaeV`9&r7hmr(6fVgz(vaWj9?i{z!^4!>+mM1K#1WTfrD zzl1Hu19Z6rkrK12q9>)tCpDXQ4d*qxAC3-Gr!{{nLn?2jK%`w}Vz`D>@h8SIpC01T zgKT2LBl;-YIVk;(Ts%rc)JBYa<ue5VEYjn18RnQge#BG)Q$&1TSXWz2wF2O2)Yp?bEe z0l8c$ZKMa5(T%(@Hp17;M9vG!=dS!TY6@@JOLH$`W7O2#MsQ5Q5%6RU{`W}D1Ono? zegb1lun-`O;}5=x!$i*Wgm^d#9*%+=9R+_ArCPItETJ~%ty-_GmMgUZ?^g%PaoBCc zX;KxwzcFBh0Cf&a06eVk}Q|j=lk3q6ONS@(9C=+Y)QjvxNum zj3p?iUeI?d;`PVBYD*u~Y(GjP&SYGs!@4Z}jpgr|Rl+2mTdZS&M#v`gyE+YVY(;;X z;>2Fvl?qv}Q7I|iWrT!b$Y>-6h9o60QmXk!yRGForBukZnqA|H@%OQXXUN4@_rA5O zHfI}Dcg&-*-+E1)a@}+?3O!2!SL?O4+EZQ@w?8Pi={IV^P+k+GDPagak4Aii-HAa7 zNJx6}cz&^hs2mQRh_Hi9G77Hd*gJn4Sm5je?fe?0zNnRo(iy`c+{rf>5H$45Vd+L$ z6NUC9WhsoLEFD0B!fXt~N_-a$aZxfPThh5qLg1k}srR}YXHugd)zZ3Gk+Lcfu48@G zOn60It`o|LXu3lf@m3flmxwM`b82)0I=;n`1l`+1vu*4U^J~fXaKyL6#65q9F89Mg zj>>fJaZMkp(X*5Q9Ct`gB3(@$h)=2iY}(8%9-VeI(Fz1`4XkO0>)Z|lrz;VL3bYbk zBQE<0*%fqAUsEbOH7}@&+Me4c3C3XQsoJ_-H-Zk@<-DoZop=j$0%x<|hu4OZ?W|p6 z=p@%XmWk_7Ybj?Uw?Kl1>REp_w28)E$5J~r!l+-OpcmLQii0fAf;NzOaaFuXynIMU z$^Fn#I6obR`5_wDQ@aA)Uh!n#@z4TqcE-gwk?W`j9w;D&!#L>air+96( z{^;@A`WoDb?7kVhodK0!Hho`7Kc?BNHL=fWAfWvW)X~Yap?k>3Q0%-HAS#1&j1Jsd z(W_DrMJ}`KShY#{L~OxJ8r`AmV-^WN-PfVCK{ly85*zqo8mj@Jjt4_@sj zSU55Ob*HOhz*y9RhZ;v)`^zw1$YL zuud*05zyIPI0mmM<|HKv%$Z5=F@q!LWe;{u+v%KBR!%2Dgk4@r%*n?&VL3GvVd9II zPI!S~L~#CZU0Ht>NZDmf?sDD`9PH625A8sws@oMyX;0;(5zcT5SBl&mL}4B5HMw{x zjfh@~^I8^o{Haz>~yL8?HqEZ_IoTW(k#a?*2VmYQBIjt((Wj>1%Q4pX7p zLOtTPjmnH$GfY&~VTD!7wb(M`02>OGi44QOa0AaF%B1Dx3Fk1Q=$xLiD8MnxuM@aX z?PkWJ!%ctYp@7y`YpRIbvm)L%lUo6I3o2Au(AWGghPPB;wxT#m!si7)-_)A32kU>| zGl+N$i{#+f0oX4>$NwM>;YfBQoN5kMME5BSyB9h`x7Ow>&w=UHy0UBtwh8_J@&^)jHqM}hp^A7Nt7#|r4XZOI z8njFdEv+?wtXd{TrcjJfOm@cOUYB&R#)rg z{G)%9OAyYwnq~OUTXmcwvlwQA+vA*eRa;4v3b8EtHJDb|Vt0To8YF z9FAujnJ7wC2Q#PkDvEBjCnN@8ozx{$b5?&R(Xf%q4jG6B?nuYXm+Ea}Y^fCQ9*d;X zMcq}vrwZ#vnO2ieCHE#Z3EF~|0UF|3tKIdC>YgQ0-q`5lH^zJJ?URMlLRI( z4_;JZ31}#_fX>m9E9Mm|ZWmMq+>%@G0;!n?ojGl~@ciAnoZ+yUn(y8NERoqU0BwIC z@Yj;6tHh^8@@}#G6j25nX76C~jNe8~3YEl$m!G$ zC*WaS`h~yFO8jHWLGB=Z1pkR8tD3N$0NZ2Z8bz7o$}!)flqoYs1X586_d8khUW5Xv zEpq2LIi!J_Xo{-Xkx3kN@Q}5y>Og-8G}4Gh6a^n#qP?+t(9?tvTg1H~8m$LPEw5sO zd~u$m()*@i;}8}}!7dy0^-!d*Y>~cuC&dtnE|L)Q^>DCVzfVC9ON|5_IG*b)-*0|a zFrY=^ZevK3k2Sa*LVTl*#uukSDWtjuL{gq0RDVf;<*!bgoMO*zJHFHXYBqnY8qMAB z))TgN;u+J$DQm$E-+cF07a5fP58I8jm#7U6gK#vUK;RCLNv@E5A*532<_)o}u0E~S z*Q)iWGrno1Y|C3Z>Br1~iPX$gBfQA5Fbz5N~bzH*Ent@Uep zfrT35bJvf8DRiL8?WrP!G|+#tjz87avEqlR18~9}6LXEe*kT?Nv+cR>$CDMmT${&% z*pH$_ijAkMk5@6DzuQ&uFcI57ogQ@wmvsC1@Z|XHXy^3oU{@^FqqrjK^?E$0U^wV% zBxKyFO<`3j?#hw86sNl<0+S#jv7~@LYy=nFu}-Ihf&N_;8clHkq6dGE4q*+Q^QkJu zer_rruRq$T!&E3JkDqlhps3>zx~%!)&P>y#7wO>RZ=w(0$KQ#gkG~yCSQ4_aN%{z< z@9}Xhn9j5|Cz{D&dEFYZrrb-MGE2CvmQQyZJBPb$J47mkbLOn6V$blzDdf7h)j7_M z&hUFYdNnIfkrSzlGF*Qd!ak`ERF}y&I_sXX{Yk!PZXdrrs3?FH2G|o%Hg1i7qLg!V z+&tUc+ikW)&vW|X5(C}{TL+wv4jZp`5&C!Utbu>1!n?bo^|H}|A6^_Z zpn)C41U~&95AWtaV*R!nTgS)Z?eXc(tV=~xPZ9x6xJFU(t^{Z;l&3-NVa>fXJFAER zBVQ4$46@qptnCx}jhat{TSFu-T+X&sxYY=95+WJU%)?PePh{e{W|mNti&I0;q>V+F z(g{_!knV!6bESXd2_nv(zO~Kqy;3!ME-)?HsKmZ{FmyaZ%cH5zELg4FShD(V%Yt!J za6|n-$3yTL-U`tHi}`?Pj#p8RBVcAEjVP-un?__ssK?!p2_uY z)^_z|R=cPZ5|Cs%s{*qn?J(3^qbdU-4qX5E>~wp#$?$(i+o!ub`>p1!Ne0M&@@I19 zKo2GL$q)=*r4h)=~}x{YFII6 zJomxebgQCKCjjBELuo$1P0q1{sl^jS>(we{IFD)WxK5W-0U;H)J;C5esR*Wyn3 zcthGp)Ct{@z8)koqSR^4#N_Ado95Xaoh#I}f!5iCfYo4Hra%8gffLNbXRYL(~N9R-<*!KMl@ z)0CBbk8?ori}}Kmw|2BNuu9w(=sqgi(e>WB;qy_@4&K*5>Y@-aj#8BfRSS!U={=b4 z#~`?PybKUYdiL#)JEhB&i717O)<7FQ>T7>HE@l(iSn{kEIzUYCf+-*jid!{FK0&Be zkKH3Go@0W^E0j9sW85ghrTR2t%;R!~ly?~PX4dspHW~*8D}L%I!>z)Gph+gKjCHL7 zD)WiT5ErqUwdJM>QeV#CxD$jpP+^EnjhOufDnp+5RpRLV!@}=v3O)5z7VWhx#^Hb3 zbvVr7gp6Xrd9udQ#k%^E9b-T1JYhSB0URt#t;1zD}yUbasi27qb z=(nf<`fKT(XLBmfUYqIHj-{EkWR!oiUvLLHS7IC6H=*U++O1L_ueD)4XdDBU4JwL@ z(=)F-&w4*|j7@z#pM^F~0QHsHmvBSO9;SPd8W) zoir*a$Qk!Ieh&4-(UFV7ZhaH6J zJyzL8w5IC3UrXPi8UfWy5XbIxxwPdK)`4rPLu}7%`6z#UbtCLh*~{%lYW3NC^k}VK-FW(R<1VMNk5l;^j$POs zC=JhZ)au=^7Y3cciQ*f)f2PB2;_1y8AJ-ql#twHgVN^wZ?cD95iAvfIfl4$Tkoi}i zidTt879;rcZ0*UjwYvEIRS@gusTIDU`aG#nMcNmAt>M?_9k14LhBbeuQ%lZoGdiG9 zgGD89pX8s*0FC2RAXnQ#vQ=jiiVdTP!aRk|RjI}@*MHp4_7$Hvxe`4;vY9lfk zV+f+mk+;p<*lA{D}&dPa;5Bvnw2sC@NRjA6YGCOc~gb&R`u|;F)L8d z@Om;*z?CP}`XkFwp=}f?lFn^*c>U4mJG@qXY_NVJWtC?vAmPkxLE(BluseWf)z@-C zWys;X90;kYEN5M{+^&t;J%&6Y;~mOda4C6z;NY^HqsoVMlcZ7vIoRvMb!HCmu-`{9 z&FCqVp?JJ+ohPMdV2 z!s0JREVxsBpp{93z$Mfjr(zxCfJj|}0Wx#;kt$S+-MKm++gIWQm_tX#uojjqP&9wz z5focjB4}giBo-i?XSX;sRb@Njx*4-p;mlPE(DLTl9b$hh2+LdHiHYJM=yE_40q2qN z^U6eXL^_vc&c0a?!`PV>)$WvpKNDNPOOu-0#@21F(xcuy)4BC|$&4dk%P#41 zIbM7<9z0MHSuejuu7OQG^Y!ExGC$jqZ;H7ho*@Yo$~ijM6>=kxOxz(BvgPOjrQTBv zoC+F%rD}g19O#$^r59^aEeO{q1*AcJ{!2FcSH=Lyt^3su;_T6d}$ z>GK>5*QGH}_03HRcPctMvXY*HjhyQy<8Xm#ierDlQ~c$AQ#6lXwB9yOcSYl9N9;6O zjjcv=SHKS^r^j#hcXoG_p{mh@i^>*(x1OBtA8mi{wvLbHIW1>L`)_tnoBOTrDbBx% zf&QnvC#Sp3-J@2cwSRon6vw9m`irsu`xubB`*ZvmFVC|h`-dk7`@1`~nD9L``@J}R z0WCJ**WHTPI%`1(TOiaN?sM-d3oYO(Z?~@OIMl4X7!5EoNr5cJAhaOvAUR{_ zEuIw;3sp%}dL9di5eKgEnMWeit?Kg|V+JzI27?iP+8nknBTrX6Qn6&(%DqvW*}s1U z)QLn>j=9usuhpZPcxv+*Xkxde~KmLOw?%-R1$y`uBovgW^= z#8B#T+>ey?FAwVZ86)7#bI!}nYC{482??;=H1TjF& zPP>gOt<*C-Q8}~`Q@9lSnVIDt?ql0Dolk&Ug^vtb5#{aQ6YZ=us+I^ z&2@j~Es#Rq!kO%!Q;t2TRS^I)*su-j9-RRI(M6se0JcID|vLEQ=9&^@B5T4e8-bOogd&L6O0DC}$zpSGNxl7D0K$$+N zlkEob!+5;zZLY%Oa`MwEpKP#wXt8GA0$I1K5>$-nbgc`O@vvrX`5Mow@Epp23O6DQ zAKeBoJ|nz{jmqZ6v3+)kfl?9-XKZJ4A@G+&{t&aVrv)7I79o3!| z`ni~05?UG{(Zu(Sw+Du9XQoTVqUx)a`sQQKHo1Ol-YSz)i)3~u5~ezTDh_|S9grf5 zalX*aeuzc+yytkHqhU!WTh5+ESu8!?aTJA_lc9t4^z7Y1h(!m@Rz*8v$uUoF_Ndq{ zV^Yl1nrHHoasqb4*QEq|%G;~LDs3kpU6`{em_u-V4&u1Nm}HQ%jaqHv9-PH9J60QMZN( zWqO*Le2D#o8gHNGfWd1oeF2hOhYb8fkkJ&70awJh!5K8kWv{4O#gm_Beb1opn~J3z z!0U#fnGYPVr(%WX8qd&kE`ksiM05rqrp8yxn9$`$+1OH?rM}yLi*>GZvlBY)wl`N- z0!l!j8^%`^RjJhR$Z5`X6q$UqDxQzZk7{BMO(|Rr737DxQV?eRBa!Ou4F`7+j)IW7 zh5>Pk7n#gOSg<~deY%L~TzkVIw92DHRZUbHIOfwQq-H3vpO~rF9I(h4;<=VoeH(^hN+VVexY51863-p}Jw1e~JISTA24zf)k zwS*BX?WPuKo6tBoh@6eTjvL;ZTt+f#1x2t|;xvdNu?3=kM$|*TgQ8dnm!7x7t0?em zU5Qr6PM}h*vLUK7tJn(`*=oV$cb3QJq`tYiUWGrKAQizDRP}yO7b2P`6DnsV5EF6> zXX7ijYAVmU3P+z~#AZe)FBB$wr1lqSSYpSu3-#%cYA21aR4T$e`$NK_T}x0gDtx?> z%hXfRg(O*jwddLk;71^TF@OYg2A1Utp-q(DhIg8UF^&+`4P#T7XMaGoYQx&!UCMu& zcE?Dg%7km@zdys|N&=c>n@>QBfIjo*9OY@q1G72ZE*0A@RsDH>>hk88<(@wO4v`6IBqKQjDhK4lrKVD zY8)iT(@qHOWf)!&GGjI9RilxVok1FTgJ@bKBtl_|JQ3k{d#j_i3obLpX? z9z0@HHJx;jZD}mSAVxg4ZV+;A8S2n;H1j@UwH(cax!AUB&Zo|}qNk?h+mryBNndGqjqwRyU9q6D*)|zkf(cyjzT5KIxD8*^K2X-EoPMyN8 ztK6x1c81chijuH!@pkr`+Xs#P!%Rlo{t@Pp?Y`MPYKi7c%v_~KooA;EeL&}bGUTzf zD-QO_Y@pM}cJ@zqw_CVm>eF1Q=V%)U7uEm^IGyZn@8gHvpYOtgHBP^;sO~j){|Nfq zf*-|B$j9r&^-H-$sAM^1iNed>~t5?)sSqOXIstIe(S8YEB20$cZkHByQgpV zw|ASf!kraU@o|&r^sK3p=V&^Apf^CI&2RDZ)>(6(QvLRiTDzyGXD66Vw=7;Bzr|Wh z^X$uZ;|!DeaEpKfjbs7)>iCq>E|Fen2UWz|m%EfY2NXR2wFLUfsCRY!iMPh(-_XNMB32+02;kzUb^%U0nRk zr%;^N@I*Hlek~NFMm51)t_S--TC>5^Bn3;J3(xn2GUK;0f$Z87(9)W3vP~hHon=FiNt1P@$`F1mySYjSPR^sO9Q{u})MrBVW?QNL_;z`T_mq|0?6ilf!hLX4e z@KN!&XF)5PS*L)1v%_~C|DLN8Y7~p4Nn|66LG&NRELRM#I3fxI+#Tl}Xdp>EOezyg z@7|3@&w)mQnglAFRu|Fr-!Cs~>e-e50pGMj?a0t75kK)3qn3ze9gGWcDS1OHF$9M z^?tfEMvBHN6OQXSRLC)&Wm>qw75Ha`-rAA1K|J&_^D^O{R9~asQYB~TX>R2x_=CFJ zRl*<{eU?6JIa=1WytH7TUZcgVm#CD~XvQgf6x9n{4^uzY4x^tKlz9E- z-YDMO8?d>5^~z|gR|9zy^13p6{PUDjW|yU+$v^y7%=gv1Rp8U!vpm_BdBxf3!Lu9C zt8RIvh)~Uslgx>q<+LNN=R3ZfR7Ew?1Qi;JG6ZnKj8`n791fee2R!qczDk-R%YiyE zmoj+OGboi}DIy@N&`A4B$lGg~qq>r+?39&ApXdmGh*Z>tr7vaYv{ks+FiO_1!1 z!Us!n_v_~`8c=co9vaX@;?n?B)QHm=(8vT$z|iTYJ62866u#87BS+GuX`oQs&(eQx z#ek74Qvz|Cd%F}Z>!_(5!W~u7p*iFnfgv#94RzxuR1QV8niu zP!_O%4j~5Z$jjJWfCQtW7!$_ffw{qbiEXzGjh9_WrG|Q7(Np86{uL3 z*l3UTNr0h@UCjLjLcUjiXlU545g!$!8n};l$7aSAUaJTfv#1} z5^%oKc6Nt4xG~_ok0tB+n1XB78ir4xdk-suYcVVJ8!J2qA?Bij`0b%AEV%3J>p68YQ3$y@_j6gnwE3>;TSR+;OOX zGUs?wg_q!0iHzb@ujb=baHU8Lgi`thJ}BvI!1I~vf#;40H7mf&BrLDK36EmQOyRPW zqBP%Q?KB7?_Z;aUa>e6u3+L``wZ2-fZ;Fh+C(jrA{L!+-MN+53z>wMb@tdor{?&Qhz6N76q= ztO8jJ!v2D4S7XW**_WM`{CQ@oX?R-Of|2Y(_nVFrilqqtK6f0_pYR9>uqZS^_$Xwj zSKAG-^eS+H&8M=lkxZ7+4#Cu*L^Gu+oD zWJOAxff~FgGocgjN;Os|#XKDFuF^BhU8X#C9m%RrO3SC4SKLlc4!)GG_eHo^{ZXxD zsOUtM4$rn+z`0{9*tYOEVdx0f7Pivxz-GM;? znMwq7aAL%6K%f`=)(zCxlD0N~^}?Cd?X*A0_Oc8;_uEW+Mv?oNhDk=X_e1ZQ+x>%Y z@XJPh?aA8u4bYP(tA?|4JXS0&LL^7=}O^9rXAT{xsk0AEBYJ{O2>B1-4})*t$x9O@g0;L;OeZr z_VbTj6foea2Ap2Fr$Vq|qKhN~ACoNhOl;{SHGExOc#KgtL%0MjDT$>wuzG9D1fR3E zy1KSfhyUtS<+dcZ9J*l`gtZRzh}faFiL6*1SV>zpoV4U~Gn+Ig%muEBh9|UwHLeqx z#1e`~rA!P9DzT|IKFe!=NTfSaD1iaq(FIUb?~6TMpJx_J$hekmo{_SOFC+Zknv{8M zcN=6neFhqrugA{TROAIGP6AzWI|C;H2{WNxID%`nk-7HV@jCFXP}Y1&;!mk?H_Z&3 zv`$AS?Few7Ezfab9(F?KO5vHd>B{piU8!{j1#RAo2sOo{t- zpqDyrznYyhtA4iUU^vHp4^7acSR`ePA|c^tcw9sGkRJ+Kc@cJknt0`~vW68nPJ?dv z@!$6o`GHJChmPL~h9CdhuVB@bI1B_lcq)4mccSYEDVj38a6bf?xhyP~F>FK(AA4G+ zqqJt7f$W?^Z@6ZE%TnL_VYgXxdcBI^k1(Ih>{2>(Lb2^c*r^kAbHTp^eXblX3WL{- zpwzzFv4FU&BN4WM+ALqlxKp1-cUd3bo%ZHjpZnHK-Z_YHe9yP08pR@Q&8Z1va}nv{ zrG#C6dB3TG$FN8=LF~Gl2`95KLARHYt*%z#&t^p&fmDBgAznHmqY~_TV#&W6JRdqS zDps9=k8!|Gr{;RgWH;Y|lj*he-G0=Tpc5=jOMmFji-Tuf$3K_;^G=j|`8VH9`XzOR zl=Fec1$K9>luXh_P#O6tvE>P}?@J8DxRtGg4K32n!8K}dv?ce=ln?{0jPYD!wo;{T z=uAWz#k)6uFP)L^dg7nHbly>*QPc6`e@1##$?fva@tyX-p;O0w?suZNhQp3)uK&$< z*ZgP*rL1n)QtN}k8m3x;p7?Jm%mItg*)X)|FH=#`DzyVK&dq+ytjslgz)?89(I8#b z7udQH311+9C7Efy)iEkY{V}dlejCM^EIA6YIv}%u#WE3-hhRnexl()G($%%_d*DPL zyg(dDELTwB{0T&uHsu_kS1%Kv3F^#u3AzdkyaeGi$d5BCY13P-i`dNC+)w$$?>phW z*UZc?7K&rR!mZU-R}T0?edQ4Tt=H-Tc4t++wyaSUD{)}v()c*k93|N!b=ocdCf%)} z+K5Yk_y{NEzySEeGDnF`Wk7tBwSSDg^uWBeLXgXtma>1eS7W;)G6}A&q?5DoI*bh) z?#meG3D%|^k`%?(bJvgULWUf?`guoKVebx$J9k)C3^6RSTcmVGG7SvV= zquNg7MiudPzx5KqT2uxSmv!SelxB0A7`2^`7AvSLkxZcX+qs+`JE zgc^Cw1V{3|AiQ_Z1mlF*p&P5bwUo~EC`!%E+G>53fbb7K{sy@9$KQ#gkH1BJts}?C z5Fz%0?#JKVKbCyY5G&@>-KV7-&$^F?Ru}8@551ctOW%<*GCiyo$sd`KmA8;JfCAco zzar7N?+)82vn`X*N#U|f-2lE060X$&vh@^YF!Rn&$J70NMqBD)ii+e`7PAv$sa)l* z8D}BTZ=a+;?)mX?P*&pR7EBj`N>`wpbe=!3qX%|$FT83gv$=E3hcQFfW@T*K-oJe{ ztLC*IJKnw5yVM{SN$VP;vN|14Yhn+7I_f1IN3@a<)F}5lbCG&!oQ-UYI=d9r~42f*ZH)B)AV{UW>QF72d?7g44u|I3MR z6QtJJBhAzc`Bn`TJ4N&vbaLBslCB$oT-fQrX);SZO;PKeq8OV!H;LqEB*m70>jiP_ z%wnAFt9R7e{Ep{+`~l1Se)HYr-)1(=mh|*ZCq5PIq=PTIm2Ooo(feodq>_yaacE-D z$e;1gQ*^Gm66DA?ffrB1=$`@|2N#YH$HXrZ9O*RYO}4>@!=S88^*RZ=ZgkHRKGYx< zNv1*?ODXPDxbQ91rwbUcgM9 z)I_s`HM^lLY&cS1o=09%lU=e#kXUy5@&EY%+@%#hhQ zi{VyI(#Lc>s?vqa#XZ&CWZykzr?*8XbS}LNF(~t{FSf&vf8BPvAAjS2D>E;{k4X?P z;8T_3rf6ADff5ERd#cfuvbk!@i+6=v5g`PB_-NtL8h-m4cN{2r)(mHXlz z@{@aXc;9=wN9mA;11G+?_lmF@#3C{6ac#Cra>6T+MIy25M$UOu5$_zo6Fu)<)Vzz* zdDJ+@8aib7j`PMAG**w{3dU#oH;qk4fQSs zZfp=i7-fR%3d==m?lVJ;M{#Xo#<4j_FHFTludA}yIM~`fZ8e&rvA6qb_YHn1Dzqr( zRUJ{>xTK+&M;*d{@nO$UKTyo0=wIQ)l&RDwZdzVX+`J~9xN#vnal`6!VqPWV7EqZ> zWtm0N=d??4vd6FqHz1R31qkxWr^lNsyaI2D6PQ`IJJujTEseY1df&iU`ds!it2$DIx+GxwY`t3fOhUmg#D z6I)^8!)i7T4jQMea&bEk>G9WYzA+K>e(%YXz`OUMemsUn+L3vD8jN_O?r{hjc2ad3 zUlJ7nxlmNu0sX~zqNU+Mp%6JLJCj}5Su}NG_lf4!*kEAyyzv&zbZliY z_`Qr%s$RGfIV<(rsxkjeaj&7>vE1+bCex|KTO@&Q=JW*JaWV2V*lfk{)%Dt{QxR`v z*OyV(xdLK@si{9fERg!<=A#Mq5MaKxTa6=uMT4+z76XUK_YP7TRjPefmJ$&rw+)wN z7z5jX1|s82SlnnRYoo#F53zBY6oaHYqE%W+$CVQ6Twa&jGO6A|aovQOEQ>i@+Qv+{ zw0LfKGa&J4o2s2wLS>ReM1+W}9Fs;E!|4i}!RdUs`fq<4ox5yX4P)0Gr3oPqc_6pN zknUVTDUMKkia3-V==7oc-~Rb|aH$EUWIED+5Vqv`4UgJmYNl%ed)U?nZQwQhn)eG&j$?kBDR_PMu$sUF87 z38w|>qVdJO!qStk0*5ec8{Sa5T{!UGAh&XjvUp*zR#|I zIky8Z(s`Ugb|J%b znvv%5!L8=bOy}o=3ccX=tFJ4pZ}ZVweXS_0Z*8?ySl?QH?9u&;>nj*T`M|!fDuQo~ zIiu6X@CcVO>(UNj51}P0KnvP?5=sJpIkQV|QdWnz%L6cXnJ15oC?$rq;4dp(D_0 zg0Sy&gZn2a-xJf9q1HP$f8B>=yUrJAX42X)UyTXIW&#Ujjwz^R!J5AklTqL##0pR_ z;0I(UN$3z8!zW|u3_)0#R19K&%yck)wJj=LcLAT4E2S(8>=f#teIsT~Hd7yahA8xQ z7#L^B3comrGJ)rXcVzuD+V0YG;fpUXb@{_+9-V@DBSH%uxD-t8TJ}EE!ICijWA?i$ zVnZcD%?I99US2y5hF<~BfF8vn$z;>i9QoQDAB(py?mdXt;)xw*vn`Tg zXBvvXf1B-I7*7m6+_~wbR8^&~jT%Zv$eboobpKC&9>gLY{8@OR`sOCVcs|9j7x~^H z&1Am@XJ1=_hEp~?if$wyG?`2E8JU-ajJuULx zj}^F|C(<6^!K0s4)6Z2@cmCd{mqa6Lcp#6ni~Ai zpZ@aG-@2dvUuf-r`}AKv{Y6czS3mtFwEq|IhQF`DhyUx-?`oKZR?kD}&#G!QJ3$;{ z7R{c6X#V$Gx5^D>k#ww*>0Jv}9HlA4_Py7<)gTs$Dl%PvqAY1UC}N58Iij!z7c2O$ z)9b;%1ND7?-Acdb5GBYm| zoTXzK;alH-SDOvY<`rlDD8OVFH4*n+YSLu0NK(^vebSVSzx}}E%H8g#;CyLLbfRFtHlj3p!x{EkUcM?)cL7Rp@%2YTy8V^_K;u>GOzpm*Sv5bA_3V;zYE4#rc zR%L&Zi0b{IX@MywGfBD-y-KGx4LE%??l_UUxf+EQ;X~hGHeB@3U%ROvQY>wuyXpD^ z$8+xaF~);fq+=`_;DGxHi!adTF-evO&N&eL0QT(=cLUzk_SCh1;{5;Yy<2Z2*>)!O zS7I7}hCl*IcCqf&g*i|bi`7Lni>yPks#GHgJ&~D_WSq*3$P*DscAlqW8;0k>h7H*8 z0EPyh@tYoO2=WDE$<~A9AJF|1bbiUK>)vZeL?$z`Sk>K913Ky=8J8V#|O{elPAUx{D=_oeNIKLtJ~NrX{1PhW(V>w=#)>THGfLB{PO^qZ>(po_o?uI z1D7%?k#Wx7w51`tKZ&zA+P|D6gMawnKIB*b@E^9>9L8f}j7*^mA<3XEj-J~WrOf*jp!q6+lgaZf88xU zy7u<_%#7+k?bx`8>W>~84?!40BD8mZCpu3Du%VvCAM#$b$cyv?(o<|loM#g7a)mzIlc4xQoH%AZQ`At&{n5t|P#aG)iByrshM%PcPp7aMvYZm0m_PmI@c4PJB^hrr@Ga?PN}sOGyZ6>ex*tD>#~vRZzc_`rQ097B=Dq(0 zMt>@m@^#QbGwn`!{GLmlYXW&mX1Wjmw~y&<{0yI_ri`@BJ@;Jh`Nipf2|QlX&L^7Q zK0e^5;8aI$VKBF?iD@0j^Mn2oJO`8O?!s=t)72ht^7BXXyU+M3`MtmRHvbH&>Ad9q zlzfL@MDL$jgBUM{Ke`S5b6eOIhvN(z7yryD%H<XT%WvOC<1#pJKy&UVB4!$uHK%?O7Yw@n!mRZ*3_b@l$fc zo5b+ZpTrm@eHDF;(w*)x}essctK%VYY;vqNKt#==Pxc4cEEPm!MSA5uE!H%`UG$a@Z%@b|W(Yc%5{ALST&VDA8P_>6$RrB4YYG zZX8X`t~mfsV8)sWbj9!VJlr4d4b;_2cDR$Q_FUs_Wrfa@$^2se^ELta8-7X_0G>)O z=NXMihv#LM zSaE_`&8%&ISi5yw=0VgCzUmr3hOn9r@(ELUn2nCoZ2ny@`sNbkrW2LQFP%+p%P#tf zaSr`hVLp-6pHkAUzN?-P8{uUR2Hg22)>LL48x!H&$amUlHo!vLAEISznC2Aggb#f+ zn!y->^f-u7Zh8c+XP&n{^2k5)=U1C>OX$HL-^W>hVLn{OKl3mae!)-4boi$eUV8JP zKy2dA9dP76QL!AxA_SH0*}{GkLt`*l89;DdV@!Ya~5bh;?hY>h|Wjo!wSB&!w~*in;w zion``xA2eAV!9}zSG#Bmr&k|ZOwz`q9t7|1MF;bX1imYJm6Vr5IKE_nwNF^%!4G%n z5DvcV<05D^rfK1N#WPMiIw|X``xSYKORVsf-MO(`M-z@eLv!+HrValIrxkxJ1Kn%b zpQeot>h^ez|;F)01r5B~;V+4|n^ z{|_c-5~`<OwN4rjM)1<=7f9}1>{dfG7oTnv5 zHW$y9Up4)O!z(x(zK)Aw%AG=n@hmNWhx54nV^{D;g%l`Oxc|NW3Yof{d;#c+G1lj-2s?XD5!Is55+sQ1+PN?|_C8!3rDWX|Z z6JDeg0A+PwV>=hv{qUHV|M<86Lv(!ckAM5$4x|77zyHU-{mbFU4b9T^P=1Vm`tNMi zKmDhnaW~Zu|7t$Dt(@JDW%T1G{6y`2jW+b~|38Xe6lpR_CegcmG9LfDkIWV!dHry& zT{awp`XJ9gAW!yAS;a-g*YdsJetVjXRm#47`1sNNZ|~o^e`oK>y$AQd0EJpq*Lm@w z_LKxO>}x-xlaw#tFyA~si1v$r1$@B-#bgSCG|WGbpf7p#k0s{IhO<^A53OH62a6;w zO8UM&wtcTk?#ZqMYo8`}yLy*&N#XWF2Dc!4`{Tpaew2{?d7NG3EEZk1#_L+Ox_JyW zsYhZx)C9^0X)}-w7Ri3)8UgH_UE-4UC+UYocqLPW3BjAIq;zW)o#zpMl7&RE2U!GU z2=ZE3@U%=j_p%$x2!}jCYE!3P-j{>LP8oj*V>6s4>s{~Gj%xoCf(T6#JOgp1>(c_x z_M^S%EJ4x&_R|m>!!oT`zlWu_*Sw7_!fI)LW_v=rbWPPxEvmjbI zoDnFoxkLB&cN`7sk97(^3{KEjAQ50g$61ok%Z_L9!%uM*_eVJ#n6Ha8Ls@^Gl*1w= zcue#HSxZ01nS8?#etZ*j@5$pwJ9|%_JdmND!GWE?D-N?^UV!X>Awg89?ToE~PMNIb zbd%OVA#79en&>MQjm9}19t+3uBu8?Zl7HD?Od-T$6%Q-dTL#aIB&*zP(sST4?3NNw zV4{UO1y<%7mYG~mY@?bhpA&MzcKWmfcr(1rPkxEV3-++NrBn3~rHs8C7~g(Afmz!J z4TGoVd>WOfUq2&%ulaLH|Ka|A_|hLO+)Z3YNLzh<3I7~oABagZx=2col4T}iK3H(j z-yR<9Kiqrr@ZrwgoxN|f{MqaM-E=sVCNd~R%dW+ULG9`y@gUx2M;by)Bk9c2jx_Ik zmg>i{Akj#Sm0J-5CJA#5$lL;hR9IqA)MA83;0%YztVOm_5pKN^ancckI5sOH`!%hIlSw_Bp5{_Bqe!H_5*`aJ;!d~AK`}L;RzsrlsD0&CGI(nB3 z%vlf&z*&zsJgpaPedNF=!*X|;R=de)zQ*WZ#bp_P4=+I-R25nzWtCQ_;y{wlli_6s z=i9|%!!P;B4@t8kjd#bz8egH~j*j(UhSfMt5Jm+5i$D_{W=t=i{&o&OSNN;`yvpS_ zKh6h!NYZ>a9`62Tw#FxZ0~e#qOks{{vnAQyjoM7dTiPmK^1nPvF5<}=AGO9q+CQ|b z?+eO*i-Q(h{$y2k+H-9VOM*Icf5Re~5OFKABbU@CWRT!p?gSrbp^<8z%Y1_6pe7vR z&j8J8M9&tU=CKE-FtI&y#0;OrCqBFk2iv0<+m_Mj$#xW9Q0>|!7b8TM@f8*)#iJg- zx2*D9ij=7M4hdE#3txcbhr}laUbrE5;*!jN+v|24$}>qej46AxQ6mRzl4v_m-q4x! z@Be+n4CC*2h8Nyi&bQN$69(JIg)WkviYxvdVYlLczSx^=n0cj26o9hZ!gqCkmqztVoW z+xWOS7z%28qjU;o>mVO3)Ye-yiCANQ_?5Uefzk74|Jew1)lNR%QDOY^O`>+r49(jI1}QQOoR;w5*+pIM|r&bc)raedHo|d{uPVbZEf3Qx06uN+0!Mi z+&~X%KpIbM@{M~nXBb7@-F=;qUp0c0b?Y6fAdJ&vAQbhesP*X0>7je9Q)3i=Yr4Kn zhnK#7H+9Wvm=Q?cLC37oHOk{vN+?qx>Z@-2Qpks`bFn0sK9jf_H~-s^UnLC0KgR9-cm@ z=i^(>;cECIHx=;j^V9zGgIE23({Bv2b=|{28;5<)(~2zyKN^jG1ojhZ1~?Y-VM@k# zXikwq8&^aCP{Fy50HP_SBhfl+eCHZ5pxevT?A^V4_tCd|_wL+z^5pS2UBt3FzhQa{XwyPY6za=47kahUwmUu=wQI{@*d*s`^$RG#V{1zbCT zFPH{~y2k-Ksp>^=IUgltMOHpF0Y+ZOoC>*_ia}T#;*k0jP-)_Lp>2wfb7X!um%bxQ z{tT7|KhgWC@ra*>7P8xam?c5|@FI*9-d51G`_6e%ljq<8_SP~Xkm4P<=nhy*{+pgB zW8_XsJ^E$+-Bf>jhuzdKS%so=hed3E`2AmysL4|N;rIV8BBy}tkJdF@DIYzTNrMMV z7tuAI+5WIj;tcOQCjKhmS#SAzZ{|(ztpZGMpjv1{^U09Wb+qPbcS^lMHi>tdrkZjN@U_i0a69vxZCybc{sk7JdUvq5os&l;EgD_7(vT_N?3Twm#1Yuks}(9>_8CB z(y;a*p;aNZ)3(W+g`o`=2^>`drsMzs8dXBIvOA0-9MZ?>V<>fHLo}oDC{z@ zJCkJOU<@q9>NAGJaSd{V*Wga~3x$7XoQ4RjiTDLi`_T@~dwU%Z%{{niZ#O#lZkWuJ zR_KiXR69O@ULSQmLmPwXaE898kf#vJE$XKWN7LmKN*E}v{e5TCsUfA#2nXp0XvCrd zE0=!XkF{#|IL$|EWf#*MH$P2Re z;Ycbe@QOX8gL??Kbd`f@#CBTv=S5Q_{dYQsH#ykWYj*lz?_O)D{(h%W{llecmw4MH zo~#MhOl_bM1YdNK=b$TNJcN_+7$e;<<#5luNaW0s=rqWBR@G;JlqYNs(F(CKQeVSf zILl>!h3-4X=F!>Vvk88{m}?1(0>6a$B)b788goFJ%waFTq+wNQ!^?MODm` zP4v`*j(X}ITy$?YI^hEztpS5?B)x^z@7NB1jgDWn0${dZW<@o2{{Z2s@7tBq6hnQtdY`iQhze>fC>a9#Za=o7<3O%$K+dRPyZ{rogoJxF?!218W* z{oT;I@2-J%ID5KGw(|RHr$zB~oVz3ceV~qD^j6L6OH6RHEr-FLH zVh{!ZrH4RY2}UjJ!5)?Jx+muqAH~U*cv_mZ!!E`gE47cRh5kfiPU9@YFb1belOQ(n zur4%X0t2eQ-!|K~COv!G1T>HRWS3YRH*$5q(**NlX~~rB8Uk*{eEa@?3H}yXeiTev zsx5R-(Orjs7xRn~xa|Q1I1doeNEk0H1kmUuF7O}4;1ND83D!8ra<7tNbSxfQpxdsE zlPORzg+H!ZZ+@{_@GjuKLyEFW2ev!F(kSXmyXfQADcQ#Q9zwGqkO@q37G#H6(g3DdNzkF7 z3C`hfG<8x<$FJ6dghy{(%$6g2!s z>=<8N1}tOc#>_4lIiRnRY;cxbyUwcX!>Bl;ixwrCB=FyV-RKOJP4F~rMpdTM6mbbD zl7Od0>RO?xy(xFFL4{)l%VC_*4I^v=G@+c;Xatv+^a|J-U?EOR?sWuyA~Iifg12E@ zK@AhE?t~488hgYA4s)0&lzhD+n@F(s7f3QkQ;5GIPzc+ z>+=PzGkHGAMYD(zxo`zK;J92y@iOQ7q{aF(zr+vK1>wBe+8^FUE;kS`*bCn+h!|=F zf5Bk$C0iNeIb|BUZ*HzzN7-6Pkrcf{T|vewd!7e>5{w~Y9OBHE8<@?7L4%kMvY1FB z)89!&00NlmFQ)9XDw{>S<%H0A3u5=u(x!gp6a6Z8*jQ<>Ax-#b~vhJgyH>j zxS*w}!CsGB8?1&K-z=T&uY0gZj7cA0njNFki*yVY%8N;k@uO#XS>a1w^*yiDox6K` zcXr@^jN9|Sdvn&`bPOK@Qr`5PpAg&J`ob@}4)D(i7@Z1CBQ0!mvAQcR0{!|3v~wl6 zKada1OY;5TL2zy|&>o_l>MGX}!u6s{3f|%kH3bg4WB1Q*2@3?@A5Xy!=xQb@ofv7D zDTt{liGcr&k}|!>gsF?L8%UKyP7*TmjnMLc$vJGt$0(IX!HQF{G3IWHxRe;_a&RzH zkYL~|8}Yj?<}uaBCO5w;UXP_q)@s}gwV&uRTgh1l zqV{%4nNJfwwBY>DL_&wBzSZ}WxZH!Gz5eHWWG#)0LsQbvf^nA=}AXaskb1PmWn=aT`lpTR}gFy~? zm?>3Qp?5+9R+Q{hpM_jVGhB|=T8J1~Z@HwzQ1mW3Zcqv?SBN(t-9dIhNh^wfAYHct znvIqMd3ZaFWRRM3GG~C`D9ILVo6(T?c_iuJh?O7IY=ado5)F&E>j;ou*53xYtwi5} z&S!CoIM7+91C4#DNvKh%HhHKneMk*1PXmNxT6LN@%zh@{#aLL?Tlb|srv@$%X+_h* zAZ%isa`9sHDd|2CzZ9NB$LeH%!oT7Pr6qtxy1=~vHwtVC@2>3_xCxDM)LAOcMuJ&1 zop8HYHs#`2H+mdO@F|VxHt|;^mBX(vU6wfP{!4oBK0h+yrPb8mwDF=S9;4QSk3zko z#l%`7Y%=qdWtgQCwxM>hDTN??17(DLya`r<*Z9zw#>2>C zNcC%8xv91we1+Nkq%uegs>(>oA%hhL6S8nCUI?ooTw9>gvT)uSDZh!!Qi4h80Ca}h z*d>QBUJe!l@jy(3M?`Rc!{|KJwvSLc$V%hhaS}+!iJ07Y*AgGz5godilaXUjgUFVI zdb~w4o7<9Dp>&H0?!zD9B2rxUL?S`dW0gsv(N63pmM?HP=!Y9?i5VW5c7+O6Dq65h zq+sKX_{idApTvvJvUR2zeY%XvzAfM@1G z`jybWF$p`Zmfoa2!YlMC(De7Vm1RMiCf>a5MMUgrayizLTwYojHEr^BiW|LMu1Byj z$jzV#BvnSgC5mK!j>h8Lxk8>Bj9n72d6|TUGUYktweDRw(eN~elCTpW`OGrPxV;qN zwRyG^SXkX{;MjJ^o^U=|6n*22$1s=pBrtp_5v+kWdL}Cq0Q}(CpjV)7hX;`1%@6Py zC_=5omUc!Fu&RulHa%a%&8Tz}$z+zC1=J~3xB}^jtV)Z2aNJ|O0sl8FQUW-u0Sbq zZycm}iopEi7s6ugjN>7?KQcVx&<9H@O|Dqw^_nYxxN*~@K8=Q4lX!D4!kd+3%S70A1t_@K~qM- zdnG8~WfxTn&6JU^8`7d(G9sC(3m9_Q!Wc|;go~Ou8#8NJf+Rz{94_Gn+DhdG5e8)n3%+1VS!LTnkf?%j#1CVP9a#_x!Sj$= z)VWu%#&PBYk6#|8+5Ef4eI1F3fEM?xr=!- z>KUydL3>c!B-y3Js#P^B?v+ptcy&zqW5PgxN-~R{t7rKQAjQsA+cR`n$|Z@`vFDxa zg(S~-VNfK%Y1`fCHD)m%!{g4MuBM;c>*jq^4EINVlk*z+*HvBCO+W6%(HyoW42}!ms0h z=ZDPb^@4b%UcWy){<;@EKRi1>J$&|tShMiLS0~R8UmWfeVbpDLDxZOm$U{At&On;e z@{3>H(QjmC=W|=~Jl$h=CBW7#;Mlg+v2EM7(?Q3!c5Ji5PO@X$wr$(C`}TRqJ?B&X zgBqjinQN|9DM{7wPCTF7NF;HJtXmv9rBtst-qxllOkMHOmLiObZ=TFv1<69!z0^C= zc?0KXUCyDRh_ciuvx$49+CqR%Hs)UopMNC;;rESbhmojc5q2um9} z!7`Y$u2ko8a~QcOTWP0$W#&tH2o{I5DLhAu&UcbENeE(iDQC>z;h;tBraz;xV>cIk zX>~D|M6@v?YBq`&a9MO?9*Z7|8oy z6SVMJ_OW^@;(d@kQYo)}PQA2!g|V~v6PBEifjGagU1p~{=9c9OxC?r%W&}h?FyrP8 zt#C#S;Ymiht5}QN<^T2nHg~{4?zkL-Pu61)c()3+%Qf-SY?MF7zqYd9&h=Ej5c$)m)7W6^_kwE~ghhV+b-*RgLGL9-*x5f0&zN zBo8GJJ@A*H{|S_5Amfh_bz2ay>Bf2!kjoy)us& zvNC&en^JgVU4l4+Wj{da26a7^SE~zR(m)sE6e7t1b7o)DSFevRMM`tNrqD-z(;7 z#*;%`1ut29;qI2JB#Wj-HdEb7ZF8q}G5t{ux{C?cWt>L45}E$`abhh>I$p5GdRG25 zpT-qke4tRTjJd%bdH}MQ`J=55t2Tp=b1j#z=9i%n~wz%i-v zw!yQvc~7tnkO=|jg=>Q0;Rp+z95bs25)?3mm1NYB1p09jTXvmnC2E4&kPvU70CwWg zvxWhe^(**!v0>lSC6Yj2QvlIX1F${1{!M|)VE zSaIvWQ_)N^RkOWc*|4YSB=R+@ZVC6nILH$6VL|!@X9sck?NHJD-_3`kaB_$`wb|HY`ZLADaSc!dUI9#e$R-jxC{V#mb>sd`Lp*&!fUo;b6H@TuDqwg+e(IW zvE?jg7tX626S%84F9kYr#Nuw8|_T7MHeFs#>_9L;nHo{yClcxjtjlV zl=6}!M9JoUVU9scDv@hN1?<=~+H~yyo!-L~0AC&nM4{YxIh?bLfrI!$1`i{jX+i*i znmXb__k?8bSS5k3wJ812o|c;`7_Z<)N%c*~$mUiK$cyD_WQZO@z+hzbDhgU3Pv2yD zDW>-oP@aVG>1yrGSOK+MjOzZatYU}c^TV{EsIML~s5Mq-WKKgcLy3YRcsjHtO zmcf@erJCp{smxsy{0aJcS9FCW?>Mswig+=46&ZG?9|DyHtU_Up6j%28n^8^jnoUOI-Fvz=g@2$1PcKauaL}xz06ID?o356>i z0p}00@S9q}&Y2(bzhGZLEs;vGUf9(hWL_469fh6-s;*QwbPP9GnrcmqAAaKExP{ze z%B{p@&s>l9iNehAd?m*;Dg|3O(nuOwKYK$akx5&_`H0e6&ek3TENDJWTEHW6e~a$^ zF~t!*yXS8)edUJ9vrz!l9Yb^ea+ZdnhjYWBC^~OLM804L_Sv={8HyIQZK3<_4OGJ=~ZJ* zWfsF~;6=A6jLW>SQXVm597Ibwd8h^mR;4uNlQjQn(u$t6T(IbCudb5RfrVwC}U+7hUWvC-Zp zx@A|vex%^eUx)h@PP}36@aUC_x}C1uBrSWLt^)hS%W%W%W}ntk+ot;Lsdmw9m)`~DOw*Rm zmOrh4w>6+d+W3R9ujNHou;t5a&%u?`5E8KUd*_)*hHcM8}E&{}V|3G#ky%$~L=DmBD>wJbjO zN0+q@=T-2ViwfdByRdpt9u+Ic##3rf99*H|j4t?> z`J&A&R1GnZkY*c7J(X#c{`n|gTPz>ROl>&?y;kIKr52{KLh16&d|l==a?9SAW5$y% z*9IV)B*oHKL)FTsX6D7OTKNJ_*`j;SXBwumnH(gL4SZ^bqwzSOmuxVJ$Qj>BWz~{r z*S0W=PmQU~Y>Z zuDB|L>A4(0<#4hD$i?6KU~l~pQ^L zeMdB5_`@E5TPncxaz}8>7d$jQ;@rD4dTSWY$fdKr(GQEH*!T!x{Y6`Tkx2D@n;S5qN6oEmbOyrDxymgQt!CI`K*wo6AL z0L9_7;-4QuP3d8EOBkLqp_RIjq*tZN?B({+~jh>ln)*d4wu;ITffj zwvg%>N=~GV#QKm6E*hp(HRTNnJFG! zT^^qz^H_IqifqMS>yF0!Os62o3=j05)aH^-w?;hH;uUj>K^bj@*0)>h%b4%#eXkVK z^nB``a21#=#E7j@aVs++ep?l(tCrCa~eM-4I#DQT}Yi298>w{RMcnbtoXk zYd8mFk%sI5EShoi^2l@RisfXT8-@ulRr{Aqs2?FXRk)GFvX^Pc^3d?On04{Jy@U^8 z{cCrF8=6`wUu3b07j$^9p0fQ>X+dh(29yQ4nr8<7H9&VvhlzL4apt}NW>?AL2UvRj z{-#!abU3NIPz>(oZ2Q8vO|zi$>Qz>@7Fe>px-fV^19Y10>+f9^6Z zCz!xK+&MC%!DQ>cPFcwrb{0eRB#Bvz&1_3ZON|B)9Rnf)KFO^spT2Am0I1Fgbzy_nFm<25+`T4plfmlkliyMNNhAWW+WIwW)l zVl<=x{Ss2-*lxVeVq3%3UMNbRdugj9dYV2~KMI^cy2i1e8@Gj(HIw?LXbzBq%aN*X zt!XX-j&h?x7L+QD5Y8-dQOy-QUZNT+kthDgQ;KD zwtre9x(SYOm3o-JgZJ|uglL&$nrDr%SwDnz#GGHg};3KyT!y6zm|EHoT1t^MzJ)5y7~XIS?EIP%Q`R1y6HKM)gAuhalgf_gUK-j>9LRI`Pz7 zpfXCa`QENND^o%SE7M3`N=DcQnx+pW)3@Cd_zRAeEr|!}x!YV__*)rxxLok=NLF@@ zWOC@AQp4&_B|0DasskyqMHTF;aJNcqL{{b<6p@D=6*ZfaKSHi{d2h-;5dCZc@WnB@ zBn#DnxfI%=dsOZj;*6(=>{?r)hLiLvwIm;2I8}B4|}A?f1RNl8jLHedrX{d z9Q54R)XsyFmC!f8DTq56r*wD^xmsF98iJN}+`w$>5{cm`nHinOS>ko*Ftk7&7}LNe zGv;uwUz`}G=cX>?XOnFD@;t8r2*QK+C|Cgj+0H5LdW_n03Y_JpAKI1IcQTLF0Pl4n zL4bqAO|q<46~yUUpa0*fH4)eEdlFt=U-xw(KVrh%KA{)nxEZ8eDJDf^q=IDZx$lYZ zvlVE8&g(~z8fH_fb)^T8*7Fd5!PkX{;Dd+Lr@pg_fd?1Q^@bOfzfU#*PtU(=sQTN0 z7WkD*;!eT%?Jj=qIK|tu8zd9%UnhQ@-?!Y}9^Rh*o}U~7$Yl~r$UXjEL|yzm-u{lV zpFpGjiL>ETx4(~{x4ZP-e%|-bw_dLbl{z24m|gq8I{EkkUiZhF|B|xie_#C`r}pk1 z3|$?i(gw7cAHiP__U^vtvQEUE-w|>heVvhR0+m80rj;z?9(DbA zk>GRxp6_B%-oJMKy}Ug|F^sG%WkQ;X-@{~&^!pC`;*#=v&E_hpQJO|__oCgyWxo4Q zq+k3NleMqMf5BrWP$x{P^PKo*A!rE;qleQQa1VuK`+5#M>DvJ~^&=IWKr$XI>X{ zqClkK(+*qJl@BIB!V`GE9fk%|am*$9cMW#>f$ftG5gsZiIZpJp^Kbdzr@jnSHt(ku z=n?3WFQB38^Skk1l)s<=XclNI-u;Yl#E%OuYU*2fFX=_-$UdsP!f5qfcPT4DO_~so z6^-6BfQMQ?5SYw{c5?Fd;4l6o?5`kSZ-o+aoJqIk#q$f`Whc9zbC~WH31?~ze|0r{ zq?7u!tB@N>=}$+OT-L6{-`mqEE3ufpDJtgBS823gJtV)Vn5Ioi2yI`ap$Z1DZ_B^Z z>%CR-NVlb!OlWcmd(FR29FVOX9(;^jatOz>vq#a*h&psKMm|Te!VdMwjQk@7e4VWw zdlC+(d31sSw-Ya(j6}grzJ(E~jQSHlpQM!_kC9+}*fI!elYfd+9v@)6795wU6a(RCy z8lN=0d=}w5o|L)gAf;bD6vgIo`T-}9QZGK*l!jt=9&_S0%{^v(%8~@Z|Ju@#^K97< zLkj8*9JQmYp0K2Zry1HBgaX=6{W=?^l5)Etr{);aUjf$SKgiho+_vFT#DU1Pd$Z0eFXR z;a2+pb}=~w`j5Q$e_UCyYC1e_gvS%{zdql6bwS4yZ~3?)rv)|ENlzz%A5~?NHffvA@v2FzLbSf$7$B34iS}tM`x)`CHdho=e{z#4gvbph zV4lJD(e8U=%xdl72OjHN*^%*vMEf_R2pgaA-7~1LW(q$jCq#S6*UlUs13VxZPo@>C z@*7~K%Y4f1oI?bF)E+Cdj2sYhvmTyJP>7jGYJX{GPRydT(~rOX;LXogRcfM9)d6K= zL#lzosx9%+`KX+U({<|x*RYn(M_ZIZ(yi6#_UCdLb{%LK6y)ER;(Bh<2lD6sqx7l~ zL zw2_=bFkm>3EsaN?V-mrkvlS6Ce$8^U_L5_y2skp05++7E04l`CgVpnBk+(Wc6s0}w zf7rZ1f|7N9y5nskWpW7Vv zvOWPwbkdwKaPKTA1aWRidP zw`18J1W+9~H);3gffzg#x zru7;AK}j*%(eAlVF!k5m3vfLZ)48M^%YkJ+F1;ko9&S7Md@G1TzWn|Z4kuPedc0cA zX$swN7GE?kxU_{a5Rqqe43wA_0sIF=eX`qVSyZR>&VH21=S9UHzL%r*n^}~)c8gOS zvvIVFfbO44JjxaP#$omydDU|QG`W3dhTP0vw072|1N=8ws+H@HywnGSX_&V5A8Og$ zBFu>O35sc+%0xV92fMXggwhxEr9^vczF297s-g0Xh0L7f091MQElE>rS}HNav#eY2ybR$`)g28Q z?`ulI8FJseJ4}vuBMAQI>>U~058H4N#v#7%07sM*fEAg_a?o!@m}kyR|&ZHN&Oc8kk`jy ztb$|^^>^~R(+v_^Q7h~M57m9U5B`I+u=rSlgXlg58(D1kgXNAv^+6zBk~(@48>QBK z^$*5Slr~pRe*V5$hjao?SG;5gqA^ZuKwG-wqS*R-E=r9iW2*urW{Uf>u0~Wo%896p zV4U0|v)ObB+AcCx{s%0{;c8C#+J-kSo4+NOcWmhg?2rd@tSN55QzgNBGKt~31V4!< zHjWZDrzd-xCm-7Zf2a_i!Ej7Zg?L)h2SJr3e)&gkHy9mupzba zlx_5rrpZA`ZlDxGd>jVKLfSMh3(9^2BrJqn_?33gnGgf>TO1or^U1L%zULI}<|=BY zORYwkm4n4k3&x)B&}`ViQC`^0j<+l_okuJPA9&B+A{z_GsTDphsPf(sa`BG6I&7GP zBsvcGK{GqW>m6Oz*p?1?1F44#80=ZwHt&YkqKTA^htHjbr9P6J9c|Cz<=J-jY4s_B z?X>Zt6u@-7?$X70`9pm#%rX^$wuCvp&^+49Ad2l-4};^Whfu3}2DpPEYnaK&>BB#B z+bA?i?O)W8t%MS0z|U^l)>f|k(RcVu5AJv-V8?|0?1H7^XtIRb ztPbIGg ztw$1E_t~TrBO;1;aa?*Rz!W^izqC%9XWkQ*G3-G+(u;AJwOZLG*mEr$Ew75rPVFPo zmz|2!VyB{Lgpi;V-dg8)fE}sa6S1X!UCLFU%S5}dL3VXd!9^S?V0bzKWqUh-2GGz- z{0>K8$wlbB(rE09U8G6YQ*wE#iYMOwXe=Ms{#ZLkin!ASEJZ2+yadTJG%@$L3KFQx zaMoD3uafbHIN8#@m`LeVa?z0eWpgXSydw>l z;dgGV16%~#(4BR$0-KIeQPjX!<4YXX1X^g@2T8^4g8H9v>+7b;~x$W zOvTi9_%q2UTqilOQ4`Xj)Qdsx`r)rTTm>sT$hkL;HG9C1!m5s|@)T}eI;)^T2iPhh zjmjo*rD23^(=IDTZ{-+9d6qJ()GvE9X-%8j|vQop9*Vo zMll+eNuFXGW9&W(*J20PSn1x6E@_NBaVOd2I3OV#Yy4cq5zJEhDQZ>odtI@y=K%&Yq3SFy74ke2i((Kh#p?zu zqqS;B+Pz)d-xZh#z_yH)^TCL$ONa77+cx#!yFhoaK$%>et0^Cf>#OH;=}r8h#G7%& zhZ{$O$j(j!rIGxWuJJzXS;^a?4aL7CwIpDd_Ad&69s7AVguA`BoATgyJ87(lm}(jh zmWT?xz?ZG!%97+IE?sLDs+9~MbeP$8Y~)71j2MCy5>*bG?9S`3+F4p$RMeQPT>XQ| zMC^%8(StNvGuZD49qM`r1zTC(0P!P-laTar7f{4OdmL+A-gb7|^hRLUi!OpPn>pw~ z$r%H{$)j+x1n*P=Fu2ola9GUJb?INqar0fdrYd-RFs8LGYqkVd9E8MfWaL9uW4J+I zb;-XF8=}1@6=&YPcs|X)8QdKg*oX;=3WJXXIBsT(jFs;AcHM{L*e}W_?DZqy35QYA zW9C?m$j0cHOqpI7BpXqupr4_Eky_F!QSbn;R|rUdvke* z-F-Y?@C=;i;(ah?$pTJ16*V(uGGXl!nitrzPt7M%eU+4xh?ocVJcm@BACX{-%Lnlf zI*(pCGGPxNDca!Gm7)VczAL>iMhN)3I%RpqCa3oZ*T?h|sZtp3A1%Uq;y+P>ThstV zg3+SRgnpqf<7G*pI&Df6yIT!4`@d5T%&RbhEq)-|UHo(@4~nl(ihP8Fu!mmPVVRvj6#b{}}d;SN=a!(AFrJWH>NeQAEx?;*M z_9gdFp%Yv0b6yLDT>^JhPyW|UK0<)E%6s{gCd4MJ(GW1@-{v-?{&Aso6KRmVG~6?| z)0ykTLHcz~-E3R%iDAc?9H^{X-4H|m(uR5&46G~lhwBMWiFJ)&4?Vu)r=x$S&=BVE zH(+NVica88dtJ?-Dmyy}1%6dc52uMm(J>04mna?A{#Zv1Mq>wm=RR8&$BG3QscYz4 z^$Bnp$SU@lcuKTATSLH7UfM-dBFqbFo+l(9=mX_W0>^0R9JWACm{8%b;~>*hHBCyP1!NTuF*4YxB+*JgoL%UA}BYM7k61LJ43(RZ|ugbyx* z2af4p3w#c~E8+#2Sl9Rt8#k#Yl9Rd1e9FezbzVT<-D168+a;LA4I!!x z4B+JwB2$aL>#>?Zi;M8A?V`Sh&gN9Skfq^g2~T-ls8D7TI_-fw0ck+Wx8P7lqGo#L zVo`!u8Sa&vk7&oV7DA>NhHpop*J^Hzr#0PpuShw{*rE7rEnju}}qqdZ&fz z6){Rt>x;S6YFhx2T?VUg%eLIRnM3%OUy#v$ciB~6xcMP0xKd(L9o&rGCX*6v*7 z7pkF)23kuudjGDq$lsL6g25F@n}n}$NM`uppxA^??-W5Mz9taiZ?4?>I#MX?<;;gT zs4wAXzWt8l>Tozt0=`k$c%2&R7`>_rvLI|pPiJ>R2$cu^#1ba5)#%cywr0QDw z50O#lr7DDti8ojakPPP6C)pr}HwtHc0}n;Al7aF5i3s z3C`s}2Gzg~$E^sufu?jzv(#>fCD_X_in*I-jP441AZYBdZP)@75XDs@TEAcskO=NI(Pe%x%!9e0PfME z))ob@2!MX98+khNLdt=pR>grkZBERz7zL-5&c<_@a&!*q;Q)u1wvdX2KOvgZZ0fXuEc8_| zR>m8NiKksfY4{JO2a+i7KU|g}l$*zOIwWL;)S^8N7j_YBA;4;ZY~iwvhJ^B$BxsZL zXv<~g>~@{l*g}@cvQQzK^W1#xD~=skfHDbr@%J2V3HTr12^czLLqimJ^c&L?l}!=98trKzW-aidc>23f zaNn}4C36jrK0ouBvXF1CPn%poCn<`PSW|7!*^k6(y48SC>4m2>rwcrs3_Fd59Nn4( z)Hq;VA5M9j7Yhgb5#L|gloBXiXJ--6xJ{^)j77*gr{FSoI3@u6xi*xbTPwc-sjGBX z9#9&&)3{@auDOpjZ8QZWl6L?37c~_X59GgIgdxpkl$n8mS!E)M()P{ilAt2q{DJJune~ zEBdCem*EI*+*y8~FWwFRTp|GdhrMXH%#S;|o>(s}yRpv%#hN9PMy4O}*7(28t zVJ^};s9_9c-be<*_-)@bvxpYo5%uU#v_>ChA@Bd;^JV0LH~OyGgAG{al`-mkJ%qlr zNWWt&=k1_ldhF~5cH7~~2hQjZwL|3(Nbl9s~4LtOM20i33>F6 z1*`{O1+_ihWuFP>+>{N0jy{+JF*(WkaIlV|H^%dWXyAA>YTIy}x`@e`=b@bx5^uj? zav0_lCSo=l#jLnoUtRPy2B3Qd_U7J)5Vp|sr^tXMDdMc;jX7_QlJOoIW7Q#?5O*|F zp>EZY=K&=@Z^o)rwjG;GR-p^NO)ImW@tD6>cN4GBFMVJNIwgs0iVJJSDE3{UF7t|F z)qy&LU$g`}g!oisB8$gTDVU_|m@K~)>r1lxTG-6L(fVR>6G?LnNJgC0X~wr6#vL;S zh<00&yPBL8?UVK(%XzKrSV!Tg?yNwk6G1C!!8)$ilSbn_KKI zxKVI!-AtfYP1ZE?2mFwrWODMYUctGfhS9K%l&@4P*NbS(M_@b}M2c1#USc&rvb3`G zUf+6DCuo18w;lgDqMq@54;8{!ht7Fa@sjBe9d1Lpfb^c@=sdXdf}{#IE2oe`{!y+m zeMiyFRN*T-inIah!1{gZ$bN z8#m3Jz_$AO#nj z(2+h(n2QkmOz|c=A7lnG3=pQIrLt(~N7zyBw?bHpMR{W%Va%bTnHCYW?gRH#oomygs@2`DialuV zhg2cgqDjSX&?m+1z%XE+)t_j^9$OSehSWg#)Dqq412!V#;i%H&#*7y6$VIDffgV3h z&?<4n2pfmlsYu5C)~K7pCiIZ!k*INGAJj*H65YWR0*EoDRj|_(wg13k9FOLaN0&8T zrRbhBGF%AslnhVj^wku!kgp0~70mu^&EBF`Dm)9?dnfmMJ4-M^=fT%}=VEPlJqW{l z73$_4j_Zy1d#+ z1bWn_SVjy|`TpzzEw^ak#u*x+k;gJ$gRYkd|1IA*?trYs^*-m#|!XtOn`TQ*6%v>aG;m4(nc5Y=NS(t_lw;ie$|x6UglTu z%E??uI`qiq^j%x1azwFn6P5ZjTPi z=l|jIZTJYFQZqBxn%EL4QLw?k$6rAnI}b zzYC+D6CJ_o{Z!=ieO~&5dc0Jo0o6 zC_xr$$n=fUdyR^}t|6ihEQup0Tm85c0Ax69`foo;>NPK7!{$y-;T;Rnf4#Yx;B2FkdZ; z{Z@%U`wY=rsHgRe^p#aud7wpzv3;*!Ld^7;E7zQ`>3o>O?$HGjKj7KmxsL#i{WI@g z5)^jd^OY4)xmLyf(ntugJRL|>HZ$!d?T{AYs`_J?l~ZY+UCHfIdle_KZzmZ5MNrP! zZfI6nltb=?0>*MNoQm9Pxhg%+vOesjN*un5kgELb0LsmFx{7M^0wy8I59eGw`K_@uA-UT4`^t2C~p*Tk=zY54Bc=I}Z1VW&EAK?L7OP}tvGR_nf! zEfwcvvAZc%OtXrk@V-3lk10QLT5{O?v@Z*3UY(Jn6N3*l%)!^>Z!AG(TQZ zNGAduq&08288^##g{2Md0`;zCq+$Z7$Qk$<$Cm&)h@}<9lJmQxqnI;sCxpmSB-mOs z1zJyjImMp{K1Y4NYGDQb?RoCWnvJNYdp(89e|DpoyFWQx!-S%-fI{dz}HV3siG9@1)*{wsvKeNcO+iXJ;lJ%Ay%} zHZ~v*#XM38B0k!j1jwUV6Ax)Iqj1XyWMpS{El)y)3m^Y8-h>{-Fr_#SX;Sx_ z7(>-}#|E)Y55-tcA`#b*wPA)273=fL-gWpg1#Q#0Iu-o%K2f%GJI{;hPJK~X&a1e$ zh%j_WjxJIZ4>@_TjS(N1U94Yc%aRsV&kb)r1Ous0E#xX(=Q_R{M?ajDRDi^bya14V zurt>nS$E;^{r#a&fxx%QS5#7i4)I3fH0GK*tn_k?hwAZ*$f5UT#L=cA1`8Ld?WV%i{0FF{qMMuPbXgDf3Xed+44GTT)$Pt zUg_hK4X@>9vmDKlc?Xr@uSx9^1#E;i@_Y-ZoN5O$E2!8CKdEF*)tjmZ9RG+kY+w#w z5SglU^;NeNzb?H%Thc7=Y8PYbM6_k{oM8NZkk$*F%?{8Wxap*c>A}#|@wp|jZ*7fe zc=T{uS`!SoLcTF}i8I7&WNCVow``2x&vRIUDg6mFl^d;lZ*Z>|jy8r8CpEWGu#GyA{ygqpTVmioVct zpXk|LNV$NxDV8XIInMcIpF*Z(!7buf`{@`3U866VGx1Xk!sn8Vd zautu{{@`muN}WSsl%+aj0iak$w$Unjjho2(y*BMicuhkbJS*!=l5BbL(^`=WliU%{P2J(n{iirQf@j9B8=7S#y)@?{m8 z?;I>)Dy?KXq&$=7j~=|>$2d^UdfcA6T3F*(4EaNqUJv_UqChs~Dt$s06do|+pQbL~ zqPP;MS7gW8l%0WRM?Hn?4^@>w}9{zL9l2VrZ+d8Dk-z0 zVcX3N(l;hf@P>6TemIaqPts}Gk@QHJEmY7kS7i9}Z->a%Z2pqZrbZC|L*thm$A%_% z#dsb~2k>a)5Xw$G4}%h~?E&Cd*xC~Y9u3Jq?nX-~gJD!O_N0(q>mORkAMpmu9WtT* z`whdl8}*M2TUq&XFz$w`*#pr?SO^|fs;aD_)6Y*z8S3L;St9gz3HZgM6vU97YG6^uXPyi?wwJ zreQ!s@zjCO;B5uJpY}e6TzI}^)G0X{;l=xmhntDxe(UpcpwAEqEbPJHPdFY( zd<&JTqd&HfRi0VsqWS>(GW20}Py4N3cei4`ebA?L`#76g`$Erx26;iw=+l|O*zAl{ zshq2Ewa-#CuVo&^&t?b^+CRDMkoV`QwPp~-Y@%>mXif?`CynrJWX_TnGLg>%COq5m z6RB6iK;g+$(_|N(Zpw3In{QbP0u>Wc#nM}gTw_)o*@M>)dsPAWd_b7=@Un~$XZ1%BW!oU0s(N^V%8TE<{HyZO$cuxk_3w*Z8h7bX*u#> z*8F+CDaP3NZ^rUz#<^q6^@=CdC#mxM{|_+XSm47r`{AwV^V+Cv zj@rwFbtSo7^qB&sX-J!65T`rigzs-OXdFAoU`-})^kHW6#nK@fo~lNVYQQ?!prU7d z$bLsQ^5!J>v((do4|DA!v5Ff-gS+QVO$5iqC!g6<|`^1_`uNv9ALQ;K6l1`ocdZrzknKoi!M|!+#Ifa@cdltEu zGnD6JGz?&#B4?dU@*bJ4lq~B^_3mBdAUp-ei7lx>W6C{~LPjfpQufaNZXVeIbb^8F z?IjENHOdMVKe}34tAfmEYH#j~xerYU;b<)nN&=AM;~S97QN&L=UEZ2b5C|*jaK9uP zGgO^{-1Xa>^D^qu9M1oqJ_T;Rj{tt2@G3Jd>hNx9JBN=yIO11M$qDPS^EHhWifD-# zZ7j7Dv&AkWp*w405OLr`Z|zwekH_yfbh)363bY0VE^J?Jx*t^Neo;_(WY?R80v*{^ zIEnz~GPjmqYLV<;8R?A6mLu9mtZ%9-w1tzwk;c4DU~w@Mo~+AB?C+_K6p4)?F@;jJ z0T+L%bAGCNsBLTEMeV~h7}K;e#N|Uf?%1ubkb;r!<$4~O^B%N?@bSq!c4rwX>)K(SZOM1l_Vld_1H<{mROGsh z#+P@hgJ|UqJ><)IwYq@5gnOjRkxmD_`k8FiE`M#1B|*5D^YM;T6X_rEO!0QMx;bQc z_M{Sx2JhK6WmoXD`d07V=Jm7f?fba5@9#!l&%IU9^*)EmyX@N9k=u&jcJ`i5rZtiI ze0Pz0YL1%G;&SWW_MKw7CZG1jQ&<&{g?k0c_6wBv=kilX2j`5Z2b`e?-fWD?^+>6lcJQ8%b{rjlU1 z$>0UsgV^=1yqo0N+^RE*mbeBH(#zcg<=@0s>!#l>9@%`lp{dtBLGrL4TTV=@J|p1K zZyqf9*|y39+$s<3R(Yk)g1CNfYe=+B_J7QZ(QO&}g(QwMU-IJJP5>JS8I z(dax-+sqC&OyMPo?g|bxCTRT?!n#MGFO1B6M4yF+*dSq(kuqY=f&Ev|`dUwUF$7qI10Set8e*YIsbQHoiZfk~y+aAQMULRQ;M6j#ofJp_k%myP= zFzG?9;PNR)^m5|+NJ_;JYCEX&&=%1mHR|N7oVQ+U)(lId(?>k@aI6bWhBB)XH?A>2 zLRNT+Q`KAI3g()-uyP6m@!jV&%zrY4XKTR?J8KS*;_F6YZD$^YcZugV);=`mfdX+S zG^RG5nV7CzK`8y>mVUGyblpTk-R0SFm@ztD*fZs%bhI=}{uC!v!rFmR(s+wWv)TSi zH@-ovLmIgYV+!3X__mDry|tzyeaVM7+qM>lGJT0$w;%>_jFK556|+iX5r1LSoXH-* zm6mc+GV}xJYSSd1hXaGIVOUm2&2MI~mG*o<~&1pY!LSpgx+ z^3<8ji@T*1U=WW&VF@cs`{*t4fo?~a&Qt*wf6-`J>tpxM0b`b)TVZY~dQFJ3_i}gq$;I`EVGQ zWM)hBC(ARU=_`gQ7rs!MT9R$HJhFYnY@WD{Ru9>jj>Uspo7vG))zZ=&cu7;>XscdH zf6B|hEfcW3WAIYhlC8(7>e#nTalhmjv#@FFBN00C+MMAleq>O;dXr?=B2#8o9P*Oi zZ=V#X<+8CcddpuY6$Gp&h|QfM+Pt5(IFQWxhIA-Su#fvLq$Q9j&(cn`K(I|B&{!B8 z^GY*rfk53KT&4`m!M<|=aQkItyl8J~f7rf{R&<{+Hp~4%{Cs3A0AI zu1ExhbcBy}kX5TV1^ETIageZ{A1Bg!5C19vC`Ia7t*wz7qi;sH=`XSyNQa?qevI_6q=Epo^VG7&vs*C`@BFl=4O>T})7-PmeYOxqoG7i*SuW zIiIrMDVM4D>w&`+a>~#wfecVA$8`xZI8o`f>`Vu}7|exunobD73wsUzj!j7vWl;LV zUSUlRw?+2HWF$o-%HGeV9aPgef5OTNtS`WpAftpkQHoNa?~I+vlxpWL`?WoA9_NE< zJf9GvxbzuTSjl{H#mh2|uekjJnOg|_CDdFUVoa}b$12&Y<^ptpdpP64MAa(DqG~ZC zlPqVrJks7Oem16NOl4{6jO+0+MF-8@PqhI^8wuKzF;(??m}&h|EX~$&fAS(F-(fD2 z&Q{t0Gfrq~ZL={@5n8));%fuf<+3*JB{dOsMaYpiXL{7o3LOTXDalTYbb9(c%5RTk4j&%5U_v36IQO*Vxo$VYrE z4wDfkKzmZ^FU5P&hh)Jkf59r*vijM6rdp&=gueumP1-B{vtWQ?Xw~m$mX>m< zy_y80W6F#6$tlo~D$VAoIOZ8CdhrK*q6gJMXx1P@OwN@6Ql!i(gM*d)S&T&` zAj%-&_)w4lM+CuNe+MYmv9RN?KW*2> zV`+^K#dHO6>A@j<#K-z7v*iVVIJPMOQ>>1c1hRmzO{w-W=eO@u%5daaQq8HAnVRY zqRlX^NU*1Ze`EcTXO{SE34%vR8}SHa(I-!-KSWpR26MkpUNU_^q2YMvu}jg_a-8j8 zp*U3AEs9DDvLsUOX|W4zo9Omo@S9^vCrjd3k#wBb)^wz^$_Z}B+z6gY2%HeEVYU@- zLEqtKwXDk`b9}f_l#ZBhjIYG)L+67)E8T2SjYF0Qe=|x^srDeh$RvyP$Rai#|7^}f zw@iX!yD!jW%UYoHiWui3*7Y1~{eq8%QgS%64OB@DBm;ta9C|K5%Ow*kPIO#J0Xb@N zGCZY8FN@V~w6#Q*WR5ko>I;4(ahqSuDBwQZZj+q8YyG}jmDujKgU?Hhul?oJrjgZt zPY@;&e;}h%B%GoUlTHW%C7q*$LMtB6w2AAoaL0LtLP2%3iXV4feubZ@k&fdEV?mNr z+HW*!`w(4gDq0jb#h=Rc4y2`XV)fbE>uDW6P4G|a?eAp=`_?U8n&jnaZ z5e3&jpx`_>6%(gw-ML_?mRq%FSN9&!k+k=)fBv0MBij?>BjSILDMxqe7*?bypEEan znY2mMa1!5vD+}#Zs2p@Oc6ASZnL(k!@udKe8we9vUO4qnZ1fzxNvqqOj^Q@yPzO1O zjpTv>ff2^ta~pEnW01Pe=MtJfhgH|f@w|V;=IN&TnrI?Q6J2-W;@bDhQ*Uz;M%y51 zeED0@kMK{(^$M%bB)+ZjA3nkrsMvRrs28P z$F_d(Ee7rpU`yv%4Q5_P88VUb7d2~<|7FrR`5^OUbygY{=9@qe$w8l`}hoB_9qixi_wecKw{FUH0 zmyN%ZNhR?;`YdhP*Md)5;t5+$W3(t80NnwrZQ*>6;C?VwQ)x3%v*(QiXFzVa|KxUx zr)X0)Fad`wc+HHd^}wv7xn8QNe*y6|J2J2D(Vp7sQUh2+;K$ZQQgeP{nqSFnacR8J zrxIw(ufmL~Op65T;N<;m9{gkU;2-aj+n#0|T-*fH$IS3rIqaCv>LMq!P&6rM+LTP> z$y=q3cd(DH7|bnba#KFc5xd6ASVtk_s6bm04IVNKRPvokP;=daLbvcQf6|oXle z^=kUWhgD%6r}7oi7dAncP{d9N-=Z6m)BKhbnOneYv${L`=S{?(A@30tFR0 zoVD#8E=J=>eu{$a;O0+SeWsv-AFdoTiLIaPunyca@!)QYnaZr^F~7BkkFiAd;wT0b4cgF8*E0m~UHe=zo$uIJ&MXhbIMSX(GjWp35gSACTiNq!~W=09SxmpB|| zN|w$DO+=cM-KL_)0+X_(HcksfA*R#B`}fX75LFD1UMg_PZnF?hn=mk9hwID5hI7GW z_@}z%xfd*t!1G`@Gk2iypt>avyjF9C=*=y!+ti)LUP<74-JT~pe=6oFM7uYfGDX(8 z7tn;@SGTFP!*DS4C<^wwSC0f8SJ_Qs_|E{p&R z>6k?N*$_^Zn9IH#f2CzJM@{)n^0OqZ8!Nm3hNQKiH^7|isAM?ECQL`56IP8M#%?kV z3lv;HNR@z*%@!fyF~)i%EJJEN%d?P|V^>;2$3u;~Fny}g0NP@M#k6Gw0^WEG+&jWl zX6N7;ZZNg<1ouUzqMYS^0vfuCxns*lr<_m6!FUHn9G$Vgf0`dM81dJh=hv{2vG){+ zy`n5Ti8(PcJN>3M0eTro`TN$)J@oGd0I->!7H zF{RCmKoDISKXa+1w2T9rtR}VV{FF`Ty8BdTgxLy=8u(1UAkISkfx{2*n3#%%DJ(2c zHJkcD3j#v4f0Sjyl{F_u-ID?Y&lrSGQk-!XH9t>E?Kt6I zX+ID1sd$(fVF)1L1c=0P8g~H#Qc=11(?tsyeaLPg*a;(T(!v@2PbSE^9#ARHb{#f0&#JYX43ZhE=U`lu%wc`zjfa z5l6gH9X??cI4p$qp_CkA%__LPyQUQbBqUH5o4`5fLB45N4K|bUL zEYADY4CO|Gv5+u;K^fqQquxM>wa9i*a6?Fe9cBw*F`=>!`kAux$j~y!U?RdHE?k(( z_-b;oe?ON-J~Q0oqZgDF<1%|5w@<|+@kIJlO$l!+v1rSBj_>hM+$JUEr#o8quqtnF zZ#Q}^{XRMo!U>j^(ck>P_6m_c9rHYP-suZh*Vy>d%0iDFokp8x(r!1;WLa7+JCYKNVgbd9-Pj1yHxXQ=%EkFqeCRS1^yV^W* zs$Yya#Z$?rE*lbI4%%#9Rd8+mJ}vKNwPkZY^gW)~v*#8+pO7>w3#bPUy8Mi+QmH&% zf5a?6Y`HjZ9DpzB5?9C)gz4&>;+=Y_GM$S5Kx2Ey6nk{sY}mV?n2eC?*{R_jrdkcc zP$6eoU2vC3ZBI$|dyIz0wHNhgbRR1|&l$?BeJjjA9)ix&5<%(~!PbB)){n6Y<|z=H zfWpq$G9s80RcP5lLyQqzo=9k#5ou|~e?fX-6+paPE?zhHxFqB+5ff5Khn~OX7~nJa zQf_!o3{Q43@ zY6<_HfF*0uErmEY=#@6jYp$) zJ0FHF7-BJp)Q25TJ+9=EZe$8qkq1O!k6iXLSS%)Ka+P>AV8>nB!&9`J$Bcev*9Yb# zOM-SPXcJ6ApgV3b77SLKmI=&6X~tB<`#vUMVZd4z6GdA{4bC^D#gh zS!zH$^#cWUwKXk|&m$%2B%Z|!Ei(vmgYbrcD^8%knwtj-1EEL9%1MLD4Pn%zMUTp=t^BBrE%DG)^r)*xQ?G=)1Hmg@e`$B*( zk&8)k<4OGWHXm1*K7`>h4FnqjqqbMOP40T0vQebOKc#A4uIg^807-%3*b<5qjku~) z#MUTA$H5V9$LrVyM|wWtb@y@fDlT9V@7}rds4H6bGSxOO#us)zQ56da zB?i_hcinXK+-lW;e{w$j08ybM-DC!|SG{^`ObcPRpYcQ-oD zqchjm93=1r$F9V$FSuE2rx?oN*i;QL1wIAPM#88aZK+>R^z3t@#pFb&HO$={ZhHwV z;M0e$)KFj1mg`@rKMw0VmjlTKIG5k6sYmUB+O9p({46aAe?XZ|=M$I!>Fvyz`34Jf zE2*JY@>uxP4xIJaVAEv$txRnOzZlD73wBc(u4fcp^RFi3r1pm6H=m!Map~;s#l#g>d`Gva?M~v(6|OpDAPACPy=x}g~GGL zV_*s4>nH3be@46L-Y(XudGjCpr}i;okl)Zobxrp04bcD2K(5m#W*Be{W`FP8D;7tK-(0n5DMsw5-IL ze^?*1toUa6hJ>r?z__2G?1<^E7Xo(hmLr3933ifNjXZXLrClrJe8IBrawaaeM^fKa zQc~uK<{aI0+OfsibE^y;Axz;~;{S9v!ZF+k$1UA7N5|s}x6N&K4}9ueb-ZrRJHPP0 zw6Ct(=l!qVhl?vu{lUAuy7+k2{_K1Ge+&G%^Ot_-yzgChu0D7B{m!ZP{;Su%ygcik zwBMg~ytDR~mio*|=d$m8`P4c0F5u~3y1kCq>$lUTRm7{;&N(~dnPq$KXCaf9Cb((Qk`xbBVd-a6#i@tZ(Rg+U6 z>tFczM*gfk9R{SH|G9H@@=5*Je&0Ros#mIkdmp;}bM*>bzBY~i{kpB6f1}n{J>qlw{GH|1i^mUqW(FZS3Q$Psm*-cbCBuIuOPA4=V!1nSDk;qe^zT>BDXN% z_Q$IZ?z=6fU%G0gK$!Bf>f=|`AB?PiRZ@T9eZDyDegG+9Sw6Wq|F!eA=WLVOcXNo^ z?=N7d-m8IhaXe}Sux%hlr|r+}kDZ<+sQAv0o%7CB`^@)xmz|R?{6qa+9T6puXS8?c zJvCPlHT4UAh}Tv!2Ty>rf5LKgt2$A7^|{Am^r787yS^$M z1oh?%wS@3UJP_7S&?kDkK5o9({h(fT@`<<2bF|A>?~~e!_Z{`IfA;CGUDOWz9yQ1= zugL{Jf!Fcrj>9WB4zF57$qO{H`bhK&UCx`vf8f?0I`@ZeyM_mjofBwU6?Ll%wE%Gp z<|bszc$@&F8ud664HGwL@y$6yhyd4D35^Xai`GwjJF#Bdw z7Qci)6rZLyTFV_ z;FYbhu9q5hB76SJAIGzIuzC0{0T8#AOME8yDv#wRjlvP6w*yZwYdO={`s3~F-G&1= z(JsZ#$*u>(0i1Mr5dMJgO$5wi?dLyV^X-UXJv9}Je~y5^mEgH6*3nEtJd|eMaKcCx zSyG>})T0eD$0y(LmCHPMUt$=Ah^Q$eOgDVrjtjN3TMU4#C#H3G(QKA(<-LPkw=}m) z7)>cdb%y*6X9poQaiqYQ5@+h220H@WM|`Vf-OM#P+VEw0?@3ABYUimJ;u+rXRm*~t zlFX;zf8jdXdxPzR48N@ub)TJUEmV(hjnN!g?{nbGjpSgcO{r6eg@>qo=o^9e9Wo7X zXNxIVoCy8)jDL5Rh9hMI%x2TK&!0a$JhX1(c`He8pG(c@^Jl*-`zwz;_ysiEW`!Wo zr~w`SHl!(lhmskBDeeK)76G{@WW&-V1}JMNf94FPP?f8;vQ7YRYKJ1ZiE(Ua3Vdxa zFb{VC`W4VYP`KLf zdlzTd{m$7}J7)9_PZJ*`z*Y{u-!s^?2fAxFy}|ozra4!au?x{q3&(?G!ih)cCfo4j zf6&FHfy#6o{GC0I0jJxoX>N=FdbgNDRuIdqu&P!4F>}`mXXw6>l}IKCt~PF&L$6ek z$n-8o=wRtG!kiJL2Qoov0`yIZv%X{3<>PhN5R);XFAi#sadsrXx`8|5Ci%W;%YvmR zu}upalyI1#Qc1}IYEC&tZn$%K2Fh{Wf5qZ|2+oc%m9Fk&EFJ>HX@Omrb7I_GL5Q}_ zy-#4X!gY-~da8JIH4z+el0()>I2u44in##!e&^GGiX0ZtMlgBEQAige02)o8Y46Tbo?Rg z1(aBCD+JTKXq;rp^ltI|;cl^~wqtL6I~}*~W|MKLTrB%SZBY^1rzGHT`EtKJ&aj`4 zGwhKcYDF7<`|TLeSe8-(v1h}T!*EvJB9}b@i(=?UT>yep~UP% zG*WW@VVpoi)_dj0!%IH5y%z`j`!Dv?Ecboyy4SAz%8rCWqReW`5)vFxe|*;Eo1@@f z&TsNbI_Cuyy3~I43;L1MII(p-13G9q{MBT=G9R z71aE@Hmve+AT%(_qeEQ*`aaA60zo3MZv(CbOVRckCKx`-?(p*_^aTj9?-yM02fA*B zs~-`|sZ^EU&I2qb4OhR(f3X1f_DrV`$BPVY8e5CP>ITK$$c4$IUR6N|Q#CPR3bkdC z1;ZjQi%2z6PRSSEaKvRJ5QNmkL}mRX%q?%HhfMdl=#5L9*NWzeGC6&}U?X=HuTL6dSe_hP0#-9~L)ZTl$ z$pj;ZMv5$rWD2+4IPVV2nDm1)kPhKiip3dace}oMl~kSE@aJw{y?l}4*49_yGc3`L z)H0~18si}3#zUmr2p?#?vOVv(^pYP3y+iuB!$gA6P>r;qUy=yRy^ZICn}^&3dAxxeDUPsA z=Ga_+P!ci=r`cQTHPq&nyN8IscCgD`za(^)1wlz1A}EJHQby7(w53K%H?w2n-_H9s zj$skXD`rPH0HeV~aNZHqzkpkgXHA?C+(D6b+(ey;!Y~Dv7-xEW=~{>r6N}ZV%+Yqb z;Lg5HG`cM}f8WDP!Z8=V17!miOPS#jGO10d$YKEf^BU?O)iK*?GYg2vC*cu<3#rVE zpzVD)AJ8!HF64?(0@)d1#XC0}X;2@&RXIYEhST|s@n$wU$WbheoeM|XQcW_Z8Dm67 zixC|MsErn83Az2T<$Ve9ra(Oh*o~B22VKwYG**0yf8mG&_kB2F!*U9Y2RA4JIn+k% zYvsf`Gep?2OUo0+PHZM?;-H1vN8B82N{VJo|Ck3I5e5-mT8@&;LMUR4gP&&%Iyy5S z<`#!0@}N}si_LeXRjMOH7vj6D#z;kCgELTM=Eu1Uuhw-JaH8rHWl4WbjX)U^7HXY# zd;P2KfBS3r6Mm5Dj!xR}i%ngO{P;F-F;-TwAdVRC@f6V8iqA?DTJp|hdKY9-_Uspp zr0Jo4OO*Q;@0TdCT5evAIIzfm|BTXe@C*7(V@T=mkAi;n9k9jhC z#|0AfgAaYs$%AjR5vqBhv0zQcbYKMh6r7mTe|+gYm%Ge4@o870aKX45eRNNx#uh!A zS%Y!#@Ya*|QEZ(8)u?+Mg)$)jWEVxq&b(42AR)Rn=R{_5*=ie)TM~nqHgT-9=N$PT zcRq!H8HqqLzWzMd<7*}wNm5#MOPnJ`C~sOJdj#|wOG{7DHDP} zf4`9-K)tYN49+xq;hHK-VCE`#$KTOqiyp*$27yw%p0WFxBoFdr0Btpo3%eEx?jjl6 zLOq2yETy(|AD;CU8HrF^3qlGS19(M7Gc=>TN>z@kL?+7DP^8&&&OGdn_ z?pV!R$?}=b!83$sWdzm4DCKrbL5+K8e<^NN4NbQ1YO=37y1g=Xma8W-fd}Jzy1@8& z`l6UAE`ex1kK)cO7ULTq%o9HSF?INH9q90)K4ze|*?R*B(Ckw2&-@(1N2&wdpn znM@hTqD0b5(di(RGDo9tLJL=^WPCOhiwBHoW1MSkUS{!RgVS9NYE1pED@?xHQo?b6XP2ku64#$aiL*X;5$9Z;tt%!?dE8Kf5kl2#M+SB zv?>U!8W(6Ohxjlet}Wb6g42wDMAr%UvG~eI^fox8cCidG^7243L?Te;V2Um4KB1OH zgh#+sS9n{+aWYqT#)Kfs3=zWWdrbQZ)j<|O_<%@>FAjs2HlblPMdZ6CaEsXp=8Un# z()Qr(l47Gq*gj*7L-;)Me};1f0#wmg+-}Nz?g)3sTLFjFHXZS(M$W!5P$H-N^+wYg zYj`$mb-AddsE#ZA`hpQ^@XhHZx#zcbH>_pIN|{O6l+dDVib?Q%Vt~v6x6(v%(gsW4 zV6(hRE%4<-t(qEN*Hkm0pJPm5_^`0BFoqI|`b2HbeVA$ZraTlaeib}u*FWVL? zUVx)P@DYg~WTpGNDLkgM>-vBmuC(UuEv&o-3XiRb4)z(9`ILFn9ksI!l2P`pT>^2u zPsVeulT?>c0$5>uk(iYrSIX$bn^csrH9B*7YXGv^IIAnIfAYgRR{7!jj%a={^Xmxr zH%(Y<lPf8e7Y%T$OllMUs zax~Y0mvN0Ye}TqL_Tt(FTA!h}>oZq0I<=;k2yzZk<4o{y+V8jEzPsFK?}Y8a(bf#@e0FIzgO>=Ly#acj%%p;Qrf{2`V##Yp}CL zHd6+@Ls(#KsPe8e-QCPUef%o%0qt()+~RH6e@c@#BCT^jGbXOex&Yf`xBj(0* zOcrM{4T=7tID}jT+FGM#&BmiTX5&%0*+`Ru&^3j1eT$O7cT8y4oNSIhv+C_jUfvY7 zf2O5SR?+GChELC5MyO{>UZk8cviXS&r=HRQC@u^`XJJcE0%QWB25Q4W)vOF1*O8&) zq71D`Z|4Ir;lLtzM2s-128G+JKof`cOO>2(20^<*LLlZl%kr7>EYA~%)jy0VO}SYB zs@RSy&H-mGcwiFNF7;(=a>;RZ0hdZ|e^O&ZBR0d&E#Y=x;45YDWgQuO>B^wXJy!_F zZnE~XyM`F*N{bTRf<%onXEW4=6%|r0%J`ZLT_%6Z#dRwvyY8?$qX}xfJlkHQGV`j2 z$h>Ohk|BO69ZnVK z2DjPH%leq`wx%a)Xv+$`9&O0a_2FsE{se5fwU0TiKP zwo?Bj0JaEvKNGfxRiMs<_mQ(fR$@6X8UCh@LN3Ga1jE%o??R*?p+FEcNyJS0gRTVQ zvvdAc=&GZ1FrQ?2=`jFMFg7<}e`r76ZbmX4y!MBz+->RSAv%DvX1{i`ileTR7+{95 zvdnawH<2mDK&En{gp*2LXPW*OYb<- zGoR|hB`i~aK1^a-e@1{+iUaR|FS|qG0^6VaqbfXJM_KX|G;p=ndOUVYV(XGd*0+5B zlfu7CHYOs^olpBfVABH3e-y?8$xbXRf8gi{v;GV@3|hE9$?C{vg$tum1K@QH1K@Su z04S!(xQx}}RkEB-Q(%eMa~fa*Sdu`Yb9m^+ImI^%QXq_`hQvy$7}FhNc_ELC%+XqD6&CJv!9;i;JB4(F>*$1ufPe~FA~k`U@2F9fN; zxlnxoy=FINtrU>i;ZU9n00B?c8X<7qj&wFbIB=3-u`;4j>3UN`y58h#+#5t>|8F$* zbzofpuG350h4!EA@t9W{N_0?6`FX~ifzbL47>GvfI zOKTVxV#i>60s$TFf0fgv%cUuf63lsQ8eGRmH5IzHg7nHF!KRK~k>inrsKkLH_>UFS(M-Camc+hERQgr!P4Lmk1P849#=-X_5~BZD!-=4zIH zvJaKgo@WBrYJzS=JI}ZPZl^t&o|8mdo`4rXm3=@8#`m!Pf66T>!trK&plfsj)CoaZ za9OtS)##O5U(R#w2k$#4?L5A7x96R8Pdev-e*EF8gHX#SpW0U+I|zXOPYDlCnivt{ zxjE{;LE@hlB!0^Sc2GyD=Nb=w7y^9zD|KUj6@gW6ly=Qd9tggwO!mL=;r~VO;Ws!5 z>+}-8aeH-_f1!lC&tBOD{HC-E_{qDakN4N@mPVBFjX}ycTb06S{u|?bGjy4s0?gcE zu-gvJoU93Lce8QvSeWLecx=nA#b1>%3<2_IzibA79+xAZZ)T>h1CY1g;1}wD&Q-qN z*Idlo1_r+j>$!BYOOe;#tw3I{yTTg9Xmbemy06S3f48r2DRWrt2X)_CgmCwo0cC%b zy>A|`z4Wz@4%}Y))<;HgFMVgjQ0|Rv`ct61m!H6Lxc7GmW1QrJOU~I`50o>HSn7LQ zV2}Q@fxx>xkv{g$wcUcMVY>Q<9oHP*f2CQmPVcRcH(&d$ z1(dDwxe84zgr4(ZPifvh8^xaRCilOc#oOK%^}cxlI=v=6I; zrOgo}ynOxo;J2d}M=$o@93CI3$Zs+sP$_BRQ779O7qc{a~B$w{9*NUH9) zyi?r}sEwE<;Z|v4BH8ir^#Ns(CZey(tAq#5N@rDsXSkh#Sz7T6tkdRF%X0LSmE6w9o8~P%u6?JD(%zxj-8O+ zI$^$AYlKATtyi)}XMpaJdS8@hx&7&I;G#jBggMcGO1zwIAX|38%i-O^f5&61@NG-{ zzKz!AHLlHTy*Bi=?WG1X7|g@;XhUZc~uSLL+yTe$InXE zuY-uQ(F=bc=>A0t=bFJX0_K@RE@Vy6cW)mw2|2ht68yJrah(??X zA;9C@7#nWgTN;i^&JjUC40y1gS9(PHLPVA&twfrT4=}M7?&)-|#mB!1_rd!sF$ZQjej~jk5f7H7J9ofKvlRUsYm9Tf2egjn&jHDvWOL7^ z0`yiUKaBAv@EKQK$Y&-KYLUW2gfmmmr`L14x$&gTY4mk^5WnaU;Oqpuq(71eSUbW= zurU*S0>GE-0{xO@a}vaXAapQ+A5F}71vf%_I&i@>f2bbqW*0AmG`owY@CXAyIf_Oz zgqs||(|3+v{J}uE&1XpLh6e%&P^l9*jMaoOBJDiV8r9=aT9us>I3((X*s39Sov)W4 zI4mE-;aX$B`~3jKvtJsn_y`x_8aV^E@S*q|&ge3Z6hhlToM1fM0~O^vpdMfV#Cu#- ze6PX(e|;CDM+fuqazP|z&;c5(fv)*=oRinD-W>0jIw!9;aZZljthwUooX}}4A3Ce5 z9V=|cRtoVu4MTYPZq8;YE;>@|T*OB@rA(Uu2|c zu*q^!V(zYXaL%o`6Bdj&;YY2%4>x)rE*UL=e~em<2cqLoWD@zzGz_K&GY6{DW(5Z2g+Mtsrr*KnZLkW$c$tS2y5 z5rgb&Khku`gN4;;j{15H^TH! z&w%-Cz0IXNTix1rf^+jbvbXs~=2MEze|~QRcj`K~hLaAUV) zg*)tCnodTz!TZw9tx~d{Xo2UsT`a##1-1gqo#(M37KX-L-#$tCTQ-+#d8%7?{r%0~ zy6auKe(u&?lC`&2m)8+$`}JC2Ww23IxRwx)X55g^#jBcYFR`f46Lb zC09IZ{52<5DmK(~cTlR1*L?1FtI^0!yS^wbGd?u>zxtpyJn-L3jSqX;WOh(Br(4Wa z7CU?5xi7ae4mP$jkaSL48qPffh}~#)SnNzC;!$CIlzwt8`@`IfIf}tisdQGGBAdv5 z&OX^O_}X?(rR4p)1~HH=8nm>Ie|Ei<+Ad!>fdM~5(YfC68?>J)!y4P!Pf*}=*mA3K zE)1IJ(}g__G3;>&VUM;8K3EZfSsC$gw}?V^V3Exe-)ug+sMgBvj{-3$al0eKpUdW`QWDlf_d>Ok#Eepgp~>e-62ti_%P2 zG3W*Z*UXcm1W?&J;n~9O28|iFLcn}$|Agkui#a#vHXSQA8y2e$p@YZF_h7&_4 zuK_=h3r7qW1CGRefS>H7FlEUPTgRJ)HMcuk2Y9xW6t*et5RDnew50ZHtpf(RZl~yA zlk+7sP^dOdA|!H3(JJY*f1F)4Mmd&aK;s_p2nARvVP~Ukn7MoSdu+-BSC%I-eSJbm z0}pr1a6scPeT$wI*?-X}KUo;V%J=%TR7`u|ri=_?!vnA=dOQ2-s-LJuzEd+FNfQtn zP}o6%0UY4a3kR@D`eA6r>xX60cW>uq?m>Z70OX!8w;DHIIfw>V zy@;uv%~MT6lUFe^5?Y?jdIvU%RXCf>54w8Kk-8awd zro`1sOWoZVu#g4kiQ1Z1ZW>Cr;mptgw)1LBT%<>r<0F*gBf!12qDYq#MfwaKZfUlW z$$3;hprbVhgpn=Spgx}LOZ05W9oP^9Des*@iNZJ>-m=&me`*Xyb+>hilqW0=u3;IV z;gKmaof=oWET-jHd>ID4)o+z$>N_9Hoj8~?opasTW@})l0caM@Ap6ZFuAPtVGtO9( zfQoQ(+X&LY%K2xH(liaxp8=J3K7#BpoOHq4rR6kaBnUAA%S{)v0Z+i*J9~1;4OQde z;+PFGw`E?3f8?&NpwgJjtzvcu8Wq&l6cmreZG!7UD+-65dT682jqOl)!@4r9f-7K1 z!>7*xt${t`SvbwS9pdQ2S~aGuu`5&nEdqWAZX#OHarltkrpbJo?K&jR!5D6HX67Jt z3a>!dFf7(7;l@Dyqgh#P1JKHc1w5$7J=_r11SM;)e{K7+yT#F#lj{1GwtryxuF?t) zt8S{TUPL&R}suy0qXv#Bs!1U} z`s!av`Wp(;1s#hP=DmX@~;JBqW zkgvCMLd>gY(GKTy0_kQnhLx!dmfkqj!o|=9UK@taTw@bL7x;WemxpDq*$$B7zM^$J z52;KuGu;8qUsJGe3lAPAtVpzG4={pr51UAKe{7O2b{T>%fMiE%=xqS6XN>A$td^e= zANUx42Ts%Y>qBClW`rqQ96`t=5(0ol*i(;IFOJ9-yb70#TTys!&J}99s?35A4Ysw7 z4lM%O%dQbDjeGX;)1o+5aaHKYF_HOqXl*lHiDNDsPH{qrhb9K%#6@F9>NvqY3ek!6 ze>D;rBq*nltAViLFq~l1AygnnIv``wKg|+nN6g^!5yO&z6~a+c*f5C+9aPOwNrkc; zMl@24!^y9z{QyWnx4#$8LfA2Fvrz&V72IUWSh~rppN4_O@Ej9fO3-T=kVdo=Hr= zkc6qdfmR0qSAP*Lz0LZledY3)HF>=(W`CM7lkc#SxoR{Vp$LXM9kNVB!YIzGUUD%P zC2&w|oRTN&gfM?Jqq76$2C-`oim|YIXJpmQD#{esx;JK4Hi!cU#JE$~3taf}I|3GK znfflh(thd-MPH^r@VcKhORuRBv?dWA?V1M>2 zshw86Z;Y|u;T(fTu^7rk%jJq~HfOl&{4G@wO{2KwY}b#wZqw8NQCEz)YLf#@TIjR! zPRTv#0Ywd^?5@Jw`Pd;aS~p5U9usDCO#ou7F~Lom4EAdy+wcB9$odYmiN=Y(-D0q2yco3G9B#Xik?uZ z8Z38Welpt{kn7vNu$v3dR0T1~nku|ocVgMm-mKJd?ogzJmr9n%;SkS^teIW$>BN;S zfr(?NEus)GpC~&93{*;~IxG+n%f3NCn0Xl4amPyuYqCm+x*zZ89UFp|ynj!8T&Qy? zi@&T{>|$#k!{at^GI`}!4}^+{cz_MevVaMDwqgzb7&Qjoit<&&Arbj|^8T!sSg3^U zgTS~ULBrYLEba)0ex7k``gHL92 zyu`wlm*CuVP*=jd>aO}lJb%dD96CK=VE)B=wSsy%=TCbAIwm%L2o}@;8pU)MK~BAj zslYHEwyZ~Fi4{DqYGT*2QNf;3P8URH(bpBE<9+;(uAS98g@i+*y)mYebi74;7;4rBJ2ta(%?|_}x1nm>-)>y`^O( zezD`r_8sLB%i`^vMW%90`1mA)GO`S7PebL_2$glA&f7WBd7yyDyZ^!aRKDk?Ch)07 z)VAZYC7AweDTGbmF6Vc^kwP6kvXr9^Phl92S$Cn{gAa_=Uw;Jk#TKs#9;9zkJoKdw zGW>2~S1=Qb6?F7V!CCl;k)$WdNpS~`lmP&O7{WE20isI^m0FDSF^XnvlUo-jLmObN zf!aVWuUG#^p-LzkgTzLZp(D;t!+*>JbW)M#f*QL5i$gs>E_6;70H)Ampmx+P)`wup zLmoF=0v!8f2Y-{mpLd9x+aR9}^U)%SKIlWX3s@@iNywwhbd<(q=8+0^fXkkS(;!MI za+)#{1M@KqO9d1ox3g%5owYz=o@ET2Vp<-I?BHe2w6KK*fB-cTSw#O}KsFLS)}xjr znxQNs#d^FW4k&-GTS#liog$l`&85#r)BQC;D-;5*f9Sp+N%-r);x2sWnL-Wvd#!TbUB>e8{G zk1Ll_jni~NW@S-!tDb~P%*G2nW4aTvxsuy^QE5Zf`~%akGdGr`rOU|a`mQdqkh>!>^~?e-H^MvI+5F+UKC-%t>d+Ycj{ z14*T7lqqE1)~I2isv~v8XX0K0JIJl1!PY_%e1CoTsuZZ>=*32@$OU}(iao=EO`M!P zdQNzhb)c13|LQHY;m)`)!$!5ND6F*J&GegP^_A?GL+4+qWc%KH3f(t+xY=AoE7Ey^ z);sFF;-!UjkLug;SX~RCe^^b(lc-b>EA^&$SMZ}@oMb4x^>(6NPIW*6FO4KAH&y+=Uv_?pmwMnF_R! zLXGZSm>Ro)vH-DPQR2I?5W3fvb)C&PTz@-_QU@x67Dl8;>7FQ2cZ6DU22_SRw`N*w z*FOGG(uq+I&0ck<6h8e+<5u`~P-6pSQPnH3N?YXihBu>3Srj)2dxEJATDqXq@ILvb zo@2V910B%AP6^WT)CkR3Hp3~I2Kld4ouGKO+!U88riFdiMiBg|%0o4deG$NOgk2AerN!An$_OLN_^1 z@GsCxCxf7MBITIqSWM$a+Yt&3rhhX@Y29=B$F?JL^L$P7d<`m)N^@bdKo5fzlNvGv zv^J%4ZEH@>Q<72&4{C$Q%p8T5v?)DOixCYibDE11*oCy7WVsebD69#%cDVJIr%Sg0 zwDz0L!!2i~`&n&@E`oTfc*`}eDWGXa>0mw~Y;M}Ox%`O$AC>SVsRejA1AnT^9aEka zhqvSC7TW!HeGP@^=dciIpBBm7FOMGh<*@_5Oe7Et*|_ccGf+S{jwm|7xpO?&Y)1H0 z>#I3+VnkoexGENYG>DLRbq8Y%2q7^7{2OBuF{co4^uZ*!4RwA2>RHv)v6pRW7)ibd z?;R%@KHxS?C)~kaT2YdT!Y0_kVduM)i-9R7f#U zfJD?b6^PD2Ef#|RGSnV2T9Pf4jL-!jVhkZlF5)<=&yFQ8r8We#=OCmE1nDjPU2V`3 zccy@-xC+c^qLW0R_0(LLSU=NF#GWXdPkkYd0#Skz615VQl}gia!g6LPGv>vv?-?^R zqGqj;`tEEm8Gr4$?`nBpa`6yAFvHw|F3;8w50La{a6?cO17)-P16njkd_xMzHC+5N z6k)2>g2TiiM5VlMAbE@7Co;sZW32FkQbMvF+UlUIiTYd(tAiYF1$f!=I+()ly&)In zhj56+=O@YB;zmA)qoj6*8ycuw#B2~_^r>rExh#Y-4uAD;ki>$X?-Zi1b8OludGDVwkO9h8u^<3J^Nc>qu7q~x)KO6H3l~x@KML7w4Zly(v7?+>kS`h23xBR_ zh+=SwB4U$2VZ$}kHK@>fpOQ17)~^>(3*1L#r(ugZClJRAmc4M;@&M}v(P zfHvgSXAfZWl^2rd;+KLgs?TXb-k5|L>YLg01U3aU&Z__~KpdIuWIj`~`G=Mxr(vQ{ zK#hSJsfs5iF*pu6Ags6nic5y7ki%c~0P`QS3wPH{tW>zbXeCqS%nMB30ttFoy(ks#~7y{q=h@R zd;~SA%YU&rm?>#l!qT_IvfU(M%zH=9l0K7ao3@X(sjuC$W$_J6rL3(ueZvgD7NuDj*{Hzu6#X+O<^CNxE< zmX+>e7n-W3cF*hf)+JLa9|RXeed+c;U0nCQFYT+V_IdxSck#h%pMUlK+&w?d7eiU4 zP%W<)V#Q9~*Xw#}R#U8q2FB_k-@szGaib7f-8UB&dX3O}Gy4vT#Vt2fTm0Kv|9^YZ zF_u(Hlp)?P8GPO0{&FeTorNl1{tAZnm@cTadgo-9KUnwGRa3!IpeqtVWx|H(eGz@< z(YC`f0(Y|Aw?CV-w2g5AcJZw8=433^dFE(33`N!5FP2FX23^x^HFrJd`~0u!1Ap_} zJJdJsJQ90vp~a(R8RnJY$UGuaCitd6mz_RtykJ4owD+OGk?YyO9W>H z2->{vyUQl)JMDsSu0h-?cV>-OzY?LcSPLx&#+~1~Mvv7acG2&=#h4F#NDt1q5rmU~ zjR)Bn^t^KTbq9j^j%;Qr4gk_UmR^%&9%ocjEhKUkBS`~OZKFRnO6IZdTXk>X9LO(u zf>pe?Rj%3P%L&S%lohY{9o4n|6l+4|9NYirkAgUKN90!E`y}QA4$Z@Xn$vAzJ*Pzi=71= zO(NRKLu?3G#EDtQ)}R?3y_2 z?*DJ*JbL{ZAG$NHGu8ZZQ!u!Er0WmthzI6Ad*i{``sV|pTiQL+QpAx5)LYdhO?IRO zi1L96eKG8reW&$`_Ty+I#Gn$MCU7A!VxAB2o`d$CB zdQJ1AJ*{y;LGX^NFxG$R8|$U8=^MPaB5q5=xeM;achQaLSX$|?0An##eSF*y`GAE< zGzDRyBJ`3p(0@ZPz^M=$*`@dEVx=xIj$YtOIa&{|BQlSrlVvghow0mE zy6>By!z$0`Hp+9KjAw_G3d937wga=esl0G`IVO#FvVYxGbqW)8c#4Ai(u+IE9gBhMp$0&6*11^Z#Ddmu*y zv5yk6Eb6dipyY{sP3AB*pkSn*z}wy3^myi+-N1EsndiYuD3#!=VG+x$)F+(Z&^5d19|2u)cC zQKrcQl*m(oie0RN_d7AuU~N#u9rIMt9S7VXBmNT2$Xxn23sZLF*6TxaA)tTQgeZuv zjArF18qKhJegIG3IezhnU6CNAAvL38cBfQ6s)-wQN=A$|XFt*!)mo9PI^i0LJrULL zo_`wK9_Shh*B~Xbjy!!NHe#;M8J0$Lnup?{f#FEhy+&hL9Y*S_U%(r0lHuanFP%r= zS6;_fI(&8TqTEB>j9~fovqor>S6!_o9LZ43YEgVu+1Zs;$|i+Rx4!|*3BOOr34lH3 zFHV0ghU6SKa`F^B$a))GzE3%+xwYJcIe%De3wMdMnX#RXvD%h=Qp$DRj=Bd;sKUD5 z(M_tS!EBAfHur${%UTx=DCPh8-_WC&@AY=jdoe)4#DFmlH^x`XRsbqj5--jdsC zjnrp3(b%~6u8zvI%0%{*>caKd%LYnY;A$U&N;i0-YC5P@y&im`sg=hY+$=vPf`9P_ zg!1`ZqjQ-ha-Nh>V48-|OhXNFNsh@`Ib>4$8{BJBh_IBuyOetwrD#p=?c8kcOLEe41YLY$RPpjI=NRCJx~xo`nu(u^H;5EUwq}-RT1J48O{;P zpLt&;L`YQ0k!%}Ij~2mjI)NfozlXVYtEixPo8K7Q?1awB45N>G;0EJ}_KW;T9H4~Q zvSW3@T zM+A#ZK4k)!FJw_G6t9(Le0lh$+!xy4sJKIUP7VaR9-E;Eyb1Fq6Qu{Ig0&Znm3>1e zS0U*v&-v9@E}*4VJbxheR>Loa!tra6od%ZRAdV3-27Eqd5sVWnK281+AEaG{TVYuS99#Y#EfYUD27ejuLf)Z6*)p--HbsELtdn2E31kZBgMev0rA*&wj^GPxdacf&bduYec#>9+_3>|J zu9?TPbJP+-;(xlQ1oobScCJDK$9*Q~<^+>Llb4cx3y;h=Is8Xof|&Ye1K*w5P~yG| zsFXP^@w-yl!bDG1>afDD)8yFt{1TlBQPmeG`4;3Ha-6gPyd5Vx14dj@T$9))2I&*(?67@EfVe_bX+>@pm(zY{`#7?oSD#WA>6^6y`Ud$8V# zvOr>=A%DBzMl2fcIXEVUi~{I*2|iF=W(+<*VA`UPS{Dv~i<9~S;W4v8kXH_i>W(WK zju>PcdYZ9WA5M<$7lnaqXnn$sokioKLWeRKB^w|a2zDREE~4y5Dy-UNehg!gP7 z+44Rs6Csi7UuLn{s+P>ObfP%FD9mcikbR|yD?YJ=155q&6p;e~a^;+KM2LUq*{mz` zvXdXCF%t4}X_omgzswE?gGqg^QD>SzkIPv~1W3&)?`)d51i|Y7I&M#@zhONFsk$`y zH-9ceDeSEzmKV%>-Yx( zl%updk1ElsjboM9>{QlfF1Tr8j|sH4p+9Y7DHT#F5E}OhT-1!*=StCjK3c_{Z zB4HC75f)CXi!L4ph-(yan<{LpGS^~Y{uxvB1)iZ%yJ4+)+x75D@y(T_7~*n!0Omkr zW1Yy`Dxh*f_RW==^UIZqg9dY8$$zsI^Si-5PuuGt0kb`mM>9JoHc~#Z<7^0??+QnK z0DaCK{j-4R{}}vm!R-@p=yV>sE1|vSWneUoNssi$!kJJ5mZD=O0{PYHp4Gk2k6!#1 zhYx~YmC;c4)e#LJ^nf-MY5~9c0PtTr?P3>kWV2A&B|{ys4J@b0uFg?oIe)}n4a{22 z9E7plv#^@hfr+5THoQBb402h*A&@twa);D^Dv| z6sKceuu$#Jdu&Pz^Ro8ndw(RYj=Ajt0C;JFth+OejL4NXy5|M^IGl>gd=VugY%)2h z)ag{EQQ>shRaSTr7>>h$p5shA%2f-wC_J%@LlZ1(;wGpAi1NaTM zc3B^Ii(5r41b0f|p!JC4D^y>WNuQY++Y^+Lm~2*jD}}|7G{f@FJ%1SVUX<-cR$0&< z7*%_j6usEJDN3G>>@qHBa4W?sQBz!}(x_(LsHs!1bj4N!sVp5V*DAghO0UB5%8Q|7 z^aKv<(XM$7`M|iq53S!b=OC|gyXfD7cn-^W@Z!bMCUD99&ei9h*FHb>PA<+* zyZ!FPdC&WBaew7q_d33J)w#U7IK4iBU;Fr}({8VS)qQ^rzuDwHOYVAumiugTF4I!D zU5s*VM4?*M$p28x0H4u8JAe6aJ_GGHK=uHGr5bpq3Z z+vM56Oun@8<$#%tCsu~cgim1jAw+1xIQ24=CL!mGG6^BK4Fziq+k<=pEWr4ivCeA*Vi1gS9hoId02Tt43npZ6(-Pbwt{!~E zCA*bX&=D%A*2V)e35QYO0ew`RC4qj8a>YcLx_=|qnQ#uwp)_rDY7J;rdCHX##U}EQ zX&MU#Q^|KOXeF$xKO4R2e4Gcj(4X9ts})8Y^@f zrqMm|%)w%1#nl4Ifw8Q!J~FkNAfpnv9rQucNbp)nn_?RcmJKGU1wF2|S~&@zoYIgJ zCVwCqu~?iUE(Ylv=~RDi>%BnX&jAF3^pV7?2g%p}#&+osD zt5Ci7`IBOfK3+Mpths=N9xps52ZWPqkAI8^c)@Y#6}7a0bfs9 z*3rO+jkw`Lg@+Wr7Ney!kEL-Z3u7Gw(JRKNY&N{eeYonbbDyjJ&x`}|v4A<@L4P+V zro8oSs4cc^kr&JgI9AS6{c;)inxSkSvpV6SwW}v;mzB`qXyRzIeJeX%0AqWhi zhzyh|i|`jza4QDo<0a)#J zu=*S6u4OnQyuLM@&;!Qlq>eDzCpQ;KJ}F=%72}9Gr?PN=gv;SPxfUq^+jkm51E5df zo`mh`pn1ZNd(;}2NBxYH`Ffw^py)TYrYfl;3Ea zOw-Yx^Oi&R20#a+@Rlk=q9IwJI_esNaA*m_r48@>&nX2KKp8hDNc9QxHSgvD0W}P$ zh4qQ?5yAq6I}V{i>Hn`l0X6!Sg1=mM!)Y)m%7U9uS5|X_%oLC^@v{hU#do&Vy&x>zdcl`BY!oN$Ps`!+0Srwhkqm|v^LJ`Po=vf z!%nx#HkKl9@R#Qk1{((RkBiiD;fsLC=_=f~A}qxu3`vqS=Z2-@*1*L%c)kB(znp$! zBV3&015WEeLK6y9Ea=T5Y)$2&m4hiYhq!Eyl7fTA1p-ePc?U6Yn5I~*rbOJrGC(!0 z4=`n&15{?z=%v2>IDcbJp~*A$bEq)lVZaAmcF$YNz6@#Vz0bBIpN6T$+zi0tTq4MX(%hjX6+!D#BFA0NH%D zf}iXQmdt*H2LtV-`;hbB2r0Zr<@mC`F@$L$_Mz;jFi5G*$R%+O?VUpVi1Cai!V87b zI`9y4BQNh67k?1i=^@Wfr)&I+GP&WIud6E5T4ril84I7-lEQd6pNL)U?6BwuQU>l# zMdbokroT+6F`$^Mq-C7uMLs1~K4;@qp*cO_SPK5#4RgVY!q<72_Sg~|`b*p08zd)_ z)Xhx_w$!A+Fd*G6fE&2_NVS(7Jmhfd+7P(e2_ZuVzq+<7Km&O zlkON@KF&)~l)!qRYu{Z{3q1&s)hmy4x6^zDF#oF1CLP|2xFsWWI3X}yF`h3kTjijN z$%x%UMqs&CDz&~_gq+8#L}2Er(*bl@Wcp;GnI{~En)WOQhKX`29D#+-UtNibektKa zO2L($cz+t+1}Wt~^PbseIiw|M6B;SJh7`S2+FF0#6`EyuIyPckQab*_@U3~D`=U=@)ch67r{nnTi zkbdhG-HezmGF{e=s(?l8cl&1@Uv2jJUibXNRrma3=X2-0?|Yv+S0|s;$lC9_XWjl+ zlz-L_-Trx}M@39+@3MWRB;@+6edS$VUtM1GI&?Qvl6@SGsl6GIlNq&W7*gm!tEDLr z52XMefh}NaKy#wk03o+am2=4}>WL;O?hG%?EEz;PWAhV>BhT+gOrM1awuteKu9=mtT5;Fo5)54lPiIg$kL=;uJ8D%JB@d9 zt;TtV7fdMy!}};(uhF=f6J=~2bDlN<8z?(wZ(3e^0QV|v#21Zkk=n3{6({e@9e?<3 zRhnsOntUmyVi8a=z!3`eghu2uAbl>lAnk8C%A$I~bI_-nGFYtwUi1Z=Asg{3<{@aC z&3dGn4c5q&<1bR`fqxD6f#;y>FZ^1vfDHEAM0`bcW5pcXtIDa%@1#ep3 z&S?_=F;HspoeA#2E9LqB*DeNyFlv(BNt1;hiEuF)tB6##I;+`2U0~mJ4F$%J=*3Da zg#=NZhV*HUyabxhUCFbOdu(3AV1b1z2&NI&W87Hahs;Zt!B=Q4pmQJ20%%@doj@AH zbH#K-b(ck8d(cWr!G@0PnSbb6kPhykq-7nZTk83S?(!jsa9@2uW2Df>2hjcY{1;Ox z@YjX<-`~8yO6Oj#*5hwA-}=0XQL;eW^hK_yJ0!~94t$`bntpeUa+LK4CEh$JXR=;6 zi6_oz6njOix=kw9*B^`AG9`2yMjZsRAGL?C^dkcAJ5&z7g__tuJ%7us|0<1IXHDavkAXzWx&p%~bU zGA9?Y+)HnASPeP+jh?Sw7&?n1w~NMK*1#9k)}3zxaI$oj!+BNyavQz3uuo6jb@tL} z6@xqaEa-=S@h;N@bARw|Z`_7`XfHSHLu=-!o?Tv^>HA~9bvTfmeR4h%zfvrP^bD{^Pi#3}2D zvL*+iJN`LwN%gFDI*4-2(kILVt$WHh-ItB`@$#zE{`~%|Q-61j{>1-#D!E&AlD!=` zCc6R%ql{dPqsz9TUaC7+(?mfd_y)ijV~tb}{TTcgb;*CjXbd8*o9pSR#6TNb+TgQ+ zH|&N3niJTF=wv(Qf8BMW?7BSn0g!Q=bJ{YBt8b5u5z0)r{CH7!2vDO(Y+WPcTY^xi z-PuEkG{EGx`hV)}ZQG?oUH9E|_@yO4Dmnu1Ay|+fw_vD(IZ;$el+GDv-Ivc}nVnj4 zHK!+&I5?PG>FWLdkVGRG97lslKKbj5f( zC#%LTS?7&b%1R&EP)bZq#b?seVcTd0DbB;Dv4;>+1eF8G!~Vc^UiaO2>?-E-WNZJ0 zQDs~U$rqAeQ%Gzr2+B0oU@G-cfBGRJE)SE52GGkD!j`ReA<|cG-J$Uo%DphM@SuK! zRadicaDPWFvErQYY1DVd1H|U*zFANzbz+kGNjXprk+0hn|49nL3bb!8WY+!0z*=1J z1q9i59AF*X;ilsf-zLy5xz%*TP}EFj3lJAKLNy{4b+g&({XQ7o-p-Y(YN56Md67_uG5L91 z2>W5vtm!k~q^pN_mR1>NpVh z<`fHtpC`4W0A+&^3=d5CVF^Cx?>XH16C995^IAjabb}g4q{)G}YU*cF;uWPWIo)oV zMa}QhXM)x#>2xy~E2zyOv`Q=ho)KZNm4BNY4c5R@RTTz$EL+(jkJgPnI}nQDV5%vu z+HG=73_gTCp$1n0a-vCG=yZc}5QcudX;g?&o9cdEb$({aAQ>}pf^w5T^e5;6XQh&@9 zRCBtJ4%J_l=?j25oTwK&YBUWJNvH4_!n=5U6H29X1tINUKFG=gM3k+dQNfkE7%KEd zZoV<&S&f1Lc-5eIbk_^_WnpVk<9Dzw-Ej`Bk1=g5LmpL}YbXKj7U&KfmzgyKMwHdqX4`j`vD zbo*eT9=XZU6sJvW^-w0wMVHi=6pkTn8^#z$r-Ki{yT&C9FRyUCu+$q@hS|NA6ub|y zpE@RgkOR?=QFg)omvm!eD}P)(cGOT|)1X+S$&vhyq3pd6_-WQLN;42A`-yr}m@d*0(&l+;yyco$Ux;uAZw=o0#`Qo(u zp?lI^4~KhY2!GZ8o=UmyTL-hP4NaTI$c5FWu8}I+u6FiED^a4?5r6#PvB15k7c4Nt z0HDdxpO0*S${@GvK)SVUT~jSW3Lzk#BDr}DQV4|*(h!zpfYw|Ll-+gT%hj<&l}xya zgt#aKYQ#Q|v@oXOM^|J%sX2XMt#kM0g+v1W};cGY4yunPF`1S$sXrazwh@Y;sN*>VLjihp&E267i^5pAj(2 zX)(m$DhlqU(VhAAbs^nC*x73#bckI$&xi(%96URLQar7-w;wvpa!{g9s>V>ST7%Uc z&vjqxNKls7Ao)SqH-+`<+QF6FDMp1m3F4SoA}U0{F6_hXL;VUxZ$2I3Z0~bqoKJcJ zj>}H~*hd?j0)H0VhBIVX5S3T`%g=;C!rwZuOt3vDp(Gskdy1oQ^|K6Po6Eov{-=_M zmyO87_GdD`uU5dN92Aob@36KW#!3okE3twuw#C7S8C=Gg56d9VRBctHxwlK1D=@4R zeh(*84aY{Mlr(c|!!F|bCP2mRx(zk}%SK$C0>p+|i+=_Owsh^cC+vC@7QR*YnOjFF z41mk2^AnA}9S%%D(Q zFzkBC7k_;>IT-EE>goS9d(>Eg&~bxRo}hScT3)C8HgXjYRrX~?OyedeHUyaBvBc2g zU^X}WXM~h&NM-bR38$#ZVVF6l!rp9^Cs7Teq~Jm++G9%&Y?HOMAHbYNr+I# zNo}8L$zXUV8WZV*hDCY+@Rc^EieyThRg4(Plz(7O;)Uei8!Hew)^#c%&^tx6F5=AM zE-+2=m*ZS|g#B|6b{S!ap`n(Kx5=^al?C;=Ox&ZSYB=VCnJ`V&n)t+Ol0$!Qaum5b zQMSC1se&spFiOS9wpI?Z>H7ksUc*H13K_q-0R9hg)XGlSu$6}*UykkVB5Lytepu%R zK!2|6x4iaxDTwCEIrd+GM&K5=JlL{j898<}rg)mG`ou9{iU^P0fXYb{nl((hWE9)Q z*-J-YQE8#o$~|LxV36p#55|Q0XpgbcQD~n=#{m(m3Yx?c_1{csKHyKs5h7DY<~51! zfMd|^HA5#t{PUKv;i)a1Tly*CIhlqSD1WaX5Ud!*)T+zN!QdA~qHg_LBS-fDz)Q{D zE{0e(9{~d{Tm2T=6QA)$*K3KscrwNO>gS1|xiQInhAtP-G-Q}-~XTKA-#(C)uV1LTxI)!$(sHsMShFj7!o*mXHqH&>1d08N3sG1xA zFjc;9QNoFyEh-;!%mAu-8}tjSD3dz#V6xjr3|4ivZ4(>Y zf6?*+a0(ouC_;BgH(`w#7l5F#0M*L|15`&8bH!xOG8?8+%=|`U z53lk;5abjyQ3!2QJFHn2{Z^9$F^LsS1rq$Ww&L`S>WtTsizWwSm7t(x<&T0@b}6Ch zA5&Yjzt8+Kq9%w*4XX?7Ie!3jvZ3oj{0$4ZYa3gflt7H!YGLNyFyuTV$wqE4!R;;R zlGzr8J=7V6lX8Iov>6yY9m>lu`v-2v-5vENy6Yh%_hcRW#JPZ%45p^wSJM<}Ikqiq zv=NqJJ(Ncz@dR8fWXo`xseWESobwC8y#3lhHT_cwM4#L8;3#VRet)ML+sI3YfUz-2 zY53MOrCQxtYm{Vif892{5{{zZp+YlbRJ?6V4h?4kxnbWTU{`QqiJ^L_oQa4N5OrT} z@)k6CeuYD1H1dGTL}~AtKyiVOI*Mko=6Kk?M?kRgbIvn(k4id#dI-&MvZwxI9_Vo} z89N-{x}(SyvI>AR&tll#bAOFPO^=cN+-n zqm;>Y(v%#QCsW-v8`5gZq6#ST+Q%ePi_$MSpN4@4bA(8~pa~udJ>}a4wfIex;U-oE z0GP~|=35OtcEGr{myAf@GfbY7S>^CGEtc~&QJ`^LJG5KE?tfHG?j&4JOx6VNN3y0Z zu=`9nf*-mL?USG9eX3sy=WC9rVK57P{QrzumV$+nqO?ghfp2)8lw*)FgK+)Slv+VZ z7UsCIU|lsIl?{E7c*&I5!N__MVXZBB)U{}HR+Zk7kPQl=p`1baal3cp`Fb2itRG{b zeQtNp`Qk56d0k<{IBd>`zvd8Vu*6oNfL`V5DHJ6SF~b*FC? z8lWK{^+>t^SlyuknUR7vUa0Ac2RQG zx<4t>bg4j8NCKJtK}k%$wvnJNV|Y1m6Alc|a&D)n>wgst3hn^s4oE7fsh@g+GL+15 zUA&!<4GDNdMMM5Np7#{ugBT-Exn?4?jt9nmw(y$(uYDd%?=Drut64?~-qTt1U0K2L z?2hr>>C999b35C>hOdNw6RjvZW2AP&7(BwKuK&vCUcNG+0Hs6Ms5n4BO7nehlL<%A zyzj~>0bNtB0A>I;p6Kp?G+B#(x*=cE^||fS=znV-hE>bfz};;Qg(<|#X5ln@>cYF{ z4s66{M1ptd$JMu>=Lq&K4F;8~va=pl)J7$!MVFgRx!FU)xtCpMEm5sBnD;nFSSxB3 zh(iQblDe}j1YX0ZKIqRK=!PyQjA<-XXN3iMqxqPN_QDwNWK9+QDBU;ey)y`tn6val z3x8m#U5kuUa+vKyj>{5c-zo&TQ5jCS@C4o!rMX)R9ePHN1790&te?3Rg>|Qqws~yi z4bDcK;9W>~u@E(wgnT(RIVb8Z}6t zhiZE=35NjG4!E(?#GDbZ0sjf~Q2G9mBWmxVV@WhQEsjBoj39t(#jYZYSw=Zz+<)JO zO{Ef1@s{teQ58)V&usau=Ve$d%ueL}Zgi6nUUn$q=f2>!+qF%q{o|Cx1opwL5Y6uv@ZFKa+ZUo`+wd$Z>cdQLi=>0*O8= z*>Wy?^D422Bf*(9o3XHSHKLXzEYpTWoA?wM8hZmq|)dePYLj(tkpqipnV{ z64bYK+{8#}{U2a>>^^NP$L73~ zwa8c-&KCb9n7Mt5pHb98Lw`0z6UZY$kbennZ2g2?CEKjG9&K#xG-VartW*4!8Q23D z3TOHVLF0FIlr)=TeFbgS{K+)$$z76QiBR97_k-)a&A=gN+ck>pt@*#EyKHJcPF+MJ zt|}97T|+mGjH@915YyvIIw*MhA9i2-|EOOAt$RZ7s-{4`%?xLdKz{-3Ay=eLc3y!Opl=UQE;Ne4|faqf}=T`-T8Qa z?R}(DQtxtpqlQ%Xy`uAXK3<;fD*a|dh(jgiR2jh26bxm%@}H{@Z8@qt0K21y=1Ilx zYW{;ciMrbTGNAwkKqcug5x(2f!;G=8uK+8>9v>M&pvl*LKxgMa?b>VvesRdgIduq7z6n3++z9E!UwWY76&8 z9}^+h)Owk;#GNE7V_tcT=uU^~^g0^|jhQHfPEGUES>U!0bKtvp%{cZ99F1P=Rj^pE zl7PHg;|qyRM<&%fEvkI1tsOyo0%71pXAH<^$4AE@TBT z*C)lV9{9@leB4mJNRm>@MT>vkhr`AvQ|ht%caDx!{|btN_X}2SAc+8)f#Kl-Z#{p+ zn<}=?JQJL8Pf94ky}$O1)I7HAdt1973cc&h&pfidFwcY_VSF(uv8}QMnheE0_ER9+ zrBMPQy@(D0VwR^_)-28snjz!SRJH@;3g`d){z9O9x?Y=rZ>l2YDT3?>=s_{^>XvXo z_0b`1Or2@|^YQ$TVjSSVs&V{5y*K~NG}b4wynFFxMr+o+ptRoT=a^f#U}^G!AJiru zG2Gd#mSP!0?H4ZB40CS%6xbAS`!LW&Dq3a$${iVG4X{1yPa8^CTyT^34kpD^VAV~^ zKP;Ut1%@c~jTl*%Vnwq@7ttHEO95LHs0w~Fvp(if6#p+c`Oh3U;3Pje1f9zy9SJRZ z&`0u$&{Ea(G|Kxk8c`Qb8Q*{8dC>fopq(pP)1X>l9n9PB7UGw)sPGk!v|o45+eAFE zKwtXXgy&%2Qrh-;+;}lT&VxhqRLO;4A`+NOCl4;I(hY6#@Tr7@y9&&j!*-Ga@+`Nn zp|T`Mml!PY`j|U9a@m~k*8F(on&+3*%#$i@!+9NIE{nZrs(I`9L1ZJ-jG?EFGw4)y z1tliif?2wRD77tn|1ZBa#N+k5_Wqejpkk(iQF8uPQ&@=KsTOuR(|y7M?Ys+$yZy8Z z0b&XF56KX82UT3-tY8mLngRdfenj_(oCYHv5H@9CG2r?Xibgp|u8UJBUoStSh=MqC zbm`;X&rF|DVeY}m;G&wO^v|yfQ%#1mmiT8n5&mDVv`-_oSbWIGdSh$NgYy2f((reY zOhd#&*q72GAXU=}N}Bz=Pb8>{VvuBXu}R)ca*cL6eQGK@jp9_Za=_pO zlQ=qoI^xA|nz0*~g8dY!Vn6&lEqykeLo05`X&`bJ)^oKnO%lwfoHFj@mRha#$%<>8 zd!dYz`s+UfjDF$_vh~x%G=f4WSR7pU(oUp)TmC`AgW2Qh9ss*rFoWX?on0^(?m8r| z`Mx;cU~NNN?>>LEH?Cc@O)We&$<)7uZ(3&taAd0^dkD}@xI9JL?JEee$OSV3qg>~Z zvlQESVZ+&f9Gvy&jilNjB5K2*wPI<4=fndFsVp31ko=~L&n$^2mXPU9ie*&QT=UzB za9;&4E7L?0@{Uh2N4x~c?&>$hw)uiG7}#=H@(6hcd~hQF3eSLIr-SKGF`3t1LyHRo zHgdimDIL>PL-bSN+#0AHzS=p)vs?B)t_RTkukld_&4JtpD;MVuP!ge8DtcrOb~55o%_+hchkF7 zBmRKd_8+R;)^A0ouQx}3$e%f2W^6r2cT^^jKcYKdS8dg{kCd?mEpD4Obvn6y?pIIq z-gg(jgbjPBU*J;Qq_@d{O2pV$nb?K*a%NmayFBVq3ME z2Y6hrcGy(yNoKDCgFVoCj%x2t1(c4?D_^>2-M$aA&mBel6~axf4ht7P!D$Vfu9L0r zRar0Pt}7pFAEA@S+S&KpTtttUwyrT5|4&OgTCVERy-m}9s1i6jk_<=dSF z?JhNk9Ao{Ehr_+Sn@CqF2IBV!0bzl&Mm8z3uBJ_{Op?Z^+x{qJ=jn1D%>_pO5^8w?3wm7Fa`JFdi z=LHv<`Nm62gHidq1nmvq+Jvoz5}3Tw^edDT@SS_9vSx7tY*aJR(qRtn7XAHP0nzqD%v z$Ji-(aFRap#SrkXi9h>-mO18SFJZFhblMLjAfJtI+>cNZvdTz%@7G6A0eRoFT`)cB z*#6cT$qjTWDIVc1M`w9+?p2rxdu2y%iuVcd1rS9)AnA0tJs-^1?L%;u~ZNRTG@L$VlRdVJL9#q?lLTfcBH7M{KXSd6%x(Lo_*9!FwZH^FSbTxQ0K zT6!gFp4bY8f<(&vVMOxaJn;MDY?8lk23JACg?H3zIS^F% zK`0%|xr03_Yo-}1r4xy42A=qL)w%XoW(9-)3d;YL92XXIh&gQ&eYp@B7wQoX7Aeeg zQNzI#;2BOG!@S;-lPpd5@?(UffBadoMY!-h>ji?a{D;~VCmC7Ke;=_Ms${dax2VLH z-P$oZJ0)v$h_Ao|DhvK+JRkijSX|fU4gEPv^q$ zA#vNwz*`(2)c0?pLzV+{i>GYXf5g zAmaV3qt952v@efUpA`ldo6t7CJdBI={202<*r}iOatU zSuA8N%=qndxT#33Po>0E-|N{QEEx0CJt!4ry~Rty>w7FdcQaBh3nX~{@2T9#I_{c^ z;JuvYdLa9Y$bj5~^4&TUzSkX#62nL!iSso0YehB*I$WK#ge1pbf~o~#mHTHQpvXuM zi?E(t0I3#yd>Vk4(Jfr(YmirdGyU|pwq%b4arTTc{p0A{KU=f=S}x*R*XeTt_wmB< zlsqQ%pxo223FZ#)@d165c6@Nn=f3L&#Dk}-u!A@J)1-XqMVJFOB80 ziOSjO_0j~)dz$~PePav9E=h{^DMUQxNmeW-5&D678PH2^wM(Gw+e0telM$ISD)J6) z{SK`Lq8*UP(z{I3Z$UA*jXiecxpfsqR{j?!IKUoRwz><#iXpr8PfqE-bHMP>o}R_t z{$jIWgkb+?=8mnQae7ByTM;MMInK@uvbXhUQ>BX4w{I;=ii4JLbvR-r4(Afnt`or~ zVW@lM&1M=jGf-pNzwu+OwGwPP5$bhC--&a6-xrh!eCAC;t5P#6qj@Yg?`$q}&A=cA z3YJh-dzqR;h$sZ8ST@9LVH zLR%$p`r3AduO@D` zYxt-mA|ER{Y5rAZ1)^$0XYn#~lejaT)e}$sFk|Mf3`Rw&zF`-0%5k!G_=8-Uc)K>h z6Xq^>M}k18kRDtc`7rec}obGEKNw9(RYw`zWfNIBCva9OI z6MfnVuv+HV$u;~55;UkJf0d_7c4?LL6ur8TR}=k@7@F`;>`7wYTn=kKroK3bf}jx0 zL{8qgq;RMUXLRN!Bb*yizT(ftbz&(f3s5>Oxn~^>Zius>g(e{Ad_q+hM?k~cNA_Tz z&{WH(B4o4ANpQ`oxnDhPmh6tJnpzp$OLBe5N;t9XH}AGoXVKOMSNWpd*>jCd9cyBp zU>5$dC_(*PAv1cxOimw#2w|zKI5PS)c=EwD`N#CD=)1lJD3c^a3YV5aQFX*OuZd)` z)4(yB;|byfu}uJ8IDVk$32~Jv`1B|EvXkEl84?PC=M&R+-t@^?*8S1iJnu`@)<|7) z@c}VV1w&E6@$EgxDagS2DE{c-23#*HQPI#mhR+~(@63s>W_h45xKf(cl)Dza#0OBF9?+;kxOemJux-INR|x(Z=5v3G4b zhX0!y3EnW>E&_#qV0cOLl6`l@H`b7_O$m@czRPjw{I-p8u=U;jF`ZD{92qyr+tW88 zqYPt-WZ=i(wM+L1s!0`s;3MB}Bi(~P1dNyy+e7-y_|;pL53pk5QhCkXiTtVW<@!J* zrz;h<8#93M(FAA9+Z6_9)s&(YtL%qCsvMmiHY{!h&fzI>h@$0R<2_K4<8WcrKHXL< zo))nq-*cSxtYBK1g5${oVC9oRXJs+3b0r+n8N)qd9Unx3t{L;C-QS$ z)_x)^lE{aFv(*c4!^r9VqCVTqi#1ga*~QHI;|>BChCt4{J^6yvo7X}Q)(sF^!A#8# zd0K=ed56^xN);E890<9P%Lrr?$@PwFPsa$Rb_rwBs%g_7>9Z*jWkB77F z&s~A>V)Jy=0WUjV6J~2V&dL~gf?PKttU7{PXZ64e{C1-pN%LnJ7rmra5&$!u=1X(> zFY%8r$t$5hVK7>C8+LBXylH`>gs6*VnA6?L zLs@xE|NBNv9_Bp0K6LV30BVY-^LKH%?Fo@0378 z@-{TRsw8%0VDP$6<3}r&xHNpo(Ge_nq%J-ipPmu$45OdQYR>um4~lmd$&E zgN)CkUT@@U&69Y7yS!fBEq>KmwVHQP?z;2BsamUa8Dy3=4K42ZL^Gx5a}R-gS78b# z`0!!~{G}SxA}kNl$4USlY&ps$6t)3$)~iMhI~Q+ruBB~K!6RP2# zV%@c{ZF~Zks)&Jd_Wc$2Ud+9Aa$fRxhLNg1ye~4ZkI#e3iV|ybxK9j~EW4y&hVOoX z%PYUQh-uT=m*`gY-Ozs{kNfsZVd5Mt+GcA$nrq|pkg&fdVr#A!F`e+ITzZ*q*YcHD z!*<-)<*zMTC={R0+c4@yPdzyTi3W_VIwh4&HQ3P`gk3ym4cHrJMlAT9wW3>6nJlvc z<#zh)PgRg*HS>__xM@gosW{g6N5*l6|4df?6@I6cre|59UDBjv5iaQ^?4l1W%4!ph znc6=Ps{SpE6MlDfq$a#Zmi~<`-6hW1@*2rAQVet#-G(cu_RkxOEy@NW(DAFbZc4CQ zXMcO+ctWFYysy-L3VtS@T&4~GXCh1_#8xNqnx+p~4n%f`j`*M|G44P2D0>U;#V%sV zII!Ez7RHp=*SC8j+6Yx7bp~RRT4r*HL!2Eh60b+SF|M(cmG(x9=NZ3&z6dA};98~M zON2{#LvD@|!14!lCIUUd#N zaZ(u+dxDWjWhMMPZ?H!4SWefc%ewz96sC69A1Js63RRw@64T3O(yF~5+PC|62j#Tz z#sqyd1!oI`=LR#YYzqpyJSTsX@+zV@B?OPI&DI|7DQC&A%$GO`=nRkSPM9mYIgM$x zj^cfz%9CguV839=CTaBBK#CXdG%XSL>kh&}X|3QDCaIyJvFFG2Taxcka`kI&mM3A+ z$v(0GHM^JwT>o(*4KDI4jQ`{&$`L7j3UURBSKw`1R;_X>l?t+&ZFuCYL$-}K?7vdW z@#r5Afn|^zvd>ZjkV4uEj>KE#z(Ex){iNtn(25-YP9n1?ne^dW8{#EVgo)7{pI08@ zif*-~H&y96m<05bPBfN=pXlZF&d}W_mquLd232-eGIP3hV6W2BcaXj6%v0Q>k!sXc zuPgcBqOi{;uS9i*bSe)mH`8!fa&z+?72IcDa6A9XK8-#B@-8Qd3P4KuT@(XeB<_?R z+39F)4g+;rCWq75A7&rgtD}|m(!p3zN*L%*yk40Ph6+pn)L+TCPf7PpXf9L2*{guk zkM$*o{))rMk_m6ugNFs*RnwC1S^N9=tb0(78AVD~>X`L_NzSzt!0DXHURLYoLrhE6 z#!U7EeP{UyK!cjR8E0*&XuSbuPi%n21r`vKy{$*Hw`Nw@FgcDj;@9h{!zWqF?-9-R%Cz z|Ndk!hvtIBvJAgsi-quLbUdB-AAMi>HM*FJwbwI46PE&k&)$aR+^7($$1IB=nhFQE zJ$W#8VzB95M~cy)OBx7PWplC+=rUoup;HevQCbdi*b0l%$V^#*P$BGd*VTeTPKRtM zS27L_)Tvw#XNlwcfkeha=0>G70D+s4{nIe}5(E_xd1zP%~XHrQU629l#J zmI3n(?~3k+opKMk9o+^7!9?h-l5{3+yG&Q-eY<6L?3($3Dvz{xFT0SIls3`?#t*n8 zI&)&yvv6+t#QWaCZp9iYgA^hngz*SV69rDdj`f5%=C~g{TW57wqZwaV_lwz1(w6>Q zY#Ipr&#BumlvqooWcP37f6B?=u`{)cyd)0ezP3tO#LCCMs8^_ybW+Kvz)_%$O2Tug zLEvi(&ErA1*L^m;r@OgJ+kxNV_pPs0#oL(O!2dc=Sx)*ZEE1ofBNBpBkwXi=we^=7 zNDz*F&~?xpd2(2h5Dj}U8AjZU-B7{l7>(RWIj)cQv*Vc9-mm2CW`?;w>xsK+2vo1X zing;1Vf%AmD7&yy>?y6+RlpI*gZT4y)B@p{*D|mzM5!Hq0|7c`3eWt(+C9af`Flec zCI^ph+bK0NExe-d$$N*oP~lX^TeXKLOW(v`T zOVNZ~Vr9!@QW#*|5r?2KuxgXuVe?y3_G%cxCCL~mnTaiFgd$O3oaueDY)1(}?z+-( zNMTs~Lf1BCC)3wnp`*G2CpvYq~ZSkxFRZ~c6H;M3lgsdP(2y< z2m5n^BS|UxthTu>A*y)%v__wy8}r5i>_c4PV4J^l1INf7F8p-{XQx`LXhCXIkg`s( zcz=LAeKIWW=sToF*1iE(mP}>nNytz4&>d3_x!7XbPH4siZ0tf|i3wIdo{0FCJQQI} z`n`o3Ej39t>0EcGFM(4AJr1QiKy8-Qi2TJ>#)+3o(Sbzk_mm#CXjjkfEpzCkX#)0A z^+935zCpUyx86<&GG>8h&NO;?#m;|j*Y>Si*j$r_CqJy5TSKwXZpYjcGrR)3Q1eu= zGX^5yQgLz?aA%j~lN0Pw$C5{^VAr)|q5@6Bj;XkRZp@qR&N(iEo-(|-x3sl>m*%eYjp_cBH6G6u3e3-MdBzmgE zerHbON@FEKoy|`P@Tasg;$U6vISVK|z6lvj zjM?gL481^w|KZa1v~5gA3S22ZuPI61WgBN8v!_h++Q`q=`Nl^ z7*{n7cZpBQD_5h-Rfi;?psGB{ZbNv)4q|jVbe(dmwX5(1$&bRj;jG6UO!X)eQz64P zY$MHj#*xyS6v4d8#}s5HjSXFEtK;zdCA?hKmfBF0c4229Xg~f%*R`_XxX0=8o(ji zbpua;TJqD3S!U6HBH?--D(4Yfs$<c;T%D)(S`~^NYugQv*?*fc<20S{a)ay?7>b=t2CW9|c-vqLfpHzp@sb$vo z^?e2Bls&Qy<8_pczIA4XCzb5({XTU-yaVeysz#A^>8+^Gt+6Yp$cI?%<`NzX<;<}8 z11nF@k-hvqDKx0NeJTM&hlSG0ZkIwaZY+*WbQSWP87V&_7GSeoqi=96L8z(H>{>PVo=c7Jx74ZiAi8k=5hO$pxbklU&t7 z2fIoFq_EgMYwPa?*1qYC;=jlFX#F1U6f#k&Vv$ImwFv5knu%p-4q&tx>lP2`=qG-I zH&ax8>=>P2K=ZCRS+oQ$L;^Gtn{C%4J(l<%#Pn~On!4YyAEz{688D^bgFx>GXwUN7 z4II)Hy=-c5zE;B>DJ3HP_#*g?R6yyq{7|Y<0ZcNk{U(t`JMQQ>FAD@hG-PeP18-w@; z)fcuXB2`y|Psj#FZci9SO-JH2)5`>OEMs?2LhjLPemA%mF6;N(&OqG8KjDR}+jq}f zttNyMxY>vRrHgb|eWSMzsz5Og%0nUqRzs>#&k8dDx&dz}b2q>1%gj=|`afG-Ki4r9 zRYVDy6Be}K;F~nEK16f+FTXejBQQ zH%&mtV%`^ZG%3l1Z5t~%W${05dtO&mgxg_BE+Etvwk$e#QLNyQSSUsD?GoQPkhd%0 zFsd)4vKFqOs~CjU6z{Y*OZY9GHXQkfh2@cy%InwYv^DEA^Xp=x0n zdP2)5^b41R$|zedRx1B6|2IJ({-!eUz{90d8S722syLoc{v2v|M_nul*B<&y*X+T} zd9Oe?2Sn!SI9R%r+x!pi6aPgz{t*-$qPb)J7a_*A4mf#l%315gD$Rv8ti}~1Y+&S; zlb&p^e>(7k4C5-wuC_#!x+%J!d~XV4VPVyn$ptf5B2w@YkCLU(WoFA*o|Of7tM&0= zlbv%D=-lb@=J1&7(y=Dy@wxZuOQE-W(FyxNGUWbq{RWo3UUcekf5tCqy_cQ3{rdh1 zq96?goeJ47H}^;o5nme+xhWwnx0S|4fy$r9$*d{(V zHa6zw64xCsH#&Z7desRjc~2XtS)q9YOH4}D_4VYNckh(`mczTFS+1Mji{72B?>0Qn zts*znpcn0p5u}qwEQen@omt7TczAd>>d}l{9rYJfODsC zK{Xqu%h%1`)#b{|z(S!&eq*GkKVp~$L51_S|GKH^M9=d_PmBAYJomZ`P$LiTuaDDB zWi-UCYjZ;}MA=-9kdG?Dn9>;Lu<@FAStC_^5rwyXNCHPbc$DntTS(aT?<6UHN+O5$ z@Qj+3LKj0TD=TAT@DHoaLWe*TwDgYD->#>fh{MV35c-on-|zM4YBMJWVhY>?XG1+cAk-GgzLMZ$VsNS4f`afEY!a13o#}Ub93zf@+3_W*aQ!;U9NrGxR?*v!o*J&9VUNN-IdM%B%Qd z+K{)In@)bUzr&4ZxFedNj|P7DpE3Z3ge!DdrS^}%ZD91z2vSygP~!9 zg1`VjKgsLAx*0V($Drkh9!z`=lb1YB6oZ+}zkm&S%tVZ*FO!Df&1r z%KpV&>f5gFi@;T)`lhO{v8<-u)>ix$ZpRQ$WUaRxBK18$iWbn%w}F$_)PprxrZ#)g zn`)yi3z*U(8a7tQGt^v_tsHb#DgSlLC`j92KD8DXu8JG*A}9jelNam2wTQcKD4 zGSuEsZB4Di@yC01N=nzCKc0Cf6JeZ$0zj64qlx0(Hlh&zv3khv*JRDgasB*Um4ozC zDtcn#Lt1W;b2XnS{S=%D#7eiVaXUI(;f9(N(H+p!yr>r)vNSO{n2b+{^E#f%UnSe7 zSlHQF%^etAru3e+@|mg&!Q1I>B&|Yzo;~NSV+K=en;x?0}!}SMFan6Qi?U`LTDqeKyzn zH3MYw7S%nLBLp^(bSDaBN&*GqsHt69W9SWDIszv5$Mhl%O;Z_%+s=a|V5{b#E`<6g zG9Z145&n659s z{@@oE7hhu_vsL+C5p$rqCxgopTTzTrmCyMabq~@q-N9C&(1SEn0w`vMUQg_K>-ouU zLiA9d5PFWWHa387S~eZ&a)x&n$=4>qfO>WL@$vDGsVk#Z`6J>18Fw9*%EDJ~=I=X} ze11dClycr^^|tkJ;zwl%Pv+r$!p@$UtMX#(Zo5nyCQP1pPW{c&@$OuWQ?!}F5Ql8cj%FH)qZR3pmYW9|r>*AnxZY!JQg*;u-&R;DB;)ed)jMvHyhl=NYt5 zeydBZmr^1Qw@|Wk*FSs=|M@oX{87y?e2)3`;&|Op(QS=&xMc=(eY!qBUJbNYt3ZV; z3`DN1+|+&6eZKrjmu4|UQc1{HFk)C+%)rxXgc6XA-^ZzC4dEdNeC46y1w{#r)XyOIyVSO>|^%rYRuv}SHd%Aw5V%ySG&KCDO*7m0wM zAZ@O5Vve9nUR!|KrFkYxkw@Iw8;QrsTzk~4+F;Nj+jW5~i~oYglgZ*^n#8h=M>~b3 zw+%)6)PL~d(?X!!rG2Gr>a7e7?=-BR8+49uMfVJH3~$YNN|fj%W+1Eiu)6eR5@=e_ zIfC0=8CMburel2Jw1t#*C`D-(N`O(%sI2a0uub+S*Pc z>V?OaX;uBEPn8M%R-nOKnGo_rsa`Qa=9j@+)6Dcp3iN1BPp?-$fP;(j`yj z*F}C$sxCMCT=hVqvN(5Y#DxY1vgZZ|8k?UyB$N7jK^jsG(oFq}25}jGf!wWE*)MDC zE@I8KR0k-WkOW|4%?WQ}irlfEaFQ^~iaQpjr`~V!`L~ z^z4MYJk=y?#EsIp&e-|SemkP|OA%1_F2{Ypk&c^#Y)`R(6`pxeC00(?4`zvz)2TYg zka`;N&ok=og8<(J?D!0loPe{@kx&~k@|M$bNAJCle0H*s_SdCzWr#Ju=G-DikYkOj zUi;i~Y%}uRA_?h>;);iM!$EfC1Ue!6T{Rl4wbEDdh@zi<7Uj~le!KOwwn~Sz zO=}U>Yt)!>IiH}xSbFa*N2~zr@9q{S@}8cbak`pY@rkFAgn@n=L<24&Zzhh2HkJ#c z>?uV}3vL&&6L(0s)E>j!oM$+6kZ@~D^Yu>0WO(JJ$JOb|Aq7BCUGtnZdD83D zyod*hg?1d`Yr3<0Uru^Oetm7Tvn8I+zdf~!skJpcG&JDs;PaFJ(us%fR`U>l+k1Xw zyS1aZ&iBmZk!fvBym?W7&^*Zj3$7Vo{?IoMXv_84nKlJ~R;X^?DMDfNWBmP$2m zJ{&Q-qS)l?H@!y zc3*Hub)t9SL&oA>20Rqn2qB*b`V#ZOQhvC0y$hz6=BdBB^rS)cuWO3U#rm2Zk1~;y z0Gp4G-@3Y8UeC1}=!Fx+haH}edW%Vu!!w~pwd|rb_M_#z7Kg!q1*ezOBWv;r6dHmq zFbSl!n_Np+naCe`EDyW>W;Zoc|IVZVj4Y06@Lbk70W0PKxknyN>B#4jYqzezzf~%oL>TxQeBvaEIc>))YBbhV z;YPDM=KCyb>u32Zc9S<@_FD)WE9B=>A8sAa$M5~jcUqd>oSrEBTJb@x&T~99GOT1Z ziZUNV%FfCTh7OV#A0k&I2oxa!+^+eOnT23emunj(iz+^V$BSbXU_vsgFHq_WD8$3SPKza@ z%(>+KMIMFKD8rVdSrSlGI}r;chE9VB^D7WThL9AGRm8Hs9OZSm$TB^6-AHqs$hgLi zDFLz#WW>5t_t*^e5vnn$WxBr`)=GWriml!PcMw+i=}lmlbqs`Vl@3LVr(J;agTeVO z8uGA0kQk^+u7oXrL5OX>eS#P)?Edy$(k}U{@o zdD-Ua;2#QDSTe-NI)+m2&GeE`wW_sPBS~7)wYBS(SQ>A{@sO%~2Mu}7{+E#po(!U? zofpp54H45k{s480Jh}CmcWk_(>n?fAY&ZUvWNkIrFqngTq?ZuNKMcwieutko87hd1 zz%OJ&3HJWXZ=`~BQ__dZJ)k!_%RkTPIt{GAawkx-?H zW5h)ix?$WB-U)gFc`VsMpoJk2d@@}IP78g-nQ_vLN^r zgcHiOpu$)k{Hu0bR?Y*#6-+7=CWvl$6g2EdTnfX;0dhs5QN$J;#VWb>&p4yxdl4-o zecTx6d4!Z#hO; z@m>DBn7}R1pc7i!_L5s=m9MsNnBCO9dx6S+v#MLP9~G2cCsFUC}w+M%#F@jcri=j#EA_x$|QFLrr2$TKs! zZfCBF6ngD{&!BMog6y*Q{+Q{w;1A`L}T32Ljz; z-WlEx1_H7P1@hkzXlQ8Y|3sjh(%`|kK>usZOCy32r#v8lq5oGC5fO~*zn@_H??=Qb zd5HhFi9XWTH>`-kVB!BqR6FGw5sc%%?Ell??f+r$_3`)rGDtxJQ~s}`3nVanU^RY~ z1J!%8N`WTHJ5N-}aoUVe&KkdHhc>3JZFi6TTU=~lD*12X;)qXbfog#*qE$%2SmJL= ziEKB<7PniYIe3D*ci*BQi?IZ(cFn2>>B-nyh&;$#IlCnVMdIl%L%KRXm(vgdx929T zuLW+S*D4Wmg}YG1qX6NC zYGe0Krz6Y;?k`X>^Gjn|n>vAldUO>h1w`6`d+kSy@(+&YADL%(;+!Uso>L=)In>lB zMKuU)TepMV+glCH%H!ief3BuPCn0Nw(x9{u<~ulg&Th&@!;byjg^quzdI~*!MLF?= z5qu?N@I^VyhL>7|!1~i>6os<+j5^15BiF{KDZN=VwEb4USRy-Vn}AnI-;=*Ev~CUv z4+&!K**@I9kMXVGJA+^=(MRB?XxCwYL?Xz|mSs8v<@ANmlWQU{b4COiV}Tw0iV%*Y zj*qXxe2@14N+FHzo{WOAukfi0`Z1)stm@VSky7$zf@ziLhFsFwd3@P-6Og( z6NP+DG6YZBa_SK3x!Lx=cT>)x07y`zvww`~rmhD4!dSsfm+a~x{ewN`sSp%(lJ1#>|9G}`v zh#)fL&(3#%dILsrxDw;QbqpEb!ZhX_ml|molE)2;8+dT|u&L4v-W-&mx0E`34x4K9 z<n<&ue+=C7yAO50p9ehll6~K(#+^9Rq0jin*2)Or{h@s-NAY_Sp9*8_gmFmclB%{ zNc}vc_BI3zkrOGpaItGX{R{~iYJ$>R7G}zUWVa)Gj-AN51ygIBD~=P3~6$BGz+QMA)G8)XNq$o=6+q z1QF>z0s*}Y?hHm2-7qj;yCxB|KWLa~V4U)yzd5aGDz3=TI!2({7FS+un`8!K^DI&gph$RP zxPLSMru#|qOI%Z()@x>Wq`YE2bSp1R>u1Md*M>~bIh{RD)hq()Rk34_*$N`nh{4f- zQ`>0M%9@;Ns|vvvldpP9jAXcsfm7PTd8At-x^P1nVXQO2SyGtO>y#s%eVX0 z<0u#@4;C?7gf2hUz6Y3l={>j17jIHyZ%Qm`7pm?2EWTI_eDF(jY`j0ZRR}Uvm~4lr z<v;p0;7s!NtSeHtGE2`H;Iz<~k_oQItp)(1m>5dV{=u5MZdWBnILrQ$&z(Ugv>Y~`Zz`C zrL|WZv$5uzJz=qlMz}4#v}?$Jc(4>y(F4klp_U#pCaaQ4S_?4-mWr2h|0Zx7nJ_Sc z0%f0S4Q_g87^S~Lr!-&B&&P<)UcWN)Dw@gux5EkhIsMn-{*e5B4OPn?&1-+YXLhRB zwzt7dgFL=tD;Gm`78d8EV+{bX&}Rh`PuNpWp%yPE89N}#G*WS16honu(uk)OlSXhi z$sK3qqAQ+PTkP!^A59-==2C>w}Ao>bXc4sO##5hV#cYFgI$+zNY*< zs?{)ErGp}^` zmRnA3hX@3Q^uVu&|9@w_DDjREeLRRE-X)jdwG20u+P+C6F8 z@6n)zF8-sYwN02nRTcQ}?-$l(n-~O;1)m*!eV>KBpr4n3M6q<2vB1Dz*lMc+{g!v9 z#Au55y_Ks|22_A=@-{x&f9Y?nrm1noBkjhBk62V2D`#Rx=C%GB|Gd1L5UPQvm{akg zI?7`N&Ty5j?vHO5*WN+pLOJBW6@MNZk(w2%o$gzep`kr}YBNYGPBzL`%@Z+m##(`C zv8|Ia+q+k%bgOLsEY7+wBl+4n+Zht271dc$ehYDxd#u8dU$op#zU@hO)q?lo}dK!sBKv z_Q6)umk|a)$S{8WD&+JqVb*R{D;q%vDnVW5c7bk?&p^}h~qX>$lG&mya|i~ z(0WoWeDg_fRRwwRizIIWHX8O~_HF#)Q*yLVAkZPBhlEc()_7v?+dvLE=Ky=3zY^m| zV@WTaYPpZHUQ{lAgeNdx%wqxxadT^2C!b447L6_cSsMM@7J#uwZG`!G26nRjjWh|O z(Oe^&yI9wN*+y_>ng+5&0lAgIj2tHQje;TW4W~FSii zHV*S1skTiqx?5|erJavjBOZ3_Z~SwA8;$Ccq%FGF)w~?8=1&mek-R3}%W9@KCu8|l zm0!`d>3a8Eyy^}+Je*ZORa?()3yIoxZ^Op_=MxTR6&G!@aOyagd^GNdu{Oij^}O3etMBif zx;|%f+?qK~mmO3pBSkFvA75P)!KJacOU)~UZ;^^_Eqg@uTp5Lv>py<-*%h^zXt5tvtsG9eX4G5wAESHIkt?6bG^wZQr#{rPEs89}|dE8X8+4H+327P5ds zm61t=0kNWJdV?&J5ie*6BT|0zY<*S+2L0*#WtlW1K|&^1Zc5|vRJ}m`Ic&(Ci(o)5{c@Od~*MBWDpV6tnr+m>7yn eDsxh?#t3pE5Jl1VS8zJB5|cVxp)jz=&j0}JJ*W!+ diff --git a/readlicense_oo/txt/license.txt b/readlicense_oo/txt/license.txt index 6acf5b6dc714..8e06f1f25286 100644 --- a/readlicense_oo/txt/license.txt +++ b/readlicense_oo/txt/license.txt @@ -5352,6 +5352,59 @@ MathML DTD associated documentation will at all times remain with copyright holders. +ODMA header + + The following software may be included in this product: + odma.h - Definitions, prototypes, etc. for Open Document Managment API + (ODMA) version 2.0. Use of any of this software is governed by the terms + of the license below: + + OPEN DOCUMENT MANAGEMENT API LICENSE 1.0 + + ODMA 2.0 SPECIFICATIONS AND SOFTWARE + ------------------------------------ + + Copyright © 1994-1998 AIIM International + All Right Reserved + +LICENSE: + + Redistribution and use in source and binary forms, with or + without modifications, are permitted provided that the + following conditions are met: + + * Redistributions of source code must retain the above + copyright notice, this list of conditions and the + following disclaimer. + + * Redistributions in binary form must reproduce the + above copyright notice, this list of conditions and + the following disclaimer in the documentation and/or + other materials provided with the distribution. + + * Neither the name of AIIM International nor the names + of its contributors may be used to endorse or promote + products derived from this software without specific + prior written permission. + +DISCLAIMER: + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING + BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + + GNU Lesser General Public License Version 3 Copyright © 2007 Free Software Foundation, Inc. From f7bfe52ae5cc12ce8198cb01837c875955ac4a6a Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 5 Oct 2012 13:32:03 +0200 Subject: [PATCH 348/863] shell: no need to define XML_UNICODE ... ... because it is added automatically by the external expat_utf16. Change-Id: Ifdad11b275f7074be6f2e92df2e3c30c7097a5b7 --- shell/Library_ooofilt.mk | 1 - shell/Library_ooofilt_x64.mk | 1 - shell/Library_propertyhdl.mk | 1 - shell/Library_propertyhdl_x64.mk | 1 - shell/Library_shlxthdl.mk | 1 - shell/Library_shlxthdl_x64.mk | 1 - shell/StaticLibrary_shlxthandler_common.mk | 1 - shell/StaticLibrary_shlxthandler_common_x64.mk | 1 - shell/StaticLibrary_xmlparser.mk | 4 ---- shell/StaticLibrary_xmlparser_x64.mk | 4 ---- 10 files changed, 16 deletions(-) diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk index 2607fea33401..8688d7ca8cfe 100644 --- a/shell/Library_ooofilt.mk +++ b/shell/Library_ooofilt.mk @@ -36,7 +36,6 @@ $(eval $(call gb_Library_add_defs,ooofilt,\ -DISOLATION_AWARE_ENABLED \ -DUNICODE \ -DWIN32_LEAN_AND_MEAN \ - -DXML_UNICODE \ -D_NTSDK \ -D_UNICODE \ )) diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk index f0232ba75e82..9c3cb655758d 100644 --- a/shell/Library_ooofilt_x64.mk +++ b/shell/Library_ooofilt_x64.mk @@ -42,7 +42,6 @@ $(eval $(call gb_Library_add_defs,ooofilt_x64,\ -DISOLATION_AWARE_ENABLED \ -DUNICODE \ -DWIN32_LEAN_AND_MEAN \ - -DXML_UNICODE \ -D_NTSDK \ -D_UNICODE \ -UNOMINMAX \ diff --git a/shell/Library_propertyhdl.mk b/shell/Library_propertyhdl.mk index 82e7db10a4ce..18af60fb676a 100644 --- a/shell/Library_propertyhdl.mk +++ b/shell/Library_propertyhdl.mk @@ -36,7 +36,6 @@ $(eval $(call gb_Library_add_defs,propertyhdl,\ -DISOLATION_AWARE_ENABLED \ -DUNICODE \ -DWIN32_LEAN_AND_MEAN \ - -DXML_UNICODE \ -D_NTSDK \ -D_UNICODE \ -UNOMINMAX \ diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk index 46cfd15909e8..f12ba0c29af6 100644 --- a/shell/Library_propertyhdl_x64.mk +++ b/shell/Library_propertyhdl_x64.mk @@ -42,7 +42,6 @@ $(eval $(call gb_Library_add_defs,propertyhdl_x64,\ -DISOLATION_AWARE_ENABLED \ -DUNICODE \ -DWIN32_LEAN_AND_MEAN \ - -DXML_UNICODE \ -D_NTSDK \ -D_UNICODE \ -UNOMINMAX \ diff --git a/shell/Library_shlxthdl.mk b/shell/Library_shlxthdl.mk index 9118f08f5018..7881f5f33dce 100644 --- a/shell/Library_shlxthdl.mk +++ b/shell/Library_shlxthdl.mk @@ -36,7 +36,6 @@ $(eval $(call gb_Library_add_defs,shlxthdl,\ -DISOLATION_AWARE_ENABLED \ -DUNICODE \ -DWIN32_LEAN_AND_MEAN \ - -DXML_UNICODE \ -D_NTSDK \ -D_UNICODE \ -UNOMINMAX \ diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk index aa6ff0462480..e5deaa9cc46e 100644 --- a/shell/Library_shlxthdl_x64.mk +++ b/shell/Library_shlxthdl_x64.mk @@ -42,7 +42,6 @@ $(eval $(call gb_Library_add_defs,shlxthdl_x64,\ -DISOLATION_AWARE_ENABLED \ -DUNICODE \ -DWIN32_LEAN_AND_MEAN \ - -DXML_UNICODE \ -D_NTSDK \ -D_UNICODE \ -UNOMINMAX \ diff --git a/shell/StaticLibrary_shlxthandler_common.mk b/shell/StaticLibrary_shlxthandler_common.mk index 057b80922fe0..65a0725860ea 100644 --- a/shell/StaticLibrary_shlxthandler_common.mk +++ b/shell/StaticLibrary_shlxthandler_common.mk @@ -36,7 +36,6 @@ $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common,\ -DISOLATION_AWARE_ENABLED \ -DUNICODE \ -DWIN32_LEAN_AND_MEAN \ - -DXML_UNICODE \ -D_NTSDK \ -D_UNICODE \ )) diff --git a/shell/StaticLibrary_shlxthandler_common_x64.mk b/shell/StaticLibrary_shlxthandler_common_x64.mk index 5665e4b5c9aa..175f8ee7b738 100644 --- a/shell/StaticLibrary_shlxthandler_common_x64.mk +++ b/shell/StaticLibrary_shlxthandler_common_x64.mk @@ -42,7 +42,6 @@ $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common_x64,\ -DISOLATION_AWARE_ENABLED \ -DUNICODE \ -DWIN32_LEAN_AND_MEAN \ - -DXML_UNICODE \ -D_NTSDK \ -D_UNICODE \ )) diff --git a/shell/StaticLibrary_xmlparser.mk b/shell/StaticLibrary_xmlparser.mk index eeefe1df5e20..c86bb75937fb 100644 --- a/shell/StaticLibrary_xmlparser.mk +++ b/shell/StaticLibrary_xmlparser.mk @@ -33,10 +33,6 @@ $(eval $(call gb_StaticLibrary_set_include,shell_xmlparser,\ )) ifeq ($(GUI),WNT) -$(eval $(call gb_StaticLibrary_add_defs,shell_xmlparser,\ - -DXML_UNICODE \ -)) - $(eval $(call gb_StaticLibrary_use_externals,shell_xmlparser,\ expat_utf16 \ )) diff --git a/shell/StaticLibrary_xmlparser_x64.mk b/shell/StaticLibrary_xmlparser_x64.mk index 845c31e63928..2f5f510bdd94 100644 --- a/shell/StaticLibrary_xmlparser_x64.mk +++ b/shell/StaticLibrary_xmlparser_x64.mk @@ -34,10 +34,6 @@ $(eval $(call gb_StaticLibrary_set_include,shell_xmlparser_x64,\ $$(INCLUDE) \ )) -$(eval $(call gb_StaticLibrary_add_defs,shell_xmlparser_x64,\ - -DXML_UNICODE \ -)) - $(eval $(call gb_StaticLibrary_use_externals,shell_xmlparser_x64,\ expat_utf16 \ )) From d9ae7573083343b8db7fd65b5677a2132bd2e1e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= Date: Fri, 5 Oct 2012 14:55:40 +0200 Subject: [PATCH 349/863] It seems that we have endianness problem in internal lcms2 Change-Id: I1bec67344ddd5d1caf417355fafd344f48517f77 --- lcms2/lcms2-endian.patch | 17 +++++++++++++++++ lcms2/makefile.mk | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 lcms2/lcms2-endian.patch diff --git a/lcms2/lcms2-endian.patch b/lcms2/lcms2-endian.patch new file mode 100644 index 000000000000..01ffc1cb300a --- /dev/null +++ b/lcms2/lcms2-endian.patch @@ -0,0 +1,17 @@ +--- misc/lcms2-2.3/include/lcms2.h 2011-12-15 16:45:47.000000000 +0100 ++++ misc/build/lcms2-2.3/include/lcms2.h 2012-10-05 14:49:09.721146003 +0200 +@@ -30,8 +30,12 @@ + + // ********** Configuration toggles **************************************** + +-// Uncomment this one if you are using big endian machines +-// #define CMS_USE_BIG_ENDIAN 1 ++#ifndef _WIN32 ++#include ++#if __BYTE_ORDER == __BIG_ENDIAN ++#define USE_BIG_ENDIAN 1 ++#endif ++#endif /* !_WIN32 */ + + // Uncomment this one if your compiler/machine does NOT support the + // "long long" type. diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk index 52b7b4a93b65..9260ad4de5a1 100644 --- a/lcms2/makefile.mk +++ b/lcms2/makefile.mk @@ -39,7 +39,7 @@ TARGET=so_lcms2 TARFILE_NAME=lcms2-2.3 TARFILE_MD5=327348d67c979c88c2dec59a23a17d85 -PATCH_FILES = lcms2.patch +PATCH_FILES = lcms2.patch lcms2-endian.patch .IF "$(SYSTEM_LCMS2)" == "YES" @all: From aed09ee69fb2e5edfb02c4df81ef1adee407c54f Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 5 Oct 2012 15:08:26 +0200 Subject: [PATCH 350/863] offapi: move LineCap, enum generates headers Change-Id: I0fada447af361c319851360d04a94948148e5a26 --- offapi/UnoApi_offapi.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 1a4289922221..442b4b78be93 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -659,7 +659,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/drawing HatchTable \ Layer \ LayerManager \ - LineCap \ LineProperties \ LineShape \ MarkerTable \ @@ -2222,6 +2221,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/drawing,\ HomogenMatrixLine4 \ HorizontalDimensioning \ LayerType \ + LineCap \ LineDash \ LineEndType \ LineJoint \ From 9db74c6133ede2a28af077fd563398176ff0d858 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 5 Oct 2012 15:00:39 +0200 Subject: [PATCH 351/863] fdo#46071: Do not hide windows based on nil "Visible" property This appears to be messy: The /org.openoffice.Office.Views/WindowType configuration group template has both a nilable bool "Visible" property and a UserData/Data string property that encodes various things like geometry---but also visibility---in a string. Now, likely due to the problem that has meanwhile been fixed through f3f79cc9e6c265baf48955d53f7e888205e0b3e0 "Resolves fdo#46074: Fix Partial::contains for paths that go past a leaf node," some registrymodification.xcu files in the wild contain such WindowType entries in "default" state, without a UserData/Data string and with a nil "Visible" property. The way SfxChildWindow::InitializeChildWinFactory_Impl and SvtViewOptions::IsVisible are implemented, they will always lead to an invisible window for such broken registrymodification.xcu data (as IsVisible unhelpfully returns false for a nil value, and InitializeChildWinFactory_Impl uses that value when there is no UserData/Data string). For the Math formula editor window (ID 30378) this means that it can disappear from the UI completely, as there appears to be no UI trigger for the user to show it in case it is hidden. The fix is to introdue SvtViewOptions::HasVisible (which only returns true if the property is not nil) and change InitializeChidlWinFactory_Impl to only use the value of IsVisible() if HasVisible() returns true. This makes the code even more baroque, but this is a rather central, generic piece of code for all sorts of windows, so I do not want to break any other uses by e.g. changing IsVisible to return true for a nil property. Change-Id: Iae40075a7116a8aabd2d25aa9334709522e23d8f --- sfx2/source/appl/childwin.cxx | 2 +- unotools/inc/unotools/viewoptions.hxx | 7 +++++ unotools/source/config/viewoptions.cxx | 40 +++++++++++++++++++++----- 3 files changed, 41 insertions(+), 8 deletions(-) diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index 18038dac690c..e1e24be242c0 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -352,7 +352,7 @@ void SfxChildWindow::InitializeChildWinFactory_Impl( sal_uInt16 nId, SfxChildWin // load configuration SvtViewOptions aWinOpt( E_WINDOW, String::CreateFromInt32( nId ) ); - if ( aWinOpt.Exists() ) + if ( aWinOpt.Exists() && aWinOpt.HasVisible() ) rInfo.bVisible = aWinOpt.IsVisible(); // set state from configuration. Can be overwritten by UserData, see below ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq = aWinOpt.GetUserData(); diff --git a/unotools/inc/unotools/viewoptions.hxx b/unotools/inc/unotools/viewoptions.hxx index 2dbfdd485a38..8270ed9ef933 100644 --- a/unotools/inc/unotools/viewoptions.hxx +++ b/unotools/inc/unotools/viewoptions.hxx @@ -225,6 +225,13 @@ class UNOTOOLS_DLLPUBLIC SvtViewOptions: public utl::detail::Options sal_Bool IsVisible ( ) const; void SetVisible( sal_Bool bState ); + /** Return true if the "Visible" property actually has a non-nil value + + (IsVisible will somewhat arbitrarily return false if the property is + nil.) + */ + bool HasVisible() const; + /*-****************************************************************************************************//** @short use it to set/get the extended user data (consisting of a set of named scalar values) @descr It's supported for ALL types! diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx index faf59372bf4f..2b4ffbc3add1 100644 --- a/unotools/source/config/viewoptions.cxx +++ b/unotools/source/config/viewoptions.cxx @@ -266,6 +266,8 @@ class SvtViewOptionsBase_Impl { //------------------------------------------------------------------------------------------------------------- public: + enum State { STATE_NONE, STATE_FALSE, STATE_TRUE }; + SvtViewOptionsBase_Impl ( const ::rtl::OUString& sList ); virtual ~SvtViewOptionsBase_Impl ( ); sal_Bool Exists ( const ::rtl::OUString& sName ); @@ -279,7 +281,7 @@ class SvtViewOptionsBase_Impl sal_Int32 GetPageID ( const ::rtl::OUString& sName ); void SetPageID ( const ::rtl::OUString& sName , sal_Int32 nID ); - sal_Bool GetVisible ( const ::rtl::OUString& sName ); + State GetVisible ( const ::rtl::OUString& sName ); void SetVisible ( const ::rtl::OUString& sName , sal_Bool bVisible ); css::uno::Any GetUserItem ( const ::rtl::OUString& sName , @@ -682,28 +684,33 @@ void SvtViewOptionsBase_Impl::SetPageID( const ::rtl::OUString& sName , } //***************************************************************************************************************** -sal_Bool SvtViewOptionsBase_Impl::GetVisible( const ::rtl::OUString& sName ) +SvtViewOptionsBase_Impl::State SvtViewOptionsBase_Impl::GetVisible( const ::rtl::OUString& sName ) { #ifdef DEBUG_VIEWOPTIONS ++m_nReadCount; #endif - sal_Bool bVisible = sal_False; + State eState = STATE_NONE; try { css::uno::Reference< css::beans::XPropertySet > xNode( impl_getSetNode(sName, sal_False), css::uno::UNO_QUERY); if (xNode.is()) - xNode->getPropertyValue(PROPERTY_VISIBLE) >>= bVisible; + { + sal_Bool bVisible = sal_False; + if (xNode->getPropertyValue(PROPERTY_VISIBLE) >>= bVisible) + { + eState = bVisible ? STATE_TRUE : STATE_FALSE; + } + } } catch(const css::uno::Exception& ex) { - bVisible = sal_False; SVTVIEWOPTIONS_LOG_UNEXPECTED_EXCEPTION(ex) } - return bVisible; + return eState; } //***************************************************************************************************************** @@ -1055,7 +1062,7 @@ sal_Bool SvtViewOptions::IsVisible() const sal_Bool bState = sal_False; if( m_eViewType == E_WINDOW ) - bState = m_pDataContainer_Windows->GetVisible( m_sViewName ); + bState = m_pDataContainer_Windows->GetVisible( m_sViewName ) == SvtViewOptionsBase_Impl::STATE_TRUE; return bState; } @@ -1076,6 +1083,25 @@ void SvtViewOptions::SetVisible( sal_Bool bState ) m_pDataContainer_Windows->SetVisible( m_sViewName, bState ); } +//***************************************************************************************************************** +// public method +//***************************************************************************************************************** +bool SvtViewOptions::HasVisible() const +{ + // Ready for multithreading + ::osl::MutexGuard aGuard( GetOwnStaticMutex() ); + + // Safe impossible cases. + // These call isn't allowed for dialogs, tab-dialogs or tab-pages! + OSL_ENSURE( !(m_eViewType==E_DIALOG||m_eViewType==E_TABDIALOG||m_eViewType==E_TABPAGE), "SvtViewOptions::IsVisible()\nCall not allowed for Dialogs, TabDialogs or TabPages! I do nothing!\n" ); + + bool bState = false; + if( m_eViewType == E_WINDOW ) + bState = m_pDataContainer_Windows->GetVisible( m_sViewName ) != SvtViewOptionsBase_Impl::STATE_NONE; + + return bState; +} + //***************************************************************************************************************** css::uno::Sequence< css::beans::NamedValue > SvtViewOptions::GetUserData() const { From d559ffe0513ec9f4ffc3ba8d857f8644fd9b1ada Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 4 Oct 2012 21:14:50 +0100 Subject: [PATCH 352/863] add stock "remove" text Change-Id: I945a46a8ca3df8c6cf7982a531025d8d8b6c31a4 --- vcl/inc/svids.hrc | 1 + vcl/source/src/btntext.src | 5 ++ vcl/source/window/builder.cxx | 120 ++++++++++++++++++---------------- 3 files changed, 69 insertions(+), 57 deletions(-) diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc index 76fc51ff57e6..4951c5c5ac35 100644 --- a/vcl/inc/svids.hrc +++ b/vcl/inc/svids.hrc @@ -150,6 +150,7 @@ #define SV_BUTTONTEXT_RESET 10111 #define SV_BUTTONTEXT_ADD 10112 #define SV_BUTTONTEXT_DELETE 10113 +#define SV_BUTTONTEXT_REMOVE 10114 #define SV_STDTEXT_FIRST SV_STDTEXT_SERVICENOTAVAILABLE #define SV_STDTEXT_SERVICENOTAVAILABLE 10200 diff --git a/vcl/source/src/btntext.src b/vcl/source/src/btntext.src index 088b779abae7..d415a1fa3b12 100644 --- a/vcl/source/src/btntext.src +++ b/vcl/source/src/btntext.src @@ -91,3 +91,8 @@ String SV_BUTTONTEXT_DELETE { Text [ en-US ] = "~Delete"; }; + +String SV_BUTTONTEXT_REMOVE +{ + Text [ en-US ] = "~Remove"; +}; diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 3ef828965363..e4213202250d 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -231,7 +231,7 @@ namespace OString extractPattern(VclBuilder::stringmap &rMap) { OString sPattern; - VclBuilder::stringmap::iterator aFind = rMap.find(OString(RTL_CONSTASCII_STRINGPARAM("pattern"))); + VclBuilder::stringmap::iterator aFind = rMap.find(OString("pattern")); if (aFind != rMap.end()) { sPattern = aFind->second; @@ -270,7 +270,7 @@ namespace VclBuilder::stringmap::iterator aFind = rMap.find(OString("orientation")); if (aFind != rMap.end()) { - bVertical = aFind->second.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("vertical")); + bVertical = aFind->second.equalsIgnoreAsciiCase("vertical"); rMap.erase(aFind); } return bVertical; @@ -279,7 +279,7 @@ namespace bool extractInconsistent(VclBuilder::stringmap &rMap) { bool bInconsistent = false; - VclBuilder::stringmap::iterator aFind = rMap.find(OString(RTL_CONSTASCII_STRINGPARAM("inconsistent"))); + VclBuilder::stringmap::iterator aFind = rMap.find(OString("inconsistent")); if (aFind != rMap.end()) { bInconsistent = toBool(aFind->second); @@ -293,7 +293,7 @@ namespace WinBits nBits = WB_CENTER|WB_VCENTER|WB_3DLOOK; bool bIsStock = false; - VclBuilder::stringmap::iterator aFind = rMap.find(OString(RTL_CONSTASCII_STRINGPARAM("use-stock"))); + VclBuilder::stringmap::iterator aFind = rMap.find(OString("use-stock")); if (aFind != rMap.end()) { bIsStock = toBool(aFind->second); @@ -305,55 +305,61 @@ namespace if (bIsStock) { OString sType; - aFind = rMap.find(OString(RTL_CONSTASCII_STRINGPARAM("label"))); + aFind = rMap.find(OString("label")); if (aFind != rMap.end()) { sType = aFind->second; rMap.erase(aFind); } - if (sType.equalsL(RTL_CONSTASCII_STRINGPARAM("gtk-ok"))) + if (sType == "gtk-ok") pWindow = new OKButton(pParent, nBits); - else if (sType.equalsL(RTL_CONSTASCII_STRINGPARAM("gtk-cancel"))) + else if (sType == "gtk-cancel") pWindow = new CancelButton(pParent, nBits); - else if (sType.equalsL(RTL_CONSTASCII_STRINGPARAM("gtk-help"))) + else if (sType == "gtk-help") pWindow = new HelpButton(pParent, nBits); - else if (sType.equalsL(RTL_CONSTASCII_STRINGPARAM("gtk-media-next"))) + else if (sType == "gtk-media-next") { PushButton *pBtn = new PushButton(pParent, nBits); pBtn->SetSymbol(SYMBOL_NEXT); pWindow = pBtn; } - else if (sType.equalsL(RTL_CONSTASCII_STRINGPARAM("gtk-media-previous"))) + else if (sType == "gtk-media-previous") { PushButton *pBtn = new PushButton(pParent, nBits); pBtn->SetSymbol(SYMBOL_PREV); pWindow = pBtn; } - else if (sType.equalsL(RTL_CONSTASCII_STRINGPARAM("gtk-close"))) + else if (sType == "gtk-close") { PushButton *pBtn = new PushButton(pParent, nBits); pBtn->SetText(VclResId(SV_BUTTONTEXT_CLOSE).toString()); pWindow = pBtn; } - else if (sType.equalsL(RTL_CONSTASCII_STRINGPARAM("gtk-revert-to-saved"))) + else if (sType == "gtk-revert-to-saved") { PushButton *pBtn = new PushButton(pParent, nBits); pBtn->SetText(VclResId(SV_BUTTONTEXT_RESET).toString()); pWindow = pBtn; } - else if (sType.equalsL(RTL_CONSTASCII_STRINGPARAM("gtk-add"))) + else if (sType == "gtk-add") { PushButton *pBtn = new PushButton(pParent, nBits); pBtn->SetText(VclResId(SV_BUTTONTEXT_ADD).toString()); pWindow = pBtn; } - else if (sType.equalsL(RTL_CONSTASCII_STRINGPARAM("gtk-delete"))) + else if (sType == "gtk-delete") { PushButton *pBtn = new PushButton(pParent, nBits); pBtn->SetText(VclResId(SV_BUTTONTEXT_DELETE).toString()); pWindow = pBtn; } + else if (sType == "gtk-remove") + { + PushButton *pBtn = new PushButton(pParent, nBits); + pBtn->SetText(VclResId(SV_BUTTONTEXT_REMOVE).toString()); + pWindow = pBtn; + } else { SAL_WARN("vcl.layout", "unknown stock type: " << sType.getStr()); @@ -401,7 +407,7 @@ namespace void ensureDefaultWidthChars(VclBuilder::stringmap &rMap) { - OString sWidthChars(RTL_CONSTASCII_STRINGPARAM("width-chars")); + OString sWidthChars("width-chars"); VclBuilder::stringmap::iterator aFind = rMap.find(sWidthChars); if (aFind == rMap.end()) rMap[sWidthChars] = "25"; @@ -410,7 +416,7 @@ namespace bool VclBuilder::extractGroup(const OString &id, stringmap &rMap) { - VclBuilder::stringmap::iterator aFind = rMap.find(OString(RTL_CONSTASCII_STRINGPARAM("group"))); + VclBuilder::stringmap::iterator aFind = rMap.find(OString("group")); if (aFind != rMap.end()) { m_pParserState->m_aGroupMaps.push_back(RadioButtonGroupMap(id, aFind->second)); @@ -422,7 +428,7 @@ bool VclBuilder::extractGroup(const OString &id, stringmap &rMap) bool VclBuilder::extractAdjustment(const OString &id, stringmap &rMap) { - VclBuilder::stringmap::iterator aFind = rMap.find(OString(RTL_CONSTASCII_STRINGPARAM("adjustment"))); + VclBuilder::stringmap::iterator aFind = rMap.find(OString("adjustment")); if (aFind != rMap.end()) { m_pParserState->m_aAdjustmentMaps.push_back(SpinButtonAdjustmentMap(id, aFind->second)); @@ -512,50 +518,50 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri } } - if (bIsPlaceHolder || name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkTreeSelection"))) + if (bIsPlaceHolder || name == "GtkTreeSelection") return NULL; Window *pWindow = NULL; - if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkDialog"))) + if (name == "GtkDialog") { WinBits nBits = WB_MOVEABLE|WB_3DLOOK|WB_CLOSEABLE; if (extractResizable(rMap)) nBits |= WB_SIZEABLE; pWindow = new Dialog(pParent, nBits); } - else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkBox"))) + else if (name == "GtkBox") { if (extractOrientation(rMap)) pWindow = new VclVBox(pParent); else pWindow = new VclHBox(pParent); } - else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkButtonBox"))) + else if (name == "GtkButtonBox") { if (extractOrientation(rMap)) pWindow = new VclVButtonBox(pParent); else pWindow = new VclHButtonBox(pParent); } - else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkGrid"))) + else if (name == "GtkGrid") pWindow = new VclGrid(pParent); - else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkFrame"))) + else if (name == "GtkFrame") pWindow = new VclFrame(pParent); - else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkExpander"))) + else if (name == "GtkExpander") pWindow = new VclExpander(pParent); - else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkAlignment"))) + else if (name == "GtkAlignment") pWindow = new VclAlignment(pParent); - else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkButton"))) + else if (name == "GtkButton") { extractImage(id, rMap); pWindow = extractStockAndBuildButton(pParent, rMap); } - else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkRadioButton"))) + else if (name == "GtkRadioButton") { extractGroup(id, rMap); pWindow = new RadioButton(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK); } - else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkCheckButton"))) + else if (name == "GtkCheckButton") { //maybe always import as TriStateBox and enable/disable tristate bool bIsTriState = extractInconsistent(rMap); @@ -566,7 +572,7 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri pCheckBox->SetState(STATE_DONTKNOW); pWindow = pCheckBox; } - else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkSpinButton"))) + else if (name == "GtkSpinButton") { extractAdjustment(id, rMap); OString sPattern = extractPattern(rMap); @@ -600,14 +606,14 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri pWindow = pField; } } - else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkComboBox"))) + else if (name == "GtkComboBox") { extractModel(id, rMap); ListBox *pListBox = new ListBox(pParent, WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK); pListBox->SetBestDropDownLineCount(); pWindow = pListBox; } - else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkComboBoxText"))) + else if (name == "GtkComboBoxText") { extractModel(id, rMap); if (extractEntry(rMap)) @@ -625,33 +631,33 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri pWindow = pMenuButton; } } - else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkTreeView"))) + else if (name == "GtkTreeView") { extractModel(id, rMap); pWindow = new ListBox(pParent, WB_LEFT|WB_VCENTER|WB_3DLOOK); } - else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkLabel"))) + else if (name == "GtkLabel") pWindow = new FixedText(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK); - else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkImage"))) + else if (name == "GtkImage") { extractStock(id, rMap); pWindow = new FixedImage(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK); } - else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkSeparator"))) + else if (name == "GtkSeparator") { if (extractOrientation(rMap)) pWindow = new FixedLine(pParent, WB_VERT); else pWindow = new FixedLine(pParent, WB_HORZ); } - else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkEntry"))) + else if (name == "GtkEntry") { pWindow = new Edit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK); ensureDefaultWidthChars(rMap); } - else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkNotebook"))) + else if (name == "GtkNotebook") pWindow = new TabControl(pParent, WB_STDTABCONTROL|WB_3DLOOK); - else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkDrawingArea"))) + else if (name == "GtkDrawingArea") pWindow = new Window(pParent); else { @@ -837,7 +843,7 @@ void VclBuilder::handleTabChild(Window *pParent, xmlreader::XmlReader &reader) } TabControl *pTabControl = static_cast(pParent); - VclBuilder::stringmap::iterator aFind = aProperties.find(OString(RTL_CONSTASCII_STRINGPARAM("label"))); + VclBuilder::stringmap::iterator aFind = aProperties.find(OString("label")); if (aFind != aProperties.end()) { pTabControl->SetPageText(pTabControl->GetCurPageId(), OStringToOUString(aFind->second, RTL_TEXTENCODING_UTF8)); @@ -896,7 +902,7 @@ void VclBuilder::handleChild(Window *pParent, xmlreader::XmlReader &reader) } } - if (sType.equalsL(RTL_CONSTASCII_STRINGPARAM("tab"))) + if (sType == "tab") { handleTabChild(pParent, reader); return; @@ -1108,7 +1114,7 @@ Window* VclBuilder::handleObject(Window *pParent, xmlreader::XmlReader &reader) } } - if (sClass.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkListStore"))) + if (sClass == "GtkListStore") { handleListStore(reader, sID); return NULL; @@ -1155,7 +1161,7 @@ Window* VclBuilder::handleObject(Window *pParent, xmlreader::XmlReader &reader) break; } - if (sClass.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkAdjustment"))) + if (sClass == "GtkAdjustment") { handleAdjustment(sID, aProperties); return NULL; @@ -1219,42 +1225,42 @@ void VclBuilder::applyPackingProperty(Window *pCurrent, xmlreader::XmlReader::TEXT_RAW, &name, &nsId); OString sValue(name.begin, name.length); - if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("expand"))) + if (sKey == "expand") { bool bTrue = (sValue[0] == 't' || sValue[0] == 'T' || sValue[0] == '1'); pCurrent->set_expand(bTrue); } - else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("fill"))) + else if (sKey == "fill") { bool bTrue = (sValue[0] == 't' || sValue[0] == 'T' || sValue[0] == '1'); pCurrent->set_fill(bTrue); } - else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("pack-type"))) + else if (sKey == "pack-type") { VclPackType ePackType = (sValue[0] == 'e' || sValue[0] == 'e') ? VCL_PACK_END : VCL_PACK_START; pCurrent->set_pack_type(ePackType); } - else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("left-attach"))) + else if (sKey == "left-attach") { pCurrent->set_grid_left_attach(sValue.toInt32()); } - else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("top-attach"))) + else if (sKey == "top-attach") { pCurrent->set_grid_top_attach(sValue.toInt32()); } - else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("width"))) + else if (sKey == "width") { pCurrent->set_grid_width(sValue.toInt32()); } - else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("height"))) + else if (sKey == "height") { pCurrent->set_grid_height(sValue.toInt32()); } - else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("padding"))) + else if (sKey == "padding") { pCurrent->set_padding(sValue.toInt32()); } - else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("position"))) + else if (sKey == "position") { set_window_packing_position(pCurrent, sValue.toInt32()); } @@ -1313,8 +1319,8 @@ void VclBuilder::collectProperty(xmlreader::XmlReader &reader, const OString &rI sProperty = sProperty.replace('_', '-'); //replace '_' with '-' except for property values that //refer to widget ids themselves. TO-DO, drop conversion - //and just use foo_bar properties throughout - if (sProperty.equalsL(RTL_CONSTASCII_STRINGPARAM("group"))) + //and just use foo_bar properties throughout ? + if (sProperty == "group") rMap[sProperty] = sValue; else rMap[sProperty] = sValue.replace('_', '-'); @@ -1467,24 +1473,24 @@ void VclBuilder::mungeadjustment(NumericFormatter &rTarget, Adjustment &rAdjustm const OString &rKey = aI->first; const OString &rValue = aI->second; - if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("upper"))) + if (rKey == "upper") { sal_Int64 nUpper = rValue.toDouble() * nMul; rTarget.SetMax(nUpper); rTarget.SetLast(nUpper); } - else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("lower"))) + else if (rKey == "lower") { sal_Int64 nLower = rValue.toDouble() * nMul; rTarget.SetMin(nLower); rTarget.SetFirst(nLower); } - else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("value"))) + else if (rKey == "value") { sal_Int64 nValue = rValue.toDouble() * nMul; rTarget.SetValue(nValue); } - else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("step-increment"))) + else if (rKey == "step-increment") { sal_Int64 nSpinSize = rValue.toDouble() * nMul; rTarget.SetSpinSize(nSpinSize); From 3479c1fb010df54ef675413d8b3659a8d619388d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 4 Oct 2012 23:02:48 +0100 Subject: [PATCH 353/863] de-pimpl Hyphenation Dialog for simplicity Change-Id: Icba94fdd75d5e09fd81744d2f5ce55886b8777b4 --- cui/source/dialogs/hyphen.cxx | 258 ++++++++++------------------------ cui/source/inc/hyphen.hxx | 63 +++++++-- 2 files changed, 128 insertions(+), 193 deletions(-) diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx index 4b33b04f061e..36a5b3447a71 100644 --- a/cui/source/dialogs/hyphen.cxx +++ b/cui/source/dialogs/hyphen.cxx @@ -31,36 +31,19 @@ #include #include -#include - -using namespace ::com::sun::star; - - #define HYPH_POS_CHAR '=' #define CONTINUE_HYPH USHRT_MAX #define CUR_HYPH_POS_CHAR '-' -// class HyphenEdit_Impl ------------------------------------------------------- - -class HyphenEdit_Impl : public Edit -{ -public: - HyphenEdit_Impl( Window* pParent, const ResId& rResId ); - -protected: - virtual void KeyInput( const KeyEvent &rKEvt ); -}; - - -HyphenEdit_Impl::HyphenEdit_Impl( Window* pParent, const ResId& rResId ) : +HyphenEdit::HyphenEdit( Window* pParent, const ResId& rResId ) : Edit( pParent, rResId ) { } -void HyphenEdit_Impl::KeyInput( const KeyEvent& rKEvt ) +void HyphenEdit::KeyInput( const KeyEvent& rKEvt ) { sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode(); @@ -86,132 +69,7 @@ void HyphenEdit_Impl::KeyInput( const KeyEvent& rKEvt ) } -// struct SvxHyphenWordDialog_Impl --------------------------------------------- - -struct SvxHyphenWordDialog_Impl -{ - SvxHyphenWordDialog * m_pDialog; - - FixedText aWordFT; - HyphenEdit_Impl aWordEdit; - ImageButton aLeftBtn; - ImageButton aRightBtn; - OKButton aOkBtn; - PushButton aContBtn; - PushButton aDelBtn; - FixedLine aFLBottom; - HelpButton aHelpBtn; - PushButton aHyphAll; - CancelButton aCancelBtn; - String aLabel; - SvxSpellWrapper* pHyphWrapper; - uno::Reference< linguistic2::XHyphenator > xHyphenator; - uno::Reference< linguistic2::XPossibleHyphens > xPossHyph; - String aEditWord; // aEditWord and aWordEdit.GetText() differ only by the character for the current selected hyphenation position - String aActWord; // actual word to be hyphenated - LanguageType nActLanguage; // and its language - sal_uInt16 nMaxHyphenationPos; // right most valid hyphenation pos - sal_uInt16 nHyphPos; - sal_uInt16 nOldPos; - sal_Int32 nHyphenationPositionsOffset; - sal_Bool bBusy; - - - void EnableLRBtn_Impl(); - String EraseUnusableHyphens_Impl( ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XPossibleHyphens > &rxPossHyph, sal_uInt16 nMaxHyphenationPos ); - - void InitControls_Impl(); - void ContinueHyph_Impl( sal_uInt16 nInsPos = 0 ); - sal_uInt16 GetHyphIndex_Impl(); - void SelLeft_Impl(); - void SelRight_Impl(); - - DECL_LINK(Left_Impl, void *); - DECL_LINK(Right_Impl, void *); - DECL_LINK(CutHdl_Impl, void *); - DECL_LINK(ContinueHdl_Impl, void *); - DECL_LINK(DeleteHdl_Impl, void *); - DECL_LINK( HyphenateAllHdl_Impl, Button* ); - DECL_LINK(CancelHdl_Impl, void *); - DECL_LINK(GetFocusHdl_Impl, void *); - - - SvxHyphenWordDialog_Impl( - SvxHyphenWordDialog * pDialog, - const String &rWord, - LanguageType nLang, - uno::Reference< linguistic2::XHyphenator > &xHyphen, - SvxSpellWrapper* pWrapper ); - ~SvxHyphenWordDialog_Impl(); -}; - - -SvxHyphenWordDialog_Impl::SvxHyphenWordDialog_Impl( - SvxHyphenWordDialog * pDialog, - const String &rWord, - LanguageType nLang, - uno::Reference< linguistic2::XHyphenator > &xHyphen, - SvxSpellWrapper* pWrapper ) : - - m_pDialog ( pDialog ), - aWordFT ( pDialog, CUI_RES( FT_WORD ) ), - aWordEdit ( pDialog, CUI_RES( ED_WORD ) ), - aLeftBtn ( pDialog, CUI_RES( BTN_LEFT ) ), - aRightBtn ( pDialog, CUI_RES( BTN_RIGHT ) ), - aOkBtn ( pDialog, CUI_RES( BTN_HYPH_CUT ) ), - aContBtn ( pDialog, CUI_RES( BTN_HYPH_CONTINUE ) ), - aDelBtn ( pDialog, CUI_RES( BTN_HYPH_DELETE ) ), - aFLBottom ( pDialog, CUI_RES( FL_BOTTOM ) ), - aHelpBtn ( pDialog, CUI_RES( BTN_HYPH_HELP ) ), - aHyphAll ( pDialog, CUI_RES( BTN_HYPH_ALL ) ), - aCancelBtn ( pDialog, CUI_RES( BTN_HYPH_CANCEL ) ), - aLabel ( pDialog->GetText() ), - pHyphWrapper ( NULL ), - xHyphenator ( NULL ), - xPossHyph ( NULL ), - aActWord ( ), - nActLanguage ( LANGUAGE_NONE ), - nMaxHyphenationPos ( 0 ), - nHyphPos ( 0 ), - nOldPos ( 0 ), - nHyphenationPositionsOffset( 0 ), - bBusy ( sal_False ) -{ - aActWord = rWord; - nActLanguage = nLang; - xHyphenator = xHyphen; - pHyphWrapper = pWrapper; - - uno::Reference< linguistic2::XHyphenatedWord > xHyphWord( pHyphWrapper ? - pHyphWrapper->GetLast() : NULL, uno::UNO_QUERY ); - DBG_ASSERT( xHyphWord.is(), "hyphenation result missing" ); - if (xHyphWord.is()) - { - DBG_ASSERT( aActWord == String( xHyphWord->getWord() ), "word mismatch" ); - DBG_ASSERT( nActLanguage == SvxLocaleToLanguage( xHyphWord->getLocale() ), "language mismatch" ); - nMaxHyphenationPos = xHyphWord->getHyphenationPos(); - } - - InitControls_Impl(); - aWordEdit.GrabFocus(); - - aLeftBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog_Impl, Left_Impl ) ); - aRightBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog_Impl, Right_Impl ) ); - aOkBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog_Impl, CutHdl_Impl ) ); - aContBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog_Impl, ContinueHdl_Impl ) ); - aDelBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog_Impl, DeleteHdl_Impl ) ); - aHyphAll.SetClickHdl( LINK( this, SvxHyphenWordDialog_Impl, HyphenateAllHdl_Impl ) ); - aCancelBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog_Impl, CancelHdl_Impl ) ); - aWordEdit.SetGetFocusHdl( LINK( this, SvxHyphenWordDialog_Impl, GetFocusHdl_Impl ) ); -} - - -SvxHyphenWordDialog_Impl::~SvxHyphenWordDialog_Impl() -{ -} - - -void SvxHyphenWordDialog_Impl::EnableLRBtn_Impl() +void SvxHyphenWordDialog::EnableLRBtn_Impl() { String aTxt( aEditWord ); xub_StrLen nLen = aTxt.Len(); @@ -242,7 +100,7 @@ void SvxHyphenWordDialog_Impl::EnableLRBtn_Impl() } -String SvxHyphenWordDialog_Impl::EraseUnusableHyphens_Impl( +String SvxHyphenWordDialog::EraseUnusableHyphens_Impl( uno::Reference< linguistic2::XPossibleHyphens > &rxPossHyph, sal_uInt16 _nMaxHyphenationPos ) { @@ -342,7 +200,7 @@ String SvxHyphenWordDialog_Impl::EraseUnusableHyphens_Impl( } -void SvxHyphenWordDialog_Impl::InitControls_Impl() +void SvxHyphenWordDialog::InitControls_Impl() { xPossHyph = NULL; if (xHyphenator.is()) @@ -356,12 +214,12 @@ void SvxHyphenWordDialog_Impl::InitControls_Impl() aWordEdit.SetText( aEditWord ); nOldPos = aEditWord.Len(); - SelLeft_Impl(); + SelLeft(); EnableLRBtn_Impl(); } -void SvxHyphenWordDialog_Impl::ContinueHyph_Impl( sal_uInt16 nInsPos ) +void SvxHyphenWordDialog::ContinueHyph_Impl( sal_uInt16 nInsPos ) { if ( nInsPos != CONTINUE_HYPH && xPossHyph.is()) { @@ -408,15 +266,15 @@ void SvxHyphenWordDialog_Impl::ContinueHyph_Impl( sal_uInt16 nInsPos ) nActLanguage = SvxLocaleToLanguage( xHyphWord->getLocale() ); nMaxHyphenationPos = xHyphWord->getHyphenationPos(); InitControls_Impl(); - m_pDialog->SetWindowTitle( nActLanguage ); + SetWindowTitle( nActLanguage ); } } else - m_pDialog->EndDialog( RET_OK ); + EndDialog( RET_OK ); } -sal_uInt16 SvxHyphenWordDialog_Impl::GetHyphIndex_Impl() +sal_uInt16 SvxHyphenWordDialog::GetHyphIndex_Impl() { sal_uInt16 nPos = 0; String aTxt( aWordEdit.GetText() ); @@ -433,7 +291,7 @@ sal_uInt16 SvxHyphenWordDialog_Impl::GetHyphIndex_Impl() } -void SvxHyphenWordDialog_Impl::SelLeft_Impl() +void SvxHyphenWordDialog::SelLeft() { DBG_ASSERT( nOldPos > 0, "invalid hyphenation position" ); if (nOldPos > 0) @@ -459,7 +317,7 @@ void SvxHyphenWordDialog_Impl::SelLeft_Impl() } -void SvxHyphenWordDialog_Impl::SelRight_Impl() +void SvxHyphenWordDialog::SelRight() { String aTxt( aEditWord ); for ( xub_StrLen i = nOldPos + 1; i < aTxt.Len(); ++i ) @@ -480,7 +338,7 @@ void SvxHyphenWordDialog_Impl::SelRight_Impl() } -IMPL_LINK_NOARG(SvxHyphenWordDialog_Impl, CutHdl_Impl) +IMPL_LINK_NOARG(SvxHyphenWordDialog, CutHdl_Impl) { if( !bBusy ) { @@ -492,7 +350,7 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog_Impl, CutHdl_Impl) } -IMPL_LINK( SvxHyphenWordDialog_Impl, HyphenateAllHdl_Impl, Button *, EMPTYARG /*pButton*/ ) +IMPL_LINK( SvxHyphenWordDialog, HyphenateAllHdl_Impl, Button *, EMPTYARG /*pButton*/ ) { if( !bBusy ) { @@ -522,7 +380,7 @@ IMPL_LINK( SvxHyphenWordDialog_Impl, HyphenateAllHdl_Impl, Button *, EMPTYARG /* } -IMPL_LINK_NOARG(SvxHyphenWordDialog_Impl, DeleteHdl_Impl) +IMPL_LINK_NOARG(SvxHyphenWordDialog, DeleteHdl_Impl) { if( !bBusy ) { @@ -534,7 +392,7 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog_Impl, DeleteHdl_Impl) } -IMPL_LINK_NOARG(SvxHyphenWordDialog_Impl, ContinueHdl_Impl) +IMPL_LINK_NOARG(SvxHyphenWordDialog, ContinueHdl_Impl) { if( !bBusy ) { @@ -546,44 +404,44 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog_Impl, ContinueHdl_Impl) } -IMPL_LINK_NOARG(SvxHyphenWordDialog_Impl, CancelHdl_Impl) +IMPL_LINK_NOARG(SvxHyphenWordDialog, CancelHdl_Impl) { if( !bBusy ) { bBusy = sal_True; pHyphWrapper->SpellEnd(); - m_pDialog->EndDialog( RET_CANCEL ); + EndDialog( RET_CANCEL ); bBusy = sal_False; } return 0; } -IMPL_LINK_NOARG(SvxHyphenWordDialog_Impl, Left_Impl) +IMPL_LINK_NOARG(SvxHyphenWordDialog, Left_Impl) { if( !bBusy ) { bBusy = sal_True; - SelLeft_Impl(); + SelLeft(); bBusy = sal_False; } return 0; } -IMPL_LINK_NOARG(SvxHyphenWordDialog_Impl, Right_Impl) +IMPL_LINK_NOARG(SvxHyphenWordDialog, Right_Impl) { if( !bBusy ) { bBusy = sal_True; - SelRight_Impl(); + SelRight(); bBusy = sal_False; } return 0; } -IMPL_LINK_NOARG(SvxHyphenWordDialog_Impl, GetFocusHdl_Impl) +IMPL_LINK_NOARG(SvxHyphenWordDialog, GetFocusHdl_Impl) { aWordEdit.SetSelection( Selection( nOldPos, nOldPos + 1 ) ); return 0; @@ -598,17 +456,64 @@ SvxHyphenWordDialog::SvxHyphenWordDialog( uno::Reference< linguistic2::XHyphenator > &xHyphen, SvxSpellWrapper* pWrapper ) : - SfxModalDialog( pParent, CUI_RES( RID_SVXDLG_HYPHENATE ) ) + SfxModalDialog( pParent, CUI_RES( RID_SVXDLG_HYPHENATE ) ), + + aWordFT ( this, CUI_RES( FT_WORD ) ), + aWordEdit ( this, CUI_RES( ED_WORD ) ), + aLeftBtn ( this, CUI_RES( BTN_LEFT ) ), + aRightBtn ( this, CUI_RES( BTN_RIGHT ) ), + aOkBtn ( this, CUI_RES( BTN_HYPH_CUT ) ), + aContBtn ( this, CUI_RES( BTN_HYPH_CONTINUE ) ), + aDelBtn ( this, CUI_RES( BTN_HYPH_DELETE ) ), + aFLBottom ( this, CUI_RES( FL_BOTTOM ) ), + aHelpBtn ( this, CUI_RES( BTN_HYPH_HELP ) ), + aHyphAll ( this, CUI_RES( BTN_HYPH_ALL ) ), + aCancelBtn ( this, CUI_RES( BTN_HYPH_CANCEL ) ), + aLabel ( GetText() ), + pHyphWrapper ( NULL ), + xHyphenator ( NULL ), + xPossHyph ( NULL ), + aActWord ( ), + nActLanguage ( LANGUAGE_NONE ), + nMaxHyphenationPos ( 0 ), + nHyphPos ( 0 ), + nOldPos ( 0 ), + nHyphenationPositionsOffset( 0 ), + bBusy ( sal_False ) { - m_pImpl = std::auto_ptr< SvxHyphenWordDialog_Impl >( - new SvxHyphenWordDialog_Impl( this, rWord, nLang, xHyphen, pWrapper ) ); + aActWord = rWord; + nActLanguage = nLang; + xHyphenator = xHyphen; + pHyphWrapper = pWrapper; + + uno::Reference< linguistic2::XHyphenatedWord > xHyphWord( pHyphWrapper ? + pHyphWrapper->GetLast() : NULL, uno::UNO_QUERY ); + DBG_ASSERT( xHyphWord.is(), "hyphenation result missing" ); + if (xHyphWord.is()) + { + DBG_ASSERT( aActWord == String( xHyphWord->getWord() ), "word mismatch" ); + DBG_ASSERT( nActLanguage == SvxLocaleToLanguage( xHyphWord->getLocale() ), "language mismatch" ); + nMaxHyphenationPos = xHyphWord->getHyphenationPos(); + } + + InitControls_Impl(); + aWordEdit.GrabFocus(); + + aLeftBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog, Left_Impl ) ); + aRightBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog, Right_Impl ) ); + aOkBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog, CutHdl_Impl ) ); + aContBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog, ContinueHdl_Impl ) ); + aDelBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog, DeleteHdl_Impl ) ); + aHyphAll.SetClickHdl( LINK( this, SvxHyphenWordDialog, HyphenateAllHdl_Impl ) ); + aCancelBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog, CancelHdl_Impl ) ); + aWordEdit.SetGetFocusHdl( LINK( this, SvxHyphenWordDialog, GetFocusHdl_Impl ) ); FreeResource(); SetWindowTitle( nLang ); // disable controls if service is not available - if (!m_pImpl->xHyphenator.is()) + if (!xHyphenator.is()) Enable( sal_False ); } @@ -621,24 +526,11 @@ SvxHyphenWordDialog::~SvxHyphenWordDialog() void SvxHyphenWordDialog::SetWindowTitle( LanguageType nLang ) { String aLangStr( SvtLanguageTable::GetLanguageString( nLang ) ); - String aTmp( m_pImpl->aLabel ); + String aTmp( aLabel ); aTmp.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " (" ) ); aTmp.Append( aLangStr ); aTmp.Append( sal_Unicode( ')' ) ); SetText( aTmp ); } - -void SvxHyphenWordDialog::SelLeft() -{ - m_pImpl->SelLeft_Impl(); -} - - -void SvxHyphenWordDialog::SelRight() -{ - m_pImpl->SelRight_Impl(); -} - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx index 128fb501ad5d..53096571a2fd 100644 --- a/cui/source/inc/hyphen.hxx +++ b/cui/source/inc/hyphen.hxx @@ -26,28 +26,71 @@ #include #include #include +#include +#include -// forward --------------------------------------------------------------- - -namespace com{namespace sun{namespace star{ -namespace linguistic2{ - class XHyphenator; -}}}} +using namespace ::com::sun::star; class SvxSpellWrapper; -// class SvxHyphenWordDialog --------------------------------------------- +class HyphenEdit : public Edit +{ +public: + HyphenEdit( Window* pParent, const ResId& rResId ); -struct SvxHyphenWordDialog_Impl; +protected: + virtual void KeyInput( const KeyEvent &rKEvt ); +}; + +// class SvxHyphenWordDialog --------------------------------------------- class SvxHyphenWordDialog : public SfxModalDialog { - std::auto_ptr< SvxHyphenWordDialog_Impl > m_pImpl; + FixedText aWordFT; + HyphenEdit aWordEdit; + ImageButton aLeftBtn; + ImageButton aRightBtn; + OKButton aOkBtn; + PushButton aContBtn; + PushButton aDelBtn; + FixedLine aFLBottom; + HelpButton aHelpBtn; + PushButton aHyphAll; + CancelButton aCancelBtn; + String aLabel; + SvxSpellWrapper* pHyphWrapper; + uno::Reference< linguistic2::XHyphenator > xHyphenator; + uno::Reference< linguistic2::XPossibleHyphens > xPossHyph; + String aEditWord; // aEditWord and aWordEdit.GetText() differ only by the character for the current selected hyphenation position + String aActWord; // actual word to be hyphenated + LanguageType nActLanguage; // and its language + sal_uInt16 nMaxHyphenationPos; // right most valid hyphenation pos + sal_uInt16 nHyphPos; + sal_uInt16 nOldPos; + sal_Int32 nHyphenationPositionsOffset; + sal_Bool bBusy; + + + void EnableLRBtn_Impl(); + String EraseUnusableHyphens_Impl( uno::Reference< linguistic2::XPossibleHyphens > &rxPossHyph, sal_uInt16 nMaxHyphenationPos ); + + void InitControls_Impl(); + void ContinueHyph_Impl( sal_uInt16 nInsPos = 0 ); + sal_uInt16 GetHyphIndex_Impl(); + + DECL_LINK(Left_Impl, void *); + DECL_LINK(Right_Impl, void *); + DECL_LINK(CutHdl_Impl, void *); + DECL_LINK(ContinueHdl_Impl, void *); + DECL_LINK(DeleteHdl_Impl, void *); + DECL_LINK( HyphenateAllHdl_Impl, Button* ); + DECL_LINK(CancelHdl_Impl, void *); + DECL_LINK(GetFocusHdl_Impl, void *); public: SvxHyphenWordDialog( const String &rWord, LanguageType nLang, Window* pParent, - ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator > &xHyphen, + uno::Reference< linguistic2::XHyphenator > &xHyphen, SvxSpellWrapper* pWrapper ); virtual ~SvxHyphenWordDialog(); From eef849b8fb396201395ef6913d9c4e161aded88d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 4 Oct 2012 23:35:19 +0100 Subject: [PATCH 354/863] convert hyphenate dialog to .ui Change-Id: I0025ce0107deaaf6b4698745691c9f0bfddc7c34 --- cui/AllLangResTarget_cui.mk | 1 - cui/UI_cui.mk | 1 + cui/source/dialogs/hyphen.cxx | 111 +++++++++--------- cui/source/dialogs/hyphen.hrc | 37 ------ cui/source/dialogs/hyphen.src | 119 ------------------- cui/source/inc/cuires.hrc | 2 - cui/source/inc/helpid.hrc | 1 - cui/source/inc/hyphen.hxx | 25 ++-- cui/uiconfig/ui/hyphenate.ui | 210 ++++++++++++++++++++++++++++++++++ 9 files changed, 274 insertions(+), 233 deletions(-) delete mode 100644 cui/source/dialogs/hyphen.hrc delete mode 100644 cui/source/dialogs/hyphen.src create mode 100644 cui/uiconfig/ui/hyphenate.ui diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk index f3d76a961c2a..6a395fc91c2c 100644 --- a/cui/AllLangResTarget_cui.mk +++ b/cui/AllLangResTarget_cui.mk @@ -66,7 +66,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\ cui/source/dialogs/hangulhanjadlg.src \ cui/source/dialogs/hlmarkwn.src \ cui/source/dialogs/hyperdlg.src \ - cui/source/dialogs/hyphen.src \ cui/source/dialogs/iconcdlg.src \ cui/source/dialogs/insrc.src \ cui/source/dialogs/multipat.src \ diff --git a/cui/UI_cui.mk b/cui/UI_cui.mk index 717107dd79d2..eb1217c3f70f 100644 --- a/cui/UI_cui.mk +++ b/cui/UI_cui.mk @@ -12,6 +12,7 @@ $(eval $(call gb_UI_UI,cui)) $(eval $(call gb_UI_add_uifiles,cui,\ cui/uiconfig/ui/charnamepage \ cui/uiconfig/ui/effectspage \ + cui/uiconfig/ui/hyphenate \ cui/uiconfig/ui/positionpage \ cui/uiconfig/ui/specialcharacters \ cui/uiconfig/ui/thesaurus \ diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx index 36a5b3447a71..cd0f7756e182 100644 --- a/cui/source/dialogs/hyphen.cxx +++ b/cui/source/dialogs/hyphen.cxx @@ -18,7 +18,6 @@ */ #include "hyphen.hxx" -#include "hyphen.hrc" #include "cuires.hrc" #include "dialmgr.hxx" @@ -36,12 +35,15 @@ #define CUR_HYPH_POS_CHAR '-' - -HyphenEdit::HyphenEdit( Window* pParent, const ResId& rResId ) : - Edit( pParent, rResId ) +HyphenEdit::HyphenEdit(Window* pParent) + : Edit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK) { } +extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeHyphenEdit(Window *pParent, VclBuilder::stringmap &) +{ + return new HyphenEdit(pParent); +} void HyphenEdit::KeyInput( const KeyEvent& rKEvt ) { @@ -75,12 +77,12 @@ void SvxHyphenWordDialog::EnableLRBtn_Impl() xub_StrLen nLen = aTxt.Len(); xub_StrLen i; - aRightBtn.Disable(); + m_pRightBtn->Disable(); for ( i = nOldPos + 2; i < nLen; ++i ) { if ( aTxt.GetChar( i ) == sal_Unicode( HYPH_POS_CHAR ) ) { - aRightBtn.Enable(); + m_pRightBtn->Enable(); break; } } @@ -88,12 +90,12 @@ void SvxHyphenWordDialog::EnableLRBtn_Impl() DBG_ASSERT(nOldPos < aTxt.Len(), "nOldPos out of range"); if (nOldPos >= aTxt.Len()) nOldPos = aTxt.Len() - 1; - aLeftBtn.Disable(); + m_pLeftBtn->Disable(); for ( i = nOldPos; i-- > 0; ) { if ( aTxt.GetChar( i ) == sal_Unicode( HYPH_POS_CHAR ) ) { - aLeftBtn.Enable(); + m_pLeftBtn->Enable(); break; } } @@ -211,7 +213,7 @@ void SvxHyphenWordDialog::InitControls_Impl() if (xPossHyph.is()) aEditWord = EraseUnusableHyphens_Impl( xPossHyph, nMaxHyphenationPos ); } - aWordEdit.SetText( aEditWord ); + m_pWordEdit->SetText( aEditWord ); nOldPos = aEditWord.Len(); SelLeft(); @@ -277,7 +279,7 @@ void SvxHyphenWordDialog::ContinueHyph_Impl( sal_uInt16 nInsPos ) sal_uInt16 SvxHyphenWordDialog::GetHyphIndex_Impl() { sal_uInt16 nPos = 0; - String aTxt( aWordEdit.GetText() ); + String aTxt( m_pWordEdit->GetText() ); for ( sal_uInt16 i=0 ; i < aTxt.Len(); ++i ) { @@ -305,9 +307,9 @@ void SvxHyphenWordDialog::SelLeft() aTxt.SetChar( i, sal_Unicode( CUR_HYPH_POS_CHAR ) ); nOldPos = i; - aWordEdit.SetText( aTxt ); - aWordEdit.GrabFocus(); - aWordEdit.SetSelection( Selection( i, i + 1 ) ); + m_pWordEdit->SetText( aTxt ); + m_pWordEdit->GrabFocus(); + m_pWordEdit->SetSelection( Selection( i, i + 1 ) ); break; } } @@ -327,9 +329,9 @@ void SvxHyphenWordDialog::SelRight() aTxt.SetChar( i, sal_Unicode( CUR_HYPH_POS_CHAR ) ); nOldPos = i; - aWordEdit.SetText( aTxt ); - aWordEdit.GrabFocus(); - aWordEdit.SetSelection( Selection( i, i + 1 ) ); + m_pWordEdit->SetText( aTxt ); + m_pWordEdit->GrabFocus(); + m_pWordEdit->SetSelection( Selection( i, i + 1 ) ); break; } } @@ -443,7 +445,7 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog, Right_Impl) IMPL_LINK_NOARG(SvxHyphenWordDialog, GetFocusHdl_Impl) { - aWordEdit.SetSelection( Selection( nOldPos, nOldPos + 1 ) ); + m_pWordEdit->SetSelection( Selection( nOldPos, nOldPos + 1 ) ); return 0; } @@ -454,37 +456,32 @@ SvxHyphenWordDialog::SvxHyphenWordDialog( const String &rWord, LanguageType nLang, Window* pParent, uno::Reference< linguistic2::XHyphenator > &xHyphen, - SvxSpellWrapper* pWrapper ) : - - SfxModalDialog( pParent, CUI_RES( RID_SVXDLG_HYPHENATE ) ), - - aWordFT ( this, CUI_RES( FT_WORD ) ), - aWordEdit ( this, CUI_RES( ED_WORD ) ), - aLeftBtn ( this, CUI_RES( BTN_LEFT ) ), - aRightBtn ( this, CUI_RES( BTN_RIGHT ) ), - aOkBtn ( this, CUI_RES( BTN_HYPH_CUT ) ), - aContBtn ( this, CUI_RES( BTN_HYPH_CONTINUE ) ), - aDelBtn ( this, CUI_RES( BTN_HYPH_DELETE ) ), - aFLBottom ( this, CUI_RES( FL_BOTTOM ) ), - aHelpBtn ( this, CUI_RES( BTN_HYPH_HELP ) ), - aHyphAll ( this, CUI_RES( BTN_HYPH_ALL ) ), - aCancelBtn ( this, CUI_RES( BTN_HYPH_CANCEL ) ), - aLabel ( GetText() ), - pHyphWrapper ( NULL ), - xHyphenator ( NULL ), - xPossHyph ( NULL ), - aActWord ( ), - nActLanguage ( LANGUAGE_NONE ), - nMaxHyphenationPos ( 0 ), - nHyphPos ( 0 ), - nOldPos ( 0 ), - nHyphenationPositionsOffset( 0 ), - bBusy ( sal_False ) + SvxSpellWrapper* pWrapper) + : SfxModalDialog(pParent, "HyphenateDialog", "cui/ui/hyphenate.ui") + , pHyphWrapper(NULL) + , xHyphenator(NULL) + , xPossHyph(NULL) + , nActLanguage(LANGUAGE_NONE) + , nMaxHyphenationPos(0) + , nHyphPos(0) + , nOldPos(0) + , nHyphenationPositionsOffset(0) + , bBusy(sal_False) { - aActWord = rWord; - nActLanguage = nLang; - xHyphenator = xHyphen; - pHyphWrapper = pWrapper; + get(m_pWordEdit, "worded"); + get(m_pLeftBtn, "left"); + get(m_pRightBtn, "right"); + get(m_pOkBtn, "ok"); + get(m_pContBtn, "continue"); + get(m_pDelBtn, "delete"); + get(m_pHyphAll, "hyphall"); + get(m_pCloseBtn, "close"); + + aLabel = GetText(); + aActWord = rWord; + nActLanguage = nLang; + xHyphenator = xHyphen; + pHyphWrapper = pWrapper; uno::Reference< linguistic2::XHyphenatedWord > xHyphWord( pHyphWrapper ? pHyphWrapper->GetLast() : NULL, uno::UNO_QUERY ); @@ -497,18 +494,16 @@ SvxHyphenWordDialog::SvxHyphenWordDialog( } InitControls_Impl(); - aWordEdit.GrabFocus(); + m_pWordEdit->GrabFocus(); - aLeftBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog, Left_Impl ) ); - aRightBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog, Right_Impl ) ); - aOkBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog, CutHdl_Impl ) ); - aContBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog, ContinueHdl_Impl ) ); - aDelBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog, DeleteHdl_Impl ) ); - aHyphAll.SetClickHdl( LINK( this, SvxHyphenWordDialog, HyphenateAllHdl_Impl ) ); - aCancelBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog, CancelHdl_Impl ) ); - aWordEdit.SetGetFocusHdl( LINK( this, SvxHyphenWordDialog, GetFocusHdl_Impl ) ); - - FreeResource(); + m_pLeftBtn->SetClickHdl( LINK( this, SvxHyphenWordDialog, Left_Impl ) ); + m_pRightBtn->SetClickHdl( LINK( this, SvxHyphenWordDialog, Right_Impl ) ); + m_pOkBtn->SetClickHdl( LINK( this, SvxHyphenWordDialog, CutHdl_Impl ) ); + m_pContBtn->SetClickHdl( LINK( this, SvxHyphenWordDialog, ContinueHdl_Impl ) ); + m_pDelBtn->SetClickHdl( LINK( this, SvxHyphenWordDialog, DeleteHdl_Impl ) ); + m_pHyphAll->SetClickHdl( LINK( this, SvxHyphenWordDialog, HyphenateAllHdl_Impl ) ); + m_pCloseBtn->SetClickHdl( LINK( this, SvxHyphenWordDialog, CancelHdl_Impl ) ); + m_pWordEdit->SetGetFocusHdl( LINK( this, SvxHyphenWordDialog, GetFocusHdl_Impl ) ); SetWindowTitle( nLang ); diff --git a/cui/source/dialogs/hyphen.hrc b/cui/source/dialogs/hyphen.hrc deleted file mode 100644 index 1c6e376edb3f..000000000000 --- a/cui/source/dialogs/hyphen.hrc +++ /dev/null @@ -1,37 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef _SVX_HYPHEN_HRC -#define _SVX_HYPHEN_HRC - -// defines ------------------------------------------------------------------ - -#define ED_WORD 10 -#define BTN_LEFT 11 -#define BTN_RIGHT 12 -#define FT_WORD 13 -#define FL_BOTTOM 14 - -#define BTN_HYPH_CONTINUE 20 -#define BTN_HYPH_DELETE 21 -#define BTN_HYPH_CUT 22 -#define BTN_HYPH_CANCEL 23 -#define BTN_HYPH_HELP 24 -#define BTN_HYPH_ALL 25 - -#endif - diff --git a/cui/source/dialogs/hyphen.src b/cui/source/dialogs/hyphen.src deleted file mode 100644 index 753bde0577cf..000000000000 --- a/cui/source/dialogs/hyphen.src +++ /dev/null @@ -1,119 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "helpid.hrc" -#include "cuires.hrc" -#include "hyphen.hrc" - -String RID_SVXSTR_HMERR_CHECKINSTALL -{ - Text [ en-US ] = "is not available for spellchecking\nPlease check your installation and install the desired language\n" ; -}; - - // RID_SVXDLG_HYPHENATE -------------------------------------------------- -ModalDialog RID_SVXDLG_HYPHENATE -{ - HelpId = HID_HYPHENATE ; - Size = MAP_APPFONT ( 200 , 111 ) ; - OutputSize = TRUE ; - SvLook = TRUE ; - Text [ en-US ] = "Hyphenation" ; - Moveable = TRUE ; - - FixedText FT_WORD - { - Pos = MAP_APPFONT ( 5 , 5 ) ; - Size = MAP_APPFONT ( 120 , 8 ) ; - Text [ en-US ] = "~Word" ; - }; - Edit ED_WORD - { - HelpID = "cui:Edit:RID_SVXDLG_HYPHENATE:ED_WORD"; - BORDER = TRUE ; - Pos = MAP_APPFONT ( 5 , 17 ) ; - Size = MAP_APPFONT ( 132 , 12 ) ; - TABSTOP = TRUE ; - LEFT = TRUE ; - }; - ImageButton BTN_LEFT - { - HelpID = "cui:ImageButton:RID_SVXDLG_HYPHENATE:BTN_LEFT"; - Pos = MAP_APPFONT ( 56 , 33 ) ; - Size = MAP_APPFONT ( 14 , 14 ) ; - TABSTOP = TRUE ; - SYMBOL = IMAGEBUTTON_ARROW_LEFT ; - }; - ImageButton BTN_RIGHT - { - HelpID = "cui:ImageButton:RID_SVXDLG_HYPHENATE:BTN_RIGHT"; - Pos = MAP_APPFONT ( 75 , 33 ) ; - Size = MAP_APPFONT ( 14 , 14 ) ; - TABSTOP = TRUE ; - Symbol = IMAGEBUTTON_ARROW_RIGHT ; - }; - OKButton BTN_HYPH_CUT - { - Pos = MAP_APPFONT ( 144 , 17 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - Text [ en-US ] = "H~yphenate" ; - TABSTOP = TRUE ; - DEFBUTTON = TRUE ; - }; - PushButton BTN_HYPH_CONTINUE - { - HelpID = "cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_CONTINUE"; - Pos = MAP_APPFONT ( 144 , 35 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - Text [ en-US ] = "~Skip" ; - TABSTOP = TRUE ; - }; - PushButton BTN_HYPH_DELETE - { - HelpID = "cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_DELETE"; - Pos = MAP_APPFONT ( 144 , 52 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - Text [ en-US ] = "~Remove" ; - TABSTOP = TRUE ; - }; - FixedLine FL_BOTTOM - { - Pos = MAP_APPFONT ( 0 , 81 ) ; - Size = MAP_APPFONT ( 200 , 8 ) ; - }; - HelpButton BTN_HYPH_HELP - { - Pos = MAP_APPFONT ( 5 , 93 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TABSTOP = TRUE ; - }; - PushButton BTN_HYPH_ALL - { - HelpID = "cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_ALL"; - Pos = MAP_APPFONT ( 63 , 93 ) ; - Size = MAP_APPFONT ( 74 , 14 ) ; - Text [ en-US ] = "Hyphenate ~All" ; - TABSTOP = TRUE ; - }; - CancelButton BTN_HYPH_CANCEL - { - Pos = MAP_APPFONT ( 144 , 93 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - Text [ en-US ] = "~Close"; - TABSTOP = TRUE ; - }; -}; diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index 24cd46857910..0345486fdb29 100644 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -201,8 +201,6 @@ #define RID_SVX_WND_COMMON_LINGU ( RID_SVX_START + 0 ) #define RID_SVX_GRFFILTER_DLG_EMBOSS_TAB (RID_SVX_START + 337) #define RID_SVXDLG_SEARCHATTR (RID_SVX_START + 22) -#define RID_SVXDLG_HYPHENATE (RID_SVX_START + 30) -#define RID_SVXSTR_HMERR_CHECKINSTALL (RID_SVX_START + 94) // hyperlink dialog #define RID_SVXDLG_NEWHYPERLINK (RID_SVX_START + 227) diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc index a21f9704e7fa..38ed2206142a 100644 --- a/cui/source/inc/helpid.hrc +++ b/cui/source/inc/helpid.hrc @@ -342,7 +342,6 @@ #define HID_PAGE_TEXTATTR "CUI_HID_PAGE_TEXTATTR" #define HID_TEXTATTR_CTL_POSITION "CUI_HID_TEXTATTR_CTL_POSITION" #define HID_TRANS_POSITION_SIZE "CUI_HID_TRANS_POSITION_SIZE" -#define HID_HYPHENATE "CUI_HID_HYPHENATE" #define HID_SVXPAGE_CHAR_NAME "CUI_HID_SVXPAGE_CHAR_NAME" #define HID_HYPERLINK_INTERNET "CUI_HID_HYPERLINK_INTERNET" #define HID_HYPERLINK_MAIL "CUI_HID_HYPERLINK_MAIL" diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx index 53096571a2fd..73c95b3f5ae1 100644 --- a/cui/source/inc/hyphen.hxx +++ b/cui/source/inc/hyphen.hxx @@ -36,27 +36,22 @@ class SvxSpellWrapper; class HyphenEdit : public Edit { public: - HyphenEdit( Window* pParent, const ResId& rResId ); + HyphenEdit(Window* pParent); protected: - virtual void KeyInput( const KeyEvent &rKEvt ); + virtual void KeyInput(const KeyEvent &rKEvt); }; -// class SvxHyphenWordDialog --------------------------------------------- - class SvxHyphenWordDialog : public SfxModalDialog { - FixedText aWordFT; - HyphenEdit aWordEdit; - ImageButton aLeftBtn; - ImageButton aRightBtn; - OKButton aOkBtn; - PushButton aContBtn; - PushButton aDelBtn; - FixedLine aFLBottom; - HelpButton aHelpBtn; - PushButton aHyphAll; - CancelButton aCancelBtn; + HyphenEdit* m_pWordEdit; + PushButton* m_pLeftBtn; + PushButton* m_pRightBtn; + PushButton* m_pOkBtn; + PushButton* m_pContBtn; + PushButton* m_pDelBtn; + PushButton* m_pHyphAll; + PushButton* m_pCloseBtn; String aLabel; SvxSpellWrapper* pHyphWrapper; uno::Reference< linguistic2::XHyphenator > xHyphenator; diff --git a/cui/uiconfig/ui/hyphenate.ui b/cui/uiconfig/ui/hyphenate.ui new file mode 100644 index 000000000000..15e0f867dfb8 --- /dev/null +++ b/cui/uiconfig/ui/hyphenate.ui @@ -0,0 +1,210 @@ + + + + + False + 5 + Hyphenation + dialog + + + False + vertical + 2 + + + False + end + + + gtk-help + True + True + True + True + + + False + True + 0 + + + + + Hyphenate All + True + True + True + + + False + True + 1 + + + + + gtk-close + True + True + True + True + + + False + True + 2 + + + + + False + True + end + 0 + + + + + True + False + 18 + True + 6 + 6 + + + True + False + 0 + Word + + + 0 + 0 + 2 + 1 + + + + + True + True + True + + + 0 + 1 + 2 + 1 + + + + + Hyphenate + True + True + True + True + + + 2 + 1 + 1 + 1 + + + + + Skip + True + True + True + + + 2 + 2 + 1 + 1 + + + + + gtk-remove + True + True + True + True + + + 2 + 3 + 1 + 1 + + + + + True + True + True + end + image1 + + + 0 + 2 + 1 + 1 + + + + + True + True + True + start + image2 + + + 1 + 2 + 1 + 1 + + + + + + + + + + + + + + False + True + 1 + + + + + + button1 + hyphall + close + + + + True + False + gtk-go-back + + + True + False + gtk-go-forward + + From a65f48f375d218b592ba7c17752f9ca86e14bd65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 4 Oct 2012 23:49:03 +0100 Subject: [PATCH 355/863] I can't see why the hyphenate cmds have toggle entries because the dialogs are modal ones so no different than most commands. (Probably cut and paste and few notice using themes where empty toggles have no frame and are indistinguisable from non-toggle) Change-Id: If82b59e7cebb71bc834a48970283b2cf68e5fdf9 --- sc/sdi/scalc.sdi | 2 +- sd/sdi/sdraw.sdi | 2 +- sw/sdi/swriter.sdi | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi index f9d70578e9bf..0350d7dc96cf 100644 --- a/sc/sdi/scalc.sdi +++ b/sc/sdi/scalc.sdi @@ -3389,7 +3389,7 @@ SfxVoidItem Hyphenate SID_ENABLE_HYPHENATION HasCoreId = FALSE, HasDialog = TRUE, ReadOnlyDoc = FALSE, - Toggle = TRUE, + Toggle = FALSE, Container = FALSE, RecordAbsolute = FALSE, RecordPerSet; diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi index 0183a5470826..277565917a97 100644 --- a/sd/sdi/sdraw.sdi +++ b/sd/sdi/sdraw.sdi @@ -3260,7 +3260,7 @@ SfxBoolItem Hyphenation SID_HYPHENATION HasCoreId = FALSE, HasDialog = FALSE, ReadOnlyDoc = FALSE, - Toggle = TRUE, + Toggle = FALSE, Container = FALSE, RecordAbsolute = FALSE, RecordPerSet; diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi index 28e023395870..8fb9339ae1b6 100644 --- a/sw/sdi/swriter.sdi +++ b/sw/sdi/swriter.sdi @@ -3528,7 +3528,7 @@ SfxVoidItem Hyphenate FN_HYPHENATE_OPT_DLG HasCoreId = FALSE, HasDialog = TRUE, ReadOnlyDoc = FALSE, - Toggle = TRUE, + Toggle = FALSE, Container = FALSE, RecordAbsolute = FALSE, RecordPerSet; From 06e3724d1c166e6715455555788f5b11c310d60a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Fri, 5 Oct 2012 12:18:07 +0100 Subject: [PATCH 356/863] convert password dialog to .ui Change-Id: Ib2e9c5a72239fc0fa3a54ac3717d90fe1b779d63 --- sfx2/AllLangResTarget_sfx2.mk | 1 - sfx2/Module_sfx2.mk | 1 + sfx2/UI_sfx.mk | 16 ++ sfx2/inc/sfx2/passwd.hxx | 89 +++++---- sfx2/inc/sfx2/sfx.hrc | 6 +- sfx2/source/appl/sfx.src | 14 ++ sfx2/source/dialog/dialog.hrc | 1 - sfx2/source/dialog/passwd.cxx | 259 +++++++------------------- sfx2/source/dialog/passwd.hrc | 47 ----- sfx2/source/dialog/passwd.src | 144 --------------- sfx2/source/inc/helpid.hrc | 1 - sfx2/uiconfig/ui/password.ui | 329 ++++++++++++++++++++++++++++++++++ 12 files changed, 487 insertions(+), 421 deletions(-) create mode 100644 sfx2/UI_sfx.mk delete mode 100644 sfx2/source/dialog/passwd.hrc delete mode 100644 sfx2/source/dialog/passwd.src create mode 100644 sfx2/uiconfig/ui/password.ui diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk index 0d16f680e95c..e10645505b33 100644 --- a/sfx2/AllLangResTarget_sfx2.mk +++ b/sfx2/AllLangResTarget_sfx2.mk @@ -58,7 +58,6 @@ $(eval $(call gb_SrsTarget_add_files,sfx/res,\ sfx2/source/dialog/mailwindow.src \ sfx2/source/dialog/mgetempl.src \ sfx2/source/dialog/newstyle.src \ - sfx2/source/dialog/passwd.src \ sfx2/source/dialog/printopt.src \ sfx2/source/dialog/recfloat.src \ sfx2/source/dialog/securitypage.src \ diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk index 1e316eb9a6e1..993ee47d3cf7 100644 --- a/sfx2/Module_sfx2.mk +++ b/sfx2/Module_sfx2.mk @@ -24,6 +24,7 @@ $(eval $(call gb_Module_add_targets,sfx2,\ Library_sfx \ Package_inc \ Package_sdi \ + UI_sfx \ )) $(eval $(call gb_Module_add_check_targets,sfx2,\ diff --git a/sfx2/UI_sfx.mk b/sfx2/UI_sfx.mk new file mode 100644 index 000000000000..a084da170522 --- /dev/null +++ b/sfx2/UI_sfx.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_UI_UI,sfx)) + +$(eval $(call gb_UI_add_uifiles,sfx,\ + sfx2/uiconfig/ui/password \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/sfx2/inc/sfx2/passwd.hxx b/sfx2/inc/sfx2/passwd.hxx index 2e07153973c1..d4fd5ee884f3 100644 --- a/sfx2/inc/sfx2/passwd.hxx +++ b/sfx2/inc/sfx2/passwd.hxx @@ -34,6 +34,7 @@ #include #include #include +#include #include // defines --------------------------------------------------------------- @@ -50,23 +51,23 @@ class SFX2_DLLPUBLIC SfxPasswordDialog : public ModalDialog { private: - FixedLine maPasswordBox; - FixedText maUserFT; - Edit maUserED; - FixedText maPasswordFT; - Edit maPasswordED; - FixedText maConfirmFT; - Edit maConfirmED; - FixedText maMinLengthFT; - FixedLine maPassword2Box; - FixedText maPassword2FT; - Edit maPassword2ED; - FixedText maConfirm2FT; - Edit maConfirm2ED; + VclFrame* mpPassword1Box; + FixedText* mpUserFT; + Edit* mpUserED; + FixedText* mpPassword1FT; + Edit* mpPassword1ED; + FixedText* mpConfirm1FT; + Edit* mpConfirm1ED; - OKButton maOKBtn; - CancelButton maCancelBtn; - HelpButton maHelpBtn; + VclFrame* mpPassword2Box; + FixedText* mpPassword2FT; + Edit* mpPassword2ED; + FixedText* mpConfirm2FT; + Edit* mpConfirm2ED; + + FixedText* mpMinLengthFT; + + OKButton* mpOKBtn; String maConfirmStr; String maMinLenPwdStr; @@ -76,28 +77,52 @@ private: sal_uInt16 mnExtras; bool mbAsciiOnly; - DECL_DLLPRIVATE_LINK( EditModifyHdl, Edit* ); + DECL_DLLPRIVATE_LINK(EditModifyHdl, Edit*); DECL_DLLPRIVATE_LINK(OKHdl, void *); void SetPasswdText(); public: - SfxPasswordDialog( Window* pParent, const String* pGroupText = NULL ); + SfxPasswordDialog(Window* pParent, const String* pGroupText = NULL); - String GetUser() const { return maUserED.GetText(); } - String GetPassword() const { return maPasswordED.GetText(); } - String GetConfirm() const { return maConfirmED.GetText(); } - - String GetPassword2() const { return maPassword2ED.GetText(); } - String GetConfirm2() const { return maConfirm2ED.GetText(); } - void SetGroup2Text( const String& i_rText ) { maPassword2Box.SetText( i_rText ); } - - void SetMinLen( sal_uInt16 Len ); - void SetEditHelpId( const rtl::OString& rId ) { maPasswordED.SetHelpId( rId ); } - void ShowExtras( sal_uInt16 nExtras ) { mnExtras = nExtras; } - void AllowAsciiOnly( bool i_bAsciiOnly = true ) { mbAsciiOnly = i_bAsciiOnly; } - - virtual short Execute(); + String GetUser() const + { + return mpUserED->GetText(); + } + String GetPassword() const + { + return mpPassword1ED->GetText(); + } + String GetConfirm() const + { + return mpConfirm1ED->GetText(); + } + String GetPassword2() const + { + return mpPassword2ED->GetText(); + } + String GetConfirm2() const + { + return mpConfirm2ED->GetText(); + } + void SetGroup2Text(const String& i_rText) + { + mpPassword2Box->set_label(i_rText); + } + void SetMinLen(sal_uInt16 Len); + void SetEditHelpId(const OString& rId) + { + mpPassword1ED->SetHelpId( rId ); + } + void ShowExtras(sal_uInt16 nExtras) + { + mnExtras = nExtras; + } + void AllowAsciiOnly(bool i_bAsciiOnly = true) + { + mbAsciiOnly = i_bAsciiOnly; + } + virtual short Execute(); }; #endif // #ifndef _SFX_PASSWD_HXX diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc index c215a18aae91..7971b85ed241 100644 --- a/sfx2/inc/sfx2/sfx.hrc +++ b/sfx2/inc/sfx2/sfx.hrc @@ -155,7 +155,7 @@ #define STR_STANDARD (RID_SFX_START+104) #define STR_READONLY (RID_SFX_START+105) -#define STR_SFX_FILTERNAME_ALL (RID_SFX_START+106) +#define STR_SFX_FILTERNAME_ALL (RID_SFX_START+106) #define STR_EDIT (RID_SFX_START+108) #define STR_QUERY_SAVE_DOCUMENT (RID_SFX_START+110) #define STR_BYTES (RID_SFX_START+111) @@ -166,10 +166,12 @@ #define STR_STANDARD_SHORTCUT (RID_SFX_START+117) #define STR_REPAIREDDOCUMENT (RID_SFX_START+118) - #define STR_ERRUNOEVENTBINDUNG (RID_SFX_START+119) #define STR_SHARED (RID_SFX_START+120) #define RID_XMLSEC_DOCUMENTSIGNED (RID_SFX_START+121) +#define STR_PASSWD (RID_SFX_START+122) +#define STR_PASSWD_EMPTY (RID_SFX_START+123) +#define STR_PASSWD_MIN_LEN (RID_SFX_START+124) #define STR_ACCTITLE_PRODUCTIVITYTOOLS (RID_SFX_START+157) //========================================================================= diff --git a/sfx2/source/appl/sfx.src b/sfx2/source/appl/sfx.src index 0b5c765319a6..1103841a3000 100644 --- a/sfx2/source/appl/sfx.src +++ b/sfx2/source/appl/sfx.src @@ -23,3 +23,17 @@ String STR_ACCTITLE_PRODUCTIVITYTOOLS Text [ en-US ] = "%PRODUCTNAME"; }; +String STR_PASSWD_MIN_LEN +{ + Text [ en-US ] = "(Minimum $(MINLEN) characters)" ; +}; + +String STR_PASSWD_EMPTY +{ + Text [ en-US ] = "(The password can be empty)" ; +}; + +String STR_PASSWD +{ + Text [ en-US ] = "Password" ; +}; diff --git a/sfx2/source/dialog/dialog.hrc b/sfx2/source/dialog/dialog.hrc index 27a9eab17f84..e27579d17cb2 100644 --- a/sfx2/source/dialog/dialog.hrc +++ b/sfx2/source/dialog/dialog.hrc @@ -32,7 +32,6 @@ #define RID_DLG_ALIEN_WARNING ( RC_DIALOG_BEGIN + 0) #define STR_RESET ( RC_DIALOG_BEGIN + 0) -#define DLG_PASSWD ( RC_DIALOG_BEGIN + 8) #define STR_TABPAGE_MANAGESTYLES ( RC_DIALOG_BEGIN + 12) #define MSG_TABPAGE_INVALIDNAME ( RC_DIALOG_BEGIN + 13) #define MSG_TABPAGE_INVALIDSTYLE ( RC_DIALOG_BEGIN + 14) diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx index ae48a4880212..77dc3524b0e0 100644 --- a/sfx2/source/dialog/passwd.cxx +++ b/sfx2/source/dialog/passwd.cxx @@ -35,20 +35,17 @@ #include "sfx2/sfxresid.hxx" #include "dialog.hrc" -#include "passwd.hrc" - -#include "vcl/arrange.hxx" // ----------------------------------------------------------------------- IMPL_LINK_INLINE_START( SfxPasswordDialog, EditModifyHdl, Edit *, pEdit ) { - if( mbAsciiOnly && (pEdit == &maPasswordED || pEdit == &maPassword2ED) ) + if (mbAsciiOnly && (pEdit == mpPassword1ED || pEdit == mpPassword2ED)) { - rtl::OUString aTest( pEdit->GetText() ); + OUString aTest( pEdit->GetText() ); const sal_Unicode* pTest = aTest.getStr(); sal_Int32 nLen = aTest.getLength(); - rtl::OUStringBuffer aFilter( nLen ); + OUStringBuffer aFilter( nLen ); bool bReset = false; for( sal_Int32 i = 0; i < nLen; i++ ) { @@ -65,10 +62,10 @@ IMPL_LINK_INLINE_START( SfxPasswordDialog, EditModifyHdl, Edit *, pEdit ) } } - bool bEnable = maPasswordED.GetText().Len() >= mnMinLen; - if( maPassword2ED.IsVisible() ) - bEnable = (bEnable && (maPassword2ED.GetText().Len() >= mnMinLen)); - maOKBtn.Enable( bEnable ); + bool bEnable = mpPassword1ED->GetText().Len() >= mnMinLen; + if( mpPassword2ED->IsVisible() ) + bEnable = (bEnable && (mpPassword2ED->GetText().Len() >= mnMinLen)); + mpOKBtn->Enable( bEnable ); return 0; } IMPL_LINK_INLINE_END(SfxPasswordDialog, EditModifyHdl, Edit *, pEdit) @@ -85,8 +82,8 @@ IMPL_LINK_NOARG(SfxPasswordDialog, OKHdl) { ErrorBox aBox( this, SfxResId( MSG_ERROR_WRONG_CONFIRM ) ); aBox.Execute(); - maConfirmED.SetText( String() ); - maConfirmED.GrabFocus(); + mpConfirm1ED->SetText( String() ); + mpConfirm1ED->GrabFocus(); } else EndDialog( RET_OK ); @@ -95,103 +92,44 @@ IMPL_LINK_NOARG(SfxPasswordDialog, OKHdl) // CTOR / DTOR ----------------------------------------------------------- -SfxPasswordDialog::SfxPasswordDialog( Window* pParent, const String* pGroupText ) : - - ModalDialog( pParent, SfxResId ( DLG_PASSWD ) ), - - maPasswordBox ( this, SfxResId( GB_PASSWD_PASSWORD ) ), - maUserFT ( this, SfxResId( FT_PASSWD_USER ) ), - maUserED ( this, SfxResId( ED_PASSWD_USER ) ), - maPasswordFT ( this, SfxResId( FT_PASSWD_PASSWORD ) ), - maPasswordED ( this, SfxResId( ED_PASSWD_PASSWORD ) ), - maConfirmFT ( this, SfxResId( FT_PASSWD_CONFIRM ) ), - maConfirmED ( this, SfxResId( ED_PASSWD_CONFIRM ) ), - - maMinLengthFT ( this, SfxResId( FT_PASSWD_MINLEN ) ), - maPassword2Box ( this, 0 ), - maPassword2FT ( this, SfxResId( FT_PASSWD_PASSWORD2 ) ), - maPassword2ED ( this, SfxResId( ED_PASSWD_PASSWORD2 ) ), - maConfirm2FT ( this, SfxResId( FT_PASSWD_CONFIRM2 ) ), - maConfirm2ED ( this, SfxResId( ED_PASSWD_CONFIRM2 ) ), - maOKBtn ( this, SfxResId( BTN_PASSWD_OK ) ), - maCancelBtn ( this, SfxResId( BTN_PASSWD_CANCEL ) ), - maHelpBtn ( this, SfxResId( BTN_PASSWD_HELP ) ), - - maMinLenPwdStr ( SfxResId( STR_PASSWD_MIN_LEN ).toString() ), - maEmptyPwdStr ( SfxResId( STR_PASSWD_EMPTY ).toString() ), - maMainPwdStr ( ), - mnMinLen ( 5 ), - mnExtras ( 0 ), - mbAsciiOnly ( false ) - +SfxPasswordDialog::SfxPasswordDialog(Window* pParent, const String* pGroupText) + : ModalDialog(pParent, "PasswordDialog", "sfx/ui/password.ui") + , maMinLenPwdStr(SFX2_RESSTR(STR_PASSWD_MIN_LEN)) + , maEmptyPwdStr(SFX2_RESSTR(STR_PASSWD_EMPTY)) + , mnMinLen(5) + , mnExtras(0) + , mbAsciiOnly(false) { - maPasswordED.SetAccessibleName(SfxResId(TEXT_PASSWD).toString()); - FreeResource(); + get(mpPassword1Box, "password1frame"); + get(mpUserFT, "userft"); + get(mpUserED, "usered"); + get(mpPassword1FT, "pass1ft"); + get(mpPassword1ED, "pass1ed"); + get(mpConfirm1FT, "confirm1ft"); + get(mpConfirm1ED, "confirm1ed"); - // setup layout - boost::shared_ptr xLayout = - boost::dynamic_pointer_cast( getLayout() ); - xLayout->setOuterBorder( 0 ); + get(mpPassword2Box, "password2frame"); + get(mpPassword2FT, "pass2ft"); + get(mpPassword2ED, "pass2ed"); + get(mpConfirm2FT, "confirm2ft"); + get(mpConfirm2ED, "confirm2ed"); - // get edit size, should be used as minimum - Size aEditSize( maUserED.GetSizePixel() ); + get(mpMinLengthFT, "minlenft"); - // add labelcolumn for the labeled edit fields - boost::shared_ptr xEdits( new vcl::LabelColumn( xLayout.get() ) ); - size_t nChildIndex = xLayout->addChild( xEdits ); - xLayout->setBorders( nChildIndex, -2, -2, -2, 0 ); + get(mpOKBtn, "ok"); - // add group box - xEdits->addWindow( &maPasswordBox ); - - // add user line - xEdits->addRow( &maUserFT, &maUserED, -2, aEditSize ); - - // add password line - xEdits->addRow( &maPasswordFT, &maPasswordED, -2, aEditSize ); - - // add confirm line - xEdits->addRow( &maConfirmFT, &maConfirmED, -2, aEditSize ); - - // add second group box - xEdits->addWindow( &maPassword2Box ); - - // add second password line - xEdits->addRow( &maPassword2FT, &maPassword2ED, -2, aEditSize ); - - // add second confirm line - xEdits->addRow( &maConfirm2FT, &maConfirm2ED, -2, aEditSize ); - - // add password length warning line - xEdits->addWindow( &maMinLengthFT ); - - // add a FixedLine - FixedLine* pLine = new FixedLine( this, 0 ); - pLine->Show(); - addWindow( pLine, true ); - xLayout->addWindow( pLine ); - - // add button column - Size aBtnSize( maCancelBtn.GetSizePixel() ); - boost::shared_ptr xButtons( new vcl::RowOrColumn( xLayout.get(), false ) ); - nChildIndex = xLayout->addChild( xButtons ); - xLayout->setBorders( nChildIndex, -2, 0, -2, -2 ); - - xButtons->addWindow( &maHelpBtn, 0, aBtnSize ); - xButtons->addChild( new vcl::Spacer( xButtons.get() ) ); - xButtons->addWindow( &maOKBtn, 0, aBtnSize ); - xButtons->addWindow( &maCancelBtn, 0, aBtnSize ); + mpPassword1ED->SetAccessibleName(SFX2_RESSTR(STR_PASSWD)); Link aLink = LINK( this, SfxPasswordDialog, EditModifyHdl ); - maPasswordED.SetModifyHdl( aLink ); - maPassword2ED.SetModifyHdl( aLink ); + mpPassword1ED->SetModifyHdl( aLink ); + mpPassword2ED->SetModifyHdl( aLink ); aLink = LINK( this, SfxPasswordDialog, OKHdl ); - maOKBtn.SetClickHdl( aLink ); + mpOKBtn->SetClickHdl( aLink ); - if ( pGroupText ) - maPasswordBox.SetText( *pGroupText ); + if (pGroupText) + mpPassword1Box->set_label(*pGroupText); -//set the text to the pasword length + //set the text to the pasword length SetPasswdText(); } @@ -201,13 +139,12 @@ void SfxPasswordDialog::SetPasswdText( ) { //set the new string to the minimum password length if( mnMinLen == 0 ) - maMinLengthFT.SetText( maEmptyPwdStr ); + mpMinLengthFT->SetText(maEmptyPwdStr); else { maMainPwdStr = maMinLenPwdStr; - maMainPwdStr.SearchAndReplace( rtl::OUString("$(MINLEN)"), String::CreateFromInt32((sal_Int32) mnMinLen ), 0); - maMinLengthFT.SetText( maMainPwdStr ); - maMinLengthFT.Show(); + maMainPwdStr.SearchAndReplace( OUString("$(MINLEN)"), String::CreateFromInt32((sal_Int32) mnMinLen ), 0); + mpMinLengthFT->SetText(maMainPwdStr); } } @@ -224,106 +161,42 @@ void SfxPasswordDialog::SetMinLen( sal_uInt16 nLen ) short SfxPasswordDialog::Execute() { - maUserFT.Hide(); - maUserED.Hide(); - maConfirmFT.Hide(); - maConfirmED.Hide(); - maPasswordFT.Hide(); - maPassword2Box.Hide(); - maPassword2FT.Hide(); - maPassword2ED.Hide(); - maPassword2FT.Hide(); - maConfirm2FT.Hide(); - maConfirm2ED.Hide(); + mpUserFT->Hide(); + mpUserED->Hide(); + mpConfirm1FT->Hide(); + mpConfirm1ED->Hide(); + mpPassword1FT->Hide(); + mpPassword2Box->Hide(); + mpPassword2FT->Hide(); + mpPassword2ED->Hide(); + mpPassword2FT->Hide(); + mpConfirm2FT->Hide(); + mpConfirm2ED->Hide(); - if( mnExtras != SHOWEXTRAS_NONE ) - maPasswordFT.Show(); - if( (mnExtras & SHOWEXTRAS_USER ) ) + if (mnExtras != SHOWEXTRAS_NONE) + mpPassword1FT->Show(); + if (mnExtras & SHOWEXTRAS_USER) { - //TODO: Inevitably this layout logic will be wrong post merge until we can see the dialog to test it. - Size a3Size = LogicToPixel( Size( 3, 3 ), MAP_APPFONT ); - Size a6Size = LogicToPixel( Size( 6, 6 ), MAP_APPFONT ); - long nMinHeight = maHelpBtn.GetPosPixel().Y() + - maHelpBtn.GetSizePixel().Height() + a6Size.Height(); - sal_uInt16 nRowHided = 1; - - if ( SHOWEXTRAS_NONE == mnExtras ) - { - maUserFT.Hide(); - maUserED.Hide(); - maConfirmFT.Hide(); - maConfirmED.Hide(); - maPasswordFT.Hide(); - - Point aPos = maUserFT.GetPosPixel(); - long nEnd = maUserED.GetPosPixel().X() + maUserED.GetSizePixel().Width(); - maPasswordED.SetPosPixel( aPos ); - Size aSize = maPasswordED.GetSizePixel(); - aSize.Width() = nEnd - aPos.X(); - maPasswordED.SetSizePixel( aSize ); - - nRowHided = 2; - } - else if ( SHOWEXTRAS_USER == mnExtras ) - { - maConfirmFT.Hide(); - maConfirmED.Hide(); - } - else if ( SHOWEXTRAS_CONFIRM == mnExtras ) - { - maUserFT.Hide(); - maUserED.Hide(); - - Point aPwdPos1 = maPasswordFT.GetPosPixel(); - Point aPwdPos2 = maPasswordED.GetPosPixel(); - - Point aPos = maUserFT.GetPosPixel(); - maPasswordFT.SetPosPixel( aPos ); - aPos = maUserED.GetPosPixel(); - maPasswordED.SetPosPixel( aPos ); - - aPos = maConfirmFT.GetPosPixel(); - maConfirmFT.SetPosPixel( aPwdPos1 ); - maConfirmED.SetPosPixel( aPwdPos2 ); - maMinLengthFT.SetPosPixel(aPos); - } - - Size aBoxSize = maPasswordBox.GetSizePixel(); - aBoxSize.Height() -= ( nRowHided * maUserED.GetSizePixel().Height() ); - aBoxSize.Height() -= ( nRowHided * a3Size.Height() ); - maPasswordBox.SetSizePixel( aBoxSize ); - - long nDlgHeight = maPasswordBox.GetPosPixel().Y() + aBoxSize.Height() + a6Size.Height(); - if ( nDlgHeight < nMinHeight ) - nDlgHeight = nMinHeight; - Size aDlgSize = GetOutputSizePixel(); - aDlgSize.Height() = nDlgHeight; - SetOutputSizePixel( aDlgSize ); - - maUserFT.Show(); - maUserED.Show(); + mpUserFT->Show(); + mpUserED->Show(); } - if( (mnExtras & SHOWEXTRAS_CONFIRM ) ) + if (mnExtras & SHOWEXTRAS_CONFIRM) { - maConfirmFT.Show(); - maConfirmED.Show(); + mpConfirm1FT->Show(); + mpConfirm1ED->Show(); } - if( (mnExtras & SHOWEXTRAS_PASSWORD2) ) + if (mnExtras & SHOWEXTRAS_PASSWORD2) { - maPassword2Box.Show(); - maPassword2FT.Show(); - maPassword2ED.Show(); + mpPassword2Box->Show(); + mpPassword2FT->Show(); + mpPassword2ED->Show(); } - if( (mnExtras & SHOWEXTRAS_CONFIRM2 ) ) + if (mnExtras & SHOWEXTRAS_CONFIRM2) { - maConfirm2FT.Show(); - maConfirm2ED.Show(); + mpConfirm2FT->Show(); + mpConfirm2ED->Show(); } - boost::shared_ptr xLayout = - boost::dynamic_pointer_cast( getLayout() ); - SetSizePixel( xLayout->getOptimalSize( WINDOWSIZE_PREFERRED ) ); - return ModalDialog::Execute(); } diff --git a/sfx2/source/dialog/passwd.hrc b/sfx2/source/dialog/passwd.hrc deleted file mode 100644 index cea12b57bf14..000000000000 --- a/sfx2/source/dialog/passwd.hrc +++ /dev/null @@ -1,47 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef _SFX_PASSWD_HRC -#define _SFX_PASSWD_HRC - -// defines --------------------------------------------------------------- - -#define GB_PASSWD_PASSWORD 10 -#define FT_PASSWD_USER 11 -#define ED_PASSWD_USER 12 -#define FT_PASSWD_PASSWORD 13 -#define ED_PASSWD_PASSWORD 14 -#define FT_PASSWD_CONFIRM 15 -#define ED_PASSWD_CONFIRM 16 -#define FT_PASSWD_MINLEN 17 - -#define BTN_PASSWD_OK 20 -#define BTN_PASSWD_CANCEL 21 -#define BTN_PASSWD_HELP 22 - -#define FT_PASSWD_PASSWORD2 25 -#define ED_PASSWD_PASSWORD2 26 -#define FT_PASSWD_CONFIRM2 27 -#define ED_PASSWD_CONFIRM2 28 - -#define STR_PASSWD_MIN_LEN 30 -#define STR_PASSWD_EMPTY 31 - -#define TEXT_PASSWD 32 - -#endif - diff --git a/sfx2/source/dialog/passwd.src b/sfx2/source/dialog/passwd.src deleted file mode 100644 index cc0393f7d9b9..000000000000 --- a/sfx2/source/dialog/passwd.src +++ /dev/null @@ -1,144 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "helpid.hrc" -#include "dialog.hrc" -#include "passwd.hrc" - - // DLG_PASSWD ------------------------------------------------------------ -ModalDialog DLG_PASSWD -{ - HelpId = HID_PASSWD ; - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT( 200, 68 ); - Text [ en-US ] = "Enter Password" ; - Moveable = TRUE ; - FixedText FT_PASSWD_USER - { - Pos = MAP_APPFONT( 12, 15 ); - Size = MAP_APPFONT( 42, 10 ); - Text [ en-US ] = "~User"; - }; - Edit ED_PASSWD_USER - { - HelpID = "sfx2:Edit:DLG_PASSWD:ED_PASSWD_USER"; - Border = TRUE; - Pos = MAP_APPFONT( 57, 14 ); - Size = MAP_APPFONT( 75, 12 ); - }; - FixedText FT_PASSWD_PASSWORD - { - Pos = MAP_APPFONT( 12, 30 ); - Size = MAP_APPFONT( 42, 10 ); - Text [ en-US ] = "~Password"; - }; - Edit ED_PASSWD_PASSWORD - { - HelpID = "sfx2:Edit:DLG_PASSWD:ED_PASSWD_PASSWORD"; - Border = TRUE; - PassWord = TRUE; - Pos = MAP_APPFONT( 57, 29 ); - Size = MAP_APPFONT( 75, 12 ); - }; - FixedText FT_PASSWD_CONFIRM - { - Pos = MAP_APPFONT( 12, 45 ); - Size = MAP_APPFONT( 42, 10 ); - Text [ en-US ] = "~Confirm"; - }; - Edit ED_PASSWD_CONFIRM - { - HelpID = "sfx2:Edit:DLG_PASSWD:ED_PASSWD_CONFIRM"; - Border = TRUE; - PassWord = TRUE; - Pos = MAP_APPFONT( 57, 44 ); - Size = MAP_APPFONT( 75, 12 ); - }; - - String STR_PASSWD_MIN_LEN - { - Text [ en-US ] = "(Minimum $(MINLEN) characters)" ; - }; - String STR_PASSWD_EMPTY - { - Text [ en-US ] = "(The password can be empty)" ; - }; - - FixedText FT_PASSWD_MINLEN - { - Pos = MAP_APPFONT(12, 65 ); - Size = MAP_APPFONT( 126, 10 ); - }; - - FixedLine GB_PASSWD_PASSWORD - { - Pos = MAP_APPFONT( 6, 3 ); - Size = MAP_APPFONT( 132, 8 ); - Text [ en-US ] = "Password" ; - }; - FixedText FT_PASSWD_PASSWORD2 - { - Pos = MAP_APPFONT( 12, 30 ); - Size = MAP_APPFONT( 42, 10 ); - Text [ en-US ] = "P~assword"; - }; - Edit ED_PASSWD_PASSWORD2 - { - Border = TRUE; - PassWord = TRUE; - Pos = MAP_APPFONT( 57, 29 ); - Size = MAP_APPFONT( 75, 12 ); - }; - FixedText FT_PASSWD_CONFIRM2 - { - Pos = MAP_APPFONT( 12, 45 ); - Size = MAP_APPFONT( 42, 10 ); - Text [ en-US ] = "Confir~m"; - }; - Edit ED_PASSWD_CONFIRM2 - { - Border = TRUE; - PassWord = TRUE; - Pos = MAP_APPFONT( 57, 44 ); - Size = MAP_APPFONT( 75, 12 ); - }; - OKButton BTN_PASSWD_OK - { - Disable = TRUE; - Pos = MAP_APPFONT( 144, 6 ); - Size = MAP_APPFONT( 50, 14 ); - DefButton = TRUE; - }; - CancelButton BTN_PASSWD_CANCEL - { - Pos = MAP_APPFONT( 144, 23 ); - Size = MAP_APPFONT( 50, 14 ); - }; - HelpButton BTN_PASSWD_HELP - { - Pos = MAP_APPFONT( 144, 43 ); - Size = MAP_APPFONT( 50, 14 ); - }; - String TEXT_PASSWD - { - Text [ en-US ] = "Password" ; - }; - -}; - diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc index c8c8ea40fbc3..0a1f71ffad1e 100644 --- a/sfx2/source/inc/helpid.hrc +++ b/sfx2/source/inc/helpid.hrc @@ -23,7 +23,6 @@ // Help-Ids ----------------------------------------------------------------- #define HID_DOCINFO_EDT "SFX2_HID_DOCINFO_EDT" -#define HID_PASSWD "SFX2_HID_PASSWD" #define HID_PRINTMONITOR "SFX2_HID_PRINTMONITOR" #define HID_MANAGE_STYLES "SFX2_HID_MANAGE_STYLES" #define HID_CONFIG_EVENT "SFX2_HID_CONFIG_EVENT" diff --git a/sfx2/uiconfig/ui/password.ui b/sfx2/uiconfig/ui/password.ui new file mode 100644 index 000000000000..598535c3b8a7 --- /dev/null +++ b/sfx2/uiconfig/ui/password.ui @@ -0,0 +1,329 @@ + + + + + False + 5 + Enter Password + dialog + + + False + vertical + 2 + + + False + end + + + gtk-help + False + True + True + True + False + True + + + False + True + 0 + + + + + gtk-ok + False + True + False + True + True + True + False + True + + + False + True + 1 + + + + + gtk-cancel + False + True + True + True + False + True + + + False + True + 2 + + + + + False + True + end + 0 + + + + + True + False + vertical + 6 + + + True + False + 0 + none + + + True + False + 12 + + + True + False + 6 + 6 + + + True + False + 0 + User + + + 0 + 0 + 1 + 1 + + + + + True + False + 0 + Password + + + 0 + 1 + 1 + 1 + + + + + True + False + 0 + Confirm + + + 0 + 2 + 1 + 1 + + + + + True + True + True + + + 1 + 0 + 1 + 1 + + + + + True + True + True + False + â— + True + + + 1 + 1 + 1 + 1 + + + + + True + True + True + False + â— + True + + + 1 + 2 + 1 + 1 + + + + + + + + + True + False + Password + True + + + + + False + True + 0 + + + + + True + False + 0 + none + + + True + False + 12 + + + True + False + 6 + 6 + + + True + False + 0 + Password + + + 0 + 0 + 1 + 1 + + + + + True + False + 0 + Confirm + + + 0 + 1 + 1 + 1 + + + + + True + True + True + False + â— + True + + + 1 + 0 + 1 + 1 + + + + + True + True + True + False + â— + True + + + 1 + 1 + 1 + 1 + + + + + + + + + True + False + Second Password + True + + + + + False + True + 1 + + + + + True + False + 0 + 6 + + + False + True + 2 + + + + + False + True + 1 + + + + + + help + ok + cancel + + + From 8f6d8d471d62f412956cb3dad339e5ab9a99dd5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Fri, 5 Oct 2012 14:08:28 +0100 Subject: [PATCH 357/863] sort by grid position, then pack type, then pack position so that focus ends up on the visually first enabled control Change-Id: Ia279c4531536305ce43eb8372abde2445769487d --- vcl/inc/vcl/builder.hxx | 12 ++++++++ vcl/source/window/builder.cxx | 53 ++++++++++++++++++----------------- 2 files changed, 40 insertions(+), 25 deletions(-) diff --git a/vcl/inc/vcl/builder.hxx b/vcl/inc/vcl/builder.hxx index 191079151e21..246f68dd208c 100644 --- a/vcl/inc/vcl/builder.hxx +++ b/vcl/inc/vcl/builder.hxx @@ -121,6 +121,18 @@ private: Window *get_by_name(OString sID); void delete_by_name(OString sID); + + class sortIntoBestTabTraversalOrder + : public std::binary_function + { + VclBuilder *m_pBuilder; + public: + sortIntoBestTabTraversalOrder(VclBuilder *pBuilder) + : m_pBuilder(pBuilder) + { + } + bool operator()(const Window *pA, const Window *pB) const; + }; public: VclBuilder(Window *pParent, OUString sUIRootDir, OUString sUIFile, OString sID = OString()); ~VclBuilder(); diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index e4213202250d..1fdad861112b 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -869,20 +869,32 @@ void VclBuilder::handleTabChild(Window *pParent, xmlreader::XmlReader &reader) pTabControl->RemovePage(pTabControl->GetCurPageId()); } -namespace +//so that tabbing between controls goes in a visually sensible sequence +//we sort these into a best-tab-order sequence +bool VclBuilder::sortIntoBestTabTraversalOrder::operator()(const Window *pA, const Window *pB) const { - bool sortByGridPositions(Window *pA, Window *pB) - { - sal_Int32 nTopA = pA->get_grid_top_attach(); - sal_Int32 nTopB = pB->get_grid_top_attach(); - if (nTopA < nTopB) - return true; - if (nTopA > nTopB) - return false; - sal_Int32 nLeftA = pA->get_grid_left_attach(); - sal_Int32 nLeftB = pB->get_grid_left_attach(); - return nLeftA < nLeftB; - } + //sort child order within parent list by grid position + sal_Int32 nTopA = pA->get_grid_top_attach(); + sal_Int32 nTopB = pB->get_grid_top_attach(); + if (nTopA < nTopB) + return true; + if (nTopA > nTopB) + return false; + sal_Int32 nLeftA = pA->get_grid_left_attach(); + sal_Int32 nLeftB = pB->get_grid_left_attach(); + if (nLeftA < nLeftB) + return true; + if (nLeftA > nLeftB) + return false; + //sort into two groups of pack start and pack end + VclPackType ePackA = pA->get_pack_type(); + VclPackType ePackB = pB->get_pack_type(); + if (ePackA < ePackB) + return true; + if (ePackA > ePackB) + return false; + //honour relative box positions with pack group + return m_pBuilder->get_window_packing_position(pA) < m_pBuilder->get_window_packing_position(pB); } void VclBuilder::handleChild(Window *pParent, xmlreader::XmlReader &reader) @@ -943,20 +955,11 @@ void VclBuilder::handleChild(Window *pParent, xmlreader::XmlReader &reader) aChilds.push_back(pChild); } - //sort child order within parent list by grid position - //so that tabbing between controls goes in a visually sensible sequence - std::stable_sort(aChilds.begin(), aChilds.end(), sortByGridPositions); + //sort child order within parent so that tabbing + //between controls goes in a visually sensible sequence + std::stable_sort(aChilds.begin(), aChilds.end(), sortIntoBestTabTraversalOrder(this)); for (size_t i = 0; i < aChilds.size(); ++i) reorderWithinParent(*aChilds[i], i); - - //honour box positions if there is any - for (size_t i = 0; i < aChilds.size(); ++i) - { - sal_Int32 nPosition = get_window_packing_position(aChilds[i]); - if (nPosition == -1) - continue; - reorderWithinParent(*aChilds[i], nPosition); - } } } } From b8f39c5c411fd4c40016c5aadd398005c2ed1755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= Date: Fri, 5 Oct 2012 13:32:14 +0200 Subject: [PATCH 358/863] Uploading a new shiny libcdr-0.0.9 Change-Id: I5bb93f9228e69dfd46b450089f34cac7204f10b8 --- RepositoryExternal.mk | 7 +- configure.in | 2 +- libcdr/ExternalPackage_libcdr.mk | 9 +++ libcdr/ExternalProject_libcdr.mk | 106 +++++++++++++++++++++++++++++++ libcdr/Module_libcdr.mk | 2 +- libcdr/StaticLibrary_cdr.mk | 46 -------------- 6 files changed, 122 insertions(+), 50 deletions(-) create mode 100644 libcdr/ExternalProject_libcdr.mk delete mode 100644 libcdr/StaticLibrary_cdr.mk diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 78e82b697c1f..d56accc9d82e 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -940,12 +940,15 @@ endef else # !SYSTEM_LIBCDR $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - cdrlib \ + cdr-0.0 \ )) define gb_LinkTarget__use_cdr +$(call gb_LinkTarget_use_package,$(1),\ + libcdr \ +) $(call gb_LinkTarget_use_static_libraries,$(1),\ - cdrlib \ + cdr-0.0 \ ) endef diff --git a/configure.in b/configure.in index c81931c97584..244925e869c7 100644 --- a/configure.in +++ b/configure.in @@ -6791,7 +6791,7 @@ elif test $_os = iOS; then else AC_MSG_RESULT([internal]) SYSTEM_LIBCDR=NO - CDR_TARBALL=ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2 + CDR_TARBALL=3c0037fb07dea2f0bbae8386fa7c6a9a-libcdr-0.0.9.tar.bz2 fi AC_SUBST(SYSTEM_LIBCDR) AC_SUBST(CDR_CFLAGS) diff --git a/libcdr/ExternalPackage_libcdr.mk b/libcdr/ExternalPackage_libcdr.mk index 0a6d15c03849..06e01795c386 100644 --- a/libcdr/ExternalPackage_libcdr.mk +++ b/libcdr/ExternalPackage_libcdr.mk @@ -16,4 +16,13 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,libcdr_inc,inc/external/libc src/lib/CMXDocument.h \ )) +$(eval $(call gb_ExternalPackage_use_external_project,libcdr,libcdr)) + +ifeq ($(OS)$(COM),WNTMSC) +$(eval $(call gb_ExternalPackage_add_file,libcdr,lib/cdr-0.0.lib,build/win32/Release/lib/libcdr-0.0.lib)) +else +$(eval $(call gb_ExternalPackage_add_file,libcdr,lib/libcdr-0.0.a,src/lib/.libs/libcdr-0.0.a)) +endif + + # vim: set noet sw=4 ts=4: diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk new file mode 100644 index 000000000000..de48baed3a8f --- /dev/null +++ b/libcdr/ExternalProject_libcdr.mk @@ -0,0 +1,106 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_ExternalProject_ExternalProject,libcdr)) + +$(eval $(call gb_ExternalProject_use_unpacked,libcdr,cdr)) + +$(eval $(call gb_ExternalProject_register_targets,libcdr,\ + build \ +)) + +$(eval $(call gb_ExternalProject_use_externals,cdrlib,\ + lcms2 \ + wpd \ + wpg \ + zlib \ +)) + +ifeq ($(OS)$(COM),WNTMSC) + +$(call gb_ExternalProject_get_state_target,libcdr,build) : + cd $(EXTERNAL_WORKDIR)/build/win32 \ + && export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && export LCMS2_INCLUDE_DIR=$(OUTDIR)/inc/lcms2 \ + && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ + && $(COMPATH)/vcpackages/vcbuild.exe libcdr.vcproj "Release|Win32" \ + && touch $@ + +else + +libcdr_cflags := +libcdr_libs := + +ifeq ($(SYSTEM_LIBWPD),YES) + +libcdr_cflags += $(WPD_CFLAGS) +libcdr_libs += $(WPD_LIBS) + +else # !SYSTEM_LIBWPD + +libcdr_cflags += -I$(OUTDIR)/inc/external +libcdr_libs += $(SOLARLIB) + +endif # SYSTEM_LIBWPD + + +ifeq ($(SYSTEM_LIBWPG),YES) + +libcdr_cflags += $(WPG_CFLAGS) +libcdr_libs += $(WPG_LIBS) + +else # !SYSTEM_LIBWPG + +libcdr_cflags += -I$(OUTDIR)/inc/external +libcdr_libs += $(SOLARLIB) + +endif # SYSTEM_LIBWPG + + +ifeq ($(SYSTEM_LCMS2),YES) + +else # !SYSTEM_LCMS2 + +libcdr_cflags += -I$(OUTDIR)/inc/lcms2 +libcdr_libs += $(SOLARLIB) + +endif # SYSTEM_LCMS2 + +zlib_cflags := +zlib_libs := + +ifneq ($(SYSTEM_ZLIB),YES) + +zlib_cflags += -I$(OUTDIR)/inc/external/zlib +zlib_libs += $(SOLARLIB) + +endif # !SYSTEM_ZLIB + +$(call gb_ExternalProject_get_state_target,libcdr,build) : + cd $(EXTERNAL_WORKDIR) \ + && PKG_CONFIG="" \ + LIBCDR_CFLAGS="$(libcdr_cflags)" \ + LIBCDR_LIBS="$(libcdr_libs)" \ + ZLIB_CFLAGS="$(zlib_cflags)" \ + ZLIB_LIBS="$(zlib_libs)" \ + ./configure \ + --with-pic \ + --enable-static \ + --disable-shared \ + --without-docs \ + --disable-debug \ + --disable-werror \ + $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + && (cd $(EXTERNAL_WORKDIR)/src/lib && $(GNUMAKE) -j$(EXTMAXPROCESS)) \ + && touch $@ + +endif + +# vim: set noet sw=4 ts=4: diff --git a/libcdr/Module_libcdr.mk b/libcdr/Module_libcdr.mk index b02dc270cca5..a9ee9240c8ee 100644 --- a/libcdr/Module_libcdr.mk +++ b/libcdr/Module_libcdr.mk @@ -13,7 +13,7 @@ ifeq ($(SYSTEM_LIBCDR),NO) $(eval $(call gb_Module_add_targets,libcdr,\ ExternalPackage_libcdr \ - StaticLibrary_cdr \ + ExternalProject_libcdr \ UnpackedTarball_cdr \ )) diff --git a/libcdr/StaticLibrary_cdr.mk b/libcdr/StaticLibrary_cdr.mk deleted file mode 100644 index 71aa233e76ff..000000000000 --- a/libcdr/StaticLibrary_cdr.mk +++ /dev/null @@ -1,46 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_StaticLibrary_StaticLibrary,cdrlib)) - -$(eval $(call gb_StaticLibrary_use_unpacked,cdrlib,cdr)) - -$(eval $(call gb_StaticLibrary_use_package,cdrlib,libcdr_inc)) - -$(eval $(call gb_StaticLibrary_use_externals,cdrlib,\ - lcms2 \ - wpd \ - wpg \ - zlib \ -)) - -$(eval $(call gb_StaticLibrary_set_warnings_not_errors,cdrlib)) - -$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,cdrlib,cpp)) - -$(eval $(call gb_StaticLibrary_add_generated_exception_objects,cdrlib,\ - UnpackedTarball/cdr/src/lib/CDRCollector \ - UnpackedTarball/cdr/src/lib/CDRContentCollector \ - UnpackedTarball/cdr/src/lib/CDRDocument \ - UnpackedTarball/cdr/src/lib/CDRInternalStream \ - UnpackedTarball/cdr/src/lib/CDROutputElementList \ - UnpackedTarball/cdr/src/lib/CDRParser \ - UnpackedTarball/cdr/src/lib/CDRPath \ - UnpackedTarball/cdr/src/lib/CDRStringVector \ - UnpackedTarball/cdr/src/lib/CDRStylesCollector \ - UnpackedTarball/cdr/src/lib/CDRSVGGenerator \ - UnpackedTarball/cdr/src/lib/CDRTypes \ - UnpackedTarball/cdr/src/lib/CDRZipStream \ - UnpackedTarball/cdr/src/lib/CMXDocument \ - UnpackedTarball/cdr/src/lib/CMXParser \ - UnpackedTarball/cdr/src/lib/CommonParser \ - UnpackedTarball/cdr/src/lib/libcdr_utils \ -)) - -# vim: set noet sw=4 ts=4: From 343e12f0c39353e3bab17ec101fb25b3ccd3ded0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= Date: Fri, 5 Oct 2012 16:14:04 +0200 Subject: [PATCH 359/863] A typo Change-Id: I115cc8e17ae6cb89d215528acb0d0fe25eb71d85 --- libcdr/ExternalPackage_libcdr.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libcdr/ExternalPackage_libcdr.mk b/libcdr/ExternalPackage_libcdr.mk index 06e01795c386..8bed6fa59b3a 100644 --- a/libcdr/ExternalPackage_libcdr.mk +++ b/libcdr/ExternalPackage_libcdr.mk @@ -7,7 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalPackage_ExternalPackage,libcdr_inc,cdr)) +$(eval $(call gb_ExternalPackage_ExternalPackage,libcdr,cdr)) $(eval $(call gb_ExternalPackage_add_unpacked_files,libcdr_inc,inc/external/libcdr,\ src/lib/libcdr.h \ From 03c766e6017cc3b7e18a8c5eef35ba7e84777d88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= Date: Fri, 5 Oct 2012 16:16:40 +0200 Subject: [PATCH 360/863] Oops Change-Id: I84e8a3833ae16cc9197b8b772404587a3dea1158 --- lcms2/lcms2-endian.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lcms2/lcms2-endian.patch b/lcms2/lcms2-endian.patch index 01ffc1cb300a..e97e4e95991e 100644 --- a/lcms2/lcms2-endian.patch +++ b/lcms2/lcms2-endian.patch @@ -9,7 +9,7 @@ +#ifndef _WIN32 +#include +#if __BYTE_ORDER == __BIG_ENDIAN -+#define USE_BIG_ENDIAN 1 ++#define CMS_USE_BIG_ENDIAN 1 +#endif +#endif /* !_WIN32 */ From 349bbf8f068f82801428c837aec50658cf169ebc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= Date: Fri, 5 Oct 2012 16:18:58 +0200 Subject: [PATCH 361/863] More typos Change-Id: I6e3bdf0cfcdfa46cf47e4db1e0703c948b4a35b2 --- libcdr/ExternalPackage_libcdr.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libcdr/ExternalPackage_libcdr.mk b/libcdr/ExternalPackage_libcdr.mk index 8bed6fa59b3a..d032e8fa1b34 100644 --- a/libcdr/ExternalPackage_libcdr.mk +++ b/libcdr/ExternalPackage_libcdr.mk @@ -9,7 +9,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,libcdr,cdr)) -$(eval $(call gb_ExternalPackage_add_unpacked_files,libcdr_inc,inc/external/libcdr,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,libcdr,inc/external/libcdr,\ src/lib/libcdr.h \ src/lib/CDRDocument.h \ src/lib/CDRStringVector.h \ From 3559b4b1ab434897491a65ed06db54ba7ecb27de Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 5 Oct 2012 16:13:43 +0200 Subject: [PATCH 362/863] SwUndoPageDesc: take care of SwPageDesc::aFirst Change-Id: I05621cc1bf6d4201120c8757d5c2886723d7d18c --- sw/source/core/undo/SwUndoPageDesc.cxx | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sw/source/core/undo/SwUndoPageDesc.cxx b/sw/source/core/undo/SwUndoPageDesc.cxx index a48414d496ad..abe49e44c639 100644 --- a/sw/source/core/undo/SwUndoPageDesc.cxx +++ b/sw/source/core/undo/SwUndoPageDesc.cxx @@ -149,6 +149,8 @@ SwUndoPageDesc::SwUndoPageDesc(const SwPageDesc & _aOld, bExchange = false; if( rOldFoot.IsActive() && ( rOldDesc.IsFooterShared() != rNewDesc.IsFooterShared() ) ) bExchange = false; + if( ( rOldHead.IsActive() || rOldFoot.IsActive() ) && ( rOldDesc.IsFirstShared() != rNewDesc.IsFirstShared() ) ) + bExchange = false; if( bExchange ) { if( rNewHead.IsActive() ) @@ -162,6 +164,12 @@ SwUndoPageDesc::SwUndoPageDesc(const SwPageDesc & _aOld, // The Ctor of this object will remove the duplicate! SwFmtHeader aFormatHeader( pFormat ); } + if( !rNewDesc.IsFirstShared() ) + { + pFormat = new SwFrmFmt( *rNewDesc.GetFirst().GetHeader().GetHeaderFmt() ); + // The Ctor of this object will remove the duplicate! + SwFmtHeader aFormatHeader( pFormat ); + } } // Same procedure for footers... if( rNewFoot.IsActive() ) @@ -175,6 +183,12 @@ SwUndoPageDesc::SwUndoPageDesc(const SwPageDesc & _aOld, // The Ctor of this object will remove the duplicate! SwFmtFooter aFormatFooter( pFormat ); } + if( !rNewDesc.IsFirstShared() ) + { + pFormat = new SwFrmFmt( *rNewDesc.GetFirst().GetFooter().GetFooterFmt() ); + // The Ctor of this object will remove the duplicate! + SwFmtFooter aFormatFooter( pFormat ); + } } // After this exchange method the old page description will point to zero, From 27a8a02826c40e57b96a4f27e4646ee44a21593a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= Date: Fri, 5 Oct 2012 16:34:44 +0200 Subject: [PATCH 363/863] Revert "Oops" This reverts commit 03c766e6017cc3b7e18a8c5eef35ba7e84777d88. --- lcms2/lcms2-endian.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lcms2/lcms2-endian.patch b/lcms2/lcms2-endian.patch index e97e4e95991e..01ffc1cb300a 100644 --- a/lcms2/lcms2-endian.patch +++ b/lcms2/lcms2-endian.patch @@ -9,7 +9,7 @@ +#ifndef _WIN32 +#include +#if __BYTE_ORDER == __BIG_ENDIAN -+#define CMS_USE_BIG_ENDIAN 1 ++#define USE_BIG_ENDIAN 1 +#endif +#endif /* !_WIN32 */ From d18455e24644a90cbf9f146ea8b4eed74180592b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= Date: Fri, 5 Oct 2012 16:35:12 +0200 Subject: [PATCH 364/863] Revert "It seems that we have endianness problem in internal lcms2" This reverts commit d9ae7573083343b8db7fd65b5677a2132bd2e1e8. --- lcms2/lcms2-endian.patch | 17 ----------------- lcms2/makefile.mk | 2 +- 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 lcms2/lcms2-endian.patch diff --git a/lcms2/lcms2-endian.patch b/lcms2/lcms2-endian.patch deleted file mode 100644 index 01ffc1cb300a..000000000000 --- a/lcms2/lcms2-endian.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- misc/lcms2-2.3/include/lcms2.h 2011-12-15 16:45:47.000000000 +0100 -+++ misc/build/lcms2-2.3/include/lcms2.h 2012-10-05 14:49:09.721146003 +0200 -@@ -30,8 +30,12 @@ - - // ********** Configuration toggles **************************************** - --// Uncomment this one if you are using big endian machines --// #define CMS_USE_BIG_ENDIAN 1 -+#ifndef _WIN32 -+#include -+#if __BYTE_ORDER == __BIG_ENDIAN -+#define USE_BIG_ENDIAN 1 -+#endif -+#endif /* !_WIN32 */ - - // Uncomment this one if your compiler/machine does NOT support the - // "long long" type. diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk index 9260ad4de5a1..52b7b4a93b65 100644 --- a/lcms2/makefile.mk +++ b/lcms2/makefile.mk @@ -39,7 +39,7 @@ TARGET=so_lcms2 TARFILE_NAME=lcms2-2.3 TARFILE_MD5=327348d67c979c88c2dec59a23a17d85 -PATCH_FILES = lcms2.patch lcms2-endian.patch +PATCH_FILES = lcms2.patch .IF "$(SYSTEM_LCMS2)" == "YES" @all: From 56c520fa70ae86ad06716bde63a35d205b688c02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= Date: Fri, 5 Oct 2012 16:38:24 +0200 Subject: [PATCH 365/863] Upgrade lcms2 to 2.4 release Change-Id: I21186cef7fe30542eaabbdeeb8920c3839724805 --- lcms2/lcms2-windows-export.patch | 4 ++-- lcms2/lcms2.patch | 4 ++-- lcms2/makefile.mk | 4 ++-- ooo.lst.in | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lcms2/lcms2-windows-export.patch b/lcms2/lcms2-windows-export.patch index 9d6d26a1b648..1a77c64f308e 100644 --- a/lcms2/lcms2-windows-export.patch +++ b/lcms2/lcms2-windows-export.patch @@ -1,5 +1,5 @@ ---- misc/build/lcms2-2.3/include/lcms2.h.sav 2011-12-15 16:45:47.000000000 +0100 -+++ misc/build/lcms2-2.3/include/lcms2.h 2012-03-17 22:53:28.731585981 +0100 +--- misc/build/lcms2-2.4/include/lcms2.h.sav 2011-12-15 16:45:47.000000000 +0100 ++++ misc/build/lcms2-2.4/include/lcms2.h 2012-03-17 22:53:28.731585981 +0100 @@ -192,6 +192,15 @@ typedef int cmsBool; # endif #endif diff --git a/lcms2/lcms2.patch b/lcms2/lcms2.patch index 851a4b6a729b..d0eca1fb86b3 100644 --- a/lcms2/lcms2.patch +++ b/lcms2/lcms2.patch @@ -1,5 +1,5 @@ ---- misc/build/lcms2-2.3/config.sub -+++ misc/build/lcms2-2.3/config.sub +--- misc/build/lcms2-2.4/config.sub ++++ misc/build/lcms2-2.4/config.sub @@ -123,7 +123,7 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk index 52b7b4a93b65..62a9ff9f9576 100644 --- a/lcms2/makefile.mk +++ b/lcms2/makefile.mk @@ -36,8 +36,8 @@ TARGET=so_lcms2 # --- Files -------------------------------------------------------- -TARFILE_NAME=lcms2-2.3 -TARFILE_MD5=327348d67c979c88c2dec59a23a17d85 +TARFILE_NAME=lcms2-2.4 +TARFILE_MD5=861ef15fa0bc018f9ddc932c4ad8b6dd PATCH_FILES = lcms2.patch diff --git a/ooo.lst.in b/ooo.lst.in index 6c5c763793c1..25b83fc0c4d6 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -91,7 +91,7 @@ a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz @VISIO_TARBALL@ @CMIS_TARBALL@ @CDR_TARBALL@ -327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz +861ef15fa0bc018f9ddc932c4ad8b6dd-lcms2-2.4.tar.gz @MSPUB_TARBALL@ fa6a2f85bd28baab035b2c95e722713f-liblangtag-0.2.tar.bz2 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz From 39d6c353fb40e6c20fc69d5d3c07181d2ef1dd45 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 5 Oct 2012 16:50:13 +0200 Subject: [PATCH 366/863] Turn a SAL_WARN into SAL_INFO ...as lingucomponent GetOldStyleDics SYSTEM_DICTS code harmlessly triggers it routinely with input containing _ and then fixing the input. Change-Id: Id00857f0b89eb65ad155e8cf0883dd2f45851c7d --- i18npool/source/languagetag/languagetag.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/i18npool/source/languagetag/languagetag.cxx b/i18npool/source/languagetag/languagetag.cxx index df1533bd998f..14cad588a857 100644 --- a/i18npool/source/languagetag/languagetag.cxx +++ b/i18npool/source/languagetag/languagetag.cxx @@ -342,8 +342,10 @@ bool LanguageTag::canonicalize() const } else { - SAL_WARN( "i18npool.langtag", "LanguageTag::canonicalize: could not parse, " << - (aError.p ? aError.p->message : "")); + SAL_INFO( + "i18npool.langtag", + "LanguageTag::canonicalize " << maBcp47 << ": could not parse, " + << (aError.p ? aError.p->message : "")); } meIsValid = DECISION_NO; return false; From 7ef7e60c1180fd643b472b57ad064a50601c51f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= Date: Fri, 5 Oct 2012 17:18:05 +0200 Subject: [PATCH 367/863] No need to apply a patch Change-Id: Idf9ad88293ca6a51f16f1230176d5c97558c66ed --- libcdr/UnpackedTarball_cdr.mk | 4 ---- libcdr/libcdr-0.0.8-msc.patch | 10 ---------- 2 files changed, 14 deletions(-) delete mode 100644 libcdr/libcdr-0.0.8-msc.patch diff --git a/libcdr/UnpackedTarball_cdr.mk b/libcdr/UnpackedTarball_cdr.mk index 29ef930d21e9..be1e7d762a87 100644 --- a/libcdr/UnpackedTarball_cdr.mk +++ b/libcdr/UnpackedTarball_cdr.mk @@ -11,8 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,cdr)) $(eval $(call gb_UnpackedTarball_set_tarball,cdr,$(CDR_TARBALL))) -$(eval $(call gb_UnpackedTarball_add_patches,cdr,\ - libcdr/libcdr-0.0.8-msc.patch \ -)) - # vim: set noet sw=4 ts=4: diff --git a/libcdr/libcdr-0.0.8-msc.patch b/libcdr/libcdr-0.0.8-msc.patch deleted file mode 100644 index 6a44e7dc426b..000000000000 --- a/libcdr/libcdr-0.0.8-msc.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- misc/libcdr-0.0.8/src/lib/libcdr_utils.h 2012-06-06 13:42:03.000000000 +0200 -+++ misc/build/libcdr-0.0.8/src/lib/libcdr_utils.h 2012-06-11 15:09:43.305289500 +0200 -@@ -50,6 +50,7 @@ - typedef unsigned char uint8_t; - typedef unsigned short uint16_t; - typedef unsigned uint32_t; -+typedef short int16_t; - typedef int int32_t; - typedef unsigned __int64 uint64_t; - From 5c19b8701c58fbb49188ce2210879ce6f4431471 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 5 Oct 2012 16:30:37 +0200 Subject: [PATCH 368/863] ItemSetToPageDesc / PageDescToItemSet: handle first page footers Change-Id: Id480c0e81b79ec48b3ceba566219089d9a408c22 --- sw/source/ui/utlui/uitool.cxx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sw/source/ui/utlui/uitool.cxx b/sw/source/ui/utlui/uitool.cxx index d3d82ad9fb05..64469417451d 100644 --- a/sw/source/ui/utlui/uitool.cxx +++ b/sw/source/ui/utlui/uitool.cxx @@ -257,6 +257,8 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc ) rPageDesc.ChgFooterShare(((const SfxBoolItem&) rFooterSet.Get(SID_ATTR_PAGE_SHARED)).GetValue()); + rPageDesc.ChgFirstShare(((const SfxBoolItem&) + rFooterSet.Get(SID_ATTR_PAGE_SHARED_FIRST)).GetValue()); } else { // Footer ausschalten @@ -439,6 +441,8 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet) // SfxBoolItem aShared(SID_ATTR_PAGE_SHARED, rPageDesc.IsFooterShared()); aFooterSet.Put(aShared); + SfxBoolItem aFirstShared(SID_ATTR_PAGE_SHARED_FIRST, rPageDesc.IsFirstShared()); + aFooterSet.Put(aFirstShared); // Groesse SvxSizeItem aSize(SID_ATTR_PAGE_SIZE, Size(rFrmSize.GetSize())); From f3905ac09a6f37615d1335c7d2d50bd00c07b920 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 5 Oct 2012 17:17:18 +0200 Subject: [PATCH 369/863] ItemSetToPageDesc: don't call SwPageDesc::ChgFirstShare twice Change-Id: I241858b0d8920187e21dcdb9fd4aac9e4d9054ba --- sw/source/ui/utlui/uitool.cxx | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/sw/source/ui/utlui/uitool.cxx b/sw/source/ui/utlui/uitool.cxx index 64469417451d..a220a9f9f22a 100644 --- a/sw/source/ui/utlui/uitool.cxx +++ b/sw/source/ui/utlui/uitool.cxx @@ -164,6 +164,7 @@ void FillHdFt(SwFrmFmt* pFmt, const SfxItemSet& rSet) void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc ) { SwFrmFmt& rMaster = rPageDesc.GetMaster(); + int nFirstShare = -1; // alle allgemeinen Rahmen-Attribute uebertragen // @@ -219,8 +220,12 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc ) rPageDesc.ChgHeaderShare(((const SfxBoolItem&) rHeaderSet.Get(SID_ATTR_PAGE_SHARED)).GetValue()); - rPageDesc.ChgFirstShare(((const SfxBoolItem&) - rHeaderSet.Get(SID_ATTR_PAGE_SHARED_FIRST)).GetValue()); + if (nFirstShare < 0) + { + rPageDesc.ChgFirstShare(((const SfxBoolItem&) + rHeaderSet.Get(SID_ATTR_PAGE_SHARED_FIRST)).GetValue()); + nFirstShare = rPageDesc.IsFirstShared(); + } } else { // Header ausschalten @@ -257,8 +262,12 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc ) rPageDesc.ChgFooterShare(((const SfxBoolItem&) rFooterSet.Get(SID_ATTR_PAGE_SHARED)).GetValue()); - rPageDesc.ChgFirstShare(((const SfxBoolItem&) - rFooterSet.Get(SID_ATTR_PAGE_SHARED_FIRST)).GetValue()); + if (nFirstShare < 0) + { + rPageDesc.ChgFirstShare(((const SfxBoolItem&) + rFooterSet.Get(SID_ATTR_PAGE_SHARED_FIRST)).GetValue()); + nFirstShare = rPageDesc.IsFirstShared(); + } } else { // Footer ausschalten From 751dacec8e0947c2d85187342995822e6dc62912 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 5 Oct 2012 16:33:45 +0200 Subject: [PATCH 370/863] SvxHFPage: add UI for style::PageProperties::FirstIsShared Change-Id: I76828a865751a8f29aeff40ccf7feb400692c43b --- svx/inc/svx/hdft.hxx | 1 + svx/source/dialog/hdft.cxx | 24 +++++++++- svx/source/dialog/hdft.hrc | 1 + svx/source/dialog/hdft.src | 98 ++++++++++++++++++++++---------------- 4 files changed, 81 insertions(+), 43 deletions(-) diff --git a/svx/inc/svx/hdft.hxx b/svx/inc/svx/hdft.hxx index 312f06e5ed6f..76fc43b27d6e 100644 --- a/svx/inc/svx/hdft.hxx +++ b/svx/inc/svx/hdft.hxx @@ -72,6 +72,7 @@ protected: FixedLine aFrm; CheckBox aTurnOnBox; CheckBox aCntSharedBox; + CheckBox aCntSharedFirstBox; FixedText aLMLbl; MetricField aLMEdit; FixedText aRMLbl; diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 50c92c7fc5bd..3dad1aef8ab0 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -171,6 +171,7 @@ SvxHFPage::SvxHFPage( Window* pParent, sal_uInt16 nResId, const SfxItemSet& rAtt aFrm ( this, SVX_RES( FL_FRAME ) ), aTurnOnBox ( this, SVX_RES( CB_TURNON ) ), aCntSharedBox ( this, SVX_RES( CB_SHARED ) ), + aCntSharedFirstBox ( this, SVX_RES( CB_SHARED_FIRST ) ), aLMLbl ( this, SVX_RES( FT_LMARGIN ) ), aLMEdit ( this, SVX_RES( ED_LMARGIN ) ), aRMLbl ( this, SVX_RES( FT_RMARGIN ) ), @@ -207,6 +208,7 @@ SvxHFPage::SvxHFPage( Window* pParent, sal_uInt16 nResId, const SfxItemSet& rAtt aTurnOnBox.SetAccessibleRelationMemberOf( &aFrm ); aCntSharedBox.SetAccessibleRelationMemberOf( &aFrm ); + aCntSharedFirstBox.SetAccessibleRelationMemberOf( &aFrm ); aLMLbl.SetAccessibleRelationMemberOf( &aFrm ); aLMEdit.SetAccessibleRelationMemberOf( &aFrm ); aRMLbl.SetAccessibleRelationMemberOf( &aFrm ); @@ -267,7 +269,7 @@ sal_Bool SvxHFPage::FillItemSet( SfxItemSet& rSet ) aSet.Put( SfxBoolItem( nWOn, aTurnOnBox.IsChecked() ) ); aSet.Put( SfxBoolItem( nWDynamic, aHeightDynBtn.IsChecked() ) ); aSet.Put( SfxBoolItem( nWShared, aCntSharedBox.IsChecked() ) ); - aSet.Put( SfxBoolItem( nWSharedFirst, sal_True) ); + aSet.Put( SfxBoolItem( nWSharedFirst, aCntSharedFirstBox.IsChecked() ) ); if(aDynSpacingCB.IsVisible() && SFX_WHICH_MAX > nWDynSpacing) { SfxBoolItem* pBoolItem = (SfxBoolItem*)pPool->GetDefaultItem(nWDynSpacing).Clone(); @@ -359,6 +361,9 @@ void SvxHFPage::Reset( const SfxItemSet& rSet ) (const SfxBoolItem&)rHeaderSet.Get( GetWhich( SID_ATTR_PAGE_DYNAMIC ) ); const SfxBoolItem& rShared = (const SfxBoolItem&)rHeaderSet.Get( GetWhich( SID_ATTR_PAGE_SHARED ) ); + const SfxBoolItem* pSharedFirst = 0; + if (rHeaderSet.HasItem(GetWhich(SID_ATTR_PAGE_SHARED_FIRST))) + pSharedFirst = (const SfxBoolItem*)&rHeaderSet.Get( GetWhich( SID_ATTR_PAGE_SHARED_FIRST ) ); const SvxSizeItem& rSize = (const SvxSizeItem&)rHeaderSet.Get( GetWhich( SID_ATTR_PAGE_SIZE ) ); const SvxULSpaceItem& rUL = @@ -388,6 +393,10 @@ void SvxHFPage::Reset( const SfxItemSet& rSet ) SetMetricValue( aLMEdit, rLR.GetLeft(), eUnit ); SetMetricValue( aRMEdit, rLR.GetRight(), eUnit ); aCntSharedBox.Check(rShared.GetValue()); + if (pSharedFirst) + aCntSharedFirstBox.Check(pSharedFirst->GetValue()); + else + aCntSharedFirstBox.Hide(); } else pSetItem = 0; @@ -411,6 +420,7 @@ void SvxHFPage::Reset( const SfxItemSet& rSet ) aTurnOnBox.Check( sal_False ); aHeightDynBtn.Check( sal_True ); aCntSharedBox.Check( sal_True ); + aCntSharedFirstBox.Check( sal_True ); } TurnOnHdl(0); @@ -477,7 +487,10 @@ IMPL_LINK( SvxHFPage, TurnOnHdl, CheckBox *, pBox ) if( nUsage == SVX_PAGE_RIGHT || nUsage == SVX_PAGE_LEFT ) aCntSharedBox.Disable(); else + { aCntSharedBox.Enable(); + aCntSharedFirstBox.Enable(); + } aBackgroundBtn.Enable(); } else @@ -747,7 +760,10 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) if ( SVX_PAGE_RIGHT == nUsage || SVX_PAGE_LEFT == nUsage ) aCntSharedBox.Disable(); else + { aCntSharedBox.Enable(); + aCntSharedFirstBox.Enable(); + } pItem = GetItem( rSet, SID_ATTR_PAGE_SIZE ); if ( pItem ) @@ -794,7 +810,10 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) aBspWin.SetHeader( sal_False ); if ( SID_ATTR_PAGE_HEADERSET == nId ) + { aCntSharedBox.Disable(); + aCntSharedFirstBox.Disable(); + } } pSetItem = 0; @@ -831,7 +850,10 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) aBspWin.SetFooter( sal_False ); if ( SID_ATTR_PAGE_FOOTERSET == nId ) + { aCntSharedBox.Disable(); + aCntSharedFirstBox.Disable(); + } } pItem = GetItem( rSet, SID_ATTR_PAGE_EXT1 ); diff --git a/svx/source/dialog/hdft.hrc b/svx/source/dialog/hdft.hrc index 572c60fb2fd5..7bed549b2dec 100644 --- a/svx/source/dialog/hdft.hrc +++ b/svx/source/dialog/hdft.hrc @@ -33,6 +33,7 @@ #define CB_SHARED 20 #define FL_FRAME 21 #define CB_DYNSPACING 22 +#define CB_SHARED_FIRST 23 #define WN_BSP 30 diff --git a/svx/source/dialog/hdft.src b/svx/source/dialog/hdft.src index 4a9f90bbc94e..3658febc0c6f 100644 --- a/svx/source/dialog/hdft.src +++ b/svx/source/dialog/hdft.src @@ -57,9 +57,16 @@ TabPage RID_SVXPAGE_HEADER Size = MAP_APPFONT ( 152 , 10 ) ; Text [ en-US ] = "Same ~content left/right" ; }; + CheckBox CB_SHARED_FIRST + { + HelpID = "svx:CheckBox:RID_SVXPAGE_HEADER:CB_SHARED_FIRST"; + Pos = MAP_APPFONT ( 12 , 46 ) ; + Size = MAP_APPFONT ( 152 , 10 ) ; + Text [ en-US ] = "Same content on first page" ; + }; FixedText FT_LMARGIN { - Pos = MAP_APPFONT ( 12 , 48 ) ; + Pos = MAP_APPFONT ( 12 , 64 ) ; Size = MAP_APPFONT ( 102 , 8 ) ; _TEXT_FT_LMARGIN Left = TRUE ; @@ -68,7 +75,7 @@ TabPage RID_SVXPAGE_HEADER { HelpID = "svx:MetricField:RID_SVXPAGE_HEADER:ED_LMARGIN"; Border = TRUE ; - Pos = MAP_APPFONT ( 124 , 46 ) ; + Pos = MAP_APPFONT ( 124 , 62 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Left = TRUE ; Repeat = TRUE ; @@ -82,7 +89,7 @@ TabPage RID_SVXPAGE_HEADER }; FixedText FT_RMARGIN { - Pos = MAP_APPFONT ( 12 , 64 ) ; + Pos = MAP_APPFONT ( 12 , 80 ) ; Size = MAP_APPFONT ( 102 , 8 ) ; _TEXT_FT_RMARGIN Left = TRUE ; @@ -91,7 +98,7 @@ TabPage RID_SVXPAGE_HEADER { HelpID = "svx:MetricField:RID_SVXPAGE_HEADER:ED_RMARGIN"; Border = TRUE ; - Pos = MAP_APPFONT ( 124 , 62 ) ; + Pos = MAP_APPFONT ( 124 , 78 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Left = TRUE ; Repeat = TRUE ; @@ -106,7 +113,7 @@ TabPage RID_SVXPAGE_HEADER FixedText FT_DIST { - Pos = MAP_APPFONT ( 12 , 82 ) ; + Pos = MAP_APPFONT ( 12 , 98 ) ; Size = MAP_APPFONT ( 102 , 8 ) ; Text [ en-US ] = "~Spacing" ; }; @@ -115,7 +122,7 @@ TabPage RID_SVXPAGE_HEADER HelpID = "svx:MetricField:RID_SVXPAGE_HEADER:ED_DIST"; Disable = TRUE ; Border = TRUE ; - Pos = MAP_APPFONT ( 124 , 80 ) ; + Pos = MAP_APPFONT ( 124 , 96 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Left = TRUE ; Repeat = TRUE ; @@ -129,14 +136,14 @@ TabPage RID_SVXPAGE_HEADER CheckBox CB_DYNSPACING { HelpID = "svx:CheckBox:RID_SVXPAGE_HEADER:CB_DYNSPACING"; - Pos = MAP_APPFONT ( 12 , 96 ) ; + Pos = MAP_APPFONT ( 12 , 112 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Hide = TRUE; Text [ en-US ] = "Use d~ynamic spacing" ; }; FixedText FT_HEIGHT { - Pos = MAP_APPFONT ( 12 , 98 ) ; + Pos = MAP_APPFONT ( 12 , 114 ) ; Size = MAP_APPFONT ( 102 , 8 ) ; Text [ en-US ] = "~Height" ; }; @@ -145,7 +152,7 @@ TabPage RID_SVXPAGE_HEADER HelpID = "svx:MetricField:RID_SVXPAGE_HEADER:ED_HEIGHT"; Disable = TRUE ; Border = TRUE ; - Pos = MAP_APPFONT ( 124 , 96 ) ; + Pos = MAP_APPFONT ( 124 , 112 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Left = TRUE ; Repeat = TRUE ; @@ -161,7 +168,7 @@ TabPage RID_SVXPAGE_HEADER CheckBox CB_HEIGHT_DYN { HelpID = "svx:CheckBox:RID_SVXPAGE_HEADER:CB_HEIGHT_DYN"; - Pos = MAP_APPFONT ( 12 , 112 ) ; + Pos = MAP_APPFONT ( 12 , 128 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Text [ en-US ] = "~AutoFit height" ; }; @@ -179,7 +186,7 @@ TabPage RID_SVXPAGE_HEADER PushButton BTN_EXTRAS { HelpID = "svx:PushButton:RID_SVXPAGE_HEADER:BTN_EXTRAS"; - Pos = MAP_APPFONT ( 12 , 130 ) ; + Pos = MAP_APPFONT ( 12 , 146 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~More..." ; }; @@ -205,9 +212,16 @@ TabPage RID_SVXPAGE_FOOTER Size = MAP_APPFONT ( 152 , 10 ) ; Text [ en-US ] = "Same ~content left/right" ; }; + CheckBox CB_SHARED_FIRST + { + HelpID = "svx:CheckBox:RID_SVXPAGE_FOOTER:CB_SHARED_FIRST"; + Pos = MAP_APPFONT ( 12 , 46 ) ; + Size = MAP_APPFONT ( 152 , 10 ) ; + Text [ en-US ] = "Same content on first page" ; + }; FixedText FT_LMARGIN { - Pos = MAP_APPFONT ( 12 , 48 ) ; + Pos = MAP_APPFONT ( 12 , 64 ) ; Size = MAP_APPFONT ( 102 , 8 ) ; Left = TRUE ; _TEXT_FT_LMARGIN @@ -216,29 +230,6 @@ TabPage RID_SVXPAGE_FOOTER { HelpID = "svx:MetricField:RID_SVXPAGE_FOOTER:ED_LMARGIN"; Border = TRUE ; - Pos = MAP_APPFONT ( 124 , 46 ) ; - Size = MAP_APPFONT ( 40 , 12 ) ; - Left = TRUE ; - Repeat = TRUE ; - Spin = TRUE ; - Minimum = 0 ; - Maximum = 9999 ; - DecimalDigits = 2 ; - Unit = FUNIT_CM ; - Last = 9999 ; - SpinSize = 10 ; - }; - FixedText FT_RMARGIN - { - Pos = MAP_APPFONT ( 12 , 64 ) ; - Size = MAP_APPFONT ( 102 , 8 ) ; - _TEXT_FT_RMARGIN - Left = TRUE ; - }; - MetricField ED_RMARGIN - { - HelpID = "svx:MetricField:RID_SVXPAGE_FOOTER:ED_RMARGIN"; - Border = TRUE ; Pos = MAP_APPFONT ( 124 , 62 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Left = TRUE ; @@ -251,9 +242,32 @@ TabPage RID_SVXPAGE_FOOTER Last = 9999 ; SpinSize = 10 ; }; + FixedText FT_RMARGIN + { + Pos = MAP_APPFONT ( 12 , 80 ) ; + Size = MAP_APPFONT ( 102 , 8 ) ; + _TEXT_FT_RMARGIN + Left = TRUE ; + }; + MetricField ED_RMARGIN + { + HelpID = "svx:MetricField:RID_SVXPAGE_FOOTER:ED_RMARGIN"; + Border = TRUE ; + Pos = MAP_APPFONT ( 124 , 78 ) ; + Size = MAP_APPFONT ( 40 , 12 ) ; + Left = TRUE ; + Repeat = TRUE ; + Spin = TRUE ; + Minimum = 0 ; + Maximum = 9999 ; + DecimalDigits = 2 ; + Unit = FUNIT_CM ; + Last = 9999 ; + SpinSize = 10 ; + }; FixedText FT_DIST { - Pos = MAP_APPFONT ( 12 , 82 ) ; + Pos = MAP_APPFONT ( 12 , 98 ) ; Size = MAP_APPFONT ( 102 , 8 ) ; Text [ en-US ] = "~Spacing" ; }; @@ -262,7 +276,7 @@ TabPage RID_SVXPAGE_FOOTER HelpID = "svx:MetricField:RID_SVXPAGE_FOOTER:ED_DIST"; Disable = TRUE ; Border = TRUE ; - Pos = MAP_APPFONT ( 124 , 80 ) ; + Pos = MAP_APPFONT ( 124 , 96 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Left = TRUE ; Repeat = TRUE ; @@ -276,14 +290,14 @@ TabPage RID_SVXPAGE_FOOTER CheckBox CB_DYNSPACING { HelpID = "svx:CheckBox:RID_SVXPAGE_FOOTER:CB_DYNSPACING"; - Pos = MAP_APPFONT ( 12 , 96 ) ; + Pos = MAP_APPFONT ( 12 , 112 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Hide = TRUE; Text [ en-US ] = "Use d~ynamic spacing" ; }; FixedText FT_HEIGHT { - Pos = MAP_APPFONT ( 12 , 98 ) ; + Pos = MAP_APPFONT ( 12 , 114 ) ; Size = MAP_APPFONT ( 102 , 8 ) ; Disable = TRUE ; Text [ en-US ] = "~Height" ; @@ -293,7 +307,7 @@ TabPage RID_SVXPAGE_FOOTER HelpID = "svx:MetricField:RID_SVXPAGE_FOOTER:ED_HEIGHT"; Disable = TRUE ; Border = TRUE ; - Pos = MAP_APPFONT ( 124 , 96 ) ; + Pos = MAP_APPFONT ( 124 , 112 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Left = TRUE ; Repeat = TRUE ; @@ -309,7 +323,7 @@ TabPage RID_SVXPAGE_FOOTER CheckBox CB_HEIGHT_DYN { HelpID = "svx:CheckBox:RID_SVXPAGE_FOOTER:CB_HEIGHT_DYN"; - Pos = MAP_APPFONT ( 12 , 112 ) ; + Pos = MAP_APPFONT ( 12 , 128 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Text [ en-US ] = "~AutoFit height" ; }; @@ -328,7 +342,7 @@ TabPage RID_SVXPAGE_FOOTER PushButton BTN_EXTRAS { HelpID = "svx:PushButton:RID_SVXPAGE_FOOTER:BTN_EXTRAS"; - Pos = MAP_APPFONT ( 12 , 130 ) ; + Pos = MAP_APPFONT ( 12 , 146 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~More..." ; }; From 53b7bdc787a1bca69066df2435b6e1c3fa541759 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 5 Oct 2012 17:19:47 +0200 Subject: [PATCH 371/863] RepositoryExternal.mk: add package dependency for libwpg Change-Id: Ic0dc4333329a4ef11eba2afe23d4e5f101689517 --- RepositoryExternal.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index d56accc9d82e..cbf337953223 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1058,6 +1058,9 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ )) define gb_LinkTarget__use_wpg +$(call gb_LinkTarget_use_package,$(1),\ + libwpg_inc \ +) $(call gb_LinkTarget_use_static_libraries,$(1),\ wpglib \ ) From ff12d3033b9284a779ea32f7cbf20d840b1995f2 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 5 Oct 2012 17:35:47 +0200 Subject: [PATCH 372/863] gbuild: implement gb_ExternalProject_use_externals Change-Id: Ie6eed251a5034d9761abca75506b677af394d945 --- solenv/gbuild/ExternalProject.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk index 0680d75e9fa2..9ed1db74903f 100644 --- a/solenv/gbuild/ExternalProject.mk +++ b/solenv/gbuild/ExternalProject.mk @@ -109,6 +109,10 @@ $(call gb_ExternalProject_get_preparation_target,$(1)) : $(call gb_ExternalProje endef +define gb_ExternalProject_use_externals +$(foreach external,$(2),$(call gb_ExternalProject_use_external,$(1),$(2))) +endef + # Make an external project depend on a package # # This is most useful for depending on output files created by another From 1a9740671cfe0f324135276fe42bd18f29dcda7d Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 5 Oct 2012 17:48:45 +0200 Subject: [PATCH 373/863] libcdr: hopefully get this to build unfortunately the ExternalProject uses a StaticLibrary built in libwpg. Change-Id: Ie4a8933247edbd2d53f697432a0848a05216237f --- libcdr/ExternalProject_libcdr.mk | 12 +++++++----- solenv/gbuild/ExternalProject.mk | 7 +++++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk index de48baed3a8f..719b75295fcd 100644 --- a/libcdr/ExternalProject_libcdr.mk +++ b/libcdr/ExternalProject_libcdr.mk @@ -16,11 +16,8 @@ $(eval $(call gb_ExternalProject_register_targets,libcdr,\ )) $(eval $(call gb_ExternalProject_use_externals,cdrlib,\ - lcms2 \ - wpd \ - wpg \ - zlib \ -)) + libwpd \ +)) ifeq ($(OS)$(COM),WNTMSC) @@ -48,6 +45,8 @@ else # !SYSTEM_LIBWPD libcdr_cflags += -I$(OUTDIR)/inc/external libcdr_libs += $(SOLARLIB) +$(eval $(call gb_ExternalProject_use_package,libwpd)) + endif # SYSTEM_LIBWPD @@ -61,6 +60,9 @@ else # !SYSTEM_LIBWPG libcdr_cflags += -I$(OUTDIR)/inc/external libcdr_libs += $(SOLARLIB) +$(eval $(call gb_ExternalProject_use_package,libwpg_inc)) +$(eval $(call gb_ExternalProject_use_static_libraries,wpglib)) + endif # SYSTEM_LIBWPG diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk index 9ed1db74903f..41d86ade2265 100644 --- a/solenv/gbuild/ExternalProject.mk +++ b/solenv/gbuild/ExternalProject.mk @@ -124,6 +124,13 @@ $(call gb_ExternalProject_get_preparation_target,$(1)) : $(call gb_Package_get_t endef +# TODO: do we really want to have projects depending on gbuild libraries? +define gb_ExternalProject_use_static_libraries +$(foreach $(lib),$(2),$(call gb_ExternalProject_get_preparation_target,$(1)) : \ + $(call gb_StaticLibrary_get_target,$(lib))) + +endef + # Make an external project depend on several packages at once # # gb_ExternalProject_use_packages external package(s) From 52304f30839eb3091304bb0d7b697b6cedda71ea Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 5 Oct 2012 18:02:33 +0200 Subject: [PATCH 374/863] libcdr: argh i am getting senile Change-Id: I1674da35bf1d756bda5c4b991cc586462325c838 --- libcdr/ExternalProject_libcdr.mk | 6 +++--- solenv/gbuild/ExternalProject.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk index 719b75295fcd..95d0eeb6e48f 100644 --- a/libcdr/ExternalProject_libcdr.mk +++ b/libcdr/ExternalProject_libcdr.mk @@ -45,7 +45,7 @@ else # !SYSTEM_LIBWPD libcdr_cflags += -I$(OUTDIR)/inc/external libcdr_libs += $(SOLARLIB) -$(eval $(call gb_ExternalProject_use_package,libwpd)) +$(eval $(call gb_ExternalProject_use_package,libcdr,libwpd)) endif # SYSTEM_LIBWPD @@ -60,8 +60,8 @@ else # !SYSTEM_LIBWPG libcdr_cflags += -I$(OUTDIR)/inc/external libcdr_libs += $(SOLARLIB) -$(eval $(call gb_ExternalProject_use_package,libwpg_inc)) -$(eval $(call gb_ExternalProject_use_static_libraries,wpglib)) +$(eval $(call gb_ExternalProject_use_package,libcdr,libwpg_inc)) +$(eval $(call gb_ExternalProject_use_static_libraries,libcdr,wpglib)) endif # SYSTEM_LIBWPG diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk index 41d86ade2265..b604d7f0eb14 100644 --- a/solenv/gbuild/ExternalProject.mk +++ b/solenv/gbuild/ExternalProject.mk @@ -126,7 +126,7 @@ endef # TODO: do we really want to have projects depending on gbuild libraries? define gb_ExternalProject_use_static_libraries -$(foreach $(lib),$(2),$(call gb_ExternalProject_get_preparation_target,$(1)) : \ +$(foreach lib,$(2),$(call gb_ExternalProject_get_preparation_target,$(1)) : \ $(call gb_StaticLibrary_get_target,$(lib))) endef From 02a934d03b101ce463a232f9cbb7b43e684de37e Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 5 Oct 2012 18:19:41 +0200 Subject: [PATCH 375/863] SwFrm::OnFirstPage: if there are no previous pages, we are on the first page Change-Id: I9e3a77bfeb314eb48f2a4185b8751e370357c7e0 --- sw/source/core/layout/trvlfrm.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index 3f7cc79cbe13..7fb7d30a9476 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -1824,6 +1824,8 @@ bool SwFrm::OnFirstPage() const const SwPageDesc* pDesc = pPage->GetPageDesc(); bRet = pPrevFrm->GetPageDesc() != pDesc && !pDesc->IsFirstShared(); } + else + bRet = true; } return bRet; } From 3ec5db65a7b1dfde8246ed9855716916d6cc468e Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 5 Oct 2012 18:20:01 +0200 Subject: [PATCH 376/863] SwHeaderFooterWin: check if we are on the first page Change-Id: Ib61effb43c2b029c92886319d3a96612b9732878 --- sw/source/ui/docvw/HeaderFooterWin.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sw/source/ui/docvw/HeaderFooterWin.cxx b/sw/source/ui/docvw/HeaderFooterWin.cxx index 482ec7d20fbe..6b96627f3005 100644 --- a/sw/source/ui/docvw/HeaderFooterWin.cxx +++ b/sw/source/ui/docvw/HeaderFooterWin.cxx @@ -400,6 +400,8 @@ bool SwHeaderFooterWin::IsEmptyHeaderFooter( ) const SwFrmFmt* pFmt = pDesc->GetLeftFmt(); if ( GetPageFrame()->OnRightPage() ) pFmt = pDesc->GetRightFmt(); + if ( GetPageFrame()->OnFirstPage() ) + pFmt = pDesc->GetFirstFmt(); if ( pFmt ) { From 368e23a3908fcf87a1290ed21da4b57ccf8f3894 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Thu, 4 Oct 2012 09:41:00 +0200 Subject: [PATCH 377/863] gbuildification of jfreereport In dmake jfreereport build system an intermediate directory classes was used. All artefacts that created during build were copied there, including external apache-commons-logging.jar. Finally java system property was used -Dlib=classes. In gbuild we don't want to mess with copying artefacts around. The artefacts are packaging in $(OUTDIR)/bin and java system property points to -Dlib=$(OUTDIR)/bin. However the dependencies must be set inside jfreereport module, because of jar interdependency: liblayout depends on other jars and flow-engine depends on liblayout. This is achived with new function gb_ExternalProject_use_packages. Special treatment is necessary when system apache-commons library is used, in which case it is not reside in $(OUTDIR)/bin, but in /usr/share/java/commons-logging.jar or in custom location. For that purpose the both patches: flow-engine.patch and liblayout.patch were extended and new java system property was introduced -Dcommons-logging.jar and passed to the build.xml. A dependency from liblayout to apache-commons-logging is set. jfreereport was moved to tail_build module. Change-Id: I32e39bb5f4f825f182c3bd3cfc1a13ea1c38321e Reviewed-on: https://gerrit.libreoffice.org/761 Reviewed-by: Norbert Thiebaud Tested-by: Norbert Thiebaud --- Makefile.top | 2 +- Module_tail_build.mk | 1 + RepositoryModule_ooo.mk | 1 + config_host.mk.in | 11 +++ configure.in | 22 +++++ ...ExternalProject_jfreereport_flow_engine.mk | 43 +++++++++ .../ExternalProject_jfreereport_flute.mk | 40 ++++++++ .../ExternalProject_jfreereport_libbase.mk | 40 ++++++++ .../ExternalProject_jfreereport_libfonts.mk | 40 ++++++++ .../ExternalProject_jfreereport_libformula.mk | 40 ++++++++ .../ExternalProject_jfreereport_liblayout.mk | 59 ++++++++++++ .../ExternalProject_jfreereport_libloader.mk | 40 ++++++++ ...ternalProject_jfreereport_librepository.mk | 40 ++++++++ ...ternalProject_jfreereport_libserializer.mk | 40 ++++++++ .../ExternalProject_jfreereport_libxml.mk | 40 ++++++++ .../ExternalProject_jfreereport_sac.mk | 36 ++++++++ jfreereport/Makefile | 7 ++ jfreereport/Module_jfreereport.mk | 53 +++++++++++ .../Package_jfreereport_flow_engine.mk | 19 ++++ jfreereport/Package_jfreereport_flute.mk | 19 ++++ jfreereport/Package_jfreereport_libbase.mk | 19 ++++ jfreereport/Package_jfreereport_libfonts.mk | 19 ++++ jfreereport/Package_jfreereport_libformula.mk | 19 ++++ jfreereport/Package_jfreereport_liblayout.mk | 19 ++++ jfreereport/Package_jfreereport_libloader.mk | 19 ++++ .../Package_jfreereport_librepository.mk | 19 ++++ .../Package_jfreereport_libserializer.mk | 19 ++++ jfreereport/Package_jfreereport_libxml.mk | 19 ++++ jfreereport/Package_jfreereport_sac.mk | 16 ++++ jfreereport/Package_jfreereport_version.mk | 14 +++ ...UnpackedTarball_jfreereport_flow_engine.mk | 22 +++++ .../UnpackedTarball_jfreereport_flute.mk | 22 +++++ .../UnpackedTarball_jfreereport_libbase.mk | 26 ++++++ .../UnpackedTarball_jfreereport_libfonts.mk | 26 ++++++ .../UnpackedTarball_jfreereport_libformula.mk | 22 +++++ .../UnpackedTarball_jfreereport_liblayout.mk | 22 +++++ .../UnpackedTarball_jfreereport_libloader.mk | 26 ++++++ ...packedTarball_jfreereport_librepository.mk | 26 ++++++ ...packedTarball_jfreereport_libserializer.mk | 22 +++++ .../UnpackedTarball_jfreereport_libxml.mk | 22 +++++ .../UnpackedTarball_jfreereport_sac.mk | 16 ++++ jfreereport/java/flute/makefile.mk | 79 ---------------- jfreereport/java/jfreereport/makefile.mk | 70 -------------- jfreereport/java/libbase/makefile.mk | 91 ------------------- jfreereport/java/libfonts/makefile.mk | 78 ---------------- jfreereport/java/libformula/makefile.mk | 81 ----------------- jfreereport/java/liblayout/makefile.mk | 71 --------------- jfreereport/java/libloader/makefile.mk | 78 ---------------- jfreereport/java/librepository/makefile.mk | 78 ---------------- jfreereport/java/libserializer/makefile.mk | 77 ---------------- jfreereport/java/libxml/makefile.mk | 77 ---------------- jfreereport/java/sac/build.xml | 64 +++++++++++++ jfreereport/java/sac/makefile.mk | 83 ----------------- jfreereport/patches/flow-engine.patch | 3 +- jfreereport/patches/liblayout.patch | 3 +- jfreereport/prj/build.lst | 15 +-- jfreereport/prj/dmake | 0 tail_build/prj/build.lst | 2 +- 58 files changed, 1097 insertions(+), 880 deletions(-) create mode 100644 jfreereport/ExternalProject_jfreereport_flow_engine.mk create mode 100644 jfreereport/ExternalProject_jfreereport_flute.mk create mode 100644 jfreereport/ExternalProject_jfreereport_libbase.mk create mode 100644 jfreereport/ExternalProject_jfreereport_libfonts.mk create mode 100644 jfreereport/ExternalProject_jfreereport_libformula.mk create mode 100644 jfreereport/ExternalProject_jfreereport_liblayout.mk create mode 100644 jfreereport/ExternalProject_jfreereport_libloader.mk create mode 100644 jfreereport/ExternalProject_jfreereport_librepository.mk create mode 100644 jfreereport/ExternalProject_jfreereport_libserializer.mk create mode 100644 jfreereport/ExternalProject_jfreereport_libxml.mk create mode 100644 jfreereport/ExternalProject_jfreereport_sac.mk create mode 100644 jfreereport/Makefile create mode 100644 jfreereport/Module_jfreereport.mk create mode 100644 jfreereport/Package_jfreereport_flow_engine.mk create mode 100644 jfreereport/Package_jfreereport_flute.mk create mode 100644 jfreereport/Package_jfreereport_libbase.mk create mode 100644 jfreereport/Package_jfreereport_libfonts.mk create mode 100644 jfreereport/Package_jfreereport_libformula.mk create mode 100644 jfreereport/Package_jfreereport_liblayout.mk create mode 100644 jfreereport/Package_jfreereport_libloader.mk create mode 100644 jfreereport/Package_jfreereport_librepository.mk create mode 100644 jfreereport/Package_jfreereport_libserializer.mk create mode 100644 jfreereport/Package_jfreereport_libxml.mk create mode 100644 jfreereport/Package_jfreereport_sac.mk create mode 100644 jfreereport/Package_jfreereport_version.mk create mode 100644 jfreereport/UnpackedTarball_jfreereport_flow_engine.mk create mode 100644 jfreereport/UnpackedTarball_jfreereport_flute.mk create mode 100644 jfreereport/UnpackedTarball_jfreereport_libbase.mk create mode 100644 jfreereport/UnpackedTarball_jfreereport_libfonts.mk create mode 100644 jfreereport/UnpackedTarball_jfreereport_libformula.mk create mode 100644 jfreereport/UnpackedTarball_jfreereport_liblayout.mk create mode 100644 jfreereport/UnpackedTarball_jfreereport_libloader.mk create mode 100644 jfreereport/UnpackedTarball_jfreereport_librepository.mk create mode 100644 jfreereport/UnpackedTarball_jfreereport_libserializer.mk create mode 100644 jfreereport/UnpackedTarball_jfreereport_libxml.mk create mode 100644 jfreereport/UnpackedTarball_jfreereport_sac.mk delete mode 100644 jfreereport/java/flute/makefile.mk delete mode 100644 jfreereport/java/jfreereport/makefile.mk delete mode 100644 jfreereport/java/libbase/makefile.mk delete mode 100644 jfreereport/java/libfonts/makefile.mk delete mode 100644 jfreereport/java/libformula/makefile.mk delete mode 100644 jfreereport/java/liblayout/makefile.mk delete mode 100644 jfreereport/java/libloader/makefile.mk delete mode 100644 jfreereport/java/librepository/makefile.mk delete mode 100644 jfreereport/java/libserializer/makefile.mk delete mode 100644 jfreereport/java/libxml/makefile.mk create mode 100644 jfreereport/java/sac/build.xml delete mode 100644 jfreereport/java/sac/makefile.mk delete mode 100644 jfreereport/prj/dmake diff --git a/Makefile.top b/Makefile.top index bb632a241546..ccf658988dac 100644 --- a/Makefile.top +++ b/Makefile.top @@ -89,6 +89,7 @@ idl\ idlc\ io\ javaunohelper\ +jfreereport\ jurt\ jvmaccess\ jvmfwk\ @@ -219,7 +220,6 @@ hunspell\ hyphen\ icu\ instsetoo_native\ -jfreereport\ jpeg\ libcroco\ libexttextcat\ diff --git a/Module_tail_build.mk b/Module_tail_build.mk index fa63c17da9d1..af87b1c8ae8c 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -81,6 +81,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ $(call gb_Helper_optional,DESKTOP,idlc) \ io \ javaunohelper \ + $(call gb_Helper_optional,JFREEREPORT,jfreereport) \ jurt \ jvmaccess \ jvmfwk \ diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index b10b3239ba08..24d12fa4f1f9 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -86,6 +86,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ $(call gb_Helper_optional,DESKTOP,idlc) \ io \ javaunohelper \ + $(call gb_Helper_optional,JFREEREPORT,jfreereport) \ jurt \ jvmaccess \ jvmfwk \ diff --git a/config_host.mk.in b/config_host.mk.in index 48710b16439a..b8988b14d85f 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -487,6 +487,17 @@ export RPM=@RPM@ export RTL_OS=@RTL_OS@ export RTL_ARCH=@RTL_ARCH@ export SAC_JAR=@SAC_JAR@ +export JFREEREPORT_SAC_TARBALL=@JFREEREPORT_SAC_TARBALL@ +export JFREEREPORT_LIBBASE_TARBALL=@JFREEREPORT_LIBBASE_TARBALL@ +export JFREEREPORT_FLUTE_TARBALL=@JFREEREPORT_FLUTE_TARBALL@ +export JFREEREPORT_LIBLOADER_TARBALL=@JFREEREPORT_LIBLOADER_TARBALL@ +export JFREEREPORT_LIBXML_TARBALL=@JFREEREPORT_LIBXML_TARBALL@ +export JFREEREPORT_LIBFORMULA_TARBALL=@JFREEREPORT_LIBFORMULA_TARBALL@ +export JFREEREPORT_LIBFONTS_TARBALL=@JFREEREPORT_LIBFONTS_TARBALL@ +export JFREEREPORT_LIBREPOSITORY_TARBALL=@JFREEREPORT_LIBREPOSITORY_TARBALL@ +export JFREEREPORT_LIBSERIALIZER_TARBALL=@JFREEREPORT_LIBSERIALIZER_TARBALL@ +export JFREEREPORT_FLOW_ENGINE_TARBALL=@JFREEREPORT_FLOW_ENGINE_TARBALL@ +export JFREEREPORT_LIBLAYOUT_TARBALL=@JFREEREPORT_LIBLAYOUT_TARBALL@ export SAL_ENABLE_FILE_LOCKING=1 export SAXON_JAR=@SAXON_JAR@ export SAXON_TARBALL=@SAXON_TARBALL@ diff --git a/configure.in b/configure.in index 244925e869c7..e4fddeb14c4c 100644 --- a/configure.in +++ b/configure.in @@ -9945,6 +9945,17 @@ if test "$enable_ext_report_builder" != "no" -a "x$enable_extension_integration" AC_MSG_RESULT([internal]) SYSTEM_JFREEREPORT=NO BUILD_TYPE="$BUILD_TYPE JFREEREPORT" + JFREEREPORT_SAC_TARBALL="39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip" + JFREEREPORT_LIBBASE_TARBALL="eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip" + JFREEREPORT_FLUTE_TARBALL="d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip" + JFREEREPORT_LIBLOADER_TARBALL="97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip" + JFREEREPORT_LIBXML_TARBALL="ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip" + JFREEREPORT_LIBFORMULA_TARBALL="3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip" + JFREEREPORT_LIBFONTS_TARBALL="3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip" + JFREEREPORT_LIBREPOSITORY_TARBALL="8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip" + JFREEREPORT_LIBSERIALIZER_TARBALL="f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip" + JFREEREPORT_FLOW_ENGINE_TARBALL="ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip" + JFREEREPORT_LIBLAYOUT_TARBALL="db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip" fi else AC_MSG_RESULT([no]) @@ -9955,6 +9966,17 @@ fi AC_SUBST(ENABLE_REPORTBUILDER) AC_SUBST(SYSTEM_JFREEREPORT) AC_SUBST(SAC_JAR) +AC_SUBST(JFREEREPORT_SAC_TARBALL) +AC_SUBST(JFREEREPORT_LIBBASE_TARBALL) +AC_SUBST(JFREEREPORT_FLUTE_TARBALL) +AC_SUBST(JFREEREPORT_LIBLOADER_TARBALL) +AC_SUBST(JFREEREPORT_LIBXML_TARBALL) +AC_SUBST(JFREEREPORT_LIBFORMULA_TARBALL) +AC_SUBST(JFREEREPORT_LIBFONTS_TARBALL) +AC_SUBST(JFREEREPORT_LIBREPOSITORY_TARBALL) +AC_SUBST(JFREEREPORT_LIBSERIALIZER_TARBALL) +AC_SUBST(JFREEREPORT_FLOW_ENGINE_TARBALL) +AC_SUBST(JFREEREPORT_LIBLAYOUT_TARBALL) AC_SUBST(LIBXML_JAR) AC_SUBST(FLUTE_JAR) AC_SUBST(JFREEREPORT_JAR) diff --git a/jfreereport/ExternalProject_jfreereport_flow_engine.mk b/jfreereport/ExternalProject_jfreereport_flow_engine.mk new file mode 100644 index 000000000000..3deb87ef9dc9 --- /dev/null +++ b/jfreereport/ExternalProject_jfreereport_flow_engine.mk @@ -0,0 +1,43 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# for RSCREVISION +include $(SOLARENV)/inc/minor.mk + +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_flow_engine)) + +$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_flow_engine,jfreereport_flow_engine)) + +$(eval $(call gb_ExternalProject_use_packages,jfreereport_flow_engine,\ + jfreereport_liblayout \ +)) + +$(eval $(call gb_ExternalProject_register_targets,jfreereport_flow_engine,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,jfreereport_flow_engine,build) : + cd "$(call gb_UnpackedTarball_get_dir,jfreereport_flow_engine)" && \ + "$(ANT)" \ + -q \ + -f build.xml \ + -Dbuild.label="build-$(RSCREVISION)" \ + $(if $(filter YES,$(SYSTEM_APACHE_COMMONS))\ + ,-Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) \ + )\ + -Dlib=$(OUTDIR)/bin \ + $(if $(filter yes,$(JAVACISGCJ))\ + ,-Dbuild.compiler=gcj \ + ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + ) \ + $(if $(debug),-Dbuild.debug="on") jar && \ + touch $@ + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/ExternalProject_jfreereport_flute.mk b/jfreereport/ExternalProject_jfreereport_flute.mk new file mode 100644 index 000000000000..120883e8dad4 --- /dev/null +++ b/jfreereport/ExternalProject_jfreereport_flute.mk @@ -0,0 +1,40 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# for RSCREVISION +include $(SOLARENV)/inc/minor.mk +# for VERSION +include $(SRCDIR)/jfreereport/version.mk + +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_flute)) + +$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_flute,jfreereport_flute)) + +$(eval $(call gb_ExternalProject_register_targets,jfreereport_flute,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,jfreereport_flute,build) : + cd "$(call gb_UnpackedTarball_get_dir,jfreereport_flute)" && \ + "$(ANT)" \ + -q \ + -f build.xml \ + -Dbuild.label="build-$(RSCREVISION)" \ + $(if $(filter yes,$(JAVACISGCJ))\ + ,-Dbuild.compiler=gcj \ + ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + ) \ + -Dantcontrib.available="true" \ + -Dbuild.id="10682" \ + -Dproject.revision="$(FLUTE_VERSION)" \ + $(if $(debug),-Dbuild.debug="on") jar && \ + touch $@ + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/ExternalProject_jfreereport_libbase.mk b/jfreereport/ExternalProject_jfreereport_libbase.mk new file mode 100644 index 000000000000..6977aae621ae --- /dev/null +++ b/jfreereport/ExternalProject_jfreereport_libbase.mk @@ -0,0 +1,40 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# for RSCREVISION +include $(SOLARENV)/inc/minor.mk +# for VERSION +include $(SRCDIR)/jfreereport/version.mk + +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libbase)) + +$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_libbase,jfreereport_libbase)) + +$(eval $(call gb_ExternalProject_register_targets,jfreereport_libbase,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,jfreereport_libbase,build) : + cd "$(call gb_UnpackedTarball_get_dir,jfreereport_libbase)" && \ + "$(ANT)" \ + -q \ + -f build.xml \ + -Dbuild.label="build-$(RSCREVISION)" \ + $(if $(filter yes,$(JAVACISGCJ))\ + ,-Dbuild.compiler=gcj \ + ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + ) \ + -Dantcontrib.available="true" \ + -Dbuild.id="10682" \ + -Dproject.revision="$(LIBBASE_VERSION)" \ + $(if $(debug),-Dbuild.debug="on") jar && \ + touch $@ + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/ExternalProject_jfreereport_libfonts.mk b/jfreereport/ExternalProject_jfreereport_libfonts.mk new file mode 100644 index 000000000000..01de6a21832e --- /dev/null +++ b/jfreereport/ExternalProject_jfreereport_libfonts.mk @@ -0,0 +1,40 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# for RSCREVISION +include $(SOLARENV)/inc/minor.mk +# for VERSION +include $(SRCDIR)/jfreereport/version.mk + +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libfonts)) + +$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_libfonts,jfreereport_libfonts)) + +$(eval $(call gb_ExternalProject_register_targets,jfreereport_libfonts,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,jfreereport_libfonts,build) : + cd "$(call gb_UnpackedTarball_get_dir,jfreereport_libfonts)" && \ + "$(ANT)" \ + -q \ + -f build.xml \ + -Dbuild.label="build-$(RSCREVISION)" \ + $(if $(filter yes,$(JAVACISGCJ))\ + ,-Dbuild.compiler=gcj \ + ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + ) \ + -Dantcontrib.available="true" \ + -Dbuild.id="10682" \ + -Dproject.revision="$(LIBFONTS_VERSION)" \ + $(if $(debug),-Dbuild.debug="on") jar && \ + touch $@ + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/ExternalProject_jfreereport_libformula.mk b/jfreereport/ExternalProject_jfreereport_libformula.mk new file mode 100644 index 000000000000..f1f329adc0ef --- /dev/null +++ b/jfreereport/ExternalProject_jfreereport_libformula.mk @@ -0,0 +1,40 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# for RSCREVISION +include $(SOLARENV)/inc/minor.mk +# for VERSION +include $(SRCDIR)/jfreereport/version.mk + +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libformula)) + +$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_libformula,jfreereport_libformula)) + +$(eval $(call gb_ExternalProject_register_targets,jfreereport_libformula,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,jfreereport_libformula,build) : + cd "$(call gb_UnpackedTarball_get_dir,jfreereport_libformula)" && \ + "$(ANT)" \ + -q \ + -f build.xml \ + -Dbuild.label="build-$(RSCREVISION)" \ + $(if $(filter yes,$(JAVACISGCJ))\ + ,-Dbuild.compiler=gcj \ + ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + ) \ + -Dantcontrib.available="true" \ + -Dbuild.id="10682" \ + -Dproject.revision="$(LIBFORMULA_VERSION)" \ + $(if $(debug),-Dbuild.debug="on") jar && \ + touch $@ + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/ExternalProject_jfreereport_liblayout.mk b/jfreereport/ExternalProject_jfreereport_liblayout.mk new file mode 100644 index 000000000000..afcb848a87a6 --- /dev/null +++ b/jfreereport/ExternalProject_jfreereport_liblayout.mk @@ -0,0 +1,59 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# for RSCREVISION +include $(SOLARENV)/inc/minor.mk + +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_liblayout)) + +$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_liblayout,jfreereport_liblayout)) + +ifneq ($(SYSTEM_APACHE_COMMONS),YES) +$(eval $(call gb_ExternalProject_use_packages,jfreereport_liblayout,\ + apache_commons_logging_inc \ +)) +endif + +$(eval $(call gb_ExternalProject_use_packages,jfreereport_liblayout,\ + jfreereport_sac \ + jfreereport_libbase \ + jfreereport_flute \ + jfreereport_libloader \ + jfreereport_libxml \ + jfreereport_libformula \ + jfreereport_libfonts \ + jfreereport_librepository \ + jfreereport_libserializer \ +)) + +$(eval $(call gb_ExternalProject_register_targets,jfreereport_liblayout,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,jfreereport_liblayout,build) : + cd "$(call gb_UnpackedTarball_get_dir,jfreereport_liblayout)" && \ + "$(ANT)" \ + -q \ + -f build.xml \ + -Dbuild.label="build-$(RSCREVISION)" \ + $(if $(filter YES,$(SYSTEM_APACHE_COMMONS))\ + ,-Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) \ + )\ + $(if $(filter yes,$(JAVACISGCJ))\ + ,-Dbuild.compiler=gcj \ + ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + ) \ + -Dantcontrib.available="true" \ + -Dbuild.id="10682" \ + -Dlib=$(OUTDIR)/bin \ + $(if $(debug),-Dbuild.debug="on") jar && \ + touch $@ + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/ExternalProject_jfreereport_libloader.mk b/jfreereport/ExternalProject_jfreereport_libloader.mk new file mode 100644 index 000000000000..bdcc7930ec57 --- /dev/null +++ b/jfreereport/ExternalProject_jfreereport_libloader.mk @@ -0,0 +1,40 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# for RSCREVISION +include $(SOLARENV)/inc/minor.mk +# for VERSION +include $(SRCDIR)/jfreereport/version.mk + +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libloader)) + +$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_libloader,jfreereport_libloader)) + +$(eval $(call gb_ExternalProject_register_targets,jfreereport_libloader,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,jfreereport_libloader,build) : + cd "$(call gb_UnpackedTarball_get_dir,jfreereport_libloader)" && \ + "$(ANT)" \ + -q \ + -f build.xml \ + -Dbuild.label="build-$(RSCREVISION)" \ + $(if $(filter yes,$(JAVACISGCJ))\ + ,-Dbuild.compiler=gcj \ + ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + ) \ + -Dantcontrib.available="true" \ + -Dbuild.id="10682" \ + -Dproject.revision="$(LIBLOADER_VERSION)" \ + $(if $(debug),-Dbuild.debug="on") jar && \ + touch $@ + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/ExternalProject_jfreereport_librepository.mk b/jfreereport/ExternalProject_jfreereport_librepository.mk new file mode 100644 index 000000000000..ffe4a4594eb3 --- /dev/null +++ b/jfreereport/ExternalProject_jfreereport_librepository.mk @@ -0,0 +1,40 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# for RSCREVISION +include $(SOLARENV)/inc/minor.mk +# for VERSION +include $(SRCDIR)/jfreereport/version.mk + +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_librepository)) + +$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_librepository,jfreereport_librepository)) + +$(eval $(call gb_ExternalProject_register_targets,jfreereport_librepository,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,jfreereport_librepository,build) : + cd "$(call gb_UnpackedTarball_get_dir,jfreereport_librepository)" && \ + "$(ANT)" \ + -q \ + -f build.xml \ + -Dbuild.label="build-$(RSCREVISION)" \ + $(if $(filter yes,$(JAVACISGCJ))\ + ,-Dbuild.compiler=gcj \ + ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + ) \ + -Dantcontrib.available="true" \ + -Dbuild.id="10682" \ + -Dproject.revision="$(LIBREPOSITORY_VERSION)" \ + $(if $(debug),-Dbuild.debug="on") jar && \ + touch $@ + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/ExternalProject_jfreereport_libserializer.mk b/jfreereport/ExternalProject_jfreereport_libserializer.mk new file mode 100644 index 000000000000..8a4ad1341d2e --- /dev/null +++ b/jfreereport/ExternalProject_jfreereport_libserializer.mk @@ -0,0 +1,40 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# for RSCREVISION +include $(SOLARENV)/inc/minor.mk +# for VERSION +include $(SRCDIR)/jfreereport/version.mk + +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libserializer)) + +$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_libserializer,jfreereport_libserializer)) + +$(eval $(call gb_ExternalProject_register_targets,jfreereport_libserializer,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,jfreereport_libserializer,build) : + cd "$(call gb_UnpackedTarball_get_dir,jfreereport_libserializer)" && \ + "$(ANT)" \ + -q \ + -f build.xml \ + -Dbuild.label="build-$(RSCREVISION)" \ + $(if $(filter yes,$(JAVACISGCJ))\ + ,-Dbuild.compiler=gcj \ + ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + ) \ + -Dantcontrib.available="true" \ + -Dbuild.id="10682" \ + -Dproject.revision="$(LIBSERIALIZER_VERSION)" \ + $(if $(debug),-Dbuild.debug="on") jar && \ + touch $@ + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/ExternalProject_jfreereport_libxml.mk b/jfreereport/ExternalProject_jfreereport_libxml.mk new file mode 100644 index 000000000000..0d21948fab7d --- /dev/null +++ b/jfreereport/ExternalProject_jfreereport_libxml.mk @@ -0,0 +1,40 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# for RSCREVISION +include $(SOLARENV)/inc/minor.mk +# for VERSION +include $(SRCDIR)/jfreereport/version.mk + +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libxml)) + +$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_libxml,jfreereport_libxml)) + +$(eval $(call gb_ExternalProject_register_targets,jfreereport_libxml,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,jfreereport_libxml,build) : + cd "$(call gb_UnpackedTarball_get_dir,jfreereport_libxml)" && \ + "$(ANT)" \ + -q \ + -f build.xml \ + -Dbuild.label="build-$(RSCREVISION)" \ + $(if $(filter yes,$(JAVACISGCJ))\ + ,-Dbuild.compiler=gcj \ + ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + ) \ + -Dantcontrib.available="true" \ + -Dbuild.id="10682" \ + -Dproject.revision="$(LIBXML_VERSION)" \ + $(if $(debug),-Dbuild.debug="on") jar && \ + touch $@ + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/ExternalProject_jfreereport_sac.mk b/jfreereport/ExternalProject_jfreereport_sac.mk new file mode 100644 index 000000000000..9e5286bfc095 --- /dev/null +++ b/jfreereport/ExternalProject_jfreereport_sac.mk @@ -0,0 +1,36 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# for RSCREVISION +include $(SOLARENV)/inc/minor.mk + +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_sac)) + +$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_sac,jfreereport_sac)) + +$(eval $(call gb_ExternalProject_register_targets,jfreereport_sac,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,jfreereport_sac,build) : + cd "$(call gb_UnpackedTarball_get_dir,jfreereport_sac)" && \ + "$(ANT)" \ + -q \ + -f build.xml \ + -Dbuild.label="build-$(RSCREVISION)" \ + $(if $(filter yes,$(JAVACISGCJ))\ + ,-Dbuild.compiler=gcj \ + ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + ) \ + -Dantcontrib.available="true" \ + $(if $(debug),-Dbuild.debug="on") all && \ + touch $@ + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/Makefile b/jfreereport/Makefile new file mode 100644 index 000000000000..ccb1c85a04da --- /dev/null +++ b/jfreereport/Makefile @@ -0,0 +1,7 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +include $(module_directory)/../solenv/gbuild/partial_build.mk + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/Module_jfreereport.mk b/jfreereport/Module_jfreereport.mk new file mode 100644 index 000000000000..ffaa9429775c --- /dev/null +++ b/jfreereport/Module_jfreereport.mk @@ -0,0 +1,53 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Module_Module,jfreereport)) + +ifneq ($(SOLAR_JAVA),) +ifneq ($(filter JFREEREPORT,$(BUILD_TYPE)),) +$(eval $(call gb_Module_add_targets,jfreereport,\ + UnpackedTarball_jfreereport_sac \ + ExternalProject_jfreereport_sac \ + Package_jfreereport_sac \ + UnpackedTarball_jfreereport_libbase \ + ExternalProject_jfreereport_libbase \ + Package_jfreereport_libbase \ + UnpackedTarball_jfreereport_flute \ + ExternalProject_jfreereport_flute \ + Package_jfreereport_flute \ + UnpackedTarball_jfreereport_libloader \ + ExternalProject_jfreereport_libloader \ + Package_jfreereport_libloader \ + UnpackedTarball_jfreereport_libxml \ + ExternalProject_jfreereport_libxml \ + Package_jfreereport_libxml \ + UnpackedTarball_jfreereport_libformula \ + ExternalProject_jfreereport_libformula \ + Package_jfreereport_libformula \ + UnpackedTarball_jfreereport_libfonts \ + ExternalProject_jfreereport_libfonts \ + Package_jfreereport_libfonts \ + ExternalProject_jfreereport_librepository \ + UnpackedTarball_jfreereport_librepository \ + Package_jfreereport_librepository \ + UnpackedTarball_jfreereport_libserializer \ + ExternalProject_jfreereport_libserializer \ + Package_jfreereport_libserializer \ + UnpackedTarball_jfreereport_liblayout \ + ExternalProject_jfreereport_liblayout \ + Package_jfreereport_liblayout \ + UnpackedTarball_jfreereport_flow_engine \ + ExternalProject_jfreereport_flow_engine \ + Package_jfreereport_flow_engine \ + Package_jfreereport_version \ +)) +endif +endif + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/Package_jfreereport_flow_engine.mk b/jfreereport/Package_jfreereport_flow_engine.mk new file mode 100644 index 000000000000..eacddb3c1867 --- /dev/null +++ b/jfreereport/Package_jfreereport_flow_engine.mk @@ -0,0 +1,19 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# for VERSION +include $(SRCDIR)/jfreereport/version.mk + +$(eval $(call gb_Package_Package,jfreereport_flow_engine,$(call gb_UnpackedTarball_get_dir,jfreereport_flow_engine))) + +$(eval $(call gb_Package_use_external_project,jfreereport_flow_engine,jfreereport_flow_engine)) + +$(eval $(call gb_Package_add_file,jfreereport_flow_engine,bin/flow-engine-$(FLOW_ENGINE_VERSION).jar,build/lib/flow-engine.jar)) + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/Package_jfreereport_flute.mk b/jfreereport/Package_jfreereport_flute.mk new file mode 100644 index 000000000000..eddb4281e147 --- /dev/null +++ b/jfreereport/Package_jfreereport_flute.mk @@ -0,0 +1,19 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# for VERSION +include $(SRCDIR)/jfreereport/version.mk + +$(eval $(call gb_Package_Package,jfreereport_flute,$(call gb_UnpackedTarball_get_dir,jfreereport_flute))) + +$(eval $(call gb_Package_use_external_project,jfreereport_flute,jfreereport_flute)) + +$(eval $(call gb_Package_add_file,jfreereport_flute,bin/flute-$(FLUTE_VERSION).jar,dist/flute-$(FLUTE_VERSION).jar)) + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/Package_jfreereport_libbase.mk b/jfreereport/Package_jfreereport_libbase.mk new file mode 100644 index 000000000000..073cce50cb2b --- /dev/null +++ b/jfreereport/Package_jfreereport_libbase.mk @@ -0,0 +1,19 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# for VERSION +include $(SRCDIR)/jfreereport/version.mk + +$(eval $(call gb_Package_Package,jfreereport_libbase,$(call gb_UnpackedTarball_get_dir,jfreereport_libbase))) + +$(eval $(call gb_Package_use_external_project,jfreereport_libbase,jfreereport_libbase)) + +$(eval $(call gb_Package_add_file,jfreereport_libbase,bin/libbase-$(LIBBASE_VERSION).jar,dist/libbase-$(LIBBASE_VERSION).jar)) + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/Package_jfreereport_libfonts.mk b/jfreereport/Package_jfreereport_libfonts.mk new file mode 100644 index 000000000000..22152c019afd --- /dev/null +++ b/jfreereport/Package_jfreereport_libfonts.mk @@ -0,0 +1,19 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# for VERSION +include $(SRCDIR)/jfreereport/version.mk + +$(eval $(call gb_Package_Package,jfreereport_libfonts,$(call gb_UnpackedTarball_get_dir,jfreereport_libfonts))) + +$(eval $(call gb_Package_use_external_project,jfreereport_libfonts,jfreereport_libfonts)) + +$(eval $(call gb_Package_add_file,jfreereport_libfonts,bin/libfonts-$(LIBFONTS_VERSION).jar,dist/libfonts-$(LIBFONTS_VERSION).jar)) + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/Package_jfreereport_libformula.mk b/jfreereport/Package_jfreereport_libformula.mk new file mode 100644 index 000000000000..87538b89cb0f --- /dev/null +++ b/jfreereport/Package_jfreereport_libformula.mk @@ -0,0 +1,19 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# for VERSION +include $(SRCDIR)/jfreereport/version.mk + +$(eval $(call gb_Package_Package,jfreereport_libformula,$(call gb_UnpackedTarball_get_dir,jfreereport_libformula))) + +$(eval $(call gb_Package_use_external_project,jfreereport_libformula,jfreereport_libformula)) + +$(eval $(call gb_Package_add_file,jfreereport_libformula,bin/libformula-$(LIBFORMULA_VERSION).jar,dist/libformula-$(LIBFORMULA_VERSION).jar)) + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/Package_jfreereport_liblayout.mk b/jfreereport/Package_jfreereport_liblayout.mk new file mode 100644 index 000000000000..d06c3a31beb1 --- /dev/null +++ b/jfreereport/Package_jfreereport_liblayout.mk @@ -0,0 +1,19 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# for VERSION +include $(SRCDIR)/jfreereport/version.mk + +$(eval $(call gb_Package_Package,jfreereport_liblayout,$(call gb_UnpackedTarball_get_dir,jfreereport_liblayout))) + +$(eval $(call gb_Package_use_external_project,jfreereport_liblayout,jfreereport_liblayout)) + +$(eval $(call gb_Package_add_file,jfreereport_liblayout,bin/liblayout-$(LIBLAYOUT_VERSION).jar,build/lib/liblayout.jar)) + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/Package_jfreereport_libloader.mk b/jfreereport/Package_jfreereport_libloader.mk new file mode 100644 index 000000000000..e67c1e46bed7 --- /dev/null +++ b/jfreereport/Package_jfreereport_libloader.mk @@ -0,0 +1,19 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# for VERSION +include $(SRCDIR)/jfreereport/version.mk + +$(eval $(call gb_Package_Package,jfreereport_libloader,$(call gb_UnpackedTarball_get_dir,jfreereport_libloader))) + +$(eval $(call gb_Package_use_external_project,jfreereport_libloader,jfreereport_libloader)) + +$(eval $(call gb_Package_add_file,jfreereport_libloader,bin/libloader-$(LIBLOADER_VERSION).jar,dist/libloader-$(LIBLOADER_VERSION).jar)) + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/Package_jfreereport_librepository.mk b/jfreereport/Package_jfreereport_librepository.mk new file mode 100644 index 000000000000..ec5f8376d874 --- /dev/null +++ b/jfreereport/Package_jfreereport_librepository.mk @@ -0,0 +1,19 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# for VERSION +include $(SRCDIR)/jfreereport/version.mk + +$(eval $(call gb_Package_Package,jfreereport_librepository,$(call gb_UnpackedTarball_get_dir,jfreereport_librepository))) + +$(eval $(call gb_Package_use_external_project,jfreereport_librepository,jfreereport_librepository)) + +$(eval $(call gb_Package_add_file,jfreereport_librepository,bin/librepository-$(LIBREPOSITORY_VERSION).jar,dist/librepository-$(LIBREPOSITORY_VERSION).jar)) + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/Package_jfreereport_libserializer.mk b/jfreereport/Package_jfreereport_libserializer.mk new file mode 100644 index 000000000000..3ac26a9487a8 --- /dev/null +++ b/jfreereport/Package_jfreereport_libserializer.mk @@ -0,0 +1,19 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# for VERSION +include $(SRCDIR)/jfreereport/version.mk + +$(eval $(call gb_Package_Package,jfreereport_libserializer,$(call gb_UnpackedTarball_get_dir,jfreereport_libserializer))) + +$(eval $(call gb_Package_use_external_project,jfreereport_libserializer,jfreereport_libserializer)) + +$(eval $(call gb_Package_add_file,jfreereport_libserializer,bin/libserializer-$(LIBBASE_VERSION).jar,dist/libserializer-$(LIBBASE_VERSION).jar)) + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/Package_jfreereport_libxml.mk b/jfreereport/Package_jfreereport_libxml.mk new file mode 100644 index 000000000000..6669f331a129 --- /dev/null +++ b/jfreereport/Package_jfreereport_libxml.mk @@ -0,0 +1,19 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# for VERSION +include $(SRCDIR)/jfreereport/version.mk + +$(eval $(call gb_Package_Package,jfreereport_libxml,$(call gb_UnpackedTarball_get_dir,jfreereport_libxml))) + +$(eval $(call gb_Package_use_external_project,jfreereport_libxml,jfreereport_libxml)) + +$(eval $(call gb_Package_add_file,jfreereport_libxml,bin/libxml-$(LIBXML_VERSION).jar,dist/libxml-$(LIBXML_VERSION).jar)) + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/Package_jfreereport_sac.mk b/jfreereport/Package_jfreereport_sac.mk new file mode 100644 index 000000000000..d4c0f86f9bb5 --- /dev/null +++ b/jfreereport/Package_jfreereport_sac.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Package_Package,jfreereport_sac,$(call gb_UnpackedTarball_get_dir,jfreereport_sac))) + +$(eval $(call gb_Package_use_external_project,jfreereport_sac,jfreereport_sac)) + +$(eval $(call gb_Package_add_file,jfreereport_sac,bin/sac.jar,build/lib/sac.jar)) + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/Package_jfreereport_version.mk b/jfreereport/Package_jfreereport_version.mk new file mode 100644 index 000000000000..5384d6a7f523 --- /dev/null +++ b/jfreereport/Package_jfreereport_version.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Package_Package,jfreereport_version,$(SRCDIR)/jfreereport)) + +$(eval $(call gb_Package_add_file,jfreereport_version,bin/jfreereport_version.mk,version.mk)) + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk b/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk new file mode 100644 index 000000000000..af4dcd6a25b6 --- /dev/null +++ b/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk @@ -0,0 +1,22 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_flow_engine)) + +$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_flow_engine,$(JFREEREPORT_FLOW_ENGINE_TARBALL),0)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_flow_engine,\ + build.xml \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_flow_engine,\ + jfreereport/patches/flow-engine.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_flute.mk b/jfreereport/UnpackedTarball_jfreereport_flute.mk new file mode 100644 index 000000000000..9a7ed95c242a --- /dev/null +++ b/jfreereport/UnpackedTarball_jfreereport_flute.mk @@ -0,0 +1,22 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_flute)) + +$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_flute,$(JFREEREPORT_FLUTE_TARBALL),0)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_flute,\ + common_build.xml \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_flute,\ + jfreereport/patches/common_build.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_libbase.mk b/jfreereport/UnpackedTarball_jfreereport_libbase.mk new file mode 100644 index 000000000000..63d2ce3d8525 --- /dev/null +++ b/jfreereport/UnpackedTarball_jfreereport_libbase.mk @@ -0,0 +1,26 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# for VERSION +include $(SRCDIR)/jfreereport/version.mk + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_libbase)) + +$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_libbase,$(JFREEREPORT_LIBBASE_TARBALL),0)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libbase,\ + common_build.xml \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libbase,\ + jfreereport/patches/common_build.patch \ + jfreereport/patches/libbase-$(LIBBASE_VERSION)-deprecated.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_libfonts.mk b/jfreereport/UnpackedTarball_jfreereport_libfonts.mk new file mode 100644 index 000000000000..c471ee03d63d --- /dev/null +++ b/jfreereport/UnpackedTarball_jfreereport_libfonts.mk @@ -0,0 +1,26 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# for VERSION +include $(SRCDIR)/jfreereport/version.mk + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_libfonts)) + +$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_libfonts,$(JFREEREPORT_LIBFONTS_TARBALL),0)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libfonts,\ + common_build.xml \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libfonts,\ + jfreereport/patches/common_build.patch \ + jfreereport/patches/libfonts-$(LIBFONTS_VERSION)-deprecated.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_libformula.mk b/jfreereport/UnpackedTarball_jfreereport_libformula.mk new file mode 100644 index 000000000000..4d5529393a56 --- /dev/null +++ b/jfreereport/UnpackedTarball_jfreereport_libformula.mk @@ -0,0 +1,22 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_libformula)) + +$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_libformula,$(JFREEREPORT_LIBFORMULA_TARBALL),0)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libformula,\ + common_build.xml \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libformula,\ + jfreereport/patches/common_build.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_liblayout.mk b/jfreereport/UnpackedTarball_jfreereport_liblayout.mk new file mode 100644 index 000000000000..f91311fb5190 --- /dev/null +++ b/jfreereport/UnpackedTarball_jfreereport_liblayout.mk @@ -0,0 +1,22 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_liblayout)) + +$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_liblayout,$(JFREEREPORT_LIBLAYOUT_TARBALL),0)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_liblayout,\ + build.xml \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_liblayout,\ + jfreereport/patches/liblayout.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_libloader.mk b/jfreereport/UnpackedTarball_jfreereport_libloader.mk new file mode 100644 index 000000000000..b34d414cb22f --- /dev/null +++ b/jfreereport/UnpackedTarball_jfreereport_libloader.mk @@ -0,0 +1,26 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# for VERSION +include $(SRCDIR)/jfreereport/version.mk + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_libloader)) + +$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_libloader,$(JFREEREPORT_LIBLOADER_TARBALL),0)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libloader,\ + common_build.xml \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libloader,\ + jfreereport/patches/common_build.patch \ + jfreereport/patches/libloader-$(LIBLOADER_VERSION)-deprecated.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_librepository.mk b/jfreereport/UnpackedTarball_jfreereport_librepository.mk new file mode 100644 index 000000000000..4262ddc6563f --- /dev/null +++ b/jfreereport/UnpackedTarball_jfreereport_librepository.mk @@ -0,0 +1,26 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# for VERSION +include $(SRCDIR)/jfreereport/version.mk + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_librepository)) + +$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_librepository,$(JFREEREPORT_LIBREPOSITORY_TARBALL),0)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_librepository,\ + common_build.xml \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_librepository,\ + jfreereport/patches/common_build.patch \ + jfreereport/patches/librepository-$(LIBREPOSITORY_VERSION)-deprecated.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_libserializer.mk b/jfreereport/UnpackedTarball_jfreereport_libserializer.mk new file mode 100644 index 000000000000..6c3992d11ee9 --- /dev/null +++ b/jfreereport/UnpackedTarball_jfreereport_libserializer.mk @@ -0,0 +1,22 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_libserializer)) + +$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_libserializer,$(JFREEREPORT_LIBSERIALIZER_TARBALL),0)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libserializer,\ + common_build.xml \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libserializer,\ + jfreereport/patches/common_build.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_libxml.mk b/jfreereport/UnpackedTarball_jfreereport_libxml.mk new file mode 100644 index 000000000000..820eaac2d493 --- /dev/null +++ b/jfreereport/UnpackedTarball_jfreereport_libxml.mk @@ -0,0 +1,22 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_libxml)) + +$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_libxml,$(JFREEREPORT_LIBXML_TARBALL),0)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libxml,\ + common_build.xml \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libxml,\ + jfreereport/patches/common_build.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/UnpackedTarball_jfreereport_sac.mk b/jfreereport/UnpackedTarball_jfreereport_sac.mk new file mode 100644 index 000000000000..2dcfd6484278 --- /dev/null +++ b/jfreereport/UnpackedTarball_jfreereport_sac.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_sac)) + +$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_sac,$(JFREEREPORT_SAC_TARBALL))) + +$(eval $(call gb_UnpackedTarball_add_file,jfreereport_sac,build.xml,jfreereport/java/sac/build.xml)) + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/java/flute/makefile.mk b/jfreereport/java/flute/makefile.mk deleted file mode 100644 index 63731fda8997..000000000000 --- a/jfreereport/java/flute/makefile.mk +++ /dev/null @@ -1,79 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=jfreereport -TARGET=flute - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : antsettings.mk -.INCLUDE : $(PRJ)$/version.mk - -.IF "$(SOLAR_JAVA)" != "" -# --- Files -------------------------------------------------------- -.IF "$(L10N_framework)"=="" -TARFILE_NAME=$(TARGET)-$(FLUTE_VERSION) -TARFILE_MD5=d8bd5eed178db6e2b18eeed243f85aa8 -# TARFILE_ROOTDIR=$(TARGET) -TARFILE_IS_FLAT=true -PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch -CONVERTFILES=common_build.xml - -.IF "$(JAVACISGCJ)"=="yes" -JAVA_HOME= -.EXPORT : JAVA_HOME -BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(FLUTE_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar -.ELSE -BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(FLUTE_VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar -.ENDIF - -.ENDIF # $(SOLAR_JAVA)!= "" - -# --- Targets ------------------------------------------------------ -.ENDIF - -.INCLUDE : set_ext.mk -.INCLUDE : target.mk - -.IF "$(SOLAR_JAVA)" != "" -.INCLUDE : tg_ext.mk -.IF "$(L10N_framework)"=="" -ALLTAR : $(CLASSDIR)$/$(TARGET)-$(FLUTE_VERSION).jar - -$(PACKAGE_DIR)$/$(TARGET).patch : - @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir) - ( $(TYPE:s/+//) $(PRJ)$/patches$/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(FLUTE_VERSION)/g' > $(PACKAGE_DIR)$/$(TARGET).patch ) - $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)$/so_converted_$(TARGET).dummy - -$(CLASSDIR)$/$(TARGET)-$(FLUTE_VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) - $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(FLUTE_VERSION).jar $(CLASSDIR)$/$(TARGET)-$(FLUTE_VERSION).jar -.ENDIF -.ENDIF - diff --git a/jfreereport/java/jfreereport/makefile.mk b/jfreereport/java/jfreereport/makefile.mk deleted file mode 100644 index af9237661112..000000000000 --- a/jfreereport/java/jfreereport/makefile.mk +++ /dev/null @@ -1,70 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=jfreereport -TARGET=flow-engine - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : antsettings.mk -.INCLUDE : $(PRJ)$/version.mk - -.IF "$(SOLAR_JAVA)" != "" -# --- Files -------------------------------------------------------- -.IF "$(L10N_framework)"=="" -TARFILE_NAME=$(TARGET)-$(FLOW_ENGINE_VERSION) -TARFILE_IS_FLAT=true -TARFILE_MD5=ba2930200c9f019c2d93a8c88c651a0f -PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch -CONVERTFILES=build.xml - -.IF "$(JAVACISGCJ)"=="yes" -JAVA_HOME= -.EXPORT : JAVA_HOME -BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar -.ELSE -BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar -.ENDIF - -.ENDIF # $(SOLAR_JAVA)!= "" -.ENDIF -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_ext.mk -.INCLUDE : target.mk - -.IF "$(SOLAR_JAVA)" != "" -.INCLUDE : tg_ext.mk -.IF "$(L10N_framework)"=="" -ALLTAR : $(CLASSDIR)$/$(TARGET)-$(FLOW_ENGINE_VERSION).jar -$(CLASSDIR)$/$(TARGET)-$(FLOW_ENGINE_VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) - $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)-$(FLOW_ENGINE_VERSION).jar -.ENDIF -.ENDIF diff --git a/jfreereport/java/libbase/makefile.mk b/jfreereport/java/libbase/makefile.mk deleted file mode 100644 index 54a247ba61f3..000000000000 --- a/jfreereport/java/libbase/makefile.mk +++ /dev/null @@ -1,91 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=../.. - -PRJNAME=jfreereport -TARGET=libbase -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : antsettings.mk -.INCLUDE : $(PRJ)/version.mk - -.IF "$(SOLAR_JAVA)" != "" -# --- Files -------------------------------------------------------- - -TARFILE_NAME=$(TARGET)-$(LIBBASE_VERSION) -TARFILE_MD5=eeb2c7ddf0d302fba4bfc6e97eac9624 -#TARFILE_ROOTDIR=$(TARGET) -TARFILE_IS_FLAT=true - -PATCH_FILES=$(PACKAGE_DIR)/$(TARGET).patch $(PRJ)/patches/$(TARGET)-$(LIBBASE_VERSION)-deprecated.patch -CONVERTFILES=common_build.xml - -.IF "$(JAVACISGCJ)"=="yes" -JAVA_HOME= -.EXPORT : JAVA_HOME -BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBBASE_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar -.ELSE -BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBBASE_VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar -.ENDIF - -.ENDIF # $(SOLAR_JAVA)!= "" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_ext.mk -.INCLUDE : target.mk - -.IF "$(SOLAR_JAVA)" != "" -.IF "$(L10N_framework)"=="" -.INCLUDE : tg_ext.mk - -ALLTAR : $(CLASSDIR)/$(TARGET)-$(LIBBASE_VERSION).jar - -$(PACKAGE_DIR)/$(TARGET).patch : - @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir) - ( $(TYPE:s/+//) $(PRJ)/patches/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBBASE_VERSION)/g' > $(PACKAGE_DIR)/$(TARGET).patch ) - $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)/so_converted_$(TARGET).dummy - -# XCLASSPATH/CLASSPATH does not work and we only can give lib once. But -# the build.xmls fortunately take *.jar out of lib so we can copy our -# commons-logging.jar here - yes, even in the system-apache commons case. -# Sucks. -$(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE) : $(CLASSDIR)/commons-logging.jar - -$(CLASSDIR)/commons-logging.jar : -.IF "$(SYSTEM_APACHE_COMMONS)" != "YES" - $(COPY) $(OUTDIR)/bin/commons-logging-1.1.1.jar $(CLASSDIR)/commons-logging.jar -.ELSE - $(COPY) $(COMMONS_LOGGING_JAR) $(CLASSDIR)/commons-logging.jar -.ENDIF - -$(CLASSDIR)/$(TARGET)-$(LIBBASE_VERSION).jar : $(CLASSDIR)/commons-logging.jar $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE) - $(COPY) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/dist/$(TARGET)-$(LIBBASE_VERSION).jar $(CLASSDIR)/$(TARGET)-$(LIBBASE_VERSION).jar -.ENDIF -.ENDIF diff --git a/jfreereport/java/libfonts/makefile.mk b/jfreereport/java/libfonts/makefile.mk deleted file mode 100644 index 69f181c785d4..000000000000 --- a/jfreereport/java/libfonts/makefile.mk +++ /dev/null @@ -1,78 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=../.. - -PRJNAME=jfreereport -TARGET=libfonts - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : antsettings.mk -.INCLUDE : $(PRJ)/version.mk - -.IF "$(SOLAR_JAVA)" != "" -# --- Files -------------------------------------------------------- -.IF "$(L10N_framework)"=="" -TARFILE_NAME=$(TARGET)-$(LIBFONTS_VERSION) -TARFILE_IS_FLAT=true -TARFILE_MD5=3bdf40c0d199af31923e900d082ca2dd -PATCH_FILES=$(PACKAGE_DIR)/$(TARGET).patch $(PRJ)/patches/$(TARGET)-$(LIBFONTS_VERSION)-deprecated.patch -CONVERTFILES=common_build.xml - -.IF "$(JAVACISGCJ)"=="yes" -JAVA_HOME= -.EXPORT : JAVA_HOME -BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBFONTS_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar -.ELSE -BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBFONTS_VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar -.ENDIF - -.ENDIF # $(SOLAR_JAVA)!= "" -.ENDIF -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_ext.mk -.INCLUDE : target.mk -.IF "$(L10N_framework)"=="" -.IF "$(SOLAR_JAVA)" != "" -.INCLUDE : tg_ext.mk - -ALLTAR : $(CLASSDIR)/$(TARGET)-$(LIBFONTS_VERSION).jar - -$(PACKAGE_DIR)/$(TARGET).patch : - @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir) - ( $(TYPE:s/+//) $(PRJ)/patches/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBFONTS_VERSION)/g' > $(PACKAGE_DIR)/$(TARGET).patch ) - $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)/so_converted_$(TARGET).dummy - -$(CLASSDIR)/$(TARGET)-$(LIBFONTS_VERSION).jar : $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE) - $(COPY) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/dist/$(TARGET)-$(LIBFONTS_VERSION).jar $(CLASSDIR)/$(TARGET)-$(LIBFONTS_VERSION).jar - -.ENDIF -.ENDIF - diff --git a/jfreereport/java/libformula/makefile.mk b/jfreereport/java/libformula/makefile.mk deleted file mode 100644 index d6f108721ee8..000000000000 --- a/jfreereport/java/libformula/makefile.mk +++ /dev/null @@ -1,81 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=jfreereport -TARGET=libformula - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : antsettings.mk -.INCLUDE : $(PRJ)$/version.mk - -.IF "$(SOLAR_JAVA)" != "" -# --- Files -------------------------------------------------------- -.IF "$(L10N_framework)"=="" -TARFILE_NAME=$(TARGET)-$(LIBFORMULA_VERSION) -TARFILE_IS_FLAT=true -TARFILE_MD5=3404ab6b1792ae5f16bbd603bd1e1d03 -PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch -CONVERTFILES=common_build.xml - -.IF "$(JAVACISGCJ)"=="yes" -JAVA_HOME= -.EXPORT : JAVA_HOME -BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBFORMULA_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar -.ELSE -BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBFORMULA_VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar -.ENDIF - - -.ENDIF # $(SOLAR_JAVA)!= "" -.ENDIF -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_ext.mk -.INCLUDE : target.mk -.IF "$(L10N_framework)"=="" -.IF "$(SOLAR_JAVA)" != "" -.INCLUDE : tg_ext.mk - -ALLTAR : $(CLASSDIR)$/$(TARGET)-$(LIBFORMULA_VERSION).jar - -$(PACKAGE_DIR)$/$(TARGET).patch : - @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir) - ( $(TYPE:s/+//) $(PRJ)$/patches$/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBFORMULA_VERSION)/g' > $(PACKAGE_DIR)$/$(TARGET).patch ) - $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)$/so_converted_$(TARGET).dummy - -$(CLASSDIR)$/$(TARGET)-$(LIBFORMULA_VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) - $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(LIBFORMULA_VERSION).jar $(CLASSDIR)$/$(TARGET)-$(LIBFORMULA_VERSION).jar - -.ENDIF -# $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/source$/org$/jfree$/formula$/function$/information$/IsRef-Function.properties : -# @@-$(MKDIRHIER) $(@:d) -# $(MV) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/source$/org$/jfree$/formula$/function$/information$/isRef-Function.properties $@ -.ENDIF diff --git a/jfreereport/java/liblayout/makefile.mk b/jfreereport/java/liblayout/makefile.mk deleted file mode 100644 index 92c8a327e07c..000000000000 --- a/jfreereport/java/liblayout/makefile.mk +++ /dev/null @@ -1,71 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=jfreereport -TARGET=liblayout - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : antsettings.mk -.INCLUDE : $(PRJ)$/version.mk - -.IF "$(SOLAR_JAVA)" != "" -# --- Files -------------------------------------------------------- -.IF "$(L10N_framework)"=="" -TARFILE_NAME=$(TARGET)-$(LIBLAYOUT_VERSION) -TARFILE_IS_FLAT=true -TARFILE_MD5=db60e4fde8dd6d6807523deb71ee34dc -PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch -CONVERTFILES=build.xml - -.IF "$(JAVACISGCJ)"=="yes" -JAVA_HOME= -.EXPORT : JAVA_HOME -BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar -.ELSE -BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar -.ENDIF - -.ENDIF # $(SOLAR_JAVA)!= "" -.ENDIF -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_ext.mk -.INCLUDE : target.mk -.IF "$(L10N_framework)"=="" -.IF "$(SOLAR_JAVA)" != "" -.INCLUDE : tg_ext.mk - -ALLTAR : $(CLASSDIR)$/$(TARGET)-$(LIBLAYOUT_VERSION).jar -$(CLASSDIR)$/$(TARGET)-$(LIBLAYOUT_VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) - $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)-$(LIBLAYOUT_VERSION).jar - -.ENDIF -.ENDIF diff --git a/jfreereport/java/libloader/makefile.mk b/jfreereport/java/libloader/makefile.mk deleted file mode 100644 index 811d382d72b9..000000000000 --- a/jfreereport/java/libloader/makefile.mk +++ /dev/null @@ -1,78 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=../.. - -PRJNAME=jfreereport -TARGET=libloader - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : antsettings.mk -.INCLUDE : $(PRJ)/version.mk - -.IF "$(SOLAR_JAVA)" != "" -# --- Files -------------------------------------------------------- - -TARFILE_NAME=$(TARGET)-$(LIBLOADER_VERSION) -TARFILE_IS_FLAT=true -TARFILE_MD5=97b2d4dba862397f446b217e2b623e71 -PATCH_FILES=$(PACKAGE_DIR)/$(TARGET).patch $(PRJ)/patches/$(TARGET)-$(LIBLOADER_VERSION)-deprecated.patch -CONVERTFILES=common_build.xml - -.IF "$(L10N_framework)"=="" -.IF "$(JAVACISGCJ)"=="yes" -JAVA_HOME= -.EXPORT : JAVA_HOME -BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBLOADER_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar -.ELSE -BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBLOADER_VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar -.ENDIF - -.ENDIF # $(SOLAR_JAVA)!= "" -.ENDIF -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_ext.mk -.INCLUDE : target.mk -.IF "$(L10N_framework)"=="" -.IF "$(SOLAR_JAVA)" != "" -.INCLUDE : tg_ext.mk - -ALLTAR : $(CLASSDIR)/$(TARGET)-$(LIBLOADER_VERSION).jar - -$(PACKAGE_DIR)/$(TARGET).patch : - @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir) - ( $(TYPE:s/+//) $(PRJ)/patches/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBLOADER_VERSION)/g' > $(PACKAGE_DIR)/$(TARGET).patch ) - $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)/so_converted_$(TARGET).dummy - -$(CLASSDIR)/$(TARGET)-$(LIBLOADER_VERSION).jar : $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE) - $(COPY) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/dist/$(TARGET)-$(LIBLOADER_VERSION).jar $(CLASSDIR)/$(TARGET)-$(LIBLOADER_VERSION).jar - -.ENDIF -.ENDIF diff --git a/jfreereport/java/librepository/makefile.mk b/jfreereport/java/librepository/makefile.mk deleted file mode 100644 index 02d9d96ff918..000000000000 --- a/jfreereport/java/librepository/makefile.mk +++ /dev/null @@ -1,78 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=../.. - -PRJNAME=jfreereport -TARGET=librepository - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : antsettings.mk -.INCLUDE : $(PRJ)/version.mk - -.IF "$(SOLAR_JAVA)" != "" -# --- Files -------------------------------------------------------- - -TARFILE_NAME=$(TARGET)-$(LIBREPOSITORY_VERSION) -TARFILE_IS_FLAT=true -TARFILE_MD5=8ce2fcd72becf06c41f7201d15373ed9 -PATCH_FILES=$(PACKAGE_DIR)/$(TARGET).patch $(PRJ)/patches/$(TARGET)-$(LIBREPOSITORY_VERSION)-deprecated.patch -CONVERTFILES=common_build.xml - -.IF "$(L10N_framework)"=="" -.IF "$(JAVACISGCJ)"=="yes" -JAVA_HOME= -.EXPORT : JAVA_HOME -BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBREPOSITORY_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar -.ELSE -BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBREPOSITORY_VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar -.ENDIF - -.ENDIF # $(SOLAR_JAVA)!= "" -.ENDIF -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_ext.mk -.INCLUDE : target.mk -.IF "$(L10N_framework)"=="" -.IF "$(SOLAR_JAVA)" != "" -.INCLUDE : tg_ext.mk - -ALLTAR : $(CLASSDIR)/$(TARGET)-$(LIBREPOSITORY_VERSION).jar - -$(PACKAGE_DIR)/$(TARGET).patch : - @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir) - ( $(TYPE:s/+//) $(PRJ)/patches/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBREPOSITORY_VERSION)/g' > $(PACKAGE_DIR)/$(TARGET).patch ) - $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)/so_converted_$(TARGET).dummy - -$(CLASSDIR)/$(TARGET)-$(LIBREPOSITORY_VERSION).jar : $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE) - $(COPY) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/dist/$(TARGET)-$(LIBREPOSITORY_VERSION).jar $(CLASSDIR)/$(TARGET)-$(LIBREPOSITORY_VERSION).jar - -.ENDIF -.ENDIF diff --git a/jfreereport/java/libserializer/makefile.mk b/jfreereport/java/libserializer/makefile.mk deleted file mode 100644 index f92c529138bd..000000000000 --- a/jfreereport/java/libserializer/makefile.mk +++ /dev/null @@ -1,77 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=jfreereport -TARGET=libserializer - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : antsettings.mk -.INCLUDE : $(PRJ)$/version.mk - -.IF "$(SOLAR_JAVA)" != "" -# --- Files -------------------------------------------------------- -.IF "$(L10N_framework)"=="" -TARFILE_NAME=$(TARGET)-$(LIBSERIALIZER_VERSION) -TARFILE_IS_FLAT=true -TARFILE_MD5=f94d9870737518e3b597f9265f4e9803 -PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch -CONVERTFILES=common_build.xml - -.IF "$(JAVACISGCJ)"=="yes" -JAVA_HOME= -.EXPORT : JAVA_HOME -BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBSERIALIZER_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar -.ELSE -BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBSERIALIZER_VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar -.ENDIF - -.ENDIF # $(SOLAR_JAVA)!= "" -.ENDIF -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_ext.mk -.INCLUDE : target.mk -.IF "$(L10N_framework)"=="" -.IF "$(SOLAR_JAVA)" != "" -.INCLUDE : tg_ext.mk - -ALLTAR : $(CLASSDIR)$/$(TARGET)-$(LIBSERIALIZER_VERSION).jar - -$(PACKAGE_DIR)$/$(TARGET).patch : - @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir) - ( $(TYPE:s/+//) $(PRJ)$/patches$/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBSERIALIZER_VERSION)/g' > $(PACKAGE_DIR)$/$(TARGET).patch ) - $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)$/so_converted_$(TARGET).dummy - -$(CLASSDIR)$/$(TARGET)-$(LIBSERIALIZER_VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) - $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(LIBSERIALIZER_VERSION).jar $(CLASSDIR)$/$(TARGET)-$(LIBSERIALIZER_VERSION).jar - -.ENDIF -.ENDIF diff --git a/jfreereport/java/libxml/makefile.mk b/jfreereport/java/libxml/makefile.mk deleted file mode 100644 index f225a58140d5..000000000000 --- a/jfreereport/java/libxml/makefile.mk +++ /dev/null @@ -1,77 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=jfreereport -TARGET=libxml - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : antsettings.mk -.INCLUDE : $(PRJ)$/version.mk - -.IF "$(SOLAR_JAVA)" != "" -# --- Files -------------------------------------------------------- -.IF "$(L10N_framework)"=="" -TARFILE_NAME=$(TARGET)-$(LIBXML_VERSION) -TARFILE_IS_FLAT=true -TARFILE_MD5=ace6ab49184e329db254e454a010f56d -PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch -CONVERTFILES=common_build.xml - -.IF "$(JAVACISGCJ)"=="yes" -JAVA_HOME= -.EXPORT : JAVA_HOME -BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBXML_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar -.ELSE -BUILD_ACTION="$(ANT)" -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBXML_VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar -.ENDIF - -.ENDIF # $(SOLAR_JAVA)!= "" -.ENDIF -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_ext.mk -.INCLUDE : target.mk -.IF "$(L10N_framework)"=="" -.IF "$(SOLAR_JAVA)" != "" -.INCLUDE : tg_ext.mk - -ALLTAR : $(CLASSDIR)$/$(TARGET)-$(LIBXML_VERSION).jar - -$(PACKAGE_DIR)$/$(TARGET).patch : - @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir) - ( $(TYPE:s/+//) $(PRJ)$/patches$/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBXML_VERSION)/g' > $(PACKAGE_DIR)$/$(TARGET).patch ) - $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)$/so_converted_$(TARGET).dummy - -$(CLASSDIR)$/$(TARGET)-$(LIBXML_VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) - $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(LIBXML_VERSION).jar $(CLASSDIR)$/$(TARGET)-$(LIBXML_VERSION).jar - -.ENDIF -.ENDIF diff --git a/jfreereport/java/sac/build.xml b/jfreereport/java/sac/build.xml new file mode 100644 index 000000000000..0e85dff04f3a --- /dev/null +++ b/jfreereport/java/sac/build.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jfreereport/java/sac/makefile.mk b/jfreereport/java/sac/makefile.mk deleted file mode 100644 index 337e752573c0..000000000000 --- a/jfreereport/java/sac/makefile.mk +++ /dev/null @@ -1,83 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=jfreereport -TARGET=sac-1.3 - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.IF "$(L10N_framework)"=="" - -# override buildfile -ANT_BUILDFILE=build.xml - -.INCLUDE : antsettings.mk - -.IF "$(SOLAR_JAVA)" != "" -# --- Files -------------------------------------------------------- - -TARFILE_NAME=sacjava-1.3 -TARFILE_MD5=39bb3fcea1514f1369fcfc87542390fd - -TARFILE_ROOTDIR=$(TARGET) - -PATCH_FILES=$(PRJ)$/patches$/sac.patch - -ADDITIONAL_FILES=build.xml - -# CONVERTFILES=build.xml - -.IF "$(JAVACISGCJ)"=="yes" -JAVA_HOME= -.EXPORT : JAVA_HOME -BUILD_ACTION="$(ANT)" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dproject.revision="$(VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) all -.ELSE -BUILD_ACTION="$(ANT)" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dproject.revision="$(VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) all -.ENDIF - -.ENDIF # $(SOLAR_JAVA)!= "" -.ENDIF # L10N_framework -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_ext.mk -.INCLUDE : target.mk - -.IF "$(L10N_framework)"=="" -.IF "$(SOLAR_JAVA)" != "" -.INCLUDE : tg_ext.mk - -ALLTAR : $(CLASSDIR)$/sac.jar - -$(CLASSDIR)$/sac.jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) - $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/sac.jar $(CLASSDIR)$/sac.jar -.ENDIF -.ENDIF # L10N_framework - diff --git a/jfreereport/patches/flow-engine.patch b/jfreereport/patches/flow-engine.patch index aef70cb7fef6..ae6864412879 100644 --- a/jfreereport/patches/flow-engine.patch +++ b/jfreereport/patches/flow-engine.patch @@ -1,9 +1,10 @@ --- misc/flow-engine-0.9.4/build.xml (Revision 6728) +++ misc/build/flow-engine-0.9.4/build.xml (Arbeitskopie) -@@ -24,6 +24,6 @@ +@@ -24,6 +24,7 @@ - ++ + diff --git a/jfreereport/patches/liblayout.patch b/jfreereport/patches/liblayout.patch index 4b1c23100987..6da279361f07 100644 --- a/jfreereport/patches/liblayout.patch +++ b/jfreereport/patches/liblayout.patch @@ -1,9 +1,10 @@ --- misc/liblayout-0.2.10/build.xml (Revision 6728) +++ misc/build/liblayout-0.2.10/build.xml (Arbeitskopie) -@@ -24,6 +24,6 @@ +@@ -24,6 +24,7 @@ - ++ + diff --git a/jfreereport/prj/build.lst b/jfreereport/prj/build.lst index 62cdd738c3b6..3c5fea8f80e4 100644 --- a/jfreereport/prj/build.lst +++ b/jfreereport/prj/build.lst @@ -1,13 +1,2 @@ -jf jfreereport : solenv APACHE_COMMONS:apache-commons NULL -jf jfreereport usr1 - all jf_mkout NULL -jf jfreereport\java\sac nmake - all jf_sac NULL -jf jfreereport\java\libbase nmake - all jf_libbase NULL -jf jfreereport\java\flute nmake - all jf_flute jf_sac NULL -jf jfreereport\java\libloader nmake - all jf_libloader jf_libbase NULL -jf jfreereport\java\libxml nmake - all jf_libxml jf_libbase jf_libloader NULL -jf jfreereport\java\libformula nmake - all jf_libformula jf_libbase NULL -jf jfreereport\java\libfonts nmake - all jf_libfonts jf_libbase jf_libloader NULL -jf jfreereport\java\librepository nmake - all jf_librepository jf_libbase NULL -jf jfreereport\java\libserializer nmake - all jf_libserializer jf_libbase NULL -jf jfreereport\java\jfreereport nmake - all jf_jfreereport jf_liblayout jf_libformula jf_libserializer NULL -jf jfreereport\java\liblayout nmake - all jf_liblayout jf_libbase jf_flute jf_libfonts jf_libloader jf_librepository jf_libxml jf_sac NULL +jf jfreereport : solenv APACHE_COMMONS:apache-commons NULL +jf jfreereport\prj nmake - all jf_sac NULL diff --git a/jfreereport/prj/dmake b/jfreereport/prj/dmake deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index 1874ebf63b75..bb0dc572e044 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland stax XPDF:xpdf ZLIB:zlib external sal solenv soltools NULL +tb tail_build : BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland stax XPDF:xpdf ZLIB:zlib external sal solenv soltools NULL tb tail_build\prj nmake - all tb_prj NULL From 51852f04d1971b7f41cee9dbed14d1aa9e05e25f Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 5 Oct 2012 20:36:46 +0200 Subject: [PATCH 378/863] gbuild: ExternalProject: add use_libraries, use_static_libraries Change-Id: Idc8b0adf1a9ed26b2e0bec3454fed0ee34e277aa --- solenv/gbuild/ExternalProject.mk | 44 +++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk index b604d7f0eb14..81081b53ee63 100644 --- a/solenv/gbuild/ExternalProject.mk +++ b/solenv/gbuild/ExternalProject.mk @@ -124,13 +124,6 @@ $(call gb_ExternalProject_get_preparation_target,$(1)) : $(call gb_Package_get_t endef -# TODO: do we really want to have projects depending on gbuild libraries? -define gb_ExternalProject_use_static_libraries -$(foreach lib,$(2),$(call gb_ExternalProject_get_preparation_target,$(1)) : \ - $(call gb_StaticLibrary_get_target,$(lib))) - -endef - # Make an external project depend on several packages at once # # gb_ExternalProject_use_packages external package(s) @@ -139,4 +132,41 @@ $(foreach package,$(2),$(call gb_ExternalProject_use_package,$(1),$(package))) endef +# Make an external project depend on a StaticLibrary +# +# Realistically there are some externals that do not have a usable build +# system, and other externals that do may depend on those. +# +# gb_ExternalProject_use_static_libraries external staticlibraries +define gb_ExternalProject_use_static_libraries +ifneq (,$$(filter-out $(gb_StaticLibrary_KNOWNLIBS),$(2))) +$$(eval $$(call gb_Output_info, currently known static libraries are: $(sort $(gb_StaticLibrary_KNOWNLIBS)),ALL)) +$$(eval $$(call gb_Output_error,Cannot link against static library/libraries $$(filter-out $(gb_StaticLibrary_KNOWNLIBS),$(2)). Static libraries must be registered in Repository.mk)) +endif + +$(call gb_ExternalProject_get_preparation_target,$(1)) : \ + $(foreach lib,$(2),$(call gb_StaticLibrary_get_target,$(lib))) + +endef + +# Make an external project depend on a Library +# +# Realistically there are some externals that do not have a usable build +# system, and other externals that do may depend on those. +# +# gb_ExternalProject_use_libraries external libraries +define gb_ExternalProject_use_libraries +ifneq (,$$(filter-out $(gb_Library_KNOWNLIBS),$(2))) +$$(eval $$(call gb_Output_info,currently known libraries are: $(sort $(gb_Library_KNOWNLIBS)),ALL)) +$$(eval $$(call gb_Output_error,Cannot link against library/libraries $$(filter-out $(gb_Library_KNOWNLIBS),$(2)). Libraries must be registered in Repository.mk)) +endif +ifneq (,$$(filter $$(gb_MERGEDLIBS),$(2))) +$$(eval $$(call gb_Output_error,Cannot link against library/libraries $$(filter $$(gb_MERGEDLIBS),$(2)) because they are merged.)) +endif + +$(call gb_ExternalProject_get_preparation_target,$(1)) : \ + $(foreach lib,$(2),$(call gb_Library_get_target,$(lib))) + +endef + # vim: set noet sw=4 ts=4: From 2b7536a99839543cc535c1c60a019bd2f784a847 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 5 Oct 2012 21:17:25 +0200 Subject: [PATCH 379/863] gbuild: add gb_ExternalProject_use_external: Or rather, re-purpose that for consistency (and rename original to gb_ExternalProject_use_external_project), to abstract over the system/internal status of dependencies of external projects. Use it in libcdr and replace exisiting uses in apache-commons. Change-Id: Ie144600688fa884b5b6faa986c6b95bdfc1ee15c --- RepositoryExternal.mk | 33 +++++++++++++++++++ ...ternalProject_apache_commons_httpclient.mk | 4 +-- libcdr/ExternalProject_libcdr.mk | 8 ++--- solenv/gbuild/ExternalProject.mk | 16 +++++++-- 4 files changed, 50 insertions(+), 11 deletions(-) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index cbf337953223..6b3b2e5bb489 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1020,6 +1020,7 @@ $(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_add_libs,$(1),$(WPD_LIBS)) endef +gb_ExternalProject__use_wpd := else # !SYSTEM_LIBWPD @@ -1035,6 +1036,10 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ wpd-0.9 \ ) +endef +define gb_ExternalProject__use_wpd +$(call gb_ExternalProject_use_package,$(1),libwpd) + endef endif # SYSTEM_LIBWPD @@ -1050,6 +1055,7 @@ $(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_add_libs,$(1),$(WPG_LIBS)) endef +gb_ExternalProject__use_wpg := else # !SYSTEM_LIBWPG @@ -1065,6 +1071,11 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ wpglib \ ) +endef +define gb_ExternalProject__use_wpg +$(call gb_ExternalProject_use_package,$(1),libwpg_inc) +$(call gb_ExternalProject_use_static_libraries,$(1),wpglib) + endef endif # SYSTEM_LIBWPG @@ -1080,6 +1091,7 @@ $(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_add_libs,$(1),$(WPS_LIBS)) endef +gb_ExternalProject__use_wps := else # !SYSTEM_LIBWPS @@ -1092,6 +1104,11 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ wpslib \ ) +endef +define gb_ExternalProject__use_wps +$(call gb_ExternalProject_use_package,$(1),libwps_inc) +$(call gb_ExternalProject_use_static_libraries,$(1),wpslib) + endef endif # SYSTEM_LIBWPS @@ -2161,18 +2178,22 @@ ifeq ($(SYSTEM_APACHE_COMMONS),YES) define gb_Jar__use_commons-codec $(call gb_Jar_use_system_jar,$(1),$(COMMONS_CODEC_JAR)) endef +gb_ExternalProject__use_commons-codec := define gb_Jar__use_commons-httpclient $(call gb_Jar_use_system_jar,$(1),$(COMMONS_HTTPCLIENT_JAR)) endef +gb_ExternalProject__use_commons-httpclient := define gb_Jar__use_commons-lang $(call gb_Jar_usadd_linked_libse_system_jar,$(1),$(COMMONS_LANG_JAR)) endef +gb_ExternalProject__use_commons-lang := define gb_Jar__use_commons-logging $(call gb_Jar_use_system_jar,$(1),$(COMMONS_LOGGING_JAR)) endef +gb_ExternalProject__use_commons-logging := else # !SYSTEM_APACHE_COMMONS @@ -2186,18 +2207,30 @@ $(eval $(call gb_Helper_register_jars,OXT,\ define gb_Jar__use_commons-codec $(call gb_Jar_use_jar,$(1),commons-codec-1.3) endef +define gb_ExternalProject__use_commons-codec +$(call gb_ExternalProject_use_external_project,$(1),apache_commons_codec) +endef define gb_Jar__use_commons-httpclient $(call gb_Jar_use_jar,$(1),commons-httpclient-3.1) endef +define gb_ExternalProject__use_commons-httpclient +$(call gb_ExternalProject_use_external_project,$(1),apache_commons_httpclient) +endef define gb_Jar__use_commons-lang $(call gb_Jar_use_jar,$(1),commons-lang-2.3) endef +define gb_ExternalProject__use_commons-lang +$(call gb_ExternalProject_use_external_project,$(1),apache_commons_lang) +endef define gb_Jar__use_commons-logging $(call gb_Jar_use_jar,$(1),commons-logging-1.1.1) endef +define gb_ExternalProject__use_commons-logging +$(call gb_ExternalProject_use_external_project,$(1),apache_commons_logging) +endef endif # SYSTEM_APACHE_COMMONS diff --git a/apache-commons/ExternalProject_apache_commons_httpclient.mk b/apache-commons/ExternalProject_apache_commons_httpclient.mk index 9dad40dc88cf..921ae1c48768 100644 --- a/apache-commons/ExternalProject_apache_commons_httpclient.mk +++ b/apache-commons/ExternalProject_apache_commons_httpclient.mk @@ -14,8 +14,8 @@ $(eval $(call gb_ExternalProject_ExternalProject,apache_commons_httpclient)) $(eval $(call gb_ExternalProject_use_unpacked,apache_commons_codec,apache_commons_httpclient)) -$(eval $(call gb_ExternalProject_use_external,apache_commons_httpclient,apache_commons_codec)) -$(eval $(call gb_ExternalProject_use_external,apache_commons_httpclient,apache_commons_logging)) +$(eval $(call gb_ExternalProject_use_external,apache_commons_httpclient,commons-codec)) +$(eval $(call gb_ExternalProject_use_external,apache_commons_httpclient,commons-logging)) $(eval $(call gb_ExternalProject_register_targets,apache_commons_httpclient,\ build \ diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk index 95d0eeb6e48f..fe6ce5f6898e 100644 --- a/libcdr/ExternalProject_libcdr.mk +++ b/libcdr/ExternalProject_libcdr.mk @@ -16,7 +16,8 @@ $(eval $(call gb_ExternalProject_register_targets,libcdr,\ )) $(eval $(call gb_ExternalProject_use_externals,cdrlib,\ - libwpd \ + wpd \ + wpg \ )) ifeq ($(OS)$(COM),WNTMSC) @@ -45,8 +46,6 @@ else # !SYSTEM_LIBWPD libcdr_cflags += -I$(OUTDIR)/inc/external libcdr_libs += $(SOLARLIB) -$(eval $(call gb_ExternalProject_use_package,libcdr,libwpd)) - endif # SYSTEM_LIBWPD @@ -60,9 +59,6 @@ else # !SYSTEM_LIBWPG libcdr_cflags += -I$(OUTDIR)/inc/external libcdr_libs += $(SOLARLIB) -$(eval $(call gb_ExternalProject_use_package,libcdr,libwpg_inc)) -$(eval $(call gb_ExternalProject_use_static_libraries,libcdr,wpglib)) - endif # SYSTEM_LIBWPG diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk index 81081b53ee63..ff504bb38200 100644 --- a/solenv/gbuild/ExternalProject.mk +++ b/solenv/gbuild/ExternalProject.mk @@ -103,14 +103,24 @@ $(foreach target,$(2),$(call gb_ExternalProject_register_target,$(1),$(target))) endef -# Make an external Project depend on another external project -define gb_ExternalProject_use_external +# Make an external Project depend on another ExternalProject +define gb_ExternalProject_use_external_project $(call gb_ExternalProject_get_preparation_target,$(1)) : $(call gb_ExternalProject_get_target,$(2)) endef +# Make an ExternalProject depend on an external +# +# this forwards to functions that must be defined in RepositoryExternal.mk. +# $(eval $(call gb_ExternalProject_use_external,library,external)) +define gb_ExternalProject_use_external +$(if $(filter undefined,$(origin gb_ExternalProject__use_$(2))),\ + $(error gb_ExternalProject_use_external: unknown external: $(2)),\ + $(call gb_ExternalProject__use_$(2),$(1))) +endef + define gb_ExternalProject_use_externals -$(foreach external,$(2),$(call gb_ExternalProject_use_external,$(1),$(2))) +$(foreach external,$(2),$(call gb_ExternalProject_use_external,$(1),$(external))) endef # Make an external project depend on a package From e80f565c3886f8bc87b03d43acbb1453f7edcc48 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 5 Oct 2012 22:30:21 +0200 Subject: [PATCH 380/863] libcdr: remove boilerplate: Define the various FOO_CFLAGS/FOO_LIBS used by libcdr in configure even for the case of internal FOO, and then just pass those variables into libcdr configure to get rid of SYSTEM_FOO conditionals. Change-Id: I0edabc13f8a068cb13792a16499593b8c589da1a --- config_host.mk.in | 2 + configure.in | 12 + libcdr/ExternalProject_libcdr.mk | 60 +--- libcdr/UnpackedTarball_cdr.mk | 4 + libcdr/libcdr-configure.patch.1 | 466 +++++++++++++++++++++++++++++++ 5 files changed, 492 insertions(+), 52 deletions(-) create mode 100644 libcdr/libcdr-configure.patch.1 diff --git a/config_host.mk.in b/config_host.mk.in index b8988b14d85f..7bc85e1eb555 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -676,3 +676,5 @@ export XRENDER_CFLAGS=@XRENDER_CFLAGS@ export XRENDER_LIBS=@XRENDER_LIBS@ export XSLTML_TARBALL=@XSLTML_TARBALL@ export XSLTPROC=@XSLTPROC@ +export ZLIB_CFLAGS=@ZLIB_CFLAGS@ +export ZLIB_LIBS=@ZLIB_LIBS@ diff --git a/configure.in b/configure.in index e4fddeb14c4c..bd0682e58a11 100644 --- a/configure.in +++ b/configure.in @@ -6687,7 +6687,11 @@ else SYSTEM_ZLIB=NO SYSTEM_MINIZIP=NO BUILD_TYPE="$BUILD_TYPE ZLIB" + ZLIB_CFLAGS="-I${OUTDIR}/inc/external/zlib" + ZLIB_LIBS="-L${OUTDIR}/lib" fi +AC_SUBST(ZLIB_CFLAGS) +AC_SUBST(ZLIB_LIBS) AC_SUBST(SYSTEM_ZLIB) AC_SUBST([SYSTEM_MINIZIP]) AC_SUBST([MINGW_MINIZIP_DLL]) @@ -6872,6 +6876,8 @@ elif test $_os = iOS; then else AC_MSG_RESULT([internal]) SYSTEM_LIBWPD=NO + WPD_CFLAGS="-I${OUTDIR}/inc/external" + WPD_LIBS="-L${OUTDIR}/lib" WPD_TARBALL=e7f84e3199dfee9122949448cab3823f-libwpd-0.9.6.tar.bz2 fi AC_SUBST(SYSTEM_LIBWPD) @@ -6892,6 +6898,8 @@ else AC_MSG_RESULT([internal]) SYSTEM_LCMS2=NO BUILD_TYPE="$BUILD_TYPE LCMS2" + LCMS2_CFLAGS="-I${OUTDIR}/inc/lcms2" + LCMS2_LIBS="-L${OUTDIR}/lib" fi AC_SUBST(SYSTEM_LCMS2) AC_SUBST(LCMS2_CFLAGS) @@ -6945,6 +6953,8 @@ elif test $_os = iOS; then else AC_MSG_RESULT([internal]) SYSTEM_LIBWPS=NO + WPS_CFLAGS="-I${OUTDIR}/inc/external" + WPS_LIBS="-L${OUTDIR}/lib" WPS_TARBALL=d197bd6211669a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2 fi AC_SUBST(SYSTEM_LIBWPS) @@ -6965,6 +6975,8 @@ elif test $_os = iOS; then else AC_MSG_RESULT([internal]) SYSTEM_LIBWPG=NO + WPG_CFLAGS="-I${OUTDIR}/inc/external" + WPG_LIBS="-L${OUTDIR}/lib" WPG_TARBALL=9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2 fi AC_SUBST(SYSTEM_LIBWPG) diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk index fe6ce5f6898e..eb48909484c7 100644 --- a/libcdr/ExternalProject_libcdr.mk +++ b/libcdr/ExternalProject_libcdr.mk @@ -33,61 +33,17 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) : else -libcdr_cflags := -libcdr_libs := - -ifeq ($(SYSTEM_LIBWPD),YES) - -libcdr_cflags += $(WPD_CFLAGS) -libcdr_libs += $(WPD_LIBS) - -else # !SYSTEM_LIBWPD - -libcdr_cflags += -I$(OUTDIR)/inc/external -libcdr_libs += $(SOLARLIB) - -endif # SYSTEM_LIBWPD - - -ifeq ($(SYSTEM_LIBWPG),YES) - -libcdr_cflags += $(WPG_CFLAGS) -libcdr_libs += $(WPG_LIBS) - -else # !SYSTEM_LIBWPG - -libcdr_cflags += -I$(OUTDIR)/inc/external -libcdr_libs += $(SOLARLIB) - -endif # SYSTEM_LIBWPG - - -ifeq ($(SYSTEM_LCMS2),YES) - -else # !SYSTEM_LCMS2 - -libcdr_cflags += -I$(OUTDIR)/inc/lcms2 -libcdr_libs += $(SOLARLIB) - -endif # SYSTEM_LCMS2 - -zlib_cflags := -zlib_libs := - -ifneq ($(SYSTEM_ZLIB),YES) - -zlib_cflags += -I$(OUTDIR)/inc/external/zlib -zlib_libs += $(SOLARLIB) - -endif # !SYSTEM_ZLIB - $(call gb_ExternalProject_get_state_target,libcdr,build) : cd $(EXTERNAL_WORKDIR) \ && PKG_CONFIG="" \ - LIBCDR_CFLAGS="$(libcdr_cflags)" \ - LIBCDR_LIBS="$(libcdr_libs)" \ - ZLIB_CFLAGS="$(zlib_cflags)" \ - ZLIB_LIBS="$(zlib_libs)" \ + WPD_CFLAGS="$(WPD_CFLAGS)" \ + WPD_LIBS="$(WPD_LIBS)" \ + WPG_CFLAGS="$(WPG_CFLAGS)" \ + WPG_LIBS="$(WPG_LIBS)" \ + LCMS2_CFLAGS="$(LCMS2_CFLAGS)" \ + LCMS2_LIBS="$(LCMS2_LIBS)" \ + ZLIB_CFLAGS="$(ZLIB_CFLAGS)" \ + ZLIB_LIBS="$(ZLIB_LIBS)" \ ./configure \ --with-pic \ --enable-static \ diff --git a/libcdr/UnpackedTarball_cdr.mk b/libcdr/UnpackedTarball_cdr.mk index be1e7d762a87..32d898bcaa8c 100644 --- a/libcdr/UnpackedTarball_cdr.mk +++ b/libcdr/UnpackedTarball_cdr.mk @@ -11,4 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,cdr)) $(eval $(call gb_UnpackedTarball_set_tarball,cdr,$(CDR_TARBALL))) +$(eval $(call gb_UnpackedTarball_add_patches,cdr,\ + libcdr/libcdr-configure.patch.1 \ +)) + # vim: set noet sw=4 ts=4: diff --git a/libcdr/libcdr-configure.patch.1 b/libcdr/libcdr-configure.patch.1 new file mode 100644 index 000000000000..5100732cd7bd --- /dev/null +++ b/libcdr/libcdr-configure.patch.1 @@ -0,0 +1,466 @@ +diff -u cdr.old/configure cdr/configure +--- cdr.old/configure 2012-10-05 21:47:11.246958344 +0200 ++++ cdr/configure 2012-10-05 22:05:33.913874511 +0200 +@@ -637,6 +617,7 @@ + DOXYGEN + STATIC_TOOLS_FALSE + STATIC_TOOLS_TRUE ++LIBCDR_LIBS + LIBCDR_CXXFLAGS + DEBUG_CXXFLAGS + WINDRES +@@ -658,8 +639,12 @@ + CDR_MAJOR_VERSION + ZLIB_LIBS + ZLIB_CFLAGS +-LIBCDR_LIBS +-LIBCDR_CFLAGS ++LCMS2_LIBS ++LCMS2_CFLAGS ++WPG_LIBS ++WPG_CFLAGS ++WPD_LIBS ++WPD_CFLAGS + PKG_CONFIG_LIBDIR + PKG_CONFIG_PATH + PKG_CONFIG +@@ -816,8 +801,12 @@ + PKG_CONFIG + PKG_CONFIG_PATH + PKG_CONFIG_LIBDIR +-LIBCDR_CFLAGS +-LIBCDR_LIBS ++WPD_CFLAGS ++WPD_LIBS ++WPG_CFLAGS ++WPG_LIBS ++LCMS2_CFLAGS ++LCMS2_LIBS + ZLIB_CFLAGS + ZLIB_LIBS' + +@@ -1481,9 +1472,13 @@ + directories to add to pkg-config's search path + PKG_CONFIG_LIBDIR + path overriding pkg-config's built-in search path +- LIBCDR_CFLAGS +- C compiler flags for LIBCDR, overriding pkg-config +- LIBCDR_LIBS linker flags for LIBCDR, overriding pkg-config ++ WPD_CFLAGS C compiler flags for WPD, overriding pkg-config ++ WPD_LIBS linker flags for WPD, overriding pkg-config ++ WPG_CFLAGS C compiler flags for WPG, overriding pkg-config ++ WPG_LIBS linker flags for WPG, overriding pkg-config ++ LCMS2_CFLAGS ++ C compiler flags for LCMS2, overriding pkg-config ++ LCMS2_LIBS linker flags for LCMS2, overriding pkg-config + ZLIB_CFLAGS C compiler flags for ZLIB, overriding pkg-config + ZLIB_LIBS linker flags for ZLIB, overriding pkg-config + +@@ -16098,33 +16094,27 @@ + # ==================== + + pkg_failed=no +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBCDR" >&5 +-$as_echo_n "checking for LIBCDR... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WPD" >&5 ++$as_echo_n "checking for WPD... " >&6; } + +-if test -n "$LIBCDR_CFLAGS"; then +- pkg_cv_LIBCDR_CFLAGS="$LIBCDR_CFLAGS" ++if test -n "$WPD_CFLAGS"; then ++ pkg_cv_WPD_CFLAGS="$WPD_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" + libwpd-0.9 + libwpd-stream-0.9 +- libwpg-0.2 +- lcms2 + \""; } >&5 + ($PKG_CONFIG --exists --print-errors " + libwpd-0.9 + libwpd-stream-0.9 +- libwpg-0.2 +- lcms2 + ") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_LIBCDR_CFLAGS=`$PKG_CONFIG --cflags " ++ pkg_cv_WPD_CFLAGS=`$PKG_CONFIG --cflags " + libwpd-0.9 + libwpd-stream-0.9 +- libwpg-0.2 +- lcms2 + " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else +@@ -16133,30 +16123,24 @@ + else + pkg_failed=untried + fi +-if test -n "$LIBCDR_LIBS"; then +- pkg_cv_LIBCDR_LIBS="$LIBCDR_LIBS" ++if test -n "$WPD_LIBS"; then ++ pkg_cv_WPD_LIBS="$WPD_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" + libwpd-0.9 + libwpd-stream-0.9 +- libwpg-0.2 +- lcms2 + \""; } >&5 + ($PKG_CONFIG --exists --print-errors " + libwpd-0.9 + libwpd-stream-0.9 +- libwpg-0.2 +- lcms2 + ") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_LIBCDR_LIBS=`$PKG_CONFIG --libs " ++ pkg_cv_WPD_LIBS=`$PKG_CONFIG --libs " + libwpd-0.9 + libwpd-stream-0.9 +- libwpg-0.2 +- lcms2 + " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else +@@ -16178,37 +16162,251 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- LIBCDR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " ++ WPD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " + libwpd-0.9 + libwpd-stream-0.9 +- libwpg-0.2 +- lcms2 + " 2>&1` + else +- LIBCDR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " ++ WPD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " + libwpd-0.9 + libwpd-stream-0.9 +- libwpg-0.2 +- lcms2 + " 2>&1` + fi + # Put the nasty error message in config.log where it belongs +- echo "$LIBCDR_PKG_ERRORS" >&5 ++ echo "$WPD_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements ( + libwpd-0.9 + libwpd-stream-0.9 ++) were not met: ++ ++$WPD_PKG_ERRORS ++ ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. ++ ++Alternatively, you may set the environment variables WPD_CFLAGS ++and WPD_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details." "$LINENO" 5 ++elif test $pkg_failed = untried; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++Alternatively, you may set the environment variables WPD_CFLAGS ++and WPD_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++ ++To get pkg-config, see . ++See \`config.log' for more details" "$LINENO" 5; } ++else ++ WPD_CFLAGS=$pkg_cv_WPD_CFLAGS ++ WPD_LIBS=$pkg_cv_WPD_LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ ++fi ++ ++ ++pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WPG" >&5 ++$as_echo_n "checking for WPG... " >&6; } ++ ++if test -n "$WPG_CFLAGS"; then ++ pkg_cv_WPG_CFLAGS="$WPG_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" ++ libwpg-0.2 ++\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors " ++ libwpg-0.2 ++") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_WPG_CFLAGS=`$PKG_CONFIG --cflags " ++ libwpg-0.2 ++" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$WPG_LIBS"; then ++ pkg_cv_WPG_LIBS="$WPG_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" ++ libwpg-0.2 ++\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors " ++ libwpg-0.2 ++") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_WPG_LIBS=`$PKG_CONFIG --libs " ++ libwpg-0.2 ++" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ WPG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " ++ libwpg-0.2 ++" 2>&1` ++ else ++ WPG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " ++ libwpg-0.2 ++" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$WPG_PKG_ERRORS" >&5 ++ ++ as_fn_error $? "Package requirements ( + libwpg-0.2 ++) were not met: ++ ++$WPG_PKG_ERRORS ++ ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. ++ ++Alternatively, you may set the environment variables WPG_CFLAGS ++and WPG_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details." "$LINENO" 5 ++elif test $pkg_failed = untried; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++Alternatively, you may set the environment variables WPG_CFLAGS ++and WPG_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++ ++To get pkg-config, see . ++See \`config.log' for more details" "$LINENO" 5; } ++else ++ WPG_CFLAGS=$pkg_cv_WPG_CFLAGS ++ WPG_LIBS=$pkg_cv_WPG_LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ ++fi ++ ++ ++pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LCMS2" >&5 ++$as_echo_n "checking for LCMS2... " >&6; } ++ ++if test -n "$LCMS2_CFLAGS"; then ++ pkg_cv_LCMS2_CFLAGS="$LCMS2_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" ++ lcms2 ++\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors " ++ lcms2 ++") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_LCMS2_CFLAGS=`$PKG_CONFIG --cflags " ++ lcms2 ++" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$LCMS2_LIBS"; then ++ pkg_cv_LCMS2_LIBS="$LCMS2_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" ++ lcms2 ++\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors " ++ lcms2 ++") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_LCMS2_LIBS=`$PKG_CONFIG --libs " ++ lcms2 ++" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ LCMS2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " ++ lcms2 ++" 2>&1` ++ else ++ LCMS2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " ++ lcms2 ++" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$LCMS2_PKG_ERRORS" >&5 ++ ++ as_fn_error $? "Package requirements ( + lcms2 + ) were not met: + +-$LIBCDR_PKG_ERRORS ++$LCMS2_PKG_ERRORS + + Consider adjusting the PKG_CONFIG_PATH environment variable if you + installed software in a non-standard prefix. + +-Alternatively, you may set the environment variables LIBCDR_CFLAGS +-and LIBCDR_LIBS to avoid the need to call pkg-config. ++Alternatively, you may set the environment variables LCMS2_CFLAGS ++and LCMS2_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details." "$LINENO" 5 + elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +@@ -16219,15 +16417,15 @@ + is in your PATH or set the PKG_CONFIG environment variable to the full + path to pkg-config. + +-Alternatively, you may set the environment variables LIBCDR_CFLAGS +-and LIBCDR_LIBS to avoid the need to call pkg-config. ++Alternatively, you may set the environment variables LCMS2_CFLAGS ++and LCMS2_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + + To get pkg-config, see . + See \`config.log' for more details" "$LINENO" 5; } + else +- LIBCDR_CFLAGS=$pkg_cv_LIBCDR_CFLAGS +- LIBCDR_LIBS=$pkg_cv_LIBCDR_LIBS ++ LCMS2_CFLAGS=$pkg_cv_LCMS2_CFLAGS ++ LCMS2_LIBS=$pkg_cv_LCMS2_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + +@@ -16574,7 +16772,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_WINDRES="windres" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -16678,7 +16876,9 @@ + DEBUG_CXXFLAGS="-DNDEBUG" + + fi +-LIBCDR_CXXFLAGS="$LIBCDR_CFLAGS" ++LIBCDR_CXXFLAGS="${WPD_CFLAGS} ${WPG_CFLAGS} ${LCMS2_CFLAGS}" ++LIBCDR_LIBS="${WPD_LIBS} ${WPG_LIBS} ${LCMS2_LIBS}" ++ + + + +diff -u cdr.old/configure.ac cdr/configure.ac +--- cdr.old/configure.ac 2012-10-05 21:47:11.248958454 +0200 ++++ cdr/configure.ac 2012-10-05 22:05:22.847875386 +0200 +@@ -37,10 +37,16 @@ + # ==================== + # Find additional apps + # ==================== +-PKG_CHECK_MODULES([LIBCDR],[ ++PKG_CHECK_MODULES([WPD],[ + libwpd-0.9 + libwpd-stream-0.9 ++]) ++ ++PKG_CHECK_MODULES([WPG],[ + libwpg-0.2 ++]) ++ ++PKG_CHECK_MODULES([LCMS2],[ + lcms2 + ]) + +@@ -168,8 +174,10 @@ + ], [ + DEBUG_CXXFLAGS="-DNDEBUG" + ]) +-LIBCDR_CXXFLAGS="$LIBCDR_CFLAGS" ++LIBCDR_CXXFLAGS="${WPD_CFLAGS} ${WPG_CFLAGS} ${LCMS2_CFLAGS}" ++LIBCDR_LIBS="${WPD_LIBS} ${WPG_LIBS} ${LCMS2_LIBS}" + AC_SUBST(LIBCDR_CXXFLAGS) ++AC_SUBST(LIBCDR_LIBS) + AC_SUBST(DEBUG_CXXFLAGS) + + # ============ From 858751d723f350c741ab2658b6de48117f2aac2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= Date: Fri, 5 Oct 2012 22:44:53 +0200 Subject: [PATCH 381/863] It seems that the VS2008 files are only maintained in the VS2008 directory Change-Id: I6fcb0a9045b81ea291904f92396df88ffd351c49 --- lcms2/lcms2-2.4-windows.patch | 44 ++++++++++++++++++++++++++++++++ lcms2/lcms2-windows-export.patch | 18 ------------- lcms2/makefile.mk | 5 ++-- 3 files changed, 47 insertions(+), 20 deletions(-) create mode 100644 lcms2/lcms2-2.4-windows.patch delete mode 100644 lcms2/lcms2-windows-export.patch diff --git a/lcms2/lcms2-2.4-windows.patch b/lcms2/lcms2-2.4-windows.patch new file mode 100644 index 000000000000..f1c681aee7f2 --- /dev/null +++ b/lcms2/lcms2-2.4-windows.patch @@ -0,0 +1,44 @@ +--- misc/lcms2-2.4/Projects/VC2010/lcms2_DLL/lcms2_DLL.vcproj 2012-09-10 18:01:51.000000000 +0200 ++++ misc/build/lcms2-2.4/Projects/VC2010/lcms2_DLL/lcms2_DLL.vcproj 2012-10-05 22:35:01.607191700 +0200 +@@ -205,6 +205,10 @@ + > + + ++ ++ + +--- misc/lcms2-2.4/Projects/VC2010/lcms2_static/lcms2_static.vcproj 2012-09-10 18:01:51.000000000 +0200 ++++ misc/build/lcms2-2.4/Projects/VC2010/lcms2_static/lcms2_static.vcproj 2012-10-05 22:35:28.168963200 +0200 +@@ -175,6 +175,10 @@ + > + + ++ ++ + +--- misc/lcms2-2.4/include/lcms2.h 2011-12-15 16:45:47.000000000 +0100 ++++ misc/build/lcms2-2.4/include/lcms2.h 2012-03-17 22:53:28.731585981 +0100 +@@ -192,6 +192,15 @@ typedef int cmsBool; + # endif + #endif + ++// LibreOffice always builds this as DLL and with the stdcall calling ++// convention, so make this usable from outside without having to ++// specify CMS_DLL manually whenever the library is used. ++#ifndef CMS_DLL_BUILD ++#ifndef CMS_DLL ++#define CMS_DLL ++#endif ++#endif ++ + // Calling convention -- this is hardly platform and compiler dependent + #ifdef CMS_IS_WINDOWS_ + # if defined(CMS_DLL) || defined(CMS_DLL_BUILD) diff --git a/lcms2/lcms2-windows-export.patch b/lcms2/lcms2-windows-export.patch deleted file mode 100644 index 1a77c64f308e..000000000000 --- a/lcms2/lcms2-windows-export.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- misc/build/lcms2-2.4/include/lcms2.h.sav 2011-12-15 16:45:47.000000000 +0100 -+++ misc/build/lcms2-2.4/include/lcms2.h 2012-03-17 22:53:28.731585981 +0100 -@@ -192,6 +192,15 @@ typedef int cmsBool; - # endif - #endif - -+// LibreOffice always builds this as DLL and with the stdcall calling -+// convention, so make this usable from outside without having to -+// specify CMS_DLL manually whenever the library is used. -+#ifndef CMS_DLL_BUILD -+#ifndef CMS_DLL -+#define CMS_DLL -+#endif -+#endif -+ - // Calling convention -- this is hardly platform and compiler dependent - #ifdef CMS_IS_WINDOWS_ - # if defined(CMS_DLL) || defined(CMS_DLL_BUILD) diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk index 62a9ff9f9576..a87ac10e5f89 100644 --- a/lcms2/makefile.mk +++ b/lcms2/makefile.mk @@ -48,16 +48,17 @@ PATCH_FILES = lcms2.patch .IF "$(GUI)$(COM)"=="WNTMSC" -PATCH_FILES += lcms2-windows-export.patch +PATCH_FILES += lcms2-2.4-windows.patch CONFIGURE_DIR=. CONFIGURE_ACTION = -BUILD_DIR=Projects/VC2010/lcms2_DLL .IF "$(CCNUMVER)" >= "001600000000" +BUILD_DIR=Projects/VC2010/lcms2_DLL BUILD_ACTION=MSBuild.exe lcms2_DLL.vcxproj /p:Configuration=Release /p:Platform=Win32 /p:TargetName=lcms2 .ELSE +BUILD_DIR=Projects/VC2008/lcms2_DLL BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe lcms2_DLL.vcproj "Release|Win32" .ENDIF From 12decfc33dcdaaa4ff1574f260945db6a337fff6 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 5 Oct 2012 22:56:07 +0200 Subject: [PATCH 382/863] libcdr: fix typo Change-Id: Iecf6609a35d4ecff728903d262ec10d3f8faf3bf --- libcdr/ExternalProject_libcdr.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk index eb48909484c7..3d4dcec2bfd9 100644 --- a/libcdr/ExternalProject_libcdr.mk +++ b/libcdr/ExternalProject_libcdr.mk @@ -15,7 +15,7 @@ $(eval $(call gb_ExternalProject_register_targets,libcdr,\ build \ )) -$(eval $(call gb_ExternalProject_use_externals,cdrlib,\ +$(eval $(call gb_ExternalProject_use_externals,libcdr,\ wpd \ wpg \ )) From 8bf3faf995c417b1f833d7c3ee725a2929d4cad6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= Date: Fri, 5 Oct 2012 23:00:27 +0200 Subject: [PATCH 383/863] Don't patch configure.ac not to run autotools ever during build Change-Id: Ib481a70fdb67fcec1b72762c408b27f854fe4d1a --- libcdr/libcdr-configure.patch.1 | 36 +-------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/libcdr/libcdr-configure.patch.1 b/libcdr/libcdr-configure.patch.1 index 5100732cd7bd..ef751fcea099 100644 --- a/libcdr/libcdr-configure.patch.1 +++ b/libcdr/libcdr-configure.patch.1 @@ -1,5 +1,4 @@ -diff -u cdr.old/configure cdr/configure ---- cdr.old/configure 2012-10-05 21:47:11.246958344 +0200 +--- cdr/configure 2012-10-05 21:47:11.246958344 +0200 +++ cdr/configure 2012-10-05 22:05:33.913874511 +0200 @@ -637,6 +617,7 @@ DOXYGEN @@ -431,36 +430,3 @@ diff -u cdr.old/configure cdr/configure -diff -u cdr.old/configure.ac cdr/configure.ac ---- cdr.old/configure.ac 2012-10-05 21:47:11.248958454 +0200 -+++ cdr/configure.ac 2012-10-05 22:05:22.847875386 +0200 -@@ -37,10 +37,16 @@ - # ==================== - # Find additional apps - # ==================== --PKG_CHECK_MODULES([LIBCDR],[ -+PKG_CHECK_MODULES([WPD],[ - libwpd-0.9 - libwpd-stream-0.9 -+]) -+ -+PKG_CHECK_MODULES([WPG],[ - libwpg-0.2 -+]) -+ -+PKG_CHECK_MODULES([LCMS2],[ - lcms2 - ]) - -@@ -168,8 +174,10 @@ - ], [ - DEBUG_CXXFLAGS="-DNDEBUG" - ]) --LIBCDR_CXXFLAGS="$LIBCDR_CFLAGS" -+LIBCDR_CXXFLAGS="${WPD_CFLAGS} ${WPG_CFLAGS} ${LCMS2_CFLAGS}" -+LIBCDR_LIBS="${WPD_LIBS} ${WPG_LIBS} ${LCMS2_LIBS}" - AC_SUBST(LIBCDR_CXXFLAGS) -+AC_SUBST(LIBCDR_LIBS) - AC_SUBST(DEBUG_CXXFLAGS) - - # ============ From 348d2fd87060a3914b1169093ef71d354cc3349c Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 5 Oct 2012 23:42:44 +0200 Subject: [PATCH 384/863] libcdr: fix --with-system-lcms2 build: It breaks because LCMS2_CFLAGS happens to be empty, which the libcdr configure script then complains about, because it thinks it hasn't found lcms2. Work around that by including a space in the variable... Change-Id: I16cc8278097dc7119d11fdabcc3be5d1ae8b4327 --- libcdr/ExternalProject_libcdr.mk | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk index 3d4dcec2bfd9..933ce9722260 100644 --- a/libcdr/ExternalProject_libcdr.mk +++ b/libcdr/ExternalProject_libcdr.mk @@ -36,14 +36,14 @@ else $(call gb_ExternalProject_get_state_target,libcdr,build) : cd $(EXTERNAL_WORKDIR) \ && PKG_CONFIG="" \ - WPD_CFLAGS="$(WPD_CFLAGS)" \ - WPD_LIBS="$(WPD_LIBS)" \ - WPG_CFLAGS="$(WPG_CFLAGS)" \ - WPG_LIBS="$(WPG_LIBS)" \ - LCMS2_CFLAGS="$(LCMS2_CFLAGS)" \ - LCMS2_LIBS="$(LCMS2_LIBS)" \ - ZLIB_CFLAGS="$(ZLIB_CFLAGS)" \ - ZLIB_LIBS="$(ZLIB_LIBS)" \ + WPD_CFLAGS=" $(WPD_CFLAGS)" \ + WPD_LIBS=" $(WPD_LIBS)" \ + WPG_CFLAGS=" $(WPG_CFLAGS)" \ + WPG_LIBS=" $(WPG_LIBS)" \ + LCMS2_CFLAGS=" $(LCMS2_CFLAGS)" \ + LCMS2_LIBS=" $(LCMS2_LIBS)" \ + ZLIB_CFLAGS=" $(ZLIB_CFLAGS)" \ + ZLIB_LIBS=" $(ZLIB_LIBS)" \ ./configure \ --with-pic \ --enable-static \ From 29ce59347d1525b8cbbcd294fd6f95c822817f57 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 5 Oct 2012 23:52:04 +0200 Subject: [PATCH 385/863] configure: actually link the libraries in FOO_LIBS variables Change-Id: Iaf30da1773676de38b1a76e2008a17316b1477a5 --- configure.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.in b/configure.in index bd0682e58a11..f7d0453408b4 100644 --- a/configure.in +++ b/configure.in @@ -6688,7 +6688,7 @@ else SYSTEM_MINIZIP=NO BUILD_TYPE="$BUILD_TYPE ZLIB" ZLIB_CFLAGS="-I${OUTDIR}/inc/external/zlib" - ZLIB_LIBS="-L${OUTDIR}/lib" + ZLIB_LIBS="-L${OUTDIR}/lib -lz" fi AC_SUBST(ZLIB_CFLAGS) AC_SUBST(ZLIB_LIBS) @@ -6877,7 +6877,7 @@ else AC_MSG_RESULT([internal]) SYSTEM_LIBWPD=NO WPD_CFLAGS="-I${OUTDIR}/inc/external" - WPD_LIBS="-L${OUTDIR}/lib" + WPD_LIBS="-L${OUTDIR}/lib -lwpdlib" WPD_TARBALL=e7f84e3199dfee9122949448cab3823f-libwpd-0.9.6.tar.bz2 fi AC_SUBST(SYSTEM_LIBWPD) @@ -6899,7 +6899,7 @@ else SYSTEM_LCMS2=NO BUILD_TYPE="$BUILD_TYPE LCMS2" LCMS2_CFLAGS="-I${OUTDIR}/inc/lcms2" - LCMS2_LIBS="-L${OUTDIR}/lib" + LCMS2_LIBS="-L${OUTDIR}/lib -llcms2" fi AC_SUBST(SYSTEM_LCMS2) AC_SUBST(LCMS2_CFLAGS) @@ -6954,7 +6954,7 @@ else AC_MSG_RESULT([internal]) SYSTEM_LIBWPS=NO WPS_CFLAGS="-I${OUTDIR}/inc/external" - WPS_LIBS="-L${OUTDIR}/lib" + WPS_LIBS="-L${OUTDIR}/lib -lwpslib" WPS_TARBALL=d197bd6211669a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2 fi AC_SUBST(SYSTEM_LIBWPS) @@ -6976,7 +6976,7 @@ else AC_MSG_RESULT([internal]) SYSTEM_LIBWPG=NO WPG_CFLAGS="-I${OUTDIR}/inc/external" - WPG_LIBS="-L${OUTDIR}/lib" + WPG_LIBS="-L${OUTDIR}/lib -lwpglib" WPG_TARBALL=9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2 fi AC_SUBST(SYSTEM_LIBWPG) From 8a3014b8e52c770083aa22e5c2d90a4455a427ea Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Sat, 6 Oct 2012 00:00:57 +0200 Subject: [PATCH 386/863] bridges: msvc complains about silly options Change-Id: I8f2124f13e0a77113dc6b99c2f236bd2077f41b2 --- bridges/Library_msvc_win32_intel.mk | 7 ------- bridges/Library_msvc_win32_x86-64.mk | 7 ------- 2 files changed, 14 deletions(-) diff --git a/bridges/Library_msvc_win32_intel.mk b/bridges/Library_msvc_win32_intel.mk index 9a372ad36504..b8c098d69ff5 100644 --- a/bridges/Library_msvc_win32_intel.mk +++ b/bridges/Library_msvc_win32_intel.mk @@ -32,13 +32,6 @@ $(eval $(call gb_Library_add_defs,msci_uno,\ ) \ )) -# In case someone enabled the non-standard -fomit-frame-pointer which does not -# work with the .cxx sources of this library. -$(eval $(call gb_Library_add_cxxflags,msci_uno,\ - -fno-omit-frame-pointer \ - -fno-strict-aliasing \ -)) - $(eval $(call gb_Library_use_libraries,msci_uno,\ cppu \ sal \ diff --git a/bridges/Library_msvc_win32_x86-64.mk b/bridges/Library_msvc_win32_x86-64.mk index bb06bfefa969..86c9d3c308c8 100644 --- a/bridges/Library_msvc_win32_x86-64.mk +++ b/bridges/Library_msvc_win32_x86-64.mk @@ -32,13 +32,6 @@ $(eval $(call gb_Library_add_defs,mscx_uno,\ ) \ )) -# In case someone enabled the non-standard -fomit-frame-pointer which does not -# work with the .cxx sources of this library. -$(eval $(call gb_Library_add_cxxflags,mscx_uno,\ - -fno-omit-frame-pointer \ - -fno-strict-aliasing \ -)) - $(eval $(call gb_Library_use_libraries,mscx_uno,\ cppu \ sal \ From 79b1868bf687ff105ce3bf3ccf583434946848aa Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Thu, 4 Oct 2012 03:53:37 +0200 Subject: [PATCH 387/863] more work on getting cell attributes and cond formats in sync Change-Id: If10059a6d2b8d2449a01fe09eb2efb9ccea55806 --- sc/source/ui/docshell/docfunc.cxx | 65 ++++++++++++++++++++++++++++--- sc/source/ui/inc/docfunc.hxx | 9 +++++ sc/source/ui/view/cellsh1.cxx | 3 +- 3 files changed, 71 insertions(+), 6 deletions(-) diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 41fdfe6cccec..72dbd69f1331 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -5059,6 +5059,30 @@ sal_Bool ScDocFunc::InsertAreaLink( const String& rFile, const String& rFilter, return sal_True; } +namespace { + +void RemoveCondFormatAttributes(ScDocument* pDoc, const ScConditionalFormat* pFormat) +{ + const ScRangeList& rRangeList = pFormat->GetRange(); + + ScPatternAttr aPattern( pDoc->GetPool() ); + aPattern.GetItemSet().Put( SfxUInt32Item( ATTR_CONDITIONAL, 0 ) ); + ScMarkData aMarkData; + aMarkData.MarkFromRangeList(rRangeList, true); + pDoc->ApplySelectionPattern( aPattern , aMarkData ); +} + +void SetConditionalFormatAttributes(ScDocument* pDoc, const ScRangeList& rRanges, sal_uLong nIndex) +{ + ScPatternAttr aPattern( pDoc->GetPool() ); + aPattern.GetItemSet().Put( SfxUInt32Item( ATTR_CONDITIONAL, nIndex ) ); + ScMarkData aMarkData; + aMarkData.MarkFromRangeList(rRanges, true); + pDoc->ApplySelectionPattern( aPattern , aMarkData ); +} + +} + void ScDocFunc::ReplaceConditionalFormat( sal_uLong nOldFormat, ScConditionalFormat* pFormat, SCTAB nTab, const ScRangeList& rRanges ) { ScDocShellModificator aModificator(rDocShell); @@ -5068,6 +5092,12 @@ void ScDocFunc::ReplaceConditionalFormat( sal_uLong nOldFormat, ScConditionalFor if(nOldFormat) { + ScConditionalFormat* pOldFormat = pDoc->GetCondFormList(nTab)->GetFormat(nOldFormat); + if(pOldFormat) + { + RemoveCondFormatAttributes(pDoc, pOldFormat); + } + pDoc->DeleteConditionalFormat(nOldFormat, nTab); pDoc->SetStreamValid(nTab, false); } @@ -5075,11 +5105,7 @@ void ScDocFunc::ReplaceConditionalFormat( sal_uLong nOldFormat, ScConditionalFor { sal_uLong nIndex = pDoc->AddCondFormat(pFormat, nTab); - ScPatternAttr aPattern( pDoc->GetPool() ); - aPattern.GetItemSet().Put( SfxUInt32Item( ATTR_CONDITIONAL, nIndex ) ); - ScMarkData aMarkData; - aMarkData.MarkFromRangeList(rRanges, true); - pDoc->ApplySelectionPattern( aPattern , aMarkData ); + SetConditionalFormatAttributes(pDoc, rRanges, nIndex); size_t n = rRanges.size(); for(size_t i = 0; i < n; ++i) pFormat->DoRepaint(rRanges[i]); @@ -5089,6 +5115,35 @@ void ScDocFunc::ReplaceConditionalFormat( sal_uLong nOldFormat, ScConditionalFor SFX_APP()->Broadcast(SfxSimpleHint(SC_HINT_AREAS_CHANGED)); } +void ScDocFunc::SetConditionalFormatList( ScConditionalFormatList* pList, SCTAB nTab ) +{ + ScDocShellModificator aModificator(rDocShell); + ScDocument* pDoc = rDocShell.GetDocument(); + if(pDoc->IsTabProtected(nTab)) + return; + + // first remove all old entries + ScConditionalFormatList* pOldList = pDoc->GetCondFormList(nTab); + for(ScConditionalFormatList::const_iterator itr = pOldList->begin(), itrEnd = pOldList->end(); itr != itrEnd; ++itr) + { + RemoveCondFormatAttributes(pDoc, &(*itr)); + } + + // then set new entries + for(ScConditionalFormatList::iterator itr = pList->begin(); itr != pList->end(); ++itr) + { + sal_uLong nIndex = itr->GetKey(); + const ScRangeList& rRange = itr->GetRange(); + SetConditionalFormatAttributes(pDoc, rRange, nIndex); + } + + pDoc->SetCondFormList(pList, nTab); + + pDoc->SetStreamValid(nTab, false); + aModificator.SetDocumentModified(); + SFX_APP()->Broadcast(SfxSimpleHint(SC_HINT_AREAS_CHANGED)); +} + void ScDocFunc::EnterListAction( sal_uInt16 nNameResId ) { String aUndo( ScGlobal::GetRscString( nNameResId ) ); diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx index 8d87bd98e8b0..3c9d64d8a255 100644 --- a/sc/source/ui/inc/docfunc.hxx +++ b/sc/source/ui/inc/docfunc.hxx @@ -53,6 +53,7 @@ struct ScTabOpParam; class ScTableProtection; struct ScCellMergeOption; class ScConditionalFormat; +class ScConditionalFormatList; // --------------------------------------------------------------------------- @@ -212,6 +213,14 @@ public: * @param pFormat if NULL only delete an old format */ virtual void ReplaceConditionalFormat( sal_uLong nOldIndex, ScConditionalFormat* pFormat, SCTAB nTab, const ScRangeList& rRanges ); + + /** + * Sets or replaces the conditional format list of a table + * + * @param pList the new ScConditionalFormatList, method takes ownership + * @param nTab the tab to which the conditional format list belongs + */ + virtual void SetConditionalFormatList( ScConditionalFormatList* pList, SCTAB nTab ); }; class ScDocFuncDirect : public ScDocFunc diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index bd8f75acd89f..a5b739e24648 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -2100,7 +2100,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) AbstractScCondFormatManagerDlg* pDlg = pFact->CreateScCondFormatMgrDlg( pTabViewShell->GetDialogParent(), pDoc, pList, aPos, RID_SCDLG_COND_FORMAT_MANAGER); if(pDlg->Execute() == RET_OK) { - pDoc->SetCondFormList(pDlg->GetConditionalFormatList(), aPos.Tab()); + ScConditionalFormatList* pCondFormatList = pDlg->GetConditionalFormatList(); + pData->GetDocShell()->GetDocFunc().SetConditionalFormatList(pCondFormatList, aPos.Tab()); } delete pDlg; } From 6ba6fe0ce1cf000c59c5a4a71256625f5f89cbac Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Thu, 4 Oct 2012 03:59:48 +0200 Subject: [PATCH 388/863] after setting a ScConditionalFormatList repainting is necessary Change-Id: I7283974ae8f12bd49c6ab806b1b052074f13a932 --- sc/source/ui/docshell/docfunc.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 72dbd69f1331..97757080affb 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -5138,6 +5138,7 @@ void ScDocFunc::SetConditionalFormatList( ScConditionalFormatList* pList, SCTAB } pDoc->SetCondFormList(pList, nTab); + rDocShell.PostPaintGridAll(); pDoc->SetStreamValid(nTab, false); aModificator.SetDocumentModified(); From 6c695e1208d2d40f6e1f1d61eb65261719f8dd8d Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Thu, 4 Oct 2012 04:10:37 +0200 Subject: [PATCH 389/863] faster repaint after cond format dialog Change-Id: Id5894efd385ad20c7a544142ce4fa4ec5d4ef062 --- sc/source/ui/docshell/docfunc.cxx | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 97757080affb..52b5c08b3cf5 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -5090,9 +5090,11 @@ void ScDocFunc::ReplaceConditionalFormat( sal_uLong nOldFormat, ScConditionalFor if(pDoc->IsTabProtected(nTab)) return; + boost::scoped_ptr pRepaintRange; if(nOldFormat) { ScConditionalFormat* pOldFormat = pDoc->GetCondFormList(nTab)->GetFormat(nOldFormat); + pRepaintRange.reset(new ScRange( pOldFormat->GetRange().Combine() )); if(pOldFormat) { RemoveCondFormatAttributes(pDoc, pOldFormat); @@ -5103,14 +5105,20 @@ void ScDocFunc::ReplaceConditionalFormat( sal_uLong nOldFormat, ScConditionalFor } if(pFormat) { + if(pRepaintRange) + pRepaintRange->ExtendTo(rRanges.Combine()); + else + pRepaintRange.reset(new ScRange(rRanges.Combine())); + sal_uLong nIndex = pDoc->AddCondFormat(pFormat, nTab); SetConditionalFormatAttributes(pDoc, rRanges, nIndex); - size_t n = rRanges.size(); - for(size_t i = 0; i < n; ++i) - pFormat->DoRepaint(rRanges[i]); pDoc->SetStreamValid(nTab, false); } + + if(pRepaintRange) + rDocShell.PostPaint(*pRepaintRange, PAINT_GRID); + aModificator.SetDocumentModified(); SFX_APP()->Broadcast(SfxSimpleHint(SC_HINT_AREAS_CHANGED)); } From f94d197789cfd0c6418fd03cb18c3a1272150c4e Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Thu, 4 Oct 2012 04:27:42 +0200 Subject: [PATCH 390/863] only set a new cond format list if it really changed Change-Id: I820d1f083edb09abb262beba1536b1b1acba3321 --- sc/inc/scabstdlg.hxx | 2 ++ sc/source/ui/attrdlg/scdlgfact.cxx | 5 +++++ sc/source/ui/attrdlg/scdlgfact.hxx | 2 ++ sc/source/ui/condformat/condformatmgr.cxx | 11 ++++++++++- sc/source/ui/inc/condformatmgr.hxx | 4 ++++ sc/source/ui/view/cellsh1.cxx | 2 +- 6 files changed, 24 insertions(+), 2 deletions(-) diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index 7081ddb5b4b0..aac528ee487f 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -94,6 +94,8 @@ class AbstractScCondFormatManagerDlg : public VclAbstractDialog { public: virtual ScConditionalFormatList* GetConditionalFormatList() = 0; + + virtual bool CondFormatsChanged() = 0; }; class AbstractScDataBarSettingsDlg : public VclAbstractDialog diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index 4dd4bc38352e..7962c6d3bcd7 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -462,6 +462,11 @@ ScConditionalFormatList* AbstractScCondFormatManagerDlg_Impl::GetConditionalForm return pDlg->GetConditionalFormatList(); } +bool AbstractScCondFormatManagerDlg_Impl::CondFormatsChanged() +{ + return pDlg->CondFormatsChanged(); +} + long AbstractScMetricInputDlg_Impl::GetInputValue( FieldUnit eUnit ) const { diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index b4c6ddcd0bca..1462b75bead8 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -148,6 +148,8 @@ class AbstractScCondFormatManagerDlg_Impl : public AbstractScCondFormatManagerDl DECL_ABSTDLG_BASE(AbstractScCondFormatManagerDlg_Impl, ScCondFormatManagerDlg) virtual ScConditionalFormatList* GetConditionalFormatList(); + + virtual bool CondFormatsChanged(); }; class AbstractScDataBarSettingsDlg_Impl : public AbstractScDataBarSettingsDlg diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx index 62b1fdc40be4..d31841ded1ca 100644 --- a/sc/source/ui/condformat/condformatmgr.cxx +++ b/sc/source/ui/condformat/condformatmgr.cxx @@ -174,7 +174,8 @@ ScCondFormatManagerDlg::ScCondFormatManagerDlg(Window* pParent, ScDocument* pDoc mpFormatList( pFormatList ? new ScConditionalFormatList(*pFormatList) : NULL), maCtrlManager(this, pDoc, mpFormatList, rPos), mpDoc(pDoc), - maPos(rPos) + maPos(rPos), + mbModified(false) { FreeResource(); @@ -196,9 +197,15 @@ ScConditionalFormatList* ScCondFormatManagerDlg::GetConditionalFormatList() return pList; } +bool ScCondFormatManagerDlg::CondFormatsChanged() +{ + return mbModified; +} + IMPL_LINK_NOARG(ScCondFormatManagerDlg, RemoveBtnHdl) { maCtrlManager.DeleteSelection(); + mbModified = true; return 0; } @@ -222,6 +229,8 @@ IMPL_LINK_NOARG(ScCondFormatManagerDlg, EditBtnHdl) } delete pDlg; + mbModified = true; + return 0; } diff --git a/sc/source/ui/inc/condformatmgr.hxx b/sc/source/ui/inc/condformatmgr.hxx index 3735e639b480..c71e2ef5e249 100644 --- a/sc/source/ui/inc/condformatmgr.hxx +++ b/sc/source/ui/inc/condformatmgr.hxx @@ -85,6 +85,8 @@ public: ScConditionalFormatList* GetConditionalFormatList(); + bool CondFormatsChanged(); + private: PushButton maBtnAdd; PushButton maBtnRemove; @@ -104,6 +106,8 @@ private: DECL_LINK(RemoveBtnHdl, void*); DECL_LINK(EditBtnHdl, void*); + + bool mbModified; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index a5b739e24648..c4d79b512ca5 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -2098,7 +2098,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) ScConditionalFormatList* pList = pDoc->GetCondFormList( aPos.Tab() ); AbstractScCondFormatManagerDlg* pDlg = pFact->CreateScCondFormatMgrDlg( pTabViewShell->GetDialogParent(), pDoc, pList, aPos, RID_SCDLG_COND_FORMAT_MANAGER); - if(pDlg->Execute() == RET_OK) + if(pDlg->Execute() == RET_OK && pDlg->CondFormatsChanged()) { ScConditionalFormatList* pCondFormatList = pDlg->GetConditionalFormatList(); pData->GetDocShell()->GetDocFunc().SetConditionalFormatList(pCondFormatList, aPos.Tab()); From a57a183a2b8b613118b1d2a212ef3069f5ae7e90 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Thu, 4 Oct 2012 04:34:10 +0200 Subject: [PATCH 391/863] replace some pointers with boost::scoped_ptr Change-Id: I5c263cd95262fae2f75069cb441752bbf7ce61f8 --- sc/source/ui/condformat/condformatmgr.cxx | 5 ++--- sc/source/ui/view/cellsh1.cxx | 16 ++++++---------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx index d31841ded1ca..09318997bf4d 100644 --- a/sc/source/ui/condformat/condformatmgr.cxx +++ b/sc/source/ui/condformat/condformatmgr.cxx @@ -216,8 +216,8 @@ IMPL_LINK_NOARG(ScCondFormatManagerDlg, EditBtnHdl) if(!pFormat) return 0; - ScCondFormatDlg* pDlg = new ScCondFormatDlg(this, mpDoc, pFormat, pFormat->GetRange(), - pFormat->GetRange().GetTopLeftCorner()); + boost::scoped_ptr pDlg(new ScCondFormatDlg(this, mpDoc, pFormat, pFormat->GetRange(), + pFormat->GetRange().GetTopLeftCorner())); if(pDlg->Execute() == RET_OK) { sal_Int32 nKey = pFormat->GetKey(); @@ -227,7 +227,6 @@ IMPL_LINK_NOARG(ScCondFormatManagerDlg, EditBtnHdl) mpFormatList->InsertNew(pNewFormat); maCtrlManager.Update(); } - delete pDlg; mbModified = true; diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index c4d79b512ca5..b4685302060b 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -2057,15 +2057,15 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) aRangeList.push_back(pRange); } - AbstractScCondFormatDlg* pDlg = NULL; + boost::scoped_ptr pDlg; const ScConditionalFormat* pCondFormat = pDoc->GetCondFormat(aPos.Col(), aPos.Row(), aPos.Tab()); if(pCondFormat) { - pDlg = pFact->CreateScCondFormatDlg( pTabViewShell->GetDialogParent(), pDoc, pCondFormat, pCondFormat->GetRange(), aPos, RID_SCDLG_CONDFORMAT ); + pDlg.reset(pFact->CreateScCondFormatDlg( pTabViewShell->GetDialogParent(), pDoc, pCondFormat, pCondFormat->GetRange(), aPos, RID_SCDLG_CONDFORMAT )); } else { - pDlg = pFact->CreateScCondFormatDlg( pTabViewShell->GetDialogParent(), pDoc, NULL, aRangeList, aRangeList.GetTopLeftCorner(), RID_SCDLG_CONDFORMAT ); + pDlg.reset(pFact->CreateScCondFormatDlg( pTabViewShell->GetDialogParent(), pDoc, NULL, aRangeList, aRangeList.GetTopLeftCorner(), RID_SCDLG_CONDFORMAT )); } if(pDlg->Execute() == RET_OK) @@ -2076,7 +2076,6 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) nOldIndex = pCondFormat->GetKey(); pData->GetDocShell()->GetDocFunc().ReplaceConditionalFormat( nOldIndex, pFormat, pData->GetTabNo(), pFormat->GetRange() ); } - delete pDlg; } break; @@ -2097,13 +2096,12 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) ScAddress aPos(pData->GetCurX(), pData->GetCurY(), pData->GetTabNo()); ScConditionalFormatList* pList = pDoc->GetCondFormList( aPos.Tab() ); - AbstractScCondFormatManagerDlg* pDlg = pFact->CreateScCondFormatMgrDlg( pTabViewShell->GetDialogParent(), pDoc, pList, aPos, RID_SCDLG_COND_FORMAT_MANAGER); + boost::scoped_ptr pDlg(pFact->CreateScCondFormatMgrDlg( pTabViewShell->GetDialogParent(), pDoc, pList, aPos, RID_SCDLG_COND_FORMAT_MANAGER)); if(pDlg->Execute() == RET_OK && pDlg->CondFormatsChanged()) { ScConditionalFormatList* pCondFormatList = pDlg->GetConditionalFormatList(); pData->GetDocShell()->GetDocFunc().SetConditionalFormatList(pCondFormatList, aPos.Tab()); } - delete pDlg; } break; @@ -2113,10 +2111,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); ScDocument* pDoc = GetViewData()->GetDocument(); - AbstractScDataBarSettingsDlg* pDlg = pFact->CreateScDataBarSetttingsDlg( pTabViewShell->GetDialogParent(), pDoc, RID_SCDLG_DATABAR ); + boost::scoped_ptr pDlg(pFact->CreateScDataBarSetttingsDlg( pTabViewShell->GetDialogParent(), pDoc, RID_SCDLG_DATABAR )); OSL_ENSURE(pDlg, "Dialog create fail!"); pDlg->Execute(); - delete pDlg; } break; @@ -2126,13 +2123,12 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); ScDocument* pDoc = GetViewData()->GetDocument(); - AbstractScDataBarSettingsDlg* pDlg = pFact->CreateScDataBarSetttingsDlg( pTabViewShell->GetDialogParent(), pDoc, RID_SCDLG_DATABAR ); + boost::scoped_ptr pDlg(pFact->CreateScDataBarSetttingsDlg( pTabViewShell->GetDialogParent(), pDoc, RID_SCDLG_DATABAR )); OSL_ENSURE(pDlg, "Dialog create fail!"); if(pDlg->Execute() == RET_OK) { //add here code that handles the data bar inserting } - delete pDlg; } break; From 76063f78d510a1e3a2396dbfb8cc37d29f7b127d Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Thu, 4 Oct 2012 05:22:00 +0200 Subject: [PATCH 392/863] add range edit box to cond format dialog Change-Id: I913c844b08f2fd01963c60c4ffa948fc128a5897 --- sc/source/ui/condformat/condformatdlg.cxx | 24 ++++++++++++++++++++--- sc/source/ui/inc/condformatdlg.hrc | 3 +++ sc/source/ui/inc/condformatdlg.hxx | 5 +++++ sc/source/ui/src/condformatdlg.src | 16 +++++++++++++-- 4 files changed, 43 insertions(+), 5 deletions(-) diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index 51fc4856dfeb..5d56bec37428 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -1089,10 +1089,12 @@ ScCondFormatDlg::ScCondFormatDlg(Window* pParent, ScDocument* pDoc, const ScCond maBtnRemove( this, ScResId( BTN_REMOVE ) ), maBtnOk( this, ScResId( BTN_OK ) ), maBtnCancel( this, ScResId( BTN_CANCEL ) ), + maFtRange( this, ScResId( FT_RANGE ) ), + maEdRange( this, ScResId( ED_RANGE ) ), maCondFormList( this, ScResId( CTRL_LIST ), pDoc, pFormat, rRange, rPos ), - maPos(rPos) + maPos(rPos), + mpDoc(pDoc) { - rtl::OUStringBuffer aTitle( GetText() ); aTitle.append(rtl::OUString(" ")); rtl::OUString aRangeString; @@ -1101,12 +1103,23 @@ ScCondFormatDlg::ScCondFormatDlg(Window* pParent, ScDocument* pDoc, const ScCond SetText(aTitle.makeStringAndClear()); maBtnAdd.SetClickHdl( LINK( &maCondFormList, ScCondFormatList, AddBtnHdl ) ); maBtnRemove.SetClickHdl( LINK( &maCondFormList, ScCondFormatList, RemoveBtnHdl ) ); + maEdRange.SetModifyHdl( LINK( &maEdRange, ScCondFormatDlg, EdRangeModifyHdl ) ); FreeResource(); + + maEdRange.SetText(aRangeString); } ScConditionalFormat* ScCondFormatDlg::GetConditionalFormat() const { - return maCondFormList.GetConditionalFormat(); + rtl::OUString aRangeStr = maEdRange.GetText(); + ScRangeList aRange; + sal_uInt16 nFlags = aRange.Parse(aRangeStr, mpDoc, SCA_VALID, mpDoc->GetAddressConvention()); + ScConditionalFormat* pFormat = maCondFormList.GetConditionalFormat(); + + if(nFlags & SCA_VALID && !aRange.empty()) + pFormat->AddRange(aRange); + + return pFormat; } IMPL_LINK_NOARG( ScCondFormatList, AddBtnHdl ) @@ -1153,5 +1166,10 @@ IMPL_LINK_NOARG( ScCondFormatList, ScrollHdl ) return 0; } +IMPL_LINK_NOARG( ScCondFormatDlg, EdRangeModifyHdl ) +{ + return 0; +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/condformatdlg.hrc b/sc/source/ui/inc/condformatdlg.hrc index d92e7a7e774b..98bf32a707ef 100644 --- a/sc/source/ui/inc/condformatdlg.hrc +++ b/sc/source/ui/inc/condformatdlg.hrc @@ -55,4 +55,7 @@ #define BTN_OPTIONS 30 #define STR_CONDITION 31 +#define FT_RANGE 32 +#define ED_RANGE 33 + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx index c5ea01dff4ea..5ddc027bc366 100644 --- a/sc/source/ui/inc/condformatdlg.hxx +++ b/sc/source/ui/inc/condformatdlg.hxx @@ -177,10 +177,15 @@ private: PushButton maBtnRemove; OKButton maBtnOk; CancelButton maBtnCancel; + FixedText maFtRange; + Edit maEdRange; ScCondFormatList maCondFormList; ScAddress maPos; + ScDocument* mpDoc; + + DECL_LINK( EdRangeModifyHdl, void* ); public: ScCondFormatDlg(Window* pWindow, ScDocument* pDoc, const ScConditionalFormat* pFormat, const ScRangeList& rRange, const ScAddress& rPos); diff --git a/sc/source/ui/src/condformatdlg.src b/sc/source/ui/src/condformatdlg.src index 2800724d2036..9a4977624b55 100644 --- a/sc/source/ui/src/condformatdlg.src +++ b/sc/source/ui/src/condformatdlg.src @@ -50,14 +50,14 @@ ModalDialog RID_SCDLG_CONDFORMAT }; PushButton BTN_ADD { - Pos = MAP_APPFONT( 5, 255 ); + Pos = MAP_APPFONT( 5, 245 ); Size = MAP_APPFONT( 50, 14 ); Text [ en-US ] = "Add"; TabStop = TRUE; }; PushButton BTN_REMOVE { - Pos = MAP_APPFONT( 60, 255 ); + Pos = MAP_APPFONT( 60, 245 ); Size = MAP_APPFONT( 50, 14 ); Text [ en-US ] = "Remove"; TabStop = TRUE; @@ -68,6 +68,18 @@ ModalDialog RID_SCDLG_CONDFORMAT Size = MAP_APPFONT( 290, 220 ); Border = TRUE; }; + FixedText FT_RANGE + { + Pos = MAP_APPFONT( 5, 262 ); + Size = MAP_APPFONT( 50, 16 ); + Text [ en-US ] = "Range:"; + }; + Edit ED_RANGE + { + Pos = MAP_APPFONT( 60, 262 ); + Size = MAP_APPFONT( 200, 14 ); + Border = TRUE; + }; }; Control RID_COND_ENTRY From 9aee608f4997201f29b740bf803f1f96ed4f7358 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Thu, 4 Oct 2012 05:56:37 +0200 Subject: [PATCH 393/863] also highlight invalid ranges Change-Id: I51c725319acb0547963feddf18c0fb34aa6e4f25 --- sc/source/ui/condformat/condformatdlg.cxx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index 5d56bec37428..50be91fcb66f 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -1168,6 +1168,13 @@ IMPL_LINK_NOARG( ScCondFormatList, ScrollHdl ) IMPL_LINK_NOARG( ScCondFormatDlg, EdRangeModifyHdl ) { + rtl::OUString aRangeStr = maEdRange.GetText(); + ScRangeList aRange; + sal_uInt16 nFlags = aRange.Parse(aRangeStr, mpDoc, SCA_VALID, mpDoc->GetAddressConvention()); + if(nFlags & SCA_VALID) + maEdRange.SetControlBackground(GetSettings().GetStyleSettings().GetWindowColor()); + else + maEdRange.SetControlBackground(COL_LIGHTRED); return 0; } From 8b100e1b0f90a43a0f4503415f114b1790606ea4 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Thu, 4 Oct 2012 23:25:19 +0200 Subject: [PATCH 394/863] remove unused ATTR_COLORSCALE Change-Id: I8118127b21144962275cb4486881b1e63b06ff0a --- sc/inc/scitems.hxx | 1 - sc/source/core/data/docpool.cxx | 2 -- 2 files changed, 3 deletions(-) diff --git a/sc/inc/scitems.hxx b/sc/inc/scitems.hxx index 57073f34e36a..2f219e2a615f 100644 --- a/sc/inc/scitems.hxx +++ b/sc/inc/scitems.hxx @@ -117,7 +117,6 @@ #define ATTR_SHADOW 152 #define ATTR_VALIDDATA 153 #define ATTR_CONDITIONAL 154 -#define ATTR_COLORSCALE 155 #define ATTR_PATTERN_END 155 // end cell-attribute-pattern diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index f2c9661a85e2..b0a8d7d513be 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -150,7 +150,6 @@ static SfxItemInfo const aItemInfos[] = { SID_ATTR_BORDER_SHADOW, SFX_ITEM_POOLABLE }, // ATTR_SHADOW { 0, SFX_ITEM_POOLABLE }, // ATTR_VALIDDATA { 0, SFX_ITEM_POOLABLE }, // ATTR_CONDITIONAL - { 0, SFX_ITEM_POOLABLE }, // ATTR_COLORSCALE { 0, SFX_ITEM_POOLABLE }, // ATTR_PATTERN { SID_ATTR_LRSPACE, SFX_ITEM_POOLABLE }, // ATTR_LRSPACE { SID_ATTR_ULSPACE, SFX_ITEM_POOLABLE }, // ATTR_ULSPACE @@ -289,7 +288,6 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, sal_Bool bLoadRefCounts ) ppPoolDefaults[ ATTR_SHADOW - ATTR_STARTINDEX ] = new SvxShadowItem( ATTR_SHADOW ); ppPoolDefaults[ ATTR_VALIDDATA - ATTR_STARTINDEX ] = new SfxUInt32Item( ATTR_VALIDDATA, 0 ); ppPoolDefaults[ ATTR_CONDITIONAL - ATTR_STARTINDEX ] = new SfxUInt32Item( ATTR_CONDITIONAL, 0 ); - ppPoolDefaults[ ATTR_COLORSCALE - ATTR_STARTINDEX ] = new SfxUInt32Item( ATTR_COLORSCALE, 0 ); // GetRscString funktioniert erst nach ScGlobal::Init, zu erkennen am EmptyBrushItem //! zusaetzliche Methode ScGlobal::IsInit() oder so... From d2b49b5b9bffdfa34174af96d85a392fde21fae1 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Fri, 5 Oct 2012 19:05:25 +0200 Subject: [PATCH 395/863] support overlapping conditional formats Still missing: *Removing conditional formats *Handling of Manage Names dialog *UNO *Undo/Redo *Import/export *Adjusting the dialogs to support this Change-Id: I72481cfb807fee2c3a1546222fe7e786d515ab44 --- sc/inc/attarray.hxx | 2 + sc/inc/attrib.hxx | 24 ++++++++++ sc/inc/column.hxx | 1 + sc/inc/document.hxx | 1 + sc/inc/scitems.hxx | 74 +++++++++++++++---------------- sc/inc/table.hxx | 1 + sc/source/core/data/attarray.cxx | 49 ++++++++++++++++++++ sc/source/core/data/attrib.cxx | 47 ++++++++++++++++++++ sc/source/core/data/column.cxx | 5 +++ sc/source/core/data/docpool.cxx | 2 +- sc/source/core/data/document.cxx | 11 +++++ sc/source/core/data/fillinfo.cxx | 73 ++++++++++++++++-------------- sc/source/core/data/table2.cxx | 17 +++++++ sc/source/ui/docshell/docfunc.cxx | 18 ++------ 14 files changed, 239 insertions(+), 86 deletions(-) diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx index 1f8d9f21e49f..ded335eac829 100644 --- a/sc/inc/attarray.hxx +++ b/sc/inc/attarray.hxx @@ -138,6 +138,8 @@ public: void ApplyLineStyleArea( SCROW nStartRow, SCROW nEndRow, const ::editeng::SvxBorderLine* pLine, bool bColorOnly ); + void AddCondFormat( SCROW nStartRow, SCROW nEndRow, sal_uInt32 nIndex ); + void ClearItems( SCROW nStartRow, SCROW nEndRow, const sal_uInt16* pWhich ); void ChangeIndent( SCROW nStartRow, SCROW nEndRow, bool bIncrement ); diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx index 0418d78723ed..eb051fd8e1ac 100644 --- a/sc/inc/attrib.hxx +++ b/sc/inc/attrib.hxx @@ -393,6 +393,30 @@ private: sal_uInt16 mnHeight; }; +class ScCondFormatItem : public SfxPoolItem +{ +public: + TYPEINFO(); + + explicit ScCondFormatItem(); + explicit ScCondFormatItem(sal_uInt32 nIndex); + explicit ScCondFormatItem(const std::vector& nIndex); + + virtual ~ScCondFormatItem(); + + virtual int operator==(const SfxPoolItem& rCmp ) const; + virtual ScCondFormatItem* Clone( SfxItemPool* = 0 ) const; + + const std::vector& GetCondFormatData() const; + void AddCondFormatData( sal_uInt32 nIndex ); + void SetCondFormatData( const std::vector& aIndex ); + void RemoveCondFormatData( sal_uInt32 nIndex ); + +private: + + std::vector maIndex; +}; + // ============================================================================ #endif diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index 34e05cbc6368..388b121646a6 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -317,6 +317,7 @@ public: void ApplySelectionStyle(const ScStyleSheet& rStyle, const ScMarkData& rMark); void ApplySelectionLineStyle( const ScMarkData& rMark, const ::editeng::SvxBorderLine* pLine, bool bColorOnly ); + void AddCondFormat(SCROW nStartRow, SCROW nEndRow, sal_uInt32 nIndex ); const ScStyleSheet* GetStyle( SCROW nRow ) const; const ScStyleSheet* GetSelectionStyle( const ScMarkData& rMark, bool& rFound ) const; diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index da7b57521025..684a16a16165 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -1155,6 +1155,7 @@ public: SC_DLLPUBLIC const ScPatternAttr* GetMostUsedPattern( SCCOL nCol, SCROW nStartRow, SCROW nEndRow, SCTAB nTab ) const; const ScPatternAttr* GetSelectionPattern( const ScMarkData& rMark, bool bDeep = true ); ScPatternAttr* CreateSelectionPattern( const ScMarkData& rMark, bool bDeep = true ); + SC_DLLPUBLIC void AddCondFormatData( const ScRangeList& rRange, SCTAB nTab, sal_uInt32 nIndex ); SC_DLLPUBLIC ScConditionalFormat* GetCondFormat( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; SC_DLLPUBLIC const SfxItemSet* GetCondResult( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; diff --git a/sc/inc/scitems.hxx b/sc/inc/scitems.hxx index 2f219e2a615f..e644854373f0 100644 --- a/sc/inc/scitems.hxx +++ b/sc/inc/scitems.hxx @@ -118,51 +118,51 @@ #define ATTR_VALIDDATA 153 #define ATTR_CONDITIONAL 154 -#define ATTR_PATTERN_END 155 // end cell-attribute-pattern +#define ATTR_PATTERN_END 154 // end cell-attribute-pattern -#define ATTR_PATTERN 156 +#define ATTR_PATTERN 155 // page attributes -#define ATTR_LRSPACE 157 // editor: PageDesc-TabPage -#define ATTR_ULSPACE 158 -#define ATTR_PAGE 159 -#define ATTR_PAGE_PAPERTRAY 160 -#define ATTR_PAGE_PAPERBIN 161 -#define ATTR_PAGE_SIZE 162 -#define ATTR_PAGE_MAXSIZE 163 -#define ATTR_PAGE_HORCENTER 164 -#define ATTR_PAGE_VERCENTER 165 +#define ATTR_LRSPACE 156 // editor: PageDesc-TabPage +#define ATTR_ULSPACE 157 +#define ATTR_PAGE 158 +#define ATTR_PAGE_PAPERTRAY 159 +#define ATTR_PAGE_PAPERBIN 160 +#define ATTR_PAGE_SIZE 161 +#define ATTR_PAGE_MAXSIZE 162 +#define ATTR_PAGE_HORCENTER 163 +#define ATTR_PAGE_VERCENTER 164 -#define ATTR_PAGE_ON 166 // editor: header/footer-page -#define ATTR_PAGE_DYNAMIC 167 -#define ATTR_PAGE_SHARED 168 +#define ATTR_PAGE_ON 165 // editor: header/footer-page +#define ATTR_PAGE_DYNAMIC 166 +#define ATTR_PAGE_SHARED 167 -#define ATTR_PAGE_NOTES 169 // editor: table -#define ATTR_PAGE_GRID 170 -#define ATTR_PAGE_HEADERS 171 -#define ATTR_PAGE_CHARTS 172 -#define ATTR_PAGE_OBJECTS 173 -#define ATTR_PAGE_DRAWINGS 174 -#define ATTR_PAGE_TOPDOWN 175 -#define ATTR_PAGE_SCALE 176 -#define ATTR_PAGE_SCALETOPAGES 177 -#define ATTR_PAGE_FIRSTPAGENO 178 +#define ATTR_PAGE_NOTES 168 // editor: table +#define ATTR_PAGE_GRID 169 +#define ATTR_PAGE_HEADERS 170 +#define ATTR_PAGE_CHARTS 171 +#define ATTR_PAGE_OBJECTS 172 +#define ATTR_PAGE_DRAWINGS 173 +#define ATTR_PAGE_TOPDOWN 174 +#define ATTR_PAGE_SCALE 175 +#define ATTR_PAGE_SCALETOPAGES 176 +#define ATTR_PAGE_FIRSTPAGENO 177 -#define ATTR_PAGE_PRINTAREA 179 // editor: print areas -#define ATTR_PAGE_REPEATROW 180 -#define ATTR_PAGE_REPEATCOL 181 -#define ATTR_PAGE_PRINTTABLES 182 +#define ATTR_PAGE_PRINTAREA 178 // editor: print areas +#define ATTR_PAGE_REPEATROW 179 +#define ATTR_PAGE_REPEATCOL 180 +#define ATTR_PAGE_PRINTTABLES 181 -#define ATTR_PAGE_HEADERLEFT 183 // contents of header/ -#define ATTR_PAGE_FOOTERLEFT 184 // footer (left) -#define ATTR_PAGE_HEADERRIGHT 185 // contents of header/ -#define ATTR_PAGE_FOOTERRIGHT 186 // footer (right) -#define ATTR_PAGE_HEADERSET 187 // the corresponding sets -#define ATTR_PAGE_FOOTERSET 188 +#define ATTR_PAGE_HEADERLEFT 182 // contents of header/ +#define ATTR_PAGE_FOOTERLEFT 183 // footer (left) +#define ATTR_PAGE_HEADERRIGHT 184 // contents of header/ +#define ATTR_PAGE_FOOTERRIGHT 185 // footer (right) +#define ATTR_PAGE_HEADERSET 186 // the corresponding sets +#define ATTR_PAGE_FOOTERSET 187 -#define ATTR_PAGE_FORMULAS 189 -#define ATTR_PAGE_NULLVALS 190 +#define ATTR_PAGE_FORMULAS 188 +#define ATTR_PAGE_NULLVALS 189 -#define ATTR_PAGE_SCALETO 191 // #i8868# scale printout to width/height +#define ATTR_PAGE_SCALETO 190 // #i8868# scale printout to width/height #define ATTR_ENDINDEX ATTR_PAGE_SCALETO // end of pool-range diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 2b205e5c3042..757f3576d3c5 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -543,6 +543,7 @@ public: void SetPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr, bool bPutToPool = false ); void ApplyPatternIfNumberformatIncompatible( const ScRange& rRange, const ScPatternAttr& rPattern, short nNewType ); + void AddCondFormatData( const ScRangeList& rRange, sal_uInt32 nIndex ); void ApplyStyle( SCCOL nCol, SCROW nRow, const ScStyleSheet& rStyle ); void ApplyStyleArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScStyleSheet& rStyle ); diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx index bcba4dee6bec..4820cb1e5a30 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.cxx @@ -273,6 +273,55 @@ const ScPatternAttr* ScAttrArray::GetPatternRange( SCROW& rStartRow, return NULL; } +void ScAttrArray::AddCondFormat( SCROW nStartRow, SCROW nEndRow, sal_uInt32 nIndex ) +{ + if(!VALIDROW(nStartRow) || !VALIDROW(nEndRow)) + return; + + if(nEndRow < nStartRow) + return; + + SCROW nTempStartRow = nStartRow; + SCROW nTempEndRow = nEndRow; + + do + { + const ScPatternAttr* pPattern = GetPattern(nTempStartRow); + + ScPatternAttr aPattern( pDocument->GetPool() ); + if(pPattern) + { + SCROW nPatternStartRow; + SCROW nPatternEndRow; + GetPatternRange( nPatternStartRow, nPatternEndRow, nTempStartRow ); + + nTempEndRow = std::min( nPatternEndRow, nEndRow ); + const SfxPoolItem* pItem = NULL; + SfxItemState eState = pPattern->GetItemSet().GetItemState( ATTR_CONDITIONAL, true, &pItem ); + std::vector< sal_uInt32 > aCondFormatData; + if(pItem) + aCondFormatData = static_cast(pItem)->GetCondFormatData(); + aCondFormatData.push_back(nIndex); + + ScCondFormatItem aItem; + aItem.SetCondFormatData( aCondFormatData ); + aPattern.GetItemSet().Put( aItem ); + } + else + { + ScCondFormatItem aItem; + aItem.AddCondFormatData(nIndex); + aPattern.GetItemSet().Put( aItem ); + nTempEndRow = nEndRow; + } + + SetPatternArea( nTempStartRow, nTempEndRow, &aPattern, true ); + nTempStartRow = nTempEndRow + 1; + } + while(nTempEndRow < nEndRow); + +} + //------------------------------------------------------------------------ void ScAttrArray::SetPattern( SCROW nRow, const ScPatternAttr* pPattern, bool bPutToPool ) diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx index e2f2c55ba5e1..3ad9b8b9c8c7 100644 --- a/sc/source/core/data/attrib.cxx +++ b/sc/source/core/data/attrib.cxx @@ -60,6 +60,7 @@ TYPEINIT1(ScPageHFItem, SfxPoolItem); TYPEINIT1(ScViewObjectModeItem, SfxEnumItem); TYPEINIT1(ScDoubleItem, SfxPoolItem); TYPEINIT1(ScPageScaleToItem, SfxPoolItem); +TYPEINIT1(ScCondFormatItem, SfxPoolItem); //------------------------------------------------------------------------ @@ -1222,5 +1223,51 @@ bool ScPageScaleToItem::PutValue( const uno::Any& rAny, sal_uInt8 nMemberId ) // ============================================================================ +ScCondFormatItem::ScCondFormatItem(): + SfxPoolItem( ATTR_CONDITIONAL ) +{ +} + +ScCondFormatItem::ScCondFormatItem( sal_uInt32 nIndex ): + SfxPoolItem( ATTR_CONDITIONAL ) +{ + maIndex.push_back(nIndex); +} + +ScCondFormatItem::ScCondFormatItem( const std::vector& rIndex ): + SfxPoolItem( ATTR_CONDITIONAL ), + maIndex( rIndex ) +{ +} + +ScCondFormatItem::~ScCondFormatItem() +{ +} + +int ScCondFormatItem::operator==( const SfxPoolItem& rCmp ) const +{ + return maIndex == static_cast(rCmp).maIndex; +} + +ScCondFormatItem* ScCondFormatItem::Clone(SfxItemPool*) const +{ + return new ScCondFormatItem(maIndex); +} + +const std::vector& ScCondFormatItem::GetCondFormatData() const +{ + return maIndex; +} + +void ScCondFormatItem::AddCondFormatData( sal_uInt32 nIndex ) +{ + maIndex.push_back(nIndex); +} + +void ScCondFormatItem::SetCondFormatData( const std::vector& rIndex ) +{ + maIndex = rIndex; +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index db994622f3cb..446ddc140916 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -498,6 +498,11 @@ void ScColumn::ApplyPatternIfNumberformatIncompatible( const ScRange& rRange, } } +void ScColumn::AddCondFormat( SCROW nStartRow, SCROW nEndRow, sal_uInt32 nIndex ) +{ + pAttrArray->AddCondFormat( nStartRow, nEndRow, nIndex ); +} + void ScColumn::ApplyStyle( SCROW nRow, const ScStyleSheet& rStyle ) { diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index b0a8d7d513be..cc8915fbdfe9 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -287,7 +287,7 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, sal_Bool bLoadRefCounts ) ppPoolDefaults[ ATTR_BORDER_INNER - ATTR_STARTINDEX ] = pGlobalBorderInnerAttr; ppPoolDefaults[ ATTR_SHADOW - ATTR_STARTINDEX ] = new SvxShadowItem( ATTR_SHADOW ); ppPoolDefaults[ ATTR_VALIDDATA - ATTR_STARTINDEX ] = new SfxUInt32Item( ATTR_VALIDDATA, 0 ); - ppPoolDefaults[ ATTR_CONDITIONAL - ATTR_STARTINDEX ] = new SfxUInt32Item( ATTR_CONDITIONAL, 0 ); + ppPoolDefaults[ ATTR_CONDITIONAL - ATTR_STARTINDEX ] = new ScCondFormatItem; // GetRscString funktioniert erst nach ScGlobal::Init, zu erkennen am EmptyBrushItem //! zusaetzliche Methode ScGlobal::IsInit() oder so... diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index ade6c8e9b051..5ebd9f566be5 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -4211,6 +4211,17 @@ void ScDocument::ApplyPatternIfNumberformatIncompatible( const ScRange& rRange, maTabs[*itr]->ApplyPatternIfNumberformatIncompatible( rRange, rPattern, nNewType ); } +void ScDocument::AddCondFormatData( const ScRangeList& rRange, SCTAB nTab, sal_uInt32 nIndex ) +{ + if(!static_cast(nTab) < maTabs.size()) + return; + + if(!maTabs[nTab]) + return; + + maTabs[nTab]->AddCondFormatData(rRange, nIndex); +} + void ScDocument::ApplyStyle( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScStyleSheet& rStyle) { diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx index 29fee726655a..01204d60ee5c 100644 --- a/sc/source/core/data/fillinfo.cxx +++ b/sc/source/core/data/fillinfo.cxx @@ -477,12 +477,8 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX else bHidden = bHideFormula = false; - sal_uLong nConditional = ((const SfxUInt32Item&)pPattern-> - GetItem(ATTR_CONDITIONAL)).GetValue(); - - const ScConditionalFormat* pCondForm = NULL; - if ( nConditional && pCondFormList ) - pCondForm = pCondFormList->GetFormat( nConditional ); + const std::vector& rCondFormats = static_cast(pPattern->GetItem(ATTR_CONDITIONAL)).GetCondFormatData(); + bool bContainsCondFormat = !rCondFormats.empty(); do { @@ -493,7 +489,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX RowInfo* pThisRowInfo = &pRowInfo[nArrY]; if (pBackground != pDefBackground) // Spalten-HG == Standard ? pThisRowInfo->bEmptyBack = false; - if (pCondForm) + if (bContainsCondFormat) pThisRowInfo->bEmptyBack = false; if (bAutoFilter) pThisRowInfo->bAutoFilter = true; @@ -529,41 +525,50 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX pThisRowInfo->bEmptyBack = false; } - if ( pCondForm ) + if ( bContainsCondFormat ) { - ScCondFormatData aData = pCondForm->GetData( pInfo->pCell, - ScAddress( nX, nCurRow, nTab ) ); - if (!aData.aStyleName.isEmpty()) + bool bFound = false; + for(std::vector::const_iterator itr = rCondFormats.begin(); + itr != rCondFormats.end() && !bFound; ++itr) { - SfxStyleSheetBase* pStyleSheet = - pStlPool->Find( aData.aStyleName, SFX_STYLE_FAMILY_PARA ); - if ( pStyleSheet ) + ScConditionalFormat* pCondForm = pCondFormList->GetFormat(*itr); + ScCondFormatData aData = pCondForm->GetData( pInfo->pCell, + ScAddress( nX, nCurRow, nTab ) ); + if (!aData.aStyleName.isEmpty()) { - //! Style-Sets cachen !!! - pInfo->pConditionSet = &pStyleSheet->GetItemSet(); - bAnyCondition = true; - - // we need to check already here for protected cells - const SfxPoolItem* pItem; - if ( bTabProtect && pInfo->pConditionSet->GetItemState( ATTR_PROTECTION, true, &pItem ) == SFX_ITEM_SET ) + SfxStyleSheetBase* pStyleSheet = + pStlPool->Find( aData.aStyleName, SFX_STYLE_FAMILY_PARA ); + if ( pStyleSheet ) { - const ScProtectionAttr* pProtAttr = static_cast(pItem); - bHidden = pProtAttr->GetHideCell(); - bHideFormula = pProtAttr->GetHideFormula(); + //! Style-Sets cachen !!! + pInfo->pConditionSet = &pStyleSheet->GetItemSet(); + bAnyCondition = true; + + // we need to check already here for protected cells + const SfxPoolItem* pItem; + if ( bTabProtect && pInfo->pConditionSet->GetItemState( ATTR_PROTECTION, true, &pItem ) == SFX_ITEM_SET ) + { + const ScProtectionAttr* pProtAttr = static_cast(pItem); + bHidden = pProtAttr->GetHideCell(); + bHideFormula = pProtAttr->GetHideFormula(); + + } + bFound = true; } - + // if style is not there, treat like no condition + } + if(aData.pColorScale) + { + pInfo->pColorScale = aData.pColorScale; + bFound = true; } - // if style is not there, treat like no condition - } - if(aData.pColorScale) - { - pInfo->pColorScale = aData.pColorScale; - } - if(aData.pDataBar) - { - pInfo->pDataBar = aData.pDataBar; + if(aData.pDataBar) + { + pInfo->pDataBar = aData.pDataBar; + bFound = true; + } } } diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index eb22ac694d6f..e3d386447221 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -2146,6 +2146,23 @@ void ScTable::ApplyPatternIfNumberformatIncompatible( const ScRange& rRange, } } +void ScTable::AddCondFormatData( const ScRangeList& rRange, sal_uInt32 nIndex ) +{ + size_t n = rRange.size(); + for(size_t i = 0; i < n; ++i) + { + const ScRange* pRange = rRange[i]; + SCCOL nColStart = pRange->aStart.Col(); + SCCOL nColEnd = pRange->aEnd.Col(); + SCROW nRowStart = pRange->aStart.Row(); + SCROW nRowEnd = pRange->aEnd.Row(); + for(SCCOL nCol = nColStart; nCol <= nColEnd; ++nCol) + { + aCol[nCol].AddCondFormat(nRowStart, nRowEnd, nIndex); + } + } +} + void ScTable::ApplyStyle( SCCOL nCol, SCROW nRow, const ScStyleSheet& rStyle ) diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 52b5c08b3cf5..c68b03d0feb0 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -5064,21 +5064,11 @@ namespace { void RemoveCondFormatAttributes(ScDocument* pDoc, const ScConditionalFormat* pFormat) { const ScRangeList& rRangeList = pFormat->GetRange(); - - ScPatternAttr aPattern( pDoc->GetPool() ); - aPattern.GetItemSet().Put( SfxUInt32Item( ATTR_CONDITIONAL, 0 ) ); - ScMarkData aMarkData; - aMarkData.MarkFromRangeList(rRangeList, true); - pDoc->ApplySelectionPattern( aPattern , aMarkData ); } -void SetConditionalFormatAttributes(ScDocument* pDoc, const ScRangeList& rRanges, sal_uLong nIndex) +void SetConditionalFormatAttributes(ScDocument* pDoc, const ScRangeList& rRanges, sal_uLong nIndex, SCTAB nTab) { - ScPatternAttr aPattern( pDoc->GetPool() ); - aPattern.GetItemSet().Put( SfxUInt32Item( ATTR_CONDITIONAL, nIndex ) ); - ScMarkData aMarkData; - aMarkData.MarkFromRangeList(rRanges, true); - pDoc->ApplySelectionPattern( aPattern , aMarkData ); + pDoc->AddCondFormatData( rRanges, nTab, nIndex ); } } @@ -5112,7 +5102,7 @@ void ScDocFunc::ReplaceConditionalFormat( sal_uLong nOldFormat, ScConditionalFor sal_uLong nIndex = pDoc->AddCondFormat(pFormat, nTab); - SetConditionalFormatAttributes(pDoc, rRanges, nIndex); + SetConditionalFormatAttributes(pDoc, rRanges, nIndex, nTab); pDoc->SetStreamValid(nTab, false); } @@ -5142,7 +5132,7 @@ void ScDocFunc::SetConditionalFormatList( ScConditionalFormatList* pList, SCTAB { sal_uLong nIndex = itr->GetKey(); const ScRangeList& rRange = itr->GetRange(); - SetConditionalFormatAttributes(pDoc, rRange, nIndex); + SetConditionalFormatAttributes(pDoc, rRange, nIndex, nTab); } pDoc->SetCondFormList(pList, nTab); From 62525574cc1ecbb4e8753ca704cb6a47f3d22dea Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Fri, 5 Oct 2012 19:46:54 +0200 Subject: [PATCH 396/863] adapt ods import of new cond format data Change-Id: I15969a5ddaab1d7edb2f0b2035f8206e6f544ab3 --- sc/source/filter/xml/xmlcondformat.cxx | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sc/source/filter/xml/xmlcondformat.cxx b/sc/source/filter/xml/xmlcondformat.cxx index c53e77fffcb6..23cff09003c4 100644 --- a/sc/source/filter/xml/xmlcondformat.cxx +++ b/sc/source/filter/xml/xmlcondformat.cxx @@ -137,14 +137,11 @@ void ScXMLConditionalFormatContext::EndElement() { ScDocument* pDoc = GetScImport().GetDocument(); - sal_uLong nIndex = pDoc->AddCondFormat(mpFormat, GetScImport().GetTables().GetCurrentSheet()); + SCTAB nTab = GetScImport().GetTables().GetCurrentSheet(); + sal_uLong nIndex = pDoc->AddCondFormat(mpFormat, nTab); mpFormat->SetKey(nIndex); - ScPatternAttr aPattern( pDoc->GetPool() ); - aPattern.GetItemSet().Put( SfxUInt32Item( ATTR_CONDITIONAL, nIndex ) ); - ScMarkData aMarkData; - aMarkData.MarkFromRangeList(mpFormat->GetRange(), true); - pDoc->ApplySelectionPattern( aPattern , aMarkData); + pDoc->AddCondFormatData( mpFormat->GetRange(), nTab, nIndex); } ScXMLColorScaleFormatContext::ScXMLColorScaleFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx, From e07da9e6c044c9e145f63eec0ddc7cbebfcb0e6e Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Fri, 5 Oct 2012 19:47:31 +0200 Subject: [PATCH 397/863] adapt oox import to cond format change Change-Id: I0924e0077f877cc123eab999c332e4c08df41f50 --- sc/source/filter/oox/condformatbuffer.cxx | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx index 7df532120e31..254b0d6d7beb 100644 --- a/sc/source/filter/oox/condformatbuffer.cxx +++ b/sc/source/filter/oox/condformatbuffer.cxx @@ -58,9 +58,6 @@ #include "document.hxx" #include "convuno.hxx" #include "docfunc.hxx" -#include "markdata.hxx" -#include "docpool.hxx" -#include "scitems.hxx" #include "tokenarray.hxx" #include "tokenuno.hxx" @@ -892,21 +889,17 @@ void CondFormat::finalizeImport() { ScDocument& rDoc = getScDocument(); maRules.forEachMem( &CondFormatRule::finalizeImport ); - sal_Int32 nIndex = getScDocument().AddCondFormat(mpFormat, maModel.maRanges.getBaseAddress().Sheet); + SCTAB nTab = maModel.maRanges.getBaseAddress().Sheet; + sal_Int32 nIndex = getScDocument().AddCondFormat(mpFormat, nTab); ScRangeList aList; for( ApiCellRangeList::const_iterator itr = maModel.maRanges.begin(); itr != maModel.maRanges.end(); ++itr) { ScRange aRange; ScUnoConversion::FillScRange(aRange, *itr); - ScPatternAttr aPattern( rDoc.GetPool() ); - aPattern.GetItemSet().Put( SfxUInt32Item( ATTR_CONDITIONAL, nIndex ) ); - ScMarkData aMarkData; - aMarkData.SetMarkArea(aRange); - rDoc.ApplySelectionPattern( aPattern , aMarkData); - aList.Append(aRange); } + rDoc.AddCondFormatData( aList, nTab, nIndex ); mpFormat->AddRange(aList); } From 23f51dc5accf23271921dd0fcefa68124644b100 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Fri, 5 Oct 2012 19:50:59 +0200 Subject: [PATCH 398/863] remove some newly unused includes Change-Id: I33e3d581d2ba38d6f68629fc2a7671cb48873bad --- sc/source/filter/xml/xmlcondformat.cxx | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sc/source/filter/xml/xmlcondformat.cxx b/sc/source/filter/xml/xmlcondformat.cxx index 23cff09003c4..32e075149752 100644 --- a/sc/source/filter/xml/xmlcondformat.cxx +++ b/sc/source/filter/xml/xmlcondformat.cxx @@ -36,11 +36,6 @@ #include "rangelst.hxx" #include "rangeutl.hxx" #include "docfunc.hxx" -#include "markdata.hxx" -#include "docpool.hxx" -#include "scitems.hxx" -#include "patattr.hxx" -#include "svl/intitem.hxx" #include "XMLConverter.hxx" From 72f1b6743ad5e6b1f8daeac1d1a2b3da4c3fde54 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Fri, 5 Oct 2012 19:58:56 +0200 Subject: [PATCH 399/863] adapt old style odf cond format import Change-Id: I0bfcc21f66e2c76f6c8521bfc711972eb747ac43 --- sc/source/filter/xml/xmlstyli.cxx | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index 687c841b27b4..fe0f2650c87b 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -454,12 +454,7 @@ void XMLTableStyleContext::ApplyCondFormat( uno::SequenceGetPool() ); - aPattern.GetItemSet().Put( SfxUInt32Item( ATTR_CONDITIONAL, nCondId ) ); - ScMarkData aMarkData; - aMarkData.MarkFromRangeList(aRangeList, true); - pDoc->ApplySelectionPattern( aPattern , aMarkData); - + pDoc->AddCondFormatData( aRangeList, nTab, nCondId ); break; } } @@ -471,11 +466,7 @@ void XMLTableStyleContext::ApplyCondFormat( uno::SequenceSetKey(nIndex); mpCondFormat->AddRange(aRangeList); - ScPatternAttr aPattern( pDoc->GetPool() ); - aPattern.GetItemSet().Put( SfxUInt32Item( ATTR_CONDITIONAL, nIndex ) ); - ScMarkData aMarkData; - aMarkData.MarkFromRangeList(aRangeList, true); - pDoc->ApplySelectionPattern( aPattern , aMarkData); + pDoc->AddCondFormatData( aRangeList, nTab, nIndex ); } From e454487d3a7349a1ec19b9785e36ad9e50add542 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Fri, 5 Oct 2012 20:38:57 +0200 Subject: [PATCH 400/863] use parantheses to prevent wrong evaluation Change-Id: Ia872b5648286fd76039f7c397ea78e18bc2ad6b8 --- sc/source/core/data/document.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 5ebd9f566be5..14b6983d2990 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -4213,7 +4213,7 @@ void ScDocument::ApplyPatternIfNumberformatIncompatible( const ScRange& rRange, void ScDocument::AddCondFormatData( const ScRangeList& rRange, SCTAB nTab, sal_uInt32 nIndex ) { - if(!static_cast(nTab) < maTabs.size()) + if(!(static_cast(nTab) < maTabs.size())) return; if(!maTabs[nTab]) From 455feac565c124a670d72bdd985e398021fb6ae9 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Fri, 5 Oct 2012 20:39:20 +0200 Subject: [PATCH 401/863] adapt xls import to new cond formats Change-Id: Ibf8149d14c1404fc6e82ec285be9389072f24c31 --- sc/source/filter/excel/xicontent.cxx | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx index 0d4319ae7226..c5f6dad50a6a 100644 --- a/sc/source/filter/excel/xicontent.cxx +++ b/sc/source/filter/excel/xicontent.cxx @@ -650,19 +650,10 @@ void XclImpCondFormat::Apply() { ScDocument& rDoc = GetDoc(); - sal_uLong nKey = rDoc.AddCondFormat( mxScCondFmt->Clone(), maRanges.front()->aStart.Tab() ); - ScPatternAttr aPattern( rDoc.GetPool() ); - aPattern.GetItemSet().Put( SfxUInt32Item( ATTR_CONDITIONAL, nKey ) ); + SCTAB nTab = maRanges.front()->aStart.Tab(); + sal_uLong nKey = rDoc.AddCondFormat( mxScCondFmt->Clone(), nTab ); - // maRanges contains only valid cell ranges - for ( size_t i = 0, nRanges = maRanges.size(); i < nRanges; ++i ) - { - const ScRange* pScRange = maRanges[ i ]; - rDoc.ApplyPatternAreaTab( - pScRange->aStart.Col(), pScRange->aStart.Row(), - pScRange->aEnd.Col(), pScRange->aEnd.Row(), - pScRange->aStart.Tab(), aPattern ); - } + rDoc.AddCondFormatData( maRanges, nTab, nKey ); } } From 7152dd8ebfa93e4d7ebe84998fa0ce5fbe43966c Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Fri, 5 Oct 2012 21:41:58 +0200 Subject: [PATCH 402/863] adapt ScDocument methods to new overlapping cond formats Change-Id: Ifc18a3f02b7734e1f6772fb264f2c7bfe6907f17 --- sc/source/core/data/documen4.cxx | 42 +++++++++++++++++++++----------- sc/source/core/data/documen6.cxx | 3 ++- 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx index 52fe982bcbf7..1a21d690722a 100644 --- a/sc/source/core/data/documen4.cxx +++ b/sc/source/core/data/documen4.cxx @@ -49,6 +49,7 @@ #include "compiler.hxx" #include "externalrefmgr.hxx" #include "colorscale.hxx" +#include "attrib.hxx" using namespace formula; @@ -639,22 +640,26 @@ const SfxPoolItem* ScDocument::GetEffItem( const SfxPoolItem* pItem; if ( rSet.GetItemState( ATTR_CONDITIONAL, true, &pItem ) == SFX_ITEM_SET ) { - sal_uLong nIndex = ((const SfxUInt32Item*)pItem)->GetValue(); + const std::vector& rIndex = static_cast(pPattern->GetItem(ATTR_CONDITIONAL)).GetCondFormatData(); ScConditionalFormatList* pCondFormList = GetCondFormList( nTab ); - if (nIndex && pCondFormList) + if (!rIndex.empty() && pCondFormList) { - const ScConditionalFormat* pForm = pCondFormList->GetFormat( nIndex ); - if ( pForm ) + for(std::vector::const_iterator itr = rIndex.begin(), itrEnd = rIndex.end(); + itr != itrEnd; ++itr) { - ScBaseCell* pCell = ((ScDocument*)this)->GetCell(ScAddress(nCol,nRow,nTab)); - rtl::OUString aStyle = pForm->GetCellStyle( pCell, ScAddress(nCol, nRow, nTab) ); - if (!aStyle.isEmpty()) + const ScConditionalFormat* pForm = pCondFormList->GetFormat( *itr ); + if ( pForm ) { - SfxStyleSheetBase* pStyleSheet = xPoolHelper->GetStylePool()->Find( - aStyle, SFX_STYLE_FAMILY_PARA ); - if ( pStyleSheet && pStyleSheet->GetItemSet().GetItemState( - nWhich, true, &pItem ) == SFX_ITEM_SET ) - return pItem; + ScBaseCell* pCell = ((ScDocument*)this)->GetCell(ScAddress(nCol,nRow,nTab)); + rtl::OUString aStyle = pForm->GetCellStyle( pCell, ScAddress(nCol, nRow, nTab) ); + if (!aStyle.isEmpty()) + { + SfxStyleSheetBase* pStyleSheet = xPoolHelper->GetStylePool()->Find( + aStyle, SFX_STYLE_FAMILY_PARA ); + if ( pStyleSheet && pStyleSheet->GetItemSet().GetItemState( + nWhich, true, &pItem ) == SFX_ITEM_SET ) + return pItem; + } } } } @@ -667,9 +672,16 @@ const SfxPoolItem* ScDocument::GetEffItem( const SfxItemSet* ScDocument::GetCondResult( SCCOL nCol, SCROW nRow, SCTAB nTab ) const { - const ScConditionalFormat* pForm = GetCondFormat( nCol, nRow, nTab ); - if ( pForm ) + const ScPatternAttr* pPattern = GetPattern( nCol, nRow, nTab ); + const std::vector& rIndex = static_cast(pPattern->GetItem(ATTR_CONDITIONAL)).GetCondFormatData(); + ScConditionalFormatList* pFormatList = GetCondFormList(nTab); + for(std::vector::const_iterator itr = rIndex.begin(), itrEnd = rIndex.end(); + itr != itrEnd; ++itr) { + ScConditionalFormat* pForm = pFormatList->GetFormat(*itr); + if(!pForm) + continue; + ScBaseCell* pCell = ((ScDocument*)this)->GetCell(ScAddress(nCol,nRow,nTab)); rtl::OUString aStyle = pForm->GetCellStyle( pCell, ScAddress(nCol, nRow, nTab) ); if (!aStyle.isEmpty()) @@ -679,7 +691,9 @@ const SfxItemSet* ScDocument::GetCondResult( SCCOL nCol, SCROW nRow, SCTAB nTab return &pStyleSheet->GetItemSet(); // if style is not there, treat like no condition } + } + return NULL; } diff --git a/sc/source/core/data/documen6.cxx b/sc/source/core/data/documen6.cxx index 4acd9eaa1299..544950fd7181 100644 --- a/sc/source/core/data/documen6.cxx +++ b/sc/source/core/data/documen6.cxx @@ -39,6 +39,7 @@ #include "patattr.hxx" #include "scrdata.hxx" #include "poolhelp.hxx" +#include "attrib.hxx" using namespace com::sun::star; @@ -168,7 +169,7 @@ sal_uInt8 ScDocument::GetScriptType( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseC const ScPatternAttr* pPattern = GetPattern( nCol, nRow, nTab ); if (!pPattern) return 0; const SfxItemSet* pCondSet = NULL; - if ( ((const SfxUInt32Item&)pPattern->GetItem(ATTR_CONDITIONAL)).GetValue() ) + if ( !((const ScCondFormatItem&)pPattern->GetItem(ATTR_CONDITIONAL)).GetCondFormatData().empty() ) pCondSet = GetCondResult( nCol, nRow, nTab ); sal_uLong nFormat = pPattern->GetNumberFormat( xPoolHelper->GetFormTable(), pCondSet ); From 3cb337fdcf0c502875c25405c1012713b1b86152 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Fri, 5 Oct 2012 22:50:34 +0200 Subject: [PATCH 403/863] adpat ScTable methods to overlapping conditional formats Change-Id: I2f63ac7884f0897aa47fd4ee35b8af06553c311c --- sc/inc/document.hxx | 1 - sc/inc/table.hxx | 2 - sc/source/core/data/documen4.cxx | 6 --- sc/source/core/data/table1.cxx | 4 +- sc/source/core/data/table2.cxx | 67 ++++++++++++++-------------- sc/source/core/data/table3.cxx | 17 ------- sc/source/filter/excel/xecontent.cxx | 3 +- 7 files changed, 36 insertions(+), 64 deletions(-) diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 684a16a16165..51a549390524 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -1190,7 +1190,6 @@ public: SC_DLLPUBLIC sal_uLong AddCondFormat( ScConditionalFormat* pNew, SCTAB nTab ); void DeleteConditionalFormat( sal_uLong nIndex, SCTAB nTab ); - SC_DLLPUBLIC void FindConditionalFormat( sal_uLong nKey, ScRangeList& rRanges, SCTAB nTab ); void ConditionalChanged( sal_uLong nKey, SCTAB nTab ); void SetCondFormList( ScConditionalFormatList* pList, SCTAB nTab ); diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 757f3576d3c5..e4d7ba0a2876 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -778,8 +778,6 @@ public: SCCOL nCol, SCROW nRowStart, SCROW nRowEnd ) const; - void FindConditionalFormat( sal_uLong nKey, ScRangeList& rRanges ) const; - void IncRecalcLevel(); void DecRecalcLevel( bool bUpdateNoteCaptionPos = true ); diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx index 1a21d690722a..3295106f40d1 100644 --- a/sc/source/core/data/documen4.cxx +++ b/sc/source/core/data/documen4.cxx @@ -738,12 +738,6 @@ const ScValidationData* ScDocument::GetValidationEntry( sal_uLong nIndex ) const return NULL; } -void ScDocument::FindConditionalFormat( sal_uLong nKey, ScRangeList& rRanges, SCTAB nTab ) -{ - if(VALIDTAB(nTab) && nTab < static_cast(maTabs.size()) && maTabs[nTab]) - maTabs[nTab]->FindConditionalFormat( nKey, rRanges ); -} - void ScDocument::DeleteConditionalFormat(sal_uLong nOldIndex, SCTAB nTab) { if(VALIDTAB(nTab) && nTab < static_cast(maTabs.size()) && maTabs[nTab]) diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx index 2e1dfbdd595d..6d61bd7b4b23 100644 --- a/sc/source/core/data/table1.cxx +++ b/sc/source/core/data/table1.cxx @@ -1790,9 +1790,7 @@ void ScTable::MaybeAddExtraColumn(SCCOL& rCol, SCROW nRow, OutputDevice* pDev, d // look at alignment const ScPatternAttr* pPattern = GetPattern( rCol, nRow ); - const SfxItemSet* pCondSet = NULL; - if ( ((const SfxUInt32Item&)pPattern->GetItem(ATTR_CONDITIONAL)).GetValue() ) - pCondSet = pDocument->GetCondResult( rCol, nRow, nTab ); + const SfxItemSet* pCondSet = pDocument->GetCondResult( rCol, nRow, nTab ); SvxCellHorJustify eHorJust = (SvxCellHorJustify)((const SvxHorJustifyItem&) pPattern->GetItem( ATTR_HOR_JUSTIFY, pCondSet )).GetValue(); diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index e3d386447221..dbd65eb8d926 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -664,12 +664,13 @@ void ScTable::CopyConditionalFormat( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCRO ScAttrIterator* pIter = pTable->aCol[i-nDx].CreateAttrIterator( nRow1-nDy, nRow2-nDy ); SCROW nStartRow = 0, nEndRow = 0; const ScPatternAttr* pPattern = pIter->Next( nStartRow, nEndRow ); - sal_uInt32 nId = ((SfxUInt32Item&)pPattern->GetItem(ATTR_CONDITIONAL)).GetValue(); - if ( nId != 0) + const std::vector& rCondFormatData = static_cast(pPattern->GetItem(ATTR_CONDITIONAL)).GetCondFormatData(); + for(std::vector::const_iterator itr = rCondFormatData.begin(), itrEnd = rCondFormatData.end(); + itr != itrEnd; ++itr) { - if (aOldIdToNewId.find(nId) == aOldIdToNewId.end()) + if (aOldIdToNewId.find(*itr) == aOldIdToNewId.end()) { - ScConditionalFormat* pFormat = pOldCondFormatList->GetFormat(nId); + ScConditionalFormat* pFormat = pOldCondFormatList->GetFormat(*itr); if(!pFormat) { // may happen in some strange circumstances where cell storage and @@ -680,20 +681,20 @@ void ScTable::CopyConditionalFormat( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCRO pNewFormat->SetKey(0); //not in list => create entries in both maps and new format sal_uLong nMax = 0; - for(ScConditionalFormatList::const_iterator itr = mpCondFormatList->begin(); - itr != mpCondFormatList->end(); ++itr) + for(ScConditionalFormatList::const_iterator itrCond = mpCondFormatList->begin(); + itrCond != mpCondFormatList->end(); ++itrCond) { - if(itr->GetKey() > nMax) - nMax = itr->GetKey(); + if(itrCond->GetKey() > nMax) + nMax = itrCond->GetKey(); } pNewFormat->SetKey(nMax + 1); mpCondFormatList->InsertNew(pNewFormat); sal_Int32 nNewId = pNewFormat->GetKey(); - aOldIdToNewId.insert( std::pair( nId, nNewId ) ); - aIdToRange.insert( std::pair( nId, ScRangeList() ) ); + aOldIdToNewId.insert( std::pair( *itr, nNewId ) ); + aIdToRange.insert( std::pair( *itr, ScRangeList() ) ); } - aIdToRange.find(nId)->second.Join( ScRange( i, nStartRow + nDy, nTab, i, nEndRow + nDy, nTab ) ); + aIdToRange.find(*itr)->second.Join( ScRange( i, nStartRow + nDy, nTab, i, nEndRow + nDy, nTab ) ); } } @@ -709,11 +710,7 @@ void ScTable::CopyConditionalFormat( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCRO nDx, nDy, pTable->nTab - nTab); pFormat->AddRange(itr->second); - ScPatternAttr aPattern( pDocument->GetPool() ); - aPattern.GetItemSet().Put( SfxUInt32Item( ATTR_CONDITIONAL, nNewKey ) ); - ScMarkData aMarkData; - aMarkData.MarkFromRangeList(itr->second, true); - pDocument->ApplySelectionPattern( aPattern, aMarkData ); + pDocument->AddCondFormatData( itr->second, nTab, nNewKey ); } } @@ -1762,31 +1759,35 @@ void ScTable::FindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCC // alle Formate durchgehen, damit die Zellen nicht einzeln // angeschaut werden muessen - sal_uLong nIndex = ((const SfxUInt32Item*)pCondItem)->GetValue(); + const std::vector& rCondFormatData = static_cast(pCondItem)->GetCondFormatData(); ScStyleSheetPool* pStylePool = pDocument->GetStyleSheetPool(); - if (mpCondFormatList && pStylePool && nIndex) + if (mpCondFormatList && pStylePool && !rCondFormatData.empty()) { - const ScConditionalFormat* pFormat = mpCondFormatList->GetFormat(nIndex); - if ( pFormat ) + for(std::vector::const_iterator itr = rCondFormatData.begin(), itrEnd = rCondFormatData.end(); + itr != itrEnd; ++itr) { - size_t nEntryCount = pFormat->size(); - for (size_t nEntry=0; nEntryGetFormat(*itr); + if ( pFormat ) { - const ScFormatEntry* pEntry = pFormat->GetEntry(nEntry); - if(pEntry->GetType() != condformat::CONDITION) - continue; - - String aStyleName = static_cast(pEntry)->GetStyle(); - if (aStyleName.Len()) + size_t nEntryCount = pFormat->size(); + for (size_t nEntry=0; nEntryFind( aStyleName, SFX_STYLE_FAMILY_PARA ); - if ( pStyleSheet ) + const ScFormatEntry* pEntry = pFormat->GetEntry(nEntry); + if(pEntry->GetType() != condformat::CONDITION) + continue; + + String aStyleName = static_cast(pEntry)->GetStyle(); + if (aStyleName.Len()) { - FillMaxRot( pRowInfo, nArrCount, nX1, nX2, + SfxStyleSheetBase* pStyleSheet = + pStylePool->Find( aStyleName, SFX_STYLE_FAMILY_PARA ); + if ( pStyleSheet ) + { + FillMaxRot( pRowInfo, nArrCount, nX1, nX2, nCol, nAttrRow1, nAttrRow2, nArrY, pPattern, &pStyleSheet->GetItemSet() ); - // nArrY nicht veraendern + // nArrY nicht veraendern + } } } } diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index 7688b4e4f825..2e1c57d0380b 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -2302,23 +2302,6 @@ void ScTable::UpdateSelectionFunction( ScFunctionData& rData, aCol[nCol].UpdateAreaFunction( rData, *mpHiddenRows, nStartRow, nEndRow ); } -void ScTable::FindConditionalFormat( sal_uLong nKey, ScRangeList& rList ) const -{ - SCROW nStartRow = 0, nEndRow = 0; - for (SCCOL nCol=0; nCol<=MAXCOL; nCol++) - { - ScAttrIterator* pIter = aCol[nCol].CreateAttrIterator( 0, MAXROW ); - const ScPatternAttr* pPattern = pIter->Next( nStartRow, nEndRow ); - while (pPattern) - { - if (((SfxUInt32Item&)pPattern->GetItem(ATTR_CONDITIONAL)).GetValue() == nKey) - rList.Join( ScRange(nCol,nStartRow,nTab, nCol,nEndRow,nTab) ); - pPattern = pIter->Next( nStartRow, nEndRow ); - } - delete pIter; - } -} - void ScTable::IncRecalcLevel() { ++nRecalcLvl; diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index abca86f96d68..2cac520d7063 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -973,8 +973,7 @@ XclExpCondfmt::XclExpCondfmt( const XclExpRoot& rRoot, const ScConditionalFormat XclExpRecord( EXC_ID_CONDFMT ), XclExpRoot( rRoot ) { - ScRangeList aScRanges; - GetDoc().FindConditionalFormat( rCondFormat.GetKey(), aScRanges, GetCurrScTab() ); + ScRangeList aScRanges = rCondFormat.GetRange(); GetAddressConverter().ConvertRangeList( maXclRanges, aScRanges, true ); if( !maXclRanges.empty() ) { From 1a25d4645ab9cf943cd4153647bfcaa02854d77e Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Fri, 5 Oct 2012 23:00:16 +0200 Subject: [PATCH 404/863] remaining places in calc core are adapted to overlapping cond formats Change-Id: I096623d3c531d21eca2f5be29f22a1677a738b0d --- sc/source/core/data/attarray.cxx | 14 +++++++------- sc/source/core/data/column2.cxx | 4 +--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx index 4820cb1e5a30..1b16d0bcca4f 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.cxx @@ -297,7 +297,7 @@ void ScAttrArray::AddCondFormat( SCROW nStartRow, SCROW nEndRow, sal_uInt32 nInd nTempEndRow = std::min( nPatternEndRow, nEndRow ); const SfxPoolItem* pItem = NULL; - SfxItemState eState = pPattern->GetItemSet().GetItemState( ATTR_CONDITIONAL, true, &pItem ); + pPattern->GetItemSet().GetItemState( ATTR_CONDITIONAL, true, &pItem ); std::vector< sal_uInt32 > aCondFormatData; if(pItem) aCondFormatData = static_cast(pItem)->GetCondFormatData(); @@ -1229,9 +1229,9 @@ bool ScAttrArray::HasAttrib( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const } if ( nMask & HASATTR_CONDITIONAL ) { - const SfxUInt32Item* pConditional = - (const SfxUInt32Item*) &pPattern->GetItem( ATTR_CONDITIONAL ); - if ( pConditional->GetValue() != 0 ) + bool bContainsCondFormat = + !static_cast(pPattern->GetItem( ATTR_CONDITIONAL )).GetCondFormatData().empty(); + if ( bContainsCondFormat ) bFound = true; } if ( nMask & HASATTR_PROTECTED ) @@ -1242,9 +1242,9 @@ bool ScAttrArray::HasAttrib( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const if ( pProtect->GetProtection() || pProtect->GetHideCell() ) bFoundTemp = true; - const SfxUInt32Item* pConditional = - (const SfxUInt32Item*) &pPattern->GetItem( ATTR_CONDITIONAL ); - if ( pConditional->GetValue() != 0 ) + bool bContainsCondFormat = + !static_cast(pPattern->GetItem( ATTR_CONDITIONAL )).GetCondFormatData().empty(); + if ( bContainsCondFormat ) { SCROW nRowStartCond = std::max( nRow1, i ? pData[i-1].nRow + 1: 0 ); SCROW nRowEndCond = std::min( nRow2, pData[i].nRow ); diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx index 435e8b82e99e..b554ff94344f 100644 --- a/sc/source/core/data/column2.cxx +++ b/sc/source/core/data/column2.cxx @@ -126,9 +126,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, } // bedingte Formatierung - const SfxItemSet* pCondSet = NULL; - if ( ((const SfxUInt32Item&)pPattern->GetItem(ATTR_CONDITIONAL)).GetValue() ) - pCondSet = pDocument->GetCondResult( nCol, nRow, nTab ); + const SfxItemSet* pCondSet = pDocument->GetCondResult( nCol, nRow, nTab ); // Zeilenumbruch? From 4921d9650d2ec41e3973e346ed73a20991255cde Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Fri, 5 Oct 2012 23:10:33 +0200 Subject: [PATCH 405/863] finally adapt the uno implementation Change-Id: I15ae8d041f4813c0ee0a36464526296d0cdeb3d7 --- sc/source/ui/unoobj/cellsuno.cxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index dd95c270d5fe..f06da09e5911 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -2412,11 +2412,8 @@ void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE ScConditionalFormat* pNew = new ScConditionalFormat( 0, pDoc ); // Index wird beim Einfuegen gesetzt pFormat->FillFormat( *pNew, pDoc, eGrammar ); pNew->AddRange( aRanges ); - sal_uLong nIndex = pDoc->AddCondFormat( pNew, aRanges.front()->aStart.Tab() ); - - ScPatternAttr aPattern( pDoc->GetPool() ); - aPattern.GetItemSet().Put( SfxUInt32Item( ATTR_CONDITIONAL, nIndex ) ); - pDocShell->GetDocFunc().ApplyAttributes( *GetMarkData(), aPattern, sal_True, sal_True ); + SCTAB nTab = aRanges.front()->aStart.Tab(); + pDocShell->GetDocFunc().ReplaceConditionalFormat( 0, pNew, nTab, aRanges ); } } } @@ -2572,8 +2569,11 @@ void ScCellRangesBase::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE formula::FormulaGrammar::Grammar eGrammar = (bXML ? pDoc->GetStorageGrammar() : formula::FormulaGrammar::mapAPItoGrammar( bEnglish, bXML)); - sal_uLong nIndex = ((const SfxUInt32Item&) - pPattern->GetItem(ATTR_CONDITIONAL)).GetValue(); + const std::vector& rIndex = ((const ScCondFormatItem&) + pPattern->GetItem(ATTR_CONDITIONAL)).GetCondFormatData(); + sal_uLong nIndex = 0; + if(!rIndex.empty()) + nIndex = rIndex[0]; rAny <<= uno::Reference( new ScTableConditionalFormat( pDoc, nIndex, aRanges.front()->aStart.Tab(), eGrammar )); } From fa02cce6800cd6021e0160e4698b9e90496a94c5 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Sat, 6 Oct 2012 00:03:35 +0200 Subject: [PATCH 406/863] also support removing of conditional formats Change-Id: I47ba632ccf752611a41b29c0da8e5d0f28a88565 --- sc/inc/attarray.hxx | 1 + sc/inc/column.hxx | 1 + sc/inc/document.hxx | 1 + sc/inc/table.hxx | 1 + sc/source/core/data/attarray.cxx | 51 +++++++++++++++++++++++++++++++ sc/source/core/data/column.cxx | 5 +++ sc/source/core/data/document.cxx | 11 +++++++ sc/source/core/data/table2.cxx | 17 +++++++++++ sc/source/ui/docshell/docfunc.cxx | 7 +++-- 9 files changed, 92 insertions(+), 3 deletions(-) diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx index ded335eac829..167404967933 100644 --- a/sc/inc/attarray.hxx +++ b/sc/inc/attarray.hxx @@ -139,6 +139,7 @@ public: const ::editeng::SvxBorderLine* pLine, bool bColorOnly ); void AddCondFormat( SCROW nStartRow, SCROW nEndRow, sal_uInt32 nIndex ); + void RemoveCondFormat( SCROW nStartRow, SCROW nEndRow, sal_uInt32 nIndex ); void ClearItems( SCROW nStartRow, SCROW nEndRow, const sal_uInt16* pWhich ); void ChangeIndent( SCROW nStartRow, SCROW nEndRow, bool bIncrement ); diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index 388b121646a6..3206637e7cfe 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -318,6 +318,7 @@ public: void ApplySelectionLineStyle( const ScMarkData& rMark, const ::editeng::SvxBorderLine* pLine, bool bColorOnly ); void AddCondFormat(SCROW nStartRow, SCROW nEndRow, sal_uInt32 nIndex ); + void RemoveCondFormat(SCROW nStartRow, SCROW nEndRow, sal_uInt32 nIndex ); const ScStyleSheet* GetStyle( SCROW nRow ) const; const ScStyleSheet* GetSelectionStyle( const ScMarkData& rMark, bool& rFound ) const; diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 51a549390524..f02f02821580 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -1156,6 +1156,7 @@ public: const ScPatternAttr* GetSelectionPattern( const ScMarkData& rMark, bool bDeep = true ); ScPatternAttr* CreateSelectionPattern( const ScMarkData& rMark, bool bDeep = true ); SC_DLLPUBLIC void AddCondFormatData( const ScRangeList& rRange, SCTAB nTab, sal_uInt32 nIndex ); + void RemoveCondFormatData( const ScRangeList& rRange, SCTAB nTab, sal_uInt32 nIndex ); SC_DLLPUBLIC ScConditionalFormat* GetCondFormat( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; SC_DLLPUBLIC const SfxItemSet* GetCondResult( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index e4d7ba0a2876..c630cb743574 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -544,6 +544,7 @@ public: void ApplyPatternIfNumberformatIncompatible( const ScRange& rRange, const ScPatternAttr& rPattern, short nNewType ); void AddCondFormatData( const ScRangeList& rRange, sal_uInt32 nIndex ); + void RemoveCondFormatData( const ScRangeList& rRange, sal_uInt32 nIndex ); void ApplyStyle( SCCOL nCol, SCROW nRow, const ScStyleSheet& rStyle ); void ApplyStyleArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScStyleSheet& rStyle ); diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx index 1b16d0bcca4f..b7b2260e62bf 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.cxx @@ -322,6 +322,57 @@ void ScAttrArray::AddCondFormat( SCROW nStartRow, SCROW nEndRow, sal_uInt32 nInd } +void ScAttrArray::RemoveCondFormat( SCROW nStartRow, SCROW nEndRow, sal_uInt32 nIndex ) +{ + if(!VALIDROW(nStartRow) || !VALIDROW(nEndRow)) + return; + + if(nEndRow < nStartRow) + return; + + SCROW nTempStartRow = nStartRow; + SCROW nTempEndRow = nEndRow; + + do + { + const ScPatternAttr* pPattern = GetPattern(nTempStartRow); + + ScPatternAttr aPattern( pDocument->GetPool() ); + if(pPattern) + { + SCROW nPatternStartRow; + SCROW nPatternEndRow; + GetPatternRange( nPatternStartRow, nPatternEndRow, nTempStartRow ); + + nTempEndRow = std::min( nPatternEndRow, nEndRow ); + const SfxPoolItem* pItem = NULL; + pPattern->GetItemSet().GetItemState( ATTR_CONDITIONAL, true, &pItem ); + if(pItem) + { + std::vector< sal_uInt32 > aCondFormatData = static_cast(pItem)->GetCondFormatData(); + std::vector::iterator itr = std::find(aCondFormatData.begin(), aCondFormatData.end(), nIndex); + if(itr != aCondFormatData.end()) + { + ScCondFormatItem aItem; + aCondFormatData.erase(itr); + aItem.SetCondFormatData( aCondFormatData ); + aPattern.GetItemSet().Put( aItem ); + SetPatternArea( nTempStartRow, nTempEndRow, &aPattern, true ); + } + + } + } + else + { + return; + } + + nTempStartRow = nTempEndRow + 1; + } + while(nTempEndRow < nEndRow); + +} + //------------------------------------------------------------------------ void ScAttrArray::SetPattern( SCROW nRow, const ScPatternAttr* pPattern, bool bPutToPool ) diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index 446ddc140916..683f99dbc549 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -503,6 +503,11 @@ void ScColumn::AddCondFormat( SCROW nStartRow, SCROW nEndRow, sal_uInt32 nIndex pAttrArray->AddCondFormat( nStartRow, nEndRow, nIndex ); } +void ScColumn::RemoveCondFormat( SCROW nStartRow, SCROW nEndRow, sal_uInt32 nIndex ) +{ + pAttrArray->RemoveCondFormat( nStartRow, nEndRow, nIndex ); +} + void ScColumn::ApplyStyle( SCROW nRow, const ScStyleSheet& rStyle ) { diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 14b6983d2990..30e12298e6b3 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -4222,6 +4222,17 @@ void ScDocument::AddCondFormatData( const ScRangeList& rRange, SCTAB nTab, sal_u maTabs[nTab]->AddCondFormatData(rRange, nIndex); } +void ScDocument::RemoveCondFormatData( const ScRangeList& rRange, SCTAB nTab, sal_uInt32 nIndex ) +{ + if(!(static_cast(nTab) < maTabs.size())) + return; + + if(!maTabs[nTab]) + return; + + maTabs[nTab]->RemoveCondFormatData(rRange, nIndex); +} + void ScDocument::ApplyStyle( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScStyleSheet& rStyle) { diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index dbd65eb8d926..69c7d00ab0b8 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -2164,6 +2164,23 @@ void ScTable::AddCondFormatData( const ScRangeList& rRange, sal_uInt32 nIndex ) } } +void ScTable::RemoveCondFormatData( const ScRangeList& rRange, sal_uInt32 nIndex ) +{ + size_t n = rRange.size(); + for(size_t i = 0; i < n; ++i) + { + const ScRange* pRange = rRange[i]; + SCCOL nColStart = pRange->aStart.Col(); + SCCOL nColEnd = pRange->aEnd.Col(); + SCROW nRowStart = pRange->aStart.Row(); + SCROW nRowEnd = pRange->aEnd.Row(); + for(SCCOL nCol = nColStart; nCol <= nColEnd; ++nCol) + { + aCol[nCol].RemoveCondFormat(nRowStart, nRowEnd, nIndex); + } + } +} + void ScTable::ApplyStyle( SCCOL nCol, SCROW nRow, const ScStyleSheet& rStyle ) diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index c68b03d0feb0..99a65a2d30c7 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -5061,9 +5061,10 @@ sal_Bool ScDocFunc::InsertAreaLink( const String& rFile, const String& rFilter, namespace { -void RemoveCondFormatAttributes(ScDocument* pDoc, const ScConditionalFormat* pFormat) +void RemoveCondFormatAttributes(ScDocument* pDoc, const ScConditionalFormat* pFormat, SCTAB nTab) { const ScRangeList& rRangeList = pFormat->GetRange(); + pDoc->RemoveCondFormatData( rRangeList, nTab, pFormat->GetKey() ); } void SetConditionalFormatAttributes(ScDocument* pDoc, const ScRangeList& rRanges, sal_uLong nIndex, SCTAB nTab) @@ -5087,7 +5088,7 @@ void ScDocFunc::ReplaceConditionalFormat( sal_uLong nOldFormat, ScConditionalFor pRepaintRange.reset(new ScRange( pOldFormat->GetRange().Combine() )); if(pOldFormat) { - RemoveCondFormatAttributes(pDoc, pOldFormat); + RemoveCondFormatAttributes(pDoc, pOldFormat, nTab); } pDoc->DeleteConditionalFormat(nOldFormat, nTab); @@ -5124,7 +5125,7 @@ void ScDocFunc::SetConditionalFormatList( ScConditionalFormatList* pList, SCTAB ScConditionalFormatList* pOldList = pDoc->GetCondFormList(nTab); for(ScConditionalFormatList::const_iterator itr = pOldList->begin(), itrEnd = pOldList->end(); itr != itrEnd; ++itr) { - RemoveCondFormatAttributes(pDoc, &(*itr)); + RemoveCondFormatAttributes(pDoc, &(*itr), nTab); } // then set new entries From c6e44b87ef6d47ab24bebd586de3e75e9f08cfbe Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Sat, 6 Oct 2012 00:22:21 +0200 Subject: [PATCH 407/863] fix crash in cond format dialog with new range edit Change-Id: Ie19038046fa9121cc234546a9891685153be5646 --- sc/source/ui/condformat/condformatdlg.cxx | 10 +++++----- sc/source/ui/inc/condformatdlg.hxx | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index 50be91fcb66f..2e294f2741c3 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -1103,7 +1103,7 @@ ScCondFormatDlg::ScCondFormatDlg(Window* pParent, ScDocument* pDoc, const ScCond SetText(aTitle.makeStringAndClear()); maBtnAdd.SetClickHdl( LINK( &maCondFormList, ScCondFormatList, AddBtnHdl ) ); maBtnRemove.SetClickHdl( LINK( &maCondFormList, ScCondFormatList, RemoveBtnHdl ) ); - maEdRange.SetModifyHdl( LINK( &maEdRange, ScCondFormatDlg, EdRangeModifyHdl ) ); + maEdRange.SetModifyHdl( LINK( this, ScCondFormatDlg, EdRangeModifyHdl ) ); FreeResource(); maEdRange.SetText(aRangeString); @@ -1166,15 +1166,15 @@ IMPL_LINK_NOARG( ScCondFormatList, ScrollHdl ) return 0; } -IMPL_LINK_NOARG( ScCondFormatDlg, EdRangeModifyHdl ) +IMPL_LINK( ScCondFormatDlg, EdRangeModifyHdl, Edit*, pEdit ) { - rtl::OUString aRangeStr = maEdRange.GetText(); + rtl::OUString aRangeStr = pEdit->GetText(); ScRangeList aRange; sal_uInt16 nFlags = aRange.Parse(aRangeStr, mpDoc, SCA_VALID, mpDoc->GetAddressConvention()); if(nFlags & SCA_VALID) - maEdRange.SetControlBackground(GetSettings().GetStyleSettings().GetWindowColor()); + pEdit->SetControlBackground(GetSettings().GetStyleSettings().GetWindowColor()); else - maEdRange.SetControlBackground(COL_LIGHTRED); + pEdit->SetControlBackground(COL_LIGHTRED); return 0; } diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx index 5ddc027bc366..4b3e780d69fc 100644 --- a/sc/source/ui/inc/condformatdlg.hxx +++ b/sc/source/ui/inc/condformatdlg.hxx @@ -185,7 +185,7 @@ private: ScAddress maPos; ScDocument* mpDoc; - DECL_LINK( EdRangeModifyHdl, void* ); + DECL_LINK( EdRangeModifyHdl, Edit* ); public: ScCondFormatDlg(Window* pWindow, ScDocument* pDoc, const ScConditionalFormat* pFormat, const ScRangeList& rRange, const ScAddress& rPos); From 2ca57fb3a9b3666409dadc515f76942a06902d72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= Date: Sat, 6 Oct 2012 07:09:46 +0200 Subject: [PATCH 408/863] Fix libcdr windows build Change-Id: I33a6c4659cf9e3792f17f73977637dab4667f58e --- libcdr/UnpackedTarball_cdr.mk | 3 + libcdr/libcdr-msvc.patch | 200 ++++++++++++++++++++++++++++++++++ 2 files changed, 203 insertions(+) create mode 100755 libcdr/libcdr-msvc.patch diff --git a/libcdr/UnpackedTarball_cdr.mk b/libcdr/UnpackedTarball_cdr.mk index 32d898bcaa8c..3b0202269333 100644 --- a/libcdr/UnpackedTarball_cdr.mk +++ b/libcdr/UnpackedTarball_cdr.mk @@ -11,8 +11,11 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,cdr)) $(eval $(call gb_UnpackedTarball_set_tarball,cdr,$(CDR_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_patchlevel,cdr,1)) + $(eval $(call gb_UnpackedTarball_add_patches,cdr,\ libcdr/libcdr-configure.patch.1 \ + libcdr/libcdr-msvc.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/libcdr/libcdr-msvc.patch b/libcdr/libcdr-msvc.patch new file mode 100755 index 000000000000..cf18fb9e1a66 --- /dev/null +++ b/libcdr/libcdr-msvc.patch @@ -0,0 +1,200 @@ +--- cdr/build/win32/cdr2raw.vcproj 2012-10-06 06:45:36.436443100 +0200 ++++ cdr/build/win32/cdr2raw.vcproj 2012-10-06 06:46:42.153510700 +0200 +@@ -69,7 +69,7 @@ + /> + + 0x0409 + + +- libcdr-0.2.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies) ++ libcdr-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies) + Debug\bin\cdr2raw.exe + true + Debug\lib;$(LIBWPD_LIB_DIR);$(LCMS2_LIB_DIR);$(ZLIB_LIB_DIR);%(AdditionalLibraryDirectories) +@@ -109,7 +109,7 @@ + 0x0409 + + +- libcdr-0.2.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies) ++ libcdr-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies) + Release\bin\cdr2raw.exe + true + Release\lib;$(LIBWPD_LIB_DIR);$(LCMS2_LIB_DIR);$(ZLIB_LIB_DIR);%(AdditionalLibraryDirectories) +--- cdr/build/win32/cdr2xhtml.vcproj 2012-10-06 06:45:36.436443100 +0200 ++++ cdr/build/win32/cdr2xhtml.vcproj 2012-10-06 06:46:42.169135300 +0200 +@@ -67,7 +67,7 @@ + /> + + 0x0409 + + +- libcdr-0.2.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies) ++ libcdr-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies) + Release\bin\cdr2xhtml.exe + true + Release\lib;$(LIBWPD_LIB_DIR);$(LCMS2_LIB_DIR);$(ZLIB_LIB_DIR);%(AdditionalLibraryDirectories) +@@ -108,7 +108,7 @@ + 0x0409 + + +- libcdr-0.2.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies) ++ libcdr-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies) + Debug\bin\cdr2xhtml.exe + true + Debug\lib;$(LIBWPD_LIB_DIR);$(LCMS2_LIB_DIR);%(AdditionalLibraryDirectories) +--- cdr/build/win32/cmx2raw.vcproj 2012-10-06 06:45:36.452067700 +0200 ++++ cdr/build/win32/cmx2raw.vcproj 2012-10-06 06:46:42.169135300 +0200 +@@ -69,7 +69,7 @@ + /> + + 0x0409 + + +- libcdr-0.2.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies) ++ libcdr-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies) + Debug\bin\cmx2raw.exe + true + Debug\lib;$(LIBWPD_LIB_DIR);$(LCMS2_LIB_DIR);$(ZLIB_LIB_DIR);%(AdditionalLibraryDirectories) +@@ -109,7 +109,7 @@ + 0x0409 + + +- libcdr-0.2.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies) ++ libcdr-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies) + Release\bin\cmx2raw.exe + true + Release\lib;$(LIBWPD_LIB_DIR);$(LCMS2_LIB_DIR);$(ZLIB_LIB_DIR);%(AdditionalLibraryDirectories) +--- cdr/build/win32/cmx2xhtml.vcproj 2012-10-06 06:45:36.452067700 +0200 ++++ cdr/build/win32/cmx2xhtml.vcproj 2012-10-06 06:46:42.184759900 +0200 +@@ -69,7 +69,7 @@ + /> + + 0x0409 + + +- libcdr-0.2.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies) ++ libcdr-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies) + Debug\bin\cmx2xhtml.exe + true + Debug\lib;$(LIBWPD_LIB_DIR);$(LCMS2_LIB_DIR);$(ZLIB_LIB_DIR);%(AdditionalLibraryDirectories) +@@ -109,7 +109,7 @@ + 0x0409 + + +- libcdr-0.2.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies) ++ libcdr-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies) + Release\bin\cmx2xhtml.exe + true + Release\lib;$(LIBWPD_LIB_DIR);$(LCMS2_LIB_DIR);$(ZLIB_LIB_DIR);%(AdditionalLibraryDirectories) +--- cdr/build/win32/libcdr.vcproj 2012-10-06 06:45:36.483316900 +0200 ++++ cdr/build/win32/libcdr.vcproj 2012-10-06 06:46:42.216009100 +0200 +@@ -67,7 +67,7 @@ + /> + + + + 0x0409 + + +- Debug\lib\libcdr-0.2.lib ++ Debug\lib\libcdr-0.0.lib + true + + +@@ -91,7 +91,7 @@ + 0x0409 + + +- Release\lib\libcdr-0.2.lib ++ Release\lib\libcdr-0.0.lib + true + + From c978bd34864a24e58685d5539f3506b9a5f8e8cb Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Sat, 6 Oct 2012 08:23:27 +0200 Subject: [PATCH 409/863] Remove newly unused methods Change-Id: I050660d095540902b442a86904d70ed544bccf13 --- .../slidesorter/controller/SlsProperties.cxx | 8 ----- .../inc/controller/SlsProperties.hxx | 1 - .../ui/slidesorter/inc/view/SlsToolTip.hxx | 8 ----- sd/source/ui/slidesorter/view/SlsToolTip.cxx | 31 ------------------- unusedcode.easy | 3 -- 5 files changed, 51 deletions(-) diff --git a/sd/source/ui/slidesorter/controller/SlsProperties.cxx b/sd/source/ui/slidesorter/controller/SlsProperties.cxx index 1f7cd71d0f59..ccf83b290fb2 100644 --- a/sd/source/ui/slidesorter/controller/SlsProperties.cxx +++ b/sd/source/ui/slidesorter/controller/SlsProperties.cxx @@ -254,14 +254,6 @@ bool Properties::IsOnlyPreviewTriggersMouseOver (void) const } - - -bool Properties::IsHighContrastModeActive (void) const -{ - return mbIsHighContrastModeActive; -} - - } } } // end of namespace ::sd::slidesorter::controller /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx index 990d66afdb4e..c775e6fc39ac 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx @@ -120,7 +120,6 @@ public: */ bool IsOnlyPreviewTriggersMouseOver (void) const; - bool IsHighContrastModeActive (void) const; private: bool mbIsHighlightCurrentSlide; diff --git a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx index a296568e844a..6df9a88e8143 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx @@ -54,14 +54,6 @@ public: */ void SetPage (const model::SharedPageDescriptor& rpPage); - /** Show a previously set default help text. - */ - void ShowDefaultHelpText (void); - - /** Show a temporary help text. - */ - void ShowHelpText (const ::rtl::OUString& rsHelpText); - /** Hide the tool tip. @return Returns whether the tool tip was visible at the time this method diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx index 217d9290264f..43dfb721d8af 100644 --- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx +++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx @@ -102,37 +102,6 @@ void ToolTip::SetPage (const model::SharedPageDescriptor& rpDescriptor) - -void ToolTip::ShowDefaultHelpText (void) -{ - if (msCurrentHelpText != msDefaultHelpText) - { - const bool bIsVisible (Hide()); - - msCurrentHelpText = msDefaultHelpText; - - Show(bIsVisible); - } -} - - - - -void ToolTip::ShowHelpText (const ::rtl::OUString& rsHelpText) -{ - if (msCurrentHelpText != rsHelpText) - { - const bool bIsVisible (Hide()); - - msCurrentHelpText = rsHelpText; - - Show(bIsVisible); - } -} - - - - void ToolTip::Show (const bool bNoDelay) { if (bNoDelay) diff --git a/unusedcode.easy b/unusedcode.easy index 94904ce7dccf..f31e7ef17d04 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -99,8 +99,5 @@ sd::framework::ResourceManager::Disable() sd::framework::ResourceManager::Enable() sd::slidesorter::controller::AnimationFunction::Blend(double, double, double) sd::slidesorter::controller::AnimationFunction::Linear(double) -sd::slidesorter::controller::Properties::IsHighContrastModeActive() const -sd::slidesorter::view::ToolTip::ShowDefaultHelpText() -sd::slidesorter::view::ToolTip::ShowHelpText(rtl::OUString const&) std::__cxx1998::vector >::~vector() std::__cxx1998::vector, std::allocator >, std::basic_string, std::allocator > >, std::allocator, std::allocator >, std::basic_string, std::allocator > > > >::~vector() From 27fafb78f1d9dd59d0c4615eaf39f5e80db13753 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Sat, 6 Oct 2012 08:30:33 +0200 Subject: [PATCH 410/863] Remove 2 other unused methods Change-Id: I54b00335020676ada0bcb09c45410e31fe74b59c --- sd/source/ui/remotecontrol/Communicator.cxx | 4 -- sd/source/ui/remotecontrol/Communicator.hxx | 1 - sd/source/ui/remotecontrol/ImagePreparer.cxx | 48 -------------------- sd/source/ui/remotecontrol/ImagePreparer.hxx | 1 - unusedcode.easy | 2 - 5 files changed, 56 deletions(-) diff --git a/sd/source/ui/remotecontrol/Communicator.cxx b/sd/source/ui/remotecontrol/Communicator.cxx index 02a39d8df7f1..0d1beb62d1f3 100644 --- a/sd/source/ui/remotecontrol/Communicator.cxx +++ b/sd/source/ui/remotecontrol/Communicator.cxx @@ -123,8 +123,4 @@ void Communicator::disposeListener() } } -Transmitter* Communicator::getTransmitter() -{ - return pTransmitter; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/remotecontrol/Communicator.hxx b/sd/source/ui/remotecontrol/Communicator.hxx index d7ad796aa77a..81b9e673acd4 100644 --- a/sd/source/ui/remotecontrol/Communicator.hxx +++ b/sd/source/ui/remotecontrol/Communicator.hxx @@ -45,7 +45,6 @@ namespace sd Communicator( BufferedStreamSocket *pSocket ); ~Communicator(); - Transmitter* getTransmitter(); void presentationStarted( const css::uno::Reference< css::presentation::XSlideShowController > &rController ); void informListenerDestroyed(); diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx b/sd/source/ui/remotecontrol/ImagePreparer.cxx index 0ea63027828d..e5423d392695 100644 --- a/sd/source/ui/remotecontrol/ImagePreparer.cxx +++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx @@ -85,7 +85,6 @@ void ImagePreparer::execute() } sendNotes( i ); } -// notesToHtml( 0 ); mRef.clear(); } @@ -220,53 +219,6 @@ void ImagePreparer::sendNotes( sal_uInt32 aSlideNumber ) } sal_Bool ExportTo( uno::Reference< drawing::XDrawPage>& aNotesPage, String aUrl ); -OString ImagePreparer::notesToHtml( sal_uInt32 aSlideNumber ) -{ - OString aRet(""); - - OUString aFileURL; - FileBase::createTempFile( 0, 0, &aFileURL ); - fprintf( stderr, "%s", OUStringToOString( aFileURL, RTL_TEXTENCODING_UTF8).getStr() ); - - if ( !xController->isRunning() ) - return ""; - - - - - // Get the page - uno::Reference< drawing::XDrawPage > xNotesPage; - uno::Reference< drawing::XDrawPage > xSourceDoc( - xController->getSlideByIndex( aSlideNumber ), - uno::UNO_QUERY_THROW ); - - uno::Reference xPresentationPage( - xSourceDoc, UNO_QUERY); - if (xPresentationPage.is()) - xNotesPage = uno::Reference< drawing::XDrawPage >( - xPresentationPage->getNotesPage(), uno::UNO_QUERY_THROW ); - else - return ""; - - - ExportTo( xNotesPage, aFileURL ); - - // FIXME: error handling. - -// File aFile( aFileURL ); -// aFile.open(0); -// sal_uInt64 aRead; -// rSize = 0; -// aFile.getSize( rSize ); -// uno::Sequence aContents( rSize ); - -// aFile.read( aContents.getArray(), rSize, aRead ); -// aFile.close(); -// File::remove( aFileURL ); -// return aContents; - - return aRet; -} // Code copied from sdremote/source/presenter/PresenterNotesView.cxx OString ImagePreparer::prepareNotes( sal_uInt32 aSlideNumber ) diff --git a/sd/source/ui/remotecontrol/ImagePreparer.hxx b/sd/source/ui/remotecontrol/ImagePreparer.hxx index 2adf22863900..130eeb699041 100644 --- a/sd/source/ui/remotecontrol/ImagePreparer.hxx +++ b/sd/source/ui/remotecontrol/ImagePreparer.hxx @@ -45,7 +45,6 @@ private: void sendNotes( sal_uInt32 aSlideNumber ); rtl::OString prepareNotes( sal_uInt32 aSlideNumber ); - rtl::OString notesToHtml( sal_uInt32 aSlideNumber ); }; } diff --git a/unusedcode.easy b/unusedcode.easy index f31e7ef17d04..1defdeed2b0f 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -87,8 +87,6 @@ oox::ole::AxFormPageModel::AxFormPageModel() oox::ole::AxMultiPageModel::AxMultiPageModel() oox::ole::AxTabStripModel::AxTabStripModel() oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper const&) -sd::Communicator::getTransmitter() -sd::ImagePreparer::notesToHtml(unsigned int) sd::LeftDrawPaneShell::RegisterInterface(SfxModule*) sd::LeftImpressPaneShell::RegisterInterface(SfxModule*) sd::ToolPanelPaneShell::RegisterInterface(SfxModule*) From 2d45ed51ead977b4ad0cbe5ff872d8510ba904e7 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Sat, 6 Oct 2012 09:23:38 +0200 Subject: [PATCH 411/863] Remove unused ReadOnlyModeObserver Change-Id: I572aea574eeba411441559e538d2438de12e9581 --- sd/Library_sd.mk | 1 - .../framework/module/ReadOnlyModeObserver.cxx | 215 ------------------ .../framework/module/ReadOnlyModeObserver.hxx | 132 ----------- 3 files changed, 348 deletions(-) delete mode 100644 sd/source/ui/framework/module/ReadOnlyModeObserver.cxx delete mode 100644 sd/source/ui/framework/module/ReadOnlyModeObserver.hxx diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 05a7baf7c9d1..ba2fe9ef4ff8 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -257,7 +257,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/ui/framework/module/ImpressModule \ sd/source/ui/framework/module/ModuleController \ sd/source/ui/framework/module/PresentationModule \ - sd/source/ui/framework/module/ReadOnlyModeObserver \ sd/source/ui/framework/module/ResourceManager \ sd/source/ui/framework/module/ShellStackGuard \ sd/source/ui/framework/module/SlideSorterModule \ diff --git a/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx b/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx deleted file mode 100644 index 423d503645e3..000000000000 --- a/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx +++ /dev/null @@ -1,215 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#include "ReadOnlyModeObserver.hxx" - -#include -#include -#include -#include -#include -#include - -#include "tools/SlotStateListener.hxx" -#include "framework/FrameworkHelper.hxx" - -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star; -using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; - -namespace sd { namespace framework { - -class ReadOnlyModeObserver::ModifyBroadcaster - : public ::cppu::OBroadcastHelper -{ -public: - explicit ModifyBroadcaster (::osl::Mutex& rOslMutex) : ::cppu::OBroadcastHelper(rOslMutex) {} -}; - - - - -ReadOnlyModeObserver::ReadOnlyModeObserver ( - const Reference& rxController) - : ReadOnlyModeObserverInterfaceBase(maMutex), - maSlotNameURL(), - mxController(rxController), - mxConfigurationController(NULL), - mxDispatch(NULL), - mpBroadcaster(new ModifyBroadcaster(maMutex)) -{ - // Create a URL object for the slot name. - maSlotNameURL.Complete = ".uno:EditDoc"; - Reference xTransformer(util::URLTransformer::create(::comphelper::getProcessComponentContext())); - xTransformer->parseStrict(maSlotNameURL); - - if ( ! ConnectToDispatch()) - { - // The controller is not yet connected to a frame. This means that - // the dispatcher is not yet set up. We wait for this to happen by - // waiting for configuration updates and try again. - Reference xControllerManager (rxController, UNO_QUERY); - if (xControllerManager.is()) - { - mxConfigurationController = xControllerManager->getConfigurationController(); - if (mxConfigurationController.is()) - { - mxConfigurationController->addConfigurationChangeListener( - this, - FrameworkHelper::msConfigurationUpdateStartEvent, - Any()); - } - } - } -} - - - - -ReadOnlyModeObserver::~ReadOnlyModeObserver (void) -{ -} - - - - -void SAL_CALL ReadOnlyModeObserver::disposing (void) -{ - if (mxController.is()) - { - mxController = NULL; - } - if (mxConfigurationController.is()) - { - mxConfigurationController->removeConfigurationChangeListener(this); - mxConfigurationController = NULL; - } - if (mxDispatch.is()) - { - mxDispatch->removeStatusListener(this, maSlotNameURL); - mxDispatch = NULL; - } - - lang::EventObject aEvent; - aEvent.Source = static_cast(this); - ::cppu::OInterfaceContainerHelper* pIterator - = mpBroadcaster->getContainer(getCppuType((Reference*)NULL)); - pIterator->disposeAndClear(aEvent); -} - - - - -void ReadOnlyModeObserver::AddStatusListener ( - const Reference& rxListener) -{ - mpBroadcaster->addListener( - getCppuType((Reference*)NULL), - rxListener); -} - - - - -bool ReadOnlyModeObserver::ConnectToDispatch (void) -{ - if ( ! mxDispatch.is()) - { - // Get the dispatch object. - Reference xProvider (mxController->getFrame(), UNO_QUERY); - if (xProvider.is()) - { - mxDispatch = xProvider->queryDispatch(maSlotNameURL, OUString(), 0); - if (mxDispatch.is()) - { - mxDispatch->addStatusListener(this, maSlotNameURL); - } - } - } - - return mxDispatch.is(); -} - - - - -void ReadOnlyModeObserver::statusChanged (const frame::FeatureStateEvent& rEvent) - throw (RuntimeException) -{ - ::cppu::OInterfaceContainerHelper* pIterator - = mpBroadcaster->getContainer(getCppuType((Reference*)NULL)); - if (pIterator != NULL) - { - pIterator->notifyEach(&frame::XStatusListener::statusChanged, rEvent); - } -} - - - - -//----- XEventListener -------------------------------------------------------- - -void SAL_CALL ReadOnlyModeObserver::disposing ( - const lang::EventObject& rEvent) - throw (RuntimeException) -{ - if (rEvent.Source == mxConfigurationController) - mxConfigurationController = NULL; - else if (rEvent.Source == mxDispatch) - mxDispatch = NULL; - - dispose(); -} - - - - -void SAL_CALL ReadOnlyModeObserver::notifyConfigurationChange ( - const ConfigurationChangeEvent& rEvent) - throw (RuntimeException) -{ - if (rEvent.Type.equals(FrameworkHelper::msConfigurationUpdateStartEvent)) - { - if (mxController.is() && mxController->getFrame().is()) - { - if (ConnectToDispatch()) - { - // We have connected successfully to the dispatcher and - // therefore can disconnect from the configuration controller. - mxConfigurationController->removeConfigurationChangeListener(this); - mxConfigurationController = NULL; - } - } - } -} - -} } // end of namespace sd::framework - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/module/ReadOnlyModeObserver.hxx b/sd/source/ui/framework/module/ReadOnlyModeObserver.hxx deleted file mode 100644 index c8f0ea2393d6..000000000000 --- a/sd/source/ui/framework/module/ReadOnlyModeObserver.hxx +++ /dev/null @@ -1,132 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef SD_FRAMEWORK_READ_ONLY_MODE_OBSERVER_HXX -#define SD_FRAMEWORK_READ_ONLY_MODE_OBSERVER_HXX - -#include "MutexOwner.hxx" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace { - -typedef ::cppu::WeakComponentImplHelper2 < - ::com::sun::star::drawing::framework::XConfigurationChangeListener, - ::com::sun::star::frame::XStatusListener - > ReadOnlyModeObserverInterfaceBase; - -} // end of anonymous namespace. - - - - -namespace sd { namespace framework { - -/** Wait for changes of the read-only mode. On switching between read-only - mode and read-write the registered listeners are called. - - This class handles the case that the given controller is not yet - connected to a frame and that the dispatcher is not yet set up. It - waits for this to happen and then registers at the .uno:EditDoc command - and waits for state changes. -*/ -class ReadOnlyModeObserver - : private sd::MutexOwner, - public ReadOnlyModeObserverInterfaceBase -{ -public: - /** Create a new read-only mode observer for the given controller. - */ - ReadOnlyModeObserver ( - const ::com::sun::star::uno::Reference& rxController); - virtual ~ReadOnlyModeObserver (void); - - virtual void SAL_CALL disposing (void); - - - /** Add a status listener that is called when the state of the - .uno:EditDoc command changes. Note that the listener has to take - into account both the IsEnabled and the State fields of the - FeatureStateEvent. Only when IsEnabled is true then the State field - is valid. - */ - void AddStatusListener ( - const ::com::sun::star::uno::Reference< - com::sun::star::frame::XStatusListener>& rxListener); - - // XEventListener - - virtual void SAL_CALL disposing ( - const com::sun::star::lang::EventObject& rEvent) - throw (com::sun::star::uno::RuntimeException); - - - // frame::XStatusListener - - /** Called by slot state change broadcasters. - @throws DisposedException - */ - virtual void SAL_CALL - statusChanged ( - const ::com::sun::star::frame::FeatureStateEvent& rState) - throw (::com::sun::star::uno::RuntimeException); - - // XConfigurationChangeListener - - virtual void SAL_CALL notifyConfigurationChange ( - const ::com::sun::star::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException); - -private: - ::com::sun::star::util::URL maSlotNameURL; - /** The XController is stored to enable repeated calls to - ConnectToDispatch() (get access to the XDispatchProvider. - */ - ::com::sun::star::uno::Reference - mxController; - ::com::sun::star::uno::Reference - mxConfigurationController; - ::com::sun::star::uno::Reference - mxDispatch; - class ModifyBroadcaster; - ::boost::scoped_ptr mpBroadcaster; - - /** Listen for the .uno:EditMode command. Returns when the connection - has been established. - */ - bool ConnectToDispatch (void); -}; - -} } // end of namespace sd::framework - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ From d1439727881527c403a6bb8ceac6240ef99f2ed2 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Sat, 6 Oct 2012 09:24:20 +0200 Subject: [PATCH 412/863] ...and update unusedcode.easy Change-Id: Id78d52a793434656baa8c74a707c683d1b2ab506 --- unusedcode.easy | 2 -- 1 file changed, 2 deletions(-) diff --git a/unusedcode.easy b/unusedcode.easy index 1defdeed2b0f..9b3b630f8c8b 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -91,8 +91,6 @@ sd::LeftDrawPaneShell::RegisterInterface(SfxModule*) sd::LeftImpressPaneShell::RegisterInterface(SfxModule*) sd::ToolPanelPaneShell::RegisterInterface(SfxModule*) sd::ViewShellBase::RegisterFactory(unsigned short) -sd::framework::ReadOnlyModeObserver::AddStatusListener(com::sun::star::uno::Reference const&) -sd::framework::ReadOnlyModeObserver::ReadOnlyModeObserver(com::sun::star::uno::Reference const&) sd::framework::ResourceManager::Disable() sd::framework::ResourceManager::Enable() sd::slidesorter::controller::AnimationFunction::Blend(double, double, double) From f2e6220fef6dc01b2538281916c2b8a5e3f1a784 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= Date: Sat, 6 Oct 2012 11:17:12 +0200 Subject: [PATCH 413/863] Fixing some obscurous linking errors on windows Change-Id: I519d02da58ce5a2915f1e18b5a295f7c093e0f2e --- libcdr/libcdr-msvc.patch | 84 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) mode change 100755 => 100644 libcdr/libcdr-msvc.patch diff --git a/libcdr/libcdr-msvc.patch b/libcdr/libcdr-msvc.patch old mode 100755 new mode 100644 index cf18fb9e1a66..290da20437a7 --- a/libcdr/libcdr-msvc.patch +++ b/libcdr/libcdr-msvc.patch @@ -1,3 +1,87 @@ +--- cdr/src/lib/CDRCollector.h ++++ cdr/src/lib/CDRCollector.h +@@ -103,7 +103,7 @@ public: + virtual void collectOutlId(unsigned id) = 0; + virtual void collectFild(unsigned id, unsigned short fillType, const CDRColor &color1, const CDRColor &color2, const CDRGradient &gradient, const CDRImageFill &imageFill) = 0; + virtual void collectOutl(unsigned id, unsigned short lineType, unsigned short capsType, unsigned short joinType, double lineWidth, +- double stretch, double angle, const CDRColor &color, const std::vector &dashArray, ++ double stretch, double angle, const CDRColor &color, const std::vector &dashArray, + unsigned startMarkerId, unsigned endMarkerId) = 0; + virtual void collectRotate(double angle, double cx, double cy) = 0; + virtual void collectFlags(unsigned flags, bool considerFlags) = 0; +--- cdr/src/lib/CDRContentCollector.h ++++ cdr/src/lib/CDRContentCollector.h +@@ -67,7 +67,7 @@ public: + void collectOutlId(unsigned id); + void collectFild(unsigned, unsigned short, const CDRColor &, const CDRColor &, const CDRGradient &, const CDRImageFill &) {} + void collectOutl(unsigned, unsigned short, unsigned short, unsigned short, double, double, double, const CDRColor &, +- const std::vector &, unsigned, unsigned) {} ++ const std::vector &, unsigned, unsigned) {} + void collectRotate(double angle, double cx, double cy); + void collectFlags(unsigned flags, bool considerFlags); + void collectPageSize(double, double, double, double) {} +--- cdr/src/lib/CDRParser.cpp ++++ cdr/src/lib/CDRParser.cpp +@@ -1376,7 +1376,7 @@ void libcdr::CDRParser::readWaldoOutl(WPXInputStream *input) + input->seek(7, WPX_SEEK_CUR); + unsigned short numDash = readU8(input); + int fixPosition = input->tell(); +- std::vector dashArray; ++ std::vector dashArray; + for (unsigned short i = 0; i < numDash; ++i) + dashArray.push_back(readU8(input)); + input->seek(fixPosition + 10, WPX_SEEK_SET); +@@ -1870,7 +1870,7 @@ void libcdr::CDRParser::readOutl(WPXInputStream *input, unsigned length) + input->seek(16, WPX_SEEK_CUR); + unsigned short numDash = readU16(input); + int fixPosition = input->tell(); +- std::vector dashArray; ++ std::vector dashArray; + for (unsigned short i = 0; i < numDash; ++i) + dashArray.push_back(readU16(input)); + if (m_version < 600) +--- cdr/src/lib/CDRStylesCollector.cpp ++++ cdr/src/lib/CDRStylesCollector.cpp +@@ -56,7 +56,7 @@ void libcdr::CDRStylesCollector::collectFild(unsigned id, unsigned short fillTyp + } + + void libcdr::CDRStylesCollector::collectOutl(unsigned id, unsigned short lineType, unsigned short capsType, unsigned short joinType, double lineWidth, +- double stretch, double angle, const CDRColor &color, const std::vector &dashArray, ++ double stretch, double angle, const CDRColor &color, const std::vector &dashArray, + unsigned startMarkerId, unsigned endMarkerId) + { + m_ps.m_lineStyles[id] = CDRLineStyle(lineType, capsType, joinType, lineWidth, stretch, angle, color, dashArray, startMarkerId, endMarkerId); +--- cdr/src/lib/CDRStylesCollector.h ++++ cdr/src/lib/CDRStylesCollector.h +@@ -68,7 +68,7 @@ public: + void collectOutlId(unsigned) {} + void collectFild(unsigned id, unsigned short fillType, const CDRColor &color1, const CDRColor &color2, const CDRGradient &gradient, const CDRImageFill &imageFill); + void collectOutl(unsigned id, unsigned short lineType, unsigned short capsType, unsigned short joinType, double lineWidth, +- double stretch, double angle, const CDRColor &color, const std::vector &dashArray, ++ double stretch, double angle, const CDRColor &color, const std::vector &dashArray, + unsigned startMarkerId, unsigned endMarkerId); + void collectRotate(double,double,double) {} + void collectFlags(unsigned, bool) {} +--- cdr/src/lib/CDRTypes.h ++++ cdr/src/lib/CDRTypes.h +@@ -136,7 +136,7 @@ struct CDRLineStyle + double stretch; + double angle; + CDRColor color; +- std::vector dashArray; ++ std::vector dashArray; + unsigned startMarkerId; + unsigned endMarkerId; + CDRLineStyle() +@@ -144,7 +144,7 @@ struct CDRLineStyle + stretch(0.0), angle(0.0), color(), dashArray(), + startMarkerId(0), endMarkerId(0) {} + CDRLineStyle(unsigned short lt, unsigned short ct, unsigned short jt, +- double lw, double st, double a, const CDRColor &c, const std::vector &da, ++ double lw, double st, double a, const CDRColor &c, const std::vector &da, + unsigned smi, unsigned emi) + : lineType(lt), capsType(ct), joinType(jt), lineWidth(lw), + stretch(st), angle(a), color(c), dashArray(da), --- cdr/build/win32/cdr2raw.vcproj 2012-10-06 06:45:36.436443100 +0200 +++ cdr/build/win32/cdr2raw.vcproj 2012-10-06 06:46:42.153510700 +0200 @@ -69,7 +69,7 @@ From 7d8b7b70f4945844f69078c7e7ae9aa9967c22af Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 2 Oct 2012 08:14:17 +0200 Subject: [PATCH 414/863] fix deps on .hrc files Change-Id: Id50515efae1729d08bd8d90488ab77a82b1ad7c8 --- desktop/AllLangResTarget_deploymentgui.mk | 4 ++++ editeng/AllLangResTarget_editeng.mk | 2 +- svtools/AllLangResTarget_svt.mk | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/desktop/AllLangResTarget_deploymentgui.mk b/desktop/AllLangResTarget_deploymentgui.mk index d9e82cc4937f..4dde2fc46b0e 100644 --- a/desktop/AllLangResTarget_deploymentgui.mk +++ b/desktop/AllLangResTarget_deploymentgui.mk @@ -35,6 +35,10 @@ $(eval $(call gb_AllLangResTarget_add_srs,deploymentgui,\ $(eval $(call gb_SrsTarget_SrsTarget,deploymentgui/res)) +$(eval $(call gb_SrsTarget_use_packages,deploymentgui/res,\ + svtools_inc \ +)) + $(eval $(call gb_SrsTarget_set_include,deploymentgui/res,\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc \ diff --git a/editeng/AllLangResTarget_editeng.mk b/editeng/AllLangResTarget_editeng.mk index 512de2d2a03f..c2a401081360 100644 --- a/editeng/AllLangResTarget_editeng.mk +++ b/editeng/AllLangResTarget_editeng.mk @@ -33,7 +33,7 @@ $(eval $(call gb_AllLangResTarget_set_reslocation,editeng,svx)) $(eval $(call gb_AllLangResTarget_add_srs,editeng, editeng/res)) $(eval $(call gb_SrsTarget_SrsTarget,editeng/res)) -$(eval $(call gb_SrsTarget_use_packages,editeng/srs,\ +$(eval $(call gb_SrsTarget_use_packages,editeng/res,\ svl_inc \ )) diff --git a/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk index 17747834e4d1..3cdff1a40bac 100644 --- a/svtools/AllLangResTarget_svt.mk +++ b/svtools/AllLangResTarget_svt.mk @@ -40,6 +40,7 @@ $(eval $(call gb_SrsTarget_use_packages,svt/res,\ i18npool_inc \ svl_inc \ svtools_inc \ + vcl_inc \ tools_inc \ )) From 211df60268afc57e6295785101b9591d77161e6e Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 2 Oct 2012 14:19:42 +0200 Subject: [PATCH 415/863] add missing deps on headers Change-Id: I665ec137c0c1249b4c8a566015026cfe44c88fff --- extensions/Library_bib.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/extensions/Library_bib.mk b/extensions/Library_bib.mk index 4e46e07c1da8..cd0cc2fcc6de 100644 --- a/extensions/Library_bib.mk +++ b/extensions/Library_bib.mk @@ -30,6 +30,12 @@ $(eval $(call gb_Library_Library,bib)) +$(eval $(call gb_Library_use_packages,bib,\ + editeng_inc \ + sfx2_inc \ + svx_inc \ +)) + $(eval $(call gb_Library_set_componentfile,bib,extensions/source/bibliography/bib)) $(eval $(call gb_Library_set_include,bib,\ From e60b346a303abf1cb5ad2216ab20ebaa3e0f7ece Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 2 Oct 2012 14:57:41 +0200 Subject: [PATCH 416/863] drop unused #include Change-Id: I55b5815feb5674c830993440027c9f3fbbf1ec02 --- canvas/source/factory/cf_service.cxx | 1 - 1 file changed, 1 deletion(-) diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx index 8ede9a993691..2594c8c7f01c 100644 --- a/canvas/source/factory/cf_service.cxx +++ b/canvas/source/factory/cf_service.cxx @@ -32,7 +32,6 @@ #include #include #include -#include #include #include From 9efdb4c02f7b646d2d22bea546256b806a075b10 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 2 Oct 2012 14:57:59 +0200 Subject: [PATCH 417/863] add missing dep on o3tl Change-Id: Ib188836d0359491b556f16c0a5b22dbe1104e56f --- canvas/Library_canvasfactory.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk index ec143c36000a..bda2146ee0d2 100644 --- a/canvas/Library_canvasfactory.mk +++ b/canvas/Library_canvasfactory.mk @@ -28,6 +28,10 @@ $(eval $(call gb_Library_Library,canvasfactory)) +$(eval $(call gb_Library_use_package,canvasfactory,\ + o3tl_inc \ +)) + $(eval $(call gb_Library_set_componentfile,canvasfactory,canvas/source/factory/canvasfactory)) $(eval $(call gb_Library_set_include,canvasfactory,\ From 873edb93645f477d3a91751db62a1f58e745803d Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 2 Oct 2012 21:05:53 +0200 Subject: [PATCH 418/863] drop unused #include Change-Id: I88173adc7ee9f3c3bb909190e983474fb201467f --- desktop/source/deployment/registry/help/dp_help.cxx | 1 - 1 file changed, 1 deletion(-) diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx index 7af20604a911..a5bd86141340 100644 --- a/desktop/source/deployment/registry/help/dp_help.cxx +++ b/desktop/source/deployment/registry/help/dp_help.cxx @@ -37,7 +37,6 @@ #include "ucbhelper/content.hxx" #include "comphelper/servicedecl.hxx" #include "svl/inettype.hxx" -#include "svtools/javainteractionhandler.hxx" #include "uno/current_context.hxx" #include "unotools/pathoptions.hxx" From cc201f7faaaf77e6585ca9f389e0974687c700cf Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 3 Oct 2012 16:27:00 +0200 Subject: [PATCH 419/863] add missing dep for tools/diagnose_ex.h Change-Id: Ib2558d444545cbeedc188ade5265e1bb665ade37 --- embeddedobj/Library_embobj.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/embeddedobj/Library_embobj.mk b/embeddedobj/Library_embobj.mk index 47963a0fd05f..99456ed3b183 100644 --- a/embeddedobj/Library_embobj.mk +++ b/embeddedobj/Library_embobj.mk @@ -27,6 +27,10 @@ $(eval $(call gb_Library_Library,embobj)) +$(eval $(call gb_Library_use_packages,embobj,\ + tools_inc \ +)) + $(eval $(call gb_Library_set_componentfile,embobj,embeddedobj/util/embobj)) $(eval $(call gb_Library_set_include,embobj,\ From 61d8e02a7b3742600dfc3af0f32057638e4d371b Mon Sep 17 00:00:00 2001 From: David Tardon Date: Thu, 4 Oct 2012 18:54:00 +0200 Subject: [PATCH 420/863] add missing dep on cppu/macros.hxx Change-Id: Ie6793b6032ddfc44c5514e2e8c826590a924d177 --- i18npool/Library_i18nisolang1.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/i18npool/Library_i18nisolang1.mk b/i18npool/Library_i18nisolang1.mk index 3432d9d25329..d38a2384fecc 100644 --- a/i18npool/Library_i18nisolang1.mk +++ b/i18npool/Library_i18nisolang1.mk @@ -28,7 +28,10 @@ $(eval $(call gb_Library_Library,i18nisolang1)) -$(eval $(call gb_Library_use_package,i18nisolang1,i18npool_inc)) +$(eval $(call gb_Library_use_packages,i18nisolang1,\ + cppu_inc \ + i18npool_inc \ +)) $(eval $(call gb_Library_set_include,i18nisolang1,\ -I$(SRCDIR)/i18npool/inc \ From 387005a2c37afed50107d7bae5ead2edff6031d6 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Thu, 4 Oct 2012 19:50:38 +0200 Subject: [PATCH 421/863] drop unneeded #include Change-Id: I20fed5357c55e6c4444b1e100d15600636ffe25d --- filter/source/graphicfilter/idxf/dxfgrprd.hxx | 4 +++- filter/source/graphicfilter/idxf/idxf.cxx | 2 ++ filter/source/graphicfilter/ieps/ieps.cxx | 3 ++- filter/source/graphicfilter/ios2met/ios2met.cxx | 3 ++- filter/source/graphicfilter/ipbm/ipbm.cxx | 3 ++- filter/source/graphicfilter/ipcx/ipcx.cxx | 3 ++- filter/source/graphicfilter/ipict/ipict.cxx | 3 ++- filter/source/graphicfilter/ipsd/ipsd.cxx | 4 +++- filter/source/graphicfilter/iras/iras.cxx | 3 ++- filter/source/graphicfilter/itga/itga.cxx | 3 ++- filter/source/graphicfilter/itiff/itiff.cxx | 3 ++- 11 files changed, 24 insertions(+), 10 deletions(-) diff --git a/filter/source/graphicfilter/idxf/dxfgrprd.hxx b/filter/source/graphicfilter/idxf/dxfgrprd.hxx index 5208237bce12..2e6612c117b7 100644 --- a/filter/source/graphicfilter/idxf/dxfgrprd.hxx +++ b/filter/source/graphicfilter/idxf/dxfgrprd.hxx @@ -20,7 +20,9 @@ #ifndef _DXFGRPRD_HXX #define _DXFGRPRD_HXX -#include +#include + +#include #define DXF_MAX_STRING_LEN 256 // Max Stringlaenge (ohne die 0) diff --git a/filter/source/graphicfilter/idxf/idxf.cxx b/filter/source/graphicfilter/idxf/idxf.cxx index e589e29b482d..b40dfccf8099 100644 --- a/filter/source/graphicfilter/idxf/idxf.cxx +++ b/filter/source/graphicfilter/idxf/idxf.cxx @@ -25,6 +25,8 @@ #include "dxf2mtf.hxx" #include +class FilterConfigItem; + //================== GraphicImport - die exportierte Funktion ================ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx index 34473493a38f..ab56b416465c 100644 --- a/filter/source/graphicfilter/ieps/ieps.cxx +++ b/filter/source/graphicfilter/ieps/ieps.cxx @@ -34,11 +34,12 @@ #include #include #include -#include #include #include #include +class FilterConfigItem; + /************************************************************************* |* |* ImpSearchEntry() diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index 2e3b78b874ab..4da779f20b59 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -22,10 +22,11 @@ #include #include #include -#include #include +class FilterConfigItem; + // MT: NOOLDSV, someone should change the code... enum PenStyle { PEN_NULL, PEN_SOLID, PEN_DOT, PEN_DASH, PEN_DASHDOT }; diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx index 1ddb08bd41d1..fabe4f05530a 100644 --- a/filter/source/graphicfilter/ipbm/ipbm.cxx +++ b/filter/source/graphicfilter/ipbm/ipbm.cxx @@ -20,7 +20,8 @@ #include #include -#include + +class FilterConfigItem; //============================ PBMReader ================================== diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx b/filter/source/graphicfilter/ipcx/ipcx.cxx index c8651f8929e0..324c8abf6f6f 100644 --- a/filter/source/graphicfilter/ipcx/ipcx.cxx +++ b/filter/source/graphicfilter/ipcx/ipcx.cxx @@ -20,7 +20,8 @@ #include #include -#include + +class FilterConfigItem; //============================ PCXReader ================================== diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx index e0a7f149ef10..8344a5f44e68 100644 --- a/filter/source/graphicfilter/ipict/ipict.cxx +++ b/filter/source/graphicfilter/ipict/ipict.cxx @@ -23,11 +23,12 @@ #include #include #include -#include #include #include "shape.hxx" +class FilterConfigItem; + namespace PictReaderInternal { //! utilitary class to store a pattern, ... class Pattern { diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx index 73750ef3b61e..41bd66c5001f 100644 --- a/filter/source/graphicfilter/ipsd/ipsd.cxx +++ b/filter/source/graphicfilter/ipsd/ipsd.cxx @@ -20,7 +20,9 @@ #include #include -#include +#include + +class FilterConfigItem; //============================ PSDReader ================================== diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx index 469151a72b86..8b690387737a 100644 --- a/filter/source/graphicfilter/iras/iras.cxx +++ b/filter/source/graphicfilter/iras/iras.cxx @@ -20,7 +20,8 @@ #include #include -#include + +class FilterConfigItem; #define RAS_TYPE_OLD 0x00000000 // supported formats by this filter #define RAS_TYPE_STANDARD 0x00000001 diff --git a/filter/source/graphicfilter/itga/itga.cxx b/filter/source/graphicfilter/itga/itga.cxx index 3fa410457213..40746835bee1 100644 --- a/filter/source/graphicfilter/itga/itga.cxx +++ b/filter/source/graphicfilter/itga/itga.cxx @@ -20,7 +20,8 @@ #include #include -#include + +class FilterConfigItem; //============================ TGAReader ================================== diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx index f5b31f668682..37cbf779fe44 100644 --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ b/filter/source/graphicfilter/itiff/itiff.cxx @@ -19,11 +19,12 @@ #include #include -#include #include #include "lzwdecom.hxx" #include "ccidecom.hxx" +class FilterConfigItem; + #define OOODEBUG(str,Num) //(InfoBox(NULL,String(str)+String(" ")+String(Num)).Execute(); namespace { From 431a9505196f63a982f6a3452edae1bff5cc2c2c Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 5 Oct 2012 15:09:23 +0200 Subject: [PATCH 422/863] add missing dep on tools/diagnose_ex.h Change-Id: I171a134250a2fc00f51c550a785125bb9708603b --- extensions/Library_log.mk | 4 ++++ extensions/source/logging/consolehandler.cxx | 2 -- extensions/source/logging/logger.cxx | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/Library_log.mk b/extensions/Library_log.mk index d09c1d04f552..05a5186c03bb 100644 --- a/extensions/Library_log.mk +++ b/extensions/Library_log.mk @@ -30,6 +30,10 @@ $(eval $(call gb_Library_Library,log)) +$(eval $(call gb_Library_use_packages,log,\ + tools_inc \ +)) + $(eval $(call gb_Library_set_componentfile,log,extensions/source/logging/log)) $(eval $(call gb_Library_use_sdk_api,log)) diff --git a/extensions/source/logging/consolehandler.cxx b/extensions/source/logging/consolehandler.cxx index 84f1cb7e83d1..5145f3ab1131 100644 --- a/extensions/source/logging/consolehandler.cxx +++ b/extensions/source/logging/consolehandler.cxx @@ -39,8 +39,6 @@ #include #include -#include - #include #include diff --git a/extensions/source/logging/logger.cxx b/extensions/source/logging/logger.cxx index 9bdd202fcbc0..8052d618d69f 100644 --- a/extensions/source/logging/logger.cxx +++ b/extensions/source/logging/logger.cxx @@ -28,8 +28,6 @@ #include #include -#include - #include #include From aa06349cff8b7f28d1e0ec2e4bc41fb2d7a2d65e Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 5 Oct 2012 16:22:03 +0200 Subject: [PATCH 423/863] drop unused #include Change-Id: I11b59681a101c3e89db8d7a15d196e8bf11114ed --- desktop/source/migration/services/oo3extensionmigration.hxx | 1 - 1 file changed, 1 deletion(-) diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx b/desktop/source/migration/services/oo3extensionmigration.hxx index d941c3b4274e..950473a23b37 100644 --- a/desktop/source/migration/services/oo3extensionmigration.hxx +++ b/desktop/source/migration/services/oo3extensionmigration.hxx @@ -43,7 +43,6 @@ #include #include #include -#include namespace com { namespace sun { namespace star { namespace uno { From 62e51648ff16af103330c5d5e55b1d753e1cdcdb Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 5 Oct 2012 18:08:32 +0200 Subject: [PATCH 424/863] tools/pathutils.hxx is windows-only Change-Id: I280342029d830e4ffac2902dbb76e6ee9635dc70 --- extensions/source/nsplugin/source/npshell.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/source/nsplugin/source/npshell.cxx b/extensions/source/nsplugin/source/npshell.cxx index e9aae6561a84..b7ee74dff9c0 100644 --- a/extensions/source/nsplugin/source/npshell.cxx +++ b/extensions/source/nsplugin/source/npshell.cxx @@ -63,6 +63,8 @@ #pragma warning (pop) #endif +#include "tools/pathutils.hxx" + #endif //end of WNT @@ -71,7 +73,6 @@ #include #include #include "boost/scoped_array.hpp" -#include "tools/pathutils.hxx" #include "npapi.h" #include "npshell.hxx" From 5df47e2a17abb2a2455df42fa65756d862e5c6f0 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 5 Oct 2012 18:12:24 +0200 Subject: [PATCH 425/863] add missing dep on comphelper/documentconstants.hxx Change-Id: I80f46c774f0cb177b2b38e5cf753d03ddd342992 --- extensions/Library_npsoplugin.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk index 6528b3d3c4b7..00a4785c9f15 100644 --- a/extensions/Library_npsoplugin.mk +++ b/extensions/Library_npsoplugin.mk @@ -30,6 +30,10 @@ $(eval $(call gb_Library_Library,npsoplugin)) +$(eval $(call gb_Library_use_packages,npsoplugin,\ + comphelper_inc \ +)) + $(eval $(call gb_Library_use_external,npsoplugin,mozilla_headers)) $(eval $(call gb_Library_use_static_libraries,npsoplugin,\ From 5bc87c1bce72bf670958a0a06e5b63ff259659ad Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 5 Oct 2012 18:44:27 +0200 Subject: [PATCH 426/863] drop unused includes Change-Id: Iba9f3dcb5404d28b60585bbddd2af4ec0511cea2 --- desktop/source/offacc/acceptor.cxx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx index 4510f65dcbc5..61749529f335 100644 --- a/desktop/source/offacc/acceptor.cxx +++ b/desktop/source/offacc/acceptor.cxx @@ -28,9 +28,6 @@ #include "acceptor.hxx" -#include -#include -#include #include #include #include @@ -293,7 +290,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL offacc_component_getFactory(const sal_Char Reference< XMultiServiceFactory > xServiceManager( reinterpret_cast< XMultiServiceFactory* >(pServiceManager)); - if (Acceptor::impl_getImplementationName().compareToAscii( pImplementationName ) == COMPARE_EQUAL ) + if (Acceptor::impl_getImplementationName().equalsAscii( pImplementationName ) ) { xFactory = Reference< XSingleServiceFactory >( cppu::createSingleFactory( xServiceManager, Acceptor::impl_getImplementationName(), From 5d900f6ef8573dfe40fef236fbc3c788cea15224 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 6 Oct 2012 14:21:57 +0200 Subject: [PATCH 427/863] drop unused #include Change-Id: Ic0de83ff615a1dde575d90cff7594c830b96c063 --- sc/source/filter/inc/ftools.hxx | 1 - 1 file changed, 1 deletion(-) diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx index 323586f652cc..ace84e12d606 100644 --- a/sc/source/filter/inc/ftools.hxx +++ b/sc/source/filter/inc/ftools.hxx @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include "filter.hxx" From 0f6dbd1b1762e0b273046a045eb902475fc6890b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Sat, 6 Oct 2012 15:55:28 +0100 Subject: [PATCH 428/863] callcatcher: GetKerningPair* is now unused since commit c4008ef54630b560792aa288437db1179ad96095 Change-Id: I0cef8db6b59774c804a6a5589f258a55bfc64592 --- vcl/inc/outfont.hxx | 3 --- vcl/inc/vcl/outdev.hxx | 14 ---------- vcl/source/gdi/outdev3.cxx | 52 -------------------------------------- 3 files changed, 69 deletions(-) diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx index bb40f86fdc24..39bc2a2e1009 100644 --- a/vcl/inc/outfont.hxx +++ b/vcl/inc/outfont.hxx @@ -269,9 +269,6 @@ private: // -------------------- // - ImplKernPairData - // -------------------- -// TODO: get rid of ImplKernPairData and use outdev.hxx's KerningPair struct -// the problem is that outdev.hxx is too high level for the device layers -// and outdev.hxx's customers depend on KerningPair being defined there struct ImplKernPairData { diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx index e1721e9ef4f4..fabeb78217cb 100644 --- a/vcl/inc/vcl/outdev.hxx +++ b/vcl/inc/vcl/outdev.hxx @@ -134,17 +134,6 @@ struct ImplThresholdRes long mnThresPixToLogY; // "" }; -// --------------- -// - KerningPair - -// --------------- - -struct KerningPair -{ - sal_Unicode nChar1; - sal_Unicode nChar2; - long nKern; -}; - // ---------------------- // - OutputDevice-Types - // ---------------------- @@ -650,9 +639,6 @@ public: static XubString GetNonMnemonicString( const XubString& rStr ) { xub_StrLen nDummy; return GetNonMnemonicString( rStr, nDummy ); } - sal_uLong GetKerningPairCount() const; - void GetKerningPairs( sal_uLong nPairs, KerningPair* pKernPairs ) const; - sal_Bool GetTextBoundRect( Rectangle& rRect, const String& rStr, xub_StrLen nBase = 0, xub_StrLen nIndex = 0, xub_StrLen nLen = STRING_LEN, sal_uLong nLayoutWidth = 0, const sal_Int32* pDXArray = NULL ) const; diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index d0428a72a8b0..d743b4dde64f 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -7624,58 +7624,6 @@ xub_StrLen OutputDevice::ValidateKashidas ( const String& rTxt, return nDropped; } - - -// ----------------------------------------------------------------------- - - -// TODO: best is to get rid of this method completely -sal_uLong OutputDevice::GetKerningPairCount() const -{ - OSL_TRACE( "OutputDevice::GetKerningPairCount()" ); - DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); - - if( mbNewFont && !ImplNewFont() ) - return 0; - if( mbInitFont ) - ImplInitFont(); - - if( mpPDFWriter && mpPDFWriter->isBuiltinFont( mpFontEntry->maFontSelData.mpFontData ) ) - return 0; - - // get the kerning pair count from the device layer - int nKernPairs = mpGraphics->GetKernPairs( 0, NULL ); - return nKernPairs; -} - -// ----------------------------------------------------------------------- - -inline bool CmpKernData( const KerningPair& a, const KerningPair& b ) -{ - return (a.nChar1 < b.nChar1) || ((a.nChar1 == b.nChar1) && (a.nChar2 < b.nChar2)); -} - -// TODO: best is to get rid of this method completely -void OutputDevice::GetKerningPairs( sal_uLong nRequestedPairs, KerningPair* pKernPairs ) const -{ - OSL_TRACE( "OutputDevice::GetKerningPairs()" ); - DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); - - if( mbNewFont && !ImplNewFont() ) - return; - if( mbInitFont ) - ImplInitFont(); - - if( mpPDFWriter && mpPDFWriter->isBuiltinFont( mpFontEntry->maFontSelData.mpFontData ) ) - return; - - // get the kerning pairs directly from the device layer - int nKernPairs = mpGraphics->GetKernPairs( nRequestedPairs, (ImplKernPairData*)pKernPairs ); - - // sort kerning pairs - std::sort( pKernPairs, pKernPairs+nKernPairs, CmpKernData ); -} - // ----------------------------------------------------------------------- sal_Bool OutputDevice::GetGlyphBoundRects( const Point& rOrigin, const String& rStr, From 190bfac40e1b7a3b32793ac82eb3e67aefd6c785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Sat, 6 Oct 2012 15:56:30 +0100 Subject: [PATCH 429/863] callcatcher: update unused code list and drop more old-layouting unuseds Change-Id: I1096ea50a23040090c9ee2975a4165c6de238497 --- unusedcode.easy | 2 +- vcl/inc/vcl/arrange.hxx | 1 - vcl/inc/vcl/window.hxx | 16 +--------------- vcl/source/window/arrange.cxx | 12 ------------ vcl/source/window/window4.cxx | 32 -------------------------------- 5 files changed, 2 insertions(+), 61 deletions(-) diff --git a/unusedcode.easy b/unusedcode.easy index 9b3b630f8c8b..733c720fdb89 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -78,7 +78,7 @@ connectivity::mork::ProfileAccess::isProfileLocked(com::sun::star::mozilla::Mozi connectivity::mozab::MQueryHelper::next() connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, unsigned char) connectivity::sdbcx::OGroup::OGroup(unsigned char) -dbtools::getConnection(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, com::sun::star::uno::Reference const&) +dbtools::getConnection(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, com::sun::star::uno::Reference const&) formula::FormulaTokenIterator::First() framework::OReadMenuDocumentHandler::getServiceFactory() jfw_plugin::VendorBase::createInstance() diff --git a/vcl/inc/vcl/arrange.hxx b/vcl/inc/vcl/arrange.hxx index 90316bdd7d09..5d99723da797 100644 --- a/vcl/inc/vcl/arrange.hxx +++ b/vcl/inc/vcl/arrange.hxx @@ -317,7 +317,6 @@ namespace vcl // returns the index of the added label size_t addRow( Window* i_pLabel, boost::shared_ptr const& i_rElement, long i_nIndent = 0 ); - size_t addRow( Window* i_pLabel, Window* i_pElement, long i_nIndent = 0, const Size& i_rElementMinSize = Size() ); }; class VCL_DLLPUBLIC Indenter : public WindowArranger diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx index 0de41b613404..a70ff66f61e4 100644 --- a/vcl/inc/vcl/window.hxx +++ b/vcl/inc/vcl/window.hxx @@ -126,7 +126,6 @@ namespace dnd { namespace vcl { struct ControlLayoutData; - class WindowArranger; struct ExtWindowImpl; } @@ -1313,20 +1312,7 @@ public: // ExtImpl - // layouting - boost::shared_ptr< vcl::WindowArranger > getLayout(); - - /* add a child Window - addWindow will do the following things - - insert the passed window into the child list (equivalent to i_pWin->SetParent( this )) - - mark the window as "owned", meaning that the added Window will be destroyed by - the parent's desctructor. - This means: do not pass in member windows or stack objects here. Do not cause - the destructor of the added window to be called in any way. - - to avoid ownership pass i_bTakeOwnership as "false" - */ - void addWindow( Window* i_pWin, bool i_bTakeOwnership = true ); + // old layouting, in-process-of-removal /* return the identifier of this window */ diff --git a/vcl/source/window/arrange.cxx b/vcl/source/window/arrange.cxx index 56ad168ef7e2..d7f79a0872b5 100644 --- a/vcl/source/window/arrange.cxx +++ b/vcl/source/window/arrange.cxx @@ -730,18 +730,6 @@ size_t LabelColumn::addRow( Window* i_pLabel, boost::shared_ptr return nIndex; } -size_t LabelColumn::addRow( Window* i_pLabel, Window* i_pElement, long i_nIndent, const Size& i_rElementMinSize ) -{ - boost::shared_ptr< LabeledElement > xLabel( new LabeledElement( this, 1 ) ); - xLabel->setLabel( i_pLabel ); - xLabel->setBorders( 0, i_nIndent, 0, 0, 0 ); - xLabel->setElement( i_pElement ); - xLabel->setMinimumSize( 1, i_rElementMinSize ); - size_t nIndex = addChild( xLabel ); - resize(); - return nIndex; -} - // ---------------------------------------- // vcl::Indenter //----------------------------------------- diff --git a/vcl/source/window/window4.cxx b/vcl/source/window/window4.cxx index f0d8f47b2515..af22d6641f1d 100644 --- a/vcl/source/window/window4.cxx +++ b/vcl/source/window/window4.cxx @@ -100,38 +100,6 @@ void Window::ImplExtResize() } } -boost::shared_ptr< vcl::WindowArranger > Window::getLayout() -{ - boost::shared_ptr< vcl::WindowArranger > xRet; - vcl::ExtWindowImpl* pImpl = ImplGetExtWindowImpl(); - if( pImpl ) - { - if( ! pImpl->mxLayout.get() ) - { - pImpl->mxLayout.reset( new vcl::LabelColumn() ); - pImpl->mxLayout->setParentWindow( this ); - pImpl->mxLayout->setOuterBorder( -1 ); - } - xRet = pImpl->mxLayout; - } - - return xRet; -} - -void Window::addWindow( Window* i_pWin, bool i_bTakeOwnership ) -{ - vcl::ExtWindowImpl* pImpl = ImplGetExtWindowImpl(); - if( pImpl && i_pWin ) - { - vcl::ExtWindowImpl* pChildImpl = i_pWin->ImplGetExtWindowImpl(); - if( pChildImpl ) - { - i_pWin->SetParent( this ); - pChildImpl->mbOwnedByParent = i_bTakeOwnership; - } - } -} - Window* Window::findWindow( const rtl::OUString& i_rIdentifier ) const { if( getIdentifier() == i_rIdentifier ) From 5e47d8ca9a4282d2c7b6e1e561d7f2eb46166bd7 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Sat, 6 Oct 2012 17:13:25 +0200 Subject: [PATCH 430/863] Remove 3 oox::ole elements: oox::ole::AxFormPageModel::AxFormPageModel() oox::ole::AxMultiPageModel::AxMultiPageModel() oox::ole::AxTabStripModel::AxTabStripModel() Change-Id: I09c0993c2b6e98eed5536ac1c2a8b5559a3dcac6 --- oox/inc/oox/ole/axcontrol.hxx | 52 ------------------- oox/source/ole/axcontrol.cxx | 96 ----------------------------------- unusedcode.easy | 3 -- 3 files changed, 151 deletions(-) diff --git a/oox/inc/oox/ole/axcontrol.hxx b/oox/inc/oox/ole/axcontrol.hxx index 30187a470a2c..9e002783e64a 100644 --- a/oox/inc/oox/ole/axcontrol.hxx +++ b/oox/inc/oox/ole/axcontrol.hxx @@ -801,31 +801,6 @@ public: // direct access needed for legacy VML drawing controls // ============================================================================ -/** Model for a Forms 2.0 tabstrip control. */ -class OOX_DLLPUBLIC AxTabStripModel : public AxFontDataModel -{ -public: - explicit AxTabStripModel(); - - virtual bool importBinaryModel( BinaryInputStream& rInStrm ); - - virtual ApiControlType getControlType() const; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const; - -private: - AxStringArray maCaptions; ///< Captions of all tabs. - sal_uInt32 mnBackColor; ///< Fill color. - sal_uInt32 mnTextColor; ///< Text color. - sal_uInt32 mnFlags; ///< Various flags. - sal_Int32 mnSelectedTab; ///< The index of the selected tab. - sal_uInt32 mnTabStyle; ///< Visual style of the tabs. - sal_Int32 mnTabFlagCount; ///< Number of entries in tab flag array. -}; - -typedef ::boost::shared_ptr< AxTabStripModel > AxTabStripModelRef; - -// ============================================================================ - typedef ::std::vector< ::rtl::OUString > AxClassTable; /** Base class for ActiveX container controls. */ @@ -881,33 +856,6 @@ public: // ============================================================================ -/** Model for a Forms 2.0 formpage control (a single page in a multipage control). */ -class OOX_DLLPUBLIC AxFormPageModel : public AxContainerModelBase -{ -public: - explicit AxFormPageModel(); - - virtual ApiControlType getControlType() const; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const; -}; - -// ============================================================================ - -/** Model for a Forms 2.0 multipage control. Contains the tabstrip control - (class AxTabStripModel) and the single pages (class AxFormPageModel). */ -class OOX_DLLPUBLIC AxMultiPageModel : public AxContainerModelBase -{ -public: - explicit AxMultiPageModel(); - - virtual ApiControlType getControlType() const; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const; - -private: - AxTabStripModelRef mxTabStrip; -}; - -// ============================================================================ /** Model for a Forms 2.0 user form. */ class OOX_DLLPUBLIC AxUserFormModel : public AxContainerModelBase diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index 8592ba6dc4f8..9e70cfd5a38f 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -2263,64 +2263,6 @@ void AxScrollBarModel::convertFromProperties( PropertySet& rPropSet, const Contr // ============================================================================ -AxTabStripModel::AxTabStripModel() : - AxFontDataModel( false ), // no support for alignment properties - mnBackColor( AX_SYSCOLOR_BUTTONFACE ), - mnTextColor( AX_SYSCOLOR_BUTTONTEXT ), - mnFlags( AX_TABSTRIP_DEFFLAGS ), - mnSelectedTab( -1 ), - mnTabStyle( AX_TABSTRIP_TABS ), - mnTabFlagCount( 0 ) -{ -} - -bool AxTabStripModel::importBinaryModel( BinaryInputStream& rInStrm ) -{ - AxBinaryPropertyReader aReader( rInStrm ); - aReader.readIntProperty< sal_Int32 >( mnSelectedTab ); - aReader.readIntProperty< sal_uInt32 >( mnBackColor ); - aReader.readIntProperty< sal_uInt32 >( mnTextColor ); - aReader.skipUndefinedProperty(); - aReader.readPairProperty( maSize ); - aReader.readStringArrayProperty( maCaptions ); - aReader.skipIntProperty< sal_uInt8 >(); // mouse pointer - aReader.skipUndefinedProperty(); - aReader.skipIntProperty< sal_uInt32 >(); // tab orientation - aReader.readIntProperty< sal_uInt32 >( mnTabStyle ); - aReader.skipBoolProperty(); // multiple rows - aReader.skipIntProperty< sal_uInt32 >(); // fixed width - aReader.skipIntProperty< sal_uInt32 >(); // fixed height - aReader.skipBoolProperty(); // tooltips - aReader.skipUndefinedProperty(); - aReader.skipStringArrayProperty(); // tooltip strings - aReader.skipUndefinedProperty(); - aReader.skipStringArrayProperty(); // tab names - aReader.readIntProperty< sal_uInt32 >( mnFlags ); - aReader.skipBoolProperty(); // new version - aReader.skipIntProperty< sal_uInt32 >(); // tabs allocated - aReader.skipStringArrayProperty(); // tags - aReader.readIntProperty< sal_uInt32 >( mnTabFlagCount ); - aReader.skipStringArrayProperty(); // accelerators - aReader.skipPictureProperty(); // mouse icon - return aReader.finalizeImport() && AxFontDataModel::importBinaryModel( rInStrm ); -} - -ApiControlType AxTabStripModel::getControlType() const -{ - return API_CONTROL_TABSTRIP; -} - -void AxTabStripModel::convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const -{ - rPropMap.setProperty( PROP_Decoration, mnTabStyle != AX_TABSTRIP_NONE ); - // adjust for openoffice ( 1 based ) - rPropMap.setProperty( PROP_MultiPageValue, mnSelectedTab + 1); - rConv.convertColor( rPropMap, PROP_BackgroundColor, mnBackColor ); - AxFontDataModel::convertProperties( rPropMap, rConv ); -} - -// ============================================================================ - AxContainerModelBase::AxContainerModelBase( bool bFontSupport ) : AxFontDataModel( false ), // no support for alignment properties maLogicalSize( AX_CONTAINER_DEFWIDTH, AX_CONTAINER_DEFHEIGHT ), @@ -2448,44 +2390,6 @@ void AxFrameModel::convertProperties( PropertyMap& rPropMap, const ControlConver // ============================================================================ -AxFormPageModel::AxFormPageModel() -{ -} - -ApiControlType AxFormPageModel::getControlType() const -{ - return API_CONTROL_PAGE; -} - -void AxFormPageModel::convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const -{ - rPropMap.setProperty( PROP_Title, maCaption ); - rPropMap.setProperty( PROP_Enabled, getFlag( mnFlags, AX_CONTAINER_ENABLED ) ); - rConv.convertColor( rPropMap, PROP_BackgroundColor, mnBackColor ); - AxContainerModelBase::convertProperties( rPropMap, rConv ); -} - -// ============================================================================ - -AxMultiPageModel::AxMultiPageModel() -{ -} - -ApiControlType AxMultiPageModel::getControlType() const -{ - return API_CONTROL_MULTIPAGE; -} - -void AxMultiPageModel::convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const -{ - rPropMap.setProperty( PROP_Enabled, getFlag( mnFlags, AX_CONTAINER_ENABLED ) ); - if( mxTabStrip.get() ) - mxTabStrip->convertProperties( rPropMap, rConv ); - AxContainerModelBase::convertProperties( rPropMap, rConv ); -} - -// ============================================================================ - AxUserFormModel::AxUserFormModel() { } diff --git a/unusedcode.easy b/unusedcode.easy index 733c720fdb89..1dddeaeee775 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -83,9 +83,6 @@ formula::FormulaTokenIterator::First() framework::OReadMenuDocumentHandler::getServiceFactory() jfw_plugin::VendorBase::createInstance() oox::drawingml::TextListStyle::dump() const -oox::ole::AxFormPageModel::AxFormPageModel() -oox::ole::AxMultiPageModel::AxMultiPageModel() -oox::ole::AxTabStripModel::AxTabStripModel() oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper const&) sd::LeftDrawPaneShell::RegisterInterface(SfxModule*) sd::LeftImpressPaneShell::RegisterInterface(SfxModule*) From 0e7e65d0480f63000b46b8009becf749e8a1d765 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 6 Oct 2012 17:57:07 +0200 Subject: [PATCH 431/863] get rid of CREATE_OUSTRING Change-Id: I67cd3213c7c92a4a782906a7250c176efeb01633 --- sc/source/filter/excel/excimp8.cxx | 4 +- sc/source/filter/excel/impop.cxx | 2 +- sc/source/filter/excel/xechart.cxx | 4 +- sc/source/filter/excel/xecontent.cxx | 12 +- sc/source/filter/excel/xeescher.cxx | 70 +++--- sc/source/filter/excel/xeformula.cxx | 9 +- sc/source/filter/excel/xestream.cxx | 4 +- sc/source/filter/excel/xichart.cxx | 6 +- sc/source/filter/excel/xiescher.cxx | 138 ++++++------ sc/source/filter/excel/xistyle.cxx | 2 +- sc/source/filter/excel/xlchart.cxx | 18 +- sc/source/filter/excel/xlescher.cxx | 2 +- sc/source/filter/excel/xlroot.cxx | 3 +- sc/source/filter/excel/xltracer.cxx | 2 +- sc/source/filter/inc/xlchart.hxx | 210 +++++++++--------- sc/source/filter/oox/condformatbuffer.cxx | 48 ++-- sc/source/filter/oox/drawingfragment.cxx | 60 ++--- sc/source/filter/oox/excelchartconverter.cxx | 2 +- sc/source/filter/oox/excelfilter.cxx | 8 +- sc/source/filter/oox/excelvbaproject.cxx | 4 +- sc/source/filter/oox/formulabase.cxx | 10 +- sc/source/filter/oox/numberformatsbuffer.cxx | 6 +- sc/source/filter/oox/pagesettings.cxx | 12 +- sc/source/filter/oox/pivotcachebuffer.cxx | 4 +- sc/source/filter/oox/querytablebuffer.cxx | 6 +- sc/source/filter/oox/stylesbuffer.cxx | 8 +- sc/source/filter/oox/themebuffer.cxx | 4 +- sc/source/filter/oox/unitconverter.cxx | 14 +- sc/source/filter/oox/viewsettings.cxx | 2 +- sc/source/filter/oox/workbookhelper.cxx | 14 +- sc/source/filter/oox/workbooksettings.cxx | 4 +- sc/source/filter/oox/worksheetbuffer.cxx | 2 +- sc/source/filter/oox/worksheethelper.cxx | 4 +- sc/source/filter/xcl97/xcl97esc.cxx | 2 +- .../ui/Accessibility/AccessibleCsvControl.cxx | 22 +- sc/source/ui/vba/vbasheetobject.cxx | 54 ++--- sc/source/ui/vba/vbasheetobjects.cxx | 14 +- 37 files changed, 391 insertions(+), 399 deletions(-) diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index 3ea56ebae788..416b3da01763 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -360,10 +360,10 @@ void ImportExcel8::ReadBasic( void ) SfxMedium& rMedium = GetMedium(); uno::Reference< io::XInputStream > xIn = rMedium.GetInputStream(); oox::ole::OleStorage root( aCtx, xIn, false ); - oox::StorageRef vbaStg = root.openSubStorage( CREATE_OUSTRING( "_VBA_PROJECT_CUR" ), false ); + oox::StorageRef vbaStg = root.openSubStorage( "_VBA_PROJECT_CUR", false ); if ( vbaStg.get() ) { - oox::ole::VbaProject aVbaPrj( aCtx, pShell->GetModel(), CREATE_OUSTRING( "Calc") ); + oox::ole::VbaProject aVbaPrj( aCtx, pShell->GetModel(), "Calc" ); // collect names of embedded form controls, as specified in the VBA project uno::Reference< container::XNameContainer > xOleNameOverrideSink( new OleNameOverrideContainer ); aVbaPrj.setOleOverridesSink( xOleNameOverrideSink ); diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index 8c7a48bcbd9b..c79b47489c80 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -1245,7 +1245,7 @@ void ImportExcel::PostDocLoad( void ) // open forms in alive mode (has no effect, if no controls in document) if( ScModelObj* pDocObj = GetDocModelObj() ) - pDocObj->setPropertyValue( CREATE_OUSTRING( SC_UNO_APPLYFMDES ), uno::Any( false ) ); + pDocObj->setPropertyValue( SC_UNO_APPLYFMDES, uno::Any( false ) ); // enables extended options to be set to the view after import GetExtDocOptions().SetChanged( true ); diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx index 9888f5af4b14..5d0bee7385d1 100644 --- a/sc/source/filter/excel/xechart.cxx +++ b/sc/source/filter/excel/xechart.cxx @@ -1947,8 +1947,8 @@ bool XclExpChSeries::ConvertDataSeries( Reference< XColorScheme > xColorScheme = xDiagram->getDefaultColorScheme(); if( xColorScheme.is() ) { - const OUString aFillStyleName = CREATE_OUSTRING( "FillStyle" ); - const OUString aColorName = CREATE_OUSTRING( "Color" ); + const OUString aFillStyleName = "FillStyle"; + const OUString aColorName = "Color"; namespace cssd = ::com::sun::star::drawing; for( sal_Int32 nPointIdx = 0; nPointIdx < nMaxPointCount; ++nPointIdx ) { diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index 2cac520d7063..c6bffc3b8f42 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -1692,7 +1692,7 @@ XclExpWebQueryBuffer::XclExpWebQueryBuffer( const XclExpRoot& rRoot ) if( !aModelProp.Is() ) return; Reference< XAreaLinks > xAreaLinks; - aModelProp.GetProperty( xAreaLinks, CREATE_OUSTRING( SC_UNO_AREALINKS ) ); + aModelProp.GetProperty( xAreaLinks, SC_UNO_AREALINKS ); Reference< XIndexAccess > xLinksIA( xAreaLinks, UNO_QUERY ); if( !xLinksIA.is() ) return; @@ -1706,16 +1706,16 @@ XclExpWebQueryBuffer::XclExpWebQueryBuffer( const XclExpRoot& rRoot ) { ScfPropertySet aLinkProp( xAreaLink ); OUString aFilter; - if( aLinkProp.GetProperty( aFilter, CREATE_OUSTRING( SC_UNONAME_FILTER ) ) && - (aFilter == CREATE_OUSTRING( EXC_WEBQRY_FILTER )) ) + if( aLinkProp.GetProperty( aFilter, SC_UNONAME_FILTER ) && + (aFilter == EXC_WEBQRY_FILTER) ) { // get properties OUString /*aFilterOpt,*/ aUrl; sal_Int32 nRefresh = 0; -// aLinkProp.GetProperty( aFilterOpt, CREATE_OUSTRING( SC_UNONAME_FILTOPT ) ); - aLinkProp.GetProperty( aUrl, CREATE_OUSTRING( SC_UNONAME_LINKURL ) ); - aLinkProp.GetProperty( nRefresh, CREATE_OUSTRING( SC_UNONAME_REFDELAY ) ); +// aLinkProp.GetProperty( aFilterOpt, SC_UNONAME_FILTOPT ); + aLinkProp.GetProperty( aUrl, SC_UNONAME_LINKURL ); + aLinkProp.GetProperty( nRefresh, SC_UNONAME_REFDELAY ); String aAbsDoc( ScGlobal::GetAbsDocName( aUrl, pShell ) ); INetURLObject aUrlObj( aAbsDoc ); diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index bf71424d9d3c..74bc82d532b9 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -461,11 +461,11 @@ void XclExpControlHelper::ConvertSheetLinks( Reference< XShape > xShape ) if( xBindable.is() ) { Reference< XServiceInfo > xServInfo( xBindable->getValueBinding(), UNO_QUERY ); - if( xServInfo.is() && xServInfo->supportsService( CREATE_OUSTRING( SC_SERVICENAME_VALBIND ) ) ) + if( xServInfo.is() && xServInfo->supportsService( SC_SERVICENAME_VALBIND ) ) { ScfPropertySet aBindProp( xServInfo ); CellAddress aApiAddress; - if( aBindProp.GetProperty( aApiAddress, CREATE_OUSTRING( SC_UNONAME_BOUNDCELL ) ) ) + if( aBindProp.GetProperty( aApiAddress, SC_UNONAME_BOUNDCELL ) ) { ScAddress aCellLink; ScUnoConversion::FillScAddress( aCellLink, aApiAddress ); @@ -481,11 +481,11 @@ void XclExpControlHelper::ConvertSheetLinks( Reference< XShape > xShape ) if( xEntrySink.is() ) { Reference< XServiceInfo > xServInfo( xEntrySink->getListEntrySource(), UNO_QUERY ); - if( xServInfo.is() && xServInfo->supportsService( CREATE_OUSTRING( SC_SERVICENAME_LISTSOURCE ) ) ) + if( xServInfo.is() && xServInfo->supportsService( SC_SERVICENAME_LISTSOURCE ) ) { ScfPropertySet aSinkProp( xServInfo ); CellRangeAddress aApiRange; - if( aSinkProp.GetProperty( aApiRange, CREATE_OUSTRING( SC_UNONAME_CELLRANGE ) ) ) + if( aSinkProp.GetProperty( aApiRange, SC_UNONAME_CELLRANGE ) ) { ScRange aSrcRange; ScUnoConversion::FillScRange( aSrcRange, aApiRange ); @@ -529,7 +529,7 @@ XclExpOcxControlObj::XclExpOcxControlObj( XclExpObjectManager& rObjMgr, Referenc // OBJ record flags SetLocked( sal_True ); - SetPrintable( aCtrlProp.GetBoolProperty( CREATE_OUSTRING( "Printable" ) ) ); + SetPrintable( aCtrlProp.GetBoolProperty( "Printable" ) ); SetAutoFill( false ); SetAutoLine( false ); @@ -544,7 +544,7 @@ XclExpOcxControlObj::XclExpOcxControlObj( XclExpObjectManager& rObjMgr, Referenc // #i51348# name of the control, may overwrite shape name OUString aCtrlName; - if( aCtrlProp.GetProperty( aCtrlName, CREATE_OUSTRING( "Name" ) ) && !aCtrlName.isEmpty() ) + if( aCtrlProp.GetProperty( aCtrlName, "Name" ) && !aCtrlName.isEmpty() ) aPropOpt.AddOpt( ESCHER_Prop_wzName, aCtrlName ); // meta file @@ -653,7 +653,7 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference< // control type sal_Int16 nClassId = 0; - if( aCtrlProp.GetProperty( nClassId, CREATE_OUSTRING( "ClassId" ) ) ) + if( aCtrlProp.GetProperty( nClassId, "ClassId" ) ) { switch( nClassId ) { @@ -673,7 +673,7 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference< // OBJ record flags SetLocked( sal_True ); - SetPrintable( aCtrlProp.GetBoolProperty( CREATE_OUSTRING( "Printable" ) ) ); + SetPrintable( aCtrlProp.GetBoolProperty( "Printable" ) ); SetAutoFill( false ); SetAutoLine( false ); @@ -681,7 +681,7 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference< mrEscherEx.OpenContainer( ESCHER_SpContainer ); mrEscherEx.AddShape( ESCHER_ShpInst_HostControl, SHAPEFLAG_HAVEANCHOR | SHAPEFLAG_HAVESPT ); EscherPropertyContainer aPropOpt; - bool bVisible = aCtrlProp.GetBoolProperty( CREATE_OUSTRING( "EnableVisible" ) ); + bool bVisible = aCtrlProp.GetBoolProperty( "EnableVisible" ); aPropOpt.AddOpt( ESCHER_Prop_fPrint, bVisible ? 0x00080000 : 0x00080002 ); // visible flag aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x01000100 ); // bool field @@ -693,7 +693,7 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference< // #i51348# name of the control, may overwrite shape name OUString aCtrlName; - if( aCtrlProp.GetProperty( aCtrlName, CREATE_OUSTRING( "Name" ) ) && !aCtrlName.isEmpty() ) + if( aCtrlProp.GetProperty( aCtrlName, "Name" ) && !aCtrlName.isEmpty() ) aPropOpt.AddOpt( ESCHER_Prop_wzName, aCtrlName ); // write DFF property set to stream @@ -707,7 +707,7 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference< // control label OUString aString; - if( aCtrlProp.GetProperty( aString, CREATE_OUSTRING( "Label" ) ) ) + if( aCtrlProp.GetProperty( aString, "Label" ) ) { /* Be sure to construct the MSODRAWING record containing the ClientTextbox atom after the base OBJ's MSODRAWING record data is @@ -733,7 +733,7 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference< mrEscherEx.CloseContainer(); // ESCHER_SpContainer // other properties - aCtrlProp.GetProperty( mnLineCount, CREATE_OUSTRING( "LineCount" ) ); + aCtrlProp.GetProperty( mnLineCount, "LineCount" ); // border style sal_Int16 nApiButton = AwtVisualEffect::LOOK3D; @@ -742,11 +742,11 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference< { case FormCompType::LISTBOX: case FormCompType::COMBOBOX: - aCtrlProp.GetProperty( nApiBorder, CREATE_OUSTRING( "Border" ) ); + aCtrlProp.GetProperty( nApiBorder, "Border" ); break; case FormCompType::CHECKBOX: case FormCompType::RADIOBUTTON: - aCtrlProp.GetProperty( nApiButton, CREATE_OUSTRING( "VisualEffect" ) ); + aCtrlProp.GetProperty( nApiButton, "VisualEffect" ); nApiBorder = AwtVisualEffect::NONE; break; // Push button cannot be set to flat in Excel @@ -774,7 +774,7 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference< // control state sal_Int16 nApiState = 0; - if( aCtrlProp.GetProperty( nApiState, CREATE_OUSTRING( "State" ) ) ) + if( aCtrlProp.GetProperty( nApiState, "State" ) ) { switch( nApiState ) { @@ -789,9 +789,9 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference< { case FormCompType::LISTBOX: { - mbMultiSel = aCtrlProp.GetBoolProperty( CREATE_OUSTRING( "MultiSelection" ) ); + mbMultiSel = aCtrlProp.GetBoolProperty( "MultiSelection" ); Sequence< sal_Int16 > aSelection; - if( aCtrlProp.GetProperty( aSelection, CREATE_OUSTRING( "SelectedItems" ) ) ) + if( aCtrlProp.GetProperty( aSelection, "SelectedItems" ) ) { sal_Int32 nLen = aSelection.getLength(); if( nLen > 0 ) @@ -804,7 +804,7 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference< } // convert listbox with dropdown button to Excel dropdown - if( aCtrlProp.GetBoolProperty( CREATE_OUSTRING( "Dropdown" ) ) ) + if( aCtrlProp.GetBoolProperty( "Dropdown" ) ) mnObjType = EXC_OBJTYPE_DROPDOWN; } break; @@ -813,8 +813,8 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference< { Sequence< OUString > aStringList; OUString aDefText; - if( aCtrlProp.GetProperty( aStringList, CREATE_OUSTRING( "StringItemList" ) ) && - aCtrlProp.GetProperty( aDefText, CREATE_OUSTRING( "Text" ) ) && + if( aCtrlProp.GetProperty( aStringList, "StringItemList" ) && + aCtrlProp.GetProperty( aDefText, "Text" ) && aStringList.getLength() && !aDefText.isEmpty() ) { const OUString* pBegin = aStringList.getConstArray(); @@ -827,7 +827,7 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference< } // convert combobox without dropdown button to Excel listbox - if( !aCtrlProp.GetBoolProperty( CREATE_OUSTRING( "Dropdown" ) ) ) + if( !aCtrlProp.GetBoolProperty( "Dropdown" ) ) mnObjType = EXC_OBJTYPE_LISTBOX; } break; @@ -835,17 +835,17 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference< case FormCompType::SCROLLBAR: { sal_Int32 nApiValue = 0; - if( aCtrlProp.GetProperty( nApiValue, CREATE_OUSTRING( "ScrollValueMin" ) ) ) + if( aCtrlProp.GetProperty( nApiValue, "ScrollValueMin" ) ) mnScrollMin = limit_cast< sal_uInt16 >( nApiValue, EXC_OBJ_SCROLLBAR_MIN, EXC_OBJ_SCROLLBAR_MAX ); - if( aCtrlProp.GetProperty( nApiValue, CREATE_OUSTRING( "ScrollValueMax" ) ) ) + if( aCtrlProp.GetProperty( nApiValue, "ScrollValueMax" ) ) mnScrollMax = limit_cast< sal_uInt16 >( nApiValue, mnScrollMin, EXC_OBJ_SCROLLBAR_MIN ); - if( aCtrlProp.GetProperty( nApiValue, CREATE_OUSTRING( "ScrollValue" ) ) ) + if( aCtrlProp.GetProperty( nApiValue, "ScrollValue" ) ) mnScrollValue = limit_cast< sal_uInt16 >( nApiValue, mnScrollMin, mnScrollMax ); - if( aCtrlProp.GetProperty( nApiValue, CREATE_OUSTRING( "LineIncrement" ) ) ) + if( aCtrlProp.GetProperty( nApiValue, "LineIncrement" ) ) mnScrollStep = limit_cast< sal_uInt16 >( nApiValue, EXC_OBJ_SCROLLBAR_MIN, EXC_OBJ_SCROLLBAR_MAX ); - if( aCtrlProp.GetProperty( nApiValue, CREATE_OUSTRING( "BlockIncrement" ) ) ) + if( aCtrlProp.GetProperty( nApiValue, "BlockIncrement" ) ) mnScrollPage = limit_cast< sal_uInt16 >( nApiValue, EXC_OBJ_SCROLLBAR_MIN, EXC_OBJ_SCROLLBAR_MAX ); - if( aCtrlProp.GetProperty( nApiValue, CREATE_OUSTRING( "Orientation" ) ) ) + if( aCtrlProp.GetProperty( nApiValue, "Orientation" ) ) mbScrollHor = nApiValue == AwtScrollOrient::HORIZONTAL; } break; @@ -853,15 +853,15 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference< case FormCompType::SPINBUTTON: { sal_Int32 nApiValue = 0; - if( aCtrlProp.GetProperty( nApiValue, CREATE_OUSTRING( "SpinValueMin" ) ) ) + if( aCtrlProp.GetProperty( nApiValue, "SpinValueMin" ) ) mnScrollMin = limit_cast< sal_uInt16 >( nApiValue, EXC_OBJ_SCROLLBAR_MIN, EXC_OBJ_SCROLLBAR_MAX ); - if( aCtrlProp.GetProperty( nApiValue, CREATE_OUSTRING( "SpinValueMax" ) ) ) + if( aCtrlProp.GetProperty( nApiValue, "SpinValueMax" ) ) mnScrollMax = limit_cast< sal_uInt16 >( nApiValue, mnScrollMin, EXC_OBJ_SCROLLBAR_MAX ); - if( aCtrlProp.GetProperty( nApiValue, CREATE_OUSTRING( "SpinValue" ) ) ) + if( aCtrlProp.GetProperty( nApiValue, "SpinValue" ) ) mnScrollValue = limit_cast< sal_uInt16 >( nApiValue, mnScrollMin, mnScrollMax ); - if( aCtrlProp.GetProperty( nApiValue, CREATE_OUSTRING( "SpinIncrement" ) ) ) + if( aCtrlProp.GetProperty( nApiValue, "SpinIncrement" ) ) mnScrollStep = limit_cast< sal_uInt16 >( nApiValue, EXC_OBJ_SCROLLBAR_MIN, EXC_OBJ_SCROLLBAR_MAX ); - if( aCtrlProp.GetProperty( nApiValue, CREATE_OUSTRING( "Orientation" ) ) ) + if( aCtrlProp.GetProperty( nApiValue, "Orientation" ) ) mbScrollHor = nApiValue == AwtScrollOrient::HORIZONTAL; } break; @@ -1077,10 +1077,10 @@ XclExpChartObj::XclExpChartObj( XclExpObjectManager& rObjMgr, Reference< XShape // create the chart substream object ScfPropertySet aShapeProp( xShape ); Reference< XModel > xModel; - aShapeProp.GetProperty( xModel, CREATE_OUSTRING( "Model" ) ); + aShapeProp.GetProperty( xModel, "Model" ); mxChartDoc.set( xModel,UNO_QUERY ); ::com::sun::star::awt::Rectangle aBoundRect; - aShapeProp.GetProperty( aBoundRect, CREATE_OUSTRING( "BoundRect" ) ); + aShapeProp.GetProperty( aBoundRect, "BoundRect" ); Rectangle aChartRect( Point( aBoundRect.X, aBoundRect.Y ), Size( aBoundRect.Width, aBoundRect.Height ) ); mxChart.reset( new XclExpChart( GetRoot(), xModel, aChartRect ) ); } @@ -1132,7 +1132,7 @@ void XclExpChartObj::WriteChartObj( sax_fastparser::FSHelperPtr pDrawing, XclExp pDrawing->startElement( FSNS( XML_xdr, XML_nvGraphicFramePr ), FSEND ); // TODO: get the correct chart name chart id - OUString sName = CREATE_OUSTRING("Object 1"); + OUString sName = "Object 1"; Reference< XNamed > xNamed( mxShape, UNO_QUERY ); if (xNamed.is()) { diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx index a9640408accc..8dea2c4c8266 100644 --- a/sc/source/filter/excel/xeformula.cxx +++ b/sc/source/filter/excel/xeformula.cxx @@ -27,13 +27,6 @@ ************************************************************************/ -// XXX xelink.hxx MUST be included before xeformula.hxx because of the -// redifinition of the CREATE_OUSTRING() macro, which is in oox/helper.hxx -// (indirectly included via xelink.hxx) and ../inc/ftools.hxx (indirectly -// included via xeformula.hxx) that does an undef first. Ugly. -#include "xelink.hxx" -#include "xeformula.hxx" - #include #include #include @@ -44,7 +37,9 @@ #include "rangelst.hxx" #include "token.hxx" #include "tokenarray.hxx" +#include "xeformula.hxx" #include "xehelper.hxx" +#include "xelink.hxx" #include "xename.hxx" #include "xestream.hxx" diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index fe96d7554043..5a9d19a32cce 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -1130,7 +1130,7 @@ bool XclExpXmlStream::exportDocument() throw() if( pShell->GetViewData() ) pShell->GetViewData()->WriteExtOptions( mpRoot->GetExtDocOptions() ); - OUString const workbook = CREATE_OUSTRING( "xl/workbook.xml" ); + OUString const workbook = "xl/workbook.xml"; PushStream( CreateOutputStream( workbook, workbook, Reference (), "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml", @@ -1165,7 +1165,7 @@ OUString XlsxExport_getImplementationName() OUString XclExpXmlStream::implGetImplementationName() const { - return CREATE_OUSTRING( "TODO" ); + return OUString( "TODO" ); } diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index 01384ad3e387..6c7ad2ba6287 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -832,7 +832,7 @@ void XclImpChSourceLink::ConvertNumFmt( ScfPropertySet& rPropSet, bool bPercent { bool bLinkToSource = ::get_flag( maData.mnFlags, EXC_CHSRCLINK_NUMFMT ); sal_uInt32 nScNumFmt = bLinkToSource ? GetNumFmtBuffer().GetScFormat( maData.mnNumFmtIdx ) : NUMBERFORMAT_ENTRY_NOT_FOUND; - OUString aPropName = bPercent ? EXC_CHPROP_PERCENTAGENUMFMT : EXC_CHPROP_NUMBERFORMAT; + OUString aPropName = bPercent ? OUString( EXC_CHPROP_PERCENTAGENUMFMT ) : OUString( EXC_CHPROP_NUMBERFORMAT ); if( nScNumFmt != NUMBERFORMAT_ENTRY_NOT_FOUND ) rPropSet.SetProperty( aPropName, static_cast< sal_Int32 >( nScNumFmt ) ); else @@ -1551,7 +1551,7 @@ void XclImpChDataFormat::Convert( ScfPropertySet& rPropSet, const XclChExtTypeIn #if EXC_CHART2_3DBAR_HAIRLINES_ONLY // #i83151# only hair lines in 3D charts with filled data points if( rTypeInfo.mb3dChart && rTypeInfo.IsSeriesFrameFormat() && mxLineFmt && mxLineFmt->HasLine() ) - rPropSet.SetProperty< sal_Int32 >( CREATE_OUSTRING( "BorderWidth" ), 0 ); + rPropSet.SetProperty< sal_Int32 >( "BorderWidth", 0 ); #endif // other formatting @@ -3076,7 +3076,7 @@ void XclImpChValueRange::Convert( ScaleData& rScaleData, bool bMirrorOrient ) co { // scaling algorithm bool bLogScale = ::get_flag( maData.mnFlags, EXC_CHVALUERANGE_LOGSCALE ); - OUString aScalingService = bLogScale ? SERVICE_CHART2_LOGSCALING : SERVICE_CHART2_LINEARSCALING; + OUString aScalingService = bLogScale ? OUString( SERVICE_CHART2_LOGSCALING ) : OUString( SERVICE_CHART2_LINEARSCALING ); rScaleData.Scaling.set( ScfApiHelper::CreateInstance( aScalingService ), UNO_QUERY ); // min/max diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 37077e36b5ab..54f033793d8d 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -1382,7 +1382,7 @@ SdrObject* XclImpTextObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const Re { TSdrObjectPtr< SdrObjCustomShape > xSdrObj( new SdrObjCustomShape ); xSdrObj->NbcSetSnapRect( rAnchorRect ); - OUString aRectType = CREATE_OUSTRING( "rectangle" ); + OUString aRectType = "rectangle"; xSdrObj->MergeDefaultAttributes( &aRectType ); ConvertRectStyle( *xSdrObj ); sal_Bool bAutoSize = ::get_flag( maTextData.maData.mnFlags, EXC_OBJ_TEXT_AUTOSIZE ); @@ -1796,7 +1796,7 @@ void XclImpControlHelper::ApplySheetLinkProps() const ScUnoConversion::FillApiAddress( aApiAddress, *mxCellLink ); NamedValue aValue; - aValue.Name = CREATE_OUSTRING( SC_UNONAME_BOUNDCELL ); + aValue.Name = SC_UNONAME_BOUNDCELL; aValue.Value <<= aApiAddress; Sequence< Any > aArgs( 1 ); @@ -1806,8 +1806,8 @@ void XclImpControlHelper::ApplySheetLinkProps() const OUString aServiceName; switch( meBindMode ) { - case EXC_CTRL_BINDCONTENT: aServiceName = CREATE_OUSTRING( SC_SERVICENAME_VALBIND ); break; - case EXC_CTRL_BINDPOSITION: aServiceName = CREATE_OUSTRING( SC_SERVICENAME_LISTCELLBIND ); break; + case EXC_CTRL_BINDCONTENT: aServiceName = SC_SERVICENAME_VALBIND; break; + case EXC_CTRL_BINDPOSITION: aServiceName = SC_SERVICENAME_LISTCELLBIND; break; } Reference< XValueBinding > xBinding( xFactory->createInstanceWithArguments( aServiceName, aArgs ), UNO_QUERY_THROW ); @@ -1827,7 +1827,7 @@ void XclImpControlHelper::ApplySheetLinkProps() const ScUnoConversion::FillApiRange( aApiRange, *mxSrcRange ); NamedValue aValue; - aValue.Name = CREATE_OUSTRING( SC_UNONAME_CELLRANGE ); + aValue.Name = SC_UNONAME_CELLRANGE; aValue.Value <<= aApiRange; Sequence< Any > aArgs( 1 ); @@ -1835,7 +1835,7 @@ void XclImpControlHelper::ApplySheetLinkProps() const // create the EntrySource instance and set at the control model Reference< XListEntrySource > xEntrySource( xFactory->createInstanceWithArguments( - CREATE_OUSTRING( SC_SERVICENAME_LISTSOURCE ), aArgs ), UNO_QUERY_THROW ); + SC_SERVICENAME_LISTSOURCE, aArgs ), UNO_QUERY_THROW ); xEntrySink->setListEntrySource( xEntrySource ); } catch( const Exception& ) @@ -1856,11 +1856,11 @@ void XclImpControlHelper::ProcessControl( const XclImpDrawObjBase& rDrawObj ) co ScfPropertySet aPropSet( xCtrlModel ); // #i51348# set object name at control model - aPropSet.SetStringProperty( CREATE_OUSTRING( "Name" ), rDrawObj.GetObjName() ); + aPropSet.SetStringProperty( "Name", rDrawObj.GetObjName() ); // control visible and printable? - aPropSet.SetBoolProperty( CREATE_OUSTRING( "EnableVisible" ), rDrawObj.IsVisible() ); - aPropSet.SetBoolProperty( CREATE_OUSTRING( "Printable" ), rDrawObj.IsPrintable() ); + aPropSet.SetBoolProperty( "EnableVisible", rDrawObj.IsVisible() ); + aPropSet.SetBoolProperty( "Printable", rDrawObj.IsPrintable() ); // virtual call for type specific processing @@ -1988,7 +1988,7 @@ void XclImpTbxObjBase::ConvertLabel( ScfPropertySet& rPropSet ) const if( nPos != STRING_NOTFOUND ) aLabel.Insert( '~', nPos ); } - rPropSet.SetStringProperty( CREATE_OUSTRING( "Label" ), aLabel ); + rPropSet.SetStringProperty( "Label", aLabel ); } ConvertFont( rPropSet ); } @@ -2027,7 +2027,7 @@ void XclImpButtonObj::DoProcessControl( ScfPropertySet& rPropSet ) const case EXC_OBJ_HOR_CENTER: nHorAlign = 1; break; case EXC_OBJ_HOR_RIGHT: nHorAlign = 2; break; } - rPropSet.SetProperty( CREATE_OUSTRING( "Align" ), nHorAlign ); + rPropSet.SetProperty( "Align", nHorAlign ); // vertical text alignment namespace csss = ::com::sun::star::style; @@ -2038,14 +2038,14 @@ void XclImpButtonObj::DoProcessControl( ScfPropertySet& rPropSet ) const case EXC_OBJ_VER_CENTER: eVerAlign = csss::VerticalAlignment_MIDDLE; break; case EXC_OBJ_VER_BOTTOM: eVerAlign = csss::VerticalAlignment_BOTTOM; break; } - rPropSet.SetProperty( CREATE_OUSTRING( "VerticalAlign" ), eVerAlign ); + rPropSet.SetProperty( "VerticalAlign", eVerAlign ); // always wrap text automatically - rPropSet.SetBoolProperty( CREATE_OUSTRING( "MultiLine" ), true ); + rPropSet.SetBoolProperty( "MultiLine", true ); // default button bool bDefButton = ::get_flag( maTextData.maData.mnButtonFlags, EXC_OBJ_BUTTON_DEFAULT ); - rPropSet.SetBoolProperty( CREATE_OUSTRING( "DefaultButton" ), bDefButton ); + rPropSet.SetBoolProperty( "DefaultButton", bDefButton ); // button type (flags cannot be combined in OOo) namespace cssa = ::com::sun::star::awt; @@ -2057,12 +2057,12 @@ void XclImpButtonObj::DoProcessControl( ScfPropertySet& rPropSet ) const else if( ::get_flag( maTextData.maData.mnButtonFlags, EXC_OBJ_BUTTON_HELP ) ) eButtonType = cssa::PushButtonType_HELP; // property type is short, not enum - rPropSet.SetProperty( CREATE_OUSTRING( "PushButtonType" ), sal_Int16( eButtonType ) ); + rPropSet.SetProperty( "PushButtonType", sal_Int16( eButtonType ) ); } OUString XclImpButtonObj::DoGetServiceName() const { - return CREATE_OUSTRING( "com.sun.star.form.component.CommandButton" ); + return OUString( "com.sun.star.form.component.CommandButton" ); } XclTbxEventType XclImpButtonObj::DoGetEventType() const @@ -2126,32 +2126,32 @@ void XclImpCheckBoxObj::DoProcessControl( ScfPropertySet& rPropSet ) const case EXC_OBJ_CHECKBOX_TRISTATE: nApiState = bSupportsTristate ? 2 : 1; break; } if( bSupportsTristate ) - rPropSet.SetBoolProperty( CREATE_OUSTRING( "TriState" ), nApiState == 2 ); - rPropSet.SetProperty( CREATE_OUSTRING( "DefaultState" ), nApiState ); + rPropSet.SetBoolProperty( "TriState", nApiState == 2 ); + rPropSet.SetProperty( "DefaultState", nApiState ); // box style namespace AwtVisualEffect = ::com::sun::star::awt::VisualEffect; sal_Int16 nEffect = ::get_flagvalue( mnCheckBoxFlags, EXC_OBJ_CHECKBOX_FLAT, AwtVisualEffect::FLAT, AwtVisualEffect::LOOK3D ); - rPropSet.SetProperty( CREATE_OUSTRING( "VisualEffect" ), nEffect ); + rPropSet.SetProperty( "VisualEffect", nEffect ); // do not wrap text automatically - rPropSet.SetBoolProperty( CREATE_OUSTRING( "MultiLine" ), false ); + rPropSet.SetBoolProperty( "MultiLine", false ); // #i40279# always centered vertically namespace csss = ::com::sun::star::style; - rPropSet.SetProperty( CREATE_OUSTRING( "VerticalAlign" ), csss::VerticalAlignment_MIDDLE ); + rPropSet.SetProperty( "VerticalAlign", csss::VerticalAlignment_MIDDLE ); // background color if( maFillData.IsFilled() ) { sal_Int32 nColor = static_cast< sal_Int32 >( GetSolidFillColor( maFillData ).GetColor() ); - rPropSet.SetProperty( CREATE_OUSTRING( "BackgroundColor" ), nColor ); + rPropSet.SetProperty( "BackgroundColor", nColor ); } } OUString XclImpCheckBoxObj::DoGetServiceName() const { - return CREATE_OUSTRING( "com.sun.star.form.component.CheckBox" ); + return OUString( "com.sun.star.form.component.CheckBox" ); } XclTbxEventType XclImpCheckBoxObj::DoGetEventType() const @@ -2220,8 +2220,8 @@ void XclImpOptionButtonObj::DoProcessControl( ScfPropertySet& rPropSet ) const ScfPropertySet aProps( xCtrlModel ); rtl::OUString sGroupName = rtl::OUString::valueOf( static_cast< sal_Int32 >( pLeader->GetDffShapeId() ) ); - aProps.SetStringProperty( CREATE_OUSTRING( "GroupName" ), sGroupName ); - aProps.SetStringProperty( CREATE_OUSTRING( "RefValue" ), rtl::OUString::valueOf( nRefVal++ ) ); + aProps.SetStringProperty( "GroupName", sGroupName ); + aProps.SetStringProperty( "RefValue", rtl::OUString::valueOf( nRefVal++ ) ); if ( pLeader->HasCellLink() && !pTbxObj->HasCellLink() ) { // propagate cell link info @@ -2242,7 +2242,7 @@ void XclImpOptionButtonObj::DoProcessControl( ScfPropertySet& rPropSet ) const OUString XclImpOptionButtonObj::DoGetServiceName() const { - return CREATE_OUSTRING( "com.sun.star.form.component.RadioButton" ); + return OUString( "com.sun.star.form.component.RadioButton" ); } XclTbxEventType XclImpOptionButtonObj::DoGetEventType() const @@ -2263,17 +2263,17 @@ void XclImpLabelObj::DoProcessControl( ScfPropertySet& rPropSet ) const ConvertLabel( rPropSet ); // text alignment (always top/left aligned) - rPropSet.SetProperty( CREATE_OUSTRING( "Align" ), sal_Int16( 0 ) ); + rPropSet.SetProperty( "Align", sal_Int16( 0 ) ); namespace csss = ::com::sun::star::style; - rPropSet.SetProperty( CREATE_OUSTRING( "VerticalAlign" ), csss::VerticalAlignment_TOP ); + rPropSet.SetProperty( "VerticalAlign", csss::VerticalAlignment_TOP ); // always wrap text automatically - rPropSet.SetBoolProperty( CREATE_OUSTRING( "MultiLine" ), true ); + rPropSet.SetBoolProperty( "MultiLine", true ); } OUString XclImpLabelObj::DoGetServiceName() const { - return CREATE_OUSTRING( "com.sun.star.form.component.FixedText" ); + return OUString( "com.sun.star.form.component.FixedText" ); } XclTbxEventType XclImpLabelObj::DoGetEventType() const @@ -2322,7 +2322,7 @@ void XclImpGroupBoxObj::DoProcessControl( ScfPropertySet& rPropSet ) const OUString XclImpGroupBoxObj::DoGetServiceName() const { - return CREATE_OUSTRING( "com.sun.star.form.component.GroupBox" ); + return OUString( "com.sun.star.form.component.GroupBox" ); } XclTbxEventType XclImpGroupBoxObj::DoGetEventType() const @@ -2346,7 +2346,7 @@ void XclImpDialogObj::DoProcessControl( ScfPropertySet& rPropSet ) const OUString XclImpDialogObj::DoGetServiceName() const { // dialog frame faked by a groupbox - return CREATE_OUSTRING( "com.sun.star.form.component.GroupBox" ); + return OUString( "com.sun.star.form.component.GroupBox" ); } XclTbxEventType XclImpDialogObj::DoGetEventType() const @@ -2403,14 +2403,14 @@ void XclImpEditObj::DoProcessControl( ScfPropertySet& rPropSet ) const if( IsNumeric() ) { // TODO: OUString::toDouble() does not handle local decimal separator - rPropSet.SetProperty( CREATE_OUSTRING( "DefaultValue" ), aText.toDouble() ); - rPropSet.SetBoolProperty( CREATE_OUSTRING( "Spin" ), mnScrollBar != 0 ); + rPropSet.SetProperty( "DefaultValue", aText.toDouble() ); + rPropSet.SetBoolProperty( "Spin", mnScrollBar != 0 ); } else { - rPropSet.SetProperty( CREATE_OUSTRING( "DefaultText" ), aText ); - rPropSet.SetBoolProperty( CREATE_OUSTRING( "MultiLine" ), mnMultiLine != 0 ); - rPropSet.SetBoolProperty( CREATE_OUSTRING( "VScroll" ), mnScrollBar != 0 ); + rPropSet.SetProperty( "DefaultText", aText ); + rPropSet.SetBoolProperty( "MultiLine", mnMultiLine != 0 ); + rPropSet.SetBoolProperty( "VScroll", mnScrollBar != 0 ); } } ConvertFont( rPropSet ); @@ -2419,8 +2419,8 @@ void XclImpEditObj::DoProcessControl( ScfPropertySet& rPropSet ) const OUString XclImpEditObj::DoGetServiceName() const { return IsNumeric() ? - CREATE_OUSTRING( "com.sun.star.form.component.NumericField" ) : - CREATE_OUSTRING( "com.sun.star.form.component.TextField" ); + OUString( "com.sun.star.form.component.NumericField" ) : + OUString( "com.sun.star.form.component.TextField" ); } XclTbxEventType XclImpEditObj::DoGetEventType() const @@ -2483,19 +2483,19 @@ void XclImpSpinButtonObj::DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, void XclImpSpinButtonObj::DoProcessControl( ScfPropertySet& rPropSet ) const { // Calc's "Border" property is not the 3D/flat style effect in Excel (#i34712#) - rPropSet.SetProperty( CREATE_OUSTRING( "Border" ), ::com::sun::star::awt::VisualEffect::NONE ); - rPropSet.SetProperty< sal_Int32 >( CREATE_OUSTRING( "DefaultSpinValue" ), mnValue ); - rPropSet.SetProperty< sal_Int32 >( CREATE_OUSTRING( "SpinValueMin" ), mnMin ); - rPropSet.SetProperty< sal_Int32 >( CREATE_OUSTRING( "SpinValueMax" ), mnMax ); - rPropSet.SetProperty< sal_Int32 >( CREATE_OUSTRING( "SpinIncrement" ), mnStep ); + rPropSet.SetProperty( "Border", ::com::sun::star::awt::VisualEffect::NONE ); + rPropSet.SetProperty< sal_Int32 >( "DefaultSpinValue", mnValue ); + rPropSet.SetProperty< sal_Int32 >( "SpinValueMin", mnMin ); + rPropSet.SetProperty< sal_Int32 >( "SpinValueMax", mnMax ); + rPropSet.SetProperty< sal_Int32 >( "SpinIncrement", mnStep ); // Excel spin buttons always vertical - rPropSet.SetProperty( CREATE_OUSTRING( "Orientation" ), ::com::sun::star::awt::ScrollBarOrientation::VERTICAL ); + rPropSet.SetProperty( "Orientation", ::com::sun::star::awt::ScrollBarOrientation::VERTICAL ); } OUString XclImpSpinButtonObj::DoGetServiceName() const { - return CREATE_OUSTRING( "com.sun.star.form.component.SpinButton" ); + return OUString( "com.sun.star.form.component.SpinButton" ); } XclTbxEventType XclImpSpinButtonObj::DoGetEventType() const @@ -2522,22 +2522,22 @@ void XclImpScrollBarObj::DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, s void XclImpScrollBarObj::DoProcessControl( ScfPropertySet& rPropSet ) const { // Calc's "Border" property is not the 3D/flat style effect in Excel (#i34712#) - rPropSet.SetProperty( CREATE_OUSTRING( "Border" ), ::com::sun::star::awt::VisualEffect::NONE ); - rPropSet.SetProperty< sal_Int32 >( CREATE_OUSTRING( "DefaultScrollValue" ), mnValue ); - rPropSet.SetProperty< sal_Int32 >( CREATE_OUSTRING( "ScrollValueMin" ), mnMin ); - rPropSet.SetProperty< sal_Int32 >( CREATE_OUSTRING( "ScrollValueMax" ), mnMax ); - rPropSet.SetProperty< sal_Int32 >( CREATE_OUSTRING( "LineIncrement" ), mnStep ); - rPropSet.SetProperty< sal_Int32 >( CREATE_OUSTRING( "BlockIncrement" ), mnPageStep ); - rPropSet.SetProperty( CREATE_OUSTRING( "VisibleSize" ), ::std::min< sal_Int32 >( mnPageStep, 1 ) ); + rPropSet.SetProperty( "Border", ::com::sun::star::awt::VisualEffect::NONE ); + rPropSet.SetProperty< sal_Int32 >( "DefaultScrollValue", mnValue ); + rPropSet.SetProperty< sal_Int32 >( "ScrollValueMin", mnMin ); + rPropSet.SetProperty< sal_Int32 >( "ScrollValueMax", mnMax ); + rPropSet.SetProperty< sal_Int32 >( "LineIncrement", mnStep ); + rPropSet.SetProperty< sal_Int32 >( "BlockIncrement", mnPageStep ); + rPropSet.SetProperty( "VisibleSize", ::std::min< sal_Int32 >( mnPageStep, 1 ) ); namespace AwtScrollOrient = ::com::sun::star::awt::ScrollBarOrientation; sal_Int32 nApiOrient = ::get_flagvalue( mnOrient, EXC_OBJ_SCROLLBAR_HOR, AwtScrollOrient::HORIZONTAL, AwtScrollOrient::VERTICAL ); - rPropSet.SetProperty( CREATE_OUSTRING( "Orientation" ), nApiOrient ); + rPropSet.SetProperty( "Orientation", nApiOrient ); } OUString XclImpScrollBarObj::DoGetServiceName() const { - return CREATE_OUSTRING( "com.sun.star.form.component.ScrollBar" ); + return OUString( "com.sun.star.form.component.ScrollBar" ); } XclTbxEventType XclImpScrollBarObj::DoGetEventType() const @@ -2568,7 +2568,7 @@ void XclImpTbxObjListBase::SetBoxFormatting( ScfPropertySet& rPropSet ) const // border style namespace AwtVisualEffect = ::com::sun::star::awt::VisualEffect; sal_Int16 nApiBorder = ::get_flagvalue( mnListFlags, EXC_OBJ_LISTBOX_FLAT, AwtVisualEffect::FLAT, AwtVisualEffect::LOOK3D ); - rPropSet.SetProperty( CREATE_OUSTRING( "Border" ), nApiBorder ); + rPropSet.SetProperty( "Border", nApiBorder ); // font formatting if( mbHasDefFontIdx ) @@ -2628,7 +2628,7 @@ void XclImpListBoxObj::DoProcessControl( ScfPropertySet& rPropSet ) const // selection type sal_uInt8 nSelType = ::extract_value< sal_uInt8 >( mnListFlags, 4, 2 ); bool bMultiSel = nSelType != EXC_OBJ_LISTBOX_SINGLE; - rPropSet.SetBoolProperty( CREATE_OUSTRING( "MultiSelection" ), bMultiSel ); + rPropSet.SetBoolProperty( "MultiSelection", bMultiSel ); // selection (do not set, if listbox is linked to a cell) if( !HasCellLink() ) @@ -2649,14 +2649,14 @@ void XclImpListBoxObj::DoProcessControl( ScfPropertySet& rPropSet ) const if( !aSelVec.empty() ) { Sequence< sal_Int16 > aSelSeq( &aSelVec.front(), static_cast< sal_Int32 >( aSelVec.size() ) ); - rPropSet.SetProperty( CREATE_OUSTRING( "DefaultSelection" ), aSelSeq ); + rPropSet.SetProperty( "DefaultSelection", aSelSeq ); } } } OUString XclImpListBoxObj::DoGetServiceName() const { - return CREATE_OUSTRING( "com.sun.star.form.component.ListBox" ); + return OUString( "com.sun.star.form.component.ListBox" ); } XclTbxEventType XclImpListBoxObj::DoGetEventType() const @@ -2726,15 +2726,15 @@ void XclImpDropDownObj::DoProcessControl( ScfPropertySet& rPropSet ) const // dropdown listbox formatting SetBoxFormatting( rPropSet ); // enable dropdown button - rPropSet.SetBoolProperty( CREATE_OUSTRING( "Dropdown" ), true ); + rPropSet.SetBoolProperty( "Dropdown", true ); // dropdown line count - rPropSet.SetProperty( CREATE_OUSTRING( "LineCount" ), mnLineCount ); + rPropSet.SetProperty( "LineCount", mnLineCount ); if( GetDropDownType() == EXC_OBJ_DROPDOWN_COMBOBOX ) { // text of editable combobox if( maTextData.mxString ) - rPropSet.SetStringProperty( CREATE_OUSTRING( "DefaultText" ), maTextData.mxString->GetText() ); + rPropSet.SetStringProperty( "DefaultText", maTextData.mxString->GetText() ); } else { @@ -2743,7 +2743,7 @@ void XclImpDropDownObj::DoProcessControl( ScfPropertySet& rPropSet ) const { Sequence< sal_Int16 > aSelSeq( 1 ); aSelSeq[ 0 ] = mnSelEntry - 1; - rPropSet.SetProperty( CREATE_OUSTRING( "DefaultSelection" ), aSelSeq ); + rPropSet.SetProperty( "DefaultSelection", aSelSeq ); } } } @@ -2751,8 +2751,8 @@ void XclImpDropDownObj::DoProcessControl( ScfPropertySet& rPropSet ) const OUString XclImpDropDownObj::DoGetServiceName() const { return (GetDropDownType() == EXC_OBJ_DROPDOWN_COMBOBOX) ? - CREATE_OUSTRING( "com.sun.star.form.component.ComboBox" ) : - CREATE_OUSTRING( "com.sun.star.form.component.ListBox" ); + OUString( "com.sun.star.form.component.ComboBox" ) : + OUString( "com.sun.star.form.component.ListBox" ); } XclTbxEventType XclImpDropDownObj::DoGetEventType() const @@ -3172,7 +3172,7 @@ XclImpDffConverter::XclImpDffConvData::XclImpDffConvData( XclImpDffConverter::XclImpDffConverter( const XclImpRoot& rRoot, SvStream& rDffStrm ) : XclImpSimpleDffConverter( rRoot, rDffStrm ), oox::ole::MSConvertOCXControls( rRoot.GetDocShell()->GetModel() ), - maStdFormName( CREATE_OUSTRING( "Standard" ) ), + maStdFormName( "Standard" ), mnOleImpFlags( 0 ) { const SvtFilterOptions& rFilterOpt = SvtFilterOptions::Get(); @@ -3343,7 +3343,7 @@ SdrObject* XclImpDffConverter::CreateSdrObject( const XclImpPictureObj& rPicObj, if ( xFComp.is() ) { ScfPropertySet aPropSet( xFComp ); - aPropSet.SetStringProperty( CREATE_OUSTRING( "Name" ), rPicObj.GetObjName() ); + aPropSet.SetStringProperty( "Name", rPicObj.GetObjName() ); InsertControl( xFComp, aSz,&xShape,true); xSdrObj.reset( rPicObj.CreateSdrObjectFromShape( xShape, rAnchorRect ) ); } @@ -3526,7 +3526,7 @@ sal_Bool XclImpDffConverter::InsertControl( const Reference< XFormComponent >& r Reference< XControlModel > xCtrlModel( rxFormComp, UNO_QUERY_THROW ); // create the control shape - Reference< XShape > xShape( ScfApiHelper::CreateInstance( GetDocShell(), CREATE_OUSTRING( "com.sun.star.drawing.ControlShape" ) ), UNO_QUERY_THROW ); + Reference< XShape > xShape( ScfApiHelper::CreateInstance( GetDocShell(), "com.sun.star.drawing.ControlShape" ), UNO_QUERY_THROW ); Reference< XControlShape > xCtrlShape( xShape, UNO_QUERY_THROW ); // insert the new control into the form @@ -3708,7 +3708,7 @@ void XclImpDffConverter::InitControlForm() } else if( SfxObjectShell* pDocShell = GetDocShell() ) { - rConvData.mxCtrlForm.set( ScfApiHelper::CreateInstance( pDocShell, CREATE_OUSTRING( "com.sun.star.form.component.Form" ) ), UNO_QUERY_THROW ); + rConvData.mxCtrlForm.set( ScfApiHelper::CreateInstance( pDocShell, "com.sun.star.form.component.Form" ), UNO_QUERY_THROW ); xFormsNC->insertByName( maStdFormName, Any( rConvData.mxCtrlForm ) ); } } diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx index b6ecf6d1e873..760cf4ad878b 100644 --- a/sc/source/filter/excel/xistyle.cxx +++ b/sc/source/filter/excel/xistyle.cxx @@ -127,7 +127,7 @@ XclImpPalette::ExportPalette() if ( xProps.is() ) { uno::Reference< container::XIndexAccess > xIndex( new PaletteIndex( aColors ) ); - xProps->setPropertyValue( CREATE_OUSTRING("ColorPalette"), uno::makeAny( xIndex ) ); + xProps->setPropertyValue( "ColorPalette", uno::makeAny( xIndex ) ); } } diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx index 53f1136c04bd..c233f51aa169 100644 --- a/sc/source/filter/excel/xlchart.cxx +++ b/sc/source/filter/excel/xlchart.cxx @@ -466,10 +466,10 @@ OUString XclChartHelper::GetErrorBarValuesRole( sal_uInt8 nBarType ) { switch( nBarType ) { - case EXC_CHSERERR_XPLUS: return EXC_CHPROP_ROLE_ERRORBARS_POSX; - case EXC_CHSERERR_XMINUS: return EXC_CHPROP_ROLE_ERRORBARS_NEGX; - case EXC_CHSERERR_YPLUS: return EXC_CHPROP_ROLE_ERRORBARS_POSY; - case EXC_CHSERERR_YMINUS: return EXC_CHPROP_ROLE_ERRORBARS_NEGY; + case EXC_CHSERERR_XPLUS: return OUString( EXC_CHPROP_ROLE_ERRORBARS_POSX ); + case EXC_CHSERERR_XMINUS: return OUString( EXC_CHPROP_ROLE_ERRORBARS_NEGX ); + case EXC_CHSERERR_YPLUS: return OUString( EXC_CHPROP_ROLE_ERRORBARS_POSY ); + case EXC_CHSERERR_YMINUS: return OUString( EXC_CHPROP_ROLE_ERRORBARS_NEGY ); default: OSL_FAIL( "XclChartHelper::GetErrorBarValuesRole - unknown bar type" ); } return OUString(); @@ -1253,7 +1253,7 @@ namespace { using the specified interface function. Checks a boolean property first. */ #define EXC_FRAGMENT_GETTITLESHAPE( shape_supplier, supplier_func, property_name ) \ ScfPropertySet aPropSet( shape_supplier ); \ - if( shape_supplier.is() && aPropSet.GetBoolProperty( CREATE_OUSTRING( #property_name ) ) ) \ + if( shape_supplier.is() && aPropSet.GetBoolProperty( #property_name ) ) \ return shape_supplier->supplier_func(); \ return Reference< XShape >(); \ @@ -1322,13 +1322,13 @@ void XclChRootData::InitConversion( const XclRoot& rRoot, const Reference< XChar // create object tables Reference< XMultiServiceFactory > xFactory( mxChartDoc, UNO_QUERY ); mxLineDashTable.reset( new XclChObjectTable( - xFactory, SERVICE_DRAWING_DASHTABLE, CREATE_OUSTRING( "Excel line dash " ) ) ); + xFactory, SERVICE_DRAWING_DASHTABLE, "Excel line dash " ) ); mxGradientTable.reset( new XclChObjectTable( - xFactory, SERVICE_DRAWING_GRADIENTTABLE, CREATE_OUSTRING( "Excel gradient " ) ) ); + xFactory, SERVICE_DRAWING_GRADIENTTABLE, "Excel gradient " ) ); mxHatchTable.reset( new XclChObjectTable( - xFactory, SERVICE_DRAWING_HATCHTABLE, CREATE_OUSTRING( "Excel hatch " ) ) ); + xFactory, SERVICE_DRAWING_HATCHTABLE, "Excel hatch " ) ); mxBitmapTable.reset( new XclChObjectTable( - xFactory, SERVICE_DRAWING_BITMAPTABLE, CREATE_OUSTRING( "Excel bitmap " ) ) ); + xFactory, SERVICE_DRAWING_BITMAPTABLE, "Excel bitmap " ) ); } void XclChRootData::FinishConversion() diff --git a/sc/source/filter/excel/xlescher.cxx b/sc/source/filter/excel/xlescher.cxx index ba76e58a61e3..a1e5bc70e832 100644 --- a/sc/source/filter/excel/xlescher.cxx +++ b/sc/source/filter/excel/xlescher.cxx @@ -334,7 +334,7 @@ bool XclControlHelper::FillMacroDescriptor( ScriptEventDescriptor& rDescriptor, { rDescriptor.ListenerType = OUString::createFromAscii( spTbxListenerData[ eEventType ].mpcListenerType ); rDescriptor.EventMethod = OUString::createFromAscii( spTbxListenerData[ eEventType ].mpcEventMethod ); - rDescriptor.ScriptType = CREATE_OUSTRING( "Script" ); + rDescriptor.ScriptType = "Script"; rDescriptor.ScriptCode = XclTools::GetSbMacroUrl( rXclMacroName, pDocShell ); return true; } diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx index 66b5e33993b2..d5c9d7147aba 100644 --- a/sc/source/filter/excel/xlroot.cxx +++ b/sc/source/filter/excel/xlroot.cxx @@ -151,7 +151,7 @@ XclRootData::XclRootData( XclBiff eBiff, SfxMedium& rMedium, try { Reference< XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory(), UNO_SET_THROW ); - Reference< XFramesSupplier > xFramesSupp( xFactory->createInstance( CREATE_OUSTRING( "com.sun.star.frame.Desktop" ) ), UNO_QUERY_THROW ); + Reference< XFramesSupplier > xFramesSupp( xFactory->createInstance( "com.sun.star.frame.Desktop" ), UNO_QUERY_THROW ); Reference< XFrame > xFrame( xFramesSupp->getActiveFrame(), UNO_SET_THROW ); Reference< XDevice > xDevice( xFrame->getContainerWindow(), UNO_QUERY_THROW ); DeviceInfo aDeviceInfo = xDevice->getInfo(); @@ -182,7 +182,6 @@ XclRoot::XclRoot( XclRootData& rRootData ) : #endif // filter tracer - // do not use CREATE_OUSTRING for conditional expression mrData.mxTracer.reset( new XclTracer( GetDocUrl() ) ); } diff --git a/sc/source/filter/excel/xltracer.cxx b/sc/source/filter/excel/xltracer.cxx index a80360314d95..c46a72b49b07 100644 --- a/sc/source/filter/excel/xltracer.cxx +++ b/sc/source/filter/excel/xltracer.cxx @@ -39,7 +39,7 @@ XclTracer::XclTracer( const String& rDocUrl ) , maFirstTimes(eTraceLength,true) { Sequence< PropertyValue > aConfigData( 1 ); - aConfigData[ 0 ].Name = CREATE_OUSTRING( "DocumentURL" ); + aConfigData[ 0 ].Name = "DocumentURL"; aConfigData[ 0 ].Value <<= OUString( rDocUrl ); } diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx index 14fbb1f98421..0fa1d8bf5784 100644 --- a/sc/source/filter/inc/xlchart.hxx +++ b/sc/source/filter/inc/xlchart.hxx @@ -52,116 +52,116 @@ class XclRoot; // Property names ============================================================= // service names -#define SERVICE_DRAWING_BITMAPTABLE CREATE_OUSTRING( "com.sun.star.drawing.BitmapTable" ) -#define SERVICE_DRAWING_DASHTABLE CREATE_OUSTRING( "com.sun.star.drawing.DashTable" ) -#define SERVICE_DRAWING_GRADIENTTABLE CREATE_OUSTRING( "com.sun.star.drawing.GradientTable" ) -#define SERVICE_DRAWING_HATCHTABLE CREATE_OUSTRING( "com.sun.star.drawing.HatchTable" ) +#define SERVICE_DRAWING_BITMAPTABLE "com.sun.star.drawing.BitmapTable" +#define SERVICE_DRAWING_DASHTABLE "com.sun.star.drawing.DashTable" +#define SERVICE_DRAWING_GRADIENTTABLE "com.sun.star.drawing.GradientTable" +#define SERVICE_DRAWING_HATCHTABLE "com.sun.star.drawing.HatchTable" -#define SERVICE_CHART2_AXIS CREATE_OUSTRING( "com.sun.star.chart2.Axis" ) -#define SERVICE_CHART2_CARTESIANCOORDSYS2D CREATE_OUSTRING( "com.sun.star.chart2.CartesianCoordinateSystem2d" ) -#define SERVICE_CHART2_CARTESIANCOORDSYS3D CREATE_OUSTRING( "com.sun.star.chart2.CartesianCoordinateSystem3d" ) -#define SERVICE_CHART2_DATAPROVIDER CREATE_OUSTRING( "com.sun.star.chart2.data.DataProvider" ) -#define SERVICE_CHART2_DATASERIES CREATE_OUSTRING( "com.sun.star.chart2.DataSeries" ) -#define SERVICE_CHART2_DIAGRAM CREATE_OUSTRING( "com.sun.star.chart2.Diagram" ) -#define SERVICE_CHART2_ERRORBAR CREATE_OUSTRING( "com.sun.star.chart2.ErrorBar" ) -#define SERVICE_CHART2_EXPREGCURVE CREATE_OUSTRING( "com.sun.star.chart2.ExponentialRegressionCurve" ) -#define SERVICE_CHART2_FORMATTEDSTRING CREATE_OUSTRING( "com.sun.star.chart2.FormattedString" ) -#define SERVICE_CHART2_LABELEDDATASEQ CREATE_OUSTRING( "com.sun.star.chart2.data.LabeledDataSequence" ) -#define SERVICE_CHART2_LEGEND CREATE_OUSTRING( "com.sun.star.chart2.Legend" ) -#define SERVICE_CHART2_LINEARREGCURVE CREATE_OUSTRING( "com.sun.star.chart2.LinearRegressionCurve" ) -#define SERVICE_CHART2_LINEARSCALING CREATE_OUSTRING( "com.sun.star.chart2.LinearScaling" ) -#define SERVICE_CHART2_LOGREGCURVE CREATE_OUSTRING( "com.sun.star.chart2.LogarithmicRegressionCurve" ) -#define SERVICE_CHART2_LOGSCALING CREATE_OUSTRING( "com.sun.star.chart2.LogarithmicScaling" ) -#define SERVICE_CHART2_POLARCOORDSYS2D CREATE_OUSTRING( "com.sun.star.chart2.PolarCoordinateSystem2d" ) -#define SERVICE_CHART2_POLARCOORDSYS3D CREATE_OUSTRING( "com.sun.star.chart2.PolarCoordinateSystem3d" ) -#define SERVICE_CHART2_POTREGCURVE CREATE_OUSTRING( "com.sun.star.chart2.PotentialRegressionCurve" ) -#define SERVICE_CHART2_TITLE CREATE_OUSTRING( "com.sun.star.chart2.Title" ) +#define SERVICE_CHART2_AXIS "com.sun.star.chart2.Axis" +#define SERVICE_CHART2_CARTESIANCOORDSYS2D "com.sun.star.chart2.CartesianCoordinateSystem2d" +#define SERVICE_CHART2_CARTESIANCOORDSYS3D "com.sun.star.chart2.CartesianCoordinateSystem3d" +#define SERVICE_CHART2_DATAPROVIDER "com.sun.star.chart2.data.DataProvider" +#define SERVICE_CHART2_DATASERIES "com.sun.star.chart2.DataSeries" +#define SERVICE_CHART2_DIAGRAM "com.sun.star.chart2.Diagram" +#define SERVICE_CHART2_ERRORBAR "com.sun.star.chart2.ErrorBar" +#define SERVICE_CHART2_EXPREGCURVE "com.sun.star.chart2.ExponentialRegressionCurve" +#define SERVICE_CHART2_FORMATTEDSTRING "com.sun.star.chart2.FormattedString" +#define SERVICE_CHART2_LABELEDDATASEQ "com.sun.star.chart2.data.LabeledDataSequence" +#define SERVICE_CHART2_LEGEND "com.sun.star.chart2.Legend" +#define SERVICE_CHART2_LINEARREGCURVE "com.sun.star.chart2.LinearRegressionCurve" +#define SERVICE_CHART2_LINEARSCALING "com.sun.star.chart2.LinearScaling" +#define SERVICE_CHART2_LOGREGCURVE "com.sun.star.chart2.LogarithmicRegressionCurve" +#define SERVICE_CHART2_LOGSCALING "com.sun.star.chart2.LogarithmicScaling" +#define SERVICE_CHART2_POLARCOORDSYS2D "com.sun.star.chart2.PolarCoordinateSystem2d" +#define SERVICE_CHART2_POLARCOORDSYS3D "com.sun.star.chart2.PolarCoordinateSystem3d" +#define SERVICE_CHART2_POTREGCURVE "com.sun.star.chart2.PotentialRegressionCurve" +#define SERVICE_CHART2_TITLE "com.sun.star.chart2.Title" // property names -#define EXC_CHPROP_ADDITIONALSHAPES CREATE_OUSTRING( "AdditionalShapes" ) -#define EXC_CHPROP_ANCHORPOSITION CREATE_OUSTRING( "AnchorPosition" ) -#define EXC_CHPROP_ARRANGEORDER CREATE_OUSTRING( "ArrangeOrder" ) -#define EXC_CHPROP_ATTAXISINDEX CREATE_OUSTRING( "AttachedAxisIndex" ) -#define EXC_CHPROP_ATTRIBDATAPOINTS CREATE_OUSTRING( "AttributedDataPoints" ) -#define EXC_CHPROP_BLACKDAY CREATE_OUSTRING( "BlackDay" ) -#define EXC_CHPROP_COLOR CREATE_OUSTRING( "Color" ) -#define EXC_CHPROP_CONNECTBARS CREATE_OUSTRING( "ConnectBars" ) -#define EXC_CHPROP_CROSSOVERPOSITION CREATE_OUSTRING( "CrossoverPosition" ) -#define EXC_CHPROP_CROSSOVERVALUE CREATE_OUSTRING( "CrossoverValue" ) -#define EXC_CHPROP_CURVESTYLE CREATE_OUSTRING( "CurveStyle" ) -#define EXC_CHPROP_D3DSCENEAMBIENTCOLOR CREATE_OUSTRING( "D3DSceneAmbientColor" ) -#define EXC_CHPROP_D3DSCENELIGHTON1 CREATE_OUSTRING( "D3DSceneLightOn1" ) -#define EXC_CHPROP_D3DSCENELIGHTCOLOR2 CREATE_OUSTRING( "D3DSceneLightColor2" ) -#define EXC_CHPROP_D3DSCENELIGHTDIR2 CREATE_OUSTRING( "D3DSceneLightDirection2" ) -#define EXC_CHPROP_D3DSCENELIGHTON2 CREATE_OUSTRING( "D3DSceneLightOn2" ) -#define EXC_CHPROP_D3DSCENEPERSPECTIVE CREATE_OUSTRING( "D3DScenePerspective" ) -#define EXC_CHPROP_D3DSCENESHADEMODE CREATE_OUSTRING( "D3DSceneShadeMode" ) -#define EXC_CHPROP_DISPLAYLABELS CREATE_OUSTRING( "DisplayLabels" ) -#define EXC_CHPROP_ERRORBARSTYLE CREATE_OUSTRING( "ErrorBarStyle" ) -#define EXC_CHPROP_ERRORBARX CREATE_OUSTRING( "ErrorBarX" ) -#define EXC_CHPROP_ERRORBARY CREATE_OUSTRING( "ErrorBarY" ) -#define EXC_CHPROP_EXPANSION CREATE_OUSTRING( "Expansion" ) -#define EXC_CHPROP_EXPTIMEINCREMENT CREATE_OUSTRING( "ExplicitTimeIncrement" ) -#define EXC_CHPROP_GAPWIDTHSEQ CREATE_OUSTRING( "GapwidthSequence" ) -#define EXC_CHPROP_GEOMETRY3D CREATE_OUSTRING( "Geometry3D" ) -#define EXC_CHPROP_INCLUDEHIDDENCELLS CREATE_OUSTRING( "IncludeHiddenCells" ) -#define EXC_CHPROP_JAPANESE CREATE_OUSTRING( "Japanese" ) -#define EXC_CHPROP_LABEL CREATE_OUSTRING( "Label" ) -#define EXC_CHPROP_LABELPLACEMENT CREATE_OUSTRING( "LabelPlacement" ) -#define EXC_CHPROP_LABELPOSITION CREATE_OUSTRING( "LabelPosition" ) -#define EXC_CHPROP_LABELSEPARATOR CREATE_OUSTRING( "LabelSeparator" ) -#define EXC_CHPROP_MAJORTICKS CREATE_OUSTRING( "MajorTickmarks" ) -#define EXC_CHPROP_MARKPOSITION CREATE_OUSTRING( "MarkPosition" ) -#define EXC_CHPROP_MINORTICKS CREATE_OUSTRING( "MinorTickmarks" ) -#define EXC_CHPROP_MISSINGVALUETREATMENT CREATE_OUSTRING( "MissingValueTreatment" ) -#define EXC_CHPROP_NEGATIVEERROR CREATE_OUSTRING( "NegativeError" ) -#define EXC_CHPROP_NUMBERFORMAT CREATE_OUSTRING( "NumberFormat" ) -#define EXC_CHPROP_OFFSET CREATE_OUSTRING( "Offset" ) -#define EXC_CHPROP_OVERLAPSEQ CREATE_OUSTRING( "OverlapSequence" ) -#define EXC_CHPROP_PERCENTAGENUMFMT CREATE_OUSTRING( "PercentageNumberFormat" ) -#define EXC_CHPROP_PERCENTDIAGONAL CREATE_OUSTRING( "PercentDiagonal" ) -#define EXC_CHPROP_PERSPECTIVE CREATE_OUSTRING( "Perspective" ) -#define EXC_CHPROP_POSITIVEERROR CREATE_OUSTRING( "PositiveError" ) -#define EXC_CHPROP_RELATIVEPOSITION CREATE_OUSTRING( "RelativePosition" ) -#define EXC_CHPROP_RELATIVESIZE CREATE_OUSTRING( "RelativeSize" ) -#define EXC_CHPROP_RIGHTANGLEDAXES CREATE_OUSTRING( "RightAngledAxes" ) -#define EXC_CHPROP_ROLE CREATE_OUSTRING( "Role" ) -#define EXC_CHPROP_ROTATIONHORIZONTAL CREATE_OUSTRING( "RotationHorizontal" ) -#define EXC_CHPROP_ROTATIONVERTICAL CREATE_OUSTRING( "RotationVertical" ) -#define EXC_CHPROP_SHOW CREATE_OUSTRING( "Show" ) -#define EXC_CHPROP_SHOWCORRELATION CREATE_OUSTRING( "ShowCorrelationCoefficient" ) -#define EXC_CHPROP_SHOWEQUATION CREATE_OUSTRING( "ShowEquation" ) -#define EXC_CHPROP_SHOWFIRST CREATE_OUSTRING( "ShowFirst" ) -#define EXC_CHPROP_SHOWHIGHLOW CREATE_OUSTRING( "ShowHighLow" ) -#define EXC_CHPROP_SHOWNEGATIVEERROR CREATE_OUSTRING( "ShowNegativeError" ) -#define EXC_CHPROP_SHOWPOSITIVEERROR CREATE_OUSTRING( "ShowPositiveError" ) -#define EXC_CHPROP_STACKCHARACTERS CREATE_OUSTRING( "StackCharacters" ) -#define EXC_CHPROP_STACKINGDIR CREATE_OUSTRING( "StackingDirection" ) -#define EXC_CHPROP_STARTINGANGLE CREATE_OUSTRING( "StartingAngle" ) -#define EXC_CHPROP_SWAPXANDYAXIS CREATE_OUSTRING( "SwapXAndYAxis" ) -#define EXC_CHPROP_SYMBOL CREATE_OUSTRING( "Symbol" ) -#define EXC_CHPROP_TEXTBREAK CREATE_OUSTRING( "TextBreak" ) -#define EXC_CHPROP_TEXTOVERLAP CREATE_OUSTRING( "TextOverlap" ) -#define EXC_CHPROP_TEXTROTATION CREATE_OUSTRING( "TextRotation" ) -#define EXC_CHPROP_USERINGS CREATE_OUSTRING( "UseRings" ) -#define EXC_CHPROP_VARYCOLORSBY CREATE_OUSTRING( "VaryColorsByPoint" ) -#define EXC_CHPROP_WEIGHT CREATE_OUSTRING( "Weight" ) -#define EXC_CHPROP_WHITEDAY CREATE_OUSTRING( "WhiteDay" ) +#define EXC_CHPROP_ADDITIONALSHAPES "AdditionalShapes" +#define EXC_CHPROP_ANCHORPOSITION "AnchorPosition" +#define EXC_CHPROP_ARRANGEORDER "ArrangeOrder" +#define EXC_CHPROP_ATTAXISINDEX "AttachedAxisIndex" +#define EXC_CHPROP_ATTRIBDATAPOINTS "AttributedDataPoints" +#define EXC_CHPROP_BLACKDAY "BlackDay" +#define EXC_CHPROP_COLOR "Color" +#define EXC_CHPROP_CONNECTBARS "ConnectBars" +#define EXC_CHPROP_CROSSOVERPOSITION "CrossoverPosition" +#define EXC_CHPROP_CROSSOVERVALUE "CrossoverValue" +#define EXC_CHPROP_CURVESTYLE "CurveStyle" +#define EXC_CHPROP_D3DSCENEAMBIENTCOLOR "D3DSceneAmbientColor" +#define EXC_CHPROP_D3DSCENELIGHTON1 "D3DSceneLightOn1" +#define EXC_CHPROP_D3DSCENELIGHTCOLOR2 "D3DSceneLightColor2" +#define EXC_CHPROP_D3DSCENELIGHTDIR2 "D3DSceneLightDirection2" +#define EXC_CHPROP_D3DSCENELIGHTON2 "D3DSceneLightOn2" +#define EXC_CHPROP_D3DSCENEPERSPECTIVE "D3DScenePerspective" +#define EXC_CHPROP_D3DSCENESHADEMODE "D3DSceneShadeMode" +#define EXC_CHPROP_DISPLAYLABELS "DisplayLabels" +#define EXC_CHPROP_ERRORBARSTYLE "ErrorBarStyle" +#define EXC_CHPROP_ERRORBARX "ErrorBarX" +#define EXC_CHPROP_ERRORBARY "ErrorBarY" +#define EXC_CHPROP_EXPANSION "Expansion" +#define EXC_CHPROP_EXPTIMEINCREMENT "ExplicitTimeIncrement" +#define EXC_CHPROP_GAPWIDTHSEQ "GapwidthSequence" +#define EXC_CHPROP_GEOMETRY3D "Geometry3D" +#define EXC_CHPROP_INCLUDEHIDDENCELLS "IncludeHiddenCells" +#define EXC_CHPROP_JAPANESE "Japanese" +#define EXC_CHPROP_LABEL "Label" +#define EXC_CHPROP_LABELPLACEMENT "LabelPlacement" +#define EXC_CHPROP_LABELPOSITION "LabelPosition" +#define EXC_CHPROP_LABELSEPARATOR "LabelSeparator" +#define EXC_CHPROP_MAJORTICKS "MajorTickmarks" +#define EXC_CHPROP_MARKPOSITION "MarkPosition" +#define EXC_CHPROP_MINORTICKS "MinorTickmarks" +#define EXC_CHPROP_MISSINGVALUETREATMENT "MissingValueTreatment" +#define EXC_CHPROP_NEGATIVEERROR "NegativeError" +#define EXC_CHPROP_NUMBERFORMAT "NumberFormat" +#define EXC_CHPROP_OFFSET "Offset" +#define EXC_CHPROP_OVERLAPSEQ "OverlapSequence" +#define EXC_CHPROP_PERCENTAGENUMFMT "PercentageNumberFormat" +#define EXC_CHPROP_PERCENTDIAGONAL "PercentDiagonal" +#define EXC_CHPROP_PERSPECTIVE "Perspective" +#define EXC_CHPROP_POSITIVEERROR "PositiveError" +#define EXC_CHPROP_RELATIVEPOSITION "RelativePosition" +#define EXC_CHPROP_RELATIVESIZE "RelativeSize" +#define EXC_CHPROP_RIGHTANGLEDAXES "RightAngledAxes" +#define EXC_CHPROP_ROLE "Role" +#define EXC_CHPROP_ROTATIONHORIZONTAL "RotationHorizontal" +#define EXC_CHPROP_ROTATIONVERTICAL "RotationVertical" +#define EXC_CHPROP_SHOW "Show" +#define EXC_CHPROP_SHOWCORRELATION "ShowCorrelationCoefficient" +#define EXC_CHPROP_SHOWEQUATION "ShowEquation" +#define EXC_CHPROP_SHOWFIRST "ShowFirst" +#define EXC_CHPROP_SHOWHIGHLOW "ShowHighLow" +#define EXC_CHPROP_SHOWNEGATIVEERROR "ShowNegativeError" +#define EXC_CHPROP_SHOWPOSITIVEERROR "ShowPositiveError" +#define EXC_CHPROP_STACKCHARACTERS "StackCharacters" +#define EXC_CHPROP_STACKINGDIR "StackingDirection" +#define EXC_CHPROP_STARTINGANGLE "StartingAngle" +#define EXC_CHPROP_SWAPXANDYAXIS "SwapXAndYAxis" +#define EXC_CHPROP_SYMBOL "Symbol" +#define EXC_CHPROP_TEXTBREAK "TextBreak" +#define EXC_CHPROP_TEXTOVERLAP "TextOverlap" +#define EXC_CHPROP_TEXTROTATION "TextRotation" +#define EXC_CHPROP_USERINGS "UseRings" +#define EXC_CHPROP_VARYCOLORSBY "VaryColorsByPoint" +#define EXC_CHPROP_WEIGHT "Weight" +#define EXC_CHPROP_WHITEDAY "WhiteDay" // data series roles -#define EXC_CHPROP_ROLE_CATEG CREATE_OUSTRING( "categories" ) -#define EXC_CHPROP_ROLE_ERRORBARS_NEGX CREATE_OUSTRING( "error-bars-x-negative" ) -#define EXC_CHPROP_ROLE_ERRORBARS_NEGY CREATE_OUSTRING( "error-bars-y-negative" ) -#define EXC_CHPROP_ROLE_ERRORBARS_POSX CREATE_OUSTRING( "error-bars-x-positive" ) -#define EXC_CHPROP_ROLE_ERRORBARS_POSY CREATE_OUSTRING( "error-bars-y-positive" ) -#define EXC_CHPROP_ROLE_LABEL CREATE_OUSTRING( "label" ) -#define EXC_CHPROP_ROLE_XVALUES CREATE_OUSTRING( "values-x" ) -#define EXC_CHPROP_ROLE_YVALUES CREATE_OUSTRING( "values-y" ) -#define EXC_CHPROP_ROLE_OPENVALUES CREATE_OUSTRING( "values-first" ) -#define EXC_CHPROP_ROLE_CLOSEVALUES CREATE_OUSTRING( "values-last" ) -#define EXC_CHPROP_ROLE_LOWVALUES CREATE_OUSTRING( "values-min" ) -#define EXC_CHPROP_ROLE_HIGHVALUES CREATE_OUSTRING( "values-max" ) -#define EXC_CHPROP_ROLE_SIZEVALUES CREATE_OUSTRING( "values-size" ) +#define EXC_CHPROP_ROLE_CATEG "categories" +#define EXC_CHPROP_ROLE_ERRORBARS_NEGX "error-bars-x-negative" +#define EXC_CHPROP_ROLE_ERRORBARS_NEGY "error-bars-y-negative" +#define EXC_CHPROP_ROLE_ERRORBARS_POSX "error-bars-x-positive" +#define EXC_CHPROP_ROLE_ERRORBARS_POSY "error-bars-y-positive" +#define EXC_CHPROP_ROLE_LABEL "label" +#define EXC_CHPROP_ROLE_XVALUES "values-x" +#define EXC_CHPROP_ROLE_YVALUES "values-y" +#define EXC_CHPROP_ROLE_OPENVALUES "values-first" +#define EXC_CHPROP_ROLE_CLOSEVALUES "values-last" +#define EXC_CHPROP_ROLE_LOWVALUES "values-min" +#define EXC_CHPROP_ROLE_HIGHVALUES "values-max" +#define EXC_CHPROP_ROLE_SIZEVALUES "values-size" // Constants and Enumerations ================================================= diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx index 254b0d6d7beb..75fc18aa62fc 100644 --- a/sc/source/filter/oox/condformatbuffer.cxx +++ b/sc/source/filter/oox/condformatbuffer.cxx @@ -643,86 +643,86 @@ void CondFormatRule::finalizeImport() break; case XML_duplicateValues: eOperator = CondFormatBuffer::convertToApiOperator( XML_duplicateValues ); - aReplaceFormula = CREATE_OUSTRING( " " ); + aReplaceFormula = " "; break; case XML_expression: eOperator = ::com::sun::star::sheet::ConditionOperator2::FORMULA; break; case XML_containsText: OSL_ENSURE( maModel.mnOperator == XML_containsText, "CondFormatRule::finalizeImport - unexpected operator" ); - aReplaceFormula = CREATE_OUSTRING( "NOT(ISERROR(SEARCH(#T,#B)))" ); + aReplaceFormula = "NOT(ISERROR(SEARCH(#T,#B)))"; break; case XML_notContainsText: // note: type XML_notContainsText vs. operator XML_notContains OSL_ENSURE( maModel.mnOperator == XML_notContains, "CondFormatRule::finalizeImport - unexpected operator" ); - aReplaceFormula = CREATE_OUSTRING( "ISERROR(SEARCH(#T,#B))" ); + aReplaceFormula = "ISERROR(SEARCH(#T,#B))"; break; case XML_beginsWith: OSL_ENSURE( maModel.mnOperator == XML_beginsWith, "CondFormatRule::finalizeImport - unexpected operator" ); - aReplaceFormula = CREATE_OUSTRING( "LEFT(#B,#L)=#T" ); + aReplaceFormula = "LEFT(#B,#L)=#T"; break; case XML_endsWith: OSL_ENSURE( maModel.mnOperator == XML_endsWith, "CondFormatRule::finalizeImport - unexpected operator" ); - aReplaceFormula = CREATE_OUSTRING( "RIGHT(#B,#L)=#T" ); + aReplaceFormula = "RIGHT(#B,#L)=#T"; break; case XML_timePeriod: switch( maModel.mnTimePeriod ) { case XML_yesterday: - aReplaceFormula = CREATE_OUSTRING( "FLOOR(#B,1)=TODAY()-1" ); + aReplaceFormula = "FLOOR(#B,1)=TODAY()-1"; break; case XML_today: - aReplaceFormula = CREATE_OUSTRING( "FLOOR(#B,1)=TODAY()" ); + aReplaceFormula = "FLOOR(#B,1)=TODAY()"; break; case XML_tomorrow: - aReplaceFormula = CREATE_OUSTRING( "FLOOR(#B,1)=TODAY()+1" ); + aReplaceFormula = "FLOOR(#B,1)=TODAY()+1"; break; case XML_last7Days: - aReplaceFormula = CREATE_OUSTRING( "AND(TODAY()-70" ); + aReplaceFormula = "LEN(TRIM(#B))>0"; break; case XML_containsErrors: - aReplaceFormula = CREATE_OUSTRING( "ISERROR(#B)" ); + aReplaceFormula = "ISERROR(#B)"; break; case XML_notContainsErrors: - aReplaceFormula = CREATE_OUSTRING( "NOT(ISERROR(#B))" ); + aReplaceFormula = "NOT(ISERROR(#B))"; break; case XML_top10: if( maModel.mbPercent ) - aReplaceFormula = CREATE_OUSTRING( "RANK(#B,#R,#M)/COUNT(#R)<=#K%" ); + aReplaceFormula = "RANK(#B,#R,#M)/COUNT(#R)<=#K%"; else - aReplaceFormula = CREATE_OUSTRING( "RANK(#B,#R,#M)<=#K" ); + aReplaceFormula = "RANK(#B,#R,#M)<=#K"; break; case XML_aboveAverage: if( maModel.mnStdDev == 0 ) - aReplaceFormula = CREATE_OUSTRING( "#B#CAVERAGE(#R)" ); + aReplaceFormula = "#B#CAVERAGE(#R)"; break; case XML_colorScale: break; @@ -767,8 +767,8 @@ void CondFormatRule::finalizeImport() case 'C': // average comparison operator if( aComp.isEmpty() ) aComp = maModel.mbAboveAverage ? - (maModel.mbEqualAverage ? CREATE_OUSTRING( ">=" ) : CREATE_OUSTRING( ">" )) : - (maModel.mbEqualAverage ? CREATE_OUSTRING( "<=" ) : CREATE_OUSTRING( "<" )); + (maModel.mbEqualAverage ? OUString( ">=" ) : OUString( ">" ) ) : + (maModel.mbEqualAverage ? OUString( "<=" ) : OUString( "<" ) ); aReplaceFormula = aReplaceFormula.replaceAt( nStrPos, 2, aComp ); break; default: diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx index 73e6b47eb7c1..afc0ca1ddad4 100644 --- a/sc/source/filter/oox/drawingfragment.cxx +++ b/sc/source/filter/oox/drawingfragment.cxx @@ -86,11 +86,11 @@ void ShapeMacroAttacher::attachMacro( const OUString& rMacroUrl ) Reference< XEventsSupplier > xSupplier( mxShape, UNO_QUERY_THROW ); Reference< XNameReplace > xEvents( xSupplier->getEvents(), UNO_SET_THROW ); Sequence< PropertyValue > aEventProps( 2 ); - aEventProps[ 0 ].Name = CREATE_OUSTRING( "EventType" ); - aEventProps[ 0 ].Value <<= CREATE_OUSTRING( "Script" ); - aEventProps[ 1 ].Name = CREATE_OUSTRING( "Script" ); + aEventProps[ 0 ].Name = "EventType"; + aEventProps[ 0 ].Value <<= OUString( "Script" ); + aEventProps[ 1 ].Name = "Script"; aEventProps[ 1 ].Value <<= rMacroUrl; - xEvents->replaceByName( CREATE_OUSTRING( "OnClick" ), Any( aEventProps ) ); + xEvents->replaceByName( "OnClick", Any( aEventProps ) ); } catch( Exception& ) { @@ -340,7 +340,7 @@ VmlControlMacroAttacher::VmlControlMacroAttacher( const OUString& rMacroName, void VmlControlMacroAttacher::attachMacro( const OUString& rMacroUrl ) { ScriptEventDescriptor aEventDesc; - aEventDesc.ScriptType = CREATE_OUSTRING( "Script" ); + aEventDesc.ScriptType = "Script"; aEventDesc.ScriptCode = rMacroUrl; // editable drop downs are treated like edit boxes @@ -352,28 +352,28 @@ void VmlControlMacroAttacher::attachMacro( const OUString& rMacroUrl ) case XML_Button: case XML_Checkbox: case XML_Radio: - aEventDesc.ListenerType = CREATE_OUSTRING( "XActionListener" ); - aEventDesc.EventMethod = CREATE_OUSTRING( "actionPerformed" ); + aEventDesc.ListenerType = "XActionListener"; + aEventDesc.EventMethod = "actionPerformed"; break; case XML_Label: case XML_GBox: case XML_Dialog: - aEventDesc.ListenerType = CREATE_OUSTRING( "XMouseListener" ); - aEventDesc.EventMethod = CREATE_OUSTRING( "mouseReleased" ); + aEventDesc.ListenerType = "XMouseListener"; + aEventDesc.EventMethod = "mouseReleased"; break; case XML_Edit: - aEventDesc.ListenerType = CREATE_OUSTRING( "XTextListener" ); - aEventDesc.EventMethod = CREATE_OUSTRING( "textChanged" ); + aEventDesc.ListenerType = "XTextListener"; + aEventDesc.EventMethod = "textChanged"; break; case XML_Spin: case XML_Scroll: - aEventDesc.ListenerType = CREATE_OUSTRING( "XAdjustmentListener" ); - aEventDesc.EventMethod = CREATE_OUSTRING( "adjustmentValueChanged" ); + aEventDesc.ListenerType = "XAdjustmentListener"; + aEventDesc.EventMethod = "adjustmentValueChanged"; break; case XML_List: case XML_Drop: - aEventDesc.ListenerType = CREATE_OUSTRING( "XChangeListener" ); - aEventDesc.EventMethod = CREATE_OUSTRING( "changed" ); + aEventDesc.ListenerType = "XChangeListener"; + aEventDesc.EventMethod = "changed"; break; default: OSL_ENSURE( false, "VmlControlMacroAttacher::attachMacro - unexpected object type" ); @@ -398,8 +398,8 @@ VmlDrawing::VmlDrawing( const WorksheetHelper& rHelper ) : maControlConv( rHelper.getBaseFilter().getModel(), rHelper.getBaseFilter().getGraphicHelper() ) { // default font for legacy listboxes and dropdowns: Tahoma, 8pt - maListBoxFont.moName = CREATE_OUSTRING( "Tahoma" ); - maListBoxFont.moColor = CREATE_OUSTRING( "auto" ); + maListBoxFont.moName = "Tahoma"; + maListBoxFont.moColor = "auto"; maListBoxFont.monSize = 160; } @@ -420,19 +420,19 @@ OUString VmlDrawing::getShapeBaseName( const ::oox::vml::ShapeBase& rShape ) con { switch( pClientData->mnObjType ) { - case XML_Button: return CREATE_OUSTRING( "Button" ); - case XML_Checkbox: return CREATE_OUSTRING( "Check Box" ); - case XML_Dialog: return CREATE_OUSTRING( "Dialog Frame" ); - case XML_Drop: return CREATE_OUSTRING( "Drop Down" ); - case XML_Edit: return CREATE_OUSTRING( "Edit Box" ); - case XML_GBox: return CREATE_OUSTRING( "Group Box" ); - case XML_Label: return CREATE_OUSTRING( "Label" ); - case XML_List: return CREATE_OUSTRING( "List Box" ); - case XML_Note: return CREATE_OUSTRING( "Comment" ); - case XML_Pict: return (pClientData->mbDde || getOleObjectInfo( rShape.getShapeId() )) ? CREATE_OUSTRING( "Object" ) : CREATE_OUSTRING( "Picture" ); - case XML_Radio: return CREATE_OUSTRING( "Option Button" ); - case XML_Scroll: return CREATE_OUSTRING( "Scroll Bar" ); - case XML_Spin: return CREATE_OUSTRING( "Spinner" ); + case XML_Button: return OUString( "Button" ); + case XML_Checkbox: return OUString( "Check Box" ); + case XML_Dialog: return OUString( "Dialog Frame" ); + case XML_Drop: return OUString( "Drop Down" ); + case XML_Edit: return OUString( "Edit Box" ); + case XML_GBox: return OUString( "Group Box" ); + case XML_Label: return OUString( "Label" ); + case XML_List: return OUString( "List Box" ); + case XML_Note: return OUString( "Comment" ); + case XML_Pict: return (pClientData->mbDde || getOleObjectInfo( rShape.getShapeId() )) ? OUString( "Object" ) : OUString( "Picture" ); + case XML_Radio: return OUString( "Option Button" ); + case XML_Scroll: return OUString( "Scroll Bar" ); + case XML_Spin: return OUString( "Spinner" ); } } return ::oox::vml::Drawing::getShapeBaseName( rShape ); diff --git a/sc/source/filter/oox/excelchartconverter.cxx b/sc/source/filter/oox/excelchartconverter.cxx index a6303b0362ea..69b317227415 100644 --- a/sc/source/filter/oox/excelchartconverter.cxx +++ b/sc/source/filter/oox/excelchartconverter.cxx @@ -69,7 +69,7 @@ void ExcelChartConverter::createDataProvider( const Reference< XChartDocument >& { Reference< XDataReceiver > xDataRec( rxChartDoc, UNO_QUERY_THROW ); Reference< XDataProvider > xDataProv( getBaseFilter().getModelFactory()->createInstance( - CREATE_OUSTRING( "com.sun.star.chart2.data.DataProvider" ) ), UNO_QUERY_THROW ); + "com.sun.star.chart2.data.DataProvider" ), UNO_QUERY_THROW ); xDataRec->attachDataProvider( xDataProv ); } catch( Exception& ) diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx index 84f933135b99..8320780867ec 100644 --- a/sc/source/filter/oox/excelfilter.cxx +++ b/sc/source/filter/oox/excelfilter.cxx @@ -83,14 +83,14 @@ void ExcelFilterBase::unregisterWorkbookGlobals() OUString SAL_CALL ExcelFilter_getImplementationName() throw() { - return CREATE_OUSTRING( "com.sun.star.comp.oox.xls.ExcelFilter" ); + return OUString( "com.sun.star.comp.oox.xls.ExcelFilter" ); } Sequence< OUString > SAL_CALL ExcelFilter_getSupportedServiceNames() throw() { Sequence< OUString > aSeq( 2 ); - aSeq[ 0 ] = CREATE_OUSTRING( "com.sun.star.document.ImportFilter" ); - aSeq[ 1 ] = CREATE_OUSTRING( "com.sun.star.document.ExportFilter" ); + aSeq[ 0 ] = "com.sun.star.document.ImportFilter"; + aSeq[ 1 ] = "com.sun.star.document.ExportFilter"; return aSeq; } @@ -178,7 +178,7 @@ sal_Bool SAL_CALL ExcelFilter::filter( const ::com::sun::star::uno::Sequence< :: if ( isExportFilter() ) { - Reference< XExporter > xExporter( getServiceFactory()->createInstance( CREATE_OUSTRING( "com.sun.star.comp.oox.ExcelFilterExport" ) ), UNO_QUERY ); + Reference< XExporter > xExporter( getServiceFactory()->createInstance( "com.sun.star.comp.oox.ExcelFilterExport" ), UNO_QUERY ); if ( xExporter.is() ) { diff --git a/sc/source/filter/oox/excelvbaproject.cxx b/sc/source/filter/oox/excelvbaproject.cxx index ceb73ecf68f3..f91ae116b781 100644 --- a/sc/source/filter/oox/excelvbaproject.cxx +++ b/sc/source/filter/oox/excelvbaproject.cxx @@ -60,7 +60,7 @@ using ::rtl::OUStringBuffer; // ============================================================================ ExcelVbaProject::ExcelVbaProject( const Reference< XComponentContext >& rxContext, const Reference< XSpreadsheetDocument >& rxDocument ) : - ::oox::ole::VbaProject( rxContext, Reference< XModel >( rxDocument, UNO_QUERY ), CREATE_OUSTRING( "Calc" ) ), + ::oox::ole::VbaProject( rxContext, Reference< XModel >( rxDocument, UNO_QUERY ), "Calc" ), mxDocument( rxDocument ) { } @@ -111,7 +111,7 @@ void ExcelVbaProject::prepareImport() else { // TODO: once we have chart sheets we need a switch/case on sheet type ('SheetNNN' vs. 'ChartNNN') - aCodeNameInfos.push_back( SheetCodeNameInfo( aSheetProp, CREATE_OUSTRING( "Sheet" ) ) ); + aCodeNameInfos.push_back( SheetCodeNameInfo( aSheetProp, "Sheet" ) ); } } catch( Exception& ) diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx index b80dbfaaf7b2..db0c40300532 100644 --- a/sc/source/filter/oox/formulabase.cxx +++ b/sc/source/filter/oox/formulabase.cxx @@ -894,12 +894,12 @@ void FunctionProviderImpl::initFunc( const FunctionData& rFuncData, sal_uInt8 nM { OSL_ENSURE( !xFuncInfo->maOoxFuncName.isEmpty(), "FunctionProviderImpl::initFunc - missing OOXML function name" ); OSL_ENSURE( !getFlag( rFuncData.mnFlags, FUNCFLAG_MACROCALLODF ), "FunctionProviderImpl::initFunc - unexpected flag FUNCFLAG_MACROCALLODF" ); - xFuncInfo->maBiffMacroName = CREATE_OUSTRING( "_xlfn." ) + xFuncInfo->maOoxFuncName; + xFuncInfo->maBiffMacroName = "_xlfn." + xFuncInfo->maOoxFuncName; } else if( getFlag( rFuncData.mnFlags, FUNCFLAG_MACROCALLODF ) ) { OSL_ENSURE( !xFuncInfo->maOdfFuncName.isEmpty(), "FunctionProviderImpl::initFunc - missing ODF function name" ); - xFuncInfo->maBiffMacroName = CREATE_OUSTRING( "_xlfnodf." ) + xFuncInfo->maOdfFuncName; + xFuncInfo->maBiffMacroName = "_xlfnodf." + xFuncInfo->maOdfFuncName; } xFuncInfo->meFuncLibType = FUNCFLAGS_TO_FUNCLIB( rFuncData.mnFlags ); @@ -1030,7 +1030,7 @@ OpCodeProviderImpl::OpCodeProviderImpl( const FunctionInfoVector& rFuncInfos, if( rxModelFactory.is() ) try { Reference< XFormulaOpCodeMapper > xMapper( rxModelFactory->createInstance( - CREATE_OUSTRING( "com.sun.star.sheet.FormulaOpCodeMapper" ) ), UNO_QUERY_THROW ); + "com.sun.star.sheet.FormulaOpCodeMapper" ), UNO_QUERY_THROW ); // op-codes provided as attributes OPCODE_UNKNOWN = xMapper->getOpCodeUnknown(); @@ -1316,7 +1316,7 @@ ApiParserWrapper::ApiParserWrapper( { if( rxModelFactory.is() ) try { - mxParser.set( rxModelFactory->createInstance( CREATE_OUSTRING( "com.sun.star.sheet.FormulaParser" ) ), UNO_QUERY_THROW ); + mxParser.set( rxModelFactory->createInstance( "com.sun.star.sheet.FormulaParser" ), UNO_QUERY_THROW ); } catch( Exception& ) { @@ -1477,7 +1477,7 @@ OUString FormulaProcessorBase::generateApiString( const OUString& rString ) OUString aRetString = rString; sal_Int32 nQuotePos = aRetString.getLength(); while( (nQuotePos = aRetString.lastIndexOf( '"', nQuotePos )) >= 0 ) - aRetString = aRetString.replaceAt( nQuotePos, 1, CREATE_OUSTRING( "\"\"" ) ); + aRetString = aRetString.replaceAt( nQuotePos, 1, OUString( "\"\"" ) ); return OUStringBuffer().append( sal_Unicode( '"' ) ).append( aRetString ).append( sal_Unicode( '"' ) ).makeStringAndClear(); } diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx index 72bc935fb223..dc7162f50f41 100644 --- a/sc/source/filter/oox/numberformatsbuffer.cxx +++ b/sc/source/filter/oox/numberformatsbuffer.cxx @@ -1857,7 +1857,7 @@ sal_Int32 lclCreateFormat( const Reference< XNumberFormats >& rxNumFmts, catch( Exception& ) { // BIFF2-BIFF4 stores standard format explicitly in stream - static const OUString saGeneral = CREATE_OUSTRING( "general" ); + static const OUString saGeneral = "general"; if( rFmtCode.equalsIgnoreAsciiCase( saGeneral ) ) { nIndex = lclCreatePredefinedFormat( rxNumFmts, 0, rToLocale ); @@ -1891,7 +1891,7 @@ private: }; NumberFormatFinalizer::NumberFormatFinalizer( const WorkbookHelper& rHelper ) : - maEnUsLocale( CREATE_OUSTRING( "en" ), CREATE_OUSTRING( "US" ), OUString() ) + maEnUsLocale( "en", "US", OUString() ) { try { @@ -2046,7 +2046,7 @@ void NumberFormatsBuffer::insertBuiltinFormats() append( "' not supported (#i29949#)" ).getStr() ); // start with default table, if no table has been found if( aMIt == aMEnd ) - aMIt = aBuiltinMap.find( CREATE_OUSTRING( "*" ) ); + aMIt = aBuiltinMap.find( "*" ); OSL_ENSURE( aMIt != aMEnd, "NumberFormatsBuffer::insertBuiltinFormats - default map not found" ); // insert all tables into the vector for( ; aMIt != aMEnd; aMIt = aBuiltinMap.find( OUString::createFromAscii( aMIt->second->mpcParent ) ) ) diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx index 122120d4fd83..5a8a09a64266 100644 --- a/sc/source/filter/oox/pagesettings.cxx +++ b/sc/source/filter/oox/pagesettings.cxx @@ -335,7 +335,7 @@ void PageSettings::setFitToPagesMode( bool bFitToPages ) void PageSettings::finalizeImport() { - OUStringBuffer aStyleNameBuffer( CREATE_OUSTRING( "PageStyle_" ) ); + OUStringBuffer aStyleNameBuffer( "PageStyle_" ); Reference< XNamed > xSheetName( getSheet(), UNO_QUERY ); if( xSheetName.is() ) aStyleNameBuffer.append( xSheetName->getName() ); @@ -499,11 +499,11 @@ static const sal_Char* const sppcItalicNames[] = HeaderFooterParser::HeaderFooterParser( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), - maPageNumberService( CREATE_OUSTRING( "com.sun.star.text.TextField.PageNumber" ) ), - maPageCountService( CREATE_OUSTRING( "com.sun.star.text.TextField.PageCount" ) ), - maSheetNameService( CREATE_OUSTRING( "com.sun.star.text.TextField.SheetName" ) ), - maFileNameService( CREATE_OUSTRING( "com.sun.star.text.TextField.FileName" ) ), - maDateTimeService( CREATE_OUSTRING( "com.sun.star.text.TextField.DateTime" ) ), + maPageNumberService( "com.sun.star.text.TextField.PageNumber" ), + maPageCountService( "com.sun.star.text.TextField.PageCount" ), + maSheetNameService( "com.sun.star.text.TextField.SheetName" ), + maFileNameService( "com.sun.star.text.TextField.FileName" ), + maDateTimeService( "com.sun.star.text.TextField.DateTime" ), maBoldNames( sppcBoldNames, STATIC_ARRAY_END( sppcBoldNames ) ), maItalicNames( sppcItalicNames, STATIC_ARRAY_END( sppcItalicNames ) ), maPortions( static_cast< size_t >( HF_COUNT ) ), diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx index 650c2a18c15c..6a79caf1f1c6 100644 --- a/sc/source/filter/oox/pivotcachebuffer.cxx +++ b/sc/source/filter/oox/pivotcachebuffer.cxx @@ -1182,7 +1182,7 @@ void PivotCache::importPCDSheetSource( SequenceInputStream& rStrm, const Relatio { rStrm >> maSheetSrcModel.maDefName; if( nIsBuiltinName != 0 ) - maSheetSrcModel.maDefName = CREATE_OUSTRING( "_xlnm." ) + maSheetSrcModel.maDefName; + maSheetSrcModel.maDefName = "_xlnm." + maSheetSrcModel.maDefName; } // resolve URL of external document @@ -1397,7 +1397,7 @@ void PivotCache::prepareSourceDataSheet() if( getAddressConverter().checkCellRange( rRange, false, true ) ) { maColSpans.insert( ValueRange( rRange.StartColumn, rRange.EndColumn ) ); - OUString aSheetName = CREATE_OUSTRING( "DPCache_" ) + maSheetSrcModel.maSheet; + OUString aSheetName = "DPCache_" + maSheetSrcModel.maSheet; rRange.Sheet = getWorksheets().insertEmptySheet( aSheetName, false ); mbValidSource = mbDummySheet = rRange.Sheet >= 0; } diff --git a/sc/source/filter/oox/querytablebuffer.cxx b/sc/source/filter/oox/querytablebuffer.cxx index 697ccc889cc3..c303dfedc058 100644 --- a/sc/source/filter/oox/querytablebuffer.cxx +++ b/sc/source/filter/oox/querytablebuffer.cxx @@ -123,7 +123,7 @@ void lclAppendWebQueryTableIndex( OUStringBuffer& rTables, sal_Int32 nTableIndex OUString lclBuildWebQueryTables( const WebPrModel::TablesVector& rTables ) { if( rTables.empty() ) - return CREATE_OUSTRING( "HTML_tables" ); + return OUString( "HTML_tables" ); OUStringBuffer aTables; for( WebPrModel::TablesVector::const_iterator aIt = rTables.begin(), aEnd = rTables.end(); aIt != aEnd; ++aIt ) @@ -276,12 +276,12 @@ void QueryTable::finalizeImport() { CellAddress aDestPos( aDestRange.Sheet, aDestRange.StartColumn, aDestRange.StartRow ); // find tables mode: entire document, all tables, or specific tables - OUString aTables = pWebPr->mbHtmlTables ? lclBuildWebQueryTables( pWebPr->maTables ) : CREATE_OUSTRING( "HTML_all" ); + OUString aTables = pWebPr->mbHtmlTables ? lclBuildWebQueryTables( pWebPr->maTables ) : "HTML_all"; if( !aTables.isEmpty() ) try { PropertySet aDocProps( getDocument() ); Reference< XAreaLinks > xAreaLinks( aDocProps.getAnyProperty( PROP_AreaLinks ), UNO_QUERY_THROW ); - OUString aFilterName = CREATE_OUSTRING( "calc_HTML_WebQuery" ); + OUString aFilterName = "calc_HTML_WebQuery"; OUString aFilterOptions; xAreaLinks->insertAtPosition( aDestPos, aFileUrl, aTables, aFilterName, aFilterOptions ); // set refresh interval (convert minutes to seconds) diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index f9b9779d32ff..fbb63b076399 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -676,7 +676,7 @@ ApiScriptFontName::ApiScriptFontName() : ApiFontData::ApiFontData() : maDesc( - CREATE_OUSTRING( "Calibri" ), + "Calibri", 220, // height 11 points 0, OUString(), @@ -2849,9 +2849,9 @@ void CellStyleBuffer::finalizeImport() if (mxDefStyle) { Reference xNA(getStyleFamily(false), UNO_QUERY_THROW); - if (xNA->hasByName(CREATE_OUSTRING("Default"))) + if (xNA->hasByName("Default")) { - PropertySet aPropSet(xNA->getByName(CREATE_OUSTRING("Default"))); + PropertySet aPropSet(xNA->getByName("Default")); getStyles().writeStyleXfToPropertySet(aPropSet, mxDefStyle->getModel().mnXfId); } } @@ -3172,7 +3172,7 @@ OUString StylesBuffer::createDxfStyle( sal_Int32 nDxfId ) const { if( Dxf* pDxf = maDxfs.get( nDxfId ).get() ) { - rStyleName = OUStringBuffer( CREATE_OUSTRING( "ConditionalStyle_" ) ).append( nDxfId + 1 ).makeStringAndClear(); + rStyleName = OUStringBuffer( "ConditionalStyle_" ).append( nDxfId + 1 ).makeStringAndClear(); // create the style sheet (this may change rStyleName if such a style already exists) Reference< XStyle > xStyle = createStyleObject( rStyleName, false ); // write style formatting properties diff --git a/sc/source/filter/oox/themebuffer.cxx b/sc/source/filter/oox/themebuffer.cxx index 2d3682e4c1a5..d7b7edde6015 100644 --- a/sc/source/filter/oox/themebuffer.cxx +++ b/sc/source/filter/oox/themebuffer.cxx @@ -96,12 +96,12 @@ ThemeBuffer::ThemeBuffer( const WorkbookHelper& rHelper ) : { case FILTER_OOXML: //! TODO: locale dependent font name - mxDefFontModel->maName = CREATE_OUSTRING( "Cambria" ); + mxDefFontModel->maName = "Cambria"; mxDefFontModel->mfHeight = 11.0; break; case FILTER_BIFF: //! TODO: BIFF dependent font name - mxDefFontModel->maName = CREATE_OUSTRING( "Arial" ); + mxDefFontModel->maName = "Arial"; mxDefFontModel->mfHeight = 10.0; break; case FILTER_UNKNOWN: break; diff --git a/sc/source/filter/oox/unitconverter.cxx b/sc/source/filter/oox/unitconverter.cxx index 2d0431b21be1..5b0c52829d5f 100644 --- a/sc/source/filter/oox/unitconverter.cxx +++ b/sc/source/filter/oox/unitconverter.cxx @@ -124,13 +124,13 @@ UnitConverter::UnitConverter( const WorkbookHelper& rHelper ) : maCoeffs[ UNIT_SPACE ] = 100.0; // default 1 space = 1 mm // error code maps - addErrorCode( BIFF_ERR_NULL, CREATE_OUSTRING( "#NULL!" ) ); - addErrorCode( BIFF_ERR_DIV0, CREATE_OUSTRING( "#DIV/0!" ) ); - addErrorCode( BIFF_ERR_VALUE, CREATE_OUSTRING( "#VALUE!" ) ); - addErrorCode( BIFF_ERR_REF, CREATE_OUSTRING( "#REF!" ) ); - addErrorCode( BIFF_ERR_NAME, CREATE_OUSTRING( "#NAME?" ) ); - addErrorCode( BIFF_ERR_NUM, CREATE_OUSTRING( "#NUM!" ) ); - addErrorCode( BIFF_ERR_NA, CREATE_OUSTRING( "#NA" ) ); + addErrorCode( BIFF_ERR_NULL, "#NULL!" ); + addErrorCode( BIFF_ERR_DIV0, "#DIV/0!" ); + addErrorCode( BIFF_ERR_VALUE, "#VALUE!" ); + addErrorCode( BIFF_ERR_REF, "#REF!" ); + addErrorCode( BIFF_ERR_NAME, "#NAME?" ); + addErrorCode( BIFF_ERR_NUM, "#NUM!" ); + addErrorCode( BIFF_ERR_NA, "#NA" ); } void UnitConverter::finalizeImport() diff --git a/sc/source/filter/oox/viewsettings.cxx b/sc/source/filter/oox/viewsettings.cxx index 3503011df51c..16353bbefcf4 100644 --- a/sc/source/filter/oox/viewsettings.cxx +++ b/sc/source/filter/oox/viewsettings.cxx @@ -652,7 +652,7 @@ void ViewSettings::finalizeImport() aWinExtent[ 1 ] = aPos.Y; aWinExtent[ 2 ] = aPos.X + aSize.Width; aWinExtent[ 3 ] = aPos.Y + aSize.Height; - getBaseFilter().getMediaDescriptor()[ CREATE_OUSTRING( "WinExtent" ) ] <<= aWinExtent; + getBaseFilter().getMediaDescriptor()[ "WinExtent" ] <<= aWinExtent; } } } diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index d0394987e561..b9dabe67289f 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -511,10 +511,10 @@ Reference< XStyle > WorkbookGlobals::createStyleObject( OUString& orStyleName, b void WorkbookGlobals::initialize( bool bWorkbookFile ) { - maCellStyles = CREATE_OUSTRING( "CellStyles" ); - maPageStyles = CREATE_OUSTRING( "PageStyles" ); - maCellStyleServ = CREATE_OUSTRING( "com.sun.star.style.CellStyle" ); - maPageStyleServ = CREATE_OUSTRING( "com.sun.star.style.PageStyle" ); + maCellStyles = "CellStyles"; + maPageStyles = "PageStyles"; + maCellStyleServ = "com.sun.star.style.CellStyle"; + maPageStyleServ = "com.sun.star.style.PageStyle"; mnCurrSheet = -1; mbWorkbook = bWorkbookFile; meTextEnc = osl_getThreadTextEncoding(); @@ -562,7 +562,7 @@ void WorkbookGlobals::initialize( bool bWorkbookFile ) xLockable->addActionLock(); //! TODO: localize progress bar text - mxProgressBar.reset( new SegmentProgressBar( mrBaseFilter.getStatusIndicator(), CREATE_OUSTRING( "Loading..." ) ) ); + mxProgressBar.reset( new SegmentProgressBar( mrBaseFilter.getStatusIndicator(), "Loading..." ) ); mxFmlaParser.reset( new FormulaParser( *this ) ); //prevent unnecessary broadcasts and "half way listeners" as @@ -572,7 +572,7 @@ void WorkbookGlobals::initialize( bool bWorkbookFile ) else if( mrBaseFilter.isExportFilter() ) { //! TODO: localize progress bar text - mxProgressBar.reset( new SegmentProgressBar( mrBaseFilter.getStatusIndicator(), CREATE_OUSTRING( "Saving..." ) ) ); + mxProgressBar.reset( new SegmentProgressBar( mrBaseFilter.getStatusIndicator(), "Saving..." ) ); } // filter specific switch( getFilterType() ) @@ -692,7 +692,7 @@ void WorkbookHelper::finalizeWorkbookImport() number 1). Otherwise hidden sheets (e.g. for scenarios) which have 'Default' page style will break automatic page numbering for following sheets. Automatic numbering is set by passing the value 0. */ - PropertySet aDefPageStyle( getStyleObject( CREATE_OUSTRING( "Default" ), true ) ); + PropertySet aDefPageStyle( getStyleObject( "Default", true ) ); aDefPageStyle.setProperty< sal_Int16 >( PROP_FirstPageNumber, 0 ); /* Import the VBA project (after finalizing workbook settings which diff --git a/sc/source/filter/oox/workbooksettings.cxx b/sc/source/filter/oox/workbooksettings.cxx index b98cb7d1ff10..e03858d62fe4 100644 --- a/sc/source/filter/oox/workbooksettings.cxx +++ b/sc/source/filter/oox/workbooksettings.cxx @@ -209,10 +209,10 @@ void WorkbookSettings::finalizeImport() // write protection if( maFileSharing.mbRecommendReadOnly || (maFileSharing.mnPasswordHash != 0) ) try { - getBaseFilter().getMediaDescriptor()[ CREATE_OUSTRING( "ReadOnly" ) ] <<= true; + getBaseFilter().getMediaDescriptor()[ "ReadOnly" ] <<= true; Reference< XPropertySet > xDocumentSettings( getBaseFilter().getModelFactory()->createInstance( - CREATE_OUSTRING( "com.sun.star.document.Settings" ) ), UNO_QUERY_THROW ); + "com.sun.star.document.Settings" ), UNO_QUERY_THROW ); PropertySet aSettingsProp( xDocumentSettings ); if( maFileSharing.mbRecommendReadOnly ) aSettingsProp.setProperty( PROP_LoadReadonly, true ); diff --git a/sc/source/filter/oox/worksheetbuffer.cxx b/sc/source/filter/oox/worksheetbuffer.cxx index 8e092ac74e5e..9d49f9c1ee40 100644 --- a/sc/source/filter/oox/worksheetbuffer.cxx +++ b/sc/source/filter/oox/worksheetbuffer.cxx @@ -168,7 +168,7 @@ WorksheetBuffer::IndexNamePair WorksheetBuffer::createSheet( const OUString& rPr Reference< XIndexAccess > xSheetsIA( xSheets, UNO_QUERY_THROW ); Reference< XNameAccess > xSheetsNA( xSheets, UNO_QUERY_THROW ); sal_Int16 nCalcSheet = -1; - OUString aSheetName = rPreferredName.isEmpty() ? CREATE_OUSTRING( "Sheet" ) : rPreferredName; + OUString aSheetName = rPreferredName.isEmpty() ? "Sheet" : rPreferredName; PropertySet aPropSet; if( nSheetPos < xSheetsIA->getCount() ) { diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index 8094e0e517bf..32da418570c6 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -426,8 +426,8 @@ private: WorksheetGlobals::WorksheetGlobals( const WorkbookHelper& rHelper, const ISegmentProgressBarRef& rxProgressBar, WorksheetType eSheetType, sal_Int16 nSheet ) : WorkbookHelper( rHelper ), - maSheetCellRanges( CREATE_OUSTRING( "com.sun.star.sheet.SheetCellRanges" ) ), - maUrlTextField( CREATE_OUSTRING( "com.sun.star.text.TextField.URL" ) ), + maSheetCellRanges( "com.sun.star.sheet.SheetCellRanges" ), + maUrlTextField( "com.sun.star.text.TextField.URL" ), mrMaxApiPos( rHelper.getAddressConverter().getMaxApiAddress() ), maUsedArea( nSheet, SAL_MAX_INT32, SAL_MAX_INT32, -1, -1 ), maSheetData( *this ), diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx index eea131ac0f15..51ff702d92db 100644 --- a/sc/source/filter/xcl97/xcl97esc.cxx +++ b/sc/source/filter/xcl97/xcl97esc.cxx @@ -183,7 +183,7 @@ bool lcl_IsFontwork( const SdrObject* pObj ) bool bIsFontwork = false; if( pObj->GetObjIdentifier() == OBJ_CUSTOMSHAPE ) { - const OUString aTextPath = CREATE_OUSTRING( "TextPath" ); + const OUString aTextPath = "TextPath"; SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&) pObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ); if( Any* pAny = rGeometryItem.GetPropertyValueByName( aTextPath, aTextPath ) ) diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx index febd32795a25..7dc366eec041 100644 --- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx @@ -80,8 +80,6 @@ const sal_uInt16 nRulerRole = AccessibleRole::TEXT; const sal_uInt16 nGridRole = AccessibleRole::TABLE; const sal_uInt16 nCellRole = AccessibleRole::TEXT; -#define CREATE_OUSTRING( name ) OUString( RTL_CONSTASCII_USTRINGPARAM( name ) ) - #define RULER_IMPL_NAME "ScAccessibleCsvRuler" #define GRID_IMPL_NAME "ScAccessibleCsvGrid" #define CELL_IMPL_NAME "ScAccessibleCsvCell" @@ -342,13 +340,13 @@ void lcl_FillFontAttributes( Sequence< PropertyValue >& rSeq, const Font& rFont SvxLanguageItem aLangItem( rFont.GetLanguage(), ATTR_FONT_LANGUAGE ); sal_Int32 nIndex = lcl_ExpandSequence( rSeq, 7 ); - lcl_FillProperty( rSeq[ nIndex++ ], CREATE_OUSTRING( "CharFontName" ), aFontItem, MID_FONT_FAMILY_NAME ); - lcl_FillProperty( rSeq[ nIndex++ ], CREATE_OUSTRING( "CharFontFamily" ), aFontItem, MID_FONT_FAMILY ); - lcl_FillProperty( rSeq[ nIndex++ ], CREATE_OUSTRING( "CharFontStyleName" ), aFontItem, MID_FONT_STYLE_NAME ); - lcl_FillProperty( rSeq[ nIndex++ ], CREATE_OUSTRING( "CharFontCharSet" ), aFontItem, MID_FONT_PITCH ); - lcl_FillProperty( rSeq[ nIndex++ ], CREATE_OUSTRING( "CharFontPitch" ), aFontItem, MID_FONT_CHAR_SET ); - lcl_FillProperty( rSeq[ nIndex++ ], CREATE_OUSTRING( "CharHeight" ), aHeightItem, MID_FONTHEIGHT ); - lcl_FillProperty( rSeq[ nIndex++ ], CREATE_OUSTRING( "CharLocale" ), aLangItem, MID_LANG_LOCALE ); + lcl_FillProperty( rSeq[ nIndex++ ], "CharFontName", aFontItem, MID_FONT_FAMILY_NAME ); + lcl_FillProperty( rSeq[ nIndex++ ], "CharFontFamily", aFontItem, MID_FONT_FAMILY ); + lcl_FillProperty( rSeq[ nIndex++ ], "CharFontStyleName", aFontItem, MID_FONT_STYLE_NAME ); + lcl_FillProperty( rSeq[ nIndex++ ], "CharFontCharSet", aFontItem, MID_FONT_PITCH ); + lcl_FillProperty( rSeq[ nIndex++ ], "CharFontPitch", aFontItem, MID_FONT_CHAR_SET ); + lcl_FillProperty( rSeq[ nIndex++ ], "CharHeight", aHeightItem, MID_FONTHEIGHT ); + lcl_FillProperty( rSeq[ nIndex++ ], "CharLocale", aLangItem, MID_LANG_LOCALE ); } @@ -757,7 +755,7 @@ void SAL_CALL ScAccessibleCsvRuler::release() throw () OUString SAL_CALL ScAccessibleCsvRuler::getImplementationName() throw( RuntimeException ) { - return CREATE_OUSTRING( RULER_IMPL_NAME ); + return OUString( RULER_IMPL_NAME ); } @@ -1267,7 +1265,7 @@ void SAL_CALL ScAccessibleCsvGrid::release() throw () OUString SAL_CALL ScAccessibleCsvGrid::getImplementationName() throw( RuntimeException ) { - return CREATE_OUSTRING( GRID_IMPL_NAME ); + return OUString( GRID_IMPL_NAME ); } @@ -1564,7 +1562,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( ScAccessibleCsvCell, ScAccessibleCsvControl, A OUString SAL_CALL ScAccessibleCsvCell::getImplementationName() throw( RuntimeException ) { - return CREATE_OUSTRING( CELL_IMPL_NAME ); + return OUString( CELL_IMPL_NAME ); } // helpers -------------------------------------------------------------------- diff --git a/sc/source/ui/vba/vbasheetobject.cxx b/sc/source/ui/vba/vbasheetobject.cxx index 7e0431cc5a05..74cc65fbed36 100644 --- a/sc/source/ui/vba/vbasheetobject.cxx +++ b/sc/source/ui/vba/vbasheetobject.cxx @@ -155,12 +155,12 @@ VBAHELPER_IMPL_XHELPERINTERFACE( ScVbaButtonCharacters, "ooo.vba.excel.Character OUString ScVbaButtonCharacters::getFullString() const throw (uno::RuntimeException) { - return mxPropSet->getPropertyValue( CREATE_OUSTRING( "Label" ) ).get< OUString >(); + return mxPropSet->getPropertyValue( "Label" ).get< OUString >(); } void ScVbaButtonCharacters::setFullString( const OUString& rString ) throw (uno::RuntimeException) { - mxPropSet->setPropertyValue( CREATE_OUSTRING( "Label" ), uno::Any( rString ) ); + mxPropSet->setPropertyValue( "Label", uno::Any( rString ) ); } // ============================================================================ @@ -230,12 +230,12 @@ void SAL_CALL ScVbaSheetObjectBase::setHeight( double fHeight ) throw (uno::Runt OUString SAL_CALL ScVbaSheetObjectBase::getName() throw (uno::RuntimeException) { - return mxShapeProps->getPropertyValue( CREATE_OUSTRING( "Name" ) ).get< OUString >(); + return mxShapeProps->getPropertyValue( "Name" ).get< OUString >(); } void SAL_CALL ScVbaSheetObjectBase::setName( const OUString& rName ) throw (uno::RuntimeException) { - mxShapeProps->setPropertyValue( CREATE_OUSTRING( "Name" ), uno::Any( rName ) ); + mxShapeProps->setPropertyValue( "Name", uno::Any( rName ) ); } sal_Int32 SAL_CALL ScVbaSheetObjectBase::getPlacement() throw (uno::RuntimeException) @@ -319,24 +319,24 @@ ScVbaControlObjectBase::ScVbaControlObjectBase( switch( eListenerType ) { case LISTENER_ACTION: - maListenerType = CREATE_OUSTRING( "XActionListener" ); - maEventMethod = CREATE_OUSTRING( "actionPerformed" ); + maListenerType = "XActionListener"; + maEventMethod = "actionPerformed"; break; case LISTENER_MOUSE: - maListenerType = CREATE_OUSTRING( "XMouseListener" ); - maEventMethod = CREATE_OUSTRING( "mouseReleased" ); + maListenerType = "XMouseListener"; + maEventMethod = "mouseReleased"; break; case LISTENER_TEXT: - maListenerType = CREATE_OUSTRING( "XTextListener" ); - maEventMethod = CREATE_OUSTRING( "textChanged" ); + maListenerType = "XTextListener"; + maEventMethod = "textChanged"; break; case LISTENER_VALUE: - maListenerType = CREATE_OUSTRING( "XAdjustmentListener" ); - maEventMethod = CREATE_OUSTRING( "adjustmentValueChanged" ); + maListenerType = "XAdjustmentListener"; + maEventMethod = "adjustmentValueChanged"; break; case LISTENER_CHANGE: - maListenerType = CREATE_OUSTRING( "XChangeListener" ); - maEventMethod = CREATE_OUSTRING( "changed" ); + maListenerType = "XChangeListener"; + maEventMethod = "changed"; break; // no default, to let the compiler complain about missing case } @@ -346,12 +346,12 @@ ScVbaControlObjectBase::ScVbaControlObjectBase( OUString SAL_CALL ScVbaControlObjectBase::getName() throw (uno::RuntimeException) { - return mxControlProps->getPropertyValue( CREATE_OUSTRING( "Name" ) ).get< OUString >(); + return mxControlProps->getPropertyValue( "Name" ).get< OUString >(); } void SAL_CALL ScVbaControlObjectBase::setName( const OUString& rName ) throw (uno::RuntimeException) { - mxControlProps->setPropertyValue( CREATE_OUSTRING( "Name" ), uno::Any( rName ) ); + mxControlProps->setPropertyValue( "Name", uno::Any( rName ) ); } OUString SAL_CALL ScVbaControlObjectBase::getOnAction() throw (uno::RuntimeException) @@ -363,7 +363,7 @@ OUString SAL_CALL ScVbaControlObjectBase::getOnAction() throw (uno::RuntimeExcep { const script::ScriptEventDescriptor* pEvent = aEvents.getConstArray(); const script::ScriptEventDescriptor* pEventEnd = pEvent + aEvents.getLength(); - const OUString aScriptType = CREATE_OUSTRING( "Script" ); + const OUString aScriptType = "Script"; for( ; pEvent < pEventEnd; ++pEvent ) if( (pEvent->ListenerType == maListenerType) && (pEvent->EventMethod == maEventMethod) && (pEvent->ScriptType == aScriptType) ) return extractMacroName( pEvent->ScriptCode ); @@ -388,7 +388,7 @@ void SAL_CALL ScVbaControlObjectBase::setOnAction( const OUString& rMacroName ) script::ScriptEventDescriptor aDescriptor; aDescriptor.ListenerType = maListenerType; aDescriptor.EventMethod = maEventMethod; - aDescriptor.ScriptType = CREATE_OUSTRING( "Script" ); + aDescriptor.ScriptType = "Script"; aDescriptor.ScriptCode = makeMacroURL( aResolvedMacro.msResolvedMacro ); xEventMgr->registerScriptEvent( nIndex, aDescriptor ); } @@ -396,12 +396,12 @@ void SAL_CALL ScVbaControlObjectBase::setOnAction( const OUString& rMacroName ) sal_Bool SAL_CALL ScVbaControlObjectBase::getPrintObject() throw (uno::RuntimeException) { - return mxControlProps->getPropertyValue( CREATE_OUSTRING( "Printable" ) ).get< sal_Bool >(); + return mxControlProps->getPropertyValue( "Printable" ).get< sal_Bool >(); } void SAL_CALL ScVbaControlObjectBase::setPrintObject( sal_Bool bPrintObject ) throw (uno::RuntimeException) { - mxControlProps->setPropertyValue( CREATE_OUSTRING( "Printable" ), uno::Any( bPrintObject ) ); + mxControlProps->setPropertyValue( "Printable", uno::Any( bPrintObject ) ); } // XControlObject attributes @@ -446,12 +446,12 @@ ScVbaButton::ScVbaButton( OUString SAL_CALL ScVbaButton::getCaption() throw (uno::RuntimeException) { - return mxControlProps->getPropertyValue( CREATE_OUSTRING( "Label" ) ).get< OUString >(); + return mxControlProps->getPropertyValue( "Label" ).get< OUString >(); } void SAL_CALL ScVbaButton::setCaption( const OUString& rCaption ) throw (uno::RuntimeException) { - mxControlProps->setPropertyValue( CREATE_OUSTRING( "Label" ), uno::Any( rCaption ) ); + mxControlProps->setPropertyValue( "Label", uno::Any( rCaption ) ); } uno::Reference< excel::XFont > SAL_CALL ScVbaButton::getFont() throw (uno::RuntimeException) @@ -466,7 +466,7 @@ void SAL_CALL ScVbaButton::setFont( const uno::Reference< excel::XFont >& /*rxFo sal_Int32 SAL_CALL ScVbaButton::getHorizontalAlignment() throw (uno::RuntimeException) { - switch( mxControlProps->getPropertyValue( CREATE_OUSTRING( "Align" ) ).get< sal_Int16 >() ) + switch( mxControlProps->getPropertyValue( "Align" ).get< sal_Int16 >() ) { case awt::TextAlign::LEFT: return excel::Constants::xlLeft; case awt::TextAlign::RIGHT: return excel::Constants::xlRight; @@ -485,12 +485,12 @@ void SAL_CALL ScVbaButton::setHorizontalAlignment( sal_Int32 nAlign ) throw (uno case excel::Constants::xlCenter: nAwtAlign = awt::TextAlign::CENTER; break; } // form controls expect short value - mxControlProps->setPropertyValue( CREATE_OUSTRING( "Align" ), uno::Any( static_cast< sal_Int16 >( nAwtAlign ) ) ); + mxControlProps->setPropertyValue( "Align", uno::Any( static_cast< sal_Int16 >( nAwtAlign ) ) ); } sal_Int32 SAL_CALL ScVbaButton::getVerticalAlignment() throw (uno::RuntimeException) { - switch( mxControlProps->getPropertyValue( CREATE_OUSTRING( "VerticalAlign" ) ).get< style::VerticalAlignment >() ) + switch( mxControlProps->getPropertyValue( "VerticalAlign" ).get< style::VerticalAlignment >() ) { case style::VerticalAlignment_TOP: return excel::Constants::xlTop; case style::VerticalAlignment_BOTTOM: return excel::Constants::xlBottom; @@ -509,7 +509,7 @@ void SAL_CALL ScVbaButton::setVerticalAlignment( sal_Int32 nAlign ) throw (uno:: case excel::Constants::xlBottom: eAwtAlign = style::VerticalAlignment_BOTTOM; break; case excel::Constants::xlCenter: eAwtAlign = style::VerticalAlignment_MIDDLE; break; } - mxControlProps->setPropertyValue( CREATE_OUSTRING( "VerticalAlign" ), uno::Any( eAwtAlign ) ); + mxControlProps->setPropertyValue( "VerticalAlign", uno::Any( eAwtAlign ) ); } sal_Int32 SAL_CALL ScVbaButton::getOrientation() throw (uno::RuntimeException) @@ -538,7 +538,7 @@ VBAHELPER_IMPL_XHELPERINTERFACE( ScVbaButton, "ooo.vba.excel.Button" ) OUString ScVbaButton::implGetBaseName() const { - return CREATE_OUSTRING( "Button" ); + return OUString( "Button" ); } void ScVbaButton::implSetDefaultProperties() throw (uno::RuntimeException) diff --git a/sc/source/ui/vba/vbasheetobjects.cxx b/sc/source/ui/vba/vbasheetobjects.cxx index 76a7cdc6de18..cb05330f7bbc 100644 --- a/sc/source/ui/vba/vbasheetobjects.cxx +++ b/sc/source/ui/vba/vbasheetobjects.cxx @@ -243,7 +243,7 @@ sal_Bool SAL_CALL ScVbaObjectContainer::hasElements() throw (uno::RuntimeExcepti OUString ScVbaObjectContainer::implGetShapeName( const uno::Reference< drawing::XShape >& rxShape ) const throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xPropSet( rxShape, uno::UNO_QUERY_THROW ); - return xPropSet->getPropertyValue( CREATE_OUSTRING( "Name" ) ).get< OUString >(); + return xPropSet->getPropertyValue( "Name" ).get< OUString >(); } void ScVbaObjectContainer::implOnShapeCreated( const uno::Reference< drawing::XShape >& /*rxShape*/ ) throw (uno::RuntimeException) @@ -404,14 +404,14 @@ uno::Reference< container::XIndexContainer > ScVbaControlContainer::createForm() { uno::Reference< form::XFormsSupplier > xFormsSupp( mxShapes, uno::UNO_QUERY_THROW ); uno::Reference< container::XNameContainer > xFormsNC( xFormsSupp->getForms(), uno::UNO_SET_THROW ); - OUString aFormName = CREATE_OUSTRING( "Standard" ); + OUString aFormName = "Standard"; if( xFormsNC->hasByName( aFormName ) ) { mxFormIC.set( xFormsNC->getByName( aFormName ), uno::UNO_QUERY_THROW ); } else { - uno::Reference< form::XForm > xForm( mxFactory->createInstance( CREATE_OUSTRING( "com.sun.star.form.component.Form" ) ), uno::UNO_QUERY_THROW ); + uno::Reference< form::XForm > xForm( mxFactory->createInstance( "com.sun.star.form.component.Form" ), uno::UNO_QUERY_THROW ); xFormsNC->insertByName( aFormName, uno::Any( xForm ) ); mxFormIC.set( xForm, uno::UNO_QUERY_THROW ); } @@ -426,7 +426,7 @@ bool ScVbaControlContainer::implPickShape( const uno::Reference< drawing::XShape uno::Reference< drawing::XControlShape > xControlShape( rxShape, uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xModelProps( xControlShape->getControl(), uno::UNO_QUERY_THROW ); sal_Int16 nClassId = -1; - return lclGetProperty( nClassId, xModelProps, CREATE_OUSTRING( "ClassId" ) ) && + return lclGetProperty( nClassId, xModelProps, "ClassId" ) && (nClassId == mnComponentType) && implCheckProperties( xModelProps ); } catch( uno::Exception& ) @@ -437,7 +437,7 @@ bool ScVbaControlContainer::implPickShape( const uno::Reference< drawing::XShape OUString ScVbaControlContainer::implGetShapeServiceName() const { - return CREATE_OUSTRING( "com.sun.star.drawing.ControlShape" ); + return OUString( "com.sun.star.drawing.ControlShape" ); } bool ScVbaControlContainer::implCheckProperties( const uno::Reference< beans::XPropertySet >& /*rxModelProps*/ ) const @@ -494,7 +494,7 @@ ScVbaButtonContainer::ScVbaButtonContainer( ScVbaControlContainer( rxParent, rxContext, rxModel, rxSheet, excel::XButton::static_type( 0 ), - CREATE_OUSTRING( "com.sun.star.form.component.CommandButton" ), + "com.sun.star.form.component.CommandButton", form::FormComponentType::COMMANDBUTTON ) { } @@ -509,7 +509,7 @@ bool ScVbaButtonContainer::implCheckProperties( const uno::Reference< beans::XPr { // do not insert toggle buttons into the 'Buttons' collection bool bToggle = false; - return lclGetProperty( bToggle, rxModelProps, CREATE_OUSTRING( "Toggle" ) ) && !bToggle; + return lclGetProperty( bToggle, rxModelProps, "Toggle" ) && !bToggle; } // ============================================================================ From 32d8c9b96cef77fd563ca1ab0c3943f783f1b16a Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Sat, 6 Oct 2012 01:13:57 +0200 Subject: [PATCH 432/863] fix another crash in cond format dialog with range name list Change-Id: I84f9c71fd7f80ad9300f4f7b2c273cd9af0f075e --- sc/source/ui/condformat/condformatdlg.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index 2e294f2741c3..e2f8d679a978 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -1116,7 +1116,7 @@ ScConditionalFormat* ScCondFormatDlg::GetConditionalFormat() const sal_uInt16 nFlags = aRange.Parse(aRangeStr, mpDoc, SCA_VALID, mpDoc->GetAddressConvention()); ScConditionalFormat* pFormat = maCondFormList.GetConditionalFormat(); - if(nFlags & SCA_VALID && !aRange.empty()) + if(nFlags & SCA_VALID && !aRange.empty() && pFormat) pFormat->AddRange(aRange); return pFormat; From ea89abb435a0175a7c12a6ccb430752393ce4b64 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Sat, 6 Oct 2012 01:15:10 +0200 Subject: [PATCH 433/863] onyl show the exisiting cond format if the range is equal Change-Id: I6a183b41261f1813b1cce277f3fe4a276ab07bb0 --- sc/source/ui/view/cellsh1.cxx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index b4685302060b..3d292f690697 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -2061,9 +2061,12 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) const ScConditionalFormat* pCondFormat = pDoc->GetCondFormat(aPos.Col(), aPos.Row(), aPos.Tab()); if(pCondFormat) { - pDlg.reset(pFact->CreateScCondFormatDlg( pTabViewShell->GetDialogParent(), pDoc, pCondFormat, pCondFormat->GetRange(), aPos, RID_SCDLG_CONDFORMAT )); + const ScRangeList& rCondFormatRange = pCondFormat->GetRange(); + if(rCondFormatRange == aRangeList) + pDlg.reset(pFact->CreateScCondFormatDlg( pTabViewShell->GetDialogParent(), pDoc, pCondFormat, pCondFormat->GetRange(), aPos, RID_SCDLG_CONDFORMAT )); } - else + + if(!pDlg) { pDlg.reset(pFact->CreateScCondFormatDlg( pTabViewShell->GetDialogParent(), pDoc, NULL, aRangeList, aRangeList.GetTopLeftCorner(), RID_SCDLG_CONDFORMAT )); } From b65e98a6a8be0ad7864eb607087d9b85003e5a1e Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Sat, 6 Oct 2012 02:32:07 +0200 Subject: [PATCH 434/863] implement the menu strucutre from Astron's proposal Change-Id: I46b751f033f2b4f08461b2eaae8ad16c1487f1c0 --- .../org/openoffice/Office/UI/CalcCommands.xcu | 12 ++++- sc/inc/sc.hrc | 4 +- sc/sdi/cellsh.sdi | 2 + sc/sdi/scalc.sdi | 50 +++++++++++++++++++ sc/source/ui/view/cellsh1.cxx | 2 + sc/uiconfig/scalc/menubar/menubar.xml | 2 + 6 files changed, 70 insertions(+), 2 deletions(-) diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu index e6767b7826e7..7418498b95ea 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu @@ -446,7 +446,17 @@ - Conditional Formatting... + Condition... + + + + + Color Scale... + + + + + Data Bar... diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 51cebf39f182..e47ee571890e 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -250,7 +250,9 @@ #define SID_OPENDLG_OPTSOLVER (SC_MESSAGE_START + 60) #define SID_VALIDITY_REFERENCE (SC_MESSAGE_START + 61) #define SID_OPENDLG_CONDFRMT_MANAGER (SC_MESSAGE_START + 62) -#define SC_HINT_NAVIGATOR_UPDATEALL (SC_MESSAGE_START + 65) +#define SC_HINT_NAVIGATOR_UPDATEALL (SC_MESSAGE_START + 65) +#define SID_OPENDLG_COLORSCALE (SC_MESSAGE_START + 66) +#define SID_OPENDLG_DATABAR (SC_MESSAGE_START + 67) // functions diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi index 77eea5c9fb78..15233b66d08a 100644 --- a/sc/sdi/cellsh.sdi +++ b/sc/sdi/cellsh.sdi @@ -189,6 +189,8 @@ interface CellSelection SID_CANCEL [ ExecMethod = Execute; ] SID_TOGGLE_REL [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] SID_OPENDLG_CONDFRMT [ ExecMethod = ExecuteEdit; ] + SID_OPENDLG_COLORSCALE [ ExecMethod = ExecuteEdit; ] + SID_OPENDLG_DATABAR [ ExecMethod = ExecuteEdit; ] SID_OPENDLG_CONDFRMT_MANAGER [ ExecMethod = ExecuteEdit; ] SID_COLORSCALE [ ExecMethod = ExecuteEdit; ] SID_DATABAR [ ExecMethod = ExecuteEdit; ] diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi index 0350d7dc96cf..5b9cda68177d 100644 --- a/sc/sdi/scalc.sdi +++ b/sc/sdi/scalc.sdi @@ -1093,6 +1093,56 @@ SfxVoidItem ConditionalFormatDialog SID_OPENDLG_CONDFRMT GroupId = GID_FORMAT; ] +//-------------------------------------------------------------------------- +SfxVoidItem ColorScaleFormatDialog SID_OPENDLG_COLORSCALE +() +[ + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = TRUE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, + GroupId = GID_FORMAT; +] + +//-------------------------------------------------------------------------- +SfxVoidItem DataBarFormatDialog SID_OPENDLG_DATABAR +() +[ + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = TRUE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, + GroupId = GID_FORMAT; +] + //-------------------------------------------------------------------------- SfxVoidItem ConditionalFormatManagerDialog SID_OPENDLG_CONDFRMT_MANAGER () diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 3d292f690697..c4b21f30a4a3 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -2035,6 +2035,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) break; case SID_OPENDLG_CONDFRMT: + case SID_OPENDLG_COLORSCALE: + case SID_OPENDLG_DATABAR: { ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index 0bff97cd0f7e..621586ea85e1 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -277,6 +277,8 @@ + + From c2d8d60748769d32133f33efb43be3e9ea28f8c8 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Sat, 6 Oct 2012 05:19:19 +0200 Subject: [PATCH 435/863] selecting the correct entry will also show it in the dialog Change-Id: I6bbeb2d1cb5af724ac0743d13f3e36cb8b613a88 --- sc/source/ui/attrdlg/scdlgfact.cxx | 13 ++++++-- sc/source/ui/condformat/condformatdlg.cxx | 39 ++++++++++++++++++++--- sc/source/ui/condformat/condformatmgr.cxx | 2 +- sc/source/ui/inc/condformatdlg.hxx | 25 +++++++++++++-- sc/source/ui/view/cellsh1.cxx | 6 ++-- 5 files changed, 71 insertions(+), 14 deletions(-) diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index 7962c6d3bcd7..9200eba351b6 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -787,8 +787,17 @@ AbstractScCondFormatDlg* ScAbstractDialogFactory_Impl::CreateScCondFormatDlg(Win ScCondFormatDlg* pDlg = NULL; switch( nId ) { - case RID_SCDLG_CONDFORMAT: - pDlg = new ScCondFormatDlg( pParent, pDoc, pFormat, rRange, rPos ); + case 0: + pDlg = new ScCondFormatDlg( pParent, pDoc, pFormat, rRange, rPos, condformat::dialog::NONE ); + break; + case SID_OPENDLG_CONDFRMT: + pDlg = new ScCondFormatDlg( pParent, pDoc, pFormat, rRange, rPos, condformat::dialog::CONDITION ); + break; + case SID_OPENDLG_COLORSCALE: + pDlg = new ScCondFormatDlg( pParent, pDoc, pFormat, rRange, rPos, condformat::dialog::COLORSCALE ); + break; + case SID_OPENDLG_DATABAR: + pDlg = new ScCondFormatDlg( pParent, pDoc, pFormat, rRange, rPos, condformat::dialog::DATABAR ); break; default: break; diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index e2f8d679a978..9dc6350241e9 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -633,6 +633,14 @@ void ScCondFrmtEntry::Select() SetHeight(); } +void ScCondFrmtEntry::SetType( ScCondFormatEntryType eType ) +{ + meType = eType; + if(eType == DATABAR) + maLbColorFormat.SelectEntryPos(2); + Select(); +} + void ScCondFrmtEntry::Deselect() { SetControlBackground(GetSettings().GetStyleSettings().GetDialogColor()); @@ -987,7 +995,8 @@ IMPL_LINK_NOARG( ScCondFrmtEntry, ConditionTypeSelectHdl ) return 0; } -ScCondFormatList::ScCondFormatList(Window* pParent, const ResId& rResId, ScDocument* pDoc, const ScConditionalFormat* pFormat, const ScRangeList& rRanges, const ScAddress& rPos): +ScCondFormatList::ScCondFormatList(Window* pParent, const ResId& rResId, ScDocument* pDoc, const ScConditionalFormat* pFormat, + const ScRangeList& rRanges, const ScAddress& rPos, condformat::dialog::ScCondFormatDialogType eType): Control(pParent, rResId), mbHasScrollBar(false), mpScrollBar(new ScrollBar(this, WB_VERT )), @@ -1005,9 +1014,28 @@ ScCondFormatList::ScCondFormatList(Window* pParent, const ResId& rResId, ScDocum { maEntries.push_back(new ScCondFrmtEntry( this, mpDoc, pFormat->GetEntry(nIndex), maPos )); } - if (nCount > 0) - maEntries.begin()->Select(); } + else + { + switch(eType) + { + case condformat::dialog::CONDITION: + maEntries.push_back(new ScCondFrmtEntry( this, mpDoc, maPos )); + break; + case condformat::dialog::COLORSCALE: + maEntries.push_back(new ScCondFrmtEntry( this, mpDoc, maPos )); + maEntries[0].SetType(COLORSCALE); + break; + case condformat::dialog::DATABAR: + maEntries.push_back(new ScCondFrmtEntry( this, mpDoc, maPos )); + maEntries[0].SetType(DATABAR); + break; + default: + break; + } + } + if (!maEntries.empty()) + maEntries.begin()->Select(); RecalcAll(); FreeResource(); @@ -1083,7 +1111,8 @@ void ScCondFormatList::DoScroll(long nDelta) mpScrollBar->SetPosPixel(aNewPoint); } -ScCondFormatDlg::ScCondFormatDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormat* pFormat, const ScRangeList& rRange, const ScAddress& rPos): +ScCondFormatDlg::ScCondFormatDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormat* pFormat, const ScRangeList& rRange, + const ScAddress& rPos, condformat::dialog::ScCondFormatDialogType eType): ModalDialog(pParent, ScResId( RID_SCDLG_CONDFORMAT )), maBtnAdd( this, ScResId( BTN_ADD ) ), maBtnRemove( this, ScResId( BTN_REMOVE ) ), @@ -1091,7 +1120,7 @@ ScCondFormatDlg::ScCondFormatDlg(Window* pParent, ScDocument* pDoc, const ScCond maBtnCancel( this, ScResId( BTN_CANCEL ) ), maFtRange( this, ScResId( FT_RANGE ) ), maEdRange( this, ScResId( ED_RANGE ) ), - maCondFormList( this, ScResId( CTRL_LIST ), pDoc, pFormat, rRange, rPos ), + maCondFormList( this, ScResId( CTRL_LIST ), pDoc, pFormat, rRange, rPos, eType ), maPos(rPos), mpDoc(pDoc) { diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx index 09318997bf4d..6eeecd108dc8 100644 --- a/sc/source/ui/condformat/condformatmgr.cxx +++ b/sc/source/ui/condformat/condformatmgr.cxx @@ -217,7 +217,7 @@ IMPL_LINK_NOARG(ScCondFormatManagerDlg, EditBtnHdl) return 0; boost::scoped_ptr pDlg(new ScCondFormatDlg(this, mpDoc, pFormat, pFormat->GetRange(), - pFormat->GetRange().GetTopLeftCorner())); + pFormat->GetRange().GetTopLeftCorner(), condformat::dialog::NONE)); if(pDlg->Execute() == RET_OK) { sal_Int32 nKey = pFormat->GetKey(); diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx index 4b3e780d69fc..c7a247ce8cf4 100644 --- a/sc/source/ui/inc/condformatdlg.hxx +++ b/sc/source/ui/inc/condformatdlg.hxx @@ -47,6 +47,22 @@ class ScFormatEntry; class ScConditionalFormat; struct ScDataBarFormatData; +namespace condformat { + +namespace dialog { + +enum ScCondFormatDialogType +{ + NONE, + CONDITION, + COLORSCALE, + DATABAR +}; + +} + +} + class ScCondFrmtEntry : public Control { private: @@ -96,7 +112,6 @@ private: boost::scoped_ptr mpDataBarData; // - void SwitchToType(ScCondFormatEntryType eType); void SetCondType(); void SetColorScaleType(); void SetDataBarType(); @@ -104,6 +119,7 @@ private: void HideCondElements(); void HideColorScaleElements(); void HideDataBarElements(); + void SwitchToType(ScCondFormatEntryType eType); void SetHeight(); void Init(); @@ -134,6 +150,8 @@ public: virtual long Notify( NotifyEvent& rNEvt ); + void SetType( ScCondFormatEntryType eType ); + void Select(); void Deselect(); @@ -159,7 +177,8 @@ private: void RecalcAll(); void DoScroll(long nDiff); public: - ScCondFormatList( Window* pParent, const ResId& rResId, ScDocument* pDoc, const ScConditionalFormat* pFormat, const ScRangeList& rRanges, const ScAddress& rPos); + ScCondFormatList( Window* pParent, const ResId& rResId, ScDocument* pDoc, const ScConditionalFormat* pFormat, + const ScRangeList& rRanges, const ScAddress& rPos, condformat::dialog::ScCondFormatDialogType eType); ScConditionalFormat* GetConditionalFormat() const; @@ -188,7 +207,7 @@ private: DECL_LINK( EdRangeModifyHdl, Edit* ); public: - ScCondFormatDlg(Window* pWindow, ScDocument* pDoc, const ScConditionalFormat* pFormat, const ScRangeList& rRange, const ScAddress& rPos); + ScCondFormatDlg(Window* pWindow, ScDocument* pDoc, const ScConditionalFormat* pFormat, const ScRangeList& rRange, const ScAddress& rPos, condformat::dialog::ScCondFormatDialogType eType); ScConditionalFormat* GetConditionalFormat() const; }; diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index c4b21f30a4a3..1f970b6d0130 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -2065,15 +2065,15 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) { const ScRangeList& rCondFormatRange = pCondFormat->GetRange(); if(rCondFormatRange == aRangeList) - pDlg.reset(pFact->CreateScCondFormatDlg( pTabViewShell->GetDialogParent(), pDoc, pCondFormat, pCondFormat->GetRange(), aPos, RID_SCDLG_CONDFORMAT )); + pDlg.reset(pFact->CreateScCondFormatDlg( pTabViewShell->GetDialogParent(), pDoc, pCondFormat, pCondFormat->GetRange(), aPos, 0 )); } if(!pDlg) { - pDlg.reset(pFact->CreateScCondFormatDlg( pTabViewShell->GetDialogParent(), pDoc, NULL, aRangeList, aRangeList.GetTopLeftCorner(), RID_SCDLG_CONDFORMAT )); + pDlg.reset(pFact->CreateScCondFormatDlg( pTabViewShell->GetDialogParent(), pDoc, NULL, aRangeList, aRangeList.GetTopLeftCorner(), nSlot )); } - if(pDlg->Execute() == RET_OK) + if(pDlg && pDlg->Execute() == RET_OK) { ScConditionalFormat* pFormat = pDlg->GetConditionalFormat(); sal_uLong nOldIndex = 0; From d8a854364f6c3d9a7a1de2073d3ff5f17c5c2762 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Sat, 6 Oct 2012 06:24:30 +0200 Subject: [PATCH 436/863] enable the add button in manage conditional formats Change-Id: I82a0abf58f8fc68d0e9e145923961fa3e3c654fe --- sc/source/ui/condformat/condformatmgr.cxx | 37 ++++++++++++++++++++++- sc/source/ui/inc/condformatmgr.hxx | 1 + 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx index 6eeecd108dc8..c6a6465a785d 100644 --- a/sc/source/ui/condformat/condformatmgr.cxx +++ b/sc/source/ui/condformat/condformatmgr.cxx @@ -181,8 +181,8 @@ ScCondFormatManagerDlg::ScCondFormatManagerDlg(Window* pParent, ScDocument* pDoc maBtnRemove.SetClickHdl(LINK(this, ScCondFormatManagerDlg, RemoveBtnHdl)); maBtnEdit.SetClickHdl(LINK(this, ScCondFormatManagerDlg, EditBtnHdl)); + maBtnAdd.SetClickHdl(LINK(this, ScCondFormatManagerDlg, AddBtnHdl)); maCtrlManager.GetListControl().SetDoubleClickHdl(LINK(this, ScCondFormatManagerDlg, EditBtnHdl)); - maBtnAdd.Hide(); } ScCondFormatManagerDlg::~ScCondFormatManagerDlg() @@ -233,4 +233,39 @@ IMPL_LINK_NOARG(ScCondFormatManagerDlg, EditBtnHdl) return 0; } +namespace { + +sal_uInt32 FindKey(ScConditionalFormatList* pFormatList) +{ + sal_uInt32 nKey = 0; + for(ScConditionalFormatList::const_iterator itr = pFormatList->begin(), itrEnd = pFormatList->end(); + itr != itrEnd; ++itr) + { + if(itr->GetKey() > nKey) + nKey = itr->GetKey(); + } + + return nKey + 1; +} + +} + +IMPL_LINK_NOARG(ScCondFormatManagerDlg, AddBtnHdl) +{ + boost::scoped_ptr pDlg(new ScCondFormatDlg(this, mpDoc, NULL, ScRangeList(), + maPos, condformat::dialog::CONDITION)); + if(pDlg->Execute() == RET_OK) + { + ScConditionalFormat* pNewFormat = pDlg->GetConditionalFormat(); + mpFormatList->InsertNew(pNewFormat); + pNewFormat->SetKey(FindKey(mpFormatList)); + maCtrlManager.Update(); + + mbModified = true; + } + + return 0; +} + + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/condformatmgr.hxx b/sc/source/ui/inc/condformatmgr.hxx index c71e2ef5e249..5b0d1e8a9f82 100644 --- a/sc/source/ui/inc/condformatmgr.hxx +++ b/sc/source/ui/inc/condformatmgr.hxx @@ -106,6 +106,7 @@ private: DECL_LINK(RemoveBtnHdl, void*); DECL_LINK(EditBtnHdl, void*); + DECL_LINK(AddBtnHdl, void*); bool mbModified; }; From 7f127204ce0d601ef4b956b92c6ba433f753d534 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Sat, 6 Oct 2012 06:52:03 +0200 Subject: [PATCH 437/863] prevent crash when no cond format will be defined in cond format dlg Change-Id: Iffc54ada1fcf586c00eddf934079fa671f263ce0 --- sc/source/ui/condformat/condformatmgr.cxx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx index c6a6465a785d..0bd35387f793 100644 --- a/sc/source/ui/condformat/condformatmgr.cxx +++ b/sc/source/ui/condformat/condformatmgr.cxx @@ -257,6 +257,9 @@ IMPL_LINK_NOARG(ScCondFormatManagerDlg, AddBtnHdl) if(pDlg->Execute() == RET_OK) { ScConditionalFormat* pNewFormat = pDlg->GetConditionalFormat(); + if(!pNewFormat) + return 0; + mpFormatList->InsertNew(pNewFormat); pNewFormat->SetKey(FindKey(mpFormatList)); maCtrlManager.Update(); From ce8ac5bbe40e4cb57e1826a81b3b5c4632474789 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Sat, 6 Oct 2012 06:52:28 +0200 Subject: [PATCH 438/863] prevent creating cond formats without a attached range Change-Id: Ic4c13fa3d0eae54b7db1fa5a4e5c5040582b21ed --- sc/source/ui/condformat/condformatdlg.cxx | 17 +++++++++++++++++ sc/source/ui/inc/condformatdlg.hxx | 1 + 2 files changed, 18 insertions(+) diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index 9dc6350241e9..4c5708a00c84 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -1133,6 +1133,7 @@ ScCondFormatDlg::ScCondFormatDlg(Window* pParent, ScDocument* pDoc, const ScCond maBtnAdd.SetClickHdl( LINK( &maCondFormList, ScCondFormatList, AddBtnHdl ) ); maBtnRemove.SetClickHdl( LINK( &maCondFormList, ScCondFormatList, RemoveBtnHdl ) ); maEdRange.SetModifyHdl( LINK( this, ScCondFormatDlg, EdRangeModifyHdl ) ); + maBtnOk.SetClickHdl( LINK( this, ScCondFormatDlg, OkBtnHdl ) ); FreeResource(); maEdRange.SetText(aRangeString); @@ -1207,5 +1208,21 @@ IMPL_LINK( ScCondFormatDlg, EdRangeModifyHdl, Edit*, pEdit ) return 0; } +IMPL_LINK_NOARG( ScCondFormatDlg, OkBtnHdl ) +{ + rtl::OUString aRangeStr = maEdRange.GetText(); + ScRangeList aRange; + aRange.Parse(aRangeStr, mpDoc, SCA_VALID, mpDoc->GetAddressConvention()); + boost::scoped_ptr pFormat(maCondFormList.GetConditionalFormat()); + if(pFormat && pFormat->GetRange().empty() && aRange.empty()) + return 0; + else + { + EndDialog(RET_OK); + } + + return 0; +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx index c7a247ce8cf4..52c03e504468 100644 --- a/sc/source/ui/inc/condformatdlg.hxx +++ b/sc/source/ui/inc/condformatdlg.hxx @@ -205,6 +205,7 @@ private: ScDocument* mpDoc; DECL_LINK( EdRangeModifyHdl, Edit* ); + DECL_LINK( OkBtnHdl, void* ); public: ScCondFormatDlg(Window* pWindow, ScDocument* pDoc, const ScConditionalFormat* pFormat, const ScRangeList& rRange, const ScAddress& rPos, condformat::dialog::ScCondFormatDialogType eType); From f26d188ffa00ee6184490fc5c179da16e17301bb Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 5 Oct 2012 18:23:16 +0300 Subject: [PATCH 439/863] Bin unused leftover "dummy" fields Change-Id: If16fcbb58234a9f1b7e07718f77909273f1fbbd4 --- filter/inc/filter/msfilter/msdffimp.hxx | 3 --- filter/inc/filter/msfilter/svdfppt.hxx | 10 ---------- filter/source/msfilter/svdfppt.cxx | 10 +++++++--- svtools/inc/svtools/filter.hxx | 11 ----------- svtools/inc/svtools/grfmgr.hxx | 3 --- svtools/inc/svtools/transfer.hxx | 17 ----------------- svtools/source/inc/sgvmain.hxx | 2 -- svx/inc/svx/galbrws.hxx | 3 --- sw/source/core/inc/tabfrm.hxx | 1 - 9 files changed, 7 insertions(+), 53 deletions(-) diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx index f69f076a28f3..e9e1b148346d 100644 --- a/filter/inc/filter/msfilter/msdffimp.hxx +++ b/filter/inc/filter/msfilter/msdffimp.hxx @@ -600,9 +600,6 @@ protected : virtual sal_Bool ShapeHasText(sal_uLong nShapeId, sal_uLong nFilePos) const; public: - void* pSvxMSDffDummy1; - void* pSvxMSDffDummy2; - void* pSvxMSDffDummy3; std::map aEscherBlipCache; DffRecordManager maShapeRecords; diff --git a/filter/inc/filter/msfilter/svdfppt.hxx b/filter/inc/filter/msfilter/svdfppt.hxx index 8250c7279cdc..79272f57adf5 100644 --- a/filter/inc/filter/msfilter/svdfppt.hxx +++ b/filter/inc/filter/msfilter/svdfppt.hxx @@ -328,7 +328,6 @@ struct PptSlidePersistEntry SdrObject* pBObj; sal_Bool bBObjIsTemporary; - void* pDummy2; PptPageKind ePageKind; // sal_Bool bNotesMaster : 1; // for NotesMaster @@ -379,11 +378,8 @@ struct PPTOleEntry struct PptExOleObjAtom { sal_uInt32 nAspect; - sal_uInt32 nDummy1; sal_uInt32 nId; - sal_uInt32 nDummy2; sal_uInt32 nPersistPtr; - sal_uInt32 nDummy4; public: @@ -429,11 +425,6 @@ public: PowerPointImportParam& rImportParam; - void* pSdrEscherDummy1; - void* pSdrEscherDummy2; - void* pSdrEscherDummy3; - void* pSdrEscherDummy4; - SdrEscherImport( PowerPointImportParam&, const String& rBaseURL ); virtual ~SdrEscherImport(); virtual bool GetColorFromPalette( sal_uInt16 nNum, Color& rColor ) const; @@ -858,7 +849,6 @@ struct PPTStyleSheet : public PPTNumberFormatCreator PPTCharSheet* mpCharSheet[ PPT_STYLESHEETENTRYS ]; PPTParaSheet* mpParaSheet[ PPT_STYLESHEETENTRYS ]; SvxNumBulletItem* mpNumBulletItem[ PPT_STYLESHEETENTRYS ]; - void* mpDummy; PPTStyleSheet( const DffRecordHeader& rSlideHd, diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 677a2ae48fd6..9e0fbc076e73 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -221,12 +221,16 @@ SvStream& operator>>( SvStream& rIn, PptInteractiveInfoAtom& rAtom ) SvStream& operator>>( SvStream& rIn, PptExOleObjAtom& rAtom ) { + sal_uInt32 nDummy1; + sal_uInt32 nDummy2; + sal_uInt32 nDummy4; + rIn >> rAtom.nAspect - >> rAtom.nDummy1 + >> nDummy1 >> rAtom.nId - >> rAtom.nDummy2 + >> nDummy2 >> rAtom.nPersistPtr - >> rAtom.nDummy4; + >> nDummy4; return rIn; } diff --git a/svtools/inc/svtools/filter.hxx b/svtools/inc/svtools/filter.hxx index 526ef933753d..95aee1cbdda9 100644 --- a/svtools/inc/svtools/filter.hxx +++ b/svtools/inc/svtools/filter.hxx @@ -243,10 +243,6 @@ struct FilterErrorEx { sal_uLong nFilterError; sal_uLong nStreamError; - long nDummy1; - long nDummy2; - long nDummy3; - long nDummy4; FilterErrorEx() : nFilterError( 0UL ), nStreamError( 0UL ) {} }; @@ -274,14 +270,7 @@ protected: FilterErrorEx* pErrorEx; sal_Bool bAbort; sal_Bool bUseConfig; - sal_Bool bDummy1; - sal_Bool bDummy2; - sal_Bool bDummy3; - sal_Bool bDummy4; long nExpGraphHint; - long nDummy2; - void* pDummy1; - void* pDummy2; public: diff --git a/svtools/inc/svtools/grfmgr.hxx b/svtools/inc/svtools/grfmgr.hxx index 8d2d050f7bb4..c0e632ebe14b 100644 --- a/svtools/inc/svtools/grfmgr.hxx +++ b/svtools/inc/svtools/grfmgr.hxx @@ -208,8 +208,6 @@ private: Timer* mpSwapOutTimer; GrfSimpleCacheObj* mpSimpleCache; sal_uLong mnAnimationLoopCount; - void* mpDummy1; - void* mpDummy2; sal_Bool mbAutoSwapped : 1; sal_Bool mbTransparent : 1; sal_Bool mbAnimated : 1; @@ -217,7 +215,6 @@ private: sal_Bool mbIsInSwapIn : 1; sal_Bool mbIsInSwapOut : 1; sal_Bool mbAlpha : 1; - sal_Bool mbDummyFlag8 : 1; sal_Bool mbIsRenderGraphic : 1; sal_Bool mbHasRenderGraphic : 1; diff --git a/svtools/inc/svtools/transfer.hxx b/svtools/inc/svtools/transfer.hxx index 68eb00c6634b..9c8f983de483 100644 --- a/svtools/inc/svtools/transfer.hxx +++ b/svtools/inc/svtools/transfer.hxx @@ -90,9 +90,6 @@ struct TransferableObjectDescriptor String maTypeName; String maDisplayName; sal_Bool mbCanLink; - void* mpDummy1; - void* mpDummy2; - sal_Bool mbDummy1; SVT_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStm, TransferableObjectDescriptor& rObjDesc ); SVT_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStm, const TransferableObjectDescriptor& rObjDesc ); @@ -109,9 +106,6 @@ struct AcceptDropEvent const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent maDragEvent; sal_Bool mbLeaving; sal_Bool mbDefault; - sal_Bool mbDummy1; - sal_Bool mbDummy2; - sal_Bool mbDummy3; AcceptDropEvent() : mnAction( DND_ACTION_NONE ), @@ -139,9 +133,6 @@ struct ExecuteDropEvent Point maPosPixel; const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent maDropEvent; sal_Bool mbDefault; - sal_Bool mbDummy1; - sal_Bool mbDummy2; - sal_Bool mbDummy3; ExecuteDropEvent() : mnAction( DND_ACTION_NONE ), @@ -193,7 +184,6 @@ private: private: - DataFlavorExList maDummy; ::com::sun::star::uno::Any maAny; ::rtl::OUString maLastFormat; mutable ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > mxClipboard; @@ -314,7 +304,6 @@ private: DataFlavorExVector* mpFormats; TransferableObjectDescriptor* mpObjDesc; TransferableDataHelper_Impl* mpImpl; - void* mpDummy4; protected: void InitFormats(); @@ -439,8 +428,6 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer > mxDragGestureRecognizer; ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureListener > mxDragGestureListener; - void* mpDummy1; - void* mpDummy2; // not available DragSourceHelper(); @@ -494,13 +481,9 @@ private: private: - DataFlavorExList maDummy; ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTarget > mxDropTarget; ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener > mxDropTargetListener; DataFlavorExVector* mpFormats; - void* mpDummy1; - void* mpDummy2; - void* mpDummy3; // not available DropTargetHelper(); diff --git a/svtools/source/inc/sgvmain.hxx b/svtools/source/inc/sgvmain.hxx index 9d023d55fa8e..fe08e2d5508d 100644 --- a/svtools/source/inc/sgvmain.hxx +++ b/svtools/source/inc/sgvmain.hxx @@ -99,8 +99,6 @@ struct ObjAreaType { sal_uInt8 FFarbe; // [Index] sal_uInt8 FBFarbe; // [Index] sal_uInt8 FIntens; // [%] - sal_uInt8 FDummy1; // - sal_Int16 FDummy2; // sal_uInt16 FMuster; // [Index] inkl. Invers, Transparenz }; diff --git a/svx/inc/svx/galbrws.hxx b/svx/inc/svx/galbrws.hxx index f93451e48956..9c92f897741b 100644 --- a/svx/inc/svx/galbrws.hxx +++ b/svx/inc/svx/galbrws.hxx @@ -83,9 +83,6 @@ private: GalleryBrowser1* mpBrowser1; GalleryBrowser2* mpBrowser2; Gallery* mpGallery; - long mnDummy1; - long mnDummy2; - long mnDummy3; void InitSettings(); diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx index b06a8be247b7..18066808f540 100644 --- a/sw/source/core/inc/tabfrm.hxx +++ b/sw/source/core/inc/tabfrm.hxx @@ -93,7 +93,6 @@ class SwTabFrm: public SwLayoutFrm, public SwFlowFrm // #i26945# sal_Bool bObjsDoesFit :1; // For splitting table rows algorithm, this boolean // indicates, if the floating screen objects fits - sal_Bool bDummy4 :1; //Split() spaltet den Frm an der angegebenen Stelle, es wird ein //Follow erzeugt und aufgebaut und direkt hinter this gepastet. From 442b7f6b747855b0899662166927aba82032afde Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 6 Oct 2012 21:44:32 +0300 Subject: [PATCH 440/863] For some reason I need mkdirs here, dunno why others don't? Change-Id: I1e4e701ba4883862ddf79ef45d4f7521346a067d --- solenv/gbuild/UnoApiTarget.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index a5d69fe1ec98..35c91cf656d2 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -341,10 +341,10 @@ $(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$(1),/%.hpp) : touch $$@ $(call gb_UnoApiHeadersTarget_get_comprehensive_dir,$(1),/%.hdl) : - touch $$@ + mkdir -p `dirname $$@` && touch $$@ $(call gb_UnoApiHeadersTarget_get_comprehensive_dir,$(1),/%.hpp) : - touch $$@ + mkdir -p `dirname $$@` && touch $$@ endef From 10542d925849ac573d33482c1b99af7279433dc3 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Sat, 6 Oct 2012 21:45:43 +0200 Subject: [PATCH 441/863] some cppcheck cleaning Change-Id: I433a34f53e0e31e8bf41a080233955c2781bfd72 --- .../source/drivers/mork/MConnection.cxx | 2 +- .../source/drivers/mork/MDatabaseMetaData.cxx | 4 +--- .../source/drivers/mork/MQueryHelper.cxx | 6 +++--- connectivity/source/drivers/mork/MorkParser.cxx | 17 ++++++++--------- .../source/drivers/mork/mork_helper.cxx | 6 ++---- .../source/drivers/mozab/MDatabaseMetaData.cxx | 3 +-- .../drivers/mozab/bootstrap/MNSProfile.cxx | 4 +--- .../mozillasrc/MDatabaseMetaDataHelper.cxx | 10 +++------- 8 files changed, 20 insertions(+), 32 deletions(-) diff --git a/connectivity/source/drivers/mork/MConnection.cxx b/connectivity/source/drivers/mork/MConnection.cxx index bb16d729f2fb..a35badddc2c8 100644 --- a/connectivity/source/drivers/mork/MConnection.cxx +++ b/connectivity/source/drivers/mork/MConnection.cxx @@ -137,7 +137,7 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV if (Tables) { // Iterate all tables - for ( tableIter = Tables->begin(); tableIter != Tables->end(); tableIter++ ) + for ( tableIter = Tables->begin(); tableIter != Tables->end(); ++tableIter ) { if ( 0 == tableIter->first ) continue; SAL_INFO("connectivity.mork", "table->first : " << tableIter->first); diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx index ab6a20f7a4fa..2f24c94c7092 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx @@ -960,9 +960,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( { SAL_INFO("connectivity.mork", "=> ODatabaseMetaData::getTablePrivileges()" ); ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTablePrivileges); - Reference< XResultSet > xRef = NULL; - - xRef = pResult; + Reference< XResultSet > xRef = pResult; ::std::vector< ::rtl::OUString > tables; if ( !m_pMetaDataHelper->getTableStrings( m_pConnection, tables) ) diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx b/connectivity/source/drivers/mork/MQueryHelper.cxx index f21bd28881b7..9091d108e0ae 100644 --- a/connectivity/source/drivers/mork/MQueryHelper.cxx +++ b/connectivity/source/drivers/mork/MQueryHelper.cxx @@ -246,18 +246,18 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection) MorkRowMap::iterator rowIter; // Iterate all tables - for ( tableIter = Tables->begin(); tableIter != Tables->end(); tableIter++ ) + for ( tableIter = Tables->begin(); tableIter != Tables->end(); ++tableIter ) { if (tableIter->first != 1) break; Rows = xConnection->getMorkParser()->getRows( 0x80, &tableIter->second ); if ( Rows ) { // Iterate all rows - for ( rowIter = Rows->begin(); rowIter != Rows->end(); rowIter++ ) + for ( rowIter = Rows->begin(); rowIter != Rows->end(); ++rowIter ) { MQueryHelperResultEntry* entry = new MQueryHelperResultEntry(); for (MorkCells::iterator CellsIter = rowIter->second.begin(); - CellsIter != rowIter->second.end(); CellsIter++ ) + CellsIter != rowIter->second.end(); ++CellsIter ) { std::string column = xConnection->getMorkParser()->getColumn(CellsIter->first); std::string value = xConnection->getMorkParser()->getValue(CellsIter->second); diff --git a/connectivity/source/drivers/mork/MorkParser.cxx b/connectivity/source/drivers/mork/MorkParser.cxx index b57fb94f6952..da772a101f49 100644 --- a/connectivity/source/drivers/mork/MorkParser.cxx +++ b/connectivity/source/drivers/mork/MorkParser.cxx @@ -102,10 +102,9 @@ void MorkParser::initVars() bool MorkParser::parse() { bool Result = true; - char cur = 0; // Run over mork chars and parse each term - cur = nextChar(); + char cur = nextChar(); int i = 0; @@ -606,7 +605,7 @@ void MorkParser::dump() //// columns dict for ( MorkDict::iterator iter = columns_.begin(); - iter != columns_.end(); iter++ ) + iter != columns_.end(); ++iter ) { std::cout << std::hex << std::uppercase << iter->first << " : " @@ -619,7 +618,7 @@ void MorkParser::dump() std::cout << "=============================================\r\n\r\n"; for ( MorkDict::iterator iter = values_.begin(); - iter != values_.end(); iter++ ) + iter != values_.end(); ++iter ) { if (iter->first >= nextAddValueId_) { continue; @@ -637,27 +636,27 @@ void MorkParser::dump() //// Mork data for ( TableScopeMap::iterator iter = mork_.begin(); - iter != mork_.end(); iter++ ) + iter != mork_.end(); ++iter ) { std::cout << "\r\n Scope:" << std::hex << std::uppercase << iter->first << std::endl; for ( MorkTableMap::iterator TableIter = iter->second.begin(); - TableIter != iter->second.end(); TableIter++ ) + TableIter != iter->second.end(); ++TableIter ) { std::cout << "\t Table:" << ( ( int ) TableIter->first < 0 ? "-" : " " ) << std::hex << std::uppercase << TableIter->first << std::endl; for (RowScopeMap::iterator RowScopeIter = TableIter->second.begin(); - RowScopeIter != TableIter->second.end(); RowScopeIter++ ) + RowScopeIter != TableIter->second.end(); ++RowScopeIter ) { std::cout << "\t\t RowScope:" << std::hex << std::uppercase << RowScopeIter->first << std::endl; for (MorkRowMap::iterator RowIter = RowScopeIter->second.begin(); - RowIter != RowScopeIter->second.end(); RowIter++ ) + RowIter != RowScopeIter->second.end(); ++RowIter ) { std::cout << "\t\t\t Row Id:" << ((int) RowIter->first < 0 ? "-" : " ") @@ -666,7 +665,7 @@ void MorkParser::dump() std::cout << "\t\t\t\t Cells:" << std::endl; for (MorkCells::iterator CellsIter = RowIter->second.begin(); - CellsIter != RowIter->second.end(); CellsIter++ ) + CellsIter != RowIter->second.end(); ++CellsIter ) { // Write ids std::cout << "\t\t\t\t\t" diff --git a/connectivity/source/drivers/mork/mork_helper.cxx b/connectivity/source/drivers/mork/mork_helper.cxx index e0c75c7d3fb0..df2758147f05 100644 --- a/connectivity/source/drivers/mork/mork_helper.cxx +++ b/connectivity/source/drivers/mork/mork_helper.cxx @@ -13,14 +13,12 @@ bool openAddressBook(const std::string& path) return false; } const int defaultScope = 0x80; - MorkTableMap *Tables = 0; MorkTableMap::iterator tableIter; - MorkRowMap::iterator rowIter; - Tables = mork.getTables( defaultScope ); + MorkTableMap *Tables = mork.getTables( defaultScope ); if ( Tables ) { // Iterate all tables - for ( tableIter = Tables->begin(); tableIter != Tables->end(); tableIter++ ) + for ( tableIter = Tables->begin(); tableIter != Tables->end(); ++tableIter ) { if ( 0 == tableIter->first ) continue; SAL_INFO("connectivity.mork", "table->first : " << tableIter->first); diff --git a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx index 81300185f66b..ea4a680f2e34 100644 --- a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx +++ b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx @@ -959,9 +959,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& tableNamePattern ) throw(SQLException, RuntimeException) { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTablePrivileges); - Reference< XResultSet > xRef = NULL; - xRef = pResult; + Reference< XResultSet > xRef = pResult; ::std::vector< ::rtl::OUString > tables; ::std::vector< ::rtl::OUString > types; diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx index 2d5c740733d8..bb4af33dfc6e 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx @@ -450,8 +450,6 @@ NS_IMETHODIMP nsProfile::GetProfileDir(const PRUnichar *profileName, nsIFile **p NS_ENSURE_ARG_POINTER(profileDir); *profileDir = nsnull; - nsresult rv = NS_OK; - // PRUnichar != sal_Unicode in mingw rtl::OUString path = xMozillaBootstrap->getProfilePath(xMozillaBootstrap->getCurrentProduct(),reinterpret_cast_mingw_only(profileName)); @@ -459,7 +457,7 @@ NS_IMETHODIMP nsProfile::GetProfileDir(const PRUnichar *profileName, nsIFile **p // PRUnichar != sal_Unicode in mingw nsAutoString filePath(reinterpret_cast_mingw_only(path.getStr())); - rv = NS_NewLocalFile(filePath, PR_TRUE, + nsresult rv = NS_NewLocalFile(filePath, PR_TRUE, getter_AddRefs(localFile)); if (localFile && NS_SUCCEEDED(rv)) return localFile->QueryInterface(NS_GET_IID(nsIFile), (void**)profileDir); diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx index 4b6e2733101e..e841826a6d98 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx @@ -121,9 +121,8 @@ static nsresult enumSubs(nsISimpleEnumerator * subDirs,nsISupportsArray * array) //enum all sub folders static nsresult enumSubs(nsIAbDirectory * parentDir,nsISupportsArray * array) { - nsresult rv = NS_OK ; nsCOMPtr subDirectories; - rv = parentDir->GetChildNodes(getter_AddRefs(subDirectories)); + nsresult rv = parentDir->GetChildNodes(getter_AddRefs(subDirectories)); if (NS_FAILED(rv)) { return rv; } rv = enumSubs(subDirectories,array); @@ -206,12 +205,11 @@ static nsresult getSubsFromParent(const rtl::OString& aParent, nsIEnumerator **a if (aSubs == nsnull) { return NS_ERROR_NULL_POINTER ; } *aSubs = nsnull ; - nsresult retCode = NS_OK ; nsCOMPtr array ; NS_NewISupportsArray(getter_AddRefs(array)) ; - retCode = insertPABDescription(); + nsresult retCode = insertPABDescription(); NS_ENSURE_SUCCESS(retCode, retCode) ; nsCOMPtr rdfService(do_GetService(kRDFServiceCID, &retCode)) ; @@ -747,14 +745,12 @@ sal_Bool MDatabaseMetaDataHelper::NewAddressBook(OConnection* _pCon,const ::rtl: OSL_TRACE("Create table"); // Get the mozilla addressbooks from the base directory. - nsresult rv = NS_OK; - MNSMozabProxy xMProxy; RunArgs args; args.funcIndex = ProxiedFunc::FUNC_NEW_ADDRESS_BOOK; args.argCount = 1; args.arg1 = (void*)&aTableName; - rv = xMProxy.StartProxy(&args,m_ProductType,m_ProfileName); + nsresult rv = xMProxy.StartProxy(&args,m_ProductType,m_ProfileName); _pCon->setForceLoadTables(sal_True); //force reload table next time if (rv == NS_ERROR_FILE_IS_LOCKED) From 89718e94ec0e61147c0a6a8aa168725df32a6d6c Mon Sep 17 00:00:00 2001 From: jailletc36 Date: Sat, 6 Oct 2012 21:39:06 +0200 Subject: [PATCH 442/863] cppcheck : redundantCondition. In this case, it seems to be a typo. Changed the redundant check against fRate with a test against fPrice as everywhere else in the file. Also change some comparisons against 0.0 instead of 0 when using floating point variable (to be consistent with the rest of the code). Change-Id: I94a397f1578a90156359987996cb1ef02d5e4209 Reviewed-on: https://gerrit.libreoffice.org/779 Reviewed-by: Markus Mohrhard Tested-by: Markus Mohrhard --- scaddins/source/analysis/financial.cxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scaddins/source/analysis/financial.cxx b/scaddins/source/analysis/financial.cxx index 18e0f04ca733..14415dde68ec 100644 --- a/scaddins/source/analysis/financial.cxx +++ b/scaddins/source/analysis/financial.cxx @@ -199,7 +199,7 @@ double SAL_CALL AnalysisAddIn::getPrice( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fRate, double fYield, double fRedemp, sal_Int32 nFreq, const ANY& rOB ) THROWDEF_RTE_IAE { - if( fYield < 0.0 || fRate < 0.0 || fRedemp <= 0 || CHK_Freq || nSettle >= nMat ) + if( fYield < 0.0 || fRate < 0.0 || fRedemp <= 0.0 || CHK_Freq || nSettle >= nMat ) THROW_IAE; double fRet = getPrice_( GetNullDate( xOpt ), nSettle, nMat, fRate, fYield, fRedemp, nFreq, getDateMode( xOpt, rOB ) ); @@ -210,7 +210,7 @@ double SAL_CALL AnalysisAddIn::getPrice( constREFXPS& xOpt, double SAL_CALL AnalysisAddIn::getPricedisc( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fDisc, double fRedemp, const ANY& rOB ) THROWDEF_RTE_IAE { - if( fDisc <= 0.0 || fRedemp <= 0 || nSettle >= nMat ) + if( fDisc <= 0.0 || fRedemp <= 0.0 || nSettle >= nMat ) THROW_IAE; double fRet = fRedemp * ( 1.0 - fDisc * GetYearDiff( GetNullDate( xOpt ), nSettle, nMat, getDateMode( xOpt, rOB ) ) ); @@ -336,7 +336,7 @@ double SAL_CALL AnalysisAddIn::getYieldmat( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue, double fRate, double fPrice, const ANY& rOB ) THROWDEF_RTE_IAE { - if( fRate < 0.0 || fRate <= 0.0 || nSettle >= nMat ) + if( fPrice <= 0.0 || fRate <= 0.0 || nSettle >= nMat ) THROW_IAE; double fRet = GetYieldmat( GetNullDate( xOpt ), nSettle, nMat, nIssue, fRate, fPrice, getDateMode( xOpt, rOB ) ); @@ -401,7 +401,7 @@ double SAL_CALL AnalysisAddIn::getOddfprice( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue, sal_Int32 nFirstCoup, double fRate, double fYield, double fRedemp, sal_Int32 nFreq, const ANY& rOB ) THROWDEF_RTE_IAE { - if( fRate < 0 || fYield < 0 || CHK_Freq || nMat <= nFirstCoup || nFirstCoup <= nSettle || nSettle <= nIssue ) + if( fRate < 0.0 || fYield < 0.0 || CHK_Freq || nMat <= nFirstCoup || nFirstCoup <= nSettle || nSettle <= nIssue ) THROW_IAE; double fRet = GetOddfprice( GetNullDate( xOpt ), nSettle, nMat, nIssue, nFirstCoup, fRate, fYield, fRedemp, nFreq, getDateMode( xOpt, rOB ) ); @@ -413,7 +413,7 @@ double SAL_CALL AnalysisAddIn::getOddfyield( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue, sal_Int32 nFirstCoup, double fRate, double fPrice, double fRedemp, sal_Int32 nFreq, const ANY& rOB ) THROWDEF_RTE_IAE { - if( fRate < 0 || fPrice <= 0 || CHK_Freq || nMat <= nFirstCoup || nFirstCoup <= nSettle || nSettle <= nIssue ) + if( fRate < 0.0 || fPrice <= 0.0 || CHK_Freq || nMat <= nFirstCoup || nFirstCoup <= nSettle || nSettle <= nIssue ) THROW_IAE; double fRet = GetOddfyield( GetNullDate( xOpt ), nSettle, nMat, nIssue, nFirstCoup, fRate, fPrice, fRedemp, nFreq, @@ -426,7 +426,7 @@ double SAL_CALL AnalysisAddIn::getOddlprice( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nLastInterest, double fRate, double fYield, double fRedemp, sal_Int32 nFreq, const ANY& rOB ) THROWDEF_RTE_IAE { - if( fRate < 0 || fYield < 0 || CHK_Freq || nMat <= nSettle || nSettle <= nLastInterest ) + if( fRate < 0.0 || fYield < 0.0 || CHK_Freq || nMat <= nSettle || nSettle <= nLastInterest ) THROW_IAE; double fRet = GetOddlprice( GetNullDate( xOpt ), nSettle, nMat, nLastInterest, fRate, fYield, fRedemp, nFreq, @@ -439,7 +439,7 @@ double SAL_CALL AnalysisAddIn::getOddlyield( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nLastInterest, double fRate, double fPrice, double fRedemp, sal_Int32 nFreq, const ANY& rOB ) THROWDEF_RTE_IAE { - if( fRate < 0 || fPrice <= 0 || CHK_Freq || nMat <= nSettle || nSettle <= nLastInterest ) + if( fRate < 0.0 || fPrice <= 0.0 || CHK_Freq || nMat <= nSettle || nSettle <= nLastInterest ) THROW_IAE; double fRet = GetOddlyield( GetNullDate( xOpt ), nSettle, nMat, nLastInterest, fRate, fPrice, fRedemp, nFreq, From 73c3907bce33c07ef78c0bb9ff1e0df8b9fbb323 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 6 Oct 2012 23:10:58 +0300 Subject: [PATCH 443/863] For some reason saxparser aborts for me without this This is in a Mac build tree using the 10.7 SDK and latest Xcode Clang. This codemaker-generated type stuff seems awfully fragile. Should we just bite the bullet and do the "comprehensive" thing for all UDKAPI types all the time on all platforms? Is that a sane question to ask? Change-Id: I9d17e76a83ff71898409179acb445832436f7bbd --- codemaker/source/cppumaker/cpputype.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx index eca01435a4e2..0996db61329c 100644 --- a/codemaker/source/cppumaker/cpputype.cxx +++ b/codemaker/source/cppumaker/cpputype.cxx @@ -119,6 +119,7 @@ bool isBootstrapType(rtl::OString const & name) { "com/sun/star/reflection/XMethodParameter", "com/sun/star/reflection/XStructTypeDescription", "com/sun/star/reflection/XTypeDescription", + "com/sun/star/reflection/XTypeDescriptionEnumeration", "com/sun/star/reflection/XTypeDescriptionEnumerationAccess", "com/sun/star/reflection/XUnionTypeDescription", "com/sun/star/registry/XImplementationRegistration", From ce3d8addcea0d3c8b6efae1f0d3836325deeb72f Mon Sep 17 00:00:00 2001 From: jailletc36 Date: Sat, 6 Oct 2012 22:38:56 +0200 Subject: [PATCH 444/863] cppcheck: Unused variable Defined the aDicLangInUse within the #ifdef block where it is used. Change-Id: I872cf178a803c3210898f7f317211a8d3a2d368e Reviewed-on: https://gerrit.libreoffice.org/782 Reviewed-by: Markus Mohrhard Tested-by: Markus Mohrhard --- lingucomponent/source/lingutil/lingutil.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lingucomponent/source/lingutil/lingutil.cxx b/lingucomponent/source/lingutil/lingutil.cxx index 6259097c888a..6fe06a51663c 100644 --- a/lingucomponent/source/lingutil/lingutil.cxx +++ b/lingucomponent/source/lingutil/lingutil.cxx @@ -149,14 +149,14 @@ std::vector< SvtLinguConfigDictionaryEntry > GetOldStyleDics( const char *pDicTy if (aFormatName.isEmpty() || aDicExtension.Len() == 0) return aRes; - // set of languages to remember the language where it is already - // decided to make use of the dictionary. - std::set< OUString > aDicLangInUse; - #ifdef SYSTEM_DICTS osl::Directory aSystemDicts(aSystemDir); if (aSystemDicts.open() == osl::FileBase::E_None) { + // set of languages to remember the language where it is already + // decided to make use of the dictionary. + std::set< OUString > aDicLangInUse; + osl::DirectoryItem aItem; osl::FileStatus aFileStatus(osl_FileStatus_Mask_FileURL); while (aSystemDicts.getNextItem(aItem) == osl::FileBase::E_None) From 8113588c35ae494ccdcbb864a7f0f9e08697118a Mon Sep 17 00:00:00 2001 From: jailletc36 Date: Sat, 6 Oct 2012 22:23:29 +0200 Subject: [PATCH 445/863] cppcheck: unreadVariable. aLangMap is a std::map that is written but never used, so drop it. Change-Id: I8f5184c58fbe812beab8580349535920645e062e Reviewed-on: https://gerrit.libreoffice.org/781 Reviewed-by: Markus Mohrhard Tested-by: Markus Mohrhard --- framework/source/uielement/langselectionmenucontroller.cxx | 2 -- 1 file changed, 2 deletions(-) diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx index 1dc52ed35cf3..44605f082d9f 100644 --- a/framework/source/uielement/langselectionmenucontroller.cxx +++ b/framework/source/uielement/langselectionmenucontroller.cxx @@ -251,7 +251,6 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup sal_Int16 nItemId = 1; // in this control the item id is not important for executing the command const OUString sAsterix("*"); // multiple languages in current selection const OUString sEmpty; // 'no language found' from language guessing - std::map< sal_Int16, OUString > aLangMap; std::set< OUString >::const_iterator it; for (it = aLangItems.begin(); it != aLangItems.end(); ++it) { @@ -269,7 +268,6 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup //make a sign for the current language pPopupMenu->CheckItem( nItemId, sal_True ); } - aLangMap[ nItemId ] = rStr; ++nItemId; } } From 8a2f3de3ef1bee204ec1f94493753bd076ff1f6b Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sat, 6 Oct 2012 19:31:53 -0500 Subject: [PATCH 446/863] WaE due lcms2 include, hide it Change-Id: I8b06bd1853cec283f330e892c1efa229682d9767 --- configure.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure.in b/configure.in index f7d0453408b4..5dfc06f6ec3e 100644 --- a/configure.in +++ b/configure.in @@ -6899,6 +6899,9 @@ else SYSTEM_LCMS2=NO BUILD_TYPE="$BUILD_TYPE LCMS2" LCMS2_CFLAGS="-I${OUTDIR}/inc/lcms2" + if test $_os = Darwin; then + LCMS2_CFLAGS="$LCMS2_CFLAGS -Wno-long-long" + fi LCMS2_LIBS="-L${OUTDIR}/lib -llcms2" fi AC_SUBST(SYSTEM_LCMS2) From 701db391b3d3b689af4ca5ab9d67c35b2459c1b3 Mon Sep 17 00:00:00 2001 From: Takeshi Abe Date: Sun, 7 Oct 2012 09:44:43 +0900 Subject: [PATCH 447/863] sal_Bool to bool Change-Id: Ieeebcd89ae2728c6314f28413759bbb353c327bf --- sw/inc/SwStyleNameMapper.hxx | 2 +- sw/inc/acmplwrd.hxx | 2 +- sw/inc/crsrsh.hxx | 2 +- sw/inc/doc.hxx | 4 +-- sw/inc/editsh.hxx | 2 +- sw/inc/viscrs.hxx | 8 ++--- sw/source/core/crsr/crsrsh.cxx | 6 ++-- sw/source/core/crsr/unocrsr.cxx | 2 +- sw/source/core/crsr/viscrs.cxx | 6 ++-- sw/source/core/doc/SwStyleNameMapper.cxx | 18 +++++------ sw/source/core/doc/acmplwrd.cxx | 6 ++-- sw/source/core/doc/dbgoutsw.cxx | 4 +-- sw/source/core/doc/doc.cxx | 40 ++++++++++++------------ sw/source/core/edit/editsh.cxx | 4 +-- sw/source/core/unocore/unochart.cxx | 2 +- sw/source/core/unocore/unoftn.cxx | 2 +- sw/source/core/unocore/unoobj.cxx | 4 +-- sw/source/core/unocore/unoobj2.cxx | 10 +++--- sw/source/core/unocore/unoparagraph.cxx | 2 +- sw/source/core/unocore/unoportenum.cxx | 4 +-- sw/source/core/unocore/unoredline.cxx | 4 +-- sw/source/core/unocore/unotbl.cxx | 22 ++++++------- sw/source/core/unocore/unotext.cxx | 4 +-- sw/source/ui/inc/navmgr.hxx | 4 +-- sw/source/ui/wrtsh/navmgr.cxx | 4 +-- 25 files changed, 84 insertions(+), 84 deletions(-) diff --git a/sw/inc/SwStyleNameMapper.hxx b/sw/inc/SwStyleNameMapper.hxx index 893ec73b841e..4142ff9a518a 100644 --- a/sw/inc/SwStyleNameMapper.hxx +++ b/sw/inc/SwStyleNameMapper.hxx @@ -141,7 +141,7 @@ protected: static void fillNameFromId ( sal_uInt16 nId, String &rName, sal_Bool bProgName ); static const String& getNameFromId ( sal_uInt16 nId, const String &rName, sal_Bool bProgName ); static const NameToIdHash& getHashTable ( SwGetPoolIdFromName, sal_Bool bProgName ); - static sal_Bool SuffixIsUser ( const String & rString ); + static bool SuffixIsUser ( const String & rString ); static void CheckSuffixAndDelete ( String & rString ); public: diff --git a/sw/inc/acmplwrd.hxx b/sw/inc/acmplwrd.hxx index 8e0dd750141a..6d86722442c4 100644 --- a/sw/inc/acmplwrd.hxx +++ b/sw/inc/acmplwrd.hxx @@ -59,7 +59,7 @@ public: SwAutoCompleteWord( sal_uInt16 nWords = 500, sal_uInt16 nMWrdLen = 10 ); ~SwAutoCompleteWord(); - sal_Bool InsertWord( const String& rWord, SwDoc& rDoc ); + bool InsertWord( const String& rWord, SwDoc& rDoc ); sal_Bool GetRange( const String& rWord, sal_uInt16& rStt, sal_uInt16& rEnd ) const; diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index e8678e99d783..fc421d2358c4 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -901,7 +901,7 @@ inline SwPaM* SwCrsrShell::GetTblCrs() inline void SwCrsrShell::UnSetVisCrsr() { pVisCrsr->Hide(); - pVisCrsr->SetDragCrsr( sal_False ); + pVisCrsr->SetDragCrsr( false ); } #endif // _CRSRSH_HXX diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 682a97aaba71..76a7ef4767dd 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -1835,7 +1835,7 @@ public: /// restore the invisible content if it's available on the undo stack bool RestoreInvisibleContent(); - sal_Bool ConvertFieldsToText(); + bool ConvertFieldsToText(); /// Create sub-documents according to given collection. /// If no collection is given, use chapter styles for 1st level. @@ -1883,7 +1883,7 @@ public: // -------------------- Uno - Interfaces --------------------------- const SwUnoCrsrTbl& GetUnoCrsrTbl() const { return *pUnoCrsrTbl; } - SwUnoCrsr* CreateUnoCrsr( const SwPosition& rPos, sal_Bool bTblCrsr = sal_False ); + SwUnoCrsr* CreateUnoCrsr( const SwPosition& rPos, bool bTblCrsr = false ); // -------------------- FeShell - Interfaces ----------------------- // !!! These assume always an existing layout !!! diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index 58d8befd6231..ba5fcbd3d133 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -206,7 +206,7 @@ public: sal_Bool RemoveInvisibleContent(); /// Replace fields by text - mailmerge support. - sal_Bool ConvertFieldsToText(); + bool ConvertFieldsToText(); /// Set all numbering start points to a fixed value - mailmerge support. void SetNumberingRestart(); diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx index f8b274bfaa83..f9ef4eafd458 100644 --- a/sw/inc/viscrs.hxx +++ b/sw/inc/viscrs.hxx @@ -43,8 +43,8 @@ class SwVisCrsr friend void _InitCore(); friend void _FinitCore(); - sal_Bool bIsVisible : 1; - sal_Bool bIsDragCrsr : 1; + bool bIsVisible : 1; + bool bIsDragCrsr : 1; Cursor aTxtCrsr; const SwCrsrShell* pCrsrShell; @@ -58,8 +58,8 @@ public: void Show(); void Hide(); - sal_Bool IsVisible() const { return bIsVisible; } - void SetDragCrsr( sal_Bool bFlag = sal_True ) { bIsDragCrsr = bFlag; } + bool IsVisible() const { return bIsVisible; } + void SetDragCrsr( bool bFlag = true ) { bIsDragCrsr = bFlag; } }; diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index f37a4b7c97a7..8dfc238133a3 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -1194,10 +1194,10 @@ void SwCrsrShell::Paint( const Rectangle &rRect) void SwCrsrShell::VisPortChgd( const SwRect & rRect ) { SET_CURR_SHELL( this ); - sal_Bool bVis; // switch off all cursors when scrolling + bool bVis; // switch off all cursors when scrolling // if a cursor is visible then hide the SV cursor - if( sal_True == ( bVis = pVisCrsr->IsVisible() )) + if( ( bVis = pVisCrsr->IsVisible() ) ) pVisCrsr->Hide(); bVisPortChgd = sal_True; @@ -2317,7 +2317,7 @@ sal_Bool SwCrsrShell::SetVisCrsr( const Point &rPt ) aCrsrHeight.Y() = aCharRect.Height(); } - pVisCrsr->SetDragCrsr( sal_True ); + pVisCrsr->SetDragCrsr( true ); pVisCrsr->Show(); // show again } return bRet; diff --git a/sw/source/core/crsr/unocrsr.cxx b/sw/source/core/crsr/unocrsr.cxx index 43f3d71b9cc1..d5dde71db4bb 100644 --- a/sw/source/core/crsr/unocrsr.cxx +++ b/sw/source/core/crsr/unocrsr.cxx @@ -79,7 +79,7 @@ SwUnoTableCrsr * SwUnoTableCrsr::Clone() const { SwUnoTableCrsr * pNewCrsr = dynamic_cast( GetDoc()->CreateUnoCrsr( - *GetPoint(), sal_True /* create SwUnoTableCrsr */ ) ); + *GetPoint(), true /* create SwUnoTableCrsr */ ) ); OSL_ENSURE(pNewCrsr, "Clone: cannot create SwUnoTableCrsr?"); if (HasMark()) { diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx index 88d840480b0c..1af6a6efad80 100644 --- a/sw/source/core/crsr/viscrs.cxx +++ b/sw/source/core/crsr/viscrs.cxx @@ -68,7 +68,7 @@ SwVisCrsr::SwVisCrsr( const SwCrsrShell * pCShell ) { pCShell->GetWin()->SetCursor( &aTxtCrsr ); bIsVisible = aTxtCrsr.IsVisible(); - bIsDragCrsr = sal_False; + bIsDragCrsr = false; aTxtCrsr.SetWidth( 0 ); } @@ -89,7 +89,7 @@ void SwVisCrsr::Show() { if( !bIsVisible ) { - bIsVisible = sal_True; + bIsVisible = true; // display at all? if( pCrsrShell->VisArea().IsOver( pCrsrShell->aCharRect ) ) @@ -103,7 +103,7 @@ void SwVisCrsr::Hide() { if( bIsVisible ) { - bIsVisible = sal_False; + bIsVisible = false; if( aTxtCrsr.IsVisible() ) // Shouldn't the flags be in effect? aTxtCrsr.Hide(); diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx b/sw/source/core/doc/SwStyleNameMapper.cxx index 794bb3aa706d..a5653364b5e9 100644 --- a/sw/source/core/doc/SwStyleNameMapper.cxx +++ b/sw/source/core/doc/SwStyleNameMapper.cxx @@ -314,11 +314,11 @@ const struct SwTableEntry NumRuleProgNameTable [] = }; #undef ENTRY -sal_Bool SwStyleNameMapper::SuffixIsUser ( const String & rString ) +bool SwStyleNameMapper::SuffixIsUser ( const String & rString ) { const sal_Unicode *pChar = rString.GetBuffer(); sal_Int32 nLen = rString.Len(); - sal_Bool bRet = sal_False; + bool bRet = false; if( nLen > 8 && pChar[nLen-7] == ' ' && pChar[nLen-6] == '(' && @@ -327,7 +327,7 @@ sal_Bool SwStyleNameMapper::SuffixIsUser ( const String & rString ) pChar[nLen-3] == 'e' && pChar[nLen-2] == 'r' && pChar[nLen-1] == ')' ) - bRet = sal_True; + bRet = true; return bRet; } void SwStyleNameMapper::CheckSuffixAndDelete ( String & rString ) @@ -468,10 +468,10 @@ const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlag break; } #ifdef _NEED_TO_DEBUG_MAPPING - static sal_Bool bTested = sal_False; + static bool bTested = false; if ( !bTested ) { - bTested = sal_True; + bTested = true; { for ( sal_uInt16 nIndex = 0, nId = RES_POOLCOLL_TEXT_BEGIN ; nId < RES_POOLCOLL_TEXT_END ; nId++,nIndex++ ) { @@ -1086,7 +1086,7 @@ const boost::ptr_vector& SwStyleNameMapper::GetNumRuleProgNameArray() const String SwStyleNameMapper::GetSpecialExtraProgName( const String& rExtraUIName ) { String aRes = rExtraUIName; - sal_Bool bChgName = sal_False; + bool bChgName = false; const boost::ptr_vector& rExtraArr(GetExtraUINameArray()); static sal_uInt16 nIds[] = { @@ -1101,7 +1101,7 @@ const String SwStyleNameMapper::GetSpecialExtraProgName( const String& rExtraUIN { if (aRes == rExtraArr[ *pIds ]) { - bChgName = sal_True; + bChgName = true; break; } } @@ -1113,7 +1113,7 @@ const String SwStyleNameMapper::GetSpecialExtraProgName( const String& rExtraUIN const String SwStyleNameMapper::GetSpecialExtraUIName( const String& rExtraProgName ) { String aRes = rExtraProgName; - sal_Bool bChgName = sal_False; + bool bChgName = false; const boost::ptr_vector& rExtraArr(GetExtraProgNameArray()); static sal_uInt16 nIds[] = { @@ -1129,7 +1129,7 @@ const String SwStyleNameMapper::GetSpecialExtraUIName( const String& rExtraProgN { if (aRes == rExtraArr[ *pIds ]) { - bChgName = sal_True; + bChgName = true; break; } } diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx index 65ce21aa47c3..5b86147a61f0 100644 --- a/sw/source/core/doc/acmplwrd.cxx +++ b/sw/source/core/doc/acmplwrd.cxx @@ -245,7 +245,7 @@ SwAutoCompleteWord::~SwAutoCompleteWord() #endif } -sal_Bool SwAutoCompleteWord::InsertWord( const String& rWord, SwDoc& rDoc ) +bool SwAutoCompleteWord::InsertWord( const String& rWord, SwDoc& rDoc ) { SwDocShell* pDocShell = rDoc.GetDocShell(); SfxMedium* pMedium = pDocShell ? pDocShell->GetMedium() : 0; @@ -262,7 +262,7 @@ sal_Bool SwAutoCompleteWord::InsertWord( const String& rWord, SwDoc& rDoc ) aNewWord = comphelper::string::remove(aNewWord, CH_TXTATR_BREAKWORD); pImpl->AddDocument(rDoc); - sal_Bool bRet = sal_False; + bool bRet = false; xub_StrLen nWrdLen = aNewWord.Len(); while( nWrdLen && '.' == aNewWord.GetChar( nWrdLen-1 )) --nWrdLen; @@ -278,7 +278,7 @@ sal_Bool SwAutoCompleteWord::InsertWord( const String& rWord, SwDoc& rDoc ) if (aInsPair.second) { - bRet = sal_True; + bRet = true; if (aLRULst.size() >= nMaxCount) { // the last one needs to be removed diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx index 6854be4f53ad..3719ef581442 100755 --- a/sw/source/core/doc/dbgoutsw.cxx +++ b/sw/source/core/doc/dbgoutsw.cxx @@ -722,7 +722,7 @@ SW_DLLPUBLIC const char * dbg_out(const SwTxtNode * pNode) return NULL; } -sal_Bool lcl_dbg_add_node(const SwNodePtr & pNode, void * pArgs) +bool lcl_dbg_add_node(const SwNodePtr & pNode, void * pArgs) { if (pNode) { @@ -731,7 +731,7 @@ sal_Bool lcl_dbg_add_node(const SwNodePtr & pNode, void * pArgs) } //MBA: this code didn't compile, needed to add a return value - return sal_True; + return true; } void lcl_dbg_nodes_inner(String & aStr, SwNodes & rNodes, sal_uLong & nIndex) diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index af8717ea0421..2a67f675b864 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -676,8 +676,8 @@ const JobSetup* SwDoc::getJobsetup() const void SwDoc::setJobsetup(/*[in]*/ const JobSetup &rJobSetup ) { - sal_Bool bCheckPageDescs = 0 == pPrt; - sal_Bool bDataChanged = sal_False; + bool bCheckPageDescs = 0 == pPrt; + bool bDataChanged = false; if ( pPrt ) { @@ -686,7 +686,7 @@ void SwDoc::setJobsetup(/*[in]*/ const JobSetup &rJobSetup ) if ( pPrt->GetJobSetup() != rJobSetup ) { pPrt->SetJobSetup( rJobSetup ); - bDataChanged = sal_True; + bDataChanged = true; } } else @@ -708,7 +708,7 @@ void SwDoc::setJobsetup(/*[in]*/ const JobSetup &rJobSetup ) else { pPrt = p; - bDataChanged = sal_True; + bDataChanged = true; } } if ( bDataChanged && !get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) ) @@ -2128,7 +2128,7 @@ void SwDoc::Summary( SwDoc* pExtDoc, sal_uInt8 nLevel, sal_uInt8 nPara, sal_Bool while( aIndx < aEndOfDoc ) { SwNode *pNode; - sal_Bool bDelete = sal_False; + bool bDelete = false; if( (pNode = &aIndx.GetNode())->IsTxtNode() ) { SwTxtNode *pNd = (SwTxtNode*)pNode; @@ -2148,7 +2148,7 @@ void SwDoc::Summary( SwDoc* pExtDoc, sal_uInt8 nLevel, sal_uInt8 nPara, sal_Bool if( !pNd->Len() && pNd->StartOfSectionIndex()+2 < pNd->EndOfSectionIndex() ) { - bDelete = sal_True; + bDelete = true; pExtDoc->GetNodes().Delete( aIndx ); } } @@ -2162,7 +2162,7 @@ void SwDoc::Summary( SwDoc* pExtDoc, sal_uInt8 nLevel, sal_uInt8 nPara, sal_Bool // Remove the invisible content from the document e.g. hidden areas, hidden paragraphs bool SwDoc::RemoveInvisibleContent() { - sal_Bool bRet = sal_False; + bool bRet = false; GetIDocumentUndoRedo().StartUndo( UNDO_UI_DELETE_INVISIBLECNTNT, NULL ); { @@ -2175,7 +2175,7 @@ bool SwDoc::RemoveInvisibleContent() pTxtNd->GetpSwpHints() && pTxtNd->HasHiddenParaField() && &pTxtNd->GetNodes() == &GetNodes() ) { - bRet = sal_True; + bRet = true; SwPaM aPam( *pTxtNd, 0, *pTxtNd, pTxtNd->GetTxt().Len() ); // Remove hidden paragraph or delete contents: @@ -2211,7 +2211,7 @@ bool SwDoc::RemoveInvisibleContent() if ( pTxtNd->HasHiddenCharAttribute( true ) ) { bRemoved = sal_True; - bRet = sal_True; + bRet = true; // Remove hidden paragraph or delete contents: // Delete contents if @@ -2234,7 +2234,7 @@ bool SwDoc::RemoveInvisibleContent() else if ( pTxtNd->HasHiddenCharAttribute( false ) ) { bRemoved = sal_True; - bRet = sal_True; + bRet = true; SwScriptInfo::DeleteHiddenRanges( *pTxtNd ); } @@ -2290,7 +2290,7 @@ bool SwDoc::RemoveInvisibleContent() SwSectionNode* pSectNd = pSectFmt->GetSectionNode(); if( pSectNd ) { - bRet = sal_True; + bRet = true; SwPaM aPam( *pSectNd ); if( pSectNd->StartOfSectionNode()->StartOfSectionIndex() == @@ -2332,11 +2332,11 @@ bool SwDoc::RemoveInvisibleContent() bool SwDoc::HasInvisibleContent() const { - sal_Bool bRet = sal_False; + bool bRet = false; SwClientIter aIter( *GetSysFldType( RES_HIDDENPARAFLD ) ); if( aIter.First( TYPE( SwFmtFld ) ) ) - bRet = sal_True; + bRet = true; // // Search for any hidden paragraph (hidden text attribute) @@ -2351,7 +2351,7 @@ bool SwDoc::HasInvisibleContent() const SwPaM aPam( *pTxtNd, 0, *pTxtNd, pTxtNd->GetTxt().Len() ); if( pTxtNd->HasHiddenCharAttribute( true ) || ( pTxtNd->HasHiddenCharAttribute( false ) ) ) { - bRet = sal_True; + bRet = true; } } } @@ -2370,7 +2370,7 @@ bool SwDoc::HasInvisibleContent() const continue; SwSection* pSect = pSectFmt->GetSection(); if( pSect->IsHidden() ) - bRet = sal_True; + bRet = true; } } return bRet; @@ -2391,9 +2391,9 @@ bool SwDoc::RestoreInvisibleContent() } -sal_Bool SwDoc::ConvertFieldsToText() +bool SwDoc::ConvertFieldsToText() { - sal_Bool bRet = sal_False; + bool bRet = false; LockExpFlds(); GetIDocumentUndoRedo().StartUndo( UNDO_UI_REPLACE, NULL ); @@ -2524,7 +2524,7 @@ bool SwDoc::LinksUpdated() const } bool SwDoc::EmbedAllLinks() { - sal_Bool bRet = sal_False; + bool bRet = false; sfx2::LinkManager& rLnkMgr = GetLinkManager(); const ::sfx2::SvBaseLinks& rLinks = rLnkMgr.GetLinks(); if( !rLinks.empty() ) @@ -2542,7 +2542,7 @@ bool SwDoc::EmbedAllLinks() if( xLink.Is() ) rLnkMgr.Remove( xLink ); - bRet = sal_True; + bRet = true; } GetIDocumentUndoRedo().DelAllUndoObj(); @@ -2675,7 +2675,7 @@ bool SwDoc::ContainsHiddenChars() const return false; } -SwUnoCrsr* SwDoc::CreateUnoCrsr( const SwPosition& rPos, sal_Bool bTblCrsr ) +SwUnoCrsr* SwDoc::CreateUnoCrsr( const SwPosition& rPos, bool bTblCrsr ) { SwUnoCrsr* pNew; if( bTblCrsr ) diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx index bf454d788dfb..3ef955c1dcd2 100644 --- a/sw/source/core/edit/editsh.cxx +++ b/sw/source/core/edit/editsh.cxx @@ -835,10 +835,10 @@ sal_Bool SwEditShell::RemoveInvisibleContent() EndAllAction(); return bRet; } -sal_Bool SwEditShell::ConvertFieldsToText() +bool SwEditShell::ConvertFieldsToText() { StartAllAction(); - sal_Bool bRet = GetDoc()->ConvertFieldsToText(); + bool bRet = GetDoc()->ConvertFieldsToText(); EndAllAction(); return bRet; } diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index ec521881dc10..a828a54d4dc2 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -438,7 +438,7 @@ static void GetFormatAndCreateCursorFromRangeRep( const SwStartNode* pSttNd = pTLBox->GetSttNd(); SwPosition aPos(*pSttNd); // set cursor to top left box of range - SwUnoCrsr* pUnoCrsr = pTblFmt->GetDoc()->CreateUnoCrsr(aPos, sal_True); + SwUnoCrsr* pUnoCrsr = pTblFmt->GetDoc()->CreateUnoCrsr(aPos, true); pUnoCrsr->Move( fnMoveForward, fnGoNode ); pUnoCrsr->SetRemainInSection( sal_False ); // #i80314# diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx index 304bed62167a..1eab4b606cc0 100644 --- a/sw/source/core/unocore/unoftn.cxx +++ b/sw/source/core/unocore/unoftn.cxx @@ -510,7 +510,7 @@ SwXFootnote::createEnumeration() throw (uno::RuntimeException) SwTxtFtn const*const pTxtFtn = rFmt.GetTxtFtn(); SwPosition aPos( *pTxtFtn->GetStartNode() ); ::std::auto_ptr pUnoCursor( - GetDoc()->CreateUnoCrsr(aPos, sal_False)); + GetDoc()->CreateUnoCrsr(aPos, false)); pUnoCursor->Move(fnMoveForward, fnGoNode); const uno::Reference< container::XEnumeration > xRet = new SwXParagraphEnumeration(this, pUnoCursor, CURSOR_FOOTNOTE); diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index d419533f4b22..cb7fe6a7ca95 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -726,7 +726,7 @@ public: const enum CursorType eType, uno::Reference xParent, SwPosition const& rPoint, SwPosition const*const pMark) - : SwClient(rDoc.CreateUnoCrsr(rPoint, sal_False)) + : SwClient(rDoc.CreateUnoCrsr(rPoint, false)) , m_rPropSet(*aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_CURSOR)) , m_eType(eType) , m_xParentText(xParent) @@ -2035,7 +2035,7 @@ lcl_SelectParaAndReset( SwPaM &rPaM, SwDoc & rDoc, SwPosition aStart = *rPaM.Start(); SwPosition aEnd = *rPaM.End(); SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< SwUnoCrsr > pTemp ( rDoc.CreateUnoCrsr(aStart, sal_False) ); + ::std::auto_ptr< SwUnoCrsr > pTemp ( rDoc.CreateUnoCrsr(aStart, false) ); SAL_WNODEPRECATED_DECLARATIONS_POP if(!SwUnoCursorHelper::IsStartOfPara(*pTemp)) { diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index a1359bd80e50..c61eca6ade59 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -627,7 +627,7 @@ throw (container::NoSuchElementException, lang::WrappedTargetException, SwPosition* pStart = pUnoCrsr->Start(); SAL_WNODEPRECATED_DECLARATIONS_PUSH const ::std::auto_ptr aNewCrsr( - pUnoCrsr->GetDoc()->CreateUnoCrsr(*pStart, sal_False) ); + pUnoCrsr->GetDoc()->CreateUnoCrsr(*pStart, false) ); SAL_WNODEPRECATED_DECLARATIONS_POP // one may also go into tables here if ((CURSOR_TBLTEXT != m_eCursorType) && @@ -1184,7 +1184,7 @@ SwXTextRange::CreateXTextRange( ::sw::CreateParentXText(rDoc, rPos)); SAL_WNODEPRECATED_DECLARATIONS_PUSH const ::std::auto_ptr pNewCrsr( - rDoc.CreateUnoCrsr(rPos, sal_False)); + rDoc.CreateUnoCrsr(rPos, false)); SAL_WNODEPRECATED_DECLARATIONS_POP if(pMark) { @@ -1320,7 +1320,7 @@ throw (uno::RuntimeException) const SwPosition aPos(GetDoc()->GetNodes().GetEndOfContent()); SAL_WNODEPRECATED_DECLARATIONS_PUSH const ::std::auto_ptr pNewCrsr( - m_pImpl->m_rDoc.CreateUnoCrsr(aPos, sal_False)); + m_pImpl->m_rDoc.CreateUnoCrsr(aPos, false)); SAL_WNODEPRECATED_DECLARATIONS_POP if (!GetPositions(*pNewCrsr)) { @@ -1344,7 +1344,7 @@ SwXTextRange::createEnumeration() throw (uno::RuntimeException) const SwPosition aPos(GetDoc()->GetNodes().GetEndOfContent()); SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr pNewCrsr( - m_pImpl->m_rDoc.CreateUnoCrsr(aPos, sal_False)); + m_pImpl->m_rDoc.CreateUnoCrsr(aPos, false)); SAL_WNODEPRECATED_DECLARATIONS_POP if (!GetPositions(*pNewCrsr)) { @@ -1751,7 +1751,7 @@ public: FrameDependList_t m_Frames; Impl(SwPaM const & rPaM) - : SwClient(rPaM.GetDoc()->CreateUnoCrsr(*rPaM.GetPoint(), sal_False)) + : SwClient(rPaM.GetDoc()->CreateUnoCrsr(*rPaM.GetPoint(), false)) { if (rPaM.HasMark()) { diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx index 64a267fe82f4..6e6ed92c04b8 100644 --- a/sw/source/core/unocore/unoparagraph.cxx +++ b/sw/source/core/unocore/unoparagraph.cxx @@ -1027,7 +1027,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException) SwPosition aStart( *aCursor.Start() ); SwPosition aEnd ( *aCursor.End() ); ::std::auto_ptr pTemp( - aCursor.GetDoc()->CreateUnoCrsr(aStart, sal_False) ); + aCursor.GetDoc()->CreateUnoCrsr(aStart, false) ); if(!SwUnoCursorHelper::IsStartOfPara(*pTemp)) { pTemp->MovePara(fnParaCurr, fnParaStart); diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx index a0246fb8da58..7c8897d1a285 100644 --- a/sw/source/core/unocore/unoportenum.cxx +++ b/sw/source/core/unocore/unoportenum.cxx @@ -255,7 +255,7 @@ SwXTextPortionEnumeration::SwXTextPortionEnumeration( : m_Portions() { SwUnoCrsr* pUnoCrsr = - rParaCrsr.GetDoc()->CreateUnoCrsr(*rParaCrsr.GetPoint(), sal_False); + rParaCrsr.GetDoc()->CreateUnoCrsr(*rParaCrsr.GetPoint(), false); pUnoCrsr->Add(this); OSL_ENSURE(nEnd == -1 || (nStart <= nEnd && @@ -274,7 +274,7 @@ SwXTextPortionEnumeration::SwXTextPortionEnumeration( : m_Portions( rPortions ) { SwUnoCrsr* const pUnoCrsr = - rParaCrsr.GetDoc()->CreateUnoCrsr(*rParaCrsr.GetPoint(), sal_False); + rParaCrsr.GetDoc()->CreateUnoCrsr(*rParaCrsr.GetPoint(), false); pUnoCrsr->Add(this); } diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx index 8f399b235214..05b64ac49407 100644 --- a/sw/source/core/unocore/unoredline.cxx +++ b/sw/source/core/unocore/unoredline.cxx @@ -176,7 +176,7 @@ uno::Reference SwXRedlineText::createEnumeration(void) aPam.Move(fnMoveForward, fnGoNode); SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr pUnoCursor( - GetDoc()->CreateUnoCrsr(*aPam.Start(), sal_False)); + GetDoc()->CreateUnoCrsr(*aPam.Start(), false)); SAL_WNODEPRECATED_DECLARATIONS_POP return new SwXParagraphEnumeration(this, pUnoCursor, CURSOR_REDLINE); } @@ -580,7 +580,7 @@ uno::Reference< container::XEnumeration > SwXRedline::createEnumeration(void) t aPam.Move(fnMoveForward, fnGoNode); SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr pUnoCursor( - GetDoc()->CreateUnoCrsr(*aPam.Start(), sal_False)); + GetDoc()->CreateUnoCrsr(*aPam.Start(), false)); SAL_WNODEPRECATED_DECLARATIONS_POP xRet = new SwXParagraphEnumeration(this, pUnoCursor, CURSOR_REDLINE); } diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index b3163b9d76d9..a9a4c3e70ccc 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -1166,7 +1166,7 @@ uno::Reference< container::XEnumeration > SwXCell::createEnumeration(void) thro const SwStartNode* pSttNd = pBox->GetSttNd(); SwPosition aPos(*pSttNd); ::std::auto_ptr pUnoCursor( - GetDoc()->CreateUnoCrsr(aPos, sal_False)); + GetDoc()->CreateUnoCrsr(aPos, false)); pUnoCursor->Move(fnMoveForward, fnGoNode); // remember table and start node for later travelling @@ -1499,7 +1499,7 @@ SwXTextTableCursor::SwXTextTableCursor(SwFrmFmt* pFmt, SwTableBox* pBox) : SwDoc* pDoc = pFmt->GetDoc(); const SwStartNode* pSttNd = pBox->GetSttNd(); SwPosition aPos(*pSttNd); - SwUnoCrsr* pUnoCrsr = pDoc->CreateUnoCrsr(aPos, sal_True); + SwUnoCrsr* pUnoCrsr = pDoc->CreateUnoCrsr(aPos, true); pUnoCrsr->Move( fnMoveForward, fnGoNode ); pUnoCrsr->Add(&aCrsrDepend); SwUnoTableCrsr* pTblCrsr = dynamic_cast(pUnoCrsr); @@ -1511,7 +1511,7 @@ SwXTextTableCursor::SwXTextTableCursor(SwFrmFmt& rTableFmt, const SwTableCursor* aCrsrDepend(this, 0), m_pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_TABLE_CURSOR)) { - SwUnoCrsr* pUnoCrsr = pTableSelection->GetDoc()->CreateUnoCrsr(*pTableSelection->GetPoint(), sal_True); + SwUnoCrsr* pUnoCrsr = pTableSelection->GetDoc()->CreateUnoCrsr(*pTableSelection->GetPoint(), true); if(pTableSelection->HasMark()) { pUnoCrsr->SetMark(); @@ -2427,7 +2427,7 @@ uno::Reference< table::XCellRange > SwXTextTable::GetRangeByName(SwFrmFmt* pFmt const SwStartNode* pSttNd = pTLBox->GetSttNd(); SwPosition aPos(*pSttNd); // Cursor in die obere linke Zelle des Ranges setzen - SwUnoCrsr* pUnoCrsr = pFmt->GetDoc()->CreateUnoCrsr(aPos, sal_True); + SwUnoCrsr* pUnoCrsr = pFmt->GetDoc()->CreateUnoCrsr(aPos, true); pUnoCrsr->Move( fnMoveForward, fnGoNode ); pUnoCrsr->SetRemainInSection( sal_False ); const SwTableBox* pBRBox = pTable->GetTblBox( sBRName ); @@ -3111,7 +3111,7 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName, const SwStartNode* pSttNd = pTLBox->GetSttNd(); SwPosition aPos(*pSttNd); // set cursor to top left cell - SwUnoCrsr* pUnoCrsr = pDoc->CreateUnoCrsr(aPos, sal_True); + SwUnoCrsr* pUnoCrsr = pDoc->CreateUnoCrsr(aPos, true); pUnoCrsr->Move( fnMoveForward, fnGoNode ); pUnoCrsr->SetRemainInSection( sal_False ); @@ -3299,7 +3299,7 @@ uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName) throw( be const SwStartNode* pSttNd = pTLBox->GetSttNd(); SwPosition aPos(*pSttNd); // set cursor to top left cell - SwUnoCrsr* pUnoCrsr = pDoc->CreateUnoCrsr(aPos, sal_True); + SwUnoCrsr* pUnoCrsr = pDoc->CreateUnoCrsr(aPos, true); pUnoCrsr->Move( fnMoveForward, fnGoNode ); pUnoCrsr->SetRemainInSection( sal_False ); @@ -3768,7 +3768,7 @@ uno::Reference< table::XCellRange > SwXCellRange::getCellRangeByPosition( const SwStartNode* pSttNd = pTLBox->GetSttNd(); SwPosition aPos(*pSttNd); // Cursor in die obere linke Zelle des Ranges setzen - SwUnoCrsr* pUnoCrsr = pFmt->GetDoc()->CreateUnoCrsr(aPos, sal_True); + SwUnoCrsr* pUnoCrsr = pFmt->GetDoc()->CreateUnoCrsr(aPos, true); pUnoCrsr->Move( fnMoveForward, fnGoNode ); pUnoCrsr->SetRemainInSection( sal_False ); const SwTableBox* pBRBox = pTable->GetTblBox( sBRName ); @@ -4777,7 +4777,7 @@ void SwXTableRows::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( uno: SwPosition aPos(*pSttNd); // Cursor in die obere linke Zelle des Ranges setzen UnoActionContext aAction(pFrmFmt->GetDoc()); - SwUnoCrsr* pUnoCrsr = pFrmFmt->GetDoc()->CreateUnoCrsr(aPos, sal_True); + SwUnoCrsr* pUnoCrsr = pFrmFmt->GetDoc()->CreateUnoCrsr(aPos, true); pUnoCrsr->Move( fnMoveForward, fnGoNode ); { @@ -4817,7 +4817,7 @@ void SwXTableRows::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( uno: const SwStartNode* pSttNd = pTLBox->GetSttNd(); SwPosition aPos(*pSttNd); // Cursor in die obere linke Zelle des Ranges setzen - SwUnoCrsr* pUnoCrsr = pFrmFmt->GetDoc()->CreateUnoCrsr(aPos, sal_True); + SwUnoCrsr* pUnoCrsr = pFrmFmt->GetDoc()->CreateUnoCrsr(aPos, true); pUnoCrsr->Move( fnMoveForward, fnGoNode ); pUnoCrsr->SetRemainInSection( sal_False ); String sBLName = lcl_GetCellName(0, nIndex + nCount - 1); @@ -4986,7 +4986,7 @@ void SwXTableColumns::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( u const SwStartNode* pSttNd = pTLBox->GetSttNd(); SwPosition aPos(*pSttNd); UnoActionContext aAction(pFrmFmt->GetDoc()); - SwUnoCrsr* pUnoCrsr = pFrmFmt->GetDoc()->CreateUnoCrsr(aPos, sal_True); + SwUnoCrsr* pUnoCrsr = pFrmFmt->GetDoc()->CreateUnoCrsr(aPos, true); pUnoCrsr->Move( fnMoveForward, fnGoNode ); { @@ -5026,7 +5026,7 @@ void SwXTableColumns::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( u const SwStartNode* pSttNd = pTLBox->GetSttNd(); SwPosition aPos(*pSttNd); // Cursor in die obere linke Zelle des Ranges setzen - SwUnoCrsr* pUnoCrsr = pFrmFmt->GetDoc()->CreateUnoCrsr(aPos, sal_True); + SwUnoCrsr* pUnoCrsr = pFrmFmt->GetDoc()->CreateUnoCrsr(aPos, true); pUnoCrsr->Move( fnMoveForward, fnGoNode ); pUnoCrsr->SetRemainInSection( sal_False ); String sTRName = lcl_GetCellName(nIndex + nCount - 1, 0); diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index 3a3ba67cca5b..353384cce7ec 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -2558,7 +2558,7 @@ throw (uno::RuntimeException) SwPosition aPos(rNode); SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr pUnoCursor( - GetDoc()->CreateUnoCrsr(aPos, sal_False)); + GetDoc()->CreateUnoCrsr(aPos, false)); SAL_WNODEPRECATED_DECLARATIONS_POP pUnoCursor->Move(fnMoveBackward, fnGoDoc); const uno::Reference< container::XEnumeration > xRet @@ -2836,7 +2836,7 @@ throw (uno::RuntimeException) SwPosition aPos(rNode); SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr pUnoCursor( - GetDoc()->CreateUnoCrsr(aPos, sal_False)); + GetDoc()->CreateUnoCrsr(aPos, false)); SAL_WNODEPRECATED_DECLARATIONS_POP pUnoCursor->Move(fnMoveForward, fnGoNode); aRef = new SwXParagraphEnumeration(this, pUnoCursor, diff --git a/sw/source/ui/inc/navmgr.hxx b/sw/source/ui/inc/navmgr.hxx index 29b63defbaa2..f1ff4cb73780 100644 --- a/sw/source/ui/inc/navmgr.hxx +++ b/sw/source/ui/inc/navmgr.hxx @@ -63,9 +63,9 @@ public: /* Constructor that initializes the shell to the current shell */ SwNavigationMgr( SwWrtShell & rShell ); /* Can we go back in the history ? */ - sal_Bool backEnabled() ; + bool backEnabled() ; /* Can we go forward in the history ? */ - sal_Bool forwardEnabled(); + bool forwardEnabled(); /* The method that is called when we click the back button */ void goBack() ; /* The method that is called when we click the forward button */ diff --git a/sw/source/ui/wrtsh/navmgr.cxx b/sw/source/ui/wrtsh/navmgr.cxx index 66a53f14b5cf..862726119d71 100644 --- a/sw/source/ui/wrtsh/navmgr.cxx +++ b/sw/source/ui/wrtsh/navmgr.cxx @@ -82,7 +82,7 @@ SwNavigationMgr::SwNavigationMgr(SwWrtShell & rShell) * It is called when we want to check if the back button should be enabled or not. * The back button should be enabled only if there are some entries in the navigation history */ -sal_Bool SwNavigationMgr::backEnabled() { +bool SwNavigationMgr::backEnabled() { return (m_nCurrent > 0); } /* @@ -92,7 +92,7 @@ sal_Bool SwNavigationMgr::backEnabled() { * current position within the navigation history entries in not the last one * i.e. when the m_nCurrent index is not at the end of the m_entries vector */ -sal_Bool SwNavigationMgr::forwardEnabled() { +bool SwNavigationMgr::forwardEnabled() { return m_nCurrent+1 < m_entries.size(); } From ecfabb66f421ef07f52a655117f047aa75d54a01 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Wed, 22 Aug 2012 16:00:11 -0400 Subject: [PATCH 448/863] add support for Windows 8 SDK Change-Id: I941ce196917cad307d9de03030c4b23ff4e1b249 Reviewed-on: https://gerrit.libreoffice.org/785 Reviewed-by: Norbert Thiebaud Tested-by: Norbert Thiebaud --- configure.in | 32 +++++++++++++++++++++++++++----- oowintool | 8 ++++++-- 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/configure.in b/configure.in index 5dfc06f6ec3e..e3c73beaa44c 100644 --- a/configure.in +++ b/configure.in @@ -2848,8 +2848,10 @@ if test "$_os" = "WINNT" -a "$WITH_MINGW" != yes; then AC_MSG_CHECKING([whether to build a 64-bit LibreOffice]) if test "$enable_64_bit" = "" -o "$enable_64_bit" = "no"; then AC_MSG_RESULT([no]) + SDK_ARCH="x86" else AC_MSG_RESULT([yes]) + SDK_ARCH="x64" BITNESS_OVERRIDE=64 fi @@ -4664,7 +4666,9 @@ if test "$build_os" = "cygwin"; then winsdktest=`./oowintool --windows-sdk-home` if test -x "$winsdktest/Bin/midl.exe"; then MIDL_PATH="$winsdktest/Bin" - fi + elif test -x "$winsdktest/Bin/$SDK_ARCH/midl.exe"; then + MIDL_PATH="$winsdktest/Bin/$SDK_ARCH" + fi fi if test ! -x "$MIDL_PATH/midl.exe"; then AC_MSG_ERROR([midl.exe not found. Make sure it's in PATH or use --with-midl-path]) @@ -4701,7 +4705,7 @@ if test "$build_os" = "cygwin"; then if test -n "$with_dotnet_framework_home"; then with_dotnet_framework_home=`cygpath -u "$with_dotnet_framework_home"` fi - if test -f "$with_dotnet_framework_home/lib/mscoree.lib"; then + if test -f "$with_dotnet_framework_home/lib/mscoree.lib"; then DOTNET_FRAMEWORK_HOME="$with_dotnet_framework_home" fi if test -z "$DOTNET_FRAMEWORK_HOME"; then @@ -4710,12 +4714,12 @@ if test "$build_os" = "cygwin"; then DOTNET_FRAMEWORK_HOME="$frametest" else frametest=`./oowintool --windows-sdk-home` - if test -f "$frametest/lib/mscoree.lib"; then + if test -f "$frametest/lib/mscoree.lib" -o -f "$frametest/lib/win8/um/$SDK_ARCH/mscoree.lib"; then DOTNET_FRAMEWORK_HOME="$frametest" fi fi fi - if test ! -f "$DOTNET_FRAMEWORK_HOME/lib/mscoree.lib"; then + if test ! -f "$DOTNET_FRAMEWORK_HOME/lib/mscoree.lib" -a ! -f "$DOTNET_FRAMEWORK_HOME/lib/win8/um/$SDK_ARCH/mscoree.lib"; then AC_MSG_ERROR([mscoree.lib (.NET Framework) not found. Make sure you use --with-dotnet-framework-home]) fi AC_MSG_RESULT(found) @@ -9017,10 +9021,16 @@ problem can be found in issue 49856.]) -a -f "$WINDOWS_SDK_HOME/Include/SqlUcode.h" \ -a -f "$WINDOWS_SDK_HOME/Include/usp10.h"; then HAVE_PSDK_H="yes" + elif test -f "$WINDOWS_SDK_HOME/Include/um/adoint.h" \ + -a -f "$WINDOWS_SDK_HOME/Include/um/SqlUcode.h" \ + -a -f "$WINDOWS_SDK_HOME/Include/um/usp10.h"; then + HAVE_PSDK_H="yes" else HAVE_PSDK_H="no" fi if test -f "$WINDOWS_SDK_HOME/lib/user32.lib"; then + HAVE_PSDK_LIB="yes" + elif test -f "$WINDOWS_SDK_HOME/lib/win8/um/$SDK_ARCH/user32.lib"; then HAVE_PSDK_LIB="yes" else HAVE_PSDK_LIB="no" @@ -9034,7 +9044,12 @@ the Windows SDK are installed.]) if test ! -x "$WINDOWS_SDK_HOME/bin/msiinfo.exe" \ -o ! -x "$WINDOWS_SDK_HOME/bin/msidb.exe" \ -o ! -x "$WINDOWS_SDK_HOME/bin/uuidgen.exe" \ - -o ! -x "$WINDOWS_SDK_HOME/bin/msitran.exe"; then + -o ! -x "$WINDOWS_SDK_HOME/bin/msitran.exe"; then : + elif test ! -x "$WINDOWS_SDK_HOME/bin/x86/msiinfo.exe" \ + -o ! -x "$WINDOWS_SDK_HOME/bin/x86/msidb.exe" \ + -o ! -x "$WINDOWS_SDK_HOME/bin/x86/uuidgen.exe" \ + -o ! -x "$WINDOWS_SDK_HOME/bin/x86/msitran.exe"; then : + else AC_MSG_ERROR([Some (all) files of the Windows Installer SDK are missing, please install.]) fi fi @@ -9047,6 +9062,8 @@ the Windows SDK are installed.]) AC_MSG_RESULT([found Windows SDK 6.0 ($WINDOWS_SDK_HOME)]) elif echo $WINDOWS_SDK_HOME | grep "v7" >/dev/null 2>/dev/null; then AC_MSG_RESULT([found Windows SDK 7 ($WINDOWS_SDK_HOME)]) + elif echo $WINDOWS_SDK_HOME | grep "8.0" >/dev/null 2>/dev/null; then + AC_MSG_RESULT([found Windows SDK 8.0 ($WINDOWS_SDK_HOME)]) else AC_MSG_ERROR([Found legacy Windows Platform SDK ($WINDOWS_SDK_HOME)]) fi @@ -9054,6 +9071,9 @@ the Windows SDK are installed.]) WINDOWS_SDK_HOME="$formatted_path" if test "$build_os" = "cygwin"; then SOLARINC="$SOLARINC -I$WINDOWS_SDK_HOME/include -I$COMPATH/include" + if test -d "$WINDOWS_SDK_HOME/include/um"; then + SOLARINC="$SOLARINC -I$WINDOWS_SDK_HOME/include/um -I$WINDOWS_SDK_HOME/include/shared" + fi fi fi AC_SUBST(WINDOWS_SDK_HOME) @@ -12463,9 +12483,11 @@ if test "$build_os" = "cygwin"; then if test "$BITNESS_OVERRIDE" = 64; then ILIB="$ILIB;$COMPATH/lib/amd64" ILIB="$ILIB;$WINDOWS_SDK_HOME/lib64" + ILIB="$ILIB;$WINDOWS_SDK_HOME/lib/win8/um/x64" else ILIB="$ILIB;$COMPATH/lib" ILIB="$ILIB;$WINDOWS_SDK_HOME/lib" + ILIB="$ILIB;$WINDOWS_SDK_HOME/lib/win8/um/x86" fi ILIB="$ILIB;$DOTNET_FRAMEWORK_HOME/lib" diff --git a/oowintool b/oowintool index e418ae410037..9c6bdc664e29 100755 --- a/oowintool +++ b/oowintool @@ -99,11 +99,15 @@ sub print_windows_sdk_home() { my ($value, $key); - $value = reg_get_value ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/Windows/CurrentInstallFolder'); - + $value = reg_get_value ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Windows Kits/Installed Roots/KitsRoot'); + + if (!defined $value) { + $value = reg_get_value ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/Windows/CurrentInstallFolder'); + } if (!defined $value) { $value = reg_get_value ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/Directories/Install Dir'); } + if (!defined $value) { $key = reg_find_key ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/*/Install Dir'); From e15b459156d488a52c8e70e79e65ae335703a54c Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Tue, 21 Aug 2012 18:10:22 -0400 Subject: [PATCH 449/863] silence boost Unknown compiler version message with VS2012 Change-Id: I8f81cc7491da81c33bd27d084a8e7b19e5c637a7 Reviewed-on: https://gerrit.libreoffice.org/784 Reviewed-by: Norbert Thiebaud Tested-by: Norbert Thiebaud --- boost/boost.vc2012.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/boost/boost.vc2012.patch b/boost/boost.vc2012.patch index 146ac0942b4d..ac206997dbbb 100644 --- a/boost/boost.vc2012.patch +++ b/boost/boost.vc2012.patch @@ -12,3 +12,14 @@ #if (_MSC_VER <= 1600) // MSVC (including the latest checked version) has not yet completely +@@ -269,8 +269,8 @@ + #error "Compiler not supported or configured - please reconfigure" + #endif + // +-// last known and checked version is 1600 (VC10, aka 2010): +-#if (_MSC_VER > 1600) ++// last known and checked version is 1700 (VC12, aka 2012): ++#if (_MSC_VER > 1700) + # if defined(BOOST_ASSERT_CONFIG) + # error "Unknown compiler version - please run the configure tests and report the results" + # else From bac631c43d53e0f1eb679a853d1fbbb9954d6e3a Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Wed, 22 Aug 2012 17:05:20 -0400 Subject: [PATCH 450/863] fix lcms2 build with VC2012 Change-Id: I665da7fbb3fb9f991d952658b247c9a80e8abede Reviewed-on: https://gerrit.libreoffice.org/786 Reviewed-by: Norbert Thiebaud Tested-by: Norbert Thiebaud --- lcms2/makefile.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk index a87ac10e5f89..86f3620f790a 100644 --- a/lcms2/makefile.mk +++ b/lcms2/makefile.mk @@ -54,7 +54,10 @@ CONFIGURE_DIR=. CONFIGURE_ACTION = -.IF "$(CCNUMVER)" >= "001600000000" +.IF "$(CCNUMVER)" >= "001700000000" +BUILD_DIR=Projects/VC2010/lcms2_DLL +BUILD_ACTION=MSBuild.exe lcms2_DLL.vcxproj /p:Configuration=Release /p:Platform=Win32 /p:TargetName=lcms2 /p:PlatformToolset=v110 +.ELIF "$(CCNUMVER)" >= "001600000000" BUILD_DIR=Projects/VC2010/lcms2_DLL BUILD_ACTION=MSBuild.exe lcms2_DLL.vcxproj /p:Configuration=Release /p:Platform=Win32 /p:TargetName=lcms2 .ELSE From ffbcd1c8b4ff839a16ddd93cdf6eec82bccf8eb4 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Fri, 24 Aug 2012 15:52:09 -0400 Subject: [PATCH 451/863] fix canvas build with Win8 SDK Change-Id: I17bd44ba8f5a6484d10bb64201ace8e030cf334d Reviewed-on: https://gerrit.libreoffice.org/789 Reviewed-by: Norbert Thiebaud Tested-by: Norbert Thiebaud --- canvas/Library_directx9canvas.mk | 6 ++++++ canvas/Library_gdipluscanvas.mk | 6 ++++++ canvas/StaticLibrary_directxcanvas.mk | 6 ++++++ canvas/source/directx/dx_winstuff.hxx | 6 ++++++ config_host.mk.in | 1 + configure.in | 5 +++++ 6 files changed, 30 insertions(+) diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk index 22a989a308b0..6fcba4e002cb 100644 --- a/canvas/Library_directx9canvas.mk +++ b/canvas/Library_directx9canvas.mk @@ -43,6 +43,12 @@ $(eval $(call gb_Library_add_defs,directx9canvas,\ -UNOMINMAX \ )) +ifeq ($(WINDOWS_SDK_VERSION),80) +$(eval $(call gb_Library_add_defs,directx9canvas,\ + -DWIN8_SDK=1 \ +)) +endif + $(eval $(call gb_Library_use_libraries,directx9canvas,\ cppu \ tk \ diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk index 327f9c1b2927..b20ac69fb276 100644 --- a/canvas/Library_gdipluscanvas.mk +++ b/canvas/Library_gdipluscanvas.mk @@ -43,6 +43,12 @@ $(eval $(call gb_Library_add_defs,gdipluscanvas,\ -UNOMINMAX \ )) +ifeq ($(WINDOWS_SDK_VERSION),80) +$(eval $(call gb_Library_add_defs,gdipluscanvas,\ + -DWIN8_SDK=1 \ +)) +endif + ifneq ($(strip $(VERBOSE)$(verbose)),) $(eval $(call gb_Library_add_defs,gdipluscanvas,\ -DVERBOSE \ diff --git a/canvas/StaticLibrary_directxcanvas.mk b/canvas/StaticLibrary_directxcanvas.mk index 232429cb7c4a..fed7f87e8cd8 100644 --- a/canvas/StaticLibrary_directxcanvas.mk +++ b/canvas/StaticLibrary_directxcanvas.mk @@ -43,6 +43,12 @@ $(eval $(call gb_StaticLibrary_add_defs,directxcanvas,\ -UNOMINMAX \ )) +ifeq ($(WINDOWS_SDK_VERSION),80) +$(eval $(call gb_StaticLibrary_add_defs,directxcanvas,\ + -DWIN8_SDK=1 \ +)) +endif + $(eval $(call gb_StaticLibrary_add_exception_objects,directxcanvas,\ canvas/source/directx/dx_bitmap \ canvas/source/directx/dx_bitmapcanvashelper \ diff --git a/canvas/source/directx/dx_winstuff.hxx b/canvas/source/directx/dx_winstuff.hxx index 595022e10182..82fe2d8c51b1 100644 --- a/canvas/source/directx/dx_winstuff.hxx +++ b/canvas/source/directx/dx_winstuff.hxx @@ -81,6 +81,12 @@ typedef IDirectDrawSurface surface_type; +#elif WIN8_SDK == 1 //Windows 8 SDK + + #include + + typedef IDirect3DSurface9 surface_type; + #else #include diff --git a/config_host.mk.in b/config_host.mk.in index 7bc85e1eb555..a192ab727f48 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -628,6 +628,7 @@ export VISIO_LIBS=@VISIO_LIBS@ export VISIO_TARBALL=@VISIO_TARBALL@ export WATCH_WINDOW_EXTENSION_PACK=@WATCH_WINDOW_EXTENSION_PACK@ export WINDOWS_SDK_HOME=@WINDOWS_SDK_HOME@ +export WINDOWS_SDK_VERSION=@WINDOWS_SDK_VERSION@ export WINDRES=@WINDRES@ export WINEGCC=@WINEGCC@ export WITHOUT_AFMS=@WITHOUT_AFMS@ diff --git a/configure.in b/configure.in index e3c73beaa44c..1655e2d32a44 100644 --- a/configure.in +++ b/configure.in @@ -9057,12 +9057,16 @@ the Windows SDK are installed.]) if test -z "$WINDOWS_SDK_HOME"; then AC_MSG_RESULT([no, hoping the necessary headers and libraries will be found anyway]) elif echo $WINDOWS_SDK_HOME | grep "v6.1" >/dev/null 2>/dev/null; then + WINDOWS_SDK_VERSION=61 AC_MSG_RESULT([found Windows SDK 6.1 ($WINDOWS_SDK_HOME)]) elif echo $WINDOWS_SDK_HOME | grep "v6.0" >/dev/null 2>/dev/null; then + WINDOWS_SDK_VERSION=60 AC_MSG_RESULT([found Windows SDK 6.0 ($WINDOWS_SDK_HOME)]) elif echo $WINDOWS_SDK_HOME | grep "v7" >/dev/null 2>/dev/null; then + WINDOWS_SDK_VERSION=70 AC_MSG_RESULT([found Windows SDK 7 ($WINDOWS_SDK_HOME)]) elif echo $WINDOWS_SDK_HOME | grep "8.0" >/dev/null 2>/dev/null; then + WINDOWS_SDK_VERSION=80 AC_MSG_RESULT([found Windows SDK 8.0 ($WINDOWS_SDK_HOME)]) else AC_MSG_ERROR([Found legacy Windows Platform SDK ($WINDOWS_SDK_HOME)]) @@ -9077,6 +9081,7 @@ the Windows SDK are installed.]) fi fi AC_SUBST(WINDOWS_SDK_HOME) +AC_SUBST(WINDOWS_SDK_VERSION) dnl ========================================= dnl Check for uuidgen From 5084b6dca889e83da13c917a15fafd10a698f326 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Sat, 25 Aug 2012 10:31:14 -0400 Subject: [PATCH 452/863] fix embedserv build with Win8 SDK Change-Id: I3a51a563fa3c2a57cbbe44087f0f4958c2b41a69 Reviewed-on: https://gerrit.libreoffice.org/790 Reviewed-by: Norbert Thiebaud Tested-by: Norbert Thiebaud --- embedserv/Library_emser.mk | 4 ++++ embedserv/source/embed/esdll.cxx | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/embedserv/Library_emser.mk b/embedserv/Library_emser.mk index 4d7e0d0b504a..25d265bfa046 100644 --- a/embedserv/Library_emser.mk +++ b/embedserv/Library_emser.mk @@ -66,6 +66,10 @@ $(eval $(call gb_Library_add_libs,emser,\ )) endif +$(eval $(call gb_Library_add_ldflags,emser,\ + -LIBPATH:$(ATL_LIB) \ +)) + $(eval $(call gb_Library_add_exception_objects,emser,\ embedserv/source/embed/docholder \ embedserv/source/embed/ed_idataobj \ diff --git a/embedserv/source/embed/esdll.cxx b/embedserv/source/embed/esdll.cxx index 44089bf53546..6df9c2edb2cb 100644 --- a/embedserv/source/embed/esdll.cxx +++ b/embedserv/source/embed/esdll.cxx @@ -18,7 +18,7 @@ */ #define STRICT -#define _WIN32_WINNT 0x0400 +#define _WIN32_WINNT 0x0403 #define _WIN32_DCOM #if defined(_MSC_VER) && (_MSC_VER > 1310) #pragma warning(disable : 4917 4555) From ed95cdf4f22c40223e2829d96b9959016eb6002c Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 5 Oct 2012 12:30:49 +0300 Subject: [PATCH 453/863] No point with ODBC for Android or iOS Sure, little point for them with the other stuff here in connectivity either, but those parts at least compile. If/when I get back to getting the --disable-database-connectivity thing to work, all of conectivity will be bypassed for Android and iOS, of course. Change-Id: I4eeeb9ccdf46fb2e1df8bf75aef63e17cbb97bbf --- connectivity/Module_connectivity.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index beb34bdc3c5b..3cd7daa38b48 100644 --- a/connectivity/Module_connectivity.mk +++ b/connectivity/Module_connectivity.mk @@ -45,8 +45,9 @@ $(eval $(call gb_Module_add_targets,connectivity,\ Library_file \ Library_flat \ Library_mysql \ - Library_odbc \ - Library_odbcbase \ + $(if $(filter ANDROID IOS,$(OS)),, \ + Library_odbc \ + Library_odbcbase) \ Library_sdbc2 \ Package_generated \ Package_inc \ From 68669491ade83c395144b66a4f65cd7720f76a55 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 5 Oct 2012 12:47:18 +0300 Subject: [PATCH 454/863] Don't do these for Android and iOS for now Again, must of the rest of the stuff here probably doesn't make sense for Android or iOS either, but at least it compiles. (It won't get linked into an app anyway, so just a small waste of time to have it compiled.) Change-Id: I32f56a11312c6a3b5eba00d2db8f0a43dd0752e0 --- extensions/Module_extensions.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index 40ae09b9159c..67133d0df8cc 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -31,10 +31,11 @@ $(eval $(call gb_Module_add_targets,extensions,\ AllLangResTarget_abp \ AllLangResTarget_scn \ AllLangResTarget_upd \ - Library_abp \ - Library_log \ Library_res \ - Library_scn \ + $(if $(filter IOS ANDROID,$(OS)),, \ + Library_abp \ + Library_log \ + Library_scn) \ )) ifneq ($(filter-out IOS ANDROID,$(OS)),) From 1691752dd29d661552700d9bcac5d3a3953fb91a Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 7 Oct 2012 07:45:10 +0300 Subject: [PATCH 455/863] When DISABLE_DYNLOADING don't even provide any module loading/unloading API Will then cause compilation errors where they are used, which will be noticed and taken care of. (The code chanaged to either use direct linking instead, when it makes sense, or to just bypass the functionality that requires dynamic loading.) Much better than waiting until run-time to notice where dynamic loading is attempted. Change-Id: Ib0cb5a2524b5c63f8e27670e7d72e37ce2a8e6e9 --- sal/Module_sal.mk | 4 ++-- sal/inc/osl/module.h | 8 ++++++++ sal/inc/osl/module.hxx | 10 ++++++++++ sal/osl/all/loadmodulerelative.cxx | 4 ++++ sal/osl/unx/module.cxx | 17 +++++++++-------- 5 files changed, 33 insertions(+), 10 deletions(-) diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk index a144b3c268dc..a2c937d719c5 100644 --- a/sal/Module_sal.mk +++ b/sal/Module_sal.mk @@ -52,13 +52,13 @@ $(eval $(call gb_Module_add_targets,sal,\ endif $(eval $(call gb_Module_add_check_targets,sal,\ - CppunitTest_Module_DLL \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),,CppunitTest_Module_DLL) \ CppunitTest_sal_bytesequence \ CppunitTest_sal_checkapi \ CppunitTest_sal_osl_condition \ $(if $(filter $(OS),WNT),, \ CppunitTest_sal_osl_file) \ - CppunitTest_sal_osl_module \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),,CppunitTest_sal_osl_module) \ CppunitTest_sal_osl_old_test_file \ CppunitTest_sal_osl_security \ CppunitTest_sal_osl_thread \ diff --git a/sal/inc/osl/module.h b/sal/inc/osl/module.h index f58909909aa2..1a886bfebe8c 100644 --- a/sal/inc/osl/module.h +++ b/sal/inc/osl/module.h @@ -70,6 +70,8 @@ typedef void* oslModule; */ typedef void ( SAL_CALL *oslGenericFunction )( void ); +#ifndef DISABLE_DYNLOADING + /** Load a shared library or module. @param strModuleName denotes the name of the module to be loaded. @param nRtldMode denotes the mode. @@ -129,6 +131,8 @@ SAL_DLLPUBLIC oslModule SAL_CALL osl_loadModuleRelativeAscii( FullTextEncodingDataSingleton in sal/textenc/textenc.cxx, so can be used in its implementation without running into circles. */ +#endif + /** Retrieve the handle of an already loaded module. This function can be used to search for a function symbol in the process address space. @@ -151,10 +155,14 @@ SAL_DLLPUBLIC oslModule SAL_CALL osl_loadModuleRelativeAscii( */ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_getModuleHandle(rtl_uString *pModuleName, oslModule *pResult); +#ifndef DISABLE_DYNLOADING + /** Release the module */ SAL_DLLPUBLIC void SAL_CALL osl_unloadModule(oslModule Module); +#endif + /** lookup the specified symbol name. @return address of the symbol or NULL if lookup failed. */ diff --git a/sal/inc/osl/module.hxx b/sal/inc/osl/module.hxx index 0d7bca644d92..152db85909f3 100644 --- a/sal/inc/osl/module.hxx +++ b/sal/inc/osl/module.hxx @@ -72,16 +72,24 @@ public: Module(): m_Module(0){} +#ifndef DISABLE_DYNLOADING + Module( const ::rtl::OUString& strModuleName, sal_Int32 nRtldMode = SAL_LOADMODULE_DEFAULT) : m_Module(0) { load( strModuleName, nRtldMode); } +#endif + ~Module() { +#ifndef DISABLE_DYNLOADING osl_unloadModule(m_Module); +#endif } +#ifndef DISABLE_DYNLOADING + sal_Bool SAL_CALL load( const ::rtl::OUString& strModuleName, sal_Int32 nRtldMode = SAL_LOADMODULE_DEFAULT) { @@ -119,6 +127,8 @@ public: } } +#endif + sal_Bool SAL_CALL is() const { return m_Module != NULL; diff --git a/sal/osl/all/loadmodulerelative.cxx b/sal/osl/all/loadmodulerelative.cxx index f3ea7bfe3509..6b7cf0e43b17 100644 --- a/sal/osl/all/loadmodulerelative.cxx +++ b/sal/osl/all/loadmodulerelative.cxx @@ -43,6 +43,8 @@ extern "C" { +#ifndef DISABLE_DYNLOADING + oslModule SAL_CALL osl_loadModuleRelative( oslGenericFunction const baseModule, rtl_uString * const relativePath, sal_Int32 const mode) @@ -67,6 +69,8 @@ oslModule SAL_CALL osl_loadModuleRelative( return ::osl_loadModule(abs.pData, mode); } +#endif // !DISABLE_DYNLOADING + } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/osl/unx/module.cxx b/sal/osl/unx/module.cxx index 386aa0b1c2a9..ed2f675c6858 100644 --- a/sal/osl/unx/module.cxx +++ b/sal/osl/unx/module.cxx @@ -118,6 +118,9 @@ static sal_Bool getModulePathFromAddress(void * address, rtl_String ** path) { return result; } + +#ifndef DISABLE_DYNLOADING + /*****************************************************************************/ /* osl_loadModule */ /*****************************************************************************/ @@ -157,7 +160,6 @@ oslModule SAL_CALL osl_loadModuleAscii(const sal_Char *pModuleName, sal_Int32 nR "sal.osl", "only either LAZY or NOW"); if (pModuleName) { -#ifndef DISABLE_DYNLOADING #ifdef ANDROID (void) nRtldMode; void *pLib = lo_dlopen(pModuleName); @@ -173,11 +175,6 @@ oslModule SAL_CALL osl_loadModuleAscii(const sal_Char *pModuleName, sal_Int32 nR << dlerror()); #endif return ((oslModule)(pLib)); - -#else /* DISABLE_DYNLOADING */ - (void) nRtldMode; - fprintf(stderr, "No DL Functions, osl_loadModuleAscii(%s) does nothing\n", pModuleName); -#endif /* DISABLE_DYNLOADING */ } return NULL; } @@ -212,6 +209,8 @@ oslModule osl_loadModuleRelativeAscii( } } +#endif // !DISABLE_DYNLOADING + /*****************************************************************************/ /* osl_getModuleHandle */ /*****************************************************************************/ @@ -227,6 +226,8 @@ osl_getModuleHandle(rtl_uString *, oslModule *pResult) return sal_True; } +#ifndef DISABLE_DYNLOADING + /*****************************************************************************/ /* osl_unloadModule */ /*****************************************************************************/ @@ -234,7 +235,6 @@ void SAL_CALL osl_unloadModule(oslModule hModule) { if (hModule) { -#ifndef DISABLE_DYNLOADING #ifdef ANDROID int nRet = lo_dlclose(hModule); #else @@ -242,10 +242,11 @@ void SAL_CALL osl_unloadModule(oslModule hModule) #endif SAL_INFO_IF( nRet != 0, "sal.osl", "dlclose(" << hModule << "): " << dlerror()); -#endif /* ifndef DISABLE_DYNLOADING */ } } +#endif // !DISABLE_DYNLOADING + /*****************************************************************************/ /* osl_getSymbol */ /*****************************************************************************/ From 97593ae24a98daca89fad176dc2492e582b3a821 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 7 Oct 2012 07:52:26 +0300 Subject: [PATCH 456/863] Handle lack of module loading/unloading API when DISABLE_DYNLOADING There are basicically two classes of cases: 1) Where the code is for obscure historical reasons or what I see as misguided "optimization" split into a more libraries than necessary, and these then are loaded at run-time. Instead, just use direct linking. 2) Where dynamic loading is part of the functionality offered to some upper (scripting etc) layer, or where some system-specific non-LO library is loaded dynamically, as it is not necessarily present on end-user machines. Can't have such in the DISABLE_DYNLOADING case. Change-Id: I9eceac5fb635245def2f4f3320821447bb7cd8c0 --- cppu/source/uno/lbenv.cxx | 4 +- cppu/source/uno/loadmodule.cxx | 4 + cppu/source/uno/loadmodule.hxx | 4 + cppuhelper/source/shlib.cxx | 2 + dbaccess/source/ui/dlg/odbcconfig.cxx | 4 + dbaccess/source/ui/dlg/odbcconfig.hxx | 2 +- filter/source/graphicfilter/egif/egif.cxx | 4 + .../source/graphicfilter/eos2met/eos2met.cxx | 4 + filter/source/graphicfilter/epbm/epbm.cxx | 4 + filter/source/graphicfilter/epgm/epgm.cxx | 4 + filter/source/graphicfilter/epict/epict.cxx | 4 + filter/source/graphicfilter/eppm/eppm.cxx | 4 + filter/source/graphicfilter/eps/eps.cxx | 4 + filter/source/graphicfilter/eras/eras.cxx | 4 + filter/source/graphicfilter/etiff/etiff.cxx | 4 + filter/source/graphicfilter/expm/expm.cxx | 4 + filter/source/graphicfilter/idxf/idxf.cxx | 4 + filter/source/graphicfilter/ieps/ieps.cxx | 4 + .../source/graphicfilter/ios2met/ios2met.cxx | 4 + filter/source/graphicfilter/ipbm/ipbm.cxx | 4 + filter/source/graphicfilter/ipcd/ipcd.cxx | 4 + filter/source/graphicfilter/ipcx/ipcx.cxx | 4 + filter/source/graphicfilter/ipict/ipict.cxx | 4 + filter/source/graphicfilter/ipsd/ipsd.cxx | 4 + filter/source/graphicfilter/iras/iras.cxx | 4 + filter/source/graphicfilter/itga/itga.cxx | 4 + filter/source/graphicfilter/itiff/itiff.cxx | 4 + jvmfwk/source/framework.cxx | 88 ++++++++++++++--- salhelper/source/dynload.cxx | 10 ++ sc/source/core/tool/callform.cxx | 24 ++++- sc/source/ui/attrdlg/scabstdlg.cxx | 12 +++ sc/source/ui/attrdlg/scuiexp.cxx | 4 + sd/inc/sdfilter.hxx | 3 +- sd/source/filter/cgm/sdcgmfilter.cxx | 47 ++++++++-- sd/source/filter/sdfilter.cxx | 3 + sd/source/filter/sdpptwrp.cxx | 45 +++++++-- sd/source/ui/dlg/sdabstdlg.cxx | 12 +++ sd/source/ui/dlg/sduiexp.cxx | 4 + sfx2/source/appl/appinit.cxx | 12 +++ sfx2/source/appl/appserv.cxx | 33 ++++++- svtools/source/filter/filter.cxx | 94 ++++++++++++++++++- svtools/source/misc/svtaccessiblefactory.cxx | 9 +- svx/source/form/dbtoolsclient.cxx | 15 +++ sw/inc/init.hxx | 3 +- sw/source/filter/basflt/fltini.cxx | 55 ++++++++++- sw/source/ui/dbui/swdbtoolsclient.cxx | 14 +++ sw/source/ui/dialog/swabstdlg.cxx | 12 +++ sw/source/ui/dialog/swuiexp.cxx | 4 + toolkit/source/helper/accessibilityclient.cxx | 8 ++ vcl/source/window/abstdlg.cxx | 8 ++ vcl/source/window/builder.cxx | 12 +++ 51 files changed, 595 insertions(+), 40 deletions(-) diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index 439d49bf8748..1909274c5d2a 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -1054,7 +1054,7 @@ static bool loadEnv(OUString const & cLibStem, { #ifdef DISABLE_DYNLOADING oslModule hMod; - uno_initEnvironmentFunc fpInit = NULL; + uno_initEnvironmentFunc fpInit; if ( cLibStem == CPPU_CURRENT_LANGUAGE_BINDING_NAME "_uno" ) fpInit = CPPU_ENV_uno_initEnvironment; @@ -1083,13 +1083,13 @@ static bool loadEnv(OUString const & cLibStem, OUString aSymbolName(RTL_CONSTASCII_USTRINGPARAM(UNO_INIT_ENVIRONMENT)); uno_initEnvironmentFunc fpInit = (uno_initEnvironmentFunc) ::osl_getFunctionSymbol( hMod, aSymbolName.pData ); -#endif if (!fpInit) { ::osl_unloadModule( hMod ); return false; } +#endif (*fpInit)( pEnv ); // init of environment ::rtl_registerModuleForUnloading( hMod ); diff --git a/cppu/source/uno/loadmodule.cxx b/cppu/source/uno/loadmodule.cxx index 75c7e549bfe8..9271a89e9e90 100644 --- a/cppu/source/uno/loadmodule.cxx +++ b/cppu/source/uno/loadmodule.cxx @@ -29,6 +29,8 @@ namespace cppu { namespace detail { +#ifndef DISABLE_DYNLOADING + ::oslModule loadModule(rtl::OUString const & name) { rtl::OUStringBuffer b; #if defined SAL_DLLPREFIX @@ -42,6 +44,8 @@ namespace cppu { namespace detail { SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY); } +#endif + } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/uno/loadmodule.hxx b/cppu/source/uno/loadmodule.hxx index f7f5a25c0de7..afedb7727fa9 100644 --- a/cppu/source/uno/loadmodule.hxx +++ b/cppu/source/uno/loadmodule.hxx @@ -27,6 +27,8 @@ namespace rtl { class OUString; } namespace cppu { namespace detail { +#ifndef DISABLE_DYNLOADING + /** Load a module. @param name @@ -38,6 +40,8 @@ namespace cppu { namespace detail { */ ::oslModule loadModule(::rtl::OUString const & name); +#endif + } } #endif diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx index b89fc5b1ead7..ed140f00f8a5 100644 --- a/cppuhelper/source/shlib.cxx +++ b/cppuhelper/source/shlib.cxx @@ -595,7 +595,9 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory( if (! xRet.is()) { +#ifndef DISABLE_DYNLOADING osl_unloadModule( lib ); +#endif #if OSL_DEBUG_LEVEL > 1 out( "### cannot activate factory: " ); out( aExcMsg ); diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx index 5adbbf36b4af..c6047a15639d 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.cxx +++ b/dbaccess/source/ui/dlg/odbcconfig.cxx @@ -133,6 +133,8 @@ sal_Bool OOdbcLibWrapper::load(const sal_Char* _pLibPath) // load the module m_pOdbcLib = osl_loadModule(m_sLibPath.pData, SAL_LOADMODULE_NOW); return (NULL != m_pOdbcLib); +#else + return sal_False; #endif } @@ -289,6 +291,8 @@ void OOdbcEnumeration::getDatasourceNames(StringBag& _rNames) _rNames.insert(aCurrentDsn); } } +#else + (void) _rNames; #endif } diff --git a/dbaccess/source/ui/dlg/odbcconfig.hxx b/dbaccess/source/ui/dlg/odbcconfig.hxx index d24b57afd6ab..7ecadd29c9e9 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.hxx +++ b/dbaccess/source/ui/dlg/odbcconfig.hxx @@ -22,7 +22,7 @@ #include "commontypes.hxx" -#if defined(WNT) || defined (UNX) +#if defined(WNT) || (defined (UNX) && !defined(ANDROID) && !defined(IOS)) #define HAVE_ODBC_SUPPORT #endif diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx index 959e3a4a7ece..675f159d4ae0 100644 --- a/filter/source/graphicfilter/egif/egif.cxx +++ b/filter/source/graphicfilter/egif/egif.cxx @@ -558,6 +558,10 @@ void GIFWriter::WriteTerminator() // ------------------------------------------------------------------------ +#ifdef DISABLE_DYNLOADING +#define GraphicExport egiGraphicExport +#endif + extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI GraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool ) diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx index 08280a6c3c4e..6849e5408d1a 100644 --- a/filter/source/graphicfilter/eos2met/eos2met.cxx +++ b/filter/source/graphicfilter/eos2met/eos2met.cxx @@ -2585,6 +2585,10 @@ sal_Bool METWriter::WriteMET( const GDIMetaFile& rMTF, SvStream& rTargetStream, //================== GraphicExport - the exported Function ================ +#ifdef DISABLE_DYNLOADING +#define GraphicExport emeGraphicExport +#endif + extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI GraphicExport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool ) { METWriter aMETWriter; diff --git a/filter/source/graphicfilter/epbm/epbm.cxx b/filter/source/graphicfilter/epbm/epbm.cxx index 12245693aba5..6fa40f6b69df 100644 --- a/filter/source/graphicfilter/epbm/epbm.cxx +++ b/filter/source/graphicfilter/epbm/epbm.cxx @@ -189,6 +189,10 @@ void PBMWriter::ImplWriteNumber(sal_Int32 nNumber) // - exported function - // --------------------- +#ifdef DISABLE_DYNLOADING +#define GraphicExport epbGraphicExport +#endif + extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) { diff --git a/filter/source/graphicfilter/epgm/epgm.cxx b/filter/source/graphicfilter/epgm/epgm.cxx index d64539c8e340..ee1531602e5c 100644 --- a/filter/source/graphicfilter/epgm/epgm.cxx +++ b/filter/source/graphicfilter/epgm/epgm.cxx @@ -214,6 +214,10 @@ void PGMWriter::ImplWriteNumber(sal_Int32 nNumber) // - exported function - // --------------------- +#ifdef DISABLE_DYNLOADING +#define GraphicExport epgGraphicExport +#endif + extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) { diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx index bf337c329965..fe1c05c8d20a 100644 --- a/filter/source/graphicfilter/epict/epict.cxx +++ b/filter/source/graphicfilter/epict/epict.cxx @@ -2298,6 +2298,10 @@ sal_Bool PictWriter::WritePict(const GDIMetaFile & rMTF, SvStream & rTargetStrea //================== GraphicExport - the exported Function ================ +#ifdef DISABLE_DYNLOADING +#define GraphicExport eptGraphicExport +#endif + extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI GraphicExport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) { diff --git a/filter/source/graphicfilter/eppm/eppm.cxx b/filter/source/graphicfilter/eppm/eppm.cxx index 2948c4d4e9cb..d908002734fd 100644 --- a/filter/source/graphicfilter/eppm/eppm.cxx +++ b/filter/source/graphicfilter/eppm/eppm.cxx @@ -222,6 +222,10 @@ void PPMWriter::ImplWriteNumber(sal_Int32 nNumber) // - exported function - // --------------------- +#ifdef DISABLE_DYNLOADING +#define GraphicExport eppGraphicExport +#endif + extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) { diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index ec33629f69b5..ba9f1a3dfae8 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -2771,6 +2771,10 @@ sal_Bool PSWriter::ImplGetBoundingBox( double* nNumb, sal_uInt8* pSource, sal_uL //================== GraphicExport - die exportierte Funktion ================ +#ifdef DISABLE_DYNLOADING +#define GraphicExport epsGraphicExport +#endif + extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI GraphicExport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) { diff --git a/filter/source/graphicfilter/eras/eras.cxx b/filter/source/graphicfilter/eras/eras.cxx index 16e20b3acf3a..350239e7bf36 100644 --- a/filter/source/graphicfilter/eras/eras.cxx +++ b/filter/source/graphicfilter/eras/eras.cxx @@ -269,6 +269,10 @@ void RASWriter::ImplPutByte( sal_uInt8 nPutThis ) // - exported function - // --------------------- +#ifdef DISABLE_DYNLOADING +#define GraphicExport eraGraphicExport +#endif + extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) { diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx index 7ca35766c322..ee79f50bb777 100644 --- a/filter/source/graphicfilter/etiff/etiff.cxx +++ b/filter/source/graphicfilter/etiff/etiff.cxx @@ -599,6 +599,10 @@ void TIFFWriter::EndCompression() // - exported function - // --------------------- +#ifdef DISABLE_DYNLOADING +#define GraphicExport etiGraphicExport +#endif + extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) { diff --git a/filter/source/graphicfilter/expm/expm.cxx b/filter/source/graphicfilter/expm/expm.cxx index fd582dadb472..51cafa036ae3 100644 --- a/filter/source/graphicfilter/expm/expm.cxx +++ b/filter/source/graphicfilter/expm/expm.cxx @@ -250,6 +250,10 @@ void XPMWriter::ImplWriteColor( sal_uInt16 nNumber ) // - exported function - // --------------------- +#ifdef DISABLE_DYNLOADING +#define GraphicExport expGraphicExport +#endif + extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool) { diff --git a/filter/source/graphicfilter/idxf/idxf.cxx b/filter/source/graphicfilter/idxf/idxf.cxx index b40dfccf8099..13915ffee0b9 100644 --- a/filter/source/graphicfilter/idxf/idxf.cxx +++ b/filter/source/graphicfilter/idxf/idxf.cxx @@ -29,6 +29,10 @@ class FilterConfigItem; //================== GraphicImport - die exportierte Funktion ================ +#ifdef DISABLE_DYNLOADING +#define GraphicImport idxGraphicImport +#endif + extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx index ab56b416465c..252dadd9db66 100644 --- a/filter/source/graphicfilter/ieps/ieps.cxx +++ b/filter/source/graphicfilter/ieps/ieps.cxx @@ -495,6 +495,10 @@ void MakePreview(sal_uInt8* pBuf, sal_uInt32 nBytesRead, //================== GraphicImport - die exportierte Funktion ================ +#ifdef DISABLE_DYNLOADING +#define GraphicImport ipsGraphicImport +#endif + extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index 4da779f20b59..21dae7b075eb 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -2719,6 +2719,10 @@ void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, GDIMetaFile & rGDIMetaF //================== GraphicImport - die exportierte Funktion ================ +#ifdef DISABLE_DYNLOADING +#define GraphicImport imeGraphicImport +#endif + extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx index fabe4f05530a..abb28ef99b79 100644 --- a/filter/source/graphicfilter/ipbm/ipbm.cxx +++ b/filter/source/graphicfilter/ipbm/ipbm.cxx @@ -520,6 +520,10 @@ sal_Bool PBMReader::ImplReadBody() //================== GraphicImport - die exportierte Funktion ================ +#ifdef DISABLE_DYNLOADING +#define GraphicImport ipbGraphicImport +#endif + extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx index 07e6711d3a2c..f0928fb4a14d 100644 --- a/filter/source/graphicfilter/ipcd/ipcd.cxx +++ b/filter/source/graphicfilter/ipcd/ipcd.cxx @@ -367,6 +367,10 @@ void PCDReader::ReadImage(sal_uLong nMinPercent, sal_uLong nMaxPercent) //================== GraphicImport - the exported Function ================ +#ifdef DISABLE_DYNLOADING +#define GraphicImport icdGraphicImport +#endif + extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pConfigItem, sal_Bool) { diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx b/filter/source/graphicfilter/ipcx/ipcx.cxx index 324c8abf6f6f..b51c2221ad2f 100644 --- a/filter/source/graphicfilter/ipcx/ipcx.cxx +++ b/filter/source/graphicfilter/ipcx/ipcx.cxx @@ -400,6 +400,10 @@ void PCXReader::ImplReadPalette( sal_uLong nCol ) //================== GraphicImport - die exportierte Funktion ================ +#ifdef DISABLE_DYNLOADING +#define GraphicImport ipxGraphicImport +#endif + extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx index 8344a5f44e68..97e90d7b1fac 100644 --- a/filter/source/graphicfilter/ipict/ipict.cxx +++ b/filter/source/graphicfilter/ipict/ipict.cxx @@ -1864,6 +1864,10 @@ void PictReader::ReadPict( SvStream & rStreamPict, GDIMetaFile & rGDIMetaFile ) //================== GraphicImport - die exportierte Funktion ================ +#ifdef DISABLE_DYNLOADING +#define GraphicImport iptGraphicImport +#endif + extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI GraphicImport( SvStream& rIStm, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx index 41bd66c5001f..21597a61553c 100644 --- a/filter/source/graphicfilter/ipsd/ipsd.cxx +++ b/filter/source/graphicfilter/ipsd/ipsd.cxx @@ -720,6 +720,10 @@ sal_Bool PSDReader::ImplReadBody() //================== GraphicImport - the exported function ================ +#ifdef DISABLE_DYNLOADING +#define GraphicImport ipdGraphicImport +#endif + extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx index 8b690387737a..833d2fefcd83 100644 --- a/filter/source/graphicfilter/iras/iras.cxx +++ b/filter/source/graphicfilter/iras/iras.cxx @@ -338,6 +338,10 @@ sal_uInt8 RASReader::ImplGetByte() //================== GraphicImport - die exportierte Funktion ================ +#ifdef DISABLE_DYNLOADING +#define GraphicImport iraGraphicImport +#endif + extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { diff --git a/filter/source/graphicfilter/itga/itga.cxx b/filter/source/graphicfilter/itga/itga.cxx index 40746835bee1..7a00af411362 100644 --- a/filter/source/graphicfilter/itga/itga.cxx +++ b/filter/source/graphicfilter/itga/itga.cxx @@ -742,6 +742,10 @@ sal_Bool TGAReader::ImplReadPalette() //================== GraphicImport - die exportierte Funktion ================ +#ifdef DISABLE_DYNLOADING +#define GraphicImport itgGraphicImport +#endif + extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx index 37cbf779fe44..961acdd1ba98 100644 --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ b/filter/source/graphicfilter/itiff/itiff.cxx @@ -1365,6 +1365,10 @@ sal_Bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic ) //================== GraphicImport - the exported Function ================ +#ifdef DISABLE_DYNLOADING +#define GraphicImport itiGraphicImport +#endif + extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index 324b112b4e7e..2f1760aae209 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -53,6 +53,41 @@ sal_Bool areEqualJavaInfo( } } +#ifdef DISABLE_DYNLOADING + +extern "C" +javaPluginError jfw_plugin_getAllJavaInfos( + rtl_uString *sVendor, + rtl_uString *sMinVersion, + rtl_uString *sMaxVersion, + rtl_uString * *arExcludeList, + sal_Int32 nLenList, + JavaInfo*** parJavaInfo, + sal_Int32 *nLenInfoList); + +extern "C" +javaPluginError jfw_plugin_getJavaInfoByPath( + rtl_uString *path, + rtl_uString *sVendor, + rtl_uString *sMinVersion, + rtl_uString *sMaxVersion, + rtl_uString * *arExcludeList, + sal_Int32 nLenList, + JavaInfo ** ppInfo); + +extern "C" +javaPluginError jfw_plugin_startJavaVirtualMachine( + const JavaInfo *pInfo, + const JavaVMOption* arOptions, + sal_Int32 cOptions, + JavaVM ** ppVm, + JNIEnv ** ppEnv); + +extern "C" +javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist); + +#endif + javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSize) { javaFrameworkError retVal = JFW_E_NONE; @@ -67,12 +102,13 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi //Get a list of plugins which provide Java information std::vector vecPlugins = aVendorSettings.getPluginData(); - +#ifndef DISABLE_DYNLOADING //Create a vector that holds the libraries, which will be later //dynamically loaded; boost::scoped_array sarModules; sarModules.reset(new osl::Module[vecPlugins.size()]); osl::Module * arModules = sarModules.get(); +#endif //Add the JavaInfos found by jfw_plugin_getAllJavaInfos to the vector //Make sure that the contents are destroyed if this //function returns with an error @@ -95,6 +131,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi const jfw::PluginLibrary & library = *i; jfw::VersionInfo versionInfo = aVendorSettings.getVersionInformation(library.sVendor); +#ifndef DISABLE_DYNLOADING arModules[cModule].load(library.sPath); osl::Module & pluginLib = arModules[cModule]; @@ -109,7 +146,10 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi jfw_plugin_getAllJavaInfos_ptr getAllJavaFunc = (jfw_plugin_getAllJavaInfos_ptr) pluginLib.getFunctionSymbol( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("jfw_plugin_getAllJavaInfos"))); - +#else + jfw_plugin_getAllJavaInfos_ptr getAllJavaFunc = + jfw_plugin_getAllJavaInfos; +#endif OSL_ASSERT(getAllJavaFunc); if (getAllJavaFunc == NULL) return JFW_E_ERROR; @@ -138,10 +178,14 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi //Check if the current plugin can detect JREs at the location // of the paths added by jfw_setJRELocations or jfw_addJRELocation //get the function from the plugin +#ifndef DISABLE_DYNLOADING jfw_plugin_getJavaInfoByPath_ptr jfw_plugin_getJavaInfoByPathFunc = (jfw_plugin_getJavaInfoByPath_ptr) pluginLib.getFunctionSymbol( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("jfw_plugin_getJavaInfoByPath"))); - +#else + jfw_plugin_getJavaInfoByPath_ptr jfw_plugin_getJavaInfoByPathFunc = + jfw_plugin_getJavaInfoByPath; +#endif OSL_ASSERT(jfw_plugin_getJavaInfoByPathFunc); if (jfw_plugin_getJavaInfoByPathFunc == NULL) return JFW_E_ERROR; @@ -347,6 +391,7 @@ javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions, sal_Int32 cOpti if ( ! modulePlugin) return JFW_E_NO_PLUGIN; +#ifndef DISABLE_DYNLOADING rtl::OUString sFunctionName( RTL_CONSTASCII_USTRINGPARAM("jfw_plugin_startJavaVirtualMachine")); jfw_plugin_startJavaVirtualMachine_ptr pFunc = @@ -354,6 +399,10 @@ javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions, sal_Int32 cOpti osl_getFunctionSymbol(modulePlugin, sFunctionName.pData); if (pFunc == NULL) return JFW_E_ERROR; +#else + jfw_plugin_startJavaVirtualMachine_ptr pFunc = + jfw_plugin_startJavaVirtualMachine; +#endif // create JavaVMOptions array that is passed to the plugin // it contains the classpath and all options set in the @@ -445,12 +494,13 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo) jfw::VendorSettings aVendorSettings; std::vector vecPlugins = aVendorSettings.getPluginData(); +#ifndef DISABLE_DYNLOADING //Create a vector that holds the libraries, which will be later //dynamically loaded; boost::scoped_array sarModules; sarModules.reset(new osl::Module[vecPlugins.size()]); osl::Module * arModules = sarModules.get(); - +#endif //Use every plug-in library to get Java installations. At the first usable //Java the loop will break typedef std::vector::const_iterator ci_pl; @@ -460,7 +510,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo) const jfw::PluginLibrary & library = *i; jfw::VersionInfo versionInfo = aVendorSettings.getVersionInformation(library.sVendor); - +#ifndef DISABLE_DYNLOADING arModules[cModule].load(library.sPath); osl::Module & pluginLib = arModules[cModule]; if (pluginLib.is() == sal_False) @@ -469,7 +519,10 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo) jfw_plugin_getAllJavaInfos_ptr getAllJavaFunc = (jfw_plugin_getAllJavaInfos_ptr) pluginLib.getFunctionSymbol( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("jfw_plugin_getAllJavaInfos"))); - +#else + jfw_plugin_getAllJavaInfos_ptr getAllJavaFunc = + jfw_plugin_getAllJavaInfos; +#endif OSL_ASSERT(getAllJavaFunc); if (getAllJavaFunc == NULL) continue; @@ -542,7 +595,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo) const jfw::PluginLibrary & library = *i; jfw::VersionInfo versionInfo = aVendorSettings.getVersionInformation(library.sVendor); - +#ifndef DISABLE_DYNLOADING osl::Module pluginLib(library.sPath); if (pluginLib.is() == sal_False) return JFW_E_NO_PLUGIN; @@ -552,7 +605,10 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo) jfw_plugin_getJavaInfoByPath_ptr jfw_plugin_getJavaInfoByPathFunc = (jfw_plugin_getJavaInfoByPath_ptr) pluginLib.getFunctionSymbol( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("jfw_plugin_getJavaInfoByPath"))); - +#else + jfw_plugin_getJavaInfoByPath_ptr jfw_plugin_getJavaInfoByPathFunc = + jfw_plugin_getJavaInfoByPath; +#endif OSL_ASSERT(jfw_plugin_getJavaInfoByPathFunc); if (jfw_plugin_getJavaInfoByPathFunc == NULL) return JFW_E_ERROR; @@ -742,12 +798,13 @@ javaFrameworkError SAL_CALL jfw_getJavaInfoByPath( //Get a list of plugins which provide Java information std::vector vecPlugins = aVendorSettings.getPluginData(); +#ifndef DISABLE_DYNLOADING //Create a vector that holds the libraries, which will be later //dynamically loaded; boost::scoped_array sarModules; sarModules.reset(new osl::Module[vecPlugins.size()]); osl::Module * arModules = sarModules.get(); - +#endif typedef std::vector::const_iterator CIT_VENDOR; std::vector vecVendors = aVendorSettings.getSupportedVendors(); @@ -762,6 +819,8 @@ javaFrameworkError SAL_CALL jfw_getJavaInfoByPath( const jfw::PluginLibrary & library = *i; jfw::VersionInfo versionInfo = aVendorSettings.getVersionInformation(library.sVendor); + +#ifndef DISABLE_DYNLOADING arModules[cModule].load(library.sPath); osl::Module & pluginLib = arModules[cModule]; if (pluginLib.is() == sal_False) @@ -776,7 +835,10 @@ javaFrameworkError SAL_CALL jfw_getJavaInfoByPath( jfw_plugin_getJavaInfoByPath_ptr jfw_plugin_getJavaInfoByPathFunc = (jfw_plugin_getJavaInfoByPath_ptr) pluginLib.getFunctionSymbol( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("jfw_plugin_getJavaInfoByPath"))); - +#else + jfw_plugin_getJavaInfoByPath_ptr jfw_plugin_getJavaInfoByPathFunc = + jfw_plugin_getJavaInfoByPath; +#endif OSL_ASSERT(jfw_plugin_getJavaInfoByPathFunc); if (jfw_plugin_getJavaInfoByPathFunc == NULL) continue; @@ -1112,6 +1174,7 @@ javaFrameworkError jfw_existJRE(const JavaInfo *pInfo, sal_Bool *exist) jfw::VendorSettings aVendorSettings; jfw::CJavaInfo aInfo; aInfo = (const ::JavaInfo*) pInfo; //makes a copy of pInfo +#ifndef DISABLE_DYNLOADING rtl::OUString sLibPath = aVendorSettings.getPluginLibrary(aInfo.getVendor()); osl::Module modulePlugin(sLibPath); if ( ! modulePlugin) @@ -1123,7 +1186,10 @@ javaFrameworkError jfw_existJRE(const JavaInfo *pInfo, sal_Bool *exist) osl_getFunctionSymbol(modulePlugin, sFunctionName.pData); if (pFunc == NULL) return JFW_E_ERROR; - +#else + jfw_plugin_existJRE_ptr pFunc = + jfw_plugin_existJRE; +#endif javaPluginError plerr = (*pFunc)(pInfo, exist); javaFrameworkError ret = JFW_E_NONE; diff --git a/salhelper/source/dynload.cxx b/salhelper/source/dynload.cxx index 2e392af66ac1..f69ace831168 100644 --- a/salhelper/source/dynload.cxx +++ b/salhelper/source/dynload.cxx @@ -43,6 +43,13 @@ ORealDynamicLoader* ORealDynamicLoader::newInstance(ORealDynamicLoader ** ppSetT const rtl::OUString& moduleName, const rtl::OUString& initFunction) { +#ifdef DISABLE_DYNLOADING + (void) ppSetToZeroInDestructor; + (void) moduleName; + (void) initFunction; + + return NULL; +#else ApiInitFunction initFunc; oslModule pModule = osl_loadModule(moduleName.pData, SAL_LOADMODULE_DEFAULT); @@ -64,6 +71,7 @@ ORealDynamicLoader* ORealDynamicLoader::newInstance(ORealDynamicLoader ** ppSetT initFunction, initFunc(), pModule)); +#endif } ORealDynamicLoader::~ORealDynamicLoader() @@ -74,7 +82,9 @@ ORealDynamicLoader::~ORealDynamicLoader() if (m_pModule) { +#ifndef DISABLE_DYNLOADING osl_unloadModule(m_pModule); +#endif m_pModule = NULL; } } diff --git a/sc/source/core/tool/callform.cxx b/sc/source/core/tool/callform.cxx index 5d20ad29c2f2..8ba120bf861b 100644 --- a/sc/source/core/tool/callform.cxx +++ b/sc/source/core/tool/callform.cxx @@ -89,7 +89,14 @@ friend class ModuleCollection; osl::Module* pInstance; public: ModuleData(const rtl::OUString& rStr, osl::Module* pInst) : aName(rStr), pInstance(pInst) {} - ModuleData(const ModuleData& rData) : aName(rData.aName) {pInstance = new osl::Module(aName);} + ModuleData(const ModuleData& rData) : aName(rData.aName) + { +#ifndef DISABLE_DYNLOADING + pInstance = new osl::Module(aName); +#else + pInstance = NULL; +#endif + } ~ModuleData() { delete pInstance; } const rtl::OUString& GetName() const { return aName; } @@ -174,6 +181,10 @@ ModuleCollection aModuleCollection; bool InitExternalFunc(const rtl::OUString& rModuleName) { +#ifdef DISABLE_DYNLOADING + (void) rModuleName; + return false; +#else // Module already loaded? const ModuleData* pTemp = aModuleCollection.findByName(rModuleName); if (pTemp) @@ -252,6 +263,7 @@ bool InitExternalFunc(const rtl::OUString& rModuleName) else delete pLib; return bRet; +#endif } //------------------------------------------------------------------------ @@ -265,6 +277,10 @@ void ExitExternalFunc() bool FuncData::Call(void** ppParam) const { +#ifdef DISABLE_DYNLOADING + (void) ppParam; + return false; +#else bool bRet = false; osl::Module* pLib = pModuleData->GetInstance(); FARPROC fProc = (FARPROC)pLib->getFunctionSymbol(aFuncName); @@ -354,12 +370,17 @@ bool FuncData::Call(void** ppParam) const } } return bRet; +#endif } //------------------------------------------------------------------------ bool FuncData::Unadvice( double nHandle ) { +#ifdef DISABLE_DYNLOADING + (void) nHandle; + return false; +#else bool bRet = false; osl::Module* pLib = pModuleData->GetInstance(); FARPROC fProc = (FARPROC)pLib->getFunctionSymbol(UNADVICE); @@ -369,6 +390,7 @@ bool FuncData::Unadvice( double nHandle ) bRet = true; } return bRet; +#endif } //------------------------------------------------------------------------ diff --git a/sc/source/ui/attrdlg/scabstdlg.cxx b/sc/source/ui/attrdlg/scabstdlg.cxx index 98b0efae6515..654fb76df9b4 100644 --- a/sc/source/ui/attrdlg/scabstdlg.cxx +++ b/sc/source/ui/attrdlg/scabstdlg.cxx @@ -36,10 +36,19 @@ using ::rtl::OUStringBuffer; typedef ScAbstractDialogFactory* (__LOADONCALLAPI *ScFuncPtrCreateDialogFactory)(); +#ifndef DISABLE_DYNLOADING + extern "C" { static void SAL_CALL thisModule() {} } +#else + +extern "C" ScAbstractDialogFactory* ScCreateDialogFactory(); + +#endif + ScAbstractDialogFactory* ScAbstractDialogFactory::Create() { +#ifndef DISABLE_DYNLOADING ScFuncPtrCreateDialogFactory fp = 0; static ::osl::Module aDialogLibrary; @@ -53,6 +62,9 @@ ScAbstractDialogFactory* ScAbstractDialogFactory::Create() if ( fp ) return fp(); return 0; +#else + return ScCreateDialogFactory(); +#endif } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/attrdlg/scuiexp.cxx b/sc/source/ui/attrdlg/scuiexp.cxx index c2581ea7b578..77e5b2e9f2ea 100644 --- a/sc/source/ui/attrdlg/scuiexp.cxx +++ b/sc/source/ui/attrdlg/scuiexp.cxx @@ -36,6 +36,10 @@ namespace scui } } +#ifdef DISABLE_DYNLOADING +#define CreateDialogFactory ScCreateDialogFactory +#endif + extern "C" { SAL_DLLPUBLIC_EXPORT ScAbstractDialogFactory* CreateDialogFactory() diff --git a/sd/inc/sdfilter.hxx b/sd/inc/sdfilter.hxx index 1f3ea8024930..d44121487001 100644 --- a/sd/inc/sdfilter.hxx +++ b/sd/inc/sdfilter.hxx @@ -57,8 +57,9 @@ protected: SdDrawDocument& mrDocument; sal_Bool mbIsDraw : 1; sal_Bool mbShowProgress : 1; - +#ifndef DISABLE_DYNLOADING ::osl::Module* OpenLibrary( const ::rtl::OUString& rLibraryName ) const; +#endif void CreateStatusIndicator(); private: diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx index 6c6ef43ce22a..7135ee81fc1d 100644 --- a/sd/source/filter/cgm/sdcgmfilter.cxx +++ b/sd/source/filter/cgm/sdcgmfilter.cxx @@ -66,8 +66,16 @@ using namespace ::com::sun::star::frame; // - Typedefs - // ------------ -typedef sal_uInt32 ( __LOADONCALLAPI *ImportCGM )( ::rtl::OUString&, Reference< XModel >&, sal_uInt32, Reference< XStatusIndicator >& ); -typedef sal_Bool ( __LOADONCALLAPI *ExportCGM )( ::rtl::OUString&, Reference< XModel >&, Reference< XStatusIndicator >&, void* ); + +typedef sal_uInt32 ( __LOADONCALLAPI *ImportCGMPointer )( ::rtl::OUString&, Reference< XModel >&, sal_uInt32, Reference< XStatusIndicator >& ); +typedef sal_Bool ( __LOADONCALLAPI *ExportCGMPointer )( ::rtl::OUString&, Reference< XModel >&, Reference< XStatusIndicator >&, void* ); + +#ifdef DISABLE_DYNLOADING + +extern "C" sal_uInt32 ImportCGM( ::rtl::OUString&, Reference< XModel >&, sal_uInt32, Reference< XStatusIndicator >& ); +extern "C" sal_Bool ExportCGM( ::rtl::OUString&, Reference< XModel >&, Reference< XStatusIndicator >&, void* ); + +#endif // --------------- // - SdPPTFilter - @@ -88,12 +96,22 @@ SdCGMFilter::~SdCGMFilter() sal_Bool SdCGMFilter::Import() { +#ifndef DISABLE_DYNLOADING ::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData() ); +#endif sal_Bool bRet = sal_False; - if( pLibrary && mxModel.is() ) + if( +#ifndef DISABLE_DYNLOADING + pLibrary && +#endif + mxModel.is() ) { - ImportCGM FncImportCGM = reinterpret_cast< ImportCGM >( pLibrary->getFunctionSymbol( "ImportCGM" ) ); +#ifndef DISABLE_DYNLOADING + ImportCGMPointer FncImportCGM = reinterpret_cast< ImportCGM >( pLibrary->getFunctionSymbol( "ImportCGM" ) ); +#else + ImportCGMPointer FncImportCGM = ImportCGM; +#endif ::rtl::OUString aFileURL( mrMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); sal_uInt32 nRetValue; @@ -122,9 +140,9 @@ sal_Bool SdCGMFilter::Import() } } } - +#ifndef DISABLE_DYNLOADING delete pLibrary; - +#endif return bRet; } @@ -132,12 +150,22 @@ sal_Bool SdCGMFilter::Import() sal_Bool SdCGMFilter::Export() { +#ifndef DISABLE_DYNLOADING ::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData() ); +#endif sal_Bool bRet = sal_False; - if( pLibrary && mxModel.is() ) + if( +#ifndef DISABLE_DYNLOADING + pLibrary && +#endif + mxModel.is() ) { - ExportCGM FncCGMExport = reinterpret_cast< ExportCGM >( pLibrary->getFunctionSymbol( "ExportCGM" ) ); +#ifndef DISABLE_DYNLOADING + ExportCGMPointer FncCGMExport = reinterpret_cast< ExportCGM >( pLibrary->getFunctionSymbol( "ExportCGM" ) ); +#else + ExportCGMPointer FncCGMExport = ExportCGM; +#endif if( FncCGMExport ) { @@ -148,8 +176,9 @@ sal_Bool SdCGMFilter::Export() } } +#ifndef DISABLE_DYNLOADING delete pLibrary; - +#endif return bRet; } diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx index ec245925a3af..d379ffd1780f 100644 --- a/sd/source/filter/sdfilter.cxx +++ b/sd/source/filter/sdfilter.cxx @@ -85,6 +85,7 @@ SdFilter::~SdFilter() // ----------------------------------------------------------------------------- +#ifndef DISABLE_DYNLOADING extern "C" { static void SAL_CALL thisModule() {} } ::osl::Module* SdFilter::OpenLibrary( const ::rtl::OUString& rLibraryName ) const @@ -95,6 +96,8 @@ extern "C" { static void SAL_CALL thisModule() {} } ? mod.release() : 0; } +#endif + // ----------------------------------------------------------------------------- void SdFilter::CreateStatusIndicator() diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx index 6be40e8e9535..c11c9585ece5 100644 --- a/sd/source/filter/sdpptwrp.cxx +++ b/sd/source/filter/sdpptwrp.cxx @@ -49,14 +49,27 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::task; using namespace ::com::sun::star::frame; -typedef sal_Bool ( __LOADONCALLAPI *ExportPPT )( const std::vector< com::sun::star::beans::PropertyValue >&, SvStorageRef&, +typedef sal_Bool ( __LOADONCALLAPI *ExportPPTPointer )( const std::vector< com::sun::star::beans::PropertyValue >&, SvStorageRef&, Reference< XModel > &, Reference< XStatusIndicator > &, SvMemoryStream*, sal_uInt32 nCnvrtFlags ); -typedef sal_Bool ( SAL_CALL *ImportPPT )( SdDrawDocument*, SvStream&, SvStorage&, SfxMedium& ); +typedef sal_Bool ( SAL_CALL *ImportPPTPointer )( SdDrawDocument*, SvStream&, SvStorage&, SfxMedium& ); -typedef sal_Bool ( __LOADONCALLAPI *SaveVBA )( SfxObjectShell&, SvMemoryStream*& ); +typedef sal_Bool ( __LOADONCALLAPI *SaveVBAPointer )( SfxObjectShell&, SvMemoryStream*& ); + +#ifdef DISABLE_DYNLOADING + +extern "C" sal_Bool ExportPPT( const std::vector< com::sun::star::beans::PropertyValue >&, SvStorageRef&, + Reference< XModel > &, + Reference< XStatusIndicator > &, + SvMemoryStream*, sal_uInt32 nCnvrtFlags ); + +extern "C" sal_Bool ImportPPT( SdDrawDocument*, SvStream&, SvStorage&, SfxMedium& ); + +extern "C" sal_Bool SaveVBA( SfxObjectShell&, SvMemoryStream*& ); + +#endif // --------------- // - SdPPTFilter - @@ -102,16 +115,22 @@ sal_Bool SdPPTFilter::Import() mrMedium.SetError( ERRCODE_SVX_READ_FILTER_PPOINT, OSL_LOG_PREFIX ); else { +#ifndef DISABLE_DYNLOADING ::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData() ); if ( pLibrary ) { - ImportPPT PPTImport = reinterpret_cast< ImportPPT >( pLibrary->getFunctionSymbol( "ImportPPT" ) ); + ImportPPTPointer PPTImport = reinterpret_cast< ImportPPT >( pLibrary->getFunctionSymbol( "ImportPPT" ) ); if ( PPTImport ) bRet = PPTImport( &mrDocument, *pDocStream, *pStorage, mrMedium ); if ( !bRet ) mrMedium.SetError( SVSTREAM_WRONGVERSION, OSL_LOG_PREFIX ); } +#else + bRet = ImportPPT( &mrDocument, *pDocStream, *pStorage, mrMedium ); + if ( !bRet ) + mrMedium.SetError( SVSTREAM_WRONGVERSION, OSL_LOG_PREFIX ); +#endif } delete pDocStream; @@ -125,15 +144,23 @@ sal_Bool SdPPTFilter::Import() sal_Bool SdPPTFilter::Export() { +#ifndef DISABLE_DYNLOADING ::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData() ); +#endif sal_Bool bRet = sal_False; +#ifndef DISABLE_DYNLOADING if( pLibrary ) +#endif { if( mxModel.is() ) { SotStorageRef xStorRef = new SotStorage( mrMedium.GetOutStream(), sal_False ); - ExportPPT PPTExport = reinterpret_cast(pLibrary->getFunctionSymbol( "ExportPPT" )); +#ifndef DISABLE_DYNLOADING + ExportPPTPointer PPTExport = reinterpret_cast(pLibrary->getFunctionSymbol( "ExportPPT" )); +#else + ExportPPTPointer PPTExport = ExportPPT; +#endif if( PPTExport && xStorRef.Is() ) { @@ -166,7 +193,9 @@ sal_Bool SdPPTFilter::Export() xStorRef->Commit(); } } +#ifndef DISABLE_DYNLOADING delete pLibrary; +#endif } return bRet; } @@ -176,15 +205,19 @@ void SdPPTFilter::PreSaveBasic() const SvtFilterOptions& rFilterOptions = SvtFilterOptions::Get(); if( rFilterOptions.IsLoadPPointBasicStorage() ) { +#ifndef DISABLE_DYNLOADING ::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData() ); if( pLibrary ) { - SaveVBA pSaveVBA= reinterpret_cast(pLibrary->getFunctionSymbol( "SaveVBA" )); + SaveVBAPointer pSaveVBA= reinterpret_cast(pLibrary->getFunctionSymbol( "SaveVBA" )); if( pSaveVBA ) { pSaveVBA( (SfxObjectShell&) mrDocShell, pBas ); } } +#else + SaveVBA( (SfxObjectShell&) mrDocShell, pBas ); +#endif } } diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx index 520f5a4a4926..6c4951e40ffe 100644 --- a/sd/source/ui/dlg/sdabstdlg.cxx +++ b/sd/source/ui/dlg/sdabstdlg.cxx @@ -35,10 +35,19 @@ typedef SdAbstractDialogFactory* (__LOADONCALLAPI *SdFuncPtrCreateDialogFactory)(); +#ifndef DISABLE_DYNLOADING + extern "C" { static void SAL_CALL thisModule() {} } +#else + +extern "C" SdAbstractDialogFactory* SdCreateDialogFactory(); + +#endif + SdAbstractDialogFactory* SdAbstractDialogFactory::Create() { +#ifndef DISABLE_DYNLOADING SdFuncPtrCreateDialogFactory fp = 0; static ::osl::Module aDialogLibrary; static const ::rtl::OUString sLibName(::vcl::unohelper::CreateLibraryName("sdui", sal_True)); @@ -48,6 +57,9 @@ SdAbstractDialogFactory* SdAbstractDialogFactory::Create() if ( fp ) return fp(); return 0; +#else + return SdCreateDialogFactory(); +#endif } diff --git a/sd/source/ui/dlg/sduiexp.cxx b/sd/source/ui/dlg/sduiexp.cxx index 962f86cdbf5a..d9505a198514 100644 --- a/sd/source/ui/dlg/sduiexp.cxx +++ b/sd/source/ui/dlg/sduiexp.cxx @@ -34,6 +34,10 @@ #include "sddlgfact.hxx" #include "sal/types.h" +#ifdef DISABLE_DYNLOADING +#define CreateDialogFactory SdCreateDialogFactory +#endif + extern "C" { SAL_DLLPUBLIC_EXPORT SdAbstractDialogFactory* CreateDialogFactory() diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 4d53e49d5fc5..d79f838118f6 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -166,8 +166,16 @@ typedef bool ( *PFunc_getSpecialCharsForEdit)( Window* i_pParent, const Font& i_ // a library above us. //==================================================================== +#ifndef DISABLE_DYNLOADING + extern "C" { static void SAL_CALL thisModule() {} } +#else + +extern "C" bool GetSpecialCharsForEdit( Window* i_pParent, const Font& i_rFont, String& o_rOutString ); + +#endif + String GetSpecialCharsForEdit(Window* pParent, const Font& rFont) { static bool bDetermineFunction = false; @@ -178,6 +186,7 @@ String GetSpecialCharsForEdit(Window* pParent, const Font& rFont) { bDetermineFunction = true; +#ifndef DISABLE_DYNLOADING static ::rtl::OUString aLibName( SVLIBRARY( "cui" ) ); oslModule handleMod = osl_loadModuleRelative( &thisModule, aLibName.pData, 0 ); @@ -186,6 +195,9 @@ String GetSpecialCharsForEdit(Window* pParent, const Font& rFont) ::rtl::OUString aSymbol( "GetSpecialCharsForEdit" ); pfunc_getSpecialCharsForEdit = (PFunc_getSpecialCharsForEdit)osl_getFunctionSymbol( handleMod, aSymbol.pData ); DBG_ASSERT( pfunc_getSpecialCharsForEdit, "GetSpecialCharsForEdit() not found!" ); +#else + pfunc_getSpecialCharsForEdit = GetSpecialCharsForEdit; +#endif } String aRet; diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 6135f7bfa6e3..08d0352c6b63 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -834,16 +834,28 @@ void SfxApplication::MiscState_Impl(SfxItemSet &rSet) } } +#ifndef DISABLE_SCRIPTING + typedef rtl_uString* (SAL_CALL *basicide_choose_macro)(XModel*, sal_Bool, rtl_uString*); typedef void (SAL_CALL *basicide_macro_organizer)( sal_Int16 ); #define DOSTRING( x ) #x #define STRING( x ) DOSTRING( x ) +#ifndef DISABLE_DYNLOADING + extern "C" { static void SAL_CALL thisModule() {} } +#else + +extern "C" rtl_uString* basicide_choose_macro(XModel*, sal_Bool, rtl_uString*); +extern "C" void basicide_macro_organizer( sal_Int16 ); + +#endif + ::rtl::OUString ChooseMacro( const Reference< XModel >& rxLimitToDocument, sal_Bool bChooseOnly, const ::rtl::OUString& rMacroDesc = ::rtl::OUString() ) { +#ifndef DISABLE_DYNLOADING // get basctl dllname static ::rtl::OUString aLibName( SVLIBRARY( "basctl" ) ); @@ -854,16 +866,24 @@ extern "C" { static void SAL_CALL thisModule() {} } // get symbol ::rtl::OUString aSymbol( "basicide_choose_macro" ); basicide_choose_macro pSymbol = (basicide_choose_macro) osl_getFunctionSymbol( handleMod, aSymbol.pData ); +#else +#define pSymbol basicide_choose_macro +#endif // call basicide_choose_macro in basctl rtl_uString* pScriptURL = pSymbol( rxLimitToDocument.get(), bChooseOnly, rMacroDesc.pData ); ::rtl::OUString aScriptURL( pScriptURL ); rtl_uString_release( pScriptURL ); return aScriptURL; + +#ifdef DISABLE_DYNLOADING +#undef pSymbol +#endif } void MacroOrganizer( sal_Int16 nTabId ) { +#ifndef DISABLE_DYNLOADING // get basctl dllname static ::rtl::OUString aLibName( SVLIBRARY( "basctl" ) ); @@ -874,11 +894,17 @@ void MacroOrganizer( sal_Int16 nTabId ) // get symbol ::rtl::OUString aSymbol( "basicide_macro_organizer" ); basicide_macro_organizer pSymbol = (basicide_macro_organizer) osl_getFunctionSymbol( handleMod, aSymbol.pData ); - // call basicide_macro_organizer in basctl pSymbol( nTabId ); +#else + basicide_macro_organizer( nTabId ); +#endif + } +#endif + + #define RID_ERRBOX_MODULENOTINSTALLED (RID_OFA_START + 72) ResMgr* SfxApplication::GetOffResManager_Impl() @@ -890,6 +916,7 @@ ResMgr* SfxApplication::GetOffResManager_Impl() namespace { +#ifndef DISABLE_SCRIPTING Window* lcl_getDialogParent( const Reference< XFrame >& _rxFrame, Window* _pFallback ) { if ( !_rxFrame.is() ) @@ -964,6 +991,7 @@ namespace } return NULL; } +#endif // !DISABLE_SCRIPTING } static ::rtl::OUString getConfigurationStringValue( @@ -1076,7 +1104,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) } break; } - +#ifndef DISABLE_SCRIPTING case SID_BASICIDE_APPEAR: { SfxViewFrame* pView = lcl_getBasicIDEViewFrame( NULL ); @@ -1258,6 +1286,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) rReq.Done(); } break; +#endif // !DISABLE_SCRIPTING case SID_OFFICE_CHECK_PLZ: { diff --git a/svtools/source/filter/filter.cxx b/svtools/source/filter/filter.cxx index aaacb12884f8..6428c2ea6b4b 100644 --- a/svtools/source/filter/filter.cxx +++ b/svtools/source/filter/filter.cxx @@ -915,7 +915,9 @@ class ImpFilterLibCache; struct ImpFilterLibCacheEntry { ImpFilterLibCacheEntry* mpNext; +#ifndef DISABLE_DYNLOADING osl::Module maLibrary; +#endif String maFiltername; PFilterCall mpfnImport; PFilterDlgCall mpfnImportDlg; @@ -930,19 +932,67 @@ struct ImpFilterLibCacheEntry ImpFilterLibCacheEntry::ImpFilterLibCacheEntry( const String& rPathname, const String& rFiltername ) : mpNext ( NULL ), +#ifndef DISABLE_DYNLOADING maLibrary ( rPathname ), +#endif maFiltername ( rFiltername ), mpfnImport ( NULL ), mpfnImportDlg ( NULL ) { +#ifdef DISABLE_DYNLOADING + (void) rPathname; +#endif } // ------------------------------------------------------------------------ +#ifdef DISABLE_DYNLOADING + +extern "C" sal_Bool icdGraphicImport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool ); +extern "C" sal_Bool idxGraphicImport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool ); +extern "C" sal_Bool imeGraphicImport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool ); +extern "C" sal_Bool ipbGraphicImport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool ); +extern "C" sal_Bool ipdGraphicImport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool ); +extern "C" sal_Bool ipsGraphicImport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool ); +extern "C" sal_Bool iptGraphicImport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool ); +extern "C" sal_Bool ipxGraphicImport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool ); +extern "C" sal_Bool iraGraphicImport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool ); +extern "C" sal_Bool itgGraphicImport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool ); +extern "C" sal_Bool itiGraphicImport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool ); + +#endif + PFilterCall ImpFilterLibCacheEntry::GetImportFunction() { if( !mpfnImport ) + { +#ifndef DISABLE_DYNLOADING mpfnImport = (PFilterCall) maLibrary.getFunctionSymbol(rtl::OUString(IMPORT_FUNCTION_NAME)); +#else + if( maFiltername.EqualsAscii( "icd" ) ) + mpfnImport = icdGraphicImport; + else if( maFiltername.EqualsAscii( "idx" ) ) + mpfnImport = idxGraphicImport; + else if( maFiltername.EqualsAscii( "ime" ) ) + mpfnImport = imeGraphicImport; + else if( maFiltername.EqualsAscii( "ipb" ) ) + mpfnImport = ipbGraphicImport; + else if( maFiltername.EqualsAscii( "ipd" ) ) + mpfnImport = ipdGraphicImport; + else if( maFiltername.EqualsAscii( "ips" ) ) + mpfnImport = ipsGraphicImport; + else if( maFiltername.EqualsAscii( "ipt" ) ) + mpfnImport = iptGraphicImport; + else if( maFiltername.EqualsAscii( "ipx" ) ) + mpfnImport = ipxGraphicImport; + else if( maFiltername.EqualsAscii( "ira" ) ) + mpfnImport = iraGraphicImport; + else if( maFiltername.EqualsAscii( "itg" ) ) + mpfnImport = itgGraphicImport; + else if( maFiltername.EqualsAscii( "iti" ) ) + mpfnImport = itiGraphicImport; +#endif + } return mpfnImport; } @@ -1003,19 +1053,22 @@ ImpFilterLibCacheEntry* ImpFilterLibCache::GetFilter( const String& rFilterPath, { String aPhysicalName( ImpCreateFullFilterPath( rFilterPath, rFilterName ) ); pEntry = new ImpFilterLibCacheEntry( aPhysicalName, rFilterName ); - +#ifndef DISABLE_DYNLOADING if ( pEntry->maLibrary.is() ) +#endif { if( !mpFirst ) mpFirst = mpLast = pEntry; else mpLast = mpLast->mpNext = pEntry; } +#ifndef DISABLE_DYNLOADING else { delete pEntry; pEntry = NULL; } +#endif } return pEntry; }; @@ -1735,6 +1788,21 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const INetURLO // ------------------------------------------------------------------------ +#ifdef DISABLE_DYNLOADING + +extern "C" sal_Bool egiGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool ); +extern "C" sal_Bool emeGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool ); +extern "C" sal_Bool epbGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool ); +extern "C" sal_Bool epgGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool ); +extern "C" sal_Bool eppGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool ); +extern "C" sal_Bool epsGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool ); +extern "C" sal_Bool eptGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool ); +extern "C" sal_Bool eraGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool ); +extern "C" sal_Bool etiGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool ); +extern "C" sal_Bool expGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool ); + +#endif + sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String& rPath, SvStream& rOStm, sal_uInt16 nFormat, const uno::Sequence< beans::PropertyValue >* pFilterData ) { @@ -2050,11 +2118,35 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String& sal_Int32 i, nTokenCount = getTokenCount(aFilterPath, ';'); for ( i = 0; i < nTokenCount; i++ ) { +#ifndef DISABLE_DYNLOADING String aPhysicalName( ImpCreateFullFilterPath( getToken(aFilterPath, i, ';'), aFilterName ) ); osl::Module aLibrary( aPhysicalName ); PFilterCall pFunc = (PFilterCall) aLibrary.getFunctionSymbol(rtl::OUString(EXPORT_FUNCTION_NAME)); // Dialog in DLL ausfuehren +#else + PFilterCall pFunc = NULL; + if( aFilterName.EqualsAscii( "egi" ) ) + pFunc = egiGraphicExport; + else if( aFilterName.EqualsAscii( "eme" ) ) + pFunc = emeGraphicExport; + else if( aFilterName.EqualsAscii( "epb" ) ) + pFunc = epbGraphicExport; + else if( aFilterName.EqualsAscii( "epg" ) ) + pFunc = epgGraphicExport; + else if( aFilterName.EqualsAscii( "epp" ) ) + pFunc = eppGraphicExport; + else if( aFilterName.EqualsAscii( "eps" ) ) + pFunc = epsGraphicExport; + else if( aFilterName.EqualsAscii( "ept" ) ) + pFunc = eptGraphicExport; + else if( aFilterName.EqualsAscii( "era" ) ) + pFunc = eraGraphicExport; + else if( aFilterName.EqualsAscii( "eti" ) ) + pFunc = etiGraphicExport; + else if( aFilterName.EqualsAscii( "exp" ) ) + pFunc = expGraphicExport; +#endif if( pFunc ) { if ( !(*pFunc)( rOStm, aGraphic, &aConfigItem, sal_False ) ) diff --git a/svtools/source/misc/svtaccessiblefactory.cxx b/svtools/source/misc/svtaccessiblefactory.cxx index f08fb7db1aac..013e946bba95 100644 --- a/svtools/source/misc/svtaccessiblefactory.cxx +++ b/svtools/source/misc/svtaccessiblefactory.cxx @@ -265,7 +265,11 @@ namespace svt } //-------------------------------------------------------------------- +#ifndef DISABLE_DYNLOADING extern "C" { static void SAL_CALL thisModule() {} } +#else + extern "C" void* getSvtAccessibilityComponentFactory(); +#endif void AccessibleFactoryAccess::ensureInitialized() { @@ -281,6 +285,7 @@ namespace svt // load the library implementing the factory if ( !s_pFactory.get() ) { +#ifndef DISABLE_DYNLOADING const ::rtl::OUString sModuleName( SVLIBRARY( "acc" )); s_hAccessibleImplementationModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, 0 ); if ( s_hAccessibleImplementationModule != NULL ) @@ -291,7 +296,9 @@ namespace svt } OSL_ENSURE( s_pAccessibleFactoryFunc, "ac_registerClient: could not load the library, or not retrieve the needed symbol!" ); - +#else + s_pAccessibleFactoryFunc = getSvtAccessibilityComponentFactory; +#endif // get a factory instance if ( s_pAccessibleFactoryFunc ) { diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx index a7a2b03f5d8f..9d87d4bb7804 100644 --- a/svx/source/form/dbtoolsclient.cxx +++ b/svx/source/form/dbtoolsclient.cxx @@ -105,8 +105,17 @@ namespace svxform } //-------------------------------------------------------------------- + +#ifndef DISABLE_DYNLOADING + extern "C" { static void SAL_CALL thisModule() {} } +#else + + extern "C" void * createDataAccessToolsFactory(); + +#endif + void ODbtoolsClient::registerClient() { ::osl::MutexGuard aGuard(theODbtoolsClientMutex::get()); @@ -115,6 +124,7 @@ namespace svxform OSL_ENSURE(NULL == s_hDbtoolsModule, "ODbtoolsClient::registerClient: inconsistence: already have a module!"); OSL_ENSURE(NULL == s_pFactoryCreationFunc, "ODbtoolsClient::registerClient: inconsistence: already have a factory function!"); +#ifndef DISABLE_DYNLOADING const ::rtl::OUString sModuleName( SVLIBRARY( "dbtools" ) ); @@ -137,6 +147,9 @@ namespace svxform s_hDbtoolsModule = NULL; } } +#else + s_pFactoryCreationFunc = createDataAccessToolsFactory; +#endif } } @@ -146,9 +159,11 @@ namespace svxform ::osl::MutexGuard aGuard(theODbtoolsClientMutex::get()); if (0 == --s_nClients) { +#ifndef DISABLE_DYNLOADING s_pFactoryCreationFunc = NULL; if (s_hDbtoolsModule) osl_unloadModule(s_hDbtoolsModule); +#endif s_hDbtoolsModule = NULL; } diff --git a/sw/inc/init.hxx b/sw/inc/init.hxx index daad12c42c67..9fe7fd9f3e70 100644 --- a/sw/inc/init.hxx +++ b/sw/inc/init.hxx @@ -47,8 +47,9 @@ public: Filters(); ~Filters(); - +#ifndef DISABLE_DYNLOADING oslGenericFunction GetMswordLibSymbol( const char *pSymbol ); +#endif private: osl::Module msword_; diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 659177565f63..13fb977523bf 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -126,8 +126,12 @@ inline void _SetFltPtr( sal_uInt16 rPos, SwRead pReader ) namespace { +#ifndef DISABLE_DYNLOADING + extern "C" { static void SAL_CALL thisModule() {} } +#endif + } namespace sw { @@ -153,6 +157,8 @@ Filters::~Filters() } } +#ifndef DISABLE_DYNLOADING + oslGenericFunction Filters::GetMswordLibSymbol( const char *pSymbol ) { if (!msword_.is()) @@ -165,6 +171,8 @@ oslGenericFunction Filters::GetMswordLibSymbol( const char *pSymbol ) return NULL; } +#endif + } namespace SwReaderWriter { @@ -818,44 +826,75 @@ void SwAsciiOptions::WriteUserData( String& rStr ) rStr += ','; } +#ifdef DISABLE_DYNLOADING + +extern "C" { + Reader *ImportRTF(); + void ExportRTF( const String&, const String& rBaseURL, WriterRef& ); + Reader *ImportDOC(); + void ExportDOC( const String&, const String& rBaseURL, WriterRef& ); + sal_uLong SaveOrDelMSVBAStorage_ww8( SfxObjectShell&, SotStorage&, sal_Bool, const String& ); + sal_uLong GetSaveWarningOfMSVBAStorage_ww8( SfxObjectShell& ); +} + +#endif + Reader* GetRTFReader() { +#ifndef DISABLE_DYNLOADING + FnGetReader pFunction = reinterpret_cast( SwGlobals::getFilters().GetMswordLibSymbol( "ImportRTF" ) ); if ( pFunction ) return (*pFunction)(); return NULL; +#else + return ImportRTF(); +#endif + } void GetRTFWriter( const String& rFltName, const String& rBaseURL, WriterRef& xRet ) { +#ifndef DISABLE_DYNLOADING FnGetWriter pFunction = reinterpret_cast( SwGlobals::getFilters().GetMswordLibSymbol( "ExportRTF" ) ); if ( pFunction ) (*pFunction)( rFltName, rBaseURL, xRet ); else xRet = WriterRef(0); +#else + ExportRTF( rFltName, rBaseURL, xRet ); +#endif } Reader* GetWW8Reader() { +#ifndef DISABLE_DYNLOADING FnGetReader pFunction = reinterpret_cast( SwGlobals::getFilters().GetMswordLibSymbol( "ImportDOC" ) ); if ( pFunction ) return (*pFunction)(); return NULL; +#else + return ImportDOC(); +#endif } void GetWW8Writer( const String& rFltName, const String& rBaseURL, WriterRef& xRet ) { +#ifndef DISABLE_DYNLOADING FnGetWriter pFunction = reinterpret_cast( SwGlobals::getFilters().GetMswordLibSymbol( "ExportDOC" ) ); if ( pFunction ) (*pFunction)( rFltName, rBaseURL, xRet ); else xRet = WriterRef(0); +#else + ExportDOC( rFltName, rBaseURL, xRet ); +#endif } typedef sal_uLong ( __LOADONCALLAPI *SaveOrDel )( SfxObjectShell&, SotStorage&, sal_Bool, const String& ); @@ -863,18 +902,26 @@ typedef sal_uLong ( __LOADONCALLAPI *GetSaveWarning )( SfxObjectShell& ); sal_uLong SaveOrDelMSVBAStorage( SfxObjectShell& rDoc, SotStorage& rStor, sal_Bool bSaveInto, const String& rStorageName ) { +#ifndef DISABLE_DYNLOADING SaveOrDel pFunction = reinterpret_cast( SwGlobals::getFilters().GetMswordLibSymbol( "SaveOrDelMSVBAStorage_ww8" ) ); if( pFunction ) - return pFunction( rDoc, rStor, bSaveInto, rStorageName ); - return ERRCODE_NONE; + return pFunction( rDoc, rStor, bSaveInto, rStorageName ); + return ERRCODE_NONE; +#else + return SaveOrDelMSVBAStorage_ww8( rDoc, rStor, bSaveInto, rStorageName ); +#endif } sal_uLong GetSaveWarningOfMSVBAStorage( SfxObjectShell &rDocS ) { +#ifndef DISABLE_DYNLOADING GetSaveWarning pFunction = reinterpret_cast( SwGlobals::getFilters().GetMswordLibSymbol( "GetSaveWarningOfMSVBAStorage_ww8" ) ); if( pFunction ) - return pFunction( rDocS ); - return ERRCODE_NONE; + return pFunction( rDocS ); + return ERRCODE_NONE; +#else + return GetSaveWarningOfMSVBAStorage_ww8( rDocS ); +#endif } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dbui/swdbtoolsclient.cxx b/sw/source/ui/dbui/swdbtoolsclient.cxx index e18db2b4138a..cf1ebf58e142 100644 --- a/sw/source/ui/dbui/swdbtoolsclient.cxx +++ b/sw/source/ui/dbui/swdbtoolsclient.cxx @@ -94,8 +94,16 @@ SwDbtoolsClient::~SwDbtoolsClient() } } +#ifndef DISABLE_DYNLOADING + extern "C" { static void SAL_CALL thisModule() {} } +#else + +extern "C" void * createDataAccessToolsFactory(); + +#endif + void SwDbtoolsClient::registerClient() { ::osl::MutexGuard aGuard(getDbtoolsClientMutex()); @@ -104,6 +112,7 @@ void SwDbtoolsClient::registerClient() OSL_ENSURE(NULL == getDbToolsClientModule(), "SwDbtoolsClient::registerClient: inconsistence: already have a module!"); OSL_ENSURE(NULL == getDbToolsClientFactoryFunction(), "SwDbtoolsClient::registerClient: inconsistence: already have a factory function!"); +#ifndef DISABLE_DYNLOADING const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM(SVLIBRARY("dbtools"))); // load the dbtools library @@ -125,6 +134,9 @@ void SwDbtoolsClient::registerClient() getDbToolsClientModule() = NULL; } } +#else + getDbToolsClientFactoryFunction() = createDataAccessToolsFactory; +#endif } } @@ -133,9 +145,11 @@ void SwDbtoolsClient::revokeClient() ::osl::MutexGuard aGuard(getDbtoolsClientMutex()); if (0 == --getDbToolsClientClients()) { +#ifndef DISABLE_DYNLOADING getDbToolsClientFactoryFunction() = NULL; if (getDbToolsClientModule()) osl_unloadModule(getDbToolsClientModule()); +#endif getDbToolsClientModule() = NULL; } } diff --git a/sw/source/ui/dialog/swabstdlg.cxx b/sw/source/ui/dialog/swabstdlg.cxx index 982f74520c09..8efc77f721b3 100644 --- a/sw/source/ui/dialog/swabstdlg.cxx +++ b/sw/source/ui/dialog/swabstdlg.cxx @@ -35,10 +35,19 @@ typedef SwAbstractDialogFactory* (__LOADONCALLAPI *SwFuncPtrCreateDialogFactory)(); +#ifndef DISABLE_DYNLOADING + extern "C" { static void SAL_CALL thisModule() {} } +#else + +extern "C" SwAbstractDialogFactory* SwCreateDialogFactory(); + +#endif + SwAbstractDialogFactory* SwAbstractDialogFactory::Create() { +#ifndef DISABLE_DYNLOADING SwFuncPtrCreateDialogFactory fp = 0; static ::osl::Module aDialogLibrary; static const ::rtl::OUString sLibName(::vcl::unohelper::CreateLibraryName("swui", sal_True)); @@ -49,6 +58,9 @@ SwAbstractDialogFactory* SwAbstractDialogFactory::Create() if ( fp ) return fp(); return 0; +#else + return SwCreateDialogFactory(); +#endif } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dialog/swuiexp.cxx b/sw/source/ui/dialog/swuiexp.cxx index 62d92c277eb5..7b92e8928b9c 100644 --- a/sw/source/ui/dialog/swuiexp.cxx +++ b/sw/source/ui/dialog/swuiexp.cxx @@ -33,6 +33,10 @@ namespace swui } } +#ifdef DISABLE_DYNLOADING +#define CreateDialogFactory SwCreateDialogFactory +#endif + extern "C" { SAL_DLLPUBLIC_EXPORT SwAbstractDialogFactory* CreateDialogFactory() diff --git a/toolkit/source/helper/accessibilityclient.cxx b/toolkit/source/helper/accessibilityclient.cxx index cbc729362895..4a1cb993fb14 100644 --- a/toolkit/source/helper/accessibilityclient.cxx +++ b/toolkit/source/helper/accessibilityclient.cxx @@ -178,7 +178,11 @@ namespace toolkit } //-------------------------------------------------------------------- +#ifndef DISABLE_DYNLOADING extern "C" { static void SAL_CALL thisModule() {} } +#else + extern "C" void *getStandardAccessibleFactory(); +#endif void AccessibilityClient::ensureInitialized() { @@ -194,6 +198,7 @@ namespace toolkit // load the library implementing the factory if ( !s_pFactory.get() ) { +#ifndef DISABLE_DYNLOADING const ::rtl::OUString sModuleName( SVLIBRARY( "acc" ) ); s_hAccessibleImplementationModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, 0 ); if ( s_hAccessibleImplementationModule != NULL ) @@ -205,6 +210,9 @@ namespace toolkit } OSL_ENSURE( s_pAccessibleFactoryFunc, "AccessibilityClient::ensureInitialized: could not load the library, or not retrieve the needed symbol!" ); +#else + s_pAccessibleFactoryFunc = getStandardAccessibleFactory; +#endif // get a factory instance if ( s_pAccessibleFactoryFunc ) diff --git a/vcl/source/window/abstdlg.cxx b/vcl/source/window/abstdlg.cxx index 3186ba9bc2fe..6db6b95a8978 100644 --- a/vcl/source/window/abstdlg.cxx +++ b/vcl/source/window/abstdlg.cxx @@ -34,16 +34,24 @@ typedef VclAbstractDialogFactory* (__LOADONCALLAPI *FuncPtrCreateDialogFactory)(); +#ifndef DISABLE_DYNLOADING extern "C" { static void SAL_CALL thisModule() {} } +#else +extern "C" VclAbstractDialogFactory* CreateDialogFactory(); +#endif VclAbstractDialogFactory* VclAbstractDialogFactory::Create() { FuncPtrCreateDialogFactory fp = 0; +#ifndef DISABLE_DYNLOADING static ::osl::Module aDialogLibrary; if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( CUI_DLL_NAME ), SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) ) fp = ( VclAbstractDialogFactory* (__LOADONCALLAPI*)() ) aDialogLibrary.getFunctionSymbol( ::rtl::OUString("CreateDialogFactory") ); +#else + fp = CreateDialogFactory; +#endif if ( fp ) return fp(); return 0; diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 1fdad861112b..86c06d109067 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -25,6 +25,10 @@ #include #include +#ifdef DISABLE_DYNLOADING +#include // For RTLD_DEFAULT +#endif + namespace { SymbolType mapStockToSymbol(OString sType) @@ -474,7 +478,9 @@ bool VclBuilder::extractImage(const OString &id, stringmap &rMap) return false; } +#ifndef DISABLE_DYNLOADING extern "C" { static void SAL_CALL thisModule() {} } +#endif Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OString &id, stringmap &rMap) { @@ -664,6 +670,7 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri sal_Int32 nDelim = name.indexOf(':'); if (nDelim != -1) { +#ifndef DISABLE_DYNLOADING OUStringBuffer sModule; #ifdef SAL_DLLPREFIX sModule.append(SAL_DLLPREFIX); @@ -671,11 +678,16 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri sModule.append(OStringToOUString(name.copy(0, nDelim), RTL_TEXTENCODING_UTF8)); #ifdef SAL_DLLEXTENSION sModule.append(SAL_DLLEXTENSION); +#endif #endif OUString sFunction(OStringToOUString(OString("make") + name.copy(nDelim+1), RTL_TEXTENCODING_UTF8)); +#ifndef DISABLE_DYNLOADING osl::Module aModule; aModule.loadRelative(&thisModule, sModule.makeStringAndClear()); customMakeWidget pFunction = (customMakeWidget)aModule.getFunctionSymbol(sFunction); +#else + customMakeWidget pFunction = (customMakeWidget)osl_getFunctionSymbol((oslModule) RTLD_DEFAULT, sFunction.pData); +#endif if (pFunction) pWindow = (*pFunction)(pParent, rMap); } From 922cff776ae913ea3dbd3fdbd6f72fc990bd9260 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 7 Oct 2012 08:10:54 +0300 Subject: [PATCH 457/863] Let's use only comprehensive UDKAPI headers for Clang on OS X Change-Id: Ie5969a0f5772676f91c29fe946217d8d31bf514a --- solenv/gbuild/UnoApiTarget.mk | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index 35c91cf656d2..de6c09d5a1b5 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -278,9 +278,28 @@ endef # harm, by accident or careful design, on platforms where shared # libraries are used.) +# We are experimenting with static linking on Android, too. There for +# technical reasons to get around silly limitations in the OS, sigh. + +ifeq ($(DISABLE_DYNLOADING),TRUE) +gb_UnoApiHeadersTarget_UDKAPI_always_comprehensive = TRUE +endif + +# It seems that when using the latest Xcode and Clang for OS X, we +# also neeed to always generate comprehensive headers for +# udkapi. Otherwise we get assertion failures in saxparser when doing +# i18npool, at least. + +ifeq ($(OS),MACOSX) +ifeq ($(COM_GCC_IS_CLANG),TRUE) +gb_UnoApiHeadersTarget_UDKAPI_always_comprehensive = TRUE +endif +endif + + $(call gb_UnoApiHeadersTarget_get_bootstrap_target,%) : \ $(gb_UnoApiHeadersTarget_CPPUMAKERTARGET) - $(if $(filter TRUEudkapi,$(DISABLE_DYNLOADING)$*), \ + $(if $(filter TRUEudkapi,$(gb_UnoApiHeadersTarget_UDKAPI_always_comprehensive)$*), \ $(call gb_Output_announce,$*,$(true),HPB,3) \ $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$*),-C), \ \ @@ -295,7 +314,7 @@ $(call gb_UnoApiHeadersTarget_get_comprehensive_target,%) : \ $(call gb_UnoApiHeadersTarget_get_target,%) : \ $(gb_UnoApiHeadersTarget_CPPUMAKERTARGET) - $(if $(filter TRUEudkapi,$(DISABLE_DYNLOADING)$*), \ + $(if $(filter TRUEudkapi,$(gb_UnoApiHeadersTarget_UDKAPI_always_comprehensive)$*), \ $(call gb_Output_announce,$*,$(true),HPP,3) \ $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_dir,$*),-C), \ \ From 06d51d2790b99e31cdcfce366956de35d6ca47d0 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 7 Oct 2012 08:12:00 +0300 Subject: [PATCH 458/863] Revert "For some reason saxparser aborts for me without this" Not needed now when we always generate comprehensive UDKAPI headers in the configuration where I thought the reverted change helped (it actually didn't). This reverts commit 73c3907bce33c07ef78c0bb9ff1e0df8b9fbb323. Change-Id: Iabbfec9b8e9d6963b31daa52dc574bed01d9eb4c --- codemaker/source/cppumaker/cpputype.cxx | 1 - 1 file changed, 1 deletion(-) diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx index 0996db61329c..eca01435a4e2 100644 --- a/codemaker/source/cppumaker/cpputype.cxx +++ b/codemaker/source/cppumaker/cpputype.cxx @@ -119,7 +119,6 @@ bool isBootstrapType(rtl::OString const & name) { "com/sun/star/reflection/XMethodParameter", "com/sun/star/reflection/XStructTypeDescription", "com/sun/star/reflection/XTypeDescription", - "com/sun/star/reflection/XTypeDescriptionEnumeration", "com/sun/star/reflection/XTypeDescriptionEnumerationAccess", "com/sun/star/reflection/XUnionTypeDescription", "com/sun/star/registry/XImplementationRegistration", From 914dae47b7be610d6a79c21f7df8f1c7ddb9a1b2 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 7 Oct 2012 08:48:05 +0300 Subject: [PATCH 459/863] Forgot to change the function pointer type name in two more places Change-Id: Ibe88fd010edbf83e06dc6a5c6b0e0b25d564fd0b --- sd/source/filter/cgm/sdcgmfilter.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx index 7135ee81fc1d..c5d1ccf4822e 100644 --- a/sd/source/filter/cgm/sdcgmfilter.cxx +++ b/sd/source/filter/cgm/sdcgmfilter.cxx @@ -108,7 +108,7 @@ sal_Bool SdCGMFilter::Import() mxModel.is() ) { #ifndef DISABLE_DYNLOADING - ImportCGMPointer FncImportCGM = reinterpret_cast< ImportCGM >( pLibrary->getFunctionSymbol( "ImportCGM" ) ); + ImportCGMPointer FncImportCGM = reinterpret_cast< ImportCGMPointer >( pLibrary->getFunctionSymbol( "ImportCGM" ) ); #else ImportCGMPointer FncImportCGM = ImportCGM; #endif @@ -162,7 +162,7 @@ sal_Bool SdCGMFilter::Export() mxModel.is() ) { #ifndef DISABLE_DYNLOADING - ExportCGMPointer FncCGMExport = reinterpret_cast< ExportCGM >( pLibrary->getFunctionSymbol( "ExportCGM" ) ); + ExportCGMPointer FncCGMExport = reinterpret_cast< ExportCGMPointer >( pLibrary->getFunctionSymbol( "ExportCGM" ) ); #else ExportCGMPointer FncCGMExport = ExportCGM; #endif From 261e9c71f9d4a12865bba7e7226ffe363aa1460b Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 7 Oct 2012 10:11:26 +0300 Subject: [PATCH 460/863] More glitches Change-Id: I700eced69bd6b6f9f5a15fd871159de38ac36287 --- sd/source/filter/sdpptwrp.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx index c11c9585ece5..72baaf4cf9c9 100644 --- a/sd/source/filter/sdpptwrp.cxx +++ b/sd/source/filter/sdpptwrp.cxx @@ -119,7 +119,7 @@ sal_Bool SdPPTFilter::Import() ::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData() ); if ( pLibrary ) { - ImportPPTPointer PPTImport = reinterpret_cast< ImportPPT >( pLibrary->getFunctionSymbol( "ImportPPT" ) ); + ImportPPTPointer PPTImport = reinterpret_cast< ImportPPTPointer >( pLibrary->getFunctionSymbol( "ImportPPT" ) ); if ( PPTImport ) bRet = PPTImport( &mrDocument, *pDocStream, *pStorage, mrMedium ); @@ -157,7 +157,7 @@ sal_Bool SdPPTFilter::Export() { SotStorageRef xStorRef = new SotStorage( mrMedium.GetOutStream(), sal_False ); #ifndef DISABLE_DYNLOADING - ExportPPTPointer PPTExport = reinterpret_cast(pLibrary->getFunctionSymbol( "ExportPPT" )); + ExportPPTPointer PPTExport = reinterpret_cast(pLibrary->getFunctionSymbol( "ExportPPT" )); #else ExportPPTPointer PPTExport = ExportPPT; #endif @@ -209,7 +209,7 @@ void SdPPTFilter::PreSaveBasic() ::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData() ); if( pLibrary ) { - SaveVBAPointer pSaveVBA= reinterpret_cast(pLibrary->getFunctionSymbol( "SaveVBA" )); + SaveVBAPointer pSaveVBA= reinterpret_cast(pLibrary->getFunctionSymbol( "SaveVBA" )); if( pSaveVBA ) { pSaveVBA( (SfxObjectShell&) mrDocShell, pBas ); From c56600dfbeaf687f249e4fb641044595892b4ebc Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 7 Oct 2012 10:33:46 +0300 Subject: [PATCH 461/863] Move the #ifndef DISABLE_DYNLOADING a bit earlier Change-Id: I1777d6304b2ebb218c0f85c778f1a66d05c4f454 --- jvmfwk/source/framework.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index 2f1760aae209..4694bf6029a8 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -387,11 +387,11 @@ javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions, sal_Int32 cOpti jfw::VendorSettings aVendorSettings; rtl::OUString sLibPath = aVendorSettings.getPluginLibrary(aInfo.getVendor()); +#ifndef DISABLE_DYNLOADING osl::Module modulePlugin(sLibPath); if ( ! modulePlugin) return JFW_E_NO_PLUGIN; -#ifndef DISABLE_DYNLOADING rtl::OUString sFunctionName( RTL_CONSTASCII_USTRINGPARAM("jfw_plugin_startJavaVirtualMachine")); jfw_plugin_startJavaVirtualMachine_ptr pFunc = From 74db703172baa3b2c7e3a77b54260a340777d266 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 7 Oct 2012 10:49:22 +0300 Subject: [PATCH 462/863] DISABLE_DYNLOADING tentative fix Change-Id: Ic23dcc0b45a90e845fc4fba1861bcee03354da01 --- javaunohelper/source/javaunohelper.cxx | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/javaunohelper/source/javaunohelper.cxx b/javaunohelper/source/javaunohelper.cxx index a36cf584a147..374b6386dc3e 100644 --- a/javaunohelper/source/javaunohelper.cxx +++ b/javaunohelper/source/javaunohelper.cxx @@ -63,6 +63,13 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo( OUString aLibName( pJLibName ); pJEnv->ReleaseStringChars( jLibName, pJLibName); +#ifdef DISABLE_DYNLOADING + (void) jSMgr; + (void) jRegKey; + (void) loader; + + fprintf(stderr, "Hmm, %s called for %s\n", __PRETTY_FUNCTION__, ::rtl::OUStringToOString(pJLibName, RTL_TEXTENCODING_JAVA_UTF8).getStr()); +#else oslModule lib = osl_loadModule( aLibName.pData, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL ); if (lib) { @@ -123,7 +130,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo( } } } - +#endif return bRet == sal_False? JNI_FALSE : JNI_TRUE; } @@ -138,6 +145,16 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( jobject jSMgr, jobject jRegKey, jobject loader ) { const jchar* pJLibName = pJEnv->GetStringChars(jLibName, NULL); + +#ifdef DISABLE_DYNLOADING + (void) jImplName; + (void) jSMgr; + (void) jRegKey; + (void) loader; + + fprintf(stderr, "Hmm, %s called for %s\n", __PRETTY_FUNCTION__, ::rtl::OUStringToOString(pJLibName, RTL_TEXTENCODING_JAVA_UTF8).getStr()); +#endif + OUString aLibName( pJLibName ); pJEnv->ReleaseStringChars( jLibName, pJLibName); @@ -145,6 +162,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( jobject joSLL_cpp = 0; +#ifndef DISABLE_DYNLOADING oslModule lib = osl_loadModule( aLibName.pData, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL ); if (lib) { @@ -219,7 +237,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( } } } - +#endif return joSLL_cpp; } From dc83d895f50169cc2bc525c5db176179d0dbcd4c Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 7 Oct 2012 11:06:02 +0300 Subject: [PATCH 463/863] Bypass ODBC here, too Change-Id: Ie9a49e9521741038a06dc46a1bd9072088e3bf6b --- postprocess/packcomponents/makefile.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 7ebbc855d787..b2b2296885db 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -145,10 +145,15 @@ my_components += \ component/connectivity/source/dbtools/dbtools \ component/connectivity/source/drivers/flat/flat \ component/connectivity/source/drivers/mysql/mysql \ - component/connectivity/source/drivers/odbc/odbc \ component/connectivity/source/manager/sdbc2 \ component/shell/source/backends/localebe/localebe1 \ +.IF "$(OS)" != "ANDROID" && "$(OS)" != "IOS" +my_components += \ + component/connectivity/source/drivers/odbc/odbc \ + +.ENDIF + .ENDIF .IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DESKTOP//)" From 8f850a0ca530fae57c1b0354752fc14e6ebff092 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 7 Oct 2012 11:10:41 +0300 Subject: [PATCH 464/863] Android printing is completely different anyway, surely Change-Id: Ib58300148bbf248150f514bb3c59d863388eaa0b --- vcl/generic/print/genprnpsp.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx index 6525f9609164..0a4bcd803eab 100644 --- a/vcl/generic/print/genprnpsp.cxx +++ b/vcl/generic/print/genprnpsp.cxx @@ -107,7 +107,7 @@ static rtl::OUString getPdfDir( const PrinterInfo& rInfo ) static void getPaLib() { -#if defined( UNX ) && !( defined( QUARTZ ) || defined( IOS ) ) +#if defined( UNX ) && !( defined( QUARTZ ) || defined( IOS ) || defined( ANDROID ) ) if( ! driverLib ) { OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( _XSALSET_LIBNAME ) ); From 3d16094619cdf29cd96a014572244462a219f304 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 7 Oct 2012 11:14:37 +0300 Subject: [PATCH 465/863] WaE: 'driverLib' defined but not used Change-Id: If4853650958df9e425c936ead16ea11c976c5657 --- vcl/generic/print/genprnpsp.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx index 0a4bcd803eab..3b0062518841 100644 --- a/vcl/generic/print/genprnpsp.cxx +++ b/vcl/generic/print/genprnpsp.cxx @@ -77,7 +77,9 @@ using ::rtl::OUStringToOString; * static helpers */ +#if defined( UNX ) && !( defined( QUARTZ ) || defined( IOS ) || defined( ANDROID ) ) static oslModule driverLib = NULL; +#endif extern "C" { typedef int(*setupFunction)(PrinterInfo&); From e87e2fd386a1848939aad755ed7dc2b3829a2008 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 7 Oct 2012 11:23:59 +0300 Subject: [PATCH 466/863] WaE: 's_hAccessibleImplementationModule' defined but not used Change-Id: I700f66cbc3ddb01d723b9a50709b4b1d5ab66405 --- toolkit/source/helper/accessibilityclient.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/toolkit/source/helper/accessibilityclient.cxx b/toolkit/source/helper/accessibilityclient.cxx index 4a1cb993fb14..3119ba6e3dc9 100644 --- a/toolkit/source/helper/accessibilityclient.cxx +++ b/toolkit/source/helper/accessibilityclient.cxx @@ -51,7 +51,9 @@ namespace toolkit #ifdef UNLOAD_ON_LAST_CLIENT_DYING static oslInterlockedCount s_nAccessibilityClients = 0; #endif // UNLOAD_ON_LAST_CLIENT_DYING +#ifndef DISABLE_DYNLOADING static oslModule s_hAccessibleImplementationModule = NULL; +#endif static GetStandardAccComponentFactory s_pAccessibleFactoryFunc = NULL; static ::rtl::Reference< IAccessibleFactory > s_pFactory; } From 7da6319de0038e5751cf7c8f9f8bca7e1813bb63 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 7 Oct 2012 11:29:28 +0300 Subject: [PATCH 467/863] WaE: 's_hAccessibleImplementationModule' defined but not used Change-Id: I8caf2951876d47873b325f306515ec840692b856 --- svtools/source/misc/svtaccessiblefactory.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/svtools/source/misc/svtaccessiblefactory.cxx b/svtools/source/misc/svtaccessiblefactory.cxx index 013e946bba95..587c4d545ea3 100644 --- a/svtools/source/misc/svtaccessiblefactory.cxx +++ b/svtools/source/misc/svtaccessiblefactory.cxx @@ -58,7 +58,9 @@ namespace svt #ifdef UNLOAD_ON_LAST_CLIENT_DYING static oslInterlockedCount s_nAccessibleFactoryAccesss = 0; #endif // UNLOAD_ON_LAST_CLIENT_DYING +#ifndef DISABLE_DYNLOADING static oslModule s_hAccessibleImplementationModule = NULL; +#endif static GetSvtAccessibilityComponentFactory s_pAccessibleFactoryFunc = NULL; static ::rtl::Reference< IAccessibleFactory > s_pFactory; From 5d83f67e060cb540345463d1762cc87d282e9566 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 7 Oct 2012 09:00:42 +0200 Subject: [PATCH 468/863] a directory is a directory Change-Id: I6384a9d86123ab354414cf6e9366b4f9e46f1c1f --- solenv/gbuild/TargetLocations.mk | 6 +++--- solenv/gbuild/UnoApiTarget.mk | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index f3b92a34407e..785df59e43d7 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -163,9 +163,9 @@ gb_UITarget_get_target = $(WORKDIR)/UITarget/$(1).done gb_UnoApiTarget_get_external_headers_target = $(WORKDIR)/UnoApiTarget/$(1).external gb_UnoApiTarget_get_headers_target = $(WORKDIR)/UnoApiTarget/$(1).headers gb_UnoApiTarget_get_target = $(WORKDIR)/UnoApiTarget/$(1).rdb -gb_UnoApiHeadersTarget_get_bootstrap_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/bootstrap$(2) -gb_UnoApiHeadersTarget_get_comprehensive_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/comprehensive$(2) -gb_UnoApiHeadersTarget_get_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/normal$(2) +gb_UnoApiHeadersTarget_get_bootstrap_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/bootstrap +gb_UnoApiHeadersTarget_get_comprehensive_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/comprehensive +gb_UnoApiHeadersTarget_get_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/normal gb_UnoApiHeadersTarget_get_bootstrap_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/bootstrap.done gb_UnoApiHeadersTarget_get_comprehensive_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/comprehensive.done gb_UnoApiHeadersTarget_get_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/normal.done diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index de6c09d5a1b5..f4b6781b5c42 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -347,29 +347,29 @@ $(call gb_UnoApiHeadersTarget_get_comprehensive_target,$(1)) : UNOAPI_DEPS := # need dummy recipes so that header files are delivered in Package_inc; # otherwise make will consider the header to be up-to-date because it was # actually built by the recipe for gb_UnoApiHeadersTarget_get_target -$(call gb_UnoApiHeadersTarget_get_dir,$(1),/%.hdl) : +$(call gb_UnoApiHeadersTarget_get_dir,$(1))/%.hdl : touch $$@ -$(call gb_UnoApiHeadersTarget_get_dir,$(1),/%.hpp) : +$(call gb_UnoApiHeadersTarget_get_dir,$(1))/%.hpp : touch $$@ -$(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$(1),/%.hdl) : +$(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$(1))/%.hdl : touch $$@ -$(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$(1),/%.hpp) : +$(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$(1))/%.hpp : touch $$@ -$(call gb_UnoApiHeadersTarget_get_comprehensive_dir,$(1),/%.hdl) : +$(call gb_UnoApiHeadersTarget_get_comprehensive_dir,$(1))/%.hdl : mkdir -p `dirname $$@` && touch $$@ -$(call gb_UnoApiHeadersTarget_get_comprehensive_dir,$(1),/%.hpp) : +$(call gb_UnoApiHeadersTarget_get_comprehensive_dir,$(1))/%.hpp : mkdir -p `dirname $$@` && touch $$@ endef # ensure that new urd triggers the dummy rule to rebuild the headers define gb_UnoApiHeadersTarget_add_headerfile -$(call gb_UnoApiHeadersTarget_get_dir,$(1),/$(3)) : \ +$(call gb_UnoApiHeadersTarget_get_dir,$(1))/$(3) : \ $(call gb_UnoApiPartTarget_get_target,$(basename $(2)).urd) endef From 86f4727920ae515987005e3c414f1d6056079be1 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 7 Oct 2012 08:49:26 +0200 Subject: [PATCH 469/863] move selection of UNO header variant to platform Change-Id: Ic06deb22da77428ef88c1071af5d7b8bf9dc77f7 --- solenv/gbuild/TargetLocations.mk | 18 ++-- solenv/gbuild/UnoApiTarget.mk | 114 ++++++++++++------------ solenv/gbuild/platform/IOS_ARM_GCC.mk | 8 ++ solenv/gbuild/platform/WNT_INTEL_GCC.mk | 8 ++ solenv/gbuild/platform/WNT_INTEL_MSC.mk | 8 ++ solenv/gbuild/platform/macosx.mk | 12 +++ solenv/gbuild/platform/solaris.mk | 8 ++ solenv/gbuild/platform/unxgcc.mk | 8 ++ 8 files changed, 120 insertions(+), 64 deletions(-) diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 785df59e43d7..514c7f361807 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -163,12 +163,18 @@ gb_UITarget_get_target = $(WORKDIR)/UITarget/$(1).done gb_UnoApiTarget_get_external_headers_target = $(WORKDIR)/UnoApiTarget/$(1).external gb_UnoApiTarget_get_headers_target = $(WORKDIR)/UnoApiTarget/$(1).headers gb_UnoApiTarget_get_target = $(WORKDIR)/UnoApiTarget/$(1).rdb -gb_UnoApiHeadersTarget_get_bootstrap_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/bootstrap -gb_UnoApiHeadersTarget_get_comprehensive_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/comprehensive -gb_UnoApiHeadersTarget_get_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/normal -gb_UnoApiHeadersTarget_get_bootstrap_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/bootstrap.done -gb_UnoApiHeadersTarget_get_comprehensive_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/comprehensive.done -gb_UnoApiHeadersTarget_get_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/normal.done +gb_UnoApiHeadersTarget_get_bootstrap_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/$(call gb_UnoApiHeadersTarget_select_variant,$(1),bootstrap) +gb_UnoApiHeadersTarget_get_comprehensive_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/$(call gb_UnoApiHeadersTarget_select_variant,$(1),comprehensive) +gb_UnoApiHeadersTarget_get_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/$(call gb_UnoApiHeadersTarget_select_variant,$(1),normal) +gb_UnoApiHeadersTarget_get_real_bootstrap_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/bootstrap +gb_UnoApiHeadersTarget_get_real_comprehensive_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/comprehensive +gb_UnoApiHeadersTarget_get_real_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/normal +gb_UnoApiHeadersTarget_get_real_bootstrap_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/bootstrap.done +gb_UnoApiHeadersTarget_get_real_comprehensive_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/comprehensive.done +gb_UnoApiHeadersTarget_get_real_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/normal.done +gb_UnoApiHeadersTarget_get_bootstrap_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/$(call gb_UnoApiHeadersTarget_select_variant,$(1),bootstrap).done +gb_UnoApiHeadersTarget_get_comprehensive_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/$(call gb_UnoApiHeadersTarget_select_variant,$(1),comprehensive).done +gb_UnoApiHeadersTarget_get_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/$(call gb_UnoApiHeadersTarget_select_variant,$(1),normal).done gb_UnoApiPartTarget_get_target = $(WORKDIR)/UnoApiPartTarget/$(1) gb_UnpackedTarball_get_dir = $(WORKDIR)/UnpackedTarball/$(1) gb_UnpackedTarball_get_pristine_dir = $(WORKDIR)/UnpackedTarball/$(1).org diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index f4b6781b5c42..022f3941e312 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -253,6 +253,43 @@ endef # UnoApiHeadersTarget +# defined by platform +# gb_UnoApiHeadersTarget_select_variant + +# Allow to redefine header variant. +# +# On iOS we use static linking because dynamic loading of own code +# isn't allowed by the iOS App Store rules, and we want our code to be +# eventually distributable there as part of apps. +# +# To avoid problems that this causes together with the lovely +# intentional breaking of the One Definition Rule, for iOS we always +# generate comprehensive headers for certain type RDBS. (The ODR +# breakage doesn't harm, by accident or careful design, on platforms +# where shared libraries are used.) To avoid generating the same headers +# more than once, we are silently "redirecting" the target to point to +# comprehensive headers instead. +# +# Example: +# If gb_UnoApiHeadersTarget_select_variant is defined as +# +# ifeq ($(DISABLE_DYNLOADING),YES) +# gb_UnoApiHeadersTarget_select_variant = $(if $(filter udkapi,$(1)),comprehensive,$(2)) +# else +# gb_UnoApiHeadersTarget_select_variant = $(2) +# endif +# +# then, for the DISABLE_DYNLOADING case, whenever a makefile uses +# $(call gb_UnoApiHeadersTarget_get_target,udkapi) or $(call +# gb_UnoApiHeadersTarget_get_dir,udkapi), it will get target or dir for +# comprehensive headers instead. +# +# We are experimenting with static linking on Android, too. There for +# technical reasons to get around silly limitations in the OS, sigh. +# +# gb_UnoApiHeadersTarget_select_variant api default-variant +# define gb_UnoApiHeadersTarget_select_variant + gb_UnoApiHeadersTarget_CPPUMAKERTARGET := $(call gb_Executable_get_target_for_build,cppumaker) gb_UnoApiHeadersTarget_CPPUMAKERCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiHeadersTarget_CPPUMAKERTARGET) @@ -268,71 +305,32 @@ define gb_UnoApiHeadersTarget__command endef -# On iOS we use static linking because dynamic loading of own code -# isn't allowed by the iOS App Store rules, and we want our code to be -# eventually distributable there as part of apps. - -# To avoid problems that this causes together with the lovely -# intentional breaking of the One Definition Rule, for iOS we always -# generate comprehensive headers for udkapi. (The ODR breakage doesn't -# harm, by accident or careful design, on platforms where shared -# libraries are used.) - -# We are experimenting with static linking on Android, too. There for -# technical reasons to get around silly limitations in the OS, sigh. - -ifeq ($(DISABLE_DYNLOADING),TRUE) -gb_UnoApiHeadersTarget_UDKAPI_always_comprehensive = TRUE -endif - -# It seems that when using the latest Xcode and Clang for OS X, we -# also neeed to always generate comprehensive headers for -# udkapi. Otherwise we get assertion failures in saxparser when doing -# i18npool, at least. - -ifeq ($(OS),MACOSX) -ifeq ($(COM_GCC_IS_CLANG),TRUE) -gb_UnoApiHeadersTarget_UDKAPI_always_comprehensive = TRUE -endif -endif - - -$(call gb_UnoApiHeadersTarget_get_bootstrap_target,%) : \ +$(call gb_UnoApiHeadersTarget_get_real_bootstrap_target,%) : \ $(gb_UnoApiHeadersTarget_CPPUMAKERTARGET) - $(if $(filter TRUEudkapi,$(gb_UnoApiHeadersTarget_UDKAPI_always_comprehensive)$*), \ - $(call gb_Output_announce,$*,$(true),HPB,3) \ - $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$*),-C), \ - \ - $(call gb_Output_announce,$*,$(true),HPB,3) \ - $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$*)) \ - ) + $(call gb_Output_announce,$*,$(true),HPB,3) \ + $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$*)) -$(call gb_UnoApiHeadersTarget_get_comprehensive_target,%) : \ +$(call gb_UnoApiHeadersTarget_get_real_comprehensive_target,%) : \ $(gb_UnoApiHeadersTarget_CPPUMAKERTARGET) $(call gb_Output_announce,$*,$(true),HPC,3) $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_comprehensive_dir,$*),-C) -$(call gb_UnoApiHeadersTarget_get_target,%) : \ +$(call gb_UnoApiHeadersTarget_get_real_target,%) : \ $(gb_UnoApiHeadersTarget_CPPUMAKERTARGET) - $(if $(filter TRUEudkapi,$(gb_UnoApiHeadersTarget_UDKAPI_always_comprehensive)$*), \ - $(call gb_Output_announce,$*,$(true),HPP,3) \ - $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_dir,$*),-C), \ - \ - $(call gb_Output_announce,$*,$(true),HPP,3) \ - $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_dir,$*),-L) \ - ) + $(call gb_Output_announce,$*,$(true),HPP,3) \ + $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_dir,$*),-L) .PHONY : $(call gb_UnoApiHeadersTarget_get_clean_target,%) $(call gb_UnoApiHeadersTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),HPP,3) $(call gb_Helper_abbreviate_dirs,\ rm -rf \ - $(call gb_UnoApiHeadersTarget_get_dir,$*) \ - $(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$*) \ - $(call gb_UnoApiHeadersTarget_get_comprehensive_dir,$*) \ - $(call gb_UnoApiHeadersTarget_get_target,$*) \ - $(call gb_UnoApiHeadersTarget_get_bootstrap_target,$*)) \ - $(call gb_UnoApiHeadersTarget_get_comprehensive_target,$*) + $(call gb_UnoApiHeadersTarget_get_real_dir,$*) \ + $(call gb_UnoApiHeadersTarget_get_real_bootstrap_dir,$*) \ + $(call gb_UnoApiHeadersTarget_get_real_comprehensive_dir,$*) \ + $(call gb_UnoApiHeadersTarget_get_real_target,$*) \ + $(call gb_UnoApiHeadersTarget_get_real_bootstrap_target,$*)) \ + $(call gb_UnoApiHeadersTarget_get_real_comprehensive_target,$*) define gb_UnoApiHeadersTarget_UnoApiHeadersTarget $(call gb_UnoApiHeadersTarget_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)) @@ -347,22 +345,22 @@ $(call gb_UnoApiHeadersTarget_get_comprehensive_target,$(1)) : UNOAPI_DEPS := # need dummy recipes so that header files are delivered in Package_inc; # otherwise make will consider the header to be up-to-date because it was # actually built by the recipe for gb_UnoApiHeadersTarget_get_target -$(call gb_UnoApiHeadersTarget_get_dir,$(1))/%.hdl : +$(call gb_UnoApiHeadersTarget_get_real_dir,$(1))/%.hdl : touch $$@ -$(call gb_UnoApiHeadersTarget_get_dir,$(1))/%.hpp : +$(call gb_UnoApiHeadersTarget_get_real_dir,$(1))/%.hpp : touch $$@ -$(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$(1))/%.hdl : +$(call gb_UnoApiHeadersTarget_get_real_bootstrap_dir,$(1))/%.hdl : touch $$@ -$(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$(1))/%.hpp : +$(call gb_UnoApiHeadersTarget_get_real_bootstrap_dir,$(1))/%.hpp : touch $$@ -$(call gb_UnoApiHeadersTarget_get_comprehensive_dir,$(1))/%.hdl : +$(call gb_UnoApiHeadersTarget_get_real_comprehensive_dir,$(1))/%.hdl : mkdir -p `dirname $$@` && touch $$@ -$(call gb_UnoApiHeadersTarget_get_comprehensive_dir,$(1))/%.hpp : +$(call gb_UnoApiHeadersTarget_get_real_comprehensive_dir,$(1))/%.hpp : mkdir -p `dirname $$@` && touch $$@ endef diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index fb4ba18a8dc0..c7d40d34bed9 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -318,6 +318,14 @@ gb_ExtensionTarget_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/LICENSE gb_UnpackedTarget_TARFILE_LOCATION := $(TARFILE_LOCATION) +# UnoApiHeadersTarget class + +ifeq ($(DISABLE_DYNLOADING),TRUE) +gb_UnoApiHeadersTarget_select_variant = $(if $(filter udkapi,$(1)),comprehensive,$(2)) +else +gb_UnoApiHeadersTarget_select_variant = $(2) +endif + # Python gb_PYTHON_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index 427c622326ad..46f4e70d2462 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -420,6 +420,14 @@ gb_ExtensionTarget_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/license.txt gb_UnpackedTarget_TARFILE_LOCATION := $(TARFILE_LOCATION) +# UnoApiHeadersTarget class + +ifeq ($(DISABLE_DYNLOADING),TRUE) +gb_UnoApiHeadersTarget_select_variant = $(if $(filter udkapi,$(1)),comprehensive,$(2)) +else +gb_UnoApiHeadersTarget_select_variant = $(2) +endif + # Python gb_PYTHON_PRECOMMAND := PATH="$${PATH}:$(OUTDIR_FOR_BUILD)/bin" PYTHONHOME="$(OUTDIR_FOR_BUILD)/lib/python" PYTHONPATH="$(OUTDIR_FOR_BUILD)/lib/python;$(OUTDIR_FOR_BUILD)/lib/python/lib-dynload" diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index a232b661eb93..9683de9ec935 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -713,6 +713,14 @@ gb_ExtensionTarget_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/license.txt gb_UnpackedTarget_TARFILE_LOCATION := $(shell cygpath -u $(TARFILE_LOCATION)) +# UnoApiHeadersTarget class + +ifeq ($(DISABLE_DYNLOADING),TRUE) +gb_UnoApiHeadersTarget_select_variant = $(if $(filter udkapi,$(1)),comprehensive,$(2)) +else +gb_UnoApiHeadersTarget_select_variant = $(2) +endif + # Python gb_PYTHON_PRECOMMAND := $(gb_Helper_set_ld_path) PYTHONHOME="$(OUTDIR_FOR_BUILD)/lib/python" PYTHONPATH="$(OUTDIR_FOR_BUILD)/lib/python;$(OUTDIR_FOR_BUILD)/lib/python/lib-dynload" diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index ecb7d71076ff..c013bf57ab96 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -409,6 +409,18 @@ gb_ExtensionTarget_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/LICENSE gb_UnpackedTarget_TARFILE_LOCATION := $(TARFILE_LOCATION) +# UnoApiHeadersTarget class + +# It seems that when using the latest Xcode and Clang for OS X, we +# also neeed to always generate comprehensive headers for +# udkapi. Otherwise we get assertion failures in saxparser when doing +# i18npool, at least. +ifneq ($(filter TRUE,$(COM_GCC_IS_CLANG) $(DISABLE_DYNLOADING)),) +gb_UnoApiHeadersTarget_select_variant = $(if $(filter udkapi,$(1)),comprehensive,$(2)) +else +gb_UnoApiHeadersTarget_select_variant = $(2) +endif + # Python gb_PYTHON_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 6c0bded557d8..2abac87c6b4c 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -400,6 +400,14 @@ gb_ExtensionTarget_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/LICENSE gb_UnpackedTarget_TARFILE_LOCATION := $(TARFILE_LOCATION) +# UnoApiHeadersTarget class + +ifeq ($(DISABLE_DYNLOADING),TRUE) +gb_UnoApiHeadersTarget_select_variant = $(if $(filter udkapi,$(1)),comprehensive,$(2)) +else +gb_UnoApiHeadersTarget_select_variant = $(2) +endif + # Python gb_PYTHON_PRECOMMAND := $(gb_Helper_set_ld_path) PYTHONHOME=$(OUTDIR)/lib/python PYTHONPATH=$(OUTDIR)/lib/python:$(OUTDIR)/lib/python/lib-dynload diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 73a354cc63ea..2b0612080a3b 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -402,6 +402,14 @@ gb_ExtensionTarget_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/LICENSE gb_UnpackedTarget_TARFILE_LOCATION := $(TARFILE_LOCATION) +# UnoApiHeadersTarget class + +ifeq ($(DISABLE_DYNLOADING),TRUE) +gb_UnoApiHeadersTarget_select_variant = $(if $(filter udkapi,$(1)),comprehensive,$(2)) +else +gb_UnoApiHeadersTarget_select_variant = $(2) +endif + # Python gb_PYTHON_PRECOMMAND := $(gb_Helper_set_ld_path) PYTHONHOME=$(OUTDIR)/lib/python PYTHONPATH=$(OUTDIR)/lib/python:$(OUTDIR)/lib/python/lib-dynload From f6414257a3ce56063566acfdd1efa7e99861c771 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 7 Oct 2012 08:55:55 +0200 Subject: [PATCH 470/863] check platform-defined func. is really defined Change-Id: I0916051214d8631198723933799e8e27fadef993 --- solenv/gbuild/UnoApiTarget.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index 022f3941e312..98734ab34b75 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -288,7 +288,9 @@ endef # technical reasons to get around silly limitations in the OS, sigh. # # gb_UnoApiHeadersTarget_select_variant api default-variant -# define gb_UnoApiHeadersTarget_select_variant +ifeq ($(origin gb_UnoApiHeadersTarget_select_variant),undefined) +$(eval $(call gb_Output_error,gb_UnoApiHeadersTarget_select_variant must be defined by platform)) +endif gb_UnoApiHeadersTarget_CPPUMAKERTARGET := $(call gb_Executable_get_target_for_build,cppumaker) gb_UnoApiHeadersTarget_CPPUMAKERCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiHeadersTarget_CPPUMAKERTARGET) From 3af8bd1ac4f216cb27b139cb6b2f8f8b7fcb6706 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 7 Oct 2012 10:25:38 +0200 Subject: [PATCH 471/863] use key directly from $(SRCDIR) Change-Id: I89f4438688b336f33816164e286f8b6c5b1cd6b6 --- cli_ure/CliLibrary_cli_basetypes.mk | 2 +- cli_ure/CliLibrary_cli_ure.mk | 2 +- cli_ure/CliNativeLibrary_cli_cppuhelper.mk | 2 +- cli_ure/CliUnoApi_cli_uretypes.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cli_ure/CliLibrary_cli_basetypes.mk b/cli_ure/CliLibrary_cli_basetypes.mk index 254720ca27ea..2d7b93737823 100644 --- a/cli_ure/CliLibrary_cli_basetypes.mk +++ b/cli_ure/CliLibrary_cli_basetypes.mk @@ -13,7 +13,7 @@ $(eval $(call gb_CliLibrary_CliLibrary,cli_basetypes)) $(eval $(call gb_CliLibrary_set_configfile,cli_basetypes,cli_ure/source/basetypes/cli_basetypes_config)) -$(eval $(call gb_CliLibrary_set_keyfile,cli_basetypes,$(OUTDIR)/bin/cliuno.snk)) +$(eval $(call gb_CliLibrary_set_keyfile,cli_basetypes,$(SRCDIR)/cli_ure/source/cliuno.snk)) $(eval $(call gb_CliLibrary_set_policy,cli_basetypes,$(CLI_BASETYPES_POLICY_ASSEMBLY),$(CLI_BASETYPES_POLICY_VERSION))) diff --git a/cli_ure/CliLibrary_cli_ure.mk b/cli_ure/CliLibrary_cli_ure.mk index fb5eaaae545a..c169d3c22829 100644 --- a/cli_ure/CliLibrary_cli_ure.mk +++ b/cli_ure/CliLibrary_cli_ure.mk @@ -13,7 +13,7 @@ $(eval $(call gb_CliLibrary_CliLibrary,cli_ure)) $(eval $(call gb_CliLibrary_set_configfile,cli_ure,cli_ure/source/ure/cli_ure_config)) -$(eval $(call gb_CliLibrary_set_keyfile,cli_ure,$(OUTDIR)/bin/cliuno.snk)) +$(eval $(call gb_CliLibrary_set_keyfile,cli_ure,$(SRCDIR)/cli_ure/source/cliuno.snk)) $(eval $(call gb_CliLibrary_set_policy,cli_ure,$(CLI_URE_POLICY_ASSEMBLY),$(CLI_URE_POLICY_VERSION))) diff --git a/cli_ure/CliNativeLibrary_cli_cppuhelper.mk b/cli_ure/CliNativeLibrary_cli_cppuhelper.mk index cea9b8b36637..014956d1c6dd 100644 --- a/cli_ure/CliNativeLibrary_cli_cppuhelper.mk +++ b/cli_ure/CliNativeLibrary_cli_cppuhelper.mk @@ -15,7 +15,7 @@ $(eval $(call gb_CliNativeLibrary_wrap_library,cli_cppuhelper,cli_cppuhelper_nat $(eval $(call gb_CliNativeLibrary_set_configfile,cli_cppuhelper,cli_ure/source/native/cli_cppuhelper_config)) -$(eval $(clal gb_CliNativeLibrary_set_keyfile,cli_cppuhelper,$(OUTDIR)/bin/clinuo.snk)) +$(eval $(clal gb_CliNativeLibrary_set_keyfile,cli_cppuhelper,$(SRCDIR)/cli_ure/source/clinuo.snk)) $(eval $(call gb_CliNativeLibrary_set_policy,cli_cppuhelper,$(CLI_CPPUHELPER_POLICY_ASSEMBLY),$(CLI_CPPUHELPER_POLICY_VERSION))) diff --git a/cli_ure/CliUnoApi_cli_uretypes.mk b/cli_ure/CliUnoApi_cli_uretypes.mk index f58bfd6e6694..5748523ca8a8 100644 --- a/cli_ure/CliUnoApi_cli_uretypes.mk +++ b/cli_ure/CliUnoApi_cli_uretypes.mk @@ -15,7 +15,7 @@ $(eval $(call gb_CliUnoApi_set_assembly_version,cli_uretypes,$(CLI_URETYPES_NEW_ $(eval $(call gb_CliUnoApi_set_configfile,cli_uretypes,cli_ure/unotypes/cli_uretypes_config)) -$(eval $(call gb_CliUnoApi_set_keyfile,cli_uretypes,$(OUTDIR)/bin/cliuno.snk)) +$(eval $(call gb_CliUnoApi_set_keyfile,cli_uretypes,$(SRCDIR)/cli_ure/source/cliuno.snk)) $(eval $(call gb_CliUnoApi_set_policy,cli_uretypes,$(CLI_URETYPES_POLICY_ASSEMBLY),$(CLI_URETYPES_POLICY_VERSION))) From d542258ea03292ab23d516c6f361a8d267187efc Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 7 Oct 2012 10:26:53 +0200 Subject: [PATCH 472/863] fix typo Change-Id: I9ae69377e585603c2cb0edd48a18a21d0934dfee --- cli_ure/CliNativeLibrary_cli_cppuhelper.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli_ure/CliNativeLibrary_cli_cppuhelper.mk b/cli_ure/CliNativeLibrary_cli_cppuhelper.mk index 014956d1c6dd..8372f93dafe6 100644 --- a/cli_ure/CliNativeLibrary_cli_cppuhelper.mk +++ b/cli_ure/CliNativeLibrary_cli_cppuhelper.mk @@ -15,7 +15,7 @@ $(eval $(call gb_CliNativeLibrary_wrap_library,cli_cppuhelper,cli_cppuhelper_nat $(eval $(call gb_CliNativeLibrary_set_configfile,cli_cppuhelper,cli_ure/source/native/cli_cppuhelper_config)) -$(eval $(clal gb_CliNativeLibrary_set_keyfile,cli_cppuhelper,$(SRCDIR)/cli_ure/source/clinuo.snk)) +$(eval $(call gb_CliNativeLibrary_set_keyfile,cli_cppuhelper,$(SRCDIR)/cli_ure/source/clinuo.snk)) $(eval $(call gb_CliNativeLibrary_set_policy,cli_cppuhelper,$(CLI_CPPUHELPER_POLICY_ASSEMBLY),$(CLI_CPPUHELPER_POLICY_VERSION))) From 4967505ad54de0639fbd7bfa553c57ead9ada6ec Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Mon, 20 Aug 2012 19:25:24 -0400 Subject: [PATCH 473/863] prefer newer versions of Visual Studio Change-Id: I6744460db43f66c91ad8e033f59612457acd66ee --- oowintool | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/oowintool b/oowintool index 9c6bdc664e29..244a3b4d7234 100755 --- a/oowintool +++ b/oowintool @@ -170,7 +170,7 @@ my %msvc_2012 = ( sub find_msvs() { - my @ms_versions = ( \%msvs_2008, \%msvs_express_2008, \%msvs_2012, \%msvs_2010 ); + my @ms_versions = ( \%msvs_2012, \%msvs_2010, \%msvs_2008, \%msvs_express_2008 ); for $ver (@ms_versions) { my $install = reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/" . $ver->{'key'}); @@ -184,7 +184,7 @@ sub find_msvs() sub find_msvc() { - my @ms_versions = ( \%msvc_2008, \%msvc_express_2008, \%msvc_2012, \%msvc_2010 ); + my @ms_versions = ( \%msvc_2012, \%msvc_2010, \%msvc_2008, \%msvc_express_2008 ); for $ver (@ms_versions) { my $install = reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/" . $ver->{'key'}); From b0a6bf81d8a555ff9870ec921be9353a36b493b2 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Wed, 22 Aug 2012 17:37:44 -0400 Subject: [PATCH 474/863] fix python build with VC2012 Change-Id: Ibaec87c929889f0038b44aac1e07e2552adc5cc5 --- python/Python-2.6.1-vc12.patch | 69 ++++++++++++++++++++++++++++++++++ python/makefile.mk | 5 ++- 2 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 python/Python-2.6.1-vc12.patch diff --git a/python/Python-2.6.1-vc12.patch b/python/Python-2.6.1-vc12.patch new file mode 100644 index 000000000000..3f8383c58705 --- /dev/null +++ b/python/Python-2.6.1-vc12.patch @@ -0,0 +1,69 @@ +--- misc/build/Python-2.6.1/PC/VS10.0/_msi.vcxproj.orig 2012-08-22 17:28:56.856166700 -0400 ++++ misc/build/Python-2.6.1/PC/VS10.0/_msi.vcxproj 2012-08-22 17:29:12.226731500 -0400 +@@ -151,7 +151,7 @@ + + + +- fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies) ++ cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies) + 0x1D160000 + + +@@ -160,13 +160,13 @@ + X64 + + +- fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies) ++ cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies) + 0x1D160000 + + + + +- fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies) ++ cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies) + 0x1D160000 + + +@@ -175,13 +175,13 @@ + X64 + + +- fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies) ++ cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies) + 0x1D160000 + + + + +- fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies) ++ cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies) + 0x1D160000 + + +@@ -190,14 +190,14 @@ + X64 + + +- fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies) ++ cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies) + 0x1D160000 + MachineX64 + + + + +- fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies) ++ cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies) + 0x1D160000 + + +@@ -206,7 +206,7 @@ + X64 + + +- fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies) ++ cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies) + 0x1D160000 + MachineX64 + diff --git a/python/makefile.mk b/python/makefile.mk index 9311c753f4ee..9ea78ef1e16a 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -162,6 +162,7 @@ BUILD_ACTION=$(ENV_BUILD) make && make install .IF "$(CCNUMVER)" >= "001600000000" PATCH_FILES+=Python-$(PYVERSION)-vc10.patch +PATCH_FILES+=Python-$(PYVERSION)-vc12.patch BUILD_DIR=PC/VS10.0 .ELIF "$(CCNUMVER)" >= "001500000000" BUILD_DIR=PCbuild @@ -188,7 +189,9 @@ CONF=Release # Build python executable and then runs a minimal script. Running the minimal script # ensures that certain *.pyc files are generated which would otherwise be created on # solver during registration in insetoo_native -.IF "$(CCNUMVER)" >= "001600000000" +.IF "$(CCNUMVER)" >= "001700000000" +BUILD_ACTION=MSBuild.exe pcbuild.sln /t:Build /p:Configuration=$(CONF) /p:PlatformToolset=v110 +.ELIF "$(CCNUMVER)" >= "001600000000" BUILD_ACTION=MSBuild.exe pcbuild.sln /t:Build /p:Configuration=$(CONF) /ToolsVersion:4.0 .ELSE BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe pcbuild.sln "$(CONF)|$(ARCH)" From 5d0c35242bb24605ca9ce6f45806b8997a17799b Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Wed, 22 Aug 2012 21:51:31 -0400 Subject: [PATCH 475/863] fix cli_ure build with Win8 SDK Change-Id: I4842d848234a5dc21085a3fd0aa0a79c58c71e8c --- configure.in | 36 ++++++++++++++++++++++++++++++++++++ oowintool | 13 +++++++++++++ 2 files changed, 49 insertions(+) diff --git a/configure.in b/configure.in index 1655e2d32a44..6249f8c60780 100644 --- a/configure.in +++ b/configure.in @@ -4700,6 +4700,38 @@ if test "$build_os" = "cygwin"; then CSC_PATH=`cygpath -d "$CSC_PATH"` CSC_PATH=`cygpath -u "$CSC_PATH"` + dnl Check al.exe + AC_PATH_PROG(AL_PATH, al.exe) + if test -n "$AL_PATH";then + AL_PATH=`dirname "$AL_PATH"` + fi + if test -n "$with_al_path";then + with_al_path=`cygpath -u "$with_al_path"` + fi + if test -x "$with_al_path/al.exe"; then + AL_PATH="$with_al_path" + fi + if test -z "$AL_PATH"; then + winsdktest=`./oowintool --windows-sdk-home` + if test -x "$winsdktest/Bin/al.exe"; then + AL_PATH="$winsdktest/Bin" + fi + fi + if test -z "$AL_PATH"; then + altest=`./oowintool --al-home` + if test -x "$altest/bin/al.exe"; then + AL_PATH="$altest/bin" + elif test -x "$altest/al.exe"; then + AL_PATH="$altest" + fi + fi + if test ! -x "$AL_PATH/al.exe"; then + AC_MSG_ERROR([al.exe not found. Make sure it's in PATH or use --with-al-path]) + fi + # Convert to posix path with 8.3 filename restrictions ( No spaces ) + AL_PATH=`cygpath -d "$AL_PATH"` + AL_PATH=`cygpath -u "$AL_PATH"` + dnl Check mscoree.lib / .NET Framework dir AC_MSG_CHECKING(.NET Framework) if test -n "$with_dotnet_framework_home"; then @@ -4726,6 +4758,9 @@ if test "$build_os" = "cygwin"; then PathFormat "$MIDL_PATH" MIDL_PATH="$formatted_path" + + PathFormat "$AL_PATH" + AL_PATH="$formatted_path" PathFormat "$DOTNET_FRAMEWORK_HOME" DOTNET_FRAMEWORK_HOME="$formatted_path" @@ -12680,6 +12715,7 @@ else pathmunge "$WINDOWS_SDK_HOME/bin" "before" pathmunge "$CSC_PATH" "before" pathmunge "$MIDL_PATH" "before" + pathmunge "$AL_PATH" "before" pathmunge "$MSPDB_PATH" "before" if test "$BITNESS_OVERRIDE" = 64; then pathmunge "$COMPATH/bin/amd64" "before" diff --git a/oowintool b/oowintool index 244a3b4d7234..5f7d60321dbe 100755 --- a/oowintool +++ b/oowintool @@ -55,6 +55,7 @@ sub print_syntax() print " --msvs-productdir - print productdir\n"; print " --dotnetsdk-dir - print .NET SDK path\n"; print " --csc-compilerdir - print .NET SDK compiler path\n"; + print " --al-home - print AL.exe install dir\n"; print " --windows-sdk-home - print Windows SDK install dir\n"; print " --jdk-home - print the jdk install dir\n"; print " --help - print this message\n"; @@ -119,6 +120,16 @@ sub print_windows_sdk_home() print cygpath ($value, 'w', $output_format); } +sub print_al_home() +{ + my ($value, $key); + + $key = reg_find_key ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/Windows/*/WinSDK-NetFx40Tools/InstallationFolder'); + $value = reg_get_value ($key); + + print cygpath ($value, 'w', $output_format); +} + my %msvs_2008 = ( 'ver' => '9.0', 'key' => 'Microsoft/VisualStudio/9.0/Setup/VS/ProductDir', @@ -373,6 +384,8 @@ while (@commands) { print_csc_compiler_dir(); } elsif ($opt eq '--windows-sdk-home') { print_windows_sdk_home(); + } elsif ($opt eq '--al-home') { + print_al_home(); } elsif ($opt eq '--jdk-home') { print_jdk_dir(); } elsif ($opt eq '--help' || $opt eq '/?') { From 2be1fb4eadb449b82c4c72bfa8b5f5ab2e3f3a80 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Sat, 25 Aug 2012 10:57:09 -0400 Subject: [PATCH 476/863] fix extensions build with Win8 SDK Change-Id: I7c38722c98300f419e6129b46c89b68f46ce4173 --- extensions/Library_oleautobridge.mk | 4 ++++ extensions/Library_oleautobridge2.mk | 4 ++++ extensions/Library_so_activex.mk | 1 + extensions/Library_so_activex_x64.mk | 1 + extensions/source/activex/StdAfx2.cxx | 2 -- extensions/source/activex/StdAfx2.h | 2 +- solenv/gbuild/platform/WNT_INTEL_MSC.mk | 3 ++- 7 files changed, 13 insertions(+), 4 deletions(-) diff --git a/extensions/Library_oleautobridge.mk b/extensions/Library_oleautobridge.mk index d86a604b1b9a..adbf359271c9 100644 --- a/extensions/Library_oleautobridge.mk +++ b/extensions/Library_oleautobridge.mk @@ -38,6 +38,10 @@ $(eval $(call gb_Library_set_include,oleautobridge,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_add_ldflags,oleautobridge,\ + -LIBPATH:$(ATL_LIB) \ +)) + $(eval $(call gb_Library_use_libraries,oleautobridge,\ comphelper \ cppuhelper \ diff --git a/extensions/Library_oleautobridge2.mk b/extensions/Library_oleautobridge2.mk index c7f1a0152034..b6fee4918d9c 100644 --- a/extensions/Library_oleautobridge2.mk +++ b/extensions/Library_oleautobridge2.mk @@ -42,6 +42,10 @@ $(eval $(call gb_Library_set_include,oleautobridge2,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_add_ldflags,oleautobridge2,\ + -LIBPATH:$(ATL_LIB) \ +)) + $(eval $(call gb_Library_use_libraries,oleautobridge2,\ comphelper \ cppuhelper \ diff --git a/extensions/Library_so_activex.mk b/extensions/Library_so_activex.mk index 733de14eab86..d618127294c8 100644 --- a/extensions/Library_so_activex.mk +++ b/extensions/Library_so_activex.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Library_add_exception_objects,so_activex,\ $(eval $(call gb_Library_add_ldflags,so_activex,\ /DEF:$(SRCDIR)/extensions/source/activex/so_activex.def \ + -LIBPATH:$(ATL_LIB) \ )) $(eval $(call gb_Library_use_system_win32_libs,so_activex,\ diff --git a/extensions/Library_so_activex_x64.mk b/extensions/Library_so_activex_x64.mk index 9bc43840d8a3..132f7f067279 100644 --- a/extensions/Library_so_activex_x64.mk +++ b/extensions/Library_so_activex_x64.mk @@ -55,6 +55,7 @@ $(eval $(call gb_Library_add_x64_generated_exception_objects,so_activex_x64,\ $(eval $(call gb_Library_add_ldflags,so_activex_x64,\ /DEF:$(SRCDIR)/extensions/source/activex/so_activex.def \ + -LIBPATH:$(ATL_LIB)/amd64 \ )) $(eval $(call gb_Library_use_system_win32_libs,so_activex_x64,\ diff --git a/extensions/source/activex/StdAfx2.cxx b/extensions/source/activex/StdAfx2.cxx index f1cf88d10d14..d06eb872c7ed 100644 --- a/extensions/source/activex/StdAfx2.cxx +++ b/extensions/source/activex/StdAfx2.cxx @@ -10,12 +10,10 @@ #ifdef _ATL_STATIC_REGISTRY #include -#include #endif #if defined(_MSC_VER) && (_MSC_VER >= 1300) #undef _DEBUG #endif -#include /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/activex/StdAfx2.h b/extensions/source/activex/StdAfx2.h index 5c540b0ba329..ab267e42352c 100644 --- a/extensions/source/activex/StdAfx2.h +++ b/extensions/source/activex/StdAfx2.h @@ -12,7 +12,7 @@ #define STRICT #ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0400 +#define _WIN32_WINNT 0x0403 #endif #define _ATL_APARTMENT_THREADED #define _ATL_STATIC_REGISTRY diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 9683de9ec935..6eb82dea3ce8 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -360,7 +360,8 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \ $(if $(filter YES,$(TARGETGUI)), -SUBSYSTEM:WINDOWS, -SUBSYSTEM:CONSOLE) \ $(if $(filter YES,$(LIBRARY_X64)), -MACHINE:X64, -MACHINE:IX86) \ - $(if $(filter YES,$(LIBRARY_X64)), -LIBPATH:$(OUTDIR)/lib/x64 -LIBPATH:$(COMPATH)/lib/amd64 -LIBPATH:$(WINDOWS_SDK_HOME)/lib/x64,) \ + $(if $(filter YES,$(LIBRARY_X64)), -LIBPATH:$(OUTDIR)/lib/x64 -LIBPATH:$(COMPATH)/lib/amd64 -LIBPATH:$(WINDOWS_SDK_HOME)/lib/x64 \ + $(if $(filter 80,$(WINDOWS_SDK_VERSION)),-LIBPATH:$(WINDOWS_SDK_HOME)/lib/win8/um/x64,),) \ $(T_LDFLAGS) \ @$${RESPONSEFILE} \ $(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))) \ From 4dd53b3893ba55db954bd02bd539c9b9a31454f6 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Sat, 25 Aug 2012 11:23:09 -0400 Subject: [PATCH 477/863] fix shell build with Win8 SDK Change-Id: I19d39f26732772f274e6c8fd76326c50fd73baa3 --- shell/source/win32/simplemail/simplemapi.hxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shell/source/win32/simplemail/simplemapi.hxx b/shell/source/win32/simplemail/simplemapi.hxx index 2de659ccb9e2..6495d4f418ba 100644 --- a/shell/source/win32/simplemail/simplemapi.hxx +++ b/shell/source/win32/simplemail/simplemapi.hxx @@ -27,8 +27,10 @@ #include #include #ifndef __MINGW32__ +#if NTDDI_VERSION < NTDDI_WIN8 #include #endif +#endif #if defined _MSC_VER #pragma warning(pop) #endif From 1eec5566b24227e592f827c5e788ae3e45e0e127 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Sat, 25 Aug 2012 10:07:39 -0400 Subject: [PATCH 478/863] fix connectivity build with Win8 SDK Change-Id: Id2308748f1301a1e1ccc68838c6a65b36a5ee008 --- connectivity/Library_ado.mk | 6 ++++++ connectivity/source/drivers/ado/ado_pre_sys_include.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk index 68abe62a2a1f..0d83eaec665b 100644 --- a/connectivity/Library_ado.mk +++ b/connectivity/Library_ado.mk @@ -48,6 +48,12 @@ $(eval $(call gb_Library_use_system_win32_libs,ado,\ uuid \ )) +ifeq ($(WINDOWS_SDK_VERSION),80) +$(eval $(call gb_Library_add_defs,ado,\ + -DNTDDI_VERSION=0x0601 \ +)) +endif + $(eval $(call gb_Library_use_libraries,ado,\ cppu \ cppuhelper \ diff --git a/connectivity/source/drivers/ado/ado_pre_sys_include.h b/connectivity/source/drivers/ado/ado_pre_sys_include.h index 13bcebb3e76a..70f77a708cf6 100644 --- a/connectivity/source/drivers/ado/ado_pre_sys_include.h +++ b/connectivity/source/drivers/ado/ado_pre_sys_include.h @@ -26,6 +26,8 @@ #pragma warning(disable:4917) #endif +#include + #define ADO_REDUCED_WARN_LEVEL /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ From a4df4e9147019337fda07982c510a85d6f4c4062 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Sat, 25 Aug 2012 13:51:40 -0400 Subject: [PATCH 479/863] convert cli_ure/source/native to new syntax Change-Id: I7dbb065c8b1b2fef85e6e7f42ef80991102785e0 --- cli_ure/Library_cli_cppuhelper_native.mk | 2 +- cli_ure/source/native/assembly.cxx | 2 -- cli_ure/source/native/native_bootstrap.cxx | 42 +++++++++++----------- cli_ure/source/native/native_share.h | 22 ++++++------ 4 files changed, 32 insertions(+), 36 deletions(-) diff --git a/cli_ure/Library_cli_cppuhelper_native.mk b/cli_ure/Library_cli_cppuhelper_native.mk index 745c69c9480c..5582e770b91e 100644 --- a/cli_ure/Library_cli_cppuhelper_native.mk +++ b/cli_ure/Library_cli_cppuhelper_native.mk @@ -13,7 +13,7 @@ $(eval $(call gb_Library_Library,cli_cppuhelper_native)) # in CLR meta-data - use of this type may lead to a runtime exception": $(eval $(call gb_Library_add_cxxflags,cli_cppuhelper_native,\ -AI $(gb_Helper_OUTDIRLIBDIR) \ - -clr:oldSyntax \ + -clr \ -wd4339 \ )) diff --git a/cli_ure/source/native/assembly.cxx b/cli_ure/source/native/assembly.cxx index 5e808122aab1..73345b94b895 100644 --- a/cli_ure/source/native/assembly.cxx +++ b/cli_ure/source/native/assembly.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#using - [assembly:System::Reflection::AssemblyProduct( "CLI-UNO Language Binding" )]; [assembly:System::Reflection::AssemblyDescription( "CLI-UNO Helper Library" )]; [assembly:System::Reflection::AssemblyDelaySign(true)]; diff --git a/cli_ure/source/native/native_bootstrap.cxx b/cli_ure/source/native/native_bootstrap.cxx index f760a1a191bc..0a22d7bb5e63 100644 --- a/cli_ure/source/native/native_bootstrap.cxx +++ b/cli_ure/source/native/native_bootstrap.cxx @@ -315,7 +315,7 @@ namespace util These contain a named value UREINSTALLLOCATION which holds a path to the URE installation folder. */ -public __sealed __gc class Bootstrap +public ref class Bootstrap sealed { inline Bootstrap() {} @@ -325,7 +325,7 @@ public: @see cppuhelper/bootstrap.hxx:defaultBootstrap_InitialComponentContext() */ - static ::unoidl::com::sun::star::uno::XComponentContext * + static ::unoidl::com::sun::star::uno::XComponentContext ^ defaultBootstrap_InitialComponentContext(); /** Bootstraps the initial component context from a native UNO installation. @@ -338,37 +338,37 @@ public: @see cppuhelper/bootstrap.hxx:defaultBootstrap_InitialComponentContext() */ - static ::unoidl::com::sun::star::uno::XComponentContext * + static ::unoidl::com::sun::star::uno::XComponentContext ^ defaultBootstrap_InitialComponentContext( - ::System::String * ini_file, - ::System::Collections::IDictionaryEnumerator * + ::System::String ^ ini_file, + ::System::Collections::IDictionaryEnumerator ^ bootstrap_parameters ); /** Bootstraps the initial component context from a native UNO installation. @see cppuhelper/bootstrap.hxx:bootstrap() */ - static ::unoidl::com::sun::star::uno::XComponentContext * + static ::unoidl::com::sun::star::uno::XComponentContext ^ bootstrap(); }; //______________________________________________________________________________ -::unoidl::com::sun::star::uno::XComponentContext * +::unoidl::com::sun::star::uno::XComponentContext ^ Bootstrap::defaultBootstrap_InitialComponentContext( - ::System::String * ini_file, - ::System::Collections::IDictionaryEnumerator * bootstrap_parameters ) + ::System::String ^ ini_file, + ::System::Collections::IDictionaryEnumerator ^ bootstrap_parameters ) { - if (0 != bootstrap_parameters) + if (nullptr != bootstrap_parameters) { bootstrap_parameters->Reset(); while (bootstrap_parameters->MoveNext()) { OUString key( - String_to_ustring( __try_cast< ::System::String * >( - bootstrap_parameters->get_Key() ) ) ); + String_to_ustring( safe_cast< ::System::String ^ >( + bootstrap_parameters->Key ) ) ); OUString value( - String_to_ustring( __try_cast< ::System::String * >( - bootstrap_parameters->get_Value() ) ) ); + String_to_ustring( safe_cast< ::System::String ^ >( + bootstrap_parameters->Value ) ) ); ::rtl::Bootstrap::set( key, value ); } @@ -376,31 +376,31 @@ Bootstrap::defaultBootstrap_InitialComponentContext( // bootstrap native uno Reference< XComponentContext > xContext; - if (0 == ini_file) + if (nullptr == ini_file) { xContext = ::cppu::defaultBootstrap_InitialComponentContext(); } else { xContext = ::cppu::defaultBootstrap_InitialComponentContext( - String_to_ustring( __try_cast< ::System::String * >( ini_file ) ) ); + String_to_ustring( safe_cast< ::System::String ^ >( ini_file ) ) ); } - return __try_cast< ::unoidl::com::sun::star::uno::XComponentContext * >( + return safe_cast< ::unoidl::com::sun::star::uno::XComponentContext ^ >( to_cli( xContext ) ); } //______________________________________________________________________________ -::unoidl::com::sun::star::uno::XComponentContext * +::unoidl::com::sun::star::uno::XComponentContext ^ Bootstrap::defaultBootstrap_InitialComponentContext() { - return defaultBootstrap_InitialComponentContext( 0, 0 ); + return defaultBootstrap_InitialComponentContext( nullptr, nullptr ); } -::unoidl::com::sun::star::uno::XComponentContext * Bootstrap::bootstrap() +::unoidl::com::sun::star::uno::XComponentContext ^ Bootstrap::bootstrap() { Reference xContext = ::cppu::bootstrap(); - return __try_cast< ::unoidl::com::sun::star::uno::XComponentContext * >( + return safe_cast< ::unoidl::com::sun::star::uno::XComponentContext ^ >( to_cli( xContext ) ); } diff --git a/cli_ure/source/native/native_share.h b/cli_ure/source/native/native_share.h index 8b24e1f5bbf6..23977dfb0f00 100644 --- a/cli_ure/source/native/native_share.h +++ b/cli_ure/source/native/native_share.h @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#using #using "cli_ure.dll" #using "cli_uretypes.dll" @@ -35,20 +34,20 @@ namespace util { //------------------------------------------------------------------------------ -inline ::System::String * ustring_to_String( ::rtl::OUString const & ustr ) +inline ::System::String ^ ustring_to_String( ::rtl::OUString const & ustr ) { - return new ::System::String( ustr.getStr(), 0, ustr.getLength() ); + return gcnew ::System::String( ustr.getStr(), 0, ustr.getLength() ); } //------------------------------------------------------------------------------ -inline ::rtl::OUString String_to_ustring( ::System::String * str ) +inline ::rtl::OUString String_to_ustring( ::System::String ^ str ) { OSL_ASSERT( sizeof (wchar_t) == sizeof (sal_Unicode) ); - wchar_t const __pin * chars = PtrToStringChars( str ); - return ::rtl::OUString( chars, str->get_Length() ); + pin_ptr chars = PtrToStringChars( str ); + return ::rtl::OUString( chars, str->Length ); } template< typename T > -inline ::System::Object * to_cli( +inline ::System::Object ^ to_cli( ::com::sun::star::uno::Reference< T > const & x ) { ::com::sun::star::uno::Mapping mapping( @@ -65,16 +64,15 @@ inline ::System::Object * to_cli( intptr_t intptr = reinterpret_cast< intptr_t >( mapping.mapInterface( x.get(), ::getCppuType( &x ) ) ); - ::System::Runtime::InteropServices::GCHandle handle( - ::System::Runtime::InteropServices::GCHandle::op_Explicit( intptr ) ); - ::System::Object * ret = handle.get_Target(); - handle.Free(); + ::System::Runtime::InteropServices::GCHandle ^ handle = (::System::Runtime::InteropServices::GCHandle ^)(gcnew ::System::IntPtr(intptr)); + ::System::Object ^ ret = handle->Target; + handle->Free(); return ret; } template< typename T > inline void to_uno( - ::com::sun::star::uno::Reference< T > * pRet, ::System::Object * x ) + ::com::sun::star::uno::Reference< T > * pRet, ::System::Object ^ x ) { ::com::sun::star::uno::Mapping mapping( OUSTR(UNO_LB_CLI), OUSTR(CPPU_CURRENT_LANGUAGE_BINDING_NAME) ); From 9f5fca7efe8d9d52f99942b3cab13de9e62782f3 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Sat, 25 Aug 2012 21:53:50 -0400 Subject: [PATCH 480/863] silence vd2 warning due to excessive output Change-Id: Ib86a5406c28560d766ecb48cb8f74ac9f9b43c4d --- solenv/gbuild/platform/WNT_INTEL_MSC.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 6eb82dea3ce8..6483d4741508 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -157,6 +157,7 @@ gb_CXXFLAGS := \ -wd4351 \ -wd4355 \ -wd4365 \ + -wd4435 \ -wd4503 \ -wd4505 \ -wd4511 \ From f8e5a25f88ab8d646328a0ddd99262edefe262a0 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Sun, 26 Aug 2012 21:23:40 -0400 Subject: [PATCH 481/863] fix sw build with VC2012 Change-Id: I1ba38baa26de2082a21d681efff2f5881092fad7 --- sw/source/core/crsr/crbm.cxx | 4 ++-- sw/source/core/doc/docbm.cxx | 16 ++++++++-------- sw/source/core/unocore/unoportenum.cxx | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sw/source/core/crsr/crbm.cxx b/sw/source/core/crsr/crbm.cxx index 4fcab6896527..e0fd137051d8 100644 --- a/sw/source/core/crsr/crbm.cxx +++ b/sw/source/core/crsr/crbm.cxx @@ -148,7 +148,7 @@ bool SwCrsrShell::GoNextBookmark() pMarkAccess->getBookmarksBegin(), pMarkAccess->getBookmarksEnd(), *GetCrsr()->GetPoint(), - bind(&::sw::mark::IMark::StartsAfter, _2, _1)), // finds the first that is starting after + boost::bind(&::sw::mark::IMark::StartsAfter, _2, _1)), // finds the first that is starting after pMarkAccess->getBookmarksEnd(), back_inserter(vCandidates), &lcl_IsInvisibleBookmark); @@ -184,7 +184,7 @@ bool SwCrsrShell::GoPrevBookmark() pMarkAccess->getBookmarksBegin(), pMarkAccess->getBookmarksEnd(), *GetCrsr()->GetPoint(), - bind(&::sw::mark::IMark::StartsAfter, _2, _1)), + boost::bind(&::sw::mark::IMark::StartsAfter, _2, _1)), back_inserter(vCandidates), &lcl_IsInvisibleBookmark); sort( diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx index 9ec2174f45e6..64b171f921c0 100644 --- a/sw/source/core/doc/docbm.cxx +++ b/sw/source/core/doc/docbm.cxx @@ -136,7 +136,7 @@ namespace rMarks.begin(), rMarks.end(), rPos, - bind(&IMark::StartsAfter, _2, _1)); // finds the first that is starting after + boost::bind(&IMark::StartsAfter, _2, _1)); // finds the first that is starting after if(pMarkAfter == rMarks.end()) return NULL; return pMarkAfter->get(); }; @@ -150,14 +150,14 @@ namespace rMarks.begin(), rMarks.end(), rPos, - bind(&IMark::StartsAfter, _2, _1)); + boost::bind(&IMark::StartsAfter, _2, _1)); vCandidates.reserve(pCandidatesEnd - rMarks.begin()); // only marks ending before are candidates remove_copy_if( rMarks.begin(), pCandidatesEnd, back_inserter(vCandidates), - bind(logical_not(), bind(&IMark::EndsBefore, _1, rPos))); + boost::bind(logical_not(), boost::bind(&IMark::EndsBefore, _1, rPos))); // no candidate left => we are in front of the first mark or there are none if(!vCandidates.size()) return NULL; // return the highest (last) candidate using mark end ordering @@ -214,7 +214,7 @@ namespace for(IDocumentMarkAccess::iterator_t ppCurrentMark = lower_bound( rMarks.begin(), rMarks.end(), rPos, - bind(&IMark::StartsBefore, _1, _2)); + boost::bind(&IMark::StartsBefore, _1, _2)); ppCurrentMark != rMarks.end(); ++ppCurrentMark) { @@ -242,7 +242,7 @@ namespace return find_if( ppMarksBegin, ppMarksEnd, - bind(&::rtl::OUString::equals, bind(&IMark::GetName, _1), rName)); + boost::bind(&::rtl::OUString::equals, boost::bind(&IMark::GetName, _1), rName)); } #if 0 @@ -742,7 +742,7 @@ namespace sw { namespace mark iterator_t pMarkLow = lower_bound( m_vMarks.begin(), m_vMarks.end(), pMark->GetMarkStart(), - bind(&IMark::StartsBefore, _1, _2)); + boost::bind(&IMark::StartsBefore, _1, _2)); // finds the first Mark that pMark is starting before // (pMark < pMarkHigh) //iterator_t pMarkHigh = upper_bound( @@ -754,7 +754,7 @@ namespace sw { namespace mark iterator_t pMarkHigh = m_vMarks.end(); iterator_t pMarkFound = find_if( pMarkLow, pMarkHigh, - bind(equal_to(), bind(&boost::shared_ptr::get, _1), pMark)); + boost::bind(equal_to(), boost::bind(&boost::shared_ptr::get, _1), pMark)); if(pMarkFound != pMarkHigh) deleteMark(pMarkFound); } @@ -808,7 +808,7 @@ namespace sw { namespace mark const_iterator_t pFieldmark = find_if( m_vFieldmarks.begin(), m_vFieldmarks.end( ), - bind(&IMark::IsCoveringPosition, _1, rPos)); + boost::bind(&IMark::IsCoveringPosition, _1, rPos)); if(pFieldmark == m_vFieldmarks.end()) return NULL; return dynamic_cast(pFieldmark->get()); } diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx index 7c8897d1a285..3fd18dd523ae 100644 --- a/sw/source/core/unocore/unoportenum.cxx +++ b/sw/source/core/unocore/unoportenum.cxx @@ -145,7 +145,7 @@ namespace pMarkAccess->getBookmarksBegin(), pMarkAccess->getBookmarksEnd(), aEndOfPara, - bind(&::sw::mark::IMark::StartsAfter, _2, _1)); // finds the first that starts after + boost::bind(&::sw::mark::IMark::StartsAfter, _2, _1)); // finds the first that starts after // search for all bookmarks that start or end in this paragraph const SwNodeIndex nOwnNode = rUnoCrsr.GetPoint()->nNode; From 45814f70b88c26b2a34c49e705f07f7c7dcc5a93 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Sun, 26 Aug 2012 22:11:05 -0400 Subject: [PATCH 482/863] fix sd build with VC2012 Change-Id: I1356570e27a065e419281fcd9d667c60658773e6 --- sd/source/core/sdpage.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 0d44e14e3029..7c52a626de85 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -1214,7 +1214,7 @@ static void CalcAutoLayoutRectangles( SdPage& rPage, int nLayout, Rectangle* rRe rRectangle[2] = Rectangle (aLayoutPos, aLayoutSize); if( bRightToLeft && (nLayout != 9) ) - ::std::swap< Rectangle >( rRectangle[1], rRectangle[2] ); + ::std::swap( rRectangle[1], rRectangle[2] ); break; case 2: // title, shape, 2 shapes aTempPnt = aLayoutPos; @@ -1234,7 +1234,7 @@ static void CalcAutoLayoutRectangles( SdPage& rPage, int nLayout, Rectangle* rRe if( bRightToLeft ) { - ::std::swap< long >( rRectangle[1].Left(), rRectangle[2].Left() ); + ::std::swap( rRectangle[1].Left(), rRectangle[2].Left() ); rRectangle[3].Left() = rRectangle[2].Left(); } break; @@ -1256,7 +1256,7 @@ static void CalcAutoLayoutRectangles( SdPage& rPage, int nLayout, Rectangle* rRe if( bRightToLeft ) { - ::std::swap< long >( rRectangle[1].Left(), rRectangle[2].Left() ); + ::std::swap( rRectangle[1].Left(), rRectangle[2].Left() ); rRectangle[3].Left() = rRectangle[2].Left(); } break; From b5bc77572338d04f8ff165ca85111096ce1d4804 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Mon, 27 Aug 2012 10:04:15 -0400 Subject: [PATCH 483/863] fix chart2 build with VS2012 Change-Id: Ieae76bfd0a3f9612c0bb573029912d5c6efa6add --- chart2/source/controller/dialogs/DialogModel.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx index e1e445b74faf..601c19b208e0 100644 --- a/chart2/source/controller/dialogs/DialogModel.cxx +++ b/chart2/source/controller/dialogs/DialogModel.cxx @@ -187,6 +187,7 @@ struct lcl_DataSeriesContainerAppend : public lcl_DataSeriesContainerAppend & operator* () { return *this; } lcl_DataSeriesContainerAppend & operator++ () { return *this; } lcl_DataSeriesContainerAppend & operator++ (int) { return *this; } + lcl_DataSeriesContainerAppend & operator= ( lcl_DataSeriesContainerAppend& ) { return *this; } private: tContainerType & m_rDestCnt; @@ -245,6 +246,7 @@ struct lcl_RolesWithRangeAppend : public lcl_RolesWithRangeAppend & operator* () { return *this; } lcl_RolesWithRangeAppend & operator++ () { return *this; } lcl_RolesWithRangeAppend & operator++ (int) { return *this; } + lcl_RolesWithRangeAppend & operator= ( lcl_RolesWithRangeAppend& ) { return *this; } private: tContainerType & m_rDestCnt; From 4b56d82c7d20ba5897d87aaf7fc94da5356b8eec Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Mon, 27 Aug 2012 15:28:23 -0400 Subject: [PATCH 484/863] convert uno_bridge to new syntax Change-Id: Iac5e9a860f7ef68104c4cfc19abe686b754190af --- cli_ure/Library_cli_uno.mk | 2 +- cli_ure/source/uno_bridge/cli_base.h | 125 ++-- cli_ure/source/uno_bridge/cli_bridge.cxx | 11 +- cli_ure/source/uno_bridge/cli_bridge.h | 23 +- cli_ure/source/uno_bridge/cli_data.cxx | 685 +++++++++--------- cli_ure/source/uno_bridge/cli_environment.cxx | 67 +- cli_ure/source/uno_bridge/cli_environment.h | 31 +- cli_ure/source/uno_bridge/cli_proxy.cxx | 329 +++++---- cli_ure/source/uno_bridge/cli_proxy.h | 102 +-- cli_ure/source/uno_bridge/cli_uno.cxx | 42 +- 10 files changed, 708 insertions(+), 709 deletions(-) diff --git a/cli_ure/Library_cli_uno.mk b/cli_ure/Library_cli_uno.mk index 3166365bb1d4..aa34fc0641e2 100644 --- a/cli_ure/Library_cli_uno.mk +++ b/cli_ure/Library_cli_uno.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Library_Library,cli_uno)) $(eval $(call gb_Library_add_cxxflags,cli_uno,\ -AI $(gb_Helper_OUTDIRLIBDIR) \ - -clr:oldSyntax \ + -clr \ -wd4339 \ )) diff --git a/cli_ure/source/uno_bridge/cli_base.h b/cli_ure/source/uno_bridge/cli_base.h index e678f8e52855..d544087d61cd 100644 --- a/cli_ure/source/uno_bridge/cli_base.h +++ b/cli_ure/source/uno_bridge/cli_base.h @@ -32,78 +32,77 @@ struct _oslMutexImpl #include "rtl/ustring.hxx" #include "typelib/typedescription.hxx" -#using #using #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) namespace cli_uno { -System::Type* loadCliType(System::String * typeName); -System::Type* mapUnoType(typelib_TypeDescription const * pTD); -System::Type* mapUnoType(typelib_TypeDescriptionReference const * pTD); -typelib_TypeDescriptionReference* mapCliType(System::Type* cliType); -rtl::OUString mapCliString(System::String const * data); -System::String* mapUnoString(rtl_uString const * data); -System::String* mapUnoTypeName(rtl_uString const * typeName); +System::Type^ loadCliType(System::String ^ typeName); +System::Type^ mapUnoType(typelib_TypeDescription const * pTD); +System::Type^ mapUnoType(typelib_TypeDescriptionReference const * pTD); +typelib_TypeDescriptionReference* mapCliType(System::Type^ cliType); +rtl::OUString mapCliString(System::String const ^ data); +System::String^ mapUnoString(rtl_uString const * data); +System::String^ mapUnoTypeName(rtl_uString const * typeName); -__gc struct Constants +ref struct Constants { - static const System::String* sXInterfaceName= new System::String( - S"unoidl.com.sun.star.uno.XInterface"); - static const System::String* sObject= new System::String(S"System.Object"); - static const System::String* sType= new System::String(S"System.Type"); - static const System::String* sUnoidl= new System::String(S"unoidl."); - static const System::String* sVoid= new System::String(S"System.Void"); - static const System::String* sAny= new System::String(S"uno.Any"); - static const System::String* sArArray= new System::String(S"System.Array[]"); - static const System::String* sBoolean= new System::String(S"System.Boolean"); - static const System::String* sChar= new System::String(S"System.Char"); - static const System::String* sByte= new System::String(S"System.Byte"); - static const System::String* sInt16= new System::String(S"System.Int16"); - static const System::String* sUInt16= new System::String(S"System.UInt16"); - static const System::String* sInt32= new System::String(S"System.Int32"); - static const System::String* sUInt32= new System::String(S"System.UInt32"); - static const System::String* sInt64= new System::String(S"System.Int64"); - static const System::String* sUInt64= new System::String(S"System.UInt64"); - static const System::String* sString= new System::String(S"System.String"); - static const System::String* sSingle= new System::String(S"System.Single"); - static const System::String* sDouble= new System::String(S"System.Double"); - static const System::String* sArBoolean= new System::String(S"System.Boolean[]"); - static const System::String* sArChar= new System::String(S"System.Char[]"); - static const System::String* sArByte= new System::String(S"System.Byte[]"); - static const System::String* sArInt16= new System::String(S"System.Int16[]"); - static const System::String* sArUInt16= new System::String(S"System.UInt16[]"); - static const System::String* sArInt32= new System::String(S"System.Int32[]"); - static const System::String* sArUInt32= new System::String(S"System.UInt32[]"); - static const System::String* sArInt64= new System::String(S"System.Int64[]"); - static const System::String* sArUInt64= new System::String(S"System.UInt64[]"); - static const System::String* sArString= new System::String(S"System.String[]"); - static const System::String* sArSingle= new System::String(S"System.Single[]"); - static const System::String* sArDouble= new System::String(S"System.Double[]"); - static const System::String* sArType= new System::String(S"System.Type[]"); - static const System::String* sArObject= new System::String(S"System.Object[]"); - static const System::String* sBrackets= new System::String(S"[]"); - static const System::String* sAttributeSet= new System::String(S"set_"); - static const System::String* sAttributeGet= new System::String(S"get_"); + static const System::String^ sXInterfaceName= gcnew System::String( + "unoidl.com.sun.star.uno.XInterface"); + static const System::String^ sObject= gcnew System::String("System.Object"); + static const System::String^ sType= gcnew System::String("System.Type"); + static const System::String^ sUnoidl= gcnew System::String("unoidl."); + static const System::String^ sVoid= gcnew System::String("System.Void"); + static const System::String^ sAny= gcnew System::String("uno.Any"); + static const System::String^ sArArray= gcnew System::String("System.Array[]"); + static const System::String^ sBoolean= gcnew System::String("System.Boolean"); + static const System::String^ sChar= gcnew System::String("System.Char"); + static const System::String^ sByte= gcnew System::String("System.Byte"); + static const System::String^ sInt16= gcnew System::String("System.Int16"); + static const System::String^ sUInt16= gcnew System::String("System.UInt16"); + static const System::String^ sInt32= gcnew System::String("System.Int32"); + static const System::String^ sUInt32= gcnew System::String("System.UInt32"); + static const System::String^ sInt64= gcnew System::String("System.Int64"); + static const System::String^ sUInt64= gcnew System::String("System.UInt64"); + static const System::String^ sString= gcnew System::String("System.String"); + static const System::String^ sSingle= gcnew System::String("System.Single"); + static const System::String^ sDouble= gcnew System::String("System.Double"); + static const System::String^ sArBoolean= gcnew System::String("System.Boolean[]"); + static const System::String^ sArChar= gcnew System::String("System.Char[]"); + static const System::String^ sArByte= gcnew System::String("System.Byte[]"); + static const System::String^ sArInt16= gcnew System::String("System.Int16[]"); + static const System::String^ sArUInt16= gcnew System::String("System.UInt16[]"); + static const System::String^ sArInt32= gcnew System::String("System.Int32[]"); + static const System::String^ sArUInt32= gcnew System::String("System.UInt32[]"); + static const System::String^ sArInt64= gcnew System::String("System.Int64[]"); + static const System::String^ sArUInt64= gcnew System::String("System.UInt64[]"); + static const System::String^ sArString= gcnew System::String("System.String[]"); + static const System::String^ sArSingle= gcnew System::String("System.Single[]"); + static const System::String^ sArDouble= gcnew System::String("System.Double[]"); + static const System::String^ sArType= gcnew System::String("System.Type[]"); + static const System::String^ sArObject= gcnew System::String("System.Object[]"); + static const System::String^ sBrackets= gcnew System::String("[]"); + static const System::String^ sAttributeSet= gcnew System::String("set_"); + static const System::String^ sAttributeGet= gcnew System::String("get_"); - static const System::String* usXInterface = S"com.sun.star.uno.XInterface"; - static const System::String* usVoid = S"void"; - static const System::String* usType = S"type"; - static const System::String* usAny = S"any"; - static const System::String* usBrackets = S"[]"; - static const System::String* usBool = S"boolean"; - static const System::String* usByte = S"byte"; - static const System::String* usChar = S"char"; - static const System::String* usShort = S"short"; - static const System::String* usUShort = S"unsigned short"; - static const System::String* usLong = S"long"; - static const System::String* usULong = S"unsigned long"; - static const System::String* usHyper = S"hyper"; - static const System::String* usUHyper = S"unsigned hyper"; - static const System::String* usString = S"string"; - static const System::String* usFloat = S"float"; - static const System::String* usDouble = S"double"; + static const System::String^ usXInterface = "com.sun.star.uno.XInterface"; + static const System::String^ usVoid = "void"; + static const System::String^ usType = "type"; + static const System::String^ usAny = "any"; + static const System::String^ usBrackets = "[]"; + static const System::String^ usBool = "boolean"; + static const System::String^ usByte = "byte"; + static const System::String^ usChar = "char"; + static const System::String^ usShort = "short"; + static const System::String^ usUShort = "unsigned short"; + static const System::String^ usLong = "long"; + static const System::String^ usULong = "unsigned long"; + static const System::String^ usHyper = "hyper"; + static const System::String^ usUHyper = "unsigned hyper"; + static const System::String^ usString = "string"; + static const System::String^ usFloat = "float"; + static const System::String^ usDouble = "double"; }; struct BridgeRuntimeError diff --git a/cli_ure/source/uno_bridge/cli_bridge.cxx b/cli_ure/source/uno_bridge/cli_bridge.cxx index 53329e8d80b6..12b432ed6dab 100644 --- a/cli_ure/source/uno_bridge/cli_bridge.cxx +++ b/cli_ure/source/uno_bridge/cli_bridge.cxx @@ -31,7 +31,6 @@ #include "cli_bridge.h" #include "cli_proxy.h" -#using #if defined(_MSC_VER) && (_MSC_VER < 1400) #include <_vcclrit.h> #endif @@ -85,7 +84,7 @@ void SAL_CALL Mapping_cli2uno( if (0 != cliI) { - System::Object* cliObj= sri::GCHandle::op_Explicit(cliI).Target; + System::Object^ cliObj= sri::GCHandle::FromIntPtr(IntPtr(cliI)).Target; (*ppOut)= bridge->map_cli2uno(cliObj, (typelib_TypeDescription*) td); } } @@ -130,16 +129,16 @@ void SAL_CALL Mapping_uno2cli( if (0 != *ppDNetI) { - sri::GCHandle::op_Explicit(ppDNetI).Free(); + sri::GCHandle::FromIntPtr(IntPtr(ppDNetI)).Free(); } if (0 != pUnoI) { - System::Object* cliI= bridge->map_uno2cli(pUnoI, td); + System::Object^ cliI= bridge->map_uno2cli(pUnoI, td); intptr_t ptr= NULL; if(cliI) { - ptr= sri::GCHandle::op_Explicit(sri::GCHandle::Alloc(cliI)) + ptr= sri::GCHandle::ToIntPtr(sri::GCHandle::Alloc(cliI)) #ifdef _WIN32 .ToInt32(); #else /* defined(_WIN64) */ .ToInt64(); @@ -288,7 +287,7 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_initEnvironment( uno_Environment * uno_cl //where g_cli_env is accessed. //When we compile the bridge with .NET 2 then we can again hold g_cli_env as a static gcroot //member in a unmanaged class, such as Bridge. - CliEnvHolder::g_cli_env = new Cli_environment(); + CliEnvHolder::g_cli_env = gcnew Cli_environment(); } //################################################################################################## SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_ext_getMapping( diff --git a/cli_ure/source/uno_bridge/cli_bridge.h b/cli_ure/source/uno_bridge/cli_bridge.h index 7c451695d10b..b12b44816f46 100644 --- a/cli_ure/source/uno_bridge/cli_bridge.h +++ b/cli_ure/source/uno_bridge/cli_bridge.h @@ -26,7 +26,6 @@ #include "uno/dispatcher.h" #include "cli_base.h" #include "cli_environment.h" -#using //#using #using #using @@ -47,8 +46,8 @@ struct Mapping : public uno_Mapping // The environment will be created in uno_initEnvironment. See also the remarks there //Managed cli environment for cli objects an UNO proxies (which are cli //objects. The uno_Environment is not used for cli objects. -__gc struct CliEnvHolder { -static Cli_environment * g_cli_env = NULL; +ref struct CliEnvHolder { +static Cli_environment ^ g_cli_env = nullptr; }; //================================================================================================== @@ -72,7 +71,7 @@ struct Bridge void release() const; void map_to_uno( - void * uno_data, System::Object* cli_data, + void * uno_data, System::Object^ cli_data, typelib_TypeDescriptionReference * type, bool assign) const; @@ -81,28 +80,28 @@ struct Bridge the type of the converted data. It may be a byref type. */ void map_to_cli( - System::Object* *cli_data, void const * uno_data, - typelib_TypeDescriptionReference * type, System::Type* info /* maybe 0 */, + System::Object^ *cli_data, void const * uno_data, + typelib_TypeDescriptionReference * type, System::Type^ info /* maybe 0 */, bool bDontCreateObj) const; - System::Object* map_uno2cli(uno_Interface * pUnoI, typelib_InterfaceTypeDescription* pTD) const; + System::Object^ map_uno2cli(uno_Interface * pUnoI, typelib_InterfaceTypeDescription* pTD) const; - System::Object* call_uno(uno_Interface * pUnoI, + System::Object^ call_uno(uno_Interface * pUnoI, typelib_TypeDescription* member_td, typelib_TypeDescriptionReference * return_type, sal_Int32 nParams, typelib_MethodParameter const * pParams, - System::Object * args[], System::Type* argTypes[], - System::Object** pException) const; + array^ args, array^ argTypes, + System::Object^* pException) const; void call_cli( - System::Object* cliI, sr::MethodInfo* method, + System::Object^ cliI, sr::MethodInfo^ method, typelib_TypeDescriptionReference * return_type, typelib_MethodParameter * params, int nParams, void * uno_ret, void * uno_args [], uno_Any ** uno_exc ) const; uno_Interface * map_cli2uno( - System::Object* cliI, typelib_TypeDescription* pTD) const; + System::Object^ cliI, typelib_TypeDescription* pTD) const; }; diff --git a/cli_ure/source/uno_bridge/cli_data.cxx b/cli_ure/source/uno_bridge/cli_data.cxx index e9edae0dbb9e..3a0eb8050319 100644 --- a/cli_ure/source/uno_bridge/cli_data.cxx +++ b/cli_ure/source/uno_bridge/cli_data.cxx @@ -52,10 +52,10 @@ using ::rtl::OUStringBuffer; namespace cli_uno { -System::String* mapUnoPolymorphicName(System::String* unoName); -OUString mapCliTypeName(System::String* typeName); -System::String* mapCliPolymorphicName(System::String* unoName); -System::String* mapPolymorphicName(System::String* unoName, bool bCliToUno); +System::String^ mapUnoPolymorphicName(System::String^ unoName); +OUString mapCliTypeName(System::String^ typeName); +System::String^ mapCliPolymorphicName(System::String^ unoName); +System::String^ mapPolymorphicName(System::String^ unoName, bool bCliToUno); inline auto_ptr< rtl_mem > seq_allocate( sal_Int32 nElements, sal_Int32 nSize ) { @@ -68,9 +68,9 @@ inline auto_ptr< rtl_mem > seq_allocate( sal_Int32 nElements, sal_Int32 nSize ) } -System::Object* Bridge::map_uno2cli(uno_Interface * pUnoI, typelib_InterfaceTypeDescription *pTD) const +System::Object^ Bridge::map_uno2cli(uno_Interface * pUnoI, typelib_InterfaceTypeDescription *pTD) const { - System::Object* retVal= NULL; + System::Object^ retVal= nullptr; // get oid rtl_uString * pOid = 0; (*m_uno_env->getObjectIdentifier)( m_uno_env, &pOid, pUnoI ); @@ -78,8 +78,8 @@ System::Object* Bridge::map_uno2cli(uno_Interface * pUnoI, typelib_InterfaceType OUString oid(pOid, SAL_NO_ACQUIRE); //see if the interface was already mapped - System::Type* ifaceType= mapUnoType(reinterpret_cast(pTD)); - System::String* sOid= mapUnoString(oid.pData); + System::Type^ ifaceType= mapUnoType(reinterpret_cast(pTD)); + System::String^ sOid= mapUnoString(oid.pData); System::Threading::Monitor::Enter( CliEnvHolder::g_cli_env ); try @@ -93,7 +93,7 @@ System::Object* Bridge::map_uno2cli(uno_Interface * pUnoI, typelib_InterfaceType // interface. If it already does that, then it does nothing if (srr::RemotingServices::IsTransparentProxy(retVal)) { - UnoInterfaceProxy* p = static_cast( + UnoInterfaceProxy^ p = static_cast( srr::RemotingServices::GetRealProxy(retVal)); p->addUnoInterface(pUnoI, pTD); } @@ -112,18 +112,18 @@ System::Object* Bridge::map_uno2cli(uno_Interface * pUnoI, typelib_InterfaceType return retVal; } -uno_Interface* Bridge::map_cli2uno(System::Object* cliObj, typelib_TypeDescription *pTD) const +uno_Interface* Bridge::map_cli2uno(System::Object^ cliObj, typelib_TypeDescription *pTD) const { uno_Interface* retIface = NULL; // get oid from dot net environment - System::String* ds_oid = CliEnvHolder::g_cli_env->getObjectIdentifier( cliObj); + System::String^ ds_oid = CliEnvHolder::g_cli_env->getObjectIdentifier( cliObj); OUString ousOid = mapCliString(ds_oid); // look if interface is already mapped m_uno_env->getRegisteredInterface(m_uno_env, (void**) &retIface, ousOid.pData, (typelib_InterfaceTypeDescription*) pTD); if ( ! retIface) { - System::Threading::Monitor::Enter(__typeof(Cli_environment)); + System::Threading::Monitor::Enter(Cli_environment::typeid); try { m_uno_env->getRegisteredInterface(m_uno_env, (void**) &retIface, ousOid.pData, @@ -135,35 +135,35 @@ uno_Interface* Bridge::map_cli2uno(System::Object* cliObj, typelib_TypeDescripti } __finally { - System::Threading::Monitor::Exit(__typeof(Cli_environment)); + System::Threading::Monitor::Exit(Cli_environment::typeid); } } return retIface; } -inline System::Type* loadCliType(rtl_uString * unoName) +inline System::Type^ loadCliType(rtl_uString * unoName) { return loadCliType(mapUnoTypeName(unoName)); } -System::Type* loadCliType(System::String * unoName) +System::Type^ loadCliType(System::String ^ unoName) { - System::Type* retVal= NULL; + System::Type^ retVal= nullptr; try { //If unoName denotes a polymorphic type, e.g com.sun.star.beans.Defaulted //then we remove the type list, otherwise the type could not be loaded. bool bIsPolymorphic = false; - System::String * loadName = unoName; + System::String ^ loadName = unoName; int index = unoName->IndexOf('<'); if (index != -1) { loadName = unoName->Substring(0, index); bIsPolymorphic = true; } - System::AppDomain* currentDomain = System::AppDomain::CurrentDomain; - sr::Assembly* assems[] = currentDomain->GetAssemblies(); + System::AppDomain^ currentDomain = System::AppDomain::CurrentDomain; + array^ assems = currentDomain->GetAssemblies(); for (int i = 0; i < assems->Length; i++) { retVal = assems[i]->GetType(loadName, false); @@ -171,9 +171,9 @@ System::Type* loadCliType(System::String * unoName) break; } - if (retVal == NULL) + if (retVal == nullptr) { - System::String * msg = new System::String(S"A type could not be loaded: "); + System::String ^ msg = gcnew System::String("A type could not be loaded: "); msg = System::String::Concat(msg, loadName); throw BridgeRuntimeError(mapCliString(msg)); } @@ -183,55 +183,55 @@ System::Type* loadCliType(System::String * unoName) retVal = uno::PolymorphicType::GetType(retVal, unoName); } } - catch( System::Exception * e) + catch( System::Exception ^ e) { - rtl::OUString ouMessage(mapCliString(e->get_Message())); + rtl::OUString ouMessage(mapCliString(e->Message)); throw BridgeRuntimeError(ouMessage); } return retVal; } -System::Type* mapUnoType(typelib_TypeDescription const * pTD) +System::Type^ mapUnoType(typelib_TypeDescription const * pTD) { return mapUnoType(pTD->pWeakRef); } -System::Type* mapUnoType(typelib_TypeDescriptionReference const * pTD) +System::Type^ mapUnoType(typelib_TypeDescriptionReference const * pTD) { - System::Type * retVal = 0; + System::Type ^ retVal = nullptr; switch (pTD->eTypeClass) { case typelib_TypeClass_VOID: - retVal= __typeof(void); break; + retVal= void::typeid; break; case typelib_TypeClass_CHAR: - retVal= __typeof(System::Char); break; + retVal= System::Char::typeid; break; case typelib_TypeClass_BOOLEAN: - retVal= __typeof(System::Boolean); break; + retVal= System::Boolean::typeid; break; case typelib_TypeClass_BYTE: - retVal= __typeof(System::Byte); break; + retVal= System::Byte::typeid; break; case typelib_TypeClass_SHORT: - retVal= __typeof(System::Int16); break; + retVal= System::Int16::typeid; break; case typelib_TypeClass_UNSIGNED_SHORT: - retVal= __typeof(System::UInt16); break; + retVal= System::UInt16::typeid; break; case typelib_TypeClass_LONG: - retVal= __typeof(System::Int32); break; + retVal= System::Int32::typeid; break; case typelib_TypeClass_UNSIGNED_LONG: - retVal= __typeof(System::UInt32); break; + retVal= System::UInt32::typeid; break; case typelib_TypeClass_HYPER: - retVal= __typeof(System::Int64); break; + retVal= System::Int64::typeid; break; case typelib_TypeClass_UNSIGNED_HYPER: - retVal= __typeof(System::UInt64); break; + retVal= System::UInt64::typeid; break; case typelib_TypeClass_FLOAT: - retVal= __typeof(System::Single); break; + retVal= System::Single::typeid; break; case typelib_TypeClass_DOUBLE: - retVal= __typeof(System::Double); break; + retVal= System::Double::typeid; break; case typelib_TypeClass_STRING: - retVal= __typeof(System::String); break; + retVal= System::String::typeid; break; case typelib_TypeClass_TYPE: - retVal= __typeof(System::Type); break; + retVal= System::Type::typeid; break; case typelib_TypeClass_ANY: - retVal= __typeof(uno::Any); break; + retVal= uno::Any::typeid; break; case typelib_TypeClass_ENUM: case typelib_TypeClass_STRUCT: case typelib_TypeClass_EXCEPTION: @@ -241,7 +241,7 @@ System::Type* mapUnoType(typelib_TypeDescriptionReference const * pTD) //special handling for XInterface, since it does not exist in cli. rtl::OUString usXInterface(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface")); if (usXInterface.equals(pTD->pTypeName)) - retVal= __typeof(System::Object); + retVal= System::Object::typeid; else retVal= loadCliType(pTD->pTypeName); break; @@ -255,42 +255,42 @@ System::Type* mapUnoType(typelib_TypeDescriptionReference const * pTD) switch (pElementTDRef->eTypeClass) { case typelib_TypeClass_CHAR: - retVal= System::Type::GetType(const_cast(Constants::sArChar)); break; + retVal= System::Type::GetType(const_cast(Constants::sArChar)); break; case typelib_TypeClass_BOOLEAN: - retVal= System::Type::GetType(const_cast(Constants::sArBoolean)); + retVal= System::Type::GetType(const_cast(Constants::sArBoolean)); break; case typelib_TypeClass_BYTE: - retVal= System::Type::GetType(const_cast(Constants::sArByte)); + retVal= System::Type::GetType(const_cast(Constants::sArByte)); break; case typelib_TypeClass_SHORT: - retVal= System::Type::GetType(const_cast(Constants::sArInt16)); + retVal= System::Type::GetType(const_cast(Constants::sArInt16)); break; case typelib_TypeClass_UNSIGNED_SHORT: - retVal= System::Type::GetType(const_cast(Constants::sArUInt16)); + retVal= System::Type::GetType(const_cast(Constants::sArUInt16)); break; case typelib_TypeClass_LONG: - retVal= System::Type::GetType(const_cast(Constants::sArInt32)); + retVal= System::Type::GetType(const_cast(Constants::sArInt32)); break; case typelib_TypeClass_UNSIGNED_LONG: - retVal= System::Type::GetType(const_cast(Constants::sArUInt32)); + retVal= System::Type::GetType(const_cast(Constants::sArUInt32)); break; case typelib_TypeClass_HYPER: - retVal= System::Type::GetType(const_cast(Constants::sArInt64)); + retVal= System::Type::GetType(const_cast(Constants::sArInt64)); break; case typelib_TypeClass_UNSIGNED_HYPER: - retVal= System::Type::GetType(const_cast(Constants::sArUInt64)); + retVal= System::Type::GetType(const_cast(Constants::sArUInt64)); break; case typelib_TypeClass_FLOAT: - retVal= System::Type::GetType(const_cast(Constants::sArSingle)); + retVal= System::Type::GetType(const_cast(Constants::sArSingle)); break; case typelib_TypeClass_DOUBLE: - retVal= System::Type::GetType(const_cast(Constants::sArDouble)); + retVal= System::Type::GetType(const_cast(Constants::sArDouble)); break; case typelib_TypeClass_STRING: - retVal= System::Type::GetType(const_cast(Constants::sArString)); + retVal= System::Type::GetType(const_cast(Constants::sArString)); break; case typelib_TypeClass_TYPE: - retVal= System::Type::GetType(const_cast(Constants::sArType)); + retVal= System::Type::GetType(const_cast(Constants::sArType)); break; case typelib_TypeClass_ANY: case typelib_TypeClass_ENUM: @@ -318,10 +318,10 @@ System::Type* mapUnoType(typelib_TypeDescriptionReference const * pTD) /** Returns an acquired td. */ -typelib_TypeDescriptionReference* mapCliType(System::Type* cliType) +typelib_TypeDescriptionReference* mapCliType(System::Type^ cliType) { typelib_TypeDescriptionReference* retVal= NULL; - if (cliType == NULL) + if (cliType == nullptr) { retVal = * typelib_static_type_getByTypeClass( typelib_TypeClass_VOID ); @@ -330,9 +330,9 @@ typelib_TypeDescriptionReference* mapCliType(System::Type* cliType) } //check for Enum first, //because otherwise case System::TypeCode::Int32 applies - if (cliType->get_IsEnum()) + if (cliType->IsEnum) { - OUString usTypeName= mapCliTypeName(cliType->get_FullName()); + OUString usTypeName= mapCliTypeName(cliType->FullName); css::uno::Type unoType(css::uno::TypeClass_ENUM, usTypeName); retVal= unoType.getTypeLibType(); typelib_typedescriptionreference_acquire(retVal); @@ -407,9 +407,9 @@ typelib_TypeDescriptionReference* mapCliType(System::Type* cliType) } if (retVal == NULL) { - System::String* cliTypeName= cliType->get_FullName(); + System::String^ cliTypeName= cliType->FullName; // Void - if (const_cast(Constants::sVoid)->Equals( + if (const_cast(Constants::sVoid)->Equals( cliTypeName)) { retVal = * typelib_static_type_getByTypeClass( @@ -417,7 +417,7 @@ typelib_TypeDescriptionReference* mapCliType(System::Type* cliType) typelib_typedescriptionreference_acquire( retVal ); } // Type - else if (const_cast(Constants::sType)->Equals( + else if (const_cast(Constants::sType)->Equals( cliTypeName)) { retVal = * typelib_static_type_getByTypeClass( @@ -425,7 +425,7 @@ typelib_TypeDescriptionReference* mapCliType(System::Type* cliType) typelib_typedescriptionreference_acquire( retVal ); } // Any - else if (const_cast(Constants::sAny)->Equals( + else if (const_cast(Constants::sAny)->Equals( cliTypeName)) { retVal = * typelib_static_type_getByTypeClass( @@ -436,8 +436,8 @@ typelib_TypeDescriptionReference* mapCliType(System::Type* cliType) else { OUString usTypeName; - uno::PolymorphicType * poly = dynamic_cast(cliType); - if (poly != NULL) + uno::PolymorphicType ^ poly = dynamic_cast(cliType); + if (poly != nullptr) usTypeName = mapCliTypeName( poly->PolymorphicName); else usTypeName = mapCliTypeName(cliTypeName); @@ -457,7 +457,7 @@ typelib_TypeDescriptionReference* mapCliType(System::Type* cliType) buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[cli_uno bridge] mapCliType():" "could not map type: ") ); - buf.append(mapCliString(cliType->get_FullName())); + buf.append(mapCliString(cliType->FullName)); throw BridgeRuntimeError( buf.makeStringAndClear() ); } return retVal; @@ -466,10 +466,10 @@ typelib_TypeDescriptionReference* mapCliType(System::Type* cliType) /** Otherwise a leading "unoidl." is removed. */ -System::String* mapUnoTypeName(rtl_uString const * typeName) +System::String^ mapUnoTypeName(rtl_uString const * typeName) { OUString usUnoName( const_cast< rtl_uString * >( typeName ) ); - st::StringBuilder* buf= new st::StringBuilder(); + st::StringBuilder^ buf= gcnew st::StringBuilder(); //determine if the type is a sequence and its dimensions int dims= 0; if (usUnoName[0] == '[') @@ -484,52 +484,52 @@ System::String* mapUnoTypeName(rtl_uString const * typeName) } usUnoName = usUnoName.copy(index - 1); } - System::String * sUnoName = mapUnoString(usUnoName.pData); - if (sUnoName->Equals(const_cast(Constants::usBool))) - buf->Append(const_cast(Constants::sBoolean)); - else if (sUnoName->Equals(const_cast(Constants::usChar))) - buf->Append(const_cast(Constants::sChar)); - else if (sUnoName->Equals(const_cast(Constants::usByte))) - buf->Append(const_cast(Constants::sByte)); - else if (sUnoName->Equals(const_cast(Constants::usShort))) - buf->Append(const_cast(Constants::sInt16)); - else if (sUnoName->Equals(const_cast(Constants::usUShort))) - buf->Append(const_cast(Constants::sUInt16)); - else if (sUnoName->Equals(const_cast(Constants::usLong))) - buf->Append(const_cast(Constants::sInt32)); - else if (sUnoName->Equals(const_cast(Constants::usULong))) - buf->Append(const_cast(Constants::sUInt32)); - else if (sUnoName->Equals(const_cast(Constants::usHyper))) - buf->Append(const_cast(Constants::sInt64)); - else if (sUnoName->Equals(const_cast(Constants::usUHyper))) - buf->Append(const_cast(Constants::sUInt64)); - else if (sUnoName->Equals(const_cast(Constants::usFloat))) - buf->Append(const_cast(Constants::sSingle)); - else if (sUnoName->Equals(const_cast(Constants::usDouble))) - buf->Append(const_cast(Constants::sDouble)); - else if (sUnoName->Equals(const_cast(Constants::usString))) - buf->Append(const_cast(Constants::sString)); - else if (sUnoName->Equals(const_cast(Constants::usVoid))) - buf->Append(const_cast(Constants::sVoid)); - else if (sUnoName->Equals(const_cast(Constants::usType))) - buf->Append(const_cast(Constants::sType)); - else if (sUnoName->Equals(const_cast(Constants::usXInterface))) - buf->Append(const_cast(Constants::sObject)); - else if (sUnoName->Equals(const_cast(Constants::usAny))) + System::String ^ sUnoName = mapUnoString(usUnoName.pData); + if (sUnoName->Equals(const_cast(Constants::usBool))) + buf->Append(const_cast(Constants::sBoolean)); + else if (sUnoName->Equals(const_cast(Constants::usChar))) + buf->Append(const_cast(Constants::sChar)); + else if (sUnoName->Equals(const_cast(Constants::usByte))) + buf->Append(const_cast(Constants::sByte)); + else if (sUnoName->Equals(const_cast(Constants::usShort))) + buf->Append(const_cast(Constants::sInt16)); + else if (sUnoName->Equals(const_cast(Constants::usUShort))) + buf->Append(const_cast(Constants::sUInt16)); + else if (sUnoName->Equals(const_cast(Constants::usLong))) + buf->Append(const_cast(Constants::sInt32)); + else if (sUnoName->Equals(const_cast(Constants::usULong))) + buf->Append(const_cast(Constants::sUInt32)); + else if (sUnoName->Equals(const_cast(Constants::usHyper))) + buf->Append(const_cast(Constants::sInt64)); + else if (sUnoName->Equals(const_cast(Constants::usUHyper))) + buf->Append(const_cast(Constants::sUInt64)); + else if (sUnoName->Equals(const_cast(Constants::usFloat))) + buf->Append(const_cast(Constants::sSingle)); + else if (sUnoName->Equals(const_cast(Constants::usDouble))) + buf->Append(const_cast(Constants::sDouble)); + else if (sUnoName->Equals(const_cast(Constants::usString))) + buf->Append(const_cast(Constants::sString)); + else if (sUnoName->Equals(const_cast(Constants::usVoid))) + buf->Append(const_cast(Constants::sVoid)); + else if (sUnoName->Equals(const_cast(Constants::usType))) + buf->Append(const_cast(Constants::sType)); + else if (sUnoName->Equals(const_cast(Constants::usXInterface))) + buf->Append(const_cast(Constants::sObject)); + else if (sUnoName->Equals(const_cast(Constants::usAny))) { - buf->Append(const_cast(Constants::sAny)); + buf->Append(const_cast(Constants::sAny)); } else { //put "unoidl." at the beginning - buf->Append(const_cast(Constants::sUnoidl)); + buf->Append(const_cast(Constants::sUnoidl)); //for polymorphic struct types remove the brackets, e.g mystruct -> mystruct - System::String * sName = mapUnoPolymorphicName(sUnoName); + System::String ^ sName = mapUnoPolymorphicName(sUnoName); buf->Append(sName); } // apend [] for (;dims--;) - buf->Append(const_cast(Constants::sBrackets)); + buf->Append(const_cast(Constants::sBrackets)); return buf->ToString(); } @@ -544,7 +544,7 @@ System::String* mapUnoTypeName(rtl_uString const * typeName) System.Int32, etc. The präfix unoidl is not added. */ -inline System::String* mapUnoPolymorphicName(System::String* unoName) +inline System::String^ mapUnoPolymorphicName(System::String^ unoName) { return mapPolymorphicName(unoName, false); } @@ -555,18 +555,18 @@ inline System::String* mapUnoPolymorphicName(System::String* unoName) long, etc. The präfix unoidl remains. */ -inline System::String* mapCliPolymorphicName(System::String* unoName) +inline System::String^ mapCliPolymorphicName(System::String^ unoName) { return mapPolymorphicName(unoName, true); } -System::String* mapPolymorphicName(System::String* unoName, bool bCliToUno) +System::String^ mapPolymorphicName(System::String^ unoName, bool bCliToUno) { int index = unoName->IndexOf('<'); if (index == -1) return unoName; - System::Text::StringBuilder * builder = new System::Text::StringBuilder(256); + System::Text::StringBuilder ^ builder = gcnew System::Text::StringBuilder(256); builder->Append(unoName->Substring(0, index +1 )); //Find the first occurrence of ',' @@ -579,14 +579,14 @@ System::String* mapPolymorphicName(System::String* unoName, bool bCliToUno) int countParams = 0; while (cur <= endIndex) { - System::Char c = unoName->Chars[cur]; + System::Char c = unoName[cur]; if (c == ',' || c == '>') { //insert a comma if needed if (countParams != 0) - builder->Append(S","); + builder->Append(","); countParams++; - System::String * sParam = unoName->Substring(index, cur - index); + System::String ^ sParam = unoName->Substring(index, cur - index); //skip the comma cur++; //the the index to the beginning of the next param @@ -608,7 +608,7 @@ System::String* mapPolymorphicName(System::String* unoName, bool bCliToUno) int numNested = 0; for (;;cur++) { - System::Char curChar = unoName->Chars[cur]; + System::Char curChar = unoName[cur]; if (curChar == '<') { numNested ++; @@ -629,7 +629,7 @@ System::String* mapPolymorphicName(System::String* unoName, bool bCliToUno) return builder->ToString(); } -OUString mapCliTypeName(System::String* typeName) +OUString mapCliTypeName(System::String^ typeName) { int dims= 0; // Array? determine the "rank" (number of "[]") @@ -640,7 +640,7 @@ OUString mapCliTypeName(System::String* typeName) bool bRightBracket = false; while (cur >= 0) { - System::Char c = typeName->Chars[cur]; + System::Char c = typeName[cur]; if (c == ']') { bRightBracket = true; @@ -672,47 +672,47 @@ OUString mapCliTypeName(System::String* typeName) typeName = typeName->Substring(0, cur + 1); - System::Text::StringBuilder * buf = new System::Text::StringBuilder(512); + System::Text::StringBuilder ^ buf = gcnew System::Text::StringBuilder(512); //Put the "[]" at the beginning of the uno type name for (;dims--;) - buf->Append(const_cast(Constants::usBrackets)); + buf->Append(const_cast(Constants::usBrackets)); - if (typeName->Equals(const_cast(Constants::sBoolean))) - buf->Append(const_cast(Constants::usBool)); - else if (typeName->Equals(const_cast(Constants::sChar))) - buf->Append(const_cast(Constants::usChar)); - else if (typeName->Equals(const_cast(Constants::sByte))) - buf->Append(const_cast(Constants::usByte)); - else if (typeName->Equals(const_cast(Constants::sInt16))) - buf->Append(const_cast(Constants::usShort)); - else if (typeName->Equals(const_cast(Constants::sUInt16))) - buf->Append(const_cast(Constants::usUShort)); - else if (typeName->Equals(const_cast(Constants::sInt32))) - buf->Append(const_cast(Constants::usLong)); - else if (typeName->Equals(const_cast(Constants::sUInt32))) - buf->Append(const_cast(Constants::usULong)); - else if (typeName->Equals(const_cast(Constants::sInt64))) - buf->Append(const_cast(Constants::usHyper)); - else if (typeName->Equals(const_cast(Constants::sUInt64))) - buf->Append(const_cast(Constants::usUHyper)); - else if (typeName->Equals(const_cast(Constants::sSingle))) - buf->Append(const_cast(Constants::usFloat)); - else if (typeName->Equals(const_cast(Constants::sDouble))) - buf->Append(const_cast(Constants::usDouble)); - else if (typeName->Equals(const_cast(Constants::sString))) - buf->Append(const_cast(Constants::usString)); - else if (typeName->Equals(const_cast(Constants::sVoid))) - buf->Append(const_cast(Constants::usVoid)); - else if (typeName->Equals(const_cast(Constants::sType))) - buf->Append(const_cast(Constants::usType)); - else if (typeName->Equals(const_cast(Constants::sObject))) - buf->Append(const_cast(Constants::usXInterface)); - else if (typeName->Equals(const_cast(Constants::sAny))) - buf->Append(const_cast(Constants::usAny)); + if (typeName->Equals(const_cast(Constants::sBoolean))) + buf->Append(const_cast(Constants::usBool)); + else if (typeName->Equals(const_cast(Constants::sChar))) + buf->Append(const_cast(Constants::usChar)); + else if (typeName->Equals(const_cast(Constants::sByte))) + buf->Append(const_cast(Constants::usByte)); + else if (typeName->Equals(const_cast(Constants::sInt16))) + buf->Append(const_cast(Constants::usShort)); + else if (typeName->Equals(const_cast(Constants::sUInt16))) + buf->Append(const_cast(Constants::usUShort)); + else if (typeName->Equals(const_cast(Constants::sInt32))) + buf->Append(const_cast(Constants::usLong)); + else if (typeName->Equals(const_cast(Constants::sUInt32))) + buf->Append(const_cast(Constants::usULong)); + else if (typeName->Equals(const_cast(Constants::sInt64))) + buf->Append(const_cast(Constants::usHyper)); + else if (typeName->Equals(const_cast(Constants::sUInt64))) + buf->Append(const_cast(Constants::usUHyper)); + else if (typeName->Equals(const_cast(Constants::sSingle))) + buf->Append(const_cast(Constants::usFloat)); + else if (typeName->Equals(const_cast(Constants::sDouble))) + buf->Append(const_cast(Constants::usDouble)); + else if (typeName->Equals(const_cast(Constants::sString))) + buf->Append(const_cast(Constants::usString)); + else if (typeName->Equals(const_cast(Constants::sVoid))) + buf->Append(const_cast(Constants::usVoid)); + else if (typeName->Equals(const_cast(Constants::sType))) + buf->Append(const_cast(Constants::usType)); + else if (typeName->Equals(const_cast(Constants::sObject))) + buf->Append(const_cast(Constants::usXInterface)); + else if (typeName->Equals(const_cast(Constants::sAny))) + buf->Append(const_cast(Constants::usAny)); else { - System::String * sName = mapCliPolymorphicName(typeName); + System::String ^ sName = mapCliPolymorphicName(typeName); int i= sName->IndexOf(L'.'); buf->Append(sName->Substring(i + 1)); } @@ -721,20 +721,20 @@ OUString mapCliTypeName(System::String* typeName) /** Maps uno types to dot net types. * If uno_data is null then the type description is converted to System::Type */ -inline System::String* mapUnoString( rtl_uString const * data) +inline System::String^ mapUnoString( rtl_uString const * data) { OSL_ASSERT(data); - return new System::String((__wchar_t*) data->buffer, 0, data->length); + return gcnew System::String((__wchar_t*) data->buffer, 0, data->length); } -OUString mapCliString(System::String const * data) +OUString mapCliString(System::String const ^ data) { - if (data != NULL) + if (data != nullptr) { OSL_ASSERT(sizeof(wchar_t) == sizeof(sal_Unicode)); - wchar_t const __pin * pdata= PtrToStringChars(data); - return OUString(pdata, const_cast(data)->get_Length()); + pin_ptr pdata= PtrToStringChars(data); + return OUString(pdata, const_cast(data)->Length); } else { @@ -745,7 +745,7 @@ OUString mapCliString(System::String const * data) // ToDo convert cli types to expected types, e.g a long to a short where the uno type // is a sal_Int16. This could be necessary if a scripting language (typeless) is used // @param assign the uno_data has to be destructed (in/out args) -void Bridge::map_to_uno(void * uno_data, System::Object* cli_data, +void Bridge::map_to_uno(void * uno_data, System::Object^ cli_data, typelib_TypeDescriptionReference * type, bool assign) const { @@ -756,67 +756,67 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data, break; case typelib_TypeClass_CHAR: { - System::Char aChar= *__try_cast(cli_data); + System::Char aChar= *safe_cast(cli_data); *(sal_Unicode*) uno_data= aChar; break; } case typelib_TypeClass_BOOLEAN: { - System::Boolean aBool= *__try_cast(cli_data); + System::Boolean aBool= *safe_cast(cli_data); *(sal_Bool*)uno_data= aBool == true ? sal_True : sal_False; break; } case typelib_TypeClass_BYTE: { - System::Byte aByte= *__try_cast(cli_data); + System::Byte aByte= *safe_cast(cli_data); *(sal_Int8*) uno_data= aByte; break; } case typelib_TypeClass_SHORT: { - System::Int16 aShort= *__try_cast(cli_data); + System::Int16 aShort= *safe_cast(cli_data); *(sal_Int16*) uno_data= aShort; break; } case typelib_TypeClass_UNSIGNED_SHORT: { - System::UInt16 aUShort= *__try_cast(cli_data); + System::UInt16 aUShort= *safe_cast(cli_data); *(sal_uInt16*) uno_data= aUShort; break; } case typelib_TypeClass_LONG: { - System::Int32 aLong= *__try_cast(cli_data); + System::Int32 aLong= *safe_cast(cli_data); *(sal_Int32*) uno_data= aLong; break; } case typelib_TypeClass_UNSIGNED_LONG: { - System::UInt32 aULong= *__try_cast(cli_data); + System::UInt32 aULong= *safe_cast(cli_data); *(sal_uInt32*) uno_data= aULong; break; } case typelib_TypeClass_HYPER: { - System::Int64 aHyper= *__try_cast(cli_data); + System::Int64 aHyper= *safe_cast(cli_data); *(sal_Int64*) uno_data= aHyper; break; } case typelib_TypeClass_UNSIGNED_HYPER: { - System::UInt64 aLong= *__try_cast(cli_data); + System::UInt64 aLong= *safe_cast(cli_data); *(sal_uInt64*) uno_data= aLong; break; } case typelib_TypeClass_FLOAT: { - System::Single aFloat= *__try_cast(cli_data); + System::Single aFloat= *safe_cast(cli_data); *(float*) uno_data= aFloat; break; } case typelib_TypeClass_DOUBLE: { - System::Double aDouble= *__try_cast(cli_data); + System::Double aDouble= *safe_cast(cli_data); *(double*) uno_data= aDouble; break; } @@ -826,22 +826,22 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data, rtl_uString_release(*(rtl_uString**) uno_data); *(rtl_uString **)uno_data = 0; - if (cli_data == NULL) + if (cli_data == nullptr) { rtl_uString_new((rtl_uString**) uno_data); } else { - System::String *s= __try_cast(cli_data); - wchar_t const __pin * pdata= PtrToStringChars(s); + System::String ^s= safe_cast(cli_data); + pin_ptr pdata= PtrToStringChars(s); rtl_uString_newFromStr_WithLength( (rtl_uString**) uno_data, - pdata, s->get_Length() ); + pdata, s->Length ); } break; } case typelib_TypeClass_TYPE: { - typelib_TypeDescriptionReference* td= mapCliType(__try_cast( + typelib_TypeDescriptionReference* td= mapCliType(safe_cast( cli_data)); if (assign) { @@ -854,14 +854,14 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data, case typelib_TypeClass_ANY: { uno_Any * pAny = (uno_Any *)uno_data; - if (cli_data == NULL) // null-ref or uninitialized any maps to empty any + if (cli_data == nullptr) // null-ref or uninitialized any maps to empty any { if (assign) uno_any_destruct( pAny, 0 ); uno_any_construct( pAny, 0, 0, 0 ); break; } - uno::Any aAny= *__try_cast(cli_data); + uno::Any aAny= *safe_cast(cli_data); css::uno::Type value_td( mapCliType(aAny.Type), SAL_NO_ACQUIRE); if (assign) @@ -876,42 +876,42 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data, break; case typelib_TypeClass_CHAR: pAny->pData = &pAny->pReserved; - *(sal_Unicode*) &pAny->pReserved = *__try_cast(aAny.Value); + *(sal_Unicode*) &pAny->pReserved = *safe_cast(aAny.Value); break; case typelib_TypeClass_BOOLEAN: pAny->pData = &pAny->pReserved; - *(sal_Bool *) &pAny->pReserved = *__try_cast(aAny.Value); + *(sal_Bool *) &pAny->pReserved = *safe_cast(aAny.Value); break; case typelib_TypeClass_BYTE: pAny->pData = &pAny->pReserved; - *(sal_Int8*) &pAny->pReserved = *__try_cast(aAny.Value); + *(sal_Int8*) &pAny->pReserved = *safe_cast(aAny.Value); break; case typelib_TypeClass_SHORT: pAny->pData = &pAny->pReserved; - *(sal_Int16*) &pAny->pReserved = *__try_cast(aAny.Value); + *(sal_Int16*) &pAny->pReserved = *safe_cast(aAny.Value); break; case typelib_TypeClass_UNSIGNED_SHORT: pAny->pData = &pAny->pReserved; - *(sal_uInt16*) &pAny->pReserved = *__try_cast(aAny.Value); + *(sal_uInt16*) &pAny->pReserved = *safe_cast(aAny.Value); break; case typelib_TypeClass_LONG: pAny->pData = &pAny->pReserved; - *(sal_Int32*) &pAny->pReserved = *__try_cast(aAny.Value); + *(sal_Int32*) &pAny->pReserved = *safe_cast(aAny.Value); break; case typelib_TypeClass_UNSIGNED_LONG: pAny->pData = &pAny->pReserved; - *(sal_uInt32*) &pAny->pReserved = *__try_cast(aAny.Value); + *(sal_uInt32*) &pAny->pReserved = *safe_cast(aAny.Value); break; case typelib_TypeClass_HYPER: if (sizeof (sal_Int64) <= sizeof (void *)) { pAny->pData = &pAny->pReserved; - *(sal_Int64*) &pAny->pReserved = *__try_cast(aAny.Value); + *(sal_Int64*) &pAny->pReserved = *safe_cast(aAny.Value); } else { auto_ptr< rtl_mem > mem( rtl_mem::allocate( sizeof (sal_Int64) ) ); - *(sal_Int64 *) mem.get()= *__try_cast(aAny.Value); + *(sal_Int64 *) mem.get()= *safe_cast(aAny.Value); pAny->pData = mem.release(); } break; @@ -919,12 +919,12 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data, if (sizeof (sal_uInt64) <= sizeof (void *)) { pAny->pData = &pAny->pReserved; - *(sal_uInt64*) &pAny->pReserved = *__try_cast(aAny.Value); + *(sal_uInt64*) &pAny->pReserved = *safe_cast(aAny.Value); } else { auto_ptr< rtl_mem > mem( rtl_mem::allocate( sizeof (sal_uInt64) ) ); - *(sal_uInt64 *) mem.get()= *__try_cast(aAny.Value); + *(sal_uInt64 *) mem.get()= *safe_cast(aAny.Value); pAny->pData = mem.release(); } break; @@ -932,12 +932,12 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data, if (sizeof (float) <= sizeof (void *)) { pAny->pData = &pAny->pReserved; - *(float*) &pAny->pReserved = *__try_cast(aAny.Value); + *(float*) &pAny->pReserved = *safe_cast(aAny.Value); } else { auto_ptr< rtl_mem > mem( rtl_mem::allocate( sizeof (float) ) ); - *(float*) mem.get() = *__try_cast(aAny.Value); + *(float*) mem.get() = *safe_cast(aAny.Value); pAny->pData = mem.release(); } break; @@ -945,19 +945,19 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data, if (sizeof (double) <= sizeof (void *)) { pAny->pData = &pAny->pReserved; - *(double*) &pAny->pReserved= *__try_cast(aAny.Value); + *(double*) &pAny->pReserved= *safe_cast(aAny.Value); } else { auto_ptr< rtl_mem > mem( rtl_mem::allocate( sizeof (double) ) ); - *(double*) mem.get()= *__try_cast(aAny.Value); + *(double*) mem.get()= *safe_cast(aAny.Value); pAny->pData= mem.release(); } break; case typelib_TypeClass_STRING: // anies often contain strings; copy string directly { pAny->pData= &pAny->pReserved; - OUString _s = mapCliString(static_cast(aAny.Value)); + OUString _s = mapCliString(static_cast(aAny.Value)); pAny->pReserved= _s.pData; rtl_uString_acquire(_s.pData); break; @@ -996,7 +996,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data, } } } - catch(System::InvalidCastException* ) + catch(System::InvalidCastException^ ) { // ToDo check this if (assign) @@ -1008,7 +1008,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data, buf.append(value_td.getTypeName()); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(" does not correspont " "to its value type: ") ); - if(aAny.Value != NULL) + if(aAny.Value != nullptr) { css::uno::Type td(mapCliType(aAny.Value->GetType()), SAL_NO_ACQUIRE); buf.append(td.getTypeName()); @@ -1058,7 +1058,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data, sal_Int32 nMembers = comp_td->nMembers; boolean bException= false; - System::Type* cliType = NULL; + System::Type^ cliType = nullptr; if (cli_data) cliType = cli_data->GetType(); @@ -1084,10 +1084,10 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data, __s = mapUnoString(comp_td->ppMemberNames[nPos]); arFields = cliType != NULL ? cliType->GetFields() : NULL; #endif - System::Object* val= NULL; - if (cli_data != NULL) + System::Object^ val= nullptr; + if (cli_data != nullptr) { - sr::FieldInfo* aField= cliType->GetField( + sr::FieldInfo^ aField= cliType->GetField( mapUnoString(comp_td->ppMemberNames[nPos])); // special case for Exception.Message property // The com.sun.star.uno.Exception.Message field is mapped to the @@ -1097,9 +1097,9 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data, rtl::OUString usMessageMember(RTL_CONSTASCII_USTRINGPARAM("Message")); if (usMessageMember.equals(comp_td->ppMemberNames[nPos])) { - sr::PropertyInfo* pi= cliType->GetProperty( + sr::PropertyInfo^ pi= cliType->GetProperty( mapUnoString(comp_td->ppMemberNames[nPos])); - val= pi->GetValue(cli_data, NULL); + val= pi->GetValue(cli_data, nullptr); } else { @@ -1120,75 +1120,75 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data, bool bDefault = ((struct_td != NULL && struct_td->pParameterizedTypes != NULL && struct_td->pParameterizedTypes[nPos] == sal_True - && val == NULL) - || cli_data == NULL) ? true : false; + && val == nullptr) + || cli_data == nullptr) ? true : false; switch (member_type->eTypeClass) { case typelib_TypeClass_CHAR: if (bDefault) *(sal_Unicode*) p = 0; else - *(sal_Unicode*) p = *__try_cast(val); + *(sal_Unicode*) p = *safe_cast(val); break; case typelib_TypeClass_BOOLEAN: if (bDefault) *(sal_Bool*) p = sal_False; else - *(sal_Bool*) p = *__try_cast(val); + *(sal_Bool*) p = *safe_cast(val); break; case typelib_TypeClass_BYTE: if (bDefault) *(sal_Int8*) p = 0; else - *(sal_Int8*) p = *__try_cast(val); + *(sal_Int8*) p = *safe_cast(val); break; case typelib_TypeClass_SHORT: if (bDefault) *(sal_Int16*) p = 0; else - *(sal_Int16*) p = *__try_cast(val); + *(sal_Int16*) p = *safe_cast(val); break; case typelib_TypeClass_UNSIGNED_SHORT: if (bDefault) *(sal_uInt16*) p = 0; else - *(sal_uInt16*) p = *__try_cast(val); + *(sal_uInt16*) p = *safe_cast(val); break; case typelib_TypeClass_LONG: if (bDefault) *(sal_Int32*) p = 0; else - *(sal_Int32*) p = *__try_cast(val); + *(sal_Int32*) p = *safe_cast(val); break; case typelib_TypeClass_UNSIGNED_LONG: if (bDefault) *(sal_uInt32*) p = 0; else - *(sal_uInt32*) p = *__try_cast(val); + *(sal_uInt32*) p = *safe_cast(val); break; case typelib_TypeClass_HYPER: if (bDefault) *(sal_Int64*) p = 0; else - *(sal_Int64*) p = *__try_cast(val); + *(sal_Int64*) p = *safe_cast(val); break; case typelib_TypeClass_UNSIGNED_HYPER: if (bDefault) *(sal_uInt64*) p = 0; else - *(sal_uInt64*) p= *__try_cast(val); + *(sal_uInt64*) p= *safe_cast(val); break; case typelib_TypeClass_FLOAT: if (bDefault) *(float*) p = 0.; else - *(float*) p = *__try_cast(val); + *(float*) p = *safe_cast(val); break; case typelib_TypeClass_DOUBLE: if (bDefault) *(double*) p = 0.; else - *(double*) p = *__try_cast(val); + *(double*) p = *safe_cast(val); break; default: { // ToDo enum, should be converted here @@ -1205,7 +1205,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data, buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("[map_to_uno():")); if (cliType) { - buf.append(mapCliString(cliType->get_FullName())); + buf.append(mapCliString(cliType->FullName)); buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(".")); buf.append(comp_td->ppMemberNames[nPos]); buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(" ")); @@ -1213,14 +1213,14 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data, buf.append(e.m_message); throw BridgeRuntimeError(buf.makeStringAndClear()); } - catch (System::InvalidCastException* ) + catch (System::InvalidCastException^ ) { bException= true; OUStringBuffer buf( 256 ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_uno():") ); if (cliType) { - buf.append(mapCliString(cliType->get_FullName())); + buf.append(mapCliString(cliType->FullName)); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(".")); buf.append(comp_td->ppMemberNames[nPos]); } @@ -1260,10 +1260,10 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data, auto_ptr< rtl_mem > seq; - System::Array* ar = NULL; - if (cli_data != NULL) + System::Array^ ar = nullptr; + if (cli_data != nullptr) { - ar = __try_cast(cli_data); + ar = safe_cast(cli_data); sal_Int32 nElements = ar->GetLength(0); try @@ -1272,74 +1272,74 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data, { case typelib_TypeClass_CHAR: seq = seq_allocate(nElements, sizeof (sal_Unicode)); - sri::Marshal::Copy(__try_cast(cli_data), 0, - & ((uno_Sequence*) seq.get())->elements, nElements); + sri::Marshal::Copy(safe_cast^>(cli_data), 0, + IntPtr(& ((uno_Sequence*) seq.get())->elements), nElements); break; case typelib_TypeClass_BOOLEAN: seq = seq_allocate(nElements, sizeof (sal_Bool)); - sri::Marshal::Copy(__try_cast(cli_data), 0, - & ((uno_Sequence*) seq.get())->elements, nElements); + sri::Marshal::Copy(safe_cast^>(cli_data), 0, + IntPtr(& ((uno_Sequence*) seq.get())->elements), nElements); break; case typelib_TypeClass_BYTE: seq = seq_allocate( nElements, sizeof (sal_Int8) ); - sri::Marshal::Copy(__try_cast(cli_data), 0, - & ((uno_Sequence*) seq.get())->elements, nElements); + sri::Marshal::Copy(safe_cast^>(cli_data), 0, + IntPtr(& ((uno_Sequence*) seq.get())->elements), nElements); break; case typelib_TypeClass_SHORT: seq = seq_allocate(nElements, sizeof (sal_Int16)); - sri::Marshal::Copy(__try_cast(cli_data), 0, - & ((uno_Sequence*) seq.get())->elements, nElements); + sri::Marshal::Copy(safe_cast^>(cli_data), 0, + IntPtr(& ((uno_Sequence*) seq.get())->elements), nElements); break; case typelib_TypeClass_UNSIGNED_SHORT: seq = seq_allocate( nElements, sizeof (sal_uInt16) ); - sri::Marshal::Copy(static_cast( - __try_cast(cli_data)), 0, - & ((uno_Sequence*) seq.get())->elements, nElements); + sri::Marshal::Copy(dynamic_cast^>( + safe_cast^>(cli_data)), 0, + IntPtr(& ((uno_Sequence*) seq.get())->elements), nElements); break; case typelib_TypeClass_LONG: seq = seq_allocate(nElements, sizeof (sal_Int32)); - sri::Marshal::Copy(__try_cast(cli_data), 0, - & ((uno_Sequence*) seq.get())->elements, nElements); + sri::Marshal::Copy(safe_cast^>(cli_data), 0, + IntPtr(& ((uno_Sequence*) seq.get())->elements), nElements); break; case typelib_TypeClass_UNSIGNED_LONG: seq = seq_allocate( nElements, sizeof (sal_uInt32) ); - sri::Marshal::Copy(static_cast( - __try_cast(cli_data)), 0, - & ((uno_Sequence*) seq.get())->elements, nElements); + sri::Marshal::Copy(dynamic_cast^>( + safe_cast^>(cli_data)), 0, + IntPtr(& ((uno_Sequence*) seq.get())->elements), nElements); break; case typelib_TypeClass_HYPER: seq = seq_allocate(nElements, sizeof (sal_Int64)); - sri::Marshal::Copy(__try_cast(cli_data), 0, - & ((uno_Sequence*) seq.get())->elements, nElements); + sri::Marshal::Copy(safe_cast^>(cli_data), 0, + IntPtr(& ((uno_Sequence*) seq.get())->elements), nElements); break; case typelib_TypeClass_UNSIGNED_HYPER: seq = seq_allocate(nElements, sizeof (sal_uInt64)); - sri::Marshal::Copy(static_cast( - __try_cast(cli_data)), 0, - & ((uno_Sequence*) seq.get())->elements, nElements); + sri::Marshal::Copy(dynamic_cast^>( + safe_cast^>(cli_data)), 0, + IntPtr(& ((uno_Sequence*) seq.get())->elements), nElements); break; case typelib_TypeClass_FLOAT: seq = seq_allocate(nElements, sizeof (float)); - sri::Marshal::Copy(__try_cast(cli_data), 0, - & ((uno_Sequence*) seq.get())->elements, nElements); + sri::Marshal::Copy(safe_cast^>(cli_data), 0, + IntPtr(& ((uno_Sequence*) seq.get())->elements), nElements); break; case typelib_TypeClass_DOUBLE: seq = seq_allocate(nElements, sizeof (double)); - sri::Marshal::Copy(__try_cast(cli_data), 0, - & ((uno_Sequence*) seq.get())->elements, nElements); + sri::Marshal::Copy(safe_cast^>(cli_data), 0, + IntPtr(& ((uno_Sequence*) seq.get())->elements), nElements); break; case typelib_TypeClass_STRING: { seq = seq_allocate(nElements, sizeof (rtl_uString*)); - System::String* arStr[]= __try_cast(cli_data); + array^ arStr= safe_cast^>(cli_data); for (int i= 0; i < nElements; i++) { - wchar_t const __pin * pdata= PtrToStringChars(arStr[i]); + pin_ptr pdata= PtrToStringChars(arStr[i]); rtl_uString** pStr= & ((rtl_uString**) & ((uno_Sequence*) seq.get())->elements)[i]; *pStr= NULL; rtl_uString_newFromStr_WithLength( pStr, pdata, - arStr[i]->get_Length()); + arStr[i]->Length); } break; } @@ -1367,7 +1367,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data, { void * p= ((uno_Sequence *) seq.get())->elements + (nPos * element_td.get()->nSize); - System::Object* elemData= dynamic_cast(cli_data)->GetValue(nPos); + System::Object^ elemData= dynamic_cast(cli_data)->GetValue(nPos); map_to_uno( p, elemData, element_td.get()->pWeakRef, false /* no assign */); @@ -1407,7 +1407,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data, buf.append(e.m_message); throw BridgeRuntimeError(buf.makeStringAndClear()); } - catch (System::InvalidCastException* ) + catch (System::InvalidCastException^ ) { // Ok, checked OUStringBuffer buf( 128 ); @@ -1443,7 +1443,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data, if (0 != p) (*p->release)( p ); } - if (0 == cli_data) // null-ref + if (nullptr == cli_data) // null-ref { *(uno_Interface **)uno_data = 0; } @@ -1467,7 +1467,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data, } } // BridgeRuntimeError are allowed to be thrown - catch (System::InvalidCastException* ) + catch (System::InvalidCastException^ ) { //ToDo check OUStringBuffer buf( 128 ); @@ -1476,12 +1476,12 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data, buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] could not convert type!") ); throw BridgeRuntimeError( buf.makeStringAndClear() ); } - catch (System::NullReferenceException * e) + catch (System::NullReferenceException ^ e) { OUStringBuffer buf(512); buf.appendAscii(RTL_CONSTASCII_STRINGPARAM( "[map_to_uno()] Illegal null reference passed!\n")); - buf.append(mapCliString(e->get_StackTrace())); + buf.append(mapCliString(e->StackTrace)); throw BridgeRuntimeError( buf.makeStringAndClear() ); } catch (BridgeRuntimeError& ) @@ -1510,50 +1510,50 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data, newly created object is passed in cli_data. */ void Bridge::map_to_cli( - System::Object* *cli_data, void const * uno_data, - typelib_TypeDescriptionReference * type, System::Type* info, + System::Object^ *cli_data, void const * uno_data, + typelib_TypeDescriptionReference * type, System::Type^ info, bool bDontCreateObj) const { switch (type->eTypeClass) { case typelib_TypeClass_CHAR: - *cli_data= __box(*(__wchar_t const*)uno_data); + *cli_data= *(__wchar_t const*)uno_data; break; case typelib_TypeClass_BOOLEAN: - *cli_data = __box((*(bool const*)uno_data) == sal_True ? true : false); + *cli_data = (*(bool const*)uno_data) == sal_True ? true : false; break; case typelib_TypeClass_BYTE: - *cli_data = __box(*(unsigned char const*) uno_data); + *cli_data = *(unsigned char const*) uno_data; break; case typelib_TypeClass_SHORT: - *cli_data= __box(*(short const*) uno_data); + *cli_data= *(short const*) uno_data; break; case typelib_TypeClass_UNSIGNED_SHORT: - *cli_data= __box(*(unsigned short const*) uno_data); + *cli_data= *(unsigned short const*) uno_data; break; case typelib_TypeClass_LONG: - *cli_data= __box(*(int const*) uno_data); + *cli_data= *(int const*) uno_data; break; case typelib_TypeClass_UNSIGNED_LONG: - *cli_data= __box(*(unsigned int const*) uno_data); + *cli_data= *(unsigned int const*) uno_data; break; case typelib_TypeClass_HYPER: - *cli_data= __box(*(__int64 const*) uno_data); + *cli_data= *(__int64 const*) uno_data; break; case typelib_TypeClass_UNSIGNED_HYPER: - *cli_data= __box(*(unsigned __int64 const*) uno_data); + *cli_data= *(unsigned __int64 const*) uno_data; break; case typelib_TypeClass_FLOAT: - *cli_data= __box(*(float const*) uno_data); + *cli_data= *(float const*) uno_data; break; case typelib_TypeClass_DOUBLE: - *cli_data= __box(*(double const*) uno_data); + *cli_data= *(double const*) uno_data; break; case typelib_TypeClass_STRING: { rtl_uString const* sVal= NULL; sVal= *(rtl_uString* const*) uno_data; - *cli_data= new System::String((__wchar_t*) sVal->buffer,0, sVal->length); + *cli_data= gcnew System::String((__wchar_t*) sVal->buffer,0, sVal->length); break; } case typelib_TypeClass_TYPE: @@ -1566,23 +1566,23 @@ void Bridge::map_to_cli( uno_Any const * pAny = (uno_Any const *)uno_data; if (typelib_TypeClass_VOID != pAny->pType->eTypeClass) { - System::Object* objCli= NULL; + System::Object^ objCli= nullptr; map_to_cli( - &objCli, pAny->pData, pAny->pType, 0, + &objCli, pAny->pData, pAny->pType, nullptr, false); uno::Any anyVal(mapUnoType(pAny->pType), objCli); - *cli_data= __box(anyVal); + *cli_data= anyVal; } else { // void any - *cli_data= __box(uno::Any::VOID); + *cli_data= uno::Any::VOID; } break; } case typelib_TypeClass_ENUM: { - if (info != NULL) + if (info != nullptr) { OSL_ASSERT(info->get_IsByRef()); info= info->GetElementType(); @@ -1605,19 +1605,19 @@ void Bridge::map_to_cli( //create the type - System::Type* cliType= loadCliType(td.get()->pTypeName); + System::Type^ cliType= loadCliType(td.get()->pTypeName); //detect if we recursivly convert inherited structures //If this point is reached because of a recursive call during convering a //struct then we must not create a new object rather we use the one in // cli_data argument. - System::Object* cliObj; + System::Object^ cliObj; if (bDontCreateObj) cliObj = *cli_data; // recursive call else { //Special handling for Exception conversion. We must call constructor System::Exception //to pass the message string - if (__typeof(ucss::uno::Exception)->IsAssignableFrom(cliType)) + if (ucss::uno::Exception::typeid->IsAssignableFrom(cliType)) { //We need to get the Message field. Therefore we must obtain the offset from //the typedescription. The base interface of all exceptions is @@ -1643,20 +1643,20 @@ void Bridge::map_to_cli( OSL_ASSERT (nPos != -1); int offset = pCTD->pMemberOffsets[nPos]; //Whith the offset within the exception we can get the message string - System::String* sMessage = mapUnoString(*(rtl_uString**) + System::String^ sMessage = mapUnoString(*(rtl_uString**) ((char*) uno_data + offset)); //We need to find a constructor for the exception that takes the message string //We assume that the first argument is the message string - sr::ConstructorInfo* arCtorInfo[] = cliType->GetConstructors(); - sr::ConstructorInfo* ctorInfo = NULL; - int numCtors = arCtorInfo->get_Length(); + array^ arCtorInfo = cliType->GetConstructors(); + sr::ConstructorInfo^ ctorInfo = nullptr; + int numCtors = arCtorInfo->Length; //Constructor must at least have 2 params for the base //unoidl.com.sun.star.uno.Exception (String, Object); - sr::ParameterInfo * arParamInfo[]; + array^ arParamInfo; for (int i = 0; i < numCtors; i++) { arParamInfo = arCtorInfo[i]->GetParameters(); - if (arParamInfo->get_Length() < 2) + if (arParamInfo->Length < 2) continue; ctorInfo = arCtorInfo[i]; break; @@ -1666,8 +1666,8 @@ void Bridge::map_to_cli( && arParamInfo[0]->get_Position() == 0 && arParamInfo[1]->get_Position() == 1); //Prepare parameters for constructor - int numArgs = arParamInfo->get_Length(); - System::Object * args[] = new System::Object*[numArgs]; + int numArgs = arParamInfo->Length; + array^ args = gcnew array(numArgs); //only initialize the first argument with the message args[0] = sMessage; cliObj = ctorInfo->Invoke(args); @@ -1684,15 +1684,15 @@ void Bridge::map_to_cli( // cliObj is used by the callee instead of a newly created struct map_to_cli( &cliObj, uno_data, - ((typelib_TypeDescription *)comp_td->pBaseTypeDescription)->pWeakRef, 0, + ((typelib_TypeDescription *)comp_td->pBaseTypeDescription)->pWeakRef, nullptr, true); } rtl::OUString usUnoException(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.Exception")); for (sal_Int32 nPos = comp_td->nMembers; nPos--; ) { typelib_TypeDescriptionReference * member_type = comp_td->ppTypeRefs[ nPos ]; - System::String* sMemberName= mapUnoString(comp_td->ppMemberNames[nPos]); - sr::FieldInfo* aField= cliType->GetField(sMemberName); + System::String^ sMemberName= mapUnoString(comp_td->ppMemberNames[nPos]); + sr::FieldInfo^ aField= cliType->GetField(sMemberName); // special case for Exception.Message. The field has already been // set while constructing cli object if ( ! aField && usUnoException.equals(td.get()->pTypeName)) @@ -1703,43 +1703,43 @@ void Bridge::map_to_cli( switch (member_type->eTypeClass) { case typelib_TypeClass_CHAR: - aField->SetValue(cliObj, __box(*(System::Char*) p)); + aField->SetValue(cliObj, *(System::Char*) p); break; case typelib_TypeClass_BOOLEAN: - aField->SetValue(cliObj, __box(*(System::Boolean*) p)); + aField->SetValue(cliObj, *(System::Boolean*) p); break; case typelib_TypeClass_BYTE: - aField->SetValue(cliObj, __box(*(System::Byte*) p)); + aField->SetValue(cliObj, *(System::Byte*) p); break; case typelib_TypeClass_SHORT: - aField->SetValue(cliObj, __box(*(System::Int16*) p)); + aField->SetValue(cliObj, *(System::Int16*) p); break; case typelib_TypeClass_UNSIGNED_SHORT: - aField->SetValue(cliObj, __box(*(System::UInt16*) p)); + aField->SetValue(cliObj, *(System::UInt16*) p); break; case typelib_TypeClass_LONG: - aField->SetValue(cliObj, __box(*(System::Int32*) p)); + aField->SetValue(cliObj, *(System::Int32*) p); break; case typelib_TypeClass_UNSIGNED_LONG: - aField->SetValue(cliObj, __box(*(System::UInt32*) p)); + aField->SetValue(cliObj, *(System::UInt32*) p); break; case typelib_TypeClass_HYPER: - aField->SetValue(cliObj, __box(*(System::Int64*) p)); + aField->SetValue(cliObj, *(System::Int64*) p); break; case typelib_TypeClass_UNSIGNED_HYPER: - aField->SetValue(cliObj, __box(*(System::UInt64*) p)); + aField->SetValue(cliObj, *(System::UInt64*) p); break; case typelib_TypeClass_FLOAT: - aField->SetValue(cliObj, __box(*(System::Single*) p)); + aField->SetValue(cliObj, *(System::Single*) p); break; case typelib_TypeClass_DOUBLE: - aField->SetValue(cliObj, __box(*(System::Double*) p)); + aField->SetValue(cliObj, *(System::Double*) p); break; default: { - System::Object* cli_val; + System::Object^ cli_val; map_to_cli( - &cli_val, p, member_type, 0, + &cli_val, p, member_type, nullptr, false); aField->SetValue(cliObj, cli_val); break; @@ -1764,97 +1764,98 @@ void Bridge::map_to_cli( { case typelib_TypeClass_CHAR: { - System::Char arChar[]= new System::Char[nElements]; - sri::Marshal::Copy( (void*) &seq->elements, arChar, 0, nElements); + array^ arChar= gcnew array(nElements); + sri::Marshal::Copy( IntPtr((void*) &seq->elements), arChar, 0, nElements); *cli_data= arChar; break; } case typelib_TypeClass_BOOLEAN: { - System::Boolean arBool[]= new System::Boolean[nElements]; - sri::Marshal::Copy( (void*) &seq->elements, arBool, 0, nElements); - *cli_data= arBool; + array^ arBool= gcnew array(nElements); + sri::Marshal::Copy( IntPtr((void*) &seq->elements), arBool, 0, nElements); + *cli_data= dynamic_cast^>(arBool); break; } case typelib_TypeClass_BYTE: { - System::Byte arByte[]= new System::Byte[nElements]; - sri::Marshal::Copy( (void*) &seq->elements, arByte, 0, nElements); + array^ arByte= gcnew array(nElements); + sri::Marshal::Copy( IntPtr((void*) &seq->elements), arByte, 0, nElements); *cli_data= arByte; break; } case typelib_TypeClass_SHORT: { - System::Int16 arShort[]= new System::Int16[nElements]; - sri::Marshal::Copy( (void*) &seq->elements, arShort, 0, nElements); + array^ arShort= gcnew array(nElements); + sri::Marshal::Copy( IntPtr((void*) &seq->elements), arShort, 0, nElements); *cli_data= arShort; break; } case typelib_TypeClass_UNSIGNED_SHORT: { - System::UInt16 arUInt16[]= new System::UInt16[nElements]; - sri::Marshal::Copy( (void*) &seq->elements, static_cast(arUInt16), + array^ arUInt16= gcnew array(nElements); + sri::Marshal::Copy( IntPtr((void*) &seq->elements), dynamic_cast^>(arUInt16), 0, nElements); *cli_data= arUInt16; break; } case typelib_TypeClass_LONG: { - System::Int32 arInt32[]= new System::Int32[nElements]; - sri::Marshal::Copy( (void*) &seq->elements, arInt32, 0, nElements); + array^ arInt32= gcnew array(nElements); + sri::Marshal::Copy( IntPtr((void*) &seq->elements), arInt32, 0, nElements); *cli_data= arInt32; break; } case typelib_TypeClass_UNSIGNED_LONG: { - System::UInt32 arUInt32[]= new System::UInt32[nElements]; - sri::Marshal::Copy( (void*) &seq->elements, static_cast(arUInt32), + array^ arUInt32= gcnew array(nElements); + sri::Marshal::Copy( IntPtr((void*) &seq->elements), dynamic_cast^>(arUInt32), 0, nElements); *cli_data= arUInt32; break; } case typelib_TypeClass_HYPER: { - System::Int64 arInt64[]= new System::Int64[nElements]; - sri::Marshal::Copy( (void*) &seq->elements, arInt64, 0, nElements); + array^ arInt64= gcnew array(nElements); + sri::Marshal::Copy( IntPtr((void*) &seq->elements), arInt64, 0, nElements); *cli_data= arInt64; break; } + //FIXME: Marshal::Copy of UInt64? case typelib_TypeClass_UNSIGNED_HYPER: { - System::UInt64 arUInt64[]= new System::UInt64[nElements]; - sri::Marshal::Copy( (void*) &seq->elements, arUInt64, 0, nElements); - *cli_data= arUInt64; + array^ arUInt64= gcnew array(nElements); + sri::Marshal::Copy( IntPtr((void*) &seq->elements), arUInt64, 0, nElements); + *cli_data= dynamic_cast^>(arUInt64); break; } case typelib_TypeClass_FLOAT: { - System::Single arSingle[]= new System::Single[nElements]; - sri::Marshal::Copy( (void*) &seq->elements, arSingle, 0, nElements); + array^ arSingle= gcnew array(nElements); + sri::Marshal::Copy( IntPtr((void*) &seq->elements), arSingle, 0, nElements); *cli_data= arSingle; break; } case typelib_TypeClass_DOUBLE: { - System::Double arDouble[]= new System::Double[nElements]; - sri::Marshal::Copy( (void*) &seq->elements, arDouble, 0, nElements); + array^ arDouble= gcnew array(nElements); + sri::Marshal::Copy( IntPtr((void*) &seq->elements), arDouble, 0, nElements); *cli_data= arDouble; break; } case typelib_TypeClass_STRING: { - System::String* arString[]= new System::String*[nElements]; + array^ arString= gcnew array(nElements); for (int i= 0; i < nElements; i++) { rtl_uString *aStr= ((rtl_uString**)(&seq->elements))[i]; - arString[i]= new System::String( (__wchar_t *) &aStr->buffer, 0, aStr->length); + arString[i]= gcnew System::String( (__wchar_t *) &aStr->buffer, 0, aStr->length); } *cli_data= arString; break; } case typelib_TypeClass_TYPE: { - System::Type* arType[]= new System::Type*[nElements]; + array^ arType= gcnew array(nElements); for (int i= 0; i < nElements; i++) { arType[i]= @@ -1865,14 +1866,14 @@ void Bridge::map_to_cli( } case typelib_TypeClass_ANY: { - uno::Any arCli[]= new uno::Any[nElements]; + array^ arCli= gcnew array(nElements); uno_Any const * p = (uno_Any const *)seq->elements; for (sal_Int32 nPos = 0; nPos < nElements; ++nPos ) { - System::Object* cli_obj = NULL; + System::Object^ cli_obj = nullptr; map_to_cli( - &cli_obj, &p[ nPos ], element_type, 0, false); - arCli[nPos]= *__try_cast<__box uno::Any*>(cli_obj); + &cli_obj, &p[ nPos ], element_type, nullptr, false); + arCli[nPos]= *safe_cast(cli_obj); } *cli_data= arCli; break; @@ -1880,8 +1881,8 @@ void Bridge::map_to_cli( case typelib_TypeClass_ENUM: { //get the Enum type - System::Type* enumType= NULL; - if (info != NULL) + System::Type^ enumType= nullptr; + if (info != nullptr) { //info is EnumType[]&, remove & OSL_ASSERT(info->IsByRef); @@ -1892,7 +1893,7 @@ void Bridge::map_to_cli( else enumType= mapUnoType(element_type); - System::Array* arEnum = System::Array::CreateInstance( + System::Array^ arEnum = System::Array::CreateInstance( enumType, nElements); for (int i= 0; i < nElements; i++) { @@ -1906,7 +1907,7 @@ void Bridge::map_to_cli( case typelib_TypeClass_EXCEPTION: { TypeDescr element_td( element_type ); - System::Array* ar= System::Array::CreateInstance( + System::Array^ ar= System::Array::CreateInstance( mapUnoType(element_type),nElements); if (0 < nElements) { @@ -1915,9 +1916,9 @@ void Bridge::map_to_cli( sal_Int32 nSize = element_td.get()->nSize; for ( sal_Int32 nPos = 0; nPos < nElements; ++nPos ) { - System::Object* val; + System::Object^ val; map_to_cli( - &val, p + (nSize * nPos), element_type, 0, false); + &val, p + (nSize * nPos), element_type, nullptr, false); ar->SetValue(val, nPos); } } @@ -1927,7 +1928,7 @@ void Bridge::map_to_cli( // ToDo, verify case typelib_TypeClass_SEQUENCE: { - System::Array *ar= System::Array::CreateInstance( + System::Array ^ar= System::Array::CreateInstance( mapUnoType(element_type), nElements); if (0 < nElements) { @@ -1935,9 +1936,9 @@ void Bridge::map_to_cli( uno_Sequence ** elements = (uno_Sequence**) seq->elements; for ( sal_Int32 nPos = 0; nPos < nElements; ++nPos ) { - System::Object* val; + System::Object^ val; map_to_cli( - &val, &elements[nPos], element_type, 0, false); + &val, &elements[nPos], element_type, nullptr, false); ar->SetValue(val, nPos); } } @@ -1947,16 +1948,16 @@ void Bridge::map_to_cli( case typelib_TypeClass_INTERFACE: { TypeDescr element_td( element_type ); - System::Type * ifaceType= mapUnoType(element_type); - System::Array* ar= System::Array::CreateInstance(ifaceType, nElements); + System::Type ^ ifaceType= mapUnoType(element_type); + System::Array^ ar= System::Array::CreateInstance(ifaceType, nElements); char * p = (char *)seq->elements; sal_Int32 nSize = element_td.get()->nSize; for ( sal_Int32 nPos = 0; nPos < nElements; ++nPos ) { - System::Object* val; + System::Object^ val; map_to_cli( - &val, p + (nSize * nPos), element_type, NULL, false); + &val, p + (nSize * nPos), element_type, nullptr, false); ar->SetValue(val, nPos); } @@ -1985,7 +1986,7 @@ void Bridge::map_to_cli( typelib_InterfaceTypeDescription*>(td.get())) ; } else - *cli_data= NULL; + *cli_data= nullptr; break; } default: diff --git a/cli_ure/source/uno_bridge/cli_environment.cxx b/cli_ure/source/uno_bridge/cli_environment.cxx index 165bcc5e2bbd..28149b921255 100644 --- a/cli_ure/source/uno_bridge/cli_environment.cxx +++ b/cli_ure/source/uno_bridge/cli_environment.cxx @@ -19,7 +19,6 @@ #include "Cli_environment.h" -#using #using #using #include "osl/diagnose.h" @@ -35,9 +34,9 @@ using namespace System::Threading; namespace cli_uno { -inline System::String* Cli_environment::createKey(System::String* oid, System::Type* t) +inline System::String^ Cli_environment::createKey(System::String^ oid, System::Type^ t) { - return System::String::Concat(oid, t->get_FullName()); + return System::String::Concat(oid, t->FullName); } @@ -55,8 +54,8 @@ Cli_environment::~Cli_environment() } -System::Object* Cli_environment::registerInterface( - System::Object* obj, System::String* oid) +System::Object^ Cli_environment::registerInterface( + System::Object^ obj, System::String^ oid) { #if OSL_DEBUG_LEVEL >= 1 //obj must be a transparent proxy @@ -64,27 +63,27 @@ System::Object* Cli_environment::registerInterface( _numRegisteredObjects ++; #endif OSL_ASSERT( ! m_objects->ContainsKey(oid)); - m_objects->Add(oid, new WeakReference(obj)); + m_objects->Add(oid, gcnew WeakReference(obj)); return obj; } -System::Object* Cli_environment::registerInterface ( - System::Object* obj, System::String* oid, System::Type* type) +System::Object^ Cli_environment::registerInterface ( + System::Object^ obj, System::String^ oid, System::Type^ type) { #if OSL_DEBUG_LEVEL >= 1 //obj must be a real cli object OSL_ASSERT( ! RemotingServices::IsTransparentProxy(obj)); _numRegisteredObjects ++; #endif - System::String* key = createKey(oid, type); + System::String^ key = createKey(oid, type); //see synchronization in map_uno2cli in cli_data.cxx OSL_ASSERT( ! m_objects->ContainsKey(key)); - m_objects->Add(key, new WeakReference(obj)); + m_objects->Add(key, gcnew WeakReference(obj)); return obj; } -void Cli_environment::revokeInterface(System::String* oid, System::Type* type) +void Cli_environment::revokeInterface(System::String^ oid, System::Type^ type) { - System::String* key = type != NULL ? createKey(oid, type) : oid; + System::String^ key = type != nullptr ? createKey(oid, type) : oid; #if OSL_DEBUG_LEVEL >= 1 _numRegisteredObjects --; #endif @@ -103,55 +102,55 @@ void Cli_environment::revokeInterface(System::String* oid, System::Type* type) m_objects->Remove(key); } -inline void Cli_environment::revokeInterface(System::String* oid) +inline void Cli_environment::revokeInterface(System::String^ oid) { - return revokeInterface(oid, NULL); + return revokeInterface(oid, nullptr); } -System::Object* Cli_environment::getRegisteredInterface(System::String* oid, - System::Type* type) +System::Object^ Cli_environment::getRegisteredInterface(System::String^ oid, + System::Type^ type) { //try if it is a UNO interface - System::Object* ret = NULL; - ret = m_objects->get_Item(oid); + System::Object^ ret = nullptr; + ret = m_objects[oid]; if (! ret) { //try if if it is a proxy for a cli object oid = createKey(oid, type); - ret = m_objects->get_Item( oid ); + ret = m_objects[ oid ]; } - if (ret != 0) + if (ret != nullptr) { - System::WeakReference* weakIface = - static_cast< System::WeakReference * >( ret ); + System::WeakReference^ weakIface = + static_cast< System::WeakReference ^ >( ret ); ret = weakIface->Target; } - if (ret == 0) + if (ret == nullptr) m_objects->Remove( oid ); return ret; } -System::String* Cli_environment::getObjectIdentifier(System::Object* obj) +System::String^ Cli_environment::getObjectIdentifier(System::Object^ obj) { - System::String* oId= 0; - RealProxy* aProxy= RemotingServices::GetRealProxy(obj); + System::String^ oId= nullptr; + RealProxy^ aProxy= RemotingServices::GetRealProxy(obj); if (aProxy) { - UnoInterfaceProxy* proxyImpl= dynamic_cast(aProxy); + UnoInterfaceProxy^ proxyImpl= dynamic_cast(aProxy); if (proxyImpl) oId= proxyImpl->getOid(); } - if (oId == 0) + if (oId == nullptr) { - StringBuilder * buf= new StringBuilder(256); - bool bFirst = false; - System::Threading::Monitor::Enter(__typeof(Cli_environment)); + StringBuilder ^ buf= gcnew StringBuilder(256); + bool bFirst = new bool(false); + System::Threading::Monitor::Enter(Cli_environment::typeid); try { - buf->Append(m_IDGen->GetId(obj, & bFirst)); - } __finally + buf->Append(m_IDGen->GetId(obj, bFirst)); + } finally { - System::Threading::Monitor::Exit(__typeof(Cli_environment)); + System::Threading::Monitor::Exit(Cli_environment::typeid); } buf->Append(sOidPart); diff --git a/cli_ure/source/uno_bridge/cli_environment.h b/cli_ure/source/uno_bridge/cli_environment.h index 683ad84a6081..d04a92bcf194 100644 --- a/cli_ure/source/uno_bridge/cli_environment.h +++ b/cli_ure/source/uno_bridge/cli_environment.h @@ -21,7 +21,6 @@ #define INCLUDED_CLI_ENVIRONMENT_H #include "cli_base.h" -#using using namespace System; using namespace System::Collections; @@ -30,12 +29,12 @@ using namespace System::Runtime::Serialization; namespace cli_uno { -public __gc class Cli_environment +public ref class Cli_environment { - static System::String* sOidPart; - static Hashtable* m_objects; - static System::Runtime::Serialization::ObjectIDGenerator* m_IDGen; - inline static System::String* createKey(System::String* oid, System::Type* t); + static System::String^ sOidPart; + static Hashtable^ m_objects; + static System::Runtime::Serialization::ObjectIDGenerator^ m_IDGen; + inline static System::String^ createKey(System::String^ oid, System::Type^ t); #if OSL_DEBUG_LEVEL >= 1 int _numRegisteredObjects; @@ -45,11 +44,11 @@ public: static Cli_environment() { - m_objects = Hashtable::Synchronized(new Hashtable()); - m_IDGen = new System::Runtime::Serialization::ObjectIDGenerator(); - System::Text::StringBuilder* buffer = new System::Text::StringBuilder(256); + m_objects = Hashtable::Synchronized(gcnew Hashtable()); + m_IDGen = gcnew System::Runtime::Serialization::ObjectIDGenerator(); + System::Text::StringBuilder^ buffer = gcnew System::Text::StringBuilder(256); Guid gd = Guid::NewGuid(); - buffer->Append(S";cli[0];"); + buffer->Append(";cli[0];"); buffer->Append(gd.ToString()); sOidPart = buffer->ToString(); } @@ -63,21 +62,21 @@ public: cli object is represents all interfaces of the UNO object. Therefore the object can be registered only with its OID; a type is not necessary. */ - Object* registerInterface(Object* obj, System::String* oid); + Object^ registerInterface(Object^ obj, System::String^ oid); /** Registers a CLI object as being mapped by this bridge. The resulting object represents exactly one UNO interface. */ - Object* registerInterface(Object* obj, System::String* oid, System::Type* type); + Object^ registerInterface(Object^ obj, System::String^ oid, System::Type^ type); /** By revoking an interface it is declared that the respective interface has not been mapped. The proxy implementations call revoke interface in their destructors. */ - inline void revokeInterface(System::String* oid); + inline void revokeInterface(System::String^ oid); - void revokeInterface(System::String* oid, System::Type* type); + void revokeInterface(System::String^ oid, System::Type^ type); /** * Retrieves an interface identified by its object id and type from this * environment. @@ -86,7 +85,7 @@ public: * @param type the type description of the interface to be retrieved * @see com.sun.star.uno.IEnvironment#getRegisteredInterface */ - Object* getRegisteredInterface(System::String* oid, System::Type* type); + Object^ getRegisteredInterface(System::String^ oid, System::Type^ type); /** * Generates a worldwide unique object identifier (oid) for the given object. It is @@ -96,7 +95,7 @@ public: * @return the generated oid. * @param object the object for which a Oid should be generated. */ - static System::String* getObjectIdentifier(Object* obj); + static System::String^ getObjectIdentifier(Object^ obj); }; diff --git a/cli_ure/source/uno_bridge/cli_proxy.cxx b/cli_ure/source/uno_bridge/cli_proxy.cxx index 2fd70fc5ede3..1e6ede2f78b6 100644 --- a/cli_ure/source/uno_bridge/cli_proxy.cxx +++ b/cli_ure/source/uno_bridge/cli_proxy.cxx @@ -25,7 +25,6 @@ #include "cli_base.h" #include "cli_bridge.h" -#using #using #using @@ -111,16 +110,16 @@ UnoInterfaceProxy::UnoInterfaceProxy( uno_Interface * pUnoI, typelib_InterfaceTypeDescription* pTD, const OUString& oid ) - :RealProxy(__typeof(MarshalByRefObject)), + :RealProxy(MarshalByRefObject::typeid), m_bridge(bridge), m_oid(mapUnoString(oid.pData)), m_sTypeName(m_system_Object_String) { m_bridge->acquire(); // create the list that holds all UnoInterfaceInfos - m_listIfaces = new ArrayList(10); + m_listIfaces = gcnew ArrayList(10); m_numUnoIfaces = 0; - m_listAdditionalProxies = new ArrayList(); + m_listAdditionalProxies = gcnew ArrayList(); m_nlistAdditionalProxies = 0; //put the information of the first UNO interface into the arraylist #if OSL_DEBUG_LEVEL >= 2 @@ -148,15 +147,15 @@ UnoInterfaceProxy::~UnoInterfaceProxy() } -System::Object* UnoInterfaceProxy::create( +System::Object^ UnoInterfaceProxy::create( Bridge * bridge, uno_Interface * pUnoI, typelib_InterfaceTypeDescription* pTD, const OUString& oid) { - UnoInterfaceProxy* proxyHandler= - new UnoInterfaceProxy(bridge, pUnoI, pTD, oid); - System::Object* proxy= proxyHandler->GetTransparentProxy(); + UnoInterfaceProxy^ proxyHandler= + gcnew UnoInterfaceProxy(bridge, pUnoI, pTD, oid); + System::Object^ proxy= proxyHandler->GetTransparentProxy(); CliEnvHolder::g_cli_env->registerInterface(proxy, mapUnoString(oid.pData)); return proxy; } @@ -165,13 +164,13 @@ System::Object* UnoInterfaceProxy::create( void UnoInterfaceProxy::addUnoInterface(uno_Interface* pUnoI, typelib_InterfaceTypeDescription* pTd) { - sc::IEnumerator* enumInfos = m_listIfaces->GetEnumerator(); + sc::IEnumerator^ enumInfos = m_listIfaces->GetEnumerator(); System::Threading::Monitor::Enter(this); try { while (enumInfos->MoveNext()) { - UnoInterfaceInfo* info = static_cast( + UnoInterfaceInfo^ info = static_cast( enumInfos->Current); #if OSL_DEBUG_LEVEL > 1 System::Type * t1; @@ -193,7 +192,7 @@ void UnoInterfaceProxy::addUnoInterface(uno_Interface* pUnoI, m_bridge->m_uno_env, reinterpret_cast< void ** >( &pUnoI ), oid.pData, pTd); //This proxy does not contain the uno_Interface. Add it. - m_listIfaces->Add(new UnoInterfaceInfo(m_bridge, pUnoI, pTd)); + m_listIfaces->Add(gcnew UnoInterfaceInfo(m_bridge, pUnoI, pTd)); m_numUnoIfaces = m_listIfaces->Count; #if OSL_DEBUG_LEVEL >= 2 System::String * sInterfaceName = static_cast( @@ -222,34 +221,34 @@ void UnoInterfaceProxy::addUnoInterface(uno_Interface* pUnoI, // IRemotingTypeInfo -bool UnoInterfaceProxy::CanCastTo(System::Type* fromType, - System::Object*) +bool UnoInterfaceProxy::CanCastTo(System::Type^ fromType, + System::Object^) { - if (fromType == __typeof(System::Object)) // trivial case + if (fromType == System::Object::typeid) // trivial case return true; System::Threading::Monitor::Enter(this); try { - if (0 != findInfo( fromType )) // proxy supports demanded interface + if (nullptr != findInfo( fromType )) // proxy supports demanded interface return true; //query an uno interface for the required type // we use the first interface in the list (m_listIfaces) to make // the queryInterface call - UnoInterfaceInfo* info = - static_cast(m_listIfaces->get_Item(0)); + UnoInterfaceInfo^ info = + static_cast(m_listIfaces[0]); css::uno::TypeDescription membertd( reinterpret_cast( info->m_typeDesc)->ppAllMembers[0]); - System::Object *args[] = new System::Object*[1]; + array^ args = gcnew array(1); args[0] = fromType; - __box uno::Any * pAny; - System::Object* pException = NULL; + uno::Any ^ pAny; + System::Object^ pException = nullptr; - pAny= static_cast<__box uno::Any *>( + pAny= static_cast( m_bridge->call_uno( info->m_unoI, membertd.get(), @@ -258,7 +257,7 @@ bool UnoInterfaceProxy::CanCastTo(System::Type* fromType, 1, ((typelib_InterfaceMethodTypeDescription*) membertd.get())->pParams, - args, NULL, &pException) ); + args, nullptr, &pException) ); // handle regular exception from target OSL_ENSURE( @@ -267,9 +266,9 @@ bool UnoInterfaceProxy::CanCastTo(System::Type* fromType, mapCliString( pException->ToString()), RTL_TEXTENCODING_UTF8 ).getStr() ); - if (pAny->Type != __typeof (void)) // has value? + if (pAny->Type != void::typeid) // has value? { - if (0 != findInfo( fromType )) + if (nullptr != findInfo( fromType )) { // proxy now supports demanded interface return true; @@ -279,12 +278,12 @@ bool UnoInterfaceProxy::CanCastTo(System::Type* fromType, // and interface with a different oid. // That way, this type is supported for the CLI // interpreter (CanCastTo() returns true) - ::System::Object * obj = pAny->Value; + ::System::Object ^ obj = pAny->Value; OSL_ASSERT( srr::RemotingServices::IsTransparentProxy( obj ) ); if (srr::RemotingServices::IsTransparentProxy( obj )) { - UnoInterfaceProxy * proxy = - static_cast< UnoInterfaceProxy * >( + UnoInterfaceProxy ^ proxy = + static_cast< UnoInterfaceProxy ^ >( srr::RemotingServices::GetRealProxy( obj ) ); OSL_ASSERT( 0 != proxy->findInfo( fromType ) ); m_listAdditionalProxies->Add( proxy ); @@ -301,13 +300,13 @@ bool UnoInterfaceProxy::CanCastTo(System::Type* fromType, OUStringToOString( e.m_message, RTL_TEXTENCODING_UTF8 ).getStr() ); } - catch (System::Exception* e) + catch (System::Exception^ e) { - System::String* msg= new System::String( - S"An unexpected CLI exception occurred in " - S"UnoInterfaceProxy::CanCastTo(). Original" - S"message: \n"); - msg= System::String::Concat(msg, e->get_Message()); + System::String^ msg= gcnew System::String( + "An unexpected CLI exception occurred in " + "UnoInterfaceProxy::CanCastTo(). Original" + "message: \n"); + msg= System::String::Concat(msg, e->Message); OSL_FAIL( OUStringToOString( mapCliString(msg), RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -325,57 +324,57 @@ bool UnoInterfaceProxy::CanCastTo(System::Type* fromType, return false; } -srrm::IMessage* UnoInterfaceProxy::invokeObject( - sc::IDictionary* props, - srrm::LogicalCallContext* context, - srrm::IMethodCallMessage* mcm) +srrm::IMessage^ UnoInterfaceProxy::invokeObject( + sc::IDictionary^ props, + srrm::LogicalCallContext^ context, + srrm::IMethodCallMessage^ mcm) { - System::Object* retMethod = 0; - System::String* sMethod = static_cast - (props->get_Item(m_methodNameString)); - System::Object* args[] = static_cast( - props->get_Item(m_ArgsString)); + System::Object^ retMethod = nullptr; + System::String^ sMethod = static_cast + (props[m_methodNameString]); + array^ args = static_cast^>( + props[m_ArgsString]); if (m_Equals_String->Equals(sMethod)) { // Object.Equals OSL_ASSERT(args->get_Length() == 1); - srrp::RealProxy* rProxy = srr::RemotingServices::GetRealProxy(args[0]); + srrp::RealProxy^ rProxy = srr::RemotingServices::GetRealProxy(args[0]); bool bDone = false; if (rProxy) { - UnoInterfaceProxy* unoProxy = - dynamic_cast(rProxy); + UnoInterfaceProxy^ unoProxy = + dynamic_cast(rProxy); if (unoProxy) { bool b = m_oid->Equals(unoProxy->getOid()); - retMethod = __box(b); + retMethod = b; bDone = true; } } if (bDone == false) { //no proxy or not our proxy, therefore Equals must be false - retMethod = __box(false); + retMethod = false; } } else if (m_GetHashCode_String->Equals(sMethod)) { // Object.GetHashCode int nHash = m_oid->GetHashCode(); - retMethod = __box(nHash); + retMethod = nHash; } else if (m_GetType_String->Equals(sMethod)) { // Object.GetType - retMethod = __typeof(System::Object); + retMethod = System::Object::typeid; } else if (m_ToString_String->Equals(sMethod)) { // Object.ToString - st::StringBuilder* sb = new st::StringBuilder(256); + st::StringBuilder^ sb = gcnew st::StringBuilder(256); // sb->AppendFormat(S"Uno object proxy. Implemented interface: {0}" // S". OID: {1}", m_type->ToString(), m_oid); - sb->AppendFormat(S"Uno object proxy. OID: {0}", m_oid); + sb->AppendFormat("Uno object proxy. OID: {0}", m_oid); retMethod = sb->ToString(); } else @@ -384,46 +383,46 @@ srrm::IMessage* UnoInterfaceProxy::invokeObject( //which should not be possible OSL_ASSERT(0); } - srrm::IMessage* retVal= new srrm::ReturnMessage( - retMethod, new System::Object*[0], 0, context, mcm); + srrm::IMessage^ retVal= gcnew srrm::ReturnMessage( + retMethod, gcnew array(0), 0, context, mcm); return retVal; } -UnoInterfaceInfo * UnoInterfaceProxy::findInfo( ::System::Type * type ) +UnoInterfaceInfo ^ UnoInterfaceProxy::findInfo( ::System::Type ^ type ) { for (int i = 0; i < m_numUnoIfaces; i++) { - UnoInterfaceInfo* tmpInfo = static_cast( - m_listIfaces->get_Item(i)); + UnoInterfaceInfo^ tmpInfo = static_cast( + m_listIfaces[i]); if (type->IsAssignableFrom(tmpInfo->m_type)) return tmpInfo; } for ( int i = 0; i < m_nlistAdditionalProxies; ++i ) { - UnoInterfaceProxy * proxy = - static_cast< UnoInterfaceProxy * >( - m_listAdditionalProxies->get_Item( i ) ); - UnoInterfaceInfo * info = proxy->findInfo( type ); - if (0 != info) + UnoInterfaceProxy ^ proxy = + static_cast< UnoInterfaceProxy ^ >( + m_listAdditionalProxies[ i ] ); + UnoInterfaceInfo ^ info = proxy->findInfo( type ); + if (nullptr != info) return info; } - return 0; + return nullptr; } -srrm::IMessage* UnoInterfaceProxy::Invoke(srrm::IMessage* callmsg) +srrm::IMessage^ UnoInterfaceProxy::Invoke(srrm::IMessage^ callmsg) { try { - sc::IDictionary* props= callmsg->Properties; - srrm::LogicalCallContext* context= - static_cast( - props->get_Item(m_CallContextString)); - srrm::IMethodCallMessage* mcm= - static_cast(callmsg); + sc::IDictionary^ props= callmsg->Properties; + srrm::LogicalCallContext^ context= + static_cast( + props[m_CallContextString]); + srrm::IMethodCallMessage^ mcm= + static_cast(callmsg); //Find out which UNO interface is being called - System::String* sTypeName = static_cast( - props->get_Item(m_typeNameString)); + System::String^ sTypeName = static_cast( + props[m_typeNameString]); sTypeName = sTypeName->Substring(0, sTypeName->IndexOf(',')); // Special Handling for System.Object methods @@ -432,14 +431,14 @@ srrm::IMessage* UnoInterfaceProxy::Invoke(srrm::IMessage* callmsg) return invokeObject(props, context, mcm); } - System::Type* typeBeingCalled = loadCliType(sTypeName); - UnoInterfaceInfo* info = findInfo( typeBeingCalled ); + System::Type^ typeBeingCalled = loadCliType(sTypeName); + UnoInterfaceInfo^ info = findInfo( typeBeingCalled ); OSL_ASSERT( 0 != info ); // ToDo do without string conversion, a OUString is not needed here // get the type description of the call - OUString usMethodName(mapCliString(static_cast( - props->get_Item(m_methodNameString)))); + OUString usMethodName(mapCliString(static_cast( + props[m_methodNameString]))); typelib_TypeDescriptionReference ** ppAllMembers = info->m_typeDesc->ppAllMembers; sal_Int32 numberMembers = info->m_typeDesc->nAllMembers; @@ -475,12 +474,12 @@ srrm::IMessage* UnoInterfaceProxy::Invoke(srrm::IMessage* callmsg) (typelib_InterfaceMethodTypeDescription *) member_td.get(); - System::Object* args[] = static_cast( - props->get_Item(m_ArgsString)); - System::Type* argTypes[] = static_cast( - props->get_Item(m_methodSignatureString)); - System::Object* pExc = NULL; - System::Object * cli_ret = m_bridge->call_uno( + array^ args = static_cast^>( + props[m_ArgsString]); + array^ argTypes = static_cast^>( + props[m_methodSignatureString]); + System::Object^ pExc = nullptr; + System::Object ^ cli_ret = m_bridge->call_uno( info->m_unoI, member_td.get(), method_td->pReturnTypeRef, method_td->nParams, method_td->pParams, args, argTypes, &pExc); @@ -511,13 +510,13 @@ srrm::IMessage* UnoInterfaceProxy::Invoke(srrm::IMessage* callmsg) (typelib_InterfaceAttributeTypeDescription*) member_td.get(); - System::Object* pExc = NULL; - System::Object* cli_ret= m_bridge->call_uno( + System::Object^ pExc = nullptr; + System::Object^ cli_ret= m_bridge->call_uno( info->m_unoI, member_td.get(), attribute_td->pAttributeTypeRef, 0, 0, - NULL, NULL, &pExc); - return constructReturnMessage(cli_ret, NULL, NULL, + nullptr, nullptr, &pExc); + return constructReturnMessage(cli_ret, nullptr, NULL, callmsg, pExc); } else if ('s' == usMethodName[0]) @@ -533,21 +532,21 @@ srrm::IMessage* UnoInterfaceProxy::Invoke(srrm::IMessage* callmsg) param.bIn = sal_True; param.bOut = sal_False; - System::Object* args[] = - static_cast( - props->get_Item(m_ArgsString)); - System::Object* pExc = NULL; + array^ args = + static_cast^>( + props[m_ArgsString]); + System::Object^ pExc = nullptr; m_bridge->call_uno( info->m_unoI, member_td.get(), ::getCppuVoidType().getTypeLibType(), - 1, ¶m, args, NULL, &pExc); - return constructReturnMessage(NULL, NULL, NULL, + 1, ¶m, args, nullptr, &pExc); + return constructReturnMessage(nullptr, nullptr, NULL, callmsg, pExc); } else { - return constructReturnMessage(NULL, NULL, NULL, - callmsg, NULL); + return constructReturnMessage(nullptr, nullptr, NULL, + callmsg, nullptr); } } break; @@ -568,66 +567,66 @@ srrm::IMessage* UnoInterfaceProxy::Invoke(srrm::IMessage* callmsg) } catch (BridgeRuntimeError & err) { - srrm::IMethodCallMessage* mcm = - static_cast(callmsg); - return new srrm::ReturnMessage(new ucss::uno::RuntimeException( - mapUnoString(err.m_message.pData), NULL), mcm); + srrm::IMethodCallMessage^ mcm = + static_cast(callmsg); + return gcnew srrm::ReturnMessage(gcnew ucss::uno::RuntimeException( + mapUnoString(err.m_message.pData), nullptr), mcm); } - catch (System::Exception* e) + catch (System::Exception^ e) { - st::StringBuilder * sb = new st::StringBuilder(512); - sb->Append(new System::String( - S"An unexpected CLI exception occurred in " - S"UnoInterfaceProxy::Invoke. Original" - S"message: \n")); - sb->Append(e->get_Message()); + st::StringBuilder ^ sb = gcnew st::StringBuilder(512); + sb->Append(gcnew System::String( + "An unexpected CLI exception occurred in " + "UnoInterfaceProxy::Invoke. Original" + "message: \n")); + sb->Append(e->Message); sb->Append((__wchar_t) '\n'); - sb->Append(e->get_StackTrace()); - srrm::IMethodCallMessage* mcm = - static_cast(callmsg); - return new srrm::ReturnMessage(new ucss::uno::RuntimeException( - sb->ToString(), NULL), mcm); + sb->Append(e->StackTrace); + srrm::IMethodCallMessage^ mcm = + static_cast(callmsg); + return gcnew srrm::ReturnMessage(gcnew ucss::uno::RuntimeException( + sb->ToString(), nullptr), mcm); } catch (...) { - System::String* msg = new System::String( - S"An unexpected native C++ exception occurred in " - S"UnoInterfaceProxy::Invoke."); - srrm::IMethodCallMessage* mcm = - static_cast(callmsg); - return new srrm::ReturnMessage(new ucss::uno::RuntimeException( - msg, NULL), mcm); + System::String^ msg = gcnew System::String( + "An unexpected native C++ exception occurred in " + "UnoInterfaceProxy::Invoke."); + srrm::IMethodCallMessage^ mcm = + static_cast(callmsg); + return gcnew srrm::ReturnMessage(gcnew ucss::uno::RuntimeException( + msg, nullptr), mcm); } - return NULL; + return nullptr; } /** If the argument args is NULL then this function is called for an attribute method (either setXXX or getXXX). For attributes the argument mtd is also NULL. */ -srrm::IMessage* UnoInterfaceProxy::constructReturnMessage( - System::Object* cliReturn, - System::Object* args[], +srrm::IMessage^ UnoInterfaceProxy::constructReturnMessage( + System::Object^ cliReturn, + array^ args, typelib_InterfaceMethodTypeDescription* mtd, - srrm::IMessage* msg, System::Object* exc) + srrm::IMessage^ msg, System::Object^ exc) { - srrm::IMessage * retVal= NULL; - srrm::IMethodCallMessage* mcm = static_cast(msg); + srrm::IMessage ^ retVal= nullptr; + srrm::IMethodCallMessage^ mcm = static_cast(msg); if (exc) { - retVal = new srrm::ReturnMessage( - dynamic_cast(exc), mcm); + retVal = gcnew srrm::ReturnMessage( + dynamic_cast(exc), mcm); } else { - sc::IDictionary* props= msg->get_Properties(); - srrm::LogicalCallContext* context= - static_cast( - props->get_Item(m_CallContextString)); - if (args != NULL) + sc::IDictionary^ props= msg->Properties; + srrm::LogicalCallContext^ context= + static_cast( + props[m_CallContextString]); + if (args != nullptr) { // Method //build the array of out parameters, allocate max length - System::Object* arOut[]= new System::Object*[mtd->nParams]; + array^ arOut= gcnew array(mtd->nParams); int nOut = 0; for (int i= 0; i < mtd->nParams; i++) { @@ -637,13 +636,13 @@ srrm::IMessage* UnoInterfaceProxy::constructReturnMessage( nOut++; } } - retVal= new srrm::ReturnMessage(cliReturn, arOut, nOut, + retVal= gcnew srrm::ReturnMessage(cliReturn, arOut, nOut, context, mcm); } else { // Attribute (getXXX) - retVal= new srrm::ReturnMessage(cliReturn, NULL, 0, + retVal= gcnew srrm::ReturnMessage(cliReturn, nullptr, 0, context, mcm); } } @@ -651,7 +650,7 @@ srrm::IMessage* UnoInterfaceProxy::constructReturnMessage( } //################################################################################ -CliProxy::CliProxy(Bridge const* bridge, System::Object* cliI, +CliProxy::CliProxy(Bridge const* bridge, System::Object^ cliI, typelib_TypeDescription const* td, const rtl::OUString& usOid): m_ref(1), @@ -688,29 +687,29 @@ void CliProxy::makeMethodInfos() type = m_type; #endif - if (m_type->get_IsInterface() == false) + if (m_type->IsInterface == false) return; - sr::MethodInfo* arThisMethods[] = m_type->GetMethods(); + array^ arThisMethods = m_type->GetMethods(); //get the inherited interfaces - System::Type* arInheritedIfaces[] = m_type->GetInterfaces(); - m_nInheritedInterfaces = arInheritedIfaces->get_Length(); + array^ arInheritedIfaces = m_type->GetInterfaces(); + m_nInheritedInterfaces = arInheritedIfaces->Length; //array containing the number of methods for the interface and its //inherited interfaces - m_arInterfaceMethodCount = new int __gc [m_nInheritedInterfaces + 1]; + m_arInterfaceMethodCount = gcnew array(m_nInheritedInterfaces + 1); //determine the number of all interface methods, including the inherited //interfaces - int numMethods = arThisMethods->get_Length(); + int numMethods = arThisMethods->Length; for (int i= 0; i < m_nInheritedInterfaces; i++) { - numMethods += arInheritedIfaces[i]->GetMethods()->get_Length(); + numMethods += arInheritedIfaces[i]->GetMethods()->Length; } //array containing MethodInfos of the cli object - m_arMethodInfos = new sr::MethodInfo*[numMethods]; + m_arMethodInfos = gcnew array(numMethods); //array containing MethodInfos of the interface - m_arInterfaceMethodInfos = new sr::MethodInfo*[numMethods]; + m_arInterfaceMethodInfos = gcnew array(numMethods); //array containing the mapping of Uno interface pos to pos in //m_arMethodInfos - m_arUnoPosToCliPos = new System::Int32[numMethods]; + m_arUnoPosToCliPos = gcnew array(numMethods); // initialize with -1 for (int i = 0; i < numMethods; i++) m_arUnoPosToCliPos[i] = -1; @@ -729,7 +728,7 @@ void CliProxy::makeMethodInfos() // !!! InterfaceMapping.TargetMethods should be MethodInfo*[] according // to documentation // but it is Type*[] instead. Bug in the framework? - System::Type* objType = m_cliI->GetType(); + System::Type^ objType = m_cliI->GetType(); try { int index = 0; @@ -737,35 +736,35 @@ void CliProxy::makeMethodInfos() //arInheritedIfaces[0] is the direct base interface //arInheritedIfaces[n] is the furthest inherited interface //Start with the base interface - int nArLength = arInheritedIfaces->get_Length(); + int nArLength = arInheritedIfaces->Length; for (;nArLength > 0; nArLength--) { sr::InterfaceMapping mapInherited = objType->GetInterfaceMap( arInheritedIfaces[nArLength - 1]); - int numMethods = mapInherited.TargetMethods->get_Length(); + int numMethods = mapInherited.TargetMethods->Length; m_arInterfaceMethodCount[nArLength - 1] = numMethods; for (int i = 0; i < numMethods; i++, index++) { - m_arMethodInfos[index] = __try_cast( + m_arMethodInfos[index] = safe_cast( mapInherited.TargetMethods[i]); - m_arInterfaceMethodInfos[index] = __try_cast( + m_arInterfaceMethodInfos[index] = safe_cast( mapInherited.InterfaceMethods[i]); } } //At last come the methods of the furthest derived interface sr::InterfaceMapping map = objType->GetInterfaceMap(m_type); - nArLength = map.TargetMethods->get_Length(); + nArLength = map.TargetMethods->Length; m_arInterfaceMethodCount[m_nInheritedInterfaces] = nArLength; for (int i = 0; i < nArLength; i++,index++) { - m_arMethodInfos[index]= __try_cast( + m_arMethodInfos[index]= safe_cast( map.TargetMethods[i]); - m_arInterfaceMethodInfos[index]= __try_cast( + m_arInterfaceMethodInfos[index]= safe_cast( map.InterfaceMethods[i]); } } - catch (System::InvalidCastException* ) + catch (System::InvalidCastException^ ) { OUStringBuffer buf( 128 ); buf.appendAscii(RTL_CONSTASCII_STRINGPARAM( @@ -777,10 +776,10 @@ void CliProxy::makeMethodInfos() } } -sr::MethodInfo* CliProxy::getMethodInfo(int nUnoFunctionPos, +sr::MethodInfo^ CliProxy::getMethodInfo(int nUnoFunctionPos, const rtl::OUString& usMethodName, MethodKind methodKind) { - sr::MethodInfo* ret = NULL; + sr::MethodInfo^ ret = nullptr; #if OSL_DEBUG_LEVEL >= 2 System::String* sMethodNameDbg; sr::MethodInfo* arMethodInfosDbg[]; @@ -803,19 +802,19 @@ sr::MethodInfo* CliProxy::getMethodInfo(int nUnoFunctionPos, return m_arMethodInfos[cliPos]; //create the method function name - System::String* sMethodName = mapUnoString(usMethodName.pData); + System::String^ sMethodName = mapUnoString(usMethodName.pData); switch (methodKind) { case MK_METHOD: break; case MK_SET: sMethodName = System::String::Concat( - const_cast(Constants::sAttributeSet), + const_cast(Constants::sAttributeSet), sMethodName); break; case MK_GET: sMethodName = System::String::Concat( - const_cast(Constants::sAttributeGet), + const_cast(Constants::sAttributeGet), sMethodName); break; default: @@ -832,10 +831,10 @@ sr::MethodInfo* CliProxy::getMethodInfo(int nUnoFunctionPos, indexCliMethod = nUnoFunctionPos; else { - int cMethods = m_arInterfaceMethodInfos->get_Length(); + int cMethods = m_arInterfaceMethodInfos->Length; for (int i = 0; i < cMethods; i++) { - System::String* cliMethod = m_arInterfaceMethodInfos[i]->Name; + System::String^ cliMethod = m_arInterfaceMethodInfos[i]->Name; if (cliMethod->Equals(sMethodName)) { indexCliMethod = i; @@ -877,7 +876,7 @@ CliProxy::~CliProxy() } uno_Interface* CliProxy::create(Bridge const * bridge, - System::Object* cliI, + System::Object^ cliI, typelib_TypeDescription const* pTD, const rtl::OUString& ousOid) { @@ -1004,7 +1003,7 @@ void SAL_CALL cli_proxy_dispatch( OUString const& usAttrName= *(rtl_uString**)& ((typelib_InterfaceMemberTypeDescription*) member_td) ->pMemberName; - sr::MethodInfo* info = proxy->getMethodInfo(function_pos, + sr::MethodInfo^ info = proxy->getMethodInfo(function_pos, usAttrName, CliProxy::MK_GET); bridge->call_cli( proxy->m_cliI, @@ -1019,7 +1018,7 @@ void SAL_CALL cli_proxy_dispatch( OUString const& usAttrName= *(rtl_uString**) & ((typelib_InterfaceMemberTypeDescription*) member_td) ->pMemberName; - sr::MethodInfo* info = proxy->getMethodInfo(function_pos + 1, + sr::MethodInfo^ info = proxy->getMethodInfo(function_pos + 1, usAttrName, CliProxy::MK_SET); typelib_MethodParameter param; param.pTypeRef = @@ -1074,7 +1073,7 @@ void SAL_CALL cli_proxy_dispatch( if (0 == pInterface) { - System::Type* mgdDemandedType = + System::Type^ mgdDemandedType = mapUnoType(demanded_td.get()); if (mgdDemandedType->IsInstanceOfType( proxy->m_cliI )) { @@ -1125,7 +1124,7 @@ void SAL_CALL cli_proxy_dispatch( ((typelib_InterfaceMemberTypeDescription*) member_td) ->pMemberName; - sr::MethodInfo* info = proxy->getMethodInfo(function_pos, + sr::MethodInfo^ info = proxy->getMethodInfo(function_pos, usMethodName, CliProxy::MK_METHOD); bridge->call_cli( proxy->m_cliI, diff --git a/cli_ure/source/uno_bridge/cli_proxy.h b/cli_ure/source/uno_bridge/cli_proxy.h index ae2e09fb74cd..5155e46baf4a 100644 --- a/cli_ure/source/uno_bridge/cli_proxy.h +++ b/cli_ure/source/uno_bridge/cli_proxy.h @@ -28,7 +28,6 @@ #include "cli_bridge.h" #include "cli_environment.h" -#using #using namespace srrp = System::Runtime::Remoting::Proxies; @@ -41,30 +40,30 @@ using namespace uno; namespace cli_uno { -public __gc class UnoInterfaceInfo +public ref class UnoInterfaceInfo { public: UnoInterfaceInfo(Bridge const * bridge, uno_Interface* unoI, typelib_InterfaceTypeDescription* td); ~UnoInterfaceInfo(); uno_Interface * m_unoI; // wrapped interface - System::Type * m_type; + System::Type ^ m_type; typelib_InterfaceTypeDescription* m_typeDesc; Bridge const* m_bridge; }; -public __gc class UnoInterfaceProxy: public srrp::RealProxy, +public ref class UnoInterfaceProxy: public srrp::RealProxy, public srr::IRemotingTypeInfo { /** used for IRemotingTypeInfo.TypeName */ - System::String* m_sTypeName; + System::String^ m_sTypeName; /** The list is filled with UnoInterfaceInfo objects. The list can only grow and elements are never changed. If an element was added it must not be changed! */ - sc::ArrayList* m_listIfaces; + sc::ArrayList^ m_listIfaces; /** The number of UNO interfaces this proxy represents. It corresponds to the the number of elements in m_listIfaces. */ @@ -73,13 +72,13 @@ public __gc class UnoInterfaceProxy: public srrp::RealProxy, to aggregation via bridges. Though the latter is strongly discouraged, this has to be supported. */ - sc::ArrayList* m_listAdditionalProxies; + sc::ArrayList^ m_listAdditionalProxies; int m_nlistAdditionalProxies; - UnoInterfaceInfo * findInfo( ::System::Type * type ); + UnoInterfaceInfo ^ findInfo( ::System::Type ^ type ); Bridge const* m_bridge; - System::String* m_oid; + System::String^ m_oid; #if OSL_DEBUG_LEVEL >= 2 /** The string contains all names of UNO interfaces which are @@ -97,13 +96,13 @@ public: /** Creates a proxy and registers it on the dot NET side. */ - static System::Object* create(Bridge * bridge, + static System::Object^ create(Bridge * bridge, uno_Interface * pUnoI, typelib_InterfaceTypeDescription* pTd, const rtl::OUString& oid); /** RealProxy::Invoke */ - srrm::IMessage* Invoke(srrm::IMessage* msg); + virtual srrm::IMessage^ Invoke(srrm::IMessage^ msg) override; /** Must be called from within a synchronized section. Add only the interface if it is not already contained. @@ -116,19 +115,22 @@ public: /** */ - inline System::String * getOid() + inline System::String ^ getOid() { return m_oid; } //IRemotingTypeInfo ---------------------------------------------- - bool CanCastTo(System::Type* fromType, System::Object* o); + virtual bool CanCastTo(System::Type^ fromType, System::Object^ o); - __property System::String* get_TypeName() + virtual property System::String^ TypeName { - return m_sTypeName; - } - __property void set_TypeName(System::String* name) - { - m_sTypeName = name; + System::String^ get() + { + return m_sTypeName; + }; + void set(System::String^ name) + { + m_sTypeName = name; + }; } @@ -139,31 +141,31 @@ private: typelib_InterfaceTypeDescription* pTD, const rtl::OUString& oid ); - static srrm::IMessage* constructReturnMessage(System::Object* retVal, - System::Object* outArgs[], + static srrm::IMessage^ constructReturnMessage(System::Object^ retVal, + array^ outArgs, typelib_InterfaceMethodTypeDescription* mtd, - srrm::IMessage* msg, System::Object* exc); + srrm::IMessage^ msg, System::Object^ exc); - static System::String* m_methodNameString = - new System::String("__MethodName"); - static System::String* m_typeNameString = new System::String("__TypeName"); - static System::String* m_ArgsString = new System::String("__Args"); - static System::String* m_CallContextString = - new System::String("__CallContext"); - static System::String* m_system_Object_String = - new System::String("System.Object"); - static System::String* m_methodSignatureString = - new System::String("__MethodSignature"); - static System::String* m_Equals_String = new System::String("Equals"); - static System::String* m_GetHashCode_String = - new System::String("GetHashCode"); - static System::String* m_GetType_String = new System::String("GetType"); - static System::String* m_ToString_String = new System::String("ToString"); + static System::String^ m_methodNameString = + gcnew System::String("__MethodName"); + static System::String^ m_typeNameString = gcnew System::String("__TypeName"); + static System::String^ m_ArgsString = gcnew System::String("__Args"); + static System::String^ m_CallContextString = + gcnew System::String("__CallContext"); + static System::String^ m_system_Object_String = + gcnew System::String("System.Object"); + static System::String^ m_methodSignatureString = + gcnew System::String("__MethodSignature"); + static System::String^ m_Equals_String = gcnew System::String("Equals"); + static System::String^ m_GetHashCode_String = + gcnew System::String("GetHashCode"); + static System::String^ m_GetType_String = gcnew System::String("GetType"); + static System::String^ m_ToString_String = gcnew System::String("ToString"); protected: - srrm::IMessage* invokeObject(sc::IDictionary* properties, - srrm::LogicalCallContext* context, - srrm::IMethodCallMessage* mcm); + srrm::IMessage^ invokeObject(sc::IDictionary^ properties, + srrm::LogicalCallContext^ context, + srrm::IMethodCallMessage^ mcm); }; @@ -172,10 +174,10 @@ struct CliProxy: public uno_Interface { mutable oslInterlockedCount m_ref; const Bridge* m_bridge; - const gcroot m_cliI; - gcroot m_type; + const gcroot m_cliI; + gcroot m_type; const com::sun::star::uno::TypeDescription m_unoType; - const gcroot m_oid; + const gcroot m_oid; const rtl::OUString m_usOid; enum MethodKind {MK_METHOD = 0, MK_SET, MK_GET}; @@ -200,7 +202,7 @@ struct CliProxy: public uno_Interface This is becaus, the cli interface does not contain the XInterface methods. */ - gcroot m_arMethodInfos; + gcroot^> m_arMethodInfos; /** This array is similar to m_arMethodInfos but it contains the MethodInfo objects of the interface (not the object). When a call is made from uno @@ -209,7 +211,7 @@ struct CliProxy: public uno_Interface array. The name of the actual implemented method may not be the same as the interface method. */ - gcroot m_arInterfaceMethodInfos; + gcroot^> m_arInterfaceMethodInfos; /** Maps the position of the method in the UNO interface to the position of the corresponding MethodInfo in m_arMethodInfos. The Uno position must @@ -222,22 +224,22 @@ struct CliProxy: public uno_Interface arUnoPosToCliPos[pos] contains the index for m_arMethodInfos. */ - gcroot m_arUnoPosToCliPos; + gcroot^> m_arUnoPosToCliPos; /** Count of inherited interfaces of the cli interface. */ int m_nInheritedInterfaces; /** Contains the number of methods of each interface. */ - gcroot m_arInterfaceMethodCount; + gcroot^> m_arInterfaceMethodCount; - CliProxy( Bridge const* bridge, System::Object* cliI, + CliProxy( Bridge const* bridge, System::Object^ cliI, typelib_TypeDescription const* pTD, const rtl::OUString& usOid); ~CliProxy(); static uno_Interface* create(Bridge const * bridge, - System::Object* cliI, + System::Object^ cliI, typelib_TypeDescription const * TD, rtl::OUString const & usOid ); @@ -273,7 +275,7 @@ struct CliProxy: public uno_Interface @param nUnoFunctionPos Position of the method in the uno interface. */ - sr::MethodInfo* getMethodInfo(int nUnoFunctionPos, + sr::MethodInfo^ getMethodInfo(int nUnoFunctionPos, const rtl::OUString & usMethodName, MethodKind mk); diff --git a/cli_ure/source/uno_bridge/cli_uno.cxx b/cli_ure/source/uno_bridge/cli_uno.cxx index d16668a09e6d..0ada41d9fd30 100644 --- a/cli_ure/source/uno_bridge/cli_uno.cxx +++ b/cli_ure/source/uno_bridge/cli_uno.cxx @@ -38,12 +38,12 @@ union largest uno_Any a; }; -System::Object* Bridge::call_uno(uno_Interface * pUnoI, +System::Object^ Bridge::call_uno(uno_Interface * pUnoI, typelib_TypeDescription* member_td, typelib_TypeDescriptionReference * return_type, sal_Int32 nParams, typelib_MethodParameter const * pParams, - System::Object * args[], System::Type* argTypes[], - System::Object** ppExc) const + array^ args, array^ argTypes, + System::Object^* ppExc) const { // return mem sal_Int32 return_size = sizeof (largest); @@ -133,9 +133,10 @@ System::Object* Bridge::call_uno(uno_Interface * pUnoI, { try { + pin_ptr ptr = &args[nPos]; map_to_cli( - &args[nPos], uno_args[nPos], param.pTypeRef, - argTypes != NULL ? argTypes[nPos] : NULL, false ); + ptr, uno_args[nPos], param.pTypeRef, + argTypes != nullptr ? argTypes[nPos] : nullptr, false ); } catch (...) { @@ -163,9 +164,9 @@ System::Object* Bridge::call_uno(uno_Interface * pUnoI, // convert uno return value try { - System::Object* cli_ret; + System::Object^ cli_ret; map_to_cli( - &cli_ret, uno_ret, return_type, 0, false); + &cli_ret, uno_ret, return_type, nullptr, false); uno_type_destructData(uno_ret, return_type, 0); return cli_ret; } @@ -175,7 +176,7 @@ System::Object* Bridge::call_uno(uno_Interface * pUnoI, throw; } } - return 0; // void return + return nullptr; // void return } else // exception occurred { @@ -189,36 +190,37 @@ System::Object* Bridge::call_uno(uno_Interface * pUnoI, } } map_to_cli(ppExc, uno_exc_holder.pData, - uno_exc_holder.pType, NULL, false); - return 0; + uno_exc_holder.pType, nullptr, false); + return nullptr; } } void Bridge::call_cli( - System::Object* cliI, - sr::MethodInfo* method, + System::Object^ cliI, + sr::MethodInfo^ method, typelib_TypeDescriptionReference * return_type, typelib_MethodParameter * params, int nParams, void * uno_ret, void * uno_args [], uno_Any ** uno_exc ) const { - System::Object *args[]= new System::Object*[nParams]; + array^ args= gcnew array(nParams); for (int nPos= 0; nPos < nParams; nPos++) { typelib_MethodParameter const & param= params[nPos]; if (param.bIn) { - map_to_cli( &args[nPos], - uno_args[nPos], param.pTypeRef, 0, false); + pin_ptr ptr = &args[nPos]; + map_to_cli( ptr, + uno_args[nPos], param.pTypeRef, nullptr, false); } } - System::Object* retInvoke= NULL; + System::Object^ retInvoke= nullptr; try { retInvoke= method->Invoke(cliI, args); } - catch (sr::TargetInvocationException* e) + catch (sr::TargetInvocationException^ e) { - System::Exception* exc= e->get_InnerException(); + System::Exception^ exc= e->InnerException; css::uno::TypeDescription td(mapCliType(exc->GetType())); // memory for exception std::auto_ptr< rtl_mem > memExc(rtl_mem::allocate(td.get()->nSize)); @@ -227,13 +229,13 @@ void Bridge::call_cli( (*uno_exc)->pData= memExc.release(); return; } - catch (System::Exception* e) + catch (System::Exception^ e) { OUStringBuffer buf( 128 ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "Unexspected exception during invocation of cli object. " "Original message is: \n") ); - buf.append(mapCliString(e->get_Message())); + buf.append(mapCliString(e->Message)); throw BridgeRuntimeError( buf.makeStringAndClear() ); } From 53ca7b480f8fb23b04023faee74fbfa4b77bfa02 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Wed, 29 Aug 2012 19:50:38 -0400 Subject: [PATCH 485/863] work-around really weird bug in VS2012 Change-Id: I7092bbcbddec179c62c2817b069f757863ca5982 --- sc/source/core/data/fillinfo.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx index 01204d60ee5c..d0aabfa43272 100644 --- a/sc/source/core/data/fillinfo.cxx +++ b/sc/source/core/data/fillinfo.cxx @@ -1,4 +1,5 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ + /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. From 959cbe4c6931170aec74a212ea02b6a64568b00a Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Thu, 30 Aug 2012 15:42:13 -0400 Subject: [PATCH 486/863] fix path for make_installer.pl Change-Id: Iac0ca81edaada999c774cdf8169f07fa98278cc6 --- configure.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure.in b/configure.in index 6249f8c60780..074f16c7dd19 100644 --- a/configure.in +++ b/configure.in @@ -12719,8 +12719,10 @@ else pathmunge "$MSPDB_PATH" "before" if test "$BITNESS_OVERRIDE" = 64; then pathmunge "$COMPATH/bin/amd64" "before" + pathmunge "$WINDOWS_SDK_HOME/bin/x64" "before" else pathmunge "$COMPATH/bin" "before" + pathmunge "$WINDOWS_SDK_HOME/bin/x86" "before" fi if test "$SOLAR_JAVA" != "" -a "$JDK"!="gcj"; then if test -d "$JAVA_HOME/jre/bin/client"; then From 79fce4ddeb8b45fd047a97507051cd9ca4245f60 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Thu, 30 Aug 2012 18:54:55 -0400 Subject: [PATCH 487/863] Win8 SDK no longer ships rebase.exe Change-Id: I3c4280ee53411f4914be8ebd4f41d1c1cec1ba97 --- config_host.mk.in | 1 + configure.in | 11 +++++++++++ download | 17 +++++++++++++++++ external/prj/d.lst | 2 ++ external/rebase/README_rebase.exe | 1 + 5 files changed, 32 insertions(+) create mode 100755 external/rebase/README_rebase.exe diff --git a/config_host.mk.in b/config_host.mk.in index a192ab727f48..97f6ec6ca4fb 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -481,6 +481,7 @@ export PYTHON_LIBS=@PYTHON_LIBS@ export RANLIB=@RANLIB@ export REDLAND_CFLAGS=@REDLAND_CFLAGS@ export REDLAND_LIBS=@REDLAND_LIBS@ +export REBASE=@REBASE@ export RHINO_JAR=@RHINO_JAR@ export RHINO_TARBALL=@RHINO_TARBALL@ export RPM=@RPM@ diff --git a/configure.in b/configure.in index 074f16c7dd19..2d3115f04313 100644 --- a/configure.in +++ b/configure.in @@ -9118,6 +9118,17 @@ fi AC_SUBST(WINDOWS_SDK_HOME) AC_SUBST(WINDOWS_SDK_VERSION) +dnl ========================================= +dnl Check for Micorosft rebase.exe +dnl ========================================= +if test "$build_os" = "cygwin"; then + AC_PATH_PROG([REBASE], [rebase]) + if test \( -z "$REBASE" -o "$REBASE" = "/usr/bin/rebase" \) -a "$WINDOWS_SDK_VERSION" = "80"; then + REBASE=download + AC_SUBST(REBASE) + fi +fi + dnl ========================================= dnl Check for uuidgen dnl ========================================= diff --git a/download b/download index 7821484475dc..620a29234612 100755 --- a/download +++ b/download @@ -183,6 +183,11 @@ if [ "$COM" = "MSC" ]; then downloaditem "http://download.microsoft.com/download/E/9/F/E9FCA9E9-9908-4D8F-B491-8E8A4C294C01/" "WindowsXP-KB958911-x86-ENU.exe" "ff084c5815b0672d54628158b820f5b1" fi +if [ "$REBASE" = "download" ]; then + downloaditem "http://download.microsoft.com/download/A/6/A/A6AC035D-DA3F-4F0C-ADA4-37C8E5D34E3D/setup/WinSDKTools/" "cab1.cab" "15331cc5cb4a03e7a44aaa303e34bf5b" + downloaditem "http://download.microsoft.com/download/A/6/A/A6AC035D-DA3F-4F0C-ADA4-37C8E5D34E3D/setup/WinSDKTools/" "WinSDKTools_x86.msi" "d1f44ddc2ba6bbda79407e951e44303b" +fi + if [ -f $start_dir/sources.ver -a ! -d $start_dir/.git ] ; then # these sources are from a tarball, so get the other source tarballs . $start_dir/sources.ver @@ -223,6 +228,18 @@ if [ "$COM" = "MSC" -a -n "$md5sum" ]; then cp $TARFILE_LOCATION/tmp/$dbghelp_dll_path ./external/dbghelp/dbghelp.dll fi fi + + if [ "$REBASE" = "download" ]; then + if [ ! -f ./external/rebase/rebase.exe -a -f $TARFILE_LOCATION/WinSDKTools_x86.msi ]; then + msiexec /a `cygpath -d $TARFILE_LOCATION/WinSDKTools_x86.msi` /qn TARGETDIR=$TMPUNPACK SHORTFILENAMES=1 + rebase_exe_path=Pfiles/*/Windows/v7.1/Bin/ReBase.Exe + sum=`$md5sum $md5special $TARFILE_LOCATION/tmp/$rebase_exe_path | sed "s/ .*//"` + if [ "$sum" = "5892a62147b7be59f0553ae3634e9dfa" ]; then + cp $TARFILE_LOCATION/tmp/$rebase_exe_path ./external/rebase/rebase.exe + fi + fi + fi + if [ ! -f ./external/gdiplus/gdiplus.dll -a -f $TARFILE_LOCATION/WindowsXP-KB958911-x86-ENU.exe ]; then gdiplus_dll_path=SP3QFE/asms/10/msft/windows/gdiplus/gdiplus.dll chmod +x `cygpath $TARFILE_LOCATION`/WindowsXP-KB958911-x86-ENU.exe diff --git a/external/prj/d.lst b/external/prj/d.lst index 7fa38d391cc1..6d15049aa3a3 100644 --- a/external/prj/d.lst +++ b/external/prj/d.lst @@ -28,6 +28,8 @@ mkdir: %_DEST%\inc\external\wine ..\dbghelp\dbghelp.dll %_DEST%\bin\dbghelp.dll +..\rebase\rebase.exe %_DEST%\bin\rebase.exe + ..\gdiplus\gdiplus.dll %_DEST%\bin\gdiplus.dll ..\msvcp80\msvcm80*.dll %_DEST%\bin diff --git a/external/rebase/README_rebase.exe b/external/rebase/README_rebase.exe new file mode 100755 index 000000000000..87248931e24e --- /dev/null +++ b/external/rebase/README_rebase.exe @@ -0,0 +1 @@ +Put rebase.exe in this directory for Windows builds. From e994a91060c145ad08ef75dcf9862043202ac6ce Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Fri, 31 Aug 2012 09:33:34 -0400 Subject: [PATCH 488/863] use downloaded rebase.exe with Win8 SDK Change-Id: Ib7cb49e9c992ba3bd8cc69e7e492f82a493d7053 --- postprocess/rebase/rebase.pl | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/postprocess/rebase/rebase.pl b/postprocess/rebase/rebase.pl index 546068efade2..f5e5ce05ccf1 100644 --- a/postprocess/rebase/rebase.pl +++ b/postprocess/rebase/rebase.pl @@ -179,7 +179,13 @@ sub rebase_again my $newfiles_ref = shift; my @grownfiles; my $solarbin ="$ENV{SOLARVERSION}/$ENV{INPATH}/bin$ENV{UPDMINOREXT}"; - my $command = "rebase " . $options_string; + my $command; + if ( $ENV{REBASE} eq "download" ) { + $command = $ENV{OUTDIR}."/bin/rebase " . $options_string; + } + else { + $command = "rebase " . $options_string; + } if ( $ENV{WRAPCMD} ) { $command = $ENV{WRAPCMD} . " " . $command; } @@ -241,7 +247,13 @@ sub rebase_again sub rebase_initially { my ($files_ref, $start_address) = @_; - my $command = "rebase "; + my $command; + if ( $ENV{REBASE} eq "download" ) { + $command = $ENV{OUTDIR}."/bin/rebase " . $options_string; + } + else { + $command = "rebase " . $options_string; + } if ( $ENV{WRAPCMD} ) { $command = $ENV{WRAPCMD} . " " . $command; } From 59bf5321fa4c49b0d140700e2c56de7e1b637926 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Fri, 31 Aug 2012 13:24:00 -0400 Subject: [PATCH 489/863] fix msm suport for VS2012 Change-Id: Ibc816de83eb48163671948ecc84e7653f2b4ec13 --- config_host.mk.in | 1 + configure.in | 10 +++-- external/msm100/README_msm100.txt | 6 +++ external/msm110/README_msm110.txt | 6 +++ external/prj/d.lst | 2 + .../windows/msi_templates/_Validat.idt | 1 - oowintool | 32 +++++++++---- post_download.in | 4 +- scp2/source/ooo/vc_redist.scp | 45 ++++++++++++++++++- 9 files changed, 90 insertions(+), 17 deletions(-) create mode 100755 external/msm100/README_msm100.txt create mode 100755 external/msm110/README_msm110.txt diff --git a/config_host.mk.in b/config_host.mk.in index 97f6ec6ca4fb..251847ee4ee3 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -622,6 +622,7 @@ export USE_XINERAMA=@USE_XINERAMA@ export UUIDGEN=@UUIDGEN@ export VALGRIND_CFLAGS=@VALGRIND_CFLAGS@ export VALIDATOR_EXTENSION_PACK=@VALIDATOR_EXTENSION_PACK@ +export VCVER=@VCVER@ export VERBOSE=@VERBOSE@ export VIGRA_TARBALL=@VIGRA_TARBALL@ export VISIO_CFLAGS=@VISIO_CFLAGS@ diff --git a/configure.in b/configure.in index 2d3115f04313..63103aefab87 100644 --- a/configure.in +++ b/configure.in @@ -3185,12 +3185,15 @@ if test "$_os" = "WINNT"; then if test "$CCNUMVER" -ge "001700000000"; then COMEX=14 MSVSVER=2012 + VCVER=110 elif test "$CCNUMVER" -ge "001600000000"; then COMEX=13 MSVSVER=2010 + VCVER=100 elif test "$CCNUMVER" -ge "001500000000"; then COMEX=12 MSVSVER=2008 + VCVER=90 else AC_MSG_ERROR([Compiler too old. Use Microsoft Visual Studio 2008 or 2010.]) fi @@ -3270,6 +3273,7 @@ if test "$_os" = "WINNT"; then fi fi AC_SUBST(COMEX) +AC_SUBST(VCVER) PathFormat "$MSPDB_PATH" MSPDB_PATH="$formatted_path" AC_SUBST(SHOWINCLUDES_PREFIX) @@ -5675,10 +5679,10 @@ fi AC_SUBST([JITC_PROCESSOR_TYPE]) if test $_os = "WINNT"; then - AC_MSG_CHECKING([for Microsoft_VC100_CRT_x86.msm]) - if ./oowintool --msvc-find-msms-vc100; then + AC_MSG_CHECKING([for Microsoft_VC"$VCVER"_CRT_x86.msm]) + if ./oowintool --msvc-find-msms; then AC_MSG_RESULT([yes]) - SCPDEFS="$SCPDEFS -DWITH_VC100_REDIST" + SCPDEFS="$SCPDEFS -DWITH_VC"$VCVER"_REDIST" else AC_MSG_RESULT([no]) fi diff --git a/external/msm100/README_msm100.txt b/external/msm100/README_msm100.txt new file mode 100755 index 000000000000..a40bbdbc8321 --- /dev/null +++ b/external/msm100/README_msm100.txt @@ -0,0 +1,6 @@ +Put +Microsoft_VC100_CRT_x86.msm +into this directory for Windows builds using a VS 2010 / VC 10.0 compiler. +For builds with --enable-dbgutil also put +Microsoft_VC100_DebugCRT_x86.msm +here. diff --git a/external/msm110/README_msm110.txt b/external/msm110/README_msm110.txt new file mode 100755 index 000000000000..b9af5778c21e --- /dev/null +++ b/external/msm110/README_msm110.txt @@ -0,0 +1,6 @@ +Put +Microsoft_VC110_CRT_x86.msm +into this directory for Windows builds using a VS 2012 / VC 11.0 compiler. +For builds with --enable-dbgutil also put +Microsoft_VC110_DebugCRT_x86.msm +here. diff --git a/external/prj/d.lst b/external/prj/d.lst index 6d15049aa3a3..0577f7faeb57 100644 --- a/external/prj/d.lst +++ b/external/prj/d.lst @@ -44,6 +44,8 @@ mkdir: %_DEST%\inc\external\wine ..\msvcp90\Microsoft.VC90.CRT.manifest %_DEST%\bin\Microsoft.VC90.CRT.manifest ..\msvcp90\Microsoft.VC90.DebugCRT.manifest %_DEST%\bin\Microsoft.VC90.DebugCRT.manifest ..\msm90\*.msm %_DEST%\bin +..\msm100\*.msm %_DEST%\bin +..\msm110\*.msm %_DEST%\bin ..\unowinreg\unowinreg.dll %_DEST%\bin\unowinreg.dll diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt index 0759d336f290..e716732c5d7a 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt @@ -1,7 +1,6 @@ Table Column Nullable MinValue MaxValue KeyTable KeyColumn Category Set Description s32 s32 s4 I4 I4 S255 I2 S32 S255 S255 _Validation Table Column -_Validation Category Y Text;Formatted;Template;Condition;Guid;Path;Version;Language;Identifier;Binary;UpperCase;LowerCase;Filename;Paths;AnyPath;WildCardFilename;RegPath;KeyFormatted;CustomSource;Property;Cabinet;Shortcut;URL String category _Validation Column N Identifier Name of column _Validation Description Y Text Description of column _Validation KeyColumn Y 1 32 Column to which foreign key connects diff --git a/oowintool b/oowintool index 5f7d60321dbe..e8f0b3b17e7a 100755 --- a/oowintool +++ b/oowintool @@ -310,11 +310,12 @@ sub msvc_copy_dlls($) } } -sub msvc_find_msms_vc100() +sub msvc_find_msms() { - my $msm_path = (cygpath reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/9.0/Setup/VS/MSMDir"), 'w', $output_format); + my $ver = find_msvc(); + my $msm_path = (cygpath reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver->{'ver'}/Setup/VS/MSMDir"), 'w', $output_format); defined $msm_path || die "MSMDir not found"; - return -e "$msm_path/Microsoft_VC100_CRT_x86.msm" ? 0 : 1; + return -e "$msm_path/Microsoft_VC".$ver->{'dll_suffix'}."_CRT_x86.msm" ? 0 : 1; } sub msvc_copy_msms($$) @@ -323,18 +324,31 @@ sub msvc_copy_msms($$) my ($dest, $postfix) = @_; my $ver = find_msvc(); - (defined $ver && ($ver->{'ver'} eq '9.0')) || return; + defined $ver || return; - my $msm_path = (cygpath reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/9.0/Setup/VS/MSMDir"), 'w', $output_format); + my $msm_path = (cygpath reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver->{'ver'}/Setup/VS/MSMDir"), 'w', $output_format); defined $msm_path || die "MSMDir not found"; + if ($ver->{'dll_suffix'} == 90) { + if ( $postfix eq "_x86" ) { + $postfix = "" + } foreach $fname ("Microsoft_VC90_CRT_x86$postfix.msm", "policy_9_0_Microsoft_VC90_CRT_x86$postfix.msm") { print STDERR "Copying $msm_path/$fname to $dest\n"; copy ("$msm_path/$fname", $dest) || die "copy failed: $!"; } - foreach $fname ("Microsoft_VC100_CRT_x86$postfix.msm") { + } + elsif ($ver->{'dll_suffix'} == 100) { + foreach $fname ("Microsoft_VC100_CRT$postfix.msm") { print STDERR "Copying $msm_path/$fname to $dest\n"; copy ("$msm_path/$fname", $dest) || print "copy failed: $!\n"; } + } + else { + foreach $fname ("Microsoft_VC110_CRT$postfix.msm") { + print STDERR "Copying $msm_path/$fname to $dest\n"; + copy ("$msm_path/$fname", $dest) || print "copy failed: $!\n"; + } + } } if (!@ARGV) { @@ -364,12 +378,12 @@ while (@commands) { my $dest = shift @commands; defined $dest || die "copy-dlls requires a destination directory"; msvc_copy_dlls( $dest ); - } elsif ($opt eq '--msvc-find-msms-vc100') { - exit msvc_find_msms_vc100(); + } elsif ($opt eq '--msvc-find-msms') { + exit msvc_find_msms(); } elsif ($opt eq '--msvc-copy-msms') { my $dest = shift @commands; defined $dest || die "copy-msms requires a destination directory"; - msvc_copy_msms( $dest, '' ); + msvc_copy_msms( $dest, '_x86' ); } elsif ($opt eq '--msvc-copy-msms-64') { my $dest = shift @commands; defined $dest || die "copy-msms-64 requires a destination directory"; diff --git a/post_download.in b/post_download.in index 0161233dd40c..7685f56e1466 100644 --- a/post_download.in +++ b/post_download.in @@ -47,10 +47,10 @@ dnl =================================================================== dnl Windows builds - use oowintool to copy VC redist merge modules dnl =================================================================== if test "$COM" = "MSC"; then - if ! ./oowintool --msvc-copy-msms ./external/msm90 ; then + if ! ./oowintool --msvc-copy-msms ./external/msm"$VCVER" ; then AC_MSG_ERROR([oowintool failed to copy merge modules]) fi - if ! ./oowintool --msvc-copy-msms-64 ./external/msm90 ; then + if ! ./oowintool --msvc-copy-msms-64 ./external/msm"$VCVER" ; then AC_MSG_WARN([oowintool failed to copy x64 merge modules, installation will lack the 64-bit Explorer extension]) fi diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp index c0e53020d1f9..fa7d1c268737 100644 --- a/scp2/source/ooo/vc_redist.scp +++ b/scp2/source/ooo/vc_redist.scp @@ -27,6 +27,8 @@ #include "macros.inc" +#if defined(WITH_VC90_REDIST) + MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86 Feature = gm_Root; Name = "Microsoft_VC90_CRT_x86.msm"; @@ -34,6 +36,15 @@ MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86 ComponentCondition = "VC_REDIST=1"; End +MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86 + Feature = gm_Root; + Name = "policy_9_0_Microsoft_VC90_CRT_x86.msm"; + RootDir = "TARGETDIR"; + ComponentCondition = "VC_REDIST=1"; +End + +#endif + #if defined(WITH_VC100_REDIST) MergeModule gid_MergeModule_Microsoft_VC100_CRT_x86 @@ -45,15 +56,21 @@ End #endif -MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86 +#if defined(WITH_VC110_REDIST) + +MergeModule gid_MergeModule_Microsoft_VC110_CRT_x86 Feature = gm_Root; - Name = "policy_9_0_Microsoft_VC90_CRT_x86.msm"; + Name = "Microsoft_VC110_CRT_x86.msm"; RootDir = "TARGETDIR"; ComponentCondition = "VC_REDIST=1"; End +#endif + #if defined(BUILD_X64) +#if defined(WITH_VC90_REDIST) + MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86_x64 Feature = gm_Root; Name = "Microsoft_VC90_CRT_x86_x64.msm"; @@ -69,3 +86,27 @@ MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86_x64 End #endif + +#if defined(WITH_VC100_REDIST) + +MergeModule gid_MergeModule_Microsoft_VC100_CRT_x64 + Feature = gm_Root; + Name = "Microsoft_VC100_CRT_x64.msm"; + RootDir = "TARGETDIR"; + ComponentCondition = "VC_REDIST=1"; +End + +#endif + +#if defined(WITH_VC110_REDIST) + +MergeModule gid_MergeModule_Microsoft_VC110_CRT_x64 + Feature = gm_Root; + Name = "Microsoft_VC110_CRT_x64.msm"; + RootDir = "TARGETDIR"; + ComponentCondition = "VC_REDIST=1"; +End + +#endif + +#endif From 5c1a93df5b3a8d7f31d9bb672d391c888418aa53 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Fri, 31 Aug 2012 13:30:12 -0400 Subject: [PATCH 490/863] fix dbghelp.dll download again Change-Id: I5992023a946301809b9708d9df29dd9cc1500b53 --- configure.in | 8 ++++++++ download | 13 +++---------- ooo.lst.in | 1 + 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/configure.in b/configure.in index 63103aefab87..83c6f4840fa9 100644 --- a/configure.in +++ b/configure.in @@ -3278,6 +3278,14 @@ PathFormat "$MSPDB_PATH" MSPDB_PATH="$formatted_path" AC_SUBST(SHOWINCLUDES_PREFIX) +# +# dbghelp.dll +# +if test "$_os" == "WINNT"; then + DBGHELP_DLL="13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll" +fi +AC_SUBST(DBGHELP_DLL) + # # prefix C with ccache if needed # diff --git a/download b/download index 620a29234612..fd9bb4a1524d 100755 --- a/download +++ b/download @@ -179,7 +179,6 @@ for i in $filelist ; do done if [ "$COM" = "MSC" ]; then - downloaditem "http://download.microsoft.com/download/A/6/A/A6AC035D-DA3F-4F0C-ADA4-37C8E5D34E3D/setup/WinSDKDebuggingTools/" "dbg_x86.msi" "2bd67a7b00507ad93539e138a4a6a2bf" downloaditem "http://download.microsoft.com/download/E/9/F/E9FCA9E9-9908-4D8F-B491-8E8A4C294C01/" "WindowsXP-KB958911-x86-ENU.exe" "ff084c5815b0672d54628158b820f5b1" fi @@ -220,15 +219,9 @@ if [ "$COM" = "MSC" -a -n "$md5sum" ]; then # This can be run only on Windows itself (Cygwin) TMPUNPACK=`cygpath -d $TARFILE_LOCATION/tmp` chmod a+w $TARFILE_LOCATION/tmp - if [ ! -f ./external/dbghelp/dbghelp.dll -a -f $TARFILE_LOCATION/dbg_x86.msi ]; then - msiexec /a `cygpath -d $TARFILE_LOCATION/dbg_x86.msi` /qn TARGETDIR=$TMPUNPACK SHORTFILENAMES=1 - dbghelp_dll_path=PFiles/DbgTools/dbghelp.dll - sum=`$md5sum $md5special $TARFILE_LOCATION/tmp/$dbghelp_dll_path | sed "s/ .*//"` - if [ "$sum" = "4003e34416ebd25e4c115d49dc15e1a7" ]; then - cp $TARFILE_LOCATION/tmp/$dbghelp_dll_path ./external/dbghelp/dbghelp.dll - fi - fi - + if [ ! -f ./external/dbghelp/dbghelp.dll -a -f $TARFILE_LOCATION/13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll ]; then + cp $TARFILE_LOCATION/13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll ./external/dbghelp/dbghelp.dll + fi if [ "$REBASE" = "download" ]; then if [ ! -f ./external/rebase/rebase.exe -a -f $TARFILE_LOCATION/WinSDKTools_x86.msi ]; then msiexec /a `cygpath -d $TARFILE_LOCATION/WinSDKTools_x86.msi` /qn TARGETDIR=$TMPUNPACK SHORTFILENAMES=1 diff --git a/ooo.lst.in b/ooo.lst.in index 25b83fc0c4d6..06081e4d429d 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -101,6 +101,7 @@ fa6a2f85bd28baab035b2c95e722713f-liblangtag-0.2.tar.bz2 @ORCUS_TARBALL@ http://dev-www.libreoffice.org/extern 185d60944ea767075d27247c3162b3bc-unowinreg.dll +@DBGHELP_DLL@ http://ooo.itc.hu/oxygenoffice/download/libreoffice/ @OOOP_GALLERY_PACK@ @OOOP_TEMPLATES_PACK@ From c140a5fdbba098704ba800c5e4f9b3a2fef2900e Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Fri, 7 Sep 2012 16:57:12 -0400 Subject: [PATCH 491/863] fix msm_path detection Change-Id: Id507a3483a126f4a04dcb9be287c12a3eae5429c --- oowintool | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/oowintool b/oowintool index e8f0b3b17e7a..58ea15399b84 100755 --- a/oowintool +++ b/oowintool @@ -313,7 +313,9 @@ sub msvc_copy_dlls($) sub msvc_find_msms() { my $ver = find_msvc(); - my $msm_path = (cygpath reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver->{'ver'}/Setup/VS/MSMDir"), 'w', $output_format); + my $msm_path = (cygpath reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/9.0/Setup/VS/MSMDir"), 'w', $output_format) || + (cygpath reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/10.0/Setup/VS/MSMDir"), 'w', $output_format) || + (cygpath reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/11.0/Setup/VS/MSMDir"), 'w', $output_format); defined $msm_path || die "MSMDir not found"; return -e "$msm_path/Microsoft_VC".$ver->{'dll_suffix'}."_CRT_x86.msm" ? 0 : 1; } @@ -326,7 +328,9 @@ sub msvc_copy_msms($$) my $ver = find_msvc(); defined $ver || return; - my $msm_path = (cygpath reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver->{'ver'}/Setup/VS/MSMDir"), 'w', $output_format); + my $msm_path = (cygpath reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/9.0/Setup/VS/MSMDir"), 'w', $output_format) || + (cygpath reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/10.0/Setup/VS/MSMDir"), 'w', $output_format) || + (cygpath reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/11.0/Setup/VS/MSMDir"), 'w', $output_format); defined $msm_path || die "MSMDir not found"; if ($ver->{'dll_suffix'} == 90) { if ( $postfix eq "_x86" ) { From 2db6f67b6e006cfcc6569306eef40f9cafdec798 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Fri, 7 Sep 2012 17:01:04 -0400 Subject: [PATCH 492/863] add support for libmerged on Windows Change-Id: I05d1c557967000be2fb7128b43d6e8c6005a7892 --- Library_merged.mk | 9 ++++++++- solenv/gbuild/platform/WNT_INTEL_MSC.mk | 8 ++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Library_merged.mk b/Library_merged.mk index f6bf68aaa5c9..6c3b047ac484 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -45,7 +45,6 @@ $(eval $(call gb_Library_use_libraries,merged,\ $(eval $(call gb_Library_use_externals,merged,\ cups \ - icui18n \ icule \ icuuc \ jpeg \ @@ -117,11 +116,19 @@ $(eval $(call gb_Library_use_system_win32_libs,merged,\ oleaut32 \ shell32 \ user32 \ + usp10 \ uuid \ version \ winmm \ winspool \ )) +$(eval $(call gb_Library_use_externals,merged,\ + icuin \ +)) +else +$(eval $(call gb_Library_use_externals,merged,\ + icui18n \ +)) endif ifeq ($(OS),MACOSX) diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 6483d4741508..151327eb0d5b 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -341,6 +341,13 @@ gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC))) gb_LinkTarget_get_pdbfile = $(call gb_LinkTarget_get_target,)pdb/$(1).pdb +# avoid fatal error LNK1170 for Library_merged +define gb_LinkTarget_MergedResponseFile +cut -f -1000 -d ' ' $${RESPONSEFILE} > $${RESPONSEFILE}.1 && \ +cut -f 1001- -d ' ' $${RESPONSEFILE} >> $${RESPONSEFILE}.1 && \ +mv $${RESPONSEFILE}.1 $${RESPONSEFILE} && +endef + define gb_LinkTarget__command $(call gb_Output_announce,$(2),$(true),LNK,4) $(call gb_Helper_abbreviate_dirs,\ @@ -354,6 +361,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),$(shell cat $(extraobjectlist))) \ $(NATIVERES)) && \ + $(if $(filter $(call gb_Library_get_linktargetname,merged),$(2)),$(call gb_LinkTarget_MergedResponseFile)) \ unset INCLUDE && \ $(if $(filter YES,$(LIBRARY_X64)), $(LINK_X64_BINARY), $(gb_LINK)) \ $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ From a97fdbda6b568d776e04e27dda7c26d33b88c8c5 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Fri, 7 Sep 2012 18:42:27 -0400 Subject: [PATCH 493/863] fix liborcus build with VS2012 Change-Id: I98248b2fe45da32fc0f478aee55b6939825112f7 --- liborcus/ExternalProject_liborcus.mk | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk index f67b48c64063..3882971bfc2a 100644 --- a/liborcus/ExternalProject_liborcus.mk +++ b/liborcus/ExternalProject_liborcus.mk @@ -17,13 +17,23 @@ $(eval $(call gb_ExternalProject_register_targets,liborcus,\ ifeq ($(OS)$(COM),WNTMSC) +ifeq ($(CCNUMVER),90) $(call gb_ExternalProject_get_state_target,liborcus,build) : cd $(EXTERNAL_WORKDIR)/vsprojects/liborcus-static-nozip \ && export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \ && export BOOST_LIB_DIR=$(OUTDIR)/lib \ && $(COMPATH)/vcpackages/vcbuild.exe liborcus-static-nozip.vcproj "Release|Win32" \ && touch $@ - +else +$(call gb_ExternalProject_get_state_target,liborcus,build) : + cd $(EXTERNAL_WORKDIR)/vsprojects/liborcus-static-nozip \ + && export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && export BOOST_LIB_DIR=$(OUTDIR)/lib \ + && $(COMPATH)/../Common7/Tools/vcupgrade.exe liborcus-static-nozip.vcproj \ + && MSBuild.exe liborcus-static-nozip.vcxproj /p:Configuration=Release /p:OutDir=Release /p:TargetName=orcus /p:WholeProgramOptimization=no \ + && touch $@ +endif + else $(call gb_ExternalProject_get_state_target,liborcus,build) : From 4b17650868da44dea228d524c38615786a256460 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Sat, 15 Sep 2012 09:35:04 -0400 Subject: [PATCH 494/863] Fix ccache with MSVC Change-Id: I0721a8d0aa584051d1e16b327c3cd1352eedf253 --- configure.in | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/configure.in b/configure.in index 83c6f4840fa9..1c71c13ba612 100644 --- a/configure.in +++ b/configure.in @@ -3289,26 +3289,23 @@ AC_SUBST(DBGHELP_DLL) # # prefix C with ccache if needed # -if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then - if test "$CCACHE" != ""; then - AC_MSG_CHECKING([whether $CC is already ccached]) - - AC_LANG_PUSH([C]) - save_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS --ccache-skip -O2" - dnl an empty program will do, we're checking the compiler flags - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], - [use_ccache=yes], [use_ccache=no]) - if test $use_ccache = yes; then - AC_MSG_RESULT([yes]) - else - CC="$CCACHE $CC" - AC_MSG_RESULT([no]) - fi - CFLAGS=$save_CFLAGS - AC_LANG_POP([C]) - fi +if test "$CCACHE" != ""; then + AC_MSG_CHECKING([whether $CC is already ccached]) + AC_LANG_PUSH([C]) + save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS --ccache-skip -O2" + dnl an empty program will do, we're checking the compiler flags + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], + [use_ccache=yes], [use_ccache=no]) + if test $use_ccache = yes; then + AC_MSG_RESULT([yes]) + else + CC="$CCACHE $CC" + AC_MSG_RESULT([no]) + fi + CFLAGS=$save_CFLAGS + AC_LANG_POP([C]) fi # From 1b0c68b61a1673d809930087bdf65d2205492765 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Sat, 15 Sep 2012 09:47:11 -0400 Subject: [PATCH 495/863] add aditional targets to clean and distclean Change-Id: Ic7539b88936370cc6bc01edf2c2755343e0113b6 --- Makefile.top | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.top b/Makefile.top index ccf658988dac..e5bd89d1da0a 100644 --- a/Makefile.top +++ b/Makefile.top @@ -342,6 +342,7 @@ endif rm -fr $(OUTDIR) rm -fr $(WORKDIR) rm -fr $(SRCDIR)/*/$(INPATH) + rm -fr $(SRCDIR)/solenv/$(OUTPATH) rm -fr install clean-build: @@ -361,7 +362,8 @@ endif rm -fr config_host.mk config_build.mk aclocal.m4 autom4te.cache \ bin/repo-list config.log config.status configure \ ooo.lst post_download post_download.log \ - config_host.mk.last set_soenv.stamp src.downloaded warn + config_host.mk.last set_soenv.stamp src.downloaded warn \ + solenv/bin/concat-deps.exe solenv/bin/concat-deps find $(SOLARENV)/gdb -name "*.pyc" -exec rm {} \; # From 0e866192ae2abe5f9bcdfc8cb0b4aa23aba1301b Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Sat, 15 Sep 2012 10:58:59 -0400 Subject: [PATCH 496/863] fix for openssl with MSVC when ccache is enabled Change-Id: I93deea3a80178f51fff9a23328df7a67f308e052 --- openssl/makefile.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openssl/makefile.mk b/openssl/makefile.mk index 04a8683a20ee..286e4242bb42 100644 --- a/openssl/makefile.mk +++ b/openssl/makefile.mk @@ -155,7 +155,8 @@ OUT2BIN += libeay32.dll # The env. vars CC and PERL are used by nmake, and nmake insists on '\'s # If WRAPCMD is set it is prepended before the compiler, don't touch that. .IF "$(WRAPCMD)"=="" - CC!:=$(subst,/,\ $(normpath,1 $(CC))) + CC!:=$(subst,/,\ $(normpath,1 $(CC:1))) + CC!:=$(CC:s/ccache/ccache cl.exe/) .EXPORT : CC .ENDIF PERL_bak:=$(PERL) From 7d2bbd22e7f81475c9b9eb3a4f120267c33818ee Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Sat, 15 Sep 2012 16:41:10 -0400 Subject: [PATCH 497/863] prevent ccache from being doubled with MSVC Change-Id: Idb2fd2a115c5e32d3e894d70c0e86730b38e73e9 --- configure.in | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/configure.in b/configure.in index 1c71c13ba612..eebe6da88fba 100644 --- a/configure.in +++ b/configure.in @@ -2455,7 +2455,7 @@ AC_SUBST(SYSBASE) dnl =================================================================== dnl Checks if ccache is available dnl =================================================================== -if test "$enable_ccache" = "yes" -o \( "$enable_ccache" = "" -a "$enable_icecream" != "yes" -a "$build_os" != "cygwin" \); then +if test "$enable_ccache" = "yes" -o \( "$enable_ccache" = "" -a "$enable_icecream" != "yes" \); then case "%$CC%$CXX%" in # If $CC and/or $CXX already contain "ccache" (possibly suffixed with some verison number etc), # assume that's good then @@ -4850,22 +4850,24 @@ fi # # prefx CXX with ccache if needed # -if test "$CCACHE" != ""; then - AC_MSG_CHECKING([whether $CXX is already ccached]) - AC_LANG_PUSH([C++]) - save_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$CXXFLAGS --ccache-skip -O2" - dnl an empty program will do, we're checking the compiler flags - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], - [use_ccache=yes], [use_ccache=no]) - if test $use_ccache = yes; then - AC_MSG_RESULT([yes]) - else - CXX="$CCACHE $CXX" - AC_MSG_RESULT([no]) - fi - CXXFLAGS=$save_CXXFLAGS - AC_LANG_POP([C++]) +if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then + if test "$CCACHE" != ""; then + AC_MSG_CHECKING([whether $CXX is already ccached]) + AC_LANG_PUSH([C++]) + save_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$CXXFLAGS --ccache-skip -O2" + dnl an empty program will do, we're checking the compiler flags + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], + [use_ccache=yes], [use_ccache=no]) + if test $use_ccache = yes; then + AC_MSG_RESULT([yes]) + else + CXX="$CCACHE $CXX" + AC_MSG_RESULT([no]) + fi + CXXFLAGS=$save_CXXFLAGS + AC_LANG_POP([C++]) + fi fi dnl =================================================================== From a0eef541ef974762ba3e38cbc7b68765a8319b3b Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Wed, 19 Sep 2012 11:13:25 -0400 Subject: [PATCH 498/863] only add win8 lib path for win8 sdk Change-Id: I9b30e5e0a8f961df1070f4ceb0e330558ab16335 --- configure.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index eebe6da88fba..e8e0295df290 100644 --- a/configure.in +++ b/configure.in @@ -12545,11 +12545,15 @@ if test "$build_os" = "cygwin"; then if test "$BITNESS_OVERRIDE" = 64; then ILIB="$ILIB;$COMPATH/lib/amd64" ILIB="$ILIB;$WINDOWS_SDK_HOME/lib64" - ILIB="$ILIB;$WINDOWS_SDK_HOME/lib/win8/um/x64" + if test "$WINDOWS_SDK_VERSION" = "80"; then + ILIB="$ILIB;$WINDOWS_SDK_HOME/lib/win8/um/x64" + fi else ILIB="$ILIB;$COMPATH/lib" ILIB="$ILIB;$WINDOWS_SDK_HOME/lib" - ILIB="$ILIB;$WINDOWS_SDK_HOME/lib/win8/um/x86" + if test "$WINDOWS_SDK_VERSION" = "80"; then + ILIB="$ILIB;$WINDOWS_SDK_HOME/lib/win8/um/x86" + fi fi ILIB="$ILIB;$DOTNET_FRAMEWORK_HOME/lib" From 8ae194caf7d4f2c9c065dbee3aa43d1dc07d9dfe Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Fri, 21 Sep 2012 16:57:37 -0400 Subject: [PATCH 499/863] fix mergedlib on windows Change-Id: I30ee99fe2a2e92c69ebfcef9af5ff1bb27ec114b --- cppuhelper/inc/cppuhelper/implbase1.hxx | 2 +- cppuhelper/inc/cppuhelper/implbase2.hxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cppuhelper/inc/cppuhelper/implbase1.hxx b/cppuhelper/inc/cppuhelper/implbase1.hxx index cf6125a2200b..57c71f566610 100644 --- a/cppuhelper/inc/cppuhelper/implbase1.hxx +++ b/cppuhelper/inc/cppuhelper/implbase1.hxx @@ -104,7 +104,7 @@ namespace cppu to implement 1 till 12 interfaces in your component. */ template< class Ifc1 > - class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakImplHelper1 + class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE SAL_DLLPUBLIC_EXPORT WeakImplHelper1 : public OWeakObject , public com::sun::star::lang::XTypeProvider , public Ifc1 diff --git a/cppuhelper/inc/cppuhelper/implbase2.hxx b/cppuhelper/inc/cppuhelper/implbase2.hxx index 3ed5aacf90d5..95a1b9fba2fb 100644 --- a/cppuhelper/inc/cppuhelper/implbase2.hxx +++ b/cppuhelper/inc/cppuhelper/implbase2.hxx @@ -100,7 +100,7 @@ namespace cppu Your sub class defines method implementations for these interface(s). */ template< class Ifc1, class Ifc2 > - class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakImplHelper2 + class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE SAL_DLLPUBLIC_EXPORT WeakImplHelper2 : public OWeakObject , public com::sun::star::lang::XTypeProvider , public Ifc1, public Ifc2 From 1685f36f3517d6e177dfd11a6e766d8fecedb83a Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Fri, 21 Sep 2012 19:16:52 -0400 Subject: [PATCH 500/863] add needed libraries to textconv_dict Change-Id: Ic0f55385c34bb253a1f452335ebcd3bba92ca9fa --- i18npool/Library_textconv_dict.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/i18npool/Library_textconv_dict.mk b/i18npool/Library_textconv_dict.mk index 23afa2113a7c..9afc2ac70cc2 100644 --- a/i18npool/Library_textconv_dict.mk +++ b/i18npool/Library_textconv_dict.mk @@ -37,6 +37,9 @@ $(eval $(call gb_Library_use_sdk_api,textconv_dict)) $(eval $(call gb_Library_use_libraries,textconv_dict,\ $(gb_UWINAPI) \ + sal \ + cppu \ + cppuhelper \ )) $(eval $(call gb_Library_add_generated_exception_objects,textconv_dict,\ From 0ba0b1ca90066fbae669ab66d1de1878e8f0e5f9 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Sat, 22 Sep 2012 09:42:16 -0400 Subject: [PATCH 501/863] prevent libmerged warning spam Change-Id: I8ee74175d3dc08318461dfe08ebd10b12ce8d814 --- Library_merged.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Library_merged.mk b/Library_merged.mk index 6c3b047ac484..51b919415bea 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -122,6 +122,11 @@ $(eval $(call gb_Library_use_system_win32_libs,merged,\ winmm \ winspool \ )) +# prevent warning spamming +$(eval $(call gb_Library_add_ldflags,merged,\ + /ignore:4049 \ + /ignore:4217 \ +)) $(eval $(call gb_Library_use_externals,merged,\ icuin \ )) From caa51aedc139cc6af678323658d352d6ea8509bf Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Sat, 22 Sep 2012 10:01:34 -0400 Subject: [PATCH 502/863] mergelibs works on windows now Change-Id: I536921b4734a50b90aa0007ebf2120306ce497a0 --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index e8e0295df290..faf2679fb54d 100644 --- a/configure.in +++ b/configure.in @@ -12574,7 +12574,7 @@ if test "$enable_mergelibs" = "yes" ; then add_warning "--enable-mergelibs conflicts with --enable-binfilter. Disabling mergelibs." AC_MSG_RESULT([no]) else - if test $_os != Linux -a $_os != Android; then + if test $_os != Linux -a $_os != Android -a $_os != WINNT; then add_warning "--enable-mergelibs is not tested for this platform" fi MERGELIBS="TRUE" From 8c1c24ac4e18dabce24f03effc3f6703656f2c4e Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Sat, 22 Sep 2012 17:38:00 -0400 Subject: [PATCH 503/863] add needed libraries to scui Change-Id: Ia6ef50bbb28c4d16154f8e673a4f3b3a1cef5cd5 --- sc/Library_scui.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk index 0cc40992aa37..92017d058f75 100644 --- a/sc/Library_scui.mk +++ b/sc/Library_scui.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_external,scui,mdds_headers)) $(eval $(call gb_Library_use_libraries,scui,\ comphelper \ cppu \ + cppuhelper \ editeng \ for \ forui \ From 1cf215b16fc65e27f3fa333af43bc067f5189f2b Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Mon, 24 Sep 2012 16:55:19 -0400 Subject: [PATCH 504/863] add needed libraries to sfx2_metadatatable Change-Id: I83aaa7170f59f89e4f1e7715295edceca3a9bef4 --- sfx2/CppunitTest_sfx2_metadatable.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sfx2/CppunitTest_sfx2_metadatable.mk b/sfx2/CppunitTest_sfx2_metadatable.mk index 277c56417f1c..c06dcac4bb2e 100644 --- a/sfx2/CppunitTest_sfx2_metadatable.mk +++ b/sfx2/CppunitTest_sfx2_metadatable.mk @@ -26,6 +26,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sfx2_metadatable, \ $(eval $(call gb_CppunitTest_use_sdk_api,sfx2_metadatable)) $(eval $(call gb_CppunitTest_use_libraries,sfx2_metadatable, \ + cppu \ + cppuhelper \ sal \ sfx \ $(gb_UWINAPI) \ From 6691aa36c1cc9175c87b86567b04bc632a09809e Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Tue, 25 Sep 2012 21:38:04 -0400 Subject: [PATCH 505/863] fix libwpd with VS2012 Change-Id: I2df9ab344bb2a934f6408a394280c01563d0c9b8 --- libwpd/ExternalProject_libwpd.mk | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/libwpd/ExternalProject_libwpd.mk b/libwpd/ExternalProject_libwpd.mk index 16ddad5bf2d0..f91314a34f4a 100644 --- a/libwpd/ExternalProject_libwpd.mk +++ b/libwpd/ExternalProject_libwpd.mk @@ -17,11 +17,22 @@ $(eval $(call gb_ExternalProject_register_targets,libwpd,\ ifeq ($(OS)$(COM),WNTMSC) +ifeq ($(CCNUMVER),90) $(call gb_ExternalProject_get_state_target,libwpd,build) : cd $(EXTERNAL_WORKDIR)/build/win32 \ && $(COMPATH)/vcpackages/vcbuild.exe libwpd.vcproj "Release|Win32" \ && touch $@ - +else ifeq ($(CCNUMVER),100) +$(call gb_ExternalProject_get_state_target,libwpd,build) : + cd $(EXTERNAL_WORKDIR)/build/win32 \ + && msbuild.exe libwpd.vcxproj \ + && touch $@ +else +$(call gb_ExternalProject_get_state_target,libwpd,build) : + cd $(EXTERNAL_WORKDIR)/build/win32 \ + && msbuild.exe libwpd.vcxproj /p:PlatformToolset=v110 /p:TargetName=libwpd-0.9 /p:Configuration=Release \ + && touch $@ +endif else $(call gb_ExternalProject_get_state_target,libwpd,build) : From 29440bd18985f6ab50029552c5e9d8d1cf643d4c Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Tue, 2 Oct 2012 14:26:12 -0400 Subject: [PATCH 506/863] add cppuhelper to sw tests Change-Id: Ie50c7adf5bd4ba1b18a8deb3e708bcf83a2777af --- sw/CppunitTest_sw_subsequent_ooxmlexport.mk | 1 + sw/CppunitTest_sw_subsequent_rtfexport.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/sw/CppunitTest_sw_subsequent_ooxmlexport.mk b/sw/CppunitTest_sw_subsequent_ooxmlexport.mk index 588349cad511..9eff7dd68dd4 100644 --- a/sw/CppunitTest_sw_subsequent_ooxmlexport.mk +++ b/sw/CppunitTest_sw_subsequent_ooxmlexport.mk @@ -36,6 +36,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_ooxmlexport, \ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmlexport, \ cppu \ + cppuhelper \ sal \ sw \ test \ diff --git a/sw/CppunitTest_sw_subsequent_rtfexport.mk b/sw/CppunitTest_sw_subsequent_rtfexport.mk index bd45fad4bb34..d6d2a290845f 100644 --- a/sw/CppunitTest_sw_subsequent_rtfexport.mk +++ b/sw/CppunitTest_sw_subsequent_rtfexport.mk @@ -36,6 +36,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_rtfexport, \ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtfexport, \ cppu \ + cppuhelper \ sal \ sw \ test \ From 8693885f8c80e13eef08841be2e672b35c81dfce Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Tue, 2 Oct 2012 21:48:12 -0400 Subject: [PATCH 507/863] fix libwpd for vs90 Change-Id: Ia8a21cd512ac425207eb31a194db9f4c9b10fee4 --- libwpd/ExternalProject_libwpd.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libwpd/ExternalProject_libwpd.mk b/libwpd/ExternalProject_libwpd.mk index f91314a34f4a..e8547ea1e879 100644 --- a/libwpd/ExternalProject_libwpd.mk +++ b/libwpd/ExternalProject_libwpd.mk @@ -17,12 +17,12 @@ $(eval $(call gb_ExternalProject_register_targets,libwpd,\ ifeq ($(OS)$(COM),WNTMSC) -ifeq ($(CCNUMVER),90) +ifeq ($(VCVER),90) $(call gb_ExternalProject_get_state_target,libwpd,build) : cd $(EXTERNAL_WORKDIR)/build/win32 \ && $(COMPATH)/vcpackages/vcbuild.exe libwpd.vcproj "Release|Win32" \ && touch $@ -else ifeq ($(CCNUMVER),100) +else ifeq ($(VCVER),100) $(call gb_ExternalProject_get_state_target,libwpd,build) : cd $(EXTERNAL_WORKDIR)/build/win32 \ && msbuild.exe libwpd.vcxproj \ From b23f3e484273ed44c36a0c039454cdfbf6f6f1e7 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Wed, 3 Oct 2012 16:58:15 -0400 Subject: [PATCH 508/863] download rebase if needed for all sdk versions Change-Id: I1417d243c94438c36158b0d5f873fa939b7d7642 --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index faf2679fb54d..4fbc6f5e9560 100644 --- a/configure.in +++ b/configure.in @@ -9134,7 +9134,7 @@ dnl Check for Micorosft rebase.exe dnl ========================================= if test "$build_os" = "cygwin"; then AC_PATH_PROG([REBASE], [rebase]) - if test \( -z "$REBASE" -o "$REBASE" = "/usr/bin/rebase" \) -a "$WINDOWS_SDK_VERSION" = "80"; then + if test \( -z "$REBASE" -o "$REBASE" = "/usr/bin/rebase" \); then REBASE=download AC_SUBST(REBASE) fi From d19932ac5795df8df46fdc6cc60153d4e6d6042e Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Fri, 5 Oct 2012 19:03:06 -0400 Subject: [PATCH 509/863] fix libcdr with VS2012 Change-Id: I9943dce422bd43b826baeaccaeb494d870aaaa77 --- libcdr/ExternalProject_libcdr.mk | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk index 933ce9722260..4982b8ca470a 100644 --- a/libcdr/ExternalProject_libcdr.mk +++ b/libcdr/ExternalProject_libcdr.mk @@ -22,6 +22,7 @@ $(eval $(call gb_ExternalProject_use_externals,libcdr,\ ifeq ($(OS)$(COM),WNTMSC) +ifeq ($(VCVER),90) $(call gb_ExternalProject_get_state_target,libcdr,build) : cd $(EXTERNAL_WORKDIR)/build/win32 \ && export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ @@ -30,6 +31,25 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) : && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ && $(COMPATH)/vcpackages/vcbuild.exe libcdr.vcproj "Release|Win32" \ && touch $@ +else ifeq ($(VCVER),100) +$(call gb_ExternalProject_get_state_target,libcdr,build) : + cd $(EXTERNAL_WORKDIR)/build/win32 \ + && export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && export LCMS2_INCLUDE_DIR=$(OUTDIR)/inc/lcms2 \ + && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ + && msbuild.exe libcdr.vcxproj /p:Configuration=Release \ + && touch $@ +else +$(call gb_ExternalProject_get_state_target,libcdr,build) : + cd $(EXTERNAL_WORKDIR)/build/win32 \ + && export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && export LCMS2_INCLUDE_DIR=$(OUTDIR)/inc/lcms2 \ + && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ + && msbuild.exe libcdr.vcxproj /p:PlatformToolset=v110 /p:Configuration=Release \ + && touch $@ +endif else From 8226b906382a98b6680ef8b09866786f42510143 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Sat, 6 Oct 2012 11:00:24 -0400 Subject: [PATCH 510/863] fix build.pl deps Change-Id: Ia532558eb25c3745f9d43303358b785994f389fe --- solenv/bin/build.pl | 3 ++- solenv/gbuild/tail_build_modules.mk | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl index 74d0f32ee087..b754f1665e02 100755 --- a/solenv/bin/build.pl +++ b/solenv/bin/build.pl @@ -556,9 +556,10 @@ sub expand_dependencies { sub get_tail_build_modules { my $tail_build_prj = shift; my $make = $ENV{'GNUMAKE'}; + my $build_type = $ENV{'BUILD_TYPE'}; my $tail_build_mk = "$tail_build_module_dir/Module_$tail_build_prj.mk"; - my $modules_str = `$make --no-print-directory -r -f $tail_build_modules_mk get_modules TAIL_BUILD_MK=$tail_build_mk`; + my $modules_str = `$make --no-print-directory -r -f $tail_build_modules_mk get_modules TAIL_BUILD_MK=$tail_build_mk BUILD_TYPE='$build_type'`; chomp $modules_str; my %modules = (); diff --git a/solenv/gbuild/tail_build_modules.mk b/solenv/gbuild/tail_build_modules.mk index e5301f4d9728..2ce60fd6af1f 100644 --- a/solenv/gbuild/tail_build_modules.mk +++ b/solenv/gbuild/tail_build_modules.mk @@ -29,6 +29,10 @@ TAIL_BUILD_MODULES := gb_Module_Module := +define gb_Helper_optional +$(if $(filter $(1),$(BUILD_TYPE)),$(2)) +endef + define gb_Module_add_moduledirs TAIL_BUILD_MODULES += $(2) From 5c02bb0f022ae6f51ccc07452901ad45a9a243e9 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 7 Oct 2012 11:50:10 +0300 Subject: [PATCH 511/863] DISABLE_DYNLOADING fixes and minor cleanup Change-Id: I08ce3523f259b1ace7c2a1a58b091b43a44a7d92 --- sfx2/source/appl/app.cxx | 33 ++++++++++++++++++++++++++++----- sfx2/source/appl/appserv.cxx | 7 ++----- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 3aa48ab14e60..a4ffed8510e7 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -468,17 +468,22 @@ void SfxApplication::Invalidate( sal_uInt16 nId ) Invalidate_Impl( pFrame->GetBindings(), nId ); } -#define DOSTRING( x ) #x -#define STRING( x ) DOSTRING( x ) - #ifndef DISABLE_SCRIPTING +#ifndef DISABLE_DYNLOADING + typedef long (SAL_CALL *basicide_handle_basic_error)(void*); -typedef rtl_uString* (SAL_CALL *basicide_choose_macro)(void*, sal_Bool, rtl_uString*); typedef void* (SAL_CALL *basicide_macro_organizer)(sal_Int16); extern "C" { static void SAL_CALL thisModule() {} } +#else + +extern "C" long basicide_handle_basic_error(void*); +extern "C" void *basicide_macro_organizer(sal_Int16); + +#endif + #endif IMPL_LINK( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*, pStarBasic ) @@ -487,6 +492,8 @@ IMPL_LINK( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*, pStarBasic ) (void) pStarBasic; return 0; #else + +#ifndef DISABLE_DYNLOADING // get basctl dllname static ::rtl::OUString aLibName( SVLIBRARY( "basctl" ) ); @@ -501,7 +508,14 @@ IMPL_LINK( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*, pStarBasic ) // call basicide_handle_basic_error in basctl long nRet = pSymbol ? pSymbol( pStarBasic ) : 0; +#else + + long nRet = basicide_handle_basic_error( pStarBasic ); + +#endif + return nRet; + #endif } @@ -586,6 +600,8 @@ void SfxApplication::MacroOrganizer( sal_Int16 nTabId ) #ifdef DISABLE_SCRIPTING (void) nTabId; #else + +#ifndef DISABLE_DYNLOADING // get basctl dllname static ::rtl::OUString aLibName( SVLIBRARY( "basctl" ) ); @@ -597,8 +613,15 @@ void SfxApplication::MacroOrganizer( sal_Int16 nTabId ) ::rtl::OUString aSymbol( "basicide_macro_organizer" ); basicide_macro_organizer pSymbol = (basicide_macro_organizer) osl_getFunctionSymbol( handleMod, aSymbol.pData ); - // call basicide_choose_macro in basctl + // call basicide_macro_organizer in basctl pSymbol( nTabId ); + +#else + + basicide_macro_organizer( nTabId ); + +#endif + #endif } diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 08d0352c6b63..450da3e9eebc 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -836,14 +836,11 @@ void SfxApplication::MiscState_Impl(SfxItemSet &rSet) #ifndef DISABLE_SCRIPTING +#ifndef DISABLE_DYNLOADING + typedef rtl_uString* (SAL_CALL *basicide_choose_macro)(XModel*, sal_Bool, rtl_uString*); typedef void (SAL_CALL *basicide_macro_organizer)( sal_Int16 ); -#define DOSTRING( x ) #x -#define STRING( x ) DOSTRING( x ) - -#ifndef DISABLE_DYNLOADING - extern "C" { static void SAL_CALL thisModule() {} } #else From 1f79b55bcabe2a627573e711a04d413d478c5882 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Sun, 7 Oct 2012 17:09:36 +0200 Subject: [PATCH 512/863] Some cppcheck cleaning Change-Id: I9ce4af18d1cdbf694093309a026fd6c738590b82 --- sfx2/source/doc/docfile.cxx | 1 + sfx2/source/doc/doctemplates.cxx | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 9c199ad53fb3..995be9cad8fe 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -325,6 +325,7 @@ SfxMedium_Impl::SfxMedium_Impl( SfxMedium* pAntiImplP ) : bIsStorage( false ), bUseInteractionHandler( true ), bAllowDefaultIntHdl( false ), + bDisposeStorage( false ), bStorageBasedOnInStream( false ), m_bSalvageMode( false ), m_bVersionsAlreadyLoaded( false ), diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index 76a4f5db6257..e1f1986ea930 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -618,12 +618,11 @@ void SfxDocTplService_Impl::getDirList() sal_Bool SfxDocTplService_Impl::needsUpdate() { OUString aPropName( PROPERTY_NEEDSUPDATE ); - sal_Bool bHasProperty = sal_False; sal_Bool bNeedsUpdate = sal_True; Any aValue; // Get the template dir list - bHasProperty = getProperty( maRootContent, aPropName, aValue ); + sal_Bool bHasProperty = getProperty( maRootContent, aPropName, aValue ); if ( bHasProperty ) aValue >>= bNeedsUpdate; From 378b578f9c33f35093c47090ff0271990346be93 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Sun, 7 Oct 2012 17:29:39 +0200 Subject: [PATCH 513/863] Remove unused mork methods Change-Id: I2d9c02145bf332ecfc0e2493bc697d61259c9d16 --- .../source/drivers/mork/MColumnAlias.cxx | 12 ------ .../source/drivers/mork/MColumnAlias.hxx | 1 - .../drivers/mork/MNSProfileDiscover.cxx | 42 ------------------- .../drivers/mork/MNSProfileDiscover.hxx | 4 -- unusedcode.easy | 5 --- 5 files changed, 64 deletions(-) diff --git a/connectivity/source/drivers/mork/MColumnAlias.cxx b/connectivity/source/drivers/mork/MColumnAlias.cxx index c8337875e272..624b5ab88e43 100644 --- a/connectivity/source/drivers/mork/MColumnAlias.cxx +++ b/connectivity/source/drivers/mork/MColumnAlias.cxx @@ -137,16 +137,4 @@ void OColumnAlias::initialize( const ::com::sun::star::uno::Reference< ::com::su return pos->second.programmaticAsciiName; } -//------------------------------------------------------------------ -bool OColumnAlias::isColumnSearchable( const ::rtl::OUString _alias ) const -{ - ::rtl::OString sProgrammatic = getProgrammaticNameOrFallbackToUTF8Alias( _alias ); - - return ( !sProgrammatic.equals( "HomeCountry" ) - && !sProgrammatic.equals( "WorkCountry" ) - ); - // for those, we know that they're not searchable in the Mozilla/LDAP implementation. - // There might be more ... -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mork/MColumnAlias.hxx b/connectivity/source/drivers/mork/MColumnAlias.hxx index 3b713ae89d56..45f6f780c966 100644 --- a/connectivity/source/drivers/mork/MColumnAlias.hxx +++ b/connectivity/source/drivers/mork/MColumnAlias.hxx @@ -67,7 +67,6 @@ namespace connectivity inline AliasMap::const_iterator begin() const { return m_aAliasMap.begin(); } inline AliasMap::const_iterator end() const { return m_aAliasMap.end(); } - bool isColumnSearchable( const ::rtl::OUString _alias ) const; private: void initialize( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB ); diff --git a/connectivity/source/drivers/mork/MNSProfileDiscover.cxx b/connectivity/source/drivers/mork/MNSProfileDiscover.cxx index 014e17cc89e9..9c7521cafb37 100644 --- a/connectivity/source/drivers/mork/MNSProfileDiscover.cxx +++ b/connectivity/source/drivers/mork/MNSProfileDiscover.cxx @@ -158,30 +158,6 @@ namespace connectivity return m_Product.mProfileList[profileName]->getProfilePath(); } - ::sal_Int32 ProfileAccess::getProfileCount( ::com::sun::star::mozilla::MozillaProductType product) throw (::com::sun::star::uno::RuntimeException) - { - sal_Int32 index=product; - ProductStruct &m_Product = m_ProductProfileList[index]; - return static_cast< ::sal_Int32 >(m_Product.mProfileList.size()); - } - ::sal_Int32 ProfileAccess::getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< ::rtl::OUString >& list ) throw (::com::sun::star::uno::RuntimeException) - { - sal_Int32 index=product; - ProductStruct &m_Product = m_ProductProfileList[index]; - list.realloc(static_cast(m_Product.mProfileList.size())); - sal_Int32 i=0; - for(ProfileList::iterator itor=m_Product.mProfileList.begin(); - itor != m_Product.mProfileList.end(); - ++itor) - { - ProfileStruct * aProfile = (*itor).second; - list[i] = aProfile->getProfileName(); - i++; - } - - return static_cast< ::sal_Int32 >(m_Product.mProfileList.size()); - } - ::rtl::OUString ProfileAccess::getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException) { sal_Int32 index=product; @@ -199,24 +175,6 @@ namespace connectivity ProfileStruct * aProfile = (*m_Product.mProfileList.begin()).second; return aProfile->getProfileName(); } - ::sal_Bool ProfileAccess::isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) - { - (void)product; /* avoid warning about unused parameter */ - (void)profileName; /* avoid warning about unused parameter */ - return sal_True; - } - - ::sal_Bool ProfileAccess::getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) - { - sal_Int32 index=product; - ProductStruct &m_Product = m_ProductProfileList[index]; - if (!m_Product.mProfileList.size() || m_Product.mProfileList.find(profileName) == m_Product.mProfileList.end()) - { - return sal_False; - } - else - return sal_True; - } } } diff --git a/connectivity/source/drivers/mork/MNSProfileDiscover.hxx b/connectivity/source/drivers/mork/MNSProfileDiscover.hxx index 1cb44cdcfeb8..be9562712da7 100644 --- a/connectivity/source/drivers/mork/MNSProfileDiscover.hxx +++ b/connectivity/source/drivers/mork/MNSProfileDiscover.hxx @@ -79,11 +79,7 @@ namespace connectivity virtual ~ProfileAccess(); ProfileAccess(); ::rtl::OUString getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); - ::sal_Int32 getProfileCount( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException); - ::sal_Int32 getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< ::rtl::OUString >& list ) throw (::com::sun::star::uno::RuntimeException); ::rtl::OUString getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException); - ::sal_Bool SAL_CALL isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); - ::sal_Bool SAL_CALL getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); protected: ProductStruct m_ProductProfileList[4]; sal_Int32 LoadProductsInfo(); diff --git a/unusedcode.easy b/unusedcode.easy index 1dddeaeee775..b836d67d8a56 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -70,11 +70,6 @@ comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(boost::share connectivity::file::OStatement_Base::reset() connectivity::mork::MQueryHelper::next() connectivity::mork::MQueryHelperResultEntry::insert(rtl::OString const&, rtl::OUString&) -connectivity::mork::OColumnAlias::isColumnSearchable(rtl::OUString) const -connectivity::mork::ProfileAccess::getProfileCount(com::sun::star::mozilla::MozillaProductType) -connectivity::mork::ProfileAccess::getProfileExists(com::sun::star::mozilla::MozillaProductType, rtl::OUString const&) -connectivity::mork::ProfileAccess::getProfileList(com::sun::star::mozilla::MozillaProductType, com::sun::star::uno::Sequence&) -connectivity::mork::ProfileAccess::isProfileLocked(com::sun::star::mozilla::MozillaProductType, rtl::OUString const&) connectivity::mozab::MQueryHelper::next() connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, unsigned char) connectivity::sdbcx::OGroup::OGroup(unsigned char) From 3fc40953c635185f8bcd1b58a1d68d28526558d4 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Sun, 23 Sep 2012 09:59:37 -0400 Subject: [PATCH 514/863] fix gbuildized cli_ure Change-Id: I3e02afbd1b75641bdc90443e7c07018c113a971a --- cli_ure/CliLibrary_cli_basetypes.mk | 4 ++++ cli_ure/CliNativeLibrary_cli_cppuhelper.mk | 2 +- cli_ure/CliUnoApi_cli_uretypes.mk | 2 ++ cli_ure/CustomTarget_cli_ure_assemblies.mk | 2 +- solenv/gbuild/CliLibrary.mk | 10 ++++++++++ 5 files changed, 18 insertions(+), 2 deletions(-) diff --git a/cli_ure/CliLibrary_cli_basetypes.mk b/cli_ure/CliLibrary_cli_basetypes.mk index 2d7b93737823..2dcc2e18b172 100644 --- a/cli_ure/CliLibrary_cli_basetypes.mk +++ b/cli_ure/CliLibrary_cli_basetypes.mk @@ -32,4 +32,8 @@ $(eval $(call gb_CliLibrary_add_generated_csfiles,cli_basetypes,\ CustomTarget/cli_ure/source/basetypes/assembly \ )) +$(eval $(call gb_CliLibrary_use_package,cli_basetypes,\ + cli_ure_cliuno \ +)) + # vim: set noet sw=4 ts=4: diff --git a/cli_ure/CliNativeLibrary_cli_cppuhelper.mk b/cli_ure/CliNativeLibrary_cli_cppuhelper.mk index 8372f93dafe6..dfc52baf33ce 100644 --- a/cli_ure/CliNativeLibrary_cli_cppuhelper.mk +++ b/cli_ure/CliNativeLibrary_cli_cppuhelper.mk @@ -15,7 +15,7 @@ $(eval $(call gb_CliNativeLibrary_wrap_library,cli_cppuhelper,cli_cppuhelper_nat $(eval $(call gb_CliNativeLibrary_set_configfile,cli_cppuhelper,cli_ure/source/native/cli_cppuhelper_config)) -$(eval $(call gb_CliNativeLibrary_set_keyfile,cli_cppuhelper,$(SRCDIR)/cli_ure/source/clinuo.snk)) +$(eval $(call gb_CliNativeLibrary_set_keyfile,cli_cppuhelper,$(SRCDIR)/cli_ure/source/cliuno.snk)) $(eval $(call gb_CliNativeLibrary_set_policy,cli_cppuhelper,$(CLI_CPPUHELPER_POLICY_ASSEMBLY),$(CLI_CPPUHELPER_POLICY_VERSION))) diff --git a/cli_ure/CliUnoApi_cli_uretypes.mk b/cli_ure/CliUnoApi_cli_uretypes.mk index 5748523ca8a8..78de63a223f9 100644 --- a/cli_ure/CliUnoApi_cli_uretypes.mk +++ b/cli_ure/CliUnoApi_cli_uretypes.mk @@ -21,4 +21,6 @@ $(eval $(call gb_CliUnoApi_set_policy,cli_uretypes,$(CLI_URETYPES_POLICY_ASSEMBL $(eval $(call gb_CliUnoApi_wrap_api,cli_uretypes,udkapi)) +$(call gb_CliUnoApiTarget_get_target,cli_uretypes) :| $(call gb_Library_get_target,bootstrap) + # vim: set noet sw=4 ts=4: diff --git a/cli_ure/CustomTarget_cli_ure_assemblies.mk b/cli_ure/CustomTarget_cli_ure_assemblies.mk index da66178251d1..2adeae81bead 100644 --- a/cli_ure/CustomTarget_cli_ure_assemblies.mk +++ b/cli_ure/CustomTarget_cli_ure_assemblies.mk @@ -10,7 +10,7 @@ cli_ure_source_MAKEFILE := $(lastword $(MAKEFILE_LIST)) # FIXME move this to configure.in ? -cli_ure_CCNUMVER = $(shell $(CXX) | $(gb_AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk) +cli_ure_CCNUMVER = $(shell PATH='$(PATH)' $(CXX) | $(gb_AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk) cli_ure_CCNUMVER_GOOD = $(shell expr $(cli_ure_CCNUMVER) '>=' 001399999999) include $(SRCDIR)/cli_ure/version/version.txt diff --git a/solenv/gbuild/CliLibrary.mk b/solenv/gbuild/CliLibrary.mk index 9cf6bd577b21..30a3c25fa1e9 100644 --- a/solenv/gbuild/CliLibrary.mk +++ b/solenv/gbuild/CliLibrary.mk @@ -81,6 +81,11 @@ $(call gb_CliLibraryTarget_get_target,$(1)) : $(call gb_CliLibrary_get_target,$( endef +define gb_CliLibraryTarget_use_package +$(call gb_CliLibraryTarget_get_target,$(1)) :| $(call gb_Package_get_target,$(strip $(2))) + +endef + define gb_CliLibraryTarget_use_assemblies $(foreach assembly,$(2),$(call gb_CliLibraryTarget_use_assembly,$(1),$(assembly))) @@ -146,6 +151,11 @@ $(call gb_CliAssembly_set_configfile,$(1),$(2)) endef +define gb_CliLibrary_use_package +$(call gb_CliLibraryTarget_use_package,$(1),$(2)) + +endef + define gb_CliLibrary_set_keyfile $(call gb_CliAssembly_set_keyfile,$(1),$(2)) From 68d6252312a75627c51f1da45f8e01fedf0f3c60 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 7 Oct 2012 20:00:38 +0200 Subject: [PATCH 515/863] most of this is not necessary anymore This reverts commit 3fc40953c635185f8bcd1b58a1d68d28526558d4. Change-Id: I6d11212cc260e03e5c83a0e7be93ed66e1ab452f --- cli_ure/CliLibrary_cli_basetypes.mk | 4 ---- cli_ure/CliUnoApi_cli_uretypes.mk | 2 -- cli_ure/CustomTarget_cli_ure_assemblies.mk | 2 +- solenv/gbuild/CliLibrary.mk | 10 ---------- 4 files changed, 1 insertion(+), 17 deletions(-) diff --git a/cli_ure/CliLibrary_cli_basetypes.mk b/cli_ure/CliLibrary_cli_basetypes.mk index 2dcc2e18b172..2d7b93737823 100644 --- a/cli_ure/CliLibrary_cli_basetypes.mk +++ b/cli_ure/CliLibrary_cli_basetypes.mk @@ -32,8 +32,4 @@ $(eval $(call gb_CliLibrary_add_generated_csfiles,cli_basetypes,\ CustomTarget/cli_ure/source/basetypes/assembly \ )) -$(eval $(call gb_CliLibrary_use_package,cli_basetypes,\ - cli_ure_cliuno \ -)) - # vim: set noet sw=4 ts=4: diff --git a/cli_ure/CliUnoApi_cli_uretypes.mk b/cli_ure/CliUnoApi_cli_uretypes.mk index 78de63a223f9..5748523ca8a8 100644 --- a/cli_ure/CliUnoApi_cli_uretypes.mk +++ b/cli_ure/CliUnoApi_cli_uretypes.mk @@ -21,6 +21,4 @@ $(eval $(call gb_CliUnoApi_set_policy,cli_uretypes,$(CLI_URETYPES_POLICY_ASSEMBL $(eval $(call gb_CliUnoApi_wrap_api,cli_uretypes,udkapi)) -$(call gb_CliUnoApiTarget_get_target,cli_uretypes) :| $(call gb_Library_get_target,bootstrap) - # vim: set noet sw=4 ts=4: diff --git a/cli_ure/CustomTarget_cli_ure_assemblies.mk b/cli_ure/CustomTarget_cli_ure_assemblies.mk index 2adeae81bead..da66178251d1 100644 --- a/cli_ure/CustomTarget_cli_ure_assemblies.mk +++ b/cli_ure/CustomTarget_cli_ure_assemblies.mk @@ -10,7 +10,7 @@ cli_ure_source_MAKEFILE := $(lastword $(MAKEFILE_LIST)) # FIXME move this to configure.in ? -cli_ure_CCNUMVER = $(shell PATH='$(PATH)' $(CXX) | $(gb_AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk) +cli_ure_CCNUMVER = $(shell $(CXX) | $(gb_AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk) cli_ure_CCNUMVER_GOOD = $(shell expr $(cli_ure_CCNUMVER) '>=' 001399999999) include $(SRCDIR)/cli_ure/version/version.txt diff --git a/solenv/gbuild/CliLibrary.mk b/solenv/gbuild/CliLibrary.mk index 30a3c25fa1e9..9cf6bd577b21 100644 --- a/solenv/gbuild/CliLibrary.mk +++ b/solenv/gbuild/CliLibrary.mk @@ -81,11 +81,6 @@ $(call gb_CliLibraryTarget_get_target,$(1)) : $(call gb_CliLibrary_get_target,$( endef -define gb_CliLibraryTarget_use_package -$(call gb_CliLibraryTarget_get_target,$(1)) :| $(call gb_Package_get_target,$(strip $(2))) - -endef - define gb_CliLibraryTarget_use_assemblies $(foreach assembly,$(2),$(call gb_CliLibraryTarget_use_assembly,$(1),$(assembly))) @@ -151,11 +146,6 @@ $(call gb_CliAssembly_set_configfile,$(1),$(2)) endef -define gb_CliLibrary_use_package -$(call gb_CliLibraryTarget_use_package,$(1),$(2)) - -endef - define gb_CliLibrary_set_keyfile $(call gb_CliAssembly_set_keyfile,$(1),$(2)) From ccb65352599dc2cc0b561d01ac12a513705d936d Mon Sep 17 00:00:00 2001 From: Ivan Timofeev Date: Sun, 7 Oct 2012 22:25:58 +0400 Subject: [PATCH 516/863] fdo#55567: add findbar.xml back to makefile regression from e125d95ba4a4905fa36ba8f4bed0c2dafd37ce13 Change-Id: I0deeb042c60d3f7d556286a0956bb4866e1c203b --- sw/Package_uiconfig.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/sw/Package_uiconfig.mk b/sw/Package_uiconfig.mk index 150b3ae2b93b..18eb9086d4f9 100644 --- a/sw/Package_uiconfig.mk +++ b/sw/Package_uiconfig.mk @@ -194,6 +194,7 @@ $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolb $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/drawingobjectbar.xml,swriter/toolbar/drawingobjectbar.xml)) $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/drawtextobjectbar.xml,swriter/toolbar/drawtextobjectbar.xml)) $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/extrusionobjectbar.xml,swriter/toolbar/extrusionobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/findbar.xml,swriter/toolbar/findbar.xml)) $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/flowchartshapes.xml,swriter/toolbar/flowchartshapes.xml)) $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/fontworkobjectbar.xml,swriter/toolbar/fontworkobjectbar.xml)) $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/fontworkshapetype.xml,swriter/toolbar/fontworkshapetype.xml)) From b5ce0607f0e8cb08180fb3598d8501ae5f465c21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= Date: Sun, 7 Oct 2012 23:51:30 +0200 Subject: [PATCH 517/863] Fix libwpd with VS2010 Change-Id: I058d673552280616adaaf1b71036ee89ba34bb13 --- libwpd/ExternalProject_libwpd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libwpd/ExternalProject_libwpd.mk b/libwpd/ExternalProject_libwpd.mk index e8547ea1e879..4d1ea615d9ff 100644 --- a/libwpd/ExternalProject_libwpd.mk +++ b/libwpd/ExternalProject_libwpd.mk @@ -25,7 +25,7 @@ $(call gb_ExternalProject_get_state_target,libwpd,build) : else ifeq ($(VCVER),100) $(call gb_ExternalProject_get_state_target,libwpd,build) : cd $(EXTERNAL_WORKDIR)/build/win32 \ - && msbuild.exe libwpd.vcxproj \ + && msbuild.exe libwpd.vcxproj /p:Configuration=Release \ && touch $@ else $(call gb_ExternalProject_get_state_target,libwpd,build) : From cc14e3b9e4fbecd9ef533c8490605f41e01ab459 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sun, 7 Oct 2012 23:42:24 -0500 Subject: [PATCH 518/863] clean-up after configure On MacOSX libconftest[12].dylib.dSYM directories where left over after a test to determine visibility support use a wider net to clean-up work files Change-Id: Ie3695c08a5a22dbb1e5a194f8dc1bc6120c8e8c2 --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 4fbc6f5e9560..bc69e74e3bec 100644 --- a/configure.in +++ b/configure.in @@ -5451,7 +5451,7 @@ _ACEOF fi fi - rm -f libconftest1$DLLPOST libconftest2$DLLPOST + rm -fr libconftest* AC_MSG_RESULT([$gccvisinlineshiddenok]) if test "$gccvisinlineshiddenok" = "no"; then AC_MSG_WARN([Your gcc/clang is not -fvisibility-inlines-hidden safe, disabling that.]) From 45948e12698a30facf6e247e7c6df3e41417cd14 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sun, 7 Oct 2012 23:43:35 -0500 Subject: [PATCH 519/863] untabify configure.in over time, unscrupulous committers allow intenpestive tab and trailling spaces to creep in. This cleans them up. Change-Id: Ia9134599cdf58462bb4231e88362d4ff00ab45ab --- configure.in | 224 +++++++++++++++++++++++++-------------------------- 1 file changed, 112 insertions(+), 112 deletions(-) diff --git a/configure.in b/configure.in index bc69e74e3bec..cc8524f99d9a 100644 --- a/configure.in +++ b/configure.in @@ -671,7 +671,7 @@ dnl ---------- *** ---------- AC_ARG_ENABLE(mergelibs, AS_HELP_STRING([--enable-mergelibs], [Enables linking of big, merged, library. Experimental feature tested - only on Linux and Android.]) + only on Linux and Android.]) ) AC_ARG_ENABLE(graphite, @@ -2762,7 +2762,7 @@ if test "$_os" = "Darwin"; then # If no CC and CXX environment vars, try to guess where the compiler is if test -z "$save_CC"; then - AC_MSG_CHECKING([what compiler to use]) + AC_MSG_CHECKING([what compiler to use]) case $with_macosx_sdk in 10.4) case "$MACOSX_SDK_PATH" in @@ -2796,7 +2796,7 @@ if test "$_os" = "Darwin"; then esac AC_MSG_RESULT([$CC and $CXX]) fi - + case "$with_macosx_version_max_allowed" in 10.4) MAC_OS_X_VERSION_MAX_ALLOWED="1040" @@ -2848,10 +2848,10 @@ if test "$_os" = "WINNT" -a "$WITH_MINGW" != yes; then AC_MSG_CHECKING([whether to build a 64-bit LibreOffice]) if test "$enable_64_bit" = "" -o "$enable_64_bit" = "no"; then AC_MSG_RESULT([no]) - SDK_ARCH="x86" + SDK_ARCH="x86" else AC_MSG_RESULT([yes]) - SDK_ARCH="x64" + SDK_ARCH="x64" BITNESS_OVERRIDE=64 fi @@ -3185,15 +3185,15 @@ if test "$_os" = "WINNT"; then if test "$CCNUMVER" -ge "001700000000"; then COMEX=14 MSVSVER=2012 - VCVER=110 + VCVER=110 elif test "$CCNUMVER" -ge "001600000000"; then COMEX=13 MSVSVER=2010 - VCVER=100 + VCVER=100 elif test "$CCNUMVER" -ge "001500000000"; then COMEX=12 MSVSVER=2008 - VCVER=90 + VCVER=90 else AC_MSG_ERROR([Compiler too old. Use Microsoft Visual Studio 2008 or 2010.]) fi @@ -3290,22 +3290,22 @@ AC_SUBST(DBGHELP_DLL) # prefix C with ccache if needed # if test "$CCACHE" != ""; then - AC_MSG_CHECKING([whether $CC is already ccached]) + AC_MSG_CHECKING([whether $CC is already ccached]) - AC_LANG_PUSH([C]) - save_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS --ccache-skip -O2" - dnl an empty program will do, we're checking the compiler flags - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], - [use_ccache=yes], [use_ccache=no]) - if test $use_ccache = yes; then - AC_MSG_RESULT([yes]) - else - CC="$CCACHE $CC" - AC_MSG_RESULT([no]) - fi - CFLAGS=$save_CFLAGS - AC_LANG_POP([C]) + AC_LANG_PUSH([C]) + save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS --ccache-skip -O2" + dnl an empty program will do, we're checking the compiler flags + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], + [use_ccache=yes], [use_ccache=no]) + if test $use_ccache = yes; then + AC_MSG_RESULT([yes]) + else + CC="$CCACHE $CC" + AC_MSG_RESULT([no]) + fi + CFLAGS=$save_CFLAGS + AC_LANG_POP([C]) fi # @@ -4675,9 +4675,9 @@ if test "$build_os" = "cygwin"; then winsdktest=`./oowintool --windows-sdk-home` if test -x "$winsdktest/Bin/midl.exe"; then MIDL_PATH="$winsdktest/Bin" - elif test -x "$winsdktest/Bin/$SDK_ARCH/midl.exe"; then - MIDL_PATH="$winsdktest/Bin/$SDK_ARCH" - fi + elif test -x "$winsdktest/Bin/$SDK_ARCH/midl.exe"; then + MIDL_PATH="$winsdktest/Bin/$SDK_ARCH" + fi fi if test ! -x "$MIDL_PATH/midl.exe"; then AC_MSG_ERROR([midl.exe not found. Make sure it's in PATH or use --with-midl-path]) @@ -4709,7 +4709,7 @@ if test "$build_os" = "cygwin"; then CSC_PATH=`cygpath -d "$CSC_PATH"` CSC_PATH=`cygpath -u "$CSC_PATH"` - dnl Check al.exe + dnl Check al.exe AC_PATH_PROG(AL_PATH, al.exe) if test -n "$AL_PATH";then AL_PATH=`dirname "$AL_PATH"` @@ -4724,11 +4724,11 @@ if test "$build_os" = "cygwin"; then winsdktest=`./oowintool --windows-sdk-home` if test -x "$winsdktest/Bin/al.exe"; then AL_PATH="$winsdktest/Bin" - fi + fi fi - if test -z "$AL_PATH"; then + if test -z "$AL_PATH"; then altest=`./oowintool --al-home` - if test -x "$altest/bin/al.exe"; then + if test -x "$altest/bin/al.exe"; then AL_PATH="$altest/bin" elif test -x "$altest/al.exe"; then AL_PATH="$altest" @@ -4740,13 +4740,13 @@ if test "$build_os" = "cygwin"; then # Convert to posix path with 8.3 filename restrictions ( No spaces ) AL_PATH=`cygpath -d "$AL_PATH"` AL_PATH=`cygpath -u "$AL_PATH"` - + dnl Check mscoree.lib / .NET Framework dir AC_MSG_CHECKING(.NET Framework) if test -n "$with_dotnet_framework_home"; then with_dotnet_framework_home=`cygpath -u "$with_dotnet_framework_home"` fi - if test -f "$with_dotnet_framework_home/lib/mscoree.lib"; then + if test -f "$with_dotnet_framework_home/lib/mscoree.lib"; then DOTNET_FRAMEWORK_HOME="$with_dotnet_framework_home" fi if test -z "$DOTNET_FRAMEWORK_HOME"; then @@ -4767,8 +4767,8 @@ if test "$build_os" = "cygwin"; then PathFormat "$MIDL_PATH" MIDL_PATH="$formatted_path" - - PathFormat "$AL_PATH" + + PathFormat "$AL_PATH" AL_PATH="$formatted_path" PathFormat "$DOTNET_FRAMEWORK_HOME" @@ -4851,23 +4851,23 @@ fi # prefx CXX with ccache if needed # if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then - if test "$CCACHE" != ""; then - AC_MSG_CHECKING([whether $CXX is already ccached]) - AC_LANG_PUSH([C++]) - save_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$CXXFLAGS --ccache-skip -O2" - dnl an empty program will do, we're checking the compiler flags - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], - [use_ccache=yes], [use_ccache=no]) - if test $use_ccache = yes; then - AC_MSG_RESULT([yes]) - else - CXX="$CCACHE $CXX" - AC_MSG_RESULT([no]) - fi - CXXFLAGS=$save_CXXFLAGS - AC_LANG_POP([C++]) - fi + if test "$CCACHE" != ""; then + AC_MSG_CHECKING([whether $CXX is already ccached]) + AC_LANG_PUSH([C++]) + save_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$CXXFLAGS --ccache-skip -O2" + dnl an empty program will do, we're checking the compiler flags + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], + [use_ccache=yes], [use_ccache=no]) + if test $use_ccache = yes; then + AC_MSG_RESULT([yes]) + else + CXX="$CCACHE $CXX" + AC_MSG_RESULT([no]) + fi + CXXFLAGS=$save_CXXFLAGS + AC_LANG_POP([C++]) + fi fi dnl =================================================================== @@ -5312,15 +5312,15 @@ if test "$GCC" = "yes"; then AC_MSG_CHECKING([whether $CC supports atomic functions]) AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ - int v = 0; - if (__sync_add_and_fetch(&v, 1) != 1 || - __sync_sub_and_fetch(&v, 1) != 0) - return 1; - __sync_synchronize(); - if (__sync_val_compare_and_swap(&v, 0, 1) != 0 || - v != 1) - return 1; - return 0; + int v = 0; + if (__sync_add_and_fetch(&v, 1) != 1 || + __sync_sub_and_fetch(&v, 1) != 0) + return 1; + __sync_synchronize(); + if (__sync_val_compare_and_swap(&v, 0, 1) != 0 || + v != 1) + return 1; + return 0; ]])],[HAVE_GCC_BUILTIN_ATOMIC=TRUE],[]) if test "$HAVE_GCC_BUILTIN_ATOMIC" = "TRUE"; then AC_MSG_RESULT([yes]) @@ -9067,7 +9067,7 @@ problem can be found in issue 49856.]) -a -f "$WINDOWS_SDK_HOME/Include/SqlUcode.h" \ -a -f "$WINDOWS_SDK_HOME/Include/usp10.h"; then HAVE_PSDK_H="yes" - elif test -f "$WINDOWS_SDK_HOME/Include/um/adoint.h" \ + elif test -f "$WINDOWS_SDK_HOME/Include/um/adoint.h" \ -a -f "$WINDOWS_SDK_HOME/Include/um/SqlUcode.h" \ -a -f "$WINDOWS_SDK_HOME/Include/um/usp10.h"; then HAVE_PSDK_H="yes" @@ -9076,7 +9076,7 @@ problem can be found in issue 49856.]) fi if test -f "$WINDOWS_SDK_HOME/lib/user32.lib"; then HAVE_PSDK_LIB="yes" - elif test -f "$WINDOWS_SDK_HOME/lib/win8/um/$SDK_ARCH/user32.lib"; then + elif test -f "$WINDOWS_SDK_HOME/lib/win8/um/$SDK_ARCH/user32.lib"; then HAVE_PSDK_LIB="yes" else HAVE_PSDK_LIB="no" @@ -9091,11 +9091,11 @@ the Windows SDK are installed.]) -o ! -x "$WINDOWS_SDK_HOME/bin/msidb.exe" \ -o ! -x "$WINDOWS_SDK_HOME/bin/uuidgen.exe" \ -o ! -x "$WINDOWS_SDK_HOME/bin/msitran.exe"; then : - elif test ! -x "$WINDOWS_SDK_HOME/bin/x86/msiinfo.exe" \ + elif test ! -x "$WINDOWS_SDK_HOME/bin/x86/msiinfo.exe" \ -o ! -x "$WINDOWS_SDK_HOME/bin/x86/msidb.exe" \ -o ! -x "$WINDOWS_SDK_HOME/bin/x86/uuidgen.exe" \ -o ! -x "$WINDOWS_SDK_HOME/bin/x86/msitran.exe"; then : - else + else AC_MSG_ERROR([Some (all) files of the Windows Installer SDK are missing, please install.]) fi fi @@ -9103,16 +9103,16 @@ the Windows SDK are installed.]) if test -z "$WINDOWS_SDK_HOME"; then AC_MSG_RESULT([no, hoping the necessary headers and libraries will be found anyway]) elif echo $WINDOWS_SDK_HOME | grep "v6.1" >/dev/null 2>/dev/null; then - WINDOWS_SDK_VERSION=61 + WINDOWS_SDK_VERSION=61 AC_MSG_RESULT([found Windows SDK 6.1 ($WINDOWS_SDK_HOME)]) elif echo $WINDOWS_SDK_HOME | grep "v6.0" >/dev/null 2>/dev/null; then - WINDOWS_SDK_VERSION=60 + WINDOWS_SDK_VERSION=60 AC_MSG_RESULT([found Windows SDK 6.0 ($WINDOWS_SDK_HOME)]) elif echo $WINDOWS_SDK_HOME | grep "v7" >/dev/null 2>/dev/null; then - WINDOWS_SDK_VERSION=70 + WINDOWS_SDK_VERSION=70 AC_MSG_RESULT([found Windows SDK 7 ($WINDOWS_SDK_HOME)]) - elif echo $WINDOWS_SDK_HOME | grep "8.0" >/dev/null 2>/dev/null; then - WINDOWS_SDK_VERSION=80 + elif echo $WINDOWS_SDK_HOME | grep "8.0" >/dev/null 2>/dev/null; then + WINDOWS_SDK_VERSION=80 AC_MSG_RESULT([found Windows SDK 8.0 ($WINDOWS_SDK_HOME)]) else AC_MSG_ERROR([Found legacy Windows Platform SDK ($WINDOWS_SDK_HOME)]) @@ -9121,9 +9121,9 @@ the Windows SDK are installed.]) WINDOWS_SDK_HOME="$formatted_path" if test "$build_os" = "cygwin"; then SOLARINC="$SOLARINC -I$WINDOWS_SDK_HOME/include -I$COMPATH/include" - if test -d "$WINDOWS_SDK_HOME/include/um"; then - SOLARINC="$SOLARINC -I$WINDOWS_SDK_HOME/include/um -I$WINDOWS_SDK_HOME/include/shared" - fi + if test -d "$WINDOWS_SDK_HOME/include/um"; then + SOLARINC="$SOLARINC -I$WINDOWS_SDK_HOME/include/um -I$WINDOWS_SDK_HOME/include/shared" + fi fi fi AC_SUBST(WINDOWS_SDK_HOME) @@ -9133,10 +9133,10 @@ dnl ========================================= dnl Check for Micorosft rebase.exe dnl ========================================= if test "$build_os" = "cygwin"; then - AC_PATH_PROG([REBASE], [rebase]) + AC_PATH_PROG([REBASE], [rebase]) if test \( -z "$REBASE" -o "$REBASE" = "/usr/bin/rebase" \); then REBASE=download - AC_SUBST(REBASE) + AC_SUBST(REBASE) fi fi @@ -9517,41 +9517,41 @@ AC_SUBST(DBUS_LIBS) AC_MSG_CHECKING([whether to enable font install via packagekit]) if test "$ENABLE_DBUS" = "TRUE"; then - if test -n "$enable_packagekit" -a "$enable_packagekit" != "no"; then - ENABLE_PACKAGEKIT=YES - AC_MSG_RESULT([yes]) - else - ENABLE_PACKAGEKIT=NO - AC_MSG_RESULT([no]) - fi + if test -n "$enable_packagekit" -a "$enable_packagekit" != "no"; then + ENABLE_PACKAGEKIT=YES + AC_MSG_RESULT([yes]) + else + ENABLE_PACKAGEKIT=NO + AC_MSG_RESULT([no]) + fi else - AC_MSG_RESULT([no, dbus disabled.]) + AC_MSG_RESULT([no, dbus disabled.]) fi AC_SUBST(ENABLE_PACKAGEKIT) AC_MSG_CHECKING([whether to enable sd remotecontrol]) if test "$ENABLE_DBUS" = "TRUE"; then - if test -n "$enable_sdremote" -a "$enable_sdremote" != "no"; then - AC_MSG_RESULT([yes]) - ENABLE_SDREMOTE=YES - if test "$OS" = "LINUX"; then - dnl =================================================================== - dnl Check for system bluez - dnl =================================================================== - AC_MSG_CHECKING([which bluetooth header to use]) - if test "$with_system_bluez" = "yes"; then - AC_MSG_RESULT([external]) - AC_CHECK_HEADER(bluetooth/bluetooth.h, [], - [AC_MSG_ERROR(bluetooth.h not found. install bluez)], []) - else - AC_MSG_RESULT([internal]) - BUILD_TYPE="$BUILD_TYPE BLUEZ" - fi - fi - else - ENABLE_SDREMOTE=NO - AC_MSG_RESULT([no]) - fi + if test -n "$enable_sdremote" -a "$enable_sdremote" != "no"; then + AC_MSG_RESULT([yes]) + ENABLE_SDREMOTE=YES + if test "$OS" = "LINUX"; then + dnl =================================================================== + dnl Check for system bluez + dnl =================================================================== + AC_MSG_CHECKING([which bluetooth header to use]) + if test "$with_system_bluez" = "yes"; then + AC_MSG_RESULT([external]) + AC_CHECK_HEADER(bluetooth/bluetooth.h, [], + [AC_MSG_ERROR(bluetooth.h not found. install bluez)], []) + else + AC_MSG_RESULT([internal]) + BUILD_TYPE="$BUILD_TYPE BLUEZ" + fi + fi + else + ENABLE_SDREMOTE=NO + AC_MSG_RESULT([no]) + fi else AC_MSG_RESULT([no, dbus disabled.]) fi @@ -12545,15 +12545,15 @@ if test "$build_os" = "cygwin"; then if test "$BITNESS_OVERRIDE" = 64; then ILIB="$ILIB;$COMPATH/lib/amd64" ILIB="$ILIB;$WINDOWS_SDK_HOME/lib64" - if test "$WINDOWS_SDK_VERSION" = "80"; then - ILIB="$ILIB;$WINDOWS_SDK_HOME/lib/win8/um/x64" - fi + if test "$WINDOWS_SDK_VERSION" = "80"; then + ILIB="$ILIB;$WINDOWS_SDK_HOME/lib/win8/um/x64" + fi else ILIB="$ILIB;$COMPATH/lib" ILIB="$ILIB;$WINDOWS_SDK_HOME/lib" - if test "$WINDOWS_SDK_VERSION" = "80"; then - ILIB="$ILIB;$WINDOWS_SDK_HOME/lib/win8/um/x86" - fi + if test "$WINDOWS_SDK_VERSION" = "80"; then + ILIB="$ILIB;$WINDOWS_SDK_HOME/lib/win8/um/x86" + fi fi ILIB="$ILIB;$DOTNET_FRAMEWORK_HOME/lib" @@ -12741,14 +12741,14 @@ else pathmunge "$WINDOWS_SDK_HOME/bin" "before" pathmunge "$CSC_PATH" "before" pathmunge "$MIDL_PATH" "before" - pathmunge "$AL_PATH" "before" + pathmunge "$AL_PATH" "before" pathmunge "$MSPDB_PATH" "before" if test "$BITNESS_OVERRIDE" = 64; then pathmunge "$COMPATH/bin/amd64" "before" - pathmunge "$WINDOWS_SDK_HOME/bin/x64" "before" + pathmunge "$WINDOWS_SDK_HOME/bin/x64" "before" else pathmunge "$COMPATH/bin" "before" - pathmunge "$WINDOWS_SDK_HOME/bin/x86" "before" + pathmunge "$WINDOWS_SDK_HOME/bin/x86" "before" fi if test "$SOLAR_JAVA" != "" -a "$JDK"!="gcj"; then if test -d "$JAVA_HOME/jre/bin/client"; then From d650d404c006ffcbb47d6871e2eab6fc4d764c40 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 7 Oct 2012 23:14:05 +0300 Subject: [PATCH 520/863] Deduplicate CTB, TBC and CTBWrapper (for disable-dynloading) Change-Id: I0e9895ca59fa75958107df2cbf4348214df52664 --- sc/source/filter/excel/excimp8.cxx | 2 +- sc/source/filter/excel/xltoolbar.cxx | 76 ++++++++++----------- sc/source/filter/excel/xltoolbar.hxx | 36 +++++----- sw/source/filter/ww8/ww8toolbar.cxx | 98 ++++++++++++++-------------- sw/source/filter/ww8/ww8toolbar.hxx | 60 ++++++++--------- 5 files changed, 136 insertions(+), 136 deletions(-) diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index 416b3da01763..d0a4a7ea0161 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -343,7 +343,7 @@ void ImportExcel8::ReadBasic( void ) SvStorageStreamRef xXCB = xRootStrg->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM( "XCB" ) ), STREAM_STD_READ | STREAM_NOCREATE ); if ( xXCB.Is()|| SVSTREAM_OK == xXCB->GetError() ) { - CTBWrapper wrapper; + ScCTBWrapper wrapper; if ( wrapper.Read( *xXCB ) ) { #if OSL_DEBUG_LEVEL > 1 diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx index b8fd7539aa79..f582ab89a300 100644 --- a/sc/source/filter/excel/xltoolbar.cxx +++ b/sc/source/filter/excel/xltoolbar.cxx @@ -94,17 +94,17 @@ CTBS::CTBS() : bSignature(0), bVersion(0), reserved1(0), reserved2(0), reserved3 { } -CTB::CTB() : nViews( 0 ), ectbid(0) +ScCTB::ScCTB() : nViews( 0 ), ectbid(0) { } -CTB::CTB(sal_uInt16 nNum ) : nViews( nNum ), ectbid(0) +ScCTB::ScCTB(sal_uInt16 nNum ) : nViews( nNum ), ectbid(0) { } -bool CTB::Read( SvStream &rS ) +bool ScCTB::Read( SvStream &rS ) { - OSL_TRACE("CTB::Read() stream pos 0x%x", rS.Tell() ); + OSL_TRACE("ScCTB::Read() stream pos 0x%x", rS.Tell() ); nOffSet = rS.Tell(); tb.Read( rS ); for ( sal_uInt16 index = 0; index < nViews; ++index ) @@ -117,17 +117,17 @@ bool CTB::Read( SvStream &rS ) for ( sal_Int16 index = 0; index < tb.getcCL(); ++index ) { - TBC aTBC; + ScTBC aTBC; aTBC.Read( rS ); rTBC.push_back( aTBC ); } return true; } -void CTB::Print( FILE* fp ) +void ScCTB::Print( FILE* fp ) { Indent a; - indent_printf( fp, "[ 0x%x ] CTB -- dump\n", nOffSet ); + indent_printf( fp, "[ 0x%x ] ScCTB -- dump\n", nOffSet ); indent_printf( fp, " nViews 0x%x\n", nViews); tb.Print( fp ); @@ -141,25 +141,25 @@ void CTB::Print( FILE* fp ) it->Print( fp ); } indent_printf( fp, " ectbid 0x%x\n", ectbid); - std::vector::iterator it_end = rTBC.end(); + std::vector::iterator it_end = rTBC.end(); counter = 0; - for ( std::vector::iterator it = rTBC.begin(); it != it_end; ++it ) + for ( std::vector::iterator it = rTBC.begin(); it != it_end; ++it ) { - indent_printf( fp, " TBC [%d]\n", counter++); + indent_printf( fp, " ScTBC [%d]\n", counter++); Indent c; it->Print( fp ); } } -bool CTB::IsMenuToolbar() +bool ScCTB::IsMenuToolbar() { return tb.IsMenuToolbar(); } -bool CTB::ImportMenuTB( CTBWrapper& rWrapper, const css::uno::Reference< css::container::XIndexContainer >& xMenuDesc, CustomToolBarImportHelper& helper ) +bool ScCTB::ImportMenuTB( ScCTBWrapper& rWrapper, const css::uno::Reference< css::container::XIndexContainer >& xMenuDesc, CustomToolBarImportHelper& helper ) { sal_Int32 index = 0; - for ( std::vector< TBC >::iterator it = rTBC.begin(); it != rTBC.end(); ++it, ++index ) + for ( std::vector< ScTBC >::iterator it = rTBC.begin(); it != rTBC.end(); ++it, ++index ) { if ( !it->ImportToolBarControl( rWrapper, xMenuDesc, helper, IsMenuToolbar() ) ) return false; @@ -167,7 +167,7 @@ bool CTB::ImportMenuTB( CTBWrapper& rWrapper, const css::uno::Reference< css::co return true; } -bool CTB::ImportCustomToolBar( CTBWrapper& rWrapper, CustomToolBarImportHelper& helper ) +bool ScCTB::ImportCustomToolBar( ScCTBWrapper& rWrapper, CustomToolBarImportHelper& helper ) { static rtl::OUString sToolbarPrefix( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/custom_" ) ); @@ -186,7 +186,7 @@ bool CTB::ImportCustomToolBar( CTBWrapper& rWrapper, CustomToolBarImportHelper& xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("UIName") ), uno::makeAny( name.getString() ) ); rtl::OUString sToolBarName = sToolbarPrefix.concat( name.getString() ); - for ( std::vector< TBC >::iterator it = rTBC.begin(); it != rTBC.end(); ++it ) + for ( std::vector< ScTBC >::iterator it = rTBC.begin(); it != rTBC.end(); ++it ) { if ( !it->ImportToolBarControl( rWrapper, xIndexContainer, helper, IsMenuToolbar() ) ) return false; @@ -236,14 +236,14 @@ void CTBS::Print( FILE* fp ) indent_printf( fp, " ictbView 0x%x\n", ictbView ); } -TBC::TBC() +ScTBC::ScTBC() { } bool -TBC::Read(SvStream &rS) +ScTBC::Read(SvStream &rS) { - OSL_TRACE("TBC::Read() stream pos 0x%x", rS.Tell() ); + OSL_TRACE("ScTBC::Read() stream pos 0x%x", rS.Tell() ); nOffSet = rS.Tell(); if ( !tbch.Read( rS ) ) return false; @@ -266,10 +266,10 @@ TBC::Read(SvStream &rS) void -TBC::Print(FILE* fp) +ScTBC::Print(FILE* fp) { Indent a; - indent_printf( fp, "[ 0x%x ] TBC -- dump\n", nOffSet ); + indent_printf( fp, "[ 0x%x ] ScTBC -- dump\n", nOffSet ); tbch.Print( fp ); if ( tbcCmd.get() ) tbcCmd->Print( fp ); @@ -277,7 +277,7 @@ TBC::Print(FILE* fp) tbcd->Print( fp ); } -bool TBC::ImportToolBarControl( CTBWrapper& rWrapper, const css::uno::Reference< css::container::XIndexContainer >& toolbarcontainer, CustomToolBarImportHelper& helper, bool bIsMenuToolbar ) +bool ScTBC::ImportToolBarControl( ScCTBWrapper& rWrapper, const css::uno::Reference< css::container::XIndexContainer >& toolbarcontainer, CustomToolBarImportHelper& helper, bool bIsMenuToolbar ) { // how to identify built-in-command ? // bool bBuiltin = false; @@ -290,11 +290,11 @@ bool TBC::ImportToolBarControl( CTBWrapper& rWrapper, const css::uno::Reference< TBCMenuSpecific* pMenu = tbcd->getMenuSpecific(); if ( pMenu ) { - // search for CTB with the appropriate name ( it contains the + // search for ScCTB with the appropriate name ( it contains the // menu items, although we cannot import ( or create ) a menu on // a custom toolbar we can import the menu items in a separate // toolbar ( better than nothing ) - CTB* pCustTB = rWrapper.GetCustomizationData( pMenu->Name() ); + ScCTB* pCustTB = rWrapper.GetCustomizationData( pMenu->Name() ); if ( pCustTB ) { uno::Reference< container::XIndexContainer > xMenuDesc; @@ -365,24 +365,24 @@ bool TBCCmd::Read( SvStream &rS ) return true; } -CTBWrapper::CTBWrapper() +ScCTBWrapper::ScCTBWrapper() { } -CTBWrapper::~CTBWrapper() +ScCTBWrapper::~ScCTBWrapper() { } bool -CTBWrapper::Read( SvStream &rS) +ScCTBWrapper::Read( SvStream &rS) { - OSL_TRACE("CTBWrapper::Read() stream pos 0x%x", rS.Tell() ); + OSL_TRACE("ScCTBWrapper::Read() stream pos 0x%x", rS.Tell() ); nOffSet = rS.Tell(); if ( !ctbSet.Read( rS ) ) return false; for ( sal_uInt16 index = 0; index < ctbSet.ctb; ++index ) { - CTB aCTB( ctbSet.ctbViews ); + ScCTB aCTB( ctbSet.ctbViews ); if ( !aCTB.Read( rS ) ) return false; rCTB.push_back( aCTB ); @@ -391,23 +391,23 @@ CTBWrapper::Read( SvStream &rS) } void -CTBWrapper::Print( FILE* fp ) +ScCTBWrapper::Print( FILE* fp ) { Indent a; - indent_printf( fp, "[ 0x%x ] CTBWrapper -- dump\n", nOffSet ); + indent_printf( fp, "[ 0x%x ] ScCTBWrapper -- dump\n", nOffSet ); ctbSet.Print( fp ); - std::vector::iterator it_end = rCTB.end(); - for ( std::vector::iterator it = rCTB.begin(); it != it_end; ++it ) + std::vector::iterator it_end = rCTB.end(); + for ( std::vector::iterator it = rCTB.begin(); it != it_end; ++it ) { Indent b; it->Print( fp ); } } -CTB* CTBWrapper::GetCustomizationData( const rtl::OUString& sTBName ) +ScCTB* ScCTBWrapper::GetCustomizationData( const rtl::OUString& sTBName ) { - CTB* pCTB = NULL; - for ( std::vector< CTB >::iterator it = rCTB.begin(); it != rCTB.end(); ++it ) + ScCTB* pCTB = NULL; + for ( std::vector< ScCTB >::iterator it = rCTB.begin(); it != rCTB.end(); ++it ) { if ( it->GetName().equals( sTBName ) ) { @@ -418,7 +418,7 @@ CTB* CTBWrapper::GetCustomizationData( const rtl::OUString& sTBName ) return pCTB; } -bool CTBWrapper::ImportCustomToolBar( SfxObjectShell& rDocSh ) +bool ScCTBWrapper::ImportCustomToolBar( SfxObjectShell& rDocSh ) { if(rCTB.empty()) return true; @@ -426,8 +426,8 @@ bool CTBWrapper::ImportCustomToolBar( SfxObjectShell& rDocSh ) uno::Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); uno::Reference< ui::XModuleUIConfigurationManagerSupplier > xAppCfgSupp( ui::ModuleUIConfigurationManagerSupplier::create(xContext) ); - std::vector::iterator it_end = rCTB.end(); - for ( std::vector::iterator it = rCTB.begin(); it != it_end; ++it ) + std::vector::iterator it_end = rCTB.end(); + for ( std::vector::iterator it = rCTB.begin(); it != it_end; ++it ) { // for each customtoolbar CustomToolBarImportHelper helper( rDocSh, xAppCfgSupp->getUIConfigurationManager( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument" ) ) ) ); diff --git a/sc/source/filter/excel/xltoolbar.hxx b/sc/source/filter/excel/xltoolbar.hxx index f6e1cc6bb516..cc9794331bd9 100644 --- a/sc/source/filter/excel/xltoolbar.hxx +++ b/sc/source/filter/excel/xltoolbar.hxx @@ -35,7 +35,7 @@ namespace css = ::com::sun::star; -class CTBWrapper; +class ScCTBWrapper; // hmm I don't normally use these packed structures // but.. hey always good to do something different class TBCCmd : public TBBase @@ -52,36 +52,36 @@ public: void Print(FILE* fp); }; -class TBC : public TBBase +class ScTBC : public TBBase { TBCHeader tbch; boost::shared_ptr tbcCmd; // optional boost::shared_ptr tbcd; public: - TBC(); - ~TBC(){} + ScTBC(); + ~ScTBC(){} void Print( FILE* ); bool Read(SvStream &rS); - bool ImportToolBarControl( CTBWrapper&, const com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >& toolbarcontainer, CustomToolBarImportHelper& helper, bool bIsMenuBar ); + bool ImportToolBarControl( ScCTBWrapper&, const com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >& toolbarcontainer, CustomToolBarImportHelper& helper, bool bIsMenuBar ); }; -class CTB : public TBBase +class ScCTB : public TBBase { sal_uInt16 nViews; TB tb; std::vector rVisualData; sal_uInt32 ectbid; - std::vector< TBC > rTBC; - bool ImportCustomToolBar_Impl( CTBWrapper&, CustomToolBarImportHelper& ); + std::vector< ScTBC > rTBC; + bool ImportCustomToolBar_Impl( ScCTBWrapper&, CustomToolBarImportHelper& ); public: - CTB(); - CTB(sal_uInt16); - ~CTB(){} + ScCTB(); + ScCTB(sal_uInt16); + ~ScCTB(){} void Print( FILE* ); bool Read(SvStream &rS); bool IsMenuToolbar(); - bool ImportCustomToolBar( CTBWrapper&, CustomToolBarImportHelper& ); - bool ImportMenuTB( CTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& ); + bool ImportCustomToolBar( ScCTBWrapper&, CustomToolBarImportHelper& ); + bool ImportMenuTB( ScCTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& ); rtl::OUString GetName() { return tb.getName().getString(); } @@ -106,19 +106,19 @@ public: bool Read(SvStream &rS); }; -class CTBWrapper : public TBBase +class ScCTBWrapper : public TBBase { CTBS ctbSet; - std::vector< CTB > rCTB; + std::vector< ScCTB > rCTB; public: - CTBWrapper(); - ~CTBWrapper(); + ScCTBWrapper(); + ~ScCTBWrapper(); bool Read(SvStream &rS); void Print( FILE* ); bool ImportCustomToolBar( SfxObjectShell& rDocSh ); - CTB* GetCustomizationData( const rtl::OUString& name ); + ScCTB* GetCustomizationData( const rtl::OUString& name ); }; diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx index 48910c0bead1..696bbb488a61 100644 --- a/sw/source/filter/ww8/ww8toolbar.cxx +++ b/sw/source/filter/ww8/ww8toolbar.cxx @@ -45,7 +45,7 @@ #include using namespace com::sun::star; -// no. of visual data elements in a CTB ( fixed ) +// no. of visual data elements in a SwCTB ( fixed ) const short nVisualData = 5; typedef std::map< sal_Int16, rtl::OUString > IdToString; @@ -91,7 +91,7 @@ rtl::OUString MSOWordCommandConvertor::MSOTCIDToOOCommand( sal_Int16 key ) } -CTBWrapper::CTBWrapper( bool bReadId ) : Tcg255SubStruct( bReadId ) +SwCTBWrapper::SwCTBWrapper( bool bReadId ) : Tcg255SubStruct( bReadId ) ,reserved2(0) ,reserved3(0) ,reserved4(0) @@ -103,20 +103,20 @@ CTBWrapper::CTBWrapper( bool bReadId ) : Tcg255SubStruct( bReadId ) { } -CTBWrapper::~CTBWrapper() +SwCTBWrapper::~SwCTBWrapper() { } -Customization* CTBWrapper::GetCustomizaton( sal_Int16 index ) +Customization* SwCTBWrapper::GetCustomizaton( sal_Int16 index ) { if ( index < 0 || index >= static_cast( rCustomizations.size() ) ) return NULL; return &rCustomizations[ index ]; } -CTB* CTBWrapper::GetCustomizationData( const rtl::OUString& sTBName ) +SwCTB* SwCTBWrapper::GetCustomizationData( const rtl::OUString& sTBName ) { - CTB* pCTB = NULL; + SwCTB* pCTB = NULL; for ( std::vector< Customization >::iterator it = rCustomizations.begin(); it != rCustomizations.end(); ++it ) { if ( it->GetCustomizationData() && it->GetCustomizationData()->GetName().equals( sTBName ) ) @@ -128,9 +128,9 @@ CTB* CTBWrapper::GetCustomizationData( const rtl::OUString& sTBName ) return pCTB; } -bool CTBWrapper::Read( SvStream& rS ) +bool SwCTBWrapper::Read( SvStream& rS ) { - OSL_TRACE("CTBWrapper::Read() stream pos 0x%x", rS.Tell() ); + OSL_TRACE("SwCTBWrapper::Read() stream pos 0x%x", rS.Tell() ); nOffSet = rS.Tell(); Tcg255SubStruct::Read( rS ); rS >> reserved2 >> reserved3 >> reserved4 >> reserved5; @@ -138,18 +138,18 @@ bool CTBWrapper::Read( SvStream& rS ) long nExpectedPos = rS.Tell() + cbDTBC; if ( cbDTBC ) { - // cbDTBC is the size in bytes of the TBC array - // but the size of a TBC element is dynamic ( and this relates to TBDelta's + // cbDTBC is the size in bytes of the SwTBC array + // but the size of a SwTBC element is dynamic ( and this relates to TBDelta's int nStart = rS.Tell(); int bytesRead = 0; int bytesToRead = cbDTBC - bytesRead; // cbDTBC specifies the size ( in bytes ) taken by an array ( of unspecified size ) - // of TBC records ( TBC records have dynamic length, so we need to check our position + // of SwTBC records ( SwTBC records have dynamic length, so we need to check our position // after each read ) do { - TBC aTBC; + SwTBC aTBC; if ( !aTBC.Read( rS ) ) return false; rtbdc.push_back( aTBC ); @@ -159,7 +159,7 @@ bool CTBWrapper::Read( SvStream& rS ) if ( static_cast< long >( rS.Tell() ) != nExpectedPos ) { // Strange error condition, shouldn't happen ( but does in at least - // one test document ) In the case where it happens the TBC & + // one test document ) In the case where it happens the SwTBC & // TBCHeader records seem blank??? ( and incorrect ) OSL_ENSURE( static_cast< long >(rS.Tell()) == nExpectedPos, "### Error: Expected pos not equal to actual pos after reading rtbdc"); OSL_TRACE("\tPos now is 0x%x should be 0x%x", rS.Tell(), nExpectedPos ); @@ -184,9 +184,9 @@ bool CTBWrapper::Read( SvStream& rS ) return true; } -TBC* CTBWrapper::GetTBCAtOffset( sal_uInt32 nStreamOffset ) +SwTBC* SwCTBWrapper::GetTBCAtOffset( sal_uInt32 nStreamOffset ) { - for ( std::vector< TBC >::iterator it = rtbdc.begin(); it != rtbdc.end(); ++it ) + for ( std::vector< SwTBC >::iterator it = rtbdc.begin(); it != rtbdc.end(); ++it ) { if ( (*it).GetOffset() == nStreamOffset ) return &(*it); @@ -194,10 +194,10 @@ TBC* CTBWrapper::GetTBCAtOffset( sal_uInt32 nStreamOffset ) return NULL; } -void CTBWrapper::Print( FILE* fp ) +void SwCTBWrapper::Print( FILE* fp ) { Indent a; - indent_printf(fp,"[ 0x%x ] CTBWrapper - dump\n", nOffSet ); + indent_printf(fp,"[ 0x%x ] SwCTBWrapper - dump\n", nOffSet ); bool bRes = ( ch == 0x12 && reserved2 == 0x0 && reserved3 == 0x7 && reserved4 == 0x6 && reserved5 == 0xC ); if ( bRes ) indent_printf(fp," sanity check ( first 8 bytes conform )\n"); @@ -217,7 +217,7 @@ void CTBWrapper::Print( FILE* fp ) sal_Int32 index = 0; - for ( std::vector< TBC >::iterator it = rtbdc.begin(); it != rtbdc.end(); ++it, ++index ) + for ( std::vector< SwTBC >::iterator it = rtbdc.begin(); it != rtbdc.end(); ++it, ++index ) { indent_printf(fp," Dumping rtbdc[%d]\n", static_cast< int >( index )); Indent b; @@ -234,7 +234,7 @@ void CTBWrapper::Print( FILE* fp ) } } -bool CTBWrapper::ImportCustomToolBar( SfxObjectShell& rDocSh ) +bool SwCTBWrapper::ImportCustomToolBar( SfxObjectShell& rDocSh ) { for ( std::vector< Customization >::iterator it = rCustomizations.begin(); it != rCustomizations.end(); ++it ) { @@ -256,7 +256,7 @@ bool CTBWrapper::ImportCustomToolBar( SfxObjectShell& rDocSh ) return false; } -Customization::Customization( CTBWrapper* wrapper ) : tbidForTBD( 0 ) +Customization::Customization( SwCTBWrapper* wrapper ) : tbidForTBD( 0 ) ,reserved1( 0 ) , ctbds( 0 ) , pWrapper( wrapper ) @@ -288,7 +288,7 @@ bool Customization::Read( SvStream &rS) } else { - customizationDataCTB.reset( new CTB() ); + customizationDataCTB.reset( new SwCTB() ); if ( !customizationDataCTB->Read( rS ) ) return false; } @@ -328,7 +328,7 @@ void Customization::Print( FILE* fp ) } -bool Customization::ImportMenu( CTBWrapper& rWrapper, CustomToolBarImportHelper& helper ) +bool Customization::ImportMenu( SwCTBWrapper& rWrapper, CustomToolBarImportHelper& helper ) { if ( tbidForTBD == 0x25 ) // we can handle in a limited way additions the built-in menu bar { @@ -346,7 +346,7 @@ bool Customization::ImportMenu( CTBWrapper& rWrapper, CustomToolBarImportHelper& sMenuBar = sMenuBar.concat( "menubar" ); // Get menu name - TBC* pTBC = pWrapper->GetTBCAtOffset( it->TBCStreamOffset() ); + SwTBC* pTBC = pWrapper->GetTBCAtOffset( it->TBCStreamOffset() ); if ( !pTBC ) return false; rtl::OUString sMenuName = pTBC->GetCustomText(); @@ -402,7 +402,7 @@ bool Customization::ImportMenu( CTBWrapper& rWrapper, CustomToolBarImportHelper& return true; } -bool Customization::ImportCustomToolBar( CTBWrapper& rWrapper, CustomToolBarImportHelper& helper ) +bool Customization::ImportCustomToolBar( SwCTBWrapper& rWrapper, CustomToolBarImportHelper& helper ) { if ( GetTBIDForTB() == 0x25 ) return ImportMenu( rWrapper, helper ); @@ -487,7 +487,7 @@ void TBDelta::Print( FILE* fp ) } } -CTB::CTB() : cbTBData( 0 ) +SwCTB::SwCTB() : cbTBData( 0 ) ,iWCTBl( 0 ) ,reserved( 0 ) ,unused( 0 ) @@ -495,19 +495,19 @@ CTB::CTB() : cbTBData( 0 ) { } -CTB::~CTB() +SwCTB::~SwCTB() { } -bool CTB::IsMenuToolbar() +bool SwCTB::IsMenuToolbar() { return tb.IsMenuToolbar(); } -bool CTB::Read( SvStream &rS) +bool SwCTB::Read( SvStream &rS) { - OSL_TRACE("CTB::Read() stream pos 0x%x", rS.Tell() ); + OSL_TRACE("SwCTB::Read() stream pos 0x%x", rS.Tell() ); nOffSet = rS.Tell(); if ( !name.Read( rS ) ) return false; @@ -527,7 +527,7 @@ bool CTB::Read( SvStream &rS) { for ( sal_Int32 index = 0; index < cCtls; ++index ) { - TBC aTBC; + SwTBC aTBC; if ( !aTBC.Read( rS ) ) return false; rTBC.push_back( aTBC ); @@ -537,10 +537,10 @@ bool CTB::Read( SvStream &rS) } void -CTB::Print( FILE* fp ) +SwCTB::Print( FILE* fp ) { Indent a; - indent_printf(fp, "[ 0x%x ] CTB - dump\n", nOffSet ); + indent_printf(fp, "[ 0x%x ] SwCTB - dump\n", nOffSet ); indent_printf(fp, " name %s\n", rtl::OUStringToOString( name.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); indent_printf(fp, " cbTBData size, in bytes, of this structure excluding the name, cCtls, and rTBC fields. %x\n", static_cast< unsigned int >( cbTBData ) ); @@ -563,7 +563,7 @@ CTB::Print( FILE* fp ) } } -bool CTB::ImportCustomToolBar( CTBWrapper& rWrapper, CustomToolBarImportHelper& helper ) +bool SwCTB::ImportCustomToolBar( SwCTBWrapper& rWrapper, CustomToolBarImportHelper& helper ) { static rtl::OUString sToolbarPrefix( "private:resource/toolbar/custom_" ); bool bRes = false; @@ -580,7 +580,7 @@ bool CTB::ImportCustomToolBar( CTBWrapper& rWrapper, CustomToolBarImportHelper& xProps->setPropertyValue( "UIName", uno::makeAny( name.getString() ) ); rtl::OUString sToolBarName = sToolbarPrefix.concat( name.getString() ); - for ( std::vector< TBC >::iterator it = rTBC.begin(); it != rTBC.end(); ++it ) + for ( std::vector< SwTBC >::iterator it = rTBC.begin(); it != rTBC.end(); ++it ) { // createToolBar item for control if ( !it->ImportToolBarControl( rWrapper, xIndexContainer, helper, IsMenuToolbar() ) ) @@ -608,9 +608,9 @@ bool CTB::ImportCustomToolBar( CTBWrapper& rWrapper, CustomToolBarImportHelper& return bRes; } -bool CTB::ImportMenuTB( CTBWrapper& rWrapper, const css::uno::Reference< css::container::XIndexContainer >& xIndexContainer, CustomToolBarImportHelper& rHelper ) +bool SwCTB::ImportMenuTB( SwCTBWrapper& rWrapper, const css::uno::Reference< css::container::XIndexContainer >& xIndexContainer, CustomToolBarImportHelper& rHelper ) { - for ( std::vector< TBC >::iterator it = rTBC.begin(); it != rTBC.end(); ++it ) + for ( std::vector< SwTBC >::iterator it = rTBC.begin(); it != rTBC.end(); ++it ) { // createToolBar item for control if ( !it->ImportToolBarControl( rWrapper, xIndexContainer, rHelper, true ) ) @@ -619,17 +619,17 @@ bool CTB::ImportMenuTB( CTBWrapper& rWrapper, const css::uno::Reference< css::co return true; } -TBC::TBC() +SwTBC::SwTBC() { } -TBC::~TBC() +SwTBC::~SwTBC() { } -bool TBC::Read( SvStream &rS ) +bool SwTBC::Read( SvStream &rS ) { - OSL_TRACE("TBC::Read() stream pos 0x%x", rS.Tell() ); + OSL_TRACE("SwTBC::Read() stream pos 0x%x", rS.Tell() ); nOffSet = rS.Tell(); if ( !tbch.Read( rS ) ) return false; @@ -648,10 +648,10 @@ bool TBC::Read( SvStream &rS ) return true; } -void TBC::Print( FILE* fp ) +void SwTBC::Print( FILE* fp ) { Indent a; - indent_printf(fp,"[ 0x%x ] TBC -- dump\n", nOffSet ); + indent_printf(fp,"[ 0x%x ] SwTBC -- dump\n", nOffSet ); indent_printf(fp," dumping header ( TBCHeader )\n"); tbch.Print( fp ); if ( cid.get() ) @@ -664,7 +664,7 @@ void TBC::Print( FILE* fp ) } bool -TBC::ImportToolBarControl( CTBWrapper& rWrapper, const css::uno::Reference< css::container::XIndexContainer >& toolbarcontainer, CustomToolBarImportHelper& helper, bool bIsMenuBar ) +SwTBC::ImportToolBarControl( SwCTBWrapper& rWrapper, const css::uno::Reference< css::container::XIndexContainer >& toolbarcontainer, CustomToolBarImportHelper& helper, bool bIsMenuBar ) { // cmtFci 0x1 Command based on a built-in command. See CidFci. // cmtMacro 0x2 Macro command. See CidMacro. @@ -724,11 +724,11 @@ TBC::ImportToolBarControl( CTBWrapper& rWrapper, const css::uno::Reference< css: if ( pMenu ) { OSL_TRACE("** control has a menu, name of toolbar with menu items is %s", rtl::OUStringToOString( pMenu->Name(), RTL_TEXTENCODING_UTF8 ).getStr() ); - // search for CTB with the appropriate name ( it contains the + // search for SwCTB with the appropriate name ( it contains the // menu items, although we cannot import ( or create ) a menu on // a custom toolbar we can import the menu items in a separate // toolbar ( better than nothing ) - CTB* pCustTB = rWrapper.GetCustomizationData( pMenu->Name() ); + SwCTB* pCustTB = rWrapper.GetCustomizationData( pMenu->Name() ); if ( pCustTB ) { uno::Reference< container::XIndexContainer > xMenuDesc; @@ -772,7 +772,7 @@ TBC::ImportToolBarControl( CTBWrapper& rWrapper, const css::uno::Reference< css: } rtl::OUString -TBC::GetCustomText() +SwTBC::GetCustomText() { rtl::OUString sCustomText; if ( tbcd.get() ) @@ -874,7 +874,7 @@ bool Tcg255::processSubStruct( sal_uInt8 nId, SvStream &rS ) } case 0x12: { - pSubStruct = new CTBWrapper( false ); + pSubStruct = new SwCTBWrapper( false ); break; } default: @@ -890,13 +890,13 @@ bool Tcg255::processSubStruct( sal_uInt8 nId, SvStream &rS ) bool Tcg255::ImportCustomToolBar( SfxObjectShell& rDocSh ) { - // Find the CTBWrapper + // Find the SwCTBWrapper for ( std::vector< Tcg255SubStruct* >::const_iterator it = rgtcgData.begin(); it != rgtcgData.end(); ++it ) { if ( (*it)->id() == 0x12 ) { // not so great, shouldn't really have to do a horror casting - CTBWrapper* pCTBWrapper = dynamic_cast< CTBWrapper* > ( *it ); + SwCTBWrapper* pCTBWrapper = dynamic_cast< SwCTBWrapper* > ( *it ); if ( pCTBWrapper ) { if ( !pCTBWrapper->ImportCustomToolBar( rDocSh ) ) diff --git a/sw/source/filter/ww8/ww8toolbar.hxx b/sw/source/filter/ww8/ww8toolbar.hxx index a99c65f05214..542d28839e11 100644 --- a/sw/source/filter/ww8/ww8toolbar.hxx +++ b/sw/source/filter/ww8/ww8toolbar.hxx @@ -45,22 +45,22 @@ public: void Print( FILE* fp ); }; -class CTBWrapper; -class TBC : public TBBase +class SwCTBWrapper; +class SwTBC : public TBBase { TBCHeader tbch; boost::shared_ptr< sal_uInt32 > cid; // optional boost::shared_ptr tbcd; public: - TBC(); - ~TBC(); + SwTBC(); + ~SwTBC(); bool Read(SvStream &rS); void Print( FILE* ); - bool ImportToolBarControl( CTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper&, bool ); + bool ImportToolBarControl( SwCTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper&, bool ); rtl::OUString GetCustomText(); }; -class CTB : public TBBase +class SwCTB : public TBBase { Xst name; sal_Int32 cbTBData; @@ -70,18 +70,18 @@ class CTB : public TBBase sal_uInt16 reserved; sal_uInt16 unused; sal_Int32 cCtls; - std::vector< TBC > rTBC; + std::vector< SwTBC > rTBC; - CTB(const CTB&); - CTB& operator = ( const CTB&); + SwCTB(const SwCTB&); + SwCTB& operator = ( const SwCTB&); public: - CTB(); - ~CTB(); + SwCTB(); + ~SwCTB(); bool Read(SvStream &rS); void Print( FILE* fp ); bool IsMenuToolbar(); - bool ImportCustomToolBar( CTBWrapper&, CustomToolBarImportHelper& ); - bool ImportMenuTB( CTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& ); + bool ImportCustomToolBar( SwCTBWrapper&, CustomToolBarImportHelper& ); + bool ImportMenuTB( SwCTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& ); rtl::OUString GetName() { return tb.getName().getString(); } }; @@ -124,32 +124,32 @@ public: bool Read(SvStream &rS); }; -class CTBWrapper; +class SwCTBWrapper; class Customization : public TBBase { -friend class CTBWrapper; +friend class SwCTBWrapper; sal_Int32 tbidForTBD; sal_uInt16 reserved1; sal_Int16 ctbds; - CTBWrapper* pWrapper; - boost::shared_ptr< CTB > customizationDataCTB; + SwCTBWrapper* pWrapper; + boost::shared_ptr< SwCTB > customizationDataCTB; std::vector< TBDelta > customizationDataTBDelta; bool bIsDroppedMenuTB; - bool ImportMenu( CTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& ); + bool ImportMenu( SwCTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& ); public: - Customization( CTBWrapper* rapper ); + Customization( SwCTBWrapper* rapper ); ~Customization(); bool Read(SvStream &rS); - bool ImportCustomToolBar( CTBWrapper&, CustomToolBarImportHelper& ); - bool ImportMenu( CTBWrapper&, CustomToolBarImportHelper& ); + bool ImportCustomToolBar( SwCTBWrapper&, CustomToolBarImportHelper& ); + bool ImportMenu( SwCTBWrapper&, CustomToolBarImportHelper& ); void Print( FILE* ); sal_Int32 GetTBIDForTB(){ return tbidForTBD; } - CTB* GetCustomizationData() { return customizationDataCTB.get(); }; + SwCTB* GetCustomizationData() { return customizationDataCTB.get(); }; }; class SfxObjectShell; -class CTBWrapper : public Tcg255SubStruct +class SwCTBWrapper : public Tcg255SubStruct { // reserved1 is the ch field of Tcg255SubStruct sal_uInt16 reserved2; @@ -162,21 +162,21 @@ class CTBWrapper : public Tcg255SubStruct sal_Int32 cbDTBC; - std::vector< TBC > rtbdc; // + std::vector< SwTBC > rtbdc; // std::vector< Customization > rCustomizations; // array of Customizations std::vector< sal_Int16 > dropDownMenuIndices; // array of indexes of Customization toolbars that are dropped by a menu - CTBWrapper(const CTBWrapper&); - CTBWrapper& operator = ( const CTBWrapper&); + SwCTBWrapper(const SwCTBWrapper&); + SwCTBWrapper& operator = ( const SwCTBWrapper&); public: - CTBWrapper( bool bReadId = true ); - ~CTBWrapper(); + SwCTBWrapper( bool bReadId = true ); + ~SwCTBWrapper(); void InsertDropIndex( sal_Int32 aIndex ) { dropDownMenuIndices.push_back( aIndex ); } - TBC* GetTBCAtOffset( sal_uInt32 nStreamOffset ); + SwTBC* GetTBCAtOffset( sal_uInt32 nStreamOffset ); bool Read(SvStream &rS); bool ImportCustomToolBar( SfxObjectShell& rDocSh ); Customization* GetCustomizaton( sal_Int16 index ); - CTB* GetCustomizationData( const rtl::OUString& name ); + SwCTB* GetCustomizationData( const rtl::OUString& name ); void Print( FILE* ); }; From fa30508fd3b2224e76e1ac7c150df9040518e7aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= Date: Mon, 8 Oct 2012 07:33:09 +0200 Subject: [PATCH 521/863] Fix svtools with Visual Studio 2010 Change-Id: I445173e8f469c409801d803ef22cb499935ba19b --- svtools/source/control/ctrlbox.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 9b82dd913483..fc99145c8163 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -832,7 +832,7 @@ sal_uInt16 LineListBox::InsertEntry( const XubString& rStr, sal_uInt16 nPos ) if ( nPos < pLineList->size() ) { ImpLineList::iterator it = pLineList->begin(); ::std::advance( it, nPos ); - pLineList->insert( it, NULL ); + pLineList->insert( it, reinterpret_cast(NULL) ); } else { pLineList->push_back( NULL ); } From cbb0babb679338ddc9910bbdb2676128d0c236f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toma=C5=BE=20Vajngerl?= Date: Mon, 8 Oct 2012 07:43:59 +0200 Subject: [PATCH 522/863] fdo#30944 Add popup menu function to charts to export them as a graphic Add popup menu function "Export as Graphic" to charts to export the chart as a graphic. Currently it works only with raster formats like PNG and JPG but not with vector formats like SVG. Change-Id: Ieeda21ff971f2ad31bab2248e8b509883b5cbcd0 --- sc/inc/sc.hrc | 4 ++- sc/sdi/chartsh.sdi | 11 ++++++- sc/sdi/scalc.sdi | 34 ++++++++++++++++--- sc/source/ui/drawfunc/chartsh.cxx | 55 +++++++++++++++++++++++++++---- sc/source/ui/drawfunc/objdraw.src | 6 ++++ sc/source/ui/inc/chartsh.hxx | 3 +- 6 files changed, 98 insertions(+), 15 deletions(-) diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index e47ee571890e..efec7ab11b6a 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -529,6 +529,9 @@ #define SID_NEW_SLOTS (SID_KEYFUNC_END) #define SID_NEW_TABLENAME (SID_NEW_SLOTS+1) + +#define SID_EXPORT_AS_GRAPHIC (SID_NEW_SLOTS+2) + #define FID_MERGE_TOGGLE (SID_NEW_SLOTS+10) #define SID_ATTR_ROWHEADERS (SID_NEW_SLOTS+11) #define SID_ATTR_COLHEADERS (SID_NEW_SLOTS+12) @@ -1126,4 +1129,3 @@ #define RID_SCPAGE_DEFAULTS (SC_OOO_BUILD_START + 10) #endif - diff --git a/sc/sdi/chartsh.sdi b/sc/sdi/chartsh.sdi index c050a7c59b82..ce000437afa4 100644 --- a/sc/sdi/chartsh.sdi +++ b/sc/sdi/chartsh.sdi @@ -16,7 +16,16 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - // =========================================================================== +interface ChartSelection +{ + SID_EXPORT_AS_GRAPHIC + [ + ExecMethod = ExecuteExportAsGraphic; + StateMethod = GetExportAsGraphicState; + ] +} + shell ScChartShell : ScDrawShell { + import ChartSelection; } diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi index 5b9cda68177d..14fb8cc980ca 100644 --- a/sc/sdi/scalc.sdi +++ b/sc/sdi/scalc.sdi @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -//-------------------------------------------------------------------------- + SfxVoidItem AcceptChanges FID_CHG_ACCEPT () [ @@ -2919,10 +2919,10 @@ SfxVoidItem SolverDialog SID_OPENDLG_OPTSOLVER Synchron; /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, GroupId = GID_OPTIONS; ] @@ -8342,3 +8342,27 @@ SfxVoidItem EnterString SID_ENTER_STRING ToolBoxConfig = FALSE, GroupId = GID_INTERN; ] + +SfxVoidItem ExportAsGraphic SID_EXPORT_AS_GRAPHIC +() +[ + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, + GroupId = GID_CHART; +] diff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxx index 414063394aeb..251fa5d5b044 100644 --- a/sc/source/ui/drawfunc/chartsh.cxx +++ b/sc/source/ui/drawfunc/chartsh.cxx @@ -17,8 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include -#include +#include +#include +#include + #include #include #include @@ -34,15 +36,13 @@ #include "docpool.hxx" #include "drawview.hxx" #include "scresid.hxx" -#include #define ScChartShell #include "scslots.hxx" - SFX_IMPL_INTERFACE(ScChartShell, ScDrawShell, ScResId(SCSTR_CHARTSHELL) ) { - SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER, + SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_SERVER, ScResId(RID_DRAW_OBJECTBAR) ); SFX_POPUPMENU_REGISTRATION( ScResId(RID_POPUP_CHART) ); } @@ -52,14 +52,55 @@ TYPEINIT1( ScChartShell, ScDrawShell ); ScChartShell::ScChartShell(ScViewData* pData) : ScDrawShell(pData) { - SetHelpId(HID_SCSHELL_CHARTSH); - SetName(rtl::OUString("ChartObject")); + SetHelpId( HID_SCSHELL_CHARTSH ); + SetName( OUString("ChartObject") ); } ScChartShell::~ScChartShell() { } +void ScChartShell::GetExportAsGraphicState( SfxItemSet& rSet ) +{ + ScDrawView* pView = GetViewData()->GetScDrawView(); + const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); + bool bEnable = false; + if( rMarkList.GetMarkCount() == 1 ) + { + SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); + + if( pObj && pObj->ISA( SdrOle2Obj ) ) + bEnable = true; + } + + if( !bEnable ) + rSet.DisableItem( SID_EXPORT_AS_GRAPHIC ); +} + +void ScChartShell::ExecuteExportAsGraphic( SfxRequest& ) +{ + ScDrawView* pView = GetViewData()->GetScDrawView(); + const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); + + if( rMarkList.GetMarkCount() == 1 ) + { + SdrObject* pObject = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); + + if( pObject && pObject->ISA( SdrOle2Obj ) ) + { + SdrOle2Obj* aOle2Object = ((SdrOle2Obj*) pObject)->Clone(); + aOle2Object->NbcResize(Point(), Fraction(1,1), Fraction(1,1)); + Graphic* pGraphic = aOle2Object->GetGraphic(); + if( pGraphic != NULL ) + { + String sGrfNm, sFilterNm; + GraphicHelper::ExportGraphic( *pGraphic, String("") ); + } + } + } + + Invalidate(); +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/objdraw.src b/sc/source/ui/drawfunc/objdraw.src index a2ed29eaabca..3263ec310525 100644 --- a/sc/source/ui/drawfunc/objdraw.src +++ b/sc/source/ui/drawfunc/objdraw.src @@ -619,6 +619,12 @@ Menu RID_POPUP_CHART MenuItem { Separator = TRUE ; }; //------------------------------ ITEM_GROUP_MENU + MenuItem + { + Identifier = SID_EXPORT_AS_GRAPHIC ; + Command = ".uno:ExportAsGraphic" ; + Text [ en-US ] = "Export as graphic.." ; + }; }; }; diff --git a/sc/source/ui/inc/chartsh.hxx b/sc/source/ui/inc/chartsh.hxx index 9de99ea28e8c..3e2eddfb787b 100644 --- a/sc/source/ui/inc/chartsh.hxx +++ b/sc/source/ui/inc/chartsh.hxx @@ -23,7 +23,6 @@ #include #include "shellids.hxx" #include -#include class ScViewData; @@ -39,6 +38,8 @@ public: ScChartShell(ScViewData* pData); virtual ~ScChartShell(); + void ExecuteExportAsGraphic(SfxRequest& rReq); + void GetExportAsGraphicState(SfxItemSet &rSet); }; #endif From a183e352747276e40358e3d19ee1f3c28f3d8d7b Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Mon, 8 Oct 2012 02:04:45 -0500 Subject: [PATCH 523/863] Revert "prefer newer versions of Visual Studio" This reverts commit 4967505ad54de0639fbd7bfa553c57ead9ada6ec. This was creating problem with tinderbox.. changing the default base version on the fly is not a good idea anyway --- oowintool | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/oowintool b/oowintool index 58ea15399b84..c81d81f56569 100755 --- a/oowintool +++ b/oowintool @@ -181,7 +181,7 @@ my %msvc_2012 = ( sub find_msvs() { - my @ms_versions = ( \%msvs_2012, \%msvs_2010, \%msvs_2008, \%msvs_express_2008 ); + my @ms_versions = ( \%msvs_2008, \%msvs_express_2008, \%msvs_2012, \%msvs_2010 ); for $ver (@ms_versions) { my $install = reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/" . $ver->{'key'}); @@ -195,7 +195,7 @@ sub find_msvs() sub find_msvc() { - my @ms_versions = ( \%msvc_2012, \%msvc_2010, \%msvc_2008, \%msvc_express_2008 ); + my @ms_versions = ( \%msvc_2008, \%msvc_express_2008, \%msvc_2012, \%msvc_2010 ); for $ver (@ms_versions) { my $install = reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/" . $ver->{'key'}); From b5b3570d9de0c19e634641c6c558e8d916f0fb4e Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Mon, 8 Oct 2012 09:41:36 +0200 Subject: [PATCH 524/863] beanshell clean content of d.lst Change-Id: I2aac9018efa36f24f15088b7702903a422b4a910 Reviewed-on: https://gerrit.libreoffice.org/838 Reviewed-by: Norbert Thiebaud Tested-by: Norbert Thiebaud --- beanshell/prj/d.lst | 1 - 1 file changed, 1 deletion(-) diff --git a/beanshell/prj/d.lst b/beanshell/prj/d.lst index ea4006c5d6fc..e69de29bb2d1 100644 --- a/beanshell/prj/d.lst +++ b/beanshell/prj/d.lst @@ -1 +0,0 @@ -..\%__SRC%\misc\build\BeanShell\dist\bsh-2.0b1.jar %_DEST%\bin\bsh.jar From 1fb40dafbefccf906108efb19f28696cd03d6aed Mon Sep 17 00:00:00 2001 From: jailletc36 Date: Sun, 7 Oct 2012 12:28:47 +0200 Subject: [PATCH 525/863] cppcheck: unreadVariable Defined the aStr within the #ifdef block where it is used. Change-Id: I2878d2db002411783e814b0ecf02e2a030d2d6d4 --- writerfilter/source/ooxml/OOXMLFastHelper.hxx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/writerfilter/source/ooxml/OOXMLFastHelper.hxx b/writerfilter/source/ooxml/OOXMLFastHelper.hxx index cfc21dc80973..8863bde8a326 100644 --- a/writerfilter/source/ooxml/OOXMLFastHelper.hxx +++ b/writerfilter/source/ooxml/OOXMLFastHelper.hxx @@ -224,15 +224,14 @@ void OOXMLFastHelper::mark(OOXMLFastContextHandler * pHandler, { OOXMLValue::Pointer_t pVal(new T(rValue)); +#ifdef DEBUG_HELPER string aStr = (*QNameToString::Instance())(nId); -#ifdef DEBUG_HELPER debug_logger->startElement("helper.mark"); debug_logger->attribute("name", aStr); - debug_logger->attribute - ("value", - OUStringToOString - (rValue, RTL_TEXTENCODING_ASCII_US).getStr()); + debug_logger->attribute("value", + OUStringToOString + (rValue, RTL_TEXTENCODING_ASCII_US).getStr()); if (aStr.empty()) debug_logger->element("unknown-qname"); From e55414dfc4899b67b8bec82885dde22ddb72faec Mon Sep 17 00:00:00 2001 From: jailletc36 Date: Sun, 7 Oct 2012 12:32:00 +0200 Subject: [PATCH 526/863] cppcheck: clarifyCalculation Use () to clarify the order of the operator + minor formatting Change-Id: I3dfa6566758d30bd76bed478089a0937ade24f89 --- desktop/win32/source/guistdio/guistdio.inc | 2 +- sw/source/core/layout/flowfrm.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/desktop/win32/source/guistdio/guistdio.inc b/desktop/win32/source/guistdio/guistdio.inc index 25586f0be214..0c2f09712f27 100644 --- a/desktop/win32/source/guistdio/guistdio.inc +++ b/desktop/win32/source/guistdio/guistdio.inc @@ -75,7 +75,7 @@ DWORD passOutputToConsole(HANDLE readPipe, HANDLE console) dwRead++; //We must make sure that only complete wchar_t|s are written. WriteConsolse takes //the number of wchar_t|s as argument. ReadFile, however, reads bytes. - bIncompleteWchar = dwRead % 2 ? true : false; + bIncompleteWchar = (dwRead % 2) ? true : false; if (bIncompleteWchar) { //To test this case, give aBuffer a small odd size, e.g. aBuffer[3] diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index 7281703fe29d..a5baf314c267 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -920,7 +920,7 @@ sal_Bool SwFrm::WrongPageDesc( SwPageFrm* pNew ) // Does the Cntnt bring a Pagedesc or do we need the // virtual page number of the new layout leaf? // PageDesc isn't allowed with Follows - const sal_Bool bOdd = nTmp ? ( nTmp % 2 ? sal_True : sal_False ) + const sal_Bool bOdd = nTmp ? ( (nTmp % 2) ? sal_True : sal_False ) : pNew->OnRightPage(); if ( !pDesc ) pDesc = pNew->FindPageDesc(); @@ -934,7 +934,7 @@ sal_Bool SwFrm::WrongPageDesc( SwPageFrm* pNew ) if ( pNewFlow && pNewFlow->GetFrm()->IsInTab() ) pNewFlow = pNewFlow->GetFrm()->FindTabFrm(); const SwPageDesc *pNewDesc= ( pNewFlow && !pNewFlow->IsFollow() ) - ? pNewFlow->GetFrm()->GetAttrSet()->GetPageDesc().GetPageDesc():0; + ? pNewFlow->GetFrm()->GetAttrSet()->GetPageDesc().GetPageDesc() : 0; return ( pNew->GetPageDesc() != pDesc || // own desc ? pNew->GetFmt() != (bFirst ? pDesc->GetFirstFmt() : (bOdd ? pDesc->GetRightFmt() : pDesc->GetLeftFmt())) || From 3b042335208cb2c995f4860bf8ba3bd1e2f2e859 Mon Sep 17 00:00:00 2001 From: Korrawit Pruegsanusak Date: Sun, 7 Oct 2012 17:15:04 +0700 Subject: [PATCH 527/863] Fix fdo#47669: also check if we started the tag before ending it The problem is we created imbalance end tag which shouldn't be there. So, place a check before inserting end tag should help. Inspired by (read: copied from) c1c2688912e769dfd7654e11e87dae380a8ce1eb ;) Change-Id: Ic933f6da44c788cba48bb2fe6fa29658985310b6 --- sw/qa/extras/ooxmlexport/data/fdo47669.docx | Bin 0 -> 3908 bytes sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 16 ++++++++++++++++ sw/source/filter/ww8/docxattributeoutput.cxx | 6 +++++- 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 sw/qa/extras/ooxmlexport/data/fdo47669.docx diff --git a/sw/qa/extras/ooxmlexport/data/fdo47669.docx b/sw/qa/extras/ooxmlexport/data/fdo47669.docx new file mode 100644 index 0000000000000000000000000000000000000000..9c5ef68790657c1c0989c066f8e8cd6b0230d402 GIT binary patch literal 3908 zcmaJ^2{=>>8^&PlTb3-@LQ`WI6-C5YvKz*lBH78z*scsoge=L@jF2T$l5mq{lqFmC z?E6R(5i<6X82*|5=ic1@|Ms0{=9%+6^PY3Q_q^Zty`Py8fS#9ziHV8E!dMSVb0AnL zzpwbYdiyKLQ@@K-OpE|fw&-OtpEhyA8ywTtO_J0?Np1oo)4vjXyMd=Xi}yc3S*pz9 z9<|n>*H=XP5#4)_Of%!-p-s;{p}vs5Du`FmxVnOvKiPKzzm*nt@==cB(6CqArE0p09sS)i%EA1lQjs!l z4o@$?C_5|9XNq>|b9{_0@ZI)0jb#h6_aKMlo@MJ^u{f>Q1N{@ddhx6+z7h+{yL93D zzUOJwjn0}@?>>i5@m;v4G2x9IGb13=mtNYVW0ZW=>1b%o{*@6P%0I57{9F{=P{;tw zt4`jo@<9miV)IVZCJ0x}I$!GYU@p*7*90u}mU&aN6X>03;@qCtcFk#R>lIp`$q)4G zOo)4+o7xAWMuOXsV0btG?p3UBv~`u?n1910Okqp78+5B!^ISZ`a`LyE*DDjyOWxwC z!*ZYBd^BM~$kVqoviEjWcpS1mhZ28MsKIJ8V)&`-z8E8dYf(0YS5zs|#U#Ni7Us1o zRPp7;Q1G#2kgHPg;HgKllP2@F@8r^WzdvE)Ip^qt>aN#MVh?I$%?H@8$WA+r0v-ow zz{r|nx2ze)-mP=gM8KyRcpi@_3^=0<^95>$D@nnI7}vsPcXLaf{qkTd>F-lLqujO6 zfi}HUNxc{6+$WtR#%5=u!eET4sSye4_F{7|T@xT7l$J_vw64*~BeXO$R)F7;EAkh) z|J9re%J~n3D>8t}@PGA}Y{JqA;fmVImVEc&sTEi9Q>2a$c#}pk3*Vs3+ztv30mRvX zJ~e*c4P91LxN>FZo_#M6k#I}aAUxL`-~W``2UIyAT@-KdrqvXFnYlPHyjl1VeYp;@ z8Eqy`r8+)Jd-2pBe+LUE^Y)m{SZ$4rN#>fkh8MmU_{j=j1_RO8S5`_J=DB;3x zbs?eTkKxE8(fXJ-P@a`%_uFXC%WLf9-$1Zq*G8wt8wxkO-tNB8(8Q&Eo)gH<%8xSW z22Sx`r_!;l0I6@LBzx$$TI2qU4u98x08ga5Ka~jGdqy0M5H_8yOvyD-9@~`y{pxAD zdRnb(kKj&vFLUeXnZc=#&zuV0A!2c8r{v`JCcmkA@lCb60qZ{JkIY_z;KHN1(tDeP z8L9&DIYQ7O0*{55enxwfz0#Rs!?0Ffmj=OtQt$)b@)p0cLk}bbh~`gBEy}@j!^%;~ zkBT3N&AL35ah^{uUpNaS0U2we^#(0oiD3PU)wDNCe5=LqVGl^G)Eonc?iJ@zGU%mz z{=J_5&hg;O##)*u4nWv$&e`aoKgJf1kLFrj4AEkvr!zfdBbpS{ZdaM0|0%^~ap|Ty z@*%PskSk&GhgulPJ*=R*>h(z6QiE!&%+&h)-BS=1{(ej5{nXl=%l@-9kSH?`@hPCs zu1qN2YnpC7i*Z`e3L@VUxm*-$?{J$RiE~BvU7bIsvT(Q)KFh_%DX2VEv1KBnE8!W( zemD;6QL!>ZI3WZd4hP%4b9*7lY8bRIGF0m8TtTk;wq=*_io`R_kLa^~*Pz0qRTyr= z>Uqy~wv3gLxFB*W!zhgvOgPoinox8{9A>a5$A70=ne6Nw;y=g9Vk^8HW%z0_Q!ugL zDnN%Vkto72-a=+?`IB2^0_EHgJ^_H0*{NR8XizN@J9$sZ(5j|5%C*%Z&;u08%I7)g z+_Vo{d*b`S&1czyG_^B3G14Q3(s(&n7x?80(3gPEvW~$<96v6|u1L~mz#KNV*|c25 zeGoa_$ifLtJ{Fv`ZBe^D#KZy5Q^J-SX5%x zo!+u~u@uB++LX`R=ornZP#vKtfd(j1n-3@KuK1+yf+cx|zKAFaf)7+(u~+b%8b=phxm9Ui*h#mj z`BWV9HU`mK`e3he4(C2`;Ssw>U3smfQ@VeZK(ul@1Q?Qk+VDH#Ph*aI4qcM67=sFP zW;>&Kf9^oS(j5p;{$ic!Var9S1lw&*20r!5z5qNUfEAz$Zjzok{~e(7_URsPLnBXX zMd9iR?byZ176k^Fm7-<8p!7nC3RCRVxTh-gu6O0Ndy;LVRf|1j_T*<#trDc8iq6-3b2WB1P4@)Nn8PV~oNbK# z*@ia!8K7Kadm*z5D{_v~@V3KI?T{GeB-Tc!Z1~>YN|^z2#QCz}lE@Bw(52Ci3LOXwn!*!npd?_r$0wHRZm~U0dg@=V#qq_oQ1Y;Fs%P zjYqD6D~W1j8H0-BL;?KVgx{CgPN@(tEk`DT@El7+Hi@B-h^|8WRCTl`;rlGNM;_)c z=;XwSPTu51Oo!BHSarcsRg*|^^yr~Kd<`t27Y|xEtBJe zwbRoLts&3t$rw2<+|i=ummpn6k2X~iuhlQeZC#gSB|CL)Eji^F9D-v()FZl{!zq>i zZpGpBIl~T*3oEMp1ucUcyfw4DP2vU1S>fRH2S69}iO#Y}EUnz=jlJ+sU~AU>c)OE1 zp{rvE|23f@?!^Ls(F}OII_UMJ#|LVH^G)fAk13DON*U+B@9Tdj=#29FVUrNa_C`$* zUaEhT-a@4C&oUtbbH5rwOK?E~Db51k=k-5TkweC-hK^U?KouzG8Ue){*h&Yx=R);jJep8m^XUP!*%9kpDbZ;OlEUd5?1a1-!4`93 zeT?nh$RnMc0(bSD*^ZF3ZpLx=7__kn>ubeItw_BiJLw$DONs9fi@M1Vip>QAly!|+ zuydRxBLf9z3szk-2PSW? zpr~9%(dj*5r||gxw_F~guzg9J;x{Q?=!zxU$JO7Ss+U?!7u9q|E{Ddo*jqh^K!oyXor#g!D!*w z#F}cI-wTlt(*^Dp$@aVsP>x7I z8w(Z{AejZqBfKTFYPcD_T9yH9ZSfl}V?)D9X-bDaaN5P`lfQL5zh1tJ#biEa3|U%@ zq`wS%WjOme%fE0OEy zQ1f(Rol$ntN+5CCdNk*7?$XAIPj0vBY~QBs@MYJ;e^m36Bxi75^E+Xtf?eUl?a5rK z@~PJ=ss5v#oP4(M+qXIo2Z~OCOhT30J75aW4nIZ&Egdh-&z_owbW|BM40keSgx zfd_ppbv5`IJd|7g@1pQ4{-6=0y5FCHqV$j-_gppE<$ zesF;P6YfOe>j(UxL;DqeuUaae?=dxp?^NP sD$4=%Up?qo_(54v3+-n_Q which shouldn't be there, + * resulting in loading error: missing last character of hyperlink text + * and content after it wasn't loaded. + */ + getParagraph(1, "This is a hyperlink with anchor. Also, this sentence should be seen."); + getRun(getParagraph(1), 2, "hyperlink with anchor"); + CPPUNIT_ASSERT_EQUAL(OUString("http://www.google.com/#a"), getProperty(getRun(getParagraph(1), 2), "HyperLinkURL")); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index bce14c8a391d..2b5485a29db8 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -535,7 +535,11 @@ void DocxAttributeOutput::EndRun() if ( m_closeHyperlinkInPreviousRun ) { - m_pSerializer->endElementNS( XML_w, XML_hyperlink ); + if ( m_startedHyperlink ) + { + m_pSerializer->endElementNS( XML_w, XML_hyperlink ); + m_startedHyperlink = false; + } m_closeHyperlinkInPreviousRun = false; } From ce3ac48c3a7c609503eca8560fa050ff097a3e72 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 8 Oct 2012 11:04:57 +0300 Subject: [PATCH 528/863] Fix for !SOLAR_JAVA Change-Id: I43d8680304ef11f2b5f5e3edafcc6af6eca8d601 --- jvmfwk/source/framework.cxx | 50 ++++++++++++++++++++++++++++++++----- 1 file changed, 44 insertions(+), 6 deletions(-) diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index 4694bf6029a8..b975c0c963b1 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -42,15 +42,20 @@ #define UNO_JAVA_JFW_JREHOME "UNO_JAVA_JFW_JREHOME" namespace { -JavaVM * g_pJavaVM = NULL; -bool g_bEnabledSwitchedOn = false; +static bool g_bEnabledSwitchedOn = false; + +#ifdef SOLAAR_JAVA + +static JavaVM * g_pJavaVM = NULL; sal_Bool areEqualJavaInfo( JavaInfo const * pInfoA,JavaInfo const * pInfoB) { return jfw_areEqualJavaInfo(pInfoA, pInfoB); } + +#endif } #ifdef DISABLE_DYNLOADING @@ -90,6 +95,12 @@ javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist); javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSize) { +#ifndef SOLAR_JAVA + (void) pparInfo; + (void) pSize; + + return JFW_E_JAVA_DISABLED; +#else javaFrameworkError retVal = JFW_E_NONE; try { @@ -182,13 +193,13 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi jfw_plugin_getJavaInfoByPath_ptr jfw_plugin_getJavaInfoByPathFunc = (jfw_plugin_getJavaInfoByPath_ptr) pluginLib.getFunctionSymbol( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("jfw_plugin_getJavaInfoByPath"))); + OSL_ASSERT(jfw_plugin_getJavaInfoByPathFunc); + if (jfw_plugin_getJavaInfoByPathFunc == NULL) + return JFW_E_ERROR; #else jfw_plugin_getJavaInfoByPath_ptr jfw_plugin_getJavaInfoByPathFunc = jfw_plugin_getJavaInfoByPath; #endif - OSL_ASSERT(jfw_plugin_getJavaInfoByPathFunc); - if (jfw_plugin_getJavaInfoByPathFunc == NULL) - return JFW_E_ERROR; typedef std::vector::const_iterator citLoc; //Check every manually added location @@ -276,6 +287,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi OSL_FAIL(e.message.getStr()); } return retVal; +#endif } javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions, sal_Int32 cOptions, @@ -287,7 +299,7 @@ javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions, sal_Int32 cOpti (void) ppVM; (void) ppEnv; - return JFW_E_ERROR; + return JFW_E_JAVA_DISABLED; #else javaFrameworkError errcode = JFW_E_NONE; if (cOptions > 0 && arOptions == NULL) @@ -477,6 +489,11 @@ javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions, sal_Int32 cOpti */ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo) { +#ifndef SOLAR_JAVA + (void) pInfo; + + return JFW_E_JAVA_DISABLED; +#else javaFrameworkError errcode = JFW_E_NONE; try { @@ -682,7 +699,9 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo) } return errcode; +#endif } + sal_Bool SAL_CALL jfw_areEqualJavaInfo( JavaInfo const * pInfoA,JavaInfo const * pInfoB) { @@ -774,6 +793,10 @@ javaFrameworkError SAL_CALL jfw_getSelectedJRE(JavaInfo **ppInfo) javaFrameworkError SAL_CALL jfw_isVMRunning(sal_Bool *bRunning) { +#ifndef SOLAR_JAVA + (void) bRunning; + return JFW_E_JAVA_DISABLED; +#else osl::MutexGuard guard(jfw::FwkMutex::get()); if (bRunning == NULL) return JFW_E_INVALID_ARG; @@ -782,11 +805,18 @@ javaFrameworkError SAL_CALL jfw_isVMRunning(sal_Bool *bRunning) else *bRunning = sal_True; return JFW_E_NONE; +#endif } javaFrameworkError SAL_CALL jfw_getJavaInfoByPath( rtl_uString *pPath, JavaInfo **ppInfo) { +#ifndef SOLAR_JAVA + (void) pPath; + (void) ppInfo; + + return JFW_E_JAVA_DISABLED; +#else javaFrameworkError errcode = JFW_E_NONE; try { @@ -905,6 +935,7 @@ javaFrameworkError SAL_CALL jfw_getJavaInfoByPath( } return errcode; +#endif } @@ -1170,6 +1201,12 @@ javaFrameworkError SAL_CALL jfw_getJRELocations( javaFrameworkError jfw_existJRE(const JavaInfo *pInfo, sal_Bool *exist) { +#ifndef SOLAR_JAVA + (void) pInfo; + (void) exist; + + return JFW_E_JAVA_DISABLED; +#else //get the function jfw_plugin_existJRE jfw::VendorSettings aVendorSettings; jfw::CJavaInfo aInfo; @@ -1208,6 +1245,7 @@ javaFrameworkError jfw_existJRE(const JavaInfo *pInfo, sal_Bool *exist) ret = JFW_E_ERROR; } return ret; +#endif } void SAL_CALL jfw_lock() From 0a6be648dbe084625e72f91d4c906e88776bf77f Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 8 Oct 2012 11:20:56 +0300 Subject: [PATCH 529/863] Deduplicate InputDialog (for disable-dynloading) Change-Id: Id1522e1874ed2b65f7bd8d379b93c35941a7d0b5 --- cui/source/dialogs/scriptdlg.cxx | 10 +++++----- cui/source/inc/scriptdlg.hxx | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index f9b0f099a785..c1faf050b9db 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -427,9 +427,9 @@ void SFTreeListBox::ExpandedHdl() } // ---------------------------------------------------------------------------- -// InputDialog ------------------------------------------------------------ +// CuiInputDialog ------------------------------------------------------------ // ---------------------------------------------------------------------------- -InputDialog::InputDialog(Window * pParent, sal_uInt16 nMode ) +CuiInputDialog::CuiInputDialog(Window * pParent, sal_uInt16 nMode ) : ModalDialog( pParent, CUI_RES( RID_DLG_NEWLIB ) ), aText( this, CUI_RES( FT_NEWLIB ) ), aEdit( this, CUI_RES( ED_LIBNAME ) ), @@ -484,7 +484,7 @@ InputDialog::InputDialog(Window * pParent, sal_uInt16 nMode ) } -InputDialog::~InputDialog() +CuiInputDialog::~CuiInputDialog() { } // ---------------------------------------------------------------------------- @@ -933,7 +933,7 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry ) } SAL_WNODEPRECATED_DECLARATIONS_PUSH - std::auto_ptr< InputDialog > xNewDlg( new InputDialog( static_cast(this), nMode ) ); + std::auto_ptr< CuiInputDialog > xNewDlg( new CuiInputDialog( static_cast(this), nMode ) ); SAL_WNODEPRECATED_DECLARATIONS_POP xNewDlg->SetObjectName( aNewName ); @@ -1065,7 +1065,7 @@ void SvxScriptOrgDialog::renameEntry( SvLBoxEntry* pEntry ) sal_uInt16 nMode = INPUTMODE_RENAME; SAL_WNODEPRECATED_DECLARATIONS_PUSH - std::auto_ptr< InputDialog > xNewDlg( new InputDialog( static_cast(this), nMode ) ); + std::auto_ptr< CuiInputDialog > xNewDlg( new CuiInputDialog( static_cast(this), nMode ) ); SAL_WNODEPRECATED_DECLARATIONS_POP xNewDlg->SetObjectName( aNewName ); diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 9b0a86859bee..514089c7dbdf 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -98,7 +98,7 @@ public: void deleteAllTree( ); }; -class InputDialog : public ModalDialog +class CuiInputDialog : public ModalDialog { private: FixedText aText; @@ -107,8 +107,8 @@ private: CancelButton aCancelButton; public: - InputDialog( Window * pParent, sal_uInt16 nMode ); - ~InputDialog(); + CuiInputDialog( Window * pParent, sal_uInt16 nMode ); + ~CuiInputDialog(); String GetObjectName() const { return aEdit.GetText(); } void SetObjectName( const String& rName ) { aEdit.SetText( rName ); aEdit.SetSelection( Selection( 0, rName.Len() ) );} From 39d45c1f55fe71e15aa93a24323972225eaafd86 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 8 Oct 2012 11:35:37 +0300 Subject: [PATCH 530/863] Deduplication of AbstractTabDialog_Impl and VclAbstractDialog_Impl Change-Id: Ifda222d842312d084496bc17d3ae6eaf83c13d25 --- cui/source/factory/dlgfact.cxx | 46 +++++++++++++++++----------------- cui/source/factory/dlgfact.hxx | 8 +++--- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 2c9bd96fff46..a97e658ce21d 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -101,9 +101,9 @@ using ::com::sun::star::uno::Reference; using namespace svx; // AbstractTabDialog implementations just forwards everything to the dialog IMPL_ABSTDLG_BASE(AbstractSfxDialog_Impl) -IMPL_ABSTDLG_BASE(VclAbstractDialog_Impl) +IMPL_ABSTDLG_BASE(CuiVclAbstractDialog_Impl) IMPL_ABSTDLG_BASE(VclAbstractRefreshableDialog_Impl); -IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl); +IMPL_ABSTDLG_BASE(CuiAbstractTabDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSvxDistributeDialog_Impl); IMPL_ABSTDLG_BASE(AbstractHangulHanjaConversionDialog_Impl); IMPL_ABSTDLG_BASE(AbstractFmShowColsDialog_Impl); @@ -191,31 +191,31 @@ IMPL_LINK( VclAbstractDialog2_Impl, EndDialogHdl, Dialog*, pDlg ) ////////////////////////////////////////////////////////////////////////// -void AbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId ) +void CuiAbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId ) { pDlg->SetCurPageId( nId ); } -const SfxItemSet* AbstractTabDialog_Impl::GetOutputItemSet() const +const SfxItemSet* CuiAbstractTabDialog_Impl::GetOutputItemSet() const { return pDlg->GetOutputItemSet(); } -const sal_uInt16* AbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem ) +const sal_uInt16* CuiAbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem ) { return pDlg->GetInputRanges( pItem ); } -void AbstractTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet ) +void CuiAbstractTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet ) { pDlg->SetInputSet( pInSet ); } //From class Window. -void AbstractTabDialog_Impl::SetText( const XubString& rStr ) +void CuiAbstractTabDialog_Impl::SetText( const XubString& rStr ) { pDlg->SetText( rStr ); } -String AbstractTabDialog_Impl::GetText() const +String CuiAbstractTabDialog_Impl::GetText() const { return pDlg->GetText(); } @@ -1017,7 +1017,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateVclDialog( Window* pParent, } if ( pDlg ) - return new VclAbstractDialog_Impl( pDlg ); + return new CuiVclAbstractDialog_Impl( pDlg ); return 0; } @@ -1045,7 +1045,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateFrameDialog( } if ( pDlg ) - return new VclAbstractDialog_Impl( pDlg ); + return new CuiVclAbstractDialog_Impl( pDlg ); else return NULL; } @@ -1072,7 +1072,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabDialog( sal_uInt32 nR } if ( pDlg ) - return new AbstractTabDialog_Impl( pDlg ); + return new CuiAbstractTabDialog_Impl( pDlg ); return 0; } @@ -1101,7 +1101,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabDialog( sal_uInt32 nR } if ( pDlg ) - return new AbstractTabDialog_Impl( pDlg ); + return new CuiAbstractTabDialog_Impl( pDlg ); return 0; } @@ -1112,7 +1112,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTextTabDialog( Window* p SdrModel* ) { SfxTabDialog* pDlg = new SvxTextTabDialog( pParent, pAttrSet, pView ); - return new AbstractTabDialog_Impl( pDlg ); + return new CuiAbstractTabDialog_Impl( pDlg ); } // TabDialog that use functionality of the drawing layer and add AnchorTypes -- for SvxCaptionTabDialog @@ -1241,7 +1241,7 @@ VclAbstractDialog * AbstractDialogFactory_Impl::CreateSvxScriptOrgDialog( Window pDlg = new SvxScriptOrgDialog( pParent, rLanguage); if ( pDlg ) - return new VclAbstractDialog_Impl( pDlg ); + return new CuiVclAbstractDialog_Impl( pDlg ); return 0; } @@ -1317,7 +1317,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabItemDialog( Window* p } if ( pDlg ) - return new AbstractTabDialog_Impl( pDlg ); + return new CuiAbstractTabDialog_Impl( pDlg ); return 0; } @@ -1326,7 +1326,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxSearchAttributeDial const sal_uInt16* pWhRanges ) { Dialog* pDlg = new SvxSearchAttributeDialog( pParent, rLst, pWhRanges); - return new VclAbstractDialog_Impl( pDlg ); + return new CuiVclAbstractDialog_Impl( pDlg ); } AbstractSvxSearchSimilarityDialog * AbstractDialogFactory_Impl::CreateSvxSearchSimilarityDialog( Window* pParent, @@ -1346,7 +1346,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxBorderBackgroundDlg( sal_Bool bEnableSelector) { SfxTabDialog* pDlg = new SvxBorderBackgroundDlg( pParent, rCoreSet, bEnableSelector); - return new AbstractTabDialog_Impl( pDlg ); + return new CuiAbstractTabDialog_Impl( pDlg ); } AbstractSvxTransformTabDialog* AbstractDialogFactory_Impl::CreateSvxTransformTabDialog( Window* pParent, @@ -1386,7 +1386,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSchTransformTabDialog( W } if ( pDlg ) - return new AbstractTabDialog_Impl( pDlg ); + return new CuiAbstractTabDialog_Impl( pDlg ); return 0; } @@ -1439,7 +1439,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialo } if ( pDlg ) - return new VclAbstractDialog_Impl( pDlg ); + return new CuiVclAbstractDialog_Impl( pDlg ); return 0; } @@ -1602,7 +1602,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxLineTabDialog( Window sal_Bool bHasObj) { SfxTabDialog* pDlg = new SvxLineTabDialog( pParent, pAttr, pModel,pObj,bHasObj ); - return new AbstractTabDialog_Impl( pDlg ); + return new CuiAbstractTabDialog_Impl( pDlg ); } SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent, @@ -1889,7 +1889,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( Window* p { pDlg = new SfxInsertFloatingFrameDialog( pParent, xObj ); pDlg->SetHelpId( rtl::OUStringToOString( rCommand, RTL_TEXTENCODING_UTF8 ) ); - return new VclAbstractDialog_Impl( pDlg ); + return new CuiVclAbstractDialog_Impl( pDlg ); } return 0; } @@ -1911,7 +1911,7 @@ SfxAbstractLinksDialog* AbstractDialogFactory_Impl::CreateLinksDialog( Window* p SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxFormatCellsDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* /*pObj*/ ) { - return new AbstractTabDialog_Impl( new SvxFormatCellsDialog( pParent, pAttr, pModel ) ); + return new CuiAbstractTabDialog_Impl( new SvxFormatCellsDialog( pParent, pAttr, pModel ) ); } SvxAbstractSplittTableDialog* AbstractDialogFactory_Impl::CreateSvxSplittTableDialog( Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ) @@ -1927,7 +1927,7 @@ SvxAbstractNewTableDialog* AbstractDialogFactory_Impl::CreateSvxNewTableDialog( VclAbstractDialog* AbstractDialogFactory_Impl::CreateOptionsDialog( Window* pParent, const rtl::OUString& rExtensionId, const rtl::OUString& /*rApplicationContext*/ ) { - return new VclAbstractDialog_Impl( new OfaTreeOptionsDialog( pParent, rExtensionId ) ); + return new CuiVclAbstractDialog_Impl( new OfaTreeOptionsDialog( pParent, rExtensionId ) ); } SvxAbstractInsRowColDlg* AbstractDialogFactory_Impl::CreateSvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId ) diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 83d6e8e77c4c..d90e809161f5 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -95,9 +95,9 @@ private: }; //for GalleryThemeProperties end -class VclAbstractDialog_Impl : public VclAbstractDialog +class CuiVclAbstractDialog_Impl : public VclAbstractDialog { - DECL_ABSTDLG_BASE(VclAbstractDialog_Impl,Dialog) + DECL_ABSTDLG_BASE(CuiVclAbstractDialog_Impl,Dialog) }; //for ActualizeProgress begin @@ -119,9 +119,9 @@ class AbstractSfxDialog_Impl : public SfxAbstractDialog virtual String GetText() const ; }; -class AbstractTabDialog_Impl : public SfxAbstractTabDialog +class CuiAbstractTabDialog_Impl : public SfxAbstractTabDialog { - DECL_ABSTDLG_BASE(AbstractTabDialog_Impl,SfxTabDialog) + DECL_ABSTDLG_BASE(CuiAbstractTabDialog_Impl,SfxTabDialog) virtual void SetCurPageId( sal_uInt16 nId ); virtual const SfxItemSet* GetOutputItemSet() const; virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ); From 29b8f729d910f604c0a1be0413bf916a23107d8f Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 8 Oct 2012 11:40:09 +0300 Subject: [PATCH 531/863] Deduplicate lcl_mediumColor Change-Id: I11556fc7dc2013ce66627e8ab41c91d0742d6866 --- cui/source/tabpages/border.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index a79868299d7a..89bd14f69b3d 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -1011,7 +1011,7 @@ void SvxBorderTabPage::FillValueSets() } // ============================================================================ -Color lcl_mediumColor( Color aMain, Color /*aDefault*/ ) +static Color lcl_mediumColor( Color aMain, Color /*aDefault*/ ) { return SvxBorderLine::threeDMediumColor( aMain ); } From 72f348746c67632aa8e53d78e79a889e76063fea Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 8 Oct 2012 11:40:45 +0300 Subject: [PATCH 532/863] There is no ExportCGM Change-Id: I1251c25e14636fea96aba08f90dfe3d16978a270 --- sd/source/filter/cgm/sdcgmfilter.cxx | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx index c5d1ccf4822e..0f6a0d94626e 100644 --- a/sd/source/filter/cgm/sdcgmfilter.cxx +++ b/sd/source/filter/cgm/sdcgmfilter.cxx @@ -73,7 +73,6 @@ typedef sal_Bool ( __LOADONCALLAPI *ExportCGMPointer )( ::rtl::OUString&, Refere #ifdef DISABLE_DYNLOADING extern "C" sal_uInt32 ImportCGM( ::rtl::OUString&, Reference< XModel >&, sal_uInt32, Reference< XStatusIndicator >& ); -extern "C" sal_Bool ExportCGM( ::rtl::OUString&, Reference< XModel >&, Reference< XStatusIndicator >&, void* ); #endif @@ -150,22 +149,16 @@ sal_Bool SdCGMFilter::Import() sal_Bool SdCGMFilter::Export() { -#ifndef DISABLE_DYNLOADING +#ifdef DISABLE_DYNLOADING + // No ExportCGM function exists(!) + return sal_False; +#else ::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData() ); -#endif sal_Bool bRet = sal_False; - if( -#ifndef DISABLE_DYNLOADING - pLibrary && -#endif - mxModel.is() ) + if( pLibrary && mxModel.is() ) { -#ifndef DISABLE_DYNLOADING ExportCGMPointer FncCGMExport = reinterpret_cast< ExportCGMPointer >( pLibrary->getFunctionSymbol( "ExportCGM" ) ); -#else - ExportCGMPointer FncCGMExport = ExportCGM; -#endif if( FncCGMExport ) { @@ -176,10 +169,9 @@ sal_Bool SdCGMFilter::Export() } } -#ifndef DISABLE_DYNLOADING delete pLibrary; -#endif return bRet; +#endif } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ From 3237a3772b063cd3e99d866c53f54f61a612ebf2 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 8 Oct 2012 12:06:24 +0300 Subject: [PATCH 533/863] Typo Change-Id: I6ec48d3156f11c4ecb5f24a70a5c83603a86f834 --- jvmfwk/source/framework.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index b975c0c963b1..d6e687d3bf87 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -45,7 +45,7 @@ namespace { static bool g_bEnabledSwitchedOn = false; -#ifdef SOLAAR_JAVA +#ifdef SOLAR_JAVA static JavaVM * g_pJavaVM = NULL; From 747ecb8fc8e6d74140fa5f8d7a479e5d63bad91b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= Date: Mon, 8 Oct 2012 11:30:48 +0200 Subject: [PATCH 534/863] fix liborcus with Visual studio 2008 Change-Id: Ia19669878e1a6c4d4b079355dcb7ce3e2836d24f --- liborcus/ExternalProject_liborcus.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk index 3882971bfc2a..50cd8778d8a7 100644 --- a/liborcus/ExternalProject_liborcus.mk +++ b/liborcus/ExternalProject_liborcus.mk @@ -17,7 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,liborcus,\ ifeq ($(OS)$(COM),WNTMSC) -ifeq ($(CCNUMVER),90) +ifeq ($(VCVER),90) $(call gb_ExternalProject_get_state_target,liborcus,build) : cd $(EXTERNAL_WORKDIR)/vsprojects/liborcus-static-nozip \ && export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \ From 46caf0e07b42fa83215d49fde64a8b16d73d3a21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Neven=20=C4=86osi=C4=87?= Date: Mon, 8 Oct 2012 01:55:56 +0200 Subject: [PATCH 535/863] add Croatian [hr-HR] genitive case month names Change-Id: Ic6c178153a64daf975af2495779b04b798a6381f --- i18npool/source/localedata/data/hr_HR.xml | 62 +++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/i18npool/source/localedata/data/hr_HR.xml b/i18npool/source/localedata/data/hr_HR.xml index 75f497be1119..80f92e12d8ae 100644 --- a/i18npool/source/localedata/data/hr_HR.xml +++ b/i18npool/source/localedata/data/hr_HR.xml @@ -307,6 +307,68 @@ prosinac + + + jan + sij + sijeÄnja + + + feb + velj + veljaÄe + + + mar + ožu + ožujka + + + apr + tra + travnja + + + may + svi + svibnja + + + jun + lip + lipnja + + + jul + srp + srpnja + + + aug + kol + kolovoza + + + sep + ruj + rujna + + + oct + lis + listopada + + + nov + stu + studenog + + + dec + pro + prosinca + + bc From 5fb5cf97998a92ad51940037115d23462587af67 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 8 Oct 2012 13:24:24 +0300 Subject: [PATCH 536/863] De-duplicate harder Change-Id: Ie319c98cc6c7551f6e1e5ba41d8bc2090d23e671 --- sc/source/ui/attrdlg/scdlgfact.cxx | 42 +++++++++++++++--------------- sc/source/ui/attrdlg/scdlgfact.hxx | 8 +++--- sd/source/ui/dlg/sddlgfact.cxx | 34 ++++++++++++------------ sd/source/ui/dlg/sddlgfact.hxx | 8 +++--- 4 files changed, 46 insertions(+), 46 deletions(-) diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index 9200eba351b6..e23522e2b59e 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -86,7 +86,7 @@ // ause #include "editutil.hxx" -IMPL_ABSTDLG_BASE(VclAbstractDialog_Impl); +IMPL_ABSTDLG_BASE(ScVclAbstractDialog_Impl); IMPL_ABSTDLG_BASE(AbstractScImportAsciiDlg_Impl); IMPL_ABSTDLG_BASE(AbstractScAutoFormatDlg_Impl); IMPL_ABSTDLG_BASE(AbstractScColRowLabelDlg_Impl); @@ -123,34 +123,34 @@ IMPL_ABSTDLG_BASE(AbstractScStringInputDlg_Impl); IMPL_ABSTDLG_BASE(AbstractScTabBgColorDlg_Impl); IMPL_ABSTDLG_BASE(AbstractScImportOptionsDlg_Impl); IMPL_ABSTDLG_BASE(AbstractScTextImportOptionsDlg_Impl); -IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl); +IMPL_ABSTDLG_BASE(ScAbstractTabDialog_Impl); -// AbstractTabDialog_Impl begin -void AbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId ) +// ScAbstractTabDialog_Impl begin +void ScAbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId ) { pDlg->SetCurPageId( nId ); } -const SfxItemSet* AbstractTabDialog_Impl::GetOutputItemSet() const +const SfxItemSet* ScAbstractTabDialog_Impl::GetOutputItemSet() const { return pDlg->GetOutputItemSet(); } -const sal_uInt16* AbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem ) +const sal_uInt16* ScAbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem ) { return pDlg->GetInputRanges( pItem ); } -void AbstractTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet ) +void ScAbstractTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet ) { pDlg->SetInputSet( pInSet ); } //From class Window. -void AbstractTabDialog_Impl::SetText( const XubString& rStr ) +void ScAbstractTabDialog_Impl::SetText( const XubString& rStr ) { pDlg->SetText( rStr ); } -String AbstractTabDialog_Impl::GetText() const +String ScAbstractTabDialog_Impl::GetText() const { return pDlg->GetText(); } @@ -757,7 +757,7 @@ VclAbstractDialog * ScAbstractDialogFactory_Impl::CreateScColOrRowDlg(Window* } if ( pDlg ) - return new VclAbstractDialog_Impl( pDlg ); + return new ScVclAbstractDialog_Impl( pDlg ); return 0; } @@ -776,7 +776,7 @@ VclAbstractDialog * ScAbstractDialogFactory_Impl::CreateScSortWarningDlg( Window break; } if( pDlg ) - return new VclAbstractDialog_Impl( pDlg ); + return new ScVclAbstractDialog_Impl( pDlg ); return 0; } @@ -1456,13 +1456,13 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScAttrDlg( SfxViewFra } if ( pDlg ) - return new AbstractTabDialog_Impl( pDlg ); + return new ScAbstractTabDialog_Impl( pDlg ); return 0; } #undef SfxTabDialog -#undef AbstractTabDialog_Impl +#undef ScAbstractTabDialog_Impl SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg( SfxViewFrame* pFrame, @@ -1483,7 +1483,7 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg( SfxViewF } if ( pDlg ) - return new AbstractTabDialog_Impl( pDlg ); + return new ScAbstractTabDialog_Impl( pDlg ); return 0; } @@ -1506,7 +1506,7 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScStyleDlg( Window* } if ( pDlg ) - return new AbstractTabDialog_Impl( pDlg ); + return new ScAbstractTabDialog_Impl( pDlg ); return 0; } @@ -1527,7 +1527,7 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSubTotalDlg( Window } if ( pDlg ) - return new AbstractTabDialog_Impl( pDlg ); + return new ScAbstractTabDialog_Impl( pDlg ); return 0; } @@ -1547,7 +1547,7 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScCharDlg( Window* pP } if ( pDlg ) - return new AbstractTabDialog_Impl( pDlg ); + return new ScAbstractTabDialog_Impl( pDlg ); return 0; } @@ -1567,7 +1567,7 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScParagraphDlg( Windo } if ( pDlg ) - return new AbstractTabDialog_Impl( pDlg ); + return new ScAbstractTabDialog_Impl( pDlg ); return 0; } @@ -1587,7 +1587,7 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScValidationDlg( Wind } if ( pDlg ) - return new AbstractTabDialog_Impl( pDlg ); + return new ScAbstractTabDialog_Impl( pDlg ); return 0; } @@ -1606,11 +1606,11 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSortDlg( Window* } if ( pDlg ) - return new AbstractTabDialog_Impl( pDlg ); + return new ScAbstractTabDialog_Impl( pDlg ); return 0; } #undef SfxTabDialog -#undef AbstractTabDialog_Impl +#undef ScAbstractTabDialog_Impl //------------------ Factories for TabPages-------------------- diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index 1462b75bead8..60c4e6d6f199 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -110,9 +110,9 @@ long Class::GetResult() \ return pDlg->GetResult(); \ } -class VclAbstractDialog_Impl : public VclAbstractDialog //add for ScColOrRowDlg +class ScVclAbstractDialog_Impl : public VclAbstractDialog //add for ScColOrRowDlg { - DECL_ABSTDLG_BASE(VclAbstractDialog_Impl,Dialog) + DECL_ABSTDLG_BASE(ScVclAbstractDialog_Impl,Dialog) }; class AbstractScImportAsciiDlg_Impl : public AbstractScImportAsciiDlg //add for ScImportAsciiDlg @@ -392,9 +392,9 @@ class AbstractScTextImportOptionsDlg_Impl : public AbstractScTextImportOptionsDl }; //add for ScAttrDlg , ScHFEditDlg, ScStyleDlg, ScSubTotalDlg, ScCharDlg, ScParagraphDlg, ScValidationDlg, ScSortDlg -class AbstractTabDialog_Impl : public SfxAbstractTabDialog +class ScAbstractTabDialog_Impl : public SfxAbstractTabDialog { - DECL_ABSTDLG_BASE( AbstractTabDialog_Impl,SfxTabDialog ) + DECL_ABSTDLG_BASE( ScAbstractTabDialog_Impl,SfxTabDialog ) virtual void SetCurPageId( sal_uInt16 nId ); virtual const SfxItemSet* GetOutputItemSet() const; virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ); diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx index a00f663d489b..dbff1fca28d9 100644 --- a/sd/source/ui/dlg/sddlgfact.cxx +++ b/sd/source/ui/dlg/sddlgfact.cxx @@ -61,10 +61,10 @@ #include "masterlayoutdlg.hxx" #include "headerfooterdlg.hxx" -IMPL_ABSTDLG_BASE(VclAbstractDialog_Impl); +IMPL_ABSTDLG_BASE(SdVclAbstractDialog_Impl); IMPL_ABSTDLG_BASE(AbstractCopyDlg_Impl); IMPL_ABSTDLG_BASE(AbstractSdCustomShowDlg_Impl); -IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl); +IMPL_ABSTDLG_BASE(SdAbstractTabDialog_Impl); IMPL_ABSTDLG_BASE(SdPresLayoutTemplateDlg_Impl); IMPL_ABSTDLG_BASE(AbstractAssistentDlg_Impl); IMPL_ABSTDLG_BASE(AbstractSdModifyFieldDlg_Impl); @@ -99,33 +99,33 @@ sal_Bool AbstractSdCustomShowDlg_Impl::IsCustomShow() const } // AbstractSdCustomShowDlg_Impl end -// AbstractTabDialog_Impl begin -void AbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId ) +// SdAbstractTabDialog_Impl begin +void SdAbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId ) { pDlg->SetCurPageId( nId ); } -const SfxItemSet* AbstractTabDialog_Impl::GetOutputItemSet() const +const SfxItemSet* SdAbstractTabDialog_Impl::GetOutputItemSet() const { return pDlg->GetOutputItemSet(); } -const sal_uInt16* AbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem ) +const sal_uInt16* SdAbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem ) { return pDlg->GetInputRanges( pItem ); } -void AbstractTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet ) +void SdAbstractTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet ) { pDlg->SetInputSet( pInSet ); } //From class Window. -void AbstractTabDialog_Impl::SetText( const XubString& rStr ) +void SdAbstractTabDialog_Impl::SetText( const XubString& rStr ) { pDlg->SetText( rStr ); } -String AbstractTabDialog_Impl::GetText() const +String SdAbstractTabDialog_Impl::GetText() const { return pDlg->GetText(); } -//add for AbstractTabDialog_Impl end +//add for SdAbstractTabDialog_Impl end // -------------------------------------------------------------------- @@ -388,7 +388,7 @@ VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateBreakDlg( sal_uLong nSumActionCount, sal_uLong nObjCount ) //add for BreakDlg { - return new VclAbstractDialog_Impl( new ::sd::BreakDlg( pWindow, pDrView, pShell, nSumActionCount, nObjCount ) ); + return new SdVclAbstractDialog_Impl( new ::sd::BreakDlg( pWindow, pDrView, pShell, nSumActionCount, nObjCount ) ); } //add for BreakDlg end @@ -412,13 +412,13 @@ AbstractSdCustomShowDlg * SdAbstractDialogFactory_Impl::CreateSdCustomShowDlg( : // add for SdCharDlg begin SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabCharDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell ) { - return new AbstractTabDialog_Impl( new SdCharDlg( pParent, pAttr, pDocShell ) ); + return new SdAbstractTabDialog_Impl( new SdCharDlg( pParent, pAttr, pDocShell ) ); } SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, sal_Bool bAreaPage ) { - return new AbstractTabDialog_Impl( new SdPageDlg( pDocShell, pParent, pAttr, bAreaPage ) ); + return new SdAbstractTabDialog_Impl( new SdPageDlg( pDocShell, pParent, pAttr, bAreaPage ) ); } // add for SdCharDlg end @@ -479,7 +479,7 @@ SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdOutlineBulletTabDl SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdParagraphTabDlg( ::Window* pParent, const SfxItemSet* pAttr ) { - return new AbstractTabDialog_Impl( new SdParagraphDlg( pParent, pAttr ) ); + return new SdAbstractTabDialog_Impl( new SdParagraphDlg( pParent, pAttr ) ); } // add for OutlineBulletDlg end @@ -494,7 +494,7 @@ AbstractSdStartPresDlg * SdAbstractDialogFactory_Impl::CreateSdStartPresentatio // add for SdRemoteDlg begin VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateRemoteDialog( ::Window* pWindow ) { - return new VclAbstractDialog_Impl( new ::sd::RemoteDialog( pWindow ) ); + return new SdVclAbstractDialog_Impl( new ::sd::RemoteDialog( pWindow ) ); } // add for SdRemoteDlg end @@ -514,7 +514,7 @@ AbstractSdPresLayoutDlg * SdAbstractDialogFactory_Impl::CreateSdPresLayoutDlg( // add for SdTabTemplateDlg begin SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabTemplateDlg( ::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) { - return new AbstractTabDialog_Impl( new SdTabTemplateDlg( pParent, pDocShell, rStyleBase, pModel, pView ) ); + return new SdAbstractTabDialog_Impl( new SdTabTemplateDlg( pParent, pDocShell, rStyleBase, pModel, pView ) ); } // add for SdTabTemplateDlg end @@ -561,7 +561,7 @@ CreateTabPage SdAbstractDialogFactory_Impl::GetSdOptionsSnapTabPageCreatorFunc() VclAbstractDialog* SdAbstractDialogFactory_Impl::CreateMasterLayoutDialog( ::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ) { - return new VclAbstractDialog_Impl( new ::sd::MasterLayoutDialog( pParent, pDoc, pCurrentPage )); + return new SdVclAbstractDialog_Impl( new ::sd::MasterLayoutDialog( pParent, pDoc, pCurrentPage )); } AbstractHeaderFooterDialog* SdAbstractDialogFactory_Impl::CreateHeaderFooterDialog( ViewShell* pViewShell, diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx index 65c5fad42962..6970d7143808 100644 --- a/sd/source/ui/dlg/sddlgfact.hxx +++ b/sd/source/ui/dlg/sddlgfact.hxx @@ -59,9 +59,9 @@ namespace sd { } // add for BreakDlg class Dialog; -class VclAbstractDialog_Impl : public VclAbstractDialog +class SdVclAbstractDialog_Impl : public VclAbstractDialog { - DECL_ABSTDLG_BASE(VclAbstractDialog_Impl,Dialog) + DECL_ABSTDLG_BASE(SdVclAbstractDialog_Impl,Dialog) }; // add for CopyDlg @@ -83,9 +83,9 @@ class AbstractSdCustomShowDlg_Impl : public AbstractSdCustomShowDlg //add for SdCharDlg begin class SfxTabDialog; -class AbstractTabDialog_Impl : public SfxAbstractTabDialog +class SdAbstractTabDialog_Impl : public SfxAbstractTabDialog { - DECL_ABSTDLG_BASE( AbstractTabDialog_Impl,SfxTabDialog ) + DECL_ABSTDLG_BASE( SdAbstractTabDialog_Impl,SfxTabDialog ) virtual void SetCurPageId( sal_uInt16 nId ); virtual const SfxItemSet* GetOutputItemSet() const; virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ); From 60337134e492aca378aec5251339f1fa5ea49049 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Mon, 8 Oct 2012 10:00:18 +0100 Subject: [PATCH 537/863] re-base on ALv2 code. Includes: linecap: Reintegrating finished LineCap feature Patch contributed by Regina Henschel http://svn.apache.org/viewvc?view=revision&revision=1232507 disable extended linecap API for now. gnumake4 work primarily from Mathias Bauer http://svn.apache.org/viewvc?view=revision&revision=1394326 misc. dead code cleanups Patch contributed by Ariel Constenla-Haile http://svn.apache.org/viewvc?view=revision&revision=1204995 http://svn.apache.org/viewvc?view=revision&revision=1207270 --- canvas/Makefile | 7 ++ .../canvas/base/bufferedgraphicdevicebase.hxx | 37 ++++------ .../inc/canvas/base/cachedprimitivebase.hxx | 37 ++++------ canvas/inc/canvas/base/canvasbase.hxx | 37 ++++------ .../canvas/base/canvascustomspritebase.hxx | 37 ++++------ .../canvas/base/canvascustomspritehelper.hxx | 37 ++++------ .../inc/canvas/base/disambiguationhelper.hxx | 37 ++++------ canvas/inc/canvas/base/graphicdevicebase.hxx | 37 ++++------ canvas/inc/canvas/base/sprite.hxx | 37 ++++------ canvas/inc/canvas/base/spritecanvasbase.hxx | 37 ++++------ canvas/inc/canvas/base/spritesurface.hxx | 37 ++++------ canvas/inc/canvas/canvastools.hxx | 37 ++++------ canvas/inc/canvas/canvastoolsdllapi.h | 51 ++++++------- canvas/inc/canvas/elapsedtime.hxx | 37 ++++------ canvas/inc/canvas/parametricpolypolygon.hxx | 37 ++++------ canvas/inc/canvas/propertysethelper.hxx | 37 ++++------ canvas/inc/canvas/rendering/irendermodule.hxx | 37 ++++------ canvas/inc/canvas/rendering/isurface.hxx | 37 ++++------ .../canvas/rendering/isurfaceproxymanager.hxx | 37 ++++------ canvas/inc/canvas/spriteredrawmanager.hxx | 37 ++++------ canvas/inc/canvas/verbosetrace.hxx | 37 ++++------ canvas/inc/canvas/verifyinput.hxx | 37 ++++------ canvas/source/cairo/cairo_canvas.cxx | 37 ++++------ canvas/source/cairo/cairo_canvas.hxx | 37 ++++------ canvas/source/cairo/cairo_canvasbitmap.cxx | 37 ++++------ canvas/source/cairo/cairo_canvasbitmap.hxx | 37 ++++------ .../source/cairo/cairo_canvascustomsprite.cxx | 37 ++++------ .../source/cairo/cairo_canvascustomsprite.hxx | 37 ++++------ canvas/source/cairo/cairo_canvasfont.cxx | 37 ++++------ canvas/source/cairo/cairo_canvashelper.cxx | 37 ++++------ canvas/source/cairo/cairo_canvashelper.hxx | 37 ++++------ canvas/source/cairo/cairo_devicehelper.cxx | 37 ++++------ canvas/source/cairo/cairo_quartz_cairo.cxx | 37 ++++------ canvas/source/cairo/cairo_services.cxx | 37 ++++------ canvas/source/cairo/cairo_sprite.hxx | 37 ++++------ canvas/source/cairo/cairo_spritecanvas.cxx | 37 ++++------ canvas/source/cairo/cairo_spritecanvas.hxx | 37 ++++------ .../source/cairo/cairo_spritecanvashelper.cxx | 37 ++++------ .../source/cairo/cairo_spritedevicehelper.cxx | 37 ++++------ canvas/source/cairo/cairo_spritehelper.cxx | 37 ++++------ canvas/source/cairo/cairo_textlayout.cxx | 37 ++++------ canvas/source/cairo/cairo_win32_cairo.cxx | 37 ++++------ canvas/source/cairo/cairo_xlib_cairo.cxx | 37 ++++------ canvas/source/cairo/cairocanvas.component | 43 +++++------ .../source/directx/directx9canvas.component | 43 +++++------ canvas/source/directx/dx_9rm.cxx | 37 ++++------ canvas/source/directx/dx_canvas.cxx | 37 ++++------ canvas/source/directx/dx_canvas.hxx | 37 ++++------ canvas/source/directx/dx_canvasbitmap.cxx | 37 ++++------ canvas/source/directx/dx_canvasbitmap.hxx | 37 ++++------ .../source/directx/dx_canvascustomsprite.cxx | 37 ++++------ .../source/directx/dx_canvascustomsprite.hxx | 37 ++++------ canvas/source/directx/dx_canvasfont.cxx | 37 ++++------ canvas/source/directx/dx_canvashelper.cxx | 37 ++++------ canvas/source/directx/dx_config.cxx | 37 ++++------ canvas/source/directx/dx_impltools.cxx | 37 ++++------ canvas/source/directx/dx_spritecanvas.cxx | 37 ++++------ canvas/source/directx/dx_spritecanvas.hxx | 37 ++++------ .../source/directx/dx_spritedevicehelper.cxx | 37 ++++------ canvas/source/directx/dx_textlayout.cxx | 37 ++++------ canvas/source/directx/dx_vcltools.cxx | 37 ++++------ canvas/source/directx/dx_winstuff.hxx | 37 ++++------ canvas/source/directx/gdipluscanvas.component | 43 +++++------ canvas/source/factory/canvasfactory.component | 43 +++++------ canvas/source/factory/cf_service.cxx | 37 ++++------ canvas/source/null/null_canvasbitmap.cxx | 37 ++++------ canvas/source/null/null_canvasbitmap.hxx | 37 ++++------ .../source/null/null_canvascustomsprite.cxx | 37 ++++------ .../source/null/null_canvascustomsprite.hxx | 37 ++++------ canvas/source/null/null_canvasfont.cxx | 37 ++++------ canvas/source/null/null_canvasfont.hxx | 37 ++++------ canvas/source/null/null_canvashelper.cxx | 37 ++++------ canvas/source/null/null_canvashelper.hxx | 37 ++++------ canvas/source/null/null_spritecanvas.cxx | 37 ++++------ canvas/source/null/null_spritecanvas.hxx | 37 ++++------ canvas/source/null/null_textlayout.cxx | 37 ++++------ canvas/source/null/sprite.hxx | 37 ++++------ .../simplecanvas/simplecanvas.component | 43 +++++------ .../source/simplecanvas/simplecanvasimpl.cxx | 37 ++++------ canvas/source/tools/cachedprimitivebase.cxx | 37 ++++------ canvas/source/tools/canvastools.cxx | 37 ++++------ canvas/source/tools/elapsedtime.cxx | 37 ++++------ canvas/source/tools/parametricpolypolygon.cxx | 37 ++++------ canvas/source/tools/propertysethelper.cxx | 37 ++++------ canvas/source/tools/spriteredrawmanager.cxx | 37 ++++------ canvas/source/tools/verifyinput.cxx | 37 ++++------ canvas/source/vcl/canvas.cxx | 37 ++++------ canvas/source/vcl/canvas.hxx | 37 ++++------ canvas/source/vcl/canvasbitmap.cxx | 37 ++++------ canvas/source/vcl/canvasbitmap.hxx | 37 ++++------ canvas/source/vcl/canvasbitmaphelper.cxx | 37 ++++------ canvas/source/vcl/canvascustomsprite.cxx | 37 ++++------ canvas/source/vcl/canvascustomsprite.hxx | 37 ++++------ canvas/source/vcl/canvasfont.cxx | 37 ++++------ canvas/source/vcl/canvashelper.cxx | 66 +++++++++++------ .../source/vcl/canvashelper_texturefill.cxx | 37 ++++------ canvas/source/vcl/devicehelper.cxx | 37 ++++------ canvas/source/vcl/impltools.cxx | 37 ++++------ canvas/source/vcl/services.cxx | 37 ++++------ canvas/source/vcl/sprite.hxx | 37 ++++------ canvas/source/vcl/spritecanvas.cxx | 37 ++++------ canvas/source/vcl/spritecanvas.hxx | 37 ++++------ canvas/source/vcl/spritecanvashelper.cxx | 37 ++++------ canvas/source/vcl/spritedevicehelper.cxx | 37 ++++------ canvas/source/vcl/spritehelper.cxx | 37 ++++------ canvas/source/vcl/textlayout.cxx | 37 ++++------ canvas/source/vcl/vclcanvas.component | 43 +++++------ canvas/workben/canvasdemo.cxx | 37 ++++------ lingucomponent/Makefile | 7 ++ .../Linguistic-lingucomponent-hyphenator.xcu | 18 ++++- ...Linguistic-lingucomponent-spellchecker.xcu | 18 ++++- .../Linguistic-lingucomponent-thesaurus.xcu | 18 ++++- .../hyphenator/altlinuxhyph/hyphen/hreg.cxx | 37 ++++------ .../altlinuxhyph/hyphen/hyphen.component | 43 +++++------ .../altlinuxhyph/hyphen/hyphenimp.cxx | 39 ++++------ .../altlinuxhyph/hyphen/hyphenimp.hxx | 37 ++++------ .../source/languageguessing/guess.cxx | 37 ++++------ .../source/languageguessing/guess.hxx | 37 ++++------ .../languageguessing/guesslang.component | 43 +++++------ .../source/languageguessing/guesslang.cxx | 37 ++++------ .../source/languageguessing/simpleguesser.cxx | 37 ++++------ .../source/languageguessing/simpleguesser.hxx | 37 ++++------ lingucomponent/source/lingutil/lingutil.cxx | 38 ++++------ .../macosxspell/MacOSXSpell.component | 43 +++++------ .../source/spellcheck/macosxspell/macreg.mm | 37 ++++------ .../spellcheck/macosxspell/macspellimp.hxx | 38 ++++------ .../spellcheck/macosxspell/macspellimp.mm | 52 ++++--------- .../source/spellcheck/spell/spell.component | 43 +++++------ .../source/spellcheck/spell/sreg.cxx | 37 ++++------ .../source/spellcheck/spell/sspellimp.cxx | 37 ++++------ .../source/spellcheck/spell/sspellimp.hxx | 37 ++++------ .../source/thesaurus/libnth/lnth.component | 43 +++++------ .../source/thesaurus/libnth/nthesdta.cxx | 37 ++++------ .../source/thesaurus/libnth/nthesimp.cxx | 38 ++++------ .../source/thesaurus/libnth/nthesimp.hxx | 37 ++++------ .../source/thesaurus/libnth/ntreg.cxx | 37 ++++------ linguistic/Makefile | 7 ++ linguistic/inc/iprcache.hxx | 37 ++++------ linguistic/inc/linguistic/hyphdta.hxx | 37 ++++------ linguistic/inc/linguistic/lngdllapi.h | 48 +++++------- linguistic/inc/linguistic/lngprophelp.hxx | 37 ++++------ linguistic/inc/linguistic/misc.hxx | 37 ++++------ linguistic/inc/linguistic/spelldta.hxx | 37 ++++------ linguistic/qa/unoapi/knownissues.xcl | 18 +++++ linguistic/source/convdic.cxx | 37 ++++------ linguistic/source/convdic.hxx | 37 ++++------ linguistic/source/convdiclist.cxx | 37 ++++------ linguistic/source/convdicxml.cxx | 37 ++++------ linguistic/source/convdicxml.hxx | 37 ++++------ linguistic/source/defs.hxx | 37 ++++------ linguistic/source/dicimp.cxx | 37 ++++------ linguistic/source/dicimp.hxx | 37 ++++------ linguistic/source/dlistimp.cxx | 37 ++++------ linguistic/source/dlistimp.hxx | 37 ++++------ linguistic/source/gciterator.cxx | 37 ++++------ linguistic/source/gciterator.hxx | 37 ++++------ linguistic/source/hhconvdic.cxx | 37 ++++------ linguistic/source/hyphdsp.cxx | 37 ++++------ linguistic/source/hyphdta.cxx | 37 ++++------ linguistic/source/iprcache.cxx | 37 ++++------ linguistic/source/lng.component | 43 +++++------ linguistic/source/lngopt.cxx | 37 ++++------ linguistic/source/lngopt.hxx | 37 ++++------ linguistic/source/lngprophelp.cxx | 37 ++++------ linguistic/source/lngreg.cxx | 37 ++++------ linguistic/source/lngsvcmgr.cxx | 73 +++++++++---------- linguistic/source/lngsvcmgr.hxx | 39 ++++------ linguistic/source/misc.cxx | 37 ++++------ linguistic/source/misc2.cxx | 37 ++++------ linguistic/source/spelldsp.cxx | 37 ++++------ linguistic/source/spelldsp.hxx | 37 ++++------ linguistic/source/spelldta.cxx | 37 ++++------ linguistic/source/thesdsp.cxx | 37 ++++------ linguistic/workben/makefile.mk | 33 +++------ linguistic/workben/sprophelp.cxx | 37 ++++------ linguistic/workben/sprophelp.hxx | 37 ++++------ linguistic/workben/sreg.cxx | 37 ++++------ linguistic/workben/sspellimp.cxx | 37 ++++------ linguistic/workben/sspellimp.hxx | 37 ++++------ linguistic/xml/linguistic.xml | 18 +++++ 180 files changed, 2615 insertions(+), 4040 deletions(-) diff --git a/canvas/Makefile b/canvas/Makefile index ccb1c85a04da..0997e628485b 100644 --- a/canvas/Makefile +++ b/canvas/Makefile @@ -1,4 +1,11 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) diff --git a/canvas/inc/canvas/base/bufferedgraphicdevicebase.hxx b/canvas/inc/canvas/base/bufferedgraphicdevicebase.hxx index 29c8fb05b38d..2713e0ea11bb 100644 --- a/canvas/inc/canvas/base/bufferedgraphicdevicebase.hxx +++ b/canvas/inc/canvas/base/bufferedgraphicdevicebase.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_CANVAS_BUFFEREDGRAPHICDEVICEBASE_HXX #define INCLUDED_CANVAS_BUFFEREDGRAPHICDEVICEBASE_HXX diff --git a/canvas/inc/canvas/base/cachedprimitivebase.hxx b/canvas/inc/canvas/base/cachedprimitivebase.hxx index 21ebf61bb875..32de38ee7af6 100644 --- a/canvas/inc/canvas/base/cachedprimitivebase.hxx +++ b/canvas/inc/canvas/base/cachedprimitivebase.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_CANVAS_CACHEDPRIMITIVEBASE_HXX #define INCLUDED_CANVAS_CACHEDPRIMITIVEBASE_HXX diff --git a/canvas/inc/canvas/base/canvasbase.hxx b/canvas/inc/canvas/base/canvasbase.hxx index 7afcf9f8aea7..f7844fd219de 100644 --- a/canvas/inc/canvas/base/canvasbase.hxx +++ b/canvas/inc/canvas/base/canvasbase.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_CANVAS_CANVASBASE_HXX #define INCLUDED_CANVAS_CANVASBASE_HXX diff --git a/canvas/inc/canvas/base/canvascustomspritebase.hxx b/canvas/inc/canvas/base/canvascustomspritebase.hxx index 041403b4a255..7c1b5508bb4e 100644 --- a/canvas/inc/canvas/base/canvascustomspritebase.hxx +++ b/canvas/inc/canvas/base/canvascustomspritebase.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_CANVAS_CANVASCUSTOMSPRITEBASE_HXX #define INCLUDED_CANVAS_CANVASCUSTOMSPRITEBASE_HXX diff --git a/canvas/inc/canvas/base/canvascustomspritehelper.hxx b/canvas/inc/canvas/base/canvascustomspritehelper.hxx index 2a571bcf22d6..2b2fd2d774d8 100644 --- a/canvas/inc/canvas/base/canvascustomspritehelper.hxx +++ b/canvas/inc/canvas/base/canvascustomspritehelper.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_CANVAS_CANVASCUSTOMSPRITEHELPER_HXX #define INCLUDED_CANVAS_CANVASCUSTOMSPRITEHELPER_HXX diff --git a/canvas/inc/canvas/base/disambiguationhelper.hxx b/canvas/inc/canvas/base/disambiguationhelper.hxx index b58ed29ea289..f12a61472cd4 100644 --- a/canvas/inc/canvas/base/disambiguationhelper.hxx +++ b/canvas/inc/canvas/base/disambiguationhelper.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_CANVAS_DISAMBIGUATIONHELPER_HXX #define INCLUDED_CANVAS_DISAMBIGUATIONHELPER_HXX diff --git a/canvas/inc/canvas/base/graphicdevicebase.hxx b/canvas/inc/canvas/base/graphicdevicebase.hxx index b8baee2417b9..e4e5081db580 100644 --- a/canvas/inc/canvas/base/graphicdevicebase.hxx +++ b/canvas/inc/canvas/base/graphicdevicebase.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_CANVAS_GRAPHICDEVICEBASE_HXX #define INCLUDED_CANVAS_GRAPHICDEVICEBASE_HXX diff --git a/canvas/inc/canvas/base/sprite.hxx b/canvas/inc/canvas/base/sprite.hxx index 161551b64ed2..4ebafd57f998 100644 --- a/canvas/inc/canvas/base/sprite.hxx +++ b/canvas/inc/canvas/base/sprite.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_CANVAS_SPRITE_HXX #define INCLUDED_CANVAS_SPRITE_HXX diff --git a/canvas/inc/canvas/base/spritecanvasbase.hxx b/canvas/inc/canvas/base/spritecanvasbase.hxx index 47134abfc2d5..f892bf4170a7 100644 --- a/canvas/inc/canvas/base/spritecanvasbase.hxx +++ b/canvas/inc/canvas/base/spritecanvasbase.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_CANVAS_SPRITECANVASBASE_HXX #define INCLUDED_CANVAS_SPRITECANVASBASE_HXX diff --git a/canvas/inc/canvas/base/spritesurface.hxx b/canvas/inc/canvas/base/spritesurface.hxx index 6ff1c3c8c954..47a0fb24a67d 100644 --- a/canvas/inc/canvas/base/spritesurface.hxx +++ b/canvas/inc/canvas/base/spritesurface.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_CANVAS_SPRITESURFACE_HXX #define INCLUDED_CANVAS_SPRITESURFACE_HXX diff --git a/canvas/inc/canvas/canvastools.hxx b/canvas/inc/canvas/canvastools.hxx index 155c9a92c59e..4f38c0b07527 100644 --- a/canvas/inc/canvas/canvastools.hxx +++ b/canvas/inc/canvas/canvastools.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_CANVAS_CANVASTOOLS_HXX #define INCLUDED_CANVAS_CANVASTOOLS_HXX diff --git a/canvas/inc/canvas/canvastoolsdllapi.h b/canvas/inc/canvas/canvastoolsdllapi.h index 4cc32ec44210..ad96dec3ea7c 100644 --- a/canvas/inc/canvas/canvastoolsdllapi.h +++ b/canvas/inc/canvas/canvastoolsdllapi.h @@ -1,37 +1,32 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef INCLUDED_CANVASTOOLSDLLAPI_H -#define INCLUDED_CANVASTOOLSDLLAPI_H + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ -#if defined CANVASTOOLS_DLLIMPLEMENTATION -#define CANVASTOOLS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#ifndef _CANVAS_DLLAPI_H +#define _CANVAS_DLLAPI_H + +#include "sal/config.h" +#include "sal/types.h" + +#if defined(CANVASTOOLS_DLLIMPLEMENTATION) +#define CANVASTOOLS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -#define CANVASTOOLS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define CANVASTOOLS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #define CANVASTOOLS_DLLPRIVATE SAL_DLLPRIVATE diff --git a/canvas/inc/canvas/elapsedtime.hxx b/canvas/inc/canvas/elapsedtime.hxx index ea2a94c1528c..8248e3408785 100644 --- a/canvas/inc/canvas/elapsedtime.hxx +++ b/canvas/inc/canvas/elapsedtime.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_CANVAS_ELAPSEDTIME_HXX #define INCLUDED_CANVAS_ELAPSEDTIME_HXX diff --git a/canvas/inc/canvas/parametricpolypolygon.hxx b/canvas/inc/canvas/parametricpolypolygon.hxx index 16a691637b1f..fa5cb0036b05 100644 --- a/canvas/inc/canvas/parametricpolypolygon.hxx +++ b/canvas/inc/canvas/parametricpolypolygon.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_CANVAS_PARAMETRICPOLYPOLYGON_HXX #define INCLUDED_CANVAS_PARAMETRICPOLYPOLYGON_HXX diff --git a/canvas/inc/canvas/propertysethelper.hxx b/canvas/inc/canvas/propertysethelper.hxx index 0630ca7ac662..1ae139677036 100644 --- a/canvas/inc/canvas/propertysethelper.hxx +++ b/canvas/inc/canvas/propertysethelper.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_CANVAS_PROPERTYSETHELPER_HXX #define INCLUDED_CANVAS_PROPERTYSETHELPER_HXX diff --git a/canvas/inc/canvas/rendering/irendermodule.hxx b/canvas/inc/canvas/rendering/irendermodule.hxx index 965a291e2977..413320eb85e9 100644 --- a/canvas/inc/canvas/rendering/irendermodule.hxx +++ b/canvas/inc/canvas/rendering/irendermodule.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_CANVAS_IRENDERMODULE_HXX #define INCLUDED_CANVAS_IRENDERMODULE_HXX diff --git a/canvas/inc/canvas/rendering/isurface.hxx b/canvas/inc/canvas/rendering/isurface.hxx index 65ec79b646e2..a79faf96a8c8 100644 --- a/canvas/inc/canvas/rendering/isurface.hxx +++ b/canvas/inc/canvas/rendering/isurface.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_CANVAS_ISURFACE_HXX #define INCLUDED_CANVAS_ISURFACE_HXX diff --git a/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx b/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx index 97acee20f307..98c7795a293e 100644 --- a/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx +++ b/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_CANVAS_ISURFACEPROXYMANAGER_HXX #define INCLUDED_CANVAS_ISURFACEPROXYMANAGER_HXX diff --git a/canvas/inc/canvas/spriteredrawmanager.hxx b/canvas/inc/canvas/spriteredrawmanager.hxx index 9dc20995a850..7609b4f8f4a6 100644 --- a/canvas/inc/canvas/spriteredrawmanager.hxx +++ b/canvas/inc/canvas/spriteredrawmanager.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_CANVAS_SPRITEREDRAWMANAGER_HXX #define INCLUDED_CANVAS_SPRITEREDRAWMANAGER_HXX diff --git a/canvas/inc/canvas/verbosetrace.hxx b/canvas/inc/canvas/verbosetrace.hxx index f4d2c2eacadf..d3810c4deaad 100644 --- a/canvas/inc/canvas/verbosetrace.hxx +++ b/canvas/inc/canvas/verbosetrace.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_CANVAS_VERBOSETRACE_HXX #define INCLUDED_CANVAS_VERBOSETRACE_HXX diff --git a/canvas/inc/canvas/verifyinput.hxx b/canvas/inc/canvas/verifyinput.hxx index bbe48476af57..54ba1618f91a 100644 --- a/canvas/inc/canvas/verifyinput.hxx +++ b/canvas/inc/canvas/verifyinput.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_CANVAS_VERIFYINPUT_HXX #define INCLUDED_CANVAS_VERIFYINPUT_HXX diff --git a/canvas/source/cairo/cairo_canvas.cxx b/canvas/source/cairo/cairo_canvas.cxx index e5f731e7e43a..54156c6d135f 100644 --- a/canvas/source/cairo/cairo_canvas.cxx +++ b/canvas/source/cairo/cairo_canvas.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/canvas/source/cairo/cairo_canvas.hxx b/canvas/source/cairo/cairo_canvas.hxx index 2236708e0ec2..5272b188dda7 100644 --- a/canvas/source/cairo/cairo_canvas.hxx +++ b/canvas/source/cairo/cairo_canvas.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _CAIROCANVAS_CANVAS_HXX_ #define _CAIROCANVAS_CANVAS_HXX_ diff --git a/canvas/source/cairo/cairo_canvasbitmap.cxx b/canvas/source/cairo/cairo_canvasbitmap.cxx index 1d6255461b8c..4b9302e68b75 100644 --- a/canvas/source/cairo/cairo_canvasbitmap.cxx +++ b/canvas/source/cairo/cairo_canvasbitmap.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/canvas/source/cairo/cairo_canvasbitmap.hxx b/canvas/source/cairo/cairo_canvasbitmap.hxx index 1626c9240ff6..4a2b7eaacdc8 100644 --- a/canvas/source/cairo/cairo_canvasbitmap.hxx +++ b/canvas/source/cairo/cairo_canvasbitmap.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _CAIROCANVAS_CANVASBITMAP_HXX #define _CAIROCANVAS_CANVASBITMAP_HXX diff --git a/canvas/source/cairo/cairo_canvascustomsprite.cxx b/canvas/source/cairo/cairo_canvascustomsprite.cxx index 6abd33c58d8e..c9d3e5bd8692 100644 --- a/canvas/source/cairo/cairo_canvascustomsprite.cxx +++ b/canvas/source/cairo/cairo_canvascustomsprite.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/canvas/source/cairo/cairo_canvascustomsprite.hxx b/canvas/source/cairo/cairo_canvascustomsprite.hxx index 08a1249144c1..940626c2fdbc 100644 --- a/canvas/source/cairo/cairo_canvascustomsprite.hxx +++ b/canvas/source/cairo/cairo_canvascustomsprite.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _CAIROCANVAS_CANVASCUSTOMSPRITE_HXX #define _CAIROCANVAS_CANVASCUSTOMSPRITE_HXX diff --git a/canvas/source/cairo/cairo_canvasfont.cxx b/canvas/source/cairo/cairo_canvasfont.cxx index 302c37a8380c..44be8b30f5a9 100644 --- a/canvas/source/cairo/cairo_canvasfont.cxx +++ b/canvas/source/cairo/cairo_canvasfont.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index a7cf165f693d..0ecddee33365 100644 --- a/canvas/source/cairo/cairo_canvashelper.cxx +++ b/canvas/source/cairo/cairo_canvashelper.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/canvas/source/cairo/cairo_canvashelper.hxx b/canvas/source/cairo/cairo_canvashelper.hxx index 175fe9233ab1..c16edf3639e5 100644 --- a/canvas/source/cairo/cairo_canvashelper.hxx +++ b/canvas/source/cairo/cairo_canvashelper.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _CAIROCANVAS_CANVASHELPER_HXX_ #define _CAIROCANVAS_CANVASHELPER_HXX_ diff --git a/canvas/source/cairo/cairo_devicehelper.cxx b/canvas/source/cairo/cairo_devicehelper.cxx index 2e2bc0659f95..9a674caeabb3 100644 --- a/canvas/source/cairo/cairo_devicehelper.cxx +++ b/canvas/source/cairo/cairo_devicehelper.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/canvas/source/cairo/cairo_quartz_cairo.cxx b/canvas/source/cairo/cairo_quartz_cairo.cxx index 72304d8e527e..5719d1c02964 100644 --- a/canvas/source/cairo/cairo_quartz_cairo.cxx +++ b/canvas/source/cairo/cairo_quartz_cairo.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #if defined QUARTZ || defined IOS /************************************************************************ diff --git a/canvas/source/cairo/cairo_services.cxx b/canvas/source/cairo/cairo_services.cxx index f9ca5d64a8b6..936fc9889ea8 100644 --- a/canvas/source/cairo/cairo_services.cxx +++ b/canvas/source/cairo/cairo_services.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/canvas/source/cairo/cairo_sprite.hxx b/canvas/source/cairo/cairo_sprite.hxx index ca96f3786ac4..47572d2b6f47 100644 --- a/canvas/source/cairo/cairo_sprite.hxx +++ b/canvas/source/cairo/cairo_sprite.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _CAIROCANVAS_SPRITE_HXX #define _CAIROCANVAS_SPRITE_HXX diff --git a/canvas/source/cairo/cairo_spritecanvas.cxx b/canvas/source/cairo/cairo_spritecanvas.cxx index 040af91a4c27..6ec0291db4fe 100644 --- a/canvas/source/cairo/cairo_spritecanvas.cxx +++ b/canvas/source/cairo/cairo_spritecanvas.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/canvas/source/cairo/cairo_spritecanvas.hxx b/canvas/source/cairo/cairo_spritecanvas.hxx index aaab44d5f996..6cb35466495c 100644 --- a/canvas/source/cairo/cairo_spritecanvas.hxx +++ b/canvas/source/cairo/cairo_spritecanvas.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _CAIROCANVAS_SPRITECANVAS_HXX_ #define _CAIROCANVAS_SPRITECANVAS_HXX_ diff --git a/canvas/source/cairo/cairo_spritecanvashelper.cxx b/canvas/source/cairo/cairo_spritecanvashelper.cxx index 4af8dc66cc1f..bf30993a3907 100644 --- a/canvas/source/cairo/cairo_spritecanvashelper.cxx +++ b/canvas/source/cairo/cairo_spritecanvashelper.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/canvas/source/cairo/cairo_spritedevicehelper.cxx b/canvas/source/cairo/cairo_spritedevicehelper.cxx index fc790ac3daf8..caf867c338a5 100644 --- a/canvas/source/cairo/cairo_spritedevicehelper.cxx +++ b/canvas/source/cairo/cairo_spritedevicehelper.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/canvas/source/cairo/cairo_spritehelper.cxx b/canvas/source/cairo/cairo_spritehelper.cxx index 9f801595667c..7c86da13f505 100644 --- a/canvas/source/cairo/cairo_spritehelper.cxx +++ b/canvas/source/cairo/cairo_spritehelper.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index adea863a6837..383b0ffe3fbc 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/canvas/source/cairo/cairo_win32_cairo.cxx b/canvas/source/cairo/cairo_win32_cairo.cxx index 42f22b23044a..3bf9c6db2a90 100644 --- a/canvas/source/cairo/cairo_win32_cairo.cxx +++ b/canvas/source/cairo/cairo_win32_cairo.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #define _WIN32_WINNT 0x0500 diff --git a/canvas/source/cairo/cairo_xlib_cairo.cxx b/canvas/source/cairo/cairo_xlib_cairo.cxx index 0259154c043e..cd13ea133004 100644 --- a/canvas/source/cairo/cairo_xlib_cairo.cxx +++ b/canvas/source/cairo/cairo_xlib_cairo.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/canvas/source/cairo/cairocanvas.component b/canvas/source/cairo/cairocanvas.component index b21197d0e4e8..862a56c13069 100644 --- a/canvas/source/cairo/cairocanvas.component +++ b/canvas/source/cairo/cairocanvas.component @@ -1,30 +1,21 @@ - + diff --git a/canvas/source/directx/directx9canvas.component b/canvas/source/directx/directx9canvas.component index dc0349bfbf96..43a335f469f4 100644 --- a/canvas/source/directx/directx9canvas.component +++ b/canvas/source/directx/directx9canvas.component @@ -1,30 +1,21 @@ - + diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx index e67898c07ba8..b30b0a4ed980 100644 --- a/canvas/source/directx/dx_9rm.cxx +++ b/canvas/source/directx/dx_9rm.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #if DIRECTX_VERSION == 0x0900 diff --git a/canvas/source/directx/dx_canvas.cxx b/canvas/source/directx/dx_canvas.cxx index 45056f95c084..6fa20bef0b11 100644 --- a/canvas/source/directx/dx_canvas.cxx +++ b/canvas/source/directx/dx_canvas.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include // don't ask. msdev breaks otherwise... diff --git a/canvas/source/directx/dx_canvas.hxx b/canvas/source/directx/dx_canvas.hxx index 32810ede36e5..0892ad009a3e 100644 --- a/canvas/source/directx/dx_canvas.hxx +++ b/canvas/source/directx/dx_canvas.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _DXCANVAS_CANVAS_HXX_ #define _DXCANVAS_CANVAS_HXX_ diff --git a/canvas/source/directx/dx_canvasbitmap.cxx b/canvas/source/directx/dx_canvasbitmap.cxx index 17881e52e1cf..b90308193af0 100644 --- a/canvas/source/directx/dx_canvasbitmap.cxx +++ b/canvas/source/directx/dx_canvasbitmap.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include // don't ask. msdev breaks otherwise... diff --git a/canvas/source/directx/dx_canvasbitmap.hxx b/canvas/source/directx/dx_canvasbitmap.hxx index 7a80e2b96796..4bf1056a2ac5 100644 --- a/canvas/source/directx/dx_canvasbitmap.hxx +++ b/canvas/source/directx/dx_canvasbitmap.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _DXCANVAS_CANVASBITMAP_HXX #define _DXCANVAS_CANVASBITMAP_HXX diff --git a/canvas/source/directx/dx_canvascustomsprite.cxx b/canvas/source/directx/dx_canvascustomsprite.cxx index 803267368af7..62b6bf83201b 100644 --- a/canvas/source/directx/dx_canvascustomsprite.cxx +++ b/canvas/source/directx/dx_canvascustomsprite.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include // don't ask. msdev breaks otherwise... diff --git a/canvas/source/directx/dx_canvascustomsprite.hxx b/canvas/source/directx/dx_canvascustomsprite.hxx index e099b75191fb..8cf291f3b7ef 100644 --- a/canvas/source/directx/dx_canvascustomsprite.hxx +++ b/canvas/source/directx/dx_canvascustomsprite.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _DXCANVAS_CANVASCUSTOMSPRITE_HXX #define _DXCANVAS_CANVASCUSTOMSPRITE_HXX diff --git a/canvas/source/directx/dx_canvasfont.cxx b/canvas/source/directx/dx_canvasfont.cxx index 5df06624c713..27c44e895b5f 100644 --- a/canvas/source/directx/dx_canvasfont.cxx +++ b/canvas/source/directx/dx_canvasfont.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include // don't ask. msdev breaks otherwise... diff --git a/canvas/source/directx/dx_canvashelper.cxx b/canvas/source/directx/dx_canvashelper.cxx index 1c4ff41ba00b..0e6d6d507dc1 100644 --- a/canvas/source/directx/dx_canvashelper.cxx +++ b/canvas/source/directx/dx_canvashelper.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/canvas/source/directx/dx_config.cxx b/canvas/source/directx/dx_config.cxx index 65f8e89d4767..ea50d6b6aff5 100644 --- a/canvas/source/directx/dx_config.cxx +++ b/canvas/source/directx/dx_config.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "dx_config.hxx" diff --git a/canvas/source/directx/dx_impltools.cxx b/canvas/source/directx/dx_impltools.cxx index 63bcabee940e..4ab23b45c30c 100644 --- a/canvas/source/directx/dx_impltools.cxx +++ b/canvas/source/directx/dx_impltools.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include // don't ask. msdev breaks otherwise... diff --git a/canvas/source/directx/dx_spritecanvas.cxx b/canvas/source/directx/dx_spritecanvas.cxx index cecc99c1da05..b3597972caa2 100644 --- a/canvas/source/directx/dx_spritecanvas.cxx +++ b/canvas/source/directx/dx_spritecanvas.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include // don't ask. msdev breaks otherwise... diff --git a/canvas/source/directx/dx_spritecanvas.hxx b/canvas/source/directx/dx_spritecanvas.hxx index 97649b90bf51..dcb786a91419 100644 --- a/canvas/source/directx/dx_spritecanvas.hxx +++ b/canvas/source/directx/dx_spritecanvas.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _DXCANVAS_SPRITECANVAS_HXX_ #define _DXCANVAS_SPRITECANVAS_HXX_ diff --git a/canvas/source/directx/dx_spritedevicehelper.cxx b/canvas/source/directx/dx_spritedevicehelper.cxx index 4680cd3428df..366e0a5b06e7 100644 --- a/canvas/source/directx/dx_spritedevicehelper.cxx +++ b/canvas/source/directx/dx_spritedevicehelper.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include // don't ask. msdev breaks otherwise... #include diff --git a/canvas/source/directx/dx_textlayout.cxx b/canvas/source/directx/dx_textlayout.cxx index cd7445870658..9a4129f8bf77 100644 --- a/canvas/source/directx/dx_textlayout.cxx +++ b/canvas/source/directx/dx_textlayout.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include // don't ask. msdev breaks otherwise... diff --git a/canvas/source/directx/dx_vcltools.cxx b/canvas/source/directx/dx_vcltools.cxx index dab00dd493eb..d6f819969b39 100644 --- a/canvas/source/directx/dx_vcltools.cxx +++ b/canvas/source/directx/dx_vcltools.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/canvas/source/directx/dx_winstuff.hxx b/canvas/source/directx/dx_winstuff.hxx index 82fe2d8c51b1..34f36c855984 100644 --- a/canvas/source/directx/dx_winstuff.hxx +++ b/canvas/source/directx/dx_winstuff.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _DXCANVAS_WINSTUFF_HXX #define _DXCANVAS_WINSTUFF_HXX diff --git a/canvas/source/directx/gdipluscanvas.component b/canvas/source/directx/gdipluscanvas.component index 8845e8c6dfc2..89a12b1f6cec 100644 --- a/canvas/source/directx/gdipluscanvas.component +++ b/canvas/source/directx/gdipluscanvas.component @@ -1,30 +1,21 @@ - + diff --git a/canvas/source/factory/canvasfactory.component b/canvas/source/factory/canvasfactory.component index d8bdd526346b..84e37ef6670f 100644 --- a/canvas/source/factory/canvasfactory.component +++ b/canvas/source/factory/canvasfactory.component @@ -1,30 +1,21 @@ - + diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx index 2594c8c7f01c..b725c95262a4 100644 --- a/canvas/source/factory/cf_service.cxx +++ b/canvas/source/factory/cf_service.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/canvas/source/null/null_canvasbitmap.cxx b/canvas/source/null/null_canvasbitmap.cxx index 4998e30531b4..55741105835c 100644 --- a/canvas/source/null/null_canvasbitmap.cxx +++ b/canvas/source/null/null_canvasbitmap.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/canvas/source/null/null_canvasbitmap.hxx b/canvas/source/null/null_canvasbitmap.hxx index fa0577c8c02a..cd2627e5857d 100644 --- a/canvas/source/null/null_canvasbitmap.hxx +++ b/canvas/source/null/null_canvasbitmap.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _NULLCANVAS_CANVASBITMAP_HXX #define _NULLCANVAS_CANVASBITMAP_HXX diff --git a/canvas/source/null/null_canvascustomsprite.cxx b/canvas/source/null/null_canvascustomsprite.cxx index 77ce07cfd727..fa8caeb6942a 100644 --- a/canvas/source/null/null_canvascustomsprite.cxx +++ b/canvas/source/null/null_canvascustomsprite.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/canvas/source/null/null_canvascustomsprite.hxx b/canvas/source/null/null_canvascustomsprite.hxx index f210f0452470..d7069d002930 100644 --- a/canvas/source/null/null_canvascustomsprite.hxx +++ b/canvas/source/null/null_canvascustomsprite.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _NULLCANVAS_CANVASCUSTOMSPRITE_HXX #define _NULLCANVAS_CANVASCUSTOMSPRITE_HXX diff --git a/canvas/source/null/null_canvasfont.cxx b/canvas/source/null/null_canvasfont.cxx index 22a5d738a2c4..3db3dfedc22c 100644 --- a/canvas/source/null/null_canvasfont.cxx +++ b/canvas/source/null/null_canvasfont.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "null_canvasfont.hxx" #include "null_textlayout.hxx" diff --git a/canvas/source/null/null_canvasfont.hxx b/canvas/source/null/null_canvasfont.hxx index c6299d229d84..95de15a01289 100644 --- a/canvas/source/null/null_canvasfont.hxx +++ b/canvas/source/null/null_canvasfont.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _NULLCANVAS_CANVASFONT_HXX #define _NULLCANVAS_CANVASFONT_HXX diff --git a/canvas/source/null/null_canvashelper.cxx b/canvas/source/null/null_canvashelper.cxx index 75bcc3591f62..cad406d09517 100644 --- a/canvas/source/null/null_canvashelper.cxx +++ b/canvas/source/null/null_canvashelper.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/canvas/source/null/null_canvashelper.hxx b/canvas/source/null/null_canvashelper.hxx index a3e8ad5073ed..556cd7f51ea1 100644 --- a/canvas/source/null/null_canvashelper.hxx +++ b/canvas/source/null/null_canvashelper.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _NULLCANVAS_CANVASHELPER_HXX_ #define _NULLCANVAS_CANVASHELPER_HXX_ diff --git a/canvas/source/null/null_spritecanvas.cxx b/canvas/source/null/null_spritecanvas.cxx index 53d918b7c5d4..28f92e4280f9 100644 --- a/canvas/source/null/null_spritecanvas.cxx +++ b/canvas/source/null/null_spritecanvas.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/canvas/source/null/null_spritecanvas.hxx b/canvas/source/null/null_spritecanvas.hxx index 8f04c6839dc7..333c4a94d097 100644 --- a/canvas/source/null/null_spritecanvas.hxx +++ b/canvas/source/null/null_spritecanvas.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _NULLCANVAS_SPRITECANVAS_HXX_ #define _NULLCANVAS_SPRITECANVAS_HXX_ diff --git a/canvas/source/null/null_textlayout.cxx b/canvas/source/null/null_textlayout.cxx index e093427b5f03..f594c666afdf 100644 --- a/canvas/source/null/null_textlayout.cxx +++ b/canvas/source/null/null_textlayout.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/canvas/source/null/sprite.hxx b/canvas/source/null/sprite.hxx index dc25d23ce6e4..94db485f9987 100644 --- a/canvas/source/null/sprite.hxx +++ b/canvas/source/null/sprite.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_NULLCANVAS_SPRITE_HXX #define INCLUDED_NULLCANVAS_SPRITE_HXX diff --git a/canvas/source/simplecanvas/simplecanvas.component b/canvas/source/simplecanvas/simplecanvas.component index ef290927a679..48c0767b8c7d 100644 --- a/canvas/source/simplecanvas/simplecanvas.component +++ b/canvas/source/simplecanvas/simplecanvas.component @@ -1,30 +1,21 @@ - + diff --git a/canvas/source/simplecanvas/simplecanvasimpl.cxx b/canvas/source/simplecanvas/simplecanvasimpl.cxx index 57102fb69f5e..1a18d8751031 100644 --- a/canvas/source/simplecanvas/simplecanvasimpl.cxx +++ b/canvas/source/simplecanvas/simplecanvasimpl.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/canvas/source/tools/cachedprimitivebase.cxx b/canvas/source/tools/cachedprimitivebase.cxx index 759b7037a21f..6dc9bdab4444 100644 --- a/canvas/source/tools/cachedprimitivebase.cxx +++ b/canvas/source/tools/cachedprimitivebase.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx index d5220fdcca9c..a3dcfa6c5223 100644 --- a/canvas/source/tools/canvastools.cxx +++ b/canvas/source/tools/canvastools.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/canvas/source/tools/elapsedtime.cxx b/canvas/source/tools/elapsedtime.cxx index 906950a00a27..1699c9544558 100644 --- a/canvas/source/tools/elapsedtime.cxx +++ b/canvas/source/tools/elapsedtime.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "osl/time.h" diff --git a/canvas/source/tools/parametricpolypolygon.cxx b/canvas/source/tools/parametricpolypolygon.cxx index ea7675ae2b4a..123ae5f577ab 100644 --- a/canvas/source/tools/parametricpolypolygon.cxx +++ b/canvas/source/tools/parametricpolypolygon.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/canvas/source/tools/propertysethelper.cxx b/canvas/source/tools/propertysethelper.cxx index 1c4faa68f781..03c87070254d 100644 --- a/canvas/source/tools/propertysethelper.cxx +++ b/canvas/source/tools/propertysethelper.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/canvas/source/tools/spriteredrawmanager.cxx b/canvas/source/tools/spriteredrawmanager.cxx index eeb4714ff992..d77fc5bd43ca 100644 --- a/canvas/source/tools/spriteredrawmanager.cxx +++ b/canvas/source/tools/spriteredrawmanager.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/canvas/source/tools/verifyinput.cxx b/canvas/source/tools/verifyinput.cxx index 32ac8bbd3447..6bdf578936fa 100644 --- a/canvas/source/tools/verifyinput.cxx +++ b/canvas/source/tools/verifyinput.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/canvas/source/vcl/canvas.cxx b/canvas/source/vcl/canvas.cxx index 2f999beeaa0a..9cfb73a53539 100644 --- a/canvas/source/vcl/canvas.cxx +++ b/canvas/source/vcl/canvas.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/canvas/source/vcl/canvas.hxx b/canvas/source/vcl/canvas.hxx index 16d5c5abd5b3..5b89e96a05eb 100644 --- a/canvas/source/vcl/canvas.hxx +++ b/canvas/source/vcl/canvas.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _VCLCANVAS_CANVAS_HXX_ #define _VCLCANVAS_CANVAS_HXX_ diff --git a/canvas/source/vcl/canvasbitmap.cxx b/canvas/source/vcl/canvasbitmap.cxx index 378a4970d593..a943ba6c55a9 100644 --- a/canvas/source/vcl/canvasbitmap.cxx +++ b/canvas/source/vcl/canvasbitmap.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/canvas/source/vcl/canvasbitmap.hxx b/canvas/source/vcl/canvasbitmap.hxx index 540b190b76a1..d0d884aef88f 100644 --- a/canvas/source/vcl/canvasbitmap.hxx +++ b/canvas/source/vcl/canvasbitmap.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _VCLCANVAS_CANVASBITMAP_HXX #define _VCLCANVAS_CANVASBITMAP_HXX diff --git a/canvas/source/vcl/canvasbitmaphelper.cxx b/canvas/source/vcl/canvasbitmaphelper.cxx index e86b629acfbc..12e57ec57440 100644 --- a/canvas/source/vcl/canvasbitmaphelper.cxx +++ b/canvas/source/vcl/canvasbitmaphelper.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/canvas/source/vcl/canvascustomsprite.cxx b/canvas/source/vcl/canvascustomsprite.cxx index 331cd7258694..f1cb72dfeafb 100644 --- a/canvas/source/vcl/canvascustomsprite.cxx +++ b/canvas/source/vcl/canvascustomsprite.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/canvas/source/vcl/canvascustomsprite.hxx b/canvas/source/vcl/canvascustomsprite.hxx index 5597cd86c32d..c16a9e73cf85 100644 --- a/canvas/source/vcl/canvascustomsprite.hxx +++ b/canvas/source/vcl/canvascustomsprite.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _VCLCANVAS_CANVASCUSTOMSPRITE_HXX #define _VCLCANVAS_CANVASCUSTOMSPRITE_HXX diff --git a/canvas/source/vcl/canvasfont.cxx b/canvas/source/vcl/canvasfont.cxx index fcbe15d585c2..49811824f685 100644 --- a/canvas/source/vcl/canvasfont.cxx +++ b/canvas/source/vcl/canvasfont.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx index 8b025e0cd895..8028a91bfe3d 100644 --- a/canvas/source/vcl/canvashelper.cxx +++ b/canvas/source/vcl/canvashelper.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include @@ -38,6 +29,7 @@ #include #include #include +#include #include #include @@ -97,6 +89,26 @@ namespace vclcanvas return basegfx::B2DLINEJOIN_NONE; } + + drawing::LineCap unoCapeFromCap( sal_Int8 nCapType) + { + switch ( nCapType) + { + case rendering::PathCapType::BUTT: + return drawing::LineCap_BUTT; + + case rendering::PathCapType::ROUND: + return drawing::LineCap_ROUND; + + case rendering::PathCapType::SQUARE: + return drawing::LineCap_SQUARE; + + default: + ENSURE_OR_THROW( false, + "unoCapeFromCap(): Unexpected cap type" ); + } + return drawing::LineCap_BUTT; + } } CanvasHelper::CanvasHelper() : @@ -389,7 +401,13 @@ namespace vclcanvas // AW: New interface, will create bezier polygons now aStrokedPolyPoly.append(basegfx::tools::createAreaGeometry( - aPolyPoly.getB2DPolygon(i), strokeAttributes.StrokeWidth*0.5, b2DJoineFromJoin(strokeAttributes.JoinType))); + aPolyPoly.getB2DPolygon(i), + strokeAttributes.StrokeWidth*0.5, + b2DJoineFromJoin(strokeAttributes.JoinType) +#ifdef FIXME_REMOVE_WHEN_RE_BASE_COMPLETE + ,unoCapeFromCap(strokeAttributes.StartCapType) +#endif + )); //aStrokedPolyPoly.append( // ::basegfx::tools::createAreaGeometryForPolygon( aPolyPoly.getB2DPolygon(i), // strokeAttributes.StrokeWidth*0.5, diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx index 1021d33de702..2da3dc607ae8 100644 --- a/canvas/source/vcl/canvashelper_texturefill.cxx +++ b/canvas/source/vcl/canvashelper_texturefill.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/canvas/source/vcl/devicehelper.cxx b/canvas/source/vcl/devicehelper.cxx index 44c35cbf4ac7..2d5af8ed72fb 100644 --- a/canvas/source/vcl/devicehelper.cxx +++ b/canvas/source/vcl/devicehelper.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/canvas/source/vcl/impltools.cxx b/canvas/source/vcl/impltools.cxx index 0484d1ed1e49..298850800d2d 100644 --- a/canvas/source/vcl/impltools.cxx +++ b/canvas/source/vcl/impltools.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/canvas/source/vcl/services.cxx b/canvas/source/vcl/services.cxx index 1b59bb590623..95ba8cba090c 100644 --- a/canvas/source/vcl/services.cxx +++ b/canvas/source/vcl/services.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/canvas/source/vcl/sprite.hxx b/canvas/source/vcl/sprite.hxx index b86137d4f383..71fb71b6075f 100644 --- a/canvas/source/vcl/sprite.hxx +++ b/canvas/source/vcl/sprite.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef INCLUDED_VCLCANVAS_SPRITE_HXX #define INCLUDED_VCLCANVAS_SPRITE_HXX diff --git a/canvas/source/vcl/spritecanvas.cxx b/canvas/source/vcl/spritecanvas.cxx index 086dd7204d0d..2a950d6048f0 100644 --- a/canvas/source/vcl/spritecanvas.cxx +++ b/canvas/source/vcl/spritecanvas.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/canvas/source/vcl/spritecanvas.hxx b/canvas/source/vcl/spritecanvas.hxx index ab4a0f682718..b4827a1d540e 100644 --- a/canvas/source/vcl/spritecanvas.hxx +++ b/canvas/source/vcl/spritecanvas.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _VCLCANVAS_SPRITECANVAS_HXX_ #define _VCLCANVAS_SPRITECANVAS_HXX_ diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx index a8c07f2a415a..2f69d9dceb8c 100644 --- a/canvas/source/vcl/spritecanvashelper.cxx +++ b/canvas/source/vcl/spritecanvashelper.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/canvas/source/vcl/spritedevicehelper.cxx b/canvas/source/vcl/spritedevicehelper.cxx index b99dc4e66cc0..901c8a0ad963 100644 --- a/canvas/source/vcl/spritedevicehelper.cxx +++ b/canvas/source/vcl/spritedevicehelper.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/canvas/source/vcl/spritehelper.cxx b/canvas/source/vcl/spritehelper.cxx index 4b5c36b93b7d..07b55110866c 100644 --- a/canvas/source/vcl/spritehelper.cxx +++ b/canvas/source/vcl/spritehelper.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx index 1f09e9d5bace..4122d8a45797 100644 --- a/canvas/source/vcl/textlayout.cxx +++ b/canvas/source/vcl/textlayout.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/canvas/source/vcl/vclcanvas.component b/canvas/source/vcl/vclcanvas.component index eb1246706a4d..ae6fc5910a81 100644 --- a/canvas/source/vcl/vclcanvas.component +++ b/canvas/source/vcl/vclcanvas.component @@ -1,30 +1,21 @@ - + diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx index 11de6f7db9f3..be08bad94b17 100644 --- a/canvas/workben/canvasdemo.cxx +++ b/canvas/workben/canvasdemo.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ // This code strongly inspired by Miguel / Federico's Gnome Canvas demo code. diff --git a/lingucomponent/Makefile b/lingucomponent/Makefile index ccb1c85a04da..0997e628485b 100644 --- a/lingucomponent/Makefile +++ b/lingucomponent/Makefile @@ -1,4 +1,11 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) diff --git a/lingucomponent/config/Linguistic-lingucomponent-hyphenator.xcu b/lingucomponent/config/Linguistic-lingucomponent-hyphenator.xcu index 2b1c486f4306..c42f16313e3a 100644 --- a/lingucomponent/config/Linguistic-lingucomponent-hyphenator.xcu +++ b/lingucomponent/config/Linguistic-lingucomponent-hyphenator.xcu @@ -1,5 +1,21 @@ - + diff --git a/lingucomponent/config/Linguistic-lingucomponent-spellchecker.xcu b/lingucomponent/config/Linguistic-lingucomponent-spellchecker.xcu index 6bb3ac53dba1..8f35b44e5f7e 100644 --- a/lingucomponent/config/Linguistic-lingucomponent-spellchecker.xcu +++ b/lingucomponent/config/Linguistic-lingucomponent-spellchecker.xcu @@ -1,5 +1,21 @@ - + diff --git a/lingucomponent/config/Linguistic-lingucomponent-thesaurus.xcu b/lingucomponent/config/Linguistic-lingucomponent-thesaurus.xcu index 15e7ba2ae4fb..e228e655610a 100644 --- a/lingucomponent/config/Linguistic-lingucomponent-thesaurus.xcu +++ b/lingucomponent/config/Linguistic-lingucomponent-thesaurus.xcu @@ -1,5 +1,21 @@ - + diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hreg.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hreg.cxx index c213cc6bc4ca..a70f754c2253 100644 --- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hreg.cxx +++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hreg.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include // helper for factories #include diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphen.component b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphen.component index bff11d16f2be..c5d1262a98c4 100644 --- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphen.component +++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphen.component @@ -1,30 +1,21 @@ - + diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx index f55505285575..ff2d267719a5 100644 --- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx +++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include @@ -49,8 +40,6 @@ #include #include -#include "dictmgr.hxx" - #include #include diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx index 504c3707347e..8d275050931c 100644 --- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx +++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _LINGU2_HYPHENIMP_HXX_ diff --git a/lingucomponent/source/languageguessing/guess.cxx b/lingucomponent/source/languageguessing/guess.cxx index f09bdecc6c0d..853a0ffb0386 100644 --- a/lingucomponent/source/languageguessing/guess.cxx +++ b/lingucomponent/source/languageguessing/guess.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/*************************************************************************** +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/lingucomponent/source/languageguessing/guess.hxx b/lingucomponent/source/languageguessing/guess.hxx index 50e7b005c674..ac883c18257b 100644 --- a/lingucomponent/source/languageguessing/guess.hxx +++ b/lingucomponent/source/languageguessing/guess.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/*************************************************************************** +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef GUESS_H #define GUESS_H diff --git a/lingucomponent/source/languageguessing/guesslang.component b/lingucomponent/source/languageguessing/guesslang.component index c5a18e5af0eb..8749ea37314e 100644 --- a/lingucomponent/source/languageguessing/guesslang.component +++ b/lingucomponent/source/languageguessing/guesslang.component @@ -1,30 +1,21 @@ - + diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx index d3df37a2009c..1f9f6e29ef2c 100644 --- a/lingucomponent/source/languageguessing/guesslang.cxx +++ b/lingucomponent/source/languageguessing/guesslang.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/lingucomponent/source/languageguessing/simpleguesser.cxx b/lingucomponent/source/languageguessing/simpleguesser.cxx index 3346ef2c3c6a..8ed660d95b57 100644 --- a/lingucomponent/source/languageguessing/simpleguesser.cxx +++ b/lingucomponent/source/languageguessing/simpleguesser.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/*************************************************************************** +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ /** * diff --git a/lingucomponent/source/languageguessing/simpleguesser.hxx b/lingucomponent/source/languageguessing/simpleguesser.hxx index 2863a6ed8dd8..eed1af930f27 100644 --- a/lingucomponent/source/languageguessing/simpleguesser.hxx +++ b/lingucomponent/source/languageguessing/simpleguesser.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/*************************************************************************** +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef SIMPLEGUESSER_H #define SIMPLEGUESSER_H diff --git a/lingucomponent/source/lingutil/lingutil.cxx b/lingucomponent/source/lingutil/lingutil.cxx index 6fe06a51663c..89dcc77034ff 100644 --- a/lingucomponent/source/lingutil/lingutil.cxx +++ b/lingucomponent/source/lingutil/lingutil.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #if defined(WNT) @@ -49,7 +40,6 @@ #include #include -#include #include diff --git a/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component b/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component index 9bc92671fe53..f314b1c7a1ee 100644 --- a/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component +++ b/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component @@ -1,30 +1,21 @@ - + diff --git a/lingucomponent/source/spellcheck/macosxspell/macreg.mm b/lingucomponent/source/spellcheck/macosxspell/macreg.mm index 6e438bb9e202..1b744266e8d9 100644 --- a/lingucomponent/source/spellcheck/macosxspell/macreg.mm +++ b/lingucomponent/source/spellcheck/macosxspell/macreg.mm @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx index d02055113145..cc5bc426efeb 100644 --- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx +++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _MACSPELLIMP_H_ #define _MACSPELLIMP_H_ @@ -77,7 +68,6 @@ class MacSpellChecker : > { Sequence< Locale > aSuppLocales; -// Hunspell ** aDicts; rtl_TextEncoding * aDEncs; Locale * aDLocs; OUString * aDNames; diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm index f09e5aa3b5ea..ff2a90b4d5ff 100644 --- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm +++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include @@ -35,7 +26,6 @@ #include #include -#include #include #include @@ -58,10 +48,8 @@ using ::rtl::OString; using ::rtl::OUStringBuffer; using ::rtl::OUStringToOString; -/////////////////////////////////////////////////////////////////////////// - MacSpellChecker::MacSpellChecker() : - aEvtListeners ( GetLinguMutex() ) + aEvtListeners( GetLinguMutex() ) { aDEncs = NULL; aDLocs = NULL; @@ -117,14 +105,10 @@ Sequence< Locale > SAL_CALL MacSpellChecker::getLocales() int numusr; // number of user dictionary entries int numshr; // number of shared dictionary entries - dictentry * spdict; // shared dict entry pointer - dictentry * updict; // user dict entry pointer SvtPathOptions aPathOpt; rtl_TextEncoding aEnc = RTL_TEXTENCODING_UTF8; std::vector postspdict; - std::vector postupdict; - if (!numdict) { @@ -143,7 +127,6 @@ Sequence< Locale > SAL_CALL MacSpellChecker::getLocales() } } - numusr = postupdict.size(); numshr = postspdict.size(); // we really should merge these and remove duplicates but since @@ -198,11 +181,6 @@ Sequence< Locale > SAL_CALL MacSpellChecker::getLocales() aDNames = NULL; aSuppLocales.realloc(0); } - - /* de-allocation of memory is handled inside the DictMgr */ - updict = NULL; - spdict = NULL; - } return aSuppLocales; diff --git a/lingucomponent/source/spellcheck/spell/spell.component b/lingucomponent/source/spellcheck/spell/spell.component index 5a7359f33aac..ac990192071e 100644 --- a/lingucomponent/source/spellcheck/spell/spell.component +++ b/lingucomponent/source/spellcheck/spell/spell.component @@ -1,30 +1,21 @@ - + diff --git a/lingucomponent/source/spellcheck/spell/sreg.cxx b/lingucomponent/source/spellcheck/spell/sreg.cxx index d5ed66fc0c26..3e90d7daf993 100644 --- a/lingucomponent/source/spellcheck/spell/sreg.cxx +++ b/lingucomponent/source/spellcheck/spell/sreg.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include // helper for factories #include diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx index de1b7b64dc86..473e6c79ac05 100644 --- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx +++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.hxx b/lingucomponent/source/spellcheck/spell/sspellimp.hxx index 998d4e8c17ab..e19e06814081 100644 --- a/lingucomponent/source/spellcheck/spell/sspellimp.hxx +++ b/lingucomponent/source/spellcheck/spell/sspellimp.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _LINGU2_SPELLIMP_HXX_ #define _LINGU2_SPELLIMP_HXX_ diff --git a/lingucomponent/source/thesaurus/libnth/lnth.component b/lingucomponent/source/thesaurus/libnth/lnth.component index 0b2c99036608..d54e1a38de2d 100644 --- a/lingucomponent/source/thesaurus/libnth/lnth.component +++ b/lingucomponent/source/thesaurus/libnth/lnth.component @@ -1,30 +1,21 @@ - + diff --git a/lingucomponent/source/thesaurus/libnth/nthesdta.cxx b/lingucomponent/source/thesaurus/libnth/nthesdta.cxx index 526ffcdf543e..88503c0ebcdd 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesdta.cxx +++ b/lingucomponent/source/thesaurus/libnth/nthesdta.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx index 6ae4d25cc4e8..6867aa985c60 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx +++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include @@ -46,7 +37,6 @@ #include #include #include "nthesdta.hxx" -#include #include #include diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx index 9a84b4bc02f4..08cba87ce8e8 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx +++ b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _LINGU2_THESIMP_HXX_ #define _LINGU2_THESIMP_HXX_ diff --git a/lingucomponent/source/thesaurus/libnth/ntreg.cxx b/lingucomponent/source/thesaurus/libnth/ntreg.cxx index f09aace883c5..3fc7d243400a 100644 --- a/lingucomponent/source/thesaurus/libnth/ntreg.cxx +++ b/lingucomponent/source/thesaurus/libnth/ntreg.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include // helper for factories #include diff --git a/linguistic/Makefile b/linguistic/Makefile index ccb1c85a04da..0997e628485b 100644 --- a/linguistic/Makefile +++ b/linguistic/Makefile @@ -1,4 +1,11 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) diff --git a/linguistic/inc/iprcache.hxx b/linguistic/inc/iprcache.hxx index af046939f241..c31724a8aa7b 100644 --- a/linguistic/inc/iprcache.hxx +++ b/linguistic/inc/iprcache.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _LINGUISTIC_IPRCACHE_HXX_ #define _LINGUISTIC_IPRCACHE_HXX_ diff --git a/linguistic/inc/linguistic/hyphdta.hxx b/linguistic/inc/linguistic/hyphdta.hxx index ffdc36a01509..81c52ce9255e 100644 --- a/linguistic/inc/linguistic/hyphdta.hxx +++ b/linguistic/inc/linguistic/hyphdta.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _LINGUISTIC_HYPHDTA_HXX_ #define _LINGUISTIC_HYPHDTA_HXX_ diff --git a/linguistic/inc/linguistic/lngdllapi.h b/linguistic/inc/linguistic/lngdllapi.h index 265a11d8b51a..0da35fe7e123 100644 --- a/linguistic/inc/linguistic/lngdllapi.h +++ b/linguistic/inc/linguistic/lngdllapi.h @@ -1,43 +1,33 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ -#ifndef INCLUDED_LNG_DLLAPI_H -#define INCLUDED_LNG_DLLAPI_H +#ifndef _LNG_DLLAPI_H +#define _LNG_DLLAPI_H #include "sal/config.h" #include "sal/types.h" -#if defined LNG_DLLIMPLEMENTATION -#define LNG_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#if defined(LNG_DLLIMPLEMENTATION) +#define LNG_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -#define LNG_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define LNG_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif - #define LNG_DLLPRIVATE SAL_DLLPRIVATE #endif diff --git a/linguistic/inc/linguistic/lngprophelp.hxx b/linguistic/inc/linguistic/lngprophelp.hxx index b74c8d4b2d4a..201310995ee8 100644 --- a/linguistic/inc/linguistic/lngprophelp.hxx +++ b/linguistic/inc/linguistic/lngprophelp.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _LINGUISTIC_LNGPROPHELP_HXX_ #define _LINGUISTIC_LNGPROPHELP_HXX_ diff --git a/linguistic/inc/linguistic/misc.hxx b/linguistic/inc/linguistic/misc.hxx index b46cef201041..0bf1c5cc00a3 100644 --- a/linguistic/inc/linguistic/misc.hxx +++ b/linguistic/inc/linguistic/misc.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _LINGUISTIC_MISC_HXX_ #define _LINGUISTIC_MISC_HXX_ diff --git a/linguistic/inc/linguistic/spelldta.hxx b/linguistic/inc/linguistic/spelldta.hxx index 1fc2daade020..8eec9c19f5a9 100644 --- a/linguistic/inc/linguistic/spelldta.hxx +++ b/linguistic/inc/linguistic/spelldta.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _LINGUISTIC_SPELLDTA_HXX_ #define _LINGUISTIC_SPELLDTA_HXX_ diff --git a/linguistic/qa/unoapi/knownissues.xcl b/linguistic/qa/unoapi/knownissues.xcl index e5bf99558ac6..27f9dacc176b 100644 --- a/linguistic/qa/unoapi/knownissues.xcl +++ b/linguistic/qa/unoapi/knownissues.xcl @@ -1,3 +1,21 @@ +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# This file incorporates work covered by the following license notice: +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . +# + ### i84435 ## lng.LngSvcMgr #uncommented in lng.sce diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx index 347707e7683e..9a14901cc697 100644 --- a/linguistic/source/convdic.cxx +++ b/linguistic/source/convdic.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx index 047b73746617..13729687f2d3 100644 --- a/linguistic/source/convdic.hxx +++ b/linguistic/source/convdic.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _LINGUISTIC_CONVDIC_HXX_ #define _LINGUISTIC_CONVDIC_HXX_ diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index 0dabd641744e..5683b263a4d9 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx index 197e4fa2814c..09298f4ba650 100644 --- a/linguistic/source/convdicxml.cxx +++ b/linguistic/source/convdicxml.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/linguistic/source/convdicxml.hxx b/linguistic/source/convdicxml.hxx index 3d52b0fe94b2..50d17df6afc6 100644 --- a/linguistic/source/convdicxml.hxx +++ b/linguistic/source/convdicxml.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _LINGUISTIC_CONVDICXML_HXX_ #define _LINGUISTIC_CONVDICXML_HXX_ diff --git a/linguistic/source/defs.hxx b/linguistic/source/defs.hxx index c37706a5a764..817639170ed9 100644 --- a/linguistic/source/defs.hxx +++ b/linguistic/source/defs.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _LINGUISTIC_DEFS_HXX_ #define _LINGUISTIC_DEFS_HXX_ diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx index 4ffb780bfd55..5a2f7d746860 100644 --- a/linguistic/source/dicimp.cxx +++ b/linguistic/source/dicimp.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/linguistic/source/dicimp.hxx b/linguistic/source/dicimp.hxx index f2e51ad3d02b..012f3fdd656c 100644 --- a/linguistic/source/dicimp.hxx +++ b/linguistic/source/dicimp.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _LINGUISTIC_DICIMP_HXX_ #define _LINGUISTIC_DICIMP_HXX_ diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index d8ef8dd19d86..a705657cb78e 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/linguistic/source/dlistimp.hxx b/linguistic/source/dlistimp.hxx index b4de818557ef..a058f41e8357 100644 --- a/linguistic/source/dlistimp.hxx +++ b/linguistic/source/dlistimp.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _LINGUISTIC_DLISTIMP_HXX_ #define _LINGUISTIC_DLISTIMP_HXX_ diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index d2c960812451..79f0f39e32fa 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/linguistic/source/gciterator.hxx b/linguistic/source/gciterator.hxx index 8dda00971437..669003511dcd 100644 --- a/linguistic/source/gciterator.hxx +++ b/linguistic/source/gciterator.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _LINGUISTIC_GRAMMARCHECKINGITERATOR_HXX_ #define _LINGUISTIC_GRAMMARCHECKINGITERATOR_HXX_ diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx index 0c8f6bac413f..2f5a54934fda 100644 --- a/linguistic/source/hhconvdic.cxx +++ b/linguistic/source/hhconvdic.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx index e80701d13689..c22841a835e4 100644 --- a/linguistic/source/hyphdsp.cxx +++ b/linguistic/source/hyphdsp.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include // helper for factories #include diff --git a/linguistic/source/hyphdta.cxx b/linguistic/source/hyphdta.cxx index 90c6e4bfabf2..c0c7a1f3551b 100644 --- a/linguistic/source/hyphdta.cxx +++ b/linguistic/source/hyphdta.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include "linguistic/hyphdta.hxx" diff --git a/linguistic/source/iprcache.cxx b/linguistic/source/iprcache.cxx index f5ca479350ea..436859281338 100644 --- a/linguistic/source/iprcache.cxx +++ b/linguistic/source/iprcache.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/linguistic/source/lng.component b/linguistic/source/lng.component index 1b31003d7bda..28ef844c9c95 100644 --- a/linguistic/source/lng.component +++ b/linguistic/source/lng.component @@ -1,30 +1,21 @@ - + diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index 8a84fa6718e7..63286648066b 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx index 61bb241eb40c..7d109e231b99 100644 --- a/linguistic/source/lngopt.hxx +++ b/linguistic/source/lngopt.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _LINGUISTIC_LNGOPT_HHX_ #define _LINGUISTIC_LNGOPT_HHX_ diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx index 730f35d325c9..a53499821f76 100644 --- a/linguistic/source/lngprophelp.cxx +++ b/linguistic/source/lngprophelp.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/linguistic/source/lngreg.cxx b/linguistic/source/lngreg.cxx index cbef8fb8ea8e..f7a33fe1127d 100644 --- a/linguistic/source/lngreg.cxx +++ b/linguistic/source/lngreg.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include // helper for factories #include diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index acb037817002..ffee4bf1abaf 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include @@ -45,6 +36,8 @@ #include #include +#include + #include "lngsvcmgr.hxx" #include "lngopt.hxx" #include "linguistic/misc.hxx" @@ -514,14 +507,10 @@ void LngSvcMgr::modified(const lang::EventObject&) //assume that if an extension has been added/removed that //it might be a dictionary extension, so drop our cache - delete pAvailSpellSvcs; - pAvailSpellSvcs = NULL; - delete pAvailGrammarSvcs; - pAvailGrammarSvcs = NULL; - delete pAvailHyphSvcs; - pAvailHyphSvcs = NULL; - delete pAvailThesSvcs; - pAvailThesSvcs = NULL; + clearSvcInfoArray(pAvailSpellSvcs); + clearSvcInfoArray(pAvailGrammarSvcs); + clearSvcInfoArray(pAvailHyphSvcs); + clearSvcInfoArray(pAvailThesSvcs); //schedule in an update to execute in the main thread aUpdateTimer.Start(); @@ -574,6 +563,12 @@ void LngSvcMgr::disposing(const lang::EventObject&) stopListening(); } +void LngSvcMgr::clearSvcInfoArray(SvcInfoArray* &rpInfo) +{ + delete rpInfo; + rpInfo = NULL; +} + LngSvcMgr::~LngSvcMgr() { stopListening(); @@ -582,10 +577,10 @@ LngSvcMgr::~LngSvcMgr() // will be freed in the destructor of the respective Reference's // xSpellDsp, xGrammarDsp, xHyphDsp, xThesDsp - delete pAvailSpellSvcs; - delete pAvailGrammarSvcs; - delete pAvailHyphSvcs; - delete pAvailThesSvcs; + clearSvcInfoArray(pAvailSpellSvcs); + clearSvcInfoArray(pAvailGrammarSvcs); + clearSvcInfoArray(pAvailHyphSvcs); + clearSvcInfoArray(pAvailThesSvcs); } namespace @@ -868,7 +863,7 @@ void LngSvcMgr::Notify( const uno::Sequence< OUString > &rPropertyNames ) if (0 == rName.compareTo( aSpellCheckerList, aSpellCheckerList.getLength() )) { // delete old cached data, needs to be acquired new on demand - delete pAvailSpellSvcs; pAvailSpellSvcs = 0; + clearSvcInfoArray(pAvailSpellSvcs); OUString aNode( aSpellCheckerList ); if (lcl_SeqHasString( aSpellCheckerListEntries, aKeyText )) @@ -893,7 +888,7 @@ void LngSvcMgr::Notify( const uno::Sequence< OUString > &rPropertyNames ) else if (0 == rName.compareTo( aGrammarCheckerList, aGrammarCheckerList.getLength() )) { // delete old cached data, needs to be acquired new on demand - delete pAvailGrammarSvcs; pAvailGrammarSvcs = 0; + clearSvcInfoArray(pAvailGrammarSvcs); OUString aNode( aGrammarCheckerList ); if (lcl_SeqHasString( aGrammarCheckerListEntries, aKeyText )) @@ -921,7 +916,7 @@ void LngSvcMgr::Notify( const uno::Sequence< OUString > &rPropertyNames ) else if (0 == rName.compareTo( aHyphenatorList, aHyphenatorList.getLength() )) { // delete old cached data, needs to be acquired new on demand - delete pAvailHyphSvcs; pAvailHyphSvcs = 0; + clearSvcInfoArray(pAvailHyphSvcs); OUString aNode( aHyphenatorList ); if (lcl_SeqHasString( aHyphenatorListEntries, aKeyText )) @@ -946,7 +941,7 @@ void LngSvcMgr::Notify( const uno::Sequence< OUString > &rPropertyNames ) else if (0 == rName.compareTo( aThesaurusList, aThesaurusList.getLength() )) { // delete old cached data, needs to be acquired new on demand - delete pAvailThesSvcs; pAvailThesSvcs = 0; + clearSvcInfoArray(pAvailThesSvcs); OUString aNode( aThesaurusList ); if (lcl_SeqHasString( aThesaurusListEntries, aKeyText )) diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx index 537750d7d262..05f93b97d01e 100644 --- a/linguistic/source/lngsvcmgr.hxx +++ b/linguistic/source/lngsvcmgr.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _LINGUISTIC_LNGSVCMGR_HXX_ #define _LINGUISTIC_LNGSVCMGR_HXX_ @@ -144,6 +135,8 @@ class LngSvcMgr : sal_Bool SaveCfgSvcs( const String &rServiceName ); + static void clearSvcInfoArray(SvcInfoArray *&rpInfo); + // utl::ConfigItem (to allow for listening of changes of relevant properties) virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString > &rPropertyNames ); virtual void Commit(); diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx index 89bbd8df5656..5992496e1272 100644 --- a/linguistic/source/misc.cxx +++ b/linguistic/source/misc.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/linguistic/source/misc2.cxx b/linguistic/source/misc2.cxx index d4daf2d151c9..f7e1794a457e 100644 --- a/linguistic/source/misc2.cxx +++ b/linguistic/source/misc2.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx index cf5a854670eb..1ddfa1ce0247 100644 --- a/linguistic/source/spelldsp.cxx +++ b/linguistic/source/spelldsp.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/linguistic/source/spelldsp.hxx b/linguistic/source/spelldsp.hxx index e2186f96ddad..2e24ade3121f 100644 --- a/linguistic/source/spelldsp.hxx +++ b/linguistic/source/spelldsp.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _LINGUISTIC_SPELLDSP_HXX_ #define _LINGUISTIC_SPELLDSP_HXX_ diff --git a/linguistic/source/spelldta.cxx b/linguistic/source/spelldta.cxx index 0aa4fc1fdebf..9bbfb8b26af5 100644 --- a/linguistic/source/spelldta.cxx +++ b/linguistic/source/spelldta.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/linguistic/source/thesdsp.cxx b/linguistic/source/thesdsp.cxx index 75e6659cf854..f182b122a959 100644 --- a/linguistic/source/thesdsp.cxx +++ b/linguistic/source/thesdsp.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/linguistic/workben/makefile.mk b/linguistic/workben/makefile.mk index 9df85c75140b..5b94668170d3 100644 --- a/linguistic/workben/makefile.mk +++ b/linguistic/workben/makefile.mk @@ -1,29 +1,20 @@ -#************************************************************************* # -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. +# This file is part of the LibreOffice project. # -# OpenOffice.org - a multi-platform office productivity suite +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# This file is part of OpenOffice.org. +# This file incorporates work covered by the following license notice: # -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . # -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* PRJ = .. diff --git a/linguistic/workben/sprophelp.cxx b/linguistic/workben/sprophelp.cxx index b5ca84245191..7360aebc92c4 100644 --- a/linguistic/workben/sprophelp.cxx +++ b/linguistic/workben/sprophelp.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include diff --git a/linguistic/workben/sprophelp.hxx b/linguistic/workben/sprophelp.hxx index 10c25de0bc63..947ce429aa39 100644 --- a/linguistic/workben/sprophelp.hxx +++ b/linguistic/workben/sprophelp.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _LINGU2_PROPHELP_HXX_ #define _LINGU2_PROPHELP_HXX_ diff --git a/linguistic/workben/sreg.cxx b/linguistic/workben/sreg.cxx index c23ccd7e4a98..d21dee45fc6d 100644 --- a/linguistic/workben/sreg.cxx +++ b/linguistic/workben/sreg.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include // helper for factories #include diff --git a/linguistic/workben/sspellimp.cxx b/linguistic/workben/sspellimp.cxx index e281f1f88d15..914f2a125a69 100644 --- a/linguistic/workben/sspellimp.cxx +++ b/linguistic/workben/sspellimp.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include #include diff --git a/linguistic/workben/sspellimp.hxx b/linguistic/workben/sspellimp.hxx index b2ebeff28ed0..172c7753d574 100644 --- a/linguistic/workben/sspellimp.hxx +++ b/linguistic/workben/sspellimp.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _LINGU2_SPELLIMP_HXX_ #define _LINGU2_SPELLIMP_HXX_ diff --git a/linguistic/xml/linguistic.xml b/linguistic/xml/linguistic.xml index 83aaaeb0c1e0..57a2d3f280f2 100644 --- a/linguistic/xml/linguistic.xml +++ b/linguistic/xml/linguistic.xml @@ -1,5 +1,23 @@ + + lng From 3d70fe990dbf977aebf4042e846f2ca173e5b43e Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 8 Oct 2012 13:43:22 +0300 Subject: [PATCH 538/863] WaE: unused function 'unoCapeFromCap' Change-Id: I21dc33e39da8f46379fad672a83e8fb8449a0ec4 --- canvas/source/vcl/canvashelper.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx index 8028a91bfe3d..0d4f204be2b5 100644 --- a/canvas/source/vcl/canvashelper.cxx +++ b/canvas/source/vcl/canvashelper.cxx @@ -90,6 +90,7 @@ namespace vclcanvas return basegfx::B2DLINEJOIN_NONE; } +#ifdef FIXME_REMOVE_WHEN_RE_BASE_COMPLETE drawing::LineCap unoCapeFromCap( sal_Int8 nCapType) { switch ( nCapType) @@ -109,6 +110,7 @@ namespace vclcanvas } return drawing::LineCap_BUTT; } +#endif } CanvasHelper::CanvasHelper() : From 3d556fcc1e3b7574b3d7f1d577f2f3bbe673cc9b Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 8 Oct 2012 13:51:22 +0300 Subject: [PATCH 539/863] WaE: variable 'numusr' is uninitialized when used here Change-Id: I6476df0460f0f1cebb4879f1c732af6a4c48b5f7 --- lingucomponent/source/spellcheck/macosxspell/macspellimp.mm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm index ff2a90b4d5ff..f34eabdaee46 100644 --- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm +++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm @@ -103,7 +103,6 @@ Sequence< Locale > SAL_CALL MacSpellChecker::getLocales() // dictionary list and the shared dictionary list // to see what dictionaries the admin/user has installed - int numusr; // number of user dictionary entries int numshr; // number of shared dictionary entries SvtPathOptions aPathOpt; rtl_TextEncoding aEnc = RTL_TEXTENCODING_UTF8; @@ -133,7 +132,7 @@ Sequence< Locale > SAL_CALL MacSpellChecker::getLocales() // users can name their dictionaries anything they want it would // be impossible to know if a real duplication exists unless we // add some unique key to each myspell dictionary - numdict = numshr + numusr; + numdict = numshr; if (numdict) { aDLocs = new Locale [numdict]; From 4c5589a397b05515ba4aec0c494f43fb9f750975 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 8 Oct 2012 13:04:22 +0200 Subject: [PATCH 540/863] configure: adjust beanshell/javascript options to the changes in a72a7dc500ffd57662e8b9be61e4676266861c33. Change-Id: I79fba4dbe8a72b65625a9ed11fa0b3cebdf80426 --- configure.in | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/configure.in b/configure.in index cc8524f99d9a..3c324811ec8b 100644 --- a/configure.in +++ b/configure.in @@ -637,12 +637,14 @@ AC_ARG_ENABLE(ext-report-builder, AC_ARG_ENABLE(ext-scripting-beanshell, AS_HELP_STRING([--enable-ext-scripting-beanshell], - [Enable support for scripts in BeanShell.]) + [DEPRECATED: use --enable-scripting-beanshell instead.]) +,AC_MSG_ERROR([--enable-ext-scripting-beanshell is no longer supported.]) ) AC_ARG_ENABLE(ext-scripting-javascript, AS_HELP_STRING([--enable-ext-scripting-javascript], - [Enable support for scripts in JavaScript.]) + [DEPRECATED: use --enable-scripting-javascript instead.]) +,AC_MSG_ERROR([--enable-ext-scripting-javascript is no longer supported.]) ) AC_ARG_ENABLE(ext-typo, @@ -1455,6 +1457,12 @@ AC_ARG_WITH(hsqldb-jar, [Specify path to jarfile manually.]), HSQLDB_JAR=$withval) +AC_ARG_ENABLE(scripting-beanshell, + AS_HELP_STRING([--disable-scripting-beanshell], + [Disable support for scripts in BeanShell.]), +, +) + AC_ARG_WITH(system-beanshell, AS_HELP_STRING([--with-system-beanshell], [Use beanshell already on system.]),, @@ -1465,6 +1473,12 @@ AC_ARG_WITH(beanshell-jar, [Specify path to jarfile manually.]), BSH_JAR=$withval) +AC_ARG_ENABLE(scripting-javascript, + AS_HELP_STRING([--disable-scripting-javascript], + [Disable support for scripts in JavaScript.]), +, +) + AC_ARG_WITH(system-rhino, AS_HELP_STRING([--with-system-rhino], [Use rhino already on system.]),,) @@ -10176,9 +10190,9 @@ AC_SUBST(COMMONS_HTTPCLIENT_JAR) AC_SUBST(COMMONS_LOGGING_JAR) AC_SUBST(TOMCAT_TARBALL) -# scripting provider for BeanShell extension? -AC_MSG_CHECKING([whether to build extension for support of scripts in BeanShell]) -if test "x$enable_ext_scripting_beanshell" = "xyes" -a "x$enable_extension_integration" != "xno" -a "x$with_java" != "xno"; then +# scripting provider for BeanShell? +AC_MSG_CHECKING([whether to build support for scripts in BeanShell]) +if test "${enable_scripting_beanshell}" != "no" -a "x$with_java" != "xno"; then AC_MSG_RESULT([yes]) ENABLE_SCRIPTING_BEANSHELL=YES @@ -10210,9 +10224,9 @@ AC_SUBST(SYSTEM_BSH) AC_SUBST(BSH_JAR) AC_SUBST(BSH_TARBALL) -# scripting provider for JavaScript extension? -AC_MSG_CHECKING([whether to build extension for support of scripts in JavaScript]) -if test "x$enable_ext_scripting_javascript" = "xyes" -a "x$enable_extension_integration" != "xno" -a "x$with_java" != "xno"; then +# scripting provider for JavaScript? +AC_MSG_CHECKING([whether to build support for scripts in JavaScript]) +if test "${enable_scripting_javascript}" != "no" -a "x$with_java" != "xno"; then AC_MSG_RESULT([yes]) ENABLE_SCRIPTING_JAVASCRIPT=YES From d4214aab9c093dab321e6deaeaf5f7e86af1381c Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 8 Oct 2012 13:12:15 +0200 Subject: [PATCH 541/863] scp2: rename misleading WITHOUT_EXTENSION_SCRIPTING_BEANSHELL/JAVSCRIPT Change-Id: Id8524bcfa3d593584afbad0b5dcc1cc48aa377d7 --- configure.in | 4 ++-- scp2/source/extensions/file_extensions.scp | 4 ++-- scp2/source/extensions/module_extensions.scp | 4 ++-- scp2/source/ooo/file_ooo.scp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configure.in b/configure.in index 3c324811ec8b..169d994f87c7 100644 --- a/configure.in +++ b/configure.in @@ -10217,7 +10217,7 @@ if test "${enable_scripting_beanshell}" != "no" -a "x$with_java" != "xno"; then else AC_MSG_RESULT([no]) ENABLE_SCRIPTING_BEANSHELL=NO - SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_SCRIPTING_BEANSHELL" + SCPDEFS="$SCPDEFS -DWITHOUT_SCRIPTING_BEANSHELL" fi AC_SUBST(ENABLE_SCRIPTING_BEANSHELL) AC_SUBST(SYSTEM_BSH) @@ -10251,7 +10251,7 @@ if test "${enable_scripting_javascript}" != "no" -a "x$with_java" != "xno"; then else AC_MSG_RESULT([no]) ENABLE_SCRIPTING_JAVASCRIPT=NO - SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT" + SCPDEFS="$SCPDEFS -DWITHOUT_SCRIPTING_JAVASCRIPT" fi AC_SUBST(ENABLE_SCRIPTING_JAVASCRIPT) AC_SUBST(SYSTEM_RHINO) diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp index 725329553327..90e99875d32e 100644 --- a/scp2/source/extensions/file_extensions.scp +++ b/scp2/source/extensions/file_extensions.scp @@ -287,7 +287,7 @@ End /* ** Script provider for BeanShell ** */ -#if defined SOLAR_JAVA && !defined WITHOUT_EXTENSION_SCRIPTING_BEANSHELL +#if defined SOLAR_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL #if !defined SYSTEM_BSH STD_JAR_FILE( gid_File_Jar_Bsh, bsh ) @@ -306,7 +306,7 @@ End /* ** Script provider for JavaScript ** */ -#if defined SOLAR_JAVA && !defined WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT +#if defined SOLAR_JAVA && !defined WITHOUT_SCRIPTING_JAVASCRIPT STD_JAR_FILE( gid_File_Jar_Js, js ) diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp index 01d773c017e4..91853ea629e1 100644 --- a/scp2/source/extensions/module_extensions.scp +++ b/scp2/source/extensions/module_extensions.scp @@ -326,7 +326,7 @@ End /* ** Script provider for BeanShell ** */ -#if defined SOLAR_JAVA && !defined WITHOUT_EXTENSION_SCRIPTING_BEANSHELL +#if defined SOLAR_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL Module gid_Module_Optional_Extensions_Script_Provider_For_Beanshell PackageInfo = "packinfo_extensions.txt"; @@ -345,7 +345,7 @@ End /* ** Script provider for JavaScript ** */ -#if defined SOLAR_JAVA && !defined WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT +#if defined SOLAR_JAVA && !defined WITHOUT_SCRIPTING_JAVASCRIPT Module gid_Module_Optional_Extensions_Script_Provider_For_Javascript PackageInfo = "packinfo_extensions.txt"; diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index a42f6834abd3..ea102c302fdb 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -723,7 +723,7 @@ File gid_File_Scripts_Java Name = "ScriptsJava.zip"; End -#ifndef WITHOUT_EXTENSION_SCRIPTING_BEANSHELL +#ifndef WITHOUT_SCRIPTING_BEANSHELL File gid_File_Scripts_Beanshell Dir = gid_Dir_Share_Scripts; ARCHIVE_TXT_FILE_BODY; @@ -731,7 +731,7 @@ File gid_File_Scripts_Beanshell End #endif -#ifndef WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT +#ifndef WITHOUT_SCRIPTING_JAVASCRIPT File gid_File_Scripts_Javascript Dir = gid_Dir_Share_Scripts; ARCHIVE_TXT_FILE_BODY; From 1b66ced2367353ad42a14bfc76ca1853c4935d6a Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 8 Oct 2012 14:27:13 +0300 Subject: [PATCH 542/863] Managed C++ to C++/CLI conversion also for the debug code Change-Id: Ibb4f5e386644a67905421d2f9c33336a119fca88 --- cli_ure/source/uno_bridge/cli_bridge.cxx | 4 ++-- cli_ure/source/uno_bridge/cli_data.cxx | 10 +++++----- cli_ure/source/uno_bridge/cli_proxy.cxx | 8 ++++---- cli_ure/source/uno_bridge/cli_uno.cxx | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cli_ure/source/uno_bridge/cli_bridge.cxx b/cli_ure/source/uno_bridge/cli_bridge.cxx index 12b432ed6dab..6da6cdf25aad 100644 --- a/cli_ure/source/uno_bridge/cli_bridge.cxx +++ b/cli_ure/source/uno_bridge/cli_bridge.cxx @@ -276,8 +276,8 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_initEnvironment( uno_Environment * uno_cl uno_cli_env->pExtEnv = 0; //Set the console to print Trace messages #if OSL_DEBUG_LEVEL >= 1 - System::Diagnostics::Trace::get_Listeners()-> - Add( new System::Diagnostics::TextWriterTraceListener(System::Console::get_Out())); + System::Diagnostics::Trace::Listeners-> + Add( gcnew System::Diagnostics::TextWriterTraceListener(System::Console::Out)); #endif OSL_ASSERT( 0 == uno_cli_env->pContext ); diff --git a/cli_ure/source/uno_bridge/cli_data.cxx b/cli_ure/source/uno_bridge/cli_data.cxx index 3a0eb8050319..935a90be2a0a 100644 --- a/cli_ure/source/uno_bridge/cli_data.cxx +++ b/cli_ure/source/uno_bridge/cli_data.cxx @@ -1584,7 +1584,7 @@ void Bridge::map_to_cli( { if (info != nullptr) { - OSL_ASSERT(info->get_IsByRef()); + OSL_ASSERT(info->IsByRef); info= info->GetElementType(); *cli_data= System::Enum::ToObject(info, *(System::Int32*) uno_data); } @@ -1661,10 +1661,10 @@ void Bridge::map_to_cli( ctorInfo = arCtorInfo[i]; break; } - OSL_ASSERT(arParamInfo[0]->get_ParameterType()->Equals(__typeof(System::String)) - && arParamInfo[1]->get_ParameterType()->Equals(__typeof(System::Object)) - && arParamInfo[0]->get_Position() == 0 - && arParamInfo[1]->get_Position() == 1); + OSL_ASSERT(arParamInfo[0]->ParameterType->Equals(System::String::typeid) + && arParamInfo[1]->ParameterType->Equals(System::Object::typeid) + && arParamInfo[0]->Position == 0 + && arParamInfo[1]->Position == 1); //Prepare parameters for constructor int numArgs = arParamInfo->Length; array^ args = gcnew array(numArgs); diff --git a/cli_ure/source/uno_bridge/cli_proxy.cxx b/cli_ure/source/uno_bridge/cli_proxy.cxx index 1e6ede2f78b6..808e5fef3924 100644 --- a/cli_ure/source/uno_bridge/cli_proxy.cxx +++ b/cli_ure/source/uno_bridge/cli_proxy.cxx @@ -285,10 +285,10 @@ bool UnoInterfaceProxy::CanCastTo(System::Type^ fromType, UnoInterfaceProxy ^ proxy = static_cast< UnoInterfaceProxy ^ >( srr::RemotingServices::GetRealProxy( obj ) ); - OSL_ASSERT( 0 != proxy->findInfo( fromType ) ); + OSL_ASSERT( nullptr != proxy->findInfo( fromType ) ); m_listAdditionalProxies->Add( proxy ); m_nlistAdditionalProxies = m_listAdditionalProxies->Count; - OSL_ASSERT( 0 != findInfo( fromType ) ); + OSL_ASSERT( nullptr != findInfo( fromType ) ); return true; } } @@ -337,7 +337,7 @@ srrm::IMessage^ UnoInterfaceProxy::invokeObject( if (m_Equals_String->Equals(sMethod)) { // Object.Equals - OSL_ASSERT(args->get_Length() == 1); + OSL_ASSERT(args->Length == 1); srrp::RealProxy^ rProxy = srr::RemotingServices::GetRealProxy(args[0]); bool bDone = false; if (rProxy) @@ -433,7 +433,7 @@ srrm::IMessage^ UnoInterfaceProxy::Invoke(srrm::IMessage^ callmsg) System::Type^ typeBeingCalled = loadCliType(sTypeName); UnoInterfaceInfo^ info = findInfo( typeBeingCalled ); - OSL_ASSERT( 0 != info ); + OSL_ASSERT( nullptr != info ); // ToDo do without string conversion, a OUString is not needed here // get the type description of the call diff --git a/cli_ure/source/uno_bridge/cli_uno.cxx b/cli_ure/source/uno_bridge/cli_uno.cxx index 0ada41d9fd30..e72b8651472f 100644 --- a/cli_ure/source/uno_bridge/cli_uno.cxx +++ b/cli_ure/source/uno_bridge/cli_uno.cxx @@ -78,7 +78,7 @@ System::Object^ Bridge::call_uno(uno_Interface * pUnoI, uno_ret = (mem + (nParams * sizeof (void *))); largest * uno_args_mem = (largest *)(mem + (nParams * sizeof (void *)) + return_size); - OSL_ASSERT( (0 == nParams) || (nParams == args->get_Length()) ); + OSL_ASSERT( (0 == nParams) || (nParams == args->Length) ); for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos ) { typelib_MethodParameter const & param = pParams[ nPos ]; From 9897942db6c53dff3a85b880d9d2b955011ef189 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Sat, 6 Oct 2012 16:19:42 +0100 Subject: [PATCH 543/863] Tweak hyphen as a togglable option after all In a65f48f375d218b592ba7c17752f9ca86e14bd65 I wondered why hyphenation was set to be a toggle able feature when it opens a non-modal dialog. Looking closer, it *is* a toggable feature on/off for draw/impress, but this isn't the case for writer. Reverted it for calc too, although apparently not toggable there. Change-Id: If02568d58253c380e6d668a728f9c3ae6acf1128 --- sc/sdi/scalc.sdi | 2 +- sd/sdi/sdraw.sdi | 2 +- sw/source/ui/uiview/viewstat.cxx | 9 --------- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi index 14fb8cc980ca..8e0cf31d6b4a 100644 --- a/sc/sdi/scalc.sdi +++ b/sc/sdi/scalc.sdi @@ -3439,7 +3439,7 @@ SfxVoidItem Hyphenate SID_ENABLE_HYPHENATION HasCoreId = FALSE, HasDialog = TRUE, ReadOnlyDoc = FALSE, - Toggle = FALSE, + Toggle = TRUE, Container = FALSE, RecordAbsolute = FALSE, RecordPerSet; diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi index 277565917a97..0183a5470826 100644 --- a/sd/sdi/sdraw.sdi +++ b/sd/sdi/sdraw.sdi @@ -3260,7 +3260,7 @@ SfxBoolItem Hyphenation SID_HYPHENATION HasCoreId = FALSE, HasDialog = FALSE, ReadOnlyDoc = FALSE, - Toggle = FALSE, + Toggle = TRUE, Container = FALSE, RecordAbsolute = FALSE, RecordPerSet; diff --git a/sw/source/ui/uiview/viewstat.cxx b/sw/source/ui/uiview/viewstat.cxx index 7938caab65cc..3aee693a3434 100644 --- a/sw/source/ui/uiview/viewstat.cxx +++ b/sw/source/ui/uiview/viewstat.cxx @@ -247,15 +247,6 @@ void SwView::GetState(SfxItemSet &rSet) rSet.Put((const SvxLanguageItem&) pWrtShell->GetDefault(RES_CHRATR_CTL_LANGUAGE), RES_CHRATR_CTL_LANGUAGE); break; - case FN_HYPHENATE_OPT_DLG: - { - sal_Bool bCheck = sal_False; - - if (pWrtShell->GetSelectionType() & (nsSelectionType::SEL_DRW_TXT|nsSelectionType::SEL_DRW)) - bCheck = IsDrawTextHyphenate(); - rSet.Put(SfxBoolItem(nWhich, bCheck)); - } - break; case FN_REDLINE_ON: rSet.Put( SfxBoolItem( nWhich, GetDocShell()->IsChangeRecording() ) ); break; From 6799ec80cd9ec6a5d0c3e11ec8a69084396f5420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Sat, 6 Oct 2012 17:14:10 +0100 Subject: [PATCH 544/863] import GtkScrollbar as scrollbars and connect GtkAdjustments Change-Id: Idef8a338f09b52cf0758a6a35e3b5bbcc96a7383 --- vcl/inc/vcl/builder.hxx | 12 ++++-- vcl/source/window/builder.cxx | 72 +++++++++++++++++++++++++++++++---- 2 files changed, 73 insertions(+), 11 deletions(-) diff --git a/vcl/inc/vcl/builder.hxx b/vcl/inc/vcl/builder.hxx index 246f68dd208c..0a6574c8af03 100644 --- a/vcl/inc/vcl/builder.hxx +++ b/vcl/inc/vcl/builder.hxx @@ -19,6 +19,7 @@ class ListBox; class NumericFormatter; +class ScrollBar; class VCL_DLLPUBLIC VclBuilder { @@ -90,10 +91,11 @@ private: } }; - typedef StringPair SpinButtonAdjustmentMap; + typedef StringPair WidgetAdjustmentMap; Adjustment *get_adjustment_by_name(OString sID); - static void mungeadjustment(NumericFormatter &rTarget, Adjustment &rAdjustment); + static void mungeSpinAdjustment(NumericFormatter &rTarget, Adjustment &rAdjustment); + static void mungeScrollAdjustment(ScrollBar &rTarget, Adjustment &rAdjustment); typedef std::map WidgetTranslations; typedef std::map Translations; @@ -105,7 +107,8 @@ private: std::vector m_aModelMaps; std::vector m_aModels; std::vector m_aAdjustments; - std::vector m_aAdjustmentMaps; + std::vector m_aSpinAdjustmentMaps; + std::vector m_aScrollAdjustmentMaps; std::vector m_aButtonImageWidgetMaps; StockMap m_aStockMap; Translations m_aTranslations; @@ -179,7 +182,8 @@ private: Window *makeObject(Window *pParent, const OString &rClass, const OString &rID, stringmap &rVec); bool extractGroup(const OString &id, stringmap &rVec); bool extractModel(const OString &id, stringmap &rVec); - bool extractAdjustment(const OString &id, stringmap &rVec); + bool extractSpinAdjustment(const OString &id, stringmap &rVec); + bool extractScrollAdjustment(const OString &id, stringmap &rVec); bool extractImage(const OString &id, stringmap &rMap); bool extractStock(const OString &id, stringmap &rMap); diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 86c06d109067..80daaab2c214 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -130,14 +131,25 @@ VclBuilder::VclBuilder(Window *pParent, OUString sUIDir, OUString sUIFile, OStri } //Set SpinButton adjustments when everything has been imported - for (std::vector::iterator aI = m_pParserState->m_aAdjustmentMaps.begin(), - aEnd = m_pParserState->m_aAdjustmentMaps.end(); aI != aEnd; ++aI) + for (std::vector::iterator aI = m_pParserState->m_aSpinAdjustmentMaps.begin(), + aEnd = m_pParserState->m_aSpinAdjustmentMaps.end(); aI != aEnd; ++aI) { NumericFormatter *pTarget = dynamic_cast(get(aI->m_sID)); Adjustment *pAdjustment = get_adjustment_by_name(aI->m_sValue); SAL_WARN_IF(!pTarget || !pAdjustment, "vcl", "missing elements of spinbutton/adjustment"); if (pTarget && pAdjustment) - mungeadjustment(*pTarget, *pAdjustment); + mungeSpinAdjustment(*pTarget, *pAdjustment); + } + + //Set ScrollBar adjustments when everything has been imported + for (std::vector::iterator aI = m_pParserState->m_aScrollAdjustmentMaps.begin(), + aEnd = m_pParserState->m_aScrollAdjustmentMaps.end(); aI != aEnd; ++aI) + { + ScrollBar *pTarget = get(aI->m_sID); + Adjustment *pAdjustment = get_adjustment_by_name(aI->m_sValue); + SAL_WARN_IF(!pTarget || !pAdjustment, "vcl", "missing elements of scrollbar/adjustment"); + if (pTarget && pAdjustment) + mungeScrollAdjustment(*pTarget, *pAdjustment); } //Set button images when everything has been imported @@ -430,18 +442,31 @@ bool VclBuilder::extractGroup(const OString &id, stringmap &rMap) return false; } -bool VclBuilder::extractAdjustment(const OString &id, stringmap &rMap) +bool VclBuilder::extractSpinAdjustment(const OString &id, stringmap &rMap) { VclBuilder::stringmap::iterator aFind = rMap.find(OString("adjustment")); if (aFind != rMap.end()) { - m_pParserState->m_aAdjustmentMaps.push_back(SpinButtonAdjustmentMap(id, aFind->second)); + m_pParserState->m_aSpinAdjustmentMaps.push_back(WidgetAdjustmentMap(id, aFind->second)); rMap.erase(aFind); return true; } return false; } +bool VclBuilder::extractScrollAdjustment(const OString &id, stringmap &rMap) +{ + VclBuilder::stringmap::iterator aFind = rMap.find(OString("adjustment")); + if (aFind != rMap.end()) + { + m_pParserState->m_aScrollAdjustmentMaps.push_back(WidgetAdjustmentMap(id, aFind->second)); + rMap.erase(aFind); + return true; + } + return false; +} + + bool VclBuilder::extractModel(const OString &id, stringmap &rMap) { VclBuilder::stringmap::iterator aFind = rMap.find(OString("model")); @@ -580,7 +605,7 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri } else if (name == "GtkSpinButton") { - extractAdjustment(id, rMap); + extractSpinAdjustment(id, rMap); OString sPattern = extractPattern(rMap); OString sUnit = sPattern; @@ -656,6 +681,14 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri else pWindow = new FixedLine(pParent, WB_HORZ); } + else if (name == "GtkScrollbar") + { + extractScrollAdjustment(id, rMap); + if (extractOrientation(rMap)) + pWindow = new ScrollBar(pParent, WB_VERT); + else + pWindow = new ScrollBar(pParent, WB_HORZ); + } else if (name == "GtkEntry") { pWindow = new Edit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK); @@ -1479,7 +1512,7 @@ void VclBuilder::mungemodel(ListBox &rTarget, ListStore &rStore) rTarget.SelectEntryPos(0); } -void VclBuilder::mungeadjustment(NumericFormatter &rTarget, Adjustment &rAdjustment) +void VclBuilder::mungeSpinAdjustment(NumericFormatter &rTarget, Adjustment &rAdjustment) { int nMul = rtl_math_pow10Exp(1, rTarget.GetDecimalDigits()); @@ -1517,4 +1550,29 @@ void VclBuilder::mungeadjustment(NumericFormatter &rTarget, Adjustment &rAdjustm } } +void VclBuilder::mungeScrollAdjustment(ScrollBar &rTarget, Adjustment &rAdjustment) +{ + for (stringmap::iterator aI = rAdjustment.begin(), aEnd = rAdjustment.end(); aI != aEnd; ++aI) + { + const OString &rKey = aI->first; + const OString &rValue = aI->second; + + if (rKey == "upper") + rTarget.SetRangeMax(rValue.toInt32()); + else if (rKey == "lower") + rTarget.SetRangeMin(rValue.toInt32()); + else if (rKey == "value") + rTarget.SetThumbPos(rValue.toInt32()); + else if (rKey == "step-increment") + rTarget.SetLineSize(rValue.toInt32()); + else if (rKey == "page-increment") + rTarget.SetPageSize(rValue.toInt32()); + else + { + SAL_INFO("vcl.layout", "unhandled property :" << rKey.getStr()); + } + } +} + + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ From 530e7ba7528b468344ca69e7892ca83e81fd42c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Mon, 8 Oct 2012 13:14:05 +0100 Subject: [PATCH 545/863] make svtools filter test not loop endlessly i.e. this partially reverts f26d188ffa00ee6184490fc5c179da16e17301bb which doesn't take into account raw reads of sizeof(ObjAreaType) Change-Id: I80f94f610647128262ebb16c7e888a7cc7ecb9d8 --- svtools/source/inc/sgvmain.hxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/svtools/source/inc/sgvmain.hxx b/svtools/source/inc/sgvmain.hxx index fe08e2d5508d..9d023d55fa8e 100644 --- a/svtools/source/inc/sgvmain.hxx +++ b/svtools/source/inc/sgvmain.hxx @@ -99,6 +99,8 @@ struct ObjAreaType { sal_uInt8 FFarbe; // [Index] sal_uInt8 FBFarbe; // [Index] sal_uInt8 FIntens; // [%] + sal_uInt8 FDummy1; // + sal_Int16 FDummy2; // sal_uInt16 FMuster; // [Index] inkl. Invers, Transparenz }; From aa7705ef2a359d62201206ce4961547fe9a00422 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 8 Oct 2012 15:19:31 +0200 Subject: [PATCH 546/863] DocxAttributeOutput: drop unused includes Change-Id: If6546c920064f0c7ddebec79afee079ab1e417fc --- sw/source/filter/ww8/docxattributeoutput.cxx | 35 -------------------- 1 file changed, 35 deletions(-) diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 2b5485a29db8..05a82bfddb24 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -18,39 +18,27 @@ */ #include "docxattributeoutput.hxx" -#include "docxexport.hxx" #include "docxexportfilter.hxx" #include "docxfootnotes.hxx" #include "writerwordglue.hxx" -#include "wrtww8.hxx" #include "ww8par.hxx" #include "fmtcntnt.hxx" -#include "fmtsrnd.hxx" #include "fchrfmt.hxx" #include "tgrditem.hxx" #include "fmtruby.hxx" -#include "charfmt.hxx" #include "breakit.hxx" #include #include -#include #include #include #include -#include - -#include - #include #include -#include #include #include -#include -#include #include #include #include @@ -58,21 +46,16 @@ #include #include #include -#include #include #include #include #include #include #include -#include -#include #include #include #include #include -#include -#include #include #include #include @@ -92,16 +75,11 @@ #include #include #include -#include #include #include #include -#include -#include -#include #include #include -#include #include #include #include @@ -109,31 +87,18 @@ #include #include #include -#include #include #include #include #include #include #include -#include #include -#include -#include -#include #include -#include - #include -#include -#include #include -#include -#include -#include -#include #if OSL_DEBUG_LEVEL > 1 #include From 2a7b3d83d682102eaf1c77d7e12e698db26fdd13 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 8 Oct 2012 17:21:08 +0300 Subject: [PATCH 547/863] Fix build with a Cygwin path for TARFILE_LOCATION Change-Id: Ic5ff8eeaa7fb30ac3f880f0cff69119deccb2bca --- rhino/ExternalProject_rhino.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rhino/ExternalProject_rhino.mk b/rhino/ExternalProject_rhino.mk index 0ca364e59c09..6a6039323e67 100644 --- a/rhino/ExternalProject_rhino.mk +++ b/rhino/ExternalProject_rhino.mk @@ -24,7 +24,7 @@ $(call gb_ExternalProject_get_state_target,rhino,build) : -q \ -f build.xml \ -Dbuild.label="build-$(RSCREVISION)" \ - -DTARFILE_LOCATION="$(TARFILE_LOCATION)" \ + -DTARFILE_LOCATION="$(if $(findstring -cygwin,$(BUILD_PLATFORM)),$(shell cygpath -m $(TARFILE_LOCATION)),$(TARFILE_LOCATION))" \ $(if $(filter yes,$(JAVACISGCJ))\ ,-Dbuild.compiler=gcj \ ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ From b790199b1d393eca11b803db9f9796341a0e58a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Mon, 8 Oct 2012 15:40:34 +0100 Subject: [PATCH 548/863] Implement GetOptimalSize for scrollbars Change-Id: I4f0f8fd1e103a2433c38b6c0d9148d34d3df2083 --- vcl/inc/vcl/scrbar.hxx | 2 ++ vcl/source/control/scrbar.cxx | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/vcl/inc/vcl/scrbar.hxx b/vcl/inc/vcl/scrbar.hxx index 918f5e7b17b2..3d29c78102d3 100644 --- a/vcl/inc/vcl/scrbar.hxx +++ b/vcl/inc/vcl/scrbar.hxx @@ -147,6 +147,8 @@ public: const Link& GetScrollHdl() const { return maScrollHdl; } void SetEndScrollHdl( const Link& rLink ) { maEndScrollHdl = rLink; } const Link& GetEndScrollHdl() const { return maEndScrollHdl; } + + virtual Size GetOptimalSize(WindowSizeType eType) const; }; // ---------------- diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index 585190153df4..b5ff6c829a47 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -332,6 +332,8 @@ void ScrollBar::ImplCalc( sal_Bool bUpdate ) Rectangle& maTrackRect = mpData->maTrackRect; // TODO: remove when maTrackRect is no longer in mpData if ( mbCalcSize ) { + Size aOldSize = GetOptimalSize(WINDOWSIZE_PREFERRED); + const Rectangle aControlRegion( Point(0,0), aSize ); Rectangle aBtn1Region, aBtn2Region, aTrackRegion, aBoundingRegion; @@ -422,6 +424,12 @@ void ScrollBar::ImplCalc( sal_Bool bUpdate ) maThumbRect.SetEmpty(); mbCalcSize = sal_False; + + Size aNewSize = GetOptimalSize(WINDOWSIZE_PREFERRED); + if (aOldSize != aNewSize) + { + queue_resize(); + } } if ( mnThumbPixRange ) @@ -1500,6 +1508,17 @@ void ScrollBar::SetVisibleSize( long nNewSize ) } } +Size ScrollBar::GetOptimalSize(WindowSizeType) const +{ + Rectangle aCtrlRegion; + aCtrlRegion.Union(maBtn1Rect); + aCtrlRegion.Union(maBtn2Rect); + aCtrlRegion.Union(maPage1Rect); + aCtrlRegion.Union(maPage2Rect); + aCtrlRegion.Union(maThumbRect); + return aCtrlRegion.GetSize(); +} + // ======================================================================= void ScrollBarBox::ImplInit( Window* pParent, WinBits nStyle ) From f52f89dc65c3b54215c094e7e93bf239b0a1ba13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Mon, 8 Oct 2012 15:40:49 +0100 Subject: [PATCH 549/863] mark layout as clean before setting allocation so that if setting the allocation makes the control change its mind the dirty flag won't be unset in this iteration, and will trigger a second one Change-Id: Ia4bb37848495bc6115eb8b16ec7a390cd58bd84f --- vcl/source/window/builder.cxx | 2 +- vcl/source/window/layout.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 80daaab2c214..97426b549853 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -730,7 +730,7 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri { pWindow->SetHelpId(m_sHelpRoot + id); SAL_INFO("vcl.layout", "for " << name.getStr() << - ", created << " << pWindow << " child of " << + ", created " << pWindow << " child of " << pParent << "(" << pWindow->mpWindowImpl->mpParent << "/" << pWindow->mpWindowImpl->mpRealParent << "/" << pWindow->mpWindowImpl->mpBorderWindow << ") with helpid " << diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index debfcfbc9e28..8f05785fd929 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -54,8 +54,8 @@ void VclContainer::SetPosSizePixel(const Point& rAllocPos, const Size& rAllocati Window::SetPosSizePixel(rAllocPos, rAllocation); if (m_bLayoutDirty || bSizeChanged) { - setAllocation(rAllocation); m_bLayoutDirty = false; + setAllocation(rAllocation); } } @@ -81,8 +81,8 @@ void VclContainer::SetSizePixel(const Size& rAllocation) Window::SetSizePixel(aAllocation); if (m_bLayoutDirty || bSizeChanged) { - setAllocation(aAllocation); m_bLayoutDirty = false; + setAllocation(aAllocation); } } From c5f401ed8991985c3f6701fdaf5f9ee53429fdb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Mon, 8 Oct 2012 16:13:53 +0100 Subject: [PATCH 550/863] we're stuck with "double-decker" tab dialogs for now after all I had hoped to move to single-decker tab dialogs, but e.g. writer's paragraph style dialog has *14* tabs, which is ludicrously wide, so just take optimal size of contents as let the tab dialog double-decker or not based on that width. Change-Id: I8d87ea6221164ba5c082249b498663c77d2f5340 --- vcl/source/control/tabctrl.cxx | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 2ad68d1f24b5..c918815af924 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -2179,40 +2179,40 @@ Point TabControl::GetItemsOffset() const Size TabControl::calculateRequisition() const { Size aOptimalPageSize(0, 0); - long nTabLabelsBottom = 0; - long nTotalTabLabelWidths = 0; for( std::vector< ImplTabItem >::const_iterator it = mpTabCtrlData->maItemList.begin(); it != mpTabCtrlData->maItemList.end(); ++it ) { - Size aPageSize; const TabPage *pPage = it->mpTabPage; //it's a real nuisance if the page is not inserted yet :-( - if (pPage) - aPageSize = pPage->GetOptimalSize(WINDOWSIZE_PREFERRED); + if (!pPage) + continue; + + Size aPageSize(pPage->GetOptimalSize(WINDOWSIZE_PREFERRED)); if (aPageSize.Width() > aOptimalPageSize.Width()) aOptimalPageSize.Width() = aPageSize.Width(); if (aPageSize.Height() > aOptimalPageSize.Height()) aOptimalPageSize.Height() = aPageSize.Height(); + } + long nTabLabelsBottom = 0, nTabLabelsRight = 0; + for( std::vector< ImplTabItem >::const_iterator it = mpTabCtrlData->maItemList.begin(); + it != mpTabCtrlData->maItemList.end(); ++it ) + { TabControl* pThis = const_cast(this); sal_uInt16 nPos = it - mpTabCtrlData->maItemList.begin(); - Rectangle aTabRect = pThis->ImplGetTabRect(nPos, LONG_MAX, LONG_MAX); + Rectangle aTabRect = pThis->ImplGetTabRect(nPos, aOptimalPageSize.Width(), LONG_MAX); if (aTabRect.Bottom() > nTabLabelsBottom) nTabLabelsBottom = aTabRect.Bottom(); - - ImplTabItem* pItem = const_cast(&(*it)); - Size aTabSize = pThis->ImplGetItemSize(pItem, LONG_MAX); - nTotalTabLabelWidths += aTabSize.Width(); + if (aTabRect.Right() > nTabLabelsRight) + nTabLabelsRight = aTabRect.Right(); } Size aOptimalSize(aOptimalPageSize); aOptimalSize.Height() += nTabLabelsBottom; - - if (nTotalTabLabelWidths > aOptimalSize.Width()) - aOptimalSize.Width() = nTotalTabLabelWidths; + aOptimalSize.Width() = std::max(nTabLabelsRight, aOptimalSize.Width()); aOptimalSize.Width() += TAB_OFFSET * 2; aOptimalSize.Height() += TAB_OFFSET * 2; From cf955c621269011eaa71ee7e51647203f6120110 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 8 Oct 2012 18:19:26 +0300 Subject: [PATCH 551/863] Don't repeat my mistake in the future Change-Id: I5b5e4464c9a7345aa9ca230100aae0d7fcee91ee --- svtools/source/inc/sgvmain.hxx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/svtools/source/inc/sgvmain.hxx b/svtools/source/inc/sgvmain.hxx index 9d023d55fa8e..fcf747322706 100644 --- a/svtools/source/inc/sgvmain.hxx +++ b/svtools/source/inc/sgvmain.hxx @@ -99,6 +99,12 @@ struct ObjAreaType { sal_uInt8 FFarbe; // [Index] sal_uInt8 FBFarbe; // [Index] sal_uInt8 FIntens; // [%] + // Despite the "Dummy" in the name, and not being used anywhere in + // the code, these two fields are *essential*. These structs are + // 1:1 mappings of actual on-disk/wire file format structures... + // So don't clean the "unused dummy" fields away. (Actually it + // might well be that many other fields around here are never used + // in our code either.) sal_uInt8 FDummy1; // sal_Int16 FDummy2; // sal_uInt16 FMuster; // [Index] inkl. Invers, Transparenz From cf0ef681854ad53a0bdeff31ff5c49c8c31da99b Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 8 Oct 2012 17:45:49 +0200 Subject: [PATCH 552/863] SwXTextDocument::getFlatParagraphIterator: fix crash: Check if the document is still valid. Crash in idle handler grammar checker observed on libreoffice-3-5 branch. Change-Id: I3cae1c6726bb9ad5be11f59bc33f8550bbbe1883 --- sw/source/ui/uno/unotxdoc.cxx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx index ef09ecf5a026..52d989de90e7 100644 --- a/sw/source/ui/uno/unotxdoc.cxx +++ b/sw/source/ui/uno/unotxdoc.cxx @@ -3033,6 +3033,12 @@ uno::Reference< text::XFlatParagraphIterator > SAL_CALL SwXTextDocument::getFlat throw ( uno::RuntimeException ) { SolarMutexGuard aGuard; + if (!IsValid()) + { + throw DisposedException("SwXTextDocument not valid", + static_cast(this)); + } + return new SwXFlatParagraphIterator( *pDocShell->GetDoc(), nTextMarkupType, bAutomatic ); } From 3982d7e78cf986266cb7eedaa77b57ca40680120 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Mon, 8 Oct 2012 16:55:25 +0100 Subject: [PATCH 553/863] support importing label wrapping Change-Id: I4f95a7c6424b0897a399e9be9913fce266c1f4df --- vcl/source/window/window2.cxx | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index c7189d350400..d73c7b8c7926 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -2002,6 +2002,14 @@ bool Window::set_property(const rtl::OString &rKey, const rtl::OString &rValue) SetStyle(nBits); } + else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("wrap"))) + { + WinBits nBits = GetStyle(); + nBits &= ~(WB_WORDBREAK); + if (toBool(rValue)) + nBits |= WB_WORDBREAK; + SetStyle(nBits); + } else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("text"))) SetText(rtl::OStringToOUString(rValue, RTL_TEXTENCODING_UTF8)); else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("height-request"))) From e9960f36675a025c0536dec30ae56c50f4adecb1 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Mon, 8 Oct 2012 18:03:18 +0200 Subject: [PATCH 554/863] implement a:overrideClrMapping (fixes n#783202) Change-Id: Ib6c0fd6d9b64f2bff446f919c58027fea76a00cb --- oox/source/ppt/slidefragmenthandler.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx index 1f7e092bf830..b626612888d9 100644 --- a/oox/source/ppt/slidefragmenthandler.cxx +++ b/oox/source/ppt/slidefragmenthandler.cxx @@ -175,9 +175,10 @@ SlideFragmentHandler::~SlideFragmentHandler() throw() } break; + case A_TOKEN( overrideClrMapping ): case PPT_TOKEN( clrMap ): // CT_ColorMapping { - oox::drawingml::ClrMapPtr pClrMapPtr( new oox::drawingml::ClrMap() ); + oox::drawingml::ClrMapPtr pClrMapPtr( aElementToken == PPT_TOKEN( clrMap ) ? new oox::drawingml::ClrMap() : new oox::drawingml::ClrMap( *mpSlidePersistPtr->getClrMap() ) ); ContextHandlerRef ret = new oox::drawingml::clrMapContext( *this, rAttribs.getFastAttributeList(), *pClrMapPtr ); mpSlidePersistPtr->setClrMap( pClrMapPtr ); return ret; From 1e34ec4c18bad3e2ec1e9e32dd42e5bc0d4d97ac Mon Sep 17 00:00:00 2001 From: Olivier Hallot Date: Sun, 7 Oct 2012 00:43:15 -0300 Subject: [PATCH 555/863] OUString cleanup in Chart2 Include C2U macro and rtl cleanup Change-Id: I4543a3a6d6a6971d2c31b8dc36bd2ec95bd892d4 --- .../itemsetwrapper/LegendItemConverter.cxx | 18 +- .../RegressionCurveItemConverter.cxx | 12 +- .../SeriesOptionsItemConverter.cxx | 30 +- .../StatisticsItemConverter.cxx | 51 ++-- .../itemsetwrapper/TitleItemConverter.cxx | 8 +- .../controller/main/ChartController.cxx | 276 +++++++++--------- 6 files changed, 196 insertions(+), 199 deletions(-) diff --git a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx index 14eb7e060ff8..03d947736c0d 100644 --- a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx @@ -55,7 +55,7 @@ LegendItemConverter::LegendItemConverter( GraphicPropertyItemConverter::LINE_AND_FILL_PROPERTIES )); m_aConverters.push_back( new CharacterPropertyItemConverter( rPropertySet, rItemPool, pRefSize, - C2U( "ReferencePageSize" ) )); + "ReferencePageSize" )); } SAL_WNODEPRECATED_DECLARATIONS_POP @@ -112,10 +112,10 @@ bool LegendItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSe { sal_Bool bShow = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue(); sal_Bool bWasShown = sal_True; - if( ! (GetPropertySet()->getPropertyValue( C2U("Show")) >>= bWasShown) || + if( ! (GetPropertySet()->getPropertyValue( "Show" ) >>= bWasShown) || ( bWasShown != bShow )) { - GetPropertySet()->setPropertyValue( C2U("Show"), uno::makeAny( bShow )); + GetPropertySet()->setPropertyValue( "Show" , uno::makeAny( bShow )); bChanged = true; } } @@ -147,12 +147,12 @@ bool LegendItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSe try { chart2::LegendPosition eOldPos; - if( ! ( GetPropertySet()->getPropertyValue( C2U( "AnchorPosition" )) >>= eOldPos ) || + if( ! ( GetPropertySet()->getPropertyValue( "AnchorPosition" ) >>= eOldPos ) || ( eOldPos != eNewPos )) { - GetPropertySet()->setPropertyValue( C2U( "AnchorPosition" ), uno::makeAny( eNewPos )); - GetPropertySet()->setPropertyValue( C2U( "Expansion" ), uno::makeAny( eExpansion )); - GetPropertySet()->setPropertyValue( C2U( "RelativePosition" ), uno::Any()); + GetPropertySet()->setPropertyValue( "AnchorPosition" , uno::makeAny( eNewPos )); + GetPropertySet()->setPropertyValue( "Expansion" , uno::makeAny( eExpansion )); + GetPropertySet()->setPropertyValue( "RelativePosition" , uno::Any()); bChanged = true; } } @@ -177,14 +177,14 @@ void LegendItemConverter::FillSpecialItem( case SCHATTR_LEGEND_SHOW: { sal_Bool bShow = sal_True; - GetPropertySet()->getPropertyValue( C2U( "Show" )) >>= bShow; + GetPropertySet()->getPropertyValue( "Show" ) >>= bShow; rOutItemSet.Put( SfxBoolItem(SCHATTR_LEGEND_SHOW, bShow) ); } break; case SCHATTR_LEGEND_POS: { chart2::LegendPosition eLegendPos( chart2::LegendPosition_LINE_END ); - GetPropertySet()->getPropertyValue( C2U( "AnchorPosition" )) >>= eLegendPos; + GetPropertySet()->getPropertyValue( "AnchorPosition" ) >>= eLegendPos; rOutItemSet.Put( SfxInt32Item(SCHATTR_LEGEND_POS, eLegendPos ) ); } break; diff --git a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx index 970330c64b4e..fcf49d925ec2 100644 --- a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx @@ -169,10 +169,10 @@ bool RegressionCurveItemConverter::ApplySpecialItem( OSL_ASSERT( xEqProp.is()); bool bOldShow = false; if( xEqProp.is() && - (xEqProp->getPropertyValue( C2U( "ShowEquation" )) >>= bOldShow) && + (xEqProp->getPropertyValue( "ShowEquation" ) >>= bOldShow) && bOldShow != bNewShow ) { - xEqProp->setPropertyValue( C2U( "ShowEquation" ), uno::makeAny( bNewShow )); + xEqProp->setPropertyValue( "ShowEquation" , uno::makeAny( bNewShow )); bChanged = true; } } @@ -192,10 +192,10 @@ bool RegressionCurveItemConverter::ApplySpecialItem( OSL_ASSERT( xEqProp.is()); bool bOldShow = false; if( xEqProp.is() && - (xEqProp->getPropertyValue( C2U( "ShowCorrelationCoefficient" )) >>= bOldShow) && + (xEqProp->getPropertyValue( "ShowCorrelationCoefficient" ) >>= bOldShow) && bOldShow != bNewShow ) { - xEqProp->setPropertyValue( C2U( "ShowCorrelationCoefficient" ), uno::makeAny( bNewShow )); + xEqProp->setPropertyValue( "ShowCorrelationCoefficient" , uno::makeAny( bNewShow )); bChanged = true; } } @@ -235,7 +235,7 @@ void RegressionCurveItemConverter::FillSpecialItem( OSL_ASSERT( xEqProp.is()); bool bShow = false; if( xEqProp.is() && - (xEqProp->getPropertyValue( C2U( "ShowEquation" )) >>= bShow)) + (xEqProp->getPropertyValue( "ShowEquation" ) >>= bShow)) { rOutItemSet.Put( SfxBoolItem( nWhichId, bShow )); } @@ -252,7 +252,7 @@ void RegressionCurveItemConverter::FillSpecialItem( OSL_ASSERT( xEqProp.is()); bool bShow = false; if( xEqProp.is() && - (xEqProp->getPropertyValue( C2U( "ShowCorrelationCoefficient" )) >>= bShow)) + (xEqProp->getPropertyValue( "ShowCorrelationCoefficient" ) >>= bShow)) { rOutItemSet.Put( SfxBoolItem( nWhichId, bShow )); } diff --git a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx index 04b2e458c252..15fe0a816b50 100644 --- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx @@ -111,12 +111,12 @@ SeriesOptionsItemConverter::SeriesOptionsItemConverter( uno::Reference< beans::XPropertySet > xChartTypeProps( xChartType, uno::UNO_QUERY ); if( xChartTypeProps.is() ) { - if( xChartTypeProps->getPropertyValue( C2U( "OverlapSequence" ) ) >>= m_aBarPositionSequence ) + if( xChartTypeProps->getPropertyValue( "OverlapSequence" ) >>= m_aBarPositionSequence ) { if( nAxisIndex >= 0 && nAxisIndex < m_aBarPositionSequence.getLength() ) m_nBarOverlap = m_aBarPositionSequence[nAxisIndex]; } - if( xChartTypeProps->getPropertyValue( C2U( "GapwidthSequence" ) ) >>= m_aBarPositionSequence ) + if( xChartTypeProps->getPropertyValue( "GapwidthSequence" ) >>= m_aBarPositionSequence ) { if( nAxisIndex >= 0 && nAxisIndex < m_aBarPositionSequence.getLength() ) m_nGapWidth = m_aBarPositionSequence[nAxisIndex]; @@ -127,20 +127,20 @@ SeriesOptionsItemConverter::SeriesOptionsItemConverter( m_bSupportingBarConnectors = ChartTypeHelper::isSupportingBarConnectors( xChartType, nDimensionCount ); if( m_bSupportingBarConnectors && xDiagramProperties.is() ) { - xDiagramProperties->getPropertyValue( C2U("ConnectBars")) >>= m_bConnectBars; + xDiagramProperties->getPropertyValue( "ConnectBars" ) >>= m_bConnectBars; } m_bSupportingAxisSideBySide = ChartTypeHelper::isSupportingAxisSideBySide( xChartType, nDimensionCount ); if( m_bSupportingAxisSideBySide && xDiagramProperties.is() ) { - xDiagramProperties->getPropertyValue( C2U("GroupBarsPerAxis")) >>= m_bGroupBarsPerAxis; + xDiagramProperties->getPropertyValue( "GroupBarsPerAxis" ) >>= m_bGroupBarsPerAxis; m_bAllSeriesAttachedToSameAxis = DataSeriesHelper::areAllSeriesAttachedToSameAxis( xChartType, m_nAllSeriesAxisIndex ); } m_bSupportingStartingAngle = ChartTypeHelper::isSupportingStartingAngle( xChartType ); if( m_bSupportingStartingAngle ) { - xDiagramProperties->getPropertyValue( C2U( "StartingAngle" ) ) >>= m_nStartingAngle; + xDiagramProperties->getPropertyValue( "StartingAngle" ) >>= m_nStartingAngle; } m_aSupportedMissingValueTreatments = ChartTypeHelper::getSupportedMissingValueTreatments( xChartType ); @@ -154,10 +154,10 @@ SeriesOptionsItemConverter::SeriesOptionsItemConverter( try { //test whether the data provider offers this property - xProp->getPropertyValue(C2U("IncludeHiddenCells")); + xProp->getPropertyValue( "IncludeHiddenCells" ); //if not exception is thrown the property is offered m_bSupportingPlottingOfHiddenCells = true; - xDiagramProperties->getPropertyValue( C2U("IncludeHiddenCells") ) >>= m_bIncludeHiddenCells; + xDiagramProperties->getPropertyValue( "IncludeHiddenCells" ) >>= m_bIncludeHiddenCells; } catch( const beans::UnknownPropertyException& ) { @@ -216,9 +216,9 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf sal_Int32& rBarPosition = ( SCHATTR_BAR_OVERLAP == nWhichId ) ? m_nBarOverlap : m_nGapWidth; rBarPosition = static_cast< const SfxInt32Item & >( rItemSet.Get( nWhichId )).GetValue(); - rtl::OUString aPropName( C2U( "GapwidthSequence" ) ); + OUString aPropName("GapwidthSequence" ); if( SCHATTR_BAR_OVERLAP == nWhichId ) - aPropName = C2U( "OverlapSequence" ); + aPropName = "OverlapSequence"; uno::Reference< XDataSeries > xDataSeries( GetPropertySet(), uno::UNO_QUERY ); uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram(m_xChartModel) ); @@ -259,10 +259,10 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf { uno::Reference< beans::XPropertySet > xDiagramProperties( ChartModelHelper::findDiagram(m_xChartModel), uno::UNO_QUERY ); if( xDiagramProperties.is() && - (xDiagramProperties->getPropertyValue( C2U("ConnectBars")) >>= bOldConnectBars) && + (xDiagramProperties->getPropertyValue( "ConnectBars" ) >>= bOldConnectBars) && bOldConnectBars != m_bConnectBars ) { - xDiagramProperties->setPropertyValue( C2U("ConnectBars"), uno::makeAny(m_bConnectBars) ); + xDiagramProperties->setPropertyValue( "ConnectBars" , uno::makeAny(m_bConnectBars) ); bChanged = true; } } @@ -278,10 +278,10 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf { uno::Reference< beans::XPropertySet > xDiagramProperties( ChartModelHelper::findDiagram(m_xChartModel), uno::UNO_QUERY ); if( xDiagramProperties.is() && - (xDiagramProperties->getPropertyValue( C2U("GroupBarsPerAxis")) >>= bOldGroupBarsPerAxis) && + (xDiagramProperties->getPropertyValue( "GroupBarsPerAxis" ) >>= bOldGroupBarsPerAxis) && bOldGroupBarsPerAxis != m_bGroupBarsPerAxis ) { - xDiagramProperties->setPropertyValue( C2U("GroupBarsPerAxis"), uno::makeAny(m_bGroupBarsPerAxis) ); + xDiagramProperties->setPropertyValue( "GroupBarsPerAxis" , uno::makeAny(m_bGroupBarsPerAxis) ); bChanged = true; } } @@ -296,7 +296,7 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf uno::Reference< beans::XPropertySet > xDiagramProperties( ChartModelHelper::findDiagram(m_xChartModel), uno::UNO_QUERY ); if( xDiagramProperties.is() ) { - xDiagramProperties->setPropertyValue( C2U("StartingAngle"), uno::makeAny(m_nStartingAngle) ); + xDiagramProperties->setPropertyValue( "StartingAngle" , uno::makeAny(m_nStartingAngle) ); bChanged = true; } } @@ -333,7 +333,7 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf uno::Reference< beans::XPropertySet > xDiagramProperties( ChartModelHelper::findDiagram(m_xChartModel), uno::UNO_QUERY ); if( xDiagramProperties.is() ) { - xDiagramProperties->setPropertyValue( C2U( "MissingValueTreatment" ), uno::makeAny( nNew )); + xDiagramProperties->setPropertyValue( "MissingValueTreatment" , uno::makeAny( nNew )); bChanged = true; } } diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx index 0acc974f3e38..6cddc4e5cf10 100644 --- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx @@ -57,7 +57,7 @@ uno::Reference< beans::XPropertySet > lcl_GetErrorBar( if( xProp.is()) try { - ( xProp->getPropertyValue( bYError ? C2U( "ErrorBarY" ) : C2U("ErrorBarX") ) >>= xResult ); + ( xProp->getPropertyValue( bYError ? OUString( "ErrorBarY" ) : OUString("ErrorBarX") ) >>= xResult ); } catch( const uno::Exception & ex ) { @@ -106,8 +106,8 @@ void lcl_getErrorValues( const uno::Reference< beans::XPropertySet > & xErrorBar try { - xErrorBarProp->getPropertyValue( C2U( "PositiveError" )) >>= rOutPosError; - xErrorBarProp->getPropertyValue( C2U( "NegativeError" )) >>= rOutNegError; + xErrorBarProp->getPropertyValue( "PositiveError" ) >>= rOutPosError; + xErrorBarProp->getPropertyValue( "NegativeError" ) >>= rOutNegError; } catch( const uno::Exception & ex ) { @@ -124,8 +124,8 @@ void lcl_getErrorIndicatorValues( try { - xErrorBarProp->getPropertyValue( C2U( "ShowPositiveError" )) >>= rOutShowPosError; - xErrorBarProp->getPropertyValue( C2U( "ShowNegativeError" )) >>= rOutShowNegError; + xErrorBarProp->getPropertyValue( "ShowPositiveError" ) >>= rOutShowPosError; + xErrorBarProp->getPropertyValue( "ShowNegativeError" ) >>= rOutShowNegError; } catch( const uno::Exception & ex ) { @@ -282,12 +282,11 @@ bool StatisticsItemConverter::ApplySpecialItem( if( !xErrorBarProp.is() ) { xErrorBarProp = lcl_GetDefaultErrorBar(); - GetPropertySet()->setPropertyValue( bYError ? C2U( "ErrorBarY" ) : C2U("ErrorBarX"), + GetPropertySet()->setPropertyValue( bYError ? OUString( "ErrorBarY" ) : OUString("ErrorBarX"), uno::makeAny( xErrorBarProp )); } - xErrorBarProp->setPropertyValue( C2U( "ErrorBarStyle" ), - uno::makeAny( nStyle )); + xErrorBarProp->setPropertyValue( "ErrorBarStyle" , uno::makeAny( nStyle )); bChanged = true; } } @@ -296,7 +295,7 @@ bool StatisticsItemConverter::ApplySpecialItem( case SCHATTR_STAT_PERCENT: case SCHATTR_STAT_BIGERROR: { - OSL_FAIL( "Deprectaed item" ); + OSL_FAIL( "Deprecated item" ); bool bYError = static_cast(rItemSet.Get(SCHATTR_STAT_ERRORBAR_TYPE)).GetValue(); @@ -314,10 +313,8 @@ bool StatisticsItemConverter::ApplySpecialItem( ! ( ::rtl::math::approxEqual( fPos, fValue ) && ::rtl::math::approxEqual( fNeg, fValue ))) { - xErrorBarProp->setPropertyValue( C2U( "PositiveError" ), - uno::makeAny( fValue )); - xErrorBarProp->setPropertyValue( C2U( "NegativeError" ), - uno::makeAny( fValue )); + xErrorBarProp->setPropertyValue( "PositiveError" , uno::makeAny( fValue )); + xErrorBarProp->setPropertyValue( "NegativeError" , uno::makeAny( fValue )); bChanged = true; } } @@ -341,7 +338,7 @@ bool StatisticsItemConverter::ApplySpecialItem( if( bOldHasErrorBar && ! ::rtl::math::approxEqual( fPos, fValue )) { - xErrorBarProp->setPropertyValue( C2U( "PositiveError" ), uno::makeAny( fValue )); + xErrorBarProp->setPropertyValue( "PositiveError" , uno::makeAny( fValue )); bChanged = true; } } @@ -364,7 +361,7 @@ bool StatisticsItemConverter::ApplySpecialItem( if( bOldHasErrorBar && ! ::rtl::math::approxEqual( fNeg, fValue )) { - xErrorBarProp->setPropertyValue( C2U( "NegativeError" ), uno::makeAny( fValue )); + xErrorBarProp->setPropertyValue( "NegativeError" , uno::makeAny( fValue )); bChanged = true; } } @@ -406,12 +403,12 @@ bool StatisticsItemConverter::ApplySpecialItem( if( xEqProp.is()) { bool bShowEq = false; - xEqProp->getPropertyValue( C2U("ShowEquation")) >>= bShowEq; + xEqProp->getPropertyValue( "ShowEquation" ) >>= bShowEq; bool bNewShowEq = static_cast< const SfxBoolItem & >( rItemSet.Get( nWhichId )).GetValue(); if( bShowEq != bNewShowEq ) { - xEqProp->setPropertyValue( C2U("ShowEquation"), uno::makeAny( bNewShowEq )); + xEqProp->setPropertyValue( "ShowEquation" , uno::makeAny( bNewShowEq )); bChanged = true; } } @@ -424,12 +421,12 @@ bool StatisticsItemConverter::ApplySpecialItem( if( xEqProp.is()) { bool bShowCoeff = false; - xEqProp->getPropertyValue( C2U("ShowCorrelationCoefficient")) >>= bShowCoeff; + xEqProp->getPropertyValue( "ShowCorrelationCoefficient" ) >>= bShowCoeff; bool bNewShowCoeff = static_cast< const SfxBoolItem & >( rItemSet.Get( nWhichId )).GetValue(); if( bShowCoeff != bNewShowCoeff ) { - xEqProp->setPropertyValue( C2U("ShowCorrelationCoefficient"), uno::makeAny( bNewShowCoeff )); + xEqProp->setPropertyValue( "ShowCorrelationCoefficient" , uno::makeAny( bNewShowCoeff )); bChanged = true; } } @@ -458,8 +455,8 @@ bool StatisticsItemConverter::ApplySpecialItem( ( bShowPos != bNewIndPos || bShowNeg != bNewIndNeg )) { - xErrorBarProp->setPropertyValue( C2U( "ShowPositiveError" ), uno::makeAny( bNewIndPos )); - xErrorBarProp->setPropertyValue( C2U( "ShowNegativeError" ), uno::makeAny( bNewIndNeg )); + xErrorBarProp->setPropertyValue( "ShowPositiveError" , uno::makeAny( bNewIndPos )); + xErrorBarProp->setPropertyValue( "ShowNegativeError" , uno::makeAny( bNewIndNeg )); bChanged = true; } } @@ -479,7 +476,7 @@ bool StatisticsItemConverter::ApplySpecialItem( xDataProvider.set( xChartDoc->getDataProvider()); if( xErrorBarSource.is() && xDataProvider.is()) { - ::rtl::OUString aNewRange( static_cast< const SfxStringItem & >( rItemSet.Get( nWhichId )).GetValue()); + OUString aNewRange( static_cast< const SfxStringItem & >( rItemSet.Get( nWhichId )).GetValue()); bool bApplyNewRange = false; bool bIsPositiveValue( nWhichId == SCHATTR_STAT_RANGE_POS ); @@ -498,7 +495,7 @@ bool StatisticsItemConverter::ApplySpecialItem( if( xIntDataProvider.is()) { xIntDataProvider->appendSequence(); - aNewRange = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("last")); + aNewRange = "last"; bApplyNewRange = true; } } @@ -510,7 +507,7 @@ bool StatisticsItemConverter::ApplySpecialItem( StatisticsHelper::getErrorDataSequenceFromDataSource( xErrorBarSource, bIsPositiveValue, bYError )); bApplyNewRange = - ! ( xSeq.is() && aNewRange.equals( xSeq->getSourceRangeRepresentation())); + ! ( xSeq.is() && (aNewRange == xSeq->getSourceRangeRepresentation())); } if( bApplyNewRange ) @@ -548,7 +545,7 @@ void StatisticsItemConverter::FillSpecialItem( if( xErrorBarProp.is() ) { sal_Int32 nStyle = 0; - if( xErrorBarProp->getPropertyValue( C2U( "ErrorBarStyle" )) >>= nStyle ) + if( xErrorBarProp->getPropertyValue( "ErrorBarStyle" ) >>= nStyle ) { switch( nStyle ) { @@ -647,7 +644,7 @@ void StatisticsItemConverter::FillSpecialItem( bool bShowEq = false; uno::Reference< beans::XPropertySet > xEqProp( lcl_getEquationProperties( GetPropertySet(), 0 )); if( xEqProp.is()) - xEqProp->getPropertyValue( C2U("ShowEquation")) >>= bShowEq; + xEqProp->getPropertyValue( "ShowEquation" ) >>= bShowEq; rOutItemSet.Put( SfxBoolItem( nWhichId, bShowEq )); } break; @@ -657,7 +654,7 @@ void StatisticsItemConverter::FillSpecialItem( bool bShowCoeff = false; uno::Reference< beans::XPropertySet > xEqProp( lcl_getEquationProperties( GetPropertySet(), 0 )); if( xEqProp.is()) - xEqProp->getPropertyValue( C2U("ShowCorrelationCoefficient")) >>= bShowCoeff; + xEqProp->getPropertyValue( "ShowCorrelationCoefficient" ) >>= bShowCoeff; rOutItemSet.Put( SfxBoolItem( nWhichId, bShowCoeff )); } break; diff --git a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx index f4ec1ad601ae..981b8dc55c70 100644 --- a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx @@ -90,7 +90,7 @@ FormattedStringsConverter::FormattedStringsConverter( m_aConverters.push_back( new CharacterPropertyItemConverter( xProp, rItemPool, ::std::auto_ptr< awt::Size >( new awt::Size( *pRefSize )), - C2U( "ReferencePageSize" ), + "ReferencePageSize" , xParentProp )); else m_aConverters.push_back( new CharacterPropertyItemConverter( xProp, rItemPool )); @@ -201,12 +201,12 @@ bool TitleItemConverter::ApplySpecialItem( rItemSet.Get( nWhichId )).GetValue()) / 100.0; double fOldVal = 0.0; bool bPropExisted = - ( GetPropertySet()->getPropertyValue( C2U( "TextRotation" )) >>= fOldVal ); + ( GetPropertySet()->getPropertyValue( "TextRotation" ) >>= fOldVal ); if( ! bPropExisted || ( bPropExisted && fOldVal != fVal )) { - GetPropertySet()->setPropertyValue( C2U( "TextRotation" ), uno::makeAny( fVal )); + GetPropertySet()->setPropertyValue( "TextRotation" , uno::makeAny( fVal )); bChanged = true; } } @@ -227,7 +227,7 @@ void TitleItemConverter::FillSpecialItem( // convert double to int (times 100) double fVal = 0; - if( GetPropertySet()->getPropertyValue( C2U( "TextRotation" )) >>= fVal ) + if( GetPropertySet()->getPropertyValue( "TextRotation" ) >>= fVal ) { rOutItemSet.Put( SfxInt32Item( nWhichId, static_cast< sal_Int32 >( ::rtl::math::round( fVal * 100.0 ) ) )); diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index e1cd60acc4bb..6eb90ae805ec 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -249,8 +249,8 @@ void ChartController::TheModel::tryTermination() catch(const uno::Exception& ex) { (void)(ex); // no warning in non-debug builds - OSL_FAIL( ( rtl::OString("Termination of model failed: ") - + rtl::OUStringToOString( ex.Message, RTL_TEXTENCODING_ASCII_US ) ).getStr() ); + OSL_FAIL( ( OString("Termination of model failed: ") + + OUStringToOString( ex.Message, RTL_TEXTENCODING_ASCII_US ) ).getStr() ); } } @@ -332,12 +332,12 @@ sal_Bool ChartController::TheModelRef::is() const APPHELPER_XSERVICEINFO_IMPL(ChartController,CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME) - uno::Sequence< rtl::OUString > ChartController + uno::Sequence< OUString > ChartController ::getSupportedServiceNames_Static() { - uno::Sequence< rtl::OUString > aSNS( 2 ); + uno::Sequence< OUString > aSNS( 2 ); aSNS.getArray()[ 0 ] = CHART_CONTROLLER_SERVICE_NAME; - aSNS.getArray()[ 1 ] = ::rtl::OUString( "com.sun.star.frame.Controller" ); + aSNS.getArray()[ 1 ] = "com.sun.star.frame.Controller"; //// @todo : add additional services if you support any further return aSNS; } @@ -417,23 +417,23 @@ APPHELPER_XSERVICEINFO_IMPL(ChartController,CHART_CONTROLLER_SERVICE_IMPLEMENTAT try { uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; - xPropSet->getPropertyValue( C2U( "LayoutManager" ) ) >>= xLayoutManager; + xPropSet->getPropertyValue( "LayoutManager" ) >>= xLayoutManager; if ( xLayoutManager.is() ) { xLayoutManager->lock(); - xLayoutManager->requestElement( C2U( "private:resource/menubar/menubar" ) ); + xLayoutManager->requestElement( "private:resource/menubar/menubar" ); //@todo: createElement should become unnecessary, remove when #i79198# is fixed - xLayoutManager->createElement( C2U( "private:resource/toolbar/standardbar" ) ); - xLayoutManager->requestElement( C2U( "private:resource/toolbar/standardbar" ) ); + xLayoutManager->createElement( "private:resource/toolbar/standardbar" ); + xLayoutManager->requestElement( "private:resource/toolbar/standardbar" ); //@todo: createElement should become unnecessary, remove when #i79198# is fixed - xLayoutManager->createElement( C2U( "private:resource/toolbar/toolbar" ) ); - xLayoutManager->requestElement( C2U( "private:resource/toolbar/toolbar" ) ); + xLayoutManager->createElement( "private:resource/toolbar/toolbar" ); + xLayoutManager->requestElement( "private:resource/toolbar/toolbar" ); // #i12587# support for shapes in chart - xLayoutManager->createElement( C2U( "private:resource/toolbar/drawbar" ) ); - xLayoutManager->requestElement( C2U( "private:resource/toolbar/drawbar" ) ); + xLayoutManager->createElement( "private:resource/toolbar/drawbar" ); + xLayoutManager->requestElement( "private:resource/toolbar/drawbar" ); - xLayoutManager->requestElement( C2U( "private:resource/statusbar/statusbar" ) ); + xLayoutManager->requestElement( "private:resource/statusbar/statusbar" ); xLayoutManager->unlock(); // add as listener to get notified when @@ -456,14 +456,14 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent { //adjust controller to view status changes - if( rEvent.NewMode.equals(C2U("dirty")) ) + if( rEvent.NewMode == "dirty" ) { //the view has become dirty, we should repaint it if we have a window SolarMutexGuard aGuard; if( m_pChartWindow ) m_pChartWindow->ForceInvalidate(); } - else if( rEvent.NewMode.equals(C2U("invalid")) ) + else if( rEvent.NewMode == "invalid" ) { //the view is about to become invalid so end all actions on it impl_invalidateAccessible(); @@ -582,7 +582,7 @@ sal_Bool SAL_CALL ChartController::attachModel( const uno::Reference< frame::XMo #endif //select chart area per default: - select( uno::makeAny( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, rtl::OUString() ) ) ); + select( uno::makeAny( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) ) ); uno::Reference< lang::XMultiServiceFactory > xFact( getModel(), uno::UNO_QUERY ); if( xFact.is()) @@ -953,8 +953,8 @@ void SAL_CALL ChartController::layoutEvent( const lang::EventObject& aSource, :: Reference< frame::XLayoutManager > xLM( aSource.Source, uno::UNO_QUERY ); if( xLM.is()) { - xLM->createElement( C2U("private:resource/statusbar/statusbar")); - xLM->requestElement( C2U("private:resource/statusbar/statusbar")); + xLM->createElement( "private:resource/statusbar/statusbar" ); + xLM->requestElement( "private:resource/statusbar/statusbar" ); } } } @@ -966,55 +966,55 @@ void SAL_CALL ChartController::layoutEvent( const lang::EventObject& aSource, :: namespace { -bool lcl_isFormatObjectCommand( const rtl::OString& aCommand ) +bool lcl_isFormatObjectCommand( const OString& aCommand ) { - if( aCommand.equals("MainTitle") - || aCommand.equals("SubTitle") - || aCommand.equals("XTitle") - || aCommand.equals("YTitle") - || aCommand.equals("ZTitle") - || aCommand.equals("SecondaryXTitle") - || aCommand.equals("SecondaryYTitle") - || aCommand.equals("AllTitles") - || aCommand.equals("DiagramAxisX") - || aCommand.equals("DiagramAxisY") - || aCommand.equals("DiagramAxisZ") - || aCommand.equals("DiagramAxisA") - || aCommand.equals("DiagramAxisB") - || aCommand.equals("DiagramAxisAll") - || aCommand.equals("DiagramGridXMain") - || aCommand.equals("DiagramGridYMain") - || aCommand.equals("DiagramGridZMain") - || aCommand.equals("DiagramGridXHelp") - || aCommand.equals("DiagramGridYHelp") - || aCommand.equals("DiagramGridZHelp") - || aCommand.equals("DiagramGridAll") + if( aCommand == "MainTitle" + || aCommand == "SubTitle" + || aCommand == "XTitle" + || aCommand == "YTitle" + || aCommand == "ZTitle" + || aCommand == "SecondaryXTitle" + || aCommand == "SecondaryYTitle" + || aCommand == "AllTitles" + || aCommand == "DiagramAxisX" + || aCommand == "DiagramAxisY" + || aCommand == "DiagramAxisZ" + || aCommand == "DiagramAxisA" + || aCommand == "DiagramAxisB" + || aCommand == "DiagramAxisAll" + || aCommand == "DiagramGridXMain" + || aCommand == "DiagramGridYMain" + || aCommand == "DiagramGridZMain" + || aCommand == "DiagramGridXHelp" + || aCommand == "DiagramGridYHelp" + || aCommand == "DiagramGridZHelp" + || aCommand == "DiagramGridAll" - || aCommand.equals("DiagramWall") - || aCommand.equals("DiagramFloor") - || aCommand.equals("DiagramArea") - || aCommand.equals("Legend") + || aCommand == "DiagramWall" + || aCommand == "DiagramFloor" + || aCommand == "DiagramArea" + || aCommand == "Legend" - || aCommand.equals("FormatWall") - || aCommand.equals("FormatFloor") - || aCommand.equals("FormatChartArea") - || aCommand.equals("FormatLegend") + || aCommand == "FormatWall" + || aCommand == "FormatFloor" + || aCommand == "FormatChartArea" + || aCommand == "FormatLegend" - || aCommand.equals("FormatTitle") - || aCommand.equals("FormatAxis") - || aCommand.equals("FormatDataSeries") - || aCommand.equals("FormatDataPoint") - || aCommand.equals("FormatDataLabels") - || aCommand.equals("FormatDataLabel") - || aCommand.equals("FormatXErrorBars") - || aCommand.equals("FormatYErrorBars") - || aCommand.equals("FormatMeanValue") - || aCommand.equals("FormatTrendline") - || aCommand.equals("FormatTrendlineEquation") - || aCommand.equals("FormatStockLoss") - || aCommand.equals("FormatStockGain") - || aCommand.equals("FormatMajorGrid") - || aCommand.equals("FormatMinorGrid") + || aCommand == "FormatTitle" + || aCommand == "FormatAxis" + || aCommand == "FormatDataSeries" + || aCommand == "FormatDataPoint" + || aCommand == "FormatDataLabels" + || aCommand == "FormatDataLabel" + || aCommand == "FormatXErrorBars" + || aCommand == "FormatYErrorBars" + || aCommand == "FormatMeanValue" + || aCommand == "FormatTrendline" + || aCommand == "FormatTrendlineEquation" + || aCommand == "FormatStockLoss" + || aCommand == "FormatStockGain" + || aCommand == "FormatMajorGrid" + || aCommand == "FormatMinorGrid" ) return true; @@ -1025,7 +1025,7 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand ) uno::Reference SAL_CALL ChartController ::queryDispatch( const util::URL& rURL - , const rtl::OUString& rTargetFrameName + , const OUString& rTargetFrameName , sal_Int32 /* nSearchFlags */) throw(uno::RuntimeException) { @@ -1059,109 +1059,109 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand ) throw (uno::RuntimeException) { //@todo avoid OString - rtl::OString aCommand( rtl::OUStringToOString( rURL.Path, RTL_TEXTENCODING_ASCII_US ) ); + OString aCommand( OUStringToOString( rURL.Path, RTL_TEXTENCODING_ASCII_US ) ); - if(aCommand.equals("Paste")) + if(aCommand == "Paste") this->executeDispatch_Paste(); - else if(aCommand.equals("Copy")) + else if(aCommand == "Copy" ) this->executeDispatch_Copy(); - else if(aCommand.equals("Cut")) + else if(aCommand == "Cut" ) this->executeDispatch_Cut(); - else if(aCommand.equals("DataRanges")) + else if(aCommand == "DataRanges" ) this->executeDispatch_SourceData(); //---------------------------------- - else if(aCommand.equals("Update")) //Update Chart + else if(aCommand == "Update" ) //Update Chart { ChartViewHelper::setViewToDirtyState( getModel() ); SolarMutexGuard aGuard; if( m_pChartWindow ) m_pChartWindow->Invalidate(); } - else if(aCommand.equals("DiagramData")) + else if(aCommand == "DiagramData" ) this->executeDispatch_EditData(); //insert objects - else if( aCommand.equals("InsertTitles") - || aCommand.equals("InsertMenuTitles") ) + else if( aCommand == "InsertTitles" + || aCommand == "InsertMenuTitles") this->executeDispatch_InsertTitles(); - else if( aCommand.equals("InsertMenuLegend") ) + else if( aCommand == "InsertMenuLegend" ) this->executeDispatch_OpenLegendDialog(); - else if( aCommand.equals("InsertLegend") ) + else if( aCommand == "InsertLegend" ) this->executeDispatch_InsertLegend(); - else if( aCommand.equals("DeleteLegend") ) + else if( aCommand == "DeleteLegend" ) this->executeDispatch_DeleteLegend(); - else if( aCommand.equals("InsertMenuDataLabels")) + else if( aCommand == "InsertMenuDataLabels" ) this->executeDispatch_InsertMenu_DataLabels(); - else if( aCommand.equals("InsertMenuAxes") - || aCommand.equals("InsertRemoveAxes") ) + else if( aCommand == "InsertMenuAxes" + || aCommand == "InsertRemoveAxes" ) this->executeDispatch_InsertAxes(); - else if( aCommand.equals("InsertMenuGrids")) + else if( aCommand == "InsertMenuGrids" ) this->executeDispatch_InsertGrid(); - else if( aCommand.equals("InsertMenuTrendlines")) + else if( aCommand == "InsertMenuTrendlines" ) this->executeDispatch_InsertMenu_Trendlines(); - else if( aCommand.equals("InsertMenuMeanValues")) + else if( aCommand == "InsertMenuMeanValues" ) this->executeDispatch_InsertMenu_MeanValues(); - else if( aCommand.equals("InsertMenuXErrorBars")) + else if( aCommand == "InsertMenuXErrorBars" ) this->executeDispatch_InsertErrorBars(false); - else if( aCommand.equals("InsertMenuYErrorBars")) + else if( aCommand == "InsertMenuYErrorBars" ) this->executeDispatch_InsertErrorBars(true); - else if( aCommand.equals("InsertSymbol")) + else if( aCommand == "InsertSymbol" ) this->executeDispatch_InsertSpecialCharacter(); - else if( aCommand.equals("InsertTrendline")) + else if( aCommand == "InsertTrendline" ) this->executeDispatch_InsertTrendline(); - else if( aCommand.equals("DeleteTrendline")) + else if( aCommand == "DeleteTrendline" ) this->executeDispatch_DeleteTrendline(); - else if( aCommand.equals("InsertMeanValue")) + else if( aCommand == "InsertMeanValue" ) this->executeDispatch_InsertMeanValue(); - else if( aCommand.equals("DeleteMeanValue")) + else if( aCommand == "DeleteMeanValue" ) this->executeDispatch_DeleteMeanValue(); - else if( aCommand.equals("InsertXErrorBars")) + else if( aCommand == "InsertXErrorBars" ) this->executeDispatch_InsertErrorBars(false); - else if( aCommand.equals("InsertYErrorBars")) + else if( aCommand == "InsertYErrorBars" ) this->executeDispatch_InsertErrorBars(true); - else if( aCommand.equals("DeleteXErrorBars")) + else if( aCommand == "DeleteXErrorBars" ) this->executeDispatch_DeleteErrorBars(false); - else if( aCommand.equals("DeleteYErrorBars")) + else if( aCommand == "DeleteYErrorBars" ) this->executeDispatch_DeleteErrorBars(true); - else if( aCommand.equals("InsertTrendlineEquation")) + else if( aCommand == "InsertTrendlineEquation" ) this->executeDispatch_InsertTrendlineEquation(); - else if( aCommand.equals("DeleteTrendlineEquation")) + else if( aCommand == "DeleteTrendlineEquation" ) this->executeDispatch_DeleteTrendlineEquation(); - else if( aCommand.equals("InsertTrendlineEquationAndR2")) + else if( aCommand == "InsertTrendlineEquationAndR2" ) this->executeDispatch_InsertTrendlineEquation( true ); - else if( aCommand.equals("InsertR2Value")) + else if( aCommand == "InsertR2Value" ) this->executeDispatch_InsertR2Value(); - else if( aCommand.equals("DeleteR2Value")) + else if( aCommand == "DeleteR2Value") this->executeDispatch_DeleteR2Value(); - else if( aCommand.equals("InsertDataLabels") ) + else if( aCommand == "InsertDataLabels" ) this->executeDispatch_InsertDataLabels(); - else if( aCommand.equals("InsertDataLabel") ) + else if( aCommand == "InsertDataLabel" ) this->executeDispatch_InsertDataLabel(); - else if( aCommand.equals("DeleteDataLabels") ) + else if( aCommand == "DeleteDataLabels") this->executeDispatch_DeleteDataLabels(); - else if( aCommand.equals("DeleteDataLabel") ) + else if( aCommand == "DeleteDataLabel" ) this->executeDispatch_DeleteDataLabel(); - else if( aCommand.equals("ResetAllDataPoints") ) + else if( aCommand == "ResetAllDataPoints" ) this->executeDispatch_ResetAllDataPoints(); - else if( aCommand.equals("ResetDataPoint") ) + else if( aCommand == "ResetDataPoint" ) this->executeDispatch_ResetDataPoint(); - else if( aCommand.equals("InsertAxis") ) + else if( aCommand == "InsertAxis" ) this->executeDispatch_InsertAxis(); - else if( aCommand.equals("InsertMajorGrid") ) + else if( aCommand == "InsertMajorGrid" ) this->executeDispatch_InsertMajorGrid(); - else if( aCommand.equals("InsertMinorGrid") ) + else if( aCommand == "InsertMinorGrid" ) this->executeDispatch_InsertMinorGrid(); - else if( aCommand.equals("InsertAxisTitle") ) + else if( aCommand == "InsertAxisTitle" ) this->executeDispatch_InsertAxisTitle(); - else if( aCommand.equals("DeleteAxis") ) + else if( aCommand == "DeleteAxis" ) this->executeDispatch_DeleteAxis(); - else if( aCommand.equals("DeleteMajorGrid") ) + else if( aCommand == "DeleteMajorGrid") this->executeDispatch_DeleteMajorGrid(); - else if( aCommand.equals("DeleteMinorGrid") ) + else if( aCommand == "DeleteMinorGrid" ) this->executeDispatch_DeleteMinorGrid(); //format objects - else if( aCommand.equals("FormatSelection") ) + else if( aCommand == "FormatSelection" ) this->executeDispatch_ObjectProperties(); - else if( aCommand.equals("TransformDialog")) + else if( aCommand == "TransformDialog" ) { if ( isShapeContext() ) { @@ -1175,11 +1175,11 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand ) else if( lcl_isFormatObjectCommand(aCommand) ) this->executeDispatch_FormatObject(rURL.Path); //more format - else if( aCommand.equals("DiagramType")) + else if( aCommand == "DiagramType" ) this->executeDispatch_ChartType(); - else if( aCommand.equals("View3D")) + else if( aCommand == "View3D" ) this->executeDispatch_View3D(); - else if ( aCommand.equals( "Forward" ) ) + else if ( aCommand == "Forward" ) { if ( isShapeContext() ) { @@ -1190,7 +1190,7 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand ) this->executeDispatch_MoveSeries( sal_True ); } } - else if ( aCommand.equals( "Backward" ) ) + else if ( aCommand == "Backward" ) { if ( isShapeContext() ) { @@ -1201,34 +1201,34 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand ) this->executeDispatch_MoveSeries( sal_False ); } } - else if( aCommand.equals("NewArrangement")) + else if( aCommand == "NewArrangement") this->executeDispatch_NewArrangement(); - else if( aCommand.equals("ToggleLegend")) + else if( aCommand == "ToggleLegend" ) this->executeDispatch_ToggleLegend(); - else if( aCommand.equals("ToggleGridHorizontal")) + else if( aCommand == "ToggleGridHorizontal" ) this->executeDispatch_ToggleGridHorizontal(); - else if( aCommand.equals("ScaleText")) + else if( aCommand == "ScaleText" ) this->executeDispatch_ScaleText(); - else if( aCommand.equals("StatusBarVisible")) + else if( aCommand == "StatusBarVisible" ) { // workaround: this should not be necessary. uno::Reference< beans::XPropertySet > xPropSet( m_xFrame, uno::UNO_QUERY ); if( xPropSet.is() ) { uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; - xPropSet->getPropertyValue( C2U( "LayoutManager" ) ) >>= xLayoutManager; + xPropSet->getPropertyValue( "LayoutManager" ) >>= xLayoutManager; if ( xLayoutManager.is() ) { - bool bIsVisible( xLayoutManager->isElementVisible( C2U("private:resource/statusbar/statusbar"))); + bool bIsVisible( xLayoutManager->isElementVisible( "private:resource/statusbar/statusbar" )); if( bIsVisible ) { - xLayoutManager->hideElement( C2U( "private:resource/statusbar/statusbar")); - xLayoutManager->destroyElement( C2U( "private:resource/statusbar/statusbar")); + xLayoutManager->hideElement( "private:resource/statusbar/statusbar" ); + xLayoutManager->destroyElement( "private:resource/statusbar/statusbar" ); } else { - xLayoutManager->createElement( C2U( "private:resource/statusbar/statusbar")); - xLayoutManager->showElement( C2U( "private:resource/statusbar/statusbar")); + xLayoutManager->createElement( "private:resource/statusbar/statusbar" ); + xLayoutManager->showElement( "private:resource/statusbar/statusbar" ); } // @todo: update menu state (checkmark next to "Statusbar"). } @@ -1323,7 +1323,7 @@ void SAL_CALL ChartController::executeDispatch_MoveSeries( sal_Bool bForward ) ControllerLockGuard aCLGuard( getModel() ); //get selected series - ::rtl::OUString aObjectCID(m_aSelection.getSelectedCID()); + OUString aObjectCID(m_aSelection.getSelectedCID()); uno::Reference< XDataSeries > xGivenDataSeries( ObjectIdentifier::getDataSeriesForCID( //yyy todo also legendentries and labels? aObjectCID, getModel() ) ); @@ -1343,19 +1343,19 @@ void SAL_CALL ChartController::executeDispatch_MoveSeries( sal_Bool bForward ) // ____ XMultiServiceFactory ____ uno::Reference< uno::XInterface > SAL_CALL - ChartController::createInstance( const ::rtl::OUString& aServiceSpecifier ) + ChartController::createInstance( const OUString& aServiceSpecifier ) throw (uno::Exception, uno::RuntimeException) { uno::Reference< uno::XInterface > xResult; - if( aServiceSpecifier.equals( CHART_ACCESSIBLE_TEXT_SERVICE_NAME )) + if( aServiceSpecifier == CHART_ACCESSIBLE_TEXT_SERVICE_NAME ) xResult.set( impl_createAccessibleTextContext()); return xResult; } uno::Reference< uno::XInterface > SAL_CALL - ChartController::createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, + ChartController::createInstanceWithArguments( const OUString& ServiceSpecifier, const uno::Sequence< uno::Any >& /* Arguments */ ) throw (uno::Exception, uno::RuntimeException) @@ -1364,11 +1364,11 @@ uno::Reference< uno::XInterface > SAL_CALL return createInstance( ServiceSpecifier ); } -uno::Sequence< ::rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL ChartController::getAvailableServiceNames() throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aServiceNames(1); + uno::Sequence< OUString > aServiceNames(1); aServiceNames[0] = CHART_ACCESSIBLE_TEXT_SERVICE_NAME; return aServiceNames; } @@ -1388,7 +1388,7 @@ IMPL_LINK( ChartController, NotifyUndoActionHdl, SdrUndoAction*, pUndoAction ) { ENSURE_OR_RETURN( pUndoAction, "invalid Undo action", 1L ); - ::rtl::OUString aObjectCID = m_aSelection.getSelectedCID(); + OUString aObjectCID = m_aSelection.getSelectedCID(); if ( aObjectCID.isEmpty() ) { try @@ -1483,9 +1483,9 @@ void ChartController::impl_initializeAccessible( const uno::Reference< lang::XIn } } -::std::set< ::rtl::OUString > ChartController::impl_getAvailableCommands() +::std::set< OUString > ChartController::impl_getAvailableCommands() { - return ::comphelper::MakeSet< ::rtl::OUString > + return ::comphelper::MakeSet< OUString > // commands for container forward ( "AddDirect" ) ( "NewDoc" ) ( "Open" ) ( "Save" ) ( "SaveAs" ) ( "SendMail" ) From d812cee7cb3ac7069d4cfbabc567312a325f6f69 Mon Sep 17 00:00:00 2001 From: Olivier Hallot Date: Sat, 6 Oct 2012 22:23:08 -0300 Subject: [PATCH 556/863] OUString cleanup in Chart2 Include C2U macro removal and rtl prefix Change-Id: I3de75446e53618862e50c69382a7ddaf0d482fa7 --- .../dialogs/ChartTypeDialogController.cxx | 158 +++++++++--------- .../source/controller/dialogs/DataBrowser.cxx | 15 +- .../controller/dialogs/DataBrowserModel.cxx | 24 +-- .../source/controller/dialogs/DialogModel.cxx | 86 +++++----- .../controller/dialogs/ObjectNameProvider.cxx | 101 ++++++----- .../dialogs/RangeSelectionHelper.cxx | 9 +- .../dialogs/dlg_CreationWizard_UNO.cxx | 42 ++--- .../dialogs/dlg_ObjectProperties.cxx | 10 +- 8 files changed, 220 insertions(+), 225 deletions(-) diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index ceb5a150f88b..a03796fd42fa 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -129,7 +129,7 @@ Image ChartTypeDialogController::getImage() { return Image(); } -bool ChartTypeDialogController::isSubType( const rtl::OUString& rServiceName ) +bool ChartTypeDialogController::isSubType( const OUString& rServiceName ) { const tTemplateServiceChartTypeParameterMap& rTemplateMap = this->getTemplateMap(); tTemplateServiceChartTypeParameterMap::const_iterator aIt( rTemplateMap.find( rServiceName )); @@ -138,7 +138,7 @@ bool ChartTypeDialogController::isSubType( const rtl::OUString& rServiceName ) return false; } ChartTypeParameter ChartTypeDialogController::getChartTypeParameterForService( - const rtl::OUString& rServiceName + const OUString& rServiceName , const uno::Reference< beans::XPropertySet >& xTemplateProps ) { ChartTypeParameter aRet; @@ -150,9 +150,9 @@ ChartTypeParameter ChartTypeDialogController::getChartTypeParameterForService( { try { - xTemplateProps->getPropertyValue( C2U( "CurveStyle" )) >>= aRet.eCurveStyle; - xTemplateProps->getPropertyValue( C2U( "CurveResolution" )) >>= aRet.nCurveResolution; - xTemplateProps->getPropertyValue( C2U( "SplineOrder" )) >>= aRet.nSplineOrder; + xTemplateProps->getPropertyValue( "CurveStyle" ) >>= aRet.eCurveStyle; + xTemplateProps->getPropertyValue( "CurveResolution" ) >>= aRet.nCurveResolution; + xTemplateProps->getPropertyValue( "SplineOrder" ) >>= aRet.nSplineOrder; } catch( uno::Exception & ex ) { @@ -162,7 +162,7 @@ ChartTypeParameter ChartTypeDialogController::getChartTypeParameterForService( try { - xTemplateProps->getPropertyValue( C2U( "Geometry3D" )) >>= aRet.nGeometry3D; + xTemplateProps->getPropertyValue( "Geometry3D" ) >>= aRet.nGeometry3D; } catch( uno::Exception& ex ) { @@ -243,7 +243,7 @@ void ChartTypeDialogController::adjustParameterToMainType( ChartTypeParameter& r rParameter = ChartTypeParameter(); } } -rtl::OUString ChartTypeDialogController::getServiceNameForParameter( const ChartTypeParameter& rParameter ) const +OUString ChartTypeDialogController::getServiceNameForParameter( const ChartTypeParameter& rParameter ) const { ChartTypeParameter aParameter(rParameter); if( aParameter.bXAxisWithValues ) @@ -268,7 +268,7 @@ rtl::OUString ChartTypeDialogController::getServiceNameForParameter( const Chart return (*aIter).first; } } - return ::rtl::OUString(); + return OUString(); } uno::Reference< XChartTypeTemplate > ChartTypeDialogController::getCurrentTemplate( const ChartTypeParameter& rParameter @@ -276,7 +276,7 @@ uno::Reference< XChartTypeTemplate > ChartTypeDialogController::getCurrentTempla { uno::Reference< XChartTypeTemplate > xTemplate(0); - rtl::OUString aServiceName( this->getServiceNameForParameter( rParameter ) ); + OUString aServiceName( this->getServiceNameForParameter( rParameter ) ); if(!aServiceName.isEmpty()) { xTemplate.set( xTemplateManager->createInstance( aServiceName ), uno::UNO_QUERY ); @@ -287,9 +287,9 @@ uno::Reference< XChartTypeTemplate > ChartTypeDialogController::getCurrentTempla { try { - xTemplateProps->setPropertyValue( C2U( "CurveStyle" ), uno::makeAny(rParameter.eCurveStyle) ); - xTemplateProps->setPropertyValue( C2U( "CurveResolution" ), uno::makeAny(rParameter.nCurveResolution) ); - xTemplateProps->setPropertyValue( C2U( "SplineOrder" ), uno::makeAny(rParameter.nSplineOrder) ); + xTemplateProps->setPropertyValue( "CurveStyle" , uno::makeAny(rParameter.eCurveStyle) ); + xTemplateProps->setPropertyValue( "CurveResolution" , uno::makeAny(rParameter.nCurveResolution) ); + xTemplateProps->setPropertyValue( "SplineOrder" , uno::makeAny(rParameter.nSplineOrder) ); } catch( uno::Exception & ex ) { @@ -298,7 +298,7 @@ uno::Reference< XChartTypeTemplate > ChartTypeDialogController::getCurrentTempla } try { - xTemplateProps->setPropertyValue( C2U( "Geometry3D" ), uno::makeAny(rParameter.nGeometry3D) ); + xTemplateProps->setPropertyValue( "Geometry3D" , uno::makeAny(rParameter.nGeometry3D) ); } catch( uno::Exception & ex ) { @@ -345,7 +345,7 @@ bool ChartTypeDialogController::commitToModel( const ChartTypeParameter& rParame { uno::Reference< beans::XPropertySet > xDiaProp( xDiagram, uno::UNO_QUERY ); if( xDiaProp.is() ) - xDiaProp->setPropertyValue( C2U( "SortByXValues" ), uno::makeAny( rParameter.bSortByXValues ) ); + xDiaProp->setPropertyValue( "SortByXValues" , uno::makeAny( rParameter.bSortByXValues ) ); } } return false; @@ -440,13 +440,13 @@ const tTemplateServiceChartTypeParameterMap& ColumnChartDialogController::getTem { static tTemplateServiceChartTypeParameterMap m_aTemplateMap = tTemplateServiceChartTypeParameterMap - ( C2U( "com.sun.star.chart2.template.Column" ), ChartTypeParameter(1,false,false,GlobalStackMode_NONE) ) - ( C2U( "com.sun.star.chart2.template.StackedColumn" ), ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y) ) - ( C2U( "com.sun.star.chart2.template.PercentStackedColumn" ), ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT) ) - ( C2U( "com.sun.star.chart2.template.ThreeDColumnFlat" ), ChartTypeParameter(1,false,true,GlobalStackMode_NONE) ) - ( C2U( "com.sun.star.chart2.template.StackedThreeDColumnFlat" ), ChartTypeParameter(2,false,true,GlobalStackMode_STACK_Y) ) - ( C2U( "com.sun.star.chart2.template.PercentStackedThreeDColumnFlat" ), ChartTypeParameter(3,false,true,GlobalStackMode_STACK_Y_PERCENT) ) - ( C2U( "com.sun.star.chart2.template.ThreeDColumnDeep" ), ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Z) ) + ( "com.sun.star.chart2.template.Column" , ChartTypeParameter(1,false,false,GlobalStackMode_NONE) ) + ( "com.sun.star.chart2.template.StackedColumn" , ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y) ) + ( "com.sun.star.chart2.template.PercentStackedColumn" , ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT) ) + ( "com.sun.star.chart2.template.ThreeDColumnFlat" , ChartTypeParameter(1,false,true,GlobalStackMode_NONE) ) + ( "com.sun.star.chart2.template.StackedThreeDColumnFlat" , ChartTypeParameter(2,false,true,GlobalStackMode_STACK_Y) ) + ( "com.sun.star.chart2.template.PercentStackedThreeDColumnFlat" , ChartTypeParameter(3,false,true,GlobalStackMode_STACK_Y_PERCENT) ) + ( "com.sun.star.chart2.template.ThreeDColumnDeep" , ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Z) ) ; return m_aTemplateMap; } @@ -517,13 +517,13 @@ const tTemplateServiceChartTypeParameterMap& BarChartDialogController::getTempla { static tTemplateServiceChartTypeParameterMap m_aTemplateMap = tTemplateServiceChartTypeParameterMap - ( C2U( "com.sun.star.chart2.template.Bar" ), ChartTypeParameter(1,false,false,GlobalStackMode_NONE) ) - ( C2U( "com.sun.star.chart2.template.StackedBar" ), ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y) ) - ( C2U( "com.sun.star.chart2.template.PercentStackedBar" ), ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT) ) - ( C2U( "com.sun.star.chart2.template.ThreeDBarFlat" ), ChartTypeParameter(1,false,true,GlobalStackMode_NONE) ) - ( C2U( "com.sun.star.chart2.template.StackedThreeDBarFlat" ), ChartTypeParameter(2,false,true,GlobalStackMode_STACK_Y) ) - ( C2U( "com.sun.star.chart2.template.PercentStackedThreeDBarFlat" ), ChartTypeParameter(3,false,true,GlobalStackMode_STACK_Y_PERCENT) ) - ( C2U( "com.sun.star.chart2.template.ThreeDBarDeep" ), ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Z) ) + ( "com.sun.star.chart2.template.Bar" , ChartTypeParameter(1,false,false,GlobalStackMode_NONE) ) + ( "com.sun.star.chart2.template.StackedBar" , ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y) ) + ( "com.sun.star.chart2.template.PercentStackedBar" , ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT) ) + ( "com.sun.star.chart2.template.ThreeDBarFlat" , ChartTypeParameter(1,false,true,GlobalStackMode_NONE) ) + ( "com.sun.star.chart2.template.StackedThreeDBarFlat" , ChartTypeParameter(2,false,true,GlobalStackMode_STACK_Y) ) + ( "com.sun.star.chart2.template.PercentStackedThreeDBarFlat" , ChartTypeParameter(3,false,true,GlobalStackMode_STACK_Y_PERCENT) ) + ( "com.sun.star.chart2.template.ThreeDBarDeep" , ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Z) ) ; return m_aTemplateMap; } @@ -593,14 +593,14 @@ const tTemplateServiceChartTypeParameterMap& PieChartDialogController::getTempla { static tTemplateServiceChartTypeParameterMap m_aTemplateMap = tTemplateServiceChartTypeParameterMap - ( C2U( "com.sun.star.chart2.template.Pie" ), ChartTypeParameter(1,false,false) ) - ( C2U( "com.sun.star.chart2.template.PieAllExploded" ), ChartTypeParameter(2,false,false) ) - ( C2U( "com.sun.star.chart2.template.Donut" ), ChartTypeParameter(3,false,false) ) - ( C2U( "com.sun.star.chart2.template.DonutAllExploded" ), ChartTypeParameter(4,false,false) ) - ( C2U( "com.sun.star.chart2.template.ThreeDPie" ), ChartTypeParameter(1,false,true) ) - ( C2U( "com.sun.star.chart2.template.ThreeDPieAllExploded" ), ChartTypeParameter(2,false,true) ) - ( C2U( "com.sun.star.chart2.template.ThreeDDonut" ), ChartTypeParameter(3,false,true) ) - ( C2U( "com.sun.star.chart2.template.ThreeDDonutAllExploded" ), ChartTypeParameter(4,false,true) ) + ( "com.sun.star.chart2.template.Pie" , ChartTypeParameter(1,false,false) ) + ( "com.sun.star.chart2.template.PieAllExploded" , ChartTypeParameter(2,false,false) ) + ( "com.sun.star.chart2.template.Donut" , ChartTypeParameter(3,false,false) ) + ( "com.sun.star.chart2.template.DonutAllExploded" , ChartTypeParameter(4,false,false) ) + ( "com.sun.star.chart2.template.ThreeDPie" , ChartTypeParameter(1,false,true) ) + ( "com.sun.star.chart2.template.ThreeDPieAllExploded" , ChartTypeParameter(2,false,true) ) + ( "com.sun.star.chart2.template.ThreeDDonut" , ChartTypeParameter(3,false,true) ) + ( "com.sun.star.chart2.template.ThreeDDonutAllExploded" , ChartTypeParameter(4,false,true) ) ; return m_aTemplateMap; } @@ -657,19 +657,19 @@ const tTemplateServiceChartTypeParameterMap& LineChartDialogController::getTempl static tTemplateServiceChartTypeParameterMap m_aTemplateMap = tTemplateServiceChartTypeParameterMap //------------------------------------------------------- - ( C2U( "com.sun.star.chart2.template.Symbol" ), ChartTypeParameter(1,false,false,GlobalStackMode_NONE,true,false) ) - ( C2U( "com.sun.star.chart2.template.StackedSymbol" ), ChartTypeParameter(1,false,false,GlobalStackMode_STACK_Y,true,false) ) - ( C2U( "com.sun.star.chart2.template.PercentStackedSymbol" ), ChartTypeParameter(1,false,false,GlobalStackMode_STACK_Y_PERCENT,true,false) ) - ( C2U( "com.sun.star.chart2.template.LineSymbol" ), ChartTypeParameter(2,false,false,GlobalStackMode_NONE,true,true) ) - ( C2U( "com.sun.star.chart2.template.StackedLineSymbol" ), ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y,true,true) ) - ( C2U( "com.sun.star.chart2.template.PercentStackedLineSymbol" ), ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y_PERCENT,true,true) ) - ( C2U( "com.sun.star.chart2.template.Line" ), ChartTypeParameter(3,false,false,GlobalStackMode_NONE,false,true) ) - ( C2U( "com.sun.star.chart2.template.StackedLine" ), ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y,false,true) ) - ( C2U( "com.sun.star.chart2.template.PercentStackedLine" ), ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT,false,true) ) + ( "com.sun.star.chart2.template.Symbol" , ChartTypeParameter(1,false,false,GlobalStackMode_NONE,true,false) ) + ( "com.sun.star.chart2.template.StackedSymbol" , ChartTypeParameter(1,false,false,GlobalStackMode_STACK_Y,true,false) ) + ( "com.sun.star.chart2.template.PercentStackedSymbol" , ChartTypeParameter(1,false,false,GlobalStackMode_STACK_Y_PERCENT,true,false) ) + ( "com.sun.star.chart2.template.LineSymbol" , ChartTypeParameter(2,false,false,GlobalStackMode_NONE,true,true) ) + ( "com.sun.star.chart2.template.StackedLineSymbol" , ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y,true,true) ) + ( "com.sun.star.chart2.template.PercentStackedLineSymbol" , ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y_PERCENT,true,true) ) + ( "com.sun.star.chart2.template.Line" , ChartTypeParameter(3,false,false,GlobalStackMode_NONE,false,true) ) + ( "com.sun.star.chart2.template.StackedLine" , ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y,false,true) ) + ( "com.sun.star.chart2.template.PercentStackedLine" , ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT,false,true) ) //------------------------------------------------------- - ( C2U( "com.sun.star.chart2.template.StackedThreeDLine" ), ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Y,false,true) ) - ( C2U( "com.sun.star.chart2.template.PercentStackedThreeDLine" ), ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Y_PERCENT,false,true) ) - ( C2U( "com.sun.star.chart2.template.ThreeDLineDeep" ), ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Z,false,true) ) + ( "com.sun.star.chart2.template.StackedThreeDLine" , ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Y,false,true) ) + ( "com.sun.star.chart2.template.PercentStackedThreeDLine" , ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Y_PERCENT,false,true) ) + ( "com.sun.star.chart2.template.ThreeDLineDeep" , ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Z,false,true) ) //------------------------------------------------------- ; return m_aTemplateMap; @@ -789,10 +789,10 @@ const tTemplateServiceChartTypeParameterMap& XYChartDialogController::getTemplat static tTemplateServiceChartTypeParameterMap m_aTemplateMap = tTemplateServiceChartTypeParameterMap //------------------------------------------------------- - ( C2U( "com.sun.star.chart2.template.ScatterSymbol" ), ChartTypeParameter(1,true,false,GlobalStackMode_NONE,true,false) ) - ( C2U( "com.sun.star.chart2.template.ScatterLineSymbol" ), ChartTypeParameter(2,true,false,GlobalStackMode_NONE,true,true) ) - ( C2U( "com.sun.star.chart2.template.ScatterLine" ), ChartTypeParameter(3,true,false,GlobalStackMode_NONE,false,true) ) - ( C2U( "com.sun.star.chart2.template.ThreeDScatter" ), ChartTypeParameter(4,true,true,GlobalStackMode_NONE,false,true) ) + ( "com.sun.star.chart2.template.ScatterSymbol" , ChartTypeParameter(1,true,false,GlobalStackMode_NONE,true,false) ) + ( "com.sun.star.chart2.template.ScatterLineSymbol" , ChartTypeParameter(2,true,false,GlobalStackMode_NONE,true,true) ) + ( "com.sun.star.chart2.template.ScatterLine" , ChartTypeParameter(3,true,false,GlobalStackMode_NONE,false,true) ) + ( "com.sun.star.chart2.template.ThreeDScatter" , ChartTypeParameter(4,true,true,GlobalStackMode_NONE,false,true) ) ; return m_aTemplateMap; } @@ -879,12 +879,12 @@ const tTemplateServiceChartTypeParameterMap& AreaChartDialogController::getTempl { static tTemplateServiceChartTypeParameterMap m_aTemplateMap = tTemplateServiceChartTypeParameterMap - ( C2U( "com.sun.star.chart2.template.Area" ), ChartTypeParameter(1,false,false,GlobalStackMode_NONE) ) - ( C2U( "com.sun.star.chart2.template.ThreeDArea" ), ChartTypeParameter(1,false,true,GlobalStackMode_STACK_Z) ) - ( C2U( "com.sun.star.chart2.template.StackedArea" ), ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y) ) - ( C2U( "com.sun.star.chart2.template.StackedThreeDArea" ), ChartTypeParameter(2,false,true,GlobalStackMode_STACK_Y) ) - ( C2U( "com.sun.star.chart2.template.PercentStackedArea" ), ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT) ) - ( C2U( "com.sun.star.chart2.template.PercentStackedThreeDArea" ), ChartTypeParameter(3,false,true,GlobalStackMode_STACK_Y_PERCENT) ) + ( "com.sun.star.chart2.template.Area" , ChartTypeParameter(1,false,false,GlobalStackMode_NONE) ) + ( "com.sun.star.chart2.template.ThreeDArea" , ChartTypeParameter(1,false,true,GlobalStackMode_STACK_Z) ) + ( "com.sun.star.chart2.template.StackedArea" , ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y) ) + ( "com.sun.star.chart2.template.StackedThreeDArea" , ChartTypeParameter(2,false,true,GlobalStackMode_STACK_Y) ) + ( "com.sun.star.chart2.template.PercentStackedArea" , ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT) ) + ( "com.sun.star.chart2.template.PercentStackedThreeDArea" , ChartTypeParameter(3,false,true,GlobalStackMode_STACK_Y_PERCENT) ) ; return m_aTemplateMap; } @@ -963,21 +963,21 @@ const tTemplateServiceChartTypeParameterMap& NetChartDialogController::getTempla static tTemplateServiceChartTypeParameterMap m_aTemplateMap = tTemplateServiceChartTypeParameterMap //@todo need templates with symbols only - ( C2U( "com.sun.star.chart2.template.NetSymbol" ), ChartTypeParameter(1,false,false,GlobalStackMode_NONE,true,false) ) - ( C2U( "com.sun.star.chart2.template.StackedNetSymbol" ), ChartTypeParameter(1,false,false,GlobalStackMode_STACK_Y,true,false) ) - ( C2U( "com.sun.star.chart2.template.PercentStackedNetSymbol" ),ChartTypeParameter(1,false,false,GlobalStackMode_STACK_Y_PERCENT,true,false) ) + ( "com.sun.star.chart2.template.NetSymbol" , ChartTypeParameter(1,false,false,GlobalStackMode_NONE,true,false) ) + ( "com.sun.star.chart2.template.StackedNetSymbol" , ChartTypeParameter(1,false,false,GlobalStackMode_STACK_Y,true,false) ) + ( "com.sun.star.chart2.template.PercentStackedNetSymbol" ,ChartTypeParameter(1,false,false,GlobalStackMode_STACK_Y_PERCENT,true,false) ) - ( C2U( "com.sun.star.chart2.template.Net" ), ChartTypeParameter(2,false,false,GlobalStackMode_NONE,true,true) ) - ( C2U( "com.sun.star.chart2.template.StackedNet" ), ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y,true,true) ) - ( C2U( "com.sun.star.chart2.template.PercentStackedNet" ), ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y_PERCENT,true,true) ) + ( "com.sun.star.chart2.template.Net" , ChartTypeParameter(2,false,false,GlobalStackMode_NONE,true,true) ) + ( "com.sun.star.chart2.template.StackedNet" , ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y,true,true) ) + ( "com.sun.star.chart2.template.PercentStackedNet" , ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y_PERCENT,true,true) ) - ( C2U( "com.sun.star.chart2.template.NetLine" ), ChartTypeParameter(3,false,false,GlobalStackMode_NONE,false,true) ) - ( C2U( "com.sun.star.chart2.template.StackedNetLine" ), ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y,false,true) ) - ( C2U( "com.sun.star.chart2.template.PercentStackedNetLine" ), ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT,false,true) ) + ( "com.sun.star.chart2.template.NetLine" , ChartTypeParameter(3,false,false,GlobalStackMode_NONE,false,true) ) + ( "com.sun.star.chart2.template.StackedNetLine" , ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y,false,true) ) + ( "com.sun.star.chart2.template.PercentStackedNetLine" , ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT,false,true) ) - ( C2U( "com.sun.star.chart2.template.FilledNet" ), ChartTypeParameter(4,false,false,GlobalStackMode_NONE,false,false) ) - ( C2U( "com.sun.star.chart2.template.StackedFilledNet" ), ChartTypeParameter(4,false,false,GlobalStackMode_STACK_Y,false,false) ) - ( C2U( "com.sun.star.chart2.template.PercentStackedFilledNet" ),ChartTypeParameter(4,false,false,GlobalStackMode_STACK_Y_PERCENT,false,false) ) + ( "com.sun.star.chart2.template.FilledNet" , ChartTypeParameter(4,false,false,GlobalStackMode_NONE,false,false) ) + ( "com.sun.star.chart2.template.StackedFilledNet" , ChartTypeParameter(4,false,false,GlobalStackMode_STACK_Y,false,false) ) + ( "com.sun.star.chart2.template.PercentStackedFilledNet" ,ChartTypeParameter(4,false,false,GlobalStackMode_STACK_Y_PERCENT,false,false) ) ; return m_aTemplateMap; } @@ -1054,10 +1054,10 @@ const tTemplateServiceChartTypeParameterMap& StockChartDialogController::getTemp { static tTemplateServiceChartTypeParameterMap m_aTemplateMap = tTemplateServiceChartTypeParameterMap - ( C2U( "com.sun.star.chart2.template.StockLowHighClose" ), ChartTypeParameter(1) ) - ( C2U( "com.sun.star.chart2.template.StockOpenLowHighClose" ), ChartTypeParameter(2) ) - ( C2U( "com.sun.star.chart2.template.StockVolumeLowHighClose" ), ChartTypeParameter(3) ) - ( C2U( "com.sun.star.chart2.template.StockVolumeOpenLowHighClose" ),ChartTypeParameter(4) ) + ( "com.sun.star.chart2.template.StockLowHighClose" , ChartTypeParameter(1) ) + ( "com.sun.star.chart2.template.StockOpenLowHighClose" , ChartTypeParameter(2) ) + ( "com.sun.star.chart2.template.StockVolumeLowHighClose" , ChartTypeParameter(3) ) + ( "com.sun.star.chart2.template.StockVolumeOpenLowHighClose" ,ChartTypeParameter(4) ) ; return m_aTemplateMap; } @@ -1109,8 +1109,8 @@ const tTemplateServiceChartTypeParameterMap& CombiColumnLineChartDialogControlle { static tTemplateServiceChartTypeParameterMap m_aTemplateMap = tTemplateServiceChartTypeParameterMap - ( C2U( "com.sun.star.chart2.template.ColumnWithLine" ), ChartTypeParameter(1) ) - ( C2U( "com.sun.star.chart2.template.StackedColumnWithLine" ), ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y) ) + ( "com.sun.star.chart2.template.ColumnWithLine" , ChartTypeParameter(1) ) + ( "com.sun.star.chart2.template.StackedColumnWithLine" , ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y) ) ; return m_aTemplateMap; } @@ -1185,7 +1185,7 @@ void CombiColumnLineChartDialogController::fillExtraControls( const ChartTypePar if(xTemplateProps.is()) try { - xTemplateProps->getPropertyValue( C2U("NumberOfLines") ) >>= nNumLines; + xTemplateProps->getPropertyValue( "NumberOfLines" ) >>= nNumLines; } catch( const uno::Exception & ex ) { @@ -1206,7 +1206,7 @@ void CombiColumnLineChartDialogController::setTemplateProperties( const uno::Ref if( xTemplateProps.is() ) { sal_Int32 nNumLines = static_cast< sal_Int32 >( m_pMF_NumberOfLines->GetValue()); - xTemplateProps->setPropertyValue( C2U( "NumberOfLines" ), uno::makeAny(nNumLines) ); + xTemplateProps->setPropertyValue( "NumberOfLines" , uno::makeAny(nNumLines) ); } } @@ -1251,7 +1251,7 @@ const tTemplateServiceChartTypeParameterMap& BubbleChartDialogController::getTem { static tTemplateServiceChartTypeParameterMap m_aTemplateMap = tTemplateServiceChartTypeParameterMap - ( C2U( "com.sun.star.chart2.template.Bubble" ), ChartTypeParameter(1,true) ) ; + ( "com.sun.star.chart2.template.Bubble" , ChartTypeParameter(1,true) ) ; return m_aTemplateMap; } void BubbleChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ ) diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 2c9caa8c50dd..26eab789b849 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -75,7 +75,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; using namespace ::svt; @@ -580,7 +579,7 @@ void DataBrowser::RenewTable() GetDataWindow().LogicToPixel( Size( 42, 0 )).getWidth() )); OUString aDefaultSeriesName(SCH_RESSTR(STR_COLUMN_LABEL)); - replaceParamterInString( aDefaultSeriesName, C2U("%COLUMNNUMBER"), OUString::valueOf( sal_Int32(24) ) ); + replaceParamterInString( aDefaultSeriesName, "%COLUMNNUMBER", OUString::valueOf( sal_Int32(24) ) ); sal_Int32 nColumnWidth = GetDataWindow().GetTextWidth( aDefaultSeriesName ) + GetDataWindow().LogicToPixel( Point( 4 + impl::SeriesHeader::GetRelativeAppFontXPosForNameField(), 0 ), MAP_APPFONT ).X(); sal_Int32 nColumnCount = m_apDataBrowserModel->getColumnCount(); @@ -613,7 +612,7 @@ void DataBrowser::RenewTable() sal_Int32 nColor = 0; // @todo: Set "DraftColor", i.e. interpolated colors for gradients, bitmaps, etc. if( xSeriesProp.is() && - ( xSeriesProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("Color"))) >>= nColor )) + ( xSeriesProp->getPropertyValue( "Color" ) >>= nColor )) spHeader->SetColor( Color( nColor )); spHeader->SetChartType( aIt->m_xChartType, aIt->m_bSwapXAndYAxis ); spHeader->SetSeriesName( @@ -621,7 +620,7 @@ void DataBrowser::RenewTable() aIt->m_xDataSeries, (aIt->m_xChartType.is() ? aIt->m_xChartType->getRoleOfSequenceForSeriesLabel() : - OUString( RTL_CONSTASCII_USTRINGPARAM("values-y")))))); + OUString("values-y"))))); // index is 1-based, as 0 is for the column that contains the row-numbers spHeader->SetRange( aIt->m_nStartColumn + 1, aIt->m_nEndColumn + 1 ); spHeader->SetGetFocusHdl( aFocusLink ); @@ -646,7 +645,7 @@ String DataBrowser::GetColString( sal_Int32 nColumnId ) const String DataBrowser::GetRowString( sal_Int32 nRow ) const { - return rtl::OUString::valueOf(nRow + 1); + return OUString::valueOf(nRow + 1); } String DataBrowser::GetCellText( long nRow, sal_uInt16 nColumnId ) const @@ -1119,7 +1118,7 @@ sal_uInt32 DataBrowser::GetNumberFormatKey( sal_Int32 nRow, sal_uInt16 nCol ) co return m_apDataBrowserModel->getNumberFormatKey( lcl_getColumnInData( nCol ), lcl_getRowInData( nRow )); } -bool DataBrowser::isDateString( rtl::OUString aInputString, double& fOutDateValue ) +bool DataBrowser::isDateString( OUString aInputString, double& fOutDateValue ) { sal_uInt32 nNumberFormat=0; SvNumberFormatter* pSvNumberFormatter = m_spNumberFormatterWrapper.get() ? m_spNumberFormatterWrapper->getSvNumberFormatter() : 0; @@ -1259,7 +1258,7 @@ void DataBrowser::RenewSeriesHeaders() Reference< beans::XPropertySet > xSeriesProp( aIt->m_xDataSeries, uno::UNO_QUERY ); sal_Int32 nColor = 0; if( xSeriesProp.is() && - ( xSeriesProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("Color"))) >>= nColor )) + ( xSeriesProp->getPropertyValue( "Color" ) >>= nColor )) spHeader->SetColor( Color( nColor )); spHeader->SetChartType( aIt->m_xChartType, aIt->m_bSwapXAndYAxis ); spHeader->SetSeriesName( @@ -1267,7 +1266,7 @@ void DataBrowser::RenewSeriesHeaders() aIt->m_xDataSeries, (aIt->m_xChartType.is() ? aIt->m_xChartType->getRoleOfSequenceForSeriesLabel() : - OUString( RTL_CONSTASCII_USTRINGPARAM("values-y")))))); + OUString( "values-y"))))); spHeader->SetRange( aIt->m_nStartColumn + 1, aIt->m_nEndColumn + 1 ); spHeader->SetGetFocusHdl( aFocusLink ); spHeader->SetEditChangedHdl( aSeriesHeaderChangedLink ); diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx index 89f5aac9d349..e28259c5a007 100644 --- a/chart2/source/controller/dialogs/DataBrowserModel.cxx +++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx @@ -57,7 +57,7 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; + namespace { @@ -70,7 +70,7 @@ OUString lcl_getRole( { try { - xProp->getPropertyValue( C2U("Role")) >>= aResult; + xProp->getPropertyValue( "Role" ) >>= aResult; } catch( const uno::Exception & ex ) { @@ -235,8 +235,8 @@ struct DataBrowserModel::tDataColumn { ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > m_xDataSeries; - sal_Int32 m_nIndexInDataSeries; - ::rtl::OUString m_aUIRoleName; + sal_Int32 m_nIndexInDataSeries; + OUString m_aUIRoleName; ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > m_xLabeledDataSequence; eCellType m_eCellType; @@ -249,7 +249,7 @@ struct DataBrowserModel::tDataColumn const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > & xDataSeries, sal_Int32 nIndexInDataSeries, - ::rtl::OUString aUIRoleName, + OUString aUIRoleName, ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > xLabeledDataSequence, eCellType aCellType, @@ -336,7 +336,7 @@ void DataBrowserModel::insertDataSeries( sal_Int32 nAfterColumnIndex ) Reference< beans::XPropertySet > xSeriesProps( xSeries, uno::UNO_QUERY ); if( xSeriesProps.is() ) - xSeriesProps->getPropertyValue( C2U( "NumberFormat" )) >>= nSeriesNumberFormat; + xSeriesProps->getPropertyValue( "NumberFormat" ) >>= nSeriesNumberFormat; } else { @@ -394,7 +394,7 @@ void DataBrowserModel::insertDataSeries( sal_Int32 nAfterColumnIndex ) // labels Reference< chart2::data::XDataSequence > xNewLabelSeq( xDataProvider->createDataSequenceByRangeRepresentation( - OUString( RTL_CONSTASCII_USTRINGPARAM( "label " )) + + "label " + OUString::valueOf( nIndex ))); lcl_copyDataSequenceProperties( aLSequences[nSeqIdx]->getLabel(), xNewLabelSeq ); @@ -409,7 +409,7 @@ void DataBrowserModel::insertDataSeries( sal_Int32 nAfterColumnIndex ) //give the new series the same number format as the former series especially for bubble charts thus the bubble size values can be edited with same format immidiately Reference< beans::XPropertySet > xNewSeriesProps( xNewSeries, uno::UNO_QUERY ); if( xNewSeriesProps.is() ) - xNewSeriesProps->setPropertyValue( C2U( "NumberFormat" ), uno::makeAny( nSeriesNumberFormat ) ); + xNewSeriesProps->setPropertyValue( "NumberFormat" , uno::makeAny( nSeriesNumberFormat ) ); } updateFromModel(); @@ -704,7 +704,7 @@ bool DataBrowserModel::setCellNumber( sal_Int32 nAtColumn, sal_Int32 nAtRow, dou setCellAny( nAtColumn, nAtRow, uno::makeAny( fValue )); } -bool DataBrowserModel::setCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow, const ::rtl::OUString & rText ) +bool DataBrowserModel::setCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow, const OUString & rText ) { return (getCellType( nAtColumn, nAtRow ) == TEXT) && setCellAny( nAtColumn, nAtRow, uno::makeAny( rText )); @@ -831,7 +831,7 @@ void DataBrowserModel::updateFromModel() Reference< chart2::XDataSeriesContainer > xSeriesCnt( aChartTypes[nCTIdx], uno::UNO_QUERY ); if( xSeriesCnt.is()) { - rtl::OUString aRoleForDataLabelNumberFormat = ChartTypeHelper::getRoleOfSequenceForDataLabelNumberFormatDetection( aChartTypes[nCTIdx] ); + OUString aRoleForDataLabelNumberFormat = ChartTypeHelper::getRoleOfSequenceForDataLabelNumberFormatDetection( aChartTypes[nCTIdx] ); Sequence< Reference< chart2::XDataSeries > > aSeries( xSeriesCnt->getDataSeries()); lcl_tSharedSeqVec aSharedSequences( lcl_getSharedSequences( aSeries )); @@ -877,7 +877,7 @@ void DataBrowserModel::updateFromModel() nSequenceNumberFormatKey = ExplicitValueProvider::getExplicitNumberFormatKeyForDataLabel( Reference< beans::XPropertySet >( xSeries, uno::UNO_QUERY ), xSeries, -1, xDiagram ); } - else if( aRole.equals( C2U( "values-x" ) ) ) + else if( aRole.equals( "values-x" ) ) nSequenceNumberFormatKey = nXAxisNumberFormat; if( ::std::find_if( aSharedSequences.begin(), aSharedSequences.end(), @@ -900,7 +900,7 @@ void DataBrowserModel::updateFromModel() try { Reference< beans::XPropertySet > xProp( aCooSysSeq[nCooSysIdx], uno::UNO_QUERY ); - xProp->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("SwapXAndYAxis"))) >>= bSwapXAndYAxis; + xProp->getPropertyValue( "SwapXAndYAxis" ) >>= bSwapXAndYAxis; } catch( const beans::UnknownPropertyException & ex ) { diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx index 601c19b208e0..161e3440b0ce 100644 --- a/chart2/source/controller/dialogs/DialogModel.cxx +++ b/chart2/source/controller/dialogs/DialogModel.cxx @@ -56,13 +56,12 @@ using namespace ::chart::ContainerHelper; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; // ---------------------------------------- namespace { -const OUString lcl_aLabelRole( RTL_CONSTASCII_USTRINGPARAM( "label" )); +const OUString lcl_aLabelRole( "label" ); struct lcl_ChartTypeToSeriesCnt : ::std::unary_function< Reference< XChartType >, Reference< XDataSeriesContainer > > @@ -83,21 +82,21 @@ OUString lcl_ConvertRole( const OUString & rRoleString, bool bFromInternalToUI ) if( aTranslationMap.empty() ) { - aTranslationMap[ C2U( "categories" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_CATEGORIES ))); - aTranslationMap[ C2U( "error-bars-x" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_X_ERROR ))); - aTranslationMap[ C2U( "error-bars-x-positive" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_X_ERROR_POSITIVE ))); - aTranslationMap[ C2U( "error-bars-x-negative" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_X_ERROR_NEGATIVE ))); - aTranslationMap[ C2U( "error-bars-y" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_Y_ERROR ))); - aTranslationMap[ C2U( "error-bars-y-positive" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_Y_ERROR_POSITIVE ))); - aTranslationMap[ C2U( "error-bars-y-negative" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_Y_ERROR_NEGATIVE ))); - aTranslationMap[ C2U( "label" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_LABEL ))); - aTranslationMap[ C2U( "values-first" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_FIRST ))); - aTranslationMap[ C2U( "values-last" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_LAST ))); - aTranslationMap[ C2U( "values-max" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_MAX ))); - aTranslationMap[ C2U( "values-min" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_MIN ))); - aTranslationMap[ C2U( "values-x" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_X ))); - aTranslationMap[ C2U( "values-y" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_Y ))); - aTranslationMap[ C2U( "values-size" ) ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_SIZE ))); + aTranslationMap[ "categories" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_CATEGORIES ))); + aTranslationMap[ "error-bars-x" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_X_ERROR ))); + aTranslationMap[ "error-bars-x-positive" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_X_ERROR_POSITIVE ))); + aTranslationMap[ "error-bars-x-negative" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_X_ERROR_NEGATIVE ))); + aTranslationMap[ "error-bars-y" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_Y_ERROR ))); + aTranslationMap[ "error-bars-y-positive" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_Y_ERROR_POSITIVE ))); + aTranslationMap[ "error-bars-y-negative" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_Y_ERROR_NEGATIVE ))); + aTranslationMap[ "label" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_LABEL ))); + aTranslationMap[ "values-first" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_FIRST ))); + aTranslationMap[ "values-last" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_LAST ))); + aTranslationMap[ "values-max" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_MAX ))); + aTranslationMap[ "values-min" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_MIN ))); + aTranslationMap[ "values-x" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_X ))); + aTranslationMap[ "values-y" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_Y ))); + aTranslationMap[ "values-size" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_SIZE ))); } if( bFromInternalToUI ) @@ -124,28 +123,28 @@ OUString lcl_ConvertRole( const OUString & rRoleString, bool bFromInternalToUI ) return aResult; } -typedef ::std::map< ::rtl::OUString, sal_Int32 > lcl_tRoleIndexMap; +typedef ::std::map< OUString, sal_Int32 > lcl_tRoleIndexMap; void lcl_createRoleIndexMap( lcl_tRoleIndexMap & rOutMap ) { rOutMap.clear(); sal_Int32 nIndex = 0; - rOutMap[ C2U( "label" ) ] = ++nIndex; - rOutMap[ C2U( "categories" ) ] = ++nIndex; - rOutMap[ C2U( "values-x" ) ] = ++nIndex; - rOutMap[ C2U( "values-y" ) ] = ++nIndex; - rOutMap[ C2U( "error-bars-x" ) ] = ++nIndex; - rOutMap[ C2U( "error-bars-x-positive" ) ] = ++nIndex; - rOutMap[ C2U( "error-bars-x-negative" ) ] = ++nIndex; - rOutMap[ C2U( "error-bars-y" ) ] = ++nIndex; - rOutMap[ C2U( "error-bars-y-positive" ) ] = ++nIndex; - rOutMap[ C2U( "error-bars-y-negative" ) ] = ++nIndex; - rOutMap[ C2U( "values-first" ) ] = ++nIndex; - rOutMap[ C2U( "values-min" ) ] = ++nIndex; - rOutMap[ C2U( "values-max" ) ] = ++nIndex; - rOutMap[ C2U( "values-last" ) ] = ++nIndex; - rOutMap[ C2U( "values-size" ) ] = ++nIndex; + rOutMap[ "label" ] = ++nIndex; + rOutMap[ "categories" ] = ++nIndex; + rOutMap[ "values-x" ] = ++nIndex; + rOutMap[ "values-y" ] = ++nIndex; + rOutMap[ "error-bars-x" ] = ++nIndex; + rOutMap[ "error-bars-x-positive" ] = ++nIndex; + rOutMap[ "error-bars-x-negative" ] = ++nIndex; + rOutMap[ "error-bars-y" ] = ++nIndex; + rOutMap[ "error-bars-y-positive" ] = ++nIndex; + rOutMap[ "error-bars-y-negative" ] = ++nIndex; + rOutMap[ "values-first" ] = ++nIndex; + rOutMap[ "values-min" ] = ++nIndex; + rOutMap[ "values-max" ] = ++nIndex; + rOutMap[ "values-last" ] = ++nIndex; + rOutMap[ "values-size" ] = ++nIndex; } struct lcl_DataSeriesContainerAppend : public @@ -164,7 +163,7 @@ struct lcl_DataSeriesContainerAppend : public if( xVal.is()) { Sequence< Reference< XDataSeries > > aSeq( xVal->getDataSeries()); - OUString aRole( RTL_CONSTASCII_USTRINGPARAM("values-y")); + OUString aRole( "values-y" ); Reference< XChartType > xCT( xVal, uno::UNO_QUERY ); if( xCT.is()) aRole = xCT->getRoleOfSequenceForSeriesLabel(); @@ -199,7 +198,7 @@ struct lcl_RolesWithRangeAppend : public typedef ::chart::DialogModel::tRolesWithRanges tContainerType; explicit lcl_RolesWithRangeAppend( tContainerType & rCnt, - const ::rtl::OUString & aLabelRole ) + const OUString & aLabelRole ) : m_rDestCnt( rCnt ), m_aRoleForLabelSeq( aLabelRole ) {} @@ -216,7 +215,7 @@ struct lcl_RolesWithRangeAppend : public { OUString aRole; Reference< beans::XPropertySet > xProp( xSeq, uno::UNO_QUERY_THROW ); - if( xProp->getPropertyValue( C2U("Role")) >>= aRole ) + if( xProp->getPropertyValue( "Role") >>= aRole ) { m_rDestCnt.insert( tContainerType::value_type( @@ -259,7 +258,7 @@ void lcl_SetSequenceRole( { Reference< beans::XPropertySet > xProp( xSeq, uno::UNO_QUERY ); if( xProp.is()) - xProp->setPropertyValue( C2U("Role"), uno::makeAny( rRole )); + xProp->setPropertyValue( "Role" , uno::makeAny( rRole )); } Reference< XDataSeries > lcl_CreateNewSeries( @@ -274,7 +273,7 @@ Reference< XDataSeries > lcl_CreateNewSeries( // create plain series Reference< XDataSeries > xResult( xContext->getServiceManager()->createInstanceWithContext( - C2U( "com.sun.star.chart2.DataSeries" ), + "com.sun.star.chart2.DataSeries" , xContext ), uno::UNO_QUERY ); if( xTemplate.is()) { @@ -285,8 +284,7 @@ Reference< XDataSeries > lcl_CreateNewSeries( // without setting it as hard attribute Reference< XColorScheme > xColorScheme( xDiagram->getDefaultColorScheme()); if( xColorScheme.is()) - xResultProp->setPropertyValue( - C2U("Color"), uno::makeAny( xColorScheme->getColorByIndex( nNewSeriesIndex ))); + xResultProp->setPropertyValue( "Color" , uno::makeAny( xColorScheme->getColorByIndex( nNewSeriesIndex ))); } sal_Int32 nGroupIndex=0; if( xChartType.is()) @@ -458,7 +456,7 @@ Reference< data::XDataProvider > DialogModel::getDataProvider() const DialogModel::tRolesWithRanges DialogModel::getRolesWithRanges( const Reference< XDataSeries > & xSeries, - const ::rtl::OUString & aRoleOfSequenceForLabel, + const OUString & aRoleOfSequenceForLabel, const Reference< chart2::XChartType > & xChartType ) const { DialogModel::tRolesWithRanges aResult; @@ -726,7 +724,7 @@ OUString DialogModel::GetRoleDataLabel() return OUString( String( ::chart::SchResId( STR_OBJECT_DATALABELS ))); } -sal_Int32 DialogModel::GetRoleIndexForSorting( const ::rtl::OUString & rInternalRoleString ) +sal_Int32 DialogModel::GetRoleIndexForSorting( const OUString & rInternalRoleString ) { static lcl_tRoleIndexMap aRoleIndexMap; @@ -778,8 +776,8 @@ void DialogModel::applyInterpretedData( // without setting it as hard attribute Reference< XColorScheme > xColorScheme( xDiagram->getDefaultColorScheme()); if( xColorScheme.is()) - xSeriesProp->setPropertyValue( - C2U("Color"), uno::makeAny( xColorScheme->getColorByIndex( nSeriesCounter ))); + xSeriesProp->setPropertyValue( "Color" , + uno::makeAny( xColorScheme->getColorByIndex( nSeriesCounter ))); } m_xTemplate->applyStyle( aSeries[nSeries], nGroup, nNewSeriesIndex++, nSeriesInGroup ); } diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx index 78def1fdd769..6ef7bd9684d3 100644 --- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx +++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx @@ -47,12 +47,11 @@ using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; -using rtl::OUString; namespace { -OUString lcl_getDataSeriesName( const rtl::OUString& rObjectCID, const Reference< frame::XModel >& xChartModel ) +OUString lcl_getDataSeriesName( const OUString& rObjectCID, const Reference< frame::XModel >& xChartModel ) { OUString aRet; @@ -71,10 +70,10 @@ OUString lcl_getDataSeriesName( const rtl::OUString& rObjectCID, const Reference return aRet; } -OUString lcl_getFullSeriesName( const rtl::OUString& rObjectCID, const Reference< frame::XModel >& xChartModel ) +OUString lcl_getFullSeriesName( const OUString& rObjectCID, const Reference< frame::XModel >& xChartModel ) { OUString aRet = String(SchResId(STR_TIP_DATASERIES)); - OUString aWildcard( C2U("%SERIESNAME") ); + OUString aWildcard( "%SERIESNAME" ); sal_Int32 nIndex = aRet.indexOf( aWildcard ); if( nIndex != -1 ) aRet = aRet.replaceAt( nIndex, aWildcard.getLength(), lcl_getDataSeriesName( rObjectCID, xChartModel ) ); @@ -103,7 +102,7 @@ OUString lcl_getDataPointValueText( const Reference< XDataSeries >& xSeries, sal Sequence< Reference< data::XLabeledDataSequence > > aDataSequences( xDataSource->getDataSequences() ); - rtl::OUString aX, aY, aY_Min, aY_Max, aY_First, aY_Last, a_Size; + OUString aX, aY, aY_Min, aY_Max, aY_First, aY_Last, a_Size; double fValue = 0; uno::Reference< util::XNumberFormatsSupplier > xNumberFormatsSupplier( xChartModel, uno::UNO_QUERY ); @@ -124,47 +123,47 @@ OUString lcl_getDataPointValueText( const Reference< XDataSeries >& xSeries, sal { try { - uno::Any aARole = xProp->getPropertyValue( C2U( "Role" ) ); - rtl::OUString aRole; + uno::Any aARole = xProp->getPropertyValue( "Role" ); + OUString aRole; aARole >>= aRole; - if( aRole.equals(C2U("values-x")) ) + if( aRole == "values-x" ) { aData[nPointIndex]>>= fValue; sal_Int32 nNumberFormatKey = xDataSequence->getNumberFormatKeyByIndex( nPointIndex ); aX = aNumberFormatterWrapper.getFormattedString( nNumberFormatKey, fValue, nLabelColor, bColorChanged ); } - else if( aRole.equals(C2U("values-y")) ) + else if( aRole == "values-y") { aData[nPointIndex]>>= fValue; sal_Int32 nNumberFormatKey = xDataSequence->getNumberFormatKeyByIndex( nPointIndex ); aY = aNumberFormatterWrapper.getFormattedString( nNumberFormatKey, fValue, nLabelColor, bColorChanged ); } - else if( aRole.equals(C2U("values-first")) ) + else if( aRole == "values-first" ) { aData[nPointIndex]>>= fValue; sal_Int32 nNumberFormatKey = xDataSequence->getNumberFormatKeyByIndex( nPointIndex ); aY_First = aNumberFormatterWrapper.getFormattedString( nNumberFormatKey, fValue, nLabelColor, bColorChanged ); } - else if( aRole.equals(C2U("values-min")) ) + else if( aRole == "values-min" ) { aData[nPointIndex]>>= fValue; sal_Int32 nNumberFormatKey = xDataSequence->getNumberFormatKeyByIndex( nPointIndex ); aY_Min = aNumberFormatterWrapper.getFormattedString( nNumberFormatKey, fValue, nLabelColor, bColorChanged ); } - else if( aRole.equals(C2U("values-max")) ) + else if( aRole == "values-max" ) { aData[nPointIndex]>>= fValue; sal_Int32 nNumberFormatKey = xDataSequence->getNumberFormatKeyByIndex( nPointIndex ); aY_Max = aNumberFormatterWrapper.getFormattedString( nNumberFormatKey, fValue, nLabelColor, bColorChanged ); } - else if( aRole.equals(C2U("values-last")) ) + else if( aRole == "values-last" ) { aData[nPointIndex]>>= fValue; sal_Int32 nNumberFormatKey = xDataSequence->getNumberFormatKeyByIndex( nPointIndex ); aY_Last = aNumberFormatterWrapper.getFormattedString( nNumberFormatKey, fValue, nLabelColor, bColorChanged ); } - else if( aRole.equals(C2U("values-size")) ) + else if( aRole == "values-size" ) { aData[nPointIndex]>>= fValue; sal_Int32 nNumberFormatKey = xDataSequence->getNumberFormatKeyByIndex( nPointIndex ); @@ -187,7 +186,7 @@ OUString lcl_getDataPointValueText( const Reference< XDataSeries >& xSeries, sal aRet = aX; } - OUString aSeparator(C2U(" ")); + OUString aSeparator( " " ); lcl_addText( aRet, aSeparator, aY ); lcl_addText( aRet, aSeparator, aY_First ); @@ -201,9 +200,9 @@ OUString lcl_getDataPointValueText( const Reference< XDataSeries >& xSeries, sal } //end anonymous namespace -rtl::OUString ObjectNameProvider::getName( ObjectType eObjectType, bool bPlural ) +OUString ObjectNameProvider::getName( ObjectType eObjectType, bool bPlural ) { - rtl::OUString aRet; + OUString aRet; switch( eObjectType ) { case OBJECTTYPE_PAGE: @@ -311,10 +310,10 @@ rtl::OUString ObjectNameProvider::getName( ObjectType eObjectType, bool bPlural return aRet; } -rtl::OUString ObjectNameProvider::getAxisName( const rtl::OUString& rObjectCID +OUString ObjectNameProvider::getAxisName( const OUString& rObjectCID , const uno::Reference< frame::XModel >& xChartModel ) { - rtl::OUString aRet; + OUString aRet; @@ -408,10 +407,10 @@ OUString ObjectNameProvider::getTitleName( const OUString& rObjectCID return aRet; } -rtl::OUString ObjectNameProvider::getGridName( const rtl::OUString& rObjectCID +OUString ObjectNameProvider::getGridName( const OUString& rObjectCID , const uno::Reference< frame::XModel >& xChartModel ) { - rtl::OUString aRet; + OUString aRet; sal_Int32 nCooSysIndex = -1; @@ -462,14 +461,14 @@ rtl::OUString ObjectNameProvider::getGridName( const rtl::OUString& rObjectCID return aRet; } -rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID, const Reference< chart2::XChartDocument >& xChartDocument, bool bVerbose ) +OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Reference< chart2::XChartDocument >& xChartDocument, bool bVerbose ) { return getHelpText( rObjectCID, Reference< frame::XModel >( xChartDocument, uno::UNO_QUERY ), bVerbose ); } -rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID, const Reference< frame::XModel >& xChartModel, bool bVerbose ) +OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Reference< frame::XModel >& xChartModel, bool bVerbose ) { - rtl::OUString aRet; + OUString aRet; ObjectType eObjectType( ObjectIdentifier::getObjectType(rObjectCID) ); if( OBJECTTYPE_AXIS == eObjectType ) { @@ -492,7 +491,7 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID, { if( bVerbose ) { - OUString aNewLine(C2U("\n")); + OUString aNewLine( "\n" ); aRet=String(SchResId(STR_TIP_DATAPOINT_INDEX)); aRet+=aNewLine; @@ -511,7 +510,7 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID, //replace data point index sal_Int32 nIndex = -1; - OUString aWildcard( C2U("%POINTNUMBER") ); + OUString aWildcard( "%POINTNUMBER" ); nIndex = aRet.indexOf( aWildcard ); if( nIndex != -1 ) { @@ -519,7 +518,7 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID, } //replace data series index - aWildcard = C2U("%SERIESNUMBER"); + aWildcard = "%SERIESNUMBER"; nIndex = aRet.indexOf( aWildcard ); if( nIndex != -1 ) { @@ -539,14 +538,14 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID, } //replace point values - aWildcard = C2U("%POINTVALUES"); + aWildcard = "%POINTVALUES"; nIndex = aRet.indexOf( aWildcard ); if( nIndex != -1 ) aRet = aRet.replaceAt( nIndex, aWildcard.getLength(), lcl_getDataPointValueText( xSeries,nPointIndex, DataSeriesHelper::getCoordinateSystemOfSeries(xSeries, xDiagram), xChartModel ) ); //replace series name - aWildcard = C2U("%SERIESNAME"); + aWildcard = "%SERIESNAME"; nIndex = aRet.indexOf( aWildcard ); if( nIndex != -1 ) aRet = aRet.replaceAt( nIndex, aWildcard.getLength(), lcl_getDataSeriesName( rObjectCID, xChartModel ) ); @@ -571,13 +570,13 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID, // replace formula sal_Int32 nIndex = -1; - OUString aWildcard( C2U("%FORMULA") ); + OUString aWildcard( "%FORMULA" ); nIndex = aRet.indexOf( aWildcard ); if( nIndex != -1 ) aRet = aRet.replaceAt( nIndex, aWildcard.getLength(), xCalculator->getRepresentation()); // replace r^2 - aWildcard = C2U("%RSQUARED"); + aWildcard = "%RSQUARED"; nIndex = aRet.indexOf( aWildcard ); if( nIndex != -1 ) { @@ -622,7 +621,7 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID, sal_Unicode aDecimalSep( '.' ); sal_Int32 nIndex = -1; - OUString aWildcard( C2U("%AVERAGE_VALUE") ); + OUString aWildcard( "%AVERAGE_VALUE" ); nIndex = aRet.indexOf( aWildcard ); // as the curve is constant, the value at any x-value is ok if( nIndex != -1 ) @@ -635,7 +634,7 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID, } // replace standard deviation - aWildcard = C2U("%STD_DEVIATION"); + aWildcard = "%STD_DEVIATION"; nIndex = aRet.indexOf( aWildcard ); if( nIndex != -1 ) { @@ -666,9 +665,9 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID, return aRet; } -rtl::OUString ObjectNameProvider::getSelectedObjectText( const rtl::OUString & rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument ) +OUString ObjectNameProvider::getSelectedObjectText( const OUString & rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument ) { - rtl::OUString aRet; + OUString aRet; ObjectType eObjectType( ObjectIdentifier::getObjectType(rObjectCID) ); Reference< frame::XModel > xChartModel( xChartDocument, uno::UNO_QUERY ); @@ -683,7 +682,7 @@ rtl::OUString ObjectNameProvider::getSelectedObjectText( const rtl::OUString & r sal_Int32 nPointIndex( ObjectIdentifier::getParticleID(rObjectCID).toInt32() ); // replace data point index - replaceParamterInString( aRet, C2U("%POINTNUMBER"), OUString::valueOf( nPointIndex + 1 )); + replaceParamterInString( aRet, "%POINTNUMBER", OUString::valueOf( nPointIndex + 1 )); // replace data series index { @@ -695,11 +694,11 @@ rtl::OUString ObjectNameProvider::getSelectedObjectText( const rtl::OUString & r if( aSeriesVector[nSeriesIndex] == xSeries ) break; } - replaceParamterInString( aRet, C2U("%SERIESNUMBER"), OUString::valueOf( nSeriesIndex + 1 ) ); + replaceParamterInString( aRet, "%SERIESNUMBER", OUString::valueOf( nSeriesIndex + 1 ) ); } // replace point value - replaceParamterInString( aRet, C2U("%POINTVALUES"), lcl_getDataPointValueText( + replaceParamterInString( aRet, "%POINTVALUES", lcl_getDataPointValueText( xSeries, nPointIndex, DataSeriesHelper::getCoordinateSystemOfSeries(xSeries, xDiagram), xChartModel ) ); } } @@ -711,7 +710,7 @@ rtl::OUString ObjectNameProvider::getSelectedObjectText( const rtl::OUString & r if( !aHelpText.isEmpty()) { aRet = String( SchResId( STR_STATUS_OBJECT_MARKED )); - replaceParamterInString( aRet, C2U("%OBJECTNAME"), aHelpText ); + replaceParamterInString( aRet, "%OBJECTNAME", aHelpText ); } } @@ -719,8 +718,8 @@ rtl::OUString ObjectNameProvider::getSelectedObjectText( const rtl::OUString & r } -rtl::OUString ObjectNameProvider::getNameForCID( - const rtl::OUString& rObjectCID, +OUString ObjectNameProvider::getNameForCID( + const OUString& rObjectCID, const uno::Reference< chart2::XChartDocument >& xChartDocument ) { ObjectType eType( ObjectIdentifier::getObjectType( rObjectCID )); @@ -747,18 +746,18 @@ rtl::OUString ObjectNameProvider::getNameForCID( case OBJECTTYPE_DATA_AVERAGE_LINE: case OBJECTTYPE_DATA_CURVE_EQUATION: { - rtl::OUString aRet = lcl_getFullSeriesName( rObjectCID, xModel ); - aRet += C2U(" "); + OUString aRet = lcl_getFullSeriesName( rObjectCID, xModel ); + aRet += " "; if( eType == OBJECTTYPE_DATA_POINT || eType == OBJECTTYPE_DATA_LABEL ) { aRet += getName( OBJECTTYPE_DATA_POINT ); sal_Int32 nPointIndex = ObjectIdentifier::getIndexFromParticleOrCID( rObjectCID ); - aRet += C2U(" "); + aRet += " "; aRet += OUString::valueOf(nPointIndex+1); if( eType == OBJECTTYPE_DATA_LABEL ) { - aRet += C2U(" "); + aRet += " "; aRet += getName( OBJECTTYPE_DATA_LABEL ); } } @@ -773,9 +772,9 @@ rtl::OUString ObjectNameProvider::getNameForCID( return getName( eType ); } -rtl::OUString ObjectNameProvider::getName_ObjectForSeries( +OUString ObjectNameProvider::getName_ObjectForSeries( ObjectType eObjectType, - const rtl::OUString& rSeriesCID, + const OUString& rSeriesCID, const uno::Reference< chart2::XChartDocument >& xChartDocument ) { uno::Reference< frame::XModel> xChartModel( xChartDocument, uno::UNO_QUERY ); @@ -783,18 +782,18 @@ rtl::OUString ObjectNameProvider::getName_ObjectForSeries( if( xSeries.is() ) { OUString aRet = String(SchResId(STR_OBJECT_FOR_SERIES)); - replaceParamterInString( aRet, C2U("%OBJECTNAME"), getName( eObjectType, false /*bPlural*/ ) ); - replaceParamterInString( aRet, C2U("%SERIESNAME"), lcl_getDataSeriesName( rSeriesCID, xChartModel ) ); + replaceParamterInString( aRet, "%OBJECTNAME", getName( eObjectType, false /*bPlural*/ ) ); + replaceParamterInString( aRet, "%SERIESNAME", lcl_getDataSeriesName( rSeriesCID, xChartModel ) ); return aRet; } else return ObjectNameProvider::getName_ObjectForAllSeries( eObjectType ); } -rtl::OUString ObjectNameProvider::getName_ObjectForAllSeries( ObjectType eObjectType ) +OUString ObjectNameProvider::getName_ObjectForAllSeries( ObjectType eObjectType ) { OUString aRet = String(SchResId(STR_OBJECT_FOR_ALL_SERIES)); - replaceParamterInString( aRet, C2U("%OBJECTNAME"), getName( eObjectType, true /*bPlural*/ ) ); + replaceParamterInString( aRet, "%OBJECTNAME", getName( eObjectType, true /*bPlural*/ ) ); return aRet; } diff --git a/chart2/source/controller/dialogs/RangeSelectionHelper.cxx b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx index b9f607c48dc9..006f673a0c69 100644 --- a/chart2/source/controller/dialogs/RangeSelectionHelper.cxx +++ b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; // ---------------------------------------- @@ -124,17 +123,17 @@ bool RangeSelectionHelper::chooseRange( { Sequence< beans::PropertyValue > aArgs( 4 ); aArgs[0] = beans::PropertyValue( - C2U("InitialValue"), -1, uno::makeAny( aCurrentRange ), + "InitialValue", -1, uno::makeAny( aCurrentRange ), beans::PropertyState_DIRECT_VALUE ); aArgs[1] = beans::PropertyValue( - C2U("Title"), -1, + "Title", -1, uno::makeAny( aUIString ), beans::PropertyState_DIRECT_VALUE ); aArgs[2] = beans::PropertyValue( - C2U("CloseOnMouseRelease"), -1, uno::makeAny( true ), + "CloseOnMouseRelease", -1, uno::makeAny( true ), beans::PropertyState_DIRECT_VALUE ); aArgs[3] = beans::PropertyValue( - C2U("MultiSelectionMode"), -1, uno::makeAny( true ), + "MultiSelectionMode", -1, uno::makeAny( true ), beans::PropertyState_DIRECT_VALUE ); if( m_xRangeSelectionListener.is() ) diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx index 4584fcc23e5a..5d4e8a593b46 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx @@ -54,7 +54,7 @@ CreationWizardUnoDlg::CreationWizardUnoDlg( const uno::Reference< uno::XComponen { uno::Reference< frame::XDesktop > xDesktop( m_xCC->getServiceManager()->createInstanceWithContext( - C2U( "com.sun.star.frame.Desktop" ), m_xCC ), uno::UNO_QUERY ); + "com.sun.star.frame.Desktop" , m_xCC ), uno::UNO_QUERY ); if( xDesktop.is() ) { uno::Reference< frame::XTerminateListener > xListener( this ); @@ -74,10 +74,10 @@ CreationWizardUnoDlg::~CreationWizardUnoDlg() // lang::XServiceInfo APPHELPER_XSERVICEINFO_IMPL(CreationWizardUnoDlg,CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME) - uno::Sequence< rtl::OUString > CreationWizardUnoDlg + uno::Sequence< OUString > CreationWizardUnoDlg ::getSupportedServiceNames_Static() { - uno::Sequence< rtl::OUString > aSNS( 1 ); + uno::Sequence< OUString > aSNS( 1 ); aSNS.getArray()[ 0 ] = CHART_WIZARD_DIALOG_SERVICE_NAME; return aSNS; } @@ -191,7 +191,7 @@ void SAL_CALL CreationWizardUnoDlg::disposing( const lang::EventObject& /*Source } //------------------------------------------------------------------------- -void SAL_CALL CreationWizardUnoDlg::setTitle( const ::rtl::OUString& /*rTitle*/ ) throw(uno::RuntimeException) +void SAL_CALL CreationWizardUnoDlg::setTitle( const OUString& /*rTitle*/ ) throw(uno::RuntimeException) { } //------------------------------------------------------------------------- @@ -292,7 +292,7 @@ void SAL_CALL CreationWizardUnoDlg::disposing() { uno::Reference< frame::XDesktop > xDesktop( m_xCC->getServiceManager()->createInstanceWithContext( - C2U( "com.sun.star.frame.Desktop" ), m_xCC ), uno::UNO_QUERY ); + "com.sun.star.frame.Desktop" , m_xCC ), uno::UNO_QUERY ); if( xDesktop.is() ) { uno::Reference< frame::XTerminateListener > xListener( this ); @@ -313,16 +313,16 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL CreationWizardUnoDlg::getProp return 0; } -void SAL_CALL CreationWizardUnoDlg::setPropertyValue( const ::rtl::OUString& rPropertyName +void SAL_CALL CreationWizardUnoDlg::setPropertyValue( const OUString& rPropertyName , const uno::Any& rValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException , lang::WrappedTargetException, uno::RuntimeException) { - if( rPropertyName.equals(C2U("Position")) ) + if( rPropertyName == "Position" ) { awt::Point aPos; if( ! (rValue >>= aPos) ) - throw lang::IllegalArgumentException( C2U("Property 'Position' requires value of type awt::Point"), 0, 0 ); + throw lang::IllegalArgumentException( "Property 'Position' requires value of type awt::Point", 0, 0 ); //set left upper outer corner relative to screen //pixels, screen position @@ -337,24 +337,24 @@ void SAL_CALL CreationWizardUnoDlg::setPropertyValue( const ::rtl::OUString& rPr m_pDialog->SetPosPixel( aNewOuterPos ); } } - else if( rPropertyName.equals(C2U("Size")) ) + else if( rPropertyName == "Size") { //read only property, do nothing } - else if( rPropertyName.equals(C2U("UnlockControllersOnExecute")) ) + else if( rPropertyName == "UnlockControllersOnExecute" ) { if( ! (rValue >>= m_bUnlockControllersOnExecute) ) - throw lang::IllegalArgumentException( C2U("Property 'UnlockControllers' requires value of type boolean"), 0, 0 ); + throw lang::IllegalArgumentException( "Property 'UnlockControllers' requires value of type boolean" , 0, 0 ); } else - throw beans::UnknownPropertyException( C2U("unknown property was tried to set to chart wizard"), 0 ); + throw beans::UnknownPropertyException( "unknown property was tried to set to chart wizard" , 0 ); } -uno::Any SAL_CALL CreationWizardUnoDlg::getPropertyValue( const ::rtl::OUString& rPropertyName ) +uno::Any SAL_CALL CreationWizardUnoDlg::getPropertyValue( const OUString& rPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { uno::Any aRet; - if( rPropertyName.equals(C2U("Position")) ) + if( rPropertyName == "Position" ) { //get left upper outer corner relative to screen //pixels, screen position @@ -367,7 +367,7 @@ uno::Any SAL_CALL CreationWizardUnoDlg::getPropertyValue( const ::rtl::OUString& aRet = uno::makeAny( aPoint ); } } - else if( rPropertyName.equals(C2U("Size")) ) + else if( rPropertyName == "Size" ) { //get outer size inclusive decoration //pixels, screen position @@ -380,35 +380,35 @@ uno::Any SAL_CALL CreationWizardUnoDlg::getPropertyValue( const ::rtl::OUString& aRet = uno::makeAny( aSize ); } } - else if( rPropertyName.equals(C2U("UnlockControllersOnExecute")) ) + else if( rPropertyName == "UnlockControllersOnExecute" ) { aRet = uno::makeAny( m_bUnlockControllersOnExecute ); } else - throw beans::UnknownPropertyException( C2U("unknown property was tried to get from chart wizard"), 0 ); + throw beans::UnknownPropertyException( "unknown property was tried to get from chart wizard" , 0 ); return aRet; } void SAL_CALL CreationWizardUnoDlg::addPropertyChangeListener( - const ::rtl::OUString& /* aPropertyName */, const uno::Reference< beans::XPropertyChangeListener >& /* xListener */ ) + const OUString& /* aPropertyName */, const uno::Reference< beans::XPropertyChangeListener >& /* xListener */ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL("not implemented"); } void SAL_CALL CreationWizardUnoDlg::removePropertyChangeListener( - const ::rtl::OUString& /* aPropertyName */, const uno::Reference< beans::XPropertyChangeListener >& /* aListener */ ) + const OUString& /* aPropertyName */, const uno::Reference< beans::XPropertyChangeListener >& /* aListener */ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL("not implemented"); } -void SAL_CALL CreationWizardUnoDlg::addVetoableChangeListener( const ::rtl::OUString& /* PropertyName */, const uno::Reference< beans::XVetoableChangeListener >& /* aListener */ ) +void SAL_CALL CreationWizardUnoDlg::addVetoableChangeListener( const OUString& /* PropertyName */, const uno::Reference< beans::XVetoableChangeListener >& /* aListener */ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL("not implemented"); } -void SAL_CALL CreationWizardUnoDlg::removeVetoableChangeListener( const ::rtl::OUString& /* PropertyName */, const uno::Reference< beans::XVetoableChangeListener >& /* aListener */ ) +void SAL_CALL CreationWizardUnoDlg::removeVetoableChangeListener( const OUString& /* PropertyName */, const uno::Reference< beans::XVetoableChangeListener >& /* aListener */ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL("not implemented"); diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index 15f72a189c2e..de868dc390b9 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -79,7 +79,7 @@ using ::com::sun::star::uno::Reference; //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -ObjectPropertiesDialogParameter::ObjectPropertiesDialogParameter( const rtl::OUString& rObjectCID ) +ObjectPropertiesDialogParameter::ObjectPropertiesDialogParameter( const OUString& rObjectCID ) : m_aObjectCID( rObjectCID ) , m_eObjectType( ObjectIdentifier::getObjectType( m_aObjectCID ) ) , m_bAffectsMultipleObjects(false) @@ -103,8 +103,8 @@ ObjectPropertiesDialogParameter::ObjectPropertiesDialogParameter( const rtl::OUS , m_xChartDocument( 0 ) , m_bComplexCategoriesAxis( false ) { - rtl::OUString aParticleID = ObjectIdentifier::getParticleID( m_aObjectCID ); - m_bAffectsMultipleObjects = aParticleID.equals(C2U("ALLELEMENTS")); + OUString aParticleID = ObjectIdentifier::getParticleID( m_aObjectCID ); + m_bAffectsMultipleObjects = (aParticleID == "ALLELEMENTS"); } ObjectPropertiesDialogParameter::~ObjectPropertiesDialogParameter() { @@ -113,7 +113,7 @@ ObjectType ObjectPropertiesDialogParameter::getObjectType() const { return m_eObjectType; } -rtl::OUString ObjectPropertiesDialogParameter::getLocalizedName() const +OUString ObjectPropertiesDialogParameter::getLocalizedName() const { return m_aLocalizedName; } @@ -296,7 +296,7 @@ bool ObjectPropertiesDialogParameter::IsCrossingAxisIsCategoryAxis() const { return m_bIsCrossingAxisIsCategoryAxis; } -const uno::Sequence< rtl::OUString >& ObjectPropertiesDialogParameter::GetCategories() const +const uno::Sequence< OUString >& ObjectPropertiesDialogParameter::GetCategories() const { return m_aCategories; } From 33bea955ca93e218ae19961e1fd9800b8a0590d4 Mon Sep 17 00:00:00 2001 From: Olivier Hallot Date: Sat, 6 Oct 2012 23:04:07 -0300 Subject: [PATCH 557/863] OUString cleanup in Chart2 Include C2U macro and rtl prefix Change-Id: I01c3224bc21a7f8a03a8562191fbc161032f2a1d --- .../controller/dialogs/res_ErrorBar.cxx | 10 +++++----- .../controller/dialogs/res_LegendPosition.cxx | 12 +++++------ .../controller/dialogs/res_TextSeparator.cxx | 18 ++++++++--------- .../controller/dialogs/res_TextSeparator.hxx | 6 +++--- .../dialogs/tp_3D_SceneAppearance.cxx | 4 ++-- .../dialogs/tp_3D_SceneGeometry.cxx | 10 +++++----- .../controller/dialogs/tp_ChartType.cxx | 6 +++--- .../controller/dialogs/tp_DataSource.cxx | 20 +++++++++---------- 8 files changed, 43 insertions(+), 43 deletions(-) diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx index ba613209d71c..377c7dd282af 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar.cxx +++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx @@ -191,7 +191,7 @@ void ErrorBarResources::SetChartDocumentForRangeChoosing( { try { - xProps->getPropertyValue( C2U( "DisableDataTableDialog" ) ) >>= m_bDisableDataTableDialog; + xProps->getPropertyValue( "DisableDataTableDialog" ) >>= m_bDisableDataTableDialog; } catch( const uno::Exception& e ) { @@ -455,7 +455,7 @@ IMPL_LINK( ErrorBarResources, ChooseRange, RangeSelectionButton *, pButton ) return 0; OSL_ASSERT( m_pCurrentRangeChoosingField == 0 ); - ::rtl::OUString aUIString; + OUString aUIString; if( pButton == &m_aIbRangePositive ) { m_pCurrentRangeChoosingField = &m_aEdRangePositive; @@ -697,14 +697,14 @@ void ErrorBarResources::FillValueSets() } void ErrorBarResources::listeningFinished( - const ::rtl::OUString & rNewRange ) + const OUString & rNewRange ) { OSL_ASSERT( m_apRangeSelectionHelper.get()); if( ! m_apRangeSelectionHelper.get()) return; // rNewRange becomes invalid after removing the listener - ::rtl::OUString aRange( rNewRange ); + OUString aRange( rNewRange ); // stop listening m_apRangeSelectionHelper->stopRangeListening(); @@ -740,7 +740,7 @@ void ErrorBarResources::disposingRangeSelection() bool ErrorBarResources::isRangeFieldContentValid( Edit & rEdit ) { - ::rtl::OUString aRange( rEdit.GetText()); + OUString aRange( rEdit.GetText()); bool bIsValid = ( aRange.isEmpty() ) || ( m_apRangeSelectionHelper.get() && m_apRangeSelectionHelper->verifyCellRange( aRange )); diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx index c08bdd761eb1..0760a8bf01c5 100644 --- a/chart2/source/controller/dialogs/res_LegendPosition.cxx +++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx @@ -95,13 +95,13 @@ void LegendPositionResources::writeToResources( const uno::Reference< frame::XMo { //show sal_Bool bShowLegend = sal_False; - xProp->getPropertyValue( C2U("Show") ) >>= bShowLegend; + xProp->getPropertyValue( "Show" ) >>= bShowLegend; m_aCbxShow.Check( bShowLegend ); PositionEnableHdl(0); //position chart2::LegendPosition ePos; - xProp->getPropertyValue( C2U( "AnchorPosition" )) >>= ePos; + xProp->getPropertyValue( "AnchorPosition" ) >>= ePos; switch( ePos ) { case chart2::LegendPosition_LINE_START: @@ -139,7 +139,7 @@ void LegendPositionResources::writeToModel( const ::com::sun::star::uno::Referen if( xProp.is() ) { //show - xProp->setPropertyValue( C2U("Show"), uno::makeAny( bShowLegend )); + xProp->setPropertyValue( "Show" , uno::makeAny( bShowLegend )); //position chart2::LegendPosition eNewPos; @@ -162,9 +162,9 @@ void LegendPositionResources::writeToModel( const ::com::sun::star::uno::Referen eExp = ::com::sun::star::chart::ChartLegendExpansion_WIDE; } - xProp->setPropertyValue( C2U( "AnchorPosition" ), uno::makeAny( eNewPos )); - xProp->setPropertyValue( C2U( "Expansion" ), uno::makeAny( eExp )); - xProp->setPropertyValue( C2U( "RelativePosition" ), uno::Any()); + xProp->setPropertyValue( "AnchorPosition" , uno::makeAny( eNewPos )); + xProp->setPropertyValue( "Expansion" , uno::makeAny( eExp )); + xProp->setPropertyValue( "RelativePosition" , uno::Any()); } } catch( const uno::Exception & ex ) diff --git a/chart2/source/controller/dialogs/res_TextSeparator.cxx b/chart2/source/controller/dialogs/res_TextSeparator.cxx index 5ebc89b76b40..9b7fc8ce3a65 100644 --- a/chart2/source/controller/dialogs/res_TextSeparator.cxx +++ b/chart2/source/controller/dialogs/res_TextSeparator.cxx @@ -43,10 +43,10 @@ TextSeparatorResources::TextSeparatorResources( Window* pWindow ) m_aLB_Separator.SetDropDownLineCount(m_aLB_Separator.GetEntryCount()); m_aLB_Separator.SetSizePixel( m_aLB_Separator.CalcMinimumSize() ); - m_aEntryMap[ C2U( " " ) ] = 0; - m_aEntryMap[ C2U( ", " ) ] = 1; - m_aEntryMap[ C2U( "; " ) ] = 2; - m_aEntryMap[ C2U( "\n" ) ] = 3; + m_aEntryMap[ " " ] = 0; + m_aEntryMap[ ", " ] = 1; + m_aEntryMap[ "; " ] = 2; + m_aEntryMap[ "\n" ] = 3; m_aLB_Separator.SetAccessibleName(m_aFT_Separator.GetText()); m_aLB_Separator.SetAccessibleRelationLabeledBy(&m_aFT_Separator); @@ -113,9 +113,9 @@ Size TextSeparatorResources::GetCurrentListBoxSize() const return m_aLB_Separator.GetSizePixel(); } -void TextSeparatorResources::SetValue( const rtl::OUString& rSeparator ) +void TextSeparatorResources::SetValue( const OUString& rSeparator ) { - ::std::map< ::rtl::OUString, sal_uInt16 >::iterator aIter( m_aEntryMap.find(rSeparator) ); + ::std::map< OUString , sal_uInt16 >::iterator aIter( m_aEntryMap.find(rSeparator) ); if( aIter == m_aEntryMap.end() ) m_aLB_Separator.SelectEntryPos( m_nDefaultPos ); else @@ -127,17 +127,17 @@ void TextSeparatorResources::SetDefault() m_aLB_Separator.SelectEntryPos( m_nDefaultPos ); } -rtl::OUString TextSeparatorResources::GetValue() const + OUString TextSeparatorResources::GetValue() const { sal_uInt16 nPos = m_aLB_Separator.GetSelectEntryPos(); - ::std::map< ::rtl::OUString, sal_uInt16 >::const_iterator aIter( m_aEntryMap.begin() ); + ::std::map< OUString , sal_uInt16 >::const_iterator aIter( m_aEntryMap.begin() ); while( aIter != m_aEntryMap.end() ) { if(aIter->second==nPos ) return aIter->first; ++aIter; } - return C2U( " " ); + return OUString( " " ); } //............................................................................. diff --git a/chart2/source/controller/dialogs/res_TextSeparator.hxx b/chart2/source/controller/dialogs/res_TextSeparator.hxx index 9d6121c07ef8..9f89dcca7927 100644 --- a/chart2/source/controller/dialogs/res_TextSeparator.hxx +++ b/chart2/source/controller/dialogs/res_TextSeparator.hxx @@ -47,15 +47,15 @@ public: Point GetCurrentListBoxPosition() const; Size GetCurrentListBoxSize() const; - ::rtl::OUString GetValue() const; - void SetValue( const ::rtl::OUString& rSeparator ); + OUString GetValue() const; + void SetValue( const OUString& rSeparator ); void SetDefault(); private: FixedText m_aFT_Separator; ListBox m_aLB_Separator; - ::std::map< ::rtl::OUString, sal_uInt16 > m_aEntryMap; + ::std::map< OUString, sal_uInt16 > m_aEntryMap; const sal_uInt16 m_nDefaultPos; }; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx index 0e05e503f63c..4c3fd3c31c22 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx @@ -55,7 +55,7 @@ lcl_ModelProperties lcl_getPropertiesFromModel( uno::Reference< frame::XModel > { uno::Reference< chart2::XDiagram > xDiagram( ::chart::ChartModelHelper::findDiagram( xModel ) ); uno::Reference< beans::XPropertySet > xDiaProp( xDiagram, uno::UNO_QUERY_THROW ); - xDiaProp->getPropertyValue( C2U("D3DSceneShadeMode")) >>= aProps.m_aShadeMode; + xDiaProp->getPropertyValue( "D3DSceneShadeMode" ) >>= aProps.m_aShadeMode; ::chart::ThreeDHelper::getRoundedEdgesAndObjectLines( xDiagram, aProps.m_nRoundedEdges, aProps.m_nObjectLines ); aProps.m_eScheme = ::chart::ThreeDHelper::detectScheme( xDiagram ); } @@ -72,7 +72,7 @@ void lcl_setShadeModeAtModel( uno::Reference< frame::XModel > & xModel, drawing: { uno::Reference< beans::XPropertySet > xDiaProp( ::chart::ChartModelHelper::findDiagram( xModel ), uno::UNO_QUERY_THROW ); - xDiaProp->setPropertyValue( C2U("D3DSceneShadeMode"), uno::makeAny( aShadeMode )); + xDiaProp->setPropertyValue( "D3DSceneShadeMode" , uno::makeAny( aShadeMode )); } catch( const uno::Exception & ex ) { diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx index bcd4c1bf34be..0fe8ac881125 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx @@ -122,12 +122,12 @@ ThreeD_SceneGeometry_TabPage::ThreeD_SceneGeometry_TabPage( Window* pWindow m_aMFZRotation.SetModifyHdl( aAngleEditedLink ); drawing::ProjectionMode aProjectionMode = drawing::ProjectionMode_PERSPECTIVE; - m_xSceneProperties->getPropertyValue( C2U("D3DScenePerspective")) >>= aProjectionMode; + m_xSceneProperties->getPropertyValue( "D3DScenePerspective" ) >>= aProjectionMode; m_aCbxPerspective.Check( aProjectionMode == drawing::ProjectionMode_PERSPECTIVE ); m_aCbxPerspective.SetToggleHdl( LINK( this, ThreeD_SceneGeometry_TabPage, PerspectiveToggled )); sal_Int32 nPerspectivePercentage = 20; - m_xSceneProperties->getPropertyValue( C2U("Perspective")) >>= nPerspectivePercentage; + m_xSceneProperties->getPropertyValue( "Perspective" ) >>= nPerspectivePercentage; m_aMFPerspective.SetValue( nPerspectivePercentage ); m_aMFPerspective.EnableUpdateData( nTimeout ); @@ -143,7 +143,7 @@ ThreeD_SceneGeometry_TabPage::ThreeD_SceneGeometry_TabPage( Window* pWindow if( ChartTypeHelper::isSupportingRightAngledAxes( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ) ) { - m_xSceneProperties->getPropertyValue( C2U("RightAngledAxes")) >>= bRightAngledAxes; + m_xSceneProperties->getPropertyValue( "RightAngledAxes" ) >>= bRightAngledAxes; m_aCbxRightAngledAxes.SetToggleHdl( LINK( this, ThreeD_SceneGeometry_TabPage, RightAngledAxesToggled )); m_aCbxRightAngledAxes.Check( bRightAngledAxes ); } @@ -216,8 +216,8 @@ void ThreeD_SceneGeometry_TabPage::applyPerspectiveToModel() try { - m_xSceneProperties->setPropertyValue( C2U("D3DScenePerspective"), uno::makeAny( aMode )); - m_xSceneProperties->setPropertyValue( C2U("Perspective"), uno::makeAny( (sal_Int32)m_aMFPerspective.GetValue() )); + m_xSceneProperties->setPropertyValue( "D3DScenePerspective" , uno::makeAny( aMode )); + m_xSceneProperties->setPropertyValue( "Perspective" , uno::makeAny( (sal_Int32)m_aMFPerspective.GetValue() )); } catch( const uno::Exception & ex ) { diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index 6884e67bb58c..7ab0e5444a7b 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -59,7 +59,7 @@ namespace try { uno::Reference< beans::XPropertySet > xDiaProp( xChartDoc->getFirstDiagram(), uno::UNO_QUERY_THROW ); - xDiaProp->getPropertyValue( C2U( "SortByXValues" ) ) >>= bRet; + xDiaProp->getPropertyValue( "SortByXValues" ) >>= bRet; } catch( const uno::Exception & ex ) { @@ -840,7 +840,7 @@ ChartTypeTabPage::ChartTypeTabPage( Window* pParent { try { - xProps->getPropertyValue( C2U( "DisableComplexChartTypes" ) ) >>= bDisableComplexChartTypes; + xProps->getPropertyValue( "DisableComplexChartTypes" ) >>= bDisableComplexChartTypes; } catch( const uno::Exception& e ) { @@ -1089,7 +1089,7 @@ void ChartTypeTabPage::initializePage() uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xModel ) ); DiagramHelper::tTemplateWithServiceName aTemplate = DiagramHelper::getTemplateForDiagram( xDiagram, xTemplateManager ); - ::rtl::OUString aServiceName( aTemplate.second ); + OUString aServiceName( aTemplate.second ); bool bFound = false; diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index e0fb150eda8e..080ad76c8f24 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -58,7 +58,7 @@ using ::rtl::OUStringBuffer; namespace { -const OUString lcl_aLabelRole( RTL_CONSTASCII_USTRINGPARAM( "label" )); +const OUString lcl_aLabelRole( "label" ); String lcl_GetRoleLBEntry( const OUString & rRole, const OUString & rRange ) @@ -124,7 +124,7 @@ OUString lcl_GetSelectedRolesRange( const SvTabListBox & rRoleListBox ) OUString lcl_GetSequenceNameForLabel( ::chart::SeriesEntry * pEntry ) { - OUString aResult( RTL_CONSTASCII_USTRINGPARAM("values-y")); + OUString aResult( "values-y" ); if( pEntry && pEntry->m_xChartType.is()) { @@ -477,7 +477,7 @@ void DataSourceTabPage::fillSeriesListBox() OUString aResString( String( ::chart::SchResId( STR_DATA_UNNAMED_SERIES_WITH_INDEX ))); // replace index of unnamed series - const OUString aReplacementStr( RTL_CONSTASCII_USTRINGPARAM( "%NUMBER" )); + const OUString aReplacementStr( "%NUMBER" ); sal_Int32 nIndex = aResString.indexOf( aReplacementStr ); if( nIndex != -1 ) aLabel = String( aResString.replaceAt( @@ -609,7 +609,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, RoleSelectionChangedHdl) OUString aSelectedRange = lcl_GetSelectedRolesRange( m_aLB_ROLE ); // replace role in fixed text label - const OUString aReplacementStr( RTL_CONSTASCII_USTRINGPARAM( "%VALUETYPE" )); + const OUString aReplacementStr( "%VALUETYPE" ); sal_Int32 nIndex = m_aFixedTextRange.indexOf( aReplacementStr ); if( nIndex != -1 ) { @@ -644,7 +644,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, MainRangeButtonClickedHdl) OUString aUIStr( aStr ); // replace role - OUString aReplacement( RTL_CONSTASCII_USTRINGPARAM( "%VALUETYPE" )); + OUString aReplacement( "%VALUETYPE" ); sal_Int32 nIndex = aUIStr.indexOf( aReplacement ); if( nIndex != -1 ) { @@ -652,7 +652,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, MainRangeButtonClickedHdl) lcl_GetSelectedRole( m_aLB_ROLE, true )); } // replace series name - aReplacement = C2U( "%SERIESNAME" ); + aReplacement = "%SERIESNAME"; nIndex = aUIStr.indexOf( aReplacement ); if( nIndex != -1 ) { @@ -936,7 +936,7 @@ bool DataSourceTabPage::updateModelFromControl( Edit * pField ) OUString aSelectedRole = lcl_GetSelectedRole( m_aLB_ROLE ); OUString aRange( m_aEDT_RANGE.GetText()); OUString aSequenceRole( aSelectedRole ); - bool bIsLabel = aSequenceRole.equals( lcl_aLabelRole ); + bool bIsLabel = (aSequenceRole == lcl_aLabelRole ); OUString aSequenceNameForLabel( lcl_GetSequenceNameForLabel( pSeriesEntry )); if( bIsLabel ) @@ -982,7 +982,7 @@ bool DataSourceTabPage::updateModelFromControl( Edit * pField ) // "$Sheet1.$A$1" aRange = xNewSeq->getSourceRangeRepresentation(); Reference< beans::XPropertySet > xProp( xNewSeq, uno::UNO_QUERY_THROW ); - xProp->setPropertyValue( C2U("Role"), uno::makeAny( lcl_aLabelRole )); + xProp->setPropertyValue( "Role" , uno::makeAny( lcl_aLabelRole )); xLabeledSeq->setLabel( xNewSeq ); } } @@ -1014,10 +1014,10 @@ bool DataSourceTabPage::updateModelFromControl( Edit * pField ) aRange = xNewSeq->getSourceRangeRepresentation(); Reference< beans::XPropertySet > xProp( xNewSeq, uno::UNO_QUERY_THROW ); - xProp->setPropertyValue( C2U("Role"), uno::makeAny( aSelectedRole )); + xProp->setPropertyValue( "Role" , uno::makeAny( aSelectedRole )); if( !xLabeledSeq.is()) { - if( aSelectedRole.equals( aSequenceNameForLabel )) + if( aSelectedRole == aSequenceNameForLabel ) xLabeledSeq.set( lcl_findLSequenceWithOnlyLabel( xSource )); if( ! xLabeledSeq.is()) { From 8f14c8a6115fb7c57203fa089b2383b858723932 Mon Sep 17 00:00:00 2001 From: Olivier Hallot Date: Sat, 6 Oct 2012 23:58:35 -0300 Subject: [PATCH 558/863] OUString cleanup in Chart2 Include C2U macro and rtl prefix Change-Id: If930f77179dbf24d43f10a344b68edcf968f7304 --- .../controller/dialogs/tp_RangeChooser.cxx | 14 +- .../controller/dialogs/tp_RangeChooser.hxx | 2 +- .../drawinglayer/DrawViewWrapper.cxx | 6 +- .../itemsetwrapper/AxisItemConverter.cxx | 56 +++---- .../CharacterPropertyItemConverter.cxx | 138 +++++++++--------- .../itemsetwrapper/DataPointItemConverter.cxx | 80 +++++----- .../itemsetwrapper/ErrorBarItemConverter.cxx | 35 ++--- .../GraphicPropertyItemConverter.cxx | 136 ++++++++--------- 8 files changed, 231 insertions(+), 236 deletions(-) diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx index 59f1efd8d948..1ce4107c2e64 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx @@ -252,12 +252,12 @@ void RangeChooserTabPage::changeDialogModelAccordingToControls() m_aRB_Columns.IsChecked(), bFirstCellAsLabel, bHasCategories ) ); // only if range is valid - if( m_aLastValidRangeString.equals( m_aED_Range.GetText())) + if( m_aLastValidRangeString.equals(m_aED_Range.GetText())) { m_rDialogModel.setTemplate( m_xCurrentChartTypeTemplate ); aArguments.realloc( aArguments.getLength() + 1 ); aArguments[aArguments.getLength() - 1] = - beans::PropertyValue( C2U("CellRangeRepresentation"), -1, + beans::PropertyValue( "CellRangeRepresentation" , -1, uno::makeAny( m_aLastValidRangeString ), beans::PropertyState_DIRECT_VALUE ); m_rDialogModel.setData( aArguments ); @@ -271,7 +271,7 @@ void RangeChooserTabPage::changeDialogModelAccordingToControls() bool RangeChooserTabPage::isValid() { - ::rtl::OUString aRange( m_aED_Range.GetText()); + OUString aRange( m_aED_Range.GetText()); sal_Bool bFirstCellAsLabel = ( m_aCB_FirstColumnAsLabel.IsChecked() && !m_aRB_Columns.IsChecked() ) || ( m_aCB_FirstRowAsLabel.IsChecked() && !m_aRB_Rows.IsChecked() ); sal_Bool bHasCategories = ( m_aCB_FirstColumnAsLabel.IsChecked() && m_aRB_Columns.IsChecked() ) @@ -352,9 +352,9 @@ IMPL_LINK_NOARG(RangeChooserTabPage, ControlChangedHdl) IMPL_LINK_NOARG(RangeChooserTabPage, ChooseRangeHdl) { - rtl::OUString aRange = m_aED_Range.GetText(); + OUString aRange = m_aED_Range.GetText(); // using assignment for broken gcc 3.3 - rtl::OUString aTitle = String( SchResId( STR_PAGE_DATA_RANGE ) ); + OUString aTitle = String( SchResId( STR_PAGE_DATA_RANGE ) ); lcl_enableRangeChoosing( true, m_pParentDialog ); m_rDialogModel.getRangeSelectionHelper()->chooseRange( aRange, aTitle, *this ); @@ -363,11 +363,11 @@ IMPL_LINK_NOARG(RangeChooserTabPage, ChooseRangeHdl) } -void RangeChooserTabPage::listeningFinished( const ::rtl::OUString & rNewRange ) +void RangeChooserTabPage::listeningFinished( const OUString & rNewRange ) { //user has selected a new range - rtl::OUString aRange( rNewRange ); + OUString aRange( rNewRange ); m_rDialogModel.startControllerLockTimer(); diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx index bb03ff03a521..2f0bc8d683bf 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx @@ -100,7 +100,7 @@ protected: //member ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > m_xDataProvider; - rtl::OUString m_aLastValidRangeString; + OUString m_aLastValidRangeString; ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartTypeTemplate > m_xCurrentChartTypeTemplate; ChartTypeTemplateProvider* m_pTemplateProvider; diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx index dc0de9a8e507..37e7b0a20746 100644 --- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx +++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx @@ -192,8 +192,8 @@ SdrObject* DrawViewWrapper::getHitObject( const Point& rPnt ) const if( pRet ) { //ignore some special shapes - rtl::OUString aShapeName = pRet->GetName(); - if( aShapeName.match(C2U("PlotAreaIncludingAxes")) || aShapeName.match(C2U("PlotAreaExcludingAxes")) ) + OUString aShapeName = pRet->GetName(); + if( aShapeName.match("PlotAreaIncludingAxes") || aShapeName.match("PlotAreaExcludingAxes") ) { pRet->SetMarkProtect( true ); return getHitObject( rPnt ); @@ -300,7 +300,7 @@ SfxItemSet DrawViewWrapper::getPositionAndSizeItemSetFromMarkedObject() const return aFullSet; } -SdrObject* DrawViewWrapper::getNamedSdrObject( const rtl::OUString& rName ) const +SdrObject* DrawViewWrapper::getNamedSdrObject( const OUString& rName ) const { if(rName.isEmpty()) return 0; diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx index 78fc46e35edf..e06643667b5b 100644 --- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx @@ -103,7 +103,7 @@ AxisItemConverter::AxisItemConverter( xNamedPropertyContainerFactory, GraphicPropertyItemConverter::LINE_PROPERTIES )); m_aConverters.push_back( new CharacterPropertyItemConverter( rPropertySet, rItemPool, pRefSize, - C2U( "ReferencePageSize" ) )); + "ReferencePageSize" )); m_xAxis.set( Reference< chart2::XAxis >( rPropertySet, uno::UNO_QUERY ) ); OSL_ASSERT( m_xAxis.is()); @@ -348,7 +348,7 @@ void AxisItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutI case SCHATTR_AXIS_POSITION: { ::com::sun::star::chart::ChartAxisPosition eAxisPos( ::com::sun::star::chart::ChartAxisPosition_ZERO ); - GetPropertySet()->getPropertyValue(C2U( "CrossoverPosition" )) >>= eAxisPos; + GetPropertySet()->getPropertyValue( "CrossoverPosition" ) >>= eAxisPos; rOutItemSet.Put( SfxInt32Item( nWhichId, eAxisPos ) ); } break; @@ -356,7 +356,7 @@ void AxisItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutI case SCHATTR_AXIS_POSITION_VALUE: { double fValue = 0.0; - if( GetPropertySet()->getPropertyValue(C2U( "CrossoverValue" )) >>= fValue ) + if( GetPropertySet()->getPropertyValue( "CrossoverValue" ) >>= fValue ) rOutItemSet.Put( SvxDoubleItem( fValue, nWhichId ) ); } break; @@ -381,7 +381,7 @@ void AxisItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutI case SCHATTR_AXIS_LABEL_POSITION: { ::com::sun::star::chart::ChartAxisLabelPosition ePos( ::com::sun::star::chart::ChartAxisLabelPosition_NEAR_AXIS ); - GetPropertySet()->getPropertyValue(C2U( "LabelPosition" )) >>= ePos; + GetPropertySet()->getPropertyValue( "LabelPosition" ) >>= ePos; rOutItemSet.Put( SfxInt32Item( nWhichId, ePos ) ); } break; @@ -389,7 +389,7 @@ void AxisItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutI case SCHATTR_AXIS_MARK_POSITION: { ::com::sun::star::chart::ChartAxisMarkPosition ePos( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS_AND_AXIS ); - GetPropertySet()->getPropertyValue(C2U( "MarkPosition" )) >>= ePos; + GetPropertySet()->getPropertyValue( "MarkPosition" ) >>= ePos; rOutItemSet.Put( SfxInt32Item( nWhichId, ePos ) ); } break; @@ -399,7 +399,7 @@ void AxisItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutI // convert double to int (times 100) double fVal = 0; - if( GetPropertySet()->getPropertyValue( C2U( "TextRotation" )) >>= fVal ) + if( GetPropertySet()->getPropertyValue( "TextRotation" ) >>= fVal ) { rOutItemSet.Put( SfxInt32Item( nWhichId, static_cast< sal_Int32 >( ::rtl::math::round( fVal * 100.0 ) ) )); @@ -425,7 +425,7 @@ void AxisItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutI case SID_ATTR_NUMBERFORMAT_SOURCE: { - bool bNumberFormatIsSet = ( GetPropertySet()->getPropertyValue( C2U( "NumberFormat" )).hasValue()); + bool bNumberFormatIsSet = ( GetPropertySet()->getPropertyValue( "NumberFormat" ).hasValue()); rOutItemSet.Put( SfxBoolItem( nWhichId, ! bNumberFormatIsSet )); } break; @@ -744,11 +744,11 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet double fValue = 0.0; if( aValue >>= fValue ) { - xCrossingMainAxis->setPropertyValue( C2U( "CrossoverPosition" ), uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_VALUE )); - xCrossingMainAxis->setPropertyValue( C2U( "CrossoverValue" ), uno::makeAny( fValue )); + xCrossingMainAxis->setPropertyValue( "CrossoverPosition" , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_VALUE )); + xCrossingMainAxis->setPropertyValue( "CrossoverValue" , uno::makeAny( fValue )); } else - xCrossingMainAxis->setPropertyValue( C2U( "CrossoverPosition" ), uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START )); + xCrossingMainAxis->setPropertyValue( "CrossoverPosition" , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START )); } } } @@ -764,11 +764,11 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet static_cast< const SfxInt32Item & >( rItemSet.Get( nWhichId )).GetValue(); ::com::sun::star::chart::ChartAxisPosition eOldAxisPos( ::com::sun::star::chart::ChartAxisPosition_ZERO ); - bool bPropExisted = ( GetPropertySet()->getPropertyValue(C2U( "CrossoverPosition" )) >>= eOldAxisPos ); + bool bPropExisted = ( GetPropertySet()->getPropertyValue( "CrossoverPosition" ) >>= eOldAxisPos ); if( !bPropExisted || ( eOldAxisPos != eAxisPos )) { - GetPropertySet()->setPropertyValue( C2U( "CrossoverPosition" ), uno::makeAny( eAxisPos )); + GetPropertySet()->setPropertyValue( "CrossoverPosition" , uno::makeAny( eAxisPos )); bChangedOtherwise = true; //move the parallel axes to the other side if necessary @@ -778,7 +778,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet if( xParallelAxis.is() ) { ::com::sun::star::chart::ChartAxisPosition eOtherPos; - if( xParallelAxis->getPropertyValue( C2U( "CrossoverPosition" ) ) >>= eOtherPos ) + if( xParallelAxis->getPropertyValue( "CrossoverPosition" ) >>= eOtherPos ) { if( eOtherPos == eAxisPos ) { @@ -786,7 +786,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet (eAxisPos==::com::sun::star::chart::ChartAxisPosition_START) ? ::com::sun::star::chart::ChartAxisPosition_END : ::com::sun::star::chart::ChartAxisPosition_START; - xParallelAxis->setPropertyValue( C2U( "CrossoverPosition" ), uno::makeAny( eOppositePos )); + xParallelAxis->setPropertyValue( "CrossoverPosition" , uno::makeAny( eOppositePos )); } } } @@ -800,11 +800,11 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet double fValue = static_cast< const SvxDoubleItem & >( rItemSet.Get( nWhichId )).GetValue(); double fOldValue = 0.0; - bool bPropExisted = ( GetPropertySet()->getPropertyValue(C2U( "CrossoverValue" )) >>= fOldValue ); + bool bPropExisted = ( GetPropertySet()->getPropertyValue( "CrossoverValue" ) >>= fOldValue ); if( !bPropExisted || ( fOldValue != fValue )) { - GetPropertySet()->setPropertyValue( C2U( "CrossoverValue" ), uno::makeAny( fValue )); + GetPropertySet()->setPropertyValue( "CrossoverValue" , uno::makeAny( fValue )); bChangedOtherwise = true; //keep old and new settings for axis positioning in sync somehow @@ -836,11 +836,11 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet static_cast< const SfxInt32Item & >( rItemSet.Get( nWhichId )).GetValue(); ::com::sun::star::chart::ChartAxisLabelPosition eOldPos( ::com::sun::star::chart::ChartAxisLabelPosition_NEAR_AXIS ); - bool bPropExisted = ( GetPropertySet()->getPropertyValue(C2U( "LabelPosition" )) >>= eOldPos ); + bool bPropExisted = ( GetPropertySet()->getPropertyValue( "LabelPosition" ) >>= eOldPos ); if( !bPropExisted || ( eOldPos != ePos )) { - GetPropertySet()->setPropertyValue( C2U( "LabelPosition" ), uno::makeAny( ePos )); + GetPropertySet()->setPropertyValue( "LabelPosition" , uno::makeAny( ePos )); bChangedOtherwise = true; //move the parallel axes to the other side if necessary @@ -850,7 +850,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet if( xParallelAxis.is() ) { ::com::sun::star::chart::ChartAxisLabelPosition eOtherPos; - if( xParallelAxis->getPropertyValue( C2U( "LabelPosition" ) ) >>= eOtherPos ) + if( xParallelAxis->getPropertyValue( "LabelPosition" ) >>= eOtherPos ) { if( eOtherPos == ePos ) { @@ -858,7 +858,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet (ePos==::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START) ? ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END : ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START; - xParallelAxis->setPropertyValue( C2U( "LabelPosition" ), uno::makeAny( eOppositePos )); + xParallelAxis->setPropertyValue( "LabelPosition" , uno::makeAny( eOppositePos )); } } } @@ -874,11 +874,11 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet static_cast< const SfxInt32Item & >( rItemSet.Get( nWhichId )).GetValue(); ::com::sun::star::chart::ChartAxisMarkPosition eOldPos( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS_AND_AXIS ); - bool bPropExisted = ( GetPropertySet()->getPropertyValue(C2U( "MarkPosition" )) >>= eOldPos ); + bool bPropExisted = ( GetPropertySet()->getPropertyValue( "MarkPosition" ) >>= eOldPos ); if( !bPropExisted || ( eOldPos != ePos )) { - GetPropertySet()->setPropertyValue( C2U( "MarkPosition" ), uno::makeAny( ePos )); + GetPropertySet()->setPropertyValue( "MarkPosition" , uno::makeAny( ePos )); bChangedOtherwise = true; } } @@ -892,12 +892,12 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet rItemSet.Get( nWhichId )).GetValue()) / 100.0; double fOldVal = 0.0; bool bPropExisted = - ( GetPropertySet()->getPropertyValue( C2U( "TextRotation" )) >>= fOldVal ); + ( GetPropertySet()->getPropertyValue( "TextRotation" ) >>= fOldVal ); if( ! bPropExisted || ( bPropExisted && fOldVal != fVal )) { - GetPropertySet()->setPropertyValue( C2U( "TextRotation" ), uno::makeAny( fVal )); + GetPropertySet()->setPropertyValue( "TextRotation" , uno::makeAny( fVal )); bChangedOtherwise = true; } } @@ -918,9 +918,9 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet rItemSet.Get( nWhichId )).GetValue()); aValue = uno::makeAny(nFmt); - if( GetPropertySet()->getPropertyValue( C2U( "NumberFormat" )) != aValue ) + if( GetPropertySet()->getPropertyValue( "NumberFormat" ) != aValue ) { - GetPropertySet()->setPropertyValue( C2U( "NumberFormat" ), aValue ); + GetPropertySet()->setPropertyValue( "NumberFormat" , aValue ); bChangedOtherwise = true; } } @@ -933,7 +933,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet bool bUseSourceFormat = (static_cast< const SfxBoolItem & >( rItemSet.Get( nWhichId )).GetValue() ); - bool bNumberFormatIsSet = ( GetPropertySet()->getPropertyValue( C2U( "NumberFormat" )).hasValue()); + bool bNumberFormatIsSet = ( GetPropertySet()->getPropertyValue( "NumberFormat").hasValue()); bChangedOtherwise = (bUseSourceFormat == bNumberFormatIsSet); if( bChangedOtherwise ) @@ -961,7 +961,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet } } // else set a void Any - GetPropertySet()->setPropertyValue( C2U( "NumberFormat" ), aValue ); + GetPropertySet()->setPropertyValue( "NumberFormat" , aValue ); } } break; diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx index 97881cec2aee..1550998294ae 100644 --- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx @@ -82,7 +82,7 @@ CharacterPropertyItemConverter::CharacterPropertyItemConverter( const uno::Reference< beans::XPropertySet > & rPropertySet, SfxItemPool& rItemPool, ::std::auto_ptr< awt::Size > pRefSize, - const ::rtl::OUString & rRefSizePropertyName, + const OUString & rRefSizePropertyName, const uno::Reference< beans::XPropertySet > & rRefSizePropSet ) : ItemConverter( rPropertySet, rItemPool ), m_pRefSize( pRefSize ), @@ -121,23 +121,23 @@ void CharacterPropertyItemConverter::FillSpecialItem( case EE_CHAR_FONTINFO_CJK: case EE_CHAR_FONTINFO_CTL: { - ::rtl::OUString aPostfix; + OUString aPostfix; if( nWhichId == EE_CHAR_FONTINFO_CJK ) - aPostfix = C2U( "Asian" ); + aPostfix = "Asian"; else if( nWhichId == EE_CHAR_FONTINFO_CTL ) - aPostfix = C2U( "Complex" ); + aPostfix = "Complex"; SvxFontItem aItem( nWhichId ); - aItem.PutValue( GetPropertySet()->getPropertyValue( C2U( "CharFontName" ) + aPostfix), + aItem.PutValue( GetPropertySet()->getPropertyValue( "CharFontName" + aPostfix), MID_FONT_FAMILY_NAME ); - aItem.PutValue( GetPropertySet()->getPropertyValue( C2U( "CharFontFamily" ) + aPostfix), + aItem.PutValue( GetPropertySet()->getPropertyValue( "CharFontFamily" + aPostfix), MID_FONT_FAMILY ); - aItem.PutValue( GetPropertySet()->getPropertyValue( C2U( "CharFontStyleName" ) + aPostfix), + aItem.PutValue( GetPropertySet()->getPropertyValue( "CharFontStyleName" + aPostfix), MID_FONT_STYLE_NAME ); - aItem.PutValue( GetPropertySet()->getPropertyValue( C2U( "CharFontCharSet" ) + aPostfix), + aItem.PutValue( GetPropertySet()->getPropertyValue( "CharFontCharSet" + aPostfix), MID_FONT_CHAR_SET ); - aItem.PutValue( GetPropertySet()->getPropertyValue( C2U( "CharFontPitch" ) + aPostfix), + aItem.PutValue( GetPropertySet()->getPropertyValue( "CharFontPitch" + aPostfix), MID_FONT_PITCH ); rOutItemSet.Put( aItem ); @@ -149,14 +149,14 @@ void CharacterPropertyItemConverter::FillSpecialItem( SvxUnderlineItem aItem(UNDERLINE_NONE, EE_CHAR_UNDERLINE); bool bModified = false; - uno::Any aValue( GetPropertySet()->getPropertyValue( C2U( "CharUnderline" ))); + uno::Any aValue( GetPropertySet()->getPropertyValue( "CharUnderline" )); if( aValue.hasValue()) { aItem.PutValue( aValue, MID_TL_STYLE ); bModified = true; } - aValue = GetPropertySet()->getPropertyValue( C2U( "CharUnderlineHasColor" )); + aValue = GetPropertySet()->getPropertyValue( "CharUnderlineHasColor" ); if( aValue.hasValue() && ( *reinterpret_cast< const sal_Bool * >( aValue.getValue()) != sal_False )) { @@ -164,7 +164,7 @@ void CharacterPropertyItemConverter::FillSpecialItem( bModified = true; } - aValue = GetPropertySet()->getPropertyValue( C2U( "CharUnderlineColor" )); + aValue = GetPropertySet()->getPropertyValue( "CharUnderlineColor" ); if( aValue.hasValue()) { aItem.PutValue( aValue, MID_TL_COLOR ); @@ -181,14 +181,14 @@ void CharacterPropertyItemConverter::FillSpecialItem( SvxOverlineItem aItem( UNDERLINE_NONE, EE_CHAR_OVERLINE ); bool bModified = false; - uno::Any aValue( GetPropertySet()->getPropertyValue( C2U( "CharOverline" ) ) ); + uno::Any aValue( GetPropertySet()->getPropertyValue( "CharOverline" ) ); if ( aValue.hasValue() ) { aItem.PutValue( aValue, MID_TL_STYLE ); bModified = true; } - aValue = GetPropertySet()->getPropertyValue( C2U( "CharOverlineHasColor" ) ); + aValue = GetPropertySet()->getPropertyValue( "CharOverlineHasColor" ); if ( aValue.hasValue() && ( *reinterpret_cast< const sal_Bool* >( aValue.getValue() ) != sal_False ) ) { @@ -196,7 +196,7 @@ void CharacterPropertyItemConverter::FillSpecialItem( bModified = true; } - aValue = GetPropertySet()->getPropertyValue( C2U( "CharOverlineColor" ) ); + aValue = GetPropertySet()->getPropertyValue( "CharOverlineColor" ); if ( aValue.hasValue() ) { aItem.PutValue( aValue, MID_TL_COLOR ); @@ -214,15 +214,15 @@ void CharacterPropertyItemConverter::FillSpecialItem( case EE_CHAR_ITALIC_CJK: case EE_CHAR_ITALIC_CTL: { - ::rtl::OUString aPostfix; + OUString aPostfix; if( nWhichId == EE_CHAR_ITALIC_CJK ) - aPostfix = C2U( "Asian" ); + aPostfix = "Asian"; else if( nWhichId == EE_CHAR_ITALIC_CTL ) - aPostfix = C2U( "Complex" ); + aPostfix = "Complex"; SvxPostureItem aItem( ITALIC_NONE, nWhichId ); - uno::Any aValue( GetPropertySet()->getPropertyValue( C2U( "CharPosture" ) + aPostfix)); + uno::Any aValue( GetPropertySet()->getPropertyValue( "CharPosture" + aPostfix)); if( aValue.hasValue()) { aItem.PutValue( aValue, MID_POSTURE ); @@ -235,15 +235,15 @@ void CharacterPropertyItemConverter::FillSpecialItem( case EE_CHAR_WEIGHT_CJK: case EE_CHAR_WEIGHT_CTL: { - ::rtl::OUString aPostfix; + OUString aPostfix; if( nWhichId == EE_CHAR_WEIGHT_CJK ) - aPostfix = C2U( "Asian" ); + aPostfix = "Asian"; else if( nWhichId == EE_CHAR_WEIGHT_CTL ) - aPostfix = C2U( "Complex" ); + aPostfix = "Complex"; SvxWeightItem aItem( WEIGHT_NORMAL, nWhichId ); - uno::Any aValue( GetPropertySet()->getPropertyValue( C2U( "CharWeight" ) + aPostfix)); + uno::Any aValue( GetPropertySet()->getPropertyValue( "CharWeight" + aPostfix)); if( aValue.hasValue()) { aItem.PutValue( aValue, MID_WEIGHT ); @@ -256,17 +256,17 @@ void CharacterPropertyItemConverter::FillSpecialItem( case EE_CHAR_FONTHEIGHT_CJK: case EE_CHAR_FONTHEIGHT_CTL: { - ::rtl::OUString aPostfix; + OUString aPostfix; if( nWhichId == EE_CHAR_FONTHEIGHT_CJK ) - aPostfix = C2U( "Asian" ); + aPostfix = "Asian"; else if( nWhichId == EE_CHAR_FONTHEIGHT_CTL ) - aPostfix = C2U( "Complex" ); + aPostfix = "Complex"; SvxFontHeightItem aItem( 240, 100, nWhichId ); try { - uno::Any aValue( GetPropertySet()->getPropertyValue( C2U( "CharHeight" ) + aPostfix )); + uno::Any aValue( GetPropertySet()->getPropertyValue( "CharHeight" + aPostfix )); float fHeight; if( aValue >>= fHeight ) { @@ -298,11 +298,11 @@ void CharacterPropertyItemConverter::FillSpecialItem( uno::Reference< chart2::XFormattedString > xFormattedString( GetPropertySet(), uno::UNO_QUERY ); if( xFormattedString.is() ) { - ::rtl::OUString aString = xFormattedString->getString(); + OUString aString = xFormattedString->getString(); rOutItemSet.Put( SfxStringItem( nWhichId, aString ) ); } else - rOutItemSet.Put( SfxStringItem( nWhichId, C2U( "" ) ) ); + rOutItemSet.Put( SfxStringItem( nWhichId, OUString("") ) ); } break; @@ -326,11 +326,11 @@ bool CharacterPropertyItemConverter::ApplySpecialItem( case EE_CHAR_FONTINFO_CJK: case EE_CHAR_FONTINFO_CTL: { - ::rtl::OUString aPostfix; + OUString aPostfix; if( nWhichId == EE_CHAR_FONTINFO_CJK ) - aPostfix = C2U( "Asian" ); + aPostfix = "Asian"; else if( nWhichId == EE_CHAR_FONTINFO_CTL ) - aPostfix = C2U( "Complex" ); + aPostfix = "Complex"; const SvxFontItem & rItem = static_cast< const SvxFontItem & >( @@ -338,41 +338,41 @@ bool CharacterPropertyItemConverter::ApplySpecialItem( if( rItem.QueryValue( aValue, MID_FONT_FAMILY_NAME )) { - if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharFontName" ) + aPostfix )) + if( aValue != GetPropertySet()->getPropertyValue( "CharFontName" + aPostfix )) { - GetPropertySet()->setPropertyValue( C2U( "CharFontName" ) + aPostfix, aValue ); + GetPropertySet()->setPropertyValue( "CharFontName" + aPostfix, aValue ); bChanged = true; } } if( rItem.QueryValue( aValue, MID_FONT_FAMILY )) { - if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharFontFamily" ) + aPostfix )) + if( aValue != GetPropertySet()->getPropertyValue( "CharFontFamily" + aPostfix )) { - GetPropertySet()->setPropertyValue( C2U( "CharFontFamily" ) + aPostfix, aValue ); + GetPropertySet()->setPropertyValue( "CharFontFamily" + aPostfix, aValue ); bChanged = true; } } if( rItem.QueryValue( aValue, MID_FONT_STYLE_NAME )) { - if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharFontStyleName" ) + aPostfix )) + if( aValue != GetPropertySet()->getPropertyValue( "CharFontStyleName" + aPostfix )) { - GetPropertySet()->setPropertyValue( C2U( "CharFontStyleName" ) + aPostfix, aValue ); + GetPropertySet()->setPropertyValue( "CharFontStyleName" + aPostfix, aValue ); bChanged = true; } } if( rItem.QueryValue( aValue, MID_FONT_CHAR_SET )) { - if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharFontCharSet" ) + aPostfix )) + if( aValue != GetPropertySet()->getPropertyValue( "CharFontCharSet" + aPostfix )) { - GetPropertySet()->setPropertyValue( C2U( "CharFontCharSet" ) + aPostfix, aValue ); + GetPropertySet()->setPropertyValue( "CharFontCharSet" + aPostfix, aValue ); bChanged = true; } } if( rItem.QueryValue( aValue, MID_FONT_PITCH )) { - if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharFontPitch" ) + aPostfix )) + if( aValue != GetPropertySet()->getPropertyValue( "CharFontPitch" + aPostfix )) { - GetPropertySet()->setPropertyValue( C2U( "CharFontPitch" ) + aPostfix, aValue ); + GetPropertySet()->setPropertyValue( "CharFontPitch" + aPostfix, aValue ); bChanged = true; } } @@ -387,27 +387,27 @@ bool CharacterPropertyItemConverter::ApplySpecialItem( if( rItem.QueryValue( aValue, MID_TL_STYLE )) { - if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharUnderline" ) )) + if( aValue != GetPropertySet()->getPropertyValue( "CharUnderline" )) { - GetPropertySet()->setPropertyValue( C2U( "CharUnderline" ), aValue ); + GetPropertySet()->setPropertyValue( "CharUnderline" , aValue ); bChanged = true; } } if( rItem.QueryValue( aValue, MID_TL_COLOR )) { - if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharUnderlineColor" ) )) + if( aValue != GetPropertySet()->getPropertyValue( "CharUnderlineColor" )) { - GetPropertySet()->setPropertyValue( C2U( "CharUnderlineColor" ), aValue ); + GetPropertySet()->setPropertyValue( "CharUnderlineColor" , aValue ); bChanged = true; } } if( rItem.QueryValue( aValue, MID_TL_HASCOLOR )) { - if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharUnderlineHasColor" ) )) + if( aValue != GetPropertySet()->getPropertyValue( "CharUnderlineHasColor" )) { - GetPropertySet()->setPropertyValue( C2U( "CharUnderlineHasColor" ), aValue ); + GetPropertySet()->setPropertyValue( "CharUnderlineHasColor" , aValue ); bChanged = true; } } @@ -420,27 +420,27 @@ bool CharacterPropertyItemConverter::ApplySpecialItem( if ( rItem.QueryValue( aValue, MID_TL_STYLE ) ) { - if ( aValue != GetPropertySet()->getPropertyValue( C2U( "CharOverline" ) ) ) + if ( aValue != GetPropertySet()->getPropertyValue( "CharOverline" ) ) { - GetPropertySet()->setPropertyValue( C2U( "CharOverline" ), aValue ); + GetPropertySet()->setPropertyValue( "CharOverline" , aValue ); bChanged = true; } } if ( rItem.QueryValue( aValue, MID_TL_COLOR ) ) { - if ( aValue != GetPropertySet()->getPropertyValue( C2U( "CharOverlineColor" ) ) ) + if ( aValue != GetPropertySet()->getPropertyValue( "CharOverlineColor" ) ) { - GetPropertySet()->setPropertyValue( C2U( "CharOverlineColor" ), aValue ); + GetPropertySet()->setPropertyValue( "CharOverlineColor" , aValue ); bChanged = true; } } if ( rItem.QueryValue( aValue, MID_TL_HASCOLOR ) ) { - if ( aValue != GetPropertySet()->getPropertyValue( C2U( "CharOverlineHasColor" ) ) ) + if ( aValue != GetPropertySet()->getPropertyValue( "CharOverlineHasColor" ) ) { - GetPropertySet()->setPropertyValue( C2U( "CharOverlineHasColor" ), aValue ); + GetPropertySet()->setPropertyValue( "CharOverlineHasColor" , aValue ); bChanged = true; } } @@ -451,11 +451,11 @@ bool CharacterPropertyItemConverter::ApplySpecialItem( case EE_CHAR_ITALIC_CJK: case EE_CHAR_ITALIC_CTL: { - ::rtl::OUString aPostfix; + OUString aPostfix; if( nWhichId == EE_CHAR_ITALIC_CJK ) - aPostfix = C2U( "Asian" ); + aPostfix = "Asian"; else if( nWhichId == EE_CHAR_ITALIC_CTL ) - aPostfix = C2U( "Complex" ); + aPostfix = "Complex"; const SvxPostureItem & rItem = static_cast< const SvxPostureItem & >( @@ -463,9 +463,9 @@ bool CharacterPropertyItemConverter::ApplySpecialItem( if( rItem.QueryValue( aValue, MID_POSTURE )) { - if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharPosture" ) + aPostfix)) + if( aValue != GetPropertySet()->getPropertyValue( "CharPosture" + aPostfix)) { - GetPropertySet()->setPropertyValue( C2U( "CharPosture" ) + aPostfix, aValue ); + GetPropertySet()->setPropertyValue( "CharPosture" + aPostfix, aValue ); bChanged = true; } } @@ -476,11 +476,11 @@ bool CharacterPropertyItemConverter::ApplySpecialItem( case EE_CHAR_WEIGHT_CJK: case EE_CHAR_WEIGHT_CTL: { - ::rtl::OUString aPostfix; + OUString aPostfix; if( nWhichId == EE_CHAR_WEIGHT_CJK ) - aPostfix = C2U( "Asian" ); + aPostfix = "Asian" ; else if( nWhichId == EE_CHAR_WEIGHT_CTL ) - aPostfix = C2U( "Complex" ); + aPostfix = "Complex"; const SvxWeightItem & rItem = static_cast< const SvxWeightItem & >( @@ -488,9 +488,9 @@ bool CharacterPropertyItemConverter::ApplySpecialItem( if( rItem.QueryValue( aValue, MID_WEIGHT )) { - if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharWeight" ) + aPostfix)) + if( aValue != GetPropertySet()->getPropertyValue( "CharWeight" + aPostfix)) { - GetPropertySet()->setPropertyValue( C2U( "CharWeight" ) + aPostfix, aValue ); + GetPropertySet()->setPropertyValue( "CharWeight" + aPostfix, aValue ); bChanged = true; } } @@ -501,11 +501,11 @@ bool CharacterPropertyItemConverter::ApplySpecialItem( case EE_CHAR_FONTHEIGHT_CJK: case EE_CHAR_FONTHEIGHT_CTL: { - ::rtl::OUString aPostfix; + OUString aPostfix; if( nWhichId == EE_CHAR_FONTHEIGHT_CJK ) - aPostfix = C2U( "Asian" ); + aPostfix = "Asian"; else if( nWhichId == EE_CHAR_FONTHEIGHT_CTL ) - aPostfix = C2U( "Complex" ); + aPostfix = "Complex"; const SvxFontHeightItem & rItem = static_cast< const SvxFontHeightItem & >( @@ -516,7 +516,7 @@ bool CharacterPropertyItemConverter::ApplySpecialItem( if( rItem.QueryValue( aValue, MID_FONTHEIGHT ) ) { bool bSetValue = false; - if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharHeight" ) + aPostfix )) + if( aValue != GetPropertySet()->getPropertyValue( "CharHeight" + aPostfix )) bSetValue = true; else { @@ -542,7 +542,7 @@ bool CharacterPropertyItemConverter::ApplySpecialItem( uno::makeAny( *m_pRefSize )); } - GetPropertySet()->setPropertyValue( C2U( "CharHeight" ) + aPostfix, aValue ); + GetPropertySet()->setPropertyValue( "CharHeight" + aPostfix, aValue ); bChanged = true; } } diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx index 325e15a3eab8..148743e16177 100644 --- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx @@ -100,7 +100,7 @@ bool lcl_NumberFormatFromItemToPropertySet( sal_uInt16 nWhichId, const SfxItemSe bool bChanged = false; if( !xPropertySet.is() ) return bChanged; - rtl::OUString aPropertyName = (SID_ATTR_NUMBERFORMAT_VALUE==nWhichId) ? C2U( "NumberFormat" ) : C2U( "PercentageNumberFormat" ); + OUString aPropertyName = (SID_ATTR_NUMBERFORMAT_VALUE==nWhichId) ? OUString( "NumberFormat" ) : OUString( "PercentageNumberFormat" ); sal_uInt16 nSourceWhich = (SID_ATTR_NUMBERFORMAT_VALUE==nWhichId) ? SID_ATTR_NUMBERFORMAT_SOURCE : SCHATTR_PERCENT_NUMBERFORMAT_SOURCE; if( SFX_ITEM_SET != rItemSet.GetItemState( nSourceWhich ) ) @@ -147,7 +147,7 @@ bool lcl_UseSourceFormatFromItemToPropertySet( sal_uInt16 nWhichId, const SfxIte bool bChanged = false; if( !xPropertySet.is() ) return bChanged; - rtl::OUString aPropertyName = (SID_ATTR_NUMBERFORMAT_SOURCE==nWhichId) ? C2U( "NumberFormat" ) : C2U( "PercentageNumberFormat" ); + OUString aPropertyName = (SID_ATTR_NUMBERFORMAT_SOURCE==nWhichId) ? OUString( "NumberFormat" ) : OUString( "PercentageNumberFormat" ); sal_uInt16 nFormatWhich = (SID_ATTR_NUMBERFORMAT_SOURCE==nWhichId) ? SID_ATTR_NUMBERFORMAT_VALUE : SCHATTR_PERCENT_NUMBERFORMAT_VALUE; if( SFX_ITEM_SET != rItemSet.GetItemState( nWhichId ) ) @@ -227,8 +227,7 @@ DataPointItemConverter::DataPointItemConverter( { m_aConverters.push_back( new GraphicPropertyItemConverter( rPropertySet, rItemPool, rDrawModel, xNamedPropertyContainerFactory, eMapTo )); - m_aConverters.push_back( new CharacterPropertyItemConverter( rPropertySet, rItemPool, pRefSize, - C2U( "ReferencePageSize" ))); + m_aConverters.push_back( new CharacterPropertyItemConverter( rPropertySet, rItemPool, pRefSize, "ReferencePageSize")); if( bDataSeries ) { m_aConverters.push_back( new StatisticsItemConverter( xChartModel, rPropertySet, rItemPool )); @@ -315,7 +314,7 @@ bool DataPointItemConverter::ApplySpecialItem( { const SfxBoolItem & rItem = static_cast< const SfxBoolItem & >( rItemSet.Get( nWhichId )); - uno::Any aOldValue( GetPropertySet()->getPropertyValue( C2U( "Label" ) )); + uno::Any aOldValue( GetPropertySet()->getPropertyValue( "Label" )); chart2::DataPointLabel aLabel; if( aOldValue >>= aLabel ) { @@ -328,15 +327,15 @@ bool DataPointItemConverter::ApplySpecialItem( { Reference< chart2::XDataSeries > xSeries( GetPropertySet(), uno::UNO_QUERY); if( bOldValue != rValue || - DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, C2U( "Label" ), aOldValue ) ) + DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, "Label" , aOldValue ) ) { - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, C2U( "Label" ), uno::makeAny( aLabel ) ); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "Label" , uno::makeAny( aLabel ) ); bChanged = true; } } else if( bOldValue != rValue ) { - GetPropertySet()->setPropertyValue( C2U( "Label" ), uno::makeAny( aLabel )); + GetPropertySet()->setPropertyValue( "Label" , uno::makeAny( aLabel )); bChanged = true; } } @@ -359,24 +358,24 @@ bool DataPointItemConverter::ApplySpecialItem( case SCHATTR_DATADESCR_SEPARATOR: { - rtl::OUString aNewValue = static_cast< const SfxStringItem & >( rItemSet.Get( nWhichId )).GetValue(); - rtl::OUString aOldValue; + OUString aNewValue = static_cast< const SfxStringItem & >( rItemSet.Get( nWhichId )).GetValue(); + OUString aOldValue; try { - GetPropertySet()->getPropertyValue( C2U( "LabelSeparator" ) ) >>= aOldValue; + GetPropertySet()->getPropertyValue( "LabelSeparator" ) >>= aOldValue; if( m_bOverwriteLabelsForAttributedDataPointsAlso ) { Reference< chart2::XDataSeries > xSeries( GetPropertySet(), uno::UNO_QUERY); if( !aOldValue.equals(aNewValue) || - DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, C2U( "LabelSeparator" ), uno::makeAny( aOldValue ) ) ) + DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, "LabelSeparator" , uno::makeAny( aOldValue ) ) ) { - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, C2U( "LabelSeparator" ), uno::makeAny( aNewValue ) ); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "LabelSeparator" , uno::makeAny( aNewValue ) ); bChanged = true; } } else if( !aOldValue.equals(aNewValue) ) { - GetPropertySet()->setPropertyValue( C2U( "LabelSeparator" ), uno::makeAny( aNewValue )); + GetPropertySet()->setPropertyValue( "LabelSeparator" , uno::makeAny( aNewValue )); bChanged = true; } } @@ -394,7 +393,7 @@ bool DataPointItemConverter::ApplySpecialItem( { sal_Int32 nNew = static_cast< const SfxInt32Item & >( rItemSet.Get( nWhichId )).GetValue(); sal_Int32 nOld =0; - if( !(GetPropertySet()->getPropertyValue( C2U( "LabelPlacement" ) ) >>= nOld) ) + if( !(GetPropertySet()->getPropertyValue( "LabelPlacement" ) >>= nOld) ) { if( m_aAvailableLabelPlacements.getLength() ) nOld = m_aAvailableLabelPlacements[0]; @@ -403,15 +402,15 @@ bool DataPointItemConverter::ApplySpecialItem( { Reference< chart2::XDataSeries > xSeries( GetPropertySet(), uno::UNO_QUERY); if( nOld!=nNew || - DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, C2U( "LabelPlacement" ), uno::makeAny( nOld ) ) ) + DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, "LabelPlacement" , uno::makeAny( nOld ) ) ) { - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, C2U( "LabelPlacement" ), uno::makeAny( nNew ) ); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "LabelPlacement" , uno::makeAny( nNew ) ); bChanged = true; } } else if( nOld!=nNew ) { - GetPropertySet()->setPropertyValue( C2U( "LabelPlacement" ), uno::makeAny( nNew )); + GetPropertySet()->setPropertyValue( "LabelPlacement" , uno::makeAny( nNew )); bChanged = true; } } @@ -429,7 +428,7 @@ bool DataPointItemConverter::ApplySpecialItem( rItemSet.Get( nWhichId )).GetValue(); chart2::Symbol aSymbol; - GetPropertySet()->getPropertyValue( C2U( "Symbol" )) >>= aSymbol; + GetPropertySet()->getPropertyValue( "Symbol" ) >>= aSymbol; sal_Int32 nOldStyle = lcl_getSymbolStyleForSymbol( aSymbol ); if( nStyle != nOldStyle ) @@ -456,10 +455,9 @@ bool DataPointItemConverter::ApplySpecialItem( } if( bDeleteSymbol ) - GetPropertySet()->setPropertyValue( C2U( "Symbol" ), uno::Any()); + GetPropertySet()->setPropertyValue( "Symbol" , uno::Any()); else - GetPropertySet()->setPropertyValue( C2U( "Symbol" ), - uno::makeAny( aSymbol )); + GetPropertySet()->setPropertyValue( "Symbol" , uno::makeAny( aSymbol )); bChanged = true; } } @@ -471,14 +469,14 @@ bool DataPointItemConverter::ApplySpecialItem( rItemSet.Get( nWhichId )).GetSize(); chart2::Symbol aSymbol; - GetPropertySet()->getPropertyValue( C2U( "Symbol" )) >>= aSymbol; + GetPropertySet()->getPropertyValue( "Symbol" ) >>= aSymbol; if( aSize.getWidth() != aSymbol.Size.Width || aSize.getHeight() != aSymbol.Size.Height ) { aSymbol.Size.Width = aSize.getWidth(); aSymbol.Size.Height = aSize.getHeight(); - GetPropertySet()->setPropertyValue( C2U( "Symbol" ), uno::makeAny( aSymbol )); + GetPropertySet()->setPropertyValue( "Symbol" , uno::makeAny( aSymbol )); bChanged = true; } } @@ -497,11 +495,11 @@ bool DataPointItemConverter::ApplySpecialItem( { aXGraphicAny <<= xGraphic; chart2::Symbol aSymbol; - GetPropertySet()->getPropertyValue( C2U( "Symbol" )) >>= aSymbol; + GetPropertySet()->getPropertyValue( "Symbol" ) >>= aSymbol; if( aSymbol.Graphic != xGraphic ) { aSymbol.Graphic = xGraphic; - GetPropertySet()->setPropertyValue( C2U( "Symbol" ), uno::makeAny( aSymbol )); + GetPropertySet()->setPropertyValue( "Symbol" , uno::makeAny( aSymbol )); bChanged = true; } } @@ -516,12 +514,12 @@ bool DataPointItemConverter::ApplySpecialItem( rItemSet.Get( nWhichId )).GetValue()) / 100.0; double fOldValue = 0.0; bool bPropExisted = - ( GetPropertySet()->getPropertyValue( C2U( "TextRotation" )) >>= fOldValue ); + ( GetPropertySet()->getPropertyValue( "TextRotation" ) >>= fOldValue ); if( ! bPropExisted || ( bPropExisted && fOldValue != fValue )) { - GetPropertySet()->setPropertyValue( C2U( "TextRotation" ), uno::makeAny( fValue )); + GetPropertySet()->setPropertyValue( "TextRotation" , uno::makeAny( fValue )); bChanged = true; } } @@ -543,7 +541,7 @@ void DataPointItemConverter::FillSpecialItem( case SCHATTR_DATADESCR_SHOW_SYMBOL: { chart2::DataPointLabel aLabel; - if( GetPropertySet()->getPropertyValue( C2U( "Label" )) >>= aLabel ) + if( GetPropertySet()->getPropertyValue( "Label" ) >>= aLabel ) { sal_Bool bValue = (SCHATTR_DATADESCR_SHOW_NUMBER==nWhichId) ? aLabel.ShowNumber : ( (SCHATTR_DATADESCR_SHOW_PERCENTAGE==nWhichId) ? aLabel.ShowNumberInPercent : ( @@ -554,7 +552,7 @@ void DataPointItemConverter::FillSpecialItem( if( m_bOverwriteLabelsForAttributedDataPointsAlso ) { if( DataSeriesHelper::hasAttributedDataPointDifferentValue( - Reference< chart2::XDataSeries >( GetPropertySet(), uno::UNO_QUERY), C2U( "Label" ), uno::makeAny(aLabel) ) ) + Reference< chart2::XDataSeries >( GetPropertySet(), uno::UNO_QUERY), "Label" , uno::makeAny(aLabel) ) ) { rOutItemSet.InvalidateItem(nWhichId); } @@ -566,7 +564,7 @@ void DataPointItemConverter::FillSpecialItem( case SID_ATTR_NUMBERFORMAT_VALUE: { sal_Int32 nKey = 0; - if( !(GetPropertySet()->getPropertyValue( C2U( "NumberFormat" )) >>= nKey) ) + if( !(GetPropertySet()->getPropertyValue( "NumberFormat" ) >>= nKey) ) nKey = m_nNumberFormat; rOutItemSet.Put( SfxUInt32Item( nWhichId, nKey )); } @@ -575,7 +573,7 @@ void DataPointItemConverter::FillSpecialItem( case SCHATTR_PERCENT_NUMBERFORMAT_VALUE: { sal_Int32 nKey = 0; - if( !(GetPropertySet()->getPropertyValue( C2U( "PercentageNumberFormat" )) >>= nKey) ) + if( !(GetPropertySet()->getPropertyValue( "PercentageNumberFormat" ) >>= nKey) ) nKey = m_nPercentNumberFormat; rOutItemSet.Put( SfxUInt32Item( nWhichId, nKey )); } @@ -583,23 +581,23 @@ void DataPointItemConverter::FillSpecialItem( case SID_ATTR_NUMBERFORMAT_SOURCE: { - bool bNumberFormatIsSet = ( GetPropertySet()->getPropertyValue( C2U( "NumberFormat" )).hasValue()); + bool bNumberFormatIsSet = ( GetPropertySet()->getPropertyValue( "NumberFormat" ).hasValue()); rOutItemSet.Put( SfxBoolItem( nWhichId, ! bNumberFormatIsSet )); } break; case SCHATTR_PERCENT_NUMBERFORMAT_SOURCE: { - bool bNumberFormatIsSet = ( GetPropertySet()->getPropertyValue( C2U( "PercentageNumberFormat" )).hasValue()); + bool bNumberFormatIsSet = ( GetPropertySet()->getPropertyValue( "PercentageNumberFormat" ).hasValue()); rOutItemSet.Put( SfxBoolItem( nWhichId, ! bNumberFormatIsSet )); } break; case SCHATTR_DATADESCR_SEPARATOR: { - rtl::OUString aValue; + OUString aValue; try { - GetPropertySet()->getPropertyValue( C2U( "LabelSeparator" ) ) >>= aValue; + GetPropertySet()->getPropertyValue( "LabelSeparator" ) >>= aValue; rOutItemSet.Put( SfxStringItem( nWhichId, aValue )); } catch( const uno::Exception& e ) @@ -614,7 +612,7 @@ void DataPointItemConverter::FillSpecialItem( try { sal_Int32 nPlacement=0; - if( GetPropertySet()->getPropertyValue( C2U( "LabelPlacement" ) ) >>= nPlacement ) + if( GetPropertySet()->getPropertyValue( "LabelPlacement" ) >>= nPlacement ) rOutItemSet.Put( SfxInt32Item( nWhichId, nPlacement )); else if( m_aAvailableLabelPlacements.getLength() ) rOutItemSet.Put( SfxInt32Item( nWhichId, m_aAvailableLabelPlacements[0] )); @@ -641,7 +639,7 @@ void DataPointItemConverter::FillSpecialItem( case SCHATTR_STYLE_SYMBOL: { chart2::Symbol aSymbol; - if( GetPropertySet()->getPropertyValue( C2U( "Symbol" )) >>= aSymbol ) + if( GetPropertySet()->getPropertyValue( "Symbol" ) >>= aSymbol ) rOutItemSet.Put( SfxInt32Item( nWhichId, lcl_getSymbolStyleForSymbol( aSymbol ) )); } break; @@ -649,7 +647,7 @@ void DataPointItemConverter::FillSpecialItem( case SCHATTR_SYMBOL_SIZE: { chart2::Symbol aSymbol; - if( GetPropertySet()->getPropertyValue( C2U( "Symbol" )) >>= aSymbol ) + if( GetPropertySet()->getPropertyValue( "Symbol" ) >>= aSymbol ) rOutItemSet.Put( SvxSizeItem( nWhichId, Size( aSymbol.Size.Width, aSymbol.Size.Height ) )); } @@ -658,7 +656,7 @@ void DataPointItemConverter::FillSpecialItem( case SCHATTR_SYMBOL_BRUSH: { chart2::Symbol aSymbol; - if(( GetPropertySet()->getPropertyValue( C2U( "Symbol" )) >>= aSymbol ) + if(( GetPropertySet()->getPropertyValue( "Symbol" ) >>= aSymbol ) && aSymbol.Graphic.is() ) { rOutItemSet.Put( SvxBrushItem( Graphic( aSymbol.Graphic ), GPOS_MM, SCHATTR_SYMBOL_BRUSH )); @@ -670,7 +668,7 @@ void DataPointItemConverter::FillSpecialItem( { double fValue = 0; - if( GetPropertySet()->getPropertyValue( C2U( "TextRotation" )) >>= fValue ) + if( GetPropertySet()->getPropertyValue( "TextRotation" ) >>= fValue ) { rOutItemSet.Put( SfxInt32Item( nWhichId, static_cast< sal_Int32 >( ::rtl::math::round( fValue * 100.0 ) ) )); diff --git a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx index bba573378a3d..1848f25f7bbd 100644 --- a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx @@ -56,8 +56,8 @@ void lcl_getErrorValues( const uno::Reference< beans::XPropertySet > & xErrorBar try { - xErrorBarProp->getPropertyValue( C2U( "PositiveError" )) >>= rOutPosError; - xErrorBarProp->getPropertyValue( C2U( "NegativeError" )) >>= rOutNegError; + xErrorBarProp->getPropertyValue( "PositiveError" ) >>= rOutPosError; + xErrorBarProp->getPropertyValue( "NegativeError" ) >>= rOutNegError; } catch( const uno::Exception & ex ) { @@ -74,8 +74,8 @@ void lcl_getErrorIndicatorValues( try { - xErrorBarProp->getPropertyValue( C2U( "ShowPositiveError" )) >>= rOutShowPosError; - xErrorBarProp->getPropertyValue( C2U( "ShowNegativeError" )) >>= rOutShowNegError; + xErrorBarProp->getPropertyValue( "ShowPositiveError" ) >>= rOutShowPosError; + xErrorBarProp->getPropertyValue( "ShowNegativeError" ) >>= rOutShowNegError; } catch( const uno::Exception & ex ) { @@ -184,8 +184,7 @@ bool ErrorBarItemConverter::ApplySpecialItem( nStyle = ::com::sun::star::chart::ErrorBarStyle::FROM_DATA; break; } - xErrorBarProp->setPropertyValue( C2U( "ErrorBarStyle" ), - uno::makeAny( nStyle )); + xErrorBarProp->setPropertyValue( "ErrorBarStyle" , uno::makeAny( nStyle )); bChanged = true; } } @@ -194,7 +193,7 @@ bool ErrorBarItemConverter::ApplySpecialItem( case SCHATTR_STAT_PERCENT: case SCHATTR_STAT_BIGERROR: { - OSL_FAIL( "Deprectaed item" ); + OSL_FAIL( "Deprecated item" ); uno::Reference< beans::XPropertySet > xErrorBarProp( GetPropertySet()); double fValue = @@ -206,10 +205,8 @@ bool ErrorBarItemConverter::ApplySpecialItem( if( ! ( ::rtl::math::approxEqual( fPos, fValue ) && ::rtl::math::approxEqual( fNeg, fValue ))) { - xErrorBarProp->setPropertyValue( C2U( "PositiveError" ), - uno::makeAny( fValue )); - xErrorBarProp->setPropertyValue( C2U( "NegativeError" ), - uno::makeAny( fValue )); + xErrorBarProp->setPropertyValue( "PositiveError" , uno::makeAny( fValue )); + xErrorBarProp->setPropertyValue( "NegativeError" , uno::makeAny( fValue )); bChanged = true; } } @@ -225,7 +222,7 @@ bool ErrorBarItemConverter::ApplySpecialItem( if( ! ::rtl::math::approxEqual( fPos, fValue )) { - GetPropertySet()->setPropertyValue( C2U( "PositiveError" ), uno::makeAny( fValue )); + GetPropertySet()->setPropertyValue( "PositiveError" , uno::makeAny( fValue )); bChanged = true; } } @@ -243,7 +240,7 @@ bool ErrorBarItemConverter::ApplySpecialItem( if( ! ::rtl::math::approxEqual( fNeg, fValue )) { - xErrorBarProp->setPropertyValue( C2U( "NegativeError" ), uno::makeAny( fValue )); + xErrorBarProp->setPropertyValue( "NegativeError" , uno::makeAny( fValue )); bChanged = true; } } @@ -266,8 +263,8 @@ bool ErrorBarItemConverter::ApplySpecialItem( if( ( bShowPos != bNewIndPos || bShowNeg != bNewIndNeg )) { - xErrorBarProp->setPropertyValue( C2U( "ShowPositiveError" ), uno::makeAny( bNewIndPos )); - xErrorBarProp->setPropertyValue( C2U( "ShowNegativeError" ), uno::makeAny( bNewIndNeg )); + xErrorBarProp->setPropertyValue( "ShowPositiveError" , uno::makeAny( bNewIndPos )); + xErrorBarProp->setPropertyValue( "ShowNegativeError" , uno::makeAny( bNewIndNeg )); bChanged = true; } } @@ -288,7 +285,7 @@ bool ErrorBarItemConverter::ApplySpecialItem( xDataProvider.set( xChartDoc->getDataProvider()); if( xErrorBarSource.is() && xDataProvider.is()) { - ::rtl::OUString aNewRange( static_cast< const SfxStringItem & >( rItemSet.Get( nWhichId )).GetValue()); + OUString aNewRange( static_cast< const SfxStringItem & >( rItemSet.Get( nWhichId )).GetValue()); bool bApplyNewRange = false; bool bIsPositiveValue( nWhichId == SCHATTR_STAT_RANGE_POS ); @@ -307,7 +304,7 @@ bool ErrorBarItemConverter::ApplySpecialItem( if( xIntDataProvider.is()) { xIntDataProvider->appendSequence(); - aNewRange = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("last")); + aNewRange = "last"; bApplyNewRange = true; } } @@ -319,7 +316,7 @@ bool ErrorBarItemConverter::ApplySpecialItem( StatisticsHelper::getErrorDataSequenceFromDataSource( xErrorBarSource, bIsPositiveValue, bYError )); bApplyNewRange = - ! ( xSeq.is() && aNewRange.equals( xSeq->getSourceRangeRepresentation())); + ! ( xSeq.is() && (aNewRange == xSeq->getSourceRangeRepresentation())); } if( bApplyNewRange ) @@ -345,7 +342,7 @@ void ErrorBarItemConverter::FillSpecialItem( uno::Reference< beans::XPropertySet > xErrorBarProp( GetPropertySet()); sal_Int32 nStyle = 0; - if( xErrorBarProp->getPropertyValue( C2U( "ErrorBarStyle" )) >>= nStyle ) + if( xErrorBarProp->getPropertyValue( "ErrorBarStyle" ) >>= nStyle ) { switch( nStyle ) { diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx index 99c42341066c..e87f6d482898 100644 --- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx @@ -128,13 +128,13 @@ bool lcl_supportsLineProperties( ::chart::wrapper::GraphicPropertyItemConverter: bool lcl_SetContentForNamedProperty( const uno::Reference< lang::XMultiServiceFactory > & xFactory, - const ::rtl::OUString & rTableName, + const OUString & rTableName, NameOrIndex & rItem, sal_uInt8 nMemberId ) { bool bResult = false; if( xFactory.is()) { - ::rtl::OUString aPropertyValue( rItem.GetName()); + OUString aPropertyValue( rItem.GetName()); uno::Reference< container::XNameAccess > xNameAcc( xFactory->createInstance( rTableName ), uno::UNO_QUERY ); @@ -250,7 +250,7 @@ void GraphicPropertyItemConverter::FillSpecialItem( case XATTR_FILLBMP_STRETCH: { drawing::BitmapMode aMode = drawing::BitmapMode_REPEAT; - if( GetPropertySet()->getPropertyValue( C2U("FillBitmapMode")) >>= aMode ) + if( GetPropertySet()->getPropertyValue( "FillBitmapMode" ) >>= aMode ) { rOutItemSet.Put( XFillBmpTileItem( aMode == drawing::BitmapMode_REPEAT )); rOutItemSet.Put( XFillBmpStretchItem( aMode == drawing::BitmapMode_STRETCH )); @@ -263,10 +263,10 @@ void GraphicPropertyItemConverter::FillSpecialItem( { if( lcl_supportsFillProperties( m_eGraphicObjectType )) { - ::rtl::OUString aPropName = + OUString aPropName = (m_eGraphicObjectType == FILLED_DATA_POINT) - ? C2U( "TransparencyGradientName" ) - : C2U( "FillTransparenceGradientName" ); + ? OUString( "TransparencyGradientName" ) + : OUString( "FillTransparenceGradientName" ); uno::Any aValue( GetPropertySet()->getPropertyValue( aPropName )); if( aValue.hasValue()) @@ -275,11 +275,11 @@ void GraphicPropertyItemConverter::FillSpecialItem( aItem.PutValue( aValue, MID_NAME ); lcl_SetContentForNamedProperty( - m_xNamedPropertyTableFactory, C2U("com.sun.star.drawing.TransparencyGradientTable"), + m_xNamedPropertyTableFactory, "com.sun.star.drawing.TransparencyGradientTable" , aItem, MID_FILLGRADIENT ); // this is important to enable the item - ::rtl::OUString aName; + OUString aName; if( (aValue >>= aName) && !aName.isEmpty()) { @@ -298,10 +298,10 @@ void GraphicPropertyItemConverter::FillSpecialItem( case XATTR_GRADIENTSTEPCOUNT: if( lcl_supportsFillProperties( m_eGraphicObjectType )) { - ::rtl::OUString aPropName = + OUString aPropName = (m_eGraphicObjectType == FILLED_DATA_POINT) - ? C2U( "GradientStepCount" ) - : C2U( "FillGradientStepCount" ); + ? OUString( "GradientStepCount" ) + : OUString( "FillGradientStepCount" ); uno::Any aValue( GetPropertySet()->getPropertyValue( aPropName ) ); if( hasLongOrShortValue(aValue) ) @@ -315,16 +315,16 @@ void GraphicPropertyItemConverter::FillSpecialItem( case XATTR_LINEDASH: if( lcl_supportsLineProperties( m_eGraphicObjectType )) { - ::rtl::OUString aPropName = + OUString aPropName = (m_eGraphicObjectType == FILLED_DATA_POINT) - ? C2U( "BorderDashName" ) - : C2U( "LineDashName" ); + ? OUString( "BorderDashName" ) + : OUString( "LineDashName" ); XLineDashItem aItem; aItem.PutValue( GetPropertySet()->getPropertyValue( aPropName ), MID_NAME ); lcl_SetContentForNamedProperty( - m_xNamedPropertyTableFactory, C2U("com.sun.star.drawing.DashTable"), + m_xNamedPropertyTableFactory, "com.sun.star.drawing.DashTable" , aItem, MID_LINEDASH ); // translate model name to UI-name for predefined entries, so @@ -339,16 +339,16 @@ void GraphicPropertyItemConverter::FillSpecialItem( case XATTR_FILLGRADIENT: if( lcl_supportsFillProperties( m_eGraphicObjectType )) { - ::rtl::OUString aPropName = + OUString aPropName = (m_eGraphicObjectType == FILLED_DATA_POINT) - ? C2U( "GradientName" ) - : C2U( "FillGradientName" ); + ? OUString( "GradientName" ) + : OUString( "FillGradientName" ); XFillGradientItem aItem; aItem.PutValue( GetPropertySet()->getPropertyValue( aPropName ), MID_NAME ); lcl_SetContentForNamedProperty( - m_xNamedPropertyTableFactory, C2U("com.sun.star.drawing.GradientTable"), + m_xNamedPropertyTableFactory, "com.sun.star.drawing.GradientTable" , aItem, MID_FILLGRADIENT ); // translate model name to UI-name for predefined entries, so @@ -363,16 +363,16 @@ void GraphicPropertyItemConverter::FillSpecialItem( case XATTR_FILLHATCH: if( lcl_supportsFillProperties( m_eGraphicObjectType )) { - ::rtl::OUString aPropName = + OUString aPropName = (m_eGraphicObjectType == FILLED_DATA_POINT) - ? C2U( "HatchName" ) - : C2U( "FillHatchName" ); + ? OUString( "HatchName" ) + : OUString( "FillHatchName" ); XFillHatchItem aItem; aItem.PutValue( GetPropertySet()->getPropertyValue( aPropName ), MID_NAME ); lcl_SetContentForNamedProperty( - m_xNamedPropertyTableFactory, C2U("com.sun.star.drawing.HatchTable"), + m_xNamedPropertyTableFactory, "com.sun.star.drawing.HatchTable" , aItem, MID_FILLHATCH ); // translate model name to UI-name for predefined entries, so @@ -388,10 +388,10 @@ void GraphicPropertyItemConverter::FillSpecialItem( if( lcl_supportsFillProperties( m_eGraphicObjectType )) { XFillBitmapItem aItem; - aItem.PutValue( GetPropertySet()->getPropertyValue( C2U( "FillBitmapName" ) ), MID_NAME ); + aItem.PutValue( GetPropertySet()->getPropertyValue( "FillBitmapName" ), MID_NAME ); lcl_SetContentForNamedProperty( - m_xNamedPropertyTableFactory, C2U("com.sun.star.drawing.BitmapTable"), + m_xNamedPropertyTableFactory, "com.sun.star.drawing.BitmapTable" , aItem, MID_GRAFURL ); // translate model name to UI-name for predefined entries, so @@ -408,12 +408,12 @@ void GraphicPropertyItemConverter::FillSpecialItem( case XATTR_LINETRANSPARENCE: if( lcl_supportsLineProperties( m_eGraphicObjectType )) { - ::rtl::OUString aPropName = + OUString aPropName = (m_eGraphicObjectType == FILLED_DATA_POINT) - ? C2U( "BorderTransparency" ) + ? OUString( "BorderTransparency" ) : (m_eGraphicObjectType == LINE_DATA_POINT) - ? C2U( "Transparency" ) - : C2U( "LineTransparence" ); + ? OUString( "Transparency" ) + : OUString( "LineTransparence" ); XLineTransparenceItem aItem; aItem.PutValue( GetPropertySet()->getPropertyValue( aPropName ) ); @@ -427,10 +427,10 @@ void GraphicPropertyItemConverter::FillSpecialItem( case XATTR_FILLTRANSPARENCE: if( lcl_supportsFillProperties( m_eGraphicObjectType )) { - ::rtl::OUString aPropName = + OUString aPropName = (m_eGraphicObjectType == FILLED_DATA_POINT) - ? C2U( "Transparency" ) - : C2U( "FillTransparence" ); + ? OUString( "Transparency" ) + : OUString( "FillTransparence" ); XFillTransparenceItem aItem; aItem.PutValue( GetPropertySet()->getPropertyValue( aPropName ) ); @@ -454,7 +454,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem( case XATTR_FILLBMP_STRETCH: if( lcl_supportsFillProperties( m_eGraphicObjectType )) { - const ::rtl::OUString aModePropName = C2U("FillBitmapMode"); + const OUString aModePropName("FillBitmapMode"); bool bStretched = static_cast< const XFillBmpStretchItem & >( rItemSet.Get( XATTR_FILLBMP_STRETCH )).GetValue(); drawing::BitmapMode aMode = @@ -472,7 +472,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem( case XATTR_FILLBMP_TILE: if( lcl_supportsFillProperties( m_eGraphicObjectType )) { - const ::rtl::OUString aModePropName = C2U("FillBitmapMode"); + const OUString aModePropName("FillBitmapMode"); bool bTiled = static_cast< const XFillBmpTileItem & >( rItemSet.Get( XATTR_FILLBMP_TILE )).GetValue(); drawing::BitmapMode aMode = @@ -492,10 +492,10 @@ bool GraphicPropertyItemConverter::ApplySpecialItem( { if( lcl_supportsFillProperties( m_eGraphicObjectType )) { - ::rtl::OUString aPropName = + OUString aPropName = (m_eGraphicObjectType == FILLED_DATA_POINT) - ? C2U( "TransparencyGradientName" ) - : C2U( "FillTransparenceGradientName" ); + ? OUString( "TransparencyGradientName" ) + : OUString( "FillTransparenceGradientName" ); const XFillFloatTransparenceItem & rItem = static_cast< const XFillFloatTransparenceItem & >( @@ -508,7 +508,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem( rItem.QueryValue( aGradient, MID_FILLGRADIENT ); // add TransparencyGradient to list if it does not already exist - ::rtl::OUString aPreferredName; + OUString aPreferredName; aValue >>= aPreferredName; aValue <<= PropertyHelper::addTransparencyGradientUniqueNameToTable( aGradient, m_xNamedPropertyTableFactory, aPreferredName ); @@ -521,7 +521,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem( } else { - ::rtl::OUString aName; + OUString aName; if( ( GetPropertySet()->getPropertyValue( aPropName ) >>= aName ) && !aName.isEmpty() ) { @@ -543,10 +543,10 @@ bool GraphicPropertyItemConverter::ApplySpecialItem( { if( lcl_supportsFillProperties( m_eGraphicObjectType )) { - ::rtl::OUString aPropName = + OUString aPropName = (m_eGraphicObjectType == FILLED_DATA_POINT) - ? C2U( "GradientStepCount" ) - : C2U( "FillGradientStepCount" ); + ? OUString( "GradientStepCount" ) + : OUString( "FillGradientStepCount" ); sal_Int16 nStepCount = ( static_cast< const XGradientStepCountItem & >( rItemSet.Get( nWhichId ))).GetValue(); @@ -566,10 +566,10 @@ bool GraphicPropertyItemConverter::ApplySpecialItem( if( lcl_supportsLineProperties( m_eGraphicObjectType )) { - ::rtl::OUString aPropName = + OUString aPropName = (m_eGraphicObjectType == FILLED_DATA_POINT) - ? C2U( "BorderDashName" ) - : C2U( "LineDashName" ); + ? OUString( "BorderDashName" ) + : OUString( "LineDashName" ); const XLineDashItem & rItem = static_cast< const XLineDashItem & >( @@ -582,7 +582,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem( // add LineDash to list uno::Any aLineDash; rItem.QueryValue( aLineDash, MID_LINEDASH ); - ::rtl::OUString aPreferredName; + OUString aPreferredName; aValue >>= aPreferredName; aValue <<= PropertyHelper::addLineDashUniqueNameToTable( aLineDash, m_xNamedPropertyTableFactory, aPreferredName ); @@ -599,10 +599,10 @@ bool GraphicPropertyItemConverter::ApplySpecialItem( { if( lcl_supportsFillProperties( m_eGraphicObjectType )) { - ::rtl::OUString aPropName = + OUString aPropName = (m_eGraphicObjectType == FILLED_DATA_POINT) - ? C2U( "GradientName" ) - : C2U( "FillGradientName" ); + ? OUString( "GradientName" ) + : OUString( "FillGradientName" ); const XFillGradientItem & rItem = static_cast< const XFillGradientItem & >( @@ -615,7 +615,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem( // add Gradient to list uno::Any aGradient; rItem.QueryValue( aGradient, MID_FILLGRADIENT ); - ::rtl::OUString aPreferredName; + OUString aPreferredName; aValue >>= aPreferredName; aValue <<= PropertyHelper::addGradientUniqueNameToTable( aGradient, m_xNamedPropertyTableFactory, aPreferredName ); @@ -632,10 +632,10 @@ bool GraphicPropertyItemConverter::ApplySpecialItem( { if( lcl_supportsFillProperties( m_eGraphicObjectType )) { - ::rtl::OUString aPropName = + OUString aPropName = (m_eGraphicObjectType == FILLED_DATA_POINT) - ? C2U( "HatchName" ) - : C2U( "FillHatchName" ); + ? OUString( "HatchName" ) + : OUString( "FillHatchName" ); const XFillHatchItem & rItem = static_cast< const XFillHatchItem & >( @@ -648,7 +648,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem( // add Hatch to list uno::Any aHatch; rItem.QueryValue( aHatch, MID_FILLHATCH ); - ::rtl::OUString aPreferredName; + OUString aPreferredName; aValue >>= aPreferredName; aValue <<= PropertyHelper::addHatchUniqueNameToTable( aHatch, m_xNamedPropertyTableFactory, aPreferredName ); @@ -671,17 +671,17 @@ bool GraphicPropertyItemConverter::ApplySpecialItem( if( rItem.QueryValue( aValue, MID_NAME )) { - if( aValue != GetPropertySet()->getPropertyValue( C2U( "FillBitmapName" ))) + if( aValue != GetPropertySet()->getPropertyValue( "FillBitmapName" )) { // add Bitmap to list uno::Any aBitmap; rItem.QueryValue( aBitmap, MID_GRAFURL ); - ::rtl::OUString aPreferredName; + OUString aPreferredName; aValue >>= aPreferredName; aValue <<= PropertyHelper::addBitmapUniqueNameToTable( aBitmap, m_xNamedPropertyTableFactory, aPreferredName ); - GetPropertySet()->setPropertyValue( C2U( "FillBitmapName" ), aValue ); + GetPropertySet()->setPropertyValue( "FillBitmapName" , aValue ); bChanged = true; } } @@ -694,12 +694,12 @@ bool GraphicPropertyItemConverter::ApplySpecialItem( case XATTR_LINETRANSPARENCE: if( lcl_supportsLineProperties( m_eGraphicObjectType )) { - ::rtl::OUString aPropName = + OUString aPropName = (m_eGraphicObjectType == FILLED_DATA_POINT) - ? C2U( "BorderTransparency" ) + ? OUString( "BorderTransparency" ) : (m_eGraphicObjectType == LINE_DATA_POINT) - ? C2U( "Transparency" ) - : C2U( "LineTransparence" ); + ? OUString( "Transparency" ) + : OUString( "LineTransparence" ); const XLineTransparenceItem & rItem = static_cast< const XLineTransparenceItem & >( @@ -733,10 +733,10 @@ bool GraphicPropertyItemConverter::ApplySpecialItem( case XATTR_FILLTRANSPARENCE: if( lcl_supportsFillProperties( m_eGraphicObjectType )) { - ::rtl::OUString aPropName = + OUString aPropName = (m_eGraphicObjectType == FILLED_DATA_POINT) - ? C2U( "Transparency" ) - : C2U( "FillTransparence" ); + ? OUString( "Transparency" ) + : OUString( "FillTransparence" ); const XFillTransparenceItem & rItem = static_cast< const XFillTransparenceItem & >( @@ -756,12 +756,12 @@ bool GraphicPropertyItemConverter::ApplySpecialItem( GetPropertySet()->setPropertyValue( aPropName, aValue ); // if linear or no transparence is set, delete the gradient - ::rtl::OUString aTransGradPropName = + OUString aTransGradPropName = (m_eGraphicObjectType == FILLED_DATA_POINT) - ? C2U( "TransparencyGradientName" ) - : C2U( "FillTransparenceGradientName" ); + ? OUString( "TransparencyGradientName" ) + : OUString( "FillTransparenceGradientName" ); GetPropertySet()->setPropertyValue( - aTransGradPropName, uno::makeAny( ::rtl::OUString() )); + aTransGradPropName, uno::makeAny( OUString() )); bChanged = true; } From fd575862a1205172d5fffdaa39e64340fda8ad3f Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Mon, 8 Oct 2012 21:19:50 +0200 Subject: [PATCH 559/863] changed scripting javascript/beanshell switches in distro configs Change-Id: I28219b9d7500a5d162c554903cf92656cb25a01b --- distro-configs/LibreOfficeLinux.conf | 5 +++-- distro-configs/LibreOfficeMacOSX.conf | 4 ++-- distro-configs/LibreOfficeWin32.conf | 4 ++-- distro-configs/LibreOfficeWin64.conf | 4 ++-- distro-configs/OxygenOfficeLinux.conf | 4 ++-- distro-configs/OxygenOfficeWin32.conf | 4 ++-- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf index b51aa95636ec..242820fede46 100644 --- a/distro-configs/LibreOfficeLinux.conf +++ b/distro-configs/LibreOfficeLinux.conf @@ -28,13 +28,13 @@ --enable-gstreamer-0-10 --enable-evolution2 --enable-gnome-vfs +--enable-scripting-beanshell +--enable-scripting-javascript --enable-ext-wiki-publisher --enable-ext-report-builder --enable-ext-presenter-minimizer --enable-ext-presenter-console --enable-ext-pdfimport ---enable-ext-scripting-beanshell ---enable-ext-scripting-javascript --enable-ext-nlpsolver --enable-epm --enable-binfilter @@ -44,3 +44,4 @@ --disable-randr-link --disable-kde4 --disable-dbus + \ No newline at end of file diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf index 20a66ddb7268..ab0fa362c1a0 100644 --- a/distro-configs/LibreOfficeMacOSX.conf +++ b/distro-configs/LibreOfficeMacOSX.conf @@ -2,13 +2,13 @@ --enable-epm --enable-binfilter --with-java-target-version=1.5 +--enable-scripting-beanshell +--enable-scripting-javascript --enable-ext-presenter-minimizer --enable-ext-presenter-console --enable-ext-pdfimport --enable-ext-wiki-publisher --enable-ext-report-builder ---enable-ext-scripting-beanshell ---enable-ext-scripting-javascript --enable-ext-nlpsolver --enable-extension-integration --enable-online-update diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf index 7273ed41b861..4ebd45931f22 100644 --- a/distro-configs/LibreOfficeWin32.conf +++ b/distro-configs/LibreOfficeWin32.conf @@ -8,8 +8,8 @@ --with-java-target-version=1.5 --disable-gtk --enable-binfilter ---enable-ext-scripting-beanshell ---enable-ext-scripting-javascript +--enable-scripting-beanshell +--enable-scripting-javascript --enable-ext-wiki-publisher --enable-ext-report-builder --enable-ext-presenter-minimizer diff --git a/distro-configs/LibreOfficeWin64.conf b/distro-configs/LibreOfficeWin64.conf index 344551eeca4a..8db7f58f246c 100644 --- a/distro-configs/LibreOfficeWin64.conf +++ b/distro-configs/LibreOfficeWin64.conf @@ -3,5 +3,5 @@ --with-java-target-version=1.5 --enable-cl-x64 --disable-gtk ---enable-ext-scripting-beanshell ---enable-ext-scripting-javascript +--enable-scripting-beanshell +--enable-scripting-javascript diff --git a/distro-configs/OxygenOfficeLinux.conf b/distro-configs/OxygenOfficeLinux.conf index 274dd9e1934b..2be6a5d5add7 100644 --- a/distro-configs/OxygenOfficeLinux.conf +++ b/distro-configs/OxygenOfficeLinux.conf @@ -41,8 +41,8 @@ --enable-ext-presenter-minimizer --enable-ext-presenter-console --enable-ext-pdfimport ---enable-ext-scripting-beanshell ---enable-ext-scripting-javascript +--enable-scripting-beanshell +--enable-scripting-javascript --enable-ext-google-docs --enable-ext-hunart --enable-ext-nlpsolver diff --git a/distro-configs/OxygenOfficeWin32.conf b/distro-configs/OxygenOfficeWin32.conf index 3faac6d9f952..5cc637c03a66 100644 --- a/distro-configs/OxygenOfficeWin32.conf +++ b/distro-configs/OxygenOfficeWin32.conf @@ -19,8 +19,8 @@ --enable-ext-presenter-minimizer --enable-ext-presenter-console --enable-ext-pdfimport ---enable-ext-scripting-beanshell ---enable-ext-scripting-javascript +--enable-scripting-beanshell +--enable-scripting-javascript --enable-ext-google-docs --enable-ext-hunart --enable-ext-nlpsolver From 48b2d6adccee986390c923ff1acb4dd101a05595 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Mon, 8 Oct 2012 20:44:54 +0100 Subject: [PATCH 560/863] use icerun to avoid compilation process explosions using icecream. Change-Id: I3539bfcfbbb43f44a6fc8fae60bda84267938116 --- config_host.mk.in | 1 + configure.in | 11 +++++++++++ solenv/gbuild/JavaClassSet.mk | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/config_host.mk.in b/config_host.mk.in index 251847ee4ee3..eaf0d61986a6 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -254,6 +254,7 @@ export HUNSPELL_CFLAGS=@HUNSPELL_CFLAGS@ export HUNSPELL_LIBS=@HUNSPELL_LIBS@ export HYPHEN_LIB=@HYPHEN_LIB@ export HYPH_SYSTEM_DIR=@HYPH_SYSTEM_DIR@ +export ICECREAM_RUN=@ICECREAM_RUN@ export ICU_MAJOR=@ICU_MAJOR@ export ICU_MICRO=@ICU_MICRO@ export ICU_MINOR=@ICU_MINOR@ diff --git a/configure.in b/configure.in index 169d994f87c7..8d1f90444a58 100644 --- a/configure.in +++ b/configure.in @@ -12614,6 +12614,17 @@ fi AC_MSG_RESULT([$BUILD_MAX_JOBS]) AC_SUBST(BUILD_MAX_JOBS) +dnl =================================================================== +dnl icerun is a wrapper that stops us spawning tens of processes +dnl locally - for tools that can't be executed on the compile cluster +dnl this avoids a dozen javac's ganging up on your laptop to kill it. +dnl =================================================================== +ICECREAM_RUN= +if test "$enable_icecream" = "yes"; then + ICECREAM_RUN=icerun +fi +AC_SUBST(ICECREAM_RUN) + # ===================================================================== # determine the parallelism for gnu make # ===================================================================== diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index 3f65099802f7..b5b743995e50 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -26,7 +26,7 @@ # #************************************************************************* -gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER) $(JAVAFLAGS) \ +gb_JavaClassSet_JAVACCOMMAND := $(ICECREAM_RUN) $(JAVACOMPILER) $(JAVAFLAGS) \ -source $(JAVA_SOURCE_VER) -target $(JAVA_TARGET_VER) gb_JavaClassSet_JAVACDEBUG := From 4d9ab30c7dbe944d5bf268d64b493ced957bb9f3 Mon Sep 17 00:00:00 2001 From: Xisco Fauli Date: Mon, 8 Oct 2012 22:28:55 +0200 Subject: [PATCH 561/863] pyfax: Don't show "the file already exists" when it doesn't do Change-Id: Iab496836b692d47be75bb617b0b28835acf01713 --- .../star/wizards/fax/FaxWizardDialogImpl.py | 15 ++++++++---- .../com/sun/star/wizards/ui/PathSelection.py | 6 ++--- .../com/sun/star/wizards/ui/WizardDialog.py | 9 ------- .../star/wizards/ui/XPathSelectionListener.py | 24 ------------------- 4 files changed, 13 insertions(+), 41 deletions(-) delete mode 100644 wizards/com/sun/star/wizards/ui/XPathSelectionListener.py diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py index ae738009839e..0547ea1b5f7a 100644 --- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py +++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py @@ -16,7 +16,8 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # import traceback -from .FaxWizardDialog import FaxWizardDialog, Helper, PropertyNames, uno +from .FaxWizardDialog import FaxWizardDialog, Helper, PropertyNames, uno, \ + WizardDialog from .CGFaxWizard import CGFaxWizard from .FaxDocument import FaxDocument from .FaxWizardDialogConst import HID @@ -103,7 +104,7 @@ class FaxWizardDialogImpl(FaxWizardDialog): self.initializeCommunication() self.__initializePaths() - #special Control fFrameor setting the save Path: + #special Control for setting the save Path: self.insertPathSelectionControl() self.initializeTemplates(xMSF) @@ -157,7 +158,7 @@ class FaxWizardDialogImpl(FaxWizardDialog): try: fileAccess = FileAccess(self.xMSF) self.sPath = self.myPathSelection.getSelectedPath() - if self.sPath == "": + if not self.sPath: self.myPathSelection.triggerPathPicker() self.sPath = self.myPathSelection.getSelectedPath() @@ -279,8 +280,7 @@ class FaxWizardDialogImpl(FaxWizardDialog): self.myPathSelection.sDefaultDirectory = self.UserTemplatePath self.myPathSelection.sDefaultName = "myFaxTemplate.ott" self.myPathSelection.sDefaultFilter = "writer8_template" - self.myPathSelection.addSelectionListener( \ - self.myPathSelectionListener()) + self.myPathSelection.addSelectionListener(self) def __initializePaths(self): try: @@ -708,3 +708,8 @@ class FaxWizardDialogImpl(FaxWizardDialog): Helper.setUnoPropertyValue(BPaperItem, PropertyNames.PROPERTY_ENABLED, False) + + def validatePath(self): + if self.myPathSelection.usedPathPicker: + self.filenameChanged = True + self.myPathSelection.usedPathPicker = False diff --git a/wizards/com/sun/star/wizards/ui/PathSelection.py b/wizards/com/sun/star/wizards/ui/PathSelection.py index 6d5762d7910d..b468004a0d91 100644 --- a/wizards/com/sun/star/wizards/ui/PathSelection.py +++ b/wizards/com/sun/star/wizards/ui/PathSelection.py @@ -117,7 +117,7 @@ class PathSelection(object): self.sDefaultName, self.sDefaultFilter) sStorePath = myFilePickerDialog.sStorePath if sStorePath is not None: - myFA = FileAccess(self.xMSF); + myFA = FileAccess(self.xMSF) self.xSaveTextBox.Text = myFA.getPath(sStorePath, None) self.sDefaultDirectory = \ FileAccess.getParentDir(sStorePath) @@ -134,5 +134,5 @@ class PathSelection(object): traceback.print_exc() def callXPathSelectionListener(self): - if self.xAction != None: - self.xAction.validatePath() + if self.xAction is not None: + self.xAction.validatePath() diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.py b/wizards/com/sun/star/wizards/ui/WizardDialog.py index ebc401e17ec5..ea7cab844dca 100644 --- a/wizards/com/sun/star/wizards/ui/WizardDialog.py +++ b/wizards/com/sun/star/wizards/ui/WizardDialog.py @@ -20,7 +20,6 @@ import traceback from abc import ABCMeta, abstractmethod from .UnoDialog2 import UnoDialog2, Desktop, PropertyNames, UIConsts, \ ItemListenerProcAdapter -from .XPathSelectionListener import XPathSelectionListener from .event.CommonListener import TerminateListenerProcAdapter from ..common.Helper import Helper from ..common.Resource import Resource @@ -501,11 +500,3 @@ class WizardDialog(UnoDialog2): OfficeDocument.attachEventCall( TextDocument.xTextDocument, "OnNew", "StarBasic", "macro:///Template.Correspondence.Database()") - - class myPathSelectionListener(XPathSelectionListener): - - def validatePath(self): - if self.myPathSelection.usedPathPicker: - self.filenameChanged = True - - self.myPathSelection.usedPathPicker = False diff --git a/wizards/com/sun/star/wizards/ui/XPathSelectionListener.py b/wizards/com/sun/star/wizards/ui/XPathSelectionListener.py deleted file mode 100644 index 474efc00b3f1..000000000000 --- a/wizards/com/sun/star/wizards/ui/XPathSelectionListener.py +++ /dev/null @@ -1,24 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# -from abc import ABCMeta, abstractmethod - -class XPathSelectionListener(object): - - @abstractmethod - def validatePath(self): - pass From aebe36aa52e51fd5ce22e445e6ca82c544149c1b Mon Sep 17 00:00:00 2001 From: Xisco Fauli Date: Mon, 8 Oct 2012 22:38:43 +0200 Subject: [PATCH 562/863] pyfax: Unused import Change-Id: I46b01dcf734bbbb580aa8baca1125e0bc48867f9 --- wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py index 0547ea1b5f7a..3185736a888d 100644 --- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py +++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py @@ -16,8 +16,7 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # import traceback -from .FaxWizardDialog import FaxWizardDialog, Helper, PropertyNames, uno, \ - WizardDialog +from .FaxWizardDialog import FaxWizardDialog, Helper, PropertyNames, uno from .CGFaxWizard import CGFaxWizard from .FaxDocument import FaxDocument from .FaxWizardDialogConst import HID From c08f23cec28e3e1532993c50d602e127d65491c0 Mon Sep 17 00:00:00 2001 From: Xisco Fauli Date: Mon, 8 Oct 2012 23:26:02 +0200 Subject: [PATCH 563/863] pywizards: Remove the deleted file from makefile Change-Id: If74e624bc7677903b7d1cbc0e77284a929583b89 --- wizards/Pyuno_commonwizards.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/wizards/Pyuno_commonwizards.mk b/wizards/Pyuno_commonwizards.mk index 5653dac67f3c..ae0224d2b2ec 100644 --- a/wizards/Pyuno_commonwizards.mk +++ b/wizards/Pyuno_commonwizards.mk @@ -60,7 +60,6 @@ $(eval $(call gb_Pyuno_add_files,wizards,\ ui/PathSelection.py \ ui/UIConsts.py \ ui/UnoDialog.py \ - ui/XPathSelectionListener.py \ ui/DocumentPreview.py \ ui/PeerConfig.py \ ui/UIConsts.py \ From d540c322cce4f00418466cf7715ecc2c2f1e95c5 Mon Sep 17 00:00:00 2001 From: Marcos Paulo de Souza Date: Mon, 8 Oct 2012 18:15:59 -0300 Subject: [PATCH 564/863] Remove more useless code inside "#if 0" blocks Change-Id: Ifb9f9d2211608b848a5de66e1d19c4815a755907 Signed-off-by: Marcos Paulo de Souza Reviewed-on: https://gerrit.libreoffice.org/840 Reviewed-by: Markus Mohrhard Tested-by: Markus Mohrhard --- writerperfect/source/filter/OdgGenerator.cxx | 41 ------------------- writerperfect/source/filter/TextRunStyle.cxx | 4 -- xmloff/source/core/SettingsExportHelper.cxx | 11 ----- xmloff/source/table/XMLTableImport.cxx | 10 ----- .../xmlsecuritycontext_mscryptimpl.hxx | 19 --------- 5 files changed, 85 deletions(-) diff --git a/writerperfect/source/filter/OdgGenerator.cxx b/writerperfect/source/filter/OdgGenerator.cxx index 0d39862788f0..86611389acd5 100644 --- a/writerperfect/source/filter/OdgGenerator.cxx +++ b/writerperfect/source/filter/OdgGenerator.cxx @@ -241,22 +241,6 @@ static inline double cubicBase(double t, double a, double b, double c, double d) return (1.0-t)*(1.0-t)*(1.0-t)*a + 3.0*(1.0-t)*(1.0-t)*t*b + 3.0*(1.0-t)*t*t*c + t*t*t*d; } -#if 0 -static std::vector cubicExtremes(double a, double b, double c, double d) -{ - std::vector vec; - double u = -a + 2*b - c; - double v = sqrt((-a*(c-d) + b*b - b*(c+d) + c*c)); - double w = -a + 3.0*b - 3.0*c + d; - if (w != 0.0) - { - vec.push_back((u-v)/w); - vec.push_back((u+v)/w); - } - return vec; -} -#endif - static void getCubicBezierBBox(double x0, double y0, double x1, double y1, double x2, double y2, double x, double y, double &xmin, double &ymin, double &xmax, double &ymax) { @@ -265,29 +249,6 @@ static void getCubicBezierBBox(double x0, double y0, double x1, double y1, doubl ymin = y0 < y ? y0 : y; ymax = y0 > y ? y0 : y; -#if 0 - std::vector extremes = cubicExtremes(x0, x1, x2, x); - for(std::vector::iterator iterX = extremes.begin(); iterX != extremes.end(); ++iterX) - { - if(*iterX >= 0 && *iterX <= 1) - { - double tmpx = cubicBase(*iterX, x0, x1, x2, x); - xmin = tmpx < xmin ? tmpx : xmin; - xmax = tmpx > xmax ? tmpx : xmax; - } - } - - extremes = cubicExtremes(y0, y1, y2, y); - for(std::vector::iterator iterY = extremes.begin(); iterY != extremes.end(); ++iterY) - { - if(*iterY>=0.0 && *iterY<=1.0) - { - double tmpy = cubicBase(*iterY, y0, y1, y2, y); - ymin = tmpy < ymin ? tmpy : ymin; - ymax = tmpy > ymax ? tmpy : ymax; - } - } -#else for (double t = 0.0; t <= 1.0; t+=0.01) { double tmpx = cubicBase(t, x0, x1, x2, x); @@ -297,7 +258,6 @@ static void getCubicBezierBBox(double x0, double y0, double x1, double y1, doubl ymin = tmpy < ymin ? tmpy : ymin; ymax = tmpy > ymax ? tmpy : ymax; } -#endif } @@ -763,7 +723,6 @@ void OdgGenerator::startGraphics(const ::WPXPropertyList &propList) TagOpenElement *pStyleDrawingPagePropertiesOpenElement = new TagOpenElement("style:drawing-page-properties"); - // pStyleDrawingPagePropertiesOpenElement->addAttribute("draw:background-size", "border"); pStyleDrawingPagePropertiesOpenElement->addAttribute("draw:fill", "none"); mpImpl->mPageAutomaticStyles.push_back(pStyleDrawingPagePropertiesOpenElement); diff --git a/writerperfect/source/filter/TextRunStyle.cxx b/writerperfect/source/filter/TextRunStyle.cxx index dbdecae34f4e..4c461f96c166 100644 --- a/writerperfect/source/filter/TextRunStyle.cxx +++ b/writerperfect/source/filter/TextRunStyle.cxx @@ -51,10 +51,6 @@ void ParagraphStyle::write(OdfDocumentHandler *pHandler) const WPXPropertyList::Iter i(mpPropList); for (i.rewind(); i.next(); ) { -#if 0 - if (strcmp(i.key(), "style:list-style-name") == 0) - propList.insert("style:list-style-name", i()->getStr()); -#endif if (strncmp(i.key(), "fo:margin-",10) == 0) { if (strcmp(i.key(), "fo:margin-left") == 0 || diff --git a/xmloff/source/core/SettingsExportHelper.cxx b/xmloff/source/core/SettingsExportHelper.cxx index 7d61bdd932a7..1dadeadffcff 100644 --- a/xmloff/source/core/SettingsExportHelper.cxx +++ b/xmloff/source/core/SettingsExportHelper.cxx @@ -205,22 +205,11 @@ void XMLSettingsExportHelper::exportBool(const sal_Bool bValue, const rtl::OUStr void XMLSettingsExportHelper::exportByte(const sal_Int8 nValue, const rtl::OUString& rName) const { -#if 0 - DBG_ASSERT(!rName.isEmpty(), "no name"); - m_rContext.AddAttribute( XML_NAME, rName ); - m_rContext.AddAttribute( XML_TYPE, XML_BYTE ); - m_rContext.StartElement( XML_CONFIG_ITEM, sal_True ); - rtl::OUStringBuffer sBuffer; - ::sax::Converter::convertNumber(sBuffer, sal_Int32(nValue)); - m_rContext.Characters( sBuffer.makeStringAndClear() ); - m_rContext.EndElement( sal_False ); -#else (void) nValue; (void) rName; OSL_ENSURE(false, "XMLSettingsExportHelper::exportByte(): #i114162#:\n" "config-items of type \"byte\" are not valid ODF, " "so storing them is disabled!\n" "Use a different type instead (e.g. \"short\")."); -#endif } void XMLSettingsExportHelper::exportShort(const sal_Int16 nValue, const rtl::OUString& rName) const { diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx index e564264208b0..75ff917cf6de 100644 --- a/xmloff/source/table/XMLTableImport.cxx +++ b/xmloff/source/table/XMLTableImport.cxx @@ -472,16 +472,6 @@ SvXMLImportContext * XMLTableImportContext::ImportRow( sal_uInt16 nPrefix, const { msDefaultCellStyleName = sValue; } -#if 0 - else if( IsXMLToken( aLocalName, XML_VISIBILITY ) ) - { - bVisibility = IsXMLToken( sValue, XML_VISIBLE ); - } - else if( IsXMLToken( aLocalName, XML_NUMBER_ROWS_REPEATED ) ) - { - nRepeated = sValue.toInt32(); - } -#endif } else if ( (XML_NAMESPACE_XML == nPrefix2) && IsXMLToken(aLocalName, XML_ID) ) diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx index 438a0c289570..9ee8e029647f 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx @@ -74,14 +74,6 @@ class XMLSecurityContext_MSCryptImpl : public ::cppu::WeakImplHelper3< virtual void SAL_CALL setDefaultSecurityEnvironmentIndex( sal_Int32 nDefaultEnvIndex ) throw (::com::sun::star::uno::RuntimeException); -#if 0 - virtual void SAL_CALL setSecurityEnvironment( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment >& aSecurityEnvironment - ) throw( com::sun::star::security::SecurityInfrastructureException) ; - - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > SAL_CALL getSecurityEnvironment() - throw(::com::sun::star::uno::RuntimeException); -#endif //Methods from XInitialization virtual void SAL_CALL initialize( @@ -107,17 +99,6 @@ class XMLSecurityContext_MSCryptImpl : public ::cppu::WeakImplHelper3< static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > impl_createFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) ; -#if 0 - //Methods from XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) - throw (com::sun::star::uno::RuntimeException); - - static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId() ; - static XMLSecurityContext_MSCryptImpl* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xObj ) ; -#endif - - //Native mehtods - //virtual xmlSecKeysMngrPtr keysManager() throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; } ; #endif // _XMLSIGNATURECONTEXT_MSCRYPTIMPL_HXX_ From ffadab26d62a24f3a142c497669db5a933ba1251 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Sun, 7 Oct 2012 01:18:43 +0200 Subject: [PATCH 565/863] make ScCondFormatDlg a ScAnyRefDlg Change-Id: I4e04a1f34dd958922e9856294639de7bf40249e4 --- sc/Library_sc.mk | 3 + sc/Library_scui.mk | 3 - sc/inc/scabstdlg.hxx | 15 ---- sc/sdi/cellsh.sdi | 2 +- sc/source/ui/app/scdll.cxx | 3 +- sc/source/ui/attrdlg/scdlgfact.cxx | 52 ------------- sc/source/ui/attrdlg/scdlgfact.hxx | 19 ----- sc/source/ui/condformat/condformatdlg.cxx | 38 +++++++--- sc/source/ui/condformat/condformatmgr.cxx | 8 +- sc/source/ui/inc/condformatdlg.hxx | 13 +++- sc/source/ui/inc/condformathelper.hxx | 6 +- sc/source/ui/inc/reffact.hxx | 1 + sc/source/ui/src/condformatdlg.src | 2 +- sc/source/ui/view/cellsh1.cxx | 92 ++++------------------- sc/source/ui/view/reffact.cxx | 7 ++ sc/source/ui/view/tabvwsh.cxx | 1 + sc/source/ui/view/tabvwshc.cxx | 56 ++++++++++++++ 17 files changed, 131 insertions(+), 190 deletions(-) diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index 9bc420fdbde0..f7c73d7c1cad 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -329,6 +329,9 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/ui/cctrl/popmenu \ sc/source/ui/cctrl/tbinsert \ sc/source/ui/cctrl/tbzoomsliderctrl \ + sc/source/ui/condformat/condformatdlg \ + sc/source/ui/condformat/condformathelper \ + sc/source/ui/condformat/colorformat \ sc/source/ui/dbgui/asciiopt \ sc/source/ui/dbgui/consdlg \ sc/source/ui/dbgui/csvcontrol \ diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk index 92017d058f75..b1eb7720f247 100644 --- a/sc/Library_scui.mk +++ b/sc/Library_scui.mk @@ -63,9 +63,6 @@ $(eval $(call gb_Library_add_exception_objects,scui,\ sc/source/ui/attrdlg/scuiexp \ sc/source/ui/attrdlg/tabpages \ sc/source/ui/cctrl/editfield \ - sc/source/ui/condformat/colorformat \ - sc/source/ui/condformat/condformatdlg \ - sc/source/ui/condformat/condformathelper \ sc/source/ui/condformat/condformatmgr \ sc/source/ui/dbgui/dapidata \ sc/source/ui/dbgui/dapitype \ diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index aac528ee487f..d09027cad4cf 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -84,12 +84,6 @@ public: virtual sal_Bool IsRow() = 0; }; -class AbstractScCondFormatDlg : public VclAbstractDialog -{ -public: - virtual ScConditionalFormat* GetConditionalFormat() = 0; -}; - class AbstractScCondFormatManagerDlg : public VclAbstractDialog { public: @@ -98,10 +92,6 @@ public: virtual bool CondFormatsChanged() = 0; }; -class AbstractScDataBarSettingsDlg : public VclAbstractDialog -{ -}; - class AbstractScDataPilotDatabaseDlg :public VclAbstractDialog //add for ScDataPilotDatabaseDlg { public: @@ -365,14 +355,9 @@ public: sal_Bool bColDefault = sal_True ) = 0; virtual VclAbstractDialog * CreateScSortWarningDlg ( Window* pParent, const String& rExtendText, const String& rCurrentText, int nId ) = 0; //add for ScSortWarningDlg - virtual AbstractScCondFormatDlg* CreateScCondFormatDlg (Window* pParent, ScDocument* pDoc, const ScConditionalFormat* pFormat, - const ScRangeList& rList, const ScAddress& rPos, int nId ) = 0; //add for ScCondFormatDlg - virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, const ScAddress& rPos, int nId ) = 0; - virtual AbstractScDataBarSettingsDlg* CreateScDataBarSetttingsDlg (Window* pParent, ScDocument* pDoc, int nId ) = 0; //add for ScDataBarSettingsDlg - virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg (Window* pParent ,int nId ) = 0; //add for ScDataPilotDatabaseDlg virtual AbstractScDataPilotSourceTypeDlg * CreateScDataPilotSourceTypeDlg ( Window* pParent, sal_Bool bEnableExternal, int nId ) = 0; //add for ScDataPilotSourceTypeDlg diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi index 15233b66d08a..1086fd547e6a 100644 --- a/sc/sdi/cellsh.sdi +++ b/sc/sdi/cellsh.sdi @@ -188,7 +188,7 @@ interface CellSelection FID_USE_NAME [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] SID_CANCEL [ ExecMethod = Execute; ] SID_TOGGLE_REL [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] - SID_OPENDLG_CONDFRMT [ ExecMethod = ExecuteEdit; ] + SID_OPENDLG_CONDFRMT [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] SID_OPENDLG_COLORSCALE [ ExecMethod = ExecuteEdit; ] SID_OPENDLG_DATABAR [ ExecMethod = ExecuteEdit; ] SID_OPENDLG_CONDFRMT_MANAGER [ ExecMethod = ExecuteEdit; ] diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index 651b46a1bce9..5f8540d1728d 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -258,7 +258,8 @@ void ScDLL::Init() ScSolverDlgWrapper ::RegisterChildWindow(false, pMod); ScOptSolverDlgWrapper ::RegisterChildWindow(false, pMod); ScNameDlgWrapper ::RegisterChildWindow(false, pMod); - ScNameDefDlgWrapper ::RegisterChildWindow(false, pMod); + ScNameDefDlgWrapper ::RegisterChildWindow(false, pMod); + ScCondFormatDlgWrapper ::RegisterChildWindow(false, pMod); ScPivotLayoutWrapper ::RegisterChildWindow(false, pMod); ScTabOpDlgWrapper ::RegisterChildWindow(false, pMod); ScFilterDlgWrapper ::RegisterChildWindow(false, pMod); diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index e23522e2b59e..a23d0edf3f8f 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -90,9 +90,7 @@ IMPL_ABSTDLG_BASE(ScVclAbstractDialog_Impl); IMPL_ABSTDLG_BASE(AbstractScImportAsciiDlg_Impl); IMPL_ABSTDLG_BASE(AbstractScAutoFormatDlg_Impl); IMPL_ABSTDLG_BASE(AbstractScColRowLabelDlg_Impl); -IMPL_ABSTDLG_BASE(AbstractScCondFormatDlg_Impl); IMPL_ABSTDLG_BASE(AbstractScCondFormatManagerDlg_Impl); -IMPL_ABSTDLG_BASE(AbstractScDataBarSettingsDlg_Impl); IMPL_ABSTDLG_BASE(AbstractScDataPilotDatabaseDlg_Impl); IMPL_ABSTDLG_BASE(AbstractScDataPilotSourceTypeDlg_Impl); IMPL_ABSTDLG_BASE(AbstractScDataPilotServiceDlg_Impl); @@ -452,11 +450,6 @@ sal_uLong AbstractScLinkedAreaDlg_Impl::GetRefresh() } -ScConditionalFormat* AbstractScCondFormatDlg_Impl::GetConditionalFormat() -{ - return pDlg->GetConditionalFormat(); -} - ScConditionalFormatList* AbstractScCondFormatManagerDlg_Impl::GetConditionalFormatList() { return pDlg->GetConditionalFormatList(); @@ -781,33 +774,6 @@ VclAbstractDialog * ScAbstractDialogFactory_Impl::CreateScSortWarningDlg( Window } -AbstractScCondFormatDlg* ScAbstractDialogFactory_Impl::CreateScCondFormatDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormat* pFormat, - const ScRangeList& rRange, const ScAddress& rPos, int nId) -{ - ScCondFormatDlg* pDlg = NULL; - switch( nId ) - { - case 0: - pDlg = new ScCondFormatDlg( pParent, pDoc, pFormat, rRange, rPos, condformat::dialog::NONE ); - break; - case SID_OPENDLG_CONDFRMT: - pDlg = new ScCondFormatDlg( pParent, pDoc, pFormat, rRange, rPos, condformat::dialog::CONDITION ); - break; - case SID_OPENDLG_COLORSCALE: - pDlg = new ScCondFormatDlg( pParent, pDoc, pFormat, rRange, rPos, condformat::dialog::COLORSCALE ); - break; - case SID_OPENDLG_DATABAR: - pDlg = new ScCondFormatDlg( pParent, pDoc, pFormat, rRange, rPos, condformat::dialog::DATABAR ); - break; - default: - break; - } - if(pDlg) - return new AbstractScCondFormatDlg_Impl( pDlg ); - - return NULL; -} - AbstractScCondFormatManagerDlg* ScAbstractDialogFactory_Impl::CreateScCondFormatMgrDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, const ScAddress& rPos, int nId ) { @@ -826,24 +792,6 @@ AbstractScCondFormatManagerDlg* ScAbstractDialogFactory_Impl::CreateScCondFormat return NULL; } -AbstractScDataBarSettingsDlg* ScAbstractDialogFactory_Impl::CreateScDataBarSetttingsDlg(Window* pParent, ScDocument* pDoc, int nId) -{ - ScDataBarSettingsDlg* pDlg = NULL; - switch( nId ) - { - case RID_SCDLG_DATABAR: - pDlg = new ScDataBarSettingsDlg( pParent, pDoc ); - break; - default: - break; - } - if(pDlg) - return new AbstractScDataBarSettingsDlg_Impl( pDlg ); - - return NULL; -} - - AbstractScDataPilotDatabaseDlg * ScAbstractDialogFactory_Impl::CreateScDataPilotDatabaseDlg (Window* pParent , int nId ) { diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index 60c4e6d6f199..dfbd7fd272c7 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -63,8 +63,6 @@ class ScTabBgColorDlg; class ScImportOptionsDlg; class SfxTabDialog; class ScTextImportOptionsDlg; -class ScDataBarSettingsDlg; -class ScCondFormatDlg; class ScCondFormatManagerDlg; #define DECL_ABSTDLG_BASE(Class,DialogClass) \ @@ -136,13 +134,6 @@ class AbstractScColRowLabelDlg_Impl : public AbstractScColRowLabelDlg //add for virtual sal_Bool IsRow(); }; -class AbstractScCondFormatDlg_Impl : public AbstractScCondFormatDlg -{ - DECL_ABSTDLG_BASE(AbstractScCondFormatDlg_Impl, ScCondFormatDlg) - - virtual ScConditionalFormat* GetConditionalFormat(); -}; - class AbstractScCondFormatManagerDlg_Impl : public AbstractScCondFormatManagerDlg { DECL_ABSTDLG_BASE(AbstractScCondFormatManagerDlg_Impl, ScCondFormatManagerDlg) @@ -152,11 +143,6 @@ class AbstractScCondFormatManagerDlg_Impl : public AbstractScCondFormatManagerDl virtual bool CondFormatsChanged(); }; -class AbstractScDataBarSettingsDlg_Impl : public AbstractScDataBarSettingsDlg -{ - DECL_ABSTDLG_BASE(AbstractScDataBarSettingsDlg_Impl, ScDataBarSettingsDlg) -}; - class AbstractScDataPilotDatabaseDlg_Impl :public AbstractScDataPilotDatabaseDlg //add for ScDataPilotDatabaseDlg { DECL_ABSTDLG_BASE(AbstractScDataPilotDatabaseDlg_Impl, ScDataPilotDatabaseDlg) @@ -435,14 +421,9 @@ public: virtual VclAbstractDialog * CreateScSortWarningDlg( Window* pParent, const String& rExtendText, const String& rCurrentText, int nId ); - virtual AbstractScCondFormatDlg* CreateScCondFormatDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormat* pFormat, - const ScRangeList& rRange, const ScAddress& rPos, int nId ); //add for ScDataBarSettingsDlg - virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, const ScAddress& rPos, int nId ); - virtual AbstractScDataBarSettingsDlg* CreateScDataBarSetttingsDlg (Window* pParent, ScDocument* pDoc, int nId ); //add for ScDataBarSettingsDlg - virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg (Window* pParent ,int nId ); //add for ScDataPilotDatabaseDlg virtual AbstractScDataPilotSourceTypeDlg * CreateScDataPilotSourceTypeDlg ( Window* pParent, sal_Bool bEnableExternal, int nId ) ; //add for ScDataPilotSourceTypeDlg diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index 4c5708a00c84..ce539d4e5ddf 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -46,6 +46,7 @@ #include "conditio.hxx" #include "colorscale.hxx" #include "colorformat.hxx" +#include "reffact.hxx" #include "globstr.hrc" @@ -1111,9 +1112,9 @@ void ScCondFormatList::DoScroll(long nDelta) mpScrollBar->SetPosPixel(aNewPoint); } -ScCondFormatDlg::ScCondFormatDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormat* pFormat, const ScRangeList& rRange, +ScCondFormatDlg::ScCondFormatDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScDocument* pDoc, const ScConditionalFormat* pFormat, const ScRangeList& rRange, const ScAddress& rPos, condformat::dialog::ScCondFormatDialogType eType): - ModalDialog(pParent, ScResId( RID_SCDLG_CONDFORMAT )), + ScAnyRefDlg(pB, pCW, pParent, RID_SCDLG_CONDFORMAT ), maBtnAdd( this, ScResId( BTN_ADD ) ), maBtnRemove( this, ScResId( BTN_REMOVE ) ), maBtnOk( this, ScResId( BTN_OK ) ), @@ -1134,11 +1135,26 @@ ScCondFormatDlg::ScCondFormatDlg(Window* pParent, ScDocument* pDoc, const ScCond maBtnRemove.SetClickHdl( LINK( &maCondFormList, ScCondFormatList, RemoveBtnHdl ) ); maEdRange.SetModifyHdl( LINK( this, ScCondFormatDlg, EdRangeModifyHdl ) ); maBtnOk.SetClickHdl( LINK( this, ScCondFormatDlg, OkBtnHdl ) ); + maBtnCancel.SetClickHdl( LINK( this, ScCondFormatDlg, CancelBtnHdl ) ); FreeResource(); maEdRange.SetText(aRangeString); } +ScCondFormatDlg::~ScCondFormatDlg() +{ +} + +void ScCondFormatDlg::SetActive() +{ + +} + +void ScCondFormatDlg::SetReference(const ScRange&, ScDocument*) +{ + +} + ScConditionalFormat* ScCondFormatDlg::GetConditionalFormat() const { rtl::OUString aRangeStr = maEdRange.GetText(); @@ -1210,16 +1226,14 @@ IMPL_LINK( ScCondFormatDlg, EdRangeModifyHdl, Edit*, pEdit ) IMPL_LINK_NOARG( ScCondFormatDlg, OkBtnHdl ) { - rtl::OUString aRangeStr = maEdRange.GetText(); - ScRangeList aRange; - aRange.Parse(aRangeStr, mpDoc, SCA_VALID, mpDoc->GetAddressConvention()); - boost::scoped_ptr pFormat(maCondFormList.GetConditionalFormat()); - if(pFormat && pFormat->GetRange().empty() && aRange.empty()) - return 0; - else - { - EndDialog(RET_OK); - } + DoClose( ScCondFormatDlgWrapper::GetChildWindowId() ); + + return 0; +} + +IMPL_LINK_NOARG( ScCondFormatDlg, CancelBtnHdl ) +{ + DoClose( ScCondFormatDlgWrapper::GetChildWindowId() ); return 0; } diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx index 0bd35387f793..16c8291cb938 100644 --- a/sc/source/ui/condformat/condformatmgr.cxx +++ b/sc/source/ui/condformat/condformatmgr.cxx @@ -216,8 +216,8 @@ IMPL_LINK_NOARG(ScCondFormatManagerDlg, EditBtnHdl) if(!pFormat) return 0; - boost::scoped_ptr pDlg(new ScCondFormatDlg(this, mpDoc, pFormat, pFormat->GetRange(), - pFormat->GetRange().GetTopLeftCorner(), condformat::dialog::NONE)); + boost::scoped_ptr pDlg;//(new ScCondFormatDlg(this, mpDoc, pFormat, pFormat->GetRange(), + // pFormat->GetRange().GetTopLeftCorner(), condformat::dialog::NONE)); if(pDlg->Execute() == RET_OK) { sal_Int32 nKey = pFormat->GetKey(); @@ -252,8 +252,8 @@ sal_uInt32 FindKey(ScConditionalFormatList* pFormatList) IMPL_LINK_NOARG(ScCondFormatManagerDlg, AddBtnHdl) { - boost::scoped_ptr pDlg(new ScCondFormatDlg(this, mpDoc, NULL, ScRangeList(), - maPos, condformat::dialog::CONDITION)); + boost::scoped_ptr pDlg;//(new ScCondFormatDlg(this, mpDoc, NULL, ScRangeList(), + // maPos, condformat::dialog::CONDITION)); if(pDlg->Execute() == RET_OK) { ScConditionalFormat* pNewFormat = pDlg->GetConditionalFormat(); diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx index 52c03e504468..8fbf5b11c9b7 100644 --- a/sc/source/ui/inc/condformatdlg.hxx +++ b/sc/source/ui/inc/condformatdlg.hxx @@ -40,6 +40,7 @@ #include #include +#include "anyrefdg.hxx" class ScDocument; class ScConditionalFormat; @@ -189,7 +190,7 @@ public: }; -class ScCondFormatDlg : public ModalDialog +class ScCondFormatDlg : public ScAnyRefDlg { private: PushButton maBtnAdd; @@ -206,11 +207,17 @@ private: DECL_LINK( EdRangeModifyHdl, Edit* ); DECL_LINK( OkBtnHdl, void* ); + DECL_LINK( CancelBtnHdl, void* ); public: - ScCondFormatDlg(Window* pWindow, ScDocument* pDoc, const ScConditionalFormat* pFormat, const ScRangeList& rRange, const ScAddress& rPos, condformat::dialog::ScCondFormatDialogType eType); + ScCondFormatDlg(SfxBindings* pB, SfxChildWindow* pSW, Window* pWindow, ScDocument* pDoc, const ScConditionalFormat* pFormat, + const ScRangeList& rRange, const ScAddress& rPos, condformat::dialog::ScCondFormatDialogType eType); + virtual ~ScCondFormatDlg(); - ScConditionalFormat* GetConditionalFormat() const; + SC_DLLPUBLIC ScConditionalFormat* GetConditionalFormat() const; + + virtual void SetReference(const ScRange&, ScDocument*); + virtual void SetActive(); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/condformathelper.hxx b/sc/source/ui/inc/condformathelper.hxx index 99f5b59cdfb1..48c269de0bd6 100644 --- a/sc/source/ui/inc/condformathelper.hxx +++ b/sc/source/ui/inc/condformathelper.hxx @@ -10,6 +10,8 @@ #include #include "conditio.hxx" +#include "global.hxx" + enum ScCondFormatEntryType { CONDITION, @@ -22,9 +24,9 @@ enum ScCondFormatEntryType class ScCondFormatHelper { public: - static rtl::OUString GetExpression(const ScConditionalFormat& rFormat, const ScAddress& rPos); + static SC_DLLPUBLIC rtl::OUString GetExpression(const ScConditionalFormat& rFormat, const ScAddress& rPos); - static rtl::OUString GetExpression( ScCondFormatEntryType eType, sal_Int32 nIndex ); + static SC_DLLPUBLIC rtl::OUString GetExpression( ScCondFormatEntryType eType, sal_Int32 nIndex ); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx index e7d728f5150d..2a454c257133 100644 --- a/sc/source/ui/inc/reffact.hxx +++ b/sc/source/ui/inc/reffact.hxx @@ -45,6 +45,7 @@ DECL_WRAPPER_WITHID(ScNameDlgWrapper) DECL_WRAPPER_WITHID(ScNameDefDlgWrapper) +DECL_WRAPPER_WITHID(ScCondFormatDlgWrapper) DECL_WRAPPER_WITHID(ScSolverDlgWrapper) DECL_WRAPPER_WITHID(ScOptSolverDlgWrapper) DECL_WRAPPER_WITHID(ScPivotLayoutWrapper) diff --git a/sc/source/ui/src/condformatdlg.src b/sc/source/ui/src/condformatdlg.src index 9a4977624b55..f00052a8d4dd 100644 --- a/sc/source/ui/src/condformatdlg.src +++ b/sc/source/ui/src/condformatdlg.src @@ -28,7 +28,7 @@ #include "condformatdlg.hrc" -ModalDialog RID_SCDLG_CONDFORMAT +ModelessDialog RID_SCDLG_CONDFORMAT { OutputSize = TRUE; Hide = TRUE; diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 1f970b6d0130..73eb0516372a 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -126,6 +126,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) case FID_INSERT_NAME: case SID_SPELL_DIALOG: case SID_HANGUL_HANJA_CONVERSION: + case SID_OPENDLG_CONDFRMT: + case SID_OPENDLG_COLORSCALE: + case SID_OPENDLG_DATABAR: pScMod->InputEnterHandler(); pTabViewShell->UpdateInputHandler(); @@ -1762,6 +1765,18 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } break; + case SID_OPENDLG_CONDFRMT: + case SID_OPENDLG_COLORSCALE: + case SID_OPENDLG_DATABAR: + { + sal_uInt16 nId = ScCondFormatDlgWrapper::GetChildWindowId(); + SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); + SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); + + pScMod->SetRefDialog( nId, pWnd ? false : sal_True ); + } + break; + case SID_DEFINE_COLROWNAMERANGES: { @@ -2034,56 +2049,6 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } break; - case SID_OPENDLG_CONDFRMT: - case SID_OPENDLG_COLORSCALE: - case SID_OPENDLG_DATABAR: - { - ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); - - ScRangeList aRangeList; - ScViewData* pData = GetViewData(); - pData->GetMarkData().FillRangeListWithMarks(&aRangeList, false); - ScDocument* pDoc = pData->GetDocument(); - - if(pDoc->IsTabProtected(pData->GetTabNo())) - { - pTabViewShell->ErrorMessage( STR_ERR_CONDFORMAT_PROTECTED ); - break; - } - - ScAddress aPos(pData->GetCurX(), pData->GetCurY(), pData->GetTabNo()); - if(aRangeList.empty()) - { - ScRange* pRange = new ScRange(aPos); - aRangeList.push_back(pRange); - } - - boost::scoped_ptr pDlg; - const ScConditionalFormat* pCondFormat = pDoc->GetCondFormat(aPos.Col(), aPos.Row(), aPos.Tab()); - if(pCondFormat) - { - const ScRangeList& rCondFormatRange = pCondFormat->GetRange(); - if(rCondFormatRange == aRangeList) - pDlg.reset(pFact->CreateScCondFormatDlg( pTabViewShell->GetDialogParent(), pDoc, pCondFormat, pCondFormat->GetRange(), aPos, 0 )); - } - - if(!pDlg) - { - pDlg.reset(pFact->CreateScCondFormatDlg( pTabViewShell->GetDialogParent(), pDoc, NULL, aRangeList, aRangeList.GetTopLeftCorner(), nSlot )); - } - - if(pDlg && pDlg->Execute() == RET_OK) - { - ScConditionalFormat* pFormat = pDlg->GetConditionalFormat(); - sal_uLong nOldIndex = 0; - if(pCondFormat) - nOldIndex = pCondFormat->GetKey(); - pData->GetDocShell()->GetDocFunc().ReplaceConditionalFormat( nOldIndex, pFormat, pData->GetTabNo(), pFormat->GetRange() ); - } - } - break; - case SID_OPENDLG_CONDFRMT_MANAGER: { ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); @@ -2110,33 +2075,6 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } break; - case SID_COLORSCALE: - { - ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); - - ScDocument* pDoc = GetViewData()->GetDocument(); - boost::scoped_ptr pDlg(pFact->CreateScDataBarSetttingsDlg( pTabViewShell->GetDialogParent(), pDoc, RID_SCDLG_DATABAR )); - OSL_ENSURE(pDlg, "Dialog create fail!"); - pDlg->Execute(); - } - break; - - case SID_DATABAR: - { - ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); - - ScDocument* pDoc = GetViewData()->GetDocument(); - boost::scoped_ptr pDlg(pFact->CreateScDataBarSetttingsDlg( pTabViewShell->GetDialogParent(), pDoc, RID_SCDLG_DATABAR )); - OSL_ENSURE(pDlg, "Dialog create fail!"); - if(pDlg->Execute() == RET_OK) - { - //add here code that handles the data bar inserting - } - } - break; - case SID_EXTERNAL_SOURCE: { String aFile; diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx index 746d7b283d0e..b31b1b2ac744 100644 --- a/sc/source/ui/view/reffact.cxx +++ b/sc/source/ui/view/reffact.cxx @@ -44,6 +44,7 @@ SFX_IMPL_MODELESSDIALOG_WITHID(ScNameDlgWrapper, FID_DEFINE_NAME ) SFX_IMPL_MODELESSDIALOG_WITHID(ScNameDefDlgWrapper, FID_ADD_NAME ) +SFX_IMPL_MODELESSDIALOG_WITHID(ScCondFormatDlgWrapper, SID_OPENDLG_CONDFRMT ) SFX_IMPL_MODELESSDIALOG_WITHID(ScSolverDlgWrapper, SID_OPENDLG_SOLVE ) SFX_IMPL_MODELESSDIALOG_WITHID(ScOptSolverDlgWrapper, SID_OPENDLG_OPTSOLVER ) SFX_IMPL_MODELESSDIALOG_WITHID(ScPivotLayoutWrapper, SID_OPENDLG_PIVOTTABLE ) @@ -115,6 +116,12 @@ IMPL_CHILD_CTOR( ScNameDlgWrapper, FID_DEFINE_NAME ) IMPL_CHILD_CTOR( ScNameDefDlgWrapper, FID_ADD_NAME ) +//------------------------------------------------------------------------- +// ScNameDlgWrapper +//------------------------------------------------------------------------- + +IMPL_CHILD_CTOR( ScCondFormatDlgWrapper, SID_OPENDLG_CONDFRMT ) + //------------------------------------------------------------------------- // ScSolverDlgWrapper //------------------------------------------------------------------------- diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx index 6c976cb6e6ec..d4928196a425 100644 --- a/sc/source/ui/view/tabvwsh.cxx +++ b/sc/source/ui/view/tabvwsh.cxx @@ -63,6 +63,7 @@ SFX_IMPL_INTERFACE(ScTabViewShell,SfxViewShell,ScResId(SCSTR_TABVIEWSHELL)) SFX_CHILDWINDOW_REGISTRATION(SID_TASKPANE); SFX_CHILDWINDOW_REGISTRATION(ScNameDlgWrapper::GetChildWindowId()); SFX_CHILDWINDOW_REGISTRATION(ScNameDefDlgWrapper::GetChildWindowId()); + SFX_CHILDWINDOW_REGISTRATION(ScCondFormatDlgWrapper::GetChildWindowId()); SFX_CHILDWINDOW_REGISTRATION(ScSolverDlgWrapper::GetChildWindowId()); SFX_CHILDWINDOW_REGISTRATION(ScOptSolverDlgWrapper::GetChildWindowId()); SFX_CHILDWINDOW_REGISTRATION(ScPivotLayoutWrapper::GetChildWindowId()); diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx index a92fca945f8b..aeb7f3bee453 100644 --- a/sc/source/ui/view/tabvwshc.cxx +++ b/sc/source/ui/view/tabvwshc.cxx @@ -63,6 +63,9 @@ #include "dpobject.hxx" #include "markdata.hxx" #include "reffact.hxx" +#include "condformatdlg.hxx" + +#include //------------------------------------------------------------------ @@ -180,6 +183,59 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( } break; + case SID_OPENDLG_CONDFRMT: + case SID_OPENDLG_COLORSCALE: + case SID_OPENDLG_DATABAR: + { + std::cout << "Open Dlg" << std::endl; + ScRangeList aRangeList; + ScViewData* pData = GetViewData(); + pData->GetMarkData().FillRangeListWithMarks(&aRangeList, false); + + if(pDoc->IsTabProtected(pData->GetTabNo())) + { + ErrorMessage( STR_ERR_CONDFORMAT_PROTECTED ); + break; + } + + ScAddress aPos(pData->GetCurX(), pData->GetCurY(), pData->GetTabNo()); + if(aRangeList.empty()) + { + ScRange* pRange = new ScRange(aPos); + aRangeList.push_back(pRange); + } + + const ScConditionalFormat* pCondFormat = pDoc->GetCondFormat(aPos.Col(), aPos.Row(), aPos.Tab()); + if(pCondFormat) + { + const ScRangeList& rCondFormatRange = pCondFormat->GetRange(); + if(rCondFormatRange == aRangeList) + pResult = new ScCondFormatDlg( pB, pCW, pParent, pDoc, NULL, rCondFormatRange, aPos, condformat::dialog::NONE ); + } + + if(!pResult) + { + condformat::dialog::ScCondFormatDialogType eType = condformat::dialog::NONE; + switch(nSlotId) + { + case SID_OPENDLG_CONDFRMT: + eType = condformat::dialog::CONDITION; + break; + case SID_OPENDLG_COLORSCALE: + eType = condformat::dialog::COLORSCALE; + break; + case SID_OPENDLG_DATABAR: + eType = condformat::dialog::DATABAR; + break; + default: + break; + } + pResult = new ScCondFormatDlg( pB, pCW, pParent, pDoc, NULL, aRangeList, aRangeList.GetTopLeftCorner(), eType ); + } + } + + break; + case SID_DEFINE_COLROWNAMERANGES: { pResult = new ScColRowNameRangesDlg( pB, pCW, pParent, GetViewData() ); From a1e53f7d14948c714382ae0961303b963bddc1e8 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Sun, 7 Oct 2012 03:22:22 +0200 Subject: [PATCH 566/863] make the different options to cal the dialog work again Change-Id: I947a4cac8f0417737bb8833eab54c67e57c8293e --- sc/source/ui/app/scdll.cxx | 4 +++- sc/source/ui/condformat/condformatdlg.cxx | 27 ++++++++++++++++++++--- sc/source/ui/inc/condformatdlg.hxx | 5 +++++ sc/source/ui/inc/reffact.hxx | 4 +++- sc/source/ui/view/cellsh1.cxx | 16 +++++++++++++- sc/source/ui/view/reffact.cxx | 20 ++++++++++++++--- sc/source/ui/view/tabvwsh.cxx | 4 +++- sc/source/ui/view/tabvwshc.cxx | 3 --- 8 files changed, 70 insertions(+), 13 deletions(-) diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index 5f8540d1728d..6d567128a1ac 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -259,7 +259,9 @@ void ScDLL::Init() ScOptSolverDlgWrapper ::RegisterChildWindow(false, pMod); ScNameDlgWrapper ::RegisterChildWindow(false, pMod); ScNameDefDlgWrapper ::RegisterChildWindow(false, pMod); - ScCondFormatDlgWrapper ::RegisterChildWindow(false, pMod); + ScCondFormatConditionDlgWrapper ::RegisterChildWindow(false, pMod); + ScCondFormatColorScaleDlgWrapper ::RegisterChildWindow(false, pMod); + ScCondFormatDataBarDlgWrapper ::RegisterChildWindow(false, pMod); ScPivotLayoutWrapper ::RegisterChildWindow(false, pMod); ScTabOpDlgWrapper ::RegisterChildWindow(false, pMod); ScFilterDlgWrapper ::RegisterChildWindow(false, pMod); diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index ce539d4e5ddf..6544e1c8f409 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -1123,7 +1123,8 @@ ScCondFormatDlg::ScCondFormatDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* p maEdRange( this, ScResId( ED_RANGE ) ), maCondFormList( this, ScResId( CTRL_LIST ), pDoc, pFormat, rRange, rPos, eType ), maPos(rPos), - mpDoc(pDoc) + mpDoc(pDoc), + meType(eType) { rtl::OUStringBuffer aTitle( GetText() ); aTitle.append(rtl::OUString(" ")); @@ -1224,16 +1225,36 @@ IMPL_LINK( ScCondFormatDlg, EdRangeModifyHdl, Edit*, pEdit ) return 0; } +sal_Bool ScCondFormatDlg::Close() +{ + sal_uInt16 nId = 0; + switch(meType) + { + case condformat::dialog::NONE: + case condformat::dialog::CONDITION: + nId = ScCondFormatConditionDlgWrapper::GetChildWindowId(); + break; + case condformat::dialog::COLORSCALE: + nId = ScCondFormatColorScaleDlgWrapper::GetChildWindowId(); + break; + case condformat::dialog::DATABAR: + nId = ScCondFormatDataBarDlgWrapper::GetChildWindowId(); + break; + } + + return DoClose(nId); +} + IMPL_LINK_NOARG( ScCondFormatDlg, OkBtnHdl ) { - DoClose( ScCondFormatDlgWrapper::GetChildWindowId() ); + Close(); return 0; } IMPL_LINK_NOARG( ScCondFormatDlg, CancelBtnHdl ) { - DoClose( ScCondFormatDlgWrapper::GetChildWindowId() ); + Close(); return 0; } diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx index 8fbf5b11c9b7..529cd149ab32 100644 --- a/sc/source/ui/inc/condformatdlg.hxx +++ b/sc/source/ui/inc/condformatdlg.hxx @@ -205,10 +205,14 @@ private: ScAddress maPos; ScDocument* mpDoc; + condformat::dialog::ScCondFormatDialogType meType; + DECL_LINK( EdRangeModifyHdl, Edit* ); DECL_LINK( OkBtnHdl, void* ); DECL_LINK( CancelBtnHdl, void* ); + virtual sal_Bool Close(); + public: ScCondFormatDlg(SfxBindings* pB, SfxChildWindow* pSW, Window* pWindow, ScDocument* pDoc, const ScConditionalFormat* pFormat, const ScRangeList& rRange, const ScAddress& rPos, condformat::dialog::ScCondFormatDialogType eType); @@ -218,6 +222,7 @@ public: virtual void SetReference(const ScRange&, ScDocument*); virtual void SetActive(); + virtual sal_Bool IsTableLocked() const { return sal_True; } }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx index 2a454c257133..e906e8c6cb4b 100644 --- a/sc/source/ui/inc/reffact.hxx +++ b/sc/source/ui/inc/reffact.hxx @@ -45,7 +45,9 @@ DECL_WRAPPER_WITHID(ScNameDlgWrapper) DECL_WRAPPER_WITHID(ScNameDefDlgWrapper) -DECL_WRAPPER_WITHID(ScCondFormatDlgWrapper) +DECL_WRAPPER_WITHID(ScCondFormatConditionDlgWrapper) +DECL_WRAPPER_WITHID(ScCondFormatColorScaleDlgWrapper) +DECL_WRAPPER_WITHID(ScCondFormatDataBarDlgWrapper) DECL_WRAPPER_WITHID(ScSolverDlgWrapper) DECL_WRAPPER_WITHID(ScOptSolverDlgWrapper) DECL_WRAPPER_WITHID(ScPivotLayoutWrapper) diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 73eb0516372a..6cfd3f8cea88 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -1769,7 +1769,21 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) case SID_OPENDLG_COLORSCALE: case SID_OPENDLG_DATABAR: { - sal_uInt16 nId = ScCondFormatDlgWrapper::GetChildWindowId(); + sal_uInt16 nId = 0; + switch( nSlot ) + { + case SID_OPENDLG_CONDFRMT: + nId = ScCondFormatConditionDlgWrapper::GetChildWindowId(); + break; + case SID_OPENDLG_COLORSCALE: + nId = ScCondFormatColorScaleDlgWrapper::GetChildWindowId(); + break; + case SID_OPENDLG_DATABAR: + nId = ScCondFormatDataBarDlgWrapper::GetChildWindowId(); + break; + default: + break; + } SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx index b31b1b2ac744..dfc2b1deab24 100644 --- a/sc/source/ui/view/reffact.cxx +++ b/sc/source/ui/view/reffact.cxx @@ -44,7 +44,9 @@ SFX_IMPL_MODELESSDIALOG_WITHID(ScNameDlgWrapper, FID_DEFINE_NAME ) SFX_IMPL_MODELESSDIALOG_WITHID(ScNameDefDlgWrapper, FID_ADD_NAME ) -SFX_IMPL_MODELESSDIALOG_WITHID(ScCondFormatDlgWrapper, SID_OPENDLG_CONDFRMT ) +SFX_IMPL_MODELESSDIALOG_WITHID(ScCondFormatConditionDlgWrapper, SID_OPENDLG_CONDFRMT ) +SFX_IMPL_MODELESSDIALOG_WITHID(ScCondFormatColorScaleDlgWrapper, SID_OPENDLG_COLORSCALE ) +SFX_IMPL_MODELESSDIALOG_WITHID(ScCondFormatDataBarDlgWrapper, SID_OPENDLG_DATABAR ) SFX_IMPL_MODELESSDIALOG_WITHID(ScSolverDlgWrapper, SID_OPENDLG_SOLVE ) SFX_IMPL_MODELESSDIALOG_WITHID(ScOptSolverDlgWrapper, SID_OPENDLG_OPTSOLVER ) SFX_IMPL_MODELESSDIALOG_WITHID(ScPivotLayoutWrapper, SID_OPENDLG_PIVOTTABLE ) @@ -117,10 +119,22 @@ IMPL_CHILD_CTOR( ScNameDlgWrapper, FID_DEFINE_NAME ) IMPL_CHILD_CTOR( ScNameDefDlgWrapper, FID_ADD_NAME ) //------------------------------------------------------------------------- -// ScNameDlgWrapper +// ScCondFormatConditionDlgWrapper //------------------------------------------------------------------------- -IMPL_CHILD_CTOR( ScCondFormatDlgWrapper, SID_OPENDLG_CONDFRMT ) +IMPL_CHILD_CTOR( ScCondFormatConditionDlgWrapper, SID_OPENDLG_CONDFRMT ) + +//------------------------------------------------------------------------- +// ScCondFormatColorScaleDlgWrapper +//------------------------------------------------------------------------- + +IMPL_CHILD_CTOR( ScCondFormatColorScaleDlgWrapper, SID_OPENDLG_COLORSCALE ) + +//------------------------------------------------------------------------- +// ScCondFormatDataBarDlgWrapper +//------------------------------------------------------------------------- + +IMPL_CHILD_CTOR( ScCondFormatDataBarDlgWrapper, SID_OPENDLG_DATABAR ) //------------------------------------------------------------------------- // ScSolverDlgWrapper diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx index d4928196a425..4e744a0b9466 100644 --- a/sc/source/ui/view/tabvwsh.cxx +++ b/sc/source/ui/view/tabvwsh.cxx @@ -63,7 +63,9 @@ SFX_IMPL_INTERFACE(ScTabViewShell,SfxViewShell,ScResId(SCSTR_TABVIEWSHELL)) SFX_CHILDWINDOW_REGISTRATION(SID_TASKPANE); SFX_CHILDWINDOW_REGISTRATION(ScNameDlgWrapper::GetChildWindowId()); SFX_CHILDWINDOW_REGISTRATION(ScNameDefDlgWrapper::GetChildWindowId()); - SFX_CHILDWINDOW_REGISTRATION(ScCondFormatDlgWrapper::GetChildWindowId()); + SFX_CHILDWINDOW_REGISTRATION(ScCondFormatConditionDlgWrapper::GetChildWindowId()); + SFX_CHILDWINDOW_REGISTRATION(ScCondFormatColorScaleDlgWrapper::GetChildWindowId()); + SFX_CHILDWINDOW_REGISTRATION(ScCondFormatDataBarDlgWrapper::GetChildWindowId()); SFX_CHILDWINDOW_REGISTRATION(ScSolverDlgWrapper::GetChildWindowId()); SFX_CHILDWINDOW_REGISTRATION(ScOptSolverDlgWrapper::GetChildWindowId()); SFX_CHILDWINDOW_REGISTRATION(ScPivotLayoutWrapper::GetChildWindowId()); diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx index aeb7f3bee453..6ef470ac9d23 100644 --- a/sc/source/ui/view/tabvwshc.cxx +++ b/sc/source/ui/view/tabvwshc.cxx @@ -65,8 +65,6 @@ #include "reffact.hxx" #include "condformatdlg.hxx" -#include - //------------------------------------------------------------------ void ScTabViewShell::SetCurRefDlgId( sal_uInt16 nNew ) @@ -187,7 +185,6 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( case SID_OPENDLG_COLORSCALE: case SID_OPENDLG_DATABAR: { - std::cout << "Open Dlg" << std::endl; ScRangeList aRangeList; ScViewData* pData = GetViewData(); pData->GetMarkData().FillRangeListWithMarks(&aRangeList, false); From 5240022f55b65900112b332a085a6ca652156e30 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Sun, 7 Oct 2012 05:58:04 +0200 Subject: [PATCH 567/863] change to ref input field for range edit Change-Id: I69eb352869e0bcaa362bb1be6022d30de8c2658c --- sc/source/ui/condformat/condformatdlg.cxx | 37 +++++++++++++++++++++-- sc/source/ui/inc/condformatdlg.hrc | 1 + sc/source/ui/inc/condformatdlg.hxx | 9 +++++- sc/source/ui/src/condformatdlg.src | 8 ++++- 4 files changed, 50 insertions(+), 5 deletions(-) diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index 6544e1c8f409..eaeb6d15ed7b 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -1120,7 +1120,8 @@ ScCondFormatDlg::ScCondFormatDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* p maBtnOk( this, ScResId( BTN_OK ) ), maBtnCancel( this, ScResId( BTN_CANCEL ) ), maFtRange( this, ScResId( FT_RANGE ) ), - maEdRange( this, ScResId( ED_RANGE ) ), + maEdRange( this, this, ScResId( ED_RANGE ) ), + maRbRange( this, ScResId( RB_RANGE ), &maEdRange, this ), maCondFormList( this, ScResId( CTRL_LIST ), pDoc, pFormat, rRange, rPos, eType ), maPos(rPos), mpDoc(pDoc), @@ -1137,6 +1138,7 @@ ScCondFormatDlg::ScCondFormatDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* p maEdRange.SetModifyHdl( LINK( this, ScCondFormatDlg, EdRangeModifyHdl ) ); maBtnOk.SetClickHdl( LINK( this, ScCondFormatDlg, OkBtnHdl ) ); maBtnCancel.SetClickHdl( LINK( this, ScCondFormatDlg, CancelBtnHdl ) ); + maEdRange.SetGetFocusHdl( LINK( this, ScCondFormatDlg, RangeGetFocusHdl ) ); FreeResource(); maEdRange.SetText(aRangeString); @@ -1148,12 +1150,36 @@ ScCondFormatDlg::~ScCondFormatDlg() void ScCondFormatDlg::SetActive() { - + maEdRange.GrabFocus(); + RefInputDone(); } -void ScCondFormatDlg::SetReference(const ScRange&, ScDocument*) +void ScCondFormatDlg::RefInputDone( sal_Bool bForced ) { + ScAnyRefDlg::RefInputDone(bForced); +} +sal_Bool ScCondFormatDlg::IsRefInputMode() const +{ + return maEdRange.IsEnabled(); +} + +#define ABS_SREF SCA_VALID \ + | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE +#define ABS_DREF ABS_SREF \ + | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE + +void ScCondFormatDlg::SetReference(const ScRange& rRef, ScDocument*) +{ + if( maEdRange.IsEnabled() ) + { + if(rRef.aStart != rRef.aEnd) + RefInputStart(&maEdRange); + + rtl::OUString aRefStr; + rRef.Format( aRefStr, ABS_DREF, mpDoc, ScAddress::Details(mpDoc->GetAddressConvention(), 0, 0) ); + maEdRange.SetRefString( aRefStr ); + } } ScConditionalFormat* ScCondFormatDlg::GetConditionalFormat() const @@ -1259,5 +1285,10 @@ IMPL_LINK_NOARG( ScCondFormatDlg, CancelBtnHdl ) return 0; } +IMPL_LINK_NOARG( ScCondFormatDlg, RangeGetFocusHdl ) +{ + return 0; +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/condformatdlg.hrc b/sc/source/ui/inc/condformatdlg.hrc index 98bf32a707ef..960faec13048 100644 --- a/sc/source/ui/inc/condformatdlg.hrc +++ b/sc/source/ui/inc/condformatdlg.hrc @@ -57,5 +57,6 @@ #define FT_RANGE 32 #define ED_RANGE 33 +#define RB_RANGE 34 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx index 529cd149ab32..7c4cd8115d88 100644 --- a/sc/source/ui/inc/condformatdlg.hxx +++ b/sc/source/ui/inc/condformatdlg.hxx @@ -198,7 +198,8 @@ private: OKButton maBtnOk; CancelButton maBtnCancel; FixedText maFtRange; - Edit maEdRange; + formula::RefEdit maEdRange; + formula::RefButton maRbRange; ScCondFormatList maCondFormList; @@ -210,8 +211,13 @@ private: DECL_LINK( EdRangeModifyHdl, Edit* ); DECL_LINK( OkBtnHdl, void* ); DECL_LINK( CancelBtnHdl, void* ); + DECL_LINK( RangeGetFocusHdl, void* ); virtual sal_Bool Close(); +protected: + + virtual void RefInputDone( sal_Bool bForced = false ); + public: ScCondFormatDlg(SfxBindings* pB, SfxChildWindow* pSW, Window* pWindow, ScDocument* pDoc, const ScConditionalFormat* pFormat, @@ -221,6 +227,7 @@ public: SC_DLLPUBLIC ScConditionalFormat* GetConditionalFormat() const; virtual void SetReference(const ScRange&, ScDocument*); + virtual sal_Bool IsRefInputMode() const; virtual void SetActive(); virtual sal_Bool IsTableLocked() const { return sal_True; } }; diff --git a/sc/source/ui/src/condformatdlg.src b/sc/source/ui/src/condformatdlg.src index f00052a8d4dd..e7fa731144b9 100644 --- a/sc/source/ui/src/condformatdlg.src +++ b/sc/source/ui/src/condformatdlg.src @@ -77,7 +77,13 @@ ModelessDialog RID_SCDLG_CONDFORMAT Edit ED_RANGE { Pos = MAP_APPFONT( 60, 262 ); - Size = MAP_APPFONT( 200, 14 ); + Size = MAP_APPFONT( 182, 14 ); + Border = TRUE; + }; + ImageButton RB_RANGE + { + Pos = MAP_APPFONT( 245, 262 ); + Size = MAP_APPFONT( 14, 14 ); Border = TRUE; }; }; From 1491483543ae6d32d7d487c26ca94a734f157532 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Mon, 8 Oct 2012 03:31:16 +0200 Subject: [PATCH 568/863] split the cond format entry code a bit up Change-Id: Ib066c18d54ac40c24b51ca5c399d09482897709f --- sc/Library_sc.mk | 1 + sc/source/ui/condformat/condformatdlg.cxx | 1062 ++--------------- .../ui/condformat/condformatdlgentry.cxx | 737 ++++++++++++ sc/source/ui/inc/condformatdlg.hxx | 102 +- sc/source/ui/inc/condformatdlgentry.hxx | 125 ++ 5 files changed, 936 insertions(+), 1091 deletions(-) create mode 100644 sc/source/ui/condformat/condformatdlgentry.cxx create mode 100644 sc/source/ui/inc/condformatdlgentry.hxx diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index f7c73d7c1cad..f4cdafa8dbb7 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -330,6 +330,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/ui/cctrl/tbinsert \ sc/source/ui/cctrl/tbzoomsliderctrl \ sc/source/ui/condformat/condformatdlg \ + sc/source/ui/condformat/condformatdlgentry \ sc/source/ui/condformat/condformathelper \ sc/source/ui/condformat/colorformat \ sc/source/ui/dbgui/asciiopt \ diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index eaeb6d15ed7b..730e7bf88470 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -47,955 +47,13 @@ #include "colorscale.hxx" #include "colorformat.hxx" #include "reffact.hxx" +#include "condformatdlgentry.hxx" #include "globstr.hrc" #include #include -namespace { - -void SetColorScaleEntryTypes( const ScColorScaleEntry& rEntry, ListBox& rLbType, Edit& rEdit, ColorListBox& rLbCol ) -{ - switch(rEntry.GetType()) - { - case COLORSCALE_MIN: - rLbType.SelectEntryPos(0); - break; - case COLORSCALE_MAX: - rLbType.SelectEntryPos(1); - break; - case COLORSCALE_PERCENTILE: - rEdit.SetText(rtl::OUString::valueOf(rEntry.GetValue())); - rLbType.SelectEntryPos(2); - break; - case COLORSCALE_PERCENT: - rEdit.SetText(rtl::OUString::valueOf(rEntry.GetValue())); - rLbType.SelectEntryPos(4); - break; - case COLORSCALE_FORMULA: - rEdit.SetText(rEntry.GetFormula(formula::FormulaGrammar::GRAM_DEFAULT)); - rLbType.SelectEntryPos(5); - break; - case COLORSCALE_VALUE: - rEdit.SetText(rtl::OUString::valueOf(rEntry.GetValue())); - rLbType.SelectEntryPos(3); - break; - case COLORSCALE_AUTOMIN: - rLbType.SelectEntryPos(6); - break; - case COLORSCALE_AUTOMAX: - rLbType.SelectEntryPos(7); - break; - } - rLbCol.SelectEntry(rEntry.GetColor()); -} - -void SetDataBarEntryTypes( const ScColorScaleEntry& rEntry, ListBox& rLbType, Edit& rEdit ) -{ - switch(rEntry.GetType()) - { - case COLORSCALE_MIN: - rLbType.SelectEntryPos(0); - break; - case COLORSCALE_MAX: - rLbType.SelectEntryPos(1); - break; - case COLORSCALE_PERCENTILE: - rEdit.SetText(rtl::OUString::valueOf(rEntry.GetValue())); - rLbType.SelectEntryPos(2); - break; - case COLORSCALE_PERCENT: - rEdit.SetText(rtl::OUString::valueOf(rEntry.GetValue())); - rLbType.SelectEntryPos(4); - break; - case COLORSCALE_FORMULA: - rEdit.SetText(rEntry.GetFormula(formula::FormulaGrammar::GRAM_DEFAULT)); - rLbType.SelectEntryPos(5); - break; - case COLORSCALE_VALUE: - rEdit.SetText(rtl::OUString::valueOf(rEntry.GetValue())); - rLbType.SelectEntryPos(3); - break; - case COLORSCALE_AUTOMIN: - rLbType.SelectEntryPos(6); - break; - case COLORSCALE_AUTOMAX: - rLbType.SelectEntryPos(7); - break; - } -} - -} - -ScCondFrmtEntry::ScCondFrmtEntry(Window* pParent, ScDocument* pDoc, const ScAddress& rPos): - Control(pParent, ScResId( RID_COND_ENTRY ) ), - mbActive(false), - meType(CONDITION), - maLbType( this, ScResId( LB_TYPE ) ), - maFtCondNr( this, ScResId( FT_COND_NR ) ), - maFtCondition( this, ScResId( FT_CONDITION ) ), - maLbCondType( this, ScResId( LB_CELLIS_TYPE ) ), - maEdVal1( this, ScResId( ED_VAL1 ) ), - maEdVal2( this, ScResId( ED_VAL2 ) ), - maFtStyle( this, ScResId( FT_STYLE ) ), - maLbStyle( this, ScResId( LB_STYLE ) ), - maWdPreview( this, ScResId( WD_PREVIEW ) ), - maLbColorFormat( this, ScResId( LB_COLOR_FORMAT ) ), - maLbColScale2( this, ScResId( LB_COL_SCALE2 ) ), - maLbColScale3( this, ScResId( LB_COL_SCALE3 ) ), - maLbEntryTypeMin( this, ScResId( LB_TYPE_COL_SCALE ) ), - maLbEntryTypeMiddle( this, ScResId( LB_TYPE_COL_SCALE ) ), - maLbEntryTypeMax( this, ScResId( LB_TYPE_COL_SCALE ) ), - maEdMin( this, ScResId( ED_COL_SCALE ) ), - maEdMiddle( this, ScResId( ED_COL_SCALE ) ), - maEdMax( this, ScResId( ED_COL_SCALE ) ), - maLbColMin( this, ScResId( LB_COL) ), - maLbColMiddle( this, ScResId( LB_COL) ), - maLbColMax( this, ScResId( LB_COL) ), - maLbDataBarMinType( this, ScResId( LB_TYPE_COL_SCALE ) ), - maLbDataBarMaxType( this, ScResId( LB_TYPE_COL_SCALE ) ), - maEdDataBarMin( this, ScResId( ED_COL_SCALE ) ), - maEdDataBarMax( this, ScResId( ED_COL_SCALE ) ), - maBtOptions( this, ScResId( BTN_OPTIONS ) ), - mpDoc(pDoc), - maPos(rPos), - mnIndex(0), - maStrCondition(ScResId( STR_CONDITION ).toString()) -{ - SetControlBackground(GetSettings().GetStyleSettings().GetDialogColor()); - FreeResource(); - - maLbType.SelectEntryPos(1); - maLbCondType.SelectEntryPos(0); - maEdVal2.Hide(); - - maLbStyle.SetSeparatorPos(0); - - //disable entries for color formats - maLbColorFormat.SelectEntryPos(0); - maLbEntryTypeMin.SelectEntryPos(0); - maLbEntryTypeMiddle.SelectEntryPos(2); - maLbEntryTypeMax.SelectEntryPos(1); - maLbDataBarMinType.SelectEntryPos(0); - maLbDataBarMaxType.SelectEntryPos(1); - maEdMiddle.SetText(rtl::OUString::valueOf(static_cast(50))); - maEdDataBarMin.Disable(); - maEdDataBarMax.Disable(); - - Init(); - maLbStyle.SelectEntryPos(1); - maClickHdl = LINK( pParent, ScCondFormatList, EntrySelectHdl ); - SwitchToType(COLLAPSED); - SetHeight(); - SetCondType(); - - EntryTypeHdl(&maLbEntryTypeMin); - EntryTypeHdl(&maLbEntryTypeMiddle); - EntryTypeHdl(&maLbEntryTypeMax); -} - -ScCondFrmtEntry::ScCondFrmtEntry(Window* pParent, ScDocument* pDoc, const ScFormatEntry* pFormatEntry, const ScAddress& rPos): - Control(pParent, ScResId( RID_COND_ENTRY ) ), - mbActive(false), - meType(CONDITION), - maLbType( this, ScResId( LB_TYPE ) ), - maFtCondNr( this, ScResId( FT_COND_NR ) ), - maFtCondition( this, ScResId( FT_CONDITION ) ), - maLbCondType( this, ScResId( LB_CELLIS_TYPE ) ), - maEdVal1( this, ScResId( ED_VAL1 ) ), - maEdVal2( this, ScResId( ED_VAL2 ) ), - maFtStyle( this, ScResId( FT_STYLE ) ), - maLbStyle( this, ScResId( LB_STYLE ) ), - maWdPreview( this, ScResId( WD_PREVIEW ) ), - maLbColorFormat( this, ScResId( LB_COLOR_FORMAT ) ), - maLbColScale2( this, ScResId( LB_COL_SCALE2 ) ), - maLbColScale3( this, ScResId( LB_COL_SCALE3 ) ), - maLbEntryTypeMin( this, ScResId( LB_TYPE_COL_SCALE ) ), - maLbEntryTypeMiddle( this, ScResId( LB_TYPE_COL_SCALE ) ), - maLbEntryTypeMax( this, ScResId( LB_TYPE_COL_SCALE ) ), - maEdMin( this, ScResId( ED_COL_SCALE ) ), - maEdMiddle( this, ScResId( ED_COL_SCALE ) ), - maEdMax( this, ScResId( ED_COL_SCALE ) ), - maLbColMin( this, ScResId( LB_COL) ), - maLbColMiddle( this, ScResId( LB_COL) ), - maLbColMax( this, ScResId( LB_COL) ), - maLbDataBarMinType( this, ScResId( LB_TYPE_COL_SCALE ) ), - maLbDataBarMaxType( this, ScResId( LB_TYPE_COL_SCALE ) ), - maEdDataBarMin( this, ScResId( ED_COL_SCALE ) ), - maEdDataBarMax( this, ScResId( ED_COL_SCALE ) ), - maBtOptions( this, ScResId( BTN_OPTIONS ) ), - mpDoc(pDoc), - maPos(rPos) -{ - SetControlBackground(GetSettings().GetStyleSettings().GetDialogColor()); - FreeResource(); - Init(); - - if(pFormatEntry && pFormatEntry->GetType() == condformat::CONDITION) - { - const ScCondFormatEntry* pEntry = static_cast(pFormatEntry); - rtl::OUString aStyleName = pEntry->GetStyle(); - maLbStyle.SelectEntry(aStyleName); - StyleSelectHdl(NULL); - ScConditionMode eMode = pEntry->GetOperation(); - maLbType.SelectEntryPos(1); - maEdVal1.SetText(pEntry->GetExpression(maPos, 0)); - SetCondType(); - switch(eMode) - { - case SC_COND_EQUAL: - maLbCondType.SelectEntryPos(0); - break; - case SC_COND_LESS: - maLbCondType.SelectEntryPos(1); - break; - case SC_COND_GREATER: - maLbCondType.SelectEntryPos(2); - break; - case SC_COND_EQLESS: - maLbCondType.SelectEntryPos(3); - break; - case SC_COND_EQGREATER: - maLbCondType.SelectEntryPos(4); - break; - case SC_COND_NOTEQUAL: - maLbCondType.SelectEntryPos(5); - break; - case SC_COND_BETWEEN: - maEdVal2.SetText(pEntry->GetExpression(maPos, 1)); - maLbCondType.SelectEntryPos(6); - break; - case SC_COND_NOTBETWEEN: - maEdVal2.SetText(pEntry->GetExpression(maPos, 1)); - maLbCondType.SelectEntryPos(7); - break; - case SC_COND_DUPLICATE: - maLbCondType.SelectEntryPos(8); - break; - case SC_COND_NOTDUPLICATE: - maLbCondType.SelectEntryPos(9); - break; - case SC_COND_DIRECT: - maLbType.SelectEntryPos(2); - SwitchToType(FORMULA); - break; - case SC_COND_NONE: - break; - } - } - else if( pFormatEntry && pFormatEntry->GetType() == condformat::COLORSCALE ) - { - const ScColorScaleFormat* pEntry = static_cast(pFormatEntry); - maLbType.SelectEntryPos(0); - if(pEntry->size() == 2) - maLbColorFormat.SelectEntryPos(0); - else - maLbColorFormat.SelectEntryPos(1); - SetColorScaleType(); - ScColorScaleFormat::const_iterator itr = pEntry->begin(); - SetColorScaleEntryTypes(*itr, maLbEntryTypeMin, maEdMin, maLbColMin); - if(pEntry->size() == 3) - { - ++itr; - SetColorScaleEntryTypes(*itr, maLbEntryTypeMiddle, maEdMiddle, maLbColMiddle); - } - ++itr; - SetColorScaleEntryTypes(*itr, maLbEntryTypeMax, maEdMax, maLbColMax); - } - else if( pFormatEntry && pFormatEntry->GetType() == condformat::DATABAR ) - { - const ScDataBarFormat* pEntry = static_cast(pFormatEntry); - mpDataBarData.reset(new ScDataBarFormatData(*pEntry->GetDataBarData())); - maLbType.SelectEntryPos(0); - maLbColorFormat.SelectEntryPos(2); - SetDataBarEntryTypes(*mpDataBarData->mpLowerLimit, maLbDataBarMinType, maEdDataBarMin); - SetDataBarEntryTypes(*mpDataBarData->mpUpperLimit, maLbDataBarMaxType, maEdDataBarMax); - DataBarTypeSelectHdl(NULL); - SetDataBarType(); - } - - maClickHdl = LINK( pParent, ScCondFormatList, EntrySelectHdl ); - SwitchToType(COLLAPSED); - SetHeight(); - - EntryTypeHdl(&maLbEntryTypeMin); - EntryTypeHdl(&maLbEntryTypeMiddle); - EntryTypeHdl(&maLbEntryTypeMax); -} - -ScCondFrmtEntry::~ScCondFrmtEntry() -{ -} - -void ScCondFrmtEntry::Init() -{ - maLbType.SetSelectHdl( LINK( this, ScCondFrmtEntry, TypeListHdl ) ); - maLbColorFormat.SetSelectHdl( LINK( this, ScCondFrmtEntry, ColFormatTypeHdl ) ); - maLbEntryTypeMin.SetSelectHdl( LINK( this, ScCondFrmtEntry, EntryTypeHdl ) ); - maLbEntryTypeMax.SetSelectHdl( LINK( this, ScCondFrmtEntry, EntryTypeHdl ) ); - maLbEntryTypeMiddle.SetSelectHdl( LINK( this, ScCondFrmtEntry, EntryTypeHdl ) ); - maEdVal1.SetStyle( maEdVal1.GetStyle() | WB_FORCECTRLBACKGROUND ); - maEdVal2.SetStyle( maEdVal2.GetStyle() | WB_FORCECTRLBACKGROUND ); - - maEdVal1.SetModifyHdl( LINK( this, ScCondFrmtEntry, EdModifyHdl ) ); - maEdVal2.SetModifyHdl( LINK( this, ScCondFrmtEntry, EdModifyHdl ) ); - - SfxStyleSheetIterator aStyleIter( mpDoc->GetStyleSheetPool(), SFX_STYLE_FAMILY_PARA ); - for ( SfxStyleSheetBase* pStyle = aStyleIter.First(); pStyle; pStyle = aStyleIter.Next() ) - { - rtl::OUString aName = pStyle->GetName(); - maLbStyle.InsertEntry( aName ); - } - maLbStyle.SetSelectHdl( LINK( this, ScCondFrmtEntry, StyleSelectHdl ) ); - - Point aPointLb = maLbEntryTypeMiddle.GetPosPixel(); - Point aPointEd = maEdMiddle.GetPosPixel(); - Point aPointCol = maLbColMiddle.GetPosPixel(); - Point aPointEdDataBar = maEdDataBarMin.GetPosPixel(); - Point aPointLbDataBar = maLbDataBarMaxType.GetPosPixel(); - const long nMovePos = maLbEntryTypeMiddle.GetSizePixel().Width() * 1.2; - aPointLb.X() += nMovePos; - aPointEd.X() += nMovePos; - aPointCol.X() += nMovePos; - aPointEdDataBar.X() += 2*nMovePos; - aPointLbDataBar.X() += 2*nMovePos; - maLbEntryTypeMiddle.SetPosPixel(aPointLb); - maEdMiddle.SetPosPixel(aPointEd); - maLbColMiddle.SetPosPixel(aPointCol); - maEdDataBarMax.SetPosPixel(aPointEdDataBar); - maLbDataBarMaxType.SetPosPixel(aPointLbDataBar); - aPointLb.X() += nMovePos; - aPointEd.X() += nMovePos; - aPointCol.X() += nMovePos; - maLbEntryTypeMax.SetPosPixel(aPointLb); - maEdMax.SetPosPixel(aPointEd); - maLbColMax.SetPosPixel(aPointCol); - - SfxObjectShell* pDocSh = SfxObjectShell::Current(); - const SfxPoolItem* pItem = NULL; - XColorListRef pColorTable; - - DBG_ASSERT( pDocSh, "DocShell not found!" ); - - if ( pDocSh ) - { - pItem = pDocSh->GetItem( SID_COLOR_TABLE ); - if ( pItem != NULL ) - pColorTable = ( (SvxColorListItem*)pItem )->GetColorList(); - } - if ( pColorTable.is() ) - { - // filling the line color box - maLbColMin.SetUpdateMode( false ); - maLbColMiddle.SetUpdateMode( false ); - maLbColMax.SetUpdateMode( false ); - - for ( long i = 0; i < pColorTable->Count(); ++i ) - { - XColorEntry* pEntry = pColorTable->GetColor(i); - maLbColMin.InsertEntry( pEntry->GetColor(), pEntry->GetName() ); - maLbColMiddle.InsertEntry( pEntry->GetColor(), pEntry->GetName() ); - maLbColMax.InsertEntry( pEntry->GetColor(), pEntry->GetName() ); - - if(pEntry->GetColor() == Color(COL_LIGHTRED)) - maLbColMin.SelectEntryPos(i); - if(pEntry->GetColor() == Color(COL_GREEN)) - maLbColMiddle.SelectEntryPos(i); - if(pEntry->GetColor() == Color(COL_LIGHTBLUE)) - maLbColMax.SelectEntryPos(i); - } - maLbColMin.SetUpdateMode( sal_True ); - maLbColMiddle.SetUpdateMode( sal_True ); - maLbColMax.SetUpdateMode( sal_True ); - } - - maBtOptions.SetClickHdl( LINK( this, ScCondFrmtEntry, OptionBtnHdl ) ); - maLbDataBarMinType.SetSelectHdl( LINK( this, ScCondFrmtEntry, DataBarTypeSelectHdl ) ); - maLbDataBarMaxType.SetSelectHdl( LINK( this, ScCondFrmtEntry, DataBarTypeSelectHdl ) ); - maLbCondType.SetSelectHdl( LINK( this, ScCondFrmtEntry, ConditionTypeSelectHdl ) ); - - mpDataBarData.reset(new ScDataBarFormatData()); - mpDataBarData->mpUpperLimit.reset(new ScColorScaleEntry()); - mpDataBarData->mpLowerLimit.reset(new ScColorScaleEntry()); - mpDataBarData->mpLowerLimit->SetType(COLORSCALE_MIN); - mpDataBarData->mpUpperLimit->SetType(COLORSCALE_MAX); - mpDataBarData->maPositiveColor = COL_LIGHTBLUE; -} - -long ScCondFrmtEntry::Notify( NotifyEvent& rNEvt ) -{ - if( rNEvt.GetType() == EVENT_MOUSEBUTTONDOWN ) - { - ImplCallEventListenersAndHandler( VCLEVENT_WINDOW_MOUSEBUTTONDOWN, maClickHdl, this ); - } - return Control::Notify(rNEvt); -} - -void ScCondFrmtEntry::SwitchToType( ScCondFormatEntryType eType ) -{ - switch(eType) - { - case COLLAPSED: - { - maLbType.Hide(); - rtl::OUString maCondText = ScCondFormatHelper::GetExpression(meType, maLbCondType.GetSelectEntryPos()); - maFtCondition.SetText(maCondText); - maFtCondition.Show(); - maLbType.Hide(); - HideCondElements(); - HideColorScaleElements(); - HideDataBarElements(); - } - break; - default: - meType = eType; - maLbType.Show(); - maFtCondition.SetText(rtl::OUString("")); - maFtCondition.Hide(); - maLbType.Show(); - break; - } -} - -void ScCondFrmtEntry::SetIndex(sal_Int32 nIndex) -{ - mnIndex = nIndex; - rtl::OUStringBuffer aBuffer(maStrCondition); - aBuffer.append(rtl::OUString::valueOf(nIndex)); - maFtCondNr.SetText(aBuffer.makeStringAndClear()); -} - -void ScCondFrmtEntry::HideCondElements() -{ - maEdVal1.Hide(); - maEdVal2.Hide(); - maLbStyle.Hide(); - maFtStyle.Hide(); - maLbCondType.Hide(); - maWdPreview.Hide(); -} - -void ScCondFrmtEntry::SetCondType() -{ - maEdVal1.SetSizePixel(maEdVal2.GetSizePixel()); - Point aPoint(maLbCondType.GetPosPixel().X() + maLbCondType.GetSizePixel().Width() + LogicToPixel(Size(5,1), MapMode(MAP_APPFONT)).getWidth(), - maEdVal1.GetPosPixel().Y()); - maEdVal1.SetPosPixel(aPoint); - maEdVal1.Show(); - maEdVal2.Show(); - maLbStyle.Show(); - maLbCondType.Show(); - maFtStyle.Show(); - maWdPreview.Show(); - HideColorScaleElements(); - HideDataBarElements(); - SwitchToType(CONDITION); - ConditionTypeSelectHdl(NULL); -} - -void ScCondFrmtEntry::HideColorScaleElements() -{ - maLbColorFormat.Hide(); - maLbColScale2.Hide(); - maLbColScale3.Hide(); - maLbEntryTypeMin.Hide(); - maLbEntryTypeMiddle.Hide(); - maLbEntryTypeMax.Hide(); - maEdMin.Hide(); - maEdMiddle.Hide(); - maEdMax.Hide(); - maLbColMin.Hide(); - maLbColMiddle.Hide(); - maLbColMax.Hide(); -} - -void ScCondFrmtEntry::SetHeight() -{ - long nPad = LogicToPixel(Size(42,2), MapMode(MAP_APPFONT)).getHeight(); - - // Calculate maximum height we need from visible widgets - sal_uInt16 nChildren = GetChildCount(); - - long nMaxHeight = 0; - for(sal_uInt16 i = 0; i < nChildren; i++) - { - Window *pChild = GetChild(i); - if(!pChild || !pChild->IsVisible()) - continue; - Point aPos = pChild->GetPosPixel(); - Size aSize = pChild->GetSizePixel(); - nMaxHeight = std::max(aPos.Y() + aSize.Height(), nMaxHeight); - } - Size aSize = GetSizePixel(); - if(nMaxHeight > 0) - { - aSize.Height() = nMaxHeight + nPad; - SetSizePixel(aSize); - } -} - -void ScCondFrmtEntry::SetColorScaleType() -{ - HideCondElements(); - HideDataBarElements(); - maLbColorFormat.Show(); - if(maLbColorFormat.GetSelectEntryPos() == 0) - { - maEdMiddle.Hide(); - maLbEntryTypeMiddle.Hide(); - // TODO: enale for 3.7 again with good presets - //maLbColScale2.Show(); - maLbColScale3.Hide(); - maLbColMiddle.Hide(); - } - else - { - maEdMiddle.Show(); - maLbEntryTypeMiddle.Show(); - maLbColScale2.Hide(); - // TODO: enale for 3.7 again with good presets - // maLbColScale3.Show(); - maLbColMiddle.Show(); - } - maLbEntryTypeMin.Show(); - maLbEntryTypeMax.Show(); - maEdMin.Show(); - maEdMax.Show(); - maLbColMin.Show(); - maLbColMax.Show(); - SwitchToType(COLORSCALE); -} - -void ScCondFrmtEntry::HideDataBarElements() -{ - maLbColorFormat.Hide(); - maLbDataBarMinType.Hide(); - maLbDataBarMaxType.Hide(); - maEdDataBarMin.Hide(); - maEdDataBarMax.Hide(); - maBtOptions.Hide(); -} - -void ScCondFrmtEntry::SetDataBarType() -{ - SwitchToType(DATABAR); - HideCondElements(); - HideColorScaleElements(); - maLbColorFormat.Show(); - maLbDataBarMinType.Show(); - maLbDataBarMaxType.Show(); - maEdDataBarMin.Show(); - maEdDataBarMax.Show(); - maBtOptions.Show(); -} - -void ScCondFrmtEntry::SetFormulaType() -{ - SwitchToType(FORMULA); - HideColorScaleElements(); - HideDataBarElements(); - maEdVal1.SetPosPixel(maLbCondType.GetPosPixel()); - Size aSize(maEdVal2.GetPosPixel().X() + maEdVal2.GetSizePixel().Width() - maLbCondType.GetPosPixel().X(), maEdVal1.GetSizePixel().Height()); - maEdVal1.SetPosPixel(maLbCondType.GetPosPixel()); - maEdVal1.SetSizePixel(aSize); - maEdVal1.Show(); - maEdVal2.Hide(); - maLbCondType.Hide(); - maLbStyle.Show(); - maFtCondition.Show(); - maWdPreview.Show(); - maFtStyle.Show(); -} - -void ScCondFrmtEntry::Select() -{ - SetControlForeground(Color(COL_RED)); - switch(meType) - { - case CONDITION: - SetCondType(); - break; - case COLORSCALE: - SetColorScaleType(); - break; - case DATABAR: - SetDataBarType(); - break; - case FORMULA: - SetFormulaType(); - break; - default: - //should not happen - break; - } - SwitchToType(meType); - mbActive = true; - SetHeight(); -} - -void ScCondFrmtEntry::SetType( ScCondFormatEntryType eType ) -{ - meType = eType; - if(eType == DATABAR) - maLbColorFormat.SelectEntryPos(2); - Select(); -} - -void ScCondFrmtEntry::Deselect() -{ - SetControlBackground(GetSettings().GetStyleSettings().GetDialogColor()); - SwitchToType(COLLAPSED); - mbActive = false; - SetHeight(); -} - -bool ScCondFrmtEntry::IsSelected() const -{ - return mbActive; -} - -ScFormatEntry* ScCondFrmtEntry::createConditionEntry() const -{ - ScConditionMode eMode; - rtl::OUString aExpr2; - switch(maLbCondType.GetSelectEntryPos()) - { - case 0: - eMode = SC_COND_EQUAL; - break; - case 1: - eMode = SC_COND_LESS; - break; - case 2: - eMode = SC_COND_GREATER; - break; - case 3: - eMode = SC_COND_EQLESS; - break; - case 4: - eMode = SC_COND_EQGREATER; - break; - case 5: - eMode = SC_COND_NOTEQUAL; - break; - case 6: - aExpr2 = maEdVal2.GetText(); - eMode = SC_COND_BETWEEN; - if(aExpr2.isEmpty()) - return NULL; - break; - case 7: - eMode = SC_COND_NOTBETWEEN; - aExpr2 = maEdVal2.GetText(); - if(aExpr2.isEmpty()) - return NULL; - break; - case 8: - eMode = SC_COND_DUPLICATE; - break; - case 9: - eMode = SC_COND_NOTDUPLICATE; - break; - default: - assert(false); // this cannot happen - return NULL; - } - - rtl::OUString aExpr1 = maEdVal1.GetText(); - - ScFormatEntry* pEntry = new ScCondFormatEntry(eMode, aExpr1, aExpr2, mpDoc, maPos, maLbStyle.GetSelectEntry()); - - return pEntry; -} - -namespace { - -void SetColorScaleEntry( ScColorScaleEntry* pEntry, const ListBox& rType, const Edit& rValue, ScDocument* pDoc, const ScAddress& rPos ) -{ - sal_uInt32 nIndex = 0; - double nVal = 0; - SvNumberFormatter* pNumberFormatter = pDoc->GetFormatTable(); - pNumberFormatter->IsNumberFormat(rValue.GetText(), nIndex, nVal); - switch(rType.GetSelectEntryPos()) - { - case 0: - pEntry->SetType(COLORSCALE_MIN); - break; - case 1: - pEntry->SetType(COLORSCALE_MAX); - break; - case 2: - pEntry->SetType(COLORSCALE_PERCENTILE); - pEntry->SetValue(nVal); - break; - case 3: - pEntry->SetType(COLORSCALE_VALUE); - pEntry->SetValue(nVal); - break; - case 4: - pEntry->SetType(COLORSCALE_PERCENT); - pEntry->SetValue(nVal); - break; - case 5: - pEntry->SetType(COLORSCALE_FORMULA); - pEntry->SetFormula(rValue.GetText(), pDoc, rPos); - break; - case 6: - pEntry->SetType(COLORSCALE_AUTOMIN); - break; - case 7: - pEntry->SetType(COLORSCALE_AUTOMAX); - break; - default: - break; - } -} - -ScColorScaleEntry* createColorScaleEntry( const ListBox& rType, const ColorListBox& rColor, const Edit& rValue, ScDocument* pDoc, const ScAddress& rPos ) -{ - ScColorScaleEntry* pEntry = new ScColorScaleEntry(); - - SetColorScaleEntry( pEntry, rType, rValue, pDoc, rPos ); - Color aColor = rColor.GetSelectEntryColor(); - pEntry->SetColor(aColor); - return pEntry; -} - -} - -ScFormatEntry* ScCondFrmtEntry::createColorscaleEntry() const -{ - ScColorScaleFormat* pColorScale = new ScColorScaleFormat(mpDoc); - pColorScale->AddEntry(createColorScaleEntry(maLbEntryTypeMin, maLbColMin, maEdMin, mpDoc, maPos)); - if(maLbColorFormat.GetSelectEntryPos() == 1) - pColorScale->AddEntry(createColorScaleEntry(maLbEntryTypeMiddle, maLbColMiddle, maEdMiddle, mpDoc, maPos)); - pColorScale->AddEntry(createColorScaleEntry(maLbEntryTypeMax, maLbColMax, maEdMax, mpDoc, maPos)); - return pColorScale; -} - -ScFormatEntry* ScCondFrmtEntry::createDatabarEntry() const -{ - SetColorScaleEntry(mpDataBarData->mpLowerLimit.get(), maLbDataBarMinType, maEdDataBarMin, mpDoc, maPos); - SetColorScaleEntry(mpDataBarData->mpUpperLimit.get(), maLbDataBarMaxType, maEdDataBarMax, mpDoc, maPos); - ScDataBarFormat* pDataBar = new ScDataBarFormat(mpDoc); - pDataBar->SetDataBarData(new ScDataBarFormatData(*mpDataBarData.get())); - return pDataBar; -} - -ScFormatEntry* ScCondFrmtEntry::createFormulaEntry() const -{ - ScConditionMode eMode = SC_COND_DIRECT; - rtl::OUString aFormula = maEdVal1.GetText(); - if(aFormula.isEmpty()) - return NULL; - - rtl::OUString aExpr2; - ScFormatEntry* pEntry = new ScCondFormatEntry(eMode, aFormula, aExpr2, mpDoc, maPos, maLbStyle.GetSelectEntry()); - return pEntry; -} - -ScFormatEntry* ScCondFrmtEntry::GetEntry() const -{ - switch(meType) - { - case CONDITION: - return createConditionEntry(); - break; - case COLORSCALE: - return createColorscaleEntry(); - break; - case DATABAR: - return createDatabarEntry(); - break; - case FORMULA: - return createFormulaEntry(); - break; - default: - break; - } - return NULL; -} - -IMPL_LINK_NOARG(ScCondFrmtEntry, TypeListHdl) -{ - sal_Int32 nPos = maLbType.GetSelectEntryPos(); - switch(nPos) - { - case 1: - SetCondType(); - break; - case 0: - if(maLbColorFormat.GetSelectEntryPos() < 2) - SetColorScaleType(); - else - SetDataBarType(); - break; - case 2: - SetFormulaType(); - break; - default: - break; - } - SetHeight(); - return 0; -} - -IMPL_LINK(ScCondFrmtEntry, EdModifyHdl, Edit*, pEdit) -{ - rtl::OUString aFormula = pEdit->GetText(); - ScCompiler aComp( mpDoc, maPos ); - aComp.SetGrammar( mpDoc->GetGrammar() ); - boost::scoped_ptr mpCode(aComp.CompileString(aFormula)); - if(mpCode->GetCodeError()) - { - pEdit->SetControlBackground(COL_LIGHTRED); - } - else - { - pEdit->SetControlBackground(GetSettings().GetStyleSettings().GetWindowColor()); - } - return 0; -} - -IMPL_LINK_NOARG(ScCondFrmtEntry, ColFormatTypeHdl) -{ - if(maLbColorFormat.GetSelectEntryPos() < 2) - { - SetColorScaleType(); - } - else - { - SetDataBarType(); - } - - SetHeight(); - - return 0; -} - -IMPL_LINK( ScCondFrmtEntry, EntryTypeHdl, ListBox*, pBox ) -{ - bool bEnableEdit = true; - sal_Int32 nPos = pBox->GetSelectEntryPos(); - if(nPos == 0 || nPos == 1) - { - bEnableEdit = false; - } - - Edit* pEd = NULL; - if(pBox == &maLbEntryTypeMin) - pEd = &maEdMin; - else if(pBox == &maLbEntryTypeMiddle) - pEd = &maEdMiddle; - else if(pBox == &maLbEntryTypeMax) - pEd = &maEdMax; - - if(bEnableEdit) - pEd->Enable(); - else - pEd->Disable(); - - return 0; -} - -IMPL_LINK_NOARG(ScCondFrmtEntry, StyleSelectHdl) -{ - if(maLbStyle.GetSelectEntryPos() == 0) - { - // call new style dialog - SfxUInt16Item aFamilyItem( SID_STYLE_FAMILY, SFX_STYLE_FAMILY_PARA ); - SfxStringItem aRefItem( SID_STYLE_REFERENCE, ScGlobal::GetRscString(STR_STYLENAME_STANDARD) ); - - // unlock the dispatcher so SID_STYLE_NEW can be executed - // (SetDispatcherLock would affect all Calc documents) - ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); - SfxDispatcher* pDisp = pViewShell->GetDispatcher(); - sal_Bool bLocked = pDisp->IsLocked(); - if (bLocked) - pDisp->Lock(false); - - // Execute the "new style" slot, complete with undo and all necessary updates. - // The return value (SfxUInt16Item) is ignored, look for new styles instead. - pDisp->Execute( SID_STYLE_NEW, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD | SFX_CALLMODE_MODAL, - &aFamilyItem, - &aRefItem, - 0L ); - - if (bLocked) - pDisp->Lock(sal_True); - - // Find the new style and add it into the style list boxes - rtl::OUString aNewStyle; - SfxStyleSheetIterator aStyleIter( mpDoc->GetStyleSheetPool(), SFX_STYLE_FAMILY_PARA ); - for ( SfxStyleSheetBase* pStyle = aStyleIter.First(); pStyle; pStyle = aStyleIter.Next() ) - { - rtl::OUString aName = pStyle->GetName(); - if ( maLbStyle.GetEntryPos(aName) == LISTBOX_ENTRY_NOTFOUND ) // all lists contain the same entries - { - maLbStyle.InsertEntry(aName); - maLbStyle.SelectEntry(aName); - } - } - } - - rtl::OUString aStyleName = maLbStyle.GetSelectEntry(); - SfxStyleSheetBase* pStyleSheet = mpDoc->GetStyleSheetPool()->Find( aStyleName, SFX_STYLE_FAMILY_PARA ); - if(pStyleSheet) - { - const SfxItemSet& rSet = pStyleSheet->GetItemSet(); - maWdPreview.Init( rSet ); - } - - return 0; -} - -IMPL_LINK_NOARG( ScCondFrmtEntry, DataBarTypeSelectHdl ) -{ - sal_Int32 nSelectPos = maLbDataBarMinType.GetSelectEntryPos(); - if(nSelectPos == 0 || nSelectPos == 1) - maEdDataBarMin.Disable(); - else - maEdDataBarMin.Enable(); - - nSelectPos = maLbDataBarMaxType.GetSelectEntryPos(); - if(nSelectPos == 0 || nSelectPos == 1) - maEdDataBarMax.Disable(); - else - maEdDataBarMax.Enable(); - - return 0; -} - -IMPL_LINK_NOARG( ScCondFrmtEntry, OptionBtnHdl ) -{ - SetColorScaleEntry(mpDataBarData->mpLowerLimit.get(), maLbDataBarMinType, maEdDataBarMin, mpDoc, maPos); - SetColorScaleEntry(mpDataBarData->mpUpperLimit.get(), maLbDataBarMaxType, maEdDataBarMax, mpDoc, maPos); - ScDataBarSettingsDlg* pDlg = new ScDataBarSettingsDlg(this, *mpDataBarData, mpDoc); - if( pDlg->Execute() == RET_OK) - { - mpDataBarData.reset(pDlg->GetData()); - SetDataBarEntryTypes(*mpDataBarData->mpLowerLimit, maLbDataBarMinType, maEdDataBarMin); - SetDataBarEntryTypes(*mpDataBarData->mpUpperLimit, maLbDataBarMaxType, maEdDataBarMax); - DataBarTypeSelectHdl(NULL); - } - return 0; -} - -IMPL_LINK_NOARG( ScCondFrmtEntry, ConditionTypeSelectHdl ) -{ - if(maLbCondType.GetSelectEntryPos() == 6 || maLbCondType.GetSelectEntryPos() == 7) - { - maEdVal2.Show(); - } - else - { - maEdVal2.Hide(); - } - - return 0; -} - ScCondFormatList::ScCondFormatList(Window* pParent, const ResId& rResId, ScDocument* pDoc, const ScConditionalFormat* pFormat, const ScRangeList& rRanges, const ScAddress& rPos, condformat::dialog::ScCondFormatDialogType eType): Control(pParent, rResId), @@ -1013,7 +71,7 @@ ScCondFormatList::ScCondFormatList(Window* pParent, const ResId& rResId, ScDocum size_t nCount = pFormat->size(); for (size_t nIndex = 0; nIndex < nCount; ++nIndex) { - maEntries.push_back(new ScCondFrmtEntry( this, mpDoc, pFormat->GetEntry(nIndex), maPos )); + maEntries.push_back(new ScConditionFrmtEntry( this, mpDoc, maPos, static_cast(pFormat->GetEntry(nIndex) ) ) ); } } else @@ -1021,15 +79,13 @@ ScCondFormatList::ScCondFormatList(Window* pParent, const ResId& rResId, ScDocum switch(eType) { case condformat::dialog::CONDITION: - maEntries.push_back(new ScCondFrmtEntry( this, mpDoc, maPos )); + maEntries.push_back(new ScConditionFrmtEntry( this, mpDoc, maPos )); break; case condformat::dialog::COLORSCALE: - maEntries.push_back(new ScCondFrmtEntry( this, mpDoc, maPos )); - maEntries[0].SetType(COLORSCALE); + maEntries.push_back(new ScColorScaleFrmtEntry( this, mpDoc, maPos )); break; case condformat::dialog::DATABAR: - maEntries.push_back(new ScCondFrmtEntry( this, mpDoc, maPos )); - maEntries[0].SetType(DATABAR); + maEntries.push_back(new ScDataBarFrmtEntry( this, mpDoc, maPos )); break; default: break; @@ -1112,6 +168,70 @@ void ScCondFormatList::DoScroll(long nDelta) mpScrollBar->SetPosPixel(aNewPoint); } +IMPL_LINK(ScCondFormatList, ColFormatTypeHdl, ListBox*, pBox) +{ + RecalcAll(); + return 0; +} + +IMPL_LINK(ScCondFormatList, TypeListHdl, ListBox*, pBox) +{ + sal_Int32 nPos = pBox->GetSelectEntryPos(); + switch(nPos) + { + } + RecalcAll(); + return 0; +} + +IMPL_LINK_NOARG( ScCondFormatList, AddBtnHdl ) +{ + ScCondFrmtEntry* pNewEntry = new ScConditionFrmtEntry(this, mpDoc, maPos); + maEntries.push_back( pNewEntry ); + for(EntryContainer::iterator itr = maEntries.begin(); itr != maEntries.end(); ++itr) + { + itr->Deselect(); + } + pNewEntry->Select(); + RecalcAll(); + return 0; +} + +IMPL_LINK_NOARG( ScCondFormatList, RemoveBtnHdl ) +{ + for(EntryContainer::iterator itr = maEntries.begin(); itr != maEntries.end(); ++itr) + { + if(itr->IsSelected()) + { + maEntries.erase(itr); + break; + } + } + RecalcAll(); + return 0; +} + +IMPL_LINK( ScCondFormatList, EntrySelectHdl, ScCondFrmtEntry*, pEntry ) +{ + for(EntryContainer::iterator itr = maEntries.begin(); itr != maEntries.end(); ++itr) + { + itr->Deselect(); + } + pEntry->Select(); + RecalcAll(); + return 0; +} + +IMPL_LINK_NOARG( ScCondFormatList, ScrollHdl ) +{ + DoScroll(mpScrollBar->GetDelta()); + return 0; +} + +//--------------------------------------------------- +//ScCondFormatDlg +//--------------------------------------------------- + ScCondFormatDlg::ScCondFormatDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScDocument* pDoc, const ScConditionalFormat* pFormat, const ScRangeList& rRange, const ScAddress& rPos, condformat::dialog::ScCondFormatDialogType eType): ScAnyRefDlg(pB, pCW, pParent, RID_SCDLG_CONDFORMAT ), @@ -1195,50 +315,6 @@ ScConditionalFormat* ScCondFormatDlg::GetConditionalFormat() const return pFormat; } -IMPL_LINK_NOARG( ScCondFormatList, AddBtnHdl ) -{ - ScCondFrmtEntry* pNewEntry = new ScCondFrmtEntry(this, mpDoc, maPos); - maEntries.push_back( pNewEntry ); - for(EntryContainer::iterator itr = maEntries.begin(); itr != maEntries.end(); ++itr) - { - itr->Deselect(); - } - pNewEntry->Select(); - RecalcAll(); - return 0; -} - -IMPL_LINK_NOARG( ScCondFormatList, RemoveBtnHdl ) -{ - for(EntryContainer::iterator itr = maEntries.begin(); itr != maEntries.end(); ++itr) - { - if(itr->IsSelected()) - { - maEntries.erase(itr); - break; - } - } - RecalcAll(); - return 0; -} - -IMPL_LINK( ScCondFormatList, EntrySelectHdl, ScCondFrmtEntry*, pEntry ) -{ - for(EntryContainer::iterator itr = maEntries.begin(); itr != maEntries.end(); ++itr) - { - itr->Deselect(); - } - pEntry->Select(); - RecalcAll(); - return 0; -} - -IMPL_LINK_NOARG( ScCondFormatList, ScrollHdl ) -{ - DoScroll(mpScrollBar->GetDelta()); - return 0; -} - IMPL_LINK( ScCondFormatDlg, EdRangeModifyHdl, Edit*, pEdit ) { rtl::OUString aRangeStr = pEdit->GetText(); diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx new file mode 100644 index 000000000000..63dfcecd7cb5 --- /dev/null +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -0,0 +1,737 @@ +#include "condformatdlg.hxx" +#include "condformatdlgentry.hxx" +#include "condformatdlg.hrc" + +#include "document.hxx" + +#include +#include +#include +#include +#include +#include +#include +#include +#include "stlpool.hxx" +#include "tabvwsh.hxx" + +#include "colorformat.hxx" + +#include "globstr.hrc" + +ScCondFrmtEntry::ScCondFrmtEntry(Window* pParent, ScDocument* pDoc, const ScAddress& rPos): + Control(pParent, ScResId( RID_COND_ENTRY ) ), + mbActive(false), + maLbType( this, ScResId( LB_TYPE ) ), + maFtCondNr( this, ScResId( FT_COND_NR ) ), + maFtCondition( this, ScResId( FT_CONDITION ) ), + mnIndex(0), + maStrCondition(ScResId( STR_CONDITION ).toString()), + mpDoc(pDoc), + maPos(rPos) +{ + SetControlBackground(GetSettings().GetStyleSettings().GetDialogColor()); + FreeResource(); + + /* + maLbType.SelectEntryPos(1); + maLbCondType.SelectEntryPos(0); + maEdVal2.Hide(); + */ + //disable entries for color formats + + Init(); + maClickHdl = LINK( pParent, ScCondFormatList, EntrySelectHdl ); + SetHeight(); +} + +ScCondFrmtEntry::~ScCondFrmtEntry() +{ +} + +void ScCondFrmtEntry::Init() +{ + maLbType.SetSelectHdl( LINK( this, ScCondFormatList, TypeListHdl ) ); + /* + maLbColorFormat.SetSelectHdl( LINK( this, ScCondFormatList, ColFormatTypeHdl ) ); + + */ +} + +long ScCondFrmtEntry::Notify( NotifyEvent& rNEvt ) +{ + if( rNEvt.GetType() == EVENT_MOUSEBUTTONDOWN ) + { + ImplCallEventListenersAndHandler( VCLEVENT_WINDOW_MOUSEBUTTONDOWN, maClickHdl, this ); + } + return Control::Notify(rNEvt); +} + +void ScCondFrmtEntry::SetIndex(sal_Int32 nIndex) +{ + mnIndex = nIndex; + rtl::OUStringBuffer aBuffer(maStrCondition); + aBuffer.append(rtl::OUString::valueOf(nIndex)); + maFtCondNr.SetText(aBuffer.makeStringAndClear()); +} + +void ScCondFrmtEntry::SetHeight() +{ + long nPad = LogicToPixel(Size(42,2), MapMode(MAP_APPFONT)).getHeight(); + + // Calculate maximum height we need from visible widgets + sal_uInt16 nChildren = GetChildCount(); + + long nMaxHeight = 0; + for(sal_uInt16 i = 0; i < nChildren; i++) + { + Window *pChild = GetChild(i); + if(!pChild || !pChild->IsVisible()) + continue; + Point aPos = pChild->GetPosPixel(); + Size aSize = pChild->GetSizePixel(); + nMaxHeight = std::max(aPos.Y() + aSize.Height(), nMaxHeight); + } + Size aSize = GetSizePixel(); + if(nMaxHeight > 0) + { + aSize.Height() = nMaxHeight + nPad; + SetSizePixel(aSize); + } +} + + +void ScCondFrmtEntry::Select() +{ + mbActive = true; + SetHeight(); +} + +void ScCondFrmtEntry::Deselect() +{ + mbActive = false; + SetHeight(); +} + +bool ScCondFrmtEntry::IsSelected() const +{ + return mbActive; +} + +IMPL_LINK(ScCondFrmtEntry, EdModifyHdl, Edit*, pEdit) +{ + rtl::OUString aFormula = pEdit->GetText(); + ScCompiler aComp( mpDoc, maPos ); + aComp.SetGrammar( mpDoc->GetGrammar() ); + boost::scoped_ptr mpCode(aComp.CompileString(aFormula)); + if(mpCode->GetCodeError()) + { + pEdit->SetControlBackground(COL_LIGHTRED); + } + else + { + pEdit->SetControlBackground(GetSettings().GetStyleSettings().GetWindowColor()); + } + return 0; +} + +// +//condition + +ScFormatEntry* ScConditionFrmtEntry::createFormulaEntry() const +{ + ScConditionMode eMode = SC_COND_DIRECT; + rtl::OUString aFormula = maEdVal1.GetText(); + if(aFormula.isEmpty()) + return NULL; + + rtl::OUString aExpr2; + ScFormatEntry* pEntry = new ScCondFormatEntry(eMode, aFormula, aExpr2, mpDoc, maPos, maLbStyle.GetSelectEntry()); + return pEntry; +} + +ScConditionFrmtEntry::ScConditionFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScCondFormatEntry* pFormatEntry ): + ScCondFrmtEntry( pParent, pDoc, rPos ), + maLbCondType( this, ScResId( LB_CELLIS_TYPE ) ), + maEdVal1( this, ScResId( ED_VAL1 ) ), + maEdVal2( this, ScResId( ED_VAL2 ) ), + maFtStyle( this, ScResId( FT_STYLE ) ), + maLbStyle( this, ScResId( LB_STYLE ) ), + maWdPreview( this, ScResId( WD_PREVIEW ) ) +{ + if(pFormatEntry) + { + rtl::OUString aStyleName = pFormatEntry->GetStyle(); + maLbStyle.SelectEntry(aStyleName); + StyleSelectHdl(NULL); + ScConditionMode eMode = pFormatEntry->GetOperation(); + maEdVal1.SetText(pFormatEntry->GetExpression(maPos, 0)); + switch(eMode) + { + case SC_COND_EQUAL: + maLbCondType.SelectEntryPos(0); + break; + case SC_COND_LESS: + maLbCondType.SelectEntryPos(1); + break; + case SC_COND_GREATER: + maLbCondType.SelectEntryPos(2); + break; + case SC_COND_EQLESS: + maLbCondType.SelectEntryPos(3); + break; + case SC_COND_EQGREATER: + maLbCondType.SelectEntryPos(4); + break; + case SC_COND_NOTEQUAL: + maLbCondType.SelectEntryPos(5); + break; + case SC_COND_BETWEEN: + maEdVal2.SetText(pFormatEntry->GetExpression(maPos, 1)); + maLbCondType.SelectEntryPos(6); + break; + case SC_COND_NOTBETWEEN: + maEdVal2.SetText(pFormatEntry->GetExpression(maPos, 1)); + maLbCondType.SelectEntryPos(7); + break; + case SC_COND_DUPLICATE: + maLbCondType.SelectEntryPos(8); + break; + case SC_COND_NOTDUPLICATE: + maLbCondType.SelectEntryPos(9); + break; + case SC_COND_DIRECT: + //maLbType.SelectEntryPos(2); + break; + case SC_COND_NONE: + break; + } + } + else + { + maLbStyle.SelectEntryPos(1); + } + +} + +void ScConditionFrmtEntry::Init() +{ + maLbStyle.SetSeparatorPos(0); + + maEdVal1.SetStyle( maEdVal1.GetStyle() | WB_FORCECTRLBACKGROUND ); + maEdVal2.SetStyle( maEdVal2.GetStyle() | WB_FORCECTRLBACKGROUND ); + + maEdVal1.SetModifyHdl( LINK( this, ScCondFrmtEntry, EdModifyHdl ) ); + maEdVal2.SetModifyHdl( LINK( this, ScCondFrmtEntry, EdModifyHdl ) ); + + SfxStyleSheetIterator aStyleIter( mpDoc->GetStyleSheetPool(), SFX_STYLE_FAMILY_PARA ); + for ( SfxStyleSheetBase* pStyle = aStyleIter.First(); pStyle; pStyle = aStyleIter.Next() ) + { + rtl::OUString aName = pStyle->GetName(); + maLbStyle.InsertEntry( aName ); + } + maLbStyle.SetSelectHdl( LINK( this, ScConditionFrmtEntry, StyleSelectHdl ) ); + + maLbCondType.SetSelectHdl( LINK( this, ScConditionFrmtEntry, ConditionTypeSelectHdl ) ); +} + +ScFormatEntry* ScConditionFrmtEntry::createConditionEntry() const +{ + ScConditionMode eMode; + rtl::OUString aExpr2; + switch(maLbCondType.GetSelectEntryPos()) + { + case 0: + eMode = SC_COND_EQUAL; + break; + case 1: + eMode = SC_COND_LESS; + break; + case 2: + eMode = SC_COND_GREATER; + break; + case 3: + eMode = SC_COND_EQLESS; + break; + case 4: + eMode = SC_COND_EQGREATER; + break; + case 5: + eMode = SC_COND_NOTEQUAL; + break; + case 6: + aExpr2 = maEdVal2.GetText(); + eMode = SC_COND_BETWEEN; + if(aExpr2.isEmpty()) + return NULL; + break; + case 7: + eMode = SC_COND_NOTBETWEEN; + aExpr2 = maEdVal2.GetText(); + if(aExpr2.isEmpty()) + return NULL; + break; + case 8: + eMode = SC_COND_DUPLICATE; + break; + case 9: + eMode = SC_COND_NOTDUPLICATE; + break; + default: + assert(false); // this cannot happen + return NULL; + } + + rtl::OUString aExpr1 = maEdVal1.GetText(); + + ScFormatEntry* pEntry = new ScCondFormatEntry(eMode, aExpr1, aExpr2, mpDoc, maPos, maLbStyle.GetSelectEntry()); + + return pEntry; +} + +ScFormatEntry* ScConditionFrmtEntry::GetEntry() const +{ + return createConditionEntry(); +} + +IMPL_LINK_NOARG(ScConditionFrmtEntry, StyleSelectHdl) +{ + if(maLbStyle.GetSelectEntryPos() == 0) + { + // call new style dialog + SfxUInt16Item aFamilyItem( SID_STYLE_FAMILY, SFX_STYLE_FAMILY_PARA ); + SfxStringItem aRefItem( SID_STYLE_REFERENCE, ScGlobal::GetRscString(STR_STYLENAME_STANDARD) ); + + // unlock the dispatcher so SID_STYLE_NEW can be executed + // (SetDispatcherLock would affect all Calc documents) + ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); + SfxDispatcher* pDisp = pViewShell->GetDispatcher(); + sal_Bool bLocked = pDisp->IsLocked(); + if (bLocked) + pDisp->Lock(false); + + // Execute the "new style" slot, complete with undo and all necessary updates. + // The return value (SfxUInt16Item) is ignored, look for new styles instead. + pDisp->Execute( SID_STYLE_NEW, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD | SFX_CALLMODE_MODAL, + &aFamilyItem, + &aRefItem, + 0L ); + + if (bLocked) + pDisp->Lock(sal_True); + + // Find the new style and add it into the style list boxes + rtl::OUString aNewStyle; + SfxStyleSheetIterator aStyleIter( mpDoc->GetStyleSheetPool(), SFX_STYLE_FAMILY_PARA ); + for ( SfxStyleSheetBase* pStyle = aStyleIter.First(); pStyle; pStyle = aStyleIter.Next() ) + { + rtl::OUString aName = pStyle->GetName(); + if ( maLbStyle.GetEntryPos(aName) == LISTBOX_ENTRY_NOTFOUND ) // all lists contain the same entries + { + maLbStyle.InsertEntry(aName); + maLbStyle.SelectEntry(aName); + } + } + } + + rtl::OUString aStyleName = maLbStyle.GetSelectEntry(); + SfxStyleSheetBase* pStyleSheet = mpDoc->GetStyleSheetPool()->Find( aStyleName, SFX_STYLE_FAMILY_PARA ); + if(pStyleSheet) + { + const SfxItemSet& rSet = pStyleSheet->GetItemSet(); + maWdPreview.Init( rSet ); + } + + return 0; +} + +//color scale + +namespace { + +void SetColorScaleEntryTypes( const ScColorScaleEntry& rEntry, ListBox& rLbType, Edit& rEdit, ColorListBox& rLbCol ) +{ + switch(rEntry.GetType()) + { + case COLORSCALE_MIN: + rLbType.SelectEntryPos(0); + break; + case COLORSCALE_MAX: + rLbType.SelectEntryPos(1); + break; + case COLORSCALE_PERCENTILE: + rEdit.SetText(rtl::OUString::valueOf(rEntry.GetValue())); + rLbType.SelectEntryPos(2); + break; + case COLORSCALE_PERCENT: + rEdit.SetText(rtl::OUString::valueOf(rEntry.GetValue())); + rLbType.SelectEntryPos(4); + break; + case COLORSCALE_FORMULA: + rEdit.SetText(rEntry.GetFormula(formula::FormulaGrammar::GRAM_DEFAULT)); + rLbType.SelectEntryPos(5); + break; + case COLORSCALE_VALUE: + rEdit.SetText(rtl::OUString::valueOf(rEntry.GetValue())); + rLbType.SelectEntryPos(3); + break; + case COLORSCALE_AUTOMIN: + rLbType.SelectEntryPos(6); + break; + case COLORSCALE_AUTOMAX: + rLbType.SelectEntryPos(7); + break; + } + rLbCol.SelectEntry(rEntry.GetColor()); +} + +void SetColorScaleEntry( ScColorScaleEntry* pEntry, const ListBox& rType, const Edit& rValue, ScDocument* pDoc, const ScAddress& rPos ) +{ + sal_uInt32 nIndex = 0; + double nVal = 0; + SvNumberFormatter* pNumberFormatter = pDoc->GetFormatTable(); + pNumberFormatter->IsNumberFormat(rValue.GetText(), nIndex, nVal); + switch(rType.GetSelectEntryPos()) + { + case 0: + pEntry->SetType(COLORSCALE_MIN); + break; + case 1: + pEntry->SetType(COLORSCALE_MAX); + break; + case 2: + pEntry->SetType(COLORSCALE_PERCENTILE); + pEntry->SetValue(nVal); + break; + case 3: + pEntry->SetType(COLORSCALE_VALUE); + pEntry->SetValue(nVal); + break; + case 4: + pEntry->SetType(COLORSCALE_PERCENT); + pEntry->SetValue(nVal); + break; + case 5: + pEntry->SetType(COLORSCALE_FORMULA); + pEntry->SetFormula(rValue.GetText(), pDoc, rPos); + break; + case 6: + pEntry->SetType(COLORSCALE_AUTOMIN); + break; + case 7: + pEntry->SetType(COLORSCALE_AUTOMAX); + break; + default: + break; + } +} + +ScColorScaleEntry* createColorScaleEntry( const ListBox& rType, const ColorListBox& rColor, const Edit& rValue, ScDocument* pDoc, const ScAddress& rPos ) +{ + ScColorScaleEntry* pEntry = new ScColorScaleEntry(); + + SetColorScaleEntry( pEntry, rType, rValue, pDoc, rPos ); + Color aColor = rColor.GetSelectEntryColor(); + pEntry->SetColor(aColor); + return pEntry; +} + +} + +ScColorScaleFrmtEntry::ScColorScaleFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat ): + ScCondFrmtEntry( pParent, pDoc, rPos ), + //maLbColorFormat( this, ScResId( LB_COLOR_FORMAT ) ), + maLbColScale2( this, ScResId( LB_COL_SCALE2 ) ), + maLbColScale3( this, ScResId( LB_COL_SCALE3 ) ), + maLbEntryTypeMin( this, ScResId( LB_TYPE_COL_SCALE ) ), + maLbEntryTypeMiddle( this, ScResId( LB_TYPE_COL_SCALE ) ), + maLbEntryTypeMax( this, ScResId( LB_TYPE_COL_SCALE ) ), + maEdMin( this, ScResId( ED_COL_SCALE ) ), + maEdMiddle( this, ScResId( ED_COL_SCALE ) ), + maEdMax( this, ScResId( ED_COL_SCALE ) ), + maLbColMin( this, ScResId( LB_COL) ), + maLbColMiddle( this, ScResId( LB_COL) ), + maLbColMax( this, ScResId( LB_COL) ) +{ + if(pFormat) + { + /* + if(pFormat->size() == 2) + maLbColorFormat.SelectEntryPos(0); + else + maLbColorFormat.SelectEntryPos(1); + */ + ScColorScaleFormat::const_iterator itr = pFormat->begin(); + SetColorScaleEntryTypes(*itr, maLbEntryTypeMin, maEdMin, maLbColMin); + if(pFormat->size() == 3) + { + ++itr; + SetColorScaleEntryTypes(*itr, maLbEntryTypeMiddle, maEdMiddle, maLbColMiddle); + } + ++itr; + SetColorScaleEntryTypes(*itr, maLbEntryTypeMax, maEdMax, maLbColMax); + } + else + { + //maLbColorFormat.SelectEntryPos(0); + maLbEntryTypeMin.SelectEntryPos(0); + maLbEntryTypeMiddle.SelectEntryPos(2); + maLbEntryTypeMax.SelectEntryPos(1); + maEdMiddle.SetText(rtl::OUString::valueOf(static_cast(50))); + } +} + +void ScColorScaleFrmtEntry::Init() +{ + maLbEntryTypeMin.SetSelectHdl( LINK( this, ScColorScaleFrmtEntry, EntryTypeHdl ) ); + maLbEntryTypeMax.SetSelectHdl( LINK( this, ScColorScaleFrmtEntry, EntryTypeHdl ) ); + maLbEntryTypeMiddle.SetSelectHdl( LINK( this, ScColorScaleFrmtEntry, EntryTypeHdl ) ); + + SfxObjectShell* pDocSh = SfxObjectShell::Current(); + const SfxPoolItem* pItem = NULL; + XColorListRef pColorTable; + + DBG_ASSERT( pDocSh, "DocShell not found!" ); + + Point aPointLb = maLbEntryTypeMiddle.GetPosPixel(); + Point aPointEd = maEdMiddle.GetPosPixel(); + Point aPointCol = maLbColMiddle.GetPosPixel(); + const long nMovePos = maLbEntryTypeMiddle.GetSizePixel().Width() * 1.2; + aPointLb.X() += nMovePos; + aPointEd.X() += nMovePos; + aPointCol.X() += nMovePos; + maLbEntryTypeMiddle.SetPosPixel(aPointLb); + maEdMiddle.SetPosPixel(aPointEd); + maLbColMiddle.SetPosPixel(aPointCol); + aPointLb.X() += nMovePos; + aPointEd.X() += nMovePos; + aPointCol.X() += nMovePos; + maLbEntryTypeMax.SetPosPixel(aPointLb); + maEdMax.SetPosPixel(aPointEd); + maLbColMax.SetPosPixel(aPointCol); + + if ( pDocSh ) + { + pItem = pDocSh->GetItem( SID_COLOR_TABLE ); + if ( pItem != NULL ) + pColorTable = ( (SvxColorListItem*)pItem )->GetColorList(); + } + if ( pColorTable.is() ) + { + // filling the line color box + maLbColMin.SetUpdateMode( false ); + maLbColMiddle.SetUpdateMode( false ); + maLbColMax.SetUpdateMode( false ); + + for ( long i = 0; i < pColorTable->Count(); ++i ) + { + XColorEntry* pEntry = pColorTable->GetColor(i); + maLbColMin.InsertEntry( pEntry->GetColor(), pEntry->GetName() ); + maLbColMiddle.InsertEntry( pEntry->GetColor(), pEntry->GetName() ); + maLbColMax.InsertEntry( pEntry->GetColor(), pEntry->GetName() ); + + if(pEntry->GetColor() == Color(COL_LIGHTRED)) + maLbColMin.SelectEntryPos(i); + if(pEntry->GetColor() == Color(COL_GREEN)) + maLbColMiddle.SelectEntryPos(i); + if(pEntry->GetColor() == Color(COL_LIGHTBLUE)) + maLbColMax.SelectEntryPos(i); + } + maLbColMin.SetUpdateMode( sal_True ); + maLbColMiddle.SetUpdateMode( sal_True ); + maLbColMax.SetUpdateMode( sal_True ); + } + + EntryTypeHdl(&maLbEntryTypeMin); + EntryTypeHdl(&maLbEntryTypeMiddle); + EntryTypeHdl(&maLbEntryTypeMax); +} + +ScFormatEntry* ScColorScaleFrmtEntry::createColorscaleEntry() const +{ + ScColorScaleFormat* pColorScale = new ScColorScaleFormat(mpDoc); + pColorScale->AddEntry(createColorScaleEntry(maLbEntryTypeMin, maLbColMin, maEdMin, mpDoc, maPos)); + /* + if(maLbColorFormat.GetSelectEntryPos() == 1) + pColorScale->AddEntry(createColorScaleEntry(maLbEntryTypeMiddle, maLbColMiddle, maEdMiddle, mpDoc, maPos)); + */ + pColorScale->AddEntry(createColorScaleEntry(maLbEntryTypeMax, maLbColMax, maEdMax, mpDoc, maPos)); + return pColorScale; +} + +ScFormatEntry* ScColorScaleFrmtEntry::GetEntry() const +{ + return createColorscaleEntry(); +} + +IMPL_LINK( ScColorScaleFrmtEntry, EntryTypeHdl, ListBox*, pBox ) +{ + bool bEnableEdit = true; + sal_Int32 nPos = pBox->GetSelectEntryPos(); + if(nPos == 0 || nPos == 1) + { + bEnableEdit = false; + } + + Edit* pEd = NULL; + if(pBox == &maLbEntryTypeMin) + pEd = &maEdMin; + else if(pBox == &maLbEntryTypeMiddle) + pEd = &maEdMiddle; + else if(pBox == &maLbEntryTypeMax) + pEd = &maEdMax; + + if(bEnableEdit) + pEd->Enable(); + else + pEd->Disable(); + + return 0; +} + +IMPL_LINK_NOARG( ScConditionFrmtEntry, ConditionTypeSelectHdl ) +{ + if(maLbCondType.GetSelectEntryPos() == 6 || maLbCondType.GetSelectEntryPos() == 7) + { + maEdVal2.Show(); + } + else + { + maEdVal2.Hide(); + } + + return 0; +} + +//databar + +namespace { + +void SetDataBarEntryTypes( const ScColorScaleEntry& rEntry, ListBox& rLbType, Edit& rEdit ) +{ + switch(rEntry.GetType()) + { + case COLORSCALE_MIN: + rLbType.SelectEntryPos(0); + break; + case COLORSCALE_MAX: + rLbType.SelectEntryPos(1); + break; + case COLORSCALE_PERCENTILE: + rEdit.SetText(rtl::OUString::valueOf(rEntry.GetValue())); + rLbType.SelectEntryPos(2); + break; + case COLORSCALE_PERCENT: + rEdit.SetText(rtl::OUString::valueOf(rEntry.GetValue())); + rLbType.SelectEntryPos(4); + break; + case COLORSCALE_FORMULA: + rEdit.SetText(rEntry.GetFormula(formula::FormulaGrammar::GRAM_DEFAULT)); + rLbType.SelectEntryPos(5); + break; + case COLORSCALE_VALUE: + rEdit.SetText(rtl::OUString::valueOf(rEntry.GetValue())); + rLbType.SelectEntryPos(3); + break; + case COLORSCALE_AUTOMIN: + rLbType.SelectEntryPos(6); + break; + case COLORSCALE_AUTOMAX: + rLbType.SelectEntryPos(7); + break; + } +} + +} + +ScDataBarFrmtEntry::ScDataBarFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScDataBarFormat* pFormat ): + ScCondFrmtEntry( pParent, pDoc, rPos ), + maLbDataBarMinType( this, ScResId( LB_TYPE_COL_SCALE ) ), + maLbDataBarMaxType( this, ScResId( LB_TYPE_COL_SCALE ) ), + maEdDataBarMin( this, ScResId( ED_COL_SCALE ) ), + maEdDataBarMax( this, ScResId( ED_COL_SCALE ) ), + maBtOptions( this, ScResId( BTN_OPTIONS ) ) +{ + if(pFormat) + { + mpDataBarData.reset(new ScDataBarFormatData(*pFormat->GetDataBarData())); + //maLbColorFormat.SelectEntryPos(2); + SetDataBarEntryTypes(*mpDataBarData->mpLowerLimit, maLbDataBarMinType, maEdDataBarMin); + SetDataBarEntryTypes(*mpDataBarData->mpUpperLimit, maLbDataBarMaxType, maEdDataBarMax); + DataBarTypeSelectHdl(NULL); + } + else + { + maLbDataBarMinType.SelectEntryPos(0); + maLbDataBarMaxType.SelectEntryPos(1); + } + +} + +ScFormatEntry* ScDataBarFrmtEntry::GetEntry() const +{ + return createDatabarEntry(); +} + +void ScDataBarFrmtEntry::Init() +{ + maLbDataBarMinType.SetSelectHdl( LINK( this, ScDataBarFrmtEntry, DataBarTypeSelectHdl ) ); + maLbDataBarMaxType.SetSelectHdl( LINK( this, ScDataBarFrmtEntry, DataBarTypeSelectHdl ) ); + Point aPointEdDataBar = maEdDataBarMin.GetPosPixel(); + Point aPointLbDataBar = maLbDataBarMaxType.GetPosPixel(); + long nMovePos = 10; + aPointEdDataBar.X() += 2*nMovePos; + aPointLbDataBar.X() += 2*nMovePos; + maEdDataBarMax.SetPosPixel(aPointEdDataBar); + maLbDataBarMaxType.SetPosPixel(aPointLbDataBar); + + maBtOptions.SetClickHdl( LINK( this, ScDataBarFrmtEntry, OptionBtnHdl ) ); + + mpDataBarData.reset(new ScDataBarFormatData()); + mpDataBarData->mpUpperLimit.reset(new ScColorScaleEntry()); + mpDataBarData->mpLowerLimit.reset(new ScColorScaleEntry()); + mpDataBarData->mpLowerLimit->SetType(COLORSCALE_MIN); + mpDataBarData->mpUpperLimit->SetType(COLORSCALE_MAX); + mpDataBarData->maPositiveColor = COL_LIGHTBLUE; +} + +ScFormatEntry* ScDataBarFrmtEntry::createDatabarEntry() const +{ + SetColorScaleEntry(mpDataBarData->mpLowerLimit.get(), maLbDataBarMinType, maEdDataBarMin, mpDoc, maPos); + SetColorScaleEntry(mpDataBarData->mpUpperLimit.get(), maLbDataBarMaxType, maEdDataBarMax, mpDoc, maPos); + ScDataBarFormat* pDataBar = new ScDataBarFormat(mpDoc); + pDataBar->SetDataBarData(new ScDataBarFormatData(*mpDataBarData.get())); + return pDataBar; +} + +IMPL_LINK_NOARG( ScDataBarFrmtEntry, DataBarTypeSelectHdl ) +{ + sal_Int32 nSelectPos = maLbDataBarMinType.GetSelectEntryPos(); + if(nSelectPos == 0 || nSelectPos == 1) + maEdDataBarMin.Disable(); + else + maEdDataBarMin.Enable(); + + nSelectPos = maLbDataBarMaxType.GetSelectEntryPos(); + if(nSelectPos == 0 || nSelectPos == 1) + maEdDataBarMax.Disable(); + else + maEdDataBarMax.Enable(); + + return 0; +} + +IMPL_LINK_NOARG( ScDataBarFrmtEntry, OptionBtnHdl ) +{ + SetColorScaleEntry(mpDataBarData->mpLowerLimit.get(), maLbDataBarMinType, maEdDataBarMin, mpDoc, maPos); + SetColorScaleEntry(mpDataBarData->mpUpperLimit.get(), maLbDataBarMaxType, maEdDataBarMax, mpDoc, maPos); + ScDataBarSettingsDlg* pDlg = new ScDataBarSettingsDlg(this, *mpDataBarData, mpDoc); + if( pDlg->Execute() == RET_OK) + { + mpDataBarData.reset(pDlg->GetData()); + SetDataBarEntryTypes(*mpDataBarData->mpLowerLimit, maLbDataBarMinType, maEdDataBarMin); + SetDataBarEntryTypes(*mpDataBarData->mpUpperLimit, maLbDataBarMaxType, maEdDataBarMax); + DataBarTypeSelectHdl(NULL); + } + return 0; +} diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx index 7c4cd8115d88..c17910751f0a 100644 --- a/sc/source/ui/inc/condformatdlg.hxx +++ b/sc/source/ui/inc/condformatdlg.hxx @@ -47,6 +47,7 @@ class ScConditionalFormat; class ScFormatEntry; class ScConditionalFormat; struct ScDataBarFormatData; +class ScCondFrmtEntry; namespace condformat { @@ -64,104 +65,6 @@ enum ScCondFormatDialogType } -class ScCondFrmtEntry : public Control -{ -private: - bool mbActive; - ScCondFormatEntryType meType; - - Link maClickHdl; - - //general ui elements - ListBox maLbType; - FixedText maFtCondNr; - FixedText maFtCondition; - - //cond format ui elements - ListBox maLbCondType; - Edit maEdVal1; - Edit maEdVal2; - FixedText maFtStyle; - ListBox maLbStyle; - SvxFontPrevWindow maWdPreview; - - //color format ui elements - ListBox maLbColorFormat; - //color scale ui elements - ListBox maLbColScale2; - ListBox maLbColScale3; - - ListBox maLbEntryTypeMin; - ListBox maLbEntryTypeMiddle; - ListBox maLbEntryTypeMax; - - Edit maEdMin; - Edit maEdMiddle; - Edit maEdMax; - - ColorListBox maLbColMin; - ColorListBox maLbColMiddle; - ColorListBox maLbColMax; - - //data bar ui elements - ListBox maLbDataBarMinType; - ListBox maLbDataBarMaxType; - Edit maEdDataBarMin; - Edit maEdDataBarMax; - PushButton maBtOptions; - - boost::scoped_ptr mpDataBarData; - - // - void SetCondType(); - void SetColorScaleType(); - void SetDataBarType(); - void SetFormulaType(); - void HideCondElements(); - void HideColorScaleElements(); - void HideDataBarElements(); - void SwitchToType(ScCondFormatEntryType eType); - - void SetHeight(); - void Init(); - - ScFormatEntry* createConditionEntry() const; - ScFormatEntry* createColorscaleEntry() const; - ScFormatEntry* createDatabarEntry() const; - ScFormatEntry* createFormulaEntry() const; - - ScDocument* mpDoc; - ScAddress maPos; - sal_Int32 mnIndex; - rtl::OUString maStrCondition; - - DECL_LINK( TypeListHdl, void*); - DECL_LINK( ColFormatTypeHdl, void*); - DECL_LINK( StyleSelectHdl, void* ); - DECL_LINK( OptionBtnHdl, void* ); - DECL_LINK( DataBarTypeSelectHdl, void* ); - DECL_LINK( ConditionTypeSelectHdl, void* ); - DECL_LINK( EntryTypeHdl, ListBox* ); - DECL_LINK( EdModifyHdl, Edit* ); - -public: - ScCondFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos ); - ScCondFrmtEntry( Window* pParent, ScDocument* pDoc, const ScFormatEntry* pFormatEntry, const ScAddress& rPos ); - virtual ~ScCondFrmtEntry(); - - virtual long Notify( NotifyEvent& rNEvt ); - - void SetType( ScCondFormatEntryType eType ); - - void Select(); - void Deselect(); - - bool IsSelected() const; - void SetIndex(sal_Int32 nIndex); - - ScFormatEntry* GetEntry() const; -}; - class ScCondFormatList : public Control { private: @@ -177,6 +80,7 @@ private: void RecalcAll(); void DoScroll(long nDiff); + public: ScCondFormatList( Window* pParent, const ResId& rResId, ScDocument* pDoc, const ScConditionalFormat* pFormat, const ScRangeList& rRanges, const ScAddress& rPos, condformat::dialog::ScCondFormatDialogType eType); @@ -188,6 +92,8 @@ public: DECL_LINK( ScrollHdl, void* ); DECL_LINK( EntrySelectHdl, ScCondFrmtEntry* ); + DECL_LINK( TypeListHdl, ListBox*); + DECL_LINK( ColFormatTypeHdl, ListBox*); }; class ScCondFormatDlg : public ScAnyRefDlg diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx new file mode 100644 index 000000000000..ee782b1f5f76 --- /dev/null +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -0,0 +1,125 @@ +#include "colorscale.hxx" +#include "conditio.hxx" + +class ScCondFrmtEntry : public Control +{ +private: + bool mbActive; + + Link maClickHdl; + + //general ui elements + ListBox maLbType; + FixedText maFtCondNr; + FixedText maFtCondition; + + void SetHeight(); + void Init(); + + sal_Int32 mnIndex; + rtl::OUString maStrCondition; +protected: + ScDocument* mpDoc; + ScAddress maPos; + + DECL_LINK( EdModifyHdl, Edit* ); + +public: + ScCondFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos ); + virtual ~ScCondFrmtEntry(); + + virtual long Notify( NotifyEvent& rNEvt ); + + void Select(); + void Deselect(); + + bool IsSelected() const; + void SetIndex(sal_Int32 nIndex); + + virtual ScFormatEntry* GetEntry() const = 0; +}; + +class ScConditionFrmtEntry : public ScCondFrmtEntry +{ + + //cond format ui elements + ListBox maLbCondType; + Edit maEdVal1; + Edit maEdVal2; + FixedText maFtStyle; + ListBox maLbStyle; + SvxFontPrevWindow maWdPreview; + + ScFormatEntry* createConditionEntry() const; + ScFormatEntry* createFormulaEntry() const; + + void SetHeight(); + void Init(); + DECL_LINK( StyleSelectHdl, void* ); + DECL_LINK( ConditionTypeSelectHdl, void* ); +public: + ScConditionFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScCondFormatEntry* pFormatEntry = NULL ); + + virtual ScFormatEntry* GetEntry() const; +}; + +class ScColorScaleFrmtEntry : public ScCondFrmtEntry +{ + + //color format ui elements + //ListBox maLbColorFormat; + + //color scale ui elements + ListBox maLbColScale2; + ListBox maLbColScale3; + + ListBox maLbEntryTypeMin; + ListBox maLbEntryTypeMiddle; + ListBox maLbEntryTypeMax; + + Edit maEdMin; + Edit maEdMiddle; + Edit maEdMax; + + ColorListBox maLbColMin; + ColorListBox maLbColMiddle; + ColorListBox maLbColMax; + + ScFormatEntry* createColorscaleEntry() const; + + void SetHeight(); + void Init(); + + DECL_LINK( EntryTypeHdl, ListBox* ); +public: + ScColorScaleFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat = NULL ); + virtual ScFormatEntry* GetEntry() const; +}; + +class ScDataBarFrmtEntry : public ScCondFrmtEntry +{ + //color format ui elements + //ListBox maLbColorFormat; + + //data bar ui elements + ListBox maLbDataBarMinType; + ListBox maLbDataBarMaxType; + Edit maEdDataBarMin; + Edit maEdDataBarMax; + + PushButton maBtOptions; + + boost::scoped_ptr mpDataBarData; + + ScFormatEntry* createDatabarEntry() const; + + void SetHeight(); + void Init(); + + DECL_LINK( OptionBtnHdl, void* ); + DECL_LINK( DataBarTypeSelectHdl, void* ); +public: + ScDataBarFrmtEntry( Window* pParemt, ScDocument* pDoc, const ScAddress& rPos, const ScDataBarFormat* pFormat = NULL ); + virtual ScFormatEntry* GetEntry() const; +}; + From d7a27f400fa148037822e93857a2b6d9d37750b8 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Mon, 8 Oct 2012 12:31:05 +0200 Subject: [PATCH 569/863] make more parts of the conditional format dlg work again Change-Id: I86ff7911bcc7cc916766d583881e605dfe1a3942 --- sc/source/ui/condformat/condformatdlg.cxx | 29 +++- .../ui/condformat/condformatdlgentry.cxx | 132 +++++++++++++++--- sc/source/ui/inc/condformatdlgentry.hxx | 27 ++-- 3 files changed, 157 insertions(+), 31 deletions(-) diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index 730e7bf88470..a3be0032dfcd 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -92,7 +92,7 @@ ScCondFormatList::ScCondFormatList(Window* pParent, const ResId& rResId, ScDocum } } if (!maEntries.empty()) - maEntries.begin()->Select(); + maEntries.begin()->SetActive(); RecalcAll(); FreeResource(); @@ -176,9 +176,28 @@ IMPL_LINK(ScCondFormatList, ColFormatTypeHdl, ListBox*, pBox) IMPL_LINK(ScCondFormatList, TypeListHdl, ListBox*, pBox) { + EntryContainer::iterator itr = maEntries.begin(); + for(; itr != maEntries.end(); ++itr) + { + if(itr->IsSelected()) + break; + } + if(itr == maEntries.end()) + return 0;; + sal_Int32 nPos = pBox->GetSelectEntryPos(); switch(nPos) { + case 0: + maEntries.replace( itr, new ScColorScaleFrmtEntry(this, mpDoc, maPos)); + itr->SetHeight(); + break; + case 1: + maEntries.replace( itr, new ScConditionFrmtEntry(this, mpDoc, maPos)); + itr->SetHeight(); + break; + case 2: + break; } RecalcAll(); return 0; @@ -190,9 +209,9 @@ IMPL_LINK_NOARG( ScCondFormatList, AddBtnHdl ) maEntries.push_back( pNewEntry ); for(EntryContainer::iterator itr = maEntries.begin(); itr != maEntries.end(); ++itr) { - itr->Deselect(); + itr->SetInactive(); } - pNewEntry->Select(); + pNewEntry->SetActive(); RecalcAll(); return 0; } @@ -215,9 +234,9 @@ IMPL_LINK( ScCondFormatList, EntrySelectHdl, ScCondFrmtEntry*, pEntry ) { for(EntryContainer::iterator itr = maEntries.begin(); itr != maEntries.end(); ++itr) { - itr->Deselect(); + itr->SetInactive(); } - pEntry->Select(); + pEntry->SetActive(); RecalcAll(); return 0; } diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 63dfcecd7cb5..f1d43794bb25 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -22,27 +22,23 @@ ScCondFrmtEntry::ScCondFrmtEntry(Window* pParent, ScDocument* pDoc, const ScAddress& rPos): Control(pParent, ScResId( RID_COND_ENTRY ) ), mbActive(false), - maLbType( this, ScResId( LB_TYPE ) ), maFtCondNr( this, ScResId( FT_COND_NR ) ), maFtCondition( this, ScResId( FT_CONDITION ) ), mnIndex(0), maStrCondition(ScResId( STR_CONDITION ).toString()), + maLbType( this, ScResId( LB_TYPE ) ), mpDoc(pDoc), maPos(rPos) { SetControlBackground(GetSettings().GetStyleSettings().GetDialogColor()); - FreeResource(); /* - maLbType.SelectEntryPos(1); - maLbCondType.SelectEntryPos(0); - maEdVal2.Hide(); */ //disable entries for color formats + maLbType.SetSelectHdl( LINK( pParent, ScCondFormatList, TypeListHdl ) ); Init(); maClickHdl = LINK( pParent, ScCondFormatList, EntrySelectHdl ); - SetHeight(); } ScCondFrmtEntry::~ScCondFrmtEntry() @@ -51,9 +47,7 @@ ScCondFrmtEntry::~ScCondFrmtEntry() void ScCondFrmtEntry::Init() { - maLbType.SetSelectHdl( LINK( this, ScCondFormatList, TypeListHdl ) ); /* - maLbColorFormat.SetSelectHdl( LINK( this, ScCondFormatList, ColFormatTypeHdl ) ); */ } @@ -103,12 +97,19 @@ void ScCondFrmtEntry::SetHeight() void ScCondFrmtEntry::Select() { + maFtCondition.SetText(rtl::OUString()); + maFtCondition.Hide(); + maLbType.Show(); mbActive = true; SetHeight(); } void ScCondFrmtEntry::Deselect() { + rtl::OUString maCondText("deselected");// = ScCondFormatHelper::GetExpression(CONDITION, maLbCondType.GetSelectEntryPos()); + maFtCondition.SetText(maCondText); + maFtCondition.Show(); + maLbType.Hide(); mbActive = false; SetHeight(); } @@ -159,6 +160,11 @@ ScConditionFrmtEntry::ScConditionFrmtEntry( Window* pParent, ScDocument* pDoc, c maLbStyle( this, ScResId( LB_STYLE ) ), maWdPreview( this, ScResId( WD_PREVIEW ) ) { + + FreeResource(); + + Init(); + if(pFormatEntry) { rtl::OUString aStyleName = pFormatEntry->GetStyle(); @@ -209,9 +215,11 @@ ScConditionFrmtEntry::ScConditionFrmtEntry( Window* pParent, ScDocument* pDoc, c } else { + maLbCondType.SelectEntryPos(0); + maEdVal2.Hide(); maLbStyle.SelectEntryPos(1); } - + maLbType.SelectEntryPos(1); } void ScConditionFrmtEntry::Init() @@ -294,6 +302,30 @@ ScFormatEntry* ScConditionFrmtEntry::GetEntry() const return createConditionEntry(); } +void ScConditionFrmtEntry::SetActive() +{ + maLbCondType.Show(); + maEdVal1.Show(); + maEdVal2.Show(); + maFtStyle.Show(); + maLbStyle.Show(); + maWdPreview.Show(); + + Select(); +} + +void ScConditionFrmtEntry::SetInactive() +{ + maLbCondType.Hide(); + maEdVal1.Hide(); + maEdVal2.Hide(); + maFtStyle.Hide(); + maLbStyle.Hide(); + maWdPreview.Hide(); + + Deselect(); +} + IMPL_LINK_NOARG(ScConditionFrmtEntry, StyleSelectHdl) { if(maLbStyle.GetSelectEntryPos() == 0) @@ -440,7 +472,7 @@ ScColorScaleEntry* createColorScaleEntry( const ListBox& rType, const ColorListB ScColorScaleFrmtEntry::ScColorScaleFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat ): ScCondFrmtEntry( pParent, pDoc, rPos ), - //maLbColorFormat( this, ScResId( LB_COLOR_FORMAT ) ), + maLbColorFormat( this, ScResId( LB_COLOR_FORMAT ) ), maLbColScale2( this, ScResId( LB_COL_SCALE2 ) ), maLbColScale3( this, ScResId( LB_COL_SCALE3 ) ), maLbEntryTypeMin( this, ScResId( LB_TYPE_COL_SCALE ) ), @@ -455,12 +487,10 @@ ScColorScaleFrmtEntry::ScColorScaleFrmtEntry( Window* pParent, ScDocument* pDoc, { if(pFormat) { - /* if(pFormat->size() == 2) maLbColorFormat.SelectEntryPos(0); else maLbColorFormat.SelectEntryPos(1); - */ ScColorScaleFormat::const_iterator itr = pFormat->begin(); SetColorScaleEntryTypes(*itr, maLbEntryTypeMin, maEdMin, maLbColMin); if(pFormat->size() == 3) @@ -473,12 +503,17 @@ ScColorScaleFrmtEntry::ScColorScaleFrmtEntry( Window* pParent, ScDocument* pDoc, } else { - //maLbColorFormat.SelectEntryPos(0); + maLbColorFormat.SelectEntryPos(1); maLbEntryTypeMin.SelectEntryPos(0); maLbEntryTypeMiddle.SelectEntryPos(2); maLbEntryTypeMax.SelectEntryPos(1); maEdMiddle.SetText(rtl::OUString::valueOf(static_cast(50))); } + FreeResource(); + + maLbColorFormat.SetSelectHdl( LINK( pParent, ScCondFormatList, ColFormatTypeHdl ) ); + + Init(); } void ScColorScaleFrmtEntry::Init() @@ -551,10 +586,8 @@ ScFormatEntry* ScColorScaleFrmtEntry::createColorscaleEntry() const { ScColorScaleFormat* pColorScale = new ScColorScaleFormat(mpDoc); pColorScale->AddEntry(createColorScaleEntry(maLbEntryTypeMin, maLbColMin, maEdMin, mpDoc, maPos)); - /* if(maLbColorFormat.GetSelectEntryPos() == 1) pColorScale->AddEntry(createColorScaleEntry(maLbEntryTypeMiddle, maLbColMiddle, maEdMiddle, mpDoc, maPos)); - */ pColorScale->AddEntry(createColorScaleEntry(maLbEntryTypeMax, maLbColMax, maEdMax, mpDoc, maPos)); return pColorScale; } @@ -564,6 +597,46 @@ ScFormatEntry* ScColorScaleFrmtEntry::GetEntry() const return createColorscaleEntry(); } +void ScColorScaleFrmtEntry::SetActive() +{ + maLbColScale2.Show(); + maLbColScale3.Show(); + + maLbEntryTypeMin.Show(); + maLbEntryTypeMiddle.Show(); + maLbEntryTypeMax.Show(); + + maEdMin.Show(); + maEdMiddle.Show(); + maEdMax.Show(); + + maLbColMin.Show(); + maLbColMiddle.Show(); + maLbColMax.Show(); + + Select(); +} + +void ScColorScaleFrmtEntry::SetInactive() +{ + maLbColScale2.Hide(); + maLbColScale3.Hide(); + + maLbEntryTypeMin.Hide(); + maLbEntryTypeMiddle.Hide(); + maLbEntryTypeMax.Hide(); + + maEdMin.Hide(); + maEdMiddle.Hide(); + maEdMax.Hide(); + + maLbColMin.Hide(); + maLbColMiddle.Hide(); + maLbColMax.Hide(); + + Deselect(); +} + IMPL_LINK( ScColorScaleFrmtEntry, EntryTypeHdl, ListBox*, pBox ) { bool bEnableEdit = true; @@ -646,16 +719,17 @@ void SetDataBarEntryTypes( const ScColorScaleEntry& rEntry, ListBox& rLbType, Ed ScDataBarFrmtEntry::ScDataBarFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScDataBarFormat* pFormat ): ScCondFrmtEntry( pParent, pDoc, rPos ), + maLbColorFormat( this, ScResId( LB_COLOR_FORMAT ) ), maLbDataBarMinType( this, ScResId( LB_TYPE_COL_SCALE ) ), maLbDataBarMaxType( this, ScResId( LB_TYPE_COL_SCALE ) ), maEdDataBarMin( this, ScResId( ED_COL_SCALE ) ), maEdDataBarMax( this, ScResId( ED_COL_SCALE ) ), maBtOptions( this, ScResId( BTN_OPTIONS ) ) { + maLbColorFormat.SelectEntryPos(2); if(pFormat) { mpDataBarData.reset(new ScDataBarFormatData(*pFormat->GetDataBarData())); - //maLbColorFormat.SelectEntryPos(2); SetDataBarEntryTypes(*mpDataBarData->mpLowerLimit, maLbDataBarMinType, maEdDataBarMin); SetDataBarEntryTypes(*mpDataBarData->mpUpperLimit, maLbDataBarMaxType, maEdDataBarMax); DataBarTypeSelectHdl(NULL); @@ -665,7 +739,11 @@ ScDataBarFrmtEntry::ScDataBarFrmtEntry( Window* pParent, ScDocument* pDoc, const maLbDataBarMinType.SelectEntryPos(0); maLbDataBarMaxType.SelectEntryPos(1); } + Init(); + maLbColorFormat.SetSelectHdl( LINK( pParent, ScCondFormatList, ColFormatTypeHdl ) ); + + FreeResource(); } ScFormatEntry* ScDataBarFrmtEntry::GetEntry() const @@ -704,6 +782,28 @@ ScFormatEntry* ScDataBarFrmtEntry::createDatabarEntry() const return pDataBar; } +void ScDataBarFrmtEntry::SetActive() +{ + maLbDataBarMinType.Show(); + maLbDataBarMaxType.Show(); + maEdDataBarMin.Show(); + maEdDataBarMax.Show(); + maBtOptions.Show(); + + Select(); +} + +void ScDataBarFrmtEntry::SetInactive() +{ + maLbDataBarMinType.Hide(); + maLbDataBarMaxType.Hide(); + maEdDataBarMin.Hide(); + maEdDataBarMax.Hide(); + maBtOptions.Hide(); + + Deselect(); +} + IMPL_LINK_NOARG( ScDataBarFrmtEntry, DataBarTypeSelectHdl ) { sal_Int32 nSelectPos = maLbDataBarMinType.GetSelectEntryPos(); diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index ee782b1f5f76..4484b0a7856f 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -9,34 +9,38 @@ private: Link maClickHdl; //general ui elements - ListBox maLbType; FixedText maFtCondNr; FixedText maFtCondition; - void SetHeight(); void Init(); sal_Int32 mnIndex; rtl::OUString maStrCondition; protected: + ListBox maLbType; + ScDocument* mpDoc; ScAddress maPos; DECL_LINK( EdModifyHdl, Edit* ); + void Select(); + void Deselect(); + public: ScCondFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos ); virtual ~ScCondFrmtEntry(); virtual long Notify( NotifyEvent& rNEvt ); - void Select(); - void Deselect(); - bool IsSelected() const; void SetIndex(sal_Int32 nIndex); + sal_Int32 GetIndex() const { return mnIndex; } + void SetHeight(); virtual ScFormatEntry* GetEntry() const = 0; + virtual void SetActive() = 0; + virtual void SetInactive() = 0; }; class ScConditionFrmtEntry : public ScCondFrmtEntry @@ -53,7 +57,6 @@ class ScConditionFrmtEntry : public ScCondFrmtEntry ScFormatEntry* createConditionEntry() const; ScFormatEntry* createFormulaEntry() const; - void SetHeight(); void Init(); DECL_LINK( StyleSelectHdl, void* ); DECL_LINK( ConditionTypeSelectHdl, void* ); @@ -61,13 +64,15 @@ public: ScConditionFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScCondFormatEntry* pFormatEntry = NULL ); virtual ScFormatEntry* GetEntry() const; + virtual void SetActive(); + virtual void SetInactive(); }; class ScColorScaleFrmtEntry : public ScCondFrmtEntry { //color format ui elements - //ListBox maLbColorFormat; + ListBox maLbColorFormat; //color scale ui elements ListBox maLbColScale2; @@ -87,19 +92,20 @@ class ScColorScaleFrmtEntry : public ScCondFrmtEntry ScFormatEntry* createColorscaleEntry() const; - void SetHeight(); void Init(); DECL_LINK( EntryTypeHdl, ListBox* ); public: ScColorScaleFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat = NULL ); virtual ScFormatEntry* GetEntry() const; + virtual void SetActive(); + virtual void SetInactive(); }; class ScDataBarFrmtEntry : public ScCondFrmtEntry { //color format ui elements - //ListBox maLbColorFormat; + ListBox maLbColorFormat; //data bar ui elements ListBox maLbDataBarMinType; @@ -113,7 +119,6 @@ class ScDataBarFrmtEntry : public ScCondFrmtEntry ScFormatEntry* createDatabarEntry() const; - void SetHeight(); void Init(); DECL_LINK( OptionBtnHdl, void* ); @@ -121,5 +126,7 @@ class ScDataBarFrmtEntry : public ScCondFrmtEntry public: ScDataBarFrmtEntry( Window* pParemt, ScDocument* pDoc, const ScAddress& rPos, const ScDataBarFormat* pFormat = NULL ); virtual ScFormatEntry* GetEntry() const; + virtual void SetActive(); + virtual void SetInactive(); }; From ee93051d46db4332f779bac9cb2b75850afc98b0 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Mon, 8 Oct 2012 13:55:26 +0200 Subject: [PATCH 570/863] add own class for formula type cond formats Change-Id: I0348797babb9e94e1d552dce341504144c837325 --- sc/source/ui/condformat/condformatdlg.cxx | 6 +- .../ui/condformat/condformatdlgentry.cxx | 138 ++++++++++++++++-- sc/source/ui/inc/condformatdlg.hrc | 2 + sc/source/ui/inc/condformatdlgentry.hxx | 20 ++- sc/source/ui/src/condformatdlg.src | 6 + 5 files changed, 157 insertions(+), 15 deletions(-) diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index a3be0032dfcd..e9234e696601 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -190,13 +190,15 @@ IMPL_LINK(ScCondFormatList, TypeListHdl, ListBox*, pBox) { case 0: maEntries.replace( itr, new ScColorScaleFrmtEntry(this, mpDoc, maPos)); - itr->SetHeight(); + itr->SetActive(); break; case 1: maEntries.replace( itr, new ScConditionFrmtEntry(this, mpDoc, maPos)); - itr->SetHeight(); + itr->SetActive(); break; case 2: + maEntries.replace( itr, new ScFormulaFrmtEntry(this, mpDoc, maPos)); + itr->SetActive(); break; } RecalcAll(); diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index f1d43794bb25..00c5b3ea56c8 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -1,6 +1,7 @@ #include "condformatdlg.hxx" #include "condformatdlgentry.hxx" #include "condformatdlg.hrc" +#include "conditio.hxx" #include "document.hxx" @@ -139,18 +140,6 @@ IMPL_LINK(ScCondFrmtEntry, EdModifyHdl, Edit*, pEdit) // //condition -ScFormatEntry* ScConditionFrmtEntry::createFormulaEntry() const -{ - ScConditionMode eMode = SC_COND_DIRECT; - rtl::OUString aFormula = maEdVal1.GetText(); - if(aFormula.isEmpty()) - return NULL; - - rtl::OUString aExpr2; - ScFormatEntry* pEntry = new ScCondFormatEntry(eMode, aFormula, aExpr2, mpDoc, maPos, maLbStyle.GetSelectEntry()); - return pEntry; -} - ScConditionFrmtEntry::ScConditionFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScCondFormatEntry* pFormatEntry ): ScCondFrmtEntry( pParent, pDoc, rPos ), maLbCondType( this, ScResId( LB_CELLIS_TYPE ) ), @@ -377,6 +366,131 @@ IMPL_LINK_NOARG(ScConditionFrmtEntry, StyleSelectHdl) return 0; } +// formula + +ScFormulaFrmtEntry::ScFormulaFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScCondFormatEntry* pFormat ): + ScCondFrmtEntry( pParent, pDoc, rPos ), + maFtStyle( this, ScResId( FT_STYLE ) ), + maLbStyle( this, ScResId( LB_STYLE ) ), + maWdPreview( this, ScResId( WD_PREVIEW ) ), + maEdFormula( this, ScResId( ED_FORMULA ) ) +{ + Init(); + + FreeResource(); + + if(pFormat) + { + maEdFormula.SetText(pFormat->GetExpression(rPos, 0, 0, pDoc->GetGrammar())); + maLbStyle.SelectEntry(pFormat->GetStyle()); + } + else + { + maLbStyle.SelectEntryPos(1); + } +} + +void ScFormulaFrmtEntry::Init() +{ + maLbStyle.SetSeparatorPos(0); + + SfxStyleSheetIterator aStyleIter( mpDoc->GetStyleSheetPool(), SFX_STYLE_FAMILY_PARA ); + for ( SfxStyleSheetBase* pStyle = aStyleIter.First(); pStyle; pStyle = aStyleIter.Next() ) + { + rtl::OUString aName = pStyle->GetName(); + maLbStyle.InsertEntry( aName ); + } + maLbStyle.SetSelectHdl( LINK( this, ScFormulaFrmtEntry, StyleSelectHdl ) ); +} + +IMPL_LINK_NOARG(ScFormulaFrmtEntry, StyleSelectHdl) +{ + if(maLbStyle.GetSelectEntryPos() == 0) + { + // call new style dialog + SfxUInt16Item aFamilyItem( SID_STYLE_FAMILY, SFX_STYLE_FAMILY_PARA ); + SfxStringItem aRefItem( SID_STYLE_REFERENCE, ScGlobal::GetRscString(STR_STYLENAME_STANDARD) ); + + // unlock the dispatcher so SID_STYLE_NEW can be executed + // (SetDispatcherLock would affect all Calc documents) + ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); + SfxDispatcher* pDisp = pViewShell->GetDispatcher(); + sal_Bool bLocked = pDisp->IsLocked(); + if (bLocked) + pDisp->Lock(false); + + // Execute the "new style" slot, complete with undo and all necessary updates. + // The return value (SfxUInt16Item) is ignored, look for new styles instead. + pDisp->Execute( SID_STYLE_NEW, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD | SFX_CALLMODE_MODAL, + &aFamilyItem, + &aRefItem, + 0L ); + + if (bLocked) + pDisp->Lock(sal_True); + + // Find the new style and add it into the style list boxes + rtl::OUString aNewStyle; + SfxStyleSheetIterator aStyleIter( mpDoc->GetStyleSheetPool(), SFX_STYLE_FAMILY_PARA ); + for ( SfxStyleSheetBase* pStyle = aStyleIter.First(); pStyle; pStyle = aStyleIter.Next() ) + { + rtl::OUString aName = pStyle->GetName(); + if ( maLbStyle.GetEntryPos(aName) == LISTBOX_ENTRY_NOTFOUND ) // all lists contain the same entries + { + maLbStyle.InsertEntry(aName); + maLbStyle.SelectEntry(aName); + } + } + } + + rtl::OUString aStyleName = maLbStyle.GetSelectEntry(); + SfxStyleSheetBase* pStyleSheet = mpDoc->GetStyleSheetPool()->Find( aStyleName, SFX_STYLE_FAMILY_PARA ); + if(pStyleSheet) + { + const SfxItemSet& rSet = pStyleSheet->GetItemSet(); + maWdPreview.Init( rSet ); + } + + return 0; +} + +ScFormatEntry* ScFormulaFrmtEntry::createFormulaEntry() const +{ + ScConditionMode eMode = SC_COND_DIRECT; + rtl::OUString aFormula = maEdFormula.GetText(); + if(aFormula.isEmpty()) + return NULL; + + rtl::OUString aExpr2; + ScFormatEntry* pEntry = new ScCondFormatEntry(eMode, aFormula, aExpr2, mpDoc, maPos, maLbStyle.GetSelectEntry()); + return pEntry; +} + +ScFormatEntry* ScFormulaFrmtEntry::GetEntry() const +{ + return createFormulaEntry(); +} + +void ScFormulaFrmtEntry::SetActive() +{ + maWdPreview.Show(); + maFtStyle.Show(); + maLbStyle.Show(); + maEdFormula.Show(); + + Select(); +} + +void ScFormulaFrmtEntry::SetInactive() +{ + maWdPreview.Hide(); + maFtStyle.Hide(); + maLbStyle.Hide(); + maEdFormula.Hide(); + + Deselect(); +} + //color scale namespace { diff --git a/sc/source/ui/inc/condformatdlg.hrc b/sc/source/ui/inc/condformatdlg.hrc index 960faec13048..f0258567f0f5 100644 --- a/sc/source/ui/inc/condformatdlg.hrc +++ b/sc/source/ui/inc/condformatdlg.hrc @@ -59,4 +59,6 @@ #define ED_RANGE 33 #define RB_RANGE 34 +#define ED_FORMULA 35 + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index 4484b0a7856f..75f45022ea30 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -55,7 +55,6 @@ class ScConditionFrmtEntry : public ScCondFrmtEntry SvxFontPrevWindow maWdPreview; ScFormatEntry* createConditionEntry() const; - ScFormatEntry* createFormulaEntry() const; void Init(); DECL_LINK( StyleSelectHdl, void* ); @@ -68,6 +67,25 @@ public: virtual void SetInactive(); }; +class ScFormulaFrmtEntry : public ScCondFrmtEntry +{ + FixedText maFtStyle; + ListBox maLbStyle; + SvxFontPrevWindow maWdPreview; + Edit maEdFormula; + + ScFormatEntry* createFormulaEntry() const; + void Init(); + + DECL_LINK( StyleSelectHdl, void* ); +public: + ScFormulaFrmtEntry( Window* pParent, ScDocument* PDoc, const ScAddress& rPos, const ScCondFormatEntry* pFormatEntry = NULL ); + + virtual ScFormatEntry* GetEntry() const; + virtual void SetActive(); + virtual void SetInactive(); +}; + class ScColorScaleFrmtEntry : public ScCondFrmtEntry { diff --git a/sc/source/ui/src/condformatdlg.src b/sc/source/ui/src/condformatdlg.src index e7fa731144b9..16b26509f40f 100644 --- a/sc/source/ui/src/condformatdlg.src +++ b/sc/source/ui/src/condformatdlg.src @@ -149,6 +149,12 @@ Control RID_COND_ENTRY Size = MAP_APPFONT( 50, 12 ); Border = TRUE; }; + Edit ED_FORMULA + { + Pos = MAP_APPFONT( 90, 15 ); + Size = MAP_APPFONT( 135, 12 ); + Border = TRUE; + }; Edit ED_VAL2 { Pos = MAP_APPFONT( 230, 15 ); From 7bc0c2bd9edac11d17d2483ec79b845854db3da4 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Mon, 8 Oct 2012 22:47:55 +0200 Subject: [PATCH 571/863] handle all kinds of condition entries correctly in the dialog Change-Id: Ibad8d9000db20819b906e9d97002e1043794adcf --- sc/source/ui/condformat/condformatdlg.cxx | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index e9234e696601..92af3cebb630 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -71,7 +71,19 @@ ScCondFormatList::ScCondFormatList(Window* pParent, const ResId& rResId, ScDocum size_t nCount = pFormat->size(); for (size_t nIndex = 0; nIndex < nCount; ++nIndex) { - maEntries.push_back(new ScConditionFrmtEntry( this, mpDoc, maPos, static_cast(pFormat->GetEntry(nIndex) ) ) ); + const ScFormatEntry* pEntry = pFormat->GetEntry(nIndex); + switch(pEntry->GetType()) + { + case condformat::CONDITION: + maEntries.push_back(new ScConditionFrmtEntry( this, mpDoc, maPos, static_cast( pEntry ) ) ); + break; + case condformat::COLORSCALE: + maEntries.push_back(new ScColorScaleFrmtEntry( this, mpDoc, maPos, static_cast( pEntry ) ) ); + break; + case condformat::DATABAR: + maEntries.push_back(new ScDataBarFrmtEntry( this, mpDoc, maPos, static_cast( pEntry ) ) ); + break; + } } } else From 1b8f33153b98251e28da4d2b6e16ddd0380f8c56 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Tue, 9 Oct 2012 04:34:14 +0200 Subject: [PATCH 572/863] separate color scale with 2 and 3 entries Change-Id: Idd3cd7467850ee32cb1380fce307395f21076071 --- sc/source/ui/condformat/condformatdlg.cxx | 34 +++- .../ui/condformat/condformatdlgentry.cxx | 185 +++++++++++++++++- sc/source/ui/inc/condformatdlgentry.hxx | 60 +++++- 3 files changed, 264 insertions(+), 15 deletions(-) diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index 92af3cebb630..6ffba85a4e76 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -78,7 +78,7 @@ ScCondFormatList::ScCondFormatList(Window* pParent, const ResId& rResId, ScDocum maEntries.push_back(new ScConditionFrmtEntry( this, mpDoc, maPos, static_cast( pEntry ) ) ); break; case condformat::COLORSCALE: - maEntries.push_back(new ScColorScaleFrmtEntry( this, mpDoc, maPos, static_cast( pEntry ) ) ); + maEntries.push_back(new ScColorScale3FrmtEntry( this, mpDoc, maPos, static_cast( pEntry ) ) ); break; case condformat::DATABAR: maEntries.push_back(new ScDataBarFrmtEntry( this, mpDoc, maPos, static_cast( pEntry ) ) ); @@ -94,7 +94,7 @@ ScCondFormatList::ScCondFormatList(Window* pParent, const ResId& rResId, ScDocum maEntries.push_back(new ScConditionFrmtEntry( this, mpDoc, maPos )); break; case condformat::dialog::COLORSCALE: - maEntries.push_back(new ScColorScaleFrmtEntry( this, mpDoc, maPos )); + maEntries.push_back(new ScColorScale3FrmtEntry( this, mpDoc, maPos )); break; case condformat::dialog::DATABAR: maEntries.push_back(new ScDataBarFrmtEntry( this, mpDoc, maPos )); @@ -182,6 +182,34 @@ void ScCondFormatList::DoScroll(long nDelta) IMPL_LINK(ScCondFormatList, ColFormatTypeHdl, ListBox*, pBox) { + EntryContainer::iterator itr = maEntries.begin(); + for(; itr != maEntries.end(); ++itr) + { + if(itr->IsSelected()) + break; + } + if(itr == maEntries.end()) + return 0;; + + sal_Int32 nPos = pBox->GetSelectEntryPos(); + switch(nPos) + { + case 0: + if(itr->GetType() != condformat::entry::COLORSCALE2) + maEntries.replace( itr, new ScColorScale2FrmtEntry( this, mpDoc, maPos ) ); + break; + case 1: + if(itr->GetType() != condformat::entry::COLORSCALE3) + maEntries.replace( itr, new ScColorScale3FrmtEntry( this, mpDoc, maPos ) ); + break; + case 2: + if(itr->GetType() != condformat::entry::DATABAR) + maEntries.replace( itr, new ScDataBarFrmtEntry( this, mpDoc, maPos ) ); + break; + default: + break; + } + itr->SetActive(); RecalcAll(); return 0; } @@ -201,7 +229,7 @@ IMPL_LINK(ScCondFormatList, TypeListHdl, ListBox*, pBox) switch(nPos) { case 0: - maEntries.replace( itr, new ScColorScaleFrmtEntry(this, mpDoc, maPos)); + maEntries.replace( itr, new ScColorScale3FrmtEntry(this, mpDoc, maPos)); itr->SetActive(); break; case 1: diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 00c5b3ea56c8..fc2e733c8059 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -151,6 +151,7 @@ ScConditionFrmtEntry::ScConditionFrmtEntry( Window* pParent, ScDocument* pDoc, c { FreeResource(); + maLbType.SelectEntryPos(1); Init(); @@ -378,6 +379,7 @@ ScFormulaFrmtEntry::ScFormulaFrmtEntry( Window* pParent, ScDocument* pDoc, const Init(); FreeResource(); + maLbType.SelectEntryPos(2); if(pFormat) { @@ -584,7 +586,168 @@ ScColorScaleEntry* createColorScaleEntry( const ListBox& rType, const ColorListB } -ScColorScaleFrmtEntry::ScColorScaleFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat ): +ScColorScale2FrmtEntry::ScColorScale2FrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat ): + ScCondFrmtEntry( pParent, pDoc, rPos ), + maLbColorFormat( this, ScResId( LB_COLOR_FORMAT ) ), + maLbColScale2( this, ScResId( LB_COL_SCALE2 ) ), + maLbEntryTypeMin( this, ScResId( LB_TYPE_COL_SCALE ) ), + maLbEntryTypeMax( this, ScResId( LB_TYPE_COL_SCALE ) ), + maEdMin( this, ScResId( ED_COL_SCALE ) ), + maEdMax( this, ScResId( ED_COL_SCALE ) ), + maLbColMin( this, ScResId( LB_COL) ), + maLbColMax( this, ScResId( LB_COL) ) +{ + maLbType.SelectEntryPos(0); + maLbColorFormat.SelectEntryPos(0); + if(pFormat) + { + ScColorScaleFormat::const_iterator itr = pFormat->begin(); + SetColorScaleEntryTypes(*itr, maLbEntryTypeMin, maEdMin, maLbColMin); + ++itr; + SetColorScaleEntryTypes(*itr, maLbEntryTypeMax, maEdMax, maLbColMax); + } + else + { + maLbEntryTypeMin.SelectEntryPos(0); + maLbEntryTypeMax.SelectEntryPos(1); + } + FreeResource(); + + maLbColorFormat.SetSelectHdl( LINK( pParent, ScCondFormatList, ColFormatTypeHdl ) ); + + Init(); +} + +void ScColorScale2FrmtEntry::Init() +{ + maLbEntryTypeMin.SetSelectHdl( LINK( this, ScColorScale2FrmtEntry, EntryTypeHdl ) ); + maLbEntryTypeMax.SetSelectHdl( LINK( this, ScColorScale2FrmtEntry, EntryTypeHdl ) ); + + SfxObjectShell* pDocSh = SfxObjectShell::Current(); + const SfxPoolItem* pItem = NULL; + XColorListRef pColorTable; + + DBG_ASSERT( pDocSh, "DocShell not found!" ); + + /* + Point aPointLb = maLbEntryTypeMiddle.GetPosPixel(); + Point aPointEd = maEdMiddle.GetPosPixel(); + Point aPointCol = maLbColMiddle.GetPosPixel(); + const long nMovePos = maLbEntryTypeMiddle.GetSizePixel().Width() * 1.2; + aPointLb.X() += nMovePos; + aPointEd.X() += nMovePos; + aPointCol.X() += nMovePos; + maLbEntryTypeMiddle.SetPosPixel(aPointLb); + maEdMiddle.SetPosPixel(aPointEd); + maLbColMiddle.SetPosPixel(aPointCol); + aPointLb.X() += nMovePos; + aPointEd.X() += nMovePos; + aPointCol.X() += nMovePos; + maLbEntryTypeMax.SetPosPixel(aPointLb); + maEdMax.SetPosPixel(aPointEd); + maLbColMax.SetPosPixel(aPointCol); + */ + + if ( pDocSh ) + { + pItem = pDocSh->GetItem( SID_COLOR_TABLE ); + if ( pItem != NULL ) + pColorTable = ( (SvxColorListItem*)pItem )->GetColorList(); + } + if ( pColorTable.is() ) + { + // filling the line color box + maLbColMin.SetUpdateMode( false ); + maLbColMax.SetUpdateMode( false ); + + for ( long i = 0; i < pColorTable->Count(); ++i ) + { + XColorEntry* pEntry = pColorTable->GetColor(i); + maLbColMin.InsertEntry( pEntry->GetColor(), pEntry->GetName() ); + maLbColMax.InsertEntry( pEntry->GetColor(), pEntry->GetName() ); + + if(pEntry->GetColor() == Color(COL_LIGHTRED)) + maLbColMin.SelectEntryPos(i); + if(pEntry->GetColor() == Color(COL_LIGHTBLUE)) + maLbColMax.SelectEntryPos(i); + } + maLbColMin.SetUpdateMode( sal_True ); + maLbColMax.SetUpdateMode( sal_True ); + } + + EntryTypeHdl(&maLbEntryTypeMin); + EntryTypeHdl(&maLbEntryTypeMax); +} + +ScFormatEntry* ScColorScale2FrmtEntry::createColorscaleEntry() const +{ + ScColorScaleFormat* pColorScale = new ScColorScaleFormat(mpDoc); + pColorScale->AddEntry(createColorScaleEntry(maLbEntryTypeMin, maLbColMin, maEdMin, mpDoc, maPos)); + pColorScale->AddEntry(createColorScaleEntry(maLbEntryTypeMax, maLbColMax, maEdMax, mpDoc, maPos)); + return pColorScale; +} + +ScFormatEntry* ScColorScale2FrmtEntry::GetEntry() const +{ + return createColorscaleEntry(); +} + +void ScColorScale2FrmtEntry::SetActive() +{ + maLbColScale2.Show(); + + maLbEntryTypeMin.Show(); + maLbEntryTypeMax.Show(); + + maEdMin.Show(); + maEdMax.Show(); + + maLbColMin.Show(); + maLbColMax.Show(); + + Select(); +} + +void ScColorScale2FrmtEntry::SetInactive() +{ + maLbColScale2.Hide(); + + maLbEntryTypeMin.Hide(); + maLbEntryTypeMax.Hide(); + + maEdMin.Hide(); + maEdMax.Hide(); + + maLbColMin.Hide(); + maLbColMax.Hide(); + + Deselect(); +} + +IMPL_LINK( ScColorScale2FrmtEntry, EntryTypeHdl, ListBox*, pBox ) +{ + bool bEnableEdit = true; + sal_Int32 nPos = pBox->GetSelectEntryPos(); + if(nPos == 0 || nPos == 1) + { + bEnableEdit = false; + } + + Edit* pEd = NULL; + if(pBox == &maLbEntryTypeMin) + pEd = &maEdMin; + else if(pBox == &maLbEntryTypeMax) + pEd = &maEdMax; + + if(bEnableEdit) + pEd->Enable(); + else + pEd->Disable(); + + return 0; +} + +ScColorScale3FrmtEntry::ScColorScale3FrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat ): ScCondFrmtEntry( pParent, pDoc, rPos ), maLbColorFormat( this, ScResId( LB_COLOR_FORMAT ) ), maLbColScale2( this, ScResId( LB_COL_SCALE2 ) ), @@ -599,6 +762,7 @@ ScColorScaleFrmtEntry::ScColorScaleFrmtEntry( Window* pParent, ScDocument* pDoc, maLbColMiddle( this, ScResId( LB_COL) ), maLbColMax( this, ScResId( LB_COL) ) { + maLbType.SelectEntryPos(0); if(pFormat) { if(pFormat->size() == 2) @@ -630,11 +794,11 @@ ScColorScaleFrmtEntry::ScColorScaleFrmtEntry( Window* pParent, ScDocument* pDoc, Init(); } -void ScColorScaleFrmtEntry::Init() +void ScColorScale3FrmtEntry::Init() { - maLbEntryTypeMin.SetSelectHdl( LINK( this, ScColorScaleFrmtEntry, EntryTypeHdl ) ); - maLbEntryTypeMax.SetSelectHdl( LINK( this, ScColorScaleFrmtEntry, EntryTypeHdl ) ); - maLbEntryTypeMiddle.SetSelectHdl( LINK( this, ScColorScaleFrmtEntry, EntryTypeHdl ) ); + maLbEntryTypeMin.SetSelectHdl( LINK( this, ScColorScale3FrmtEntry, EntryTypeHdl ) ); + maLbEntryTypeMax.SetSelectHdl( LINK( this, ScColorScale3FrmtEntry, EntryTypeHdl ) ); + maLbEntryTypeMiddle.SetSelectHdl( LINK( this, ScColorScale3FrmtEntry, EntryTypeHdl ) ); SfxObjectShell* pDocSh = SfxObjectShell::Current(); const SfxPoolItem* pItem = NULL; @@ -696,7 +860,7 @@ void ScColorScaleFrmtEntry::Init() EntryTypeHdl(&maLbEntryTypeMax); } -ScFormatEntry* ScColorScaleFrmtEntry::createColorscaleEntry() const +ScFormatEntry* ScColorScale3FrmtEntry::createColorscaleEntry() const { ScColorScaleFormat* pColorScale = new ScColorScaleFormat(mpDoc); pColorScale->AddEntry(createColorScaleEntry(maLbEntryTypeMin, maLbColMin, maEdMin, mpDoc, maPos)); @@ -706,12 +870,12 @@ ScFormatEntry* ScColorScaleFrmtEntry::createColorscaleEntry() const return pColorScale; } -ScFormatEntry* ScColorScaleFrmtEntry::GetEntry() const +ScFormatEntry* ScColorScale3FrmtEntry::GetEntry() const { return createColorscaleEntry(); } -void ScColorScaleFrmtEntry::SetActive() +void ScColorScale3FrmtEntry::SetActive() { maLbColScale2.Show(); maLbColScale3.Show(); @@ -731,7 +895,7 @@ void ScColorScaleFrmtEntry::SetActive() Select(); } -void ScColorScaleFrmtEntry::SetInactive() +void ScColorScale3FrmtEntry::SetInactive() { maLbColScale2.Hide(); maLbColScale3.Hide(); @@ -751,7 +915,7 @@ void ScColorScaleFrmtEntry::SetInactive() Deselect(); } -IMPL_LINK( ScColorScaleFrmtEntry, EntryTypeHdl, ListBox*, pBox ) +IMPL_LINK( ScColorScale3FrmtEntry, EntryTypeHdl, ListBox*, pBox ) { bool bEnableEdit = true; sal_Int32 nPos = pBox->GetSelectEntryPos(); @@ -841,6 +1005,7 @@ ScDataBarFrmtEntry::ScDataBarFrmtEntry( Window* pParent, ScDocument* pDoc, const maBtOptions( this, ScResId( BTN_OPTIONS ) ) { maLbColorFormat.SelectEntryPos(2); + maLbType.SelectEntryPos(0); if(pFormat) { mpDataBarData.reset(new ScDataBarFormatData(*pFormat->GetDataBarData())); diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index 75f45022ea30..3147bfb03c2f 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -1,6 +1,23 @@ #include "colorscale.hxx" #include "conditio.hxx" +namespace condformat { + +namespace entry { + +enum ScCondFrmtEntryType +{ + CONDITION, + FORMULA, + COLORSCALE2, + COLORSCALE3, + DATABAR +}; + +} + +} + class ScCondFrmtEntry : public Control { private: @@ -41,6 +58,8 @@ public: virtual ScFormatEntry* GetEntry() const = 0; virtual void SetActive() = 0; virtual void SetInactive() = 0; + + virtual condformat::entry::ScCondFrmtEntryType GetType() = 0; }; class ScConditionFrmtEntry : public ScCondFrmtEntry @@ -65,6 +84,8 @@ public: virtual ScFormatEntry* GetEntry() const; virtual void SetActive(); virtual void SetInactive(); + + virtual condformat::entry::ScCondFrmtEntryType GetType() { return condformat::entry::CONDITION; } }; class ScFormulaFrmtEntry : public ScCondFrmtEntry @@ -84,9 +105,41 @@ public: virtual ScFormatEntry* GetEntry() const; virtual void SetActive(); virtual void SetInactive(); + virtual condformat::entry::ScCondFrmtEntryType GetType() { return condformat::entry::FORMULA; } }; -class ScColorScaleFrmtEntry : public ScCondFrmtEntry +class ScColorScale2FrmtEntry : public ScCondFrmtEntry +{ + + //color format ui elements + ListBox maLbColorFormat; + + //color scale ui elements + ListBox maLbColScale2; + + ListBox maLbEntryTypeMin; + ListBox maLbEntryTypeMax; + + Edit maEdMin; + Edit maEdMax; + + ColorListBox maLbColMin; + ColorListBox maLbColMax; + + ScFormatEntry* createColorscaleEntry() const; + + void Init(); + + DECL_LINK( EntryTypeHdl, ListBox* ); +public: + ScColorScale2FrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat = NULL ); + virtual ScFormatEntry* GetEntry() const; + virtual void SetActive(); + virtual void SetInactive(); + virtual condformat::entry::ScCondFrmtEntryType GetType() { return condformat::entry::COLORSCALE2; } +}; + +class ScColorScale3FrmtEntry : public ScCondFrmtEntry { //color format ui elements @@ -114,10 +167,11 @@ class ScColorScaleFrmtEntry : public ScCondFrmtEntry DECL_LINK( EntryTypeHdl, ListBox* ); public: - ScColorScaleFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat = NULL ); + ScColorScale3FrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat = NULL ); virtual ScFormatEntry* GetEntry() const; virtual void SetActive(); virtual void SetInactive(); + virtual condformat::entry::ScCondFrmtEntryType GetType() { return condformat::entry::COLORSCALE3; } }; class ScDataBarFrmtEntry : public ScCondFrmtEntry @@ -146,5 +200,7 @@ public: virtual ScFormatEntry* GetEntry() const; virtual void SetActive(); virtual void SetInactive(); + + virtual condformat::entry::ScCondFrmtEntryType GetType() { return condformat::entry::DATABAR; } }; From 2741675caddb927653ec914f46025b3f6ab0d439 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Tue, 9 Oct 2012 05:03:21 +0200 Subject: [PATCH 573/863] only show two entries for between and not between Change-Id: I8cf41941d50f7fb868868f17d6f25206ae53c76f --- sc/source/ui/condformat/condformatdlgentry.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index fc2e733c8059..211c3bb163ee 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -296,7 +296,8 @@ void ScConditionFrmtEntry::SetActive() { maLbCondType.Show(); maEdVal1.Show(); - maEdVal2.Show(); + if(maLbCondType.GetSelectEntryPos() == 6 || maLbCondType.GetSelectEntryPos() == 7) + maEdVal2.Show(); maFtStyle.Show(); maLbStyle.Show(); maWdPreview.Show(); From b5ac62c06d8dcbb7ecad325685fec80df7470458 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Tue, 9 Oct 2012 06:09:52 +0200 Subject: [PATCH 574/863] position all elements in the src file and not in the code # Changes to be committed: Change-Id: Idc3d2a7201c6d2e92a111ffc6cb60f88c4c0c4c2 --- .../ui/condformat/condformatdlgentry.cxx | 75 +++++-------------- sc/source/ui/inc/condformatdlg.hrc | 16 ++-- sc/source/ui/inc/condformatdlgentry.hxx | 5 -- sc/source/ui/src/condformatdlg.src | 74 ++++++++++++++++-- 4 files changed, 99 insertions(+), 71 deletions(-) diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 211c3bb163ee..ee83a7a9c273 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -590,13 +590,12 @@ ScColorScaleEntry* createColorScaleEntry( const ListBox& rType, const ColorListB ScColorScale2FrmtEntry::ScColorScale2FrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat ): ScCondFrmtEntry( pParent, pDoc, rPos ), maLbColorFormat( this, ScResId( LB_COLOR_FORMAT ) ), - maLbColScale2( this, ScResId( LB_COL_SCALE2 ) ), - maLbEntryTypeMin( this, ScResId( LB_TYPE_COL_SCALE ) ), - maLbEntryTypeMax( this, ScResId( LB_TYPE_COL_SCALE ) ), - maEdMin( this, ScResId( ED_COL_SCALE ) ), - maEdMax( this, ScResId( ED_COL_SCALE ) ), - maLbColMin( this, ScResId( LB_COL) ), - maLbColMax( this, ScResId( LB_COL) ) + maLbEntryTypeMin( this, ScResId( LB_TYPE_COL_SCALE_MIN ) ), + maLbEntryTypeMax( this, ScResId( LB_TYPE_COL_SCALE_MAX ) ), + maEdMin( this, ScResId( ED_COL_SCALE_MIN ) ), + maEdMax( this, ScResId( ED_COL_SCALE_MAX ) ), + maLbColMin( this, ScResId( LB_COL_MIN ) ), + maLbColMax( this, ScResId( LB_COL_MAX ) ) { maLbType.SelectEntryPos(0); maLbColorFormat.SelectEntryPos(0); @@ -695,8 +694,6 @@ ScFormatEntry* ScColorScale2FrmtEntry::GetEntry() const void ScColorScale2FrmtEntry::SetActive() { - maLbColScale2.Show(); - maLbEntryTypeMin.Show(); maLbEntryTypeMax.Show(); @@ -711,8 +708,6 @@ void ScColorScale2FrmtEntry::SetActive() void ScColorScale2FrmtEntry::SetInactive() { - maLbColScale2.Hide(); - maLbEntryTypeMin.Hide(); maLbEntryTypeMax.Hide(); @@ -751,17 +746,15 @@ IMPL_LINK( ScColorScale2FrmtEntry, EntryTypeHdl, ListBox*, pBox ) ScColorScale3FrmtEntry::ScColorScale3FrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat ): ScCondFrmtEntry( pParent, pDoc, rPos ), maLbColorFormat( this, ScResId( LB_COLOR_FORMAT ) ), - maLbColScale2( this, ScResId( LB_COL_SCALE2 ) ), - maLbColScale3( this, ScResId( LB_COL_SCALE3 ) ), - maLbEntryTypeMin( this, ScResId( LB_TYPE_COL_SCALE ) ), - maLbEntryTypeMiddle( this, ScResId( LB_TYPE_COL_SCALE ) ), - maLbEntryTypeMax( this, ScResId( LB_TYPE_COL_SCALE ) ), - maEdMin( this, ScResId( ED_COL_SCALE ) ), - maEdMiddle( this, ScResId( ED_COL_SCALE ) ), - maEdMax( this, ScResId( ED_COL_SCALE ) ), - maLbColMin( this, ScResId( LB_COL) ), - maLbColMiddle( this, ScResId( LB_COL) ), - maLbColMax( this, ScResId( LB_COL) ) + maLbEntryTypeMin( this, ScResId( LB_TYPE_COL_SCALE_MIN ) ), + maLbEntryTypeMiddle( this, ScResId( LB_TYPE_COL_SCALE_MIDDLE ) ), + maLbEntryTypeMax( this, ScResId( LB_TYPE_COL_SCALE_MAX ) ), + maEdMin( this, ScResId( ED_COL_SCALE_MIN ) ), + maEdMiddle( this, ScResId( ED_COL_SCALE_MIDDLE ) ), + maEdMax( this, ScResId( ED_COL_SCALE_MAX ) ), + maLbColMin( this, ScResId( LB_COL_MIN ) ), + maLbColMiddle( this, ScResId( LB_COL_MIDDLE ) ), + maLbColMax( this, ScResId( LB_COL_MAX ) ) { maLbType.SelectEntryPos(0); if(pFormat) @@ -807,23 +800,6 @@ void ScColorScale3FrmtEntry::Init() DBG_ASSERT( pDocSh, "DocShell not found!" ); - Point aPointLb = maLbEntryTypeMiddle.GetPosPixel(); - Point aPointEd = maEdMiddle.GetPosPixel(); - Point aPointCol = maLbColMiddle.GetPosPixel(); - const long nMovePos = maLbEntryTypeMiddle.GetSizePixel().Width() * 1.2; - aPointLb.X() += nMovePos; - aPointEd.X() += nMovePos; - aPointCol.X() += nMovePos; - maLbEntryTypeMiddle.SetPosPixel(aPointLb); - maEdMiddle.SetPosPixel(aPointEd); - maLbColMiddle.SetPosPixel(aPointCol); - aPointLb.X() += nMovePos; - aPointEd.X() += nMovePos; - aPointCol.X() += nMovePos; - maLbEntryTypeMax.SetPosPixel(aPointLb); - maEdMax.SetPosPixel(aPointEd); - maLbColMax.SetPosPixel(aPointCol); - if ( pDocSh ) { pItem = pDocSh->GetItem( SID_COLOR_TABLE ); @@ -878,9 +854,6 @@ ScFormatEntry* ScColorScale3FrmtEntry::GetEntry() const void ScColorScale3FrmtEntry::SetActive() { - maLbColScale2.Show(); - maLbColScale3.Show(); - maLbEntryTypeMin.Show(); maLbEntryTypeMiddle.Show(); maLbEntryTypeMax.Show(); @@ -898,9 +871,6 @@ void ScColorScale3FrmtEntry::SetActive() void ScColorScale3FrmtEntry::SetInactive() { - maLbColScale2.Hide(); - maLbColScale3.Hide(); - maLbEntryTypeMin.Hide(); maLbEntryTypeMiddle.Hide(); maLbEntryTypeMax.Hide(); @@ -999,10 +969,10 @@ void SetDataBarEntryTypes( const ScColorScaleEntry& rEntry, ListBox& rLbType, Ed ScDataBarFrmtEntry::ScDataBarFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScDataBarFormat* pFormat ): ScCondFrmtEntry( pParent, pDoc, rPos ), maLbColorFormat( this, ScResId( LB_COLOR_FORMAT ) ), - maLbDataBarMinType( this, ScResId( LB_TYPE_COL_SCALE ) ), - maLbDataBarMaxType( this, ScResId( LB_TYPE_COL_SCALE ) ), - maEdDataBarMin( this, ScResId( ED_COL_SCALE ) ), - maEdDataBarMax( this, ScResId( ED_COL_SCALE ) ), + maLbDataBarMinType( this, ScResId( LB_TYPE_COL_SCALE_MIN ) ), + maLbDataBarMaxType( this, ScResId( LB_TYPE_COL_SCALE_MAX ) ), + maEdDataBarMin( this, ScResId( ED_COL_SCALE_MIN ) ), + maEdDataBarMax( this, ScResId( ED_COL_SCALE_MAX ) ), maBtOptions( this, ScResId( BTN_OPTIONS ) ) { maLbColorFormat.SelectEntryPos(2); @@ -1035,13 +1005,6 @@ void ScDataBarFrmtEntry::Init() { maLbDataBarMinType.SetSelectHdl( LINK( this, ScDataBarFrmtEntry, DataBarTypeSelectHdl ) ); maLbDataBarMaxType.SetSelectHdl( LINK( this, ScDataBarFrmtEntry, DataBarTypeSelectHdl ) ); - Point aPointEdDataBar = maEdDataBarMin.GetPosPixel(); - Point aPointLbDataBar = maLbDataBarMaxType.GetPosPixel(); - long nMovePos = 10; - aPointEdDataBar.X() += 2*nMovePos; - aPointLbDataBar.X() += 2*nMovePos; - maEdDataBarMax.SetPosPixel(aPointEdDataBar); - maLbDataBarMaxType.SetPosPixel(aPointLbDataBar); maBtOptions.SetClickHdl( LINK( this, ScDataBarFrmtEntry, OptionBtnHdl ) ); diff --git a/sc/source/ui/inc/condformatdlg.hrc b/sc/source/ui/inc/condformatdlg.hrc index f0258567f0f5..dcb51d19be77 100644 --- a/sc/source/ui/inc/condformatdlg.hrc +++ b/sc/source/ui/inc/condformatdlg.hrc @@ -46,12 +46,7 @@ #define FT_STYLE 21 #define LB_COLOR_FORMAT 22 -#define LB_COL_SCALE2 23 -#define LB_COL_SCALE3 24 -#define LB_TYPE_COL_SCALE 25 -#define ED_COL_SCALE 28 #define WD_PREVIEW 26 -#define LB_COL 27 #define BTN_OPTIONS 30 #define STR_CONDITION 31 @@ -61,4 +56,15 @@ #define ED_FORMULA 35 +#define ED_COL_SCALE_MIN 36 +#define ED_COL_SCALE_MIDDLE 37 +#define ED_COL_SCALE_MAX 38 + +#define LB_COL_MIN 39 +#define LB_COL_MIDDLE 40 +#define LB_COL_MAX 41 + +#define LB_TYPE_COL_SCALE_MIN 42 +#define LB_TYPE_COL_SCALE_MIDDLE 43 +#define LB_TYPE_COL_SCALE_MAX 43 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index 3147bfb03c2f..94722d040d76 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -115,8 +115,6 @@ class ScColorScale2FrmtEntry : public ScCondFrmtEntry ListBox maLbColorFormat; //color scale ui elements - ListBox maLbColScale2; - ListBox maLbEntryTypeMin; ListBox maLbEntryTypeMax; @@ -146,9 +144,6 @@ class ScColorScale3FrmtEntry : public ScCondFrmtEntry ListBox maLbColorFormat; //color scale ui elements - ListBox maLbColScale2; - ListBox maLbColScale3; - ListBox maLbEntryTypeMin; ListBox maLbEntryTypeMiddle; ListBox maLbEntryTypeMax; diff --git a/sc/source/ui/src/condformatdlg.src b/sc/source/ui/src/condformatdlg.src index 16b26509f40f..4adff8f62fc4 100644 --- a/sc/source/ui/src/condformatdlg.src +++ b/sc/source/ui/src/condformatdlg.src @@ -191,7 +191,7 @@ Control RID_COND_ENTRY "New Style..."; }; }; - ListBox LB_TYPE_COL_SCALE + ListBox LB_TYPE_COL_SCALE_MIN { Pos = MAP_APPFONT( 5, 32 ); Size = MAP_APPFONT( 80, 60 ); @@ -209,6 +209,42 @@ Control RID_COND_ENTRY "AutoMax"; }; }; + ListBox LB_TYPE_COL_SCALE_MIDDLE + { + Pos = MAP_APPFONT( 100, 32 ); + Size = MAP_APPFONT( 80, 60 ); + Border = TRUE; + DropDown = TRUE; + StringList [ en-US ] = + { + "Min"; + "Max"; + "Percentile"; + "Value"; + "Percent"; + "Formula"; + "AutoMin"; + "AutoMax"; + }; + }; + ListBox LB_TYPE_COL_SCALE_MAX + { + Pos = MAP_APPFONT( 195, 32 ); + Size = MAP_APPFONT( 80, 60 ); + Border = TRUE; + DropDown = TRUE; + StringList [ en-US ] = + { + "Min"; + "Max"; + "Percentile"; + "Value"; + "Percent"; + "Formula"; + "AutoMin"; + "AutoMax"; + }; + }; Window WD_PREVIEW { Pos = MAP_APPFONT( 175, 32 ); @@ -216,16 +252,44 @@ Control RID_COND_ENTRY Text [ en-US ] = "Example"; Border = TRUE; }; - Edit ED_COL_SCALE + Edit ED_COL_SCALE_MIN { Pos = MAP_APPFONT( 5, 48 ); - Size = MAP_APPFONT( 60, 12 ); + Size = MAP_APPFONT( 80, 12 ); Border = TRUE; }; - ListBox LB_COL + Edit ED_COL_SCALE_MIDDLE + { + Pos = MAP_APPFONT( 100, 48 ); + Size = MAP_APPFONT( 80, 12 ); + Border = TRUE; + }; + Edit ED_COL_SCALE_MAX + { + Pos = MAP_APPFONT( 195, 48 ); + Size = MAP_APPFONT( 80, 12 ); + Border = TRUE; + }; + ListBox LB_COL_MIN { Pos = MAP_APPFONT( 5, 62 ); - Size = MAP_APPFONT( 60, 40 ); + Size = MAP_APPFONT( 80, 40 ); + Border = TRUE; + DropDown = TRUE; + DDExtraWidth = TRUE; + }; + ListBox LB_COL_MIDDLE + { + Pos = MAP_APPFONT( 100, 62 ); + Size = MAP_APPFONT( 80, 40 ); + Border = TRUE; + DropDown = TRUE; + DDExtraWidth = TRUE; + }; + ListBox LB_COL_MAX + { + Pos = MAP_APPFONT( 195, 62 ); + Size = MAP_APPFONT( 80, 40 ); Border = TRUE; DropDown = TRUE; DDExtraWidth = TRUE; From 025559813580370ffdf0de0a8844eed4cbe0ab1c Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Tue, 9 Oct 2012 06:11:17 +0200 Subject: [PATCH 575/863] disable these buttons until figured out how to call the cond format dlg Change-Id: I519e4fec832a47e298512a0f0416bc12827913fb --- sc/source/ui/condformat/condformatmgr.cxx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx index 16c8291cb938..dc5bb8b3d6fe 100644 --- a/sc/source/ui/condformat/condformatmgr.cxx +++ b/sc/source/ui/condformat/condformatmgr.cxx @@ -183,6 +183,9 @@ ScCondFormatManagerDlg::ScCondFormatManagerDlg(Window* pParent, ScDocument* pDoc maBtnEdit.SetClickHdl(LINK(this, ScCondFormatManagerDlg, EditBtnHdl)); maBtnAdd.SetClickHdl(LINK(this, ScCondFormatManagerDlg, AddBtnHdl)); maCtrlManager.GetListControl().SetDoubleClickHdl(LINK(this, ScCondFormatManagerDlg, EditBtnHdl)); + + maBtnAdd.Disable(); + maBtnEdit.Disable(); } ScCondFormatManagerDlg::~ScCondFormatManagerDlg() From 937cee757ea243a18ea03b4d3e8662524a8ff090 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Tue, 9 Oct 2012 06:29:21 +0200 Subject: [PATCH 576/863] make the dialog actually do something useful again Change-Id: I440b38442f69bd50286fee8ce3ee1b289b45775d --- sc/source/ui/condformat/condformatdlg.cxx | 13 ++++++++++++- sc/source/ui/inc/condformatdlg.hxx | 2 ++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index 6ffba85a4e76..332139e89495 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -47,6 +47,8 @@ #include "colorscale.hxx" #include "colorformat.hxx" #include "reffact.hxx" +#include "docsh.hxx" +#include "docfunc.hxx" #include "condformatdlgentry.hxx" #include "globstr.hrc" @@ -306,6 +308,7 @@ ScCondFormatDlg::ScCondFormatDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* p maCondFormList( this, ScResId( CTRL_LIST ), pDoc, pFormat, rRange, rPos, eType ), maPos(rPos), mpDoc(pDoc), + mpFormat(pFormat), meType(eType) { rtl::OUStringBuffer aTitle( GetText() ); @@ -410,13 +413,21 @@ sal_Bool ScCondFormatDlg::Close() IMPL_LINK_NOARG( ScCondFormatDlg, OkBtnHdl ) { - Close(); + ScConditionalFormat* pFormat = GetConditionalFormat(); + SfxObjectShell* pObjectShell = mpDoc->GetDocumentShell(); + sal_Int32 nKey = 0; + if(mpFormat) + nKey = mpFormat->GetKey(); + static_cast(pObjectShell)->GetDocFunc().ReplaceConditionalFormat(nKey, pFormat, maPos.Tab(), pFormat->GetRange()); + + Close(); return 0; } IMPL_LINK_NOARG( ScCondFormatDlg, CancelBtnHdl ) { + Close(); return 0; diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx index c17910751f0a..e91574bde89a 100644 --- a/sc/source/ui/inc/condformatdlg.hxx +++ b/sc/source/ui/inc/condformatdlg.hxx @@ -112,6 +112,8 @@ private: ScAddress maPos; ScDocument* mpDoc; + const ScConditionalFormat* mpFormat; + condformat::dialog::ScCondFormatDialogType meType; DECL_LINK( EdRangeModifyHdl, Edit* ); From 1ae1bca7e6108081b16c9bedd1078e6c8ba34bf6 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Tue, 9 Oct 2012 06:34:18 +0200 Subject: [PATCH 577/863] forgot the licence header Change-Id: I85e58c241a3acd1caf949d4314ca9a05a5e51379 --- sc/source/ui/condformat/condformatdlgentry.cxx | 11 +++++++++++ sc/source/ui/inc/condformatdlgentry.hxx | 10 ++++++++++ 2 files changed, 21 insertions(+) diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index ee83a7a9c273..507a0edef29b 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -1,3 +1,12 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + #include "condformatdlg.hxx" #include "condformatdlgentry.hxx" #include "condformatdlg.hrc" @@ -1078,3 +1087,5 @@ IMPL_LINK_NOARG( ScDataBarFrmtEntry, OptionBtnHdl ) } return 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index 94722d040d76..b0051ad10837 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -1,3 +1,12 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + #include "colorscale.hxx" #include "conditio.hxx" @@ -199,3 +208,4 @@ public: virtual condformat::entry::ScCondFrmtEntryType GetType() { return condformat::entry::DATABAR; } }; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ From 34638df69902a2251e8c23833b62c005a754fd5d Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Tue, 9 Oct 2012 07:04:58 +0200 Subject: [PATCH 578/863] don't insert the same data twice into boost::ptr_set, fdo#55710 Change-Id: Ifcd421cab6e675482d11aa5d2f92e11569077173 --- sc/source/filter/xml/xmlstyli.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index fe0f2650c87b..bb054377c104 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -455,18 +455,18 @@ void XMLTableStyleContext::ApplyCondFormat( uno::SequenceAddCondFormatData( aRangeList, nTab, nCondId ); - break; + return; } } - if(mpCondFormat) + if(mpCondFormat && mbDeleteCondFormat) { - mbDeleteCondFormat = false; sal_uLong nIndex = pDoc->AddCondFormat(mpCondFormat, nTab ); mpCondFormat->SetKey(nIndex); mpCondFormat->AddRange(aRangeList); pDoc->AddCondFormatData( aRangeList, nTab, nIndex ); + mbDeleteCondFormat = false; } From cd5d41470d0657ee6fb05e93aea58adeb8afc0e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Mon, 8 Oct 2012 21:01:24 +0100 Subject: [PATCH 579/863] support max-width-chars property for labels Change-Id: I23245919c5180035fedb308fb5cc97bf3238ec07 --- vcl/inc/vcl/fixed.hxx | 10 ++++-- vcl/source/control/button.cxx | 6 ++-- vcl/source/control/fixed.cxx | 67 ++++++++++++++++++++++++++--------- 3 files changed, 62 insertions(+), 21 deletions(-) diff --git a/vcl/inc/vcl/fixed.hxx b/vcl/inc/vcl/fixed.hxx index a3834af6d9dc..397e3cf0c507 100644 --- a/vcl/inc/vcl/fixed.hxx +++ b/vcl/inc/vcl/fixed.hxx @@ -44,6 +44,8 @@ class UserDrawEvent; class VCL_DLLPUBLIC FixedText : public Control { private: + sal_Int32 m_nMaxWidthChars; + using Control::ImplInitSettings; using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); @@ -71,10 +73,14 @@ public: virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); - static Size CalcMinimumTextSize( Control const* pControl, long nMaxWidth = 0 ); - Size CalcMinimumSize( long nMaxWidth = 0 ) const; + void setMaxWidthChars(sal_Int32 nWidth); + sal_Int32 getMaxWidthChars() const { return m_nMaxWidthChars; } + static Size CalcMinimumTextSize(Control const* pControl, long nMaxWidth = 0x7fffffff); + static Size getTextDimensions(Control const *pControl, const OUString &rTxt, long nMaxWidth); + Size CalcMinimumSize(long nMaxWidth = 0x7fffffff) const; virtual Size GetOptimalSize(WindowSizeType eType) const; virtual void take_properties(Window &rOther); + virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue); }; // ------------- diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index db244efd3218..373143b6191d 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -1748,7 +1748,7 @@ Size PushButton::GetOptimalSize(WindowSizeType eType) const bool PushButton::set_property(const rtl::OString &rKey, const rtl::OString &rValue) { - if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("has-default"))) + if (rKey == "has-default") { WinBits nBits = GetStyle(); nBits &= ~(WB_DEFBUTTON); @@ -2912,7 +2912,7 @@ void RadioButton::SetState( sal_Bool bCheck ) bool RadioButton::set_property(const rtl::OString &rKey, const rtl::OString &rValue) { - if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("active"))) + if (rKey == "active") SetState(toBool(rValue)); else return Window::set_property(rKey, rValue); @@ -3885,7 +3885,7 @@ void CheckBox::SetState( TriState eState ) bool CheckBox::set_property(const rtl::OString &rKey, const rtl::OString &rValue) { - if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("active"))) + if (rKey == "active") SetState(toBool(rValue) ? STATE_CHECK : STATE_NOCHECK); else return Window::set_property(rKey, rValue); diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index 688b69961f00..55a133800326 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -154,16 +154,18 @@ void FixedText::ImplInitSettings( sal_Bool bFont, // ----------------------------------------------------------------------- -FixedText::FixedText( Window* pParent, WinBits nStyle ) : - Control( WINDOW_FIXEDTEXT ) +FixedText::FixedText( Window* pParent, WinBits nStyle ) + : Control(WINDOW_FIXEDTEXT) + , m_nMaxWidthChars(-1) { ImplInit( pParent, nStyle ); } // ----------------------------------------------------------------------- -FixedText::FixedText( Window* pParent, const ResId& rResId ) : - Control( WINDOW_FIXEDTEXT ) +FixedText::FixedText( Window* pParent, const ResId& rResId ) + : Control(WINDOW_FIXEDTEXT) + , m_nMaxWidthChars(-1) { rResId.SetRT( RSC_TEXT ); WinBits nStyle = ImplInitRes( rResId ); @@ -188,8 +190,9 @@ void FixedText::take_properties(Window &rOther) // ----------------------------------------------------------------------- -FixedText::FixedText( Window* pParent, const ResId& rResId, bool bDisableAccessibleLabelForRelation ) : - Control( WINDOW_FIXEDTEXT ) +FixedText::FixedText( Window* pParent, const ResId& rResId, bool bDisableAccessibleLabelForRelation ) + : Control( WINDOW_FIXEDTEXT ) + , m_nMaxWidthChars(-1) { rResId.SetRT( RSC_TEXT ); WinBits nStyle = ImplInitRes( rResId ); @@ -397,14 +400,20 @@ void FixedText::DataChanged( const DataChangedEvent& rDCEvt ) // ----------------------------------------------------------------------- -Size FixedText::CalcMinimumTextSize( Control const *pControl, long nMaxWidth ) +Size FixedText::getTextDimensions(Control const *pControl, const OUString &rTxt, long nMaxWidth) { sal_uInt16 nStyle = ImplGetTextStyle( pControl->GetStyle() ); if ( !( pControl->GetStyle() & WB_NOLABEL ) ) nStyle |= TEXT_DRAW_MNEMONIC; - Size aSize = pControl->GetTextRect( Rectangle( Point(), Size( (nMaxWidth ? nMaxWidth : 0x7fffffff), 0x7fffffff ) ), - pControl->GetText(), nStyle ).GetSize(); + return pControl->GetTextRect(Rectangle( Point(), Size(nMaxWidth, 0x7fffffff)), + rTxt, nStyle).GetSize(); +} + + +Size FixedText::CalcMinimumTextSize( Control const *pControl, long nMaxWidth ) +{ + Size aSize = getTextDimensions(pControl, pControl->GetText(), nMaxWidth); if ( pControl->GetStyle() & WB_EXTRAOFFSET ) aSize.Width() += 2; @@ -426,22 +435,48 @@ Size FixedText::CalcMinimumSize( long nMaxWidth ) const Size FixedText::GetOptimalSize(WindowSizeType eType) const { - switch (eType) { - case WINDOWSIZE_MINIMUM: - return CalcMinimumSize(); - default: - return Control::GetOptimalSize( eType ); + switch (eType) + { + case WINDOWSIZE_MINIMUM: + { + sal_Int32 nMaxAvailWidth = 0x7fffffff; + const OUString &rTxt = GetText(); + if (m_nMaxWidthChars != -1 && m_nMaxWidthChars < rTxt.getLength()) + { + nMaxAvailWidth = getTextDimensions(this, + rTxt.copy(0, m_nMaxWidthChars), 0x7fffffff).Width(); + } + return CalcMinimumSize(nMaxAvailWidth); + } + default: + return Control::GetOptimalSize( eType ); } } // ----------------------------------------------------------------------- -void FixedText::FillLayoutData() const +void FixedText::FillLayoutData() const { mpControlData->mpLayoutData = new vcl::ControlLayoutData(); ImplDraw( const_cast(this), 0, Point(), GetOutputSizePixel(), true ); } +void FixedText::setMaxWidthChars(sal_Int32 nWidth) +{ + m_nMaxWidthChars = nWidth; + queue_resize(); +} + +bool FixedText::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +{ + if (rKey == "max-width-chars") + { + setMaxWidthChars(rValue.toInt32()); + } + else + return Control::set_property(rKey, rValue); +} + // ======================================================================= void FixedLine::ImplInit( Window* pParent, WinBits nStyle ) @@ -705,7 +740,7 @@ Size FixedLine::GetOptimalSize(WindowSizeType eType) const { switch (eType) { case WINDOWSIZE_MINIMUM: - return CalcWindowSize( FixedText::CalcMinimumTextSize ( this ) ); + return CalcWindowSize( FixedText::CalcMinimumTextSize ( this, 0x7fffffff ) ); default: return Control::GetOptimalSize( eType ); } From e8624cc0e2777ffcc7d06bd76ff7372921125589 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 9 Oct 2012 09:05:23 +0100 Subject: [PATCH 580/863] maCbJPGPreview is never enabled, remove it Change-Id: I765185bf2c51f37ab7d7209098fa0dcb1ba60b7c --- svtools/source/filter/exportdialog.cxx | 14 -------------- svtools/source/filter/exportdialog.hrc | 1 - svtools/source/filter/exportdialog.hxx | 1 - svtools/source/filter/exportdialog.src | 7 ------- 4 files changed, 23 deletions(-) diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx index ef226f9516ea..dafa648f6e80 100644 --- a/svtools/source/filter/exportdialog.cxx +++ b/svtools/source/filter/exportdialog.cxx @@ -596,7 +596,6 @@ ExportDialog::ExportDialog( FltCallDialogParameter& rPara, maFtJPGMax ( this, ResId( FT_JPG_MAX, *rPara.pResMgr ) ), maFtPNGMin ( this, ResId( FT_PNG_MIN, *rPara.pResMgr ) ), maFtPNGMax ( this, ResId( FT_PNG_MAX, *rPara.pResMgr ) ), - maCbJPGPreview ( this, ResId( CB_JPG_PREVIEW, *rPara.pResMgr ) ), maCbInterlaced ( this, ResId( CB_INTERLACED, *rPara.pResMgr ) ), maCbRLEEncoding ( this, ResId( CB_RLE_ENCODING, *rPara.pResMgr ) ), maFlGIFDrawingObjects ( this, ResId( FL_GIF_DRAWING_OBJECTS, *rPara.pResMgr ) ), @@ -710,11 +709,6 @@ ExportDialog::ExportDialog( FltCallDialogParameter& rPara, maRbBinary.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); maRbText.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); - - // JPG Preview -// maCbJPGPreview.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); -maCbJPGPreview.Enable( sal_False ); - maSbJPGPreviewVert.SetScrollHdl( LINK( this, ExportDialog, UpdateHdl ) ); maSbJPGPreviewHorz.SetScrollHdl( LINK( this, ExportDialog, UpdateHdl ) ); maSbZoom.SetScrollHdl( LINK( this, ExportDialog, UpdateHdl ) ); @@ -875,8 +869,6 @@ void ExportDialog::createFilterOptions( vcl::RowOrColumn& rLayout ) createScrollBar( *xRows.get() ); xRows->addWindow( &maFtJPGMin ); xRows->addWindow( &maFtJPGMax ); - if ( maCbJPGPreview.IsEnabled() ) - xRows->addWindow( &maCbJPGPreview ); boost::shared_ptr< vcl::Spacer > xSpacer( new vcl::Spacer( &rLayout, 2 ) ); rLayout.addChild( xSpacer ); @@ -891,8 +883,6 @@ void ExportDialog::createFilterOptions( vcl::RowOrColumn& rLayout ) maNfCompression.SetMax( 100 ); maNfCompression.SetValue( nQuality ); maNfCompression.SetStrictFormat( sal_True ); - if ( maCbJPGPreview.IsEnabled() ) - maCbJPGPreview.Check( sal_False ); } break; case FORMAT_PNG : @@ -1160,10 +1150,6 @@ sal_Int32 static GetZoomValueFromThumbPos( sal_Int32 nThumbPos ) void ExportDialog::updatePreview() { - // JPG -// maCbJPGPreview.Enable( IsTempExportAvailable() ); - -// if ( maCbJPGPreview.IsEnabled() && maCbJPGPreview.IsChecked() ) if ( mbPreview ) { long nScrollBarSize = Application::GetSettings().GetStyleSettings().GetScrollBarSize(); diff --git a/svtools/source/filter/exportdialog.hrc b/svtools/source/filter/exportdialog.hrc index abe2515f9d23..3e6aa98731ff 100644 --- a/svtools/source/filter/exportdialog.hrc +++ b/svtools/source/filter/exportdialog.hrc @@ -64,7 +64,6 @@ #define RB_EPS_COMPRESSION_LZW 7 #define RB_EPS_COMPRESSION_NONE 8 -#define CB_JPG_PREVIEW 1 #define CB_INTERLACED 2 #define CB_RLE_ENCODING 3 #define CB_SAVE_TRANSPARENCY 4 diff --git a/svtools/source/filter/exportdialog.hxx b/svtools/source/filter/exportdialog.hxx index 388cb945db2d..784d01c9673b 100644 --- a/svtools/source/filter/exportdialog.hxx +++ b/svtools/source/filter/exportdialog.hxx @@ -77,7 +77,6 @@ private: FixedText maFtJPGMax; FixedText maFtPNGMin; FixedText maFtPNGMax; - CheckBox maCbJPGPreview; CheckBox maCbInterlaced; CheckBox maCbRLEEncoding; FixedLine maFlGIFDrawingObjects; diff --git a/svtools/source/filter/exportdialog.src b/svtools/source/filter/exportdialog.src index 2d1dfc708d31..eba425180dcf 100644 --- a/svtools/source/filter/exportdialog.src +++ b/svtools/source/filter/exportdialog.src @@ -258,13 +258,6 @@ ModalDialog DLG_EXPORT Size = MAP_APPFONT ( 41 , 10 ) ; Text [ en-US ] = "9 is smallest file size and slowest loading." ; }; - CheckBox CB_JPG_PREVIEW - { - HelpID = "svtools:CheckBox:DLG_EXPORT:CB_JPG_PREVIEW"; - Hide = TRUE; - Size = MAP_APPFONT ( 60 , 10 ) ; - Text [ en-US ] = "Preview" ; - }; CheckBox CB_INTERLACED { HelpID = "svtools:CheckBox:DLG_EXPORT:CB_INTERLACED"; From 54985c634fbcc6b8ba78a004712c20a5f93ce7c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 9 Oct 2012 09:14:14 +0100 Subject: [PATCH 581/863] cut out always-hidden controls from graphic ExportDialog Change-Id: Ia94c0418d2a0e93f35f9521ab0614eb110f593a5 --- svtools/source/filter/exportdialog.cxx | 158 +------------------------ svtools/source/filter/exportdialog.hrc | 6 - svtools/source/filter/exportdialog.hxx | 6 - svtools/source/filter/exportdialog.src | 52 -------- 4 files changed, 6 insertions(+), 216 deletions(-) diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx index dafa648f6e80..24339bcf90d3 100644 --- a/svtools/source/filter/exportdialog.cxx +++ b/svtools/source/filter/exportdialog.cxx @@ -620,11 +620,6 @@ ExportDialog::ExportDialog( FltCallDialogParameter& rPara, msEstimatedSizePix2 ( ResId( STR_ESTIMATED_SIZE_PIX_2, *rPara.pResMgr ).toString() ), msEstimatedSizeVec ( ResId( STR_ESTIMATED_SIZE_VEC, *rPara.pResMgr ).toString() ), maFlButtons ( this, ResId( FL_BUTTONS, *rPara.pResMgr ) ), - maFbJPGPreview ( this, ResId( FB_JPG_PREVIEW, *rPara.pResMgr ) ), - maSbZoom ( this, ResId( SB_ZOOM, *rPara.pResMgr ) ), - maNfZoom ( this, ResId( NF_ZOOM, *rPara.pResMgr ) ), - maSbJPGPreviewHorz ( this, ResId( SB_JPG_PREVIEW_HORZ, *rPara.pResMgr ) ), - maSbJPGPreviewVert ( this, ResId( SB_JPG_PREVIEW_VERT, *rPara.pResMgr ) ), maBtnOK ( this, ResId( BTN_OK, *rPara.pResMgr ) ), maBtnCancel ( this, ResId( BTN_CANCEL, *rPara.pResMgr ) ), maBtnHelp ( this, ResId( BTN_HELP, *rPara.pResMgr ) ), @@ -640,7 +635,6 @@ ExportDialog::ExportDialog( FltCallDialogParameter& rPara, mnMaxFilesizeForRealtimePreview( 0 ), mpTempStream ( new SvMemoryStream() ), maOriginalSize ( awt::Size( 0, 0 ) ), - mbPreview ( sal_False ), mbIsPixelFormat ( bIsPixelFormat ), mbExportSelection ( bExportSelection ), mbPreserveAspectRatio ( sal_True ) @@ -709,10 +703,6 @@ ExportDialog::ExportDialog( FltCallDialogParameter& rPara, maRbBinary.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); maRbText.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); - maSbJPGPreviewVert.SetScrollHdl( LINK( this, ExportDialog, UpdateHdl ) ); - maSbJPGPreviewHorz.SetScrollHdl( LINK( this, ExportDialog, UpdateHdl ) ); - maSbZoom.SetScrollHdl( LINK( this, ExportDialog, UpdateHdl ) ); - // BMP maCbRLEEncoding.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); @@ -1116,7 +1106,7 @@ void ExportDialog::setupLayout() maLayout.show(); maDialogSize = maLayout.getOptimalSize( WINDOWSIZE_PREFERRED ); maLayout.setManagedArea( Rectangle( Point(), maDialogSize ) ); - SetOutputSizePixel( Size( mbPreview ? maDialogSize.Width() * 2 : maDialogSize.Width(), maDialogSize.Height() ) ); + SetOutputSizePixel( maDialogSize ); maRectFlButtons = Rectangle( maFlButtons.GetPosPixel(), maFlButtons.GetSizePixel() ); maRectBtnHelp = Rectangle( maBtnHelp.GetPosPixel(), maBtnHelp.GetSizePixel() ); @@ -1138,150 +1128,14 @@ static rtl::OUString ImpValueOfInKB( const sal_Int64& rVal ) return aVal.makeStringAndClear(); } -sal_Int32 static GetZoomValueFromThumbPos( sal_Int32 nThumbPos ) -{ - sal_Int32 nProz = 0; - if ( nThumbPos <= 50 ) - nProz = nThumbPos * 2; // so a range of 50 represents 100% - else - nProz = ( ( nThumbPos - 50 ) * 60 ) + 100; // we want to scale up to 3000% - return nProz; -} - void ExportDialog::updatePreview() { - if ( mbPreview ) - { - long nScrollBarSize = Application::GetSettings().GetStyleSettings().GetScrollBarSize(); + SetOutputSizePixel( maDialogSize ); - Point aPreviewPos( maDialogSize.Width(), 0 ); - Size aPreviewSize( maDialogSize.Width(), maFlButtons.GetPosPixel().Y() ); - - Point aFixedBitmapPos( aPreviewPos ); - Size aFixedBitmapSize( aPreviewSize ); - - maSbZoom.Show( sal_False ); - maSbZoom.SetPosPixel( Point( aPreviewPos.X(), aPreviewPos.Y() ) ); - maSbZoom.SetSizePixel( Size( aPreviewSize.Width() / 4, nScrollBarSize ) ); - maNfZoom.Show( sal_False ); - maNfZoom.SetPosPixel( Point( aPreviewPos.X() + aPreviewSize.Width() / 4, aPreviewPos.Y() ) ); - maNfZoom.SetSizePixel( Size( aPreviewSize.Width() / 6, nScrollBarSize ) ); - maNfZoom.SetValue( GetZoomValueFromThumbPos( maSbZoom.GetThumbPos() ) ); - maFbJPGPreview.Show( sal_True ); - - sal_Int32 nZoom = GetZoomValueFromThumbPos( maSbZoom.GetThumbPos() ); - double fSizePixelX = static_cast< double >( maSize.Width * nZoom ) / 100.0; - double fSizePixelY = static_cast< double >( maSize.Height * nZoom ) / 100.0; - - double fXRatio = fSizePixelX / maSize.Width; // the size of each pixel - double fYRatio = fSizePixelY / maSize.Height; - - sal_Bool bHorzSb = fSizePixelX > aFixedBitmapSize.Width(); - sal_Bool bVertSb = fSizePixelY > aFixedBitmapSize.Height(); - if ( bHorzSb ) - { - aFixedBitmapSize.Height() -= nScrollBarSize; - - maSbJPGPreviewHorz.Show( sal_True ); - maSbJPGPreviewHorz.SetPosPixel( Point( aFixedBitmapPos.X(), aFixedBitmapPos.Y() + aFixedBitmapSize.Height() ) ); - maSbJPGPreviewHorz.SetSizePixel( Size( aFixedBitmapSize.Width(), nScrollBarSize ) ); - } - else - { - maSbJPGPreviewHorz.Show( sal_False ); - } - - - if ( bVertSb ) - { - aFixedBitmapSize.Width() -= nScrollBarSize; - - maSbJPGPreviewVert.Show( sal_True ); - maSbJPGPreviewVert.SetPosPixel( Point( aFixedBitmapPos.X() + aFixedBitmapSize.Width(), aFixedBitmapPos.Y() ) ); - maSbJPGPreviewVert.SetSizePixel( Size( nScrollBarSize, aFixedBitmapSize.Height() ) ); - } - else - { - maSbJPGPreviewVert.Show( sal_False ); - } - - Point aPos( 0, 0 ); - Size aSize; - if ( fXRatio > 1.0 ) - { - aSize.Width() = maSize.Width > aFixedBitmapSize.Width() ? maSize.Width : aFixedBitmapSize.Width(); - aSize.Width() /= static_cast(fXRatio); - } - else - { - aSize.Width() = maSize.Width < aFixedBitmapSize.Width() ? maSize.Width : aFixedBitmapSize.Width(); - aSize.Width() /= static_cast(fXRatio); - } - - if ( fYRatio > 1.0 ) - { - aSize.Height() = maSize.Height > aFixedBitmapSize.Height() ? maSize.Height : aFixedBitmapSize.Height(); - aSize.Height() /= static_cast(fYRatio); - } - else - { - aSize.Height() = maSize.Height < aFixedBitmapSize.Height() ? maSize.Height : aFixedBitmapSize.Height(); - aSize.Height() /= static_cast(fYRatio); - } - - if ( aSize.Width() < maSize.Width ) - { - sal_Int32 nXDiff = static_cast< sal_Int32 >( ( ( ( maSize.Width - aSize.Width() ) * maSbJPGPreviewHorz.GetThumbPos() ) / 100.0 ) ); - aPos.X() += nXDiff; - } - if ( aSize.Height() < maSize.Height ) - { - sal_Int32 nYDiff = static_cast< sal_Int32 >( ( ( ( maSize.Height - aSize.Height() ) * maSbJPGPreviewVert.GetThumbPos() ) / 100.0 ) ); - aPos.Y() += nYDiff; - } - - Bitmap aCroppedBitmap( maBitmap ); - aCroppedBitmap.Crop( Rectangle( aPos, aSize ) ); - aSize = aCroppedBitmap.GetSizePixel(); - aSize = Size( static_cast(aSize.Width() * fXRatio), static_cast(aSize.Height() * fYRatio) ); - aCroppedBitmap.Scale( aSize ); - - if ( aSize.Width() > aFixedBitmapSize.Width() ) - aSize.Width() = aFixedBitmapSize.Width(); - if ( aSize.Height() > aFixedBitmapSize.Height() ) - aSize.Height() = aFixedBitmapSize.Height(); - Point aPoint( aFixedBitmapPos ); - if ( aSize.Width() < aFixedBitmapSize.Width() ) - aPoint.X() += ( aFixedBitmapSize.Width() - aSize.Width() ) / 2; - if ( aSize.Height() < aFixedBitmapSize.Height() ) - aPoint.Y() += ( aFixedBitmapSize.Height() - aSize.Height() ) / 2; - - maFbJPGPreview.SetPosPixel( aPoint ); - maFbJPGPreview.SetSizePixel( aSize ); - maFbJPGPreview.SetBitmap( aCroppedBitmap ); - - SetOutputSizePixel( Size( maDialogSize.Width() * 2, maDialogSize.Height() ) ); - - maFlButtons.SetSizePixel( Size( maRectFlButtons.GetWidth() * 2, maRectFlButtons.GetHeight() ) ); - maBtnHelp.SetPosPixel( Point( maRectBtnHelp.Left() + maDialogSize.Width(), maRectBtnHelp.Top() ) ); - maBtnOK.SetPosPixel( Point( maRectBtnOK.Left() + maDialogSize.Width(), maRectBtnOK.Top() ) ); - maBtnCancel.SetPosPixel( Point( maRectBtnCancel.Left() + maDialogSize.Width(), maRectBtnCancel.Top() ) ); - } - else - { - maSbZoom.Show( sal_False ); - maNfZoom.Show( sal_False ); - maFbJPGPreview.Show( sal_False ); - maSbJPGPreviewHorz.Show( sal_False ); - maSbJPGPreviewVert.Show( sal_False ); - - SetOutputSizePixel( maDialogSize ); - - maFlButtons.SetSizePixel( Size( maRectFlButtons.GetWidth(), maRectFlButtons.GetHeight() ) ); - maBtnHelp.SetPosPixel( Point( maRectBtnHelp.Left(), maRectBtnHelp.Top() ) ); - maBtnOK.SetPosPixel( Point( maRectBtnOK.Left(), maRectBtnOK.Top() ) ); - maBtnCancel.SetPosPixel( Point( maRectBtnCancel.Left(), maRectBtnCancel.Top() ) ); - } + maFlButtons.SetSizePixel( Size( maRectFlButtons.GetWidth(), maRectFlButtons.GetHeight() ) ); + maBtnHelp.SetPosPixel( Point( maRectBtnHelp.Left(), maRectBtnHelp.Top() ) ); + maBtnOK.SetPosPixel( Point( maRectBtnOK.Left(), maRectBtnOK.Top() ) ); + maBtnCancel.SetPosPixel( Point( maRectBtnCancel.Left(), maRectBtnCancel.Top() ) ); } void ExportDialog::updateControls() diff --git a/svtools/source/filter/exportdialog.hrc b/svtools/source/filter/exportdialog.hrc index 3e6aa98731ff..6bcb10c3d6fb 100644 --- a/svtools/source/filter/exportdialog.hrc +++ b/svtools/source/filter/exportdialog.hrc @@ -45,7 +45,6 @@ #define NF_RESOLUTION 1 #define NF_COMPRESSION 2 -#define NF_ZOOM 3 #define MF_SIZEX 1 #define MF_SIZEY 2 @@ -70,12 +69,7 @@ #define CB_EPS_PREVIEW_TIFF 5 #define CB_EPS_PREVIEW_EPSI 6 -#define FB_JPG_PREVIEW 1 - #define SB_COMPRESSION 1 -#define SB_JPG_PREVIEW_HORZ 2 -#define SB_JPG_PREVIEW_VERT 3 -#define SB_ZOOM 4 #define STR_1BIT_THRESHOLD 1 #define STR_1BIT_DITHERED 2 diff --git a/svtools/source/filter/exportdialog.hxx b/svtools/source/filter/exportdialog.hxx index 784d01c9673b..83168d2230c1 100644 --- a/svtools/source/filter/exportdialog.hxx +++ b/svtools/source/filter/exportdialog.hxx @@ -101,11 +101,6 @@ private: String msEstimatedSizePix2; String msEstimatedSizeVec; FixedLine maFlButtons; - FixedBitmap maFbJPGPreview; - ScrollBar maSbZoom; - NumericField maNfZoom; - ScrollBar maSbJPGPreviewHorz; - ScrollBar maSbJPGPreviewVert; OKButton maBtnOK; CancelButton maBtnCancel; HelpButton maBtnHelp; @@ -142,7 +137,6 @@ private: com::sun::star::awt::Size maSize; // for vector graphics it always contains the logical size in 1/100mm - sal_Bool mbPreview; sal_Bool mbIsPixelFormat; sal_Bool mbExportSelection; sal_Bool mbPreserveAspectRatio; diff --git a/svtools/source/filter/exportdialog.src b/svtools/source/filter/exportdialog.src index eba425180dcf..92abe187b651 100644 --- a/svtools/source/filter/exportdialog.src +++ b/svtools/source/filter/exportdialog.src @@ -400,58 +400,6 @@ ModalDialog DLG_EXPORT Hide = TRUE; Size = MAP_APPFONT ( 41 , 10 ) ; }; - FixedBitmap FB_JPG_PREVIEW - { - Hide = TRUE; - OutputSize = TRUE ; - Scale = TRUE; - Border = TRUE; - }; - ScrollBar SB_ZOOM - { - Hide = TRUE; - Size = MAP_APPFONT ( 48, 10 ); - VScroll = FALSE; - HScroll = TRUE; - Drag = TRUE; - MinPos = 5; - MaxPos = 100; - ThumbPos = 50; - }; - NumericField NF_ZOOM - { - HelpID = "svtools:NumericField:DLG_EXPORT:NF_ZOOM"; - Hide = TRUE; - Border = TRUE ; - Size = MAP_APPFONT ( 30, 12 ) ; - TabStop = TRUE ; - Repeat = TRUE ; - Spin = FALSE ; - Maximum = 3000; - Last = 255 ; - }; - ScrollBar SB_JPG_PREVIEW_HORZ - { - Hide = TRUE; - Size = MAP_APPFONT ( 48, 10 ); - VScroll = FALSE; - HScroll = TRUE; - Drag = TRUE; - MinPos = 0; - MaxPos = 100; - ThumbPos = 50; - }; - ScrollBar SB_JPG_PREVIEW_VERT - { - Hide = TRUE; - Size = MAP_APPFONT ( 48, 10 ); - VScroll = TRUE; - HScroll = FALSE; - Drag = TRUE; - MinPos = 0; - MaxPos = 100; - ThumbPos = 50; - }; OKButton BTN_OK { Hide = TRUE; From ad181973af9be0b5bea129ef9a1976b379681e66 Mon Sep 17 00:00:00 2001 From: Marcos Paulo de Souza Date: Mon, 8 Oct 2012 20:45:45 -0300 Subject: [PATCH 582/863] Get ride of not used macros in filter Change-Id: I7f06720c9f4614b763066bb3cf136f2464b2c7bd Signed-off-by: Marcos Paulo de Souza Reviewed-on: https://gerrit.libreoffice.org/843 Reviewed-by: Thomas Arnhold Tested-by: Thomas Arnhold --- filter/source/config/cache/filterfactory.cxx | 30 -------------------- filter/source/msfilter/msdffimp.cxx | 8 ------ filter/source/xsltdialog/xmlfileview.cxx | 6 ---- 3 files changed, 44 deletions(-) diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx index 931b3f28df31..fa918f683060 100644 --- a/filter/source/config/cache/filterfactory.cxx +++ b/filter/source/config/cache/filterfactory.cxx @@ -35,20 +35,6 @@ namespace filter{ namespace css = ::com::sun::star; -/** @short can be used to query for filters related to its application module. - */ -#define BASE_QUERY_ALL "_query_all" -#define BASE_QUERY_WRITER "_query_Writer" -#define BASE_QUERY_WEB "_query_web" -#define BASE_QUERY_GLOBAL "_query_global" -#define BASE_QUERY_CHART "_query_chart" -#define BASE_QUERY_CALC "_query_calc" -#define BASE_QUERY_IMPRESS "_query_impress" -#define BASE_QUERY_DRAW "_query_draw" -#define BASE_QUERY_MATH "_query_math" - -//_______________________________________________ - /** @short define all possible parts of a filter query. @descr syntax: "[:[=]]" @@ -64,22 +50,6 @@ namespace css = ::com::sun::star; default_first set default filter on top of return list false case_sensitive compare "sort_prop" case sensitive false */ -#define SEPERATOR_QUERYPARAM ((sal_Unicode)':') -#define SEPERATOR_QUERYPARAMVALUE ((sal_Unicode)'=') - -#define QUERYPARAM_IFLAGS ::rtl::OUString( "iflags" ) -#define QUERYPARAM_EFLAGS ::rtl::OUString( "eflags" ) -#define QUERYPARAM_SORT_PROP ::rtl::OUString( "sort_prop" ) - -#define QUERYPARAM_DESCENDING ::rtl::OUString( "descending" ) -#define QUERYPARAM_USE_ORDER ::rtl::OUString( "use_order" ) -#define QUERYPARAM_DEFAULT_FIRST ::rtl::OUString( "default_first" ) -#define QUERYPARAM_CASE_SENSITIVE ::rtl::OUString( "case_sensitive" ) - -#define QUERYPARAMVALUE_SORT_PROP_NAME ::rtl::OUString( "name" ) -#define QUERYPARAMVALUE_SORT_PROP_UINAME ::rtl::OUString( "uiname" ) - - FilterFactory::FilterFactory(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) { diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index d1c68387aef3..066c84922569 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -222,14 +222,6 @@ SvStream& operator>>( SvStream& rIn, DffRecordHeader& rRec ) return rIn; } -// measurements dashed lines -#define LLEN_MIDDLE (450) -#define LLEN_SPACE_MIDDLE (360) -#define LLEN_LONG (LLEN_MIDDLE * 2) -#define LLEN_SPACE_LONG (LLEN_SPACE_MIDDLE + 20) -#define LLEN_POINT (LLEN_MIDDLE / 4) -#define LLEN_SPACE_POINT (LLEN_SPACE_MIDDLE / 4) - SvStream& operator>>( SvStream& rIn, DffPropSet& rRec ) { rRec.InitializePropSet(); diff --git a/filter/source/xsltdialog/xmlfileview.cxx b/filter/source/xsltdialog/xmlfileview.cxx index db3973d7f8cb..9cf3522902bf 100644 --- a/filter/source/xsltdialog/xmlfileview.cxx +++ b/filter/source/xsltdialog/xmlfileview.cxx @@ -55,12 +55,6 @@ using namespace com::sun::star::xml::sax; using ::rtl::OUString; - -#define MAX_SYNTAX_HIGHLIGHT 20 -#define MAX_HIGHLIGHTTIME 200 -#define SYNTAX_HIGHLIGHT_TIMEOUT 200 - - struct SwTextPortion { sal_uInt16 nLine; From f9a12d8dd35882b5d58a12b70ff8d2f9ee8b6acf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 9 Oct 2012 09:24:35 +0100 Subject: [PATCH 583/863] FL_PBM_OPTIONS never shown either Change-Id: I9866e2234960a6525212431d9e6dbad17359d1b6 --- svtools/source/filter/exportdialog.cxx | 1 - svtools/source/filter/exportdialog.hrc | 1 - svtools/source/filter/exportdialog.hxx | 1 - svtools/source/filter/exportdialog.src | 6 ------ 4 files changed, 9 deletions(-) diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx index 24339bcf90d3..b2a7d3867dc8 100644 --- a/svtools/source/filter/exportdialog.cxx +++ b/svtools/source/filter/exportdialog.cxx @@ -589,7 +589,6 @@ ExportDialog::ExportDialog( FltCallDialogParameter& rPara, maLbColorDepth ( this, ResId( LB_COLOR_DEPTH, *rPara.pResMgr ) ), maFlJPGQuality ( this, ResId( FL_JPG_QUALITY, *rPara.pResMgr ) ), maFlMode ( this, ResId( FL_MODE, *rPara.pResMgr ) ), - maFlPBMOptions ( this, ResId( FL_PBM_OPTIONS, *rPara.pResMgr ) ), maSbCompression ( this, ResId( SB_COMPRESSION, *rPara.pResMgr ) ), maNfCompression ( this, ResId( NF_COMPRESSION, *rPara.pResMgr ) ), maFtJPGMin ( this, ResId( FT_JPG_MIN, *rPara.pResMgr ) ), diff --git a/svtools/source/filter/exportdialog.hrc b/svtools/source/filter/exportdialog.hrc index 6bcb10c3d6fb..23df23b2a190 100644 --- a/svtools/source/filter/exportdialog.hrc +++ b/svtools/source/filter/exportdialog.hrc @@ -27,7 +27,6 @@ #define FL_COMPRESSION 4 #define FL_MODE 5 #define FL_GIF_DRAWING_OBJECTS 6 -#define FL_PBM_OPTIONS 7 #define FL_EPS_PREVIEW 8 #define FL_EPS_VERSION 9 #define FL_EPS_COLOR_FORMAT 10 diff --git a/svtools/source/filter/exportdialog.hxx b/svtools/source/filter/exportdialog.hxx index 83168d2230c1..f98d971716bf 100644 --- a/svtools/source/filter/exportdialog.hxx +++ b/svtools/source/filter/exportdialog.hxx @@ -70,7 +70,6 @@ private: ListBox maLbColorDepth; FixedLine maFlJPGQuality; FixedLine maFlMode; - FixedLine maFlPBMOptions; ScrollBar maSbCompression; NumericField maNfCompression; FixedText maFtJPGMin; diff --git a/svtools/source/filter/exportdialog.src b/svtools/source/filter/exportdialog.src index 92abe187b651..ef82a6cf802e 100644 --- a/svtools/source/filter/exportdialog.src +++ b/svtools/source/filter/exportdialog.src @@ -208,12 +208,6 @@ ModalDialog DLG_EXPORT Size = MAP_APPFONT ( 110 , 8 ) ; Text [ en-US ] = "Mode" ; }; - FixedLine FL_PBM_OPTIONS - { - Hide = TRUE; - Size = MAP_APPFONT ( 110 , 8 ) ; - Text [ en-US ] = "File Format" ; - }; ScrollBar SB_COMPRESSION { Hide = TRUE; From 835a0a97ab99d92b0c5f9762f585b4c837bcc0ba Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 9 Oct 2012 09:03:04 +0300 Subject: [PATCH 584/863] Do generate Thumb code, I think the current NDK (r8b) handles it fine Change-Id: If331d969f419d72076faff661bd0fbeb52bd24c4 --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 8d1f90444a58..4c555371c1b0 100644 --- a/configure.in +++ b/configure.in @@ -186,7 +186,7 @@ if test -n "$with_android_ndk"; then if test $host_cpu = arm; then ANDROID_APP_ABI=armeabi-v7a - ANDROIDCFLAGS="-march=armv7-a -mfloat-abi=softfp -mfpu=neon -Wl,--fix-cortex-a8" + ANDROIDCFLAGS="-march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon -Wl,--fix-cortex-a8" elif test $host_cpu = mips; then ANDROID_APP_ABI=mips ANDROIDCFLAGS="" From 3c4c11700899a1ee70d16444d960bd220d8e0b48 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 9 Oct 2012 09:23:52 +0300 Subject: [PATCH 585/863] I want to see what unknown library is required always Change-Id: I7e0eb7ba3be8ac2b70e6a56d84c1a890be0ba396 --- cppuhelper/source/shlib.cxx | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx index ed140f00f8a5..bd9270153890 100644 --- a/cppuhelper/source/shlib.cxx +++ b/cppuhelper/source/shlib.cxx @@ -41,9 +41,7 @@ #include "com/sun/star/beans/XPropertySet.hpp" -#if OSL_DEBUG_LEVEL > 1 #include -#endif #include #ifdef IOS @@ -570,9 +568,7 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory( } if ( pSym == NULL ) { -#if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "attempting to load unknown library %s\n", OUStringToOString( rLibName, RTL_TEXTENCODING_ASCII_US ).getStr() ); -#endif assert( !"Attempt to load unknown library" ); } } From 3f00118cc911ca1175031fed2b6b8931a421c04c Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 9 Oct 2012 09:25:16 +0300 Subject: [PATCH 586/863] De-duplicate AbstractSfxDialog_Impl Change-Id: Iddf2222aa75b21dd60472fa8dc979ddbdc18dcba --- cui/source/factory/dlgfact.cxx | 14 +++++++------- cui/source/factory/dlgfact.hxx | 4 ++-- sd/source/ui/dlg/sddlgfact.cxx | 10 +++++----- sd/source/ui/dlg/sddlgfact.hxx | 4 ++-- sw/source/ui/dialog/swdlgfact.cxx | 16 ++++++++-------- sw/source/ui/dialog/swdlgfact.hxx | 4 ++-- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index a97e658ce21d..3c019294e1bf 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -100,7 +100,7 @@ using ::com::sun::star::uno::Reference; using namespace svx; // AbstractTabDialog implementations just forwards everything to the dialog -IMPL_ABSTDLG_BASE(AbstractSfxDialog_Impl) +IMPL_ABSTDLG_BASE(CuiAbstractSfxDialog_Impl) IMPL_ABSTDLG_BASE(CuiVclAbstractDialog_Impl) IMPL_ABSTDLG_BASE(VclAbstractRefreshableDialog_Impl); IMPL_ABSTDLG_BASE(CuiAbstractTabDialog_Impl); @@ -221,17 +221,17 @@ String CuiAbstractTabDialog_Impl::GetText() const } -const SfxItemSet* AbstractSfxDialog_Impl::GetOutputItemSet() const +const SfxItemSet* CuiAbstractSfxDialog_Impl::GetOutputItemSet() const { return pDlg->GetOutputItemSet(); } -void AbstractSfxDialog_Impl::SetText( const XubString& rStr ) +void CuiAbstractSfxDialog_Impl::SetText( const XubString& rStr ) { pDlg->SetText( rStr ); } -String AbstractSfxDialog_Impl::GetText() const +String CuiAbstractSfxDialog_Impl::GetText() const { return pDlg->GetText(); } @@ -1299,7 +1299,7 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( sal_uInt32, const SfxItemSet* pAttrSet ) { SfxModalDialog* pDlg = new SvxCharacterMap( pParent, sal_True, pAttrSet ); - return new AbstractSfxDialog_Impl( pDlg ); + return new CuiAbstractSfxDialog_Impl( pDlg ); } SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabItemDialog( Window* pParent, @@ -1628,7 +1628,7 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent, } if ( pDlg ) - return new AbstractSfxDialog_Impl( pDlg ); + return new CuiAbstractSfxDialog_Impl( pDlg ); return 0; } @@ -1655,7 +1655,7 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent, } if ( pDlg ) - return new AbstractSfxDialog_Impl( pDlg ); + return new CuiAbstractSfxDialog_Impl( pDlg ); return 0; } diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index d90e809161f5..d85f92339fbc 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -109,9 +109,9 @@ class VclAbstractRefreshableDialog_Impl : public VclAbstractRefreshableDialog }; //for ActualizeProgress end -class AbstractSfxDialog_Impl : public SfxAbstractDialog +class CuiAbstractSfxDialog_Impl : public SfxAbstractDialog { - DECL_ABSTDLG_BASE(AbstractSfxDialog_Impl,SfxModalDialog) + DECL_ABSTDLG_BASE(CuiAbstractSfxDialog_Impl,SfxModalDialog) virtual const SfxItemSet* GetOutputItemSet() const; //From class Window. diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx index dbff1fca28d9..44c0c8165dc3 100644 --- a/sd/source/ui/dlg/sddlgfact.cxx +++ b/sd/source/ui/dlg/sddlgfact.cxx @@ -75,7 +75,7 @@ IMPL_ABSTDLG_BASE(AbstractSdInsertPagesObjsDlg_Impl); IMPL_ABSTDLG_BASE(AbstractMorphDlg_Impl); IMPL_ABSTDLG_BASE(AbstractSdStartPresDlg_Impl); IMPL_ABSTDLG_BASE(AbstractSdPresLayoutDlg_Impl); -IMPL_ABSTDLG_BASE(AbstractSfxDialog_Impl); +IMPL_ABSTDLG_BASE(SdAbstractSfxDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSdVectorizeDlg_Impl); IMPL_ABSTDLG_BASE(AbstractSdPublishingDlg_Impl); IMPL_ABSTDLG_BASE(AbstractHeaderFooterDialog_Impl); @@ -332,15 +332,15 @@ void AbstractSdPresLayoutDlg_Impl::GetAttr( SfxItemSet& rOutAttrs ) // AbstractSdPresLayoutDlg_Impl end //SfxAbstractDialog_Impl begin -const SfxItemSet* AbstractSfxDialog_Impl::GetOutputItemSet() const +const SfxItemSet* SdAbstractSfxDialog_Impl::GetOutputItemSet() const { return pDlg->GetOutputItemSet(); } -void AbstractSfxDialog_Impl::SetText( const XubString& rStr ) +void SdAbstractSfxDialog_Impl::SetText( const XubString& rStr ) { pDlg->SetText( rStr ); } -String AbstractSfxDialog_Impl::GetText() const +String SdAbstractSfxDialog_Impl::GetText() const { return pDlg->GetText(); } @@ -520,7 +520,7 @@ SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabTemplateDlg( :: SfxAbstractDialog* SdAbstractDialogFactory_Impl::CreatSdActionDialog( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) { - return new AbstractSfxDialog_Impl( new SdActionDlg( pParent, pAttr, pView ) ); + return new SdAbstractSfxDialog_Impl( new SdActionDlg( pParent, pAttr, pView ) ); } // add for SdVectorizeDlg begin diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx index 6970d7143808..e29d2d20c227 100644 --- a/sd/source/ui/dlg/sddlgfact.hxx +++ b/sd/source/ui/dlg/sddlgfact.hxx @@ -218,9 +218,9 @@ class AbstractSdPresLayoutDlg_Impl : public AbstractSdPresLayoutDlg }; // add for SdActionDlg -class AbstractSfxDialog_Impl : public SfxAbstractDialog +class SdAbstractSfxDialog_Impl : public SfxAbstractDialog { - DECL_ABSTDLG_BASE(AbstractSfxDialog_Impl,SfxModalDialog) + DECL_ABSTDLG_BASE(SdAbstractSfxDialog_Impl,SfxModalDialog) virtual const SfxItemSet* GetOutputItemSet() const; virtual void SetText( const XubString& rStr ); virtual String GetText() const; diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index 131b70732ebd..09dbd3fd3568 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -107,7 +107,7 @@ using namespace ::com::sun::star; IMPL_ABSTDLG_BASE(AbstractSwWordCountFloatDlg_Impl); IMPL_ABSTDLG_BASE(AbstractSwInsertAbstractDlg_Impl); -IMPL_ABSTDLG_BASE(AbstractSfxDialog_Impl); +IMPL_ABSTDLG_BASE(SwAbstractSfxDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSwAsciiFilterDlg_Impl); IMPL_ABSTDLG_BASE(VclAbstractDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSplitTableDialog_Impl); @@ -178,17 +178,17 @@ sal_uInt8 AbstractSwInsertAbstractDlg_Impl::GetPara() const } //add for SwAddrDlg, SwDropCapsDlg ,SwBackgroundDlg, SwNumFmtDlg SwBorderDlg SwWrapDlg SwFldEditDlg begin -const SfxItemSet* AbstractSfxDialog_Impl::GetOutputItemSet() const +const SfxItemSet* SwAbstractSfxDialog_Impl::GetOutputItemSet() const { return pDlg->GetOutputItemSet(); } -void AbstractSfxDialog_Impl::SetText( const XubString& rStr ) +void SwAbstractSfxDialog_Impl::SetText( const XubString& rStr ) { pDlg->SetText( rStr ); } -String AbstractSfxDialog_Impl::GetText() const +String SwAbstractSfxDialog_Impl::GetText() const { return pDlg->GetText(); } @@ -667,7 +667,7 @@ SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSfxDialog( Window* pParen } if ( pDlg ) - return new AbstractSfxDialog_Impl( pDlg ); + return new SwAbstractSfxDialog_Impl( pDlg ); return 0; } @@ -980,7 +980,7 @@ SfxAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwBorderDlg (Window* pPa } if ( pDlg ) - return new AbstractSfxDialog_Impl( pDlg ); + return new SwAbstractSfxDialog_Impl( pDlg ); return 0; } @@ -997,7 +997,7 @@ SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwWrapDlg ( Window* pPare } if ( pDlg ) - return new AbstractSfxDialog_Impl( pDlg ); + return new SwAbstractSfxDialog_Impl( pDlg ); return 0; } @@ -1057,7 +1057,7 @@ SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwFldEditDlg ( SwView& } if ( pDlg ) - return new AbstractSfxDialog_Impl( pDlg ); + return new SwAbstractSfxDialog_Impl( pDlg ); return 0; } diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index b94f61a83ff9..f1764397bb6e 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -95,9 +95,9 @@ class AbstractSwInsertAbstractDlg_Impl : public AbstractSwInsertAbstractDlg // add for SwAddrDlg, SwDropCapsDlg, SwBackgroundDlg SwNumFmtDlg SwWrapDlg SwBorderDlg, SwFldEditDlg begin class SfxSingleTabDialog; -class AbstractSfxDialog_Impl :public SfxAbstractDialog +class SwAbstractSfxDialog_Impl :public SfxAbstractDialog { - DECL_ABSTDLG_BASE(AbstractSfxDialog_Impl,SfxModalDialog) + DECL_ABSTDLG_BASE(SwAbstractSfxDialog_Impl,SfxModalDialog) virtual const SfxItemSet* GetOutputItemSet() const; virtual void SetText( const XubString& rStr ); virtual String GetText() const; From fc6fa71e8512cbca511b6a8acbf0d6f439b32dde Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 9 Oct 2012 09:27:32 +0300 Subject: [PATCH 587/863] Make lcl functions static Change-Id: Ia8439fda69324a48660e6b6c5b954c6d3eb14bc9 --- sw/source/ui/frmdlg/frmpage.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 8396539392e4..887709fe121f 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -394,7 +394,7 @@ static sal_uInt16 aAddPgRg[] = { 0 }; -size_t lcl_GetFrmMapCount( const FrmMap* pMap) +static size_t lcl_GetFrmMapCount( const FrmMap* pMap) { if ( pMap ) { @@ -567,7 +567,7 @@ SvxSwFramePosString::StringId lcl_ChangeResIdToVerticalOrRTL(SvxSwFramePosString // helper method in order to determine all possible // listbox relations in a relation map for a given relation -sal_uLong lcl_GetLBRelationsForRelations( const sal_uInt16 _nRel ) +static sal_uLong lcl_GetLBRelationsForRelations( const sal_uInt16 _nRel ) { sal_uLong nLBRelations = 0L; @@ -585,9 +585,9 @@ sal_uLong lcl_GetLBRelationsForRelations( const sal_uInt16 _nRel ) // helper method on order to determine all possible // listbox relations in a relation map for a given string ID -sal_uLong lcl_GetLBRelationsForStrID( const FrmMap* _pMap, - const SvxSwFramePosString::StringId _eStrId, - const bool _bUseMirrorStr ) +static sal_uLong lcl_GetLBRelationsForStrID( const FrmMap* _pMap, + const SvxSwFramePosString::StringId _eStrId, + const bool _bUseMirrorStr ) { sal_uLong nLBRelations = 0L; @@ -2740,7 +2740,7 @@ IMPL_LINK_NOARG(SwFrmURLPage, InsertFileHdl) return 0; } -void lcl_Move(Window& rWin, sal_Int32 nDiff) +static void lcl_Move(Window& rWin, sal_Int32 nDiff) { Point aPos(rWin.GetPosPixel()); aPos.Y() -= nDiff; From f5ba1a09408be65e6c5831c2b61bc94133d7ad13 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 9 Oct 2012 09:28:09 +0300 Subject: [PATCH 588/863] De-duplicate aEmptyStr and pSwResMgr Change-Id: I129754d1180ea15d815b2b4d2533f911f10116c3 --- sw/source/ui/dialog/swdialmgr.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sw/source/ui/dialog/swdialmgr.cxx b/sw/source/ui/dialog/swdialmgr.cxx index d8fb185302e8..364416d510fa 100644 --- a/sw/source/ui/dialog/swdialmgr.cxx +++ b/sw/source/ui/dialog/swdialmgr.cxx @@ -30,13 +30,15 @@ #include "tools/string.hxx" #include +#ifndef DISABLE_DYNLOADING //copy from core\bastyp\swtypes.cxx String aEmptyStr; // constant strings - -ResMgr* pSwResMgr=0; +#endif ResMgr* SwDialogsResMgr::GetResMgr() { + static ResMgr* pSwResMgr=0; + if ( !pSwResMgr ) { pSwResMgr = SfxApplication::CreateResManager( "sw" ); From bf467badca422346778e23165e58ab4b7c8d6ab1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= Date: Tue, 9 Oct 2012 10:36:11 +0200 Subject: [PATCH 589/863] Revert "download rebase if needed for all sdk versions" This reverts commit b23f3e484273ed44c36a0c039454cdfbf6f6f1e7. Conflicts: configure.in Change-Id: Id9d3c2373e32bab76d58a7765ea17994b738d309 --- configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 4c555371c1b0..859152a8ed8f 100644 --- a/configure.in +++ b/configure.in @@ -9147,8 +9147,8 @@ dnl ========================================= dnl Check for Micorosft rebase.exe dnl ========================================= if test "$build_os" = "cygwin"; then - AC_PATH_PROG([REBASE], [rebase]) - if test \( -z "$REBASE" -o "$REBASE" = "/usr/bin/rebase" \); then + AC_PATH_PROG([REBASE], [rebase]) + if test \( -z "$REBASE" -o "$REBASE" = "/usr/bin/rebase" \) -a "$WINDOWS_SDK_VERSION" = "80"; then REBASE=download AC_SUBST(REBASE) fi From b120689ab0eddfd0e1c5d7be74d6acf2ce0181c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= Date: Tue, 9 Oct 2012 10:37:23 +0200 Subject: [PATCH 590/863] Revert "use downloaded rebase.exe with Win8 SDK" This reverts commit e994a91060c145ad08ef75dcf9862043202ac6ce. --- postprocess/rebase/rebase.pl | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/postprocess/rebase/rebase.pl b/postprocess/rebase/rebase.pl index f5e5ce05ccf1..546068efade2 100644 --- a/postprocess/rebase/rebase.pl +++ b/postprocess/rebase/rebase.pl @@ -179,13 +179,7 @@ sub rebase_again my $newfiles_ref = shift; my @grownfiles; my $solarbin ="$ENV{SOLARVERSION}/$ENV{INPATH}/bin$ENV{UPDMINOREXT}"; - my $command; - if ( $ENV{REBASE} eq "download" ) { - $command = $ENV{OUTDIR}."/bin/rebase " . $options_string; - } - else { - $command = "rebase " . $options_string; - } + my $command = "rebase " . $options_string; if ( $ENV{WRAPCMD} ) { $command = $ENV{WRAPCMD} . " " . $command; } @@ -247,13 +241,7 @@ sub rebase_again sub rebase_initially { my ($files_ref, $start_address) = @_; - my $command; - if ( $ENV{REBASE} eq "download" ) { - $command = $ENV{OUTDIR}."/bin/rebase " . $options_string; - } - else { - $command = "rebase " . $options_string; - } + my $command = "rebase "; if ( $ENV{WRAPCMD} ) { $command = $ENV{WRAPCMD} . " " . $command; } From 55754a818f38165f7bf2274f6502709acd18a056 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= Date: Tue, 9 Oct 2012 10:42:26 +0200 Subject: [PATCH 591/863] Revert "Win8 SDK no longer ships rebase.exe" This reverts commit 79fce4ddeb8b45fd047a97507051cd9ca4245f60. Conflicts: configure.in download Change-Id: Ica8691c5ff5d3e70538d029ed33a91621405af94 --- config_host.mk.in | 1 - configure.in | 11 ----------- download | 24 ++++++++---------------- external/prj/d.lst | 2 -- external/rebase/README_rebase.exe | 1 - 5 files changed, 8 insertions(+), 31 deletions(-) delete mode 100755 external/rebase/README_rebase.exe diff --git a/config_host.mk.in b/config_host.mk.in index eaf0d61986a6..605d701c7727 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -482,7 +482,6 @@ export PYTHON_LIBS=@PYTHON_LIBS@ export RANLIB=@RANLIB@ export REDLAND_CFLAGS=@REDLAND_CFLAGS@ export REDLAND_LIBS=@REDLAND_LIBS@ -export REBASE=@REBASE@ export RHINO_JAR=@RHINO_JAR@ export RHINO_TARBALL=@RHINO_TARBALL@ export RPM=@RPM@ diff --git a/configure.in b/configure.in index 859152a8ed8f..5d37a667b2d8 100644 --- a/configure.in +++ b/configure.in @@ -9143,17 +9143,6 @@ fi AC_SUBST(WINDOWS_SDK_HOME) AC_SUBST(WINDOWS_SDK_VERSION) -dnl ========================================= -dnl Check for Micorosft rebase.exe -dnl ========================================= -if test "$build_os" = "cygwin"; then - AC_PATH_PROG([REBASE], [rebase]) - if test \( -z "$REBASE" -o "$REBASE" = "/usr/bin/rebase" \) -a "$WINDOWS_SDK_VERSION" = "80"; then - REBASE=download - AC_SUBST(REBASE) - fi -fi - dnl ========================================= dnl Check for uuidgen dnl ========================================= diff --git a/download b/download index fd9bb4a1524d..918852b9731a 100755 --- a/download +++ b/download @@ -182,11 +182,6 @@ if [ "$COM" = "MSC" ]; then downloaditem "http://download.microsoft.com/download/E/9/F/E9FCA9E9-9908-4D8F-B491-8E8A4C294C01/" "WindowsXP-KB958911-x86-ENU.exe" "ff084c5815b0672d54628158b820f5b1" fi -if [ "$REBASE" = "download" ]; then - downloaditem "http://download.microsoft.com/download/A/6/A/A6AC035D-DA3F-4F0C-ADA4-37C8E5D34E3D/setup/WinSDKTools/" "cab1.cab" "15331cc5cb4a03e7a44aaa303e34bf5b" - downloaditem "http://download.microsoft.com/download/A/6/A/A6AC035D-DA3F-4F0C-ADA4-37C8E5D34E3D/setup/WinSDKTools/" "WinSDKTools_x86.msi" "d1f44ddc2ba6bbda79407e951e44303b" -fi - if [ -f $start_dir/sources.ver -a ! -d $start_dir/.git ] ; then # these sources are from a tarball, so get the other source tarballs . $start_dir/sources.ver @@ -222,17 +217,14 @@ if [ "$COM" = "MSC" -a -n "$md5sum" ]; then if [ ! -f ./external/dbghelp/dbghelp.dll -a -f $TARFILE_LOCATION/13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll ]; then cp $TARFILE_LOCATION/13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll ./external/dbghelp/dbghelp.dll fi - if [ "$REBASE" = "download" ]; then - if [ ! -f ./external/rebase/rebase.exe -a -f $TARFILE_LOCATION/WinSDKTools_x86.msi ]; then - msiexec /a `cygpath -d $TARFILE_LOCATION/WinSDKTools_x86.msi` /qn TARGETDIR=$TMPUNPACK SHORTFILENAMES=1 - rebase_exe_path=Pfiles/*/Windows/v7.1/Bin/ReBase.Exe - sum=`$md5sum $md5special $TARFILE_LOCATION/tmp/$rebase_exe_path | sed "s/ .*//"` - if [ "$sum" = "5892a62147b7be59f0553ae3634e9dfa" ]; then - cp $TARFILE_LOCATION/tmp/$rebase_exe_path ./external/rebase/rebase.exe - fi - fi - fi - + if [ ! -f ./external/dbghelp/dbghelp.dll -a -f $TARFILE_LOCATION/dbg_x86.msi ]; then + msiexec /a `cygpath -d $TARFILE_LOCATION/dbg_x86.msi` /qn TARGETDIR=$TMPUNPACK SHORTFILENAMES=1 + dbghelp_dll_path=PFiles/DbgTools/dbghelp.dll + sum=`$md5sum $md5special $TARFILE_LOCATION/tmp/$dbghelp_dll_path | sed "s/ .*//"` + if [ "$sum" = "4003e34416ebd25e4c115d49dc15e1a7" ]; then + cp $TARFILE_LOCATION/tmp/$dbghelp_dll_path ./external/dbghelp/dbghelp.dll + fi + fi if [ ! -f ./external/gdiplus/gdiplus.dll -a -f $TARFILE_LOCATION/WindowsXP-KB958911-x86-ENU.exe ]; then gdiplus_dll_path=SP3QFE/asms/10/msft/windows/gdiplus/gdiplus.dll chmod +x `cygpath $TARFILE_LOCATION`/WindowsXP-KB958911-x86-ENU.exe diff --git a/external/prj/d.lst b/external/prj/d.lst index 0577f7faeb57..645fe4a2bab0 100644 --- a/external/prj/d.lst +++ b/external/prj/d.lst @@ -28,8 +28,6 @@ mkdir: %_DEST%\inc\external\wine ..\dbghelp\dbghelp.dll %_DEST%\bin\dbghelp.dll -..\rebase\rebase.exe %_DEST%\bin\rebase.exe - ..\gdiplus\gdiplus.dll %_DEST%\bin\gdiplus.dll ..\msvcp80\msvcm80*.dll %_DEST%\bin diff --git a/external/rebase/README_rebase.exe b/external/rebase/README_rebase.exe deleted file mode 100755 index 87248931e24e..000000000000 --- a/external/rebase/README_rebase.exe +++ /dev/null @@ -1 +0,0 @@ -Put rebase.exe in this directory for Windows builds. From 03c2bd42d03cd2cd3999d3527b59a14de2170756 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= Date: Tue, 9 Oct 2012 10:32:14 +0200 Subject: [PATCH 592/863] Kill rebasing all together - little advantage for a lot of hassle Change-Id: I3bcf920d4c57ff05079033ab1715b61c14b86fd5 --- postprocess/prj/build.lst | 7 +- postprocess/rebase/coffbase.txt | 391 ------------------------------- postprocess/rebase/makefile.mk | 59 ----- postprocess/rebase/no_rebase.txt | 33 --- postprocess/rebase/rebase.pl | 287 ----------------------- 5 files changed, 3 insertions(+), 774 deletions(-) delete mode 100644 postprocess/rebase/coffbase.txt delete mode 100644 postprocess/rebase/makefile.mk delete mode 100644 postprocess/rebase/no_rebase.txt delete mode 100644 postprocess/rebase/rebase.pl diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst index ad37e0ded900..f1fd67deb2a5 100644 --- a/postprocess/prj/build.lst +++ b/postprocess/prj/build.lst @@ -2,7 +2,6 @@ po postprocess :: BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n po postprocess usr1 - all po_mkout NULL po postprocess\checkxml nmake - all po_checkxml NULL po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL -po postprocess\packregistry nmake - all po_packregistry NULL -po postprocess\packcomponents nmake - all po_packcomponents NULL -po postprocess\rebase nmake - w po_rebase NULL -po postprocess\signing nmake - w,sign po_signing po_rebase.w NULL +po postprocess\packregistry nmake - all po_packregistry NULL +po postprocess\packcomponents nmake - all po_packcomponents NULL +po postprocess\signing nmake - w,sign po_signing NULL diff --git a/postprocess/rebase/coffbase.txt b/postprocess/rebase/coffbase.txt deleted file mode 100644 index 4fe3a25e1aa7..000000000000 --- a/postprocess/rebase/coffbase.txt +++ /dev/null @@ -1,391 +0,0 @@ -abpmi.dll 0x0000000067fd0000 0x00020000 -acceptor.uno.dll 0x0000000067fb0000 0x00010000 -accmi.dll 0x0000000067f00000 0x000a0000 -adabasuimi.dll 0x0000000067e60000 0x00020000 -ado2.dll 0x0000000067dd0000 0x00080000 -affine_uno_uno.dll 0x0000000067db0000 0x00010000 -aggmi.dll 0x0000000067d70000 0x00030000 -analysismi.dll 0x0000000067d20000 0x00040000 -animcore.dll 0x0000000067cf0000 0x00020000 -avmediami.dll 0x0000000067ca0000 0x00040000 -avmediawin.dll 0x0000000067c70000 0x00020000 -basctlmi.dll 0x0000000067ba0000 0x000c0000 -basebmpmi.dll 0x00000000678a0000 0x002f0000 -basegfxmi.dll 0x0000000067820000 0x00070000 -basprovmi.uno.dll 0x00000000677f0000 0x00020000 -behelper.uno.dll 0x00000000677a0000 0x00010000 -bf_frmmi.dll 0x00000000676b0000 0x000e0000 -bf_gomi.dll 0x0000000067680000 0x00020000 -bf_migratefiltermi.dll 0x0000000067660000 0x00010000 -bf_ofami.dll 0x0000000067640000 0x00010000 -bf_sbmi.dll 0x00000000675b0000 0x00080000 -bf_schmi.dll 0x0000000067500000 0x000a0000 -bf_scmi.dll 0x00000000672a0000 0x00250000 -bf_sdmi.dll 0x00000000671f0000 0x000a0000 -bf_smmi.dll 0x0000000067190000 0x00050000 -bf_somi.dll 0x00000000670f0000 0x00090000 -bf_svtmi.dll 0x0000000066f30000 0x001b0000 -bf_svxmi.dll 0x0000000066b50000 0x003d0000 -bf_swmi.dll 0x00000000668b0000 0x00290000 -bf_wrappermi.dll 0x0000000066880000 0x00020000 -bf_xomi.dll 0x0000000066480000 0x003f0000 -bibmi.dll 0x0000000066430000 0x00040000 -bindetmi.dll 0x0000000066410000 0x00010000 -bootstrap.uno.dll 0x0000000066380000 0x00080000 -bootstrpdtmi.dll 0x0000000066350000 0x00020000 -bridgefac.uno.dll 0x0000000066330000 0x00010000 -cached1.dll 0x00000000662b0000 0x00030000 -calcmi.dll 0x0000000066260000 0x00040000 -canvasfactory.uno.dll 0x0000000066240000 0x00010000 -canvastoolsmi.dll 0x00000000661b0000 0x00080000 -chartcontrollermi.dll 0x0000000066030000 0x00170000 -chartmodelmi.dll 0x0000000065f70000 0x000b0000 -charttoolsmi.dll 0x0000000065dd0000 0x00190000 -chartviewmi.dll 0x0000000065c60000 0x00160000 -cli_uno.dll 0x0000000065c20000 0x00030000 -collator_data.dll 0x0000000065aa0000 0x00170000 -communimi.dll 0x0000000065a80000 0x00010000 -comphelp4msc.dll 0x0000000065980000 0x000f0000 -configmgr.uno.dll 0x000000005adb0000 0x00070000 -connector.uno.dll 0x00000000657e0000 0x00010000 -cppcanvasmi.dll 0x0000000065780000 0x00050000 -cppu3.dll 0x0000000065740000 0x00030000 -cppuhelper3msc.dll 0x00000000656c0000 0x00070000 -ctlmi.dll 0x0000000065680000 0x00030000 -cuimi.dll 0x00000000654a0000 0x001d0000 -datemi.dll 0x0000000065470000 0x00020000 -dbami.dll 0x00000000652e0000 0x00150000 -dbasemi.dll 0x0000000065280000 0x00050000 -dbaxmlmi.dll 0x0000000065230000 0x00040000 -dbmmmi.dll 0x0000000065200000 0x00020000 -dbpmi.dll 0x00000000651c0000 0x00030000 -dbpool2.dll 0x0000000065190000 0x00020000 -dbtoolsmi.dll 0x0000000064f60000 0x00220000 -dbumi.dll 0x0000000064ce0000 0x00270000 -deploymentguimi.uno.dll 0x0000000064c60000 0x00070000 -deploymentmi.uno.dll 0x0000000064be0000 0x00070000 -deploymentmiscmi.dll 0x0000000064bb0000 0x00020000 -dfami.dll 0x0000000064b40000 0x00010000 -dict_ja.dll 0x0000000064a20000 0x00110000 -dict_zh.dll 0x00000000647e0000 0x00230000 -directx5canvas.uno.dll 0x0000000064760000 0x00070000 -directx9canvas.uno.dll 0x00000000646e0000 0x00070000 -dlgprovmi.uno.dll 0x00000000646b0000 0x00020000 -dnd.dll 0x0000000064680000 0x00020000 -doctok.dll 0x00000000645c0000 0x000b0000 -dtrans.dll 0x00000000645a0000 0x00010000 -dynamicloader.uno.dll 0x0000000064570000 0x00020000 -egimi.dll 0x0000000064550000 0x00010000 -embobj.dll 0x00000000644d0000 0x00070000 -emboleobj.dll 0x0000000064480000 0x00040000 -ememi.dll 0x0000000064460000 0x00010000 -empmi.dll 0x0000000064410000 0x00040000 -emsermi.dll 0x00000000643d0000 0x00030000 -epbmi.dll 0x00000000643b0000 0x00010000 -epgmi.dll 0x0000000064390000 0x00010000 -eppmi.dll 0x0000000064370000 0x00010000 -epsmi.dll 0x0000000064340000 0x00020000 -eptmi.dll 0x0000000064320000 0x00010000 -erami.dll 0x0000000064300000 0x00010000 -etimi.dll 0x00000000642e0000 0x00010000 -evtatt.dll 0x00000000642c0000 0x00010000 -expmi.dll 0x0000000064280000 0x00010000 -fastsax.uno.dll 0x0000000064240000 0x00030000 -fileacc.dll 0x0000000064220000 0x00010000 -filemi.dll 0x0000000064140000 0x000d0000 -filterconfig1.dll 0x00000000640f0000 0x00040000 -filtertracermi.dll 0x00000000640d0000 0x00010000 -flashmi.dll 0x0000000064090000 0x00030000 -flatmi.dll 0x0000000064040000 0x00040000 -fpicker.uno.dll 0x0000000064000000 0x00010000 -fps.dll 0x0000000063fc0000 0x00030000 -fps_office.uno.dll 0x0000000063f70000 0x00040000 -frmmi.dll 0x0000000063dd0000 0x00190000 -fsstorage.uno.dll 0x0000000063da0000 0x00020000 -ftransl.dll 0x0000000063d80000 0x00010000 -fwemi.dll 0x0000000063c90000 0x000e0000 -fwimi.dll 0x0000000063c30000 0x00050000 -fwkmi.dll 0x0000000063a50000 0x001d0000 -fwlmi.dll 0x0000000063a20000 0x00020000 -fwmmi.dll 0x00000000639f0000 0x00020000 -gdipluscanvas.uno.dll 0x0000000063980000 0x00060000 -gomi.dll 0x00000000638b0000 0x00060000 -guesslangmi.dll 0x0000000063890000 0x00010000 -hatchwindowfactory.uno.dll 0x0000000063860000 0x00020000 -helplinkermi.dll 0x0000000063820000 0x00030000 -hsqldb2.dll 0x00000000637d0000 0x00040000 -hwp.dll 0x0000000063740000 0x00080000 -hyphenmi.dll 0x0000000063710000 0x00020000 -i18nisolang1msc.dll 0x00000000636f0000 0x00010000 -i18npool.uno.dll 0x00000000635b0000 0x00130000 -i18nregexpmsc.dll 0x0000000063590000 0x00010000 -i18nsearch.uno.dll 0x0000000063570000 0x00010000 -i18nutilmsc.dll 0x0000000063540000 0x00020000 -icdmi.dll 0x0000000063520000 0x00010000 -icgmi.dll 0x00000000634f0000 0x00020000 -icudt40.dll 0x0000000059bb0000 0x00d50000 -icuin40.dll 0x0000000059a90000 0x00110000 -icule40.dll 0x0000000059a40000 0x00040000 -icutu40.dll 0x0000000059a10000 0x00020000 -icuuc40.dll 0x0000000059910000 0x000f0000 -idxmi.dll 0x0000000062880000 0x00020000 -imemi.dll 0x0000000062860000 0x00010000 -index_data.dll 0x00000000627c0000 0x00090000 -instooofiltmsi.dll 0x0000000062790000 0x00020000 -introspection.uno.dll 0x0000000062760000 0x00020000 -invocadapt.uno.dll 0x0000000062740000 0x00010000 -invocation.uno.dll 0x0000000062720000 0x00010000 -ipbmi.dll 0x0000000062700000 0x00010000 -ipdmi.dll 0x00000000626e0000 0x00010000 -ipsmi.dll 0x00000000626c0000 0x00010000 -iptmi.dll 0x00000000626a0000 0x00010000 -ipxmi.dll 0x0000000062680000 0x00010000 -irami.dll 0x0000000062660000 0x00010000 -itgmi.dll 0x0000000062640000 0x00010000 -itimi.dll 0x0000000062620000 0x00010000 -java_uno.dll 0x00000000625f0000 0x00020000 -java_uno_accessbridge.dll 0x00000000625d0000 0x00010000 -javaloader.uno.dll 0x00000000625b0000 0x00010000 -javavm.uno.dll 0x0000000062580000 0x00020000 -jdbc2.dll 0x0000000062510000 0x00060000 -jfregca.dll 0x00000000624d0000 0x00030000 -jmi_g.dll 0x00000000624b0000 0x00010000 -jpipe.dll 0x0000000062490000 0x00010000 -juh.dll 0x00000000623b0000 0x00010000 -juhx.dll 0x0000000062380000 0x00020000 -jvmaccess3msc.dll 0x0000000062360000 0x00010000 -jvmfwk3.dll 0x0000000062330000 0x00020000 -ldapbe2.uno.dll 0x0000000062300000 0x00020000 -legacy_binfiltersmi.dll 0x00000000622d0000 0x00020000 -libcurl.dll 0x0000000062290000 0x00030000 -libdb47.dll 0x00000000621f0000 0x00090000 -libeay32.dll 0x00000000620d0000 0x00110000 -libexslt.dll 0x00000000620a0000 0x00020000 -librdf.dll 0x0000000062070000 0x00020000 -libtextcat.dll 0x0000000062050000 0x00010000 -libxml2.dll 0x0000000061f50000 0x000f0000 -libxmlsec-mscrypto.dll 0x0000000061f10000 0x00030000 -libxmlsec.dll 0x0000000061eb0000 0x00050000 -libxslt.dll 0x0000000061e70000 0x00030000 -lngpckinsthlp.dll 0x0000000061cc0000 0x00040000 -lnthmi.dll 0x0000000061c90000 0x00020000 -localebe1.uno.dll 0x0000000061c70000 0x00010000 -localedata_en.dll 0x0000000061c40000 0x00020000 -localedata_es.dll 0x0000000061c10000 0x00020000 -localedata_euro.dll 0x0000000061b60000 0x000a0000 -localedata_others.dll 0x0000000061aa0000 0x000b0000 -logmi.dll 0x0000000061a70000 0x00020000 -lpsolve55.dll 0x0000000061970000 0x00070000 -mcnttype.dll 0x0000000061950000 0x00010000 -mozabmi.dll 0x00000000597a0000 0x00020000 -mozabdrvmi.dll 0x00000000597d0000 0x00070000 -msci_uno.dll 0x0000000061860000 0x00010000 -mysql2.dll 0x0000000061820000 0x00030000 -namingservice.uno.dll 0x0000000061800000 0x00010000 -npsoplugin.dll 0x00000000617e0000 0x00010000 -npsoplugin_so.dll 0x00000000617c0000 0x00010000 -nullcanvas.uno.dll 0x0000000061770000 0x00040000 -odbc2.dll 0x0000000061750000 0x00010000 -odbcbase2.dll 0x0000000061690000 0x000b0000 -offaccmi.dll 0x0000000061670000 0x00010000 -officebean.dll 0x0000000061650000 0x00010000 -oleautobridge.uno.dll 0x00000000615f0000 0x00050000 -oleautobridge2.uno.dll 0x0000000061590000 0x00050000 -onlinecheck.dll 0x0000000061570000 0x00010000 -ooofilt.dll 0x0000000061530000 0x00030000 -ooofiltproxy.dll 0x0000000061500000 0x00020000 -ooxmi.dll 0x0000000061190000 0x00340000 -ooxml.dll 0x0000000060f20000 0x00260000 -package2.dll 0x0000000060ec0000 0x00050000 -passwordcontainer.uno.dll 0x0000000060e90000 0x00020000 -patchmsi.dll 0x0000000060e30000 0x00050000 -pcrmi.dll 0x0000000060d40000 0x000e0000 -pdffiltermi.dll 0x0000000060d00000 0x00030000 -pdfimport.uno.dll 0x0000000060bf0000 0x000a0000 -placewaremi.dll 0x0000000060bd0000 0x00010000 -plmi.dll 0x0000000060b90000 0x00030000 -pptimportermi.dll 0x0000000060b70000 0x00010000 -protocolhandlermi.dll 0x0000000060b00000 0x00010000 -proxyfac.uno.dll 0x0000000060ae0000 0x00010000 -purpenvhelper3msc.dll 0x0000000060ac0000 0x00010000 -python23.dll 0x00000000609b0000 0x00100000 -pythonloader.uno.dll 0x0000000060990000 0x00010000 -pyuno.dll 0x0000000060930000 0x00050000 -qslnkmsi.dll 0x00000000608e0000 0x00040000 -raptor.dll 0x0000000060880000 0x00050000 -rasqal.dll 0x0000000060840000 0x00030000 -reflection.uno.dll 0x0000000060810000 0x00020000 -reg3.dll 0x00000000607e0000 0x00020000 -reg4allmsdoc.dll 0x0000000060790000 0x00040000 -regactivex.dll 0x0000000060710000 0x00020000 -regpatchactivex.dll 0x0000000060690000 0x00020000 -remotebridge.uno.dll 0x0000000060640000 0x00010000 -resmi.dll 0x0000000060610000 0x00020000 -resourcemodel.dll 0x0000000060580000 0x00080000 -rmcxt3.dll 0x00000000604f0000 0x00010000 -rotmi.dll 0x00000000604d0000 0x00010000 -rptmi.dll 0x0000000060400000 0x000c0000 -rptuimi.dll 0x0000000060320000 0x000d0000 -rptxmlmi.dll 0x00000000602c0000 0x00050000 -sal3.dll 0x0000000060100000 0x001b0000 -salhelper3msc.dll 0x00000000600e0000 0x00010000 -sax.uno.dll 0x00000000600a0000 0x00030000 -saxmi.dll 0x0000000060080000 0x00010000 -sbmi.dll 0x000000005ff20000 0x00150000 -scdmi.dll 0x000000005ff00000 0x00010000 -scmi.dll 0x000000005f820000 0x006d0000 -scnmi.dll 0x000000005f800000 0x00010000 -scriptframe.dll 0x000000005f7c0000 0x00030000 -scuimi.dll 0x000000005f760000 0x00050000 -sdbc2.dll 0x000000005f730000 0x00020000 -sdbtmi.dll 0x000000005f700000 0x00020000 -sddmi.dll 0x000000005f6e0000 0x00010000 -sdmi.dll 0x000000005f2a0000 0x00430000 -sdqsmsi.dll 0x000000005f250000 0x00040000 -sduimi.dll 0x000000005f1d0000 0x00070000 -sfxmi.dll 0x000000005eed0000 0x002f0000 -shlxthdl.dll 0x000000005ee60000 0x00060000 -shlxtmsi.dll 0x000000005ee00000 0x00050000 -simplecanvas.uno.dll 0x000000005ede0000 0x00010000 -simplecmmi.dll 0x000000005edc0000 0x00010000 -slideshow.uno.dll 0x000000005ec60000 0x00150000 -slideshowtestmi.dll 0x000000005e8b0000 0x003a0000 -smdmi.dll 0x000000005e890000 0x00010000 -smmi.dll 0x000000005e7f0000 0x00090000 -smplmail.uno.dll 0x000000005e7d0000 0x00010000 -sn_tools.dll 0x000000005e7a0000 0x00020000 -so_activex.dll 0x000000005e770000 0x00020000 -sofficeapp.dll 0x000000005e6e0000 0x00060000 -soldepmi.dll 0x000000005e6a0000 0x00030000 -solvermi.dll 0x000000005e680000 0x00010000 -sotmi.dll 0x000000005e620000 0x00050000 -spellmi.dll 0x000000005e5e0000 0x00030000 -splmi.dll 0x000000005e5a0000 0x00030000 -srtrs1.dll 0x000000005e570000 0x00020000 -ssleay32.dll 0x000000005e520000 0x00040000 -stlport_vc7145.dll 0x000000005e470000 0x000a0000 -stlport_vc71_stldebug45.dll 0x000000005e340000 0x00120000 -stocservices.uno.dll 0x000000005e310000 0x00020000 -store3.dll 0x000000005e2e0000 0x00020000 -streams.uno.dll 0x000000005e2b0000 0x00020000 -stringresourcemi.uno.dll 0x000000005e280000 0x00020000 -stsmi.dll 0x000000005e1f0000 0x00080000 -libsunjavaplugin.dll 0x000000005e1c0000 0x00020000 -svgfiltermi.dll 0x000000005e190000 0x00020000 -svgmi.dll 0x000000005e160000 0x00020000 -svlmi.dll 0x000000005e090000 0x000c0000 -svtmi.dll 0x000000005ddc0000 0x002c0000 -svtmisc.uno.dll 0x000000005dd90000 0x00020000 -svxmi.dll 0x000000005d4c0000 0x008c0000 -swdmi.dll 0x000000005d490000 0x00020000 -swmi.dll 0x000000005cd00000 0x00780000 -swuimi.dll 0x000000005cbc0000 0x00130000 -sysdtrans.dll 0x000000005cb90000 0x00020000 -sysmgr1.uno.dll 0x000000005cb70000 0x00010000 -syssh.uno.dll 0x000000005cb50000 0x00010000 -t602filtermi.dll 0x000000005cb20000 0x00020000 -textconv_dict.dll 0x000000005c9e0000 0x00040000 -textconversiondlgsmi.dll 0x000000005c9b0000 0x00020000 -textinstream.uno.dll 0x000000005c990000 0x00010000 -textoutstream.uno.dll 0x000000005c970000 0x00010000 -tfumi.dll 0x000000005c950000 0x00010000 -tkmi.dll 0x000000005c7c0000 0x00180000 -tlmi.dll 0x000000005c730000 0x00080000 -tvhlp1.dll 0x000000005c6f0000 0x00030000 -ucb1.dll 0x000000005c6a0000 0x00040000 -ucbhelper4msc.dll 0x000000005c630000 0x00060000 -ucpchelp1.dll 0x000000005c5e0000 0x00040000 -ucpdav1.dll 0x000000005c570000 0x00060000 -ucpexpand1.uno.dll 0x000000005c550000 0x00010000 -ucpfile1.dll 0x000000005c500000 0x00040000 -ucpftp1.dll 0x000000005c4c0000 0x00030000 -ucphier1.dll 0x000000005c480000 0x00030000 -ucppkg1.dll 0x000000005c440000 0x00030000 -ucptdoc1.uno.dll 0x000000005c3f0000 0x00040000 -udlgmi.dll 0x000000005c3d0000 0x00010000 -unopkgapp.dll 0x000000005c3a0000 0x00020000 -unordfmi.dll 0x000000005c360000 0x00030000 -unowinreg.dll 0x000000005c340000 0x00010000 -unoxmlmi.dll 0x000000005c2e0000 0x00050000 -unsafe_uno_uno.dll 0x000000005c2c0000 0x00010000 -updatefeed.uno.dll 0x000000005c290000 0x00020000 -updchk.uno.dll 0x000000005c250000 0x00030000 -updchkmi.dll 0x000000005c230000 0x00010000 -urp_uno.dll 0x000000005c200000 0x00020000 -utlmi.dll 0x000000005c170000 0x00080000 -uuimi.dll 0x000000005c130000 0x00030000 -uuresolver.uno.dll 0x000000005c110000 0x00010000 -uwinapi.dll 0x000000005c0e0000 0x00020000 -vbaobjmi.uno.dll 0x000000005bfd0000 0x00100000 -vclcanvas.uno.dll 0x000000005bf50000 0x00070000 -vclmi.dll 0x000000005bc50000 0x002f0000 -vos3msc.dll 0x000000005bc20000 0x00020000 -wininetbe1.uno.dll 0x000000005bc00000 0x00010000 -writerfilter.uno.dll 0x000000005bb30000 0x00010000 -writerfiltermi.dll 0x000000005b760000 0x003c0000 -xcrmi.dll 0x000000005b6c0000 0x00090000 -xmergesync.dll 0x000000005b690000 0x00020000 -xmlfami.dll 0x000000005b670000 0x00010000 -xmlfdmi.dll 0x000000005b650000 0x00010000 -xmlsecurity.dll 0x000000005b600000 0x00040000 -xofmi.dll 0x000000005b580000 0x00050000 -xomi.dll 0x000000005b2b0000 0x002c0000 -xsec_fw.dll 0x000000005b280000 0x00020000 -xsec_xmlsec.dll 0x000000005b250000 0x00020000 -xsltdlgmi.dll 0x000000005b200000 0x00040000 -xsltfiltermi.dll 0x000000005b1e0000 0x00010000 -xstor.dll 0x000000005b190000 0x00040000 -npsoplugin.dll 0x000000005b0b0000 0x00010000 -migrationoo2.uno.dll 0x000000005b080000 0x00020000 -inprocserv.dll 0x000000005b060000 0x00010000 -lngmi.dll 0x000000005af50000 0x00100000 -adomi.dll 0x000000005aea0000 0x00080000 -cppunit_dll.dll 0x000000005ad60000 0x00040000 -drawinglayermi.dll 0x000000005ac00000 0x00100000 -editengmi.dll 0x000000005aa80000 0x00170000 -formi.dll 0x000000005aa30000 0x00020000 -foruimi.dll 0x000000005a9f0000 0x00030000 -freebl3.dll 0x000000005a9a0000 0x00040000 -hsqldb.dll 0x000000005a950000 0x00040000 -i18npapermi.dll 0x000000005a930000 0x00010000 -jdbcmi.dll 0x00000000598b0000 0x00050000 -jpipx.dll 0x0000000059890000 0x00010000 -log_uno_uno.dll 0x0000000059870000 0x00010000 -migrationoo3.uno.dll 0x0000000059850000 0x00010000 -msfiltermi.dll 0x00000000596e0000 0x000b0000 -msformsmi.uno.dll 0x0000000059680000 0x00050000 -mswordmi.dll 0x0000000059560000 0x00110000 -mysqlcppconn.dll 0x00000000594c0000 0x00090000 -mysqlmi.dll 0x0000000059480000 0x00030000 -neon.dll 0x0000000059450000 0x00020000 -nspr4.dll 0x0000000059410000 0x00030000 -nss3.dll 0x0000000059330000 0x000d0000 -nssckbi.dll 0x00000000592c0000 0x00060000 -nssdbm3.dll 0x0000000059290000 0x00020000 -nssutil3.dll 0x0000000059260000 0x00020000 -odbcbasemi.dll 0x00000000591f0000 0x00060000 -odbcmi.dll 0x00000000591d0000 0x00010000 -ooofilt_x64.dll 0x0000000059130000 0x00090000 -plc4.dll 0x00000000590e0000 0x00010000 -plds4.dll 0x00000000590c0000 0x00010000 -propertyhdl.dll 0x0000000059070000 0x00040000 -propertyhdl_x64.dll 0x0000000058fe0000 0x00080000 -python26.dll 0x0000000058da0000 0x00230000 -rebase.dll 0x0000000058d50000 0x00040000 -reg64msi.dll 0x0000000058cc0000 0x00030000 -scfiltmi.dll 0x0000000058aa0000 0x001c0000 -sdfiltmi.dll 0x0000000058a20000 0x00070000 -shlxthdl_x64.dll 0x0000000058940000 0x000d0000 -smime3.dll 0x0000000058910000 0x00020000 -so_activex_x64.dll 0x00000000588c0000 0x00040000 -softokn3.dll 0x0000000058880000 0x00030000 -sqlite3.dll 0x00000000587c0000 0x00070000 -ssl3.dll 0x0000000058780000 0x00030000 -svxcoremi.dll 0x0000000058230000 0x00540000 -test.dll 0x0000000058120000 0x00010000 -test_converter.dll 0x0000000058100000 0x00010000 -ucpext.uno.dll 0x00000000580d0000 0x00020000 -ucpmyucp1.uno.dll 0x00000000580a0000 0x00020000 -vbaeventsmi.uno.dll 0x0000000058070000 0x00020000 -vbahelpermi.dll 0x0000000057fc0000 0x000a0000 -vbaswobjmi.uno.dll 0x0000000057ef0000 0x000c0000 diff --git a/postprocess/rebase/makefile.mk b/postprocess/rebase/makefile.mk deleted file mode 100644 index c5d76158005c..000000000000 --- a/postprocess/rebase/makefile.mk +++ /dev/null @@ -1,59 +0,0 @@ -#*********************************************************************** -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=.. - - -PRJNAME=postprocess -TARGET=rebase - -.INCLUDE : settings.mk - -.INCLUDE : target.mk - -STARTADDRESS=0x68000000 -BASEADDRESSES=$(MISC)$/coffbase.txt -EXCLUDELIST=no_rebase.txt -LOGFILE=$(MISC)$/rebase_log.txt -IMAGENAMES=$(SOLARBINDIR)$/*.dll $(SOLARBINDIR)$/so$/*.dll - -ALLTAR : REBASE - -REBASE .PHONY : $(BASEADDRESSES) -.IF "$(GUI)$(COM)$(CPUNAME)"=="WNTMSCINTEL" -.IF "$(product)"=="full" - $(PERL) rebase.pl -C $(BASEADDRESSES) -b $(STARTADDRESS) -d -e 10000 -l $(LOGFILE) -m $(MISC) -v -R $(SOLARBINDIR) -N $(EXCLUDELIST) $(IMAGENAMES) -.ELSE # "$(product)"=="full" - @echo Doing nothing on non product builds ... -.ENDIF # "$(product)"=="full" -.ELSE # "$(GUI)"=="WNTI" - @echo We do rebasing on 32-bit Windows only built with MSVC. -.ENDIF - -$(BASEADDRESSES) : coffbase.txt - $(COPY) coffbase.txt $@ - diff --git a/postprocess/rebase/no_rebase.txt b/postprocess/rebase/no_rebase.txt deleted file mode 100644 index 9a3aabf1962d..000000000000 --- a/postprocess/rebase/no_rebase.txt +++ /dev/null @@ -1,33 +0,0 @@ -cli_basetypes.dll -cli_cppuhelper.dll -cli_uretypes.dll -cli_oootypes.dll -cli_ure.dll -policy.1.0.cli_uretypes.dll -policy.1.0.cli_oootypes.dll -policy.1.0.cli_ure.dll -policy.1.0.cli_cppuhelper.dll -policy.1.0.cli_basetypes.dll -gdiplus.dll -mingwm10.dll -msvcm80d.dll -msvcm80.dll -msvcm90d.dll -msvcm90.dll -msvcp70d.dll -msvcp70.dll -msvcp71d.dll -msvcp71.dll -msvcp80d.dll -msvcp80.dll -msvcp90d.dll -msvcp90.dll -msvcr70d.dll -msvcr70.dll -msvcr71d.dll -msvcr71.dll -msvcr80d.dll -msvcr80.dll -msvcr90d.dll -msvcr90.dll -dbghelp.dll diff --git a/postprocess/rebase/rebase.pl b/postprocess/rebase/rebase.pl deleted file mode 100644 index 546068efade2..000000000000 --- a/postprocess/rebase/rebase.pl +++ /dev/null @@ -1,287 +0,0 @@ -: -eval 'exec perl -wS $0 ${1+"$@"}' - if 0; -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -# -# rebase.pl - rebase windows dlls -# -# This perl script is to rebase all windows dlls. In principle this could -# be done with one simple command line like f.e. -# rebase -b 0x68000000 -d -R foo_dir -N bar.txt $(SOLARBINDIR)$/*.dll -# That would work fine for creating complete office install sets, but it -# could fail as soon as we are going to ship single dlls for a product -# patch. Therefore, this wrapper perl script is used. It reads a given base -# address file and rebases all files mentioned to the same address as -# previously. New dlls get appended to the list. - -use strict; - -#### globals ##### - -my $myname = ''; -my $options_string = ''; # order of options is important -my %options_hash; -my $rebase_files; -my $misc_dir = $ENV{TEMP}; -my $lastaddress; -my @old_files; -my @new_files; - -#### main ##### - -$myname = script_id(); -parse_options(); -my %lastrun = read_coffbase( \$lastaddress ); -# Get files specified on command line. Differ between those already -# listed in coffbase (%options_hash{'C'}) and additional ones. -get_files( \@old_files, \@new_files ); -# Rebase libraries already listed in coffbase to the addresses given there. -rebase_again( \@old_files, \@new_files ) if ( @old_files ); -# Rebase additional files. -rebase_initially( \@new_files, $lastaddress ) if ( @new_files ); - -exit 0; - - -#### subroutines #### - -sub script_id -{ - ( my $script_name = $0 ) =~ s/^.*[\\\/]([\w\.]+)$/$1/; - return $script_name; -} - - -sub parse_options -{ - use Getopt::Std; - if ( !getopts('C:b:de:l:m:R:N:v', \%options_hash) || ($#ARGV < 0) ) { - print STDERR "Error: invalid command line.\n\n"; - usage (); - exit 1; - } - # create options string (we cannot rely on a hash because for some options the - # order is important. -R option has to be specified before -N!) - foreach my $var ( 'C', 'b', 'e', 'l', 'R', 'N' ) { - if ($options_hash{$var} ) { - $options_string .= "-$var $options_hash{$var} "; - } - } - $options_string .= "-d " if $options_hash{"d"}; - $options_string .= "-v " if $options_hash{"v"}; - # some basic tests - if ( ! $options_hash{'C'}) { - print STDERR "Error: no coffbase specified\n\n"; - usage (); - exit 2; - } - if ( ! $options_hash{'b'}) { - print STDERR "Error: no initial base address specified\n\n"; - usage (); - exit 2; - } - if ($options_hash{"m"}) { - $misc_dir = $options_hash{"m"}; - } - if ( ! -d $misc_dir ) { - print STDERR "Error: no directory to write work files. Please specify with -m\n"; - usage (); - exit 3; - } - if ( $misc_dir !~ /[\/\\]$/ ) { - # append finishing path separator: - if ( $misc_dir =~ /([\/\\])/ ) { - $misc_dir .= $1; - } - } - $rebase_files = join " ", @ARGV; - # Cygwin's perl in a W32-4nt configuration wants / instead of \ . - $rebase_files =~ s/\\/\//g; - return; -} - - -sub read_coffbase -{ - my ($addref) = shift; - my %baseaddresses; - my @entry; - if ( $options_hash{'C'} ) { - my $filename = $options_hash{'C'}; - if ( -e $filename ) { - print "Repeated run, $filename present\n"; - open( COFFBASE, $filename) or die "Error: cannot open $filename"; - while ( my $line = ) { - # each row consists of three entries, separated by white space: - # dll-name base-address size - @entry = split /\s+/ , $line ; - if ( $entry[3] || ( ! $entry[2] ) ) { - print STDERR "Warning: coffbase file structure invalid?\n"; - } - $baseaddresses{$entry[0]} = $entry[1]; - if ( $entry[3] ) { - print STDERR "Warning: coffbase file structure invalid?\n"; - } - } - close( COFFBASE ); - $$addref = $entry[1]; - } else { - print "Initial run, $filename not yet present\n"; - } - } else { - die "Error: no coffbase specified."; - } - return %baseaddresses; -} - - -sub get_files -{ - use File::Basename; - my ( $oldfiles_ref, $newfiles_ref ) = @_; - my @target = split / /, $rebase_files; - foreach my $pattern ( @target ) { - foreach my $i ( glob( $pattern ) ) { - my $lib = File::Basename::basename $i; - $lib =~ s/\+/\\\+/g; - if ( grep /^$lib$/i, (keys %lastrun) ) { - push @$oldfiles_ref, $i; - } else { - push @$newfiles_ref, $i; - } - } - } - return; -} - - -sub rebase_again -# rebase using given coffbase file -{ - my $oldfiles_ref = shift; - my $newfiles_ref = shift; - my @grownfiles; - my $solarbin ="$ENV{SOLARVERSION}/$ENV{INPATH}/bin$ENV{UPDMINOREXT}"; - my $command = "rebase " . $options_string; - if ( $ENV{WRAPCMD} ) { - $command = $ENV{WRAPCMD} . " " . $command; - } - $command =~ s/-C /-i /; - $command =~ s/-d//; - $command =~ s/-b $options_hash{'b'}//; - my $fname = $misc_dir . "rebase_again.txt"; - open ( FILES, "> $fname") or die "Error: cannot open file $fname"; - my $filesstring = join " ", @$oldfiles_ref; - print FILES "$filesstring\n"; - close FILES; - $command .= "\@$fname"; - # Cygwin's perl needs escaped \ in system() and open( COMMAND ... ) - if ( "$^O" eq "cygwin" ) { $command =~ s/\\/\\\\/g; } - print "\n$command\n"; - open( COMMAND, "$command 2>&1 |") or die "Error: Can't execute $command\n"; - if ( $? ) { - die "Error: rebase failed: $?!\n"; - } - while( ) { - print; - # evaluate error messages - if ( /REBASE: ([^\s]+).*Grew too large/ ) { - my $toobig_name = $1; - if ( -e "$solarbin/so/$toobig_name" ) { - push @grownfiles, "$solarbin/so/$toobig_name"; - print "name was : $toobig_name\n"; - print "push $solarbin/so/$toobig_name\n"; - } else { - push @grownfiles, "$solarbin/$toobig_name"; - } - } - } - close( COMMAND ); - if ( @grownfiles ) { - # Some files are larger than expected and therefore could not be rebased. - # Remove respective entries from coffbase and schedule rebase in 'rebase_initially'. - push @$newfiles_ref, @grownfiles; - my $coffbase = $options_hash{'C'}; - my $coffbase_new = $options_hash{'C'} . ".new"; - open( COFFBASENEW, "> $coffbase_new") or die "Error: cannot open $coffbase_new"; - open( COFFBASE, $coffbase) or die "Error: cannot open $coffbase"; - my @entry; - while ( my $line = ) { - @entry = split /\s+/ , $line ; - if ( $entry[3] ) { - print STDERR "Warning: coffbase file structure invalid?\n"; - } - grep /^$entry[0]$/, @grownfiles or print COFFBASENEW $line; - } - close( COFFBASE ); - close( COFFBASENEW ); - rename $coffbase, $coffbase . ".old" or warn "Error: cannot rename $coffbase"; - rename $coffbase_new, $coffbase or warn "Error: cannot rename $coffbase_new"; - } -} - - -sub rebase_initially -{ - my ($files_ref, $start_address) = @_; - my $command = "rebase "; - if ( $ENV{WRAPCMD} ) { - $command = $ENV{WRAPCMD} . " " . $command; - } - $command .= $options_string; - if ( $start_address ) { - $command =~ s/-b $options_hash{'b'}/ -b $start_address/; - } - my $fname = $misc_dir . "rebase_new.txt"; - open ( FILES, "> $fname") or die "Error: cannot open file $fname"; - my $filesstring = join " ", @$files_ref; - print FILES "$filesstring\n"; - close FILES; - $command .= "\@$fname"; - # Cygwin's perl needs escaped \ in system() and open( COMMAND ... ) - if ( "$^O" eq "cygwin" ) { $command =~ s/\\/\\\\/g; } - print "\n$command\n"; - my $error = system("$command"); - if ($error) { - $error /= 256; - die "Error: rebase failed with exit code $error!\n"; - } -} - - -sub usage -{ - print "Usage:\t $myname <-C filename> <-b address> [-d] [-e ] [-l ] [-v] [-m dir] [-R ] [-N ] \n"; - # Options similar to rebase binary. Additional options: -m misc-directory - print "Options:\n"; - print "\t -C coffbase_filename Write the list of base adresses to file coffbase_filename. "; - print "Mandatory.\n"; - print "\t -b address Initial base address. Mandatory.\n"; - print "\t -e SizeAdjustment Extra size to allow for image growth.\n"; - print "\t -d Top down rebase.\n"; - print "\t -l filename Write logfile filename.\n"; - print "\t -m directory Directory to write work files.\n"; - print "\t -R directory Root directory.\n"; - print "\t -N filename Specify list of files not to be rebased.\n"; - print "\t -v Verbose.\n"; - return; -} - - From 1e456c0cb1e0d635713b1e0ad8ca6cfa3950f547 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 9 Oct 2012 10:49:43 +0200 Subject: [PATCH 593/863] vcl: -Werror=return-type Change-Id: I82d7041ca12dffb946758b667d02ba2d9aa7c4bc --- vcl/source/control/fixed.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index 55a133800326..785f65c41db4 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -472,6 +472,7 @@ bool FixedText::set_property(const rtl::OString &rKey, const rtl::OString &rValu if (rKey == "max-width-chars") { setMaxWidthChars(rValue.toInt32()); + return true; } else return Control::set_property(rKey, rValue); From 77f8ca714250f83ecf501a6ecbd23c9849ab6a70 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Tue, 9 Oct 2012 10:58:58 +0200 Subject: [PATCH 594/863] same identifier for different resources Change-Id: Ibe80f6ec6e85942a85f4c2bb322e1b0ca61ba07f --- sc/source/ui/inc/condformatdlg.hrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sc/source/ui/inc/condformatdlg.hrc b/sc/source/ui/inc/condformatdlg.hrc index dcb51d19be77..f631b53ac46b 100644 --- a/sc/source/ui/inc/condformatdlg.hrc +++ b/sc/source/ui/inc/condformatdlg.hrc @@ -66,5 +66,5 @@ #define LB_TYPE_COL_SCALE_MIN 42 #define LB_TYPE_COL_SCALE_MIDDLE 43 -#define LB_TYPE_COL_SCALE_MAX 43 +#define LB_TYPE_COL_SCALE_MAX 44 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ From bf7657fc2a91f71a8e9d380f77470ff8d07f2f8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= Date: Tue, 9 Oct 2012 10:53:28 +0200 Subject: [PATCH 595/863] Killing even the last remenants of rebase Change-Id: I649275360a1d57aeec03d3cecdb02f5f7ccdd1e8 --- scp2/source/ooo/file_library_ooo.scp | 11 - scp2/source/ooo/windowscustomaction_ooo.scp | 10 - setup_native/prj/build.lst | 1 - .../win32/customactions/rebase/makefile.mk | 82 ------- .../win32/customactions/rebase/rebase.cxx | 227 ------------------ .../win32/customactions/rebase/rebase.dxp | 1 - 6 files changed, 332 deletions(-) delete mode 100644 setup_native/source/win32/customactions/rebase/makefile.mk delete mode 100644 setup_native/source/win32/customactions/rebase/rebase.cxx delete mode 100644 setup_native/source/win32/customactions/rebase/rebase.dxp diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 3cc740ba3daa..66f3a77e59f6 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -824,17 +824,6 @@ End #endif -#if defined(WNT) && defined(HAVE_WINDOWS_SDK) - -File gid_File_Lib_Rebasemsi - LIB_FILE_BODY; - Name = "rebase.dll"; - Dir = SCP2_OOO_BIN_DIR; - Styles = (PACKED,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH); -End - -#endif /* WNT && HAVE_WINDOWS_SDK */ - STD_LIB_FILE( gid_File_Lib_Lng, lng) File gid_File_Lib_Localedata_En diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp index 6d3b11b69d7c..b489c3298b5f 100644 --- a/scp2/source/ooo/windowscustomaction_ooo.scp +++ b/scp2/source/ooo/windowscustomaction_ooo.scp @@ -401,16 +401,6 @@ WindowsCustomAction gid_Customaction_SortTree Assignment1 = ("ControlEvent", "CustomSetup", "Tree", "DoAction", "SortTree", "1", "1"); End -WindowsCustomAction gid_Customaction_RebaseLibrariesonproperties - Name = "RebaseLibrariesOnProperties"; - Typ = "65"; - Source = "rebase.dll"; - Target = "RebaseLibrariesOnProperties"; - Inbinarytable = 1; - Assignment1 = ("InstallExecuteSequence", "VersionNT < 600 And Not REMOVE=\"ALL\"", "end"); - Assignment2 = ("AdminExecuteSequence", "VersionNT < 600 And Not REMOVE=\"ALL\"", "end"); -End - WindowsCustomAction gid_Customaction_LookForRegisteredExtensions Name = "LookForRegisteredExtensions"; Typ = "65"; diff --git a/setup_native/prj/build.lst b/setup_native/prj/build.lst index 24d973c78708..e69e2d6295ce 100644 --- a/setup_native/prj/build.lst +++ b/setup_native/prj/build.lst @@ -5,7 +5,6 @@ pk setup_native\scripts nmake - u sn_scri pk setup_native\source\mac nmake - u sn_mac NULL pk setup_native\source\packinfo nmake - w sn_packinfo NULL pk setup_native\source\win32\customactions\tools nmake - w sn_tools NULL -pk setup_native\source\win32\customactions\rebase nmake - w sn_rebase NULL pk setup_native\source\win32\customactions\regactivex nmake - w sn_regactivex NULL pk setup_native\source\win32\customactions\regpatchactivex nmake - w sn_regpatchactivex NULL pk setup_native\source\win32\customactions\reg4allmsdoc nmake - w sn_reg4allmsdoc NULL diff --git a/setup_native/source/win32/customactions/rebase/makefile.mk b/setup_native/source/win32/customactions/rebase/makefile.mk deleted file mode 100644 index fb1fc22a8555..000000000000 --- a/setup_native/source/win32/customactions/rebase/makefile.mk +++ /dev/null @@ -1,82 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. -PRJNAME=setup_native -TARGET=rebase - -# --- Settings ----------------------------------------------------- - -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE -NO_DEFAULT_STL=TRUE -DYNAMIC_CRT= -USE_DEFFILE=TRUE -MINGW_NODLL=YES - -.INCLUDE : settings.mk - -UWINAPILIB= - -# --- Files -------------------------------------------------------- - -.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" - -STDSHL += \ - $(ADVAPI32LIB)\ - $(SHELL32LIB)\ - $(MSILIB) - -.IF "$(COM)"=="GCC" -STDSHL+= \ - $(KERNEL32LIB)\ - -lmsvcrt \ - $(PSDK_HOME)$/lib$/imagehlp.lib -.ELSE -STDSHL+= \ - Imagehlp.lib -.ENDIF - -SHL1OBJS = \ - $(SLO)$/rebase.obj - -SHL1TARGET = $(TARGET) -SHL1IMPLIB = i$(TARGET) - -SHL1DEF = $(MISC)$/$(SHL1TARGET).def -SHL1BASE = 0x1c000000 -DEF1NAME=$(SHL1TARGET) -SHL1DEPN=$(SHL1OBJS) -DEF1EXPORTFILE=$(TARGET).dxp - -.ENDIF - -# --- Targets -------------------------------------------------------------- - -.INCLUDE : target.mk - -# ------------------------------------------------------------------------- diff --git a/setup_native/source/win32/customactions/rebase/rebase.cxx b/setup_native/source/win32/customactions/rebase/rebase.cxx deleted file mode 100644 index 641e397fb9d2..000000000000 --- a/setup_native/source/win32/customactions/rebase/rebase.cxx +++ /dev/null @@ -1,227 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -#undef UNICODE -#undef _UNICODE - -#pragma once - -#ifdef _MSC_VER -#pragma warning(push, 1) /* disable warnings within system headers */ -#endif -#define WIN32_LEAN_AND_MEAN -#include -#include -#include -#include -#define STRSAFE_NO_DEPRECATE -#include -#ifdef _MSC_VER -#pragma warning(pop) -#endif - -#include -#include -#include -#include - -const DWORD PE_Signature = 0x00004550; -typedef std::pair< std::string, bool > StringPair; -typedef boost::unordered_map< std::string, bool > ExcludeLibsMap; - -#ifdef DEBUG -static void OutputDebugStringFormat( LPCSTR pFormat, ... ) -{ - CHAR buffer[1024]; - va_list args; - - va_start( args, pFormat ); - StringCchVPrintfA( buffer, sizeof(buffer), pFormat, args ); - OutputDebugStringA( buffer ); -} -#else -static void OutputDebugStringFormat( LPCSTR, ... ) -{ -} -#endif - -static bool IsValidHandle( HANDLE handle ) -{ - return NULL != handle && INVALID_HANDLE_VALUE != handle; -} - -static std::string GetMsiProperty(MSIHANDLE handle, const std::string& sProperty) -{ - std::string result; - TCHAR szDummy[1] = TEXT(""); - DWORD nChars = 0; - - if (MsiGetProperty(handle, sProperty.c_str(), szDummy, &nChars) == ERROR_MORE_DATA) - { - DWORD nBytes = ++nChars * sizeof(TCHAR); - LPTSTR buffer = reinterpret_cast(_alloca(nBytes)); - ZeroMemory( buffer, nBytes ); - MsiGetProperty(handle, sProperty.c_str(), buffer, &nChars); - result = buffer; - } - return result; -} - -static BOOL rebaseImage( const std::string& filePath, LPVOID address ) -{ - ULONG ulOldImageSize; - ULONG_PTR lpOldImageBase; - ULONG ulNewImageSize; - ULONG_PTR lpNewImageBase = reinterpret_cast(address); - - BOOL bResult = ReBaseImage( - (PSTR)filePath.c_str(), - (PSTR)"", - TRUE, - FALSE, - FALSE, - 0, - &ulOldImageSize, - &lpOldImageBase, - &ulNewImageSize, - &lpNewImageBase, - (ULONG)time(NULL) ); - - return bResult; -} - -static BOOL rebaseImage( MSIHANDLE /*handle*/, const std::string& sFilePath, LPVOID address ) -{ - std::string mystr; - mystr = "Full file: " + sFilePath; - - BOOL bResult = rebaseImage( sFilePath, address ); - - if ( !bResult ) - { - OutputDebugStringFormat( "Rebasing library %s failed", mystr.c_str() ); - } - - return bResult; -} - -static BOOL rebaseImagesInFolder( MSIHANDLE handle, const std::string& sPath, LPVOID address, ExcludeLibsMap& rExcludeMap ) -{ - std::string sDir = sPath; - std::string sPattern = sPath + TEXT("*.dll"); - WIN32_FIND_DATA aFindFileData; - - HANDLE hFind = FindFirstFile( sPattern.c_str(), &aFindFileData ); - if ( IsValidHandle(hFind) ) - { - BOOL fSuccess = false; - - do - { - std::string sFileName = aFindFileData.cFileName; - if ( rExcludeMap.find( sFileName ) == rExcludeMap.end() ) - { - OutputDebugStringFormat( "Rebase library: %s", sFileName.c_str() ); - std::string sLibFile = sDir + sFileName; - rebaseImage( handle, sLibFile, address ); - } - else - { - OutputDebugStringFormat( "Exclude library %s from rebase", sFileName.c_str() ); - } - - fSuccess = FindNextFile( hFind, &aFindFileData ); - } - while ( fSuccess ); - - FindClose( hFind ); - } - - return ERROR_SUCCESS; -} - -static BOOL rebaseImages( MSIHANDLE handle, LPVOID pAddress, ExcludeLibsMap& rMap ) -{ - std::string sInstallPath = GetMsiProperty(handle, TEXT("INSTALLLOCATION")); - - std::string sBasisDir = sInstallPath + TEXT("Basis\\program\\"); - std::string sOfficeDir = sInstallPath + TEXT("program\\"); - std::string sUreDir = sInstallPath + TEXT("URE\\bin\\"); - - BOOL bResult = rebaseImagesInFolder( handle, sBasisDir, pAddress, rMap ); - bResult &= rebaseImagesInFolder( handle, sOfficeDir, pAddress, rMap ); - bResult &= rebaseImagesInFolder( handle, sUreDir, pAddress, rMap ); - - return bResult; -} - -static BOOL IsServerSystem( MSIHANDLE /*handle*/ ) -{ - OSVERSIONINFOEX osVersionInfoEx; - osVersionInfoEx.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); - GetVersionEx(reinterpret_cast(&osVersionInfoEx)); - - if ( osVersionInfoEx.wProductType != VER_NT_WORKSTATION ) - { - OutputDebugStringFormat( "Server system detected. No rebase necessary!" ); - return TRUE; - } - else - { - OutputDebugStringFormat( "Client system detected. Rebase necessary!" ); - return FALSE; - } -} - -static void InitExcludeFromRebaseList( MSIHANDLE handle, ExcludeLibsMap& rMap ) -{ - size_t nPos( 0 ); - const TCHAR cDelim = ','; - std::string sLibsExcluded = GetMsiProperty(handle, TEXT("EXCLUDE_FROM_REBASE")); - - while ( nPos < sLibsExcluded.size() ) - { - size_t nDelPos = sLibsExcluded.find_first_of( cDelim, nPos ); - - std::string sExcludedLibName; - if ( nDelPos != std::string::npos ) - { - sExcludedLibName = sLibsExcluded.substr( nPos, nDelPos - nPos ); - nPos = nDelPos+1; - } - else - { - sExcludedLibName = sLibsExcluded.substr( nPos ); - nPos = sLibsExcluded.size(); - } - - if ( sExcludedLibName.size() > 0 ) - { - OutputDebugStringFormat( "Insert library %s into exclude from rebase list", sExcludedLibName.c_str() ); - rMap.insert( StringPair( sExcludedLibName, true )); - } - } -} - -extern "C" BOOL __stdcall RebaseLibrariesOnProperties( MSIHANDLE handle ) -{ - static LPVOID pDefault = reinterpret_cast(0x10000000); - - OutputDebugStringFormat( "RebaseLibrariesOnProperties has been called" ); - std::string sDontOptimizeLibs = GetMsiProperty(handle, TEXT("DONTOPTIMIZELIBS")); - if ( sDontOptimizeLibs.length() > 0 && sDontOptimizeLibs == "1" ) - { - OutputDebugStringFormat( "Don't optimize libraries set. No rebase necessary!" ); - return TRUE; - } - - if ( !IsServerSystem( handle )) - { - ExcludeLibsMap aExcludeLibsMap; - InitExcludeFromRebaseList( handle, aExcludeLibsMap ); - - return rebaseImages( handle, pDefault, aExcludeLibsMap ); - } - - return TRUE; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/setup_native/source/win32/customactions/rebase/rebase.dxp b/setup_native/source/win32/customactions/rebase/rebase.dxp deleted file mode 100644 index 47ea23951f04..000000000000 --- a/setup_native/source/win32/customactions/rebase/rebase.dxp +++ /dev/null @@ -1 +0,0 @@ -RebaseLibrariesOnProperties From a6ab8927c74d512675dcc174b0d179f02a4c64d6 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 9 Oct 2012 12:21:38 +0300 Subject: [PATCH 596/863] Do the de-duplication of pSwResMgr a bit differently Let the code stay as-is for the normal (not DISABLE_DYNLOADING) case. This partially reverts commit f5ba1a09408be65e6c5831c2b61bc94133d7ad13. Change-Id: I040e05844f9438ace39cf419a9a9e757002f9719 --- sw/source/ui/dialog/swdialmgr.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sw/source/ui/dialog/swdialmgr.cxx b/sw/source/ui/dialog/swdialmgr.cxx index 364416d510fa..6d5861dadcd8 100644 --- a/sw/source/ui/dialog/swdialmgr.cxx +++ b/sw/source/ui/dialog/swdialmgr.cxx @@ -33,12 +33,14 @@ #ifndef DISABLE_DYNLOADING //copy from core\bastyp\swtypes.cxx String aEmptyStr; // constant strings + +ResMgr* pSwResMgr=0; +#else +static ResMgr *pSwResMgr; #endif ResMgr* SwDialogsResMgr::GetResMgr() { - static ResMgr* pSwResMgr=0; - if ( !pSwResMgr ) { pSwResMgr = SfxApplication::CreateResManager( "sw" ); From fd5c4df7a2a3ebbad5611346bb43fe909424ff17 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Tue, 9 Oct 2012 12:05:27 +0200 Subject: [PATCH 597/863] remove obsoleted instruction from icon themes' README Change-Id: Id6e7f7dea6284af1b94c2616c9c83f88448115be --- icon-themes/README | 5 ----- 1 file changed, 5 deletions(-) diff --git a/icon-themes/README b/icon-themes/README index 4fa769bb780e..1358cd47b197 100644 --- a/icon-themes/README +++ b/icon-themes/README @@ -54,11 +54,6 @@ How to add a new image set: < "New set" ; > ; both in cui/source/options/optgdlg.src -- FIXME: is this step still needed? - Add all known localizations of the new item to svx/source/dialog/localize.sdf, e.g. - svx source\dialog\optgdlg.src 0 stringlist OFA_TP_VIEW.LB_ICONSTYLE 6 0 cs New set 2002-02-02 02:02:02 - the check box item will not be visible in the other localizations otherwise, see http://www.openoffice.org/issues/show_bug.cgi?id=74982 - - Add the new_set to 'SymbolsStyle' property in officecfg/registry/schema/org/openoffice/Office/Common.xcs. From 138f1159c4ad2d742385c986efd36d9489d185ad Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Tue, 9 Oct 2012 13:27:32 +0200 Subject: [PATCH 598/863] cui: add initial README Change-Id: I4334373637834d04b28a01891b7728a32060cf3a --- cui/README | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 cui/README diff --git a/cui/README b/cui/README new file mode 100644 index 000000000000..f17af24b54b9 --- /dev/null +++ b/cui/README @@ -0,0 +1,8 @@ +Common User Interface + +It was moved out from svx in DEV300m68: + +http://www.mail-archive.com/dev@openoffice.org/msg12925.html + +It contains dialogs used by more then one application, e.g. paragraph +properties. From 9040130ade07bc1b6757a48928ad01a3510865f0 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Tue, 9 Oct 2012 13:44:39 +0200 Subject: [PATCH 599/863] add link to detailed module description to Math's README Change-Id: I930f8729a58fb8cd3209df2ad1b112150796f50f --- starmath/README | 3 +++ 1 file changed, 3 insertions(+) diff --git a/starmath/README b/starmath/README index a5a0a4efd619..d84b3d8e0483 100644 --- a/starmath/README +++ b/starmath/README @@ -1 +1,4 @@ Formula editor code for writer ([[sw]]). + +Good overview from the original developer: +http://www.mail-archive.com/dev@sw.openoffice.org/msg00200.html From 4874a0dcbfe56028d5ac7f44bb994837eb003c35 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Tue, 9 Oct 2012 11:24:28 +0200 Subject: [PATCH 600/863] added safety check Change-Id: I05ca3e5b176202d26c2f2e45cc674ea54934a30b --- oox/source/ppt/slidefragmenthandler.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx index b626612888d9..bb1e3e201e50 100644 --- a/oox/source/ppt/slidefragmenthandler.cxx +++ b/oox/source/ppt/slidefragmenthandler.cxx @@ -178,7 +178,7 @@ SlideFragmentHandler::~SlideFragmentHandler() throw() case A_TOKEN( overrideClrMapping ): case PPT_TOKEN( clrMap ): // CT_ColorMapping { - oox::drawingml::ClrMapPtr pClrMapPtr( aElementToken == PPT_TOKEN( clrMap ) ? new oox::drawingml::ClrMap() : new oox::drawingml::ClrMap( *mpSlidePersistPtr->getClrMap() ) ); + oox::drawingml::ClrMapPtr pClrMapPtr( ( aElementToken == PPT_TOKEN( clrMap ) || !mpSlidePersistPtr.get() ) ? new oox::drawingml::ClrMap() : new oox::drawingml::ClrMap( *mpSlidePersistPtr->getClrMap() ) ); ContextHandlerRef ret = new oox::drawingml::clrMapContext( *this, rAttribs.getFastAttributeList(), *pClrMapPtr ); mpSlidePersistPtr->setClrMap( pClrMapPtr ); return ret; From bb414e9eeed32b9f931b0f2a9909bb43e1f6bdbb Mon Sep 17 00:00:00 2001 From: Ricardo Montania Date: Fri, 5 Oct 2012 01:25:41 -0300 Subject: [PATCH 601/863] rtl::OUString to OUString in basctl Change-Id: Iaa56c5f8a15032c3102ad58011c80e3c86fe287c --- basctl/source/basicide/basides2.cxx | 18 ++--- basctl/source/basicide/basides3.cxx | 12 +-- basctl/source/basicide/basobj3.cxx | 30 +++---- basctl/source/basicide/bastype2.cxx | 116 ++++++++++++++-------------- basctl/source/inc/bastypes.hxx | 62 +++++++-------- 5 files changed, 119 insertions(+), 119 deletions(-) diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx index 16e73fef6430..410d3a78652c 100644 --- a/basctl/source/basicide/basides2.cxx +++ b/basctl/source/basicide/basides2.cxx @@ -126,7 +126,7 @@ void Shell::SetMDITitle() aTitleBuf.append(IDE_RESSTR(RID_STR_SIGNED)); aTitleBuf.append(' '); } - ::rtl::OUString aTitle(aTitleBuf.makeStringAndClear()); + OUString aTitle(aTitleBuf.makeStringAndClear()); SfxViewFrame* pViewFrame = GetViewFrame(); if ( pViewFrame ) @@ -145,18 +145,18 @@ void Shell::SetMDITitle() } } -ModulWindow* Shell::CreateBasWin( const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, const ::rtl::OUString& rModName ) +ModulWindow* Shell::CreateBasWin( const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rModName ) { bCreatingWindow = true; sal_uLong nKey = 0; ModulWindow* pWin = 0; - ::rtl::OUString aLibName( rLibName ); - ::rtl::OUString aModName( rModName ); + OUString aLibName( rLibName ); + OUString aModName( rModName ); if ( aLibName.isEmpty() ) - aLibName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Standard")); + aLibName = "Standard" ; uno::Reference< container::XNameContainer > xLib = rDocument.getOrCreateLibrary( E_SCRIPTS, aLibName ); @@ -168,7 +168,7 @@ ModulWindow* Shell::CreateBasWin( const ScriptDocument& rDocument, const ::rtl:: if ( !pWin ) { - ::rtl::OUString aModule; + OUString aModule; bool bSuccess = false; if ( rDocument.hasModule( aLibName, aModName ) ) bSuccess = rDocument.getModule( aLibName, aModName, aModule ); @@ -200,11 +200,11 @@ ModulWindow* Shell::CreateBasWin( const ScriptDocument& rDocument, const ::rtl:: { // display a nice friendly name in the ObjectModule tab, // combining the objectname and module name, e.g. Sheet1 ( Financials ) - ::rtl::OUString sObjName; + OUString sObjName; ModuleInfoHelper::getObjectName( xLib, rModName, sObjName ); if( !sObjName.isEmpty() ) { - ::rtl::OUStringBuffer aModNameBuf(aModName); + OUStringBuffer aModNameBuf(aModName); aModNameBuf.append(' '); aModNameBuf.append('('); aModNameBuf.append(sObjName); @@ -224,7 +224,7 @@ ModulWindow* Shell::CreateBasWin( const ScriptDocument& rDocument, const ::rtl:: ModulWindow* Shell::FindBasWin ( ScriptDocument const& rDocument, - rtl::OUString const& rLibName, rtl::OUString const& rName, + OUString const& rLibName, OUString const& rName, bool bCreateIfNotExist, bool bFindSuspended ) { diff --git a/basctl/source/basicide/basides3.cxx b/basctl/source/basicide/basides3.cxx index d642a2ae1785..5d043eacc1bf 100644 --- a/basctl/source/basicide/basides3.cxx +++ b/basctl/source/basicide/basides3.cxx @@ -44,17 +44,17 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::io; -DialogWindow* Shell::CreateDlgWin( const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, const ::rtl::OUString& rDlgName ) +DialogWindow* Shell::CreateDlgWin( const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rDlgName ) { bCreatingWindow = true; sal_uLong nKey = 0; DialogWindow* pWin = 0; - ::rtl::OUString aLibName( rLibName ); - ::rtl::OUString aDlgName( rDlgName ); + OUString aLibName( rLibName ); + OUString aDlgName( rDlgName ); if ( aLibName.isEmpty() ) - aLibName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Standard")); + aLibName = "Standard" ; rDocument.getOrCreateLibrary( E_DIALOGS, aLibName ); @@ -79,7 +79,7 @@ DialogWindow* Shell::CreateDlgWin( const ScriptDocument& rDocument, const ::rtl: // create dialog model Reference< lang::XMultiServiceFactory > xMSF = getProcessServiceFactory(); Reference< container::XNameContainer > xDialogModel( xMSF->createInstance - ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDialogModel" ) ) ), UNO_QUERY ); + ( "com.sun.star.awt.UnoControlDialogModel" ), UNO_QUERY ); Reference< XInputStream > xInput( xISP->createInputStream() ); Reference< XComponentContext > xContext( comphelper::getComponentContext( xMSF ) ); @@ -120,7 +120,7 @@ DialogWindow* Shell::CreateDlgWin( const ScriptDocument& rDocument, const ::rtl: DialogWindow* Shell::FindDlgWin ( ScriptDocument const& rDocument, - rtl::OUString const& rLibName, rtl::OUString const& rName, + OUString const& rLibName, OUString const& rName, bool bCreateIfNotExist, bool bFindSuspended ) { diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx index 5da04e9016fb..6a726662f08c 100644 --- a/basctl/source/basicide/basobj3.cxx +++ b/basctl/source/basicide/basobj3.cxx @@ -87,11 +87,11 @@ SbMethod* CreateMacro( SbModule* pModule, const String& rMacroName ) if ( aMacroName.Len() == 0 ) { if ( !pModule->GetMethods()->Count() ) - aMacroName = String( RTL_CONSTASCII_USTRINGPARAM( "Main" ) ); + aMacroName = String( "Main" ); else { bool bValid = false; - String aStdMacroText( RTL_CONSTASCII_USTRINGPARAM( "Macro" ) ); + String aStdMacroText( "Macro" ); sal_uInt16 nMacro = 1; while ( !bValid ) { @@ -104,7 +104,7 @@ SbMethod* CreateMacro( SbModule* pModule, const String& rMacroName ) } } - ::rtl::OUString aOUSource( pModule->GetSource32() ); + OUString aOUSource( pModule->GetSource32() ); // don't produce too many empty lines... sal_Int32 nSourceLen = aOUSource.getLength(); @@ -112,17 +112,17 @@ SbMethod* CreateMacro( SbModule* pModule, const String& rMacroName ) { const sal_Unicode* pStr = aOUSource.getStr(); if ( pStr[ nSourceLen - 1 ] != LINE_SEP ) - aOUSource += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "\n\n" ) ); + aOUSource += "\n\n" ; else if ( pStr[ nSourceLen - 2 ] != LINE_SEP ) - aOUSource += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "\n" ) ); + aOUSource += "\n" ; else if ( pStr[ nSourceLen - 3 ] == LINE_SEP ) aOUSource = aOUSource.copy( 0, nSourceLen-1 ); } - ::rtl::OUString aSubStr; - aSubStr = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Sub " ) ); + OUString aSubStr; + aSubStr = "Sub " ; aSubStr += aMacroName; - aSubStr += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "\n\nEnd Sub" ) ); + aSubStr += "\n\nEnd Sub" ; aOUSource += aSubStr; @@ -165,9 +165,9 @@ SbMethod* CreateMacro( SbModule* pModule, const String& rMacroName ) bool RenameDialog ( Window* pErrorParent, ScriptDocument const& rDocument, - rtl::OUString const& rLibName, - rtl::OUString const& rOldName, - rtl::OUString const& rNewName + OUString const& rLibName, + OUString const& rOldName, + OUString const& rNewName ) throw(ElementExistException, NoSuchElementException) { @@ -228,7 +228,7 @@ bool RenameDialog ( //---------------------------------------------------------------------------- -bool RemoveDialog( const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, const ::rtl::OUString& rDlgName ) +bool RemoveDialog( const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rDlgName ) { if (Shell* pShell = GetShell()) { @@ -267,9 +267,9 @@ BasicManager* FindBasicManager( StarBASIC* pLib ) if ( !pBasicMgr ) continue; - Sequence< ::rtl::OUString > aLibNames( doc->getLibraryNames() ); + Sequence< OUString > aLibNames( doc->getLibraryNames() ); sal_Int32 nLibCount = aLibNames.getLength(); - const ::rtl::OUString* pLibNames = aLibNames.getConstArray(); + const OUString* pLibNames = aLibNames.getConstArray(); for ( sal_Int32 i = 0 ; i < nLibCount ; i++ ) { @@ -431,7 +431,7 @@ long HandleBasicError( StarBASIC* pBasic ) OSL_ENSURE( aDocument.isValid(), "basctl::HandleBasicError: no document for the given BasicManager!" ); if ( aDocument.isValid() ) { - ::rtl::OUString aOULibName( pBasic->GetName() ); + OUString aOULibName( pBasic->GetName() ); Reference< script::XLibraryContainer > xModLibContainer( aDocument.getLibraryContainer( E_SCRIPTS ) ); if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) ) { diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx index bd9858a7525d..db208138ed90 100644 --- a/basctl/source/basicide/bastype2.cxx +++ b/basctl/source/basicide/bastype2.cxx @@ -54,7 +54,7 @@ namespace basctl using namespace ::com::sun::star::uno; using namespace ::com::sun::star; -void ModuleInfoHelper::getObjectName( const uno::Reference< container::XNameContainer >& rLib, const ::rtl::OUString& rModName, ::rtl::OUString& rObjName ) +void ModuleInfoHelper::getObjectName( const uno::Reference< container::XNameContainer >& rLib, const OUString& rModName, OUString& rObjName ) { try { @@ -64,7 +64,7 @@ void ModuleInfoHelper::getObjectName( const uno::Reference< container::XNameCont script::ModuleInfo aModuleInfo = xVBAModuleInfo->getModuleInfo( rModName ); uno::Any aObject( aModuleInfo.ModuleObject ); uno::Reference< lang::XServiceInfo > xServiceInfo( aObject, uno::UNO_QUERY ); - if( xServiceInfo.is() && xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.excel.Worksheet" )) ) ) + if( xServiceInfo.is() && xServiceInfo->supportsService( "ooo.vba.excel.Worksheet" ) ) { uno::Reference< container::XNamed > xNamed( aObject, uno::UNO_QUERY ); if( xNamed.is() ) @@ -77,7 +77,7 @@ void ModuleInfoHelper::getObjectName( const uno::Reference< container::XNameCont } } -sal_Int32 ModuleInfoHelper::getModuleType( const uno::Reference< container::XNameContainer >& rLib, const ::rtl::OUString& rModName ) +sal_Int32 ModuleInfoHelper::getModuleType( const uno::Reference< container::XNameContainer >& rLib, const OUString& rModName ) { sal_Int32 nType = script::ModuleType::NORMAL; uno::Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( rLib, uno::UNO_QUERY ); @@ -110,7 +110,7 @@ DocumentEntry::~DocumentEntry() LibEntry::LibEntry ( ScriptDocument const& rDocument, LibraryLocation eLocation, - rtl::OUString const& rLibName, + OUString const& rLibName, EntryType eType ) : DocumentEntry(rDocument, eLocation, eType), @@ -129,9 +129,9 @@ EntryDescriptor::EntryDescriptor () : EntryDescriptor::EntryDescriptor ( ScriptDocument const& rDocument, LibraryLocation eLocation, - rtl::OUString const& rLibName, - rtl::OUString const& rLibSubName, - rtl::OUString const& rName, + OUString const& rLibName, + OUString const& rLibSubName, + OUString const& rName, EntryType eType ) : m_aDocument(rDocument), @@ -147,10 +147,10 @@ EntryDescriptor::EntryDescriptor ( EntryDescriptor::EntryDescriptor ( ScriptDocument const& rDocument, LibraryLocation eLocation, - rtl::OUString const& rLibName, - rtl::OUString const& rLibSubName, - rtl::OUString const& rName, - rtl::OUString const& rMethodName, + OUString const& rLibName, + OUString const& rLibSubName, + OUString const& rName, + OUString const& rMethodName, EntryType eType ) : m_aDocument(rDocument), @@ -223,7 +223,7 @@ void TreeListBox::ScanEntry( const ScriptDocument& rDocument, LibraryLocation eL ImpCreateLibEntries( pDocumentRootEntry, rDocument, eLocation ); if ( !pDocumentRootEntry ) { - ::rtl::OUString aRootName( GetRootEntryName( rDocument, eLocation ) ); + OUString aRootName( GetRootEntryName( rDocument, eLocation ) ); Image aImage; GetRootEntryBitmaps( rDocument, aImage ); SAL_WNODEPRECATED_DECLARATIONS_PUSH @@ -242,19 +242,19 @@ void TreeListBox::ScanEntry( const ScriptDocument& rDocument, LibraryLocation eL void TreeListBox::ImpCreateLibEntries( SvLBoxEntry* pDocumentRootEntry, const ScriptDocument& rDocument, LibraryLocation eLocation ) { // get a sorted list of library names - Sequence< ::rtl::OUString > aLibNames( rDocument.getLibraryNames() ); + Sequence< OUString > aLibNames( rDocument.getLibraryNames() ); sal_Int32 nLibCount = aLibNames.getLength(); - const ::rtl::OUString* pLibNames = aLibNames.getConstArray(); + const OUString* pLibNames = aLibNames.getConstArray(); for ( sal_Int32 i = 0 ; i < nLibCount ; i++ ) { - ::rtl::OUString aLibName = pLibNames[ i ]; + OUString aLibName = pLibNames[ i ]; if ( eLocation == rDocument.getLibraryLocation( aLibName ) ) { // check, if the module library is loaded bool bModLibLoaded = false; - ::rtl::OUString aOULibName( aLibName ); + OUString aOULibName( aLibName ); Reference< script::XLibraryContainer > xModLibContainer( rDocument.getLibraryContainer( E_SCRIPTS ) ); if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) && xModLibContainer->isLibraryLoaded( aOULibName ) ) bModLibLoaded = true; @@ -303,7 +303,7 @@ void TreeListBox::ImpCreateLibEntries( SvLBoxEntry* pDocumentRootEntry, const Sc } } -void TreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const ::rtl::OUString& rLibName ) +void TreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName ) { // modules if ( nMode & BROWSEMODE_MODULES ) @@ -319,13 +319,13 @@ void TreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const Scri else { // get a sorted list of module names - Sequence< ::rtl::OUString > aModNames = rDocument.getObjectNames( E_SCRIPTS, rLibName ); + Sequence< OUString > aModNames = rDocument.getObjectNames( E_SCRIPTS, rLibName ); sal_Int32 nModCount = aModNames.getLength(); - const ::rtl::OUString* pModNames = aModNames.getConstArray(); + const OUString* pModNames = aModNames.getConstArray(); for ( sal_Int32 i = 0 ; i < nModCount ; i++ ) { - ::rtl::OUString aModName = pModNames[ i ]; + OUString aModName = pModNames[ i ]; SvLBoxEntry* pModuleEntry = FindEntry( pLibRootEntry, aModName, OBJ_TYPE_MODULE ); if ( !pModuleEntry ) pModuleEntry = AddEntry( @@ -338,13 +338,13 @@ void TreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const Scri // methods if ( nMode & BROWSEMODE_SUBS ) { - Sequence< ::rtl::OUString > aNames = GetMethodNames( rDocument, rLibName, aModName ); + Sequence< OUString > aNames = GetMethodNames( rDocument, rLibName, aModName ); sal_Int32 nCount = aNames.getLength(); - const ::rtl::OUString* pNames = aNames.getConstArray(); + const OUString* pNames = aNames.getConstArray(); for ( sal_Int32 j = 0 ; j < nCount ; j++ ) { - ::rtl::OUString aName = pNames[ j ]; + OUString aName = pNames[ j ]; SvLBoxEntry* pEntry = FindEntry( pModuleEntry, aName, OBJ_TYPE_METHOD ); if ( !pEntry ) pEntry = AddEntry( @@ -375,13 +375,13 @@ void TreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const Scri try { // get a sorted list of dialog names - Sequence< ::rtl::OUString > aDlgNames( rDocument.getObjectNames( E_DIALOGS, rLibName ) ); + Sequence< OUString > aDlgNames( rDocument.getObjectNames( E_DIALOGS, rLibName ) ); sal_Int32 nDlgCount = aDlgNames.getLength(); - const ::rtl::OUString* pDlgNames = aDlgNames.getConstArray(); + const OUString* pDlgNames = aDlgNames.getConstArray(); for ( sal_Int32 i = 0 ; i < nDlgCount ; i++ ) { - ::rtl::OUString aDlgName = pDlgNames[ i ]; + OUString aDlgName = pDlgNames[ i ]; SvLBoxEntry* pDialogEntry = FindEntry( pLibRootEntry, aDlgName, OBJ_TYPE_DIALOG ); if ( !pDialogEntry ) pDialogEntry = AddEntry( @@ -400,20 +400,20 @@ void TreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const Scri } } -void TreeListBox::ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const ::rtl::OUString& rLibName ) +void TreeListBox::ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName ) { - std::vector > aEntries; + std::vector > aEntries; aEntries.push_back( ::std::make_pair( OBJ_TYPE_DOCUMENT_OBJECTS, IDE_RESSTR(RID_STR_DOCUMENT_OBJECTS) ) ); aEntries.push_back( ::std::make_pair( OBJ_TYPE_USERFORMS, IDE_RESSTR(RID_STR_USERFORMS) ) ); aEntries.push_back( ::std::make_pair( OBJ_TYPE_NORMAL_MODULES, IDE_RESSTR(RID_STR_NORMAL_MODULES) ) ); aEntries.push_back( ::std::make_pair( OBJ_TYPE_CLASS_MODULES, IDE_RESSTR(RID_STR_CLASS_MODULES) ) ); - std::vector >::iterator iter; + std::vector >::iterator iter; for( iter = aEntries.begin(); iter != aEntries.end(); ++iter ) { EntryType eType = iter->first; - rtl::OUString aEntryName = iter->second; + OUString aEntryName = iter->second; SvLBoxEntry* pLibSubRootEntry = FindEntry( pLibRootEntry, aEntryName, eType ); if( pLibSubRootEntry ) { @@ -433,7 +433,7 @@ void TreeListBox::ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEntry, c } } -void TreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubRootEntry, const ScriptDocument& rDocument, const ::rtl::OUString& rLibName ) +void TreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubRootEntry, const ScriptDocument& rDocument, const OUString& rLibName ) { uno::Reference< container::XNameContainer > xLib = rDocument.getOrCreateLibrary( E_SCRIPTS, rLibName ); if( !xLib.is() ) @@ -442,16 +442,16 @@ void TreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubRootEn try { // get a sorted list of module names - Sequence< ::rtl::OUString > aModNames = rDocument.getObjectNames( E_SCRIPTS, rLibName ); + Sequence< OUString > aModNames = rDocument.getObjectNames( E_SCRIPTS, rLibName ); sal_Int32 nModCount = aModNames.getLength(); - const ::rtl::OUString* pModNames = aModNames.getConstArray(); + const OUString* pModNames = aModNames.getConstArray(); EntryDescriptor aDesc( GetEntryDescriptor( pLibSubRootEntry ) ); EntryType eCurrentType( aDesc.GetType() ); for ( sal_Int32 i = 0 ; i < nModCount ; i++ ) { - ::rtl::OUString aModName = pModNames[ i ]; + OUString aModName = pModNames[ i ]; EntryType eType = OBJ_TYPE_UNKNOWN; switch( ModuleInfoHelper::getModuleType( xLib, aModName ) ) { @@ -473,19 +473,19 @@ void TreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubRootEn // display a nice friendly name in the ObjectModule tab, // combining the objectname and module name, e.g. Sheet1 ( Financials ) - ::rtl::OUStringBuffer aEntryNameBuf( aModName ); + OUStringBuffer aEntryNameBuf( aModName ); if( eType == OBJ_TYPE_DOCUMENT_OBJECTS ) { - ::rtl::OUString sObjName; + OUString sObjName; ModuleInfoHelper::getObjectName( xLib, aModName, sObjName ); if( !sObjName.isEmpty() ) { - aEntryNameBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM(" (")); + aEntryNameBuf.appendAscii( " (" ); aEntryNameBuf.append(sObjName); aEntryNameBuf.append(')'); } } - ::rtl::OUString aEntryName(aEntryNameBuf.makeStringAndClear()); + OUString aEntryName(aEntryNameBuf.makeStringAndClear()); SvLBoxEntry* pModuleEntry = FindEntry( pLibSubRootEntry, aEntryName, OBJ_TYPE_MODULE ); if ( !pModuleEntry ) pModuleEntry = AddEntry( @@ -498,13 +498,13 @@ void TreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubRootEn // methods if ( nMode & BROWSEMODE_SUBS ) { - Sequence< ::rtl::OUString > aNames = GetMethodNames( rDocument, rLibName, aModName ); + Sequence< OUString > aNames = GetMethodNames( rDocument, rLibName, aModName ); sal_Int32 nCount = aNames.getLength(); - const ::rtl::OUString* pNames = aNames.getConstArray(); + const OUString* pNames = aNames.getConstArray(); for ( sal_Int32 j = 0 ; j < nCount ; j++ ) { - ::rtl::OUString aName = pNames[ j ]; + OUString aName = pNames[ j ]; SvLBoxEntry* pEntry = FindEntry( pModuleEntry, aName, OBJ_TYPE_METHOD ); if ( !pEntry ) pEntry = AddEntry( @@ -523,7 +523,7 @@ void TreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubRootEn } } -SvLBoxEntry* TreeListBox::ImpFindEntry( SvLBoxEntry* pParent, const ::rtl::OUString& rText ) +SvLBoxEntry* TreeListBox::ImpFindEntry( SvLBoxEntry* pParent, const OUString& rText ) { sal_uLong nRootPos = 0; SvLBoxEntry* pEntry = pParent ? FirstChild( pParent ) : GetEntry( nRootPos ); @@ -640,7 +640,7 @@ SvLBoxEntry* TreeListBox::CloneEntry( SvLBoxEntry* pSource ) return pNew; } -SvLBoxEntry* TreeListBox::FindEntry( SvLBoxEntry* pParent, const ::rtl::OUString& rText, EntryType eType ) +SvLBoxEntry* TreeListBox::FindEntry( SvLBoxEntry* pParent, const OUString& rText, EntryType eType ) { sal_uLong nRootPos = 0; SvLBoxEntry* pEntry = pParent ? FirstChild( pParent ) : GetEntry( nRootPos ); @@ -668,10 +668,10 @@ long TreeListBox::ExpandingHdl() OSL_ENSURE( aDocument.isAlive(), "TreeListBox::ExpandingHdl: no document, or document is dead!" ); if ( aDocument.isAlive() ) { - ::rtl::OUString aLibName( aDesc.GetLibName() ); - ::rtl::OUString aLibSubName( aDesc.GetLibSubName() ); - ::rtl::OUString aName( aDesc.GetName() ); - ::rtl::OUString aMethodName( aDesc.GetMethodName() ); + OUString aLibName( aDesc.GetLibName() ); + OUString aLibSubName( aDesc.GetLibSubName() ); + OUString aName( aDesc.GetName() ); + OUString aMethodName( aDesc.GetMethodName() ); if ( !aLibName.isEmpty() && aLibSubName.isEmpty() && aName.isEmpty() && aMethodName.isEmpty() ) { @@ -682,7 +682,7 @@ long TreeListBox::ExpandingHdl() Reference< script::XLibraryContainerPassword > xPasswd( xModLibContainer, UNO_QUERY ); if ( xPasswd.is() && xPasswd->isLibraryPasswordProtected( aLibName ) && !xPasswd->isLibraryPasswordVerified( aLibName ) ) { - ::rtl::OUString aPassword; + OUString aPassword; bOK = QueryPassword( xModLibContainer, aLibName, aPassword ); } } @@ -702,7 +702,7 @@ bool TreeListBox::IsEntryProtected( SvLBoxEntry* pEntry ) OSL_ENSURE( aDocument.isAlive(), "TreeListBox::IsEntryProtected: no document, or document is dead!" ); if ( aDocument.isAlive() ) { - ::rtl::OUString aOULibName( aDesc.GetLibName() ); + OUString aOULibName( aDesc.GetLibName() ); Reference< script::XLibraryContainer > xModLibContainer( aDocument.getLibraryContainer( E_SCRIPTS ) ); if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) ) { @@ -719,7 +719,7 @@ bool TreeListBox::IsEntryProtected( SvLBoxEntry* pEntry ) SAL_WNODEPRECATED_DECLARATIONS_PUSH SvLBoxEntry* TreeListBox::AddEntry( - rtl::OUString const& rText, + OUString const& rText, const Image& rImage, SvLBoxEntry* pParent, bool bChildrenOnDemand, @@ -750,7 +750,7 @@ LibraryType TreeListBox::GetLibraryType() const return eType; } -::rtl::OUString TreeListBox::GetRootEntryName( const ScriptDocument& rDocument, LibraryLocation eLocation ) const +OUString TreeListBox::GetRootEntryName( const ScriptDocument& rDocument, LibraryLocation eLocation ) const { return rDocument.getTitle( eLocation, GetLibraryType() ); } @@ -763,12 +763,12 @@ void TreeListBox::GetRootEntryBitmaps( const ScriptDocument& rDocument, Image& r if ( rDocument.isDocument() ) { - ::rtl::OUString sFactoryURL; + OUString sFactoryURL; Reference xContext( ::comphelper::getProcessComponentContext() ); Reference< frame::XModuleManager2 > xModuleManager( frame::ModuleManager::create(xContext) ); try { - ::rtl::OUString sModule( xModuleManager->identify( rDocument.getDocument() ) ); + OUString sModule( xModuleManager->identify( rDocument.getDocument() ) ); Reference< container::XNameAccess > xModuleConfig( xModuleManager, UNO_QUERY ); if ( xModuleConfig.is() ) { @@ -816,7 +816,7 @@ void TreeListBox::SetCurrentEntry (EntryDescriptor& rDesc) aDesc = EntryDescriptor( ScriptDocument::getApplicationScriptDocument(), LIBRARY_LOCATION_USER, "Standard", - ::rtl::OUString(), ".", OBJ_TYPE_UNKNOWN + OUString(), ".", OBJ_TYPE_UNKNOWN ); } ScriptDocument aDocument = aDesc.GetDocument(); @@ -826,7 +826,7 @@ void TreeListBox::SetCurrentEntry (EntryDescriptor& rDesc) if ( pRootEntry ) { pCurEntry = pRootEntry; - ::rtl::OUString aLibName( aDesc.GetLibName() ); + OUString aLibName( aDesc.GetLibName() ); if ( !aLibName.isEmpty() ) { Expand( pRootEntry ); @@ -834,7 +834,7 @@ void TreeListBox::SetCurrentEntry (EntryDescriptor& rDesc) if ( pLibEntry ) { pCurEntry = pLibEntry; - ::rtl::OUString aLibSubName( aDesc.GetLibSubName() ); + OUString aLibSubName( aDesc.GetLibSubName() ); if( !aLibSubName.isEmpty() ) { Expand( pLibEntry ); @@ -844,7 +844,7 @@ void TreeListBox::SetCurrentEntry (EntryDescriptor& rDesc) pCurEntry = pLibSubEntry; } } - ::rtl::OUString aName( aDesc.GetName() ); + OUString aName( aDesc.GetName() ); if ( !aName.isEmpty() ) { Expand( pCurEntry ); @@ -855,7 +855,7 @@ void TreeListBox::SetCurrentEntry (EntryDescriptor& rDesc) if ( pEntry ) { pCurEntry = pEntry; - ::rtl::OUString aMethodName( aDesc.GetMethodName() ); + OUString aMethodName( aDesc.GetMethodName() ); if ( !aMethodName.isEmpty() ) { Expand( pEntry ); diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx index d7d2e69d0196..b5bb4004cac7 100644 --- a/basctl/source/inc/bastypes.hxx +++ b/basctl/source/inc/bastypes.hxx @@ -50,7 +50,7 @@ class DialogWindow; #define LINE_SEP 0x0A // Implementation: baside2b.cxx -sal_Int32 searchEOL( const ::rtl::OUString& rStr, sal_Int32 fromIndex ); +sal_Int32 searchEOL( const OUString& rStr, sal_Int32 fromIndex ); // Meaning of bToBeKilled: // While being in a reschedule-loop, I may not destroy the window. @@ -155,8 +155,8 @@ private: int nStatus; ScriptDocument m_aDocument; - rtl::OUString m_aLibName; - rtl::OUString m_aName; + OUString m_aLibName; + OUString m_aName; friend class ModulWindow; friend class DialogWindow; @@ -166,7 +166,7 @@ protected: public: TYPEINFO(); - BaseWindow( Window* pParent, const ScriptDocument& rDocument, ::rtl::OUString aLibName, ::rtl::OUString aName ); + BaseWindow( Window* pParent, const ScriptDocument& rDocument, OUString aLibName, OUString aName ); virtual ~BaseWindow(); void Init(); @@ -192,8 +192,8 @@ public: // print page virtual void printPage( sal_Int32 nPage, Printer* pPrinter ) = 0; - virtual ::rtl::OUString GetTitle(); - ::rtl::OUString CreateQualifiedName(); + virtual OUString GetTitle(); + OUString CreateQualifiedName(); virtual EntryDescriptor CreateEntryDescriptor() = 0; virtual bool IsModified(); @@ -223,16 +223,16 @@ public: GetDocument() const { return m_aDocument; } void SetDocument( const ScriptDocument& rDocument ) { m_aDocument = rDocument; } bool IsDocument( const ScriptDocument& rDocument ) const { return rDocument == m_aDocument; } - const ::rtl::OUString& GetLibName() const { return m_aLibName; } - void SetLibName( const ::rtl::OUString& aLibName ) { m_aLibName = aLibName; } - const ::rtl::OUString& GetName() const { return m_aName; } - void SetName( const ::rtl::OUString& aName ) { m_aName = aName; } + const OUString& GetLibName() const { return m_aLibName; } + void SetLibName( const OUString& aLibName ) { m_aLibName = aLibName; } + const OUString& GetName() const { return m_aName; } + void SetName( const OUString& aName ) { m_aName = aName; } virtual void OnNewDocument (); virtual char const* GetHid () const = 0; virtual ItemType GetType () const = 0; void InsertLibInfo () const; - bool Is (ScriptDocument const&, rtl::OUString const&, rtl::OUString const&, ItemType, bool bFindSuspended); + bool Is (ScriptDocument const&, OUString const&, OUString const&, ItemType, bool bFindSuspended); virtual bool HasActiveEditor () const; }; @@ -244,19 +244,19 @@ public: LibInfos (); ~LibInfos (); public: - void InsertInfo (ScriptDocument const&, rtl::OUString const& rLibName, rtl::OUString const& rCurrentName, ItemType eCurrentType); + void InsertInfo (ScriptDocument const&, OUString const& rLibName, OUString const& rCurrentName, ItemType eCurrentType); void RemoveInfoFor (ScriptDocument const&); - Item const* GetInfo (ScriptDocument const&, rtl::OUString const& rLibName); + Item const* GetInfo (ScriptDocument const&, OUString const& rLibName); private: class Key { private: ScriptDocument m_aDocument; - ::rtl::OUString m_aLibName; + OUString m_aLibName; public: - Key (ScriptDocument const&, rtl::OUString const& rLibName); + Key (ScriptDocument const&, OUString const& rLibName); ~Key (); public: bool operator == (Key const&) const; @@ -266,24 +266,24 @@ private: }; public: const ScriptDocument& GetDocument() const { return m_aDocument; } - const ::rtl::OUString& GetLibName() const { return m_aLibName; } + const OUString& GetLibName() const { return m_aLibName; } }; public: class Item { private: ScriptDocument m_aDocument; - ::rtl::OUString m_aLibName; - ::rtl::OUString m_aCurrentName; + OUString m_aLibName; + OUString m_aCurrentName; ItemType m_eCurrentType; public: - Item (ScriptDocument const&, rtl::OUString const& rLibName, rtl::OUString const& rCurrentName, ItemType eCurrentType); + Item (ScriptDocument const&, OUString const& rLibName, OUString const& rCurrentName, ItemType eCurrentType); ~Item (); public: const ScriptDocument& GetDocument() const { return m_aDocument; } - const ::rtl::OUString& GetLibName() const { return m_aLibName; } - const ::rtl::OUString& GetCurrentName() const { return m_aCurrentName; } + const OUString& GetLibName() const { return m_aLibName; } + const OUString& GetCurrentName() const { return m_aCurrentName; } ItemType GetCurrentType() const { return m_eCurrentType; } }; private: @@ -291,16 +291,16 @@ private: Map m_aMap; }; -void CutLines( ::rtl::OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, bool bEraseTrailingEmptyLines = false ); -::rtl::OUString CreateMgrAndLibStr( const ::rtl::OUString& rMgrName, const ::rtl::OUString& rLibName ); +void CutLines( OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, bool bEraseTrailingEmptyLines = false ); +OUString CreateMgrAndLibStr( const OUString& rMgrName, const OUString& rLibName ); sal_uLong CalcLineCount( SvStream& rStream ); -bool QueryReplaceMacro( const ::rtl::OUString& rName, Window* pParent = 0 ); -bool QueryDelMacro( const ::rtl::OUString& rName, Window* pParent = 0 ); -bool QueryDelDialog( const ::rtl::OUString& rName, Window* pParent = 0 ); -bool QueryDelModule( const ::rtl::OUString& rName, Window* pParent = 0 ); -bool QueryDelLib( const ::rtl::OUString& rName, bool bRef = false, Window* pParent = 0 ); -bool QueryPassword( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >& xLibContainer, const ::rtl::OUString& rLibName, ::rtl::OUString& rPassword, bool bRepeat = false, bool bNewTitle = false ); +bool QueryReplaceMacro( const OUString& rName, Window* pParent = 0 ); +bool QueryDelMacro( const OUString& rName, Window* pParent = 0 ); +bool QueryDelDialog( const OUString& rName, Window* pParent = 0 ); +bool QueryDelModule( const OUString& rName, Window* pParent = 0 ); +bool QueryDelLib( const OUString& rName, bool bRef = false, Window* pParent = 0 ); +bool QueryPassword( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >& xLibContainer, const OUString& rLibName, OUString& rPassword, bool bRepeat = false, bool bNewTitle = false ); class ModuleInfoHelper { @@ -309,8 +309,8 @@ class ModuleInfoHelper ModuleInfoHelper (const ModuleInfoHelper&); ModuleInfoHelper& operator = (const ModuleInfoHelper&); public: - static void getObjectName( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rLib, const ::rtl::OUString& rModName, ::rtl::OUString& rObjName ); - static sal_Int32 getModuleType( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rLib, const ::rtl::OUString& rModName ); + static void getObjectName( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rLib, const OUString& rModName, OUString& rObjName ); + static sal_Int32 getModuleType( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rLib, const OUString& rModName ); }; } // namespace basctl From d3e08f257437fe942719304e45792a294d9310db Mon Sep 17 00:00:00 2001 From: Ricardo Montania Date: Sun, 7 Oct 2012 16:26:46 -0300 Subject: [PATCH 602/863] More ::rtl::OUString to OUString in basctl Change-Id: Ie27a55e933462c644f315d0123978082054d79af --- basctl/source/basicide/bastype3.cxx | 10 +++--- basctl/source/basicide/bastypes.cxx | 54 ++++++++++++++--------------- basctl/source/basicide/brkdlg.cxx | 12 +++---- basctl/source/basicide/iderdll.cxx | 7 ++-- 4 files changed, 41 insertions(+), 42 deletions(-) diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx index 19ecab328f77..17c66a7cbe40 100644 --- a/basctl/source/basicide/bastype3.cxx +++ b/basctl/source/basicide/bastype3.cxx @@ -58,7 +58,7 @@ void TreeListBox::RequestingChildren( SvLBoxEntry* pEntry ) } else if ( eType == OBJ_TYPE_LIBRARY ) { - ::rtl::OUString aOULibName( aDesc.GetLibName() ); + OUString aOULibName( aDesc.GetLibName() ); // check password bool bOK = true; @@ -68,7 +68,7 @@ void TreeListBox::RequestingChildren( SvLBoxEntry* pEntry ) Reference< script::XLibraryContainerPassword > xPasswd( xModLibContainer, UNO_QUERY ); if ( xPasswd.is() && xPasswd->isLibraryPasswordProtected( aOULibName ) && !xPasswd->isLibraryPasswordVerified( aOULibName ) ) { - ::rtl::OUString aPassword; + OUString aPassword; bOK = QueryPassword( xModLibContainer, aOULibName, aPassword ); } } @@ -123,7 +123,7 @@ void TreeListBox::RequestingChildren( SvLBoxEntry* pEntry ) || eType == OBJ_TYPE_NORMAL_MODULES || eType == OBJ_TYPE_CLASS_MODULES ) { - ::rtl::OUString aLibName( aDesc.GetLibName() ); + OUString aLibName( aDesc.GetLibName() ); ImpCreateLibSubSubEntriesInVBAMode( pEntry, aDocument, aLibName ); } else { @@ -452,9 +452,9 @@ SvLBoxEntry* TreeListBox::FindRootEntry( const ScriptDocument& rDocument, Librar return 0; } -::rtl::OUString CreateMgrAndLibStr( const ::rtl::OUString& rMgrName, const ::rtl::OUString& rLibName ) +OUString CreateMgrAndLibStr( const OUString& rMgrName, const OUString& rLibName ) { - ::rtl::OUStringBuffer aName; + OUStringBuffer aName; aName.append('['); aName.append(rMgrName); aName.append(']'); diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index 384566d3ad9e..461044c7d407 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -54,7 +54,7 @@ DBG_NAME( BaseWindow ) TYPEINIT0( BaseWindow ) TYPEINIT1( SbxItem, SfxPoolItem ); -BaseWindow::BaseWindow( Window* pParent, const ScriptDocument& rDocument, ::rtl::OUString aLibName, ::rtl::OUString aName ) +BaseWindow::BaseWindow( Window* pParent, const ScriptDocument& rDocument, OUString aLibName, OUString aName ) :Window( pParent, WinBits( WB_3DLOOK ) ) ,m_aDocument( rDocument ) ,m_aLibName( aLibName ) @@ -176,14 +176,14 @@ void BaseWindow::UpdateData() { } -::rtl::OUString BaseWindow::GetTitle() +OUString BaseWindow::GetTitle() { - return ::rtl::OUString(); + return OUString(); } -::rtl::OUString BaseWindow::CreateQualifiedName() +OUString BaseWindow::CreateQualifiedName() { - ::rtl::OUStringBuffer aName; + OUStringBuffer aName; if ( !m_aLibName.isEmpty() ) { LibraryLocation eLocation = m_aDocument.getLibraryLocation( m_aLibName ); @@ -250,7 +250,7 @@ void BaseWindow::InsertLibInfo () const bool BaseWindow::Is ( ScriptDocument const& rDocument, - rtl::OUString const& rLibName, rtl::OUString const& rName, + OUString const& rLibName, OUString const& rName, ItemType eType, bool bFindSuspended ) { @@ -521,7 +521,7 @@ void TabBar::Command( const CommandEvent& rCEvt ) if (Shell* pShell = GetShell()) { ScriptDocument aDocument( pShell->GetCurDocument() ); - ::rtl::OUString aOULibName( pShell->GetCurLibName() ); + OUString aOULibName( pShell->GetCurLibName() ); Reference< script::XLibraryContainer2 > xModLibContainer( aDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY ); Reference< script::XLibraryContainer2 > xDlgLibContainer( aDocument.getLibraryContainer( E_DIALOGS ), UNO_QUERY ); if ( ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) && xModLibContainer->isLibraryReadOnly( aOULibName ) ) || @@ -651,7 +651,7 @@ void TabBar::Sort() } } -void CutLines( ::rtl::OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, bool bEraseTrailingEmptyLines ) +void CutLines( OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, bool bEraseTrailingEmptyLines ) { sal_Int32 nStartPos = 0; sal_Int32 nLine = 0; @@ -678,7 +678,7 @@ void CutLines( ::rtl::OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, bo else nEndPos++; - ::rtl::OUString aEndStr = rStr.copy( nEndPos ); + OUString aEndStr = rStr.copy( nEndPos ); rStr = rStr.copy( 0, nStartPos ); rStr += aEndStr; } @@ -694,7 +694,7 @@ void CutLines( ::rtl::OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, bo if ( n > nStartPos ) { - ::rtl::OUString aEndStr = rStr.copy( n ); + OUString aEndStr = rStr.copy( n ); rStr = rStr.copy( 0, nStartPos ); rStr += aEndStr; } @@ -737,8 +737,8 @@ LibInfos::~LibInfos () void LibInfos::InsertInfo ( ScriptDocument const& rDocument, - rtl::OUString const& rLibName, - rtl::OUString const& rCurrentName, + OUString const& rLibName, + OUString const& rCurrentName, ItemType eCurrentType ) { @@ -758,14 +758,14 @@ void LibInfos::RemoveInfoFor (ScriptDocument const& rDocument) } LibInfos::Item const* LibInfos::GetInfo ( - ScriptDocument const& rDocument, rtl::OUString const& rLibName + ScriptDocument const& rDocument, OUString const& rLibName ) { Map::iterator it = m_aMap.find(Key(rDocument, rLibName)); return it != m_aMap.end() ? &it->second : 0; } -LibInfos::Key::Key (ScriptDocument const& rDocument, rtl::OUString const& rLibName) : +LibInfos::Key::Key (ScriptDocument const& rDocument, OUString const& rLibName) : m_aDocument(rDocument), m_aLibName(rLibName) { } @@ -784,8 +784,8 @@ size_t LibInfos::Key::Hash::operator () (Key const& rKey) const LibInfos::Item::Item ( ScriptDocument const& rDocument, - rtl::OUString const& rLibName, - rtl::OUString const& rCurrentName, + OUString const& rLibName, + OUString const& rCurrentName, ItemType eCurrentType ) : m_aDocument(rDocument), @@ -797,10 +797,10 @@ LibInfos::Item::Item ( LibInfos::Item::~Item () { } -bool QueryDel( const ::rtl::OUString& rName, const ResId& rId, Window* pParent ) +bool QueryDel( const OUString& rName, const ResId& rId, Window* pParent ) { - ::rtl::OUString aQuery(rId.toString()); - ::rtl::OUStringBuffer aNameBuf( rName ); + OUString aQuery(rId.toString()); + OUStringBuffer aNameBuf( rName ); aNameBuf.append('\''); aNameBuf.insert(sal_Int32(0), sal_Unicode('\'')); aQuery = aQuery.replaceAll("XX", aNameBuf.makeStringAndClear()); @@ -808,32 +808,32 @@ bool QueryDel( const ::rtl::OUString& rName, const ResId& rId, Window* pParent ) return ( aQueryBox.Execute() == RET_YES ); } -bool QueryDelMacro( const ::rtl::OUString& rName, Window* pParent ) +bool QueryDelMacro( const OUString& rName, Window* pParent ) { return QueryDel( rName, IDEResId( RID_STR_QUERYDELMACRO ), pParent ); } -bool QueryReplaceMacro( const ::rtl::OUString& rName, Window* pParent ) +bool QueryReplaceMacro( const OUString& rName, Window* pParent ) { return QueryDel( rName, IDEResId( RID_STR_QUERYREPLACEMACRO ), pParent ); } -bool QueryDelDialog( const ::rtl::OUString& rName, Window* pParent ) +bool QueryDelDialog( const OUString& rName, Window* pParent ) { return QueryDel( rName, IDEResId( RID_STR_QUERYDELDIALOG ), pParent ); } -bool QueryDelLib( const ::rtl::OUString& rName, bool bRef, Window* pParent ) +bool QueryDelLib( const OUString& rName, bool bRef, Window* pParent ) { return QueryDel( rName, IDEResId( bRef ? RID_STR_QUERYDELLIBREF : RID_STR_QUERYDELLIB ), pParent ); } -bool QueryDelModule( const ::rtl::OUString& rName, Window* pParent ) +bool QueryDelModule( const OUString& rName, Window* pParent ) { return QueryDel( rName, IDEResId( RID_STR_QUERYDELMODULE ), pParent ); } -bool QueryPassword( const Reference< script::XLibraryContainer >& xLibContainer, const ::rtl::OUString& rLibName, ::rtl::OUString& rPassword, bool bRepeat, bool bNewTitle ) +bool QueryPassword( const Reference< script::XLibraryContainer >& xLibContainer, const OUString& rLibName, OUString& rPassword, bool bRepeat, bool bNewTitle ) { bool bOK = false; sal_uInt16 nRet = 0; @@ -847,7 +847,7 @@ bool QueryPassword( const Reference< script::XLibraryContainer >& xLibContainer, // set new title if ( bNewTitle ) { - ::rtl::OUString aTitle(IDE_RESSTR(RID_STR_ENTERPASSWORD)); + OUString aTitle(IDE_RESSTR(RID_STR_ENTERPASSWORD)); aTitle = aTitle.replaceAll("XX", rLibName); aDlg.SetText( aTitle ); } @@ -864,7 +864,7 @@ bool QueryPassword( const Reference< script::XLibraryContainer >& xLibContainer, if ( xPasswd.is() && xPasswd->isLibraryPasswordProtected( rLibName ) && !xPasswd->isLibraryPasswordVerified( rLibName ) ) { rPassword = aDlg.GetPassword(); - // ::rtl::OUString aOUPassword( rPassword ); + // OUString aOUPassword( rPassword ); bOK = xPasswd->verifyLibraryPassword( rLibName, rPassword ); if ( !bOK ) diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx index 5ee425e6dc37..d8f2f5ebb070 100644 --- a/basctl/source/basicide/brkdlg.cxx +++ b/basctl/source/basicide/brkdlg.cxx @@ -38,15 +38,15 @@ namespace basctl namespace { -bool lcl_ParseText(rtl::OUString const &rText, size_t& rLineNr ) +bool lcl_ParseText(OUString const &rText, size_t& rLineNr ) { // aText should look like "# n" where // n > 0 && n < std::numeric_limits< sal_uInt16 >::max(). // All spaces are ignored, so there can even be spaces within the // number n. (Maybe it would be better to ignore all whitespace instead // of just spaces.) - rtl::OUString aText( - rText.replaceAll(" ", rtl::OUString())); + OUString aText( + rText.replaceAll(" ", OUString())); sal_Unicode cFirst = aText[0]; if (cFirst != '#' && !(cFirst >= '0' && cFirst <= '9')) return false; @@ -82,7 +82,7 @@ BreakPointDialog::BreakPointDialog( Window* pParent, BreakPointList& rBrkPntList for ( size_t i = 0, n = m_aModifiedBreakPointList.size(); i < n; ++i ) { BreakPoint* pBrk = m_aModifiedBreakPointList.at( i ); - String aEntryStr( RTL_CONSTASCII_USTRINGPARAM( "# " ) ); + String aEntryStr( "# " ); aEntryStr += String::CreateFromInt32( pBrk->nLine ); aComboBox.InsertEntry( aEntryStr, COMBOBOX_APPEND ); } @@ -111,7 +111,7 @@ BreakPointDialog::BreakPointDialog( Window* pParent, BreakPointList& rBrkPntList void BreakPointDialog::SetCurrentBreakPoint( BreakPoint* pBrk ) { - String aStr( RTL_CONSTASCII_USTRINGPARAM( "# " ) ); + String aStr( "# " ); aStr += String::CreateFromInt32( pBrk->nLine ); aComboBox.SetText( aStr ); UpdateFields( pBrk ); @@ -200,7 +200,7 @@ IMPL_LINK( BreakPointDialog, ButtonHdl, Button *, pButton ) pBrk->bEnabled = aCheckBox.IsChecked(); pBrk->nStopAfter = (size_t) aNumericField.GetValue(); m_aModifiedBreakPointList.InsertSorted( pBrk ); - String aEntryStr( RTL_CONSTASCII_USTRINGPARAM( "# " ) ); + String aEntryStr( "# " ); aEntryStr += String::CreateFromInt32( pBrk->nLine ); aComboBox.InsertEntry( aEntryStr, COMBOBOX_APPEND ); if (SfxDispatcher* pDispatcher = GetDispatcher()) diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx index 1923141bd92c..c0669e8b5989 100644 --- a/basctl/source/basicide/iderdll.cxx +++ b/basctl/source/basicide/iderdll.cxx @@ -46,7 +46,6 @@ namespace basctl { -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -71,7 +70,7 @@ public: class DllInstance : public comphelper::scoped_disposing_solar_mutex_reset_ptr { public: - DllInstance() : comphelper::scoped_disposing_solar_mutex_reset_ptr(::com::sun::star::uno::Reference(comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop"))), ::com::sun::star::uno::UNO_QUERY_THROW), new Dll) + DllInstance() : comphelper::scoped_disposing_solar_mutex_reset_ptr(::com::sun::star::uno::Reference(comphelper::getProcessServiceFactory()->createInstance(OUString("com.sun.star.frame.Desktop")), ::com::sun::star::uno::UNO_QUERY_THROW), new Dll) { } }; @@ -137,7 +136,7 @@ Dll::Dll () : SfxModule* pMod = Module::Get(); SfxObjectFactory& rFactory = DocShell::Factory(); - rFactory.SetDocumentServiceName( rtl::OUString("com.sun.star.script.BasicIDE") ); + rFactory.SetDocumentServiceName( "com.sun.star.script.BasicIDE" ); DocShell::RegisterInterface( pMod ); Shell::RegisterFactory( SVX_INTERFACE_BASIDE_VIEWSH ); @@ -198,7 +197,7 @@ IMPL_LINK(ExtraData, GlobalBasicBreakHdl, StarBASIC *, pBasic ) OSL_ENSURE( aDocument.isValid(), "basctl::ExtraData::GlobalBasicBreakHdl: no document for the basic manager!" ); if ( aDocument.isValid() ) { - ::rtl::OUString aOULibName( pBasic->GetName() ); + OUString aOULibName( pBasic->GetName() ); Reference< script::XLibraryContainer > xModLibContainer( aDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY ); if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) ) { From 9c6c53db832c61d70e9364a5a47566fb445b1560 Mon Sep 17 00:00:00 2001 From: Ricardo Montania Date: Sun, 7 Oct 2012 16:44:11 -0300 Subject: [PATCH 603/863] ::rtl::OUString to OUString in basctl Change-Id: If6a53fd69f8a99bafc7fc324911132dd51e67266 --- basctl/source/basicide/linenumberwindow.cxx | 6 +- basctl/source/basicide/localizationmgr.cxx | 228 ++++++++++---------- 2 files changed, 117 insertions(+), 117 deletions(-) diff --git a/basctl/source/basicide/linenumberwindow.cxx b/basctl/source/basicide/linenumberwindow.cxx index 56445830d8ac..6e8107521403 100644 --- a/basctl/source/basicide/linenumberwindow.cxx +++ b/basctl/source/basicide/linenumberwindow.cxx @@ -41,7 +41,7 @@ LineNumberWindow::LineNumberWindow (Window* pParent, ModulWindow* pModulWindow) m_nCurYOffset(0) { SetBackground(Wallpaper(GetSettings().GetStyleSettings().GetFieldColor())); - m_nBaseWidth = GetTextWidth(rtl::OUString('8')); + m_nBaseWidth = GetTextWidth('8'); m_nWidth = m_nBaseWidth * 3 + m_nBaseWidth / 2; } @@ -75,7 +75,7 @@ void LineNumberWindow::Paint( const Rectangle& ) // FIXME: it would be best if we could get notified of a font change // rather than doing that re-calculation at each Paint event - m_nBaseWidth = GetTextWidth(rtl::OUString('8')); + m_nBaseWidth = GetTextWidth(OUString('8')); // reserve enough for 3 sigit minimum, with a bit to spare for confort m_nWidth = m_nBaseWidth * 3 + m_nBaseWidth / 2; @@ -88,7 +88,7 @@ void LineNumberWindow::Paint( const Rectangle& ) sal_Int64 y = (nStartLine - 1) * nLineHeight; for(sal_Int32 n = nStartLine; n <= nEndLine; ++n, y += nLineHeight) - DrawText(Point(0, y - m_nCurYOffset), rtl::OUString::valueOf(n)); + DrawText(Point(0, y - m_nCurYOffset), OUString::valueOf(n)); } void LineNumberWindow::DataChanged(DataChangedEvent const & rDCEvt) diff --git a/basctl/source/basicide/localizationmgr.cxx b/basctl/source/basicide/localizationmgr.cxx index 62004ad27859..996767f34e2b 100644 --- a/basctl/source/basicide/localizationmgr.cxx +++ b/basctl/source/basicide/localizationmgr.cxx @@ -41,16 +41,16 @@ using namespace ::com::sun::star::resource; namespace { -rtl::OUString const aDot("."); -rtl::OUString const aEsc("&"); -rtl::OUString const aSemi(";"); +OUString const aDot("."); +OUString const aEsc("&"); +OUString const aSemi(";"); } // namespace LocalizationMgr::LocalizationMgr( Shell* pShell, ScriptDocument const& rDocument, - rtl::OUString const& aLibName, + OUString const& aLibName, Reference const& xStringResourceManager ) : m_xStringResourceManager(xStringResourceManager), @@ -68,8 +68,8 @@ bool LocalizationMgr::isLibraryLocalized () void LocalizationMgr::handleTranslationbar () { - static rtl::OUString const aLayoutManagerName("LayoutManager"); - static rtl::OUString const aToolBarResName("private:resource/toolbar/translationbar"); + static OUString const aLayoutManagerName("LayoutManager"); + static OUString const aToolBarResName("private:resource/toolbar/translationbar"); Reference< beans::XPropertySet > xFrameProps ( m_pShell->GetViewFrame()->GetFrame().GetFrameInterface(), uno::UNO_QUERY ); @@ -102,7 +102,7 @@ namespace } -bool isLanguageDependentProperty( ::rtl::OUString aName ) +bool isLanguageDependentProperty( OUString aName ) { static struct Prop { @@ -129,9 +129,9 @@ bool isLanguageDependentProperty( ::rtl::OUString aName ) void LocalizationMgr::implEnableDisableResourceForAllLibraryDialogs( HandleResourceMode eMode ) { - Sequence< ::rtl::OUString > aDlgNames = m_aDocument.getObjectNames( E_DIALOGS, m_aLibName ); + Sequence< OUString > aDlgNames = m_aDocument.getObjectNames( E_DIALOGS, m_aLibName ); sal_Int32 nDlgCount = aDlgNames.getLength(); - const ::rtl::OUString* pDlgNames = aDlgNames.getConstArray(); + const OUString* pDlgNames = aDlgNames.getConstArray(); Reference< XStringResourceResolver > xDummyStringResolver; for( sal_Int32 i = 0 ; i < nDlgCount ; i++ ) @@ -146,15 +146,15 @@ void LocalizationMgr::implEnableDisableResourceForAllLibraryDialogs( HandleResou Any aDialogCtrl; aDialogCtrl <<= xDialog; implHandleControlResourceProperties( aDialogCtrl, aDlgName, - ::rtl::OUString(), m_xStringResourceManager, xDummyStringResolver, eMode ); + OUString(), m_xStringResourceManager, xDummyStringResolver, eMode ); // Handle all controls - Sequence< ::rtl::OUString > aNames = xDialog->getElementNames(); - const ::rtl::OUString* pNames = aNames.getConstArray(); + Sequence< OUString > aNames = xDialog->getElementNames(); + const OUString* pNames = aNames.getConstArray(); sal_Int32 nCtrls = aNames.getLength(); for( sal_Int32 j = 0 ; j < nCtrls ; ++j ) { - ::rtl::OUString aCtrlName( pNames[j] ); + OUString aCtrlName( pNames[j] ); Any aCtrl = xDialog->getByName( aCtrlName ); implHandleControlResourceProperties( aCtrl, aDlgName, aCtrlName, m_xStringResourceManager, xDummyStringResolver, eMode ); @@ -165,13 +165,13 @@ void LocalizationMgr::implEnableDisableResourceForAllLibraryDialogs( HandleResou } -::rtl::OUString implCreatePureResourceId - ( const ::rtl::OUString& aDialogName, const ::rtl::OUString& aCtrlName, - const ::rtl::OUString& aPropName, +OUString implCreatePureResourceId + ( const OUString& aDialogName, const OUString& aCtrlName, + const OUString& aPropName, Reference< XStringResourceManager > xStringResourceManager ) { sal_Int32 nUniqueId = xStringResourceManager->getUniqueNumericId(); - ::rtl::OUString aPureIdStr = ::rtl::OUString::valueOf( nUniqueId ); + OUString aPureIdStr = OUString::valueOf( nUniqueId ); aPureIdStr += aDot; aPureIdStr += aDialogName; aPureIdStr += aDot; @@ -191,7 +191,7 @@ extern bool localesAreEqual( const ::com::sun::star::lang::Locale& rLocaleLeft, // anyway only one language should exist when calling this method then, // either the first one for mode SET_IDS or the last one for mode RESET_IDS sal_Int32 LocalizationMgr::implHandleControlResourceProperties - ( Any aControlAny, const ::rtl::OUString& aDialogName, const ::rtl::OUString& aCtrlName, + ( Any aControlAny, const OUString& aDialogName, const OUString& aCtrlName, Reference< XStringResourceManager > xStringResourceManager, Reference< XStringResourceResolver > xSourceStringResolver, HandleResourceMode eMode ) { @@ -218,7 +218,7 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties for( sal_Int32 j = 0 ; j < nCtrlProps ; ++j ) { const Property& rProp = pProps[j]; - ::rtl::OUString aPropName = rProp.Name; + OUString aPropName = rProp.Name; TypeClass eType = rProp.Type.getTypeClass(); bool bLanguageDependentProperty = (eType == TypeClass_STRING || eType == TypeClass_SEQUENCE) @@ -229,7 +229,7 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties if( eType == TypeClass_STRING ) { Any aPropAny = xPropertySet->getPropertyValue( aPropName ); - ::rtl::OUString aPropStr; + OUString aPropStr; aPropAny >>= aPropStr; // Replace string by id, add id+string to StringResource @@ -239,7 +239,7 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties if( bEscAlreadyExisting ) continue; - ::rtl::OUString aPureIdStr = implCreatePureResourceId + OUString aPureIdStr = implCreatePureResourceId ( aDialogName, aCtrlName, aPropName, xStringResourceManager ); // Set Id for all locales @@ -250,7 +250,7 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties xStringResourceManager->setStringForLocale( aPureIdStr, aPropStr, rLocale ); } - ::rtl::OUString aPropIdStr = aEsc; + OUString aPropIdStr = aEsc; aPropIdStr += aPureIdStr; // TODO?: Change here and in toolkit (void)aSemi; @@ -262,8 +262,8 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties { if( aPropStr.getLength() > 1 ) { - ::rtl::OUString aPureIdStr = aPropStr.copy( 1 ); - ::rtl::OUString aNewPropStr = aPropStr; + OUString aPureIdStr = aPropStr.copy( 1 ); + OUString aNewPropStr = aPropStr; try { aNewPropStr = xStringResourceManager->resolveString( aPureIdStr ); @@ -280,7 +280,7 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties { if( aPropStr.getLength() > 1 ) { - ::rtl::OUString aPureIdStr = aPropStr.copy( 1 ); + OUString aPureIdStr = aPropStr.copy( 1 ); const Locale* pLocales = aLocaleSeq.getConstArray(); for( sal_Int32 i = 0 ; i < nLocaleCount ; i++ ) @@ -299,10 +299,10 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties // Rename resource id else if( eMode == RENAME_DIALOG_IDS || eMode == RENAME_CONTROL_IDS ) { - ::rtl::OUString aSourceIdStr = aPropStr; - ::rtl::OUString aPureSourceIdStr = aSourceIdStr.copy( 1 ); + OUString aSourceIdStr = aPropStr; + OUString aPureSourceIdStr = aSourceIdStr.copy( 1 ); - ::rtl::OUString aPureIdStr = implCreatePureResourceId + OUString aPureIdStr = implCreatePureResourceId ( aDialogName, aCtrlName, aPropName, xStringResourceManager ); // Set new Id and remove old one for all locales @@ -310,7 +310,7 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties for( sal_Int32 i = 0 ; i < nLocaleCount ; i++ ) { const Locale& rLocale = pLocales[ i ]; - ::rtl::OUString aResStr; + OUString aResStr; try { aResStr = xStringResourceManager->resolveStringForLocale @@ -322,7 +322,7 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties {} } - ::rtl::OUString aPropIdStr = aEsc; + OUString aPropIdStr = aEsc; aPropIdStr += aPureIdStr; // TODO?: Change here and in toolkit (void)aSemi; @@ -332,10 +332,10 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties // Replace string by string from source StringResourceResolver else if( eMode == MOVE_RESOURCES && xSourceStringResolver.is() ) { - ::rtl::OUString aSourceIdStr = aPropStr; - ::rtl::OUString aPureSourceIdStr = aSourceIdStr.copy( 1 ); + OUString aSourceIdStr = aPropStr; + OUString aPureSourceIdStr = aSourceIdStr.copy( 1 ); - ::rtl::OUString aPureIdStr = implCreatePureResourceId + OUString aPureIdStr = implCreatePureResourceId ( aDialogName, aCtrlName, aPropName, xStringResourceManager ); const Locale& rDefaultLocale = xSourceStringResolver->getDefaultLocale(); @@ -345,7 +345,7 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties for( sal_Int32 i = 0 ; i < nLocaleCount ; i++ ) { const Locale& rLocale = pLocales[ i ]; - ::rtl::OUString aResStr; + OUString aResStr; try { aResStr = xSourceStringResolver->resolveStringForLocale @@ -359,7 +359,7 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties xStringResourceManager->setStringForLocale( aPureIdStr, aResStr, rLocale ); } - ::rtl::OUString aPropIdStr = aEsc; + OUString aPropIdStr = aEsc; aPropIdStr += aPureIdStr; // TODO?: Change here and in toolkit (void)aSemi; @@ -369,8 +369,8 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties // Copy string from source to target resource else if( eMode == COPY_RESOURCES && xSourceStringResolver.is() ) { - ::rtl::OUString aSourceIdStr = aPropStr; - ::rtl::OUString aPureSourceIdStr = aSourceIdStr.copy( 1 ); + OUString aSourceIdStr = aPropStr; + OUString aPureSourceIdStr = aSourceIdStr.copy( 1 ); const Locale& rDefaultLocale = xSourceStringResolver->getDefaultLocale(); @@ -379,7 +379,7 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties for( sal_Int32 i = 0 ; i < nLocaleCount ; i++ ) { const Locale& rLocale = pLocales[ i ]; - ::rtl::OUString aResStr; + OUString aResStr; try { aResStr = xSourceStringResolver->resolveStringForLocale @@ -400,10 +400,10 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties else if( eType == TypeClass_SEQUENCE ) { Any aPropAny = xPropertySet->getPropertyValue( aPropName ); - Sequence< ::rtl::OUString > aPropStrings; + Sequence< OUString > aPropStrings; aPropAny >>= aPropStrings; - const ::rtl::OUString* pPropStrings = aPropStrings.getConstArray(); + const OUString* pPropStrings = aPropStrings.getConstArray(); sal_Int32 nPropStringCount = aPropStrings.getLength(); if( nPropStringCount == 0 ) continue; @@ -411,11 +411,11 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties // Replace string by id, add id+string to StringResource if( eMode == SET_IDS ) { - Sequence< ::rtl::OUString > aIdStrings; + Sequence< OUString > aIdStrings; aIdStrings.realloc( nPropStringCount ); - ::rtl::OUString* pIdStrings = aIdStrings.getArray(); + OUString* pIdStrings = aIdStrings.getArray(); - ::rtl::OUString aIdStrBase = aDot; + OUString aIdStrBase = aDot; aIdStrBase += aCtrlName; aIdStrBase += aDot; aIdStrBase += aPropName; @@ -424,7 +424,7 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties sal_Int32 i; for ( i = 0; i < nPropStringCount; ++i ) { - ::rtl::OUString aPropStr = pPropStrings[i]; + OUString aPropStr = pPropStrings[i]; bool bEscAlreadyExisting = (!aPropStr.isEmpty() && aPropStr.getStr()[0] == '&' ); if( bEscAlreadyExisting ) { @@ -433,7 +433,7 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties } sal_Int32 nUniqueId = xStringResourceManager->getUniqueNumericId(); - ::rtl::OUString aPureIdStr = ::rtl::OUString::valueOf( nUniqueId ); + OUString aPureIdStr = OUString::valueOf( nUniqueId ); aPureIdStr += aIdStrBase; // Set Id for all locales @@ -443,7 +443,7 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties xStringResourceManager->setStringForLocale( aPureIdStr, aPropStr, rLocale ); } - ::rtl::OUString aPropIdStr = aEsc; + OUString aPropIdStr = aEsc; aPropIdStr += aPureIdStr; pIdStrings[i] = aPropIdStr; } @@ -453,18 +453,18 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties // Replace id by string from StringResource else if( eMode == RESET_IDS ) { - Sequence< ::rtl::OUString > aNewPropStrings; + Sequence< OUString > aNewPropStrings; aNewPropStrings.realloc( nPropStringCount ); - ::rtl::OUString* pNewPropStrings = aNewPropStrings.getArray(); + OUString* pNewPropStrings = aNewPropStrings.getArray(); sal_Int32 i; for ( i = 0; i < nPropStringCount; ++i ) { - ::rtl::OUString aIdStr = pPropStrings[i]; - ::rtl::OUString aNewPropStr = aIdStr; + OUString aIdStr = pPropStrings[i]; + OUString aNewPropStr = aIdStr; if( aIdStr.getLength() > 1 ) { - ::rtl::OUString aPureIdStr = aIdStr.copy( 1 ); + OUString aPureIdStr = aIdStr.copy( 1 ); try { aNewPropStr = xStringResourceManager->resolveString( aPureIdStr ); @@ -481,17 +481,17 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties // Remove Id for all locales else if( eMode == REMOVE_IDS_FROM_RESOURCE ) { - Sequence< ::rtl::OUString > aNewPropStrings; + Sequence< OUString > aNewPropStrings; aNewPropStrings.realloc( nPropStringCount ); const Locale* pLocales = aLocaleSeq.getConstArray(); sal_Int32 i; for ( i = 0; i < nPropStringCount; ++i ) { - ::rtl::OUString aIdStr = pPropStrings[i]; + OUString aIdStr = pPropStrings[i]; if( aIdStr.getLength() > 1 ) { - ::rtl::OUString aPureIdStr = aIdStr.copy( 1 ); + OUString aPureIdStr = aIdStr.copy( 1 ); for( sal_Int32 iLocale = 0 ; iLocale < nLocaleCount ; iLocale++ ) { @@ -510,11 +510,11 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties // Rename resource id else if( eMode == RENAME_CONTROL_IDS ) { - Sequence< ::rtl::OUString > aIdStrings; + Sequence< OUString > aIdStrings; aIdStrings.realloc( nPropStringCount ); - ::rtl::OUString* pIdStrings = aIdStrings.getArray(); + OUString* pIdStrings = aIdStrings.getArray(); - ::rtl::OUString aIdStrBase = aDot; + OUString aIdStrBase = aDot; aIdStrBase += aCtrlName; aIdStrBase += aDot; aIdStrBase += aPropName; @@ -523,11 +523,11 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties sal_Int32 i; for ( i = 0; i < nPropStringCount; ++i ) { - ::rtl::OUString aSourceIdStr = pPropStrings[i]; - ::rtl::OUString aPureSourceIdStr = aSourceIdStr.copy( 1 ); + OUString aSourceIdStr = pPropStrings[i]; + OUString aPureSourceIdStr = aSourceIdStr.copy( 1 ); sal_Int32 nUniqueId = xStringResourceManager->getUniqueNumericId(); - ::rtl::OUString aPureIdStr = ::rtl::OUString::valueOf( nUniqueId ); + OUString aPureIdStr = OUString::valueOf( nUniqueId ); aPureIdStr += aIdStrBase; // Set Id for all locales @@ -535,7 +535,7 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties { const Locale& rLocale = pLocales[ iLocale ]; - ::rtl::OUString aResStr; + OUString aResStr; try { aResStr = xStringResourceManager->resolveStringForLocale @@ -547,7 +547,7 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties {} } - ::rtl::OUString aPropIdStr = aEsc; + OUString aPropIdStr = aEsc; aPropIdStr += aPureIdStr; pIdStrings[i] = aPropIdStr; } @@ -557,11 +557,11 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties // Replace string by string from source StringResourceResolver else if( eMode == MOVE_RESOURCES && xSourceStringResolver.is() ) { - Sequence< ::rtl::OUString > aIdStrings; + Sequence< OUString > aIdStrings; aIdStrings.realloc( nPropStringCount ); - ::rtl::OUString* pIdStrings = aIdStrings.getArray(); + OUString* pIdStrings = aIdStrings.getArray(); - ::rtl::OUString aIdStrBase = aDot; + OUString aIdStrBase = aDot; aIdStrBase += aCtrlName; aIdStrBase += aDot; aIdStrBase += aPropName; @@ -572,11 +572,11 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties sal_Int32 i; for ( i = 0; i < nPropStringCount; ++i ) { - ::rtl::OUString aSourceIdStr = pPropStrings[i]; - ::rtl::OUString aPureSourceIdStr = aSourceIdStr.copy( 1 ); + OUString aSourceIdStr = pPropStrings[i]; + OUString aPureSourceIdStr = aSourceIdStr.copy( 1 ); sal_Int32 nUniqueId = xStringResourceManager->getUniqueNumericId(); - ::rtl::OUString aPureIdStr = ::rtl::OUString::valueOf( nUniqueId ); + OUString aPureIdStr = OUString::valueOf( nUniqueId ); aPureIdStr += aIdStrBase; // Set Id for all locales @@ -584,7 +584,7 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties { const Locale& rLocale = pLocales[ iLocale ]; - ::rtl::OUString aResStr; + OUString aResStr; try { aResStr = xSourceStringResolver->resolveStringForLocale @@ -598,7 +598,7 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties xStringResourceManager->setStringForLocale( aPureIdStr, aResStr, rLocale ); } - ::rtl::OUString aPropIdStr = aEsc; + OUString aPropIdStr = aEsc; aPropIdStr += aPureIdStr; pIdStrings[i] = aPropIdStr; } @@ -614,15 +614,15 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties sal_Int32 i; for ( i = 0; i < nPropStringCount; ++i ) { - ::rtl::OUString aSourceIdStr = pPropStrings[i]; - ::rtl::OUString aPureSourceIdStr = aSourceIdStr.copy( 1 ); + OUString aSourceIdStr = pPropStrings[i]; + OUString aPureSourceIdStr = aSourceIdStr.copy( 1 ); // Set Id for all locales for( sal_Int32 iLocale = 0 ; iLocale < nLocaleCount ; iLocale++ ) { const Locale& rLocale = pLocales[ iLocale ]; - ::rtl::OUString aResStr; + OUString aResStr; try { aResStr = xSourceStringResolver->resolveStringForLocale @@ -818,7 +818,7 @@ DialogWindow* FindDialogWindowForEditor( DlgEditor* pEditor ) void LocalizationMgr::setControlResourceIDsForNewEditorObject( DlgEditor* pEditor, - Any aControlAny, const ::rtl::OUString& aCtrlName ) + Any aControlAny, const OUString& aCtrlName ) { // Get library for DlgEditor DialogWindow* pDlgWin = FindDialogWindowForEditor( pEditor ); @@ -837,7 +837,7 @@ void LocalizationMgr::setControlResourceIDsForNewEditorObject( DlgEditor* pEdito if( !xStringResourceManager.is() || xStringResourceManager->getLocales().getLength() == 0 ) return; - ::rtl::OUString aDialogName = pDlgWin->GetName(); + OUString aDialogName = pDlgWin->GetName(); Reference< XStringResourceResolver > xDummyStringResolver; sal_Int32 nChangedCount = implHandleControlResourceProperties ( aControlAny, aDialogName, aCtrlName, xStringResourceManager, @@ -848,7 +848,7 @@ void LocalizationMgr::setControlResourceIDsForNewEditorObject( DlgEditor* pEdito } void LocalizationMgr::renameControlResourceIDsForEditorObject( DlgEditor* pEditor, - ::com::sun::star::uno::Any aControlAny, const ::rtl::OUString& aNewCtrlName ) + ::com::sun::star::uno::Any aControlAny, const OUString& aNewCtrlName ) { // Get library for DlgEditor DialogWindow* pDlgWin = FindDialogWindowForEditor( pEditor ); @@ -867,7 +867,7 @@ void LocalizationMgr::renameControlResourceIDsForEditorObject( DlgEditor* pEdito if( !xStringResourceManager.is() || xStringResourceManager->getLocales().getLength() == 0 ) return; - ::rtl::OUString aDialogName = pDlgWin->GetName(); + OUString aDialogName = pDlgWin->GetName(); Reference< XStringResourceResolver > xDummyStringResolver; implHandleControlResourceProperties ( aControlAny, aDialogName, aNewCtrlName, xStringResourceManager, @@ -876,7 +876,7 @@ void LocalizationMgr::renameControlResourceIDsForEditorObject( DlgEditor* pEdito void LocalizationMgr::deleteControlResourceIDsForDeletedEditorObject( DlgEditor* pEditor, - Any aControlAny, const ::rtl::OUString& aCtrlName ) + Any aControlAny, const OUString& aCtrlName ) { // Get library for DlgEditor DialogWindow* pDlgWin = FindDialogWindowForEditor( pEditor ); @@ -891,7 +891,7 @@ void LocalizationMgr::deleteControlResourceIDsForDeletedEditorObject( DlgEditor* Reference< XStringResourceManager > xStringResourceManager = LocalizationMgr::getStringResourceFromDialogLibrary( xDialogLib ); - ::rtl::OUString aDialogName = pDlgWin->GetName(); + OUString aDialogName = pDlgWin->GetName(); Reference< XStringResourceResolver > xDummyStringResolver; sal_Int32 nChangedCount = implHandleControlResourceProperties ( aControlAny, aDialogName, aCtrlName, xStringResourceManager, @@ -901,10 +901,10 @@ void LocalizationMgr::deleteControlResourceIDsForDeletedEditorObject( DlgEditor* MarkDocumentModified( aDocument ); } -void LocalizationMgr::setStringResourceAtDialog( const ScriptDocument& rDocument, const ::rtl::OUString& aLibName, - const ::rtl::OUString& aDlgName, Reference< container::XNameContainer > xDialogModel ) +void LocalizationMgr::setStringResourceAtDialog( const ScriptDocument& rDocument, const OUString& aLibName, + const OUString& aDlgName, Reference< container::XNameContainer > xDialogModel ) { - static ::rtl::OUString aResourceResolverPropName( RTL_CONSTASCII_USTRINGPARAM( "ResourceResolver" )); + static OUString aResourceResolverPropName( "ResourceResolver" ); // Get library Reference< container::XNameContainer > xDialogLib( rDocument.getLibrary( E_DIALOGS, aLibName, true ) ); @@ -922,7 +922,7 @@ void LocalizationMgr::setStringResourceAtDialog( const ScriptDocument& rDocument aDialogCtrl <<= xDialogModel; Reference< XStringResourceResolver > xDummyStringResolver; implHandleControlResourceProperties( aDialogCtrl, aDlgName, - ::rtl::OUString(), xStringResourceManager, + OUString(), xStringResourceManager, xDummyStringResolver, SET_IDS ); } @@ -933,8 +933,8 @@ void LocalizationMgr::setStringResourceAtDialog( const ScriptDocument& rDocument } } -void LocalizationMgr::renameStringResourceIDs( const ScriptDocument& rDocument, const ::rtl::OUString& aLibName, - const ::rtl::OUString& aDlgName, Reference< container::XNameContainer > xDialogModel ) +void LocalizationMgr::renameStringResourceIDs( const ScriptDocument& rDocument, const OUString& aLibName, + const OUString& aDlgName, Reference< container::XNameContainer > xDialogModel ) { // Get library Reference< container::XNameContainer > xDialogLib( rDocument.getLibrary( E_DIALOGS, aLibName, true ) ); @@ -947,16 +947,16 @@ void LocalizationMgr::renameStringResourceIDs( const ScriptDocument& rDocument, aDialogCtrl <<= xDialogModel; Reference< XStringResourceResolver > xDummyStringResolver; implHandleControlResourceProperties( aDialogCtrl, aDlgName, - ::rtl::OUString(), xStringResourceManager, + OUString(), xStringResourceManager, xDummyStringResolver, RENAME_DIALOG_IDS ); // Handle all controls - Sequence< ::rtl::OUString > aNames = xDialogModel->getElementNames(); - const ::rtl::OUString* pNames = aNames.getConstArray(); + Sequence< OUString > aNames = xDialogModel->getElementNames(); + const OUString* pNames = aNames.getConstArray(); sal_Int32 nCtrls = aNames.getLength(); for( sal_Int32 i = 0 ; i < nCtrls ; ++i ) { - ::rtl::OUString aCtrlName( pNames[i] ); + OUString aCtrlName( pNames[i] ); Any aCtrl = xDialogModel->getByName( aCtrlName ); implHandleControlResourceProperties( aCtrl, aDlgName, aCtrlName, xStringResourceManager, @@ -964,8 +964,8 @@ void LocalizationMgr::renameStringResourceIDs( const ScriptDocument& rDocument, } } -void LocalizationMgr::removeResourceForDialog( const ScriptDocument& rDocument, const ::rtl::OUString& aLibName, - const ::rtl::OUString& aDlgName, Reference< container::XNameContainer > xDialogModel ) +void LocalizationMgr::removeResourceForDialog( const ScriptDocument& rDocument, const OUString& aLibName, + const OUString& aDlgName, Reference< container::XNameContainer > xDialogModel ) { // Get library Reference< container::XNameContainer > xDialogLib( rDocument.getLibrary( E_DIALOGS, aLibName, true ) ); @@ -978,16 +978,16 @@ void LocalizationMgr::removeResourceForDialog( const ScriptDocument& rDocument, aDialogCtrl <<= xDialogModel; Reference< XStringResourceResolver > xDummyStringResolver; implHandleControlResourceProperties( aDialogCtrl, aDlgName, - ::rtl::OUString(), xStringResourceManager, + OUString(), xStringResourceManager, xDummyStringResolver, REMOVE_IDS_FROM_RESOURCE ); // Handle all controls - Sequence< ::rtl::OUString > aNames = xDialogModel->getElementNames(); - const ::rtl::OUString* pNames = aNames.getConstArray(); + Sequence< OUString > aNames = xDialogModel->getElementNames(); + const OUString* pNames = aNames.getConstArray(); sal_Int32 nCtrls = aNames.getLength(); for( sal_Int32 i = 0 ; i < nCtrls ; ++i ) { - ::rtl::OUString aCtrlName( pNames[i] ); + OUString aCtrlName( pNames[i] ); Any aCtrl = xDialogModel->getByName( aCtrlName ); implHandleControlResourceProperties( aCtrl, aDlgName, aCtrlName, xStringResourceManager, @@ -1002,7 +1002,7 @@ void LocalizationMgr::resetResourceForDialog( Reference< container::XNameContain return; // Dialog as control - ::rtl::OUString aDummyName; + OUString aDummyName; Any aDialogCtrl; aDialogCtrl <<= xDialogModel; Reference< XStringResourceResolver > xDummyStringResolver; @@ -1010,12 +1010,12 @@ void LocalizationMgr::resetResourceForDialog( Reference< container::XNameContain aDummyName, xStringResourceManager, xDummyStringResolver, RESET_IDS ); // Handle all controls - Sequence< ::rtl::OUString > aNames = xDialogModel->getElementNames(); - const ::rtl::OUString* pNames = aNames.getConstArray(); + Sequence< OUString > aNames = xDialogModel->getElementNames(); + const OUString* pNames = aNames.getConstArray(); sal_Int32 nCtrls = aNames.getLength(); for( sal_Int32 i = 0 ; i < nCtrls ; ++i ) { - ::rtl::OUString aCtrlName( pNames[i] ); + OUString aCtrlName( pNames[i] ); Any aCtrl = xDialogModel->getByName( aCtrlName ); implHandleControlResourceProperties( aCtrl, aDummyName, aCtrlName, xStringResourceManager, xDummyStringResolver, RESET_IDS ); @@ -1029,7 +1029,7 @@ void LocalizationMgr::setResourceIDsForDialog( Reference< container::XNameContai return; // Dialog as control - ::rtl::OUString aDummyName; + OUString aDummyName; Any aDialogCtrl; aDialogCtrl <<= xDialogModel; Reference< XStringResourceResolver > xDummyStringResolver; @@ -1037,12 +1037,12 @@ void LocalizationMgr::setResourceIDsForDialog( Reference< container::XNameContai aDummyName, xStringResourceManager, xDummyStringResolver, SET_IDS ); // Handle all controls - Sequence< ::rtl::OUString > aNames = xDialogModel->getElementNames(); - const ::rtl::OUString* pNames = aNames.getConstArray(); + Sequence< OUString > aNames = xDialogModel->getElementNames(); + const OUString* pNames = aNames.getConstArray(); sal_Int32 nCtrls = aNames.getLength(); for( sal_Int32 i = 0 ; i < nCtrls ; ++i ) { - ::rtl::OUString aCtrlName( pNames[i] ); + OUString aCtrlName( pNames[i] ); Any aCtrl = xDialogModel->getByName( aCtrlName ); implHandleControlResourceProperties( aCtrl, aDummyName, aCtrlName, xStringResourceManager, xDummyStringResolver, SET_IDS ); @@ -1050,7 +1050,7 @@ void LocalizationMgr::setResourceIDsForDialog( Reference< container::XNameContai } void LocalizationMgr::copyResourcesForPastedEditorObject( DlgEditor* pEditor, - Any aControlAny, const ::rtl::OUString& aCtrlName, + Any aControlAny, const OUString& aCtrlName, Reference< XStringResourceResolver > xSourceStringResolver ) { // Get library for DlgEditor @@ -1070,33 +1070,33 @@ void LocalizationMgr::copyResourcesForPastedEditorObject( DlgEditor* pEditor, if( !xStringResourceManager.is() || xStringResourceManager->getLocales().getLength() == 0 ) return; - ::rtl::OUString aDialogName = pDlgWin->GetName(); + OUString aDialogName = pDlgWin->GetName(); implHandleControlResourceProperties ( aControlAny, aDialogName, aCtrlName, xStringResourceManager, xSourceStringResolver, MOVE_RESOURCES ); } void LocalizationMgr::copyResourceForDroppedDialog( Reference< container::XNameContainer > xDialogModel, - const ::rtl::OUString& aDialogName, Reference< XStringResourceManager > xStringResourceManager, + const OUString& aDialogName, Reference< XStringResourceManager > xStringResourceManager, Reference< XStringResourceResolver > xSourceStringResolver ) { if( !xStringResourceManager.is() ) return; // Dialog as control - ::rtl::OUString aDummyName; + OUString aDummyName; Any aDialogCtrl; aDialogCtrl <<= xDialogModel; implHandleControlResourceProperties( aDialogCtrl, aDialogName, aDummyName, xStringResourceManager, xSourceStringResolver, MOVE_RESOURCES ); // Handle all controls - Sequence< ::rtl::OUString > aNames = xDialogModel->getElementNames(); - const ::rtl::OUString* pNames = aNames.getConstArray(); + Sequence< OUString > aNames = xDialogModel->getElementNames(); + const OUString* pNames = aNames.getConstArray(); sal_Int32 nCtrls = aNames.getLength(); for( sal_Int32 i = 0 ; i < nCtrls ; ++i ) { - ::rtl::OUString aCtrlName( pNames[i] ); + OUString aCtrlName( pNames[i] ); Any aCtrl = xDialogModel->getByName( aCtrlName ); implHandleControlResourceProperties( aCtrl, aDialogName, aCtrlName, xStringResourceManager, xSourceStringResolver, MOVE_RESOURCES ); @@ -1111,7 +1111,7 @@ void LocalizationMgr::copyResourceForDialog( if( !xDialogModel.is() || !xSourceStringResolver.is() || !xTargetStringResourceManager.is() ) return; - ::rtl::OUString aDummyName; + OUString aDummyName; Any aDialogCtrl; aDialogCtrl <<= xDialogModel; implHandleControlResourceProperties @@ -1119,12 +1119,12 @@ void LocalizationMgr::copyResourceForDialog( xSourceStringResolver, COPY_RESOURCES ); // Handle all controls - Sequence< ::rtl::OUString > aNames = xDialogModel->getElementNames(); - const ::rtl::OUString* pNames = aNames.getConstArray(); + Sequence< OUString > aNames = xDialogModel->getElementNames(); + const OUString* pNames = aNames.getConstArray(); sal_Int32 nCtrls = aNames.getLength(); for( sal_Int32 i = 0 ; i < nCtrls ; ++i ) { - ::rtl::OUString aCtrlName( pNames[i] ); + OUString aCtrlName( pNames[i] ); Any aCtrl = xDialogModel->getByName( aCtrlName ); implHandleControlResourceProperties( aCtrl, aDummyName, aDummyName, xTargetStringResourceManager, xSourceStringResolver, COPY_RESOURCES ); From 7b34748b1bfd8b5fe0406c1f6bdaaa585d7bc4c3 Mon Sep 17 00:00:00 2001 From: Ricardo Montania Date: Sun, 7 Oct 2012 17:31:09 -0300 Subject: [PATCH 604/863] Some OUString and RTL_CONST refactoring Change-Id: I27709f12ef6e3448ed457bd0e9f2056979ba0291 --- basctl/source/basicide/brkdlg.cxx | 4 +- basctl/source/basicide/macrodlg.cxx | 10 +- basctl/source/basicide/moduldl2.cxx | 172 ++++++++++++++-------------- 3 files changed, 92 insertions(+), 94 deletions(-) diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx index d8f2f5ebb070..9be73f16ef33 100644 --- a/basctl/source/basicide/brkdlg.cxx +++ b/basctl/source/basicide/brkdlg.cxx @@ -82,7 +82,7 @@ BreakPointDialog::BreakPointDialog( Window* pParent, BreakPointList& rBrkPntList for ( size_t i = 0, n = m_aModifiedBreakPointList.size(); i < n; ++i ) { BreakPoint* pBrk = m_aModifiedBreakPointList.at( i ); - String aEntryStr( "# " ); + OUString aEntryStr( "# " ); aEntryStr += String::CreateFromInt32( pBrk->nLine ); aComboBox.InsertEntry( aEntryStr, COMBOBOX_APPEND ); } @@ -200,7 +200,7 @@ IMPL_LINK( BreakPointDialog, ButtonHdl, Button *, pButton ) pBrk->bEnabled = aCheckBox.IsChecked(); pBrk->nStopAfter = (size_t) aNumericField.GetValue(); m_aModifiedBreakPointList.InsertSorted( pBrk ); - String aEntryStr( "# " ); + OUString aEntryStr( "# " ); aEntryStr += String::CreateFromInt32( pBrk->nLine ); aComboBox.InsertEntry( aEntryStr, COMBOBOX_APPEND ); if (SfxDispatcher* pDispatcher = GetDispatcher()) diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx index 4feb8ffefac5..9bc56e994098 100644 --- a/basctl/source/basicide/macrodlg.cxx +++ b/basctl/source/basicide/macrodlg.cxx @@ -303,7 +303,7 @@ void MacroChooser::DeleteMacro() SbModule* pModule = pMethod->GetModule(); DBG_ASSERT( pModule, "DeleteMacro: Kein Modul?!" ); - ::rtl::OUString aSource( pModule->GetSource32() ); + OUString aSource( pModule->GetSource32() ); sal_uInt16 nStart, nEnd; pMethod->GetLineRange( nStart, nEnd ); pModule->GetMethods()->Remove( pMethod ); @@ -335,11 +335,11 @@ SbMethod* MacroChooser::CreateMacro() String aLibName( aDesc.GetLibName() ); if ( !aLibName.Len() ) - aLibName = rtl::OUString("Standard"); + aLibName = "Standard" ; aDocument.getOrCreateLibrary( E_SCRIPTS, aLibName ); - ::rtl::OUString aOULibName( aLibName ); + OUString aOULibName( aLibName ); Reference< script::XLibraryContainer > xModLibContainer( aDocument.getLibraryContainer( E_SCRIPTS ) ); if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) && !xModLibContainer->isLibraryLoaded( aOULibName ) ) xModLibContainer->loadLibrary( aOULibName ); @@ -405,7 +405,7 @@ void MacroChooser::CheckButtons() if ( nDepth == 1 || nDepth == 2 ) { ScriptDocument aDocument( aDesc.GetDocument() ); - ::rtl::OUString aOULibName( aDesc.GetLibName() ); + OUString aOULibName( aDesc.GetLibName() ); Reference< script::XLibraryContainer2 > xModLibContainer( aDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY ); Reference< script::XLibraryContainer2 > xDlgLibContainer( aDocument.getLibraryContainer( E_DIALOGS ), UNO_QUERY ); if ( ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) && xModLibContainer->isLibraryReadOnly( aOULibName ) ) || @@ -504,7 +504,7 @@ IMPL_LINK( MacroChooser, BasicSelectHdl, SvTreeListBox *, pBox ) if ( pModule ) { String aStr = aMacrosInTxtBaseStr; - aStr += rtl::OUString(" "); + aStr += " " ; aStr += pModule->GetName(); aMacrosInTxt.SetText( aStr ); diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index 5de042e9262f..931e727c6f64 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -67,7 +67,6 @@ namespace basctl { -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -137,7 +136,7 @@ void LibLBoxString::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16, SvLBoxEn static_cast(pEntry->GetUserData())-> GetDocument() ); - rtl::OUString aLibName( + OUString aLibName( static_cast< SvLBoxString * >(pEntry->GetItem(1))->GetText()); Reference< script::XLibraryContainer2 > xModLibContainer( aDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY); @@ -287,7 +286,7 @@ sal_Bool CheckBox::EditingEntry( SvLBoxEntry* pEntry, Selection& ) DBG_ASSERT( pEntry, "Kein Eintrag?" ); // check, if Standard library - ::rtl::OUString aLibName = GetEntryText( pEntry, 0 ); + OUString aLibName = GetEntryText( pEntry, 0 ); if ( aLibName.equalsIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM( "Standard" ) ) ) { ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_CANNOTCHANGENAMESTDLIB) ).Execute(); @@ -312,7 +311,7 @@ sal_Bool CheckBox::EditingEntry( SvLBoxEntry* pEntry, Selection& ) Reference< script::XLibraryContainerPassword > xPasswd( xModLibContainer, UNO_QUERY ); if ( xPasswd.is() && xPasswd->isLibraryPasswordProtected( aLibName ) && !xPasswd->isLibraryPasswordVerified( aLibName ) ) { - ::rtl::OUString aPassword; + OUString aPassword; Reference< script::XLibraryContainer > xModLibContainer1( xModLibContainer, UNO_QUERY ); bOK = QueryPassword( xModLibContainer1, aLibName, aPassword ); } @@ -327,10 +326,10 @@ sal_Bool CheckBox::EditingEntry( SvLBoxEntry* pEntry, Selection& ) //---------------------------------------------------------------------------- -sal_Bool CheckBox::EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewName ) +sal_Bool CheckBox::EditedEntry( SvLBoxEntry* pEntry, const OUString& rNewName ) { bool bValid = rNewName.getLength() <= 30 && IsValidSbxName(rNewName); - rtl::OUString aOldName( GetEntryText( pEntry, 0 ) ); + OUString aOldName( GetEntryText( pEntry, 0 ) ); if ( bValid && ( aOldName != rNewName ) ) { try @@ -451,7 +450,7 @@ GotoLineDialog::GotoLineDialog(Window * pParent ) sal_Int32 GotoLineDialog::GetLineNumber() { - return rtl::OUString( aEdit.GetText() ).toInt32(); + return OUString( aEdit.GetText() ).toInt32(); } IMPL_LINK_NOARG(GotoLineDialog, OkButtonHandler) @@ -561,7 +560,7 @@ void LibPage::CheckButtons() SvLBoxEntry* pCur = aLibBox.GetCurEntry(); if ( pCur ) { - ::rtl::OUString aLibName = aLibBox.GetEntryText( pCur, 0 ); + OUString aLibName = aLibBox.GetEntryText( pCur, 0 ); Reference< script::XLibraryContainer2 > xModLibContainer( m_aCurDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY ); Reference< script::XLibraryContainer2 > xDlgLibContainer( m_aCurDocument.getLibraryContainer( E_DIALOGS ), UNO_QUERY ); @@ -682,7 +681,7 @@ IMPL_LINK( LibPage, ButtonHdl, Button *, pButton ) else if ( pButton == &aPasswordButton ) { SvLBoxEntry* pCurEntry = aLibBox.GetCurEntry(); - ::rtl::OUString aLibName( aLibBox.GetEntryText( pCurEntry, 0 ) ); + OUString aLibName( aLibBox.GetEntryText( pCurEntry, 0 ) ); // load module library (if not loaded) Reference< script::XLibraryContainer > xModLibContainer = m_aCurDocument.getLibraryContainer( E_SCRIPTS ); @@ -749,15 +748,15 @@ IMPL_LINK_INLINE_START( LibPage, CheckPasswordHdl, SvxPasswordDialog *, pDlg ) long nRet = 0; SvLBoxEntry* pCurEntry = aLibBox.GetCurEntry(); - ::rtl::OUString aLibName( aLibBox.GetEntryText( pCurEntry, 0 ) ); + OUString aLibName( aLibBox.GetEntryText( pCurEntry, 0 ) ); Reference< script::XLibraryContainerPassword > xPasswd( m_aCurDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY ); if ( xPasswd.is() ) { try { - ::rtl::OUString aOldPassword( pDlg->GetOldPassword() ); - ::rtl::OUString aNewPassword( pDlg->GetNewPassword() ); + OUString aOldPassword( pDlg->GetOldPassword() ); + OUString aNewPassword( pDlg->GetNewPassword() ); xPasswd->changeLibraryPassword( aLibName, aOldPassword, aNewPassword ); nRet = 1; } @@ -789,30 +788,30 @@ void LibPage::InsertLib() Sequence aServiceType(1); aServiceType[0] <<= TemplateDescription::FILEOPEN_SIMPLE; xFP = Reference< XFilePicker >( xMSF->createInstanceWithArguments( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ) ), aServiceType ), UNO_QUERY ); + "com.sun.star.ui.dialogs.FilePicker", aServiceType ), UNO_QUERY ); } xFP->setTitle( String( IDEResId( RID_STR_APPENDLIBS ) ) ); // filter - ::rtl::OUString aTitle = String( IDEResId( RID_STR_BASIC ) ); - ::rtl::OUString aFilter; - aFilter = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*.sbl;*.xlc;*.xlb" ) ); // library files - aFilter += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";*.sdw;*.sxw;*.odt" ) ); // text - aFilter += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";*.vor;*.stw;*.ott" ) ); // text template - aFilter += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";*.sgl;*.sxg;*.odm" ) ); // master document - aFilter += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";*.oth" ) ); // html document template - aFilter += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";*.sdc;*.sxc;*.ods" ) ); // spreadsheet - aFilter += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";*.stc;*.ots" ) ); // spreadsheet template - aFilter += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";*.sda;*.sxd;*.odg" ) ); // drawing - aFilter += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";*.std;*.otg" ) ); // drawing template - aFilter += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";*.sdd;*.sxi;*.odp" ) ); // presentation - aFilter += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";*.sti;*.otp" ) ); // presentation template - aFilter += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";*.sxm;*.odf" ) ); // formula + OUString aTitle = String( IDEResId( RID_STR_BASIC ) ); + OUString aFilter; + aFilter = "*.sbl;*.xlc;*.xlb" ; // library files + aFilter += ";*.sdw;*.sxw;*.odt" ; // text + aFilter += ";*.vor;*.stw;*.ott" ; // text template + aFilter += ";*.sgl;*.sxg;*.odm" ; // master document + aFilter += ";*.oth" ; // html document template + aFilter += ";*.sdc;*.sxc;*.ods" ; // spreadsheet + aFilter += ";*.stc;*.ots" ; // spreadsheet template + aFilter += ";*.sda;*.sxd;*.odg" ; // drawing + aFilter += ";*.std;*.otg" ; // drawing template + aFilter += ";*.sdd;*.sxi;*.odp" ; // presentation + aFilter += ";*.sti;*.otp" ; // presentation template + aFilter += ";*.sxm;*.odf" ; // formula Reference< XFilterManager > xFltMgr(xFP, UNO_QUERY); xFltMgr->appendFilter( aTitle, aFilter ); // set display directory and filter - ::rtl::OUString aPath(GetExtraData()->GetAddLibPath()); + OUString aPath(GetExtraData()->GetAddLibPath()); if ( !aPath.isEmpty() ) xFP->setDisplayDirectory( aPath ); else @@ -821,7 +820,7 @@ void LibPage::InsertLib() xFP->setDisplayDirectory( SvtPathOptions().GetWorkPath() ); } - rtl::OUString aLastFilter(GetExtraData()->GetAddLibFilter()); + OUString aLastFilter(GetExtraData()->GetAddLibFilter()); if ( !aLastFilter.isEmpty() ) xFltMgr->setCurrentFilter( aLastFilter ); else @@ -837,14 +836,14 @@ void LibPage::InsertLib() Reference< script::XLibraryContainer2 > xDlgLibContImport; // file URLs - Sequence< ::rtl::OUString > aFiles = xFP->getFiles(); + Sequence< OUString > aFiles = xFP->getFiles(); INetURLObject aURLObj( aFiles[0] ); INetURLObject aModURLObj( aURLObj ); INetURLObject aDlgURLObj( aURLObj ); - ::rtl::OUString aBase = aURLObj.getBase(); - ::rtl::OUString aModBase(RTL_CONSTASCII_USTRINGPARAM("script")); - ::rtl::OUString aDlgBase(RTL_CONSTASCII_USTRINGPARAM("dialog")); + OUString aBase = aURLObj.getBase(); + OUString aModBase( "script" ); + OUString aDlgBase( "dialog" ); if ( aBase == aModBase || aBase == aDlgBase ) { @@ -856,22 +855,22 @@ void LibPage::InsertLib() { Reference< XSimpleFileAccess2 > xSFA( SimpleFileAccess::create(comphelper::getProcessComponentContext()) ); - ::rtl::OUString aModURL( aModURLObj.GetMainURL( INetURLObject::NO_DECODE ) ); + OUString aModURL( aModURLObj.GetMainURL( INetURLObject::NO_DECODE ) ); if ( xSFA->exists( aModURL ) ) { Sequence aSeqModURL(1); aSeqModURL[0] <<= aModURL; xModLibContImport = Reference< script::XLibraryContainer2 >( xMSF->createInstanceWithArguments( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.script.DocumentScriptLibraryContainer" ) ), aSeqModURL ), UNO_QUERY ); + "com.sun.star.script.DocumentScriptLibraryContainer", aSeqModURL ), UNO_QUERY ); } - ::rtl::OUString aDlgURL( aDlgURLObj.GetMainURL( INetURLObject::NO_DECODE ) ); + OUString aDlgURL( aDlgURLObj.GetMainURL( INetURLObject::NO_DECODE ) ); if ( xSFA->exists( aDlgURL ) ) { Sequence aSeqDlgURL(1); aSeqDlgURL[0] <<= aDlgURL; xDlgLibContImport = Reference< script::XLibraryContainer2 >( xMSF->createInstanceWithArguments( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.script.DocumentDialogLibraryContainer" ) ), aSeqDlgURL ), UNO_QUERY ); + "com.sun.star.script.DocumentDialogLibraryContainer", aSeqDlgURL ), UNO_QUERY ); } } @@ -881,9 +880,9 @@ void LibPage::InsertLib() Reference< script::XLibraryContainer > xModLibContImp( xModLibContImport, UNO_QUERY ); Reference< script::XLibraryContainer > xDlgLibContImp( xDlgLibContImport, UNO_QUERY ); - Sequence< ::rtl::OUString > aLibNames = GetMergedLibraryNames( xModLibContImp, xDlgLibContImp ); + Sequence< OUString > aLibNames = GetMergedLibraryNames( xModLibContImp, xDlgLibContImp ); sal_Int32 nLibCount = aLibNames.getLength(); - const ::rtl::OUString* pLibNames = aLibNames.getConstArray(); + const OUString* pLibNames = aLibNames.getConstArray(); for ( sal_Int32 i = 0 ; i < nLibCount ; i++ ) { // library import dialog @@ -895,7 +894,7 @@ void LibPage::InsertLib() } // libbox entries - ::rtl::OUString aLibName( pLibNames[ i ] ); + OUString aLibName( pLibNames[ i ] ); if ( !( ( xModLibContImport.is() && xModLibContImport->hasByName( aLibName ) && xModLibContImport->isLibraryLink( aLibName ) ) || ( xDlgLibContImport.is() && xDlgLibContImport->hasByName( aLibName ) && xDlgLibContImport->isLibraryLink( aLibName ) ) ) ) { @@ -910,9 +909,9 @@ void LibPage::InsertLib() else { bool bChanges = false; - ::rtl::OUString aExtension( aURLObj.getExtension() ); - ::rtl::OUString aLibExtension(RTL_CONSTASCII_USTRINGPARAM("xlb")); - ::rtl::OUString aContExtension(RTL_CONSTASCII_USTRINGPARAM("xlc")); + OUString aExtension( aURLObj.getExtension() ); + OUString aLibExtension( "xlb" ); + OUString aContExtension( "xlc" ); // disable reference checkbox for documents and sbls if ( aExtension != aLibExtension && aExtension != aContExtension ) @@ -930,7 +929,7 @@ void LibPage::InsertLib() { SvLBoxEntry* pEntry = pLibDlg->GetLibBox().GetEntry( nLib ); DBG_ASSERT( pEntry, "Entry?!" ); - ::rtl::OUString aLibName( pLibDlg->GetLibBox().GetEntryText( pEntry, 0 ) ); + OUString aLibName( pLibDlg->GetLibBox().GetEntryText( pEntry, 0 ) ); Reference< script::XLibraryContainer2 > xModLibContainer( m_aCurDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY ); Reference< script::XLibraryContainer2 > xDlgLibContainer( m_aCurDocument.getLibraryContainer( E_DIALOGS ), UNO_QUERY ); @@ -951,9 +950,9 @@ void LibPage::InsertLib() if ( ( xModLibContainer.is() && xModLibContainer->hasByName( aLibName ) && xModLibContainer->isLibraryReadOnly( aLibName ) && !xModLibContainer->isLibraryLink( aLibName ) ) || ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aLibName ) && xDlgLibContainer->isLibraryReadOnly( aLibName ) && !xDlgLibContainer->isLibraryLink( aLibName ) ) ) { - ::rtl::OUString aErrStr( IDE_RESSTR(RID_STR_REPLACELIB) ); + OUString aErrStr( IDE_RESSTR(RID_STR_REPLACELIB) ); aErrStr = aErrStr.replaceAll("XX", aLibName); - aErrStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); + aErrStr += OUString( "\n" ); aErrStr += IDE_RESSTR(RID_STR_LIBISREADONLY); ErrorBox( this, WB_OK | WB_DEF_OK, aErrStr ).Execute(); continue; @@ -964,13 +963,13 @@ void LibPage::InsertLib() } else { - ::rtl::OUString aErrStr; + OUString aErrStr; if ( bReference ) aErrStr = IDE_RESSTR(RID_STR_REFNOTPOSSIBLE); else aErrStr = IDE_RESSTR(RID_STR_IMPORTNOTPOSSIBLE); aErrStr = aErrStr.replaceAll("XX", aLibName); - aErrStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); + aErrStr += "\n" ; aErrStr += IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED); ErrorBox( this, WB_OK | WB_DEF_OK, aErrStr ).Execute(); continue; @@ -979,7 +978,7 @@ void LibPage::InsertLib() // check, if the library is password protected bool bOK = false; - ::rtl::OUString aPassword; + OUString aPassword; if ( xModLibContImport.is() && xModLibContImport->hasByName( aLibName ) ) { Reference< script::XLibraryContainerPassword > xPasswd( xModLibContImport, UNO_QUERY ); @@ -989,7 +988,7 @@ void LibPage::InsertLib() if ( !bOK ) { - ::rtl::OUString aErrStr( IDE_RESSTR(RID_STR_NOIMPORT) ); + OUString aErrStr( IDE_RESSTR(RID_STR_NOIMPORT) ); aErrStr = aErrStr.replaceAll("XX", aLibName); ErrorBox( this, WB_OK | WB_DEF_OK, aErrStr ).Execute(); continue; @@ -1029,7 +1028,7 @@ void LibPage::InsertLib() aModStorageURLObj.setExtension( aLibExtension ); aModStorageURLObj.setFinalSlash(); } - ::rtl::OUString aModStorageURL( aModStorageURLObj.GetMainURL( INetURLObject::NO_DECODE ) ); + OUString aModStorageURL( aModStorageURLObj.GetMainURL( INetURLObject::NO_DECODE ) ); // create library link xModLib = Reference< container::XNameContainer >( xModLibContainer->createLibraryLink( aLibName, aModStorageURL, true ), UNO_QUERY); @@ -1052,12 +1051,12 @@ void LibPage::InsertLib() xModLibContImport->loadLibrary( aLibName ); // copy all modules - Sequence< ::rtl::OUString > aModNames = xModLibImport->getElementNames(); + Sequence< OUString > aModNames = xModLibImport->getElementNames(); sal_Int32 nModCount = aModNames.getLength(); - const ::rtl::OUString* pModNames = aModNames.getConstArray(); + const OUString* pModNames = aModNames.getConstArray(); for ( sal_Int32 i = 0 ; i < nModCount ; i++ ) { - ::rtl::OUString aModName( pModNames[ i ] ); + OUString aModName( pModNames[ i ] ); Any aElement_ = xModLibImport->getByName( aModName ); xModLib->insertByName( aModName, aElement_ ); } @@ -1070,8 +1069,8 @@ void LibPage::InsertLib() { try { - ::rtl::OUString _aPassword( aPassword ); - xPasswd->changeLibraryPassword( aLibName, ::rtl::OUString(), _aPassword ); + OUString _aPassword( aPassword ); + xPasswd->changeLibraryPassword( aLibName, OUString(), _aPassword ); } catch (...) { @@ -1098,7 +1097,7 @@ void LibPage::InsertLib() aDlgStorageURLObj.setExtension( aLibExtension ); aDlgStorageURLObj.setFinalSlash(); } - ::rtl::OUString aDlgStorageURL( aDlgStorageURLObj.GetMainURL( INetURLObject::NO_DECODE ) ); + OUString aDlgStorageURL( aDlgStorageURLObj.GetMainURL( INetURLObject::NO_DECODE ) ); // create library link xDlgLib = Reference< container::XNameContainer >( xDlgLibContainer->createLibraryLink( aLibName, aDlgStorageURL, true ), UNO_QUERY); @@ -1121,12 +1120,12 @@ void LibPage::InsertLib() xDlgLibContImport->loadLibrary( aLibName ); // copy all dialogs - Sequence< ::rtl::OUString > aDlgNames = xDlgLibImport->getElementNames(); + Sequence< OUString > aDlgNames = xDlgLibImport->getElementNames(); sal_Int32 nDlgCount = aDlgNames.getLength(); - const ::rtl::OUString* pDlgNames = aDlgNames.getConstArray(); + const OUString* pDlgNames = aDlgNames.getConstArray(); for ( sal_Int32 i = 0 ; i < nDlgCount ; i++ ) { - ::rtl::OUString aDlgName( pDlgNames[ i ] ); + OUString aDlgName( pDlgNames[ i ] ); Any aElement_ = xDlgLibImport->getByName( aDlgName ); xDlgLib->insertByName( aDlgName, aElement_ ); } @@ -1162,7 +1161,7 @@ void LibPage::Export( void ) String aLibName( aLibBox.GetEntryText( pCurEntry, 0 ) ); // Password verification - ::rtl::OUString aOULibName( aLibName ); + OUString aOULibName( aLibName ); Reference< script::XLibraryContainer2 > xModLibContainer( m_aCurDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY ); if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) && !xModLibContainer->isLibraryLoaded( aOULibName ) ) @@ -1173,7 +1172,7 @@ void LibPage::Export( void ) Reference< script::XLibraryContainerPassword > xPasswd( xModLibContainer, UNO_QUERY ); if ( xPasswd.is() && xPasswd->isLibraryPasswordProtected( aOULibName ) && !xPasswd->isLibraryPasswordVerified( aOULibName ) ) { - ::rtl::OUString aPassword; + OUString aPassword; Reference< script::XLibraryContainer > xModLibContainer1( xModLibContainer, UNO_QUERY ); bOK = QueryPassword( xModLibContainer1, aLibName, aPassword ); } @@ -1201,7 +1200,7 @@ void LibPage::Export( void ) void LibPage::implExportLib( const String& aLibName, const String& aTargetURL, const Reference< task::XInteractionHandler >& Handler ) { - ::rtl::OUString aOULibName( aLibName ); + OUString aOULibName( aLibName ); Reference< script::XLibraryContainerExport > xModLibContainerExport ( m_aCurDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY ); Reference< script::XLibraryContainerExport > xDlgLibContainerExport @@ -1262,14 +1261,14 @@ void LibPage::ExportAsPackage( const String& aLibName ) Sequence aServiceType(1); aServiceType[0] <<= TemplateDescription::FILESAVE_SIMPLE; xFP = Reference< XFilePicker >( xMSF->createInstanceWithArguments( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ) ), aServiceType ), UNO_QUERY ); + "com.sun.star.ui.dialogs.FilePicker", aServiceType ), UNO_QUERY ); xFP->setTitle( String( IDEResId( RID_STR_EXPORTPACKAGE ) ) ); // filter - ::rtl::OUString aTitle = String( IDEResId( RID_STR_PACKAGE_BUNDLE ) ); - ::rtl::OUString aFilter; - aFilter = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*.oxt" ) ); // library files + OUString aTitle = String( IDEResId( RID_STR_PACKAGE_BUNDLE ) ); + OUString aFilter; + aFilter = "*.oxt" ; // library files Reference< XFilterManager > xFltMgr(xFP, UNO_QUERY); xFltMgr->appendFilter( aTitle, aFilter ); @@ -1290,12 +1289,12 @@ void LibPage::ExportAsPackage( const String& aLibName ) { GetExtraData()->SetAddLibPath(xFP->getDisplayDirectory()); - Sequence< ::rtl::OUString > aFiles = xFP->getFiles(); + Sequence< OUString > aFiles = xFP->getFiles(); INetURLObject aURL( aFiles[0] ); if( aURL.getExtension().isEmpty() ) - aURL.setExtension( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "oxt" ) ) ); + aURL.setExtension( "oxt" ); - ::rtl::OUString aPackageURL( aURL.GetMainURL( INetURLObject::NO_DECODE ) ); + OUString aPackageURL( aURL.GetMainURL( INetURLObject::NO_DECODE ) ); String aTmpPath = SvtPathOptions().GetTempPath(); INetURLObject aInetObj( aTmpPath ); @@ -1314,8 +1313,8 @@ void LibPage::ExportAsPackage( const String& aLibName ) ::ucbhelper::Content sourceContent( aSourcePath, xCmdEnv, comphelper::getProcessComponentContext() ); - ::rtl::OUStringBuffer buf; - buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.zip://") ); + OUStringBuffer buf; + buf.appendAscii( "vnd.sun.star.zip://" ); buf.append( ::rtl::Uri::encode( aPackageURL, rtl_UriCharClassRegName, rtl_UriEncodeIgnoreEscapes, @@ -1332,7 +1331,7 @@ void LibPage::ExportAsPackage( const String& aLibName ) OUString(), NameClash::OVERWRITE ); INetURLObject aMetaInfInetObj( aTmpPath ); - aMetaInfInetObj.insertName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "META-INF" ) ), + aMetaInfInetObj.insertName( "META-INF", true, INetURLObject::LAST_SEGMENT, true, INetURLObject::ENCODE_ALL ); OUString aMetaInfFolder = aMetaInfInetObj.GetMainURL( INetURLObject::NO_DECODE ); if( xSFA->exists( aMetaInfFolder ) ) @@ -1340,16 +1339,15 @@ void LibPage::ExportAsPackage( const String& aLibName ) xSFA->createFolder( aMetaInfFolder ); ::std::vector< Sequence > manifest; - const OUString strMediaType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ); - const OUString strFullPath = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FullPath" ) ); - const OUString strBasicMediaType = ::rtl::OUString - ( RTL_CONSTASCII_USTRINGPARAM( "application/vnd.sun.star.basic-library" ) ); + const OUString strMediaType = "MediaType" ; + const OUString strFullPath = "FullPath" ; + const OUString strBasicMediaType = "application/vnd.sun.star.basic-library" ; Sequence attribs( 2 ); beans::PropertyValue * pattribs = attribs.getArray(); pattribs[ 0 ].Name = strFullPath; OUString fullPath = aLibName; - fullPath += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/") ); + fullPath += "/" ; pattribs[ 0 ].Value <<= fullPath; pattribs[ 1 ].Name = strMediaType; pattribs[ 1 ].Value <<= strBasicMediaType; @@ -1363,7 +1361,7 @@ void LibPage::ExportAsPackage( const String& aLibName ) xPipe, Sequence< Sequence >( &manifest[ 0 ], manifest.size() ) ); - aMetaInfInetObj.insertName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "manifest.xml" ) ), + aMetaInfInetObj.insertName( "manifest.xml", true, INetURLObject::LAST_SEGMENT, true, INetURLObject::ENCODE_ALL ); // write buffered pipe data to content: @@ -1388,7 +1386,7 @@ void LibPage::ExportAsBasic( const String& aLibName ) Reference< lang::XMultiServiceFactory > xMSF( ::comphelper::getProcessServiceFactory() ); Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); Reference< XFolderPicker > xFolderPicker( xMSF->createInstance( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FolderPicker" ) ) ), UNO_QUERY ); + "com.sun.star.ui.dialogs.FolderPicker" ), UNO_QUERY ); Reference< task::XInteractionHandler2 > xHandler( task::InteractionHandler::createWithParent(xContext, 0) ); if( xFolderPicker.is() ) @@ -1423,7 +1421,7 @@ void LibPage::DeleteCurrent() // check, if library is link bool bIsLibraryLink = false; - ::rtl::OUString aOULibName( aLibName ); + OUString aOULibName( aLibName ); Reference< script::XLibraryContainer2 > xModLibContainer( m_aCurDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY ); Reference< script::XLibraryContainer2 > xDlgLibContainer( m_aCurDocument.getLibraryContainer( E_DIALOGS ), UNO_QUERY ); if ( ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) && xModLibContainer->isLibraryLink( aOULibName ) ) || @@ -1508,9 +1506,9 @@ void LibPage::SetCurLib() aLibBox.Clear(); // get a sorted list of library names - Sequence< ::rtl::OUString > aLibNames = aDocument.getLibraryNames(); + Sequence< OUString > aLibNames = aDocument.getLibraryNames(); sal_Int32 nLibCount = aLibNames.getLength(); - const ::rtl::OUString* pLibNames = aLibNames.getConstArray(); + const OUString* pLibNames = aLibNames.getConstArray(); for ( sal_Int32 i = 0 ; i < nLibCount ; i++ ) { @@ -1519,7 +1517,7 @@ void LibPage::SetCurLib() ImpInsertLibEntry( aLibName, i ); } - SvLBoxEntry* pEntry_ = aLibBox.FindEntry( rtl::OUString("Standard") ); + SvLBoxEntry* pEntry_ = aLibBox.FindEntry( OUString( "Standard" ) ); if ( !pEntry_ ) pEntry_ = aLibBox.GetEntry( 0 ); aLibBox.SetCurEntry( pEntry_ ); @@ -1533,7 +1531,7 @@ SvLBoxEntry* LibPage::ImpInsertLibEntry( const String& rLibName, sal_uLong nPos { // check, if library is password protected bool bProtected = false; - ::rtl::OUString aOULibName( rLibName ); + OUString aOULibName( rLibName ); Reference< script::XLibraryContainer2 > xModLibContainer( m_aCurDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY ); if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) ) { @@ -1576,7 +1574,7 @@ void createLibImpl( Window* pWin, const ScriptDocument& rDocument, // create library name String aLibName; - String aLibStdName( String( RTL_CONSTASCII_USTRINGPARAM( "Library" ) ) ); + String aLibStdName( String( "Library" ) ); //String aLibStdName( IDEResId( RID_STR_STDLIBNAME ) ); bool bValid = false; sal_uInt16 i = 1; @@ -1628,7 +1626,7 @@ void createLibImpl( Window* pWin, const ScriptDocument& rDocument, // create a module String aModName = rDocument.createObjectName( E_SCRIPTS, aLibName ); - ::rtl::OUString sModuleCode; + OUString sModuleCode; if ( !rDocument.createModule( aLibName, aModName, true, sModuleCode ) ) throw Exception(); From 02a8d36ebf3d54784903f2899eafe010bedf2f4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Fri, 5 Oct 2012 18:17:13 +0200 Subject: [PATCH 605/863] initial support for clang compiler plugins The plugin is intentionally built using a custom Makefile, because it's used by gbuild, so I don't want to build the plugin using gbuild too. It is also intentionally not placed under workdir/, as that is cleaned by 'make clean', the plugin is cleaned only by 'make distclean', so that cleaning it doesn't cause ccache misses. No actual functionality in the plugin itself yet. Change-Id: Ic05eba8d6260eec123c9e699eb5385abfe1b832f --- Makefile.top | 6 ++- compilerplugins/.gitignore | 1 + compilerplugins/Makefile | 23 +++++++++ compilerplugins/Makefile-clang.mk | 60 ++++++++++++++++++++++ compilerplugins/Makefile.mk | 32 ++++++++++++ compilerplugins/README | 27 ++++++++++ compilerplugins/clang/compileplugin.cxx | 68 +++++++++++++++++++++++++ compilerplugins/clang/compileplugin.hxx | 14 +++++ config_host.mk.in | 1 + configure.in | 39 ++++++++++++++ solenv/gbuild/platform/com_GCC_class.mk | 2 + solenv/gbuild/platform/com_GCC_defs.mk | 6 +++ 12 files changed, 277 insertions(+), 2 deletions(-) create mode 100644 compilerplugins/.gitignore create mode 100644 compilerplugins/Makefile create mode 100644 compilerplugins/Makefile-clang.mk create mode 100644 compilerplugins/Makefile.mk create mode 100644 compilerplugins/README create mode 100644 compilerplugins/clang/compileplugin.cxx create mode 100644 compilerplugins/clang/compileplugin.hxx diff --git a/Makefile.top b/Makefile.top index e5bd89d1da0a..d8bde500ca26 100644 --- a/Makefile.top +++ b/Makefile.top @@ -351,10 +351,12 @@ ifeq ($(CROSS_COMPILING),YES) rm -rf $(SRCDIR)/*/$(INPATH_FOR_BUILD) endif +include $(SRCDIR)/compilerplugins/Makefile.mk + # # Distclean # -distclean : clean +distclean : clean compilerplugins-clean ifeq ($(BUILD_DMAKE),YES) (if [ -f dmake/Makefile ] ; then $(GNUMAKE) -j $(GMAKE_PARALLELISM) -C dmake distclean; fi) && \ rm -f solenv/*/bin/dmake* @@ -393,7 +395,7 @@ endif # bootstrap: $(WORKDIR)/bootstrap -$(WORKDIR)/bootstrap: solenv/bin/concat-deps.c +$(WORKDIR)/bootstrap: solenv/bin/concat-deps.c compilerplugins @cd $(SRCDIR) && ./bootstrap @mkdir -p $(dir $@) && touch $@ diff --git a/compilerplugins/.gitignore b/compilerplugins/.gitignore new file mode 100644 index 000000000000..b672fdeaf35b --- /dev/null +++ b/compilerplugins/.gitignore @@ -0,0 +1 @@ +obj diff --git a/compilerplugins/Makefile b/compilerplugins/Makefile new file mode 100644 index 000000000000..4281c12da996 --- /dev/null +++ b/compilerplugins/Makefile @@ -0,0 +1,23 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +ifeq ($(SOLARENV),) +ifeq ($(gb_Side),) +gb_Side:=host +endif +include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))../config_$(gb_Side).mk +endif + +include $(SRCDIR)/compilerplugins/Makefile.mk + +all: build +build: compilerplugins +clean: compilerplugins-clean + +# vim: set noet sw=4 ts=4: diff --git a/compilerplugins/Makefile-clang.mk b/compilerplugins/Makefile-clang.mk new file mode 100644 index 000000000000..1797e424ddb1 --- /dev/null +++ b/compilerplugins/Makefile-clang.mk @@ -0,0 +1,60 @@ +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# Make sure variables in this Makefile do not conflict with other variables (e.g. from gbuild). + +# The list of source files. +CLANGSRC=compileplugin.cxx + +# You may occassionally want to override some of these + +# Compile flags ('make CLANGCXXFLAGS=-g' if you need to debug the plugin) +CLANGCXXFLAGS=-O2 -Wall -g +# The prefix where Clang resides, override to where Clang resides if using a source build. +CLANGDIR=/usr +# The build directory (different from CLANGDIR if using a Clang out-of-source build) +CLANGBUILD=/usr + +# The uninteresting rest. + +# Clang headers require these. +CLANGDEFS=-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -fno-rtti +# All include locations needed. +CLANGINCLUDES=-I$(CLANGDIR)/include -I$(CLANGDIR)/tools/clang/include -I$(CLANGBUILD)/include -I$(CLANGBUILD)/tools/clang/include + +CLANGINDIR=$(SRCDIR)/compilerplugins/clang +# Cannot use $(WORKDIR), the plugin should survive even 'make clean', otherwise the rebuilt +# plugin will cause cache misses with ccache. +CLANGOUTDIR=$(SRCDIR)/compilerplugins/obj + +compilerplugins: $(CLANGOUTDIR) $(CLANGOUTDIR)/compileplugin.so + +compilerplugins-clean: + rm -rf $(CLANGOUTDIR) + +$(CLANGOUTDIR): + mkdir -p $(CLANGOUTDIR) + +CLANGOBJS= + +define clangbuildsrc +$(3): $(2) $(SRCDIR)/compilerplugins/Makefile-clang.mk + $(CXX) $(CLANGCXXFLAGS) $(CLANGDEFS) $(CLANGINCLUDES) $(2) -fPIC -c -o $(3) -MMD -MT $(3) -MP -MF $(CLANGOUTDIR)/$(1).d + +-include $(CLANGOUTDIR)/$(1).d + +$(CLANGOUTDIR)/compileplugin.so: $(3) +$(CLANGOUTDIR)/compileplugin.so: CLANGOBJS += $(3) +endef + +$(foreach src, $(CLANGSRC), $(eval $(call clangbuildsrc,$(src),$(CLANGINDIR)/$(src),$(CLANGOUTDIR)/$(src:.cxx=.o)))) + +$(CLANGOUTDIR)/compileplugin.so: $(CLANGOBJS) + $(CXX) -shared $(CLANGOBJS) -o $@ + +# vim: set noet sw=4 ts=4: diff --git a/compilerplugins/Makefile.mk b/compilerplugins/Makefile.mk new file mode 100644 index 000000000000..c3b5290c9b2d --- /dev/null +++ b/compilerplugins/Makefile.mk @@ -0,0 +1,32 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +.PHONY: compilerplugins compilerplugins-clean + +ifeq ($(COMPILER_PLUGINS),) + +# no support + +compilerplugins: +compilerplugins-clean: +compilerplugins.clean: + +else + +ifeq ($(COM_GCC_IS_CLANG),TRUE) + +include $(SRCDIR)/compilerplugins/Makefile-clang.mk + +compilerplugins.clean: compilerplugins-clean + +endif + +endif + +# vim: set noet sw=4 ts=4: diff --git a/compilerplugins/README b/compilerplugins/README new file mode 100644 index 000000000000..98ac70c85ef5 --- /dev/null +++ b/compilerplugins/README @@ -0,0 +1,27 @@ +Compiler plugins. + +== Overview == + +This directory contains code for compiler plugins. These are used to perform +additional actions during compilation (such as additional warnings) and +also to perform mass code refactoring. + +Currently only the Clang compiler is supported (http://clang.llvm.org). + +== Usage == + +Compiler plugins are enabled automatically by --enable-dbgutil if Clang headers +are found or explicitly using --enable-compiler-plugins. + + +== Functionality == + +=== Compile plugin === + +The compile plugin is used during normal compilation to perform additional checks. +All warnings and errors are marked '[loplugin]' in the message. + + +== Code documentation / howtos == + +TBD diff --git a/compilerplugins/clang/compileplugin.cxx b/compilerplugins/clang/compileplugin.cxx new file mode 100644 index 000000000000..fb2632e3d2cd --- /dev/null +++ b/compilerplugins/clang/compileplugin.cxx @@ -0,0 +1,68 @@ +/* + * This file is part of the LibreOffice project. + * + * Based on LLVM/Clang. + * + * This file is distributed under the University of Illinois Open Source + * License. See LICENSE.TXT for details. + * + */ + +#include "compileplugin.hxx" + +#include +#include +#include +#include +#include +#include + +using namespace clang; + +namespace loplugin +{ + +/** + Class that manages all LO modules. +*/ +class PluginHandler + : public ASTConsumer + { + public: + explicit PluginHandler( ASTContext& context ) + : rewriter( context.getSourceManager(), context.getLangOpts()) + { + } + virtual void HandleTranslationUnit( ASTContext& context ) + { + if( context.getDiagnostics().hasErrorOccurred()) + return; + // TODO also LO header files? or a subdir? + if( const RewriteBuffer* buf = rewriter.getRewriteBufferFor( context.getSourceManager().getMainFileID())) + buf->write( llvm::outs()); + // TODO else write out the original file? + } + private: + Rewriter rewriter; + }; + +/** + The Clang plugin class, just forwards to PluginHandler. +*/ +class LibreOfficeAction + : public PluginASTAction + { + public: + virtual ASTConsumer* CreateASTConsumer( CompilerInstance& Compiler, StringRef InFile ) + { + return new PluginHandler( Compiler.getASTContext()); + } + virtual bool ParseArgs( const CompilerInstance& CI, const std::vector< std::string >& args ) + { + return true; + } + }; + +} // namespace + +static FrontendPluginRegistry::Add< loplugin::LibreOfficeAction > X( "loplugin", "LibreOffice compile check plugin" ); diff --git a/compilerplugins/clang/compileplugin.hxx b/compilerplugins/clang/compileplugin.hxx new file mode 100644 index 000000000000..f7d5182b7b0f --- /dev/null +++ b/compilerplugins/clang/compileplugin.hxx @@ -0,0 +1,14 @@ +/* + * This file is part of the LibreOffice project. + * + * Based on LLVM/Clang. + * + * This file is distributed under the University of Illinois Open Source + * License. See LICENSE.TXT for details. + * + */ + +#ifndef COMPILEPLUGIN_H +#define COMPILEPLUGIN_H + +#endif // COMPILEPLUGIN_H diff --git a/config_host.mk.in b/config_host.mk.in index 605d701c7727..5c0dcf2e6179 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -71,6 +71,7 @@ export COMMONS_HTTPCLIENT_JAR=@COMMONS_HTTPCLIENT_JAR@ export COMMONS_LANG_JAR=@COMMONS_LANG_JAR@ export COMMONS_LOGGING_JAR=@COMMONS_LOGGING_JAR@ export COMPATH=@COMPATH@ +export COMPILER_PLUGINS=@COMPILER_PLUGINS@ export COMP_ENV=@OUTPATH@ export COM_FOR_BUILD=@COM_FOR_BUILD@ export CPPUNIT_CFLAGS=@CPPUNIT_CFLAGS@ diff --git a/configure.in b/configure.in index 5d37a667b2d8..8b29eb30d755 100644 --- a/configure.in +++ b/configure.in @@ -791,6 +791,11 @@ AC_ARG_ENABLE(dbgutil, It is not possible to mix object files or libraries from a --enable-dbgutil and a --disable-dbgutil build.])) +AC_ARG_ENABLE(compiler-plugins, + AS_HELP_STRING([--enable-compiler-plugins], + [Enable compiler plugins that will perform additional checks during + building. Enabled automatically by --enable-dbgutil.])) + AC_ARG_ENABLE(linkoo, AS_HELP_STRING([--disable-linkoo], [Disable linkoo for the smoketest installation.])) @@ -5023,6 +5028,40 @@ if test "$cross_compiling" != "yes" -a "$enable_dbgutil" != "no" -a \ fi AC_SUBST([VALGRIND_CFLAGS]) +dnl =================================================================== +dnl Compiler plugins +dnl =================================================================== + +COMPILER_PLUGINS= +# currently only Clang +if test "$COM_GCC_IS_CLANG" = "TRUE"; then + if test -n "$enable_compiler_plugins"; then + compiler_plugins="$enable_compiler_plugins" + elif test -n "$enable_dbgutil" -a "$enable_dbgutil" != "no"; then + compiler_plugins=test + else + compiler_plugins=no + fi + if test "$compiler_plugins" != "no"; then + AC_LANG_PUSH([C++]) + save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS" + AC_CHECK_HEADER(clang/AST/RecursiveASTVisitor.h, + [COMPILER_PLUGINS=TRUE], + [ + if test "$compiler_plugins" = "yes"; then + AC_MSG_ERROR([Cannot find Clang headers to build compiler plugins.]) + else + AC_MSG_WARN([Cannot find Clang headers to build compiler plugins, plugins disabled]) + add_warning "Cannot find Clang headers to build compiler plugins, plugins disabled." + fi + ]) + CPPFLAGS=$save_CPPFLAGS + AC_LANG_POP([C++]) + fi +fi +AC_SUBST(COMPILER_PLUGINS) + dnl =================================================================== dnl Set the MinGW sys-root dnl =================================================================== diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index 630eed78c560..aa00267222f0 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -60,6 +60,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \ $(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \ $(if $(WARNINGS_NOT_ERRORS),,$(gb_CFLAGS_WERROR)) \ + $(if $(COMPILER_PLUGINS),$(gb_COMPILER_PLUGINS)) \ $(T_CFLAGS) \ -c $(3) \ -o $(1) \ @@ -82,6 +83,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \ $(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \ $(if $(WARNINGS_NOT_ERRORS),,$(gb_CXXFLAGS_WERROR)) \ + $(if $(COMPILER_PLUGINS),$(gb_COMPILER_PLUGINS)) \ $(T_CXXFLAGS) \ -c $(3) \ -o $(1) \ diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 1e349f0a8325..0cc32b52505b 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -153,6 +153,12 @@ gb_DEBUG_CXXFLAGS := $(FNO_DEFAULT_INLINE) gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC))) +ifeq ($(COM_GCC_IS_CLANG),TRUE) +gb_COMPILER_PLUGINS :=-Xclang -load -Xclang $(SRCDIR)/compilerplugins/obj/compileplugin.so -Xclang -add-plugin -Xclang loplugin +else +gb_COMPILER_PLUGINS := +endif + # Executable class gb_Executable_EXT_for_build := From 13e39545eac66b628f9ef3c89cc03d2003e5d317 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Tue, 9 Oct 2012 14:50:19 +0200 Subject: [PATCH 606/863] compiler check for unused variables This is for variables that the compiler itself cannot figure out (e.g. non-trivial ctors). The classes need to be marked manually. Change-Id: I0109972e11e20578b1adc32065f701a871ee21aa --- compilerplugins/Makefile-clang.mk | 2 +- compilerplugins/README | 7 ++ compilerplugins/clang/compileplugin.cxx | 5 + compilerplugins/clang/unusedvariablecheck.cxx | 112 ++++++++++++++++++ compilerplugins/clang/unusedvariablecheck.hxx | 35 ++++++ sal/inc/sal/types.h | 20 ++++ 6 files changed, 180 insertions(+), 1 deletion(-) create mode 100644 compilerplugins/clang/unusedvariablecheck.cxx create mode 100644 compilerplugins/clang/unusedvariablecheck.hxx diff --git a/compilerplugins/Makefile-clang.mk b/compilerplugins/Makefile-clang.mk index 1797e424ddb1..9b37fb9939c7 100644 --- a/compilerplugins/Makefile-clang.mk +++ b/compilerplugins/Makefile-clang.mk @@ -9,7 +9,7 @@ # Make sure variables in this Makefile do not conflict with other variables (e.g. from gbuild). # The list of source files. -CLANGSRC=compileplugin.cxx +CLANGSRC=compileplugin.cxx unusedvariablecheck.cxx # You may occassionally want to override some of these diff --git a/compilerplugins/README b/compilerplugins/README index 98ac70c85ef5..2430d40fb72e 100644 --- a/compilerplugins/README +++ b/compilerplugins/README @@ -21,6 +21,13 @@ are found or explicitly using --enable-compiler-plugins. The compile plugin is used during normal compilation to perform additional checks. All warnings and errors are marked '[loplugin]' in the message. +==== Unused variable check ==== + +- unused parameter 'foo' [loplugin] +- unused variable 'foo' [loplugin] + +Additional check for unused variables. + == Code documentation / howtos == diff --git a/compilerplugins/clang/compileplugin.cxx b/compilerplugins/clang/compileplugin.cxx index fb2632e3d2cd..2b1647560117 100644 --- a/compilerplugins/clang/compileplugin.cxx +++ b/compilerplugins/clang/compileplugin.cxx @@ -17,6 +17,8 @@ #include #include +#include "unusedvariablecheck.hxx" + using namespace clang; namespace loplugin @@ -31,12 +33,14 @@ class PluginHandler public: explicit PluginHandler( ASTContext& context ) : rewriter( context.getSourceManager(), context.getLangOpts()) + , unusedVariableCheck( context ) { } virtual void HandleTranslationUnit( ASTContext& context ) { if( context.getDiagnostics().hasErrorOccurred()) return; + unusedVariableCheck.run(); // TODO also LO header files? or a subdir? if( const RewriteBuffer* buf = rewriter.getRewriteBufferFor( context.getSourceManager().getMainFileID())) buf->write( llvm::outs()); @@ -44,6 +48,7 @@ class PluginHandler } private: Rewriter rewriter; + UnusedVariableCheck unusedVariableCheck; }; /** diff --git a/compilerplugins/clang/unusedvariablecheck.cxx b/compilerplugins/clang/unusedvariablecheck.cxx new file mode 100644 index 000000000000..029e637b578c --- /dev/null +++ b/compilerplugins/clang/unusedvariablecheck.cxx @@ -0,0 +1,112 @@ +/* + * This file is part of the LibreOffice project. + * + * Based on LLVM/Clang. + * + * This file is distributed under the University of Illinois Open Source + * License. See LICENSE.TXT for details. + * + */ + +#include "unusedvariablecheck.hxx" + +#include + +using namespace clang; + +namespace loplugin +{ + +/* +Check for unused classes where the compiler cannot decide (e.g. because of +non-trivial or extern ctors) if a variable is unused if only its ctor/dtor +are called and nothing else. For example std::vector is a class where +the ctor may call further functions, but an unused std::string variable +does nothing. On the other hand, std::auto_ptr instances are used +for their dtors and so are not unused even if not otherwise accessed. + +Classes which are safe to be warned about need to be marked using +SAL_WARN_UNUSED (see e.g. OUString). For external classes such as std::vector +that cannot be edited there is a manual list below. +*/ + +UnusedVariableCheck::UnusedVariableCheck( ASTContext& context ) + : context( context ) + { + } + +void UnusedVariableCheck::run() + { + TraverseDecl( context.getTranslationUnitDecl()); + } + +DiagnosticBuilder UnusedVariableCheck::report( DiagnosticsEngine::Level level, StringRef message, SourceLocation loc ) + { + // Do some mappings (e.g. for -Werror) that clang does not do for custom messages for some reason. + DiagnosticsEngine& diag = context.getDiagnostics(); + if( level == DiagnosticsEngine::Warning && diag.getWarningsAsErrors()) + level = DiagnosticsEngine::Error; + if( level == DiagnosticsEngine::Error && diag.getErrorsAsFatal()) + level = DiagnosticsEngine::Fatal; + return diag.Report( loc, diag.getCustomDiagID( level, message )); + } + +bool UnusedVariableCheck::VisitNamedDecl( NamedDecl* declaration ) + { + // TODO also LO header files? or a subdir? + if( !context.getSourceManager().isFromMainFile( declaration->getLocStart())) + return true; + if( !isa< VarDecl >( declaration )) + return true; + const VarDecl* var = cast< VarDecl >( declaration ); + if( var->isReferenced() || var->isUsed()) + return true; + if( CXXRecordDecl* type = var->getType()->getAsCXXRecordDecl()) + { + bool warn_unused = false; + if( type->hasAttrs()) + { + // Clang currently has no support for custom attributes, but + // the annotate attribute comes close, so check for __attribute__((annotate("lo_warn_unused"))) + for( specific_attr_iterator i = type->specific_attr_begin(), + e = type->specific_attr_end(); + i != e; + ++i ) + { + if( (*i)->getAnnotation() == "lo_warn_unused" ) + { + warn_unused = true; + break; + } + } + } + if( !warn_unused ) + { + std::string n = type->getQualifiedNameAsString(); + // Check some common non-LO types. + if( n == "std::string" || n == "std::basic_string" + || n == "std::list" || n == "std::__debug::list" + || n == "std::vector" || n == "std::__debug::vector" ) + warn_unused = true; + } + if( warn_unused ) + { + if( const ParmVarDecl* param = dyn_cast< ParmVarDecl >( var )) + { + // If this declaration does not have a body, then the parameter is indeed not used, + // so ignore. + if( const FunctionDecl* func = dyn_cast< FunctionDecl >( param->getParentFunctionOrMethod())) + if( !func->doesThisDeclarationHaveABody()) + return true; + report( DiagnosticsEngine::Warning, "unused parameter %0 [loplugin]", + var->getLocStart()) << var->getDeclName(); + } + else + report( DiagnosticsEngine::Warning, "unused variable %0 [loplugin]", + var->getLocStart()) << var->getDeclName(); + } + } + return true; + } + +} // namespace diff --git a/compilerplugins/clang/unusedvariablecheck.hxx b/compilerplugins/clang/unusedvariablecheck.hxx new file mode 100644 index 000000000000..c49532a86414 --- /dev/null +++ b/compilerplugins/clang/unusedvariablecheck.hxx @@ -0,0 +1,35 @@ +/* + * This file is part of the LibreOffice project. + * + * Based on LLVM/Clang. + * + * This file is distributed under the University of Illinois Open Source + * License. See LICENSE.TXT for details. + * + */ + +#ifndef UNUSEDVARIABLECHECK_H +#define UNUSEDVARIABLECHECK_H + +#include + +using namespace clang; + +namespace loplugin +{ + +class UnusedVariableCheck + : public RecursiveASTVisitor< UnusedVariableCheck > + { + public: + explicit UnusedVariableCheck( ASTContext& context ); + void run(); + bool VisitNamedDecl( NamedDecl* declaration ); + private: + DiagnosticBuilder report( DiagnosticsEngine::Level level, StringRef message, SourceLocation loc ); + ASTContext& context; + }; + +} // namespace + +#endif // UNUSEDVARIABLECHECK_H diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h index f97ecc701438..0baf3d19cb1c 100644 --- a/sal/inc/sal/types.h +++ b/sal/inc/sal/types.h @@ -489,6 +489,26 @@ template< typename T1, typename T2 > inline T1 static_int_cast(T2 n) { #endif #endif +/** + + Annotate classes where a compiler should warn if an instance is unused. + + The compiler cannot warn about unused instances if they have non-trivial + or external constructors or destructors. Classes marked with SAL_WARN_UNUSED + will be warned about. + + Currently implemented by a Clang compiler plugin. + + @since LibreOffice 3.7 + +*/ + +#if defined __clang__ +#define SAL_WARN_UNUSED __attribute__((annotate("lo_warn_unused"))) +#else +#define SAL_WARN_UNUSED +#endif + #endif /*_SAL_TYPES_H_ */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ From 76757ebd98df1e08d00282cb96312b5be7690d16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Tue, 9 Oct 2012 15:17:13 +0200 Subject: [PATCH 607/863] mark our string classes as SAL_WARN_UNUSED Change-Id: I420229dea6c5b3e45cec5989897bb31654851e32 --- sal/inc/rtl/strbuf.hxx | 2 +- sal/inc/rtl/string.hxx | 2 +- sal/inc/rtl/ustrbuf.hxx | 2 +- sal/inc/rtl/ustring.hxx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sal/inc/rtl/strbuf.hxx b/sal/inc/rtl/strbuf.hxx index 62c17990453e..51bb05febfb0 100644 --- a/sal/inc/rtl/strbuf.hxx +++ b/sal/inc/rtl/strbuf.hxx @@ -97,7 +97,7 @@ namespace rtl buffer array. If the internal buffer overflows, it is automatically made larger. */ -class OStringBuffer +class SAL_WARN_UNUSED OStringBuffer { public: /** diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx index d58999b812f6..a135d4ed400b 100644 --- a/sal/inc/rtl/string.hxx +++ b/sal/inc/rtl/string.hxx @@ -91,7 +91,7 @@ namespace rtl use this class. */ -class OString +class SAL_WARN_UNUSED OString { public: /// @cond INTERNAL diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx index a11dff178442..426d129ab5d5 100644 --- a/sal/inc/rtl/ustrbuf.hxx +++ b/sal/inc/rtl/ustrbuf.hxx @@ -92,7 +92,7 @@ namespace rtl buffer array. If the internal buffer overflows, it is automatically made larger. */ -class OUStringBuffer +class SAL_WARN_UNUSED OUStringBuffer { public: /** diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx index e12a4b0b6256..97568012e06a 100644 --- a/sal/inc/rtl/ustring.hxx +++ b/sal/inc/rtl/ustring.hxx @@ -90,7 +90,7 @@ namespace rtl use this class. */ -class OUString +class SAL_WARN_UNUSED OUString { public: /// @cond INTERNAL From d4aa136e975b150add5f32013ea37aa68e9ccb57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Tue, 9 Oct 2012 16:21:33 +0200 Subject: [PATCH 608/863] compiler plugin check for if/while/true bodies with possibly {} missing Change-Id: Ia84c70006b0b8a039b6fea27f3c5cde796f25d03 --- compilerplugins/Makefile-clang.mk | 5 +- compilerplugins/README | 12 ++ compilerplugins/clang/bodynotinblock.cxx | 147 +++++++++++++++++++++++ compilerplugins/clang/bodynotinblock.hxx | 39 ++++++ compilerplugins/clang/compileplugin.cxx | 4 + 5 files changed, 206 insertions(+), 1 deletion(-) create mode 100644 compilerplugins/clang/bodynotinblock.cxx create mode 100644 compilerplugins/clang/bodynotinblock.hxx diff --git a/compilerplugins/Makefile-clang.mk b/compilerplugins/Makefile-clang.mk index 9b37fb9939c7..ca95f11aaff3 100644 --- a/compilerplugins/Makefile-clang.mk +++ b/compilerplugins/Makefile-clang.mk @@ -9,7 +9,10 @@ # Make sure variables in this Makefile do not conflict with other variables (e.g. from gbuild). # The list of source files. -CLANGSRC=compileplugin.cxx unusedvariablecheck.cxx +CLANGSRC=compileplugin.cxx \ + bodynotinblock.cxx \ + unusedvariablecheck.cxx \ + # You may occassionally want to override some of these diff --git a/compilerplugins/README b/compilerplugins/README index 2430d40fb72e..50c7505dd72e 100644 --- a/compilerplugins/README +++ b/compilerplugins/README @@ -28,6 +28,18 @@ All warnings and errors are marked '[loplugin]' in the message. Additional check for unused variables. +==== Body of if/while/for not in {} ==== + +- statement aligned as second statement in if/while/for body but not in a statement block [loplugin] + +Warn about the following construct: + + if( a != 0 ) + b = 2; + c = 3; + +Here either both statements should be inside {} or the second statement in indented wrong. + == Code documentation / howtos == diff --git a/compilerplugins/clang/bodynotinblock.cxx b/compilerplugins/clang/bodynotinblock.cxx new file mode 100644 index 000000000000..9f5bf0e75c4e --- /dev/null +++ b/compilerplugins/clang/bodynotinblock.cxx @@ -0,0 +1,147 @@ +/* + * This file is part of the LibreOffice project. + * + * Based on LLVM/Clang. + * + * This file is distributed under the University of Illinois Open Source + * License. See LICENSE.TXT for details. + * + */ + +#include "bodynotinblock.hxx" + +#include + +using namespace clang; + +namespace loplugin +{ + +/* +Check for two statements that are both indented to look like a body of if/while/for +but are not inside a compound statement and thus the second one is unrelated. +*/ + +BodyNotInBlock::BodyNotInBlock( ASTContext& context ) + : context( context ) + { + } + +DiagnosticBuilder BodyNotInBlock::report( DiagnosticsEngine::Level level, StringRef message, SourceLocation loc ) + { + // Do some mappings (e.g. for -Werror) that clang does not do for custom messages for some reason. + DiagnosticsEngine& diag = context.getDiagnostics(); + if( level == DiagnosticsEngine::Warning && diag.getWarningsAsErrors()) + level = DiagnosticsEngine::Error; + if( level == DiagnosticsEngine::Error && diag.getErrorsAsFatal()) + level = DiagnosticsEngine::Fatal; + return diag.Report( loc, diag.getCustomDiagID( level, message )); + } + +void BodyNotInBlock::run() + { + TraverseDecl( context.getTranslationUnitDecl()); + } + +bool BodyNotInBlock::VisitFunctionDecl( FunctionDecl* declaration ) + { + // TODO also LO header files? or a subdir? + if( !context.getSourceManager().isFromMainFile( declaration->getLocStart())) + return true; + if( !declaration->doesThisDeclarationHaveABody()) + return true; + StmtParents parents; + traverseStatement( declaration->getBody(), parents ); + return true; + } + +void BodyNotInBlock::traverseStatement( const Stmt* stmt, StmtParents& parents ) + { + parents.push_back( stmt ); + for( ConstStmtIterator it = stmt->child_begin(); + it != stmt->child_end(); + ++it ) + { + if( *it != NULL ) // some children can be apparently NULL + { + traverseStatement( *it, parents ); // substatements first + parents.push_back( *it ); + if( const IfStmt* ifstmt = dyn_cast< IfStmt >( *it )) + { + checkBody( ifstmt->getThen(), parents, 0 ); + checkBody( ifstmt->getElse(), parents, 0 ); + } + else if( const WhileStmt* whilestmt = dyn_cast< WhileStmt >( *it )) + checkBody( whilestmt->getBody(), parents, 1 ); + else if( const ForStmt* forstmt = dyn_cast< ForStmt >( *it )) + checkBody( forstmt->getBody(), parents, 2 ); + else if( const CXXForRangeStmt* forstmt = dyn_cast< CXXForRangeStmt >( *it )) + checkBody( forstmt->getBody(), parents, 2 ); + parents.pop_back(); + } + } + assert( parents.back() == stmt ); + parents.pop_back(); + } + +void BodyNotInBlock::checkBody( const Stmt* body, const StmtParents& parents, int stmtType ) + { + if( body == NULL || parents.size() < 2 ) + return; + if( dyn_cast< CompoundStmt >( body )) + return; // if body is a compound statement, then it is in {} + // Find the next statement (in source position) after 'body'. + for( int parent_pos = parents.size() - 2; // start from grandparent + parent_pos >= 0; + --parent_pos ) + { + for( ConstStmtIterator it = parents[ parent_pos ]->child_begin(); + it != parents[ parent_pos ]->child_end(); + ) + { + if( *it == parents[ parent_pos + 1 ] ) // found grand(grand...)parent + { + // get next statement after our (grand...)parent + ++it; + while( it != parents[ parent_pos ]->child_end() && *it == NULL ) + ++it; // skip empty ones (missing 'else' bodies for example) + if( it != parents[ parent_pos ]->child_end()) + { + // TODO: If both statements come from macro expansions, they may be + // below evaluated to be in the same place (because they may be + // the result of expansion of the same macro). Analysing this including + // macro expansions would be probably more complicated, so just + // ignore that in order to avoid false positives. + if( body->getLocStart().isMacroID() && (*it)->getLocStart().isMacroID()) + return; + bool invalid1, invalid2; + unsigned bodyColumn = context.getSourceManager() + .getPresumedColumnNumber( body->getLocStart(), &invalid1 ); + unsigned nextStatementColumn = context.getSourceManager() + .getPresumedColumnNumber( (*it)->getLocStart(), &invalid2 ); + if( invalid1 || invalid2 ) + return; + if( bodyColumn == nextStatementColumn ) + { + report( DiagnosticsEngine::Warning, + "statement aligned as second statement in %select{if|while|for}0 body but not in a statement block [loplugin]", + (*it)->getLocStart()) << stmtType; + report( DiagnosticsEngine::Note, + "%select{if|while|for}0 body statement is here [loplugin]", + body->getLocStart()) << stmtType; + } + return; + } + // else we need to go higher to find the next statement + } + else + ++it; + } + // If going up would mean leaving a {} block, stop, because the } should + // make it visible the two statements are not in the same body. + if( dyn_cast< CompoundStmt >( parents[ parent_pos ] )) + return; + } + } + +} // namespace diff --git a/compilerplugins/clang/bodynotinblock.hxx b/compilerplugins/clang/bodynotinblock.hxx new file mode 100644 index 000000000000..dba82a67917e --- /dev/null +++ b/compilerplugins/clang/bodynotinblock.hxx @@ -0,0 +1,39 @@ +/* + * This file is part of the LibreOffice project. + * + * Based on LLVM/Clang. + * + * This file is distributed under the University of Illinois Open Source + * License. See LICENSE.TXT for details. + * + */ + +#ifndef BODYNOTINBLOCK_H +#define BODYNOTINBLOCK_H + +#include + +using namespace clang; + +namespace loplugin +{ + +typedef std::vector< const Stmt* > StmtParents; + +class BodyNotInBlock + : public RecursiveASTVisitor< BodyNotInBlock > + { + public: + explicit BodyNotInBlock( ASTContext& context ); + void run(); + bool VisitFunctionDecl( FunctionDecl* declaration ); + private: + void traverseStatement( const Stmt* stmt, StmtParents& parents ); + void checkBody( const Stmt* body, const StmtParents& parents, int stmtType ); + DiagnosticBuilder report( DiagnosticsEngine::Level level, StringRef message, SourceLocation loc ); + ASTContext& context; + }; + +} // namespace + +#endif // BODYNOTINBLOCK_H diff --git a/compilerplugins/clang/compileplugin.cxx b/compilerplugins/clang/compileplugin.cxx index 2b1647560117..d2e32c04a5d8 100644 --- a/compilerplugins/clang/compileplugin.cxx +++ b/compilerplugins/clang/compileplugin.cxx @@ -17,6 +17,7 @@ #include #include +#include "bodynotinblock.hxx" #include "unusedvariablecheck.hxx" using namespace clang; @@ -33,6 +34,7 @@ class PluginHandler public: explicit PluginHandler( ASTContext& context ) : rewriter( context.getSourceManager(), context.getLangOpts()) + , bodyNotInBlock( context ) , unusedVariableCheck( context ) { } @@ -40,6 +42,7 @@ class PluginHandler { if( context.getDiagnostics().hasErrorOccurred()) return; + bodyNotInBlock.run(); unusedVariableCheck.run(); // TODO also LO header files? or a subdir? if( const RewriteBuffer* buf = rewriter.getRewriteBufferFor( context.getSourceManager().getMainFileID())) @@ -48,6 +51,7 @@ class PluginHandler } private: Rewriter rewriter; + BodyNotInBlock bodyNotInBlock; UnusedVariableCheck unusedVariableCheck; }; From 4fc56b9d4cd12cca51d7696e0776de5aa8f822cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Tue, 9 Oct 2012 16:27:25 +0200 Subject: [PATCH 609/863] move some code to a common base Change-Id: Ife306c69054dfcc20b1339b88a4e14e5333ced71 --- compilerplugins/clang/bodynotinblock.cxx | 15 +-------------- compilerplugins/clang/bodynotinblock.hxx | 10 +++------- compilerplugins/clang/compileplugin.cxx | 16 ++++++++++++++++ compilerplugins/clang/compileplugin.hxx | 18 ++++++++++++++++++ compilerplugins/clang/unusedvariablecheck.cxx | 15 +-------------- compilerplugins/clang/unusedvariablecheck.hxx | 8 ++------ 6 files changed, 41 insertions(+), 41 deletions(-) diff --git a/compilerplugins/clang/bodynotinblock.cxx b/compilerplugins/clang/bodynotinblock.cxx index 9f5bf0e75c4e..ce19a5f6477a 100644 --- a/compilerplugins/clang/bodynotinblock.cxx +++ b/compilerplugins/clang/bodynotinblock.cxx @@ -12,8 +12,6 @@ #include -using namespace clang; - namespace loplugin { @@ -23,21 +21,10 @@ but are not inside a compound statement and thus the second one is unrelated. */ BodyNotInBlock::BodyNotInBlock( ASTContext& context ) - : context( context ) + : Plugin( context ) { } -DiagnosticBuilder BodyNotInBlock::report( DiagnosticsEngine::Level level, StringRef message, SourceLocation loc ) - { - // Do some mappings (e.g. for -Werror) that clang does not do for custom messages for some reason. - DiagnosticsEngine& diag = context.getDiagnostics(); - if( level == DiagnosticsEngine::Warning && diag.getWarningsAsErrors()) - level = DiagnosticsEngine::Error; - if( level == DiagnosticsEngine::Error && diag.getErrorsAsFatal()) - level = DiagnosticsEngine::Fatal; - return diag.Report( loc, diag.getCustomDiagID( level, message )); - } - void BodyNotInBlock::run() { TraverseDecl( context.getTranslationUnitDecl()); diff --git a/compilerplugins/clang/bodynotinblock.hxx b/compilerplugins/clang/bodynotinblock.hxx index dba82a67917e..9846d7a0e567 100644 --- a/compilerplugins/clang/bodynotinblock.hxx +++ b/compilerplugins/clang/bodynotinblock.hxx @@ -11,27 +11,23 @@ #ifndef BODYNOTINBLOCK_H #define BODYNOTINBLOCK_H -#include - -using namespace clang; +#include "compileplugin.hxx" namespace loplugin { -typedef std::vector< const Stmt* > StmtParents; - class BodyNotInBlock : public RecursiveASTVisitor< BodyNotInBlock > + , public Plugin { public: explicit BodyNotInBlock( ASTContext& context ); void run(); bool VisitFunctionDecl( FunctionDecl* declaration ); private: + typedef std::vector< const Stmt* > StmtParents; void traverseStatement( const Stmt* stmt, StmtParents& parents ); void checkBody( const Stmt* body, const StmtParents& parents, int stmtType ); - DiagnosticBuilder report( DiagnosticsEngine::Level level, StringRef message, SourceLocation loc ); - ASTContext& context; }; } // namespace diff --git a/compilerplugins/clang/compileplugin.cxx b/compilerplugins/clang/compileplugin.cxx index d2e32c04a5d8..99ab2725d7c5 100644 --- a/compilerplugins/clang/compileplugin.cxx +++ b/compilerplugins/clang/compileplugin.cxx @@ -25,6 +25,22 @@ using namespace clang; namespace loplugin { +Plugin::Plugin( ASTContext& context ) + : context( context ) + { + } + +DiagnosticBuilder Plugin::report( DiagnosticsEngine::Level level, StringRef message, SourceLocation loc ) + { + // Do some mappings (e.g. for -Werror) that clang does not do for custom messages for some reason. + DiagnosticsEngine& diag = context.getDiagnostics(); + if( level == DiagnosticsEngine::Warning && diag.getWarningsAsErrors()) + level = DiagnosticsEngine::Error; + if( level == DiagnosticsEngine::Error && diag.getErrorsAsFatal()) + level = DiagnosticsEngine::Fatal; + return diag.Report( loc, diag.getCustomDiagID( level, message )); + } + /** Class that manages all LO modules. */ diff --git a/compilerplugins/clang/compileplugin.hxx b/compilerplugins/clang/compileplugin.hxx index f7d5182b7b0f..edf3a5ea11a8 100644 --- a/compilerplugins/clang/compileplugin.hxx +++ b/compilerplugins/clang/compileplugin.hxx @@ -11,4 +11,22 @@ #ifndef COMPILEPLUGIN_H #define COMPILEPLUGIN_H +#include + +using namespace clang; + +namespace loplugin +{ + +class Plugin + { + public: + explicit Plugin( ASTContext& context ); + protected: + DiagnosticBuilder report( DiagnosticsEngine::Level level, StringRef message, SourceLocation loc ); + ASTContext& context; + }; + +} // namespace + #endif // COMPILEPLUGIN_H diff --git a/compilerplugins/clang/unusedvariablecheck.cxx b/compilerplugins/clang/unusedvariablecheck.cxx index 029e637b578c..a9e47b2eb316 100644 --- a/compilerplugins/clang/unusedvariablecheck.cxx +++ b/compilerplugins/clang/unusedvariablecheck.cxx @@ -12,8 +12,6 @@ #include -using namespace clang; - namespace loplugin { @@ -31,7 +29,7 @@ that cannot be edited there is a manual list below. */ UnusedVariableCheck::UnusedVariableCheck( ASTContext& context ) - : context( context ) + : Plugin( context ) { } @@ -40,17 +38,6 @@ void UnusedVariableCheck::run() TraverseDecl( context.getTranslationUnitDecl()); } -DiagnosticBuilder UnusedVariableCheck::report( DiagnosticsEngine::Level level, StringRef message, SourceLocation loc ) - { - // Do some mappings (e.g. for -Werror) that clang does not do for custom messages for some reason. - DiagnosticsEngine& diag = context.getDiagnostics(); - if( level == DiagnosticsEngine::Warning && diag.getWarningsAsErrors()) - level = DiagnosticsEngine::Error; - if( level == DiagnosticsEngine::Error && diag.getErrorsAsFatal()) - level = DiagnosticsEngine::Fatal; - return diag.Report( loc, diag.getCustomDiagID( level, message )); - } - bool UnusedVariableCheck::VisitNamedDecl( NamedDecl* declaration ) { // TODO also LO header files? or a subdir? diff --git a/compilerplugins/clang/unusedvariablecheck.hxx b/compilerplugins/clang/unusedvariablecheck.hxx index c49532a86414..21e0eabd03c0 100644 --- a/compilerplugins/clang/unusedvariablecheck.hxx +++ b/compilerplugins/clang/unusedvariablecheck.hxx @@ -11,23 +11,19 @@ #ifndef UNUSEDVARIABLECHECK_H #define UNUSEDVARIABLECHECK_H -#include - -using namespace clang; +#include "compileplugin.hxx" namespace loplugin { class UnusedVariableCheck : public RecursiveASTVisitor< UnusedVariableCheck > + , public Plugin { public: explicit UnusedVariableCheck( ASTContext& context ); void run(); bool VisitNamedDecl( NamedDecl* declaration ); - private: - DiagnosticBuilder report( DiagnosticsEngine::Level level, StringRef message, SourceLocation loc ); - ASTContext& context; }; } // namespace From 4d05099806fc6116fbd7abe992d7f2f31210dd4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Tue, 9 Oct 2012 16:28:13 +0200 Subject: [PATCH 610/863] do not force compiler plugin warnings to errors with -Werror, for now Change-Id: I87585fce44e803513d5345709d9723075b9429a1 --- compilerplugins/clang/compileplugin.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/compilerplugins/clang/compileplugin.cxx b/compilerplugins/clang/compileplugin.cxx index 99ab2725d7c5..e5d34a32ccd5 100644 --- a/compilerplugins/clang/compileplugin.cxx +++ b/compilerplugins/clang/compileplugin.cxx @@ -32,12 +32,14 @@ Plugin::Plugin( ASTContext& context ) DiagnosticBuilder Plugin::report( DiagnosticsEngine::Level level, StringRef message, SourceLocation loc ) { - // Do some mappings (e.g. for -Werror) that clang does not do for custom messages for some reason. DiagnosticsEngine& diag = context.getDiagnostics(); +#if 0 + // Do some mappings (e.g. for -Werror) that clang does not do for custom messages for some reason. if( level == DiagnosticsEngine::Warning && diag.getWarningsAsErrors()) level = DiagnosticsEngine::Error; if( level == DiagnosticsEngine::Error && diag.getErrorsAsFatal()) level = DiagnosticsEngine::Fatal; +#endif return diag.Report( loc, diag.getCustomDiagID( level, message )); } From 7cd19a8f10881028bfaf4217e586955f1d435c31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Tue, 9 Oct 2012 16:39:49 +0200 Subject: [PATCH 611/863] do not analyse system headers in the compiler plugin Change-Id: Ica1e233b45cc778bfdc86cfd608ada7fc261c6c2 --- compilerplugins/clang/bodynotinblock.cxx | 3 +-- compilerplugins/clang/compileplugin.cxx | 5 +++++ compilerplugins/clang/compileplugin.hxx | 15 +++++++++++++++ compilerplugins/clang/unusedvariablecheck.cxx | 3 +-- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/compilerplugins/clang/bodynotinblock.cxx b/compilerplugins/clang/bodynotinblock.cxx index ce19a5f6477a..9e59896f892f 100644 --- a/compilerplugins/clang/bodynotinblock.cxx +++ b/compilerplugins/clang/bodynotinblock.cxx @@ -32,8 +32,7 @@ void BodyNotInBlock::run() bool BodyNotInBlock::VisitFunctionDecl( FunctionDecl* declaration ) { - // TODO also LO header files? or a subdir? - if( !context.getSourceManager().isFromMainFile( declaration->getLocStart())) + if( ignoreLocation( declaration )) return true; if( !declaration->doesThisDeclarationHaveABody()) return true; diff --git a/compilerplugins/clang/compileplugin.cxx b/compilerplugins/clang/compileplugin.cxx index e5d34a32ccd5..a61a3bab66a4 100644 --- a/compilerplugins/clang/compileplugin.cxx +++ b/compilerplugins/clang/compileplugin.cxx @@ -43,6 +43,11 @@ DiagnosticBuilder Plugin::report( DiagnosticsEngine::Level level, StringRef mess return diag.Report( loc, diag.getCustomDiagID( level, message )); } +bool Plugin::ignoreLocation( SourceLocation loc ) + { + return context.getSourceManager().isInSystemHeader( context.getSourceManager().getExpansionLoc( loc )); + } + /** Class that manages all LO modules. */ diff --git a/compilerplugins/clang/compileplugin.hxx b/compilerplugins/clang/compileplugin.hxx index edf3a5ea11a8..a02b36005e4b 100644 --- a/compilerplugins/clang/compileplugin.hxx +++ b/compilerplugins/clang/compileplugin.hxx @@ -24,9 +24,24 @@ class Plugin explicit Plugin( ASTContext& context ); protected: DiagnosticBuilder report( DiagnosticsEngine::Level level, StringRef message, SourceLocation loc ); + bool ignoreLocation( SourceLocation loc ); + bool ignoreLocation( const Decl* decl ); + bool ignoreLocation( const Stmt* stmt ); ASTContext& context; }; +inline +bool Plugin::ignoreLocation( const Decl* decl ) + { + return ignoreLocation( decl->getLocStart()); + } + +inline +bool Plugin::ignoreLocation( const Stmt* stmt ) + { + return ignoreLocation( stmt->getLocStart()); + } + } // namespace #endif // COMPILEPLUGIN_H diff --git a/compilerplugins/clang/unusedvariablecheck.cxx b/compilerplugins/clang/unusedvariablecheck.cxx index a9e47b2eb316..f2916320718d 100644 --- a/compilerplugins/clang/unusedvariablecheck.cxx +++ b/compilerplugins/clang/unusedvariablecheck.cxx @@ -40,8 +40,7 @@ void UnusedVariableCheck::run() bool UnusedVariableCheck::VisitNamedDecl( NamedDecl* declaration ) { - // TODO also LO header files? or a subdir? - if( !context.getSourceManager().isFromMainFile( declaration->getLocStart())) + if( ignoreLocation( declaration )) return true; if( !isa< VarDecl >( declaration )) return true; From 4d3c6a04995a19209c3a66b92fddbb50c92418b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Tue, 9 Oct 2012 16:48:48 +0200 Subject: [PATCH 612/863] ignore macro expansion completely for now Change-Id: Ie37b83fef1279a0a953de27941e3b342437c81d1 --- compilerplugins/clang/bodynotinblock.cxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/compilerplugins/clang/bodynotinblock.cxx b/compilerplugins/clang/bodynotinblock.cxx index 9e59896f892f..9c047c501fca 100644 --- a/compilerplugins/clang/bodynotinblock.cxx +++ b/compilerplugins/clang/bodynotinblock.cxx @@ -74,6 +74,13 @@ void BodyNotInBlock::checkBody( const Stmt* body, const StmtParents& parents, in { if( body == NULL || parents.size() < 2 ) return; + // TODO: If the if/while/for comes from a macro expansion, ignore it completely for + // now. The code below could assume everything is in the same place (and thus also column) + // and give a false warning. Moreover some macros are rather lousily written and would + // result in poor formatting. To be evaluated later, maybe this could be handled + // including macro expansion. + if( parents.back()->getLocStart().isMacroID()) + return; if( dyn_cast< CompoundStmt >( body )) return; // if body is a compound statement, then it is in {} // Find the next statement (in source position) after 'body'. @@ -93,13 +100,6 @@ void BodyNotInBlock::checkBody( const Stmt* body, const StmtParents& parents, in ++it; // skip empty ones (missing 'else' bodies for example) if( it != parents[ parent_pos ]->child_end()) { - // TODO: If both statements come from macro expansions, they may be - // below evaluated to be in the same place (because they may be - // the result of expansion of the same macro). Analysing this including - // macro expansions would be probably more complicated, so just - // ignore that in order to avoid false positives. - if( body->getLocStart().isMacroID() && (*it)->getLocStart().isMacroID()) - return; bool invalid1, invalid2; unsigned bodyColumn = context.getSourceManager() .getPresumedColumnNumber( body->getLocStart(), &invalid1 ); From 7c4d3ea6ba4d42b4dda5148a00c8c411b5d7703d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Tue, 9 Oct 2012 16:55:15 +0200 Subject: [PATCH 613/863] don't check next statement after if body if there's also an else part Change-Id: I04265acd821187f529562691f35ede93b84368fa --- compilerplugins/clang/bodynotinblock.cxx | 9 +++++++-- compilerplugins/clang/bodynotinblock.hxx | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/compilerplugins/clang/bodynotinblock.cxx b/compilerplugins/clang/bodynotinblock.cxx index 9c047c501fca..f13eb9392357 100644 --- a/compilerplugins/clang/bodynotinblock.cxx +++ b/compilerplugins/clang/bodynotinblock.cxx @@ -54,7 +54,7 @@ void BodyNotInBlock::traverseStatement( const Stmt* stmt, StmtParents& parents ) parents.push_back( *it ); if( const IfStmt* ifstmt = dyn_cast< IfStmt >( *it )) { - checkBody( ifstmt->getThen(), parents, 0 ); + checkBody( ifstmt->getThen(), parents, 0, ifstmt->getElse() != NULL ); checkBody( ifstmt->getElse(), parents, 0 ); } else if( const WhileStmt* whilestmt = dyn_cast< WhileStmt >( *it )) @@ -70,7 +70,7 @@ void BodyNotInBlock::traverseStatement( const Stmt* stmt, StmtParents& parents ) parents.pop_back(); } -void BodyNotInBlock::checkBody( const Stmt* body, const StmtParents& parents, int stmtType ) +void BodyNotInBlock::checkBody( const Stmt* body, const StmtParents& parents, int stmtType, bool dontGoUp ) { if( body == NULL || parents.size() < 2 ) return; @@ -127,6 +127,11 @@ void BodyNotInBlock::checkBody( const Stmt* body, const StmtParents& parents, in // make it visible the two statements are not in the same body. if( dyn_cast< CompoundStmt >( parents[ parent_pos ] )) return; + // If the body to be checked is a body of an if statement that has also + // an else part, don't go up, the else is after the body and should make + // it clear the body does not continue there. + if( dontGoUp ) + return; } } diff --git a/compilerplugins/clang/bodynotinblock.hxx b/compilerplugins/clang/bodynotinblock.hxx index 9846d7a0e567..a2c47e6683cd 100644 --- a/compilerplugins/clang/bodynotinblock.hxx +++ b/compilerplugins/clang/bodynotinblock.hxx @@ -27,7 +27,7 @@ class BodyNotInBlock private: typedef std::vector< const Stmt* > StmtParents; void traverseStatement( const Stmt* stmt, StmtParents& parents ); - void checkBody( const Stmt* body, const StmtParents& parents, int stmtType ); + void checkBody( const Stmt* body, const StmtParents& parents, int stmtType, bool dontGoUp = false ); }; } // namespace From f0eb45df5e3f59991102b2228a62d15baa397b59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Tue, 9 Oct 2012 17:01:14 +0200 Subject: [PATCH 614/863] fix some lousy formatting that triggers warnings from the compiler plugin Change-Id: I94cafba5363f24d608add6878c72f230f45fdb87 --- soltools/cpp/_macro.c | 2 +- soltools/mkdepend/cppsetup.c | 8 ++++---- soltools/mkdepend/ifparser.c | 8 ++++---- soltools/mkdepend/main.c | 28 ++++++++++++++-------------- soltools/mkdepend/parse.c | 14 ++++++-------- 5 files changed, 29 insertions(+), 31 deletions(-) diff --git a/soltools/cpp/_macro.c b/soltools/cpp/_macro.c index 7490597a608b..251a1f63dfff 100644 --- a/soltools/cpp/_macro.c +++ b/soltools/cpp/_macro.c @@ -664,7 +664,7 @@ Tokenrow * // Change by np 31.10.2001, #93725 - begin if ( tp->wslen > 0 ) - *sp++ = ' '; + *sp++ = ' '; // change end. for (i = 0, cp = tp->t; (unsigned int)i < tp->len; i++) diff --git a/soltools/mkdepend/cppsetup.c b/soltools/mkdepend/cppsetup.c index 6a4d2b8cf68a..f4cdaa55eeb1 100644 --- a/soltools/mkdepend/cppsetup.c +++ b/soltools/mkdepend/cppsetup.c @@ -161,7 +161,7 @@ _lookup_variable (var, len) char tmpbuf[MAXNAMELEN + 1]; if (len > MAXNAMELEN) - return 0; + return 0; strncpy (tmpbuf, var, len); tmpbuf[len] = '\0'; @@ -177,9 +177,9 @@ _my_eval_defined (ip, var, len) { (void)ip; if (_lookup_variable (var, len)) - return 1; + return 1; else - return 0; + return 0; } #define isvarfirstletter(ccc) (isalpha(ccc) || (ccc) == '_') @@ -196,7 +196,7 @@ _my_eval_variable (ip, var, len) s = _lookup_variable (var, len); if (!s) - return 0; + return 0; do { var = s; if (!isvarfirstletter(*var)) diff --git a/soltools/mkdepend/ifparser.c b/soltools/mkdepend/ifparser.c index abfb92c9e48a..6518b1e5a974 100644 --- a/soltools/mkdepend/ifparser.c +++ b/soltools/mkdepend/ifparser.c @@ -82,7 +82,7 @@ parse_variable (g, cp, varp) SKIPSPACE (cp); if (!isvarfirstletter (*cp)) - return CALLFUNC(g, handle_error) (g, cp, "variable name"); + return CALLFUNC(g, handle_error) (g, cp, "variable name"); *varp = cp; /* EMPTY */ @@ -100,7 +100,7 @@ parse_number (g, cp, valp) SKIPSPACE (cp); if (!isdigit(*cp)) - return CALLFUNC(g, handle_error) (g, cp, "number"); + return CALLFUNC(g, handle_error) (g, cp, "number"); #ifdef WIN32 { @@ -128,7 +128,7 @@ parse_value (g, cp, valp) SKIPSPACE (cp); if (!*cp) - return cp; + return cp; switch (*cp) { case '(': @@ -178,7 +178,7 @@ parse_value (g, cp, valp) len = (int)(cp - var); SKIPSPACE (cp); if (paren && *cp != ')') - return CALLFUNC(g, handle_error) (g, cp, ")"); + return CALLFUNC(g, handle_error) (g, cp, ")"); *valp = (*(g->funcs.eval_defined)) (g, var, len); return cp + paren; /* skip the right paren */ } diff --git a/soltools/mkdepend/main.c b/soltools/mkdepend/main.c index f9dc0f764ebd..5beb8fdf981e 100644 --- a/soltools/mkdepend/main.c +++ b/soltools/mkdepend/main.c @@ -195,18 +195,18 @@ int main(argc, argv) nargc = 1; if ((afd = open(argv[1]+1, O_RDONLY)) < 0) - fatalerr("cannot open \"%s\"\n", argv[1]+1); + fatalerr("cannot open \"%s\"\n", argv[1]+1); fstat(afd, &ast); args = (char *)malloc(ast.st_size + 1); if ((ast.st_size = read(afd, args, (size_t) ast.st_size)) < 0) - fatalerr("failed to read %s\n", argv[1]+1); + fatalerr("failed to read %s\n", argv[1]+1); args[ast.st_size] = '\0'; close(afd); for (p = args; *p; p++) { if (quotechar) { - if (quotechar == '\\' || - (*p == quotechar && p[-1] != '\\')) - quotechar = '\0'; + if (quotechar == '\\' + || (*p == quotechar && p[-1] != '\\')) + quotechar = '\0'; continue; } switch (*p) { @@ -219,18 +219,18 @@ int main(argc, argv) case '\n': *p = '\0'; if (p > args && p[-1]) - nargc++; + nargc++; break; } } if (p[-1]) - nargc++; + nargc++; nargv = (char **)malloc(nargc * sizeof(char *)); nargv[0] = argv[0]; argc = 1; for (p = args; argc < nargc; p += strlen(p) + 1) - if (*p) nargv[argc++] = p; - argv = nargv; + if (*p) nargv[argc++] = p; + argv = nargv; } for(argc--, argv++; argc; argc--, argv++) { /* if looking for endmarker then check before parsing */ @@ -364,16 +364,16 @@ int main(argc, argv) *incp++ = PREINCDIR; #endif if (incp >= includedirs + MAXDIRS) - fatalerr("Too many -I flags.\n"); + fatalerr("Too many -I flags.\n"); *incp++ = INCLUDEDIR; #ifdef POSTINCDIR if (incp >= includedirs + MAXDIRS) - fatalerr("Too many -I flags.\n"); + fatalerr("Too many -I flags.\n"); *incp++ = POSTINCDIR; #endif } else if (*defincdir) { if (incp >= includedirs + MAXDIRS) - fatalerr("Too many -I flags.\n"); + fatalerr("Too many -I flags.\n"); *incp++ = defincdir; } @@ -709,8 +709,8 @@ void redirect(line, makefile) } if (!found) { if (verbose) - warning("Adding new delimiting line \"%s\" and dependencies...\n", - line); + warning("Adding new delimiting line \"%s\" and dependencies...\n", + line); puts(line); /* same as fputs(fdout); but with newline */ } else if (append) { while (fgets(buf, BUFSIZ, fdin)) { diff --git a/soltools/mkdepend/parse.c b/soltools/mkdepend/parse.c index 939155aa3b83..0914fbc57ede 100644 --- a/soltools/mkdepend/parse.c +++ b/soltools/mkdepend/parse.c @@ -70,11 +70,9 @@ int find_includes(struct filepointer *filep, struct inclist *file, struct inclis if (type == ELSE) find_includes(filep, file, file_red, recursion+1, recfailOK, incCollection, symbols); - else - if (type == ELIF) + else if (type == ELIF) goto doif; - else - if ((type == ELIFFALSE) || (type == ELIFGUESSFALSE)) + else if ((type == ELIFFALSE) || (type == ELIFGUESSFALSE)) goto doiffalse; break; case IFDEF: @@ -398,14 +396,14 @@ void define( def, symbols ) /* Separate symbol name and its value */ val = def; while (isalnum(*val) || *val == '_') - val++; + val++; if (*val) - *val++ = '\0'; + *val++ = '\0'; while (*val == ' ' || *val == '\t') - val++; + val++; if (!*val) - val = "1"; + val = "1"; hash_define( def, val, symbols ); } From d19067683df48fd6a31dbe82da69f14f7680bf0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Tue, 9 Oct 2012 17:09:48 +0200 Subject: [PATCH 615/863] fix incorrect formatting Change-Id: Ibe865e189db747a9d61268ad02b097002cb44654 --- vcl/inc/vcl/keycod.hxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vcl/inc/vcl/keycod.hxx b/vcl/inc/vcl/keycod.hxx index a29b30843507..0d22720029df 100644 --- a/vcl/inc/vcl/keycod.hxx +++ b/vcl/inc/vcl/keycod.hxx @@ -101,8 +101,8 @@ inline KeyCode::KeyCode( sal_uInt16 nKey, sal_Bool bShift, sal_Bool bMod1, sal_B nCode |= KEY_MOD1; if( bMod2 ) nCode |= KEY_MOD2; - if( bMod3 ) - nCode |= KEY_MOD3; + if( bMod3 ) + nCode |= KEY_MOD3; eFunc = KEYFUNC_DONTKNOW; } From 5fe7a4245d5c0a5c00c5f72f10781f624ad599fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 9 Oct 2012 10:31:01 +0100 Subject: [PATCH 616/863] always assert on a missing widget for the typical case Change-Id: Ia68bfa8a3d2a6091491d69a9141a7c47556097fe --- vcl/inc/vcl/builder.hxx | 3 +++ vcl/source/control/fixed.cxx | 1 + 2 files changed, 4 insertions(+) diff --git a/vcl/inc/vcl/builder.hxx b/vcl/inc/vcl/builder.hxx index 0a6574c8af03..aae959a3fe31 100644 --- a/vcl/inc/vcl/builder.hxx +++ b/vcl/inc/vcl/builder.hxx @@ -140,9 +140,11 @@ public: VclBuilder(Window *pParent, OUString sUIRootDir, OUString sUIFile, OString sID = OString()); ~VclBuilder(); Window *get_widget_root(); + //sID must exist and be of type T template T* get(T*& ret, OString sID) { Window *w = get_by_name(sID); + assert(w); ret = static_cast(w); #if OSL_DEBUG_LEVEL > 0 @@ -155,6 +157,7 @@ public: return ret; } + //sID may not exist, but must be of type T if it does template T* get(OString sID) { Window *w = get_by_name(sID); diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index 785f65c41db4..9409fe6698ac 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -476,6 +476,7 @@ bool FixedText::set_property(const rtl::OString &rKey, const rtl::OString &rValu } else return Control::set_property(rKey, rValue); + return true; } // ======================================================================= From fda9d127b2e355e4c440aa396a4e8e6c8a68e9da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 9 Oct 2012 12:36:43 +0100 Subject: [PATCH 617/863] add .src and .hrc to add-modelines Change-Id: I4c0d2d408c5de770bbad54294a109743fa35b3f6 --- solenv/bin/add-modelines | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solenv/bin/add-modelines b/solenv/bin/add-modelines index 5984c8fe53e0..ea0f2dee3074 100755 --- a/solenv/bin/add-modelines +++ b/solenv/bin/add-modelines @@ -31,7 +31,7 @@ set -o posix # Change these to taste FirstLine='/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */' LastLine='/* vim:set shiftwidth=4 softtabstop=4 expandtab: */' -SourceFiles='*.cxx *.cpp *.hxx *.hpp *.c *.h *.m *.mm *.idl' +SourceFiles='*.cxx *.cpp *.hxx *.hpp *.c *.h *.m *.mm *.idl *.src *.hrc' # Set defaults (don't change these) ModelineReplace="false" From f6b67d95d9b41a773189e445d0108c320d71e000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 9 Oct 2012 13:23:12 +0100 Subject: [PATCH 618/863] convert graphic export dialog to .ui Change-Id: I3bd078e569c5cb1a55cfb44de7b1e569908e1698 --- svtools/AllLangResTarget_svt.mk | 2 +- svtools/Module_svtools.mk | 1 + svtools/UI_svt.mk | 16 + svtools/inc/svtools/svtools.hrc | 15 +- svtools/source/filter/exportdialog.cxx | 791 ++++++------------ svtools/source/filter/exportdialog.hrc | 82 -- svtools/source/filter/exportdialog.hxx | 111 ++- svtools/source/filter/exportdialog.src | 416 ---------- svtools/source/misc/svtools.src | 52 ++ svtools/uiconfig/ui/graphicexport.ui | 1060 ++++++++++++++++++++++++ 10 files changed, 1464 insertions(+), 1082 deletions(-) create mode 100644 svtools/UI_svt.mk delete mode 100644 svtools/source/filter/exportdialog.hrc delete mode 100644 svtools/source/filter/exportdialog.src create mode 100644 svtools/source/misc/svtools.src create mode 100644 svtools/uiconfig/ui/graphicexport.ui diff --git a/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk index 3cdff1a40bac..81f05b4792c0 100644 --- a/svtools/AllLangResTarget_svt.mk +++ b/svtools/AllLangResTarget_svt.mk @@ -66,12 +66,12 @@ $(eval $(call gb_SrsTarget_add_files,svt/res,\ svtools/source/dialogs/prnsetup.src \ svtools/source/dialogs/so3res.src \ svtools/source/dialogs/wizardmachine.src \ - svtools/source/filter/exportdialog.src \ svtools/source/java/javaerror.src \ svtools/source/misc/ehdl.src \ svtools/source/misc/helpagent.src \ svtools/source/misc/imagemgr.src \ svtools/source/misc/langtab.src \ + svtools/source/misc/svtools.src \ svtools/source/misc/undo.src \ svtools/source/toolpanel/toolpanel.src \ )) diff --git a/svtools/Module_svtools.mk b/svtools/Module_svtools.mk index bfefee30d666..e182a3678bc9 100644 --- a/svtools/Module_svtools.mk +++ b/svtools/Module_svtools.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Module_add_targets,svtools,\ Library_hatchwindowfactory \ Library_svt \ Package_inc \ + UI_svt \ )) ifneq ($(CROSS_COMPILING),YES) diff --git a/svtools/UI_svt.mk b/svtools/UI_svt.mk new file mode 100644 index 000000000000..7a8cf96a0054 --- /dev/null +++ b/svtools/UI_svt.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_UI_UI,svt)) + +$(eval $(call gb_UI_add_uifiles,svt,\ + svtools/uiconfig/ui/graphicexport \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/svtools/inc/svtools/svtools.hrc b/svtools/inc/svtools/svtools.hrc index e671679a5968..6988e1906c59 100644 --- a/svtools/inc/svtools/svtools.hrc +++ b/svtools/inc/svtools/svtools.hrc @@ -50,6 +50,16 @@ #define STR_SVT_FILEVIEW_COLUMN_TYPE (RID_SVTOOLS_START + 29) #define STR_FILTERNAME_ALL (RID_SVTOOLS_START + 30) #define RID_FILEVIEW_CONTEXTMENU (RID_SVTOOLS_START + 31) +#define STR_1BIT_THRESHOLD (RID_SVTOOLS_START + 32) +#define STR_1BIT_DITHERED (RID_SVTOOLS_START + 33) +#define STR_4BIT_GRAYSCALE (RID_SVTOOLS_START + 34) +#define STR_4BIT_COLOR_PALETTE (RID_SVTOOLS_START + 35) +#define STR_8BIT_GRAYSCALE (RID_SVTOOLS_START + 36) +#define STR_8BIT_COLOR_PALETTE (RID_SVTOOLS_START + 37) +#define STR_24BIT_TRUE_COLOR (RID_SVTOOLS_START + 38) +#define STR_ESTIMATED_SIZE_PIX_1 (RID_SVTOOLS_START + 39) +#define STR_ESTIMATED_SIZE_PIX_2 (RID_SVTOOLS_START + 40) +#define STR_ESTIMATED_SIZE_VEC (RID_SVTOOLS_START + 41) // doc template dialog #define DLG_DOCTEMPLATE (RID_SVTOOLS_START+50) @@ -216,9 +226,6 @@ //............................................................................. // dialogs -#define DLG_EXPORT_START (STR_ARR_SVT_LANGUAGE_TABLE_END + 1) -#define DLG_EXPORT (DLG_EXPORT_START) -#define DLG_EXPORT_TITLE (DLG_EXPORT_START+1) #define DLG_LOGIN (RID_SVTOOLS_START+113) #define DLG_ADDRESSBOOKSOURCE (RID_SVTOOLS_START+114) @@ -262,7 +269,7 @@ #define IMG_TRIANGLE_RIGHT (RID_SVTOOLS_START + 18) #define IMG_TRIANGLE_DOWN (RID_SVTOOLS_START + 20) -#define IMG_SVT_FOLDER (RID_SVTOOLS_START + 40) +#define IMG_SVT_FOLDER (RID_SVTOOLS_START + 42) #define IMG_SVT_NEWDOC (RID_SVTOOLS_START + 52) #define IMG_SVT_MYDOCS (RID_SVTOOLS_START + 53) diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx index b2a7d3867dc8..ec95415a0491 100644 --- a/svtools/source/filter/exportdialog.cxx +++ b/svtools/source/filter/exportdialog.cxx @@ -34,6 +34,8 @@ #include #include #include +#include +#include #include #include #include @@ -53,7 +55,6 @@ #include #include #include "exportdialog.hxx" -#include "exportdialog.hrc" #define FORMAT_UNKNOWN 0 #define FORMAT_JPG 1 @@ -84,7 +85,7 @@ using namespace ::com::sun::star; -static sal_Int16 GetFilterFormat(const rtl::OUString& rExt) +static sal_Int16 GetFilterFormat(const OUString& rExt) { sal_Int16 nFormat = FORMAT_UNKNOWN; if ( rExt == "JPG" ) @@ -187,7 +188,7 @@ uno::Sequence< beans::PropertyValue > ExportDialog::GetFilterData( sal_Bool bUpd { if ( bUpdateConfig ) { - sal_Int32 nUnit = maLbSizeX.GetSelectEntryPos(); + sal_Int32 nUnit = mpLbSizeX->GetSelectEntryPos(); if ( nUnit < 0 ) nUnit = UNIT_CM; @@ -200,20 +201,20 @@ uno::Sequence< beans::PropertyValue > ExportDialog::GetFilterData( sal_Bool bUpd if ( nUnit > UNIT_MAX_ID ) nUnit = UNIT_PIXEL; - sal_Int32 nResolution = maNfResolution.GetValue(); + sal_Int32 nResolution = mpNfResolution->GetValue(); if ( nResolution < 1 ) nResolution = 96; - mpOptionsItem->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "PixelExportUnit" ) ), nUnit ); - mpOptionsItem->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "PixelExportResolution" ) ), nResolution ); - mpOptionsItem->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "PixelExportResolutionUnit" ) ), maLbResolution.GetSelectEntryPos() ); + mpOptionsItem->WriteInt32(OUString("PixelExportUnit"), nUnit); + mpOptionsItem->WriteInt32(OUString("PixelExportResolution"), nResolution); + mpOptionsItem->WriteInt32(OUString("PixelExportResolutionUnit"), mpLbResolution->GetSelectEntryPos()); } else { if ( nUnit >= UNIT_PIXEL ) nUnit = UNIT_CM; - mpOptionsItem->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "VectorExportUnit" ) ), nUnit ); + mpOptionsItem->WriteInt32(OUString("VectorExportUnit"), nUnit); } } @@ -226,12 +227,12 @@ uno::Sequence< beans::PropertyValue > ExportDialog::GetFilterData( sal_Bool bUpd pFilterOptions = new FilterConfigItem( &aFilterData ); } - const String sLogicalWidth( String( RTL_CONSTASCII_USTRINGPARAM( "LogicalWidth" ) ) ); - const String sLogicalHeight( String( RTL_CONSTASCII_USTRINGPARAM( "LogicalHeight" ) ) ); + const OUString sLogicalWidth(OUString("LogicalWidth")); + const OUString sLogicalHeight(OUString("LogicalHeight")); if ( mbIsPixelFormat ) { - pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "PixelWidth" ) ), static_cast< sal_Int32 >( maSize.Width ) ); - pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "PixelHeight" ) ), static_cast< sal_Int32 >( maSize.Height ) ); + pFilterOptions->WriteInt32(OUString("PixelWidth"), static_cast< sal_Int32 >( maSize.Width ) ); + pFilterOptions->WriteInt32(OUString("PixelHeight"), static_cast< sal_Int32 >( maSize.Height ) ); if ( maResolution.Width && maResolution.Height ) { const double f100thmmPerPixelX = 100000.0 / maResolution.Width; @@ -254,44 +255,44 @@ uno::Sequence< beans::PropertyValue > ExportDialog::GetFilterData( sal_Bool bUpd { case FORMAT_JPG : { - sal_Int32 nColor = maLbColorDepth.GetSelectEntryPos(); + sal_Int32 nColor = mpLbColorDepth->GetSelectEntryPos(); if ( nColor == 1 ) nColor = 0; else nColor = 1; - pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "ColorMode" ) ), nColor ); - pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Quality" ) ), static_cast< sal_Int32 >( maSbCompression.GetThumbPos() ) ); + pFilterOptions->WriteInt32(OUString("ColorMode"), nColor); + pFilterOptions->WriteInt32(OUString("Quality"), static_cast(mpSbCompression->GetThumbPos())); } break; case FORMAT_PNG : { - pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Compression" ) ), static_cast< sal_Int32 >( maSbCompression.GetThumbPos() ) ); + pFilterOptions->WriteInt32(OUString("Compression"), static_cast(mpSbCompression->GetThumbPos())); sal_Int32 nInterlace = 0; - if ( maCbInterlaced.IsChecked() ) + if ( mpCbInterlaced->IsChecked() ) nInterlace++; - pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Interlaced" ) ), nInterlace ); + pFilterOptions->WriteInt32(OUString("Interlaced"), nInterlace); } break; case FORMAT_BMP : { - pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Color" ) ), maLbColorDepth.GetSelectEntryPos() + 1 ); - pFilterOptions->WriteBool( String( RTL_CONSTASCII_USTRINGPARAM( "RLE_Coding" ) ), maCbRLEEncoding.IsChecked() ); + pFilterOptions->WriteInt32(OUString("Color"), mpLbColorDepth->GetSelectEntryPos() + 1); + pFilterOptions->WriteBool(OUString("RLE_Coding"), mpCbRLEEncoding->IsChecked()); } break; case FORMAT_GIF : { sal_Int32 nValue = 0; - if ( maCbInterlaced.IsChecked() ) + if ( mpCbInterlaced->IsChecked() ) nValue++; - pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Interlaced" ) ), nValue ); + pFilterOptions->WriteInt32(OUString("Interlaced"), nValue); nValue = 0; - if ( maCbSaveTransparency.IsChecked() ) + if (mpCbSaveTransparency->IsChecked()) nValue++; - pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Translucent" ) ), nValue ); + pFilterOptions->WriteInt32(OUString("Translucent"), nValue); } break; @@ -300,35 +301,35 @@ uno::Sequence< beans::PropertyValue > ExportDialog::GetFilterData( sal_Bool bUpd case FORMAT_PPM : { sal_Int32 nFormat = 0; - if ( maRbText.IsChecked() ) + if ( mpRbText->IsChecked() ) nFormat++; - pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "FileFormat" ) ), nFormat ); + pFilterOptions->WriteInt32(OUString("FileFormat"), nFormat); } break; case FORMAT_EPS : { sal_Int32 nCheck = 0; - if ( maCbEPSPreviewTIFF.IsChecked() ) + if ( mpCbEPSPreviewTIFF->IsChecked() ) nCheck++; - if ( maCbEPSPreviewEPSI.IsChecked() ) + if ( mpCbEPSPreviewEPSI->IsChecked() ) nCheck += 2; - pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Preview" ) ), nCheck ); + pFilterOptions->WriteInt32(OUString("Preview"), nCheck); nCheck = 1; - if ( maRbEPSLevel2.IsChecked() ) + if ( mpRbEPSLevel2->IsChecked() ) nCheck++; - pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Version" ) ), nCheck ); + pFilterOptions->WriteInt32(OUString("Version"), nCheck); nCheck = 1; - if ( maRbEPSColorFormat2.IsChecked() ) + if ( mpRbEPSColorFormat2->IsChecked() ) nCheck++; - pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "ColorFormat" ) ), nCheck ); + pFilterOptions->WriteInt32(OUString("ColorFormat"), nCheck); nCheck = 1; - if ( maRbEPSCompressionNone.IsChecked() ) + if ( mpRbEPSCompressionNone->IsChecked() ) nCheck++; - pFilterOptions->WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "CompressionMode" ) ), nCheck ); + pFilterOptions->WriteInt32(OUString("CompressionMode"), nCheck); } break; } @@ -352,9 +353,9 @@ awt::Size ExportDialog::GetOriginalSize() sal_Int32 nWidth = 0; sal_Int32 nHeight= 0; com::sun::star::uno::Any aAny; - aAny = xPagePropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Width" ) ) ); + aAny = xPagePropSet->getPropertyValue(OUString("Width")); aAny >>= nWidth; - aAny = xPagePropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Height" ) ) ); + aAny = xPagePropSet->getPropertyValue(OUString("Height")); aAny >>= nHeight; aShapesRange = basegfx::B2DRange( 0, 0, nWidth, nHeight ); } @@ -362,7 +363,7 @@ awt::Size ExportDialog::GetOriginalSize() else { uno::Reference< graphic::XPrimitiveFactory2D > xPrimitiveFactory( - mxMgr->createInstance( String( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.graphic.PrimitiveFactory2D" ) ) ), uno::UNO_QUERY ); + mxMgr->createInstance(OUString("com.sun.star.comp.graphic.PrimitiveFactory2D")), uno::UNO_QUERY); if ( xPrimitiveFactory.is() ) { basegfx::B2DHomMatrix aViewTransformation( Application::GetDefaultDevice()->GetViewTransformation() ); @@ -374,7 +375,7 @@ awt::Size ExportDialog::GetOriginalSize() aTransformation.m11 = aViewTransformation.get(1,1); aTransformation.m12 = aViewTransformation.get(1,2); - const rtl::OUString sViewTransformation( RTL_CONSTASCII_USTRINGPARAM( "ViewTransformation" ) ); + const OUString sViewTransformation( RTL_CONSTASCII_USTRINGPARAM( "ViewTransformation" ) ); uno::Sequence< beans::PropertyValue > aViewInformation( 1 ); aViewInformation[ 0 ].Value <<= aTransformation; aViewInformation[ 0 ].Name = sViewTransformation; @@ -464,20 +465,20 @@ sal_Bool ExportDialog::GetGraphicStream() uno::Reference < io::XOutputStream > xOutputStream( xStream->getOutputStream() ); uno::Reference< document::XExporter > xGraphicExporter( - mxMgr->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GraphicExportFilter") ) ), uno::UNO_QUERY_THROW ); + mxMgr->createInstance(OUString("com.sun.star.drawing.GraphicExportFilter")), uno::UNO_QUERY_THROW); uno::Reference< document::XFilter > xFilter( xGraphicExporter, uno::UNO_QUERY_THROW ); sal_Int32 nProperties = 2; uno::Sequence< beans::PropertyValue > aFilterData( nProperties ); - rtl::OUString sFormat( maExt ); + OUString sFormat( maExt ); uno::Sequence< beans::PropertyValue > aDescriptor( 3 ); - aDescriptor[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OutputStream") ); + aDescriptor[0].Name = OUString("OutputStream"); aDescriptor[0].Value <<= xOutputStream; - aDescriptor[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FilterName") ); + aDescriptor[1].Name = OUString("FilterName"); aDescriptor[1].Value <<= sFormat; - aDescriptor[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FilterData") ); + aDescriptor[2].Name = OUString("FilterData"); aDescriptor[2].Value <<= aNewFilterData; uno::Reference< lang::XComponent > xSourceDoc; @@ -531,7 +532,7 @@ sal_uInt32 ExportDialog::GetRawFileSize() const if ( mbIsPixelFormat ) { sal_Int32 nBitsPerPixel = 24; - String aEntry( maLbColorDepth.GetSelectEntry() ); + String aEntry( mpLbColorDepth->GetSelectEntry() ); if ( ms1BitTreshold == aEntry ) nBitsPerPixel = 1; else if ( ms1BitDithered == aEntry ) @@ -566,80 +567,78 @@ sal_Bool ExportDialog::IsTempExportAvailable() const return GetRawFileSize() < static_cast< sal_uInt32 >( mnMaxFilesizeForRealtimePreview ); } -ExportDialog::ExportDialog( FltCallDialogParameter& rPara, +ExportDialog::ExportDialog(FltCallDialogParameter& rPara, const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > rxMgr, - const com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& rxSourceDocument, - sal_Bool bExportSelection, sal_Bool bIsPixelFormat ) : - ModalDialog ( rPara.pWindow, ResId( DLG_EXPORT, *rPara.pResMgr ) ), - mrFltCallPara ( rPara ), - mpMgr ( rPara.pResMgr ), - mxMgr ( rxMgr ), - mxSourceDocument ( rxSourceDocument ), - maFlExportSize ( this, ResId( FL_EXPORT_SIZE, *rPara.pResMgr ) ), - maFtSizeX ( this, ResId( FT_SIZEX, *rPara.pResMgr ) ), - maMfSizeX ( this, ResId( MF_SIZEX, *rPara.pResMgr ) ), - maLbSizeX ( this, ResId( LB_SIZEX, *rPara.pResMgr ) ), - maFtSizeY ( this, ResId( FT_SIZEY, *rPara.pResMgr ) ), - maMfSizeY ( this, ResId( MF_SIZEY, *rPara.pResMgr ) ), - maLbSizeY ( this, ResId( LB_SIZEY, *rPara.pResMgr ) ), - maFtResolution ( this, ResId( FT_RESOLUTION, *rPara.pResMgr ) ), - maNfResolution ( this, ResId( NF_RESOLUTION, *rPara.pResMgr ) ), - maLbResolution ( this, ResId( LB_RESOLUTION, *rPara.pResMgr ) ), - maFlColorDepth ( this, ResId( FL_COLOR_DEPTH, *rPara.pResMgr ) ), - maLbColorDepth ( this, ResId( LB_COLOR_DEPTH, *rPara.pResMgr ) ), - maFlJPGQuality ( this, ResId( FL_JPG_QUALITY, *rPara.pResMgr ) ), - maFlMode ( this, ResId( FL_MODE, *rPara.pResMgr ) ), - maSbCompression ( this, ResId( SB_COMPRESSION, *rPara.pResMgr ) ), - maNfCompression ( this, ResId( NF_COMPRESSION, *rPara.pResMgr ) ), - maFtJPGMin ( this, ResId( FT_JPG_MIN, *rPara.pResMgr ) ), - maFtJPGMax ( this, ResId( FT_JPG_MAX, *rPara.pResMgr ) ), - maFtPNGMin ( this, ResId( FT_PNG_MIN, *rPara.pResMgr ) ), - maFtPNGMax ( this, ResId( FT_PNG_MAX, *rPara.pResMgr ) ), - maCbInterlaced ( this, ResId( CB_INTERLACED, *rPara.pResMgr ) ), - maCbRLEEncoding ( this, ResId( CB_RLE_ENCODING, *rPara.pResMgr ) ), - maFlGIFDrawingObjects ( this, ResId( FL_GIF_DRAWING_OBJECTS, *rPara.pResMgr ) ), - maCbSaveTransparency ( this, ResId( CB_SAVE_TRANSPARENCY, *rPara.pResMgr ) ), - maRbBinary ( this, ResId( RB_BINARY, *rPara.pResMgr ) ), - maRbText ( this, ResId( RB_TEXT, *rPara.pResMgr ) ), - maFlEPSPreview ( this, ResId( FL_EPS_PREVIEW, *rPara.pResMgr ) ), - maCbEPSPreviewTIFF ( this, ResId( CB_EPS_PREVIEW_TIFF, *rPara.pResMgr ) ), - maCbEPSPreviewEPSI ( this, ResId( CB_EPS_PREVIEW_EPSI, *rPara.pResMgr ) ), - maFlEPSVersion ( this, ResId( FL_EPS_VERSION, *rPara.pResMgr ) ), - maRbEPSLevel1 ( this, ResId( RB_EPS_LEVEL1, *rPara.pResMgr ) ), - maRbEPSLevel2 ( this, ResId( RB_EPS_LEVEL2, *rPara.pResMgr ) ), - maFlEPSColorFormat ( this, ResId( FL_EPS_COLOR_FORMAT, *rPara.pResMgr ) ), - maRbEPSColorFormat1 ( this, ResId( RB_EPS_COLOR_FORMAT1, *rPara.pResMgr ) ), - maRbEPSColorFormat2 ( this, ResId( RB_EPS_COLOR_FORMAT2, *rPara.pResMgr ) ), - maFlCompression ( this, ResId( FL_COMPRESSION, *rPara.pResMgr ) ), - maRbEPSCompressionLZW ( this, ResId( RB_EPS_COMPRESSION_LZW, *rPara.pResMgr ) ), - maRbEPSCompressionNone ( this, ResId( RB_EPS_COMPRESSION_NONE, *rPara.pResMgr ) ), - maFlEstimatedSize ( this, ResId( FL_ESTIMATED_SIZE, *rPara.pResMgr ) ), - maFtEstimatedSize ( this, ResId( FT_ESTIMATED_SIZE, *rPara.pResMgr ) ), - msEstimatedSizePix1 ( ResId( STR_ESTIMATED_SIZE_PIX_1, *rPara.pResMgr ).toString() ), - msEstimatedSizePix2 ( ResId( STR_ESTIMATED_SIZE_PIX_2, *rPara.pResMgr ).toString() ), - msEstimatedSizeVec ( ResId( STR_ESTIMATED_SIZE_VEC, *rPara.pResMgr ).toString() ), - maFlButtons ( this, ResId( FL_BUTTONS, *rPara.pResMgr ) ), - maBtnOK ( this, ResId( BTN_OK, *rPara.pResMgr ) ), - maBtnCancel ( this, ResId( BTN_CANCEL, *rPara.pResMgr ) ), - maBtnHelp ( this, ResId( BTN_HELP, *rPara.pResMgr ) ), - ms1BitTreshold ( ResId( STR_1BIT_THRESHOLD, *rPara.pResMgr ).toString() ), - ms1BitDithered ( ResId( STR_1BIT_DITHERED, *rPara.pResMgr ).toString() ), - ms4BitGrayscale ( ResId( STR_4BIT_GRAYSCALE, *rPara.pResMgr ).toString() ), - ms4BitColorPalette ( ResId( STR_4BIT_COLOR_PALETTE, *rPara.pResMgr ).toString() ), - ms8BitGrayscale ( ResId( STR_8BIT_GRAYSCALE, *rPara.pResMgr ).toString() ), - ms8BitColorPalette ( ResId( STR_8BIT_COLOR_PALETTE, *rPara.pResMgr ).toString() ), - ms24BitColor ( ResId( STR_24BIT_TRUE_COLOR, *rPara.pResMgr ).toString() ), - maExt ( rPara.aFilterExt ), - mnFormat ( FORMAT_UNKNOWN ), - mnMaxFilesizeForRealtimePreview( 0 ), - mpTempStream ( new SvMemoryStream() ), - maOriginalSize ( awt::Size( 0, 0 ) ), - mbIsPixelFormat ( bIsPixelFormat ), - mbExportSelection ( bExportSelection ), - mbPreserveAspectRatio ( sal_True ) + const com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& rxSourceDocument, + sal_Bool bExportSelection, sal_Bool bIsPixelFormat) + : ModalDialog(rPara.pWindow, "GraphicExportDialog", "svt/ui/graphicexport.ui") + , mrFltCallPara(rPara) + , mxMgr(rxMgr) + , mxSourceDocument(rxSourceDocument) + , mpSbCompression(NULL) + , mpNfCompression(NULL) + , msEstimatedSizePix1(SVT_RESSTR(STR_ESTIMATED_SIZE_PIX_1)) + , msEstimatedSizePix2(SVT_RESSTR(STR_ESTIMATED_SIZE_PIX_2)) + , msEstimatedSizeVec(SVT_RESSTR(STR_ESTIMATED_SIZE_VEC)) + , ms1BitTreshold(SVT_RESSTR(STR_1BIT_THRESHOLD)) + , ms1BitDithered(SVT_RESSTR(STR_1BIT_DITHERED)) + , ms4BitGrayscale(SVT_RESSTR(STR_4BIT_GRAYSCALE)) + , ms4BitColorPalette(SVT_RESSTR(STR_4BIT_COLOR_PALETTE)) + , ms8BitGrayscale(SVT_RESSTR(STR_8BIT_GRAYSCALE)) + , ms8BitColorPalette(SVT_RESSTR(STR_8BIT_COLOR_PALETTE)) + , ms24BitColor(SVT_RESSTR(STR_24BIT_TRUE_COLOR)) + , maExt(rPara.aFilterExt) + , mnFormat(FORMAT_UNKNOWN) + , mnMaxFilesizeForRealtimePreview(0) + , mpTempStream(new SvMemoryStream()) + , maOriginalSize(awt::Size(0, 0)) + , mbIsPixelFormat(bIsPixelFormat) + , mbExportSelection(bExportSelection) + , mbPreserveAspectRatio(sal_True) { + get(mpMfSizeX, "widthmf-nospin"); + get(mpMfSizeY, "heightmf-nospin"); + get(mpLbSizeX, "widthlb"); + get(mpFtResolution, "resolutionft"); + get(mpNfResolution, "resolutionmf-nospin"); + get(mpLbResolution, "resolutionlb"); + + get(mpColorDepth, "colordepth"); + get(mpLbColorDepth, "colordepthlb"); + + get(mpJPGQuality, "jpgquality"); + get(mpPNGCompression, "pngcompression"); + + get(mpBMPCompression, "bmpcompression"); + get(mpCbRLEEncoding, "rlecb"); + + get(mpMode, "mode"); + get(mpCbInterlaced, "interlacedcb"); + + get(mpDrawingObjects, "drawingobjects"); + get(mpCbSaveTransparency, "savetransparencycb"); + + get(mpEncoding, "encoding"); + get(mpRbBinary, "binarycb"); + get(mpRbText, "textcb"); + + get(mpEPSGrid, "epsgrid"); + get(mpCbEPSPreviewTIFF, "tiffpreviewcb"); + get(mpCbEPSPreviewEPSI, "epsipreviewcb"); + get(mpRbEPSLevel1, "level1rb"); + get(mpRbEPSLevel2, "level2rb"); + get(mpRbEPSColorFormat1, "color1rb"); + get(mpRbEPSColorFormat2, "color2rb"); + get(mpRbEPSCompressionLZW, "compresslzw"); + get(mpRbEPSCompressionNone, "compressnone"); + GetGraphicSource(); + get(mpInfo, "information"); + get(mpFtEstimatedSize, "estsizeft");; + + get(mpBtnOK, "ok"); + maExt.ToUpperAscii(); String aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/" ) ); @@ -648,15 +647,15 @@ ExportDialog::ExportDialog( FltCallDialogParameter& rPara, mpFilterOptionsItem = new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData ); mnInitialResolutionUnit = mbIsPixelFormat - ? mpOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "PixelExportUnit" ) ), UNIT_DEFAULT ) - : mpOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "VectorExportUnit" ) ), UNIT_DEFAULT ); + ? mpOptionsItem->ReadInt32(OUString("PixelExportUnit"), UNIT_DEFAULT) + : mpOptionsItem->ReadInt32(OUString( "VectorExportUnit"), UNIT_DEFAULT); - mnMaxFilesizeForRealtimePreview = mpOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "MaxFilesizeForRealtimePreview" ) ), 0 ); - maFtEstimatedSize.SetText( String( RTL_CONSTASCII_USTRINGPARAM( " \n " ) ) ); + mnMaxFilesizeForRealtimePreview = mpOptionsItem->ReadInt32(OUString("MaxFilesizeForRealtimePreview"), 0); + mpFtEstimatedSize->SetText(OUString(" \n ")); - String aTitle( maExt ); - aTitle += ResId(DLG_EXPORT_TITLE, *mpMgr).toString(); - SetText( aTitle ); + String aTitle(maExt); + aTitle += GetText(); + SetText(aTitle); mnFormat = GetFilterFormat( maExt ); @@ -675,98 +674,61 @@ ExportDialog::ExportDialog( FltCallDialogParameter& rPara, maSize = maOriginalSize; } + setupControls(); + // Size - maLbSizeX.SetSelectHdl( LINK( this, ExportDialog, UpdateHdl ) ); + mpLbSizeX->SetSelectHdl( LINK( this, ExportDialog, UpdateHdl ) ); - maSbCompression.SetScrollHdl( LINK( this, ExportDialog, SbCompressionUpdateHdl ) ); - maNfCompression.SetModifyHdl( LINK( this, ExportDialog, UpdateHdl ) ); + if (mpSbCompression) + mpSbCompression->SetScrollHdl(LINK(this, ExportDialog, SbCompressionUpdateHdl)); + if (mpNfCompression) + mpNfCompression->SetModifyHdl(LINK(this, ExportDialog, UpdateHdl)); - maMfSizeX.SetModifyHdl( LINK( this, ExportDialog, UpdateHdlMtfSizeX ) ); - maMfSizeY.SetModifyHdl( LINK( this, ExportDialog, UpdateHdlMtfSizeY ) ); + mpMfSizeX->SetModifyHdl( LINK( this, ExportDialog, UpdateHdlMtfSizeX ) ); + mpMfSizeY->SetModifyHdl( LINK( this, ExportDialog, UpdateHdlMtfSizeY ) ); - maNfResolution.SetModifyHdl( LINK( this, ExportDialog, UpdateHdlNfResolution ) ); - maLbResolution.SetSelectHdl( LINK( this, ExportDialog, UpdateHdl ) ); + mpNfResolution->SetModifyHdl( LINK( this, ExportDialog, UpdateHdlNfResolution ) ); + mpLbResolution->SetSelectHdl( LINK( this, ExportDialog, UpdateHdl ) ); - maLbColorDepth.SetSelectHdl( LINK( this, ExportDialog, UpdateHdl ) ); + mpLbColorDepth->SetSelectHdl( LINK( this, ExportDialog, UpdateHdl ) ); - maCbInterlaced.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); + mpCbInterlaced->SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); - maCbSaveTransparency.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); + mpCbSaveTransparency->SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); - maCbEPSPreviewTIFF.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); - maCbEPSPreviewEPSI.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); + mpCbEPSPreviewTIFF->SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); + mpCbEPSPreviewEPSI->SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); - maRbEPSCompressionLZW.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); - maRbEPSCompressionNone.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); + mpRbEPSCompressionLZW->SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); + mpRbEPSCompressionNone->SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); - maRbBinary.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); - maRbText.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); + mpRbBinary->SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); + mpRbText->SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); // BMP - maCbRLEEncoding.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); + mpCbRLEEncoding->SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); // EPS - maRbEPSLevel1.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); - maRbEPSLevel2.SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); + mpRbEPSLevel1->SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); + mpRbEPSLevel2->SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); - maBtnOK.SetClickHdl( LINK( this, ExportDialog, OK ) ); + mpBtnOK->SetClickHdl( LINK( this, ExportDialog, OK ) ); - setupLayout(); updateControls(); - - FreeResource(); } -void ExportDialog::createSizeControls( vcl::RowOrColumn& rLayout ) +void ExportDialog::setupSizeControls() { - size_t nIndex; - Size aBorder( LogicToPixel( Size( 5, 5 ), MapMode( MAP_APPFONT ) ) ); - long nIndent = aBorder.Width(); - - // Size controls - rLayout.addWindow( &maFlExportSize ); - - Size aLbMax( maLbSizeX.GetSizePixel() ); - aLbMax.Width() = Max( aLbMax.Width(), maLbResolution.GetSizePixel().Width() ); - - boost::shared_ptr< vcl::LabelColumn > xSizeColumns( new vcl::LabelColumn( &rLayout ) ); - rLayout.addChild( xSizeColumns ); - - // row 1 - boost::shared_ptr< vcl::RowOrColumn > xColumn( new vcl::RowOrColumn( xSizeColumns.get(), false ) ); - xSizeColumns->addRow( &maFtSizeX, xColumn, nIndent ); - Size aMinSize( maMfSizeX.GetSizePixel() ); - nIndex = xColumn->addWindow( &maMfSizeX ); - xColumn->setMinimumSize( nIndex, aMinSize ); - nIndex = xColumn->addWindow( &maLbSizeX ); - xColumn->setMinimumSize( nIndex, aLbMax ); - - // row 2 - xColumn = boost::shared_ptr< vcl::RowOrColumn >( new vcl::RowOrColumn( xSizeColumns.get(), false ) ); - xSizeColumns->addRow( &maFtSizeY, xColumn, nIndent ); - nIndex = xColumn->addWindow( &maMfSizeY ); - xColumn->setMinimumSize( nIndex, aMinSize ); - nIndex = xColumn->addWindow( &maLbSizeY ); - xColumn->setMinimumSize( nIndex, aLbMax ); - - // row 3 - if ( mbIsPixelFormat ) // TODO: (metafileresolutionsupport) - { - xColumn = boost::shared_ptr< vcl::RowOrColumn >( new vcl::RowOrColumn( xSizeColumns.get(), false ) ); - xSizeColumns->addRow( &maFtResolution, xColumn, nIndent ); - nIndex = xColumn->addWindow( &maNfResolution ); - xColumn->setMinimumSize( nIndex, aMinSize ); - nIndex = xColumn->addWindow( &maLbResolution ); - xColumn->setMinimumSize( nIndex, aLbMax ); - } - sal_Int32 nUnit = mnInitialResolutionUnit; - if ( nUnit == UNIT_DEFAULT ) + if (nUnit == UNIT_DEFAULT) nUnit = GetDefaultUnit(); - if ( !mbIsPixelFormat ) + if (!mbIsPixelFormat) { - maLbSizeX.RemoveEntry( UNIT_PIXEL ); // removing pixel + mpFtResolution->Hide(); + mpNfResolution->Hide(); + mpLbResolution->Hide(); + mpLbSizeX->RemoveEntry( UNIT_PIXEL ); // removing pixel if ( nUnit >= UNIT_PIXEL ) nUnit = UNIT_CM; } @@ -774,369 +736,165 @@ void ExportDialog::createSizeControls( vcl::RowOrColumn& rLayout ) nUnit = UNIT_PIXEL; if ( nUnit < 0 ) nUnit = UNIT_CM; - maLbSizeX.SelectEntryPos( static_cast< sal_uInt16 >( nUnit ) ); + mpLbSizeX->SelectEntryPos( static_cast< sal_uInt16 >( nUnit ) ); if ( mbIsPixelFormat ) // TODO: (metafileresolutionsupport) should be supported for vector formats also... this makes { // sense eg for bitmap fillings in metafiles, to preserve high dpi output // (atm without special vector support the bitmaps are rendered with 96dpi) - sal_Int32 nResolution = mpOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "PixelExportResolution" ) ), 96 ); + sal_Int32 nResolution = mpOptionsItem->ReadInt32(OUString("PixelExportResolution"), 96); if ( nResolution < 1 ) nResolution = 96; - maNfResolution.SetValue( nResolution ); + mpNfResolution->SetValue( nResolution ); - sal_Int32 nResolutionUnit = mpOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "PixelExportResolutionUnit" ) ), 1 ); + sal_Int32 nResolutionUnit = mpOptionsItem->ReadInt32(OUString("PixelExportResolutionUnit"), 1); if ( ( nResolutionUnit < 0 ) || ( nResolutionUnit > 2 ) ) nResolutionUnit = 1; - maLbResolution.SelectEntryPos( static_cast< sal_uInt16 >( nResolutionUnit ) ); + mpLbResolution->SelectEntryPos( static_cast< sal_uInt16 >( nResolutionUnit ) ); } - - boost::shared_ptr< vcl::Spacer > xSpacer( new vcl::Spacer( &rLayout, 2 ) ); - rLayout.addChild( xSpacer ); } -void ExportDialog::createColorDepthControls( vcl::RowOrColumn& rLayout ) +void ExportDialog::createFilterOptions() { - // Color Depth - Size aBorder( LogicToPixel( Size( 5, 5 ), MapMode( MAP_APPFONT ) ) ); - long nIndent = aBorder.Width(); - - boost::shared_ptr< vcl::RowOrColumn > xRow( new vcl::RowOrColumn( &rLayout, false ) ); - rLayout.addChild( xRow ); - xRow->addWindow( &maFlColorDepth ); - - xRow = boost::shared_ptr< vcl::RowOrColumn >( new vcl::RowOrColumn( &rLayout, false ) ); - rLayout.addChild( xRow ); - boost::shared_ptr< vcl::Indenter > xIndenter( new vcl::Indenter( &rLayout, nIndent ) ); - xRow->addChild( xIndenter ); - boost::shared_ptr< vcl::RowOrColumn > xRows( new vcl::RowOrColumn( &rLayout, true ) ); - xIndenter->setChild( xRows ); - xRows->addWindow( &maLbColorDepth ); - - boost::shared_ptr< vcl::Spacer > xSpacer( new vcl::Spacer( &rLayout, 2 ) ); - rLayout.addChild( xSpacer ); -} - -void ExportDialog::createScrollBar( vcl::RowOrColumn& rLayout ) -{ - boost::shared_ptr< vcl::RowOrColumn > xRow( new vcl::RowOrColumn( &rLayout, false ) ); - rLayout.addChild( xRow ); - - Size aMinSize( maSbCompression.GetSizePixel() ); - size_t nIndex = xRow->addWindow( &maSbCompression ); - xRow->setMinimumSize( nIndex, aMinSize ); - aMinSize = maNfCompression.GetSizePixel(); - nIndex = xRow->addWindow( &maNfCompression ); - xRow->setMinimumSize( nIndex, aMinSize ); -} - -void ExportDialog::createFilterOptions( vcl::RowOrColumn& rLayout ) -{ - Size aBorder( LogicToPixel( Size( 5, 5 ), MapMode( MAP_APPFONT ) ) ); - long nIndent = aBorder.Width(); - switch( mnFormat ) { case FORMAT_JPG : { - sal_Int32 nColor = mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "ColorMode" ) ), 0 ); + sal_Int32 nColor = mpFilterOptionsItem->ReadInt32(OUString("ColorMode"), 0); if ( nColor == 1 ) nColor = 0; else nColor = 1; - maLbColorDepth.InsertEntry( ms8BitGrayscale ); - maLbColorDepth.InsertEntry( ms24BitColor ); - maLbColorDepth.SelectEntryPos( nColor ); - createColorDepthControls( maLayout ); - - rLayout.addWindow( &maFlJPGQuality ); + mpLbColorDepth->InsertEntry( ms8BitGrayscale ); + mpLbColorDepth->InsertEntry( ms24BitColor ); + mpLbColorDepth->SelectEntryPos( nColor ); + mpColorDepth->Show(); // Quality - boost::shared_ptr< vcl::Indenter > xIndenter( new vcl::Indenter( &rLayout, nIndent ) ); - rLayout.addChild( xIndenter ); - boost::shared_ptr< vcl::RowOrColumn > xRows( new vcl::RowOrColumn( &rLayout, true ) ); - xIndenter->setChild( xRows ); - createScrollBar( *xRows.get() ); - xRows->addWindow( &maFtJPGMin ); - xRows->addWindow( &maFtJPGMax ); - - boost::shared_ptr< vcl::Spacer > xSpacer( new vcl::Spacer( &rLayout, 2 ) ); - rLayout.addChild( xSpacer ); - - sal_Int32 nQuality = mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Quality" ) ), 75 ); - if ( ( nQuality < 1 ) || ( nQuality > 100 ) ) + mpJPGQuality->Show(); + sal_Int32 nQuality = mpFilterOptionsItem->ReadInt32(OUString("Quality"), 75); + if ((nQuality < 1 ) || (nQuality > 100)) nQuality = 75; - - maSbCompression.SetRangeMin( 1 ); - maSbCompression.SetRangeMax( 100 ); - maNfCompression.SetMin( 1 ); - maNfCompression.SetMax( 100 ); - maNfCompression.SetValue( nQuality ); - maNfCompression.SetStrictFormat( sal_True ); + get(mpSbCompression, "compressionjpgsb"); + get(mpNfCompression, "compressionjpgnf-nospin"); + mpSbCompression->SetRangeMin( 1 ); + mpSbCompression->SetRangeMax( 100 ); + mpNfCompression->SetMin( 1 ); + mpNfCompression->SetMax( 100 ); + mpNfCompression->SetValue( nQuality ); + mpNfCompression->SetStrictFormat( sal_True ); } break; case FORMAT_PNG : { - rLayout.addWindow( &maFlCompression ); - // Compression 1..9 - boost::shared_ptr< vcl::Indenter > xIndenter( new vcl::Indenter( &rLayout, nIndent ) ); - rLayout.addChild( xIndenter ); - boost::shared_ptr< vcl::RowOrColumn > xRows( new vcl::RowOrColumn( &rLayout, true ) ); - xIndenter->setChild( xRows ); - createScrollBar( *xRows.get() ); - xRows->addWindow( &maFtPNGMin ); - xRows->addWindow( &maFtPNGMax ); - boost::shared_ptr< vcl::Spacer > xSpacer( new vcl::Spacer( &rLayout, 2 ) ); - rLayout.addChild( xSpacer ); - - // Interlaced - rLayout.addWindow( &maFlMode ); - xIndenter.reset( new vcl::Indenter( &rLayout, nIndent ) ); - rLayout.addChild( xIndenter ); - xRows.reset( new vcl::RowOrColumn( &rLayout, true ) ); - xIndenter->setChild( xRows ); - xRows->addWindow( &maCbInterlaced ); - - xSpacer.reset( new vcl::Spacer( &rLayout, 2 ) ); - rLayout.addChild( xSpacer ); - - sal_Int32 nCompression = mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Compression" ) ), 6 ); + mpPNGCompression->Show(); + sal_Int32 nCompression = mpFilterOptionsItem->ReadInt32(OUString("Compression"), 6); if ( ( nCompression < 1 ) || ( nCompression > 9 ) ) nCompression = 6; - maSbCompression.SetRangeMin( 1 ); - maSbCompression.SetRangeMax( 9 ); - maNfCompression.SetMin( 1 ); - maNfCompression.SetMax( 9 ); - maNfCompression.SetValue( 9 ); - maNfCompression.SetStrictFormat( sal_True ); + get(mpSbCompression, "compressionpngsb"); + get(mpNfCompression, "compressionpngnf-nospin"); + mpSbCompression->SetRangeMin( 1 ); + mpSbCompression->SetRangeMax( 9 ); + mpNfCompression->SetMin( 1 ); + mpNfCompression->SetMax( 9 ); + mpNfCompression->SetValue( 9 ); + mpNfCompression->SetStrictFormat( sal_True ); - maCbInterlaced.Check( mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Interlaced" ) ), 0 ) != 0 ); + // Interlaced + mpMode->Show(); + mpCbInterlaced->Check( mpFilterOptionsItem->ReadInt32(OUString("Interlaced"), 0) != 0); } break; case FORMAT_BMP : { - sal_Int32 nColor = mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Color" ) ), 0 ); + sal_Int32 nColor = mpFilterOptionsItem->ReadInt32(OUString("Color"), 0); if ( nColor == 0 ) nColor = 6; else nColor--; - maLbColorDepth.InsertEntry( ms1BitTreshold ); - maLbColorDepth.InsertEntry( ms1BitDithered ); - maLbColorDepth.InsertEntry( ms4BitGrayscale ); - maLbColorDepth.InsertEntry( ms4BitColorPalette ); - maLbColorDepth.InsertEntry( ms8BitGrayscale ); - maLbColorDepth.InsertEntry( ms8BitColorPalette ); - maLbColorDepth.InsertEntry( ms24BitColor ); - maLbColorDepth.SelectEntryPos( nColor ); - createColorDepthControls( maLayout ); + mpLbColorDepth->InsertEntry( ms1BitTreshold ); + mpLbColorDepth->InsertEntry( ms1BitDithered ); + mpLbColorDepth->InsertEntry( ms4BitGrayscale ); + mpLbColorDepth->InsertEntry( ms4BitColorPalette ); + mpLbColorDepth->InsertEntry( ms8BitGrayscale ); + mpLbColorDepth->InsertEntry( ms8BitColorPalette ); + mpLbColorDepth->InsertEntry( ms24BitColor ); + mpLbColorDepth->SelectEntryPos( nColor ); + mpColorDepth->Show(); - rLayout.addWindow( &maFlCompression ); // RLE coding - boost::shared_ptr< vcl::Indenter > xIndenter( new vcl::Indenter( &rLayout, nIndent ) ); - rLayout.addChild( xIndenter ); - boost::shared_ptr< vcl::RowOrColumn > xRows( new vcl::RowOrColumn( &rLayout, true ) ); - xIndenter->setChild( xRows ); - xRows->addWindow( &maCbRLEEncoding ); - boost::shared_ptr< vcl::Spacer > xSpacer( new vcl::Spacer( &rLayout, 2 ) ); - rLayout.addChild( xSpacer ); - - maCbRLEEncoding.Check( mpFilterOptionsItem->ReadBool( String( RTL_CONSTASCII_USTRINGPARAM( "RLE_Coding" ) ), sal_True ) ); + mpBMPCompression->Show(); + mpCbRLEEncoding->Check(mpFilterOptionsItem->ReadBool(OUString("RLE_Coding"), sal_True)); } break; case FORMAT_GIF : { - rLayout.addWindow( &maFlMode ); - boost::shared_ptr< vcl::Indenter > xIndenter( new vcl::Indenter( &rLayout, nIndent ) ); - rLayout.addChild( xIndenter ); - boost::shared_ptr< vcl::RowOrColumn > xRows( new vcl::RowOrColumn( &rLayout, true ) ); - xIndenter->setChild( xRows ); - xRows->addWindow( &maCbInterlaced ); - boost::shared_ptr< vcl::Spacer > xSpacer( new vcl::Spacer( &rLayout, 2 ) ); - rLayout.addChild( xSpacer ); + mpMode->Show(); + mpCbInterlaced->Check(mpFilterOptionsItem->ReadInt32(OUString("Interlaced"), 1) != 0); - rLayout.addWindow( &maFlGIFDrawingObjects ); - xIndenter = boost::shared_ptr< vcl::Indenter >( new vcl::Indenter( &rLayout, nIndent ) ); - rLayout.addChild( xIndenter ); - xRows = boost::shared_ptr< vcl::RowOrColumn >( new vcl::RowOrColumn( &rLayout, true ) ); - xIndenter->setChild( xRows ); - xRows->addWindow( &maCbSaveTransparency ); - xSpacer.reset( new vcl::Spacer( &rLayout, 2 ) ); - rLayout.addChild( xSpacer ); - - maCbInterlaced.Check( mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Interlaced" ) ), 1 ) != 0 ); - maCbSaveTransparency.Check( mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Translucent" ) ), 1 ) != 0 ); + mpDrawingObjects->Show(); + mpCbSaveTransparency->Check(mpFilterOptionsItem->ReadInt32(OUString("Translucent"), 1) != 0); } break; case FORMAT_PBM : case FORMAT_PGM : case FORMAT_PPM : { - rLayout.addWindow( &maFlJPGQuality ); - // RB Binary / Text - boost::shared_ptr< vcl::Indenter > xIndenter( new vcl::Indenter( &rLayout, nIndent ) ); - rLayout.addChild( xIndenter ); - boost::shared_ptr< vcl::RowOrColumn > xRows( new vcl::RowOrColumn( &rLayout, true ) ); - xIndenter->setChild( xRows ); - xRows->addWindow( &maRbBinary ); - xRows->addWindow( &maRbText ); - boost::shared_ptr< vcl::Spacer > xSpacer( new vcl::Spacer( &rLayout, 2 ) ); - rLayout.addChild( xSpacer ); - - sal_Int32 nFormat = mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "FileFormat" ) ), 1 ); - maRbBinary.Check( nFormat == 0 ); - maRbText.Check( nFormat != 0 ); + mpEncoding->Show(); + sal_Int32 nFormat = mpFilterOptionsItem->ReadInt32(OUString("FileFormat"), 1); + mpRbBinary->Check( nFormat == 0 ); + mpRbText->Check( nFormat != 0 ); } break; case FORMAT_EPS : { - boost::shared_ptr< vcl::RowOrColumn > xColumns( new vcl::RowOrColumn( &rLayout, false ) ); - rLayout.addChild( xColumns ); - boost::shared_ptr< vcl::RowOrColumn > xLeft( new vcl::RowOrColumn( &rLayout, true ) ); - xColumns->addChild( xLeft ); + mpEPSGrid->Show(); - xLeft->addWindow( &maFlEPSPreview ); - boost::shared_ptr< vcl::Indenter > xIndenter( new vcl::Indenter( xLeft.get(), nIndent ) ); - xLeft->addChild( xIndenter ); - boost::shared_ptr< vcl::RowOrColumn > xRows( new vcl::RowOrColumn( xLeft.get(), true ) ); - xIndenter->setChild( xRows ); - xRows->addWindow( &maCbEPSPreviewTIFF ); - xRows->addWindow( &maCbEPSPreviewEPSI ); - boost::shared_ptr< vcl::Spacer > xSpacer( new vcl::Spacer( xLeft.get(), 2 ) ); - xLeft->addChild( xSpacer ); + sal_Int32 nPreview = mpFilterOptionsItem->ReadInt32(OUString("Preview"), 0); + sal_Int32 nVersion = mpFilterOptionsItem->ReadInt32(OUString("Version"), 2); + sal_Int32 nColor = mpFilterOptionsItem->ReadInt32(OUString("ColorFormat"), 0); + sal_Int32 nCompr = mpFilterOptionsItem->ReadInt32(OUString("CompressionMode"), 2); - xLeft->addWindow( &maFlEPSVersion ); - xIndenter = boost::shared_ptr< vcl::Indenter >( new vcl::Indenter( xLeft.get(), nIndent ) ); - xLeft->addChild( xIndenter ); - xRows = boost::shared_ptr< vcl::RowOrColumn >( new vcl::RowOrColumn( xLeft.get(), true ) ); - xIndenter->setChild( xRows ); - xRows->addWindow( &maRbEPSLevel1 ); - xRows->addWindow( &maRbEPSLevel2 ); - xSpacer.reset( new vcl::Spacer( xLeft.get(), 2 ) ); - xLeft->addChild( xSpacer ); + mpFilterOptionsItem->ReadInt32(OUString("TextMode"), 0); - boost::shared_ptr< vcl::RowOrColumn > xRight( new vcl::RowOrColumn( &rLayout, true ) ); - xColumns->addChild( xRight ); + mpCbEPSPreviewTIFF->Check( ( nPreview & 1 ) != 0 ); + mpCbEPSPreviewEPSI->Check( ( nPreview & 2 ) != 0 ); - xRight->addWindow( &maFlEPSColorFormat ); - xIndenter = boost::shared_ptr< vcl::Indenter >( new vcl::Indenter( xRight.get(), nIndent ) ); - xRight->addChild( xIndenter ); - xRows = boost::shared_ptr< vcl::RowOrColumn >( new vcl::RowOrColumn( xRight.get(), true ) ); - xIndenter->setChild( xRows ); - xRows->addWindow( &maRbEPSColorFormat1 ); - xRows->addWindow( &maRbEPSColorFormat2 ); - xSpacer.reset( new vcl::Spacer( xRight.get(), 2 ) ); - xRight->addChild( xSpacer ); + mpRbEPSLevel1->Check( nVersion == 1 ); + mpRbEPSLevel2->Check( nVersion == 2 ); - xRight->addWindow( &maFlCompression ); - xIndenter = boost::shared_ptr< vcl::Indenter >( new vcl::Indenter( xRight.get(), nIndent ) ); - xRight->addChild( xIndenter ); - xRows = boost::shared_ptr< vcl::RowOrColumn >( new vcl::RowOrColumn( xRight.get(), true ) ); - xIndenter->setChild( xRows ); - xRows->addWindow( &maRbEPSCompressionLZW ); - xRows->addWindow( &maRbEPSCompressionNone ); + mpRbEPSColorFormat1->Check( nColor == 1 ); + mpRbEPSColorFormat2->Check( nColor != 1 ); - xSpacer.reset( new vcl::Spacer( &rLayout, 2 ) ); - rLayout.addChild( xSpacer ); - - sal_Int32 nPreview = mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Preview" ) ), 0 ); - sal_Int32 nVersion = mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Version" ) ), 2 ); - sal_Int32 nColor = mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "ColorFormat" ) ), 0 ); - sal_Int32 nCompr = mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "CompressionMode" ) ), 2 ); - - mpFilterOptionsItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "TextMode" ) ), 0 ); - - maCbEPSPreviewTIFF.Check( ( nPreview & 1 ) != 0 ); - maCbEPSPreviewEPSI.Check( ( nPreview & 2 ) != 0 ); - - maRbEPSLevel1.Check( nVersion == 1 ); - maRbEPSLevel2.Check( nVersion == 2 ); - - maRbEPSColorFormat1.Check( nColor == 1 ); - maRbEPSColorFormat2.Check( nColor != 1 ); - - maRbEPSCompressionLZW.Check( nCompr == 1 ); - maRbEPSCompressionNone.Check( nCompr != 1 ); + mpRbEPSCompressionLZW->Check( nCompr == 1 ); + mpRbEPSCompressionNone->Check( nCompr != 1 ); } break; } } -void ExportDialog::createButtons( vcl::RowOrColumn& rLayout ) +void ExportDialog::setupControls() { - rLayout.addWindow( &maFlButtons ); - boost::shared_ptr< vcl::Spacer > xSpacer( new vcl::Spacer( &rLayout, 2 ) ); - rLayout.addChild( xSpacer ); + setupSizeControls(); + createFilterOptions(); - Size aBorder( LogicToPixel( Size( 5, 5 ), MapMode( MAP_APPFONT ) ) ); - - boost::shared_ptr< vcl::RowOrColumn > xButtons( new vcl::RowOrColumn( &rLayout, false ) ); - size_t nIndex = rLayout.addChild( xButtons ); - rLayout.setBorders( nIndex, aBorder.Width(), 0, aBorder.Width(), aBorder.Width() ); - - Size aMinSize( maBtnCancel.GetSizePixel() ); - // insert help button - xButtons->setMinimumSize( xButtons->addWindow( &maBtnHelp ), aMinSize ); - - // insert a spacer, cancel and OK buttons are right aligned - - xSpacer.reset( new vcl::Spacer( xButtons.get(), 2 ) ); - xButtons->addChild( xSpacer ); - xButtons->setMinimumSize( xButtons->addWindow( &maBtnOK ), aMinSize ); - xButtons->setMinimumSize( xButtons->addWindow( &maBtnCancel ), aMinSize ); + if (mnMaxFilesizeForRealtimePreview || mbIsPixelFormat) + mpInfo->Show(); } -void ExportDialog::setupLayout() -{ - Size aBorder( LogicToPixel( Size( 5, 5 ), MapMode( MAP_APPFONT ) ) ); - maLayout.setParentWindow( this ); - maLayout.setOuterBorder( aBorder.Width() ); - - createSizeControls( maLayout ); - createFilterOptions( maLayout ); - - if ( mnMaxFilesizeForRealtimePreview || mbIsPixelFormat ) - { - maLayout.addWindow( &maFlEstimatedSize ); - maLayout.addWindow( &maFtEstimatedSize ); - } - createButtons( maLayout ); - - maLayout.show(); - maDialogSize = maLayout.getOptimalSize( WINDOWSIZE_PREFERRED ); - maLayout.setManagedArea( Rectangle( Point(), maDialogSize ) ); - SetOutputSizePixel( maDialogSize ); - - maRectFlButtons = Rectangle( maFlButtons.GetPosPixel(), maFlButtons.GetSizePixel() ); - maRectBtnHelp = Rectangle( maBtnHelp.GetPosPixel(), maBtnHelp.GetSizePixel() ); - maRectBtnOK = Rectangle( maBtnOK.GetPosPixel(), maBtnOK.GetSizePixel() ); - maRectBtnCancel = Rectangle( maBtnCancel.GetPosPixel(), maBtnOK.GetSizePixel() ); - - maLbSizeY.Hide(); -} - -static rtl::OUString ImpValueOfInKB( const sal_Int64& rVal ) +static OUString ImpValueOfInKB( const sal_Int64& rVal ) { double fVal( static_cast( rVal ) ); fVal /= ( 1 << 10 ); fVal += 0.05; - rtl::OUStringBuffer aVal( rtl::OUString::valueOf( fVal ) ); - sal_Int32 nX( rtl::OUString( aVal.getStr() ).indexOf( '.', 0 ) ); + OUStringBuffer aVal( OUString::valueOf( fVal ) ); + sal_Int32 nX( OUString( aVal.getStr() ).indexOf( '.', 0 ) ); if ( nX > 0 ) aVal.setLength( nX + 2 ); return aVal.makeStringAndClear(); } -void ExportDialog::updatePreview() -{ - SetOutputSizePixel( maDialogSize ); - - maFlButtons.SetSizePixel( Size( maRectFlButtons.GetWidth(), maRectFlButtons.GetHeight() ) ); - maBtnHelp.SetPosPixel( Point( maRectBtnHelp.Left(), maRectBtnHelp.Top() ) ); - maBtnOK.SetPosPixel( Point( maRectBtnOK.Left(), maRectBtnOK.Top() ) ); - maBtnCancel.SetPosPixel( Point( maRectBtnCancel.Left(), maRectBtnCancel.Top() ) ); -} - void ExportDialog::updateControls() { GetGraphicStream(); @@ -1146,26 +904,26 @@ void ExportDialog::updateControls() { awt::Size aSize100thmm( maSize ); Size aSize( LogicToLogic( Size( aSize100thmm.Width * 100, aSize100thmm.Height * 100 ), MAP_100TH_MM, - MapMode( GetMapUnit( maLbSizeX.GetSelectEntryPos() ) ) ) ); - maMfSizeX.SetValue( aSize.Width() ); - maMfSizeY.SetValue( aSize.Height() ); + MapMode( GetMapUnit( mpLbSizeX->GetSelectEntryPos() ) ) ) ); + mpMfSizeX->SetValue( aSize.Width() ); + mpMfSizeY->SetValue( aSize.Height() ); } else { - MapUnit aMapUnit( GetMapUnit( maLbSizeX.GetSelectEntryPos() ) ); + MapUnit aMapUnit( GetMapUnit( mpLbSizeX->GetSelectEntryPos() ) ); if ( aMapUnit == MAP_PIXEL ) { // calculating pixel count via resolution and original graphic size - maMfSizeX.SetDecimalDigits( 0 ); - maMfSizeY.SetDecimalDigits( 0 ); - maMfSizeX.SetValue( maSize.Width ); - maMfSizeY.SetValue( maSize.Height ); + mpMfSizeX->SetDecimalDigits( 0 ); + mpMfSizeY->SetDecimalDigits( 0 ); + mpMfSizeX->SetValue( maSize.Width ); + mpMfSizeY->SetValue( maSize.Height ); } else { - maMfSizeX.SetDecimalDigits( 2 ); - maMfSizeY.SetDecimalDigits( 2 ); + mpMfSizeX->SetDecimalDigits( 2 ); + mpMfSizeY->SetDecimalDigits( 2 ); double fRatio; - switch( GetMapUnit( maLbSizeX.GetSelectEntryPos() ) ) + switch( GetMapUnit( mpLbSizeX->GetSelectEntryPos() ) ) { case MAP_INCH : fRatio = static_cast< double >( maResolution.Width ) * 0.0254; break; case MAP_MM : fRatio = static_cast< double >( maResolution.Width ) * 0.001; break; @@ -1173,22 +931,22 @@ void ExportDialog::updateControls() default: case MAP_CM : fRatio = static_cast< double >( maResolution.Width ) * 0.01; break; } - maMfSizeX.SetValue( static_cast< sal_Int32 >( ( static_cast< double >( maSize.Width * 100 ) / fRatio ) + 0.5 ) ); - maMfSizeY.SetValue( static_cast< sal_Int32 >( ( static_cast< double >( maSize.Height * 100 ) / fRatio ) + 0.5 ) ); + mpMfSizeX->SetValue( static_cast< sal_Int32 >( ( static_cast< double >( maSize.Width * 100 ) / fRatio ) + 0.5 ) ); + mpMfSizeY->SetValue( static_cast< sal_Int32 >( ( static_cast< double >( maSize.Height * 100 ) / fRatio ) + 0.5 ) ); } } sal_Int32 nResolution = 0; - switch( maLbResolution.GetSelectEntryPos() ) + switch( mpLbResolution->GetSelectEntryPos() ) { case 0 : nResolution = maResolution.Width / 100; break; // pixels / cm case 2 : nResolution = maResolution.Width; break; // pixels / meter default: case 1 : nResolution = static_cast< sal_Int32 >(maResolution.Width * 0.0254); break; // pixels / inch } - maNfResolution.SetValue( nResolution ); + mpNfResolution->SetValue( nResolution ); - if ( maSbCompression.IsVisible() ) - maSbCompression.SetThumbPos( maNfCompression.GetValue() ); + if (mpSbCompression && mpSbCompression->IsVisible() && mpNfCompression) + mpSbCompression->SetThumbPos(mpNfCompression->GetValue()); // updating estimated size sal_Int64 nRealFileSize( mpTempStream->Tell() ); @@ -1204,7 +962,7 @@ void ExportDialog::updateControls() nInd = aEst.Search( '%', nInd ); aEst.Replace( nInd, 2, ImpValueOfInKB( nRealFileSize ) ); } - maFtEstimatedSize.SetText( aEst ); + mpFtEstimatedSize->SetText( aEst ); } else { @@ -1213,19 +971,18 @@ void ExportDialog::updateControls() String aEst( msEstimatedSizeVec ); xub_StrLen nInd = aEst.Search( '%', 0 ); aEst.Replace( nInd, 2, ImpValueOfInKB( nRealFileSize ) ); - maFtEstimatedSize.SetText( aEst ); + mpFtEstimatedSize->SetText( aEst ); } } - updatePreview(); // EPS - if ( maRbEPSLevel1.IsVisible() ) + if ( mpRbEPSLevel1->IsVisible() ) { - sal_Bool bEnabled = maRbEPSLevel1.IsChecked() == sal_False; - maRbEPSColorFormat1.Enable( bEnabled ); - maRbEPSColorFormat2.Enable( bEnabled ); - maRbEPSCompressionLZW.Enable( bEnabled ); - maRbEPSCompressionNone.Enable( bEnabled ); + sal_Bool bEnabled = mpRbEPSLevel1->IsChecked() == sal_False; + mpRbEPSColorFormat1->Enable( bEnabled ); + mpRbEPSColorFormat2->Enable( bEnabled ); + mpRbEPSCompressionLZW->Enable( bEnabled ); + mpRbEPSCompressionNone->Enable( bEnabled ); } } @@ -1253,24 +1010,24 @@ IMPL_LINK_NOARG(ExportDialog, UpdateHdlMtfSizeX) if ( mbIsPixelFormat ) { - switch( GetMapUnit( maLbSizeX.GetSelectEntryPos() ) ) + switch( GetMapUnit( mpLbSizeX->GetSelectEntryPos() ) ) { - case MAP_INCH : maSize.Width = static_cast< sal_Int32 >( static_cast< double >( maResolution.Width ) * 0.0254 * maMfSizeX.GetValue() / 100.0 + 0.5 ); break; - case MAP_CM : maSize.Width = static_cast< sal_Int32 >( static_cast< double >( maResolution.Width ) * 0.01 * maMfSizeX.GetValue() / 100.0 + 0.5 ); break; - case MAP_MM : maSize.Width = static_cast< sal_Int32 >( static_cast< double >( maResolution.Width ) * 0.001 * maMfSizeX.GetValue() / 100.0 + 0.5 ); break; - case MAP_POINT : maSize.Width = static_cast< sal_Int32 >( static_cast< double >( maResolution.Width ) * 0.0254 * maMfSizeX.GetValue() / 100.0 * 72 + 0.5 ); break; + case MAP_INCH : maSize.Width = static_cast< sal_Int32 >( static_cast< double >( maResolution.Width ) * 0.0254 * mpMfSizeX->GetValue() / 100.0 + 0.5 ); break; + case MAP_CM : maSize.Width = static_cast< sal_Int32 >( static_cast< double >( maResolution.Width ) * 0.01 * mpMfSizeX->GetValue() / 100.0 + 0.5 ); break; + case MAP_MM : maSize.Width = static_cast< sal_Int32 >( static_cast< double >( maResolution.Width ) * 0.001 * mpMfSizeX->GetValue() / 100.0 + 0.5 ); break; + case MAP_POINT : maSize.Width = static_cast< sal_Int32 >( static_cast< double >( maResolution.Width ) * 0.0254 * mpMfSizeX->GetValue() / 100.0 * 72 + 0.5 ); break; default: - case MAP_PIXEL : maSize.Width = maMfSizeX.GetValue(); break; + case MAP_PIXEL : maSize.Width = mpMfSizeX->GetValue(); break; } maSize.Height = static_cast< sal_Int32 >( fRatio * maSize.Width + 0.5 ); } else { Fraction aFract( 1, 100 ); - sal_Int32 nWidth = maMfSizeX.GetValue(); + sal_Int32 nWidth = mpMfSizeX->GetValue(); sal_Int32 nHeight= static_cast< sal_Int32 >( nWidth * fRatio ); const Size aSource( static_cast< sal_Int32 >( nWidth ), static_cast< sal_Int32 >( nHeight ) ); - MapMode aSourceMapMode( GetMapUnit( maLbSizeX.GetSelectEntryPos() ),Point(), aFract, aFract ); + MapMode aSourceMapMode( GetMapUnit( mpLbSizeX->GetSelectEntryPos() ),Point(), aFract, aFract ); Size aDest( LogicToLogic( aSource, aSourceMapMode, MAP_100TH_MM ) ); maSize.Width = aDest.Width(); @@ -1287,24 +1044,24 @@ IMPL_LINK_NOARG(ExportDialog, UpdateHdlMtfSizeY) if ( mbIsPixelFormat ) { - switch( GetMapUnit( maLbSizeX.GetSelectEntryPos() ) ) + switch( GetMapUnit( mpLbSizeX->GetSelectEntryPos() ) ) { - case MAP_INCH : maSize.Height = static_cast< sal_Int32 >( static_cast< double >( maResolution.Height ) * 0.0254 * maMfSizeY.GetValue() / 100.0 + 0.5 ); break; - case MAP_CM : maSize.Height = static_cast< sal_Int32 >( static_cast< double >( maResolution.Height ) * 0.01 * maMfSizeY.GetValue() / 100.0 + 0.5 ); break; - case MAP_MM : maSize.Height = static_cast< sal_Int32 >( static_cast< double >( maResolution.Height ) * 0.001 * maMfSizeY.GetValue() / 100.0 + 0.5 ); break; - case MAP_POINT : maSize.Height = static_cast< sal_Int32 >( static_cast< double >( maResolution.Height ) * 0.0254 * maMfSizeY.GetValue() / 100.0 * 72 + 0.5 ); break; + case MAP_INCH : maSize.Height = static_cast< sal_Int32 >( static_cast< double >( maResolution.Height ) * 0.0254 * mpMfSizeY->GetValue() / 100.0 + 0.5 ); break; + case MAP_CM : maSize.Height = static_cast< sal_Int32 >( static_cast< double >( maResolution.Height ) * 0.01 * mpMfSizeY->GetValue() / 100.0 + 0.5 ); break; + case MAP_MM : maSize.Height = static_cast< sal_Int32 >( static_cast< double >( maResolution.Height ) * 0.001 * mpMfSizeY->GetValue() / 100.0 + 0.5 ); break; + case MAP_POINT : maSize.Height = static_cast< sal_Int32 >( static_cast< double >( maResolution.Height ) * 0.0254 * mpMfSizeY->GetValue() / 100.0 * 72 + 0.5 ); break; default: - case MAP_PIXEL : maSize.Height = maMfSizeY.GetValue(); break; + case MAP_PIXEL : maSize.Height = mpMfSizeY->GetValue(); break; } maSize.Width = static_cast< sal_Int32 >( fRatio * maSize.Height + 0.5 ); } else { Fraction aFract( 1, 100 ); - sal_Int32 nHeight= maMfSizeY.GetValue(); + sal_Int32 nHeight= mpMfSizeY->GetValue(); sal_Int32 nWidth = static_cast< sal_Int32 >( nHeight * fRatio ); const Size aSource( static_cast< sal_Int32 >( nWidth ), static_cast< sal_Int32 >( nHeight ) ); - MapMode aSourceMapMode( GetMapUnit( maLbSizeX.GetSelectEntryPos() ),Point(), aFract, aFract ); + MapMode aSourceMapMode( GetMapUnit( mpLbSizeX->GetSelectEntryPos() ),Point(), aFract, aFract ); Size aDest( LogicToLogic( aSource, aSourceMapMode, MAP_100TH_MM ) ); maSize.Height = aDest.Height(); @@ -1317,10 +1074,10 @@ IMPL_LINK_NOARG(ExportDialog, UpdateHdlMtfSizeY) IMPL_LINK_NOARG(ExportDialog, UpdateHdlNfResolution) { - sal_Int32 nResolution = maNfResolution.GetValue(); - if ( maLbResolution.GetSelectEntryPos() == 0 ) // pixels / cm + sal_Int32 nResolution = mpNfResolution->GetValue(); + if ( mpLbResolution->GetSelectEntryPos() == 0 ) // pixels / cm nResolution *= 100; - else if ( maLbResolution.GetSelectEntryPos() == 1 ) // pixels / inch + else if ( mpLbResolution->GetSelectEntryPos() == 1 ) // pixels / inch nResolution = static_cast< sal_Int32 >( ( ( static_cast< double >( nResolution ) + 0.5 ) / 0.0254 ) ); maResolution.Width = nResolution; maResolution.Height= nResolution; @@ -1331,7 +1088,7 @@ IMPL_LINK_NOARG(ExportDialog, UpdateHdlNfResolution) IMPL_LINK_NOARG(ExportDialog, SbCompressionUpdateHdl) { - maNfCompression.SetValue( maSbCompression.GetThumbPos() ); + mpNfCompression->SetValue( mpSbCompression->GetThumbPos() ); updateControls(); return 0; } diff --git a/svtools/source/filter/exportdialog.hrc b/svtools/source/filter/exportdialog.hrc deleted file mode 100644 index 23df23b2a190..000000000000 --- a/svtools/source/filter/exportdialog.hrc +++ /dev/null @@ -1,82 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#include - -#define BTN_OK 1 -#define BTN_CANCEL 1 -#define BTN_HELP 1 - -#define FL_EXPORT_SIZE 1 -#define FL_COLOR_DEPTH 2 -#define FL_JPG_QUALITY 3 -#define FL_COMPRESSION 4 -#define FL_MODE 5 -#define FL_GIF_DRAWING_OBJECTS 6 -#define FL_EPS_PREVIEW 8 -#define FL_EPS_VERSION 9 -#define FL_EPS_COLOR_FORMAT 10 -#define FL_ESTIMATED_SIZE 11 -#define FL_BUTTONS 12 - -#define FT_SIZEX 1 -#define FT_SIZEY 2 -#define FT_RESOLUTION 3 -#define FT_JPG_MIN 4 -#define FT_JPG_MAX 5 -#define FT_PNG_MIN 6 -#define FT_PNG_MAX 7 -#define FT_ESTIMATED_SIZE 8 - -#define NF_RESOLUTION 1 -#define NF_COMPRESSION 2 - -#define MF_SIZEX 1 -#define MF_SIZEY 2 - -#define LB_SIZEX 1 -#define LB_SIZEY 2 -#define LB_RESOLUTION 3 -#define LB_COLOR_DEPTH 4 - -#define RB_BINARY 1 -#define RB_TEXT 2 -#define RB_EPS_LEVEL1 3 -#define RB_EPS_LEVEL2 4 -#define RB_EPS_COLOR_FORMAT1 5 -#define RB_EPS_COLOR_FORMAT2 6 -#define RB_EPS_COMPRESSION_LZW 7 -#define RB_EPS_COMPRESSION_NONE 8 - -#define CB_INTERLACED 2 -#define CB_RLE_ENCODING 3 -#define CB_SAVE_TRANSPARENCY 4 -#define CB_EPS_PREVIEW_TIFF 5 -#define CB_EPS_PREVIEW_EPSI 6 - -#define SB_COMPRESSION 1 - -#define STR_1BIT_THRESHOLD 1 -#define STR_1BIT_DITHERED 2 -#define STR_4BIT_GRAYSCALE 3 -#define STR_4BIT_COLOR_PALETTE 4 -#define STR_8BIT_GRAYSCALE 5 -#define STR_8BIT_COLOR_PALETTE 6 -#define STR_24BIT_TRUE_COLOR 7 -#define STR_ESTIMATED_SIZE_PIX_1 8 -#define STR_ESTIMATED_SIZE_PIX_2 9 -#define STR_ESTIMATED_SIZE_VEC 10 diff --git a/svtools/source/filter/exportdialog.hxx b/svtools/source/filter/exportdialog.hxx index f98d971716bf..4d952ef7fbb7 100644 --- a/svtools/source/filter/exportdialog.hxx +++ b/svtools/source/filter/exportdialog.hxx @@ -26,9 +26,9 @@ #include #include #include +#include #include #include -#include #include #include #include @@ -46,63 +46,60 @@ class ExportDialog : public ModalDialog { private: - FltCallDialogParameter& - mrFltCallPara; - - ResMgr* mpMgr; + FltCallDialogParameter& mrFltCallPara; const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > mxMgr; const com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& mxSourceDocument; - FixedLine maFlExportSize; - FixedText maFtSizeX; - MetricField maMfSizeX; - ListBox maLbSizeX; - FixedText maFtSizeY; - MetricField maMfSizeY; - ListBox maLbSizeY; - FixedText maFtResolution; - NumericField maNfResolution; - ListBox maLbResolution; - FixedLine maFlColorDepth; - ListBox maLbColorDepth; - FixedLine maFlJPGQuality; - FixedLine maFlMode; - ScrollBar maSbCompression; - NumericField maNfCompression; - FixedText maFtJPGMin; - FixedText maFtJPGMax; - FixedText maFtPNGMin; - FixedText maFtPNGMax; - CheckBox maCbInterlaced; - CheckBox maCbRLEEncoding; - FixedLine maFlGIFDrawingObjects; - CheckBox maCbSaveTransparency; - RadioButton maRbBinary; - RadioButton maRbText; - FixedLine maFlEPSPreview; - CheckBox maCbEPSPreviewTIFF; - CheckBox maCbEPSPreviewEPSI; - FixedLine maFlEPSVersion; - RadioButton maRbEPSLevel1; - RadioButton maRbEPSLevel2; - FixedLine maFlEPSColorFormat; - RadioButton maRbEPSColorFormat1; - RadioButton maRbEPSColorFormat2; - FixedLine maFlCompression; - RadioButton maRbEPSCompressionLZW; - RadioButton maRbEPSCompressionNone; - FixedLine maFlEstimatedSize; - FixedText maFtEstimatedSize; + NumericField* mpMfSizeX; + ListBox* mpLbSizeX; + NumericField* mpMfSizeY; + FixedText* mpFtResolution; + NumericField* mpNfResolution; + ListBox* mpLbResolution; + + VclContainer* mpColorDepth; + ListBox* mpLbColorDepth; + + VclContainer* mpJPGQuality; + VclContainer* mpPNGCompression; + + ScrollBar* mpSbCompression; + NumericField* mpNfCompression; + + VclContainer* mpMode; + CheckBox* mpCbInterlaced; + + VclContainer* mpBMPCompression; + CheckBox* mpCbRLEEncoding; + + VclContainer* mpDrawingObjects; + CheckBox* mpCbSaveTransparency; + + VclContainer* mpEncoding; + RadioButton* mpRbBinary; + RadioButton* mpRbText; + + VclContainer* mpEPSGrid; + CheckBox* mpCbEPSPreviewTIFF; + CheckBox* mpCbEPSPreviewEPSI; + RadioButton* mpRbEPSLevel1; + RadioButton* mpRbEPSLevel2; + RadioButton* mpRbEPSColorFormat1; + RadioButton* mpRbEPSColorFormat2; + RadioButton* mpRbEPSCompressionLZW; + RadioButton* mpRbEPSCompressionNone; + + VclContainer* mpInfo; + FixedText* mpFtEstimatedSize; + + OKButton* mpBtnOK; + String msEstimatedSizePix1; String msEstimatedSizePix2; String msEstimatedSizeVec; - FixedLine maFlButtons; - OKButton maBtnOK; - CancelButton maBtnCancel; - HelpButton maBtnHelp; String ms1BitTreshold; String ms1BitDithered; @@ -112,7 +109,6 @@ private: String ms8BitColorPalette; String ms24BitColor; - vcl::RowOrColumn maLayout; Size maDialogSize; FilterConfigItem* mpOptionsItem; @@ -123,11 +119,6 @@ private: sal_Int16 mnFormat; sal_Int32 mnMaxFilesizeForRealtimePreview; - Rectangle maRectFlButtons; - Rectangle maRectBtnHelp; - Rectangle maRectBtnOK; - Rectangle maRectBtnCancel; - SvStream* mpTempStream; Bitmap maBitmap; @@ -163,13 +154,9 @@ private: DECL_LINK( OK, void* p ); - void createSizeControls( vcl::RowOrColumn& ); - void createColorDepthControls( vcl::RowOrColumn& ); - void createFilterOptions( vcl::RowOrColumn& ); - void createButtons( vcl::RowOrColumn& ); - void createScrollBar( vcl::RowOrColumn& ); - void setupLayout(); - void updatePreview(); + void setupSizeControls(); + void createFilterOptions(); + void setupControls(); void updateControls(); void GetGraphicSource(); diff --git a/svtools/source/filter/exportdialog.src b/svtools/source/filter/exportdialog.src deleted file mode 100644 index ef82a6cf802e..000000000000 --- a/svtools/source/filter/exportdialog.src +++ /dev/null @@ -1,416 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "exportdialog.hrc" - -String DLG_EXPORT_TITLE -{ - Text [ en-US ] = " Options" ; -}; - -ModalDialog DLG_EXPORT -{ - HelpID = "svtools:ModalDialog:DLG_EXPORT"; - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 178 , 135 ) ; - Moveable = TRUE ; - Closeable = TRUE ; - - FixedLine FL_EXPORT_SIZE - { - Hide = TRUE; - Size = MAP_APPFONT ( 110 , 8 ) ; - Text [ en-US ] = "Size" ; - }; - FixedText FT_SIZEX - { - Hide = TRUE; - Size = MAP_APPFONT ( 41 , 10 ) ; - Text [ en-US ] = "Width:" ; - }; - MetricField MF_SIZEX - { - HelpID = "svtools:MetricField:DLG_EXPORT:MF_SIZEX"; - Hide = TRUE; - Border = TRUE; - Size = MAP_APPFONT ( 30, 12 ) ; - TabStop = TRUE; - Repeat = TRUE; - Spin = FALSE; - StrictFormat = TRUE; - DecimalDigits = 2; - Unit = FUNIT_NONE; - Maximum = 99999; - Last = 255; - }; - ListBox LB_SIZEX - { - HelpID = "svtools:ListBox:DLG_EXPORT:LB_SIZEX"; - Hide = TRUE; - Border = TRUE ; - Size = MAP_APPFONT ( 60, 80 ) ; - DropDown = TRUE ; - Sort = FALSE ; - StringList [ en-US ] = - { - < "inches" ; > ; - < "cm" ; Default ; > ; - < "mm" ; > ; - < "points" ; > ; - < "pixels" ; > ; - }; - }; - FixedText FT_SIZEY - { - Hide = TRUE; - Size = MAP_APPFONT ( 41 , 10 ) ; - Text [ en-US ] = "Height:" ; - }; - MetricField MF_SIZEY - { - HelpID = "svtools:MetricField:DLG_EXPORT:MF_SIZEY"; - Hide = TRUE; - Border = TRUE; - Size = MAP_APPFONT ( 30, 12 ); - TabStop = TRUE; - Repeat = TRUE; - Spin = FALSE; - StrictFormat = TRUE; - DecimalDigits = 2; - Unit = FUNIT_NONE; - Maximum = 99999; - Last = 255 ; - }; - ListBox LB_SIZEY - { - HelpID = "svtools:ListBox:DLG_EXPORT:LB_SIZEY"; - Hide = TRUE; - Border = TRUE ; - Size = MAP_APPFONT ( 60, 80 ) ; - DropDown = TRUE ; - Sort = FALSE ; - StringList [ en-US ] = - { - < "inches" ; > ; - < "cm" ; Default ; > ; - < "mm" ; > ; - < "points" ; > ; - < "pixels" ; > ; - }; - }; - FixedText FT_RESOLUTION - { - Hide = TRUE; - Size = MAP_APPFONT ( 41 , 10 ) ; - Text [ en-US ] = "Resolution:" ; - }; - NumericField NF_RESOLUTION - { - HelpID = "svtools:NumericField:DLG_EXPORT:NF_RESOLUTION"; - Hide = TRUE; - Border = TRUE ; - Size = MAP_APPFONT ( 30, 12 ) ; - TabStop = TRUE ; - Repeat = TRUE ; - Spin = FALSE ; - Maximum = 99999; - Last = 255 ; - }; - ListBox LB_RESOLUTION - { - HelpID = "svtools:ListBox:DLG_EXPORT:LB_RESOLUTION"; - Hide = TRUE; - Border = TRUE ; - Size = MAP_APPFONT ( 60, 80 ) ; - DropDown = TRUE ; - Sort = FALSE ; - StringList [ en-US ] = - { - < "pixels/cm" ; > ; - < "pixels/inch" ; Default ; > ; - < "pixels/meter" ; > ; - }; - }; - FixedLine FL_COLOR_DEPTH - { - Hide = TRUE; - Size = MAP_APPFONT ( 110 , 8 ) ; - Text [ en-US ] = "Color Depth" ; - }; - ListBox LB_COLOR_DEPTH - { - HelpID = "svtools:ListBox:DLG_EXPORT:LB_COLOR_DEPTH"; - Hide = TRUE; - Border = TRUE ; - Size = MAP_APPFONT ( 60, 80 ) ; - DropDown = TRUE ; - Sort = FALSE ; - }; - String STR_1BIT_THRESHOLD - { - Text [ en-US ] = "1 bit threshold"; - }; - String STR_1BIT_DITHERED - { - Text [ en-US ] = "1 bit dithered"; - }; - String STR_4BIT_GRAYSCALE - { - Text [ en-US ] = "4 bit grayscale"; - }; - String STR_4BIT_COLOR_PALETTE - { - Text [ en-US ] = "4 bit color"; - }; - String STR_8BIT_GRAYSCALE - { - Text [ en-US ] = "8 bit grayscale"; - }; - String STR_8BIT_COLOR_PALETTE - { - Text [ en-US ] = "8 bit color"; - }; - String STR_24BIT_TRUE_COLOR - { - Text [ en-US ] = "24 bit true color"; - }; - FixedLine FL_JPG_QUALITY - { - Hide = TRUE; - Size = MAP_APPFONT ( 110 , 8 ) ; - Text [ en-US ] = "Quality" ; - }; - FixedLine FL_COMPRESSION - { - Hide = TRUE; - Size = MAP_APPFONT ( 110 , 8 ) ; - Text [ en-US ] = "Compression" ; - }; - FixedLine FL_MODE - { - Hide = TRUE; - Size = MAP_APPFONT ( 110 , 8 ) ; - Text [ en-US ] = "Mode" ; - }; - ScrollBar SB_COMPRESSION - { - Hide = TRUE; - Size = MAP_APPFONT ( 48, 10 ) ; - VScroll = FALSE ; - HScroll = TRUE; - Drag = TRUE ; - }; - NumericField NF_COMPRESSION - { - HelpID = "svtools:NumericField:DLG_EXPORT:NF_COMPRESSION"; - Hide = TRUE; - Border = TRUE ; - Size = MAP_APPFONT ( 30, 12 ) ; - TabStop = TRUE ; - Repeat = TRUE ; - Spin = FALSE ; - Maximum = 99999; - Last = 255 ; - }; - FixedText FT_JPG_MIN - { - Hide = TRUE; - Size = MAP_APPFONT ( 41 , 10 ) ; - Text [ en-US ] = "1 is minimum Quality and smallest file size." ; - }; - FixedText FT_JPG_MAX - { - Hide = TRUE; - Size = MAP_APPFONT ( 41 , 10 ) ; - Text [ en-US ] = "100 is maximum Quality and biggest file size." ; - }; - FixedText FT_PNG_MIN - { - Hide = TRUE; - Size = MAP_APPFONT ( 41 , 10 ) ; - Text [ en-US ] = "0 is biggest file size and fastest loading." ; - }; - FixedText FT_PNG_MAX - { - Hide = TRUE; - Size = MAP_APPFONT ( 41 , 10 ) ; - Text [ en-US ] = "9 is smallest file size and slowest loading." ; - }; - CheckBox CB_INTERLACED - { - HelpID = "svtools:CheckBox:DLG_EXPORT:CB_INTERLACED"; - Hide = TRUE; - Size = MAP_APPFONT ( 60 , 10 ) ; - Text [ en-US ] = "Interlaced" ; - }; - CheckBox CB_RLE_ENCODING - { - HelpID = "svtools:CheckBox:DLG_EXPORT:CB_RLE_ENCODING"; - Hide = TRUE; - Size = MAP_APPFONT ( 60 , 10 ) ; - Text [ en-US ] = "RLE encoding" ; - }; - FixedLine FL_GIF_DRAWING_OBJECTS - { - Hide = TRUE; - Size = MAP_APPFONT ( 110 , 8 ) ; - Text [ en-US ] = "Drawing Objects" ; - }; - CheckBox CB_SAVE_TRANSPARENCY - { - HelpID = "svtools:CheckBox:DLG_EXPORT:CB_SAVE_TRANSPARENCY"; - Hide = TRUE; - Size = MAP_APPFONT ( 60 , 10 ) ; - Text [ en-US ] = "Save transparency" ; - }; - RadioButton RB_BINARY - { - HelpID = "svtools:RadioButton:DLG_EXPORT:RB_BINARY"; - Hide = TRUE; - Size = MAP_APPFONT ( 105 , 10 ) ; - Text [ en-US ] = "Binary" ; - }; - RadioButton RB_TEXT - { - HelpID = "svtools:RadioButton:DLG_EXPORT:RB_TEXT"; - Hide = TRUE; - Size = MAP_APPFONT ( 105 , 10 ) ; - Text [ en-US ] = "Text" ; - }; - FixedLine FL_EPS_PREVIEW - { - Hide = TRUE; - Size = MAP_APPFONT ( 110 , 8 ) ; - Text [ en-US ] = "Preview" ; - }; - CheckBox CB_EPS_PREVIEW_TIFF - { - HelpID = "svtools:CheckBox:DLG_EXPORT:CB_EPS_PREVIEW_TIFF"; - Hide = TRUE; - Size = MAP_APPFONT ( 60 , 10 ) ; - Text [ en-US ] = "Image Preview (TIFF)" ; - }; - CheckBox CB_EPS_PREVIEW_EPSI - { - HelpID = "svtools:CheckBox:DLG_EXPORT:CB_EPS_PREVIEW_EPSI"; - Hide = TRUE; - Size = MAP_APPFONT ( 60 , 10 ) ; - Text [ en-US ] = "Interchange (EPSI)" ; - }; - FixedLine FL_EPS_VERSION - { - Hide = TRUE; - Size = MAP_APPFONT ( 41 , 10 ) ; - Text [ en-US ] = "Version" ; - }; - RadioButton RB_EPS_LEVEL1 - { - HelpID = "svtools:RadioButton:DLG_EXPORT:RB_EPS_LEVEL1"; - Hide = TRUE; - Size = MAP_APPFONT ( 105 , 10 ) ; - Text [ en-US ] = "Level 1" ; - }; - RadioButton RB_EPS_LEVEL2 - { - HelpID = "svtools:RadioButton:DLG_EXPORT:RB_EPS_LEVEL2"; - Hide = TRUE; - Size = MAP_APPFONT ( 105 , 10 ) ; - Text [ en-US ] = "Level 2" ; - }; - FixedLine FL_EPS_COLOR_FORMAT - { - Hide = TRUE; - Size = MAP_APPFONT ( 41 , 10 ) ; - Text [ en-US ] = "Color format" ; - }; - RadioButton RB_EPS_COLOR_FORMAT1 - { - HelpID = "svtools:RadioButton:DLG_EXPORT:RB_EPS_COLOR_FORMAT1"; - Hide = TRUE; - Size = MAP_APPFONT ( 105 , 10 ) ; - Text [ en-US ] = "Color" ; - }; - RadioButton RB_EPS_COLOR_FORMAT2 - { - HelpID = "svtools:RadioButton:DLG_EXPORT:RB_EPS_COLOR_FORMAT2"; - Hide = TRUE; - Size = MAP_APPFONT ( 105 , 10 ) ; - Text [ en-US ] = "Grayscale" ; - }; - RadioButton RB_EPS_COMPRESSION_LZW - { - HelpID = "svtools:RadioButton:DLG_EXPORT:RB_EPS_COMPRESSION_LZW"; - Hide = TRUE; - Size = MAP_APPFONT ( 105 , 10 ) ; - Text [ en-US ] = "LZW encoding" ; - }; - RadioButton RB_EPS_COMPRESSION_NONE - { - HelpID = "svtools:RadioButton:DLG_EXPORT:RB_EPS_COMPRESSION_NONE"; - Hide = TRUE; - Size = MAP_APPFONT ( 105 , 10 ) ; - Text [ en-US ] = "None" ; - }; - FixedLine FL_ESTIMATED_SIZE - { - Hide = TRUE; - Size = MAP_APPFONT ( 41 , 10 ) ; - }; - FixedText FT_ESTIMATED_SIZE - { - Hide = TRUE; - Size = MAP_APPFONT ( 41 , 10 ) ; - }; - String STR_ESTIMATED_SIZE_PIX_1 - { - Text [ en-US ] = "The picture needs about %1 KB of memory."; - }; - String STR_ESTIMATED_SIZE_PIX_2 - { - Text [ en-US ] = "The picture needs about %1 KB of memory,\n the file size is %2 KB."; - }; - String STR_ESTIMATED_SIZE_VEC - { - Text [ en-US ] = "The file size is %1 KB."; - }; - FixedLine FL_BUTTONS - { - Hide = TRUE; - Size = MAP_APPFONT ( 41 , 10 ) ; - }; - OKButton BTN_OK - { - Hide = TRUE; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - DefButton = TRUE ; - }; - CancelButton BTN_CANCEL - { - Hide = TRUE; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; - HelpButton BTN_HELP - { - Hide = TRUE; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; -}; diff --git a/svtools/source/misc/svtools.src b/svtools/source/misc/svtools.src new file mode 100644 index 000000000000..1ae9e3a45bf5 --- /dev/null +++ b/svtools/source/misc/svtools.src @@ -0,0 +1,52 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include "svtools/svtools.hrc" + +String STR_1BIT_THRESHOLD +{ + Text [ en-US ] = "1 bit threshold"; +}; +String STR_1BIT_DITHERED +{ + Text [ en-US ] = "1 bit dithered"; +}; +String STR_4BIT_GRAYSCALE +{ + Text [ en-US ] = "4 bit grayscale"; +}; +String STR_4BIT_COLOR_PALETTE +{ + Text [ en-US ] = "4 bit color"; +}; +String STR_8BIT_GRAYSCALE +{ + Text [ en-US ] = "8 bit grayscale"; +}; +String STR_8BIT_COLOR_PALETTE +{ + Text [ en-US ] = "8 bit color"; +}; +String STR_24BIT_TRUE_COLOR +{ + Text [ en-US ] = "24 bit true color"; +}; +String STR_ESTIMATED_SIZE_PIX_1 +{ + Text [ en-US ] = "The picture needs about %1 KB of memory."; +}; +String STR_ESTIMATED_SIZE_PIX_2 +{ + Text [ en-US ] = "The picture needs about %1 KB of memory, the file size is %2 KB."; +}; +String STR_ESTIMATED_SIZE_VEC +{ + Text [ en-US ] = "The file size is %1 KB."; +}; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/uiconfig/ui/graphicexport.ui b/svtools/uiconfig/ui/graphicexport.ui new file mode 100644 index 000000000000..c0da519527fb --- /dev/null +++ b/svtools/uiconfig/ui/graphicexport.ui @@ -0,0 +1,1060 @@ + + + + + 1 + 100 + 75 + 1 + 10 + + + 1 + 9 + 9 + 1 + 10 + + + 999.99000000000001 + 1 + 10 + + + False + 5 + Options + dialog + + + False + vertical + 2 + + + False + end + + + gtk-help + False + True + True + True + False + True + + + False + True + 0 + + + + + gtk-ok + False + True + True + True + True + True + False + True + + + False + True + 1 + + + + + gtk-cancel + False + True + True + True + False + True + + + False + True + 2 + + + + + False + True + end + 0 + + + + + True + False + vertical + + + True + False + 0 + none + + + True + False + 12 + + + True + False + 6 + 6 + + + True + False + 0 + Width + + + 0 + 0 + 1 + 1 + + + + + True + False + 0 + Height + + + 0 + 1 + 1 + 1 + + + + + True + False + 0 + Resolution + + + 0 + 2 + 1 + 1 + + + + + True + True + ◠+ adjustment3 + 2 + + + 1 + 0 + 1 + 1 + + + + + True + True + ◠+ True + adjustment3 + 2 + + + 1 + 1 + 1 + 1 + + + + + True + True + ◠+ True + adjustment3 + + + 1 + 2 + 1 + 1 + + + + + True + False + liststore2 + + + 2 + 0 + 1 + 1 + + + + + True + False + liststore1 + + + 2 + 2 + 1 + 1 + + + + + + + + + + + + True + False + Size + True + + + + + False + True + 0 + + + + + False + 0 + none + + + True + False + 12 + + + True + False + + + + + + + True + False + Color Depth + True + + + + + False + True + 1 + + + + + False + 0 + none + + + True + False + 12 + + + True + False + 6 + 6 + + + True + False + 0 + 1 is minimum Quality and smallest file size. + + + 0 + 1 + 2 + 1 + + + + + True + False + 0 + 100 is maximum Quality and biggest file size. + + + 0 + 2 + 2 + 1 + + + + + True + True + ◠+ True + adjustment1 + + + 1 + 0 + 1 + 1 + + + + + True + False + center + True + adjustment1 + + + 0 + 0 + 1 + 1 + + + + + + + + + True + False + Quality + True + + + + + False + True + 2 + + + + + False + 0 + none + + + True + False + 12 + + + True + False + 6 + 6 + + + True + True + ◠+ True + adjustment2 + + + 1 + 0 + 1 + 1 + + + + + True + False + center + True + adjustment2 + + + 0 + 0 + 1 + 1 + + + + + True + False + 0 + 0 is biggest file size and fastest loading. + + + 0 + 1 + 2 + 1 + + + + + True + False + 0 + 9 is smallest file size and slowest loading. + + + 0 + 2 + 2 + 1 + + + + + + + + + True + False + Compression + True + + + + + False + True + 3 + + + + + False + 0 + none + + + True + False + 12 + + + RLE Encoding + False + True + True + False + False + 0 + True + True + + + + + + + True + False + Compression + True + + + + + False + True + 4 + + + + + False + 0 + none + + + True + False + 12 + + + Interlaced + False + True + True + False + False + 0 + True + True + + + + + + + True + False + Mode + True + + + + + False + True + 5 + + + + + False + 0 + none + + + True + False + 12 + + + Save transparency + False + True + True + False + False + 0 + True + True + + + + + + + True + False + Drawing Objects + True + + + + + False + True + 6 + + + + + False + 0 + none + + + True + False + 12 + + + True + False + + + Binary + False + True + True + False + False + 0 + True + textcb + + + 0 + 0 + 1 + 1 + + + + + Text + False + True + True + False + False + 0 + True + True + binarycb + + + 0 + 1 + 1 + 1 + + + + + + + + + True + False + Encoding + True + + + + + False + True + 7 + + + + + False + + + True + False + 0 + none + + + True + False + 12 + + + True + False + + + Image Preview (TIFF) + False + True + True + False + False + 0 + True + True + + + 0 + 0 + 1 + 1 + + + + + Interchange (EPSI) + False + True + True + False + False + 0 + True + + + 0 + 1 + 1 + 1 + + + + + + + + + True + False + Preview + True + + + + + 0 + 0 + 1 + 1 + + + + + True + False + 0 + none + + + True + False + 12 + + + True + False + + + Color + False + True + True + False + False + 0 + True + color2rb + + + 0 + 0 + 1 + 1 + + + + + Grayscale + False + True + True + False + False + 0 + True + True + color1rb + + + 0 + 1 + 1 + 1 + + + + + + + + + True + False + Color format + True + + + + + 1 + 0 + 1 + 1 + + + + + True + False + 0 + none + + + True + False + 12 + + + True + False + + + Level 1 + False + True + True + False + False + 0 + True + level2rb + + + 0 + 0 + 1 + 1 + + + + + Level 2 + False + True + True + False + False + 0.059999998658895493 + True + True + level1rb + + + 0 + 1 + 1 + 1 + + + + + + + + + True + False + Version + True + + + + + 0 + 1 + 1 + 1 + + + + + True + False + 0 + none + + + True + False + 12 + + + True + False + + + LZW encoding + False + True + True + False + False + 0 + True + compressnone + + + 0 + 0 + 1 + 1 + + + + + None + False + True + True + False + False + 0 + True + True + compresslzw + + + 0 + 1 + 1 + 1 + + + + + + + + + True + False + Compression + True + + + + + 1 + 1 + 1 + 1 + + + + + False + True + 8 + + + + + False + 0 + none + + + True + False + 12 + + + True + False + 0 + 3 + True + 30 + + + + + + + True + False + Information + True + + + + + False + True + 9 + + + + + False + True + 1 + + + + + + help + ok + cancel + + + + + + + + + + pixels/cm + + + pixels/inch + + + pixels/meter + + + + + + + + + + + inches + + + cm + + + mm + + + points + + + pixels + + + + From ae326faf5a5f4c9c078e914cb0e3adfcc04674df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 9 Oct 2012 15:57:07 +0100 Subject: [PATCH 619/863] clip numeric formatter max width Change-Id: I2211d63a7bbe564a9ed586dabc33399eb8aa6183 --- vcl/source/control/field.cxx | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index 3548f611c80a..9474761969e5 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -962,6 +962,16 @@ namespace Size aRet(std::max(aMinTextSize.Width(), aMaxTextSize.Width()), std::max(aMinTextSize.Height(), aMaxTextSize.Height())); + OUStringBuffer sBuf("999999999"); + sal_uInt16 nDigits = rFormatter.GetDecimalDigits(); + if (nDigits) + { + sBuf.append('.'); + comphelper::string::padToLength(aBuf, aBuf.getLength() + nDigits, '9'); + } + aMaxTextSize = rSpinField.CalcMinimumSizeForText(sBuf.makeStringAndClear()); + aRet.Width() = std::min(aRet.Width(), aMaxTextSize.Width()); + return aRet; } } From 54acc08629eeee8831931f3a6ba7747451e0f032 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 9 Oct 2012 16:27:56 +0100 Subject: [PATCH 620/863] default internal-children to visible, default containers to not-shown Change-Id: I25cd15e586abeeeabfde7539986309b187690320 --- vcl/inc/vcl/layout.hxx | 2 -- vcl/source/window/builder.cxx | 10 ++++++++++ vcl/source/window/layout.cxx | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/vcl/inc/vcl/layout.hxx b/vcl/inc/vcl/layout.hxx index 9e869a3ae258..6aeefe795b3e 100644 --- a/vcl/inc/vcl/layout.hxx +++ b/vcl/inc/vcl/layout.hxx @@ -53,7 +53,6 @@ public: , m_bHomogeneous(bHomogeneous) , m_nSpacing(nSpacing) { - Show(); } void set_spacing(int nSpacing) { @@ -339,7 +338,6 @@ public: , m_bRowHomogeneous(false), m_bColumnHomogeneous(false) , m_nRowSpacing(0), m_nColumnSpacing(0) { - Show(); } void set_row_homogeneous(bool bHomogeneous) { diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 97426b549853..5ab64b3c7881 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -945,6 +945,7 @@ bool VclBuilder::sortIntoBestTabTraversalOrder::operator()(const Window *pA, con void VclBuilder::handleChild(Window *pParent, xmlreader::XmlReader &reader) { Window *pCurrentChild = NULL; + bool bIsInternalChild = false; xmlreader::Span name; int nsId; @@ -957,6 +958,10 @@ void VclBuilder::handleChild(Window *pParent, xmlreader::XmlReader &reader) name = reader.getAttributeValue(false); sType = OString(name.begin, name.length); } + else if (name.equals(RTL_CONSTASCII_STRINGPARAM("internal-child"))) + { + bIsInternalChild = true; + } } if (sType == "tab") @@ -981,6 +986,11 @@ void VclBuilder::handleChild(Window *pParent, xmlreader::XmlReader &reader) if (bObjectInserted) { + //Internal-children default in glade to not having their visible bits set + //even though they are visible (generally anyway) + if (bIsInternalChild) + pCurrentChild->Show(); + //Select the first page if its a notebook if (pCurrentChild->GetType() == WINDOW_TABCONTROL) { diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index 8f05785fd929..1b4e2527b655 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -15,7 +15,7 @@ VclContainer::VclContainer(Window *pParent) : Window(WINDOW_CONTAINER) , m_bLayoutDirty(true) { - ImplInit(pParent, 0, NULL); + ImplInit(pParent, WB_HIDE, NULL); } Size VclContainer::GetOptimalSize(WindowSizeType eType) const From e213253ad440eceef6700122a4c57701e7ec9d1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 9 Oct 2012 16:39:26 +0100 Subject: [PATCH 621/863] remove some unnecessary headers Change-Id: I367ee95976ddedb7c6be4e0fc0d87147e7ed22f5 --- vcl/inc/printdlg.hxx | 8 -------- vcl/source/window/printdlg.cxx | 6 ------ 2 files changed, 14 deletions(-) diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx index 7de6ff9ba17f..d4d88fb8bc50 100644 --- a/vcl/inc/printdlg.hxx +++ b/vcl/inc/printdlg.hxx @@ -42,7 +42,6 @@ #include "vcl/field.hxx" #include "vcl/tabctrl.hxx" #include "vcl/tabpage.hxx" -#include "vcl/arrange.hxx" #include "vcl/virdev.hxx" #include @@ -136,9 +135,6 @@ namespace vcl // border around each page CheckBox* mpBorderCB; - boost::shared_ptr< vcl::RowOrColumn > mxBrochureDep; - boost::shared_ptr< vcl::LabeledElement >mxPagesBtnLabel; - void setupLayout(); NUpTabPage( VclBuilder* ); @@ -184,8 +180,6 @@ namespace vcl CheckBox* mpToFileBox; CheckBox* mpCollateSingleJobsBox; - boost::shared_ptr mxOptGroup; - OutputOptPage( VclBuilder* ); void readFromSettings(); @@ -231,8 +225,6 @@ namespace vcl rtl::OUString maPrintText; rtl::OUString maDefPrtText; - boost::shared_ptr mxPreviewCtrls; - Size maDetailsCollapsedSize; Size maDetailsExpandedSize; diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 84bcb3f9db32..bd7693f4105f 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -38,7 +38,6 @@ #include "vcl/wall.hxx" #include "vcl/status.hxx" #include "vcl/decoview.hxx" -#include "vcl/arrange.hxx" #include "vcl/configsettings.hxx" #include "vcl/help.hxx" #include "vcl/decoview.hxx" @@ -1269,11 +1268,6 @@ void PrintDialog::setPreviewText( sal_Int32 ) { rtl::OUString aNewText( searchAndReplace( maPageStr, "%n", 2, rtl::OUString::valueOf( mnCachedPages ) ) ); mpNumPagesText->SetText( aNewText ); - - // if layout is already established the refresh layout of - // preview controls since text length may have changes - if( mxPreviewCtrls.get() ) - mxPreviewCtrls->setManagedArea( mxPreviewCtrls->getManagedArea() ); } void PrintDialog::preparePreview( bool i_bNewPage, bool i_bMayUseCache ) From c1d2eed375293d7c27bb885f344cc24ec0cd40ca Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 9 Oct 2012 13:32:15 +0200 Subject: [PATCH 622/863] fdo#54648: WW8 export: test that FlyFrm actually has layout frm The bugdoc has 2 "hidden" drawing objects that are invisible. Change-Id: I58179f2e620348db5357b38f834e1edca1f20ae2 --- sw/source/filter/ww8/wrtw8esh.cxx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index c71bae931b7d..6d8866804d11 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -1648,6 +1648,10 @@ bool lcl_isInHeader(const SwFrmFmt& rFmt) if (!pFlyFrmFmt) return false; SwFlyFrm* pFlyFrm = const_cast(pFlyFrmFmt->GetFrm()); + if (!pFlyFrm) // fdo#54648: "hidden" drawing object has no layout frame + { + return false; + } SwPageFrm* pPageFrm = pFlyFrm->FindPageFrmOfAnchor(); SwFrm* pHeader = pPageFrm->Lower(); if (pHeader->GetType() == FRM_HEADER) From ecd70a727d7f559ebda1dd726cea1be472948270 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 9 Oct 2012 17:27:52 +0200 Subject: [PATCH 623/863] add editeng::ConvertBorderWidthFromWord: Replace the 2 duplicate implementations of this in ww8 and writerfilter with a common one. Differences were: 2) ww8 doubles the with, writerfilter does not 13) unsupported, mapped to THINTHICK_SMALLGAP vs. THICKTHIN_SMALLGAP 22) unsupported, mapped to DASHED vs. SOLID 26) INSET not supported in writerfilter 27) OUTSET not supported in writerfilter Change-Id: I533b77394388e736f38d70284a6a11061d81e813 --- editeng/inc/editeng/borderline.hxx | 5 +- editeng/source/items/borderline.cxx | 77 ++++++++++++++++++- sw/source/filter/ww8/ww8par6.cxx | 76 +----------------- .../source/dmapper/ConversionHelper.cxx | 69 +---------------- 4 files changed, 86 insertions(+), 141 deletions(-) diff --git a/editeng/inc/editeng/borderline.hxx b/editeng/inc/editeng/borderline.hxx index 7d18587e78fb..4bb4388243ea 100644 --- a/editeng/inc/editeng/borderline.hxx +++ b/editeng/inc/editeng/borderline.hxx @@ -52,9 +52,12 @@ namespace editeng { // values from ::com::sun::star::table::BorderLineStyle typedef sal_Int16 SvxBorderStyle; + // convert border style between Word formats and LO + SvxBorderStyle EDITENG_DLLPUBLIC ConvertBorderStyleFromWord(int); /// convert border width in twips between Word formats and LO double EDITENG_DLLPUBLIC ConvertBorderWidthToWord(SvxBorderStyle, double); - double EDITENG_DLLPUBLIC ConvertBorderWidthFromWord(SvxBorderStyle, double); + double EDITENG_DLLPUBLIC ConvertBorderWidthFromWord(SvxBorderStyle, + double, int); class EDITENG_DLLPUBLIC SvxBorderLine { diff --git a/editeng/source/items/borderline.cxx b/editeng/source/items/borderline.cxx index 704bbfa8d12e..f81493a4a0c4 100644 --- a/editeng/source/items/borderline.cxx +++ b/editeng/source/items/borderline.cxx @@ -117,6 +117,78 @@ SvxBorderLine::SvxBorderLine( const Color *pCol, long nWidth, aColor = *pCol; } + +SvxBorderStyle +ConvertBorderStyleFromWord(int const nWordLineStyle) +{ + switch (nWordLineStyle) + { + // First the single lines + case 1: + case 2: // thick line + case 5: + // and the unsupported special cases which we map to a single line + case 8: + case 9: + case 20: + return SOLID; + break; + case 6: + return DOTTED; + break; + case 7: + case 22: + return DASHED; + break; + // then the shading beams which we represent by a double line + case 23: + return DOUBLE; + break; + // then the double lines, for which we have good matches + case 3: + case 10: // Don't have triple so use double + case 21: // Don't have double wave: use double instead + return DOUBLE; + break; + case 11: + return THINTHICK_SMALLGAP; + break; + case 12: + case 13: // Don't have thin thick thin, so use thick thin + return THICKTHIN_SMALLGAP; + break; + case 14: + return THINTHICK_MEDIUMGAP; + break; + case 15: + case 16: // Don't have thin thick thin, so use thick thin + return THICKTHIN_MEDIUMGAP; + break; + case 17: + return THINTHICK_LARGEGAP; + break; + case 18: + case 19: // Don't have thin thick thin, so use thick thin + return THICKTHIN_LARGEGAP; + break; + case 24: + return EMBOSSED; + break; + case 25: + return ENGRAVED; + break; + case 26: + return OUTSET; + break; + case 27: + return INSET; + break; + default: + return NONE; + break; + } +} + static const double THINTHICK_SMALLGAP_line2 = 15.0; static const double THINTHICK_SMALLGAP_gap = 15.0; static const double THINTHICK_LARGEGAP_line1 = 30.0; @@ -129,7 +201,8 @@ static const double OUTSET_line1 = 15.0; static const double INSET_line2 = 15.0; double -ConvertBorderWidthFromWord(SvxBorderStyle const eStyle, double const fWidth) +ConvertBorderWidthFromWord(SvxBorderStyle const eStyle, double const fWidth, + int const nWordLineStyle) { switch (eStyle) { @@ -137,7 +210,7 @@ ConvertBorderWidthFromWord(SvxBorderStyle const eStyle, double const fWidth) case SOLID: case DOTTED: case DASHED: - return fWidth; + return (2 == nWordLineStyle) ? (fWidth * 2.0) : fWidth; break; // Double lines diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 3b6503b75aa8..31ebaa87b16b 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -1280,83 +1280,13 @@ sal_uInt8 lcl_ReadBorders(bool bVer67, WW8_BRC* brc, WW8PLCFx_Cp_FKP* pPap, void GetLineIndex(SvxBoxItem &rBox, short nLineThickness, short nSpace, sal_uInt8 nCol, short nIdx, sal_uInt16 nOOIndex, sal_uInt16 nWWIndex, short *pSize=0) { - ::editeng::SvxBorderStyle eStyle = table::BorderLineStyle::SOLID; - switch (nIdx) - { - // First the single lines - case 1: - case 5: - // and the unsupported special cases which we map to a single line - case 8: - case 9: - case 20: - case 22: - eStyle = table::BorderLineStyle::SOLID; - break; - case 2: - { - eStyle = table::BorderLineStyle::SOLID; - nLineThickness *= 2; - } - break; - case 6: - eStyle = table::BorderLineStyle::DOTTED; - break; - case 7: - eStyle = table::BorderLineStyle::DASHED; - break; - // then the shading beams which we represent by a double line - case 23: - eStyle = table::BorderLineStyle::DOUBLE; - break; - // then the double lines, for which we have good matches - case 3: - case 10: //Don't have tripple so use double - case 21: //Don't have double wave: use double instead - eStyle = table::BorderLineStyle::DOUBLE; - break; - case 11: - eStyle = table::BorderLineStyle::THINTHICK_SMALLGAP; - break; - case 12: - case 13: //Don't have thin thick thin, so use thick thin - eStyle = table::BorderLineStyle::THICKTHIN_SMALLGAP; - break; - case 14: - eStyle = table::BorderLineStyle::THINTHICK_MEDIUMGAP; - break; - case 15: - case 16: //Don't have thin thick thin, so use thick thin - eStyle = table::BorderLineStyle::THICKTHIN_MEDIUMGAP; - break; - case 17: - eStyle = table::BorderLineStyle::THINTHICK_LARGEGAP; - break; - case 18: - case 19: //Don't have thin thick thin, so use thick thin - eStyle = table::BorderLineStyle::THICKTHIN_LARGEGAP; - break; - case 24: - eStyle = table::BorderLineStyle::EMBOSSED; - break; - case 25: - eStyle = table::BorderLineStyle::ENGRAVED; - break; - case 26: - eStyle = table::BorderLineStyle::OUTSET; - break; - case 27: - eStyle = table::BorderLineStyle::INSET; - break; - default: - eStyle = table::BorderLineStyle::NONE; - break; - } + ::editeng::SvxBorderStyle const eStyle( + ::editeng::ConvertBorderStyleFromWord(nIdx)); ::editeng::SvxBorderLine aLine; aLine.SetBorderLineStyle( eStyle ); double const fConverted( (table::BorderLineStyle::NONE == eStyle) ? 0.0 : - ::editeng::ConvertBorderWidthFromWord(eStyle, nLineThickness)); + ::editeng::ConvertBorderWidthFromWord(eStyle, nLineThickness, nIdx)); aLine.SetWidth(fConverted); //No AUTO for borders as yet, so if AUTO, use BLACK diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx b/writerfilter/source/dmapper/ConversionHelper.cxx index d428fc118fe4..40ea9bdc2674 100644 --- a/writerfilter/source/dmapper/ConversionHelper.cxx +++ b/writerfilter/source/dmapper/ConversionHelper.cxx @@ -133,77 +133,16 @@ void MakeBorderLine( sal_Int32 nLineThickness, sal_Int32 nLineType, if(!bIsOOXML && sal::static_int_cast(nLineColor) < SAL_N_ELEMENTS(aBorderDefColor)) nLineColor = aBorderDefColor[nLineColor]; - sal_Int16 nLineStyle = NONE; // Map to our border types, we should use of one equal line // thickness, or one of smaller thickness. If too small we // can make the defecit up in additional white space or // object size - switch(nLineType) - { - // First the single lines - case 1: - case 2: - case 5: - nLineStyle = SOLID; - break; - // Dotted and dashed lines - case 6: - nLineStyle = DOTTED; - break; - case 7: - case 22: - nLineStyle = DASHED; - break; - // and the unsupported special cases which we map to a single line - case 8: - case 9: - case 20: - nLineStyle = SOLID; - break; - // Double line - case 3: - case 10: //Don't have tripple so use double - case 21: - case 23: - nLineStyle = DOUBLE; - break; - case 11: - case 13: //Don't have thin thick thin, so use thick thin - nLineStyle = THINTHICK_SMALLGAP; - break; - case 12: - nLineStyle = THICKTHIN_SMALLGAP; - break; - case 14: - nLineStyle = THINTHICK_MEDIUMGAP; - break; - case 15: - case 16: //Don't have thin thick thin, so use thick thin - nLineStyle = THICKTHIN_MEDIUMGAP; - break; - case 17: - nLineStyle = THINTHICK_LARGEGAP; - break; - case 18: - case 19: //Don't have thin thick thin, so use thick thin - nLineStyle = THICKTHIN_LARGEGAP; - break; - // Embossed and engraved lines - case 24: - nLineStyle = EMBOSSED; - break; - case 25: - nLineStyle = ENGRAVED; - break; - case 0: - case 255: - default: - break; - } - + ::editeng::SvxBorderStyle const nLineStyle( + ::editeng::ConvertBorderStyleFromWord(nLineType)); rToFill.LineStyle = nLineStyle; double const fConverted( (NONE == nLineStyle) ? 0.0 : - ::editeng::ConvertBorderWidthFromWord(nLineStyle, nLineThickness)); + ::editeng::ConvertBorderWidthFromWord(nLineStyle, nLineThickness, + nLineType)); rToFill.LineWidth = convertTwipToMM100(fConverted); rToFill.Color = nLineColor; } From 59ab112fe93cbf4e2b052f4e8bafbdb4e6738bef Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 9 Oct 2012 17:56:21 +0200 Subject: [PATCH 624/863] fdo#55526: fix import of RTF \brdrhair: This is a hairline border that should be mapped to a non-zero width border given that LO doesn't have hairline borders as such. Change-Id: I4a2d2f983ac8e016b2ddb6b38435f5562e545c72 --- editeng/source/items/borderline.cxx | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/editeng/source/items/borderline.cxx b/editeng/source/items/borderline.cxx index f81493a4a0c4..610bafe68d1a 100644 --- a/editeng/source/items/borderline.cxx +++ b/editeng/source/items/borderline.cxx @@ -126,7 +126,7 @@ ConvertBorderStyleFromWord(int const nWordLineStyle) // First the single lines case 1: case 2: // thick line - case 5: + case 5: // hairline // and the unsupported special cases which we map to a single line case 8: case 9: @@ -208,9 +208,23 @@ ConvertBorderWidthFromWord(SvxBorderStyle const eStyle, double const fWidth, { // Single lines case SOLID: + switch (nWordLineStyle) + { + case 2: + return (fWidth * 2.0); // thick + break; + case 5: // fdo#55526: map 0 hairline width to > 0 + return (fWidth > 1.0) ? fWidth : 1.0; + break; + default: + return fWidth; + break; + } + break; + case DOTTED: case DASHED: - return (2 == nWordLineStyle) ? (fWidth * 2.0) : fWidth; + return fWidth; break; // Double lines From b5bb36194bc25ccbef027dec257092bbf395386d Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Tue, 9 Oct 2012 18:33:22 +0200 Subject: [PATCH 625/863] sw: add odf and ww8 regression tests for first page header/footer Change-Id: Ic002f3cba79b6758475cf9d3153ae3063eb640a3 --- .../odfexport/data/first-header-footer.odt | Bin 0 -> 9644 bytes sw/qa/extras/odfexport/odfexport.cxx | 22 +++++++++++++++++ .../ww8export/data/first-header-footer.doc | Bin 0 -> 23552 bytes sw/qa/extras/ww8export/ww8export.cxx | 23 ++++++++++++++++++ 4 files changed, 45 insertions(+) create mode 100644 sw/qa/extras/odfexport/data/first-header-footer.odt create mode 100644 sw/qa/extras/ww8export/data/first-header-footer.doc diff --git a/sw/qa/extras/odfexport/data/first-header-footer.odt b/sw/qa/extras/odfexport/data/first-header-footer.odt new file mode 100644 index 0000000000000000000000000000000000000000..2ed6b740a1029ba13942da022a56fdf796acfdb7 GIT binary patch literal 9644 zcmdUVcU%)&*KVYDse<$-(nBwyBfUun0f87oGbE6NE+EoGkY1!ql_DT0DAJ@OO#xAn zDn+CtNR##jm4nCQdGGuE?)~RZX7Zcad#z`$-B#AKGWy!sIMe_D0RTXuHLqyhE<$n< z0010cm?D6SlM58>?Ft3Ey26|wV6+ng4)lQA2_nEKCzK$<6$-aQK-^uRaI_#A>V?+- z8<@$mr$7ZZ0C0SL2ZN%)f?h5#Sq01&s|OT`!obO~3kwRdvqIqzgq;)IL5|(TSWQ5R zT|u5m7GZDi1c8E1S`fgP0%pai!cm|fRdVd^NI2-bEg(491&RWpA)sH40{tot`rgow z5-*q&{JI>wBO2`r0s=ifJq0~Q1rbOGps=*GH1K;Z`_HEAAb-iZx+7uVrR*R;C=7bs zZ4^*gP#Ab3du-u@WFWI)ITC z1v&ujz-X|5hZEG3gPrx~IQ}x=BJA=fqkC+IyzF;lAV}!<85Y1OL*+$;ghd2|Bn5;d zj75Y&LSi6saarIW8|$7XOfSfWn~|Tm({H$LSgpdineE0g4Jra_Tt2-Mwtgr6g=5 z#8`i+v~fiuoS_gj&|b=3L`3>0_$kg0+`kqe3XQQEg?56lejf)k_!bKF)~>ghKz)!R_it=upWepNpdS#@1cfFfB~jyPh`y5q z11BRMZfYQJ9vzyBd_>~S6;`Z-Hz|1J5Bcx;)w*st(QL%i#_%e;EsFOoj1%4lv}p7o z>N_;IzvgbwuS7GX_vQdB*zlZ4l(TqWr!pH{{Q6wKbZM(JS*u^UfPILPA8%+tiI|GK zyu4~$eyp;ul8=u$e9jV)?LJUEl+-;tygo%TTle-^LqpkcZFw{vw|)P+*m?=tO;dFZ)FBr_oy9yDf`bt8fXj%IHCjOR#IG${JXb$6{>vTWy?f zmp65Os|R}-Szqgbfx1FptXDs~D|<@asqr*xELu*L8ildge+U_S!2KqoJ~XX&qrGD~ zG9bjU;eF#$#J8bccj?7xTtRhm!zd+(rdCGdz830OY^w2$B%Xwgekzx6ZQQeT%CVd0 zrx$ED9tdmeaZof9HILaYUl!UUQ@T`kme?EEBVgimKE*c8N*)-H5K`mWUntp~CZMb} zJykc(ece>mh-@gREwz;K!`p>Iat^$}{ORj1PYtd|5})xh>DvLedMOvI4_7M|Me}O- zRks^^#yqI#40_JH=+ZjZrC-mGEJ!TYb#T4$IscW&H*``s^vz{?#1~8(=B7rb4AH(u zoh+YEBEtc@)9te>P{wbaQ+f0~k0n3WVUG|24a#=lLQdiR^j zMoxOaQgLtP-Wt~aD*~@V|GY2M{0gQlJZV*-A)!6tvK9Rgo-ke42`yv~Dqg4`oj&_! z!Z1H~`1$1~qsy_@vO=*U<6Q3BOT4aB=JRY0XZT~nVt@rE&%BL=CbKt4=(LOpX;%94 zR$FnMMaETA9CmmgdK&T&j&JKc<^eYZx%H?7zIez)7cIfGfT9f%3~r?$X6}gGAk%(B zZl}n1aYj5%5bIJ%x&||62xshlou^l7=qo=i=;v`F@i$vikLW|#2(Tsa4Hk-4SwqU% zxk8Hw&|Tvt1|3Sntbn}X&Uib`bp^nO#DiCEIq#yRrVVs-`z0(KEO)FXU42=D=545p z&3uqvyc|N8SUPDR@Genx6jQirjng_G`Q(LN#2 z8|CJ~T#)OY&~~2W3RWebFmsUJRh3A3>=9>Dd(j1x^!u$IXY9{X-KJW}<9Po>GOf@4 zmP9Y;MTT(Ky;0YlP$OE3+_4+h6w5^IdoP+j7hcBJ0-RjoYJ)giFh_kMGfVxPtT-IS z%v4IVhOzT(pZx3uUd;|c51!AYCvfhelI(pyF)?@>BKz#8XNUto4ER(W#I0W(oJ$+@ z0uXslvgb<}&D@PCxO*eaeVo*3;!~Ih=RGTyhbX1P_ZfqXWr;GK((~qzoL@{1-G6_j zaV7bsGg0F1wf1!yyz4*K#cSRz5*)wkl}@l zudyKkB7h90Wv;-$y718kTuPL+{*5E)pLCD{vnOgLmr0# zhJ4=~`o<E)4%iW6@ za0cfyMiR#kNGhC#uBXN9 z@6}f~1@dz)Jpnp>%tZO!XoRfTJ&=Bqf&pECo&6dh&uA|Ret&gHBB;zHMI)z1Ps>m!gD$o6P9hWEd@j|~q=4LBrJe#A z*DRO!<2@HFmu_lHY?ygW%FCGKrD#{16F6sOzO0$4KgS(UzL~=wnpOCo*t(&7x>VTY zmfN7%yWRzhVn*P~%F3h1cuiuH#TJBNT0Hi*hTFuft$?m!0{7TZn^#~qhF54A3hcu| z>DIFzE?kwbW%t-sar~TAI9&DdMa$Q+f!+D5`F?Pv9uM}5Pj_%5SLSAS&54We)h4x( zDXY?y+am^Z_ipe&W1I;alrlzVdwV69vV1>(;;%Cp6&eZ}eC(=)LrRg{X8s!R^up44i&u{h*7voZK4euFY9vvsdlQ<_(aD__{4&G8RH9B-by0lZaP5vI6-87Mi7ZJ0k3-J&cdWKOq#CLrp-W1MUA*%ZVJ%l^ z_PkeM&@M5VO|OA`DYphg}&);KxGTOR%KuW#3iXF*rMF0xBX+xcQM<8qs3t*%%~nP(#pN zz0Q}TQKnI~OtRKI?l^|M{?LqWk;lMksUH6*FoO3ps({1+)MZy`5LuT?8kFSV5wcH* z7&Y?HTwK3oVX1M(jHe)mrk|bpikdSx>9NOP3V&^V>u}8Fm5Vble&MSF5+ZU>_P6e4 zxX0E;zDs2j5S^x})o6}|8}~-}FzG)IaNZF+ANh>1WIG*sl@O^|DdCE5ukm8}jNT=> z&c3Cf4Wru@3={KXTna0jr4y*ENwUKOSw!@q_RQxs<}AWTHYMw1YQ$%4f|Y6g&pGby zc85?_-&4}vdrlhtz^3u6*%8*sUjM=7obii#v~d7{(C*Hb4Yq9?+LkZNkE7y6+1@a)Dc z0Yz&#e&!xJ^wpmDsMVOlXZo^jKby}PdJm2O#dQI`ST81205NL+*XJiYK(9SYj9x%c z@Y{_BFWJN0(2|l8n8e=hjglb?3yV7{>|}a)JHT|3`=%u{5pCAx@0LBXGBd3Nliw{? zL2~;$=Qf&bUlW~=?%?C&3uR zoL)OuXk8xG^3kJKE=7kZM7hSQZx-3|@wI8=)hb{RQ*>0++qZ9F;Ul{n8yg`ZxO;YqNHTY7kN!c7F=Ti$W4!cokk$QTBsCcqh(M^{-?Nj|Ut;1UK=A6clY zuOHqUmnZWW>F(|x9kqHeSfTuBZq6kL?dAqP3zFiSB-X>z=S{Q^YH4X1W=+(Biloe= zok{DmCdS69R)a{%$jD$V5Nz#c>wN|W1`mG}YOsmtjLqKTMy%oM<57=?j&}E9n+%o* zEU&O9LUHk(Z~*_`oO*b#VG`=O{ZmspujV2;rn3;wYHMp78*OZCJlC?Yj>6*4ym79& zR`Gsu^ZD4y;9z|B?7C0A2TY89_l7(j2{Q`|!o_81anqQ0bAy&4Ju}mSGX5oJicYnK zK&?WohSc%sk|6?NZr>-_h4{HXcS859m7pXenak$LkUqDaO*l;AdeP|UXb+yp=F(En z>h{R<#=5#E57ILz*KjXl(~;m+nDf)$HRYulA;!fDM1!uDnl9&$uWob1cDA$x`B8x~ z`W6A(f(I56ZB>-kLi+Y+%ClQI7dl zS63J8QC%I(%w_+J(xmVHuub4nKD=XiA;2NxaQelvN8<$H4bdc~JPN@7gY$qmFo)tO zLes?a*jH$(>Zz0|+uk~HKtHJBTk8!jCQPja<~pW|Ft9hm9m9jc5JxD)&eo1w=$fr9 z!K9t7E%=u3Jut~Rx*(c%TWk@)-(j9?I}YGtTv8Aw8aak>0mGf_p(wN<($2m&z84-O zL>{~<8v^ZnuL#7&MRIr5IA^^O4>iXHuBTFtH$=so8srr(WWAX#QxlztdXlybX6%fp zENn6sgYaDF(r~Pr=L6LW*5r?XKD@8yV@YND;vAHp#rxb7&MR$`6e1u=0(hV^09 ztg(TLcL{a6g3&>Y&-Jw1M3XiQq?@vrr#fuw2ZM5CZP)msUcDc`O;RvxJz4)~#VTmx zMxvw73dF~Ku|6!yQ=JI=YdqppFG|3Q!O55{6LI}S)F>i?j5{Hyr;@ElwEpWFMB*711$ z@3rh<2u!Z+v~NGQ4aO+I@lWsZah!?$-9j(~f=NGqPjvwy?nva%_#OL~ZR36%>YLU} zX%hkfP&ojA2ovg~(B7CF+Fy~rKPJjQzJ81Jmn|)$N2)3PUzH0PQ~SlaIKBH)7OU&_ zn%yxl58rWc?p6|an!^PH)}l>N;~|M=Y>r*m+wm#(G#mokK399GiBT1vRsROy`b#GJ z^w;ZLw+l9GZ*>P3ysFN9`EeQ#csd4Iy1a|m?hZS?V+|zJpY=@Zr*M0E-c`3!6^4d! ze-f;to%iwr8hRoETRi~rCBqk4iv#5SV30r>h`Z)^R0*Y8aev2~(G`EKB5@P=Yr^85 zyK@`eDTm9ht5KD!bQJfbmtGod;mn3_N(tQ1!)|cIV`OWH2RlDYk^OpqrY-X09T70; z%XV7sH9gqib-p_{r0O|`9>L91eXca6N1V^2$MNw}Ut0;gZzLU!?K+07n3!#3Ngc0? z?doR9IozJ~CGzbBI^6t5H-d(8A&$6UWR=TM?CX~TeZb(=M_EVdnikyG1&rehMr8!J z$i^E}bab>|azBYDxge$E7KhTr$|=K7lIU;DkCki+pi}au)?r;GRaaW~yF|d1Q6EPM zcO~q&B{d_{>@CEQJ;M=5RA42#OT1;z?5?os?GGwW>&HrDin?Z zJ#VCS?uZ)C^-4h##M#nqgIU-4@5uaNQKdB4I5-R zCGGK0ByKJ#&dw`E;FhMEnG8A2fL380zY}+Wq~*@Jd^GK?S;mO9L#}(5fpN{+quaN! zJ~$E>;gflXP~P)y7J$wWCyJ|9wwtM^tj=V|T{7h!gyb_n^0AX>==;bh!(N@8$u63J zVsL#sOLI-5rhXc&8aJYBOw4Pd#280y)O%;$IU zh9y4@szS%?TNxITOS8p%NIoVjkX`5k3wLa{f5=qP9*b+x(f)RD)-usPQ-?WY`dplU zlJ6z5x@Ti%mR7}6%%8Y*oBX<@5*wv?Zp*#u?0mQ&LQ!>&dxIs4GzuW47giSjMCd|H zN4_yuuOCI#{1E91QJrs$W%O++{Jw1KgE%D~_tekpPcxE9Z1cz3KY|1N8UUUxq-n^( zXr)kMl`egGnH0syv-gTq5x)Gd;^cffm+=#<&>UI{)#W_#FWEULJ^)&cqId;c_ILRS z&yVevo>2xyBZSM8l_bq!vq69(L%a@DelmmbmV={D@jo3zl%9$z-Qi^;Wle)s}~!Zb(dY z!t2f4X9C)UoJ8D32IH#*=jg?$5}dgdcgdD_JDbJz6W`>G^Jyi!ILnuodEwp#QXqYS zU)zJz&nh|Mm_%)nwNoYUClL5JyUGd+F@L-t{hEdawa!r#s~tN%{fO$qmwE1RW>k+& zjL%IkwaAZ(Bywd~Vvh3pScQDo`~r*c;N$s)Zk?luzRRW|fl4anFPVhyHBphse!7dN z=ldwzN5VIdNs?V^U7)^y?RMu5Q>MjAmayRMI7u$SOxl+641>zmF5)+$oNrnfCHI$x z4apqaeY(OMyq={BerToMBkGHN(ewiQaoFwfBtM==SambaHAN|*jjvSem)7Kw^-QQkJJF4qM*Ba!W6ZIm`kx36-tY-$kcp3-^^J_;0re01) z=q8)w#}$qgrLm%UbdP%7xIPFl^Vdf?x-qTqwkU=-dh6%R%la(hw&kN0g@aLn$S*{S z;mO$d%$3hlR{0C62-=)skJv#1;*thhRH*uJyQXMvR$5t;-W)LWx$oFqqv*ZY8$@|| zj`mP+)ev-_4pVZa0ZV_1FCf{IM^0btqt$(@dMy2Ohe=c9J~8}#!}?_y#O_5l4GXQa zRJu~M-2MA$>a*8CjbER7Cl4sKk!La_G9OGD-p|9@5Xy$CNw{y2bx<~cGUduO?wpXH z%xS0nwwEN6@Xp-&*=N@O`&HZgnZobiy8T`t!+v@`5ZZ zZ#>6CqHboZ^9-Z0|G+YD=M%#IZSFYMV#6MHID8)C^!n7^bgVol)$Yop3~ zB*;k|&pz{n`^cN9z8UX2bGdg&9Sav6DU!}?U4KQozSduLIM&#IpP>bNOV+vBf}+}d z+))WPQxJcw-w}X_h!J6LY=yB0i!_l_=q25Zg1;?%%8HFp+~=_LjCI;er@f%AaCrdC zc<%E!vu=Zf47Wv6JOs7+ZpTqRL*1-YVuMZdS^Feq8_+w)d*-83%D!Gp#{k!+?h7Zq zB|l!RBQsPsL{t5qwSzu0iE{+YNV3Yeh?<&jR9+1a)#Xe(&d)j-OO9%o5PM6y5mXX#49?=AjMG z!Sch&G?Jb-`mFGLclFRv_7KdpbdlmY6t1ZSP3wqH8ru_%jL-)5@=b0BXg$^WT5a!G zx=;RXT96|$0{`#q9z;++-eL;?lHd39Ts2ZJ=D;R6&OQlD1d)!wXTbHAEBc7txw zF!ypTI#Rw|n_)mBnLfWOKNnqni?oSw*Pv*vxX7*8I!hM@;$e#FuUe z8Y>BC>Zt+$qBEErY^kv}yoHr~Y>xWeNY`t7lWeIgDhq@I*g9+Pm2NfNV!MN|k#Uwc zN$fIx4DnyB2jiKh#e23=yzi`>82HGjR6qUBlt>oUIP20RS8wd*u-<;JaaZf0- zzkuXqVja#Sl;!GG3nMEc{|{S>dsJt=J8;XjA(*J(vBgr6=nU4P;BL64jNp54PV zLh4IzyO+8@;5oz6rq8nr(9i{u;ftz3k&yvsKL=P*WvO+EX~hg{p`wLQcWXSQ+{4Wl z-bp?_#ALh9U{M49{q2S0`1$lWd6(gLt>0f$IMvX_+#de{dK@yJYW?|N&{Hi=%>4fP zpXjkBGxo8S1b}~L;E%b)k9=ER;1niU|64vD_eVbdw+Q{zls~8WPEF|}{r9BbDaxO@ z`YFm~%D*%B-!*@y=ck%U7|p*{H-@aAYW|t2o@%yH{gd|m%3J?F@uzwKz%g?@Jr4eW z^A8^T?_kGF_VfT@Ch>PJ_A9UbZ*h=+!1*Tui$afaYrl`rDKGwSQS|?Sa>|oWQ2xx6Px=D@g#H2LUwHHJsyx}C|K!cTZqQx~ t=&vjqvp@g9pifu%pB?|Hkye<+`p2IEeQjL4V=+q1=L5!{)Uh5v{ST{^O``w+ literal 0 HcmV?d00001 diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx index 1a30dd5fddba..032da03cd640 100644 --- a/sw/qa/extras/odfexport/odfexport.cxx +++ b/sw/qa/extras/odfexport/odfexport.cxx @@ -33,10 +33,12 @@ class Test : public SwModelTestBase { public: void testFdo38244(); + void testFirstHeaderFooter(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) && !defined(WNT) CPPUNIT_TEST(testFdo38244); + CPPUNIT_TEST(testFirstHeaderFooter); #endif CPPUNIT_TEST_SUITE_END(); @@ -86,6 +88,26 @@ void Test::testFdo38244() CPPUNIT_ASSERT_EQUAL(OUString("M"), getProperty(xPropertySet, "Initials")); } +void Test::testFirstHeaderFooter() +{ + // Test import and export of the header-first token. + roundtrip("first-header-footer.odt"); + + // The document has 6 pages, two page styles for the first and second half of pages. + CPPUNIT_ASSERT_EQUAL(OUString("First header"), parseDump("/root/page[1]/header/txt/text()")); + CPPUNIT_ASSERT_EQUAL(OUString("First footer"), parseDump("/root/page[1]/footer/txt/text()")); + CPPUNIT_ASSERT_EQUAL(OUString("Left header"), parseDump("/root/page[2]/header/txt/text()")); + CPPUNIT_ASSERT_EQUAL(OUString("Left footer"), parseDump("/root/page[2]/footer/txt/text()")); + CPPUNIT_ASSERT_EQUAL(OUString("Right header"), parseDump("/root/page[3]/header/txt/text()")); + CPPUNIT_ASSERT_EQUAL(OUString("Right footer"), parseDump("/root/page[3]/footer/txt/text()")); + CPPUNIT_ASSERT_EQUAL(OUString("First header2"), parseDump("/root/page[4]/header/txt/text()")); + CPPUNIT_ASSERT_EQUAL(OUString("First footer2"), parseDump("/root/page[4]/footer/txt/text()")); + CPPUNIT_ASSERT_EQUAL(OUString("Right header2"), parseDump("/root/page[5]/header/txt/text()")); + CPPUNIT_ASSERT_EQUAL(OUString("Right footer2"), parseDump("/root/page[5]/footer/txt/text()")); + CPPUNIT_ASSERT_EQUAL(OUString("Left header2"), parseDump("/root/page[6]/header/txt/text()")); + CPPUNIT_ASSERT_EQUAL(OUString("Left footer2"), parseDump("/root/page[6]/footer/txt/text()")); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/qa/extras/ww8export/data/first-header-footer.doc b/sw/qa/extras/ww8export/data/first-header-footer.doc new file mode 100644 index 0000000000000000000000000000000000000000..023c494862a51c48229e63a53e54501f56bda53d GIT binary patch literal 23552 zcmeHP2|UzW`#;7Q`;w4QO{i$G7V1_g%92PFQ5g(I%xKWARJ3q=)2>pv+81%Jv}x0# zU0P|E_HK(d%T>+$JiqZ{xM{g>_y2j{|D99c-*e7$&Uv15o^yWZceYV-p;h@Wzv|s1 z&0K#XOFoGd2}^=61AbFFtU*XO@FVY&NF+kG2>`rO_djHT=Nk)&Y@#BQkV?(N*ocHc z%YsuN#7&V9H4+>d9J#`Gg)hZz@=#>z5I&@SZ!bf^zdp9INvg(xNTl8nXvt3}*h6`Q z_1zC?ers{um#8tF9Vj*e2CvuWlcZk2H`O9U1!ymz@V_BlKwCmApj*2l6WrIRowhh# zbNWe_5C%qpJj#6|P1PeL3o`a-N5}xo2>I$&h~?BjX*SDAfOH9(E+*`>W8j5MSVVCzvgn9htWQgj+P_I`xZZ4zpu&rtMXea11*oX6W!m+ z7v^yz1J2{XNIAOS{R~Dk1}>eCj(-Mrz^>K}>}mlN`yV!-ssrSrE$>2%F$Lw~HVe@ppkKCPb)w?v!kp~JMD>2OPw zmP@y9bNaRT=IMV_m~O9@%H0y5F7Nl!mgM2stOx_?R82zqK>wB_n()Lgiq!r0TVN1R z7#qiq;e>NlRaA#_Lj?R#D#SM7PT=xQf$0;$6Vg0EXsD@5V-~iRs)}c5eI)puA&WS- zm8z_&DpR%o*~pLJazeR6Rn>-EG@~&|m_QKMBni!s&`al%V9}`>1&I?u8JlZER%0@8 z#wN)cSrQ7w;vlO8uQ8#j>VJP*f3}1$&$9wp1N;E~fKh-zz-Yi&KoB4p5CY%=;sFx? z69IDoa{==J>424hRe&{st$=NS?SKP-gMdST3xE>9MZkT)1HeN-6`&eW15kpwr!qhV z&<@ZZ&;eixumV^E1_1^GTmd*&t*Lx+`|3sUznY?>;{W>_e7|kJ*zmtHBOUy=KWmXM zGFdtiNs~R{i>)1TEv%5}L<9w1CDATw%veAp*TZmrBUeo)qIo!?Tc5^wka^2)n1oD} z+#nNTR|d@>L|rx#OC}EaD#$dH0P{AaMqPGBO~Oq|2=S8At#F>N3{VBI0fqqV3l4xG z0PGI|0PGKA0N5Wm0PGK;0PGKRU!eN|-3RElr`sLd{G+6G|Hi=E7WMqtnAa`pX*mXG z(G9MN4O))*MrjRV>pe29V2Q2{pJPHaLn~pmuC;-X@KEdm5FkXKeh=w)kbeK@caMJW z=ywj^Hx~f?&NV51ouvA2jHzugPs=ea>uEVplj1Z9NEYCq;HUcpw!eBWqGTasnHC|_ zCkDr)4!QEJ*|}Q{I_74|83K&bGUbc`opK3jlUu^j1*oKzF#ck;e}Z}cx9S+lY)v#_ zC{Tt`LLT<~@E;*e{49`kz}m0C24??X!vxsP_!?T0(I4`*6!&-Vw?KVqxwy+g`&*)W zzadTYybYXW_!4D9^`z=pJcMb1AxpB>oF4^RV80DI~JMgXP**w9R#ZnDG+Fbpu(MTQye zqR8X}VgYdgNJ8A8*Uab&*{{X(3GO8r_)1NJGM2$zI`?0AqK2PO3azYq{kJ!41&@CHE% z_z;WEoAAh6Q65m0c4FZcEEVDdIf6j~7g9GZuK{UO1>LmgH5QRkl8q93OvGpM=~(w}s2kRfk?swip@oT*u`Si}W%b4VyW zg&?sFQJ0v{X%{IFhKpvJu?#c@F(aSUvxtn08Bu{TU7TOJNq#mN2=zugpzBZApiff< z^=UTfLz@VoT(rJcU(wf*($}g%pJe`~`n=p_nOe~9_=V|6W~Cfx{Rj9Apy;?!A23kB zkK^*=#`;W-;l_?On-m?jW6{~jV-_0D)ybb`m+USR?l;+3R-ENJF`@eDIG~xc1?eFSdniiCHwe*sm z-DSr+#U*1(OGiF@sbyiha+A-~wY~f5E{R%bwBeS#@nl|t!OVwxKeawG-C^#d-6k)8 zet+C0`-HD^@TC5@xy-E*BR<>%=|GcpiF(o?!iwh0%siW__4=L?{Q{JVn1Ce zNHfzlTd`*s=h5M8I8TA&3wWWLm}=v-&5w_OiEJPiyVY1BH!9ZL44+90FMx?u=Dtck zIQwG4uuI2uJ54a(m^RRSeFC{>G9$uJ|EB)$H$6|XlnNA*HoU6d+V9iO)Y^MXAG38< zZDSp)7-)Ys;@*UQhiA+>oxEXlCxw7XF>}^Wy_rAufY-(Kea~C!Z**{KERsZf8@~SD^^Jeq*R8H%@S%1q77lRYsqwby5e)M#b?&)0%THkd&6+0}!=xSPW zcK&Vlwft^ZJHG0Ed(1xL$bPAVM?Se+ZCc^{d$-O?47<-4etCX&#d7%Qc^MP4mkE0E@hN4$uI}NXf1E$JJ#YTGZM_v=LMJ8a!v`tqbo zJI#)!o;SvP6rLYw{Ccv(lH3=!+gF)qPj=~=!AyUhwCkYhqC5Eus_z!0l=?aa&k9N~ zEFFI{b*WqFisc*BkNJ&xWa=8kKj-|j_JNcbQ;iyhCq+@beIo)!r&xOQU0SYt>W<#R zt)3-bOWxTCEBdi=<}aRdBs@6NwRL!MAxl1fLE7-^Tt>U#YgLJ!M;6X`aOjQ3G4DdB zo7-2e+p}wYykbsxYWk?$-Me-QreEJ5kKMAb&Plb+oOkg-kXm-T8?VBzD4$Bt zd*N22cce73?X)?wB22Q}^K{=j^+?Iry?Z}Pov4QTU1VTBEC*F3GcckI5r{ip%O+oCg) z9{QRe{`maD$qwu7*G_-?=3<+xll+TBe;n&__``?Ey)-U`cP>sfU-zNv`RUZ0{vSUU z4A!pnm^qkRlUC%Ewfcd=i?_O3)+5Gu>S8qhkoGZ!%WqQ78!xphT;(qJaczphyYr@D zD<>NC?sGi9yq(O$^-7Zxgcn*((wIL#OFLs?R+-F8VR4^8pHZB_Z@aFXZ0CA3@=>sN z(Tk92ekTf2Tc139&{ZkkTHSr{Yrd0#Wwq{5Ej8BxT9;x!B&I37cg=ym>-4Vz z&m7hs-jjJfl{NZVx4N;yYug$ngUb(Iov~c+wJ=&GFtGO=Moq=p;OQMP28 z6{pUrc68ED{&59?%y%zx_61B@{JfRI+u8+>N1sj@DLg2ec6#*E3*kL><=s%?j;vPQ zZEDj)cp!IR`{6~b$TO!@d8zqpFIvy;}P;(t0>}E9S+_U|&mE~;4rIkN3+Lq;* zG&~~r_qClh&-@%`GVDwzgXiaBIz=y-+j;c$5YF%px>5bo{9e2{qL%aI-iJW1G|K{y z2(@*+*K2!}?>IMNXQ-3oi&D;r(gAB$2Hc((=C{CoE+giD(|ARHb`I>u{ zcdldIDz4aIRZzs3u&?^garep03kNp5t#az~+lGvc?v8__bFK#Rr<^*;yQzO{rB3_% zS_jPHFU<8jU zpgV3AGx^JY(|=f;lj2&d?7h*TNM!B%ZaTwOuG`G2MD^0W45KwU(F>Ke$8Qvhh)cVu%FZyq!Gql@#bw0Zq#;hrjxXD)J=IA~QU96V-fh(r)SWe+ZCVw|JyJfjXkFb}Zi&eikD1pxF&ekRmuW>GyJg72v+EM2FVoF}$yHn4mJelvm`s%4XM*6bdvqmhh$}v6K zd(WtVUmx`x!+&&iW}C;o<`iaibh~#*{;7SgXxKgLI_?0$mVt-V^R)}-vOH9dvam1m1jpGfUF zA&hhK+JvZIwif1f8Ll;_sMfK_u4vk&t~25*)=w>e(qr%4brzjGEDCKq&HUxPL3-cB z2YU?8Us`|{KmI)5P`#M8Za2i}!$-PHv(K=2?m>OqBtFLVa}f`vqZV38)w3ol2n3h+ zYb@$~dtOQQ71^W*y;N=NjfXvdp}MoXg4tZop_ROX6>Cnn4zapp8L>@Iq0iH0<5v|% z?|uF+2XCFB^RNFDnj19hUjo|~+Tn}bO*}dqdz+Y9rVG`&xGl*jN%5&o+-bLd;fM!@ z>o+-`DkyQOj!(#Zy;^443FCvo8dI;5w#&U%iSj<$>CF!}@1QgK(=f-_>&bE^Sw-i{ zjaF|P!aNhOfB*5j4ON$6^ni2tmgc39Ou~I;mg?o+R6z6DT4U~RU{8s;Tl0*~XFrV@ zwP23?r|E=*`I}2>J{4({bn$bNsEJ8)8O=LEqm0$C3oKchFLVhncR835;nA=h84a~x zu7sh!_An7*Pv8n;c>;bvLrXIYLpGNmA_(R2!}}Tf`V8t}XUL9?Ri(b1J|R&;4^9jl1n^_~aQYcW#Kpz*F*lD5fvF-V)=Ut?|kU%%FXS z=Kaxn)&MuKC2a1)Vp@FNNuAg>_>l)IQ0UNNKxreLWV=3&?tvNfd)B?YKRD)3WO<(hO?KIp>(&Z z#0*q4Q0&EcbEgBq5MTwsW^n*G0#K7PU=RTIK8QQO1K4HGJN0B`si@G zBc7>Ew3KuS9&cOqHX(Rig-7vt{Ed5w%X>{EcugMk68z20d)xSUL&ceg_KuH`XZ8!vV{69&|yd@b>D1(Ou0-sKG{WP&eFtht%UOfKjJ@e;-QR^U^TlHwvz(+ zfLm&xcM2|)Ld8nBL#}A-1($}PGr(2K87+aj;s9yzqx@&r5xY_|rvZD7jcgbTs5udx zC=*_1kw}vc)>9VrUmlDRQSipaLZ6fjHB0*68T(@W00+)801hKh0BA^@lTdRg z5T*itHc<27v4RX#iZ~CIR4g zC)9Bg{Aigh1>g=Y?hoKPeggp4@jC!`$9fk4*Te?^DElQ^7eoTvj` zOSC;G$NUKD3MwkW#XT00uH$hzjOX@v9*%$85zpvxO^s`FT&LsNJg)n3EsyJbJj=)R zycPieQXQ`8aovx3+X96@Xh-1JP}Fa^@JE%nMpg0Y(60Kqo+FKoD zWxVd-Pps!!O8mCAp7mWsjW8(v*l)2M-;x>cpwNFkZ6wrQ2)AsVfQG;=TfBrv{}%XL zWa)u^e1~Wod`liogMT*@og7@*L#_DxXSBU5Xb+>xgq%3IT!g<(ZrPcDezZ8gyWd)W zyvstpyg=msRP*mEk6pd}zo-6e3H>r~kr1yr#t=`q6c~vy-{mx6^rCftYyDBd_x18G z7wNC)|FXpIi~UdZW8amIsgf4_XZdBI^=07$kF{<-cH=kLgZG&`Z|vT-J>XX~)@&z1 qNPIN>GKRXw=P?}b!vTvLThMPt$D7%acfEfb|9#zBn)?610{;dHXe?#` literal 0 HcmV?d00001 diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx index b38c1f0c771c..470028cd9635 100644 --- a/sw/qa/extras/ww8export/ww8export.cxx +++ b/sw/qa/extras/ww8export/ww8export.cxx @@ -41,12 +41,14 @@ public: void testN325936(); void testFdo45724(); void testFdo46020(); + void testFirstHeaderFooter(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) && !defined(WNT) CPPUNIT_TEST(testN325936); CPPUNIT_TEST(testFdo45724); CPPUNIT_TEST(testFdo46020); + CPPUNIT_TEST(testFirstHeaderFooter); #endif CPPUNIT_TEST_SUITE_END(); @@ -104,6 +106,27 @@ void Test::testFdo46020() CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xFootnotes->getCount()); } +void Test::testFirstHeaderFooter() +{ + // Test import and export of a section's headerf/footerf properties. + roundtrip("first-header-footer.doc"); + + // The document has 6 pages. Note that we don't test if 4 or just 2 page + // styles are created, the point is that layout should be correct. + CPPUNIT_ASSERT_EQUAL(OUString("First page header"), parseDump("/root/page[1]/header/txt/text()")); + CPPUNIT_ASSERT_EQUAL(OUString("First page footer"), parseDump("/root/page[1]/footer/txt/text()")); + CPPUNIT_ASSERT_EQUAL(OUString("Even page header"), parseDump("/root/page[2]/header/txt/text()")); + CPPUNIT_ASSERT_EQUAL(OUString("Even page footer"), parseDump("/root/page[2]/footer/txt/text()")); + CPPUNIT_ASSERT_EQUAL(OUString("Odd page header"), parseDump("/root/page[3]/header/txt/text()")); + CPPUNIT_ASSERT_EQUAL(OUString("Odd page footer"), parseDump("/root/page[3]/footer/txt/text()")); + CPPUNIT_ASSERT_EQUAL(OUString("First page header2"), parseDump("/root/page[4]/header/txt/text()")); + CPPUNIT_ASSERT_EQUAL(OUString("First page footer 2"), parseDump("/root/page[4]/footer/txt/text()")); + CPPUNIT_ASSERT_EQUAL(OUString("Odd page header 2"), parseDump("/root/page[5]/header/txt/text()")); + CPPUNIT_ASSERT_EQUAL(OUString("Odd page footer 2"), parseDump("/root/page[5]/footer/txt/text()")); + CPPUNIT_ASSERT_EQUAL(OUString("Even page header 2"), parseDump("/root/page[6]/header/txt/text()")); + CPPUNIT_ASSERT_EQUAL(OUString("Even page footer 2"), parseDump("/root/page[6]/footer/txt/text()")); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); From 6f35bbfe408f662a74101598e71d6b2970796036 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Tue, 9 Oct 2012 20:57:40 +0200 Subject: [PATCH 626/863] Resolves: fdo#55367 wrong convertion factor for "tspm" Change-Id: If37ef46ab009b9886fefd0ca071bd81dd68e25fc Reviewed-on: https://gerrit.libreoffice.org/849 Reviewed-by: Eike Rathke Tested-by: Eike Rathke --- scaddins/source/analysis/analysishelper.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx index 56064b56f884..cdd6ed123f93 100644 --- a/scaddins/source/analysis/analysishelper.cxx +++ b/scaddins/source/analysis/analysishelper.cxx @@ -2535,7 +2535,7 @@ ConvertDataList::ConvertDataList( void ) NEWD( "Humpen", 2.0, CDC_Volume ); // *** NEWD( "ly3", 1.1810108125623799E-51, CDC_Volume ); // *** Cubic light-year NEWD( "MTON", 1.4125866688595436E00, CDC_Volume ); // *** Measurement ton - NEWD( "tspm", 5.0000000000000000E02, CDC_Volume ); // *** Modern teaspoon + NEWD( "tspm", 2.0000000000000000E02, CDC_Volume ); // *** Modern teaspoon NEWD( "uk_gal", 2.1996924829908779E-01, CDC_Volume ); // U.K. / Imperial gallon 1/4.54609 NEWD( "uk_qt", 8.7987699319635115E-01, CDC_Volume ); // U.K. / Imperial quart 1/4 imperial gallon From fc8796c9737e1ea6d5b2d0750d9f6534420f6755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 9 Oct 2012 17:08:43 +0100 Subject: [PATCH 627/863] fix some mangled indents Change-Id: I96169ac205ad5c794f0545aa46c05f73e433629a --- vcl/unx/kde/salnativewidgets-kde.cxx | 387 +++++++++++++-------------- 1 file changed, 193 insertions(+), 194 deletions(-) diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx index d453198cbefa..acbc7c7d8954 100644 --- a/vcl/unx/kde/salnativewidgets-kde.cxx +++ b/vcl/unx/kde/salnativewidgets-kde.cxx @@ -476,7 +476,7 @@ sal_Bool WidgetPainter::drawStyledWidget( QWidget *pWidget, int nDepth, GC gc, ControlPart nPart ) { if ( !pWidget ) - return sal_False; + return sal_False; // Normalize the widget QPoint qWidgetPos( pWidget->pos() ); @@ -502,156 +502,156 @@ sal_Bool WidgetPainter::drawStyledWidget( QWidget *pWidget, // Draw the widget to the pixmap if ( strcmp( QPushButton_String, pClassName ) == 0 ) { - // Workaround for the Platinum style. - // Platinum takes the state directly from the widget, not from SFlags. - QPushButton *pPushButton = static_cast( pWidget->qt_cast( QPushButton_String ) ); - if ( pPushButton ) - { - pPushButton->setDown ( nStyle & QStyle::Style_Down ); - pPushButton->setOn ( nStyle & QStyle::Style_On ); - pPushButton->setEnabled( nStyle & QStyle::Style_Enabled ); - } + // Workaround for the Platinum style. + // Platinum takes the state directly from the widget, not from SFlags. + QPushButton *pPushButton = static_cast( pWidget->qt_cast( QPushButton_String ) ); + if ( pPushButton ) + { + pPushButton->setDown ( nStyle & QStyle::Style_Down ); + pPushButton->setOn ( nStyle & QStyle::Style_On ); + pPushButton->setEnabled( nStyle & QStyle::Style_Enabled ); + } - kapp->style().drawControl( QStyle::CE_PushButton, - &qPainter, pWidget, qRect, - pWidget->colorGroup(), nStyle ); + kapp->style().drawControl( QStyle::CE_PushButton, + &qPainter, pWidget, qRect, + pWidget->colorGroup(), nStyle ); } else if ( strcmp( QRadioButton_String, pClassName ) == 0 ) { - // Bitblt from the screen, because the radio buttons are usually not - // rectangular, and there could be a bitmap under them - GC aTmpGC = XCreateGC( dpy, qPixmap.handle(), 0, NULL ); - X11SalGraphics::CopyScreenArea( - dpy, - drawable, nXScreen, nDepth, - qPixmap.handle(), SalX11Screen( qPixmap.x11Screen() ), qPixmap.x11Depth(), - aTmpGC, - qWidgetPos.x(), qWidgetPos.y(), qRect.width(), qRect.height(), - 0, 0 ); - XFreeGC( dpy, aTmpGC ); + // Bitblt from the screen, because the radio buttons are usually not + // rectangular, and there could be a bitmap under them + GC aTmpGC = XCreateGC( dpy, qPixmap.handle(), 0, NULL ); + X11SalGraphics::CopyScreenArea( + dpy, + drawable, nXScreen, nDepth, + qPixmap.handle(), SalX11Screen( qPixmap.x11Screen() ), qPixmap.x11Depth(), + aTmpGC, + qWidgetPos.x(), qWidgetPos.y(), qRect.width(), qRect.height(), + 0, 0 ); + XFreeGC( dpy, aTmpGC ); - kapp->style().drawControl( QStyle::CE_RadioButton, - &qPainter, pWidget, qRect, - pWidget->colorGroup(), nStyle ); + kapp->style().drawControl( QStyle::CE_RadioButton, + &qPainter, pWidget, qRect, + pWidget->colorGroup(), nStyle ); } else if ( strcmp( QCheckBox_String, pClassName ) == 0 ) { - kapp->style().drawControl( QStyle::CE_CheckBox, - &qPainter, pWidget, qRect, - pWidget->colorGroup(), nStyle ); + kapp->style().drawControl( QStyle::CE_CheckBox, + &qPainter, pWidget, qRect, + pWidget->colorGroup(), nStyle ); } else if ( strcmp( QComboBox_String, pClassName ) == 0 ) { - kapp->style().drawComplexControl( QStyle::CC_ComboBox, - &qPainter, pWidget, qRect, - pWidget->colorGroup(), nStyle ); + kapp->style().drawComplexControl( QStyle::CC_ComboBox, + &qPainter, pWidget, qRect, + pWidget->colorGroup(), nStyle ); - // Editable combo box uses the background of the associated edit box - QComboBox *pComboBox = static_cast( pWidget->qt_cast( QComboBox_String ) ); - if ( pComboBox && pComboBox->editable() && pComboBox->lineEdit() ) - { - QColorGroup::ColorRole eColorRole = ( pComboBox->isEnabled() )? - QColorGroup::Base: QColorGroup::Background; - qPainter.fillRect( - kapp->style().querySubControlMetrics( QStyle::CC_ComboBox, - pComboBox, QStyle::SC_ComboBoxEditField ), - pComboBox->lineEdit()->colorGroup().brush( eColorRole ) ); - } + // Editable combo box uses the background of the associated edit box + QComboBox *pComboBox = static_cast( pWidget->qt_cast( QComboBox_String ) ); + if ( pComboBox && pComboBox->editable() && pComboBox->lineEdit() ) + { + QColorGroup::ColorRole eColorRole = ( pComboBox->isEnabled() )? + QColorGroup::Base: QColorGroup::Background; + qPainter.fillRect( + kapp->style().querySubControlMetrics( QStyle::CC_ComboBox, + pComboBox, QStyle::SC_ComboBoxEditField ), + pComboBox->lineEdit()->colorGroup().brush( eColorRole ) ); + } } else if ( strcmp( QLineEdit_String, pClassName ) == 0 ) { - kapp->style().drawPrimitive( QStyle::PE_PanelLineEdit, - &qPainter, qRect, - pWidget->colorGroup(), nStyle | QStyle::Style_Sunken ); + kapp->style().drawPrimitive( QStyle::PE_PanelLineEdit, + &qPainter, qRect, + pWidget->colorGroup(), nStyle | QStyle::Style_Sunken ); } else if ( strcmp( QSpinWidget_String, pClassName ) == 0 ) { - const SpinbuttonValue *pValue = static_cast ( &aValue ); + const SpinbuttonValue *pValue = static_cast ( &aValue ); - // Is any of the buttons pressed? - QStyle::SCFlags eActive = QStyle::SC_None; - if ( pValue ) - { - if ( pValue->mnUpperState & CTRL_STATE_PRESSED ) - eActive = QStyle::SC_SpinWidgetUp; - else if ( pValue->mnLowerState & CTRL_STATE_PRESSED ) - eActive = QStyle::SC_SpinWidgetDown; - - // Update the enable/disable state of the widget - if ( ( nState & CTRL_STATE_ENABLED ) || - ( pValue->mnUpperState & CTRL_STATE_ENABLED ) || - ( pValue->mnLowerState & CTRL_STATE_ENABLED ) ) + // Is any of the buttons pressed? + QStyle::SCFlags eActive = QStyle::SC_None; + if ( pValue ) { - pWidget->setEnabled( true ); - nStyle |= QStyle::Style_Enabled; + if ( pValue->mnUpperState & CTRL_STATE_PRESSED ) + eActive = QStyle::SC_SpinWidgetUp; + else if ( pValue->mnLowerState & CTRL_STATE_PRESSED ) + eActive = QStyle::SC_SpinWidgetDown; + + // Update the enable/disable state of the widget + if ( ( nState & CTRL_STATE_ENABLED ) || + ( pValue->mnUpperState & CTRL_STATE_ENABLED ) || + ( pValue->mnLowerState & CTRL_STATE_ENABLED ) ) + { + pWidget->setEnabled( true ); + nStyle |= QStyle::Style_Enabled; + } + else + pWidget->setEnabled( false ); + + // Mouse-over effect + if ( (pValue->mnUpperState & CTRL_STATE_ROLLOVER) || + (pValue->mnLowerState & CTRL_STATE_ROLLOVER) ) + nStyle |= QStyle::Style_MouseOver; } - else - pWidget->setEnabled( false ); - // Mouse-over effect - if ( (pValue->mnUpperState & CTRL_STATE_ROLLOVER) || - (pValue->mnLowerState & CTRL_STATE_ROLLOVER) ) - nStyle |= QStyle::Style_MouseOver; - } + // Spin widget uses the background of the associated edit box + QSpinWidget *pSpinWidget = static_cast( pWidget->qt_cast( QSpinWidget_String ) ); + if ( pSpinWidget && pSpinWidget->editWidget() ) + { + QColorGroup::ColorRole eColorRole = ( pSpinWidget->isEnabled() )? + QColorGroup::Base: QColorGroup::Background; + qPainter.fillRect( + kapp->style().querySubControlMetrics( QStyle::CC_SpinWidget, + pSpinWidget, QStyle::SC_SpinWidgetEditField ), + pSpinWidget->editWidget()->colorGroup().brush( eColorRole ) ); + } - // Spin widget uses the background of the associated edit box - QSpinWidget *pSpinWidget = static_cast( pWidget->qt_cast( QSpinWidget_String ) ); - if ( pSpinWidget && pSpinWidget->editWidget() ) - { - QColorGroup::ColorRole eColorRole = ( pSpinWidget->isEnabled() )? - QColorGroup::Base: QColorGroup::Background; - qPainter.fillRect( - kapp->style().querySubControlMetrics( QStyle::CC_SpinWidget, - pSpinWidget, QStyle::SC_SpinWidgetEditField ), - pSpinWidget->editWidget()->colorGroup().brush( eColorRole ) ); - } + // Adjust the frame (needed for Motif Plus style) + QRect qFrameRect = kapp->style().querySubControlMetrics( QStyle::CC_SpinWidget, + pWidget, QStyle::SC_SpinWidgetFrame ); - // Adjust the frame (needed for Motif Plus style) - QRect qFrameRect = kapp->style().querySubControlMetrics( QStyle::CC_SpinWidget, - pWidget, QStyle::SC_SpinWidgetFrame ); - - kapp->style().drawComplexControl( QStyle::CC_SpinWidget, - &qPainter, pWidget, qFrameRect, - pWidget->colorGroup(), nStyle, - QStyle::SC_All, eActive ); + kapp->style().drawComplexControl( QStyle::CC_SpinWidget, + &qPainter, pWidget, qFrameRect, + pWidget->colorGroup(), nStyle, + QStyle::SC_All, eActive ); } else if ( strcmp( QTabBar_String, pClassName ) == 0 ) { - const TabitemValue *pValue = static_cast ( &aValue ); + const TabitemValue *pValue = static_cast ( &aValue ); - QTab *pTab = NULL; - if ( pValue ) - { - if ( ( pValue->isFirst() || pValue->isLeftAligned() ) && ( pValue->isLast() || pValue->isRightAligned() ) ) - pTab = m_pTabAlone; - else if ( pValue->isFirst() || pValue->isLeftAligned() ) - pTab = m_pTabLeft; - else if ( pValue->isLast() || pValue->isRightAligned() ) - pTab = m_pTabRight; - else - pTab = m_pTabMiddle; - } - if ( !pTab ) - return sal_False; + QTab *pTab = NULL; + if ( pValue ) + { + if ( ( pValue->isFirst() || pValue->isLeftAligned() ) && ( pValue->isLast() || pValue->isRightAligned() ) ) + pTab = m_pTabAlone; + else if ( pValue->isFirst() || pValue->isLeftAligned() ) + pTab = m_pTabLeft; + else if ( pValue->isLast() || pValue->isRightAligned() ) + pTab = m_pTabRight; + else + pTab = m_pTabMiddle; + } + if ( !pTab ) + return sal_False; - pTab->setRect( qRect ); + pTab->setRect( qRect ); - kapp->style().drawControl( QStyle::CE_TabBarTab, - &qPainter, pWidget, qRect, - pWidget->colorGroup(), nStyle, - QStyleOption( pTab ) ); + kapp->style().drawControl( QStyle::CE_TabBarTab, + &qPainter, pWidget, qRect, + pWidget->colorGroup(), nStyle, + QStyleOption( pTab ) ); } else if ( strcmp( QTabWidget_String, pClassName ) == 0 ) { - kapp->style().drawPrimitive( QStyle::PE_PanelTabWidget, - &qPainter, qRect, - pWidget->colorGroup(), nStyle ); + kapp->style().drawPrimitive( QStyle::PE_PanelTabWidget, + &qPainter, qRect, + pWidget->colorGroup(), nStyle ); } else if ( strcmp( QListView_String, pClassName ) == 0 ) { - kapp->style().drawPrimitive( QStyle::PE_Panel, - &qPainter, qRect, - pWidget->colorGroup(), nStyle | QStyle::Style_Sunken ); + kapp->style().drawPrimitive( QStyle::PE_Panel, + &qPainter, qRect, + pWidget->colorGroup(), nStyle | QStyle::Style_Sunken ); } else if ( strcmp( QScrollBar_String, pClassName ) == 0 ) { @@ -665,31 +665,31 @@ sal_Bool WidgetPainter::drawStyledWidget( QWidget *pWidget, const char *pStyleName = kapp->style().className(); if ( strcmp( QMotifPlusStyle_String, pStyleName ) == 0 ) { - nStyle |= QStyle::Style_MouseOver; - if ( pValue->mnThumbState & CTRL_STATE_ROLLOVER ) - eActive = QStyle::SC_ScrollBarSlider; + nStyle |= QStyle::Style_MouseOver; + if ( pValue->mnThumbState & CTRL_STATE_ROLLOVER ) + eActive = QStyle::SC_ScrollBarSlider; } else if ( strcmp( QSGIStyle_String, pStyleName ) == 0 ) { - nStyle |= QStyle::Style_MouseOver; - if ( pValue->mnButton1State & CTRL_STATE_ROLLOVER ) - eActive = QStyle::SC_ScrollBarSubLine; - else if ( pValue->mnButton2State & CTRL_STATE_ROLLOVER ) - eActive = QStyle::SC_ScrollBarAddLine; - else if ( pValue->mnThumbState & CTRL_STATE_ROLLOVER ) - eActive = QStyle::SC_ScrollBarSlider; + nStyle |= QStyle::Style_MouseOver; + if ( pValue->mnButton1State & CTRL_STATE_ROLLOVER ) + eActive = QStyle::SC_ScrollBarSubLine; + else if ( pValue->mnButton2State & CTRL_STATE_ROLLOVER ) + eActive = QStyle::SC_ScrollBarAddLine; + else if ( pValue->mnThumbState & CTRL_STATE_ROLLOVER ) + eActive = QStyle::SC_ScrollBarSlider; } if ( pValue->mnButton1State & CTRL_STATE_PRESSED ) - eActive = QStyle::SC_ScrollBarSubLine; + eActive = QStyle::SC_ScrollBarSubLine; else if ( pValue->mnButton2State & CTRL_STATE_PRESSED ) - eActive = QStyle::SC_ScrollBarAddLine; + eActive = QStyle::SC_ScrollBarAddLine; else if ( pValue->mnThumbState & CTRL_STATE_PRESSED ) - eActive = QStyle::SC_ScrollBarSlider; + eActive = QStyle::SC_ScrollBarSlider; else if ( pValue->mnPage1State & CTRL_STATE_PRESSED ) - eActive = QStyle::SC_ScrollBarSubPage; + eActive = QStyle::SC_ScrollBarSubPage; else if ( pValue->mnPage2State & CTRL_STATE_PRESSED ) - eActive = QStyle::SC_ScrollBarAddPage; + eActive = QStyle::SC_ScrollBarAddPage; // Update the enable/disable state of the widget if ( ( nState & CTRL_STATE_ENABLED ) || @@ -699,11 +699,11 @@ sal_Bool WidgetPainter::drawStyledWidget( QWidget *pWidget, ( pValue->mnPage1State & CTRL_STATE_ENABLED ) || ( pValue->mnPage2State & CTRL_STATE_ENABLED ) ) { - pWidget->setEnabled( true ); - nStyle |= QStyle::Style_Enabled; + pWidget->setEnabled( true ); + nStyle |= QStyle::Style_Enabled; } else - pWidget->setEnabled( false ); + pWidget->setEnabled( false ); } // Is it a horizontal scroll bar? @@ -820,7 +820,7 @@ sal_Bool WidgetPainter::drawStyledWidget( QWidget *pWidget, pWidget->colorGroup(), nStyle ); } else - return sal_False; + return sal_False; // Bitblt it to the screen X11SalGraphics::CopyScreenArea( @@ -840,7 +840,7 @@ QPushButton *WidgetPainter::pushButton( const Rectangle& rControlRegion, sal_Bool bDefault ) { if ( !m_pPushButton ) - m_pPushButton = new QPushButton( NULL, "push_button" ); + m_pPushButton = new QPushButton( NULL, "push_button" ); QRect qRect = region2QRect( rControlRegion ); @@ -850,20 +850,20 @@ QPushButton *WidgetPainter::pushButton( const Rectangle& rControlRegion, // FIXME Fix Keramik style to be consistant with Qt built-in styles. Aargh! if ( bDefault ) { - QSize qContentsSize( 50, 50 ); - m_pPushButton->setDefault( false ); - QSize qNormalSize = kapp->style().sizeFromContents( QStyle::CT_PushButton, - m_pPushButton, qContentsSize ); - m_pPushButton->setDefault( true ); - QSize qDefSize = kapp->style().sizeFromContents( QStyle::CT_PushButton, - m_pPushButton, qContentsSize ); + QSize qContentsSize( 50, 50 ); + m_pPushButton->setDefault( false ); + QSize qNormalSize = kapp->style().sizeFromContents( QStyle::CT_PushButton, + m_pPushButton, qContentsSize ); + m_pPushButton->setDefault( true ); + QSize qDefSize = kapp->style().sizeFromContents( QStyle::CT_PushButton, + m_pPushButton, qContentsSize ); - int nIndicatorSize = kapp->style().pixelMetric( - QStyle::PM_ButtonDefaultIndicator, m_pPushButton ); - if ( qNormalSize.width() == qDefSize.width() ) - qRect.addCoords( nIndicatorSize, 0, -nIndicatorSize, 0 ); - if ( qNormalSize.height() == qDefSize.height() ) - qRect.addCoords( 0, nIndicatorSize, 0, -nIndicatorSize ); + int nIndicatorSize = kapp->style().pixelMetric( + QStyle::PM_ButtonDefaultIndicator, m_pPushButton ); + if ( qNormalSize.width() == qDefSize.width() ) + qRect.addCoords( nIndicatorSize, 0, -nIndicatorSize, 0 ); + if ( qNormalSize.height() == qDefSize.height() ) + qRect.addCoords( 0, nIndicatorSize, 0, -nIndicatorSize ); } m_pPushButton->move( qRect.topLeft() ); @@ -876,7 +876,7 @@ QPushButton *WidgetPainter::pushButton( const Rectangle& rControlRegion, QRadioButton *WidgetPainter::radioButton( const Rectangle& rControlRegion ) { if ( !m_pRadioButton ) - m_pRadioButton = new QRadioButton( NULL, "radio_button" ); + m_pRadioButton = new QRadioButton( NULL, "radio_button" ); QRect qRect = region2QRect( rControlRegion ); @@ -885,15 +885,15 @@ QRadioButton *WidgetPainter::radioButton( const Rectangle& rControlRegion ) const char *pStyleName = kapp->style().className(); if ( strcmp( "KThemeStyle", pStyleName ) == 0 ) { - QRect qOldRect( qRect ); + QRect qOldRect( qRect ); - qRect.setWidth( kapp->style().pixelMetric( - QStyle::PM_ExclusiveIndicatorWidth, m_pRadioButton ) ); - qRect.setHeight( kapp->style().pixelMetric( - QStyle::PM_ExclusiveIndicatorHeight, m_pRadioButton ) ); + qRect.setWidth( kapp->style().pixelMetric( + QStyle::PM_ExclusiveIndicatorWidth, m_pRadioButton ) ); + qRect.setHeight( kapp->style().pixelMetric( + QStyle::PM_ExclusiveIndicatorHeight, m_pRadioButton ) ); - qRect.moveBy( ( qOldRect.width() - qRect.width() ) / 2, - ( qOldRect.height() - qRect.height() ) / 2 ); + qRect.moveBy( ( qOldRect.width() - qRect.width() ) / 2, + ( qOldRect.height() - qRect.height() ) / 2 ); } m_pRadioButton->move( qRect.topLeft() ); @@ -905,7 +905,7 @@ QRadioButton *WidgetPainter::radioButton( const Rectangle& rControlRegion ) QCheckBox *WidgetPainter::checkBox( const Rectangle& rControlRegion ) { if ( !m_pCheckBox ) - m_pCheckBox = new QCheckBox( NULL, "check_box" ); + m_pCheckBox = new QCheckBox( NULL, "check_box" ); QRect qRect = region2QRect( rControlRegion ); @@ -914,15 +914,15 @@ QCheckBox *WidgetPainter::checkBox( const Rectangle& rControlRegion ) const char *pStyleName = kapp->style().className(); if ( strcmp( "KThemeStyle", pStyleName ) == 0 ) { - QRect qOldRect( qRect ); + QRect qOldRect( qRect ); - qRect.setWidth( kapp->style().pixelMetric( - QStyle::PM_IndicatorWidth, m_pCheckBox ) ); - qRect.setHeight( kapp->style().pixelMetric( - QStyle::PM_IndicatorHeight, m_pCheckBox ) ); + qRect.setWidth( kapp->style().pixelMetric( + QStyle::PM_IndicatorWidth, m_pCheckBox ) ); + qRect.setHeight( kapp->style().pixelMetric( + QStyle::PM_IndicatorHeight, m_pCheckBox ) ); - qRect.moveBy( ( qOldRect.width() - qRect.width() ) / 2, - ( qOldRect.height() - qRect.height() ) / 2 ); + qRect.moveBy( ( qOldRect.width() - qRect.width() ) / 2, + ( qOldRect.height() - qRect.height() ) / 2 ); } m_pCheckBox->move( qRect.topLeft() ); @@ -937,15 +937,15 @@ QComboBox *WidgetPainter::comboBox( const Rectangle& rControlRegion, QComboBox *pComboBox = NULL; if ( bEditable ) { - if ( !m_pEditableComboBox ) - m_pEditableComboBox = new QComboBox( true, NULL, "combo_box_edit" ); - pComboBox = m_pEditableComboBox; + if ( !m_pEditableComboBox ) + m_pEditableComboBox = new QComboBox( true, NULL, "combo_box_edit" ); + pComboBox = m_pEditableComboBox; } else { - if ( !m_pComboBox ) - m_pComboBox = new QComboBox( false, NULL, "combo_box" ); - pComboBox = m_pComboBox; + if ( !m_pComboBox ) + m_pComboBox = new QComboBox( false, NULL, "combo_box" ); + pComboBox = m_pComboBox; } QRect qRect = region2QRect( rControlRegion ); @@ -959,7 +959,7 @@ QComboBox *WidgetPainter::comboBox( const Rectangle& rControlRegion, QLineEdit *WidgetPainter::lineEdit( const Rectangle& rControlRegion ) { if ( !m_pLineEdit ) - m_pLineEdit = new QLineEdit( NULL, "line_edit" ); + m_pLineEdit = new QLineEdit( NULL, "line_edit" ); QRect qRect = region2QRect( rControlRegion ); @@ -973,10 +973,9 @@ QSpinWidget *WidgetPainter::spinWidget( const Rectangle& rControlRegion ) { if ( !m_pSpinWidget ) { - m_pSpinWidget = new QSpinWidget( NULL, "spin_widget" ); - - m_pSpinEdit = new QLineEdit( NULL, "line_edit_spin" ); - m_pSpinWidget->setEditWidget( m_pSpinEdit ); + m_pSpinWidget = new QSpinWidget( NULL, "spin_widget" ); + m_pSpinEdit = new QLineEdit( NULL, "line_edit_spin" ); + m_pSpinWidget->setEditWidget( m_pSpinEdit ); } QRect qRect = region2QRect( rControlRegion ); @@ -992,19 +991,19 @@ QTabBar *WidgetPainter::tabBar( const Rectangle& rControlRegion ) { if ( !m_pTabBar ) { - if ( !m_pTabBarParent ) - m_pTabBarParent = new QWidget( NULL, "tab_bar_parent" ); + if ( !m_pTabBarParent ) + m_pTabBarParent = new QWidget( NULL, "tab_bar_parent" ); - m_pTabBar = new QTabBar( m_pTabBarParent, "tab_bar" ); + m_pTabBar = new QTabBar( m_pTabBarParent, "tab_bar" ); - m_pTabLeft = new QTab(); - m_pTabMiddle = new QTab(); - m_pTabRight = new QTab(); - m_pTabAlone = new QTab(); + m_pTabLeft = new QTab(); + m_pTabMiddle = new QTab(); + m_pTabRight = new QTab(); + m_pTabAlone = new QTab(); - m_pTabBar->addTab( m_pTabLeft ); - m_pTabBar->addTab( m_pTabMiddle ); - m_pTabBar->addTab( m_pTabRight ); + m_pTabBar->addTab( m_pTabLeft ); + m_pTabBar->addTab( m_pTabMiddle ); + m_pTabBar->addTab( m_pTabRight ); } QRect qRect = region2QRect( rControlRegion ); @@ -1020,7 +1019,7 @@ QTabBar *WidgetPainter::tabBar( const Rectangle& rControlRegion ) QTabWidget *WidgetPainter::tabWidget( const Rectangle& rControlRegion ) { if ( !m_pTabWidget ) - m_pTabWidget = new QTabWidget( NULL, "tab_widget" ); + m_pTabWidget = new QTabWidget( NULL, "tab_widget" ); QRect qRect = region2QRect( rControlRegion ); --qRect.rTop(); @@ -1034,7 +1033,7 @@ QTabWidget *WidgetPainter::tabWidget( const Rectangle& rControlRegion ) QListView *WidgetPainter::listView( const Rectangle& rControlRegion ) { if ( !m_pListView ) - m_pListView = new QListView( NULL, "list_view" ); + m_pListView = new QListView( NULL, "list_view" ); QRect qRect = region2QRect( rControlRegion ); @@ -1049,9 +1048,9 @@ QScrollBar *WidgetPainter::scrollBar( const Rectangle& rControlRegion, { if ( !m_pScrollBar ) { - m_pScrollBar = new QScrollBar( NULL, "scroll_bar" ); - m_pScrollBar->setTracking( false ); - m_pScrollBar->setLineStep( 1 ); + m_pScrollBar = new QScrollBar( NULL, "scroll_bar" ); + m_pScrollBar->setTracking( false ); + m_pScrollBar->setLineStep( 1 ); } QRect qRect = region2QRect( rControlRegion ); @@ -1063,10 +1062,10 @@ QScrollBar *WidgetPainter::scrollBar( const Rectangle& rControlRegion, const ScrollbarValue *pValue = static_cast ( &aValue ); if ( pValue ) { - m_pScrollBar->setMinValue( pValue->mnMin ); - m_pScrollBar->setMaxValue( pValue->mnMax - pValue->mnVisibleSize ); - m_pScrollBar->setValue( pValue->mnCur ); - m_pScrollBar->setPageStep( pValue->mnVisibleSize ); + m_pScrollBar->setMinValue( pValue->mnMin ); + m_pScrollBar->setMaxValue( pValue->mnMax - pValue->mnVisibleSize ); + m_pScrollBar->setValue( pValue->mnCur ); + m_pScrollBar->setPageStep( pValue->mnVisibleSize ); } return m_pScrollBar; From 453abd0e1b2c2e692f1662b3327ed5a78510bb9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 9 Oct 2012 20:07:22 +0100 Subject: [PATCH 628/863] kill off the layout competition Change-Id: I00882045bb7c23a6ad88013b651c9151e836965d --- vcl/Library_vcl.mk | 2 - vcl/Package_inc.mk | 1 - vcl/inc/vcl/arrange.hxx | 385 ----------------- vcl/inc/vcl/window.hxx | 29 +- vcl/inc/window.h | 2 - vcl/source/window/arrange.cxx | 772 ---------------------------------- vcl/source/window/window.cxx | 5 - vcl/source/window/window2.cxx | 1 - vcl/source/window/window4.cxx | 166 -------- 9 files changed, 1 insertion(+), 1362 deletions(-) delete mode 100644 vcl/inc/vcl/arrange.hxx delete mode 100644 vcl/source/window/arrange.cxx delete mode 100644 vcl/source/window/window4.cxx diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 6aaa675cba8d..d1dbad65c512 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -242,7 +242,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/window/abstdlg \ vcl/source/window/accel \ vcl/source/window/accmgr \ - vcl/source/window/arrange \ vcl/source/window/brdwin \ vcl/source/window/btndlg \ vcl/source/window/builder \ @@ -282,7 +281,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/window/toolbox \ vcl/source/window/window2 \ vcl/source/window/window3 \ - vcl/source/window/window4 \ vcl/source/window/window \ vcl/source/window/winproc \ vcl/source/window/wrkwin \ diff --git a/vcl/Package_inc.mk b/vcl/Package_inc.mk index c9868e3c44b2..fa831c5f969b 100644 --- a/vcl/Package_inc.mk +++ b/vcl/Package_inc.mk @@ -32,7 +32,6 @@ $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/accel.hxx,vcl/accel.hxx)) $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/alpha.hxx,vcl/alpha.hxx)) $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/animate.hxx,vcl/animate.hxx)) $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/apptypes.hxx,vcl/apptypes.hxx)) -$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/arrange.hxx,vcl/arrange.hxx)) $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/bitmapex.hxx,vcl/bitmapex.hxx)) $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/bitmap.hxx,vcl/bitmap.hxx)) $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/bmpacc.hxx,vcl/bmpacc.hxx)) diff --git a/vcl/inc/vcl/arrange.hxx b/vcl/inc/vcl/arrange.hxx deleted file mode 100644 index 5d99723da797..000000000000 --- a/vcl/inc/vcl/arrange.hxx +++ /dev/null @@ -1,385 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _VCL_ARRANGE_HXX -#define _VCL_ARRANGE_HXX - -#include "vcl/window.hxx" - -#include -#include -#include - -namespace vcl -{ - /* some helper classes for simple window layouting - guidelines: - - a WindowArranger is not a Window - - a WindowArranger hierarchy manages exactly one level of child windows inside a common parent - this is to keep the vcl Window hierarchy flat, as some code like accelerators depend on such behavior - - a WindowArranger never becomes owner of a Window, windows need to be destroyed separately - - a WindowArranger however always is owner of its child WindowArrangers, that is the - WindowArranger hierarchy will keep track of its objects and delete them - - a managed element of a WindowArranger can either be a Window (a leaf in the hierarchy) - or a child WindowArranger (a node in the hierarchy), but never both - */ - - class VCL_DLLPUBLIC WindowArranger - { - protected: - struct Element - { - Window* m_pElement; - boost::shared_ptr m_pChild; - sal_Int32 m_nExpandPriority; - Size m_aMinSize; - bool m_bHidden; - long m_nLeftBorder; - long m_nTopBorder; - long m_nRightBorder; - long m_nBottomBorder; - - Element() - : m_pElement( NULL ) - , m_pChild() - , m_nExpandPriority( 0 ) - , m_bHidden( false ) - , m_nLeftBorder( 0 ) - , m_nTopBorder( 0 ) - , m_nRightBorder( 0 ) - , m_nBottomBorder( 0 ) - {} - - Element( Window* i_pWin, - boost::shared_ptr const & i_pChild = boost::shared_ptr(), - sal_Int32 i_nExpandPriority = 0, - const Size& i_rMinSize = Size() - ) - : m_pElement( i_pWin ) - , m_pChild( i_pChild ) - , m_nExpandPriority( i_nExpandPriority ) - , m_aMinSize( i_rMinSize ) - , m_bHidden( false ) - , m_nLeftBorder( 0 ) - , m_nTopBorder( 0 ) - , m_nRightBorder( 0 ) - , m_nBottomBorder( 0 ) - {} - - void deleteChild() { m_pChild.reset(); } - - sal_Int32 getExpandPriority() const; - Size getOptimalSize( WindowSizeType ) const; - bool isVisible() const; - void setPosSize( const Point&, const Size& ); - }; - - Window* m_pParentWindow; - WindowArranger* m_pParentArranger; - Rectangle m_aManagedArea; - long m_nOuterBorder; - - rtl::OUString m_aIdentifier; - - virtual Element* getElement( size_t i_nIndex ) = 0; - const Element* getConstElement( size_t i_nIndex ) const - { return const_cast(this)->getElement( i_nIndex ); } - - - public: - static long getDefaultBorder(); - - static long getBorderValue( long nBorder ) - { return nBorder >= 0 ? nBorder : -nBorder * getDefaultBorder(); } - - WindowArranger( WindowArranger* i_pParent = NULL ) - : m_pParentWindow( i_pParent ? i_pParent->m_pParentWindow : NULL ) - , m_pParentArranger( i_pParent ) - , m_nOuterBorder( 0 ) - {} - virtual ~WindowArranger(); - - // ask what would be the optimal size - virtual Size getOptimalSize( WindowSizeType ) const = 0; - // call Resize to trigger layouting inside the managed area - // without function while parent window is unset - virtual void resize() = 0; - // avoid this if possible, using the constructor instead - // there can be only one parent window and all managed windows MUST - // be direct children of that window - // violating that condition will result in undefined behavior - virtual void setParentWindow( Window* ); - - virtual void setParent( WindowArranger* ); - - virtual size_t countElements() const = 0; - boost::shared_ptr getChild( size_t i_nIndex ) const - { - const Element* pEle = getConstElement( i_nIndex ); - return pEle ? pEle->m_pChild : boost::shared_ptr(); - } - Window* getWindow( size_t i_nIndex ) const - { - const Element* pEle = getConstElement( i_nIndex ); - return pEle ? pEle->m_pElement : NULL; - } - - virtual bool isVisible() const; // true if any element is visible - - virtual com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > getProperties() const; - virtual void setProperties( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& ); - - sal_Int32 getExpandPriority( size_t i_nIndex ) const - { - const Element* pEle = getConstElement( i_nIndex ); - return pEle ? pEle->getExpandPriority() : 0; - } - - Size getMinimumSize( size_t i_nIndex ) const - { - const Element* pEle = getConstElement( i_nIndex ); - return pEle ? pEle->m_aMinSize : Size(); - } - - bool setMinimumSize( size_t i_nIndex, const Size& i_rMinSize ) - { - Element* pEle = getElement( i_nIndex ); - if( pEle ) - pEle->m_aMinSize = i_rMinSize; - return pEle != NULL; - } - - void setBorders( size_t i_nIndex, long i_nLeft, long i_nTop, long i_nRight, long i_nBottom ) - { - Element* pEle = getElement( i_nIndex ); - if( pEle ) - { - pEle->m_nLeftBorder = i_nLeft; - pEle->m_nRightBorder = i_nRight; - pEle->m_nTopBorder = i_nTop; - pEle->m_nBottomBorder = i_nBottom; - } - } - - void getBorders( size_t i_nIndex, long* i_pLeft = NULL, long* i_pTop = NULL, long* i_pRight = NULL, long* i_pBottom = NULL ) const - { - const Element* pEle = getConstElement( i_nIndex ); - if( pEle ) - { - if( i_pLeft ) *i_pLeft = pEle->m_nLeftBorder; - if( i_pTop ) *i_pTop = pEle->m_nTopBorder; - if( i_pRight ) *i_pRight = pEle->m_nRightBorder; - if( i_pBottom ) *i_pBottom = pEle->m_nBottomBorder; - } - } - - - void show( bool i_bShow = true, bool i_bImmediateUpdate = true ); - - void setManagedArea( const Rectangle& i_rArea ) - { - m_aManagedArea = i_rArea; - resize(); - } - const Rectangle& getManagedArea() const { return m_aManagedArea; } - - void setOuterBorder( long i_nBorder ) - { - m_nOuterBorder = i_nBorder; - resize(); - } - - const rtl::OUString getIdentifier() const - { return m_aIdentifier; } - - void setIdentifier( const rtl::OUString& i_rId ) - { m_aIdentifier = i_rId; } - }; - - class VCL_DLLPUBLIC RowOrColumn : public WindowArranger - { - long m_nBorderWidth; - bool m_bColumn; - - std::vector< WindowArranger::Element > m_aElements; - - void distributeRowWidth( std::vector< Size >& io_rSizes, long i_nUsedWidth, long i_nExtraWidth ); - void distributeColumnHeight( std::vector< Size >& io_rSizes, long i_nUsedHeight, long i_nExtraHeight ); - protected: - virtual Element* getElement( size_t i_nIndex ) - { return i_nIndex < m_aElements.size() ? &m_aElements[ i_nIndex ] : 0; } - - public: - RowOrColumn( WindowArranger* i_pParent = NULL, - bool bColumn = true, long i_nBorderWidth = -1 ) - : WindowArranger( i_pParent ) - , m_nBorderWidth( i_nBorderWidth ) - , m_bColumn( bColumn ) - {} - - virtual ~RowOrColumn(); - - virtual Size getOptimalSize( WindowSizeType ) const; - virtual void resize(); - virtual size_t countElements() const { return m_aElements.size(); } - - // add a managed window at the given index - // an index smaller than zero means add the window at the end - size_t addWindow( Window*, sal_Int32 i_nExpandPrio = 0, const Size& i_rMinSize = Size(), size_t i_nIndex = ~0 ); - - size_t addChild( boost::shared_ptr const &, sal_Int32 i_nExpandPrio = 0, size_t i_nIndex = ~0 ); - // convenience: use for addChild( new WindowArranger( ... ) ) constructs - size_t addChild( WindowArranger* i_pNewChild, sal_Int32 i_nExpandPrio = 0, size_t i_nIndex = ~0 ) - { return addChild( boost::shared_ptr( i_pNewChild ), i_nExpandPrio, i_nIndex ); } - - long getBorderWidth() const { return m_nBorderWidth; } - }; - - class VCL_DLLPUBLIC LabeledElement : public WindowArranger - { - WindowArranger::Element m_aLabel; - WindowArranger::Element m_aElement; - long m_nDistance; - long m_nLabelColumnWidth; - int m_nLabelStyle; - protected: - virtual Element* getElement( size_t i_nIndex ) - { - if( i_nIndex == 0 ) - return &m_aLabel; - else if( i_nIndex == 1 ) - return &m_aElement; - return 0; - } - - public: - LabeledElement( WindowArranger* i_pParent = NULL, int i_nLabelStyle = 0, long i_nDistance = -1 ) - : WindowArranger( i_pParent ) - , m_nDistance( i_nDistance ) - , m_nLabelColumnWidth( 0 ) - , m_nLabelStyle( i_nLabelStyle ) - {} - - virtual ~LabeledElement(); - - virtual Size getOptimalSize( WindowSizeType ) const; - virtual void resize(); - virtual size_t countElements() const { return 2; } - - void setLabel( Window* ); - void setElement( Window* ); - void setElement( boost::shared_ptr const & ); - void setLabelColumnWidth( long i_nWidth ) - { m_nLabelColumnWidth = i_nWidth; } - - Size getLabelSize( WindowSizeType i_eType ) const - { return m_aLabel.getOptimalSize( i_eType ); } - Size getElementSize( WindowSizeType i_eType ) const - { return m_aElement.getOptimalSize( i_eType ); } - }; - - class VCL_DLLPUBLIC LabelColumn : public RowOrColumn - { - long getLabelWidth() const; - public: - LabelColumn( WindowArranger* i_pParent = NULL, long i_nBorderWidth = -1 ) - : RowOrColumn( i_pParent, true, i_nBorderWidth ) - {} - virtual ~LabelColumn(); - - virtual Size getOptimalSize( WindowSizeType ) const; - virtual void resize(); - - // returns the index of the added label - size_t addRow( Window* i_pLabel, boost::shared_ptr const& i_rElement, long i_nIndent = 0 ); - }; - - class VCL_DLLPUBLIC Indenter : public WindowArranger - { - long m_nIndent; - WindowArranger::Element m_aElement; - - protected: - virtual Element* getElement( size_t i_nIndex ) - { return i_nIndex == 0 ? &m_aElement : NULL; } - - public: - Indenter( WindowArranger* i_pParent = NULL, long i_nIndent = 3*getDefaultBorder() ) - : WindowArranger( i_pParent ) - , m_nIndent( i_nIndent ) - {} - - virtual ~Indenter(); - - virtual Size getOptimalSize( WindowSizeType ) const; - virtual void resize(); - virtual size_t countElements() const { return (m_aElement.m_pElement != 0 || m_aElement.m_pChild != 0) ? 1 : 0; } - - void setIndent( long i_nIndent ) - { - m_nIndent = i_nIndent; - resize(); - } - - void setChild( boost::shared_ptr const &, sal_Int32 i_nExpandPrio = 0 ); - // convenience: use for setChild( new WindowArranger( ... ) ) constructs - void setChild( WindowArranger* i_pChild, sal_Int32 i_nExpandPrio = 0 ) - { setChild( boost::shared_ptr( i_pChild ), i_nExpandPrio ); } - }; - - class VCL_DLLPUBLIC Spacer : public WindowArranger - { - WindowArranger::Element m_aElement; - Size m_aSize; - - protected: - virtual Element* getElement( size_t i_nIndex ) - { return i_nIndex == 0 ? &m_aElement : NULL; } - - public: - Spacer( WindowArranger* i_pParent = NULL, sal_Int32 i_nPrio = 20, const Size& i_rSize = Size( 0, 0 ) ) - : WindowArranger( i_pParent ) - , m_aElement( NULL, boost::shared_ptr(), i_nPrio ) - , m_aSize( i_rSize ) - {} - - virtual ~Spacer() {} - - virtual Size getOptimalSize( WindowSizeType ) const - { return m_aSize; } - virtual void resize() {} - virtual void setParentWindow( Window* ) {} - virtual size_t countElements() const { return 1; } - virtual bool isVisible() const { return true; } - }; - -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx index a70ff66f61e4..80ce5fd13914 100644 --- a/vcl/inc/vcl/window.hxx +++ b/vcl/inc/vcl/window.hxx @@ -126,7 +126,6 @@ namespace dnd { namespace vcl { struct ControlLayoutData; - struct ExtWindowImpl; } namespace svt { class PopupWindowControllerImpl; } @@ -483,10 +482,7 @@ public: SAL_DLLPRIVATE sal_Bool ImplUpdatePos(); SAL_DLLPRIVATE void ImplUpdateSysObjPos(); SAL_DLLPRIVATE WindowImpl* ImplGetWindowImpl() const { return mpWindowImpl; } - SAL_DLLPRIVATE void ImplFreeExtWindowImpl(); - // creates ExtWindowImpl on demand, but may return NULL (e.g. if mbInDtor) - SAL_DLLPRIVATE vcl::ExtWindowImpl* ImplGetExtWindowImpl() const; - SAL_DLLPRIVATE void ImplDeleteOwnedChildren(); + /** check whether a font is suitable for UI The font to be tested will be checked whether it could display a @@ -549,7 +545,6 @@ public: SAL_DLLPRIVATE sal_Bool ImplRegisterAccessibleNativeFrame(); SAL_DLLPRIVATE void ImplRevokeAccessibleNativeFrame(); SAL_DLLPRIVATE void ImplCallResize(); - SAL_DLLPRIVATE void ImplExtResize(); SAL_DLLPRIVATE void ImplCallMove(); SAL_DLLPRIVATE Rectangle ImplOutputToUnmirroredAbsoluteScreenPixel( const Rectangle& rRect ) const; SAL_DLLPRIVATE void ImplMirrorFramePos( Point &pt ) const; @@ -1309,28 +1304,6 @@ public: virtual rtl::OUString GetSurroundingText() const; virtual Selection GetSurroundingTextSelection() const; - - // ExtImpl - - // old layouting, in-process-of-removal - - /* return the identifier of this window - */ - const rtl::OUString& getIdentifier() const; - - /* returns the first found descendant that matches - the passed identifier or NULL - */ - Window* findWindow( const rtl::OUString& ) const; - - /* get/set properties - this will contain window properties (like visible, enabled) - as well as properties of derived classes (e.g. text of Edit fields) - */ - virtual com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > getProperties() const; - /* - */ - virtual void setProperties( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& ); }; diff --git a/vcl/inc/window.h b/vcl/inc/window.h index dd7718b82e2f..cb48d04118d8 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -101,7 +101,6 @@ namespace dnd { namespace vcl { struct ControlLayoutData; - struct ExtWindowImpl; } @@ -269,7 +268,6 @@ public: ImplDelData* mpFirstDel; void* mpUserData; - vcl::ExtWindowImpl* mpExtImpl; Cursor* mpCursor; Pointer maPointer; Fraction maZoom; diff --git a/vcl/source/window/arrange.cxx b/vcl/source/window/arrange.cxx deleted file mode 100644 index d7f79a0872b5..000000000000 --- a/vcl/source/window/arrange.cxx +++ /dev/null @@ -1,772 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#include "svdata.hxx" - -#include "vcl/arrange.hxx" -#include "vcl/edit.hxx" -#include "vcl/svapp.hxx" - -#include "com/sun/star/beans/PropertyValue.hpp" -#include "com/sun/star/awt/Rectangle.hpp" - -#include "osl/diagnose.h" - -using namespace vcl; -using namespace com::sun::star; - -// ---------------------------------------- -// vcl::WindowArranger -//----------------------------------------- - -long WindowArranger::getDefaultBorder() -{ - ImplSVData* pSVData = ImplGetSVData(); - long nResult = pSVData->maAppData.mnDefaultLayoutBorder; - if( nResult < 0 ) - { - OutputDevice* pDefDev = Application::GetDefaultDevice(); - if( pDefDev ) - { - Size aBorder( pDefDev->LogicToPixel( Size( 3, 3 ), MapMode( MAP_APPFONT ) ) ); - nResult = pSVData->maAppData.mnDefaultLayoutBorder = aBorder.Height(); - } - } - return nResult > 0 ? nResult : 0; -} - -WindowArranger::~WindowArranger() -{} - -void WindowArranger::setParent( WindowArranger* i_pParent ) -{ - OSL_VERIFY( i_pParent->m_pParentWindow == m_pParentWindow || m_pParentWindow == NULL ); - - m_pParentArranger = i_pParent; - m_pParentWindow = i_pParent->m_pParentWindow; - setParentWindow( m_pParentWindow ); -} - -void WindowArranger::setParentWindow( Window* i_pNewParent ) -{ - m_pParentWindow = i_pNewParent; - - size_t nEle = countElements(); - for( size_t i = 0; i < nEle; i++ ) - { - Element* pEle = getElement( i ); - if( pEle ) // sanity check - { - #if OSL_DEBUG_LEVEL > 0 - if( pEle->m_pElement ) - { - OSL_VERIFY( pEle->m_pElement->GetParent() == i_pNewParent ); - } - #endif - if( pEle->m_pChild ) - pEle->m_pChild->setParentWindow( i_pNewParent ); - } - } -} - -void WindowArranger::show( bool i_bShow, bool i_bImmediateUpdate ) -{ - size_t nEle = countElements(); - for( size_t i = 0; i < nEle; i++ ) - { - Element* pEle = getElement( i ); - if( pEle ) // sanity check - { - pEle->m_bHidden = ! i_bShow; - if( pEle->m_pElement ) - pEle->m_pElement->Show( i_bShow ); - if( pEle->m_pChild.get() ) - pEle->m_pChild->show( i_bShow, false ); - } - } - if( m_pParentArranger ) - { - nEle = m_pParentArranger->countElements(); - for( size_t i = 0; i < nEle; i++ ) - { - Element* pEle = m_pParentArranger->getElement( i ); - if( pEle && pEle->m_pChild.get() == this ) - { - pEle->m_bHidden = ! i_bShow; - break; - } - } - } - if( i_bImmediateUpdate ) - { - // find the topmost parent - WindowArranger* pResize = this; - while( pResize->m_pParentArranger ) - pResize = pResize->m_pParentArranger; - pResize->resize(); - } -} - -bool WindowArranger::isVisible() const -{ - size_t nEle = countElements(); - for( size_t i = 0; i < nEle; i++ ) - { - const Element* pEle = getConstElement( i ); - if( pEle->isVisible() ) - return true; - } - return false; -} - -bool WindowArranger::Element::isVisible() const -{ - bool bVisible = false; - if( ! m_bHidden ) - { - if( m_pElement ) - bVisible = m_pElement->IsVisible(); - else if( m_pChild ) - bVisible = m_pChild->isVisible(); - } - return bVisible; -} - -sal_Int32 WindowArranger::Element::getExpandPriority() const -{ - sal_Int32 nPrio = m_nExpandPriority; - if( m_pChild && m_nExpandPriority >= 0 ) - { - size_t nElements = m_pChild->countElements(); - for( size_t i = 0; i < nElements; i++ ) - { - sal_Int32 nCPrio = m_pChild->getExpandPriority( i ); - if( nCPrio > nPrio ) - nPrio = nCPrio; - } - } - return nPrio; -} - -Size WindowArranger::Element::getOptimalSize( WindowSizeType i_eType ) const -{ - Size aResult; - if( ! m_bHidden ) - { - bool bVisible = false; - if( m_pElement && m_pElement->IsVisible() ) - { - aResult = m_pElement->GetOptimalSize( i_eType ); - bVisible = true; - } - else if( m_pChild && m_pChild->isVisible() ) - { - aResult = m_pChild->getOptimalSize( i_eType ); - bVisible = true; - } - if( bVisible ) - { - if( aResult.Width() < m_aMinSize.Width() ) - aResult.Width() = m_aMinSize.Width(); - if( aResult.Height() < m_aMinSize.Height() ) - aResult.Height() = m_aMinSize.Height(); - aResult.Width() += getBorderValue( m_nLeftBorder ) + getBorderValue( m_nRightBorder ); - aResult.Height() += getBorderValue( m_nTopBorder ) + getBorderValue( m_nBottomBorder ); - } - } - - return aResult; -} - -void WindowArranger::Element::setPosSize( const Point& i_rPos, const Size& i_rSize ) -{ - Point aPoint( i_rPos ); - Size aSize( i_rSize ); - aPoint.X() += getBorderValue( m_nLeftBorder ); - aPoint.Y() += getBorderValue( m_nTopBorder ); - aSize.Width() -= getBorderValue( m_nLeftBorder ) + getBorderValue( m_nRightBorder ); - aSize.Height() -= getBorderValue( m_nTopBorder ) + getBorderValue( m_nBottomBorder ); - if( m_pElement ) - m_pElement->SetPosSizePixel( aPoint, aSize ); - else if( m_pChild ) - m_pChild->setManagedArea( Rectangle( aPoint, aSize ) ); -} - -uno::Sequence< beans::PropertyValue > WindowArranger::getProperties() const -{ - uno::Sequence< beans::PropertyValue > aRet( 3 ); - aRet[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OuterBorder" ) ); - aRet[0].Value = uno::makeAny( sal_Int32( getBorderValue( m_nOuterBorder ) ) ); - aRet[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ManagedArea" ) ); - awt::Rectangle aArea( m_aManagedArea.getX(), m_aManagedArea.getY(), m_aManagedArea.getWidth(), m_aManagedArea.getHeight() ); - aRet[1].Value = uno::makeAny( aArea ); - aRet[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Visible" ) ); - aRet[2].Value = uno::makeAny( sal_Bool( isVisible() ) ); - return aRet; -} - -void WindowArranger::setProperties( const uno::Sequence< beans::PropertyValue >& i_rProps ) -{ - const beans::PropertyValue* pProps = i_rProps.getConstArray(); - bool bResize = false; - for( sal_Int32 i = 0; i < i_rProps.getLength(); i++ ) - { - if ( pProps[i].Name == "OuterBorder" ) - { - sal_Int32 nVal = 0; - if( pProps[i].Value >>= nVal ) - { - if( getBorderValue( m_nOuterBorder ) != nVal ) - { - m_nOuterBorder = nVal; - bResize = true; - } - } - } - else if ( pProps[i].Name == "ManagedArea" ) - { - awt::Rectangle aArea( 0, 0, 0, 0 ); - if( pProps[i].Value >>= aArea ) - { - m_aManagedArea.setX( aArea.X ); - m_aManagedArea.setY( aArea.Y ); - m_aManagedArea.setWidth( aArea.Width ); - m_aManagedArea.setHeight( aArea.Height ); - bResize = true; - } - } - else if ( pProps[i].Name == "Visible" ) - { - sal_Bool bVal = sal_False; - if( pProps[i].Value >>= bVal ) - { - show( bVal, false ); - bResize = true; - } - } - } - if( bResize ) - resize(); -} - - -// ---------------------------------------- -// vcl::RowOrColumn -//----------------------------------------- - -RowOrColumn::~RowOrColumn() -{ - for( std::vector< WindowArranger::Element >::iterator it = m_aElements.begin(); - it != m_aElements.end(); ++it ) - { - it->deleteChild(); - } -} - -Size RowOrColumn::getOptimalSize( WindowSizeType i_eType ) const -{ - Size aRet( 0, 0 ); - long nDistance = getBorderValue( m_nBorderWidth ); - for( std::vector< WindowArranger::Element >::const_iterator it = m_aElements.begin(); - it != m_aElements.end(); ++it ) - { - if( it->isVisible() ) - { - // get the size of type of the managed element - Size aElementSize( it->getOptimalSize( i_eType ) ); - if( m_bColumn ) - { - // add the distance between elements - aRet.Height() += nDistance; - // check if the width needs adjustment - if( aRet.Width() < aElementSize.Width() ) - aRet.Width() = aElementSize.Width(); - aRet.Height() += aElementSize.Height(); - } - else - { - // add the distance between elements - aRet.Width() += nDistance; - // check if the height needs adjustment - if( aRet.Height() < aElementSize.Height() ) - aRet.Height() = aElementSize.Height(); - aRet.Width() += aElementSize.Width(); - } - } - } - - if( aRet.Width() != 0 || aRet.Height() != 0 ) - { - // subtract the border for the first element - if( m_bColumn ) - aRet.Height() -= nDistance; - else - aRet.Width() -= nDistance; - - // add the outer border - long nOuterBorder = getBorderValue( m_nOuterBorder ); - aRet.Width() += 2*nOuterBorder; - aRet.Height() += 2*nOuterBorder; - } - - return aRet; -} - -void RowOrColumn::distributeRowWidth( std::vector& io_rSizes, long /*i_nUsedWidth*/, long i_nExtraWidth ) -{ - if( ! io_rSizes.empty() && io_rSizes.size() == m_aElements.size() ) - { - // find all elements with the highest expand priority - size_t nElements = m_aElements.size(); - std::vector< size_t > aIndices; - sal_Int32 nHighPrio = 0; - for( size_t i = 0; i < nElements; i++ ) - { - if( m_aElements[ i ].isVisible() ) - { - sal_Int32 nCurPrio = m_aElements[ i ].getExpandPriority(); - if( nCurPrio > nHighPrio ) - { - aIndices.clear(); - nHighPrio = nCurPrio; - } - if( nCurPrio == nHighPrio ) - aIndices.push_back( i ); - } - } - - // distribute extra space evenly among collected elements - nElements = aIndices.size(); - if( nElements > 0 ) - { - long nDelta = i_nExtraWidth / nElements; - for( size_t i = 0; i < nElements; i++ ) - { - io_rSizes[ aIndices[i] ].Width() += nDelta; - i_nExtraWidth -= nDelta; - } - // add the last pixels to the last row element - if( i_nExtraWidth > 0 && nElements > 0 ) - io_rSizes[aIndices.back()].Width() += i_nExtraWidth; - } - } -} - -void RowOrColumn::distributeColumnHeight( std::vector& io_rSizes, long /*i_nUsedHeight*/, long i_nExtraHeight ) -{ - if( ! io_rSizes.empty() && io_rSizes.size() == m_aElements.size() ) - { - // find all elements with the highest expand priority - size_t nElements = m_aElements.size(); - std::vector< size_t > aIndices; - sal_Int32 nHighPrio = 3; - for( size_t i = 0; i < nElements; i++ ) - { - if( m_aElements[ i ].isVisible() ) - { - sal_Int32 nCurPrio = m_aElements[ i ].getExpandPriority(); - if( nCurPrio > nHighPrio ) - { - aIndices.clear(); - nHighPrio = nCurPrio; - } - if( nCurPrio == nHighPrio ) - aIndices.push_back( i ); - } - } - - // distribute extra space evenly among collected elements - nElements = aIndices.size(); - if( nElements > 0 ) - { - long nDelta = i_nExtraHeight / nElements; - for( size_t i = 0; i < nElements; i++ ) - { - io_rSizes[ aIndices[i] ].Height() += nDelta; - i_nExtraHeight -= nDelta; - } - // add the last pixels to the last row element - if( i_nExtraHeight > 0 && nElements > 0 ) - io_rSizes[aIndices.back()].Height() += i_nExtraHeight; - } - } -} - -void RowOrColumn::resize() -{ - // check if we can get optimal size, else fallback to minimal size - Size aOptSize( getOptimalSize( WINDOWSIZE_PREFERRED ) ); - WindowSizeType eType = WINDOWSIZE_PREFERRED; - if( m_bColumn ) - { - if( aOptSize.Height() > m_aManagedArea.GetHeight() ) - eType = WINDOWSIZE_MINIMUM; - } - else - { - if( aOptSize.Width() > m_aManagedArea.GetWidth() ) - eType = WINDOWSIZE_MINIMUM; - } - - size_t nElements = m_aElements.size(); - // get all element sizes for sizing - std::vector aElementSizes( nElements ); - long nDistance = getBorderValue( m_nBorderWidth ); - long nOuterBorder = getBorderValue( m_nOuterBorder ); - long nUsedWidth = 2*nOuterBorder - (nElements ? nDistance : 0); - for( size_t i = 0; i < nElements; i++ ) - { - if( m_aElements[i].isVisible() ) - { - aElementSizes[i] = m_aElements[i].getOptimalSize( eType ); - if( m_bColumn ) - { - aElementSizes[i].Width() = m_aManagedArea.GetWidth() - 2 * nOuterBorder; - nUsedWidth += aElementSizes[i].Height() + nDistance; - } - else - { - aElementSizes[i].Height() = m_aManagedArea.GetHeight() - 2 * nOuterBorder; - nUsedWidth += aElementSizes[i].Width() + nDistance; - } - } - } - - long nExtraWidth = (m_bColumn ? m_aManagedArea.GetHeight() : m_aManagedArea.GetWidth()) - nUsedWidth; - if( nExtraWidth > 0 ) - { - if( m_bColumn ) - distributeColumnHeight( aElementSizes, nUsedWidth, nExtraWidth ); - else - distributeRowWidth( aElementSizes, nUsedWidth, nExtraWidth ); - } - - // get starting position - Point aElementPos( m_aManagedArea.TopLeft() ); - // outer border - aElementPos.X() += nOuterBorder; - aElementPos.Y() += nOuterBorder; - - // position managed windows - for( size_t i = 0; i < nElements; i++ ) - { - // get the size of type of the managed element - if( m_aElements[i].isVisible() ) - { - m_aElements[i].setPosSize( aElementPos, aElementSizes[i] ); - if( m_bColumn ) - aElementPos.Y() += nDistance + aElementSizes[i].Height(); - else - aElementPos.X() += nDistance + aElementSizes[i].Width(); - } - } -} - -size_t RowOrColumn::addWindow( Window* i_pWindow, sal_Int32 i_nExpandPrio, const Size& i_rMinSize, size_t i_nIndex ) -{ - size_t nIndex = i_nIndex; - if( i_nIndex >= m_aElements.size() ) - { - nIndex = m_aElements.size(); - m_aElements.push_back( WindowArranger::Element( i_pWindow, boost::shared_ptr(), i_nExpandPrio, i_rMinSize ) ); - } - else - { - std::vector< WindowArranger::Element >::iterator it = m_aElements.begin(); - while( i_nIndex-- ) - ++it; - m_aElements.insert( it, WindowArranger::Element( i_pWindow, boost::shared_ptr(), i_nExpandPrio, i_rMinSize ) ); - } - return nIndex; -} - -size_t RowOrColumn::addChild( boost::shared_ptr const & i_pChild, sal_Int32 i_nExpandPrio, size_t i_nIndex ) -{ - size_t nIndex = i_nIndex; - if( i_nIndex >= m_aElements.size() ) - { - nIndex = m_aElements.size(); - m_aElements.push_back( WindowArranger::Element( NULL, i_pChild, i_nExpandPrio ) ); - } - else - { - std::vector< WindowArranger::Element >::iterator it = m_aElements.begin(); - while( i_nIndex-- ) - ++it; - m_aElements.insert( it, WindowArranger::Element( NULL, i_pChild, i_nExpandPrio ) ); - } - return nIndex; -} - -// ---------------------------------------- -// vcl::LabeledElement -//----------------------------------------- - -LabeledElement::~LabeledElement() -{ - m_aLabel.deleteChild(); - m_aElement.deleteChild(); -} - -Size LabeledElement::getOptimalSize( WindowSizeType i_eType ) const -{ - Size aRet( m_aLabel.getOptimalSize( WINDOWSIZE_MINIMUM ) ); - if( aRet.Width() != 0 ) - { - if( m_nLabelColumnWidth != 0 ) - aRet.Width() = m_nLabelColumnWidth; - else - aRet.Width() += getBorderValue( m_nDistance ); - } - Size aElementSize( m_aElement.getOptimalSize( i_eType ) ); - aRet.Width() += aElementSize.Width(); - if( aElementSize.Height() > aRet.Height() ) - aRet.Height() = aElementSize.Height(); - if( aRet.Height() != 0 ) - aRet.Height() += 2 * getBorderValue( m_nOuterBorder ); - - return aRet; -} - -void LabeledElement::resize() -{ - Size aLabelSize( m_aLabel.getOptimalSize( WINDOWSIZE_MINIMUM ) ); - Size aElementSize( m_aElement.getOptimalSize( WINDOWSIZE_PREFERRED ) ); - long nDistance = getBorderValue( m_nDistance ); - long nOuterBorder = getBorderValue( m_nOuterBorder ); - if( nDistance + aLabelSize.Width() + aElementSize.Width() > m_aManagedArea.GetWidth() ) - aElementSize = m_aElement.getOptimalSize( WINDOWSIZE_MINIMUM ); - - // align label and element vertically in LabeledElement - long nYOff = (m_aManagedArea.GetHeight() - 2*nOuterBorder - aLabelSize.Height()) / 2; - Point aPos( m_aManagedArea.Left(), - m_aManagedArea.Top() + nOuterBorder + nYOff ); - Size aSize( aLabelSize ); - if( m_nLabelColumnWidth != 0 ) - aSize.Width() = m_nLabelColumnWidth; - m_aLabel.setPosSize( aPos, aSize ); - - aPos.X() += aSize.Width() + nDistance; - nYOff = (m_aManagedArea.GetHeight() - 2*nOuterBorder - aElementSize.Height()) / 2; - aPos.Y() = m_aManagedArea.Top() + nOuterBorder + nYOff; - aSize.Width() = aElementSize.Width(); - aSize.Height() = m_aManagedArea.GetHeight() - 2*nOuterBorder; - - // label style - // 0: position left and right - // 1: keep the element close to label and grow it - // 2: keep the element close and don't grow it - if( m_nLabelStyle == 0) - { - if( aPos.X() + aSize.Width() < m_aManagedArea.Right() ) - aPos.X() = m_aManagedArea.Right() - aSize.Width(); - } - else if( m_nLabelStyle == 1 ) - { - if( aPos.X() + aSize.Width() < m_aManagedArea.Right() ) - aSize.Width() = m_aManagedArea.Right() - aPos.X(); - } - m_aElement.setPosSize( aPos, aSize ); -} - -void LabeledElement::setLabel( Window* i_pLabel ) -{ - m_aLabel.m_pElement = i_pLabel; - m_aLabel.m_pChild.reset(); -} - -void LabeledElement::setElement( Window* i_pElement ) -{ - m_aElement.m_pElement = i_pElement; - m_aElement.m_pChild.reset(); -} - -void LabeledElement::setElement( boost::shared_ptr const & i_pElement ) -{ - m_aElement.m_pElement = NULL; - m_aElement.m_pChild = i_pElement; -} - -// ---------------------------------------- -// vcl::LabelColumn -//----------------------------------------- -LabelColumn::~LabelColumn() -{ -} - -long LabelColumn::getLabelWidth() const -{ - long nWidth = 0; - - size_t nEle = countElements(); - for( size_t i = 0; i < nEle; i++ ) - { - const Element* pEle = getConstElement( i ); - if( pEle && pEle->m_pChild.get() ) - { - const LabeledElement* pLabel = dynamic_cast< const LabeledElement* >(pEle->m_pChild.get()); - if( pLabel ) - { - Window* pLW = pLabel->getWindow( 0 ); - if( pLW ) - { - Size aLabSize( pLW->GetOptimalSize( WINDOWSIZE_MINIMUM ) ); - long nLB = 0; - pLabel->getBorders(0, &nLB); - aLabSize.Width() += getBorderValue( nLB ); - if( aLabSize.Width() > nWidth ) - nWidth = aLabSize.Width(); - } - } - } - } - return nWidth + getBorderValue( getBorderWidth() ); -} - -Size LabelColumn::getOptimalSize( WindowSizeType i_eType ) const -{ - long nWidth = getLabelWidth(); - long nOuterBorder = getBorderValue( m_nOuterBorder ); - Size aColumnSize; - - // every child is a LabeledElement - size_t nEle = countElements(); - for( size_t i = 0; i < nEle; i++ ) - { - Size aElementSize; - const Element* pEle = getConstElement( i ); - if( pEle && pEle->m_pChild.get() ) - { - const LabeledElement* pLabel = dynamic_cast< const LabeledElement* >(pEle->m_pChild.get()); - if( pLabel ) // we have a label - { - aElementSize = pLabel->getLabelSize( WINDOWSIZE_MINIMUM ); - if( aElementSize.Width() ) - aElementSize.Width() = nWidth; - Size aSize( pLabel->getElementSize( i_eType ) ); - aElementSize.Width() += aSize.Width(); - if( aSize.Height() > aElementSize.Height() ) - aElementSize.Height() = aSize.Height(); - } - else // a non label, just treat it as a row - { - aElementSize = pEle->getOptimalSize( i_eType ); - } - } - else if( pEle && pEle->m_pElement ) // a general window, treat is as a row - { - aElementSize = pEle->getOptimalSize( i_eType ); - } - if( aElementSize.Width() ) - { - aElementSize.Width() += 2*nOuterBorder; - if( aElementSize.Width() > aColumnSize.Width() ) - aColumnSize.Width() = aElementSize.Width(); - } - if( aElementSize.Height() ) - { - aColumnSize.Height() += getBorderValue( getBorderWidth() ) + aElementSize.Height(); - } - } - if( nEle > 0 && aColumnSize.Height() ) - { - aColumnSize.Height() -= getBorderValue( getBorderWidth() ); // for the first element - aColumnSize.Height() += 2*nOuterBorder; - } - return aColumnSize; -} - -void LabelColumn::resize() -{ - long nWidth = getLabelWidth(); - size_t nEle = countElements(); - for( size_t i = 0; i < nEle; i++ ) - { - Element* pEle = getElement( i ); - if( pEle && pEle->m_pChild.get() ) - { - LabeledElement* pLabel = dynamic_cast< LabeledElement* >(pEle->m_pChild.get()); - if( pLabel ) - pLabel->setLabelColumnWidth( nWidth ); - } - } - RowOrColumn::resize(); -} - -size_t LabelColumn::addRow( Window* i_pLabel, boost::shared_ptr const& i_rElement, long i_nIndent ) -{ - boost::shared_ptr< LabeledElement > xLabel( new LabeledElement( this, 1 ) ); - xLabel->setLabel( i_pLabel ); - xLabel->setBorders( 0, i_nIndent, 0, 0, 0 ); - xLabel->setElement( i_rElement ); - size_t nIndex = addChild( xLabel ); - resize(); - return nIndex; -} - -// ---------------------------------------- -// vcl::Indenter -//----------------------------------------- - -Indenter::~Indenter() -{ - m_aElement.deleteChild(); -} - -Size Indenter::getOptimalSize( WindowSizeType i_eType ) const -{ - Size aSize( m_aElement.getOptimalSize( i_eType ) ); - long nOuterBorder = getBorderValue( m_nOuterBorder ); - long nIndent = getBorderValue( m_nIndent ); - aSize.Width() += 2*nOuterBorder + nIndent; - aSize.Height() += 2*nOuterBorder; - return aSize; -} - -void Indenter::resize() -{ - long nOuterBorder = getBorderValue( m_nOuterBorder ); - long nIndent = getBorderValue( m_nIndent ); - Point aPt( m_aManagedArea.TopLeft() ); - aPt.X() += nOuterBorder + nIndent; - aPt.Y() += nOuterBorder; - Size aSz( m_aManagedArea.GetSize() ); - aSz.Width() -= 2*nOuterBorder + nIndent; - aSz.Height() -= 2*nOuterBorder; - m_aElement.setPosSize( aPt, aSz ); -} - -void Indenter::setChild( boost::shared_ptr const & i_pChild, sal_Int32 i_nExpandPrio ) -{ - OSL_VERIFY( (m_aElement.m_pElement == 0 && m_aElement.m_pChild == 0 ) || i_pChild == 0 ); - m_aElement.m_pChild = i_pChild; - m_aElement.m_nExpandPriority = i_nExpandPrio; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index d874d811527b..7d21da6a3a99 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -604,7 +604,6 @@ void Window::ImplInitWindowData( WindowType nType ) mpWindowImpl->mpDlgCtrlDownWindow = NULL; // window for dialog control mpWindowImpl->mpFirstDel = NULL; // Dtor notification list mpWindowImpl->mpUserData = NULL; // user data - mpWindowImpl->mpExtImpl = NULL; // extended implementation data mpWindowImpl->mpCursor = NULL; // cursor mpWindowImpl->mpControlFont = NULL; // font propertie mpWindowImpl->mpVCLXWindow = NULL; @@ -1180,8 +1179,6 @@ void Window::ImplCallResize() // #88419# Most classes don't call the base class in Resize() and Move(), // => Call ImpleResize/Move instead of Resize/Move directly... ImplCallEventListeners( VCLEVENT_WINDOW_RESIZE ); - - ImplExtResize(); } // ----------------------------------------------------------------------- @@ -4258,8 +4255,6 @@ namespace Window::~Window() { - ImplFreeExtWindowImpl(); - vcl::LazyDeletor::Undelete( this ); DBG_DTOR( Window, ImplDbgCheckWindow ); diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index d73c7b8c7926..5bd02d99b531 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -1799,7 +1799,6 @@ void Window::take_properties(Window &rOther) if (!mpWindowImpl->mpRealParent) ImplInit(pWindowImpl->mpRealParent, rOther.GetStyle(), NULL); std::swap(mpWindowImpl->mpUserData, pWindowImpl->mpUserData); - std::swap(mpWindowImpl->mpExtImpl, pWindowImpl->mpExtImpl); std::swap(mpWindowImpl->mpCursor, pWindowImpl->mpCursor); std::swap(mpWindowImpl->maPointer, pWindowImpl->maPointer); mpWindowImpl->maZoom = pWindowImpl->maZoom; diff --git a/vcl/source/window/window4.cxx b/vcl/source/window/window4.cxx deleted file mode 100644 index af22d6641f1d..000000000000 --- a/vcl/source/window/window4.cxx +++ /dev/null @@ -1,166 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#include "vcl/window.hxx" -#include "vcl/arrange.hxx" - -#include "window.h" -#include "svdata.hxx" - -#include "com/sun/star/beans/PropertyValue.hpp" - -#include -#include - -using namespace com::sun::star; - -namespace vcl -{ - struct ExtWindowImpl - { - ExtWindowImpl() - : mbOwnedByParent( false ) - {} - ~ExtWindowImpl() - {} - - boost::shared_ptr< WindowArranger > mxLayout; - bool mbOwnedByParent; - rtl::OUString maIdentifier; - }; -} - -void Window::ImplDeleteOwnedChildren() -{ - Window* pChild = mpWindowImpl->mpFirstChild; - while ( pChild ) - { - Window* pDeleteCandidate = pChild; - pChild = pChild->mpWindowImpl->mpNext; - vcl::ExtWindowImpl* pDelImpl = pDeleteCandidate->ImplGetExtWindowImpl(); - if( pDelImpl && pDelImpl->mbOwnedByParent ) - delete pDeleteCandidate; - } -} - -void Window::ImplFreeExtWindowImpl() -{ - ImplDeleteOwnedChildren(); - if( mpWindowImpl ) - { - delete mpWindowImpl->mpExtImpl; - mpWindowImpl->mpExtImpl = NULL; - } -} - -vcl::ExtWindowImpl* Window::ImplGetExtWindowImpl() const -{ - vcl::ExtWindowImpl* pImpl = NULL; - if( mpWindowImpl ) - { - if( ! mpWindowImpl->mpExtImpl && ! mpWindowImpl->mbInDtor ) - mpWindowImpl->mpExtImpl = new vcl::ExtWindowImpl(); - pImpl = mpWindowImpl->mpExtImpl; - } - return pImpl; -} - -void Window::ImplExtResize() -{ - if( mpWindowImpl && mpWindowImpl->mpExtImpl ) - { - if( mpWindowImpl->mpExtImpl->mxLayout.get() ) - mpWindowImpl->mpExtImpl->mxLayout->setManagedArea( Rectangle( Point( 0, 0 ), GetSizePixel() ) ); - } -} - -Window* Window::findWindow( const rtl::OUString& i_rIdentifier ) const -{ - if( getIdentifier() == i_rIdentifier ) - return const_cast(this); - - Window* pChild = mpWindowImpl->mpFirstChild; - while ( pChild ) - { - Window* pResult = pChild->findWindow( i_rIdentifier ); - if( pResult ) - return pResult; - pChild = pChild->mpWindowImpl->mpNext; - } - - return NULL; -} - -const rtl::OUString& Window::getIdentifier() const -{ - static rtl::OUString aEmptyStr; - - return (mpWindowImpl && mpWindowImpl->mpExtImpl) ? mpWindowImpl->mpExtImpl->maIdentifier : aEmptyStr; -} - -void Window::setProperties( const uno::Sequence< beans::PropertyValue >& i_rProps ) -{ - const beans::PropertyValue* pVals = i_rProps.getConstArray(); - for( sal_Int32 i = 0; i < i_rProps.getLength(); i++ ) - { - if ( pVals[i].Name == "Enabled" ) - { - sal_Bool bVal = sal_True; - if( pVals[i].Value >>= bVal ) - Enable( bVal ); - } - else if ( pVals[i].Name == "Visible" ) - { - sal_Bool bVal = sal_True; - if( pVals[i].Value >>= bVal ) - Show( bVal ); - } - else if ( pVals[i].Name == "Text" ) - { - rtl::OUString aText; - if( pVals[i].Value >>= aText ) - SetText( aText ); - } - } -} - -uno::Sequence< beans::PropertyValue > Window::getProperties() const -{ - uno::Sequence< beans::PropertyValue > aProps( 3 ); - aProps[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Enabled" ) ); - aProps[0].Value = uno::makeAny( sal_Bool( IsEnabled() ) ); - aProps[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Visible" ) ); - aProps[1].Value = uno::makeAny( sal_Bool( IsVisible() ) ); - aProps[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" ) ); - aProps[2].Value = uno::makeAny( rtl::OUString( GetText() ) ); - - return aProps; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ From d00dc669964bb407a49420ecddf0647a5276c3f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 9 Oct 2012 20:09:46 +0100 Subject: [PATCH 629/863] loplugin: unused OStrings Change-Id: I22916424fb97ba27ea6f4e540841a6c851fb8c88 --- jvmfwk/source/elements.cxx | 3 --- jvmfwk/source/fwkbase.cxx | 1 - 2 files changed, 4 deletions(-) diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx index 17d1f273449a..a39571724458 100644 --- a/jvmfwk/source/elements.cxx +++ b/jvmfwk/source/elements.cxx @@ -909,9 +909,6 @@ void CNodeJavaInfo::writeToNode(xmlDoc* pDoc, { OSL_ASSERT(pJavaInfoNode && pDoc); - rtl::OString sExcMsg("[Java framework] Error in function NodeJavaInfo::writeToNode " - "(elements.cxx)."); - //write the attribute vendorSettings //javaInfo@vendorUpdate diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx index c03e27fe80b5..a25140111563 100644 --- a/jvmfwk/source/fwkbase.cxx +++ b/jvmfwk/source/fwkbase.cxx @@ -294,7 +294,6 @@ OUString VendorSettings::getPluginLibrary(const OUString& sVendor) OSL_ASSERT(!sVendor.isEmpty()); OString sExcMsg("[Java framework] Error in function getPluginLibrary (fwkbase.cxx)."); - OString sVendorsPath = getVendorSettingsPath(m_xmlDocVendorSettingsFileUrl); OUStringBuffer usBuffer(256); usBuffer.appendAscii("/jf:javaSelection/jf:plugins/jf:library[@vendor=\""); usBuffer.append(sVendor); From f2b34cb356bf858eb5108fe76e3595597179a88f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 9 Oct 2012 20:13:23 +0100 Subject: [PATCH 630/863] merge double fix Change-Id: Id213a881bbb56fbd6a8e16e8a40ce1dc3e57cab7 --- vcl/source/control/fixed.cxx | 3 --- 1 file changed, 3 deletions(-) diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index 9409fe6698ac..254494c49b56 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -470,10 +470,7 @@ void FixedText::setMaxWidthChars(sal_Int32 nWidth) bool FixedText::set_property(const rtl::OString &rKey, const rtl::OString &rValue) { if (rKey == "max-width-chars") - { setMaxWidthChars(rValue.toInt32()); - return true; - } else return Control::set_property(rKey, rValue); return true; From 7ef1190c3e9422998d89df2cf8fcf30bddfc1a03 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 4 Oct 2012 15:06:27 +0200 Subject: [PATCH 631/863] Add a 'fromIndex' parameter to OUString::replaceAll This method will be needed for forthcoming String->OUStringBuffer conversions. Change-Id: I001099baaca5cd402aebcd15c031d9060286a8f9 --- sal/inc/rtl/ustring.h | 23 +++++++++++++++++++++++ sal/inc/rtl/ustring.hxx | 8 +++++--- sal/rtl/source/ustring.cxx | 10 +++++++++- sal/util/sal.map | 1 + 4 files changed, 38 insertions(+), 4 deletions(-) diff --git a/sal/inc/rtl/ustring.h b/sal/inc/rtl/ustring.h index 231dcdce253a..e056bad4915e 100644 --- a/sal/inc/rtl/ustring.h +++ b/sal/inc/rtl/ustring.h @@ -1519,6 +1519,29 @@ SAL_DLLPUBLIC void SAL_CALL rtl_uString_newReplaceAll( rtl_uString ** newStr, rtl_uString * str, rtl_uString const * from, rtl_uString const * to) SAL_THROW_EXTERN_C(); +/** Create a new string by replacing all occurrences of a given substring with + another substring. + + Replacing subsequent occurrences picks up only after a given replacement. + That is, replacing from "xa" to "xx" in "xaa" results in "xxa", not "xxx". + + @param[in, out] newStr pointer to the new string; must not be null; must + point to null or a valid rtl_uString + + @param str pointer to the original string; must not be null + + @param from pointer to the substring to be replaced; must not be null + + @param to pointer to the replacing substring; must not be null + + @param fromIndex the position in the string where we will begin searching + + @since LibreOffice 3.7 +*/ +SAL_DLLPUBLIC void SAL_CALL rtl_uString_newReplaceAllFromIndex( + rtl_uString ** newStr, rtl_uString * str, rtl_uString const * from, + rtl_uString const * to, sal_Int32 fromIndex) SAL_THROW_EXTERN_C(); + /** Create a new string by replacing all occurrences of a given substring with another substring. diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx index 97568012e06a..bbd6e962690d 100644 --- a/sal/inc/rtl/ustring.hxx +++ b/sal/inc/rtl/ustring.hxx @@ -1531,11 +1531,13 @@ public: @param to the replacing substring - @since LibreOffice 3.6 + @param fromIndex the position in the string where we will begin searching + + @since LibreOffice 3.7 */ - OUString replaceAll(OUString const & from, OUString const & to) const { + OUString replaceAll(OUString const & from, OUString const & to, int fromIndex = 0) const { rtl_uString * s = 0; - rtl_uString_newReplaceAll(&s, pData, from.pData, to.pData); + rtl_uString_newReplaceAllFromIndex(&s, pData, from.pData, to.pData, fromIndex); return OUString(s, SAL_NO_ACQUIRE); } diff --git a/sal/rtl/source/ustring.cxx b/sal/rtl/source/ustring.cxx index b21994959e62..ac2d7d9eba65 100644 --- a/sal/rtl/source/ustring.cxx +++ b/sal/rtl/source/ustring.cxx @@ -1158,10 +1158,18 @@ void rtl_uString_newReplaceFirstAsciiLAsciiL( void rtl_uString_newReplaceAll( rtl_uString ** newStr, rtl_uString * str, rtl_uString const * from, rtl_uString const * to) SAL_THROW_EXTERN_C() +{ + rtl_uString_newReplaceAllFromIndex( newStr, str, from, to, 0 ); +} + +void rtl_uString_newReplaceAllFromIndex( + rtl_uString ** newStr, rtl_uString * str, rtl_uString const * from, + rtl_uString const * to, sal_Int32 fromIndex) SAL_THROW_EXTERN_C() { assert(to != 0); + assert(fromIndex >= 0 && fromIndex <= str->length); rtl_uString_assign(newStr, str); - for (sal_Int32 i = 0;; i += to->length) { + for (sal_Int32 i = fromIndex;; i += to->length) { rtl_uString_newReplaceFirst(newStr, *newStr, from, to, &i); if (i == -1) { break; diff --git a/sal/util/sal.map b/sal/util/sal.map index 978a66ef5adf..bf518d393590 100644 --- a/sal/util/sal.map +++ b/sal/util/sal.map @@ -631,6 +631,7 @@ LIBO_UDK_3.7 { # symbols available in >= LibO 3.7 global: rtl_string_newFromSubString; rtl_uString_newFromSubString; + rtl_uString_newReplaceAllFromIndex; } LIBO_UDK_3.6; PRIVATE_1.0 { From 8e610f6148c89d931d264b81fb1f5736e45c8a93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Tue, 9 Oct 2012 22:56:16 +0200 Subject: [PATCH 632/863] explicitly fail with --enable-compiler-plugins if compiler is not clang Change-Id: I7c21730486f74b44b7c1189c40105f5d1a96f754 --- configure.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configure.in b/configure.in index 8b29eb30d755..29e4d92ec078 100644 --- a/configure.in +++ b/configure.in @@ -5059,6 +5059,10 @@ if test "$COM_GCC_IS_CLANG" = "TRUE"; then CPPFLAGS=$save_CPPFLAGS AC_LANG_POP([C++]) fi +else + if test "$enable_compiler_plugins" = "yes"; then + AC_MSG_ERROR([Compiler plugins are currently supported only with the Clang compiler.]) + fi fi AC_SUBST(COMPILER_PLUGINS) From bf59cceafd05dba74e4fc3a3f5fdc8098bb1a95b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 9 Oct 2012 22:02:44 +0100 Subject: [PATCH 633/863] fix blank dialogs: now need to explicitly call show on containers Change-Id: I803f808e7049777ec5a46dc2fce00a3943321ffa --- sfx2/source/dialog/tabdlg.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 5d883c7c2915..b137cee62372 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -592,6 +592,8 @@ void SfxTabDialog::Init_Impl( sal_Bool bFmtFlag, const String* pUserButtonText, LINK( this, SfxTabDialog, ActivatePageHdl ) ); m_pTabCtrl->SetDeactivatePageHdl( LINK( this, SfxTabDialog, DeactivatePageHdl ) ); + m_pActionArea->Show(); + m_pVBox->Show(); m_pTabCtrl->Show(); m_pOKBtn->Show(); m_pCancelBtn->Show(); From 227d385fcdaf30ef4bd294d99b088ef533372d58 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Tue, 9 Oct 2012 23:04:13 +0200 Subject: [PATCH 634/863] jfreereport clean d.lst after gbuildification Change-Id: I58114ca1229b2d02a80b3908a740bffc65f755ba --- jfreereport/prj/d.lst | 2 -- 1 file changed, 2 deletions(-) diff --git a/jfreereport/prj/d.lst b/jfreereport/prj/d.lst index 094707925b36..e69de29bb2d1 100644 --- a/jfreereport/prj/d.lst +++ b/jfreereport/prj/d.lst @@ -1,2 +0,0 @@ -..\%__SRC%\class\*.jar %_DEST%\bin\*.jar -..\version.mk %_DEST%\bin\jfreereport_version.mk From 58528348fad0609c4d7af7943bc76df4261b8508 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 4 Oct 2012 17:13:24 +0200 Subject: [PATCH 635/863] String->OUString in tools::ErrorContext Change-Id: Ibd0cd3e8d7281b5abde420df5cc1d51e9354069c Reviewed-on: https://gerrit.libreoffice.org/769 Reviewed-by: Michael Stahl Tested-by: Michael Stahl --- sd/source/filter/html/htmlex.cxx | 8 ++-- sd/source/filter/html/htmlex.hxx | 2 +- svtools/inc/svtools/ehdl.hxx | 8 ++-- svtools/source/misc/ehdl.cxx | 53 +++++++++++++------------- test/source/bootstrapfixture.cxx | 2 +- tools/inc/tools/errinf.hxx | 60 +++++++++++++++--------------- tools/source/ref/errinf.cxx | 20 +++++----- uui/source/iahndl-errorhandler.cxx | 2 +- uui/source/iahndl.cxx | 4 +- 9 files changed, 80 insertions(+), 79 deletions(-) diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 043907769dd5..babb586e702d 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -3316,16 +3316,16 @@ HtmlErrorContext::HtmlErrorContext(Window *_pWin) // ===================================================================== -sal_Bool HtmlErrorContext::GetString( sal_uLong, String& rCtxStr ) +sal_Bool HtmlErrorContext::GetString( sal_uLong, OUString& rCtxStr ) { DBG_ASSERT( mnResId != 0, "No error context set" ); if( mnResId == 0 ) return false; - rCtxStr = String( SdResId( mnResId ) ); + rCtxStr = SdResId( mnResId ); - rCtxStr.SearchAndReplace( rtl::OUString("$(URL1)"), maURL1 ); - rCtxStr.SearchAndReplace( rtl::OUString("$(URL2)"), maURL2 ); + rCtxStr = rCtxStr.replaceAll( rtl::OUString("$(URL1)"), maURL1 ); + rCtxStr = rCtxStr.replaceAll( rtl::OUString("$(URL2)"), maURL2 ); return true; } diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx index 0b4a4aa3b9a1..7a4ac0061c78 100644 --- a/sd/source/filter/html/htmlex.hxx +++ b/sd/source/filter/html/htmlex.hxx @@ -81,7 +81,7 @@ public: HtmlErrorContext(Window *pWin=0); ~HtmlErrorContext() {}; - virtual sal_Bool GetString( sal_uLong nErrId, String& rCtxStr ); + virtual sal_Bool GetString( sal_uLong nErrId, OUString& rCtxStr ); void SetContext( sal_uInt16 nResId, const String& rURL ); void SetContext( sal_uInt16 nResId, const String& rURL1, const String& rURL2 ); diff --git a/svtools/inc/svtools/ehdl.hxx b/svtools/inc/svtools/ehdl.hxx index 7438882a59cd..4b06a6e9d781 100644 --- a/svtools/inc/svtools/ehdl.hxx +++ b/svtools/inc/svtools/ehdl.hxx @@ -38,7 +38,7 @@ public: SfxErrorContext( sal_uInt16 nCtxIdP, const String &aArg1, Window *pWin=0, sal_uInt16 nResIdP=USHRT_MAX, ResMgr *pMgrP=0); - virtual sal_Bool GetString(sal_uLong nErrId, String &rStr); + virtual sal_Bool GetString(sal_uLong nErrId, OUString &rStr); private: sal_uInt16 nCtxId; @@ -54,8 +54,8 @@ public: ~SfxErrorHandler(); protected: - virtual sal_Bool GetErrorString(sal_uLong lErrId, String &, sal_uInt16&) const; - virtual sal_Bool GetMessageString(sal_uLong lErrId, String &, sal_uInt16&) const; + virtual sal_Bool GetErrorString(sal_uLong lErrId, OUString &, sal_uInt16&) const; + virtual sal_Bool GetMessageString(sal_uLong lErrId, OUString &, sal_uInt16&) const; private: @@ -67,7 +67,7 @@ private: SVT_DLLPRIVATE sal_Bool GetClassString(sal_uLong lErrId, String &) const; virtual sal_Bool CreateString( - const ErrorInfo *, String &, sal_uInt16 &) const; + const ErrorInfo *, OUString &, sal_uInt16 &) const; }; #endif diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index b23feb7d10c4..97b81fde8de5 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -42,8 +42,8 @@ static sal_uInt16 aWndFunc( Window *pWin, // Parent des Dialoges sal_uInt16 nFlags, - const String &rErr, // Fehlertext - const String &rAction) // Actiontext + const OUString &rErr, // Fehlertext + const OUString &rAction) // Actiontext /* [Beschreibung] @@ -175,7 +175,7 @@ SfxErrorHandler::~SfxErrorHandler() //------------------------------------------------------------------------- sal_Bool SfxErrorHandler::CreateString( - const ErrorInfo *pErr, String &rStr, sal_uInt16& nFlags) const + const ErrorInfo *pErr, OUString &rStr, sal_uInt16& nFlags) const /* [Beschreibung] @@ -192,13 +192,12 @@ sal_Bool SfxErrorHandler::CreateString( { if(GetMessageString(nErrCode, rStr, nFlags)) { - for (xub_StrLen i = 0; i < rStr.Len();) + for (xub_StrLen i = 0; i < rStr.getLength();) { - i = rStr.SearchAndReplace(rtl::OUString("$(ARG1)"), - pMsgInfo->GetMessageArg(), i); - if (i == STRING_NOTFOUND) + if( rStr.indexOf(OUString("$(ARG1)"), i) == -1 ) break; - i = i + pMsgInfo->GetMessageArg().Len(); + rStr = rStr.replaceAll("$(ARG1)", pMsgInfo->GetMessageArg(), i); + i = i + pMsgInfo->GetMessageArg().getLength(); } return sal_True; } @@ -207,32 +206,32 @@ sal_Bool SfxErrorHandler::CreateString( { StringErrorInfo *pStringInfo=PTR_CAST(StringErrorInfo,pErr); if(pStringInfo) - for (xub_StrLen i = 0; i < rStr.Len();) + for (xub_StrLen i = 0; i < rStr.getLength();) { - i = rStr.SearchAndReplace(rtl::OUString("$(ARG1)"), - pStringInfo->GetErrorString(), i); - if (i == STRING_NOTFOUND) + if( rStr.indexOf("$(ARG1)", i) == -1 ) break; - i = i + pStringInfo->GetErrorString().Len(); + rStr = rStr.replaceAll(rtl::OUString("$(ARG1)"), + pStringInfo->GetErrorString(), i); + i = i + pStringInfo->GetErrorString().getLength(); } else { TwoStringErrorInfo * pTwoStringInfo = PTR_CAST(TwoStringErrorInfo, pErr); if (pTwoStringInfo) - for (sal_uInt16 i = 0; i < rStr.Len();) + for (sal_uInt16 i = 0; i < rStr.getLength();) { - sal_uInt16 nArg1Pos = rStr.Search(rtl::OUString("$(ARG1)"), i); - sal_uInt16 nArg2Pos = rStr.Search(rtl::OUString("$(ARG2)"), i); + sal_uInt16 nArg1Pos = rStr.indexOf(rtl::OUString("$(ARG1)"), i); + sal_uInt16 nArg2Pos = rStr.indexOf(rtl::OUString("$(ARG2)"), i); if (nArg1Pos < nArg2Pos) { - rStr.Replace(nArg1Pos, 7, pTwoStringInfo->GetArg1()); - i = nArg1Pos + pTwoStringInfo->GetArg1().Len(); + rStr = rStr.replaceAt(nArg1Pos, 7, pTwoStringInfo->GetArg1()); + i = nArg1Pos + pTwoStringInfo->GetArg1().getLength(); } else if (nArg2Pos < nArg1Pos) { - rStr.Replace(nArg2Pos, 7, pTwoStringInfo->GetArg2()); - i = nArg2Pos + pTwoStringInfo->GetArg2().Len(); + rStr = rStr.replaceAt(nArg2Pos, 7, pTwoStringInfo->GetArg2()); + i = nArg2Pos + pTwoStringInfo->GetArg2().getLength(); } else break; } @@ -329,7 +328,7 @@ sal_Bool SfxErrorHandler::GetClassString(sal_uLong lClassId, String &rStr) const //------------------------------------------------------------------------- sal_Bool SfxErrorHandler::GetMessageString( - sal_uLong lErrId, String &rStr, sal_uInt16 &nFlags) const + sal_uLong lErrId, OUString &rStr, sal_uInt16 &nFlags) const /* [Beschreibung] @@ -359,7 +358,7 @@ sal_Bool SfxErrorHandler::GetMessageString( //------------------------------------------------------------------------- sal_Bool SfxErrorHandler::GetErrorString( - sal_uLong lErrId, String &rStr, sal_uInt16 &nFlags) const + sal_uLong lErrId, OUString &rStr, sal_uInt16 &nFlags) const /* [Beschreibung] Erzeugt den Fehlerstring fuer den eigentlichen Fehler ohne @@ -383,7 +382,7 @@ sal_Bool SfxErrorHandler::GetErrorString( sal_uInt16 nResFlags = aErrorString.GetFlags(); if ( nResFlags ) nFlags = nResFlags; - rStr.SearchAndReplace(rtl::OUString("$(ERROR)"), aErrorString.GetString()); + rStr = rStr.replaceAll(rtl::OUString("$(ERROR)"), aErrorString.GetString()); bRet = sal_True; } else @@ -397,7 +396,7 @@ sal_Bool SfxErrorHandler::GetErrorString( aErrStr); if(aErrStr.Len()) aErrStr += rtl::OUString(".\n"); - rStr.SearchAndReplace(rtl::OUString("$(CLASS)"),aErrStr); + rStr = rStr.replaceAll(rtl::OUString("$(CLASS)"),aErrStr); } return bRet; @@ -427,7 +426,7 @@ SfxErrorContext::SfxErrorContext( //------------------------------------------------------------------------- -sal_Bool SfxErrorContext::GetString(sal_uLong nErrId, String &rStr) +sal_Bool SfxErrorContext::GetString(sal_uLong nErrId, OUString &rStr) /* [Beschreibung] @@ -452,7 +451,7 @@ sal_Bool SfxErrorContext::GetString(sal_uLong nErrId, String &rStr) if ( aTestEr ) { rStr = ( (ResString)aTestEr ).GetString(); - rStr.SearchAndReplace(rtl::OUString("$(ARG1)"), aArg1 ); + rStr = rStr.replaceAll(rtl::OUString("$(ARG1)"), aArg1 ); bRet = true; } else @@ -466,7 +465,7 @@ sal_Bool SfxErrorContext::GetString(sal_uLong nErrId, String &rStr) sal_uInt16 nId = ( nErrId & ERRCODE_WARNING_MASK ) ? ERRCTX_WARNING : ERRCTX_ERROR; ResId aSfxResId( RID_ERRCTX, *pMgr ); ErrorResource_Impl aEr( aSfxResId, nId ); - rStr.SearchAndReplace( rtl::OUString("$(ERR)"), ( (ResString)aEr ).GetString() ); + rStr = rStr.replaceAll( rtl::OUString("$(ERR)"), ( (ResString)aEr ).GetString() ); } } diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx index 2b68451d1ae6..41fca3d3f92d 100644 --- a/test/source/bootstrapfixture.cxx +++ b/test/source/bootstrapfixture.cxx @@ -47,7 +47,7 @@ using namespace ::com::sun::star; -static void aBasicErrorFunc( const String &rErr, const String &rAction ) +static void aBasicErrorFunc( const OUString &rErr, const OUString &rAction ) { OStringBuffer aErr( "Unexpected dialog: " ); aErr.append( OUStringToOString( rAction, RTL_TEXTENCODING_ASCII_US ) ); diff --git a/tools/inc/tools/errinf.hxx b/tools/inc/tools/errinf.hxx index 61b69de8a2d3..815447b7372f 100644 --- a/tools/inc/tools/errinf.hxx +++ b/tools/inc/tools/errinf.hxx @@ -69,48 +69,50 @@ public: class TOOLS_DLLPUBLIC StringErrorInfo : public DynamicErrorInfo { private: - String aString; + OUString aString; public: TYPEINFO(); StringErrorInfo( sal_uIntPtr lUserId, - const String& aStringP, + const OUString& aStringP, sal_uInt16 nFlags = 0); - const String& GetErrorString() const { return aString; } + const OUString& GetErrorString() const { return aString; } }; class TOOLS_DLLPUBLIC TwoStringErrorInfo: public DynamicErrorInfo { private: - String aArg1; - String aArg2; + OUString aArg1; + OUString aArg2; public: TYPEINFO(); - TwoStringErrorInfo(sal_uIntPtr nUserID, const String & rTheArg1, - const String & rTheArg2, sal_uInt16 nFlags = 0): - DynamicErrorInfo(nUserID, nFlags), aArg1(rTheArg1), aArg2(rTheArg2) {} + TwoStringErrorInfo(sal_uIntPtr nUserID, const OUString & rTheArg1, + const OUString & rTheArg2, sal_uInt16 nFlags = 0): + DynamicErrorInfo(nUserID, nFlags), aArg1(rTheArg1), aArg2(rTheArg2) {} + virtual ~TwoStringErrorInfo() {} - String GetArg1() const { return aArg1; } - String GetArg2() const { return aArg2; } + const OUString& GetArg1() const { return aArg1; } + const OUString& GetArg2() const { return aArg2; } }; class TOOLS_DLLPUBLIC MessageInfo : public DynamicErrorInfo { public: - TYPEINFO(); - MessageInfo(sal_uIntPtr UserId, sal_uInt16 nFlags = 0) : - DynamicErrorInfo(UserId, nFlags){} - MessageInfo(sal_uIntPtr UserId, const String &rArg, - sal_uInt16 nFlags = 0 ) : - DynamicErrorInfo(UserId, nFlags), aArg(rArg) {} - const String& GetMessageArg() const { return aArg; } + TYPEINFO(); + + MessageInfo(sal_uIntPtr UserId, sal_uInt16 nFlags = 0) : + DynamicErrorInfo(UserId, nFlags) {} + MessageInfo(sal_uIntPtr UserId, const OUString &rArg, sal_uInt16 nFlags = 0 ) : + DynamicErrorInfo(UserId, nFlags), aArg(rArg) {} + + const OUString& GetMessageArg() const { return aArg; } private: - String aArg; + OUString aArg; }; class TOOLS_DLLPUBLIC ErrorContext @@ -125,17 +127,17 @@ public: ErrorContext(Window *pWin=0); virtual ~ErrorContext(); - virtual sal_Bool GetString( sal_uIntPtr nErrId, String& rCtxStr ) = 0; + virtual sal_Bool GetString( sal_uIntPtr nErrId, OUString& rCtxStr ) = 0; Window* GetParent() { return pWin; } static ErrorContext* GetContext(); }; typedef sal_uInt16 WindowDisplayErrorFunc( - Window *, sal_uInt16 nMask, const String &rErr, const String &rAction); + Window *, sal_uInt16 nMask, const OUString &rErr, const OUString &rAction); typedef void BasicDisplayErrorFunc( - const String &rErr, const String &rAction); + const OUString &rErr, const OUString &rAction); class TOOLS_DLLPUBLIC ErrorHandler { @@ -144,20 +146,20 @@ class TOOLS_DLLPUBLIC ErrorHandler private: ErrHdl_Impl* pImpl; - static sal_uInt16 HandleError_Impl( sal_uIntPtr lId, - sal_uInt16 nFlags, - sal_Bool bJustCreateString, - String & rError); + static sal_uInt16 HandleError_Impl( sal_uIntPtr lId, + sal_uInt16 nFlags, + sal_Bool bJustCreateString, + OUString & rError); protected: - virtual sal_Bool CreateString( const ErrorInfo *, - String &, sal_uInt16& nMask ) const = 0; + virtual sal_Bool CreateString( const ErrorInfo *, + OUString &, sal_uInt16& nMask ) const = 0; public: ErrorHandler(); virtual ~ErrorHandler(); static sal_uInt16 HandleError ( sal_uIntPtr lId, sal_uInt16 nMask = USHRT_MAX ); - static sal_Bool GetErrorString( sal_uIntPtr lId, String& rStr ); + static sal_Bool GetErrorString( sal_uIntPtr lId, OUString& rStr ); static void RegisterDisplay( BasicDisplayErrorFunc* ); static void RegisterDisplay( WindowDisplayErrorFunc* ); @@ -166,7 +168,7 @@ public: class TOOLS_DLLPUBLIC SimpleErrorHandler : private ErrorHandler { protected: - virtual sal_Bool CreateString( const ErrorInfo*, String &, + virtual sal_Bool CreateString( const ErrorInfo*, OUString &, sal_uInt16 &nMask ) const; public: diff --git a/tools/source/ref/errinf.cxx b/tools/source/ref/errinf.cxx index 7126c06751a2..b7867a8079b8 100644 --- a/tools/source/ref/errinf.cxx +++ b/tools/source/ref/errinf.cxx @@ -162,7 +162,7 @@ sal_uInt16 DynamicErrorInfo::GetDialogMask() const } StringErrorInfo::StringErrorInfo( - sal_uIntPtr UserId, const String& aStringP, sal_uInt16 nFlags) + sal_uIntPtr UserId, const OUString& aStringP, sal_uInt16 nFlags) : DynamicErrorInfo(UserId, nFlags), aString(aStringP) { } @@ -172,10 +172,10 @@ class ErrHdl_Impl public: ErrorHandler *pNext; static sal_Bool CreateString(const ErrorHandler *pStart, - const ErrorInfo*, String&, sal_uInt16&); + const ErrorInfo*, OUString&, sal_uInt16&); }; -static void aDspFunc(const String &rErr, const String &rAction) +static void aDspFunc(const OUString &rErr, const OUString &rAction) { rtl::OStringBuffer aErr(RTL_CONSTASCII_STRINGPARAM("Aktion: ")); aErr.append(rtl::OUStringToOString(rAction, RTL_TEXTENCODING_ASCII_US)); @@ -261,10 +261,10 @@ void ErrorHandler::RegisterDisplay(BasicDisplayErrorFunc *aDsp) @return ??? */ sal_uInt16 ErrorHandler::HandleError_Impl( - sal_uIntPtr lId, sal_uInt16 nFlags, sal_Bool bJustCreateString, String & rError) + sal_uIntPtr lId, sal_uInt16 nFlags, sal_Bool bJustCreateString, OUString & rError) { - String aErr; - String aAction; + OUString aErr; + OUString aAction; if(!lId || lId == ERRCODE_ABORT) return 0; EDcrData *pData=EDcrData::GetData(); @@ -346,7 +346,7 @@ sal_uInt16 ErrorHandler::HandleError_Impl( } // static -sal_Bool ErrorHandler::GetErrorString(sal_uIntPtr lId, String& rStr) +sal_Bool ErrorHandler::GetErrorString(sal_uIntPtr lId, OUString& rStr) { return (sal_Bool)HandleError_Impl( lId, USHRT_MAX, sal_True, rStr ); } @@ -357,12 +357,12 @@ sal_Bool ErrorHandler::GetErrorString(sal_uIntPtr lId, String& rStr) */ sal_uInt16 ErrorHandler::HandleError(sal_uIntPtr lId, sal_uInt16 nFlags) { - String aDummy; + OUString aDummy; return HandleError_Impl( lId, nFlags, sal_False, aDummy ); } sal_Bool ErrHdl_Impl::CreateString( const ErrorHandler *pStart, - const ErrorInfo* pInfo, String& pStr, + const ErrorInfo* pInfo, OUString& pStr, sal_uInt16 &rFlags) { for(const ErrorHandler *pHdl=pStart;pHdl;pHdl=pHdl->pImpl->pNext) @@ -374,7 +374,7 @@ sal_Bool ErrHdl_Impl::CreateString( const ErrorHandler *pStart, } sal_Bool SimpleErrorHandler::CreateString( - const ErrorInfo *pInfo, String &rStr, sal_uInt16 &) const + const ErrorInfo *pInfo, OUString &rStr, sal_uInt16 &) const { sal_uIntPtr nId = pInfo->GetErrorCode(); rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Id ")); diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx index 10ae5276d243..ae4f2bc80743 100644 --- a/uui/source/iahndl-errorhandler.cxx +++ b/uui/source/iahndl-errorhandler.cxx @@ -258,7 +258,7 @@ UUIInteractionHelper::handleErrorHandlerRequest( ErrorContext * pContext = ErrorContext::GetContext(); if (pContext) { - UniString aContextString; + OUString aContextString; if (pContext->GetString(nErrorCode, aContextString)) aContext = aContextString; } diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index 09f904cf2971..60e49e41878a 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -1243,7 +1243,7 @@ UUIInteractionHelper::handleGenericErrorRequest( bHasErrorString = isInformationalErrorMessageRequest(rContinuations); if (bHasErrorString) { - String aErrorString; + OUString aErrorString; ErrorHandler::GetErrorString(nErrorCode, aErrorString); rErrorString = aErrorString; } @@ -1264,7 +1264,7 @@ UUIInteractionHelper::handleGenericErrorRequest( || nError == ERRCODE_SFX_INCOMPLETE_ENCRYPTION ) { // the security warning box needs a special title - String aErrorString; + OUString aErrorString; ErrorHandler::GetErrorString( nErrorCode, aErrorString ); boost::scoped_ptr< ResMgr > xManager( From be5f517a37086ee270a954cf8461585be7c39242 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 5 Oct 2012 08:15:43 +0200 Subject: [PATCH 636/863] String->OUString in svl::SvNumberFormat::GetMappedFormatstring method Change-Id: I80512acbcd639ee20f56f9ac95efc00bd3209b76 Reviewed-on: https://gerrit.libreoffice.org/770 Reviewed-by: Michael Stahl Tested-by: Michael Stahl --- svl/inc/svl/zformat.hxx | 2 +- svl/source/numbers/zformat.cxx | 48 +++++++++++++++++----------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/svl/inc/svl/zformat.hxx b/svl/inc/svl/zformat.hxx index 1a352825e617..ead212c9eb68 100644 --- a/svl/inc/svl/zformat.hxx +++ b/svl/inc/svl/zformat.hxx @@ -224,7 +224,7 @@ public: const OUString& GetFormatstring() const { return sFormatstring; } // Build a format string of application defined keywords - String GetMappedFormatstring( const NfKeywordTable& rKeywords, + OUString GetMappedFormatstring( const NfKeywordTable& rKeywords, const LocaleDataWrapper& rLoc, bool bDontQuote = false ) const; diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 5c4c31c7fcf3..ed20ade4112d 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -4543,11 +4543,11 @@ void lcl_SvNumberformat_AddLimitStringImpl( String& rStr, } } -String SvNumberformat::GetMappedFormatstring( +OUString SvNumberformat::GetMappedFormatstring( const NfKeywordTable& rKeywords, const LocaleDataWrapper& rLocWrp, bool bDontQuote ) const { - String aStr; + OUStringBuffer aStr; bool bDefault[4]; // 1 subformat matches all if no condition specified, bDefault[0] = ( NumFor[1].GetCount() == 0 && eOp1 == NUMBERFORMAT_OP_NO ); @@ -4628,13 +4628,13 @@ String SvNumberformat::GetMappedFormatstring( if ( nSem && (nAnz || aPrefix.Len()) ) { for ( ; nSem; --nSem ) - aStr += ';'; + aStr.append( ';' ); for ( ; nSub <= n; ++nSub ) bDefault[nSub] = false; } if ( aPrefix.Len() ) - aStr += aPrefix; + aStr.append( aPrefix ); if ( nAnz ) { @@ -4644,64 +4644,64 @@ String SvNumberformat::GetMappedFormatstring( { if ( 0 <= pType[j] && pType[j] < NF_KEYWORD_ENTRIES_COUNT ) { - aStr += rKeywords[pType[j]]; + aStr.append( rKeywords[pType[j]] ); if( NF_KEY_NNNN == pType[j] ) - aStr += rLocWrp.getLongDateDayOfWeekSep(); + aStr.append( rLocWrp.getLongDateDayOfWeekSep() ); } else { switch ( pType[j] ) { case NF_SYMBOLTYPE_DECSEP : - aStr += rLocWrp.getNumDecimalSep(); + aStr.append( rLocWrp.getNumDecimalSep() ); break; case NF_SYMBOLTYPE_THSEP : - aStr += rLocWrp.getNumThousandSep(); + aStr.append( rLocWrp.getNumThousandSep() ); break; case NF_SYMBOLTYPE_DATESEP : - aStr += rLocWrp.getDateSep(); + aStr.append( rLocWrp.getDateSep() ); break; case NF_SYMBOLTYPE_TIMESEP : - aStr += rLocWrp.getTimeSep(); + aStr.append( rLocWrp.getTimeSep() ); break; case NF_SYMBOLTYPE_TIME100SECSEP : - aStr += rLocWrp.getTime100SecSep(); + aStr.append( rLocWrp.getTime100SecSep() ); break; case NF_SYMBOLTYPE_STRING : if( bDontQuote ) - aStr += pStr[j]; + aStr.append( pStr[j] ); else if ( pStr[j].getLength() == 1 ) { - aStr += '\\'; - aStr += pStr[j]; + aStr.append( '\\' ); + aStr.append( pStr[j] ); } else { - aStr += '"'; - aStr += pStr[j]; - aStr += '"'; + aStr.append( '"' ); + aStr.append( pStr[j] ); + aStr.append( '"' ); } break; case NF_SYMBOLTYPE_CALDEL : if ( pStr[j+1].equalsAscii("buddhist") ) { - aStr.InsertAscii( "[$-", 0 ); + aStr.insert( 0, "[$-" ); if ( rNum.IsSet() && rNum.GetNatNum() == 1 && MsLangId::getRealLanguage( rNum.GetLang() ) == LANGUAGE_THAI ) { - aStr.InsertAscii( "D07041E]", 3 ); // date in Thai digit, Buddhist era + aStr.insert( 3, "D07041E]" ); // date in Thai digit, Buddhist era } else { - aStr.InsertAscii( "107041E]", 3 ); // date in Arabic digit, Buddhist era + aStr.insert( 3, "107041E]" ); // date in Arabic digit, Buddhist era } j = j+2; } LCIDInserted = true; break; default: - aStr += pStr[j]; + aStr.append( pStr[j] ); } } @@ -4714,14 +4714,14 @@ String SvNumberformat::GetMappedFormatstring( LANGUAGE_THAI && !LCIDInserted ) { - aStr.InsertAscii( "[$-D00041E]", 0 ); // number in Thai digit + aStr.insert( 0, "[$-D00041E]" ); // number in Thai digit } } for ( ; nSub<4 && bDefault[nSub]; ++nSub ) { // append empty subformats - aStr += ';'; + aStr.append( ';' ); } - return aStr; + return aStr.getStr(); } String SvNumberformat::ImpGetNatNumString( const SvNumberNatNum& rNum, From c90e0064357f78ffc9ee8261c6c100c15d904beb Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 5 Oct 2012 08:42:18 +0200 Subject: [PATCH 637/863] String->OUString in svl::ImpSvNumFor::GetNewCurrencySymbol method Change-Id: Ie283a02903b0bf420291e1e4e1e29232cc7ff3a9 Reviewed-on: https://gerrit.libreoffice.org/771 Reviewed-by: Michael Stahl Tested-by: Michael Stahl --- svl/inc/svl/zformat.hxx | 4 ++-- svl/source/numbers/numfmuno.cxx | 9 +++++---- svl/source/numbers/zforfind.cxx | 6 +++--- svl/source/numbers/zforlist.cxx | 8 ++++---- svl/source/numbers/zformat.cxx | 14 +++++++------- svx/source/items/numfmtsh.cxx | 2 +- 6 files changed, 22 insertions(+), 21 deletions(-) diff --git a/svl/inc/svl/zformat.hxx b/svl/inc/svl/zformat.hxx index ead212c9eb68..1dbb9731552c 100644 --- a/svl/inc/svl/zformat.hxx +++ b/svl/inc/svl/zformat.hxx @@ -146,7 +146,7 @@ public: // new SYMBOLTYPE_CURRENCY in subformat? bool HasNewCurrency() const; - bool GetNewCurrencySymbol( String& rSymbol, String& rExtension ) const; + bool GetNewCurrencySymbol( OUString& rSymbol, OUString& rExtension ) const; void SaveNewCurrencyMap( SvStream& rStream ) const; void LoadNewCurrencyMap( SvStream& rStream ); @@ -344,7 +344,7 @@ public: // If a new SYMBOLTYPE_CURRENCY is contained if the format is of type // NUMBERFORMAT_CURRENCY, and if so the symbol xxx and the extension nnn // of [$xxx-nnn] are returned - bool GetNewCurrencySymbol( String& rSymbol, String& rExtension ) const; + bool GetNewCurrencySymbol( OUString& rSymbol, OUString& rExtension ) const; static bool HasStringNegativeSign( const String& rStr ); diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx index 461ff8bb370e..6b6005200e8d 100644 --- a/svl/source/numbers/numfmuno.cxx +++ b/svl/source/numbers/numfmuno.cxx @@ -802,19 +802,19 @@ uno::Any SAL_CALL SvNumberFormatObj::getPropertyValue( const rtl::OUString& aPro } else if (aString.EqualsAscii( PROPERTYNAME_CURRSYM )) { - String aSymbol, aExt; + OUString aSymbol, aExt; pFormat->GetNewCurrencySymbol( aSymbol, aExt ); aRet <<= rtl::OUString( aSymbol ); } else if (aString.EqualsAscii( PROPERTYNAME_CURREXT )) { - String aSymbol, aExt; + OUString aSymbol, aExt; pFormat->GetNewCurrencySymbol( aSymbol, aExt ); aRet <<= rtl::OUString( aExt ); } else if (aString.EqualsAscii( PROPERTYNAME_CURRABB )) { - String aSymbol, aExt; + OUString aSymbol, aExt; bool bBank = false; pFormat->GetNewCurrencySymbol( aSymbol, aExt ); const NfCurrencyEntry* pCurr = pFormatter->GetCurrencyEntry( bBank, @@ -876,7 +876,8 @@ uno::Sequence SAL_CALL SvNumberFormatObj::getPropertyValue const SvNumberformat* pFormat = pFormatter ? pFormatter->GetEntry(nKey) : NULL; if (pFormat) { - String aSymbol, aExt, aAbb; + OUString aSymbol, aExt; + String aAbb; bool bBank = false; pFormat->GetNewCurrencySymbol( aSymbol, aExt ); const NfCurrencyEntry* pCurr = pFormatter->GetCurrencyEntry( bBank, diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx index 69d676181f46..085d5676659f 100644 --- a/svl/source/numbers/zforfind.cxx +++ b/svl/source/numbers/zforfind.cxx @@ -673,15 +673,15 @@ bool ImpSvNumberInputScan::GetCurrency( const String& rString, xub_StrLen& nPos, } if ( pFormat ) { - String aSymbol, aExtension; + OUString aSymbol, aExtension; if ( pFormat->GetNewCurrencySymbol( aSymbol, aExtension ) ) { - if ( aSymbol.Len() <= rString.Len() - nPos ) + if ( aSymbol.getLength() <= rString.Len() - nPos ) { aSymbol = pFormatter->GetCharClass()->uppercase(aSymbol); if ( StringContains( aSymbol, rString, nPos ) ) { - nPos = nPos + aSymbol.Len(); + nPos = nPos + aSymbol.getLength(); return true; } } diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 22872d1ff9f2..692b228c7da6 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -3307,7 +3307,7 @@ bool SvNumberFormatter::GetNewCurrencySymbolString( sal_uInt32 nFormat, const SvNumberformat* pFormat = GetFormatEntry(nFormat); if ( pFormat ) { - String aSymbol, aExtension; + OUString aSymbol, aExtension; if ( pFormat->GetNewCurrencySymbol( aSymbol, aExtension ) ) { if ( ppEntry ) @@ -3329,8 +3329,8 @@ bool SvNumberFormatter::GetNewCurrencySymbolString( sal_uInt32 nFormat, { // analog to BuildSymbolString rStr = '['; rStr += '$'; - if ( aSymbol.Search( '-' ) != STRING_NOTFOUND || - aSymbol.Search( ']' ) != STRING_NOTFOUND ) + if ( aSymbol.indexOf( '-' ) != -1 || + aSymbol.indexOf( ']' ) != -1 ) { rStr += '"'; rStr += aSymbol; @@ -3338,7 +3338,7 @@ bool SvNumberFormatter::GetNewCurrencySymbolString( sal_uInt32 nFormat, } else rStr += aSymbol; - if ( aExtension.Len() ) + if ( aExtension.getLength() ) rStr += aExtension; rStr += ']'; } diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index ed20ade4112d..b5c583cfb081 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -404,8 +404,8 @@ bool ImpSvNumFor::HasNewCurrency() const return false; } -bool ImpSvNumFor::GetNewCurrencySymbol( String& rSymbol, - String& rExtension ) const +bool ImpSvNumFor::GetNewCurrencySymbol( OUString& rSymbol, + OUString& rExtension ) const { for ( sal_uInt16 j=0; jTestNewString( rFmtString, eCurLanguage ); if ( nFound != NUMBERFORMAT_ENTRY_NOT_FOUND && ((pFormat = pFormatter->GetEntry( nFound )) != 0) && From 68abd6d9258975e9ef1155f726fe4c12bb0918e2 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 5 Oct 2012 09:08:24 +0200 Subject: [PATCH 638/863] String->OUString in SVL::SvNumberFormat calendar methods Change-Id: I6fe904d25a0675d881ee7c1d761e9af87e23a69d Reviewed-on: https://gerrit.libreoffice.org/772 Reviewed-by: Michael Stahl Tested-by: Michael Stahl --- svl/inc/svl/zformat.hxx | 8 ++++---- svl/source/numbers/zformat.cxx | 28 ++++++++++++++-------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/svl/inc/svl/zformat.hxx b/svl/inc/svl/zformat.hxx index 1dbb9731552c..015cf9711c8f 100644 --- a/svl/inc/svl/zformat.hxx +++ b/svl/inc/svl/zformat.hxx @@ -421,13 +421,13 @@ public: /** Switches to the first non-"gregorian" calendar, but only if the current calendar is "gregorian"; original calendar name and date/time returned, but only if calendar switched and rOrgCalendar was empty. */ - void SwitchToOtherCalendar( String& rOrgCalendar, double& fOrgDateTime ) const; + void SwitchToOtherCalendar( OUString& rOrgCalendar, double& fOrgDateTime ) const; /** Switches to the "gregorian" calendar, but only if the current calendar is non-"gregorian" and rOrgCalendar is not empty. Thus a preceding ImpSwitchToOtherCalendar() call should have been placed prior to calling this method. */ - void SwitchToGregorianCalendar( const String& rOrgCalendar, double fOrgDateTime ) const; + void SwitchToGregorianCalendar( const OUString& rOrgCalendar, double fOrgDateTime ) const; #ifdef THE_FUTURE /** Switches to the first specified calendar, if any, in subformat nNumFor @@ -438,7 +438,7 @@ public: if a calendar was specified and switched to, else. */ - bool SwitchToSpecifiedCalendar( String& rOrgCalendar, double& fOrgDateTime, + bool SwitchToSpecifiedCalendar( OUString& rOrgCalendar, double& fOrgDateTime, sal_uInt16 nNumFor ) const { if ( nNumFor < 4 ) @@ -620,7 +620,7 @@ private: // know a "before" era (like zh_TW ROC or ja_JP Gengou). If switched and // rOrgCalendar was "gregorian" the string is emptied. If rOrgCalendar was // empty the previous calendar name and date/time are returned. - SVL_DLLPRIVATE bool ImpFallBackToGregorianCalendar( String& rOrgCalendar, double& fOrgDateTime ); + SVL_DLLPRIVATE bool ImpFallBackToGregorianCalendar( OUString& rOrgCalendar, double& fOrgDateTime ); // Append a "G" short era string of the given calendar. In the case of a // Gengou calendar this is a one character abbreviation, for other diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index b5c583cfb081..4049881c1a46 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -3055,7 +3055,7 @@ bool SvNumberformat::ImpIsOtherCalendar( const ImpSvNumFor& rNumFor ) const return false; } -void SvNumberformat::SwitchToOtherCalendar( String& rOrgCalendar, +void SvNumberformat::SwitchToOtherCalendar( OUString& rOrgCalendar, double& fOrgDateTime ) const { CalendarWrapper& rCal = GetCal(); @@ -3072,7 +3072,7 @@ void SvNumberformat::SwitchToOtherCalendar( String& rOrgCalendar, { if ( xCals[j] != rGregorian ) { - if ( !rOrgCalendar.Len() ) + if ( !rOrgCalendar.getLength() ) { rOrgCalendar = rCal.getUniqueID(); fOrgDateTime = rCal.getDateTime(); @@ -3086,19 +3086,19 @@ void SvNumberformat::SwitchToOtherCalendar( String& rOrgCalendar, } } -void SvNumberformat::SwitchToGregorianCalendar( const String& rOrgCalendar, +void SvNumberformat::SwitchToGregorianCalendar( const OUString& rOrgCalendar, double fOrgDateTime ) const { CalendarWrapper& rCal = GetCal(); const rtl::OUString &rGregorian = Gregorian::get(); - if ( rOrgCalendar.Len() && rCal.getUniqueID() != rGregorian ) + if ( rOrgCalendar.getLength() && rCal.getUniqueID() != rGregorian ) { rCal.loadCalendar( rGregorian, rLoc().getLocale() ); rCal.setDateTime( fOrgDateTime ); } } -bool SvNumberformat::ImpFallBackToGregorianCalendar( String& rOrgCalendar, double& fOrgDateTime ) +bool SvNumberformat::ImpFallBackToGregorianCalendar( OUString& rOrgCalendar, double& fOrgDateTime ) { using namespace ::com::sun::star::i18n; CalendarWrapper& rCal = GetCal(); @@ -3108,13 +3108,13 @@ bool SvNumberformat::ImpFallBackToGregorianCalendar( String& rOrgCalendar, doubl sal_Int16 nVal = rCal.getValue( CalendarFieldIndex::ERA ); if ( nVal == 0 && rCal.getLoadedCalendar().Eras[0].ID == "Dummy" ) { - if ( !rOrgCalendar.Len() ) + if ( !rOrgCalendar.getLength() ) { rOrgCalendar = rCal.getUniqueID(); fOrgDateTime = rCal.getDateTime(); } - else if ( rOrgCalendar == String(rGregorian) ) - rOrgCalendar.Erase(); + else if ( rOrgCalendar == rGregorian ) + rOrgCalendar = ""; rCal.loadCalendar( rGregorian, rLoc().getLocale() ); rCal.setDateTime( fOrgDateTime ); return true; @@ -3257,7 +3257,7 @@ bool SvNumberformat::ImpGetDateOutput(double fNumber, fNumber += fDiff; rCal.setLocalDateTime( fNumber ); int nUseMonthCase = 0; // not decided yet - String aOrgCalendar; // empty => not changed yet + OUString aOrgCalendar; // empty => not changed yet double fOrgDateTime; bool bOtherCalendar = ImpIsOtherCalendar( NumFor[nIx] ); if ( bOtherCalendar ) @@ -3272,7 +3272,7 @@ bool SvNumberformat::ImpGetDateOutput(double fNumber, switch (rInfo.nTypeArray[i]) { case NF_SYMBOLTYPE_CALENDAR : - if ( !aOrgCalendar.Len() ) + if ( !aOrgCalendar.getLength() ) { aOrgCalendar = rCal.getUniqueID(); fOrgDateTime = rCal.getDateTime(); @@ -3436,7 +3436,7 @@ bool SvNumberformat::ImpGetDateOutput(double fNumber, break; } } - if ( aOrgCalendar.Len() ) + if ( aOrgCalendar.getLength() ) rCal.loadCalendar( aOrgCalendar, rLoc().getLocale() ); // restore calendar return bRes; } @@ -3477,7 +3477,7 @@ bool SvNumberformat::ImpGetDateTimeOutput(double fNumber, rCal.setLocalDateTime( fNumber ); int nUseMonthCase = 0; // not decided yet - String aOrgCalendar; // empty => not changed yet + OUString aOrgCalendar; // empty => not changed yet double fOrgDateTime; bool bOtherCalendar = ImpIsOtherCalendar( NumFor[nIx] ); if ( bOtherCalendar ) @@ -3559,7 +3559,7 @@ bool SvNumberformat::ImpGetDateTimeOutput(double fNumber, switch (rInfo.nTypeArray[i]) { case NF_SYMBOLTYPE_CALENDAR : - if ( !aOrgCalendar.Len() ) + if ( !aOrgCalendar.getLength() ) { aOrgCalendar = rCal.getUniqueID(); fOrgDateTime = rCal.getDateTime(); @@ -3772,7 +3772,7 @@ bool SvNumberformat::ImpGetDateTimeOutput(double fNumber, break; } } - if ( aOrgCalendar.Len() ) + if ( aOrgCalendar.getLength() ) rCal.loadCalendar( aOrgCalendar, rLoc().getLocale() ); // restore calendar return bRes; } From 06fb559a4bc7f2b8f14187d6f4399e87452b2809 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Tue, 9 Oct 2012 23:05:26 +0200 Subject: [PATCH 639/863] note about (not) linking llvm/clang libraries Change-Id: I628e3b99b69d238abc9df3e62e77b30eb85f1a0d --- compilerplugins/Makefile-clang.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/compilerplugins/Makefile-clang.mk b/compilerplugins/Makefile-clang.mk index ca95f11aaff3..d175f23899f9 100644 --- a/compilerplugins/Makefile-clang.mk +++ b/compilerplugins/Makefile-clang.mk @@ -30,6 +30,10 @@ CLANGDEFS=-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS # All include locations needed. CLANGINCLUDES=-I$(CLANGDIR)/include -I$(CLANGDIR)/tools/clang/include -I$(CLANGBUILD)/include -I$(CLANGBUILD)/tools/clang/include +# Clang/LLVM libraries are intentionally not linked in, they are usually built as static libraries, which means the resulting +# plugin would be big (even though the clang binary already includes it all) and it'd be necessary to explicitly specify +# also all the dependency libraries. + CLANGINDIR=$(SRCDIR)/compilerplugins/clang # Cannot use $(WORKDIR), the plugin should survive even 'make clean', otherwise the rebuilt # plugin will cause cache misses with ccache. From 98a6d76f1eb20346828056b906bd775c8247e992 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Tue, 9 Oct 2012 23:29:42 +0200 Subject: [PATCH 640/863] avoid the annoying xpdf warning about string literal conversion to error() Clang quotes it in the warning message, and tinderbox log parser highlights every single of the warnings because of the 'error'. Change-Id: I6a2addc6817d05d18dcc1985ecaca0b110045ecf --- xpdf/makefile.mk | 2 +- xpdf/xpdf-no-writable-literals.patch | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 xpdf/xpdf-no-writable-literals.patch diff --git a/xpdf/makefile.mk b/xpdf/makefile.mk index ff6dd6a4b76d..239912bb115a 100644 --- a/xpdf/makefile.mk +++ b/xpdf/makefile.mk @@ -48,7 +48,7 @@ dummy: TARFILE_NAME=xpdf-3.02 TARFILE_MD5=599dc4cc65a07ee868cf92a667a913d2 -PATCH_FILES=$(TARFILE_NAME).patch xpdf-3.02-ooopwd.patch xpdf-3.02-gfxColorMaxComps.patch +PATCH_FILES=$(TARFILE_NAME).patch xpdf-3.02-ooopwd.patch xpdf-3.02-gfxColorMaxComps.patch xpdf-no-writable-literals.patch CONFIGURE_DIR= BUILD_DIR=$(CONFIGURE_DIR) diff --git a/xpdf/xpdf-no-writable-literals.patch b/xpdf/xpdf-no-writable-literals.patch new file mode 100644 index 000000000000..9a1366e1613c --- /dev/null +++ b/xpdf/xpdf-no-writable-literals.patch @@ -0,0 +1,21 @@ +--- misc/xpdf-3.02/xpdf/Error.h.sav 2007-02-27 23:05:52.000000000 +0100 ++++ misc/build/xpdf-3.02/xpdf/Error.h 2012-10-09 23:24:12.002455791 +0200 +@@ -18,6 +18,6 @@ + #include + #include "config.h" + +-extern void CDECL error(int pos, char *msg, ...); ++extern void CDECL error(int pos, const char *msg, ...); + + #endif +--- misc/build/xpdf-3.02/xpdf/Error.cc.sav 2007-02-27 23:05:52.000000000 +0100 ++++ misc/build/xpdf-3.02/xpdf/Error.cc 2012-10-09 23:24:27.813569809 +0200 +@@ -18,7 +18,7 @@ + #include "GlobalParams.h" + #include "Error.h" + +-void CDECL error(int pos, char *msg, ...) { ++void CDECL error(int pos, const char *msg, ...) { + va_list args; + + // NB: this can be called before the globalParams object is created From 24e66143ed0887bb28f359d3172735017434bdf8 Mon Sep 17 00:00:00 2001 From: Marcos Paulo de Souza Date: Fri, 5 Oct 2012 20:33:57 -0300 Subject: [PATCH 641/863] Remove useless code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These macros was never defined: KANJI AMIKAKE BORDER_BMP SMARTEXT JAPANESE_ENABLED BENUTIL_SUPPORT So, these code inside these ifdefs was never executed. Remove all this. Also in this commit, remove some odd comments and commented code. Change-Id: Idd4991d06d1c879e64f07875241a8acfa35695d0 Signed-off-by: Marcos Paulo de Souza Reviewed-on: https://gerrit.libreoffice.org/777 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara --- .../source/filter/lwpcharacterstyle.cxx | 2 - lotuswordpro/source/filter/lwpfrib.cxx | 44 +------------------ lotuswordpro/source/filter/lwpfribheader.hxx | 9 ---- lotuswordpro/source/filter/lwplaypiece.hxx | 5 --- lotuswordpro/source/filter/lwpobjtags.hxx | 7 --- lotuswordpro/source/filter/lwpoverride.hxx | 5 --- lotuswordpro/source/filter/tocread.cxx | 10 ----- 7 files changed, 1 insertion(+), 81 deletions(-) diff --git a/lotuswordpro/source/filter/lwpcharacterstyle.cxx b/lotuswordpro/source/filter/lwpcharacterstyle.cxx index 8b57de456b0d..5c4de3f9e8d5 100644 --- a/lotuswordpro/source/filter/lwpcharacterstyle.cxx +++ b/lotuswordpro/source/filter/lwpcharacterstyle.cxx @@ -124,7 +124,6 @@ void LwpTextStyle::ReadCommon() m_pLangOverride->Read(m_pObjStrm); m_pTxtAttrOverride->Read(m_pObjStrm); -//#ifdef AMIKAKE if (LwpFileHeader::m_nFileRevision < 0x000B) { m_pCharacterBorderOverride->Read(m_pObjStrm); @@ -135,7 +134,6 @@ void LwpTextStyle::ReadCommon() m_CharacterBorder.ReadIndexed(m_pObjStrm); m_Amikake.ReadIndexed(m_pObjStrm); } -//#endif sal_uInt16 nCount = 6; if (LwpFileHeader::m_nFileRevision > 0x0005) nCount = m_pObjStrm->QuickReaduInt16(); diff --git a/lotuswordpro/source/filter/lwpfrib.cxx b/lotuswordpro/source/filter/lwpfrib.cxx index f7b800de6b3b..d801d42ae038 100644 --- a/lotuswordpro/source/filter/lwpfrib.cxx +++ b/lotuswordpro/source/filter/lwpfrib.cxx @@ -169,36 +169,10 @@ LwpFrib* LwpFrib::CreateFrib(LwpPara* pPara, LwpObjectStream* pObjStrm, sal_uInt case FRIB_TAG_NOTE: newFrib = new LwpFribNote(pPara); break; -/* case FRIB_TAG_KANJI: - #ifdef KANJI - newFrib = new CFribHelperKanji; - #else - newFrib = new CFribHelperUnicode; - #endif - break; - case FRIB_TAG_HKATAKANA: - #ifdef KANJI - newFrib = new CFribHelperHKatakana; - #else - newFrib = new CFribHelperUnicode; - #endif - break; - case FRIB_TAG_SEPARATOR: - newFrib = new CFribHelperSeparator; - break;*/ case FRIB_TAG_SECTION: newFrib = new LwpFribSection(pPara); break; -/* case FRIB_TAG_TOMBSTONE: - newFrib = new CFribHelperTombstone; - break; - case FRIB_TAG_SPECIALTAB: - newFrib = new CFribHelperSpecialTab; - break; case FRIB_TAG_PAGENUMBER: - newFrib = new CFribHelperPageNumber; - break; -*/ case FRIB_TAG_PAGENUMBER: newFrib = new LwpFribPageNumber(pPara); break; case FRIB_TAG_DOCVAR: @@ -207,30 +181,18 @@ LwpFrib* LwpFrib::CreateFrib(LwpPara* pPara, LwpObjectStream* pObjStrm, sal_uInt case FRIB_TAG_BOOKMARK: newFrib = new LwpFribBookMark(pPara); break; -/* case FRIB_TAG_DOCVAR: - newFrib = new CFribHelperBookmark; - break; - case FRIB_TAG_DDE: - newFrib = new CFribHelperDDE; - break; -*/ case FRIB_TAG_FIELD: + case FRIB_TAG_FIELD: newFrib = new LwpFribField(pPara); break; case FRIB_TAG_CHBLOCK: newFrib = new LwpFribCHBlock(pPara); break; -/* case FRIB_TAG_FLOWBREAK: - newFrib = new CFribHelperFlowBreak; - break; -#ifdef RUBY*/ case FRIB_TAG_RUBYMARKER: newFrib = new LwpFribRubyMarker(pPara); break; case FRIB_TAG_RUBYFRAME: newFrib = new LwpFribRubyFrame(pPara); break; -/*#endif -*/ } //Do not know why the fribTag judgement is necessary, to be checked with @@ -400,10 +362,6 @@ void LwpFrib::ReadModifiers(LwpObjectStream* pObjStrm,ModifierInfo* pModInfo) } } -//do nothing -//void LwpFrib::Parse(IXFStream* pOutputStream) -//{} - /** * @descr: Whether there are other fribs following current frib. * @return: Ture if having following fribs, or false. diff --git a/lotuswordpro/source/filter/lwpfribheader.hxx b/lotuswordpro/source/filter/lwpfribheader.hxx index 143799e756d5..e6863a6ff367 100644 --- a/lotuswordpro/source/filter/lwpfribheader.hxx +++ b/lotuswordpro/source/filter/lwpfribheader.hxx @@ -103,13 +103,8 @@ enum FRIB_TAG_SOFTHYPHEN, // FT_SOFTHYPHEN FRIB_TAG_PARANUMBER, // FT_PARANUMBER FRIB_TAG_UNICODE, // FT_UNICODE -#ifdef KANJI - FRIB_TAG_KANJI, // FT_KANJI - FRIB_TAG_HKATAKANA, // FT_HKATAKANA -#else FRIB_TAG_UNICODE2, // FT_UNICODE FRIB_TAG_UNICODE3, // FT_UNICODE -#endif FRIB_TAG_SEPARATOR, // FT_SEPARATOR FRIB_TAG_SECTION, // FT_SECTION FRIB_TAG_TOMBSTONE, // FT_TOMBSTONE @@ -121,13 +116,9 @@ enum FRIB_TAG_DDE, // FT_DDE FRIB_TAG_FIELD, // FT_FIELD FRIB_TAG_CHBLOCK, // FT_CHBLOCK -//#ifdef RUBY FRIB_TAG_FLOWBREAK, // FT_FLOWBREAK FRIB_TAG_RUBYMARKER, // FT_RUBYMARKER FRIB_TAG_RUBYFRAME // FT_RUBYFRAME -//#else -// FRIB_TAG_FLOWBREAK // FT_FLOWBREAK -//#endif }; #endif diff --git a/lotuswordpro/source/filter/lwplaypiece.hxx b/lotuswordpro/source/filter/lwplaypiece.hxx index 4abae5218dc0..c086f160253c 100644 --- a/lotuswordpro/source/filter/lwplaypiece.hxx +++ b/lotuswordpro/source/filter/lwplaypiece.hxx @@ -121,9 +121,7 @@ public: void SetContentRotation(sal_uInt16 nVal){m_nContentRotation = nVal;} sal_uInt16 GetPlacement(){return m_nPlacement;} void SetPlacement(sal_uInt16 nVal){m_nPlacement = nVal;} - // add by , 04/05/2005 inline LwpPoint* GetOffset() {return &m_Offset;} - // end add protected: virtual void Read(); protected: @@ -275,7 +273,6 @@ private: DOG_EAR_PAGE = 8, DESKTOP = 9, BOX_HIGHLIGHT = 10, -//#ifdef BORDER_BMP STAR = 11, ROPE = 12, DECO1 = 13, @@ -285,7 +282,6 @@ private: ROSE = 17, SUNF = 18, DECO3 = 19, -//#endif //BORDER_BMP WARNING = 20, BUBBLE = 21, GIRDER = 22, @@ -326,7 +322,6 @@ protected: LwpShadow m_Shadow; }; -/*class LwpLayoutRelativityGuts*/ class LwpLayoutRelativityGuts { public: diff --git a/lotuswordpro/source/filter/lwpobjtags.hxx b/lotuswordpro/source/filter/lwpobjtags.hxx index 5bc2802dbd75..b091ae45e579 100644 --- a/lotuswordpro/source/filter/lwpobjtags.hxx +++ b/lotuswordpro/source/filter/lwpobjtags.hxx @@ -212,13 +212,6 @@ #define TAG_NOTIFY 0x7966744EUL // "Ntfy" #define TAG_LONGHOLDER 0x676E6F4CUL // "Long" -#ifdef SMARTEXT -#define TAG_STXINFO 0x6e495f53UL // "S_In" -#define TAG_STXMANAGER 0x674d5f53UL // "S_Mg" -#define TAG_STXLINK 0x6b4c5f53UL // "S_Lk" -#define TAG_STXLINKMARKERLIST 0x4c4d5f53UL // "S_ML" -#endif // SMARTEXT - #define TAG_DIVOPTS 0x74704f44UL // "DOpt" #define TAG_FOOTNOTEOPTS 0x704f4e46UL // "FNOp" diff --git a/lotuswordpro/source/filter/lwpoverride.hxx b/lotuswordpro/source/filter/lwpoverride.hxx index e5c88168e85f..71a9385d6349 100644 --- a/lotuswordpro/source/filter/lwpoverride.hxx +++ b/lotuswordpro/source/filter/lwpoverride.hxx @@ -458,12 +458,7 @@ private: IO_REL_FIRST = 0x0100, IO_REL_REST = 0x0200, IO_REL_FLAGS = (IO_REL_ALL | IO_REL_FIRST | IO_REL_REST), -#ifdef JAPANESE_ENABLED // 96/4/8 ueda for indentation by char width - IO_USE_RELATIVE = 0x0400, - IO_CHARUNIT = 0x0800 -#else IO_USE_RELATIVE = 0x0400 -#endif }; sal_Int32 m_nAll; diff --git a/lotuswordpro/source/filter/tocread.cxx b/lotuswordpro/source/filter/tocread.cxx index 95027bbed9f6..2a6f289ed793 100644 --- a/lotuswordpro/source/filter/tocread.cxx +++ b/lotuswordpro/source/filter/tocread.cxx @@ -230,7 +230,6 @@ CBenTOCReader::ReadTOC() if (LookAhead == BEN_REFERENCE_LIST_ID) { - // Eat it, unless BENUTIL_SUPPORT turned on if ((Err = GetDWord(&ReferencedListID)) != BenErr_OK) return Err; LookAhead = GetCode(); @@ -298,9 +297,6 @@ CBenTOCReader::ReadTOC() delete[] sAllocBuffer; } - // If BENUTIL_SUPPORT turned on, read in references object - // like regular object -#ifndef BENUTIL_SUPPORT else if (PropertyID == BEN_PROPID_OBJ_REFERENCES) { // Don't need to read in references object--we assume @@ -308,7 +304,6 @@ CBenTOCReader::ReadTOC() if ((Err = ReadSegments(NULL, &LookAhead)) != BenErr_OK) return Err; } -#endif else if (ObjectID == BEN_OBJID_TOC) { if (PropertyID == BEN_PROPID_TOC_SEED) @@ -343,11 +338,6 @@ CBenTOCReader::ReadTOC() pProperty = new CBenProperty(pObject, PropertyID, TypeID, (pCBenProperty) pObject->GetProperties()->GetLast()); -#ifdef BENUTIL_SUPPORT - pProperty->UseValue()-> - SetReferencedListObjectID(ReferencedListID); -#endif - if ((Err = ReadSegments(pProperty->UseValue(), &LookAhead)) != BenErr_OK) return Err; From 55149144cb926513ef250c87fdf0c59e11e2f6cf Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 9 Oct 2012 23:32:18 +0200 Subject: [PATCH 642/863] SfxErrorHandler::CreateString: remove pointless loops Change-Id: I585add18ea917249df252827e0eee944e59ce410 --- svl/source/numbers/zformat.cxx | 2 +- svtools/source/misc/ehdl.cxx | 40 ++++++++-------------------------- 2 files changed, 10 insertions(+), 32 deletions(-) diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 4049881c1a46..447bcf54da32 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -4721,7 +4721,7 @@ OUString SvNumberformat::GetMappedFormatstring( { // append empty subformats aStr.append( ';' ); } - return aStr.getStr(); + return aStr.makeStringAndClear(); } String SvNumberformat::ImpGetNatNumString( const SvNumberNatNum& rNum, diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index 97b81fde8de5..1fac294074ac 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -192,13 +192,7 @@ sal_Bool SfxErrorHandler::CreateString( { if(GetMessageString(nErrCode, rStr, nFlags)) { - for (xub_StrLen i = 0; i < rStr.getLength();) - { - if( rStr.indexOf(OUString("$(ARG1)"), i) == -1 ) - break; - rStr = rStr.replaceAll("$(ARG1)", pMsgInfo->GetMessageArg(), i); - i = i + pMsgInfo->GetMessageArg().getLength(); - } + rStr = rStr.replaceAll("$(ARG1)", pMsgInfo->GetMessageArg()); return sal_True; } } @@ -206,35 +200,19 @@ sal_Bool SfxErrorHandler::CreateString( { StringErrorInfo *pStringInfo=PTR_CAST(StringErrorInfo,pErr); if(pStringInfo) - for (xub_StrLen i = 0; i < rStr.getLength();) - { - if( rStr.indexOf("$(ARG1)", i) == -1 ) - break; - rStr = rStr.replaceAll(rtl::OUString("$(ARG1)"), - pStringInfo->GetErrorString(), i); - i = i + pStringInfo->GetErrorString().getLength(); - } + { + rStr = rStr.replaceAll(rtl::OUString("$(ARG1)"), + pStringInfo->GetErrorString()); + } else { TwoStringErrorInfo * pTwoStringInfo = PTR_CAST(TwoStringErrorInfo, pErr); if (pTwoStringInfo) - for (sal_uInt16 i = 0; i < rStr.getLength();) - { - sal_uInt16 nArg1Pos = rStr.indexOf(rtl::OUString("$(ARG1)"), i); - sal_uInt16 nArg2Pos = rStr.indexOf(rtl::OUString("$(ARG2)"), i); - if (nArg1Pos < nArg2Pos) - { - rStr = rStr.replaceAt(nArg1Pos, 7, pTwoStringInfo->GetArg1()); - i = nArg1Pos + pTwoStringInfo->GetArg1().getLength(); - } - else if (nArg2Pos < nArg1Pos) - { - rStr = rStr.replaceAt(nArg2Pos, 7, pTwoStringInfo->GetArg2()); - i = nArg2Pos + pTwoStringInfo->GetArg2().getLength(); - } - else break; - } + { + rStr = rStr.replaceAll("$(ARG1)", pTwoStringInfo->GetArg1()); + rStr = rStr.replaceAll("$(ARG2)", pTwoStringInfo->GetArg2()); + } } return sal_True; } From ebf82e52c945f8c2a7c021b547064e5bbeadfe2f Mon Sep 17 00:00:00 2001 From: Marcos Paulo de Souza Date: Fri, 5 Oct 2012 23:42:12 -0300 Subject: [PATCH 643/863] Kill use of macro LINGU_EXCEPTIONS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This macro is not defined, so we can kill all code that have the "#ifdef LINGU_EXCEPTIONS". Just a cleanup, the rationale is the same. Change-Id: Ib6f784859210d5a59210af51766ef4d7b8d7ead6 Signed-off-by: Marcos Paulo de Souza Reviewed-on: https://gerrit.libreoffice.org/778 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara --- .../spellcheck/macosxspell/macspellimp.mm | 8 ------ .../source/spellcheck/spell/sspellimp.cxx | 8 ------ linguistic/source/dicimp.cxx | 27 ++----------------- linguistic/source/hyphdsp.cxx | 16 +---------- linguistic/source/lngopt.cxx | 24 ----------------- linguistic/source/spelldsp.cxx | 16 ++--------- linguistic/source/thesdsp.cxx | 8 +----- 7 files changed, 6 insertions(+), 101 deletions(-) diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm index f34eabdaee46..7be1983e1d16 100644 --- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm +++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm @@ -281,11 +281,7 @@ sal_Bool SAL_CALL return sal_True; if (!hasLocale( rLocale )) -#ifdef LINGU_EXCEPTIONS - throw( IllegalArgumentException() ); -#else return sal_True; -#endif // Get property values to be used. // These are be the default values set in the SN_LINGU_PROPERTIES @@ -395,11 +391,7 @@ Reference< XSpellAlternatives > SAL_CALL return NULL; if (!hasLocale( rLocale )) -#ifdef LINGU_EXCEPTIONS - throw( IllegalArgumentException() ); -#else return NULL; -#endif Reference< XSpellAlternatives > xAlt; if (!isValid( rWord, rLocale, rProperties )) diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx index 473e6c79ac05..94d8fd025a8d 100644 --- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx +++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx @@ -359,11 +359,7 @@ sal_Bool SAL_CALL SpellChecker::isValid( const OUString& rWord, const Locale& rL return sal_True; if (!hasLocale( rLocale )) -#ifdef LINGU_EXCEPTIONS - throw( IllegalArgumentException() ); -#else return sal_True; -#endif // return sal_False to process SPELLML requests (they are longer than the header) if (rWord.match(A2OU(SPELLML_HEADER), 0) && (rWord.getLength() > 10)) return sal_False; @@ -480,11 +476,7 @@ Reference< XSpellAlternatives > SAL_CALL SpellChecker::spell( return NULL; if (!hasLocale( rLocale )) -#ifdef LINGU_EXCEPTIONS - throw( IllegalArgumentException() ); -#else return NULL; -#endif Reference< XSpellAlternatives > xAlt; if (!isValid( rWord, rLocale, rProperties )) diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx index 5a2f7d746860..68a7581f4cc2 100644 --- a/linguistic/source/dicimp.cxx +++ b/linguistic/source/dicimp.cxx @@ -333,10 +333,6 @@ sal_uLong DictionaryNeo::loadEntries(const OUString &rMainURL) break; if (0 != (nErr = pStream->GetError())) return nErr; -#ifdef LINGU_EXCEPTIONS - if (nLen >= BUFSIZE) - throw io::IOException() ; -#endif if (nLen < BUFSIZE) { @@ -1006,13 +1002,7 @@ void SAL_CALL DictionaryNeo::store() if (bIsModified && hasLocation() && !isReadonly()) { - if (saveEntries( aMainURL )) - { -#ifdef LINGU_EXCEPTIONS - throw io::IOException(); -#endif - } - else + if (!saveEntries( aMainURL )) bIsModified = sal_False; } } @@ -1024,13 +1014,7 @@ void SAL_CALL DictionaryNeo::storeAsURL( { MutexGuard aGuard( GetLinguMutex() ); - if (saveEntries( aURL )) - { -#ifdef LINGU_EXCEPTIONS - throw io::IOException(); -#endif - } - else + if (!saveEntries( aURL )) { aMainURL = aURL; bIsModified = sal_False; @@ -1044,13 +1028,6 @@ void SAL_CALL DictionaryNeo::storeToURL( throw(io::IOException, RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); - - if (saveEntries( aURL )) - { -#ifdef LINGU_EXCEPTIONS - throw io::IOException(); -#endif - } } diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx index c22841a835e4..df06ef2bd0db 100644 --- a/linguistic/source/hyphdsp.cxx +++ b/linguistic/source/hyphdsp.cxx @@ -264,11 +264,7 @@ Reference< XHyphenatedWord > SAL_CALL bool bWordModified = false; if (!pEntry || (nMaxLeading < 0 || nMaxLeading > nWordLen)) { -#ifdef LINGU_EXCEPTIONS - throw IllegalArgumentException(); -#else return NULL; -#endif } else { @@ -405,11 +401,7 @@ Reference< XHyphenatedWord > SAL_CALL bool bWordModified = false; if (!pEntry || !(0 <= nIndex && nIndex <= nWordLen - 2)) { -#ifdef LINGU_EXCEPTIONS - throw IllegalArgumentException(); -#else return NULL; -#endif } else { @@ -537,13 +529,7 @@ Reference< XPossibleHyphens > SAL_CALL HyphSvcByLangMap_t::iterator aIt( aSvcMap.find( nLanguage ) ); LangSvcEntries_Hyph *pEntry = aIt != aSvcMap.end() ? aIt->second.get() : NULL; - if (!pEntry) - { -#ifdef LINGU_EXCEPTIONS - throw IllegalArgumentException(); -#endif - } - else + if (pEntry) { OUString aChkWord( rWord ); diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index 63286648066b..37af9e9b1909 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -250,12 +250,6 @@ void SAL_CALL LinguProps::setPropertyValue( launchEvent( aChgEvt ); } } -#ifdef LINGU_EXCEPTIONS - else - { - throw UnknownPropertyException(); - } -#endif } Any SAL_CALL LinguProps::getPropertyValue( const OUString& rPropertyName ) @@ -270,12 +264,6 @@ Any SAL_CALL LinguProps::getPropertyValue( const OUString& rPropertyName ) { aRet = aConfig.GetProperty( pCur->nWID ); } -#ifdef LINGU_EXCEPTIONS - else - { - throw UnknownPropertyException(); - } -#endif return aRet; } @@ -292,12 +280,6 @@ void SAL_CALL LinguProps::addPropertyChangeListener( const SfxItemPropertySimpleEntry* pCur = aPropertyMap.getByName( rPropertyName ); if(pCur) aPropListeners.addInterface( pCur->nWID, rxListener ); -#ifdef LINGU_EXCEPTIONS - else - { - throw UnknownPropertyException(); - } -#endif } } @@ -313,12 +295,6 @@ void SAL_CALL LinguProps::removePropertyChangeListener( const SfxItemPropertySimpleEntry* pCur = aPropertyMap.getByName( rPropertyName ); if(pCur) aPropListeners.removeInterface( pCur->nWID, rxListener ); -#ifdef LINGU_EXCEPTIONS - else - { - throw UnknownPropertyException(); - } -#endif } } diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx index 1ddfa1ce0247..bc1939c2faca 100644 --- a/linguistic/source/spelldsp.cxx +++ b/linguistic/source/spelldsp.cxx @@ -295,13 +295,7 @@ sal_Bool SpellCheckerDispatcher::isValid_Impl( SpellSvcByLangMap_t::iterator aIt( aSvcMap.find( nLanguage ) ); LangSvcEntries_Spell *pEntry = aIt != aSvcMap.end() ? aIt->second.get() : NULL; - if (!pEntry) - { -#ifdef LINGU_EXCEPTIONS - throw IllegalArgumentException(); -#endif - } - else + if (pEntry) { OUString aChkWord( rWord ); Locale aLocale( CreateLocale( nLanguage ) ); @@ -461,13 +455,7 @@ Reference< XSpellAlternatives > SpellCheckerDispatcher::spell_Impl( SpellSvcByLangMap_t::iterator aIt( aSvcMap.find( nLanguage ) ); LangSvcEntries_Spell *pEntry = aIt != aSvcMap.end() ? aIt->second.get() : NULL; - if (!pEntry) - { -#ifdef LINGU_EXCEPTIONS - throw IllegalArgumentException(); -#endif - } - else + if (pEntry) { OUString aChkWord( rWord ); Locale aLocale( CreateLocale( nLanguage ) ); diff --git a/linguistic/source/thesdsp.cxx b/linguistic/source/thesdsp.cxx index f182b122a959..d9e5ce030668 100644 --- a/linguistic/source/thesdsp.cxx +++ b/linguistic/source/thesdsp.cxx @@ -124,13 +124,7 @@ Sequence< Reference< XMeaning > > SAL_CALL ThesSvcByLangMap_t::iterator aIt( aSvcMap.find( nLanguage ) ); LangSvcEntries_Thes *pEntry = aIt != aSvcMap.end() ? aIt->second.get() : NULL; - if (!pEntry) - { -#ifdef LINGU_EXCEPTIONS - throw IllegalArgumentException(); -#endif - } - else + if (pEntry) { OUString aChkWord( rTerm ); aChkWord = aChkWord.replace( SVT_HARD_SPACE, ' ' ); From ac8d3988890e0dbd19afb496033725a9878a86cc Mon Sep 17 00:00:00 2001 From: Marcos Paulo de Souza Date: Sun, 7 Oct 2012 21:23:27 -0300 Subject: [PATCH 644/863] Remove more unused methods MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I5c6bb319458b1ce60cedfe0e2b0f5eaa8ba55e9d Signed-off-by: Marcos Paulo de Souza Reviewed-on: https://gerrit.libreoffice.org/837 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- svtools/source/config/toolpanelopt.cxx | 29 -------------------------- unusedcode.easy | 2 -- 2 files changed, 31 deletions(-) diff --git a/svtools/source/config/toolpanelopt.cxx b/svtools/source/config/toolpanelopt.cxx index 2f580222fd95..94bebef6d73c 100644 --- a/svtools/source/config/toolpanelopt.cxx +++ b/svtools/source/config/toolpanelopt.cxx @@ -99,8 +99,6 @@ class SvtToolPanelOptions_Impl : public ConfigItem bool m_bVisibleHandoutView; bool m_bVisibleSlideSorterView; - void AddListenerLink( const Link& rLink ); - void RemoveListenerLink( const Link& rLink ); void CallListeners(); private: @@ -251,23 +249,6 @@ void SvtToolPanelOptions_Impl::Load( const Sequence< OUString >& rPropertyNames } } -void SvtToolPanelOptions_Impl::AddListenerLink( const Link& rLink ) -{ - aList.push_back( rLink ); -} - -void SvtToolPanelOptions_Impl::RemoveListenerLink( const Link& rLink ) -{ - for ( ::std::list::iterator iter = aList.begin(); iter != aList.end(); ++iter ) - { - if ( *iter == rLink ) - { - aList.erase(iter); - break; - } - } -} - void SvtToolPanelOptions_Impl::CallListeners() { for ( ::std::list::const_iterator iter = aList.begin(); iter != aList.end(); ++iter ) @@ -428,14 +409,4 @@ Mutex & SvtToolPanelOptions::GetInitMutex() return theSvtToolPanelOptionsMutex::get(); } -void SvtToolPanelOptions::AddListenerLink( const Link& rLink ) -{ - m_pDataContainer->AddListenerLink( rLink ); -} - -void SvtToolPanelOptions::RemoveListenerLink( const Link& rLink ) -{ - m_pDataContainer->RemoveListenerLink( rLink ); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unusedcode.easy b/unusedcode.easy index b836d67d8a56..91d299521b27 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -10,8 +10,6 @@ ScVbaFormat::setNumberFormat(com::sun::star::lang::Loca SvLBoxTreeList::Clone(SvListEntry*, unsigned long&) const SvLBoxTreeList::Prev(SvListEntry*, unsigned short*) const SvTreeEntryList::front() -SvtToolPanelOptions::AddListenerLink(Link const&) -SvtToolPanelOptions::RemoveListenerLink(Link const&) SvxAutoCorrect::DeleteText(String const&, unsigned short) TextEngine::GetLeftMargin() const ThumbnailView::GetItemCount() const From 321fec4eead0f674ca16ef55c624812d3906b355 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 9 Oct 2012 23:04:37 +0100 Subject: [PATCH 645/863] restore saveEntries ebf82e52c945f8c2a7c021b547064e5bbeadfe2f cut a little too deep Change-Id: I8213b4f3aca3e64dc2ba98d11ebb7d068dc14d90 --- linguistic/source/dicimp.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx index 68a7581f4cc2..2770906c3f1a 100644 --- a/linguistic/source/dicimp.cxx +++ b/linguistic/source/dicimp.cxx @@ -1028,6 +1028,7 @@ void SAL_CALL DictionaryNeo::storeToURL( throw(io::IOException, RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); + saveEntries(aURL); } From 2a680739f8dfe123316a69a9c85030f784ca1f22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 9 Oct 2012 23:05:23 +0100 Subject: [PATCH 646/863] AddListenerLink/RemoveListenerLink not implemented so the underlying stuff isn't used either, i.e. aList is always empty Change-Id: Ia273576956294f878a81c7fab17446b7f33c5fa2 --- svtools/inc/svtools/toolpanelopt.hxx | 3 --- svtools/source/config/toolpanelopt.cxx | 10 ---------- 2 files changed, 13 deletions(-) diff --git a/svtools/inc/svtools/toolpanelopt.hxx b/svtools/inc/svtools/toolpanelopt.hxx index 4c70256ae3b6..8b96e2555168 100644 --- a/svtools/inc/svtools/toolpanelopt.hxx +++ b/svtools/inc/svtools/toolpanelopt.hxx @@ -56,9 +56,6 @@ class SVT_DLLPUBLIC SvtToolPanelOptions: public utl::detail::Options SvtToolPanelOptions(); virtual ~SvtToolPanelOptions(); - void AddListenerLink( const Link& rLink ); - void RemoveListenerLink( const Link& rLink ); - bool GetVisibleImpressView() const; void SetVisibleImpressView( bool bVisible ); bool GetVisibleOutlineView() const; diff --git a/svtools/source/config/toolpanelopt.cxx b/svtools/source/config/toolpanelopt.cxx index 94bebef6d73c..339e1556c48e 100644 --- a/svtools/source/config/toolpanelopt.cxx +++ b/svtools/source/config/toolpanelopt.cxx @@ -58,7 +58,6 @@ using namespace ::com::sun::star; class SvtToolPanelOptions_Impl : public ConfigItem { private: - ::std::list aList; Sequence< OUString > m_seqPropertyNames; public: @@ -99,8 +98,6 @@ class SvtToolPanelOptions_Impl : public ConfigItem bool m_bVisibleHandoutView; bool m_bVisibleSlideSorterView; - void CallListeners(); - private: /** return list of key names of our configuration management which represent oue module tree @@ -249,16 +246,9 @@ void SvtToolPanelOptions_Impl::Load( const Sequence< OUString >& rPropertyNames } } -void SvtToolPanelOptions_Impl::CallListeners() -{ - for ( ::std::list::const_iterator iter = aList.begin(); iter != aList.end(); ++iter ) - iter->Call( this ); -} - void SvtToolPanelOptions_Impl::Notify( const Sequence< OUString >& rPropertyNames ) { Load( rPropertyNames ); - CallListeners(); } void SvtToolPanelOptions_Impl::Commit() From 61b94e06ef5a822e0dbe24528bc5d4d112a2547b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 9 Oct 2012 23:13:29 +0100 Subject: [PATCH 647/863] These are now already OUStrings, so no need for extra temp OUStrings Change-Id: I3cf01d975e468299d9dc009f389e88bff7c8f4a2 --- svl/source/numbers/numfmuno.cxx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx index 6b6005200e8d..e669a7f8e8fe 100644 --- a/svl/source/numbers/numfmuno.cxx +++ b/svl/source/numbers/numfmuno.cxx @@ -804,13 +804,13 @@ uno::Any SAL_CALL SvNumberFormatObj::getPropertyValue( const rtl::OUString& aPro { OUString aSymbol, aExt; pFormat->GetNewCurrencySymbol( aSymbol, aExt ); - aRet <<= rtl::OUString( aSymbol ); + aRet <<= aSymbol; } else if (aString.EqualsAscii( PROPERTYNAME_CURREXT )) { OUString aSymbol, aExt; pFormat->GetNewCurrencySymbol( aSymbol, aExt ); - aRet <<= rtl::OUString( aExt ); + aRet <<= aExt; } else if (aString.EqualsAscii( PROPERTYNAME_CURRABB )) { @@ -877,7 +877,7 @@ uno::Sequence SAL_CALL SvNumberFormatObj::getPropertyValue if (pFormat) { OUString aSymbol, aExt; - String aAbb; + OUString aAbb; bool bBank = false; pFormat->GetNewCurrencySymbol( aSymbol, aExt ); const NfCurrencyEntry* pCurr = pFormatter->GetCurrencyEntry( bBank, @@ -885,8 +885,8 @@ uno::Sequence SAL_CALL SvNumberFormatObj::getPropertyValue if ( pCurr ) aAbb = pCurr->GetBankSymbol(); - String aFmtStr = pFormat->GetFormatstring(); - String aComment = pFormat->GetComment(); + OUString aFmtStr = pFormat->GetFormatstring(); + OUString aComment = pFormat->GetComment(); sal_Bool bStandard = ( ( nKey % SV_COUNTRY_LANGUAGE_OFFSET ) == 0 ); //! SvNumberformat Member bStandard rausreichen? sal_Bool bUserDef = ( ( pFormat->GetType() & NUMBERFORMAT_DEFINED ) != 0 ); @@ -900,13 +900,13 @@ uno::Sequence SAL_CALL SvNumberFormatObj::getPropertyValue beans::PropertyValue* pArray = aSeq.getArray(); pArray[0].Name = rtl::OUString(PROPERTYNAME_FMTSTR ); - pArray[0].Value <<= rtl::OUString( aFmtStr ); + pArray[0].Value <<= aFmtStr; pArray[1].Name = rtl::OUString(PROPERTYNAME_LOCALE ); pArray[1].Value <<= aLocale; pArray[2].Name = rtl::OUString(PROPERTYNAME_TYPE ); pArray[2].Value <<= (sal_Int16)( pFormat->GetType() ); pArray[3].Name = rtl::OUString(PROPERTYNAME_COMMENT ); - pArray[3].Value <<= rtl::OUString( aComment ); + pArray[3].Value <<= aComment; pArray[4].Name = rtl::OUString(PROPERTYNAME_STDFORM ); pArray[4].Value.setValue( &bStandard, getBooleanCppuType() ); pArray[5].Name = rtl::OUString(PROPERTYNAME_USERDEF ); @@ -920,11 +920,11 @@ uno::Sequence SAL_CALL SvNumberFormatObj::getPropertyValue pArray[9].Name = rtl::OUString(PROPERTYNAME_THOUS ); pArray[9].Value.setValue( &bThousand, getBooleanCppuType() ); pArray[10].Name = rtl::OUString(PROPERTYNAME_CURRSYM ); - pArray[10].Value <<= rtl::OUString( aSymbol ); + pArray[10].Value <<= aSymbol; pArray[11].Name = rtl::OUString(PROPERTYNAME_CURREXT ); - pArray[11].Value <<= rtl::OUString( aExt ); + pArray[11].Value <<= aExt; pArray[12].Name = rtl::OUString(PROPERTYNAME_CURRABB ); - pArray[12].Value <<= rtl::OUString( aAbb ); + pArray[12].Value <<= aAbb; return aSeq; } From 7e1d03f0f6b68d4a955a6b5df94be77307e58476 Mon Sep 17 00:00:00 2001 From: Takeshi Abe Date: Wed, 10 Oct 2012 07:34:19 +0900 Subject: [PATCH 648/863] sal_Bool to bool Change-Id: I2549e597bc11d0a4b4bcdc42c77914dda01a1c5f --- sw/inc/SwStyleNameMapper.hxx | 10 +++--- sw/source/core/doc/SwStyleNameMapper.cxx | 26 +++++++------- sw/source/core/docnode/ndnotxt.cxx | 2 +- sw/source/core/docnode/node.cxx | 4 +-- sw/source/core/layout/atrfrm.cxx | 2 +- .../core/text/EnhancedPDFExportHelper.cxx | 8 ++--- sw/source/core/txtnode/fmtatr2.cxx | 12 +++---- sw/source/core/txtnode/ndtxt.cxx | 4 +-- sw/source/core/unocore/SwXTextDefaults.cxx | 2 +- sw/source/core/unocore/unocrsrhelper.cxx | 4 +-- sw/source/core/unocore/unoidx.cxx | 24 ++++++------- sw/source/core/unocore/unoobj.cxx | 10 +++--- sw/source/core/unocore/unosett.cxx | 34 +++++++++--------- sw/source/core/unocore/unostyle.cxx | 36 +++++++++---------- sw/source/core/unocore/unotbl.cxx | 4 +-- sw/source/filter/xml/xmlfmt.cxx | 4 +-- sw/source/filter/xml/xmlfmte.cxx | 2 +- sw/source/filter/xml/xmltexte.cxx | 2 +- sw/source/ui/uno/unotxvw.cxx | 4 +-- 19 files changed, 97 insertions(+), 97 deletions(-) diff --git a/sw/inc/SwStyleNameMapper.hxx b/sw/inc/SwStyleNameMapper.hxx index 4142ff9a518a..34797cabd55d 100644 --- a/sw/inc/SwStyleNameMapper.hxx +++ b/sw/inc/SwStyleNameMapper.hxx @@ -138,20 +138,20 @@ protected: const SwTableEntry *pTable, sal_uInt8 nCount); - static void fillNameFromId ( sal_uInt16 nId, String &rName, sal_Bool bProgName ); - static const String& getNameFromId ( sal_uInt16 nId, const String &rName, sal_Bool bProgName ); - static const NameToIdHash& getHashTable ( SwGetPoolIdFromName, sal_Bool bProgName ); + static void fillNameFromId ( sal_uInt16 nId, String &rName, bool bProgName ); + static const String& getNameFromId ( sal_uInt16 nId, const String &rName, bool bProgName ); + static const NameToIdHash& getHashTable ( SwGetPoolIdFromName, bool bProgName ); static bool SuffixIsUser ( const String & rString ); static void CheckSuffixAndDelete ( String & rString ); public: // This gets the UI Name from the programmatic name static const String& GetUIName ( const String& rName, SwGetPoolIdFromName ); - static void FillUIName ( const String& rName, String& rFillName, SwGetPoolIdFromName, sal_Bool bDisambiguate = sal_False ); + static void FillUIName ( const String& rName, String& rFillName, SwGetPoolIdFromName, bool bDisambiguate = false ); // Get the programmatic Name from the UI name static const String& GetProgName ( const String& rName, SwGetPoolIdFromName ); - static void FillProgName ( const String& rName, String& rFillName, SwGetPoolIdFromName, sal_Bool bDisambiguate = sal_False ); + static void FillProgName ( const String& rName, String& rFillName, SwGetPoolIdFromName, bool bDisambiguate = false ); // This gets the UI Name from the Pool ID SW_DLLPUBLIC static void FillUIName ( sal_uInt16 nId, String& rFillName ); diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx b/sw/source/core/doc/SwStyleNameMapper.cxx index a5653364b5e9..c4b4234ca21f 100644 --- a/sw/source/core/doc/SwStyleNameMapper.cxx +++ b/sw/source/core/doc/SwStyleNameMapper.cxx @@ -346,7 +346,7 @@ void SwStyleNameMapper::CheckSuffixAndDelete ( String & rString ) rString.Erase ( nLen - 7, 7 ); } } -const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlags, sal_Bool bProgName ) +const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlags, bool bProgName ) { NameToIdHash *pHash = 0; const boost::ptr_vector *pStrings; @@ -634,7 +634,7 @@ const String& SwStyleNameMapper::GetProgName( const String& rName, SwGetPoolIdFr } // Get the programmatic name from the UI name in rName and put it into rFillName -void SwStyleNameMapper::FillProgName ( const String& rName, String& rFillName, SwGetPoolIdFromName eFlags, sal_Bool bDisambiguate ) +void SwStyleNameMapper::FillProgName ( const String& rName, String& rFillName, SwGetPoolIdFromName eFlags, bool bDisambiguate ) { sal_uInt16 nId = GetPoolIdFromUIName ( rName, eFlags ); if ( bDisambiguate && nId == USHRT_MAX ) @@ -659,11 +659,11 @@ void SwStyleNameMapper::FillProgName ( const String& rName, String& rFillName, S else { // If we aren't trying to disambiguate, then just do a normal fill - fillNameFromId ( nId, rFillName, sal_True); + fillNameFromId ( nId, rFillName, true); } } // Get the UI name from the programmatic name in rName and put it into rFillName -void SwStyleNameMapper::FillUIName ( const String& rName, String& rFillName, SwGetPoolIdFromName eFlags, sal_Bool bDisambiguate ) +void SwStyleNameMapper::FillUIName ( const String& rName, String& rFillName, SwGetPoolIdFromName eFlags, bool bDisambiguate ) { sal_uInt16 nId = GetPoolIdFromProgName ( rName, eFlags ); if ( bDisambiguate && nId == USHRT_MAX ) @@ -675,11 +675,11 @@ void SwStyleNameMapper::FillUIName ( const String& rName, String& rFillName, SwG else { // If we aren't trying to disambiguate, then just do a normal fill - fillNameFromId ( nId, rFillName, sal_False); + fillNameFromId ( nId, rFillName, false); } } -const String& SwStyleNameMapper::getNameFromId( sal_uInt16 nId, const String& rFillName, sal_Bool bProgName ) +const String& SwStyleNameMapper::getNameFromId( sal_uInt16 nId, const String& rFillName, bool bProgName ) { sal_uInt16 nStt = 0; const boost::ptr_vector* pStrArr = 0; @@ -764,7 +764,7 @@ const String& SwStyleNameMapper::getNameFromId( sal_uInt16 nId, const String& rF } return pStrArr ? (pStrArr->operator[] ( nId - nStt ) ) : rFillName; } -void SwStyleNameMapper::fillNameFromId( sal_uInt16 nId, String& rFillName, sal_Bool bProgName ) +void SwStyleNameMapper::fillNameFromId( sal_uInt16 nId, String& rFillName, bool bProgName ) { sal_uInt16 nStt = 0; const boost::ptr_vector* pStrArr = 0; @@ -853,35 +853,35 @@ void SwStyleNameMapper::fillNameFromId( sal_uInt16 nId, String& rFillName, sal_B // Get the UI Name from the pool ID void SwStyleNameMapper::FillUIName ( sal_uInt16 nId, String& rFillName ) { - fillNameFromId ( nId, rFillName, sal_False ); + fillNameFromId ( nId, rFillName, false ); } // Get the UI Name from the pool ID const String& SwStyleNameMapper::GetUIName ( sal_uInt16 nId, const String& rName ) { - return getNameFromId ( nId, rName, sal_False ); + return getNameFromId ( nId, rName, false ); } // Get the programmatic Name from the pool ID void SwStyleNameMapper::FillProgName ( sal_uInt16 nId, String& rFillName ) { - fillNameFromId ( nId, rFillName, sal_True ); + fillNameFromId ( nId, rFillName, true ); } // Get the programmatic Name from the pool ID const String& SwStyleNameMapper::GetProgName ( sal_uInt16 nId, const String& rName ) { - return getNameFromId ( nId, rName, sal_True ); + return getNameFromId ( nId, rName, true ); } // This gets the PoolId from the UI Name sal_uInt16 SwStyleNameMapper::GetPoolIdFromUIName( const String& rName, SwGetPoolIdFromName eFlags ) { - const NameToIdHash & rHashMap = getHashTable ( eFlags, sal_False ); + const NameToIdHash & rHashMap = getHashTable ( eFlags, false ); NameToIdHash::const_iterator aIter = rHashMap.find ( &rName ); return aIter != rHashMap.end() ? (*aIter).second : USHRT_MAX; } // Get the Pool ID from the programmatic name sal_uInt16 SwStyleNameMapper::GetPoolIdFromProgName( const String& rName, SwGetPoolIdFromName eFlags ) { - const NameToIdHash & rHashMap = getHashTable ( eFlags, sal_True ); + const NameToIdHash & rHashMap = getHashTable ( eFlags, true ); NameToIdHash::const_iterator aIter = rHashMap.find ( &rName ); return aIter != rHashMap.end() ? (*aIter).second : USHRT_MAX; } diff --git a/sw/source/core/docnode/ndnotxt.cxx b/sw/source/core/docnode/ndnotxt.cxx index fd3a0695483e..805fcf19ce3f 100644 --- a/sw/source/core/docnode/ndnotxt.cxx +++ b/sw/source/core/docnode/ndnotxt.cxx @@ -74,7 +74,7 @@ void SwNoTxtNode::NewAttrSet( SwAttrPool& rPool ) // put names of parent style and conditional style: const SwFmtColl* pFmtColl = GetFmtColl(); String sVal; - SwStyleNameMapper::FillProgName( pFmtColl->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True ); + SwStyleNameMapper::FillProgName( pFmtColl->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true ); SfxStringItem aFmtColl( RES_FRMATR_STYLE_NAME, sVal ); aNewAttrSet.Put( aFmtColl ); diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index cc458280e5f4..7c80a5faa0de 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -123,12 +123,12 @@ void SetParent( boost::shared_ptr& mrpAttrSet, if ( pParentFmt ) { - SwStyleNameMapper::FillProgName( pParentFmt->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True ); + SwStyleNameMapper::FillProgName( pParentFmt->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true ); const SfxStringItem aAnyFmtColl( RES_FRMATR_STYLE_NAME, sVal ); aNewSet.Put( aAnyFmtColl ); if ( pConditionalFmt != pParentFmt ) - SwStyleNameMapper::FillProgName( pConditionalFmt->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True ); + SwStyleNameMapper::FillProgName( pConditionalFmt->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true ); const SfxStringItem aFmtColl( RES_FRMATR_CONDITIONAL_STYLE_NAME, sVal ); aNewSet.Put( aFmtColl ); diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 416ccf28069d..691586634b33 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -747,7 +747,7 @@ bool SwFmtPageDesc::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const if( pDesc ) { String aString; - SwStyleNameMapper::FillProgName(pDesc->GetName(), aString, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, sal_True ); + SwStyleNameMapper::FillProgName(pDesc->GetName(), aString, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, true ); rVal <<= OUString( aString ); } else diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx index 3d1e6d957dad..5133878402b4 100644 --- a/sw/source/core/text/EnhancedPDFExportHelper.cxx +++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx @@ -182,7 +182,7 @@ bool lcl_IsHeadlineCell( const SwCellFrm& rCellFrm ) const SwFmt* pTxtFmt = pTxtNode->GetFmtColl(); String sStyleName; - SwStyleNameMapper::FillProgName( pTxtFmt->GetName(), sStyleName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True ); + SwStyleNameMapper::FillProgName( pTxtFmt->GetName(), sStyleName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true ); bRet = sStyleName.EqualsAscii(aTableHeadingName); } @@ -1109,9 +1109,9 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() String sParentStyleName; if ( pTxtFmt) - SwStyleNameMapper::FillProgName( pTxtFmt->GetName(), sStyleName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True ); + SwStyleNameMapper::FillProgName( pTxtFmt->GetName(), sStyleName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true ); if ( pParentTxtFmt) - SwStyleNameMapper::FillProgName( pParentTxtFmt->GetName(), sParentStyleName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True ); + SwStyleNameMapper::FillProgName( pParentTxtFmt->GetName(), sParentStyleName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true ); // This is the default. If the paragraph could not be mapped to // any of the standard pdf tags, we write a user defined tag @@ -1406,7 +1406,7 @@ void SwTaggedPDFHelper::BeginInlineStructureElements() const SwCharFmt* pCharFmt = (charAttrs.size()) ? (*charAttrs.begin())->GetCharFmt().GetCharFmt() : 0; if ( pCharFmt ) - SwStyleNameMapper::FillProgName( pCharFmt->GetName(), sStyleName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True ); + SwStyleNameMapper::FillProgName( pCharFmt->GetName(), sStyleName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true ); } // Check for Link: diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx index dc927f609b07..c8f8f0129ee2 100644 --- a/sw/source/core/txtnode/fmtatr2.cxx +++ b/sw/source/core/txtnode/fmtatr2.cxx @@ -127,7 +127,7 @@ bool SwFmtCharFmt::QueryValue( uno::Any& rVal, sal_uInt8 ) const { String sCharFmtName; if(GetCharFmt()) - SwStyleNameMapper::FillProgName(GetCharFmt()->GetName(), sCharFmtName, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True ); + SwStyleNameMapper::FillProgName(GetCharFmt()->GetName(), sCharFmtName, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true ); rVal <<= OUString( sCharFmtName ); return true; } @@ -321,14 +321,14 @@ bool SwFmtINetFmt::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const if( !sVal.Len() && nVisitedId != 0 ) SwStyleNameMapper::FillUIName( nVisitedId, sVal ); if( sVal.Len() ) - SwStyleNameMapper::FillProgName( sVal, sVal, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True ); + SwStyleNameMapper::FillProgName( sVal, sVal, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true ); break; case MID_URL_UNVISITED_FMT: sVal = aINetFmt; if( !sVal.Len() && nINetId != 0 ) SwStyleNameMapper::FillUIName( nINetId, sVal ); if( sVal.Len() ) - SwStyleNameMapper::FillProgName( sVal, sVal, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True ); + SwStyleNameMapper::FillProgName( sVal, sVal, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true ); break; case MID_URL_HYPERLINKEVENTS: { @@ -395,7 +395,7 @@ bool SwFmtINetFmt::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) case MID_URL_VISITED_FMT: { String aString; - SwStyleNameMapper::FillUIName( sVal, aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True ); + SwStyleNameMapper::FillUIName( sVal, aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true ); aVisitedFmt = OUString ( aString ); nVisitedId = SwStyleNameMapper::GetPoolIdFromUIName( aVisitedFmt, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT ); @@ -404,7 +404,7 @@ bool SwFmtINetFmt::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) case MID_URL_UNVISITED_FMT: { String aString; - SwStyleNameMapper::FillUIName( sVal, aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True ); + SwStyleNameMapper::FillUIName( sVal, aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true ); aINetFmt = OUString ( aString ); nINetId = SwStyleNameMapper::GetPoolIdFromUIName( aINetFmt, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT ); } @@ -484,7 +484,7 @@ bool SwFmtRuby::QueryValue( uno::Any& rVal, case MID_RUBY_CHARSTYLE: { String aString; - SwStyleNameMapper::FillProgName(sCharFmtName, aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True ); + SwStyleNameMapper::FillProgName(sCharFmtName, aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true ); rVal <<= OUString ( aString ); } break; diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 22ddb66b2934..32aae4d790b3 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -826,10 +826,10 @@ void SwTxtNode::NewAttrSet( SwAttrPool& rPool ) const SwFmtColl* pAnyFmtColl = &GetAnyFmtColl(); const SwFmtColl* pFmtColl = GetFmtColl(); String sVal; - SwStyleNameMapper::FillProgName( pAnyFmtColl->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True ); + SwStyleNameMapper::FillProgName( pAnyFmtColl->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true ); SfxStringItem aAnyFmtColl( RES_FRMATR_STYLE_NAME, sVal ); if ( pFmtColl != pAnyFmtColl ) - SwStyleNameMapper::FillProgName( pFmtColl->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True ); + SwStyleNameMapper::FillProgName( pFmtColl->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true ); SfxStringItem aFmtColl( RES_FRMATR_CONDITIONAL_STYLE_NAME, sVal ); aNewAttrSet.Put( aAnyFmtColl ); aNewAttrSet.Put( aFmtColl ); diff --git a/sw/source/core/unocore/SwXTextDefaults.cxx b/sw/source/core/unocore/SwXTextDefaults.cxx index c17e8022e3ca..d18311dfb3c6 100644 --- a/sw/source/core/unocore/SwXTextDefaults.cxx +++ b/sw/source/core/unocore/SwXTextDefaults.cxx @@ -102,7 +102,7 @@ void SAL_CALL SwXTextDefaults::setPropertyValue( const OUString& rPropertyName, if(aValue >>= uStyle) { String sStyle; - SwStyleNameMapper::FillUIName(uStyle, sStyle, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True ); + SwStyleNameMapper::FillUIName(uStyle, sStyle, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true ); SwDocStyleSheet* pStyle = (SwDocStyleSheet*)m_pDoc->GetDocShell()->GetStyleSheetPool()->Find(sStyle, SFX_STYLE_FAMILY_CHAR); SwFmtDrop* pDrop = 0; diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index f66a4fbeef53..130fd2a335b0 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -210,7 +210,7 @@ sal_Bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry if( pAny ) { String sVal; - SwStyleNameMapper::FillProgName(pFmt->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True ); + SwStyleNameMapper::FillProgName(pFmt->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true ); *pAny <<= OUString(sVal); } } @@ -722,7 +722,7 @@ void GetCurPageStyle(SwPaM& rPaM, String &rString) { const SwPageFrm* pPage = rPaM.GetCntntNode()->getLayoutFrm(rPaM.GetDoc()->GetCurrentLayout())->FindPageFrm(); if(pPage) - SwStyleNameMapper::FillProgName( pPage->GetPageDesc()->GetName(), rString, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, sal_True ); + SwStyleNameMapper::FillProgName( pPage->GetPageDesc()->GetName(), rString, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, true ); } /* -------------------------------------------------- diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index 5f22640bb63e..7a43ea1a3df8 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -763,7 +763,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, { String aString; SwStyleNameMapper::FillUIName(lcl_AnyToString(rValue), - aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True); + aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true); rTOXBase.SetMainEntryCharStyle( aString ); } break; @@ -799,7 +799,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, { String aString; SwStyleNameMapper::FillUIName( lcl_AnyToString(rValue), - aString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True); + aString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true); bForm = sal_True; // Header is on Pos 0 aForm.SetTemplate( 0, aString ); @@ -814,7 +814,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, String aString; bForm = sal_True; SwStyleNameMapper::FillUIName( lcl_AnyToString(rValue), - aString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True); + aString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true); aForm.SetTemplate( 1, aString ); } break; @@ -838,7 +838,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, const sal_uInt16 nLPos = rTOXBase.GetType() == TOX_INDEX ? 2 : 1; String aString; SwStyleNameMapper::FillUIName( lcl_AnyToString(rValue), - aString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True); + aString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true); aForm.SetTemplate(nLPos + pEntry->nWID - WID_PARA_LEV1, aString ); } break; @@ -1100,7 +1100,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, pTOXBase->GetMainEntryCharStyle(), aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, - sal_True); + true); aRet <<= OUString( aString ); } break; @@ -1140,7 +1140,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, //Header steht an Pos 0 String aString; SwStyleNameMapper::FillProgName(rForm.GetTemplate( 0 ), aString, - nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True ); + nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true ); aRet <<= OUString( aString ); } break; @@ -1151,7 +1151,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, rForm.GetTemplate( 1 ), aString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, - sal_True); + true); aRet <<= OUString( aString ); } break; @@ -1173,7 +1173,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, rForm.GetTemplate(nLPos + pEntry->nWID - WID_PARA_LEV1), aString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, - sal_True); + true); aRet <<= OUString( aString ); } break; @@ -2626,7 +2626,7 @@ throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, sSetStyles += TOX_STYLE_DELIMITER; } SwStyleNameMapper::FillUIName(pStyles[i], aString, - nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True); + nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true); sSetStyles += aString; } rTOXBase.SetStyleNames(sSetStyles, static_cast(nIndex)); @@ -2664,7 +2664,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, rStyles.GetToken(i, TOX_STYLE_DELIMITER), aString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, - sal_True); + true); pStyles[i] = OUString( aString ); } uno::Any aRet(&aStyles, ::getCppuType((uno::Sequence*)0)); @@ -2800,7 +2800,7 @@ throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lcl_AnyToString(pProperties[j].Value), sCharStyleName, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, - sal_True); + true); aToken.sCharStyleName = sCharStyleName; aToken.nPoolId = SwStyleNameMapper::GetPoolIdFromUIName ( sCharStyleName, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT ); @@ -2974,7 +2974,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, aToken.sCharStyleName, aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, - sal_True ); + true ); const OUString aProgCharStyle( aString ); switch(aToken.eTokenType) { diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index cb7fe6a7ca95..d85983f2216d 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -237,7 +237,7 @@ throw (lang::IllegalArgumentException) } String sStyle; SwStyleNameMapper::FillUIName(uStyle, sStyle, - nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True); + nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true); SwDocStyleSheet *const pStyle = static_cast( pDocSh->GetStyleSheetPool()->Find(sStyle, SFX_STYLE_FAMILY_CHAR)); if (!pStyle) @@ -288,7 +288,7 @@ throw (lang::IllegalArgumentException) rAny >>= uStyle; String sStyle; SwStyleNameMapper::FillUIName(uStyle, sStyle, - nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True ); + nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true ); SwDocStyleSheet *const pStyle = static_cast( pDocSh->GetStyleSheetPool()->Find(sStyle, SFX_STYLE_FAMILY_PARA)); if (!pStyle) @@ -331,7 +331,7 @@ SwUnoCursorHelper::SetPageDesc( } String sDescName; SwStyleNameMapper::FillUIName(uDescName, sDescName, - nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, sal_True); + nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, true); if (!pNewDesc->GetPageDesc() || (pNewDesc->GetPageDesc()->GetName() != sDescName)) { @@ -428,7 +428,7 @@ lcl_setDropcapCharStyle(SwPaM & rPam, SfxItemSet & rItemSet, } String sStyle; SwStyleNameMapper::FillUIName(uStyle, sStyle, - nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True); + nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true); SwDoc *const pDoc = rPam.GetDoc(); //default character style must not be set as default format SwDocStyleSheet *const pStyle = static_cast( @@ -482,7 +482,7 @@ lcl_setRubyCharstyle(SfxItemSet & rItemSet, uno::Any const& rValue) } String sStyle; SwStyleNameMapper::FillUIName(sTmp, sStyle, - nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True ); + nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true ); pRuby->SetCharFmtName(sStyle); pRuby->SetCharFmtId(0); if (sStyle.Len() > 0) diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index 6cf173a83836..4a9b7c358884 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -216,7 +216,7 @@ SwCharFmt* lcl_getCharFmt(SwDoc* pDoc, const uno::Any& aValue) OUString uTmp; aValue >>= uTmp; String sCharFmt; - SwStyleNameMapper::FillUIName(uTmp, sCharFmt, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True); + SwStyleNameMapper::FillUIName(uTmp, sCharFmt, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true); if(sStandard != sCharFmt) { pRet = pDoc->FindCharFmtByName( sCharFmt ); @@ -235,7 +235,7 @@ SwTxtFmtColl* lcl_GetParaStyle(SwDoc* pDoc, const uno::Any& aValue) OUString uTmp; aValue >>= uTmp; String sParaStyle; - SwStyleNameMapper::FillUIName(uTmp, sParaStyle, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True ); + SwStyleNameMapper::FillUIName(uTmp, sParaStyle, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true ); SwTxtFmtColl* pRet = pDoc->FindTxtFmtCollByName( sParaStyle ); if( !pRet ) { @@ -253,7 +253,7 @@ SwPageDesc* lcl_GetPageDesc(SwDoc* pDoc, const uno::Any& aValue) OUString uTmp; aValue >>= uTmp; String sPageDesc; - SwStyleNameMapper::FillUIName(uTmp, sPageDesc, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, sal_True ); + SwStyleNameMapper::FillUIName(uTmp, sPageDesc, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, true ); for( sal_uInt16 i = 0; i < nCount; i++) { const SwPageDesc& rDesc = pDoc->GetPageDesc( i ); @@ -509,7 +509,7 @@ uno::Any SwXFootnoteProperties::getPropertyValue(const OUString& rPropertyName) String aString; if(pColl) aString = String ( pColl->GetName() ); - SwStyleNameMapper::FillProgName(aString, aString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True); + SwStyleNameMapper::FillProgName(aString, aString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true); aRet <<= OUString ( aString ); } break; @@ -522,7 +522,7 @@ uno::Any SwXFootnoteProperties::getPropertyValue(const OUString& rPropertyName) rFtnInfo.GetPageDesc( *pDoc )->GetName(), aString, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, - sal_True); + true); } aRet <<= OUString ( aString ); } @@ -548,7 +548,7 @@ uno::Any SwXFootnoteProperties::getPropertyValue(const OUString& rPropertyName) pCharFmt->GetName(), aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, - sal_True); + true); } aRet <<= OUString ( aString ); } @@ -755,7 +755,7 @@ uno::Any SwXEndnoteProperties::getPropertyValue(const OUString& rPropertyName) aString, aString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, - sal_True); + true); aRet <<= OUString ( aString ); } @@ -769,7 +769,7 @@ uno::Any SwXEndnoteProperties::getPropertyValue(const OUString& rPropertyName) rEndInfo.GetPageDesc( *pDoc )->GetName(), aString, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, - sal_True ); + true ); } aRet <<= OUString ( aString ); } @@ -795,7 +795,7 @@ uno::Any SwXEndnoteProperties::getPropertyValue(const OUString& rPropertyName) pCharFmt->GetName(), aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, - sal_True ); + true ); } aRet <<= OUString ( aString ); } @@ -1023,7 +1023,7 @@ Any SwXLineNumberingProperties::getPropertyValue(const OUString& rPropertyName) rInfo.GetCharFmt(*pDoc)->GetName(), aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, - sal_True); + true); } aRet <<= OUString ( aString ); } @@ -1400,7 +1400,7 @@ uno::Sequence SwXNumberingRules::GetNumberingRuleByIndex( CharStyleName = sNewCharStyleNames[(sal_uInt16)nIndex]; String aString; - SwStyleNameMapper::FillProgName( CharStyleName, aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True ); + SwStyleNameMapper::FillProgName( CharStyleName, aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true ); aUString = aString; pData = new PropValData((void*)&aUString, "CharStyleName", ::getCppuType((const OUString*)0)); aPropertyValues.push_back(pData); @@ -1588,7 +1588,7 @@ uno::Sequence SwXNumberingRules::GetNumberingRuleByIndex( } } String aName; - SwStyleNameMapper::FillProgName(sValue, aName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True); + SwStyleNameMapper::FillProgName(sValue, aName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true); aUString = aName; pData = new PropValData((void*)&aUString, SW_PROP_NAME_STR(UNO_NAME_HEADING_STYLE_NAME), ::getCppuType((const OUString*)0)); @@ -1756,7 +1756,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex( OUString uTmp; pData->aVal >>= uTmp; String sCharFmtName; - SwStyleNameMapper::FillUIName( uTmp, sCharFmtName, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True ); + SwStyleNameMapper::FillUIName( uTmp, sCharFmtName, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true ); if(sCharFmtName.EqualsAscii(SW_PROP_NAME_STR(UNO_NAME_CHARACTER_FORMAT_NONE))) { sNewCharStyleNames[(sal_uInt16)nIndex] = rtl::OUString(aInvalidStyle); @@ -1923,7 +1923,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex( OUString uTmp; pData->aVal >>= uTmp; String sStyleName; - SwStyleNameMapper::FillUIName(uTmp, sStyleName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True ); + SwStyleNameMapper::FillUIName(uTmp, sStyleName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true ); const SwTxtFmtColls* pColls = pDoc->GetTxtFmtColls(); const sal_uInt16 nCount = pColls->size(); for(sal_uInt16 k = 0; k < nCount; ++k) @@ -2078,7 +2078,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex( OUString uTmp; pData->aVal >>= uTmp; String sStyleName; - SwStyleNameMapper::FillUIName(uTmp, sStyleName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True ); + SwStyleNameMapper::FillUIName(uTmp, sStyleName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true ); const SwTxtFmtColls* pColls = pDocShell->GetDoc()->GetTxtFmtColls(); const sal_uInt16 nCount = pColls->size(); for(sal_uInt16 k = 0; k < nCount; ++k) @@ -2304,14 +2304,14 @@ OUString SwXNumberingRules::getName() throw( RuntimeException ) String aString; if(pNumRule) { - SwStyleNameMapper::FillProgName(pNumRule->GetName(), aString, nsSwGetPoolIdFromName::GET_POOLID_NUMRULE, sal_True ); + SwStyleNameMapper::FillProgName(pNumRule->GetName(), aString, nsSwGetPoolIdFromName::GET_POOLID_NUMRULE, true ); return OUString ( aString ); } // consider chapter numbering else if ( pDocShell ) { SwStyleNameMapper::FillProgName( pDocShell->GetDoc()->GetOutlineNumRule()->GetName(), - aString, nsSwGetPoolIdFromName::GET_POOLID_NUMRULE, sal_True ); + aString, nsSwGetPoolIdFromName::GET_POOLID_NUMRULE, true ); return OUString ( aString ); } else diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 5f965ba58eda..623c1a21b721 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -761,7 +761,7 @@ uno::Any SwXStyleFamily::getByName(const OUString& rName) SolarMutexGuard aGuard; uno::Any aRet; String sStyleName; - SwStyleNameMapper::FillUIName(rName, sStyleName, lcl_GetSwEnumFromSfxEnum ( eFamily ), sal_True ); + SwStyleNameMapper::FillUIName(rName, sStyleName, lcl_GetSwEnumFromSfxEnum ( eFamily ), true ); if(pBasePool) { pBasePool->SetSearchMask(eFamily, SFXSTYLEBIT_ALL ); @@ -801,7 +801,7 @@ uno::Sequence< OUString > SwXStyleFamily::getElementNames(void) throw( uno::Runt String aString; for(sal_uInt16 i = 0; i < nCount; i++) { - SwStyleNameMapper::FillProgName((*pIterator)[i]->GetName(), aString, lcl_GetSwEnumFromSfxEnum ( eFamily ), sal_True ); + SwStyleNameMapper::FillProgName((*pIterator)[i]->GetName(), aString, lcl_GetSwEnumFromSfxEnum ( eFamily ), true ); pArray[i] = OUString ( aString ); } delete pIterator; @@ -818,7 +818,7 @@ sal_Bool SwXStyleFamily::hasByName(const OUString& rName) throw( uno::RuntimeExc if(pBasePool) { String sStyleName; - SwStyleNameMapper::FillUIName(rName, sStyleName, lcl_GetSwEnumFromSfxEnum ( eFamily ), sal_True ); + SwStyleNameMapper::FillUIName(rName, sStyleName, lcl_GetSwEnumFromSfxEnum ( eFamily ), true ); pBasePool->SetSearchMask(eFamily, SFXSTYLEBIT_ALL ); SfxStyleSheetBase* pBase = pBasePool->Find(sStyleName); bRet = 0 != pBase; @@ -849,7 +849,7 @@ void SwXStyleFamily::insertByName(const OUString& rName, const uno::Any& rElemen if(pBasePool) { String sStyleName; - SwStyleNameMapper::FillUIName(rName, sStyleName, lcl_GetSwEnumFromSfxEnum ( eFamily ), sal_True); + SwStyleNameMapper::FillUIName(rName, sStyleName, lcl_GetSwEnumFromSfxEnum ( eFamily ), true); pBasePool->SetSearchMask(eFamily, SFXSTYLEBIT_ALL ); SfxStyleSheetBase* pBase = pBasePool->Find(sStyleName); SfxStyleSheetBase* pUINameBase = pBasePool->Find( sStyleName ); @@ -952,7 +952,7 @@ void SwXStyleFamily::removeByName(const OUString& rName) throw( container::NoSuc { pBasePool->SetSearchMask(eFamily, SFXSTYLEBIT_ALL ); String aString; - SwStyleNameMapper::FillUIName(rName, aString, lcl_GetSwEnumFromSfxEnum ( eFamily ), sal_True ); + SwStyleNameMapper::FillUIName(rName, aString, lcl_GetSwEnumFromSfxEnum ( eFamily ), true ); SfxStyleSheetBase* pBase = pBasePool->Find( aString ); if(pBase) @@ -1384,7 +1384,7 @@ OUString SwXStyle::getName(void) throw( uno::RuntimeException ) OSL_ENSURE(pBase, "where is the style?" ); if(!pBase) throw uno::RuntimeException(); - SwStyleNameMapper::FillProgName(pBase->GetName(), aString, lcl_GetSwEnumFromSfxEnum ( eFamily ), sal_True); + SwStyleNameMapper::FillProgName(pBase->GetName(), aString, lcl_GetSwEnumFromSfxEnum ( eFamily ), true); } else aString = sStyleName; @@ -1462,7 +1462,7 @@ OUString SwXStyle::getParentStyle(void) throw( uno::RuntimeException ) aString = sParentStyleName; else throw uno::RuntimeException(); - SwStyleNameMapper::FillProgName(aString, aString, lcl_GetSwEnumFromSfxEnum ( eFamily ), sal_True ); + SwStyleNameMapper::FillProgName(aString, aString, lcl_GetSwEnumFromSfxEnum ( eFamily ), true ); return OUString ( aString ); } @@ -1471,7 +1471,7 @@ void SwXStyle::setParentStyle(const OUString& rParentStyle) { SolarMutexGuard aGuard; String sParentStyle; - SwStyleNameMapper::FillUIName(rParentStyle, sParentStyle, lcl_GetSwEnumFromSfxEnum ( eFamily ), sal_True ); + SwStyleNameMapper::FillUIName(rParentStyle, sParentStyle, lcl_GetSwEnumFromSfxEnum ( eFamily ), true ); if(pBasePool) { pBasePool->SetSearchMask(eFamily); @@ -1822,7 +1822,7 @@ void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, OUString sTmp; rValue >>= sTmp; String aString; - SwStyleNameMapper::FillUIName(sTmp, aString, lcl_GetSwEnumFromSfxEnum ( eFamily ), sal_True ) ; + SwStyleNameMapper::FillUIName(sTmp, aString, lcl_GetSwEnumFromSfxEnum ( eFamily ), true ) ; rBase.mxNewBase->SetFollow( aString ); } break; @@ -1846,7 +1846,7 @@ void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, OUString uDescName; rValue >>= uDescName; String sDescName; - SwStyleNameMapper::FillUIName(uDescName, sDescName, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, sal_True ); + SwStyleNameMapper::FillUIName(uDescName, sDescName, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, true ); if(!pNewDesc->GetPageDesc() || pNewDesc->GetPageDesc()->GetName() != sDescName) { sal_Bool bPut = sal_False; @@ -1903,7 +1903,7 @@ void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, { // get UI style name from programmatic style name String aStyleName; - SwStyleNameMapper::FillUIName( aTmp, aStyleName, lcl_GetSwEnumFromSfxEnum ( eFamily ), sal_True ); + SwStyleNameMapper::FillUIName( aTmp, aStyleName, lcl_GetSwEnumFromSfxEnum ( eFamily ), true ); // // check for correct context and style name @@ -1977,7 +1977,7 @@ void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, aReg.SetWhich(SID_SWREGISTER_MODE); rBase.GetItemSet().Put(aReg); String aString; - SwStyleNameMapper::FillUIName(sName, aString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True); + SwStyleNameMapper::FillUIName(sName, aString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true); rBase.GetItemSet().Put(SfxStringItem(SID_SWREGISTER_COLLECTION, aString ) ); } @@ -1996,7 +1996,7 @@ void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, if(!pRuby) pRuby = new SwFmtRuby(aEmptyStr); String sStyle; - SwStyleNameMapper::FillUIName(sTmp, sStyle, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True ); + SwStyleNameMapper::FillUIName(sTmp, sStyle, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true ); pRuby->SetCharFmtName( sTmp ); pRuby->SetCharFmtId( 0 ); if(!sTmp.isEmpty()) @@ -2028,7 +2028,7 @@ void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, OUString uStyle; rValue >>= uStyle; String sStyle; - SwStyleNameMapper::FillUIName(uStyle, sStyle, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True ); + SwStyleNameMapper::FillUIName(uStyle, sStyle, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true ); SwDocStyleSheet* pStyle = (SwDocStyleSheet*)pDoc->GetDocShell()->GetStyleSheetPool()->Find(sStyle, SFX_STYLE_FAMILY_CHAR); if(pStyle) @@ -2226,7 +2226,7 @@ uno::Any lcl_GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, case FN_UNO_FOLLOW_STYLE: { String aString; - SwStyleNameMapper::FillProgName(rBase.mxNewBase->GetFollow(), aString, lcl_GetSwEnumFromSfxEnum ( eFamily ), sal_True); + SwStyleNameMapper::FillProgName(rBase.mxNewBase->GetFollow(), aString, lcl_GetSwEnumFromSfxEnum ( eFamily ), true); aRet <<= OUString( aString ); } break; @@ -2242,7 +2242,7 @@ uno::Any lcl_GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, if(pDesc) { String aString; - SwStyleNameMapper::FillProgName(pDesc->GetName(), aString, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, sal_True ); + SwStyleNameMapper::FillProgName(pDesc->GetName(), aString, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, true ); aRet <<= OUString( aString ); } } @@ -2285,7 +2285,7 @@ uno::Any lcl_GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, { // get programmatic style name from UI style name aStyleName = pCond->GetTxtFmtColl()->GetName(); - SwStyleNameMapper::FillProgName(aStyleName, aStyleName, lcl_GetSwEnumFromSfxEnum ( eFamily ), sal_True); + SwStyleNameMapper::FillProgName(aStyleName, aStyleName, lcl_GetSwEnumFromSfxEnum ( eFamily ), true); } pSeq[n].Name = GetCommandContextByIndex(n); @@ -2331,7 +2331,7 @@ uno::Any lcl_GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, pCol = pPageDesc->GetRegisterFmtColl(); if( pCol ) SwStyleNameMapper::FillProgName( - pCol->GetName(), aString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True ); + pCol->GetName(), aString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true ); aRet <<= OUString ( aString ); } break; diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index a9a4c3e70ccc..e66ff3d78c27 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -198,7 +198,7 @@ void lcl_SetSpecialProperty(SwFrmFmt* pFmt, const SfxItemPropertySimpleEntry* pE const SwPageDesc* pDesc = 0; if(sPageStyle.Len()) { - SwStyleNameMapper::FillUIName(sPageStyle, sPageStyle, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, sal_True ); + SwStyleNameMapper::FillUIName(sPageStyle, sPageStyle, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, true ); pDesc = ::GetPageDescByName_Impl(*pFmt->GetDoc(), sPageStyle); } SwFmtPageDesc aDesc( pDesc ); @@ -1980,7 +1980,7 @@ void SwTableProperties_Impl::ApplyTblAttr(const SwTable& rTbl, SwDoc& rDoc) String sPageStyle = uTmp; if(sPageStyle.Len()) { - SwStyleNameMapper::FillUIName(sPageStyle, sPageStyle, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, sal_True ); + SwStyleNameMapper::FillUIName(sPageStyle, sPageStyle, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, true ); const SwPageDesc* pDesc = ::GetPageDescByName_Impl(rDoc, sPageStyle); if(pDesc) { diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx index 30a44ebe157b..cdbc634ee034 100644 --- a/sw/source/filter/xml/xmlfmt.cxx +++ b/sw/source/filter/xml/xmlfmt.cxx @@ -422,7 +422,7 @@ void SwXMLTextStyleContext_Impl::Finish( sal_Bool bOverwrite ) SwStyleNameMapper::FillUIName( aDisplayName, aString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, - sal_True); + true); sName = aString; SwTxtFmtColl* pCondColl = pDoc->FindTxtFmtCollByName( sName ); OSL_ENSURE( pCondColl, @@ -657,7 +657,7 @@ void SwXMLItemSetStyleContext_Impl::ConnectPageDesc() SwStyleNameMapper::FillUIName( sName, sName, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, - sal_True); + true); SwPageDesc *pPageDesc = pDoc->FindPageDescByName( sName ); if( !pPageDesc ) { diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx index 42ec988411fb..8454fe44c9cc 100644 --- a/sw/source/filter/xml/xmlfmte.cxx +++ b/sw/source/filter/xml/xmlfmte.cxx @@ -106,7 +106,7 @@ void SwXMLExport::ExportFmt( const SwFmt& rFmt, enum XMLTokenEnum eFamily ) pPageDesc->GetName(), sName, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, - sal_True); + true); AddAttribute( XML_NAMESPACE_STYLE, XML_MASTER_PAGE_NAME, EncodeStyleName( sName ) ); } diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx index 1a4dfe783e79..8f3e57756088 100644 --- a/sw/source/filter/xml/xmltexte.cxx +++ b/sw/source/filter/xml/xmltexte.cxx @@ -178,7 +178,7 @@ void SwXMLTextParagraphExport::exportStyleContent( rCond.GetTxtFmtColl()->GetName(), aString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, - sal_True); + true); aString = GetExport().EncodeStyleName( aString ); GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_APPLY_STYLE_NAME, aString ); diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx index 37e54af4532f..0a25804242cc 100644 --- a/sw/source/ui/uno/unotxvw.cxx +++ b/sw/source/ui/uno/unotxvw.cxx @@ -732,7 +732,7 @@ Sequence< Sequence< PropertyValue > > SwXTextView::getRubyList( sal_Bool /*bAuto pValues[1].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_RUBY_TEXT)); pValues[1].Value <<= OUString(rAttr.GetText()); pValues[2].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_RUBY_CHAR_STYLE_NAME)); - SwStyleNameMapper::FillProgName(rAttr.GetCharFmtName(), aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True ); + SwStyleNameMapper::FillProgName(rAttr.GetCharFmtName(), aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true ); pValues[2].Value <<= OUString( aString ); pValues[3].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_RUBY_ADJUST)); pValues[3].Value <<= (sal_Int16)rAttr.GetAdjustment(); @@ -787,7 +787,7 @@ void SAL_CALL SwXTextView::setRubyList( if((pProperties[nProp].Value >>= sTmp)) { String sName; - SwStyleNameMapper::FillUIName(sTmp, sName, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True ); + SwStyleNameMapper::FillUIName(sTmp, sName, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true ); sal_uInt16 nPoolId = sName.Len() ? SwStyleNameMapper::GetPoolIdFromUIName( sName, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT ) : 0; From da7edb8bd74eb3c42a4585254e5bb329905b56c8 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Tue, 9 Oct 2012 11:17:25 +0200 Subject: [PATCH 649/863] in ScAnyRefDlg + table locked, don't allow creating new sheets,fdo#55709 Change-Id: I8129b41288d20a0c2b6eac90ca5d25392fe0386f --- sc/source/ui/view/tabcont.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx index f086ad693f6e..71fcf453bd24 100644 --- a/sc/source/ui/view/tabcont.cxx +++ b/sc/source/ui/view/tabcont.cxx @@ -176,7 +176,8 @@ void ScTabControl::MouseButtonUp( const MouseEvent& rMEvt ) { // Insert a new sheet at the right end, with default name. ScDocument* pDoc = pViewData->GetDocument(); - if (!pDoc->IsDocEditable()) + ScModule* pScMod = SC_MOD(); + if (!pDoc->IsDocEditable() || pScMod->IsTableLocked()) return; rtl::OUString aName; pDoc->CreateValidTabName(aName); From 6b74e2c69fd8c19f0eec6bb141f19e21c91a2076 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Wed, 10 Oct 2012 02:34:01 +0200 Subject: [PATCH 650/863] make also the condition edit fields ref input fields Change-Id: I1246d9ef7ef129901dbcdb92ae9b8fed171fb343 --- sc/source/ui/condformat/condformatdlg.cxx | 47 ++++++++++++++++--- .../ui/condformat/condformatdlgentry.cxx | 6 +++ sc/source/ui/inc/condformatdlg.hxx | 8 +++- sc/source/ui/inc/condformatdlgentry.hxx | 9 ++-- 4 files changed, 60 insertions(+), 10 deletions(-) diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index 332139e89495..21093fec53a4 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -198,15 +198,24 @@ IMPL_LINK(ScCondFormatList, ColFormatTypeHdl, ListBox*, pBox) { case 0: if(itr->GetType() != condformat::entry::COLORSCALE2) + { maEntries.replace( itr, new ScColorScale2FrmtEntry( this, mpDoc, maPos ) ); + static_cast(GetParent())->InvalidateRefData(); + } break; case 1: if(itr->GetType() != condformat::entry::COLORSCALE3) + { maEntries.replace( itr, new ScColorScale3FrmtEntry( this, mpDoc, maPos ) ); + static_cast(GetParent())->InvalidateRefData(); + } break; case 2: if(itr->GetType() != condformat::entry::DATABAR) + { maEntries.replace( itr, new ScDataBarFrmtEntry( this, mpDoc, maPos ) ); + static_cast(GetParent())->InvalidateRefData(); + } break; default: break; @@ -232,14 +241,17 @@ IMPL_LINK(ScCondFormatList, TypeListHdl, ListBox*, pBox) { case 0: maEntries.replace( itr, new ScColorScale3FrmtEntry(this, mpDoc, maPos)); + static_cast(GetParent())->InvalidateRefData(); itr->SetActive(); break; case 1: maEntries.replace( itr, new ScConditionFrmtEntry(this, mpDoc, maPos)); + static_cast(GetParent())->InvalidateRefData(); itr->SetActive(); break; case 2: maEntries.replace( itr, new ScFormulaFrmtEntry(this, mpDoc, maPos)); + static_cast(GetParent())->InvalidateRefData(); itr->SetActive(); break; } @@ -255,6 +267,7 @@ IMPL_LINK_NOARG( ScCondFormatList, AddBtnHdl ) { itr->SetInactive(); } + static_cast(GetParent())->InvalidateRefData(); pNewEntry->SetActive(); RecalcAll(); return 0; @@ -270,6 +283,7 @@ IMPL_LINK_NOARG( ScCondFormatList, RemoveBtnHdl ) break; } } + static_cast(GetParent())->InvalidateRefData(); RecalcAll(); return 0; } @@ -280,6 +294,7 @@ IMPL_LINK( ScCondFormatList, EntrySelectHdl, ScCondFrmtEntry*, pEntry ) { itr->SetInactive(); } + static_cast(GetParent())->InvalidateRefData(); pEntry->SetActive(); RecalcAll(); return 0; @@ -309,6 +324,7 @@ ScCondFormatDlg::ScCondFormatDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* p maPos(rPos), mpDoc(pDoc), mpFormat(pFormat), + mpLastEdit(NULL), meType(eType) { rtl::OUStringBuffer aTitle( GetText() ); @@ -323,6 +339,7 @@ ScCondFormatDlg::ScCondFormatDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* p maBtnOk.SetClickHdl( LINK( this, ScCondFormatDlg, OkBtnHdl ) ); maBtnCancel.SetClickHdl( LINK( this, ScCondFormatDlg, CancelBtnHdl ) ); maEdRange.SetGetFocusHdl( LINK( this, ScCondFormatDlg, RangeGetFocusHdl ) ); + maEdRange.SetLoseFocusHdl( LINK( this, ScCondFormatDlg, RangeLoseFocusHdl ) ); FreeResource(); maEdRange.SetText(aRangeString); @@ -334,7 +351,11 @@ ScCondFormatDlg::~ScCondFormatDlg() void ScCondFormatDlg::SetActive() { - maEdRange.GrabFocus(); + if(mpLastEdit) + mpLastEdit->GrabFocus(); + else + maEdRange.GrabFocus(); + RefInputDone(); } @@ -355,14 +376,18 @@ sal_Bool ScCondFormatDlg::IsRefInputMode() const void ScCondFormatDlg::SetReference(const ScRange& rRef, ScDocument*) { - if( maEdRange.IsEnabled() ) + formula::RefEdit* pEdit = mpLastEdit; + if(!mpLastEdit) + pEdit = &maEdRange; + + if( pEdit->IsEnabled() ) { if(rRef.aStart != rRef.aEnd) - RefInputStart(&maEdRange); + RefInputStart(pEdit); rtl::OUString aRefStr; rRef.Format( aRefStr, ABS_DREF, mpDoc, ScAddress::Details(mpDoc->GetAddressConvention(), 0, 0) ); - maEdRange.SetRefString( aRefStr ); + pEdit->SetRefString( aRefStr ); } } @@ -379,6 +404,11 @@ ScConditionalFormat* ScCondFormatDlg::GetConditionalFormat() const return pFormat; } +void ScCondFormatDlg::InvalidateRefData() +{ + mpLastEdit = NULL; +} + IMPL_LINK( ScCondFormatDlg, EdRangeModifyHdl, Edit*, pEdit ) { rtl::OUString aRangeStr = pEdit->GetText(); @@ -427,16 +457,21 @@ IMPL_LINK_NOARG( ScCondFormatDlg, OkBtnHdl ) IMPL_LINK_NOARG( ScCondFormatDlg, CancelBtnHdl ) { - Close(); return 0; } -IMPL_LINK_NOARG( ScCondFormatDlg, RangeGetFocusHdl ) +IMPL_LINK( ScCondFormatDlg, RangeGetFocusHdl, formula::RefEdit*, pEdit ) { + mpLastEdit = pEdit; return 0; } +IMPL_LINK_NOARG( ScCondFormatDlg, RangeLoseFocusHdl ) +{ + //mpLastEdit = NULL; + return 0; +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 507a0edef29b..707462f3c879 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -224,6 +224,10 @@ ScConditionFrmtEntry::ScConditionFrmtEntry( Window* pParent, ScDocument* pDoc, c void ScConditionFrmtEntry::Init() { maLbStyle.SetSeparatorPos(0); + maEdVal1.SetGetFocusHdl( LINK( GetParent()->GetParent(), ScCondFormatDlg, RangeGetFocusHdl ) ); + maEdVal2.SetGetFocusHdl( LINK( GetParent()->GetParent(), ScCondFormatDlg, RangeGetFocusHdl ) ); + maEdVal1.SetLoseFocusHdl( LINK( GetParent()->GetParent(), ScCondFormatDlg, RangeLoseFocusHdl ) ); + maEdVal2.SetLoseFocusHdl( LINK( GetParent()->GetParent(), ScCondFormatDlg, RangeLoseFocusHdl ) ); maEdVal1.SetStyle( maEdVal1.GetStyle() | WB_FORCECTRLBACKGROUND ); maEdVal2.SetStyle( maEdVal2.GetStyle() | WB_FORCECTRLBACKGROUND ); @@ -405,6 +409,8 @@ ScFormulaFrmtEntry::ScFormulaFrmtEntry( Window* pParent, ScDocument* pDoc, const void ScFormulaFrmtEntry::Init() { maLbStyle.SetSeparatorPos(0); + maEdFormula.SetGetFocusHdl( LINK( GetParent()->GetParent(), ScCondFormatDlg, RangeGetFocusHdl ) ); + maEdFormula.SetLoseFocusHdl( LINK( GetParent()->GetParent(), ScCondFormatDlg, RangeLoseFocusHdl ) ); SfxStyleSheetIterator aStyleIter( mpDoc->GetStyleSheetPool(), SFX_STYLE_FAMILY_PARA ); for ( SfxStyleSheetBase* pStyle = aStyleIter.First(); pStyle; pStyle = aStyleIter.Next() ) diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx index e91574bde89a..3b3cfb30aa56 100644 --- a/sc/source/ui/inc/condformatdlg.hxx +++ b/sc/source/ui/inc/condformatdlg.hxx @@ -114,12 +114,13 @@ private: const ScConditionalFormat* mpFormat; + formula::RefEdit* mpLastEdit; + condformat::dialog::ScCondFormatDialogType meType; DECL_LINK( EdRangeModifyHdl, Edit* ); DECL_LINK( OkBtnHdl, void* ); DECL_LINK( CancelBtnHdl, void* ); - DECL_LINK( RangeGetFocusHdl, void* ); virtual sal_Bool Close(); protected: @@ -138,6 +139,11 @@ public: virtual sal_Bool IsRefInputMode() const; virtual void SetActive(); virtual sal_Bool IsTableLocked() const { return sal_True; } + + void InvalidateRefData(); + + DECL_LINK( RangeGetFocusHdl, formula::RefEdit* ); + DECL_LINK( RangeLoseFocusHdl, void* ); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index b0051ad10837..f28a82442e46 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -9,6 +9,7 @@ #include "colorscale.hxx" #include "conditio.hxx" +#include namespace condformat { @@ -76,8 +77,8 @@ class ScConditionFrmtEntry : public ScCondFrmtEntry //cond format ui elements ListBox maLbCondType; - Edit maEdVal1; - Edit maEdVal2; + formula::RefEdit maEdVal1; + formula::RefEdit maEdVal2; FixedText maFtStyle; ListBox maLbStyle; SvxFontPrevWindow maWdPreview; @@ -87,6 +88,7 @@ class ScConditionFrmtEntry : public ScCondFrmtEntry void Init(); DECL_LINK( StyleSelectHdl, void* ); DECL_LINK( ConditionTypeSelectHdl, void* ); + public: ScConditionFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScCondFormatEntry* pFormatEntry = NULL ); @@ -102,12 +104,13 @@ class ScFormulaFrmtEntry : public ScCondFrmtEntry FixedText maFtStyle; ListBox maLbStyle; SvxFontPrevWindow maWdPreview; - Edit maEdFormula; + formula::RefEdit maEdFormula; ScFormatEntry* createFormulaEntry() const; void Init(); DECL_LINK( StyleSelectHdl, void* ); + public: ScFormulaFrmtEntry( Window* pParent, ScDocument* PDoc, const ScAddress& rPos, const ScCondFormatEntry* pFormatEntry = NULL ); From a2cc01df8bc654b90bfeae62d581a0a0eadb2b6e Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Wed, 10 Oct 2012 03:17:56 +0200 Subject: [PATCH 651/863] remove unused header file Change-Id: I862311c2ee2b327a2542cd3161fc31e668b70c93 --- sc/source/ui/inc/parawin.hxx | 163 ----------------------------------- 1 file changed, 163 deletions(-) delete mode 100644 sc/source/ui/inc/parawin.hxx diff --git a/sc/source/ui/inc/parawin.hxx b/sc/source/ui/inc/parawin.hxx deleted file mode 100644 index 8179733dba08..000000000000 --- a/sc/source/ui/inc/parawin.hxx +++ /dev/null @@ -1,163 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SC_PARAWIN_HXX -#define SC_PARAWIN_HXX - -#include "funcutl.hxx" -#include "global.hxx" // ScAddress -#include -#include -#include -#include -#include -#include - -#include - -class ScFuncDesc; - -//============================================================================ -#define NOT_FOUND 0xffff -//============================================================================ - -class ScParaWin : public TabPage -{ -private: - - Link aScrollLink; - Link aFxLink; - Link aArgModifiedLink; - - ::std::vector aVisibleArgMapping; - const ScFuncDesc* pFuncDesc; - ScAnyRefDlg* pMyParent; - sal_uInt16 nArgs; // unsuppressed arguments - Font aFntBold; - Font aFntLight; - - FixedInfo aFtEditDesc; - FixedText aFtArgName; - FixedInfo aFtArgDesc; - - ImageButton aBtnFx1; - FixedText aFtArg1; - ArgEdit aEdArg1; - formula::RefButton aRefBtn1; - ImageButton aBtnFx2; - FixedText aFtArg2; - ArgEdit aEdArg2; - formula::RefButton aRefBtn2; - ImageButton aBtnFx3; - FixedText aFtArg3; - ArgEdit aEdArg3; - formula::RefButton aRefBtn3; - ImageButton aBtnFx4; - FixedText aFtArg4; - ArgEdit aEdArg4; - formula::RefButton aRefBtn4; - ScrollBar aSlider; - sal_Bool bRefMode; - - sal_uInt16 nEdFocus; - sal_uInt16 nActiveLine; - - ArgInput aArgInput[4]; - String aDefaultString; - DECL_LINK( ScrollHdl, ScrollBar* ); - DECL_LINK( ModifyHdl, ArgInput* ); - DECL_LINK( GetEdFocusHdl, ArgInput* ); - DECL_LINK( GetFxFocusHdl, ArgInput* ); - DECL_LINK( GetFxHdl, ArgInput* ); - -protected: - - virtual void SliderMoved(); - virtual void ArgumentModified(); - virtual void FxClick(); - - void InitArgInput( sal_uInt16 nPos, FixedText& rFtArg, ImageButton& rBtnFx, - ArgEdit& rEdArg, formula::RefButton& rRefBtn); - - void DelParaArray(); - void SetArgumentDesc(const String& aText); - void SetArgumentText(const String& aText); - - - void SetArgName (sal_uInt16 no,const String &aArg); - void SetArgNameFont (sal_uInt16 no,const Font&); - void SetArgVal (sal_uInt16 no,const String &aArg); - - void HideParaLine(sal_uInt16 no); - void ShowParaLine(sal_uInt16 no); - void UpdateArgDesc( sal_uInt16 nArg ); - void UpdateArgInput( sal_uInt16 nOffset, sal_uInt16 i ); - -public: - ScParaWin(ScAnyRefDlg* pParent,Point aPos); - ~ScParaWin(); - - void SetFunctionDesc(const ScFuncDesc* pFDesc); - void SetArgumentOffset(sal_uInt16 nOffset); - void SetEditDesc(const String& aText); - void UpdateParas(); - void ClearAll(); - - sal_Bool IsRefMode() {return bRefMode;} - void SetRefMode(sal_Bool bFlag) {bRefMode=bFlag;} - - sal_uInt16 GetActiveLine(); - void SetActiveLine(sal_uInt16 no); - formula::RefEdit* GetActiveEdit(); - String GetActiveArgName(); - - String GetArgument(sal_uInt16 no); - void SetArgument(sal_uInt16 no, const String& aString); - void SetArgumentFonts(const Font&aBoldFont,const Font&aLightFont); - - void SetEdFocus(sal_uInt16 nEditLine); // Visable edit lines - sal_uInt16 GetSliderPos(); - void SetSliderPos(sal_uInt16 nSliderPos); - - void SetScrollHdl( const Link& rLink ) { aScrollLink = rLink; } - const Link& GetScrollHdl() const { return aScrollLink; } - - void SetArgModifiedHdl( const Link& rLink ) { aArgModifiedLink = rLink; } - const Link& GetArgModifiedHdl() const { return aArgModifiedLink; } - - void SetFxHdl( const Link& rLink ) { aFxLink = rLink; } - const Link& GetFxHdl() const { return aFxLink; } -}; - - - - - -#endif // SC_PARAWIN_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ From 549726ae15ec7bfa8381fe2ad0e8e4e13eec29af Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Wed, 10 Oct 2012 03:18:30 +0200 Subject: [PATCH 652/863] remove another unused header file Change-Id: I446664e9e7e938e093c1b2254f36752420a6b584 --- sc/source/ui/inc/funcutl.hxx | 188 ----------------------------------- 1 file changed, 188 deletions(-) delete mode 100644 sc/source/ui/inc/funcutl.hxx diff --git a/sc/source/ui/inc/funcutl.hxx b/sc/source/ui/inc/funcutl.hxx deleted file mode 100644 index e3c995bbb21e..000000000000 --- a/sc/source/ui/inc/funcutl.hxx +++ /dev/null @@ -1,188 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef SC_FUNCUTL_HXX -#define SC_FUNCUTL_HXX - -#include -#include -#include -#include "anyrefdg.hxx" // formula::RefButton - - -//============================================================================ -// class ValWnd - -class ValWnd : public Window -{ -public: - ValWnd( Window* pParent, const ResId& rId ); - - void SetValue( const String& rStrVal ); - -protected: - virtual void Paint( const Rectangle& rRect ); - -private: - String aStrValue; - Rectangle aRectOut; -}; - - -//============================================================================ -// class ScEditBox - -class ScEditBox : public Control -{ -private: - - MultiLineEdit* pMEdit; - Link aSelChangedLink; - Selection aOldSel; - sal_Bool bMouseFlag; - DECL_LINK( ChangedHdl, ScEditBox* ); - -protected: - - virtual long PreNotify( NotifyEvent& rNEvt ); - virtual void SelectionChanged(); - virtual void Resize(); - virtual void GetFocus(); - - -public: - ScEditBox( Window* pParent, const ResId& rResId ); - - ~ScEditBox(); - - MultiLineEdit* GetEdit() {return pMEdit;} - - void SetSelChangedHdl( const Link& rLink ) { aSelChangedLink = rLink; } - const Link& GetSelChangedHdl() const { return aSelChangedLink; } - - void UpdateOldSel(); -}; - - - -//============================================================================ -// class ArgEdit - -class ArgEdit : public formula::RefEdit -{ -public: - ArgEdit( Window* pParent, const ResId& rResId ); - - void Init( ArgEdit* pPrevEdit, ArgEdit* pNextEdit, - ScrollBar& rArgSlider, sal_uInt16 nArgCount ); - -protected: - virtual void KeyInput( const KeyEvent& rKEvt ); - -private: - ArgEdit* pEdPrev; - ArgEdit* pEdNext; - ScrollBar* pSlider; - sal_uInt16 nArgs; -}; - - -//============================================================================ -// class ArgInput - -class ArgInput -{ -private: - - Link aFxClickLink; - Link aRefClickLink; - Link aFxFocusLink; - Link aRefFocusLink; - Link aEdFocusLink; - Link aEdModifyLink; - - FixedText* pFtArg; - ImageButton* pBtnFx; - ArgEdit* pEdArg; - formula::RefButton* pRefBtn; - - DECL_LINK( FxBtnClickHdl, ImageButton* ); - DECL_LINK( RefBtnClickHdl,formula::RefButton* ); - DECL_LINK( FxBtnFocusHdl, ImageButton* ); - DECL_LINK( RefBtnFocusHdl,formula::RefButton* ); - DECL_LINK( EdFocusHdl, ArgEdit* ); - DECL_LINK( EdModifyHdl,ArgEdit* ); - -protected: - - virtual void FxClick(); - virtual void RefClick(); - virtual void FxFocus(); - virtual void RefFocus(); - virtual void EdFocus(); - virtual void EdModify(); - -public: - - ArgInput(); - - void InitArgInput ( FixedText* pftArg, - ImageButton* pbtnFx, - ArgEdit* pedArg, - formula::RefButton* prefBtn); - - void SetArgName(const String &aArg); - String GetArgName(); - void SetArgNameFont(const Font&); - - void SetArgVal(const String &aVal); - String GetArgVal(); - - void SetArgSelection (const Selection& rSel ); - - ArgEdit* GetArgEdPtr() {return pEdArg;} - - - void SetFxClickHdl( const Link& rLink ) { aFxClickLink = rLink; } - const Link& GetFxClickHdl() const { return aFxClickLink; } - - void SetRefClickHdl( const Link& rLink ) { aRefClickLink = rLink; } - const Link& GetRefClickHdl() const { return aRefClickLink; } - - void SetFxFocusHdl( const Link& rLink ) { aFxFocusLink = rLink; } - const Link& GetFxFocusHdl() const { return aFxFocusLink; } - - void SetRefFocusHdl( const Link& rLink ) { aRefFocusLink = rLink; } - const Link& GetRefFocusHdl() const { return aRefFocusLink; } - - void SetEdFocusHdl( const Link& rLink ) { aEdFocusLink = rLink; } - const Link& GetEdFocusHdl() const { return aEdFocusLink; } - - void SetEdModifyHdl( const Link& rLink ) { aEdModifyLink = rLink; } - const Link& GetEdModifyHdl() const { return aEdModifyLink; } - - void Hide(); - void Show(); - -}; - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ From 0b5a7d25c7314d69cfa54da16111bde6805e3335 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Wed, 10 Oct 2012 03:33:01 +0200 Subject: [PATCH 653/863] prevent overwriting the entry if the same has been selected Change-Id: If15ad07c3813dfe8d8c9460060771b0c5bae5b5e --- sc/source/ui/condformat/condformatdlg.cxx | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index 21093fec53a4..b6b6ea4c1cc9 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -240,16 +240,32 @@ IMPL_LINK(ScCondFormatList, TypeListHdl, ListBox*, pBox) switch(nPos) { case 0: + switch(itr->GetType()) + { + case condformat::entry::FORMULA: + case condformat::entry::CONDITION: + break; + case condformat::entry::COLORSCALE2: + case condformat::entry::COLORSCALE3: + case condformat::entry::DATABAR: + return 0; + } maEntries.replace( itr, new ScColorScale3FrmtEntry(this, mpDoc, maPos)); static_cast(GetParent())->InvalidateRefData(); itr->SetActive(); break; case 1: + if(itr->GetType() == condformat::entry::CONDITION) + return 0; + maEntries.replace( itr, new ScConditionFrmtEntry(this, mpDoc, maPos)); static_cast(GetParent())->InvalidateRefData(); itr->SetActive(); break; case 2: + if(itr->GetType() == condformat::entry::FORMULA) + return 0; + maEntries.replace( itr, new ScFormulaFrmtEntry(this, mpDoc, maPos)); static_cast(GetParent())->InvalidateRefData(); itr->SetActive(); From ad7d278372a05fc2c64f80d80c3638c367a78cde Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Wed, 10 Oct 2012 03:35:33 +0200 Subject: [PATCH 654/863] little clean-up for the color format case Change-Id: I8e42a2494e9f7761ca55beb465c3f20d2b057060 --- sc/source/ui/condformat/condformatdlg.cxx | 33 ++++++++++------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index b6b6ea4c1cc9..041faec0b1b9 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -53,9 +53,6 @@ #include "globstr.hrc" -#include -#include - ScCondFormatList::ScCondFormatList(Window* pParent, const ResId& rResId, ScDocument* pDoc, const ScConditionalFormat* pFormat, const ScRangeList& rRanges, const ScAddress& rPos, condformat::dialog::ScCondFormatDialogType eType): Control(pParent, rResId), @@ -191,35 +188,33 @@ IMPL_LINK(ScCondFormatList, ColFormatTypeHdl, ListBox*, pBox) break; } if(itr == maEntries.end()) - return 0;; + return 0; sal_Int32 nPos = pBox->GetSelectEntryPos(); switch(nPos) { case 0: - if(itr->GetType() != condformat::entry::COLORSCALE2) - { - maEntries.replace( itr, new ScColorScale2FrmtEntry( this, mpDoc, maPos ) ); - static_cast(GetParent())->InvalidateRefData(); - } + if(itr->GetType() == condformat::entry::COLORSCALE2) + return 0; + + maEntries.replace( itr, new ScColorScale2FrmtEntry( this, mpDoc, maPos ) ); break; case 1: - if(itr->GetType() != condformat::entry::COLORSCALE3) - { - maEntries.replace( itr, new ScColorScale3FrmtEntry( this, mpDoc, maPos ) ); - static_cast(GetParent())->InvalidateRefData(); - } + if(itr->GetType() == condformat::entry::COLORSCALE3) + return 0; + + maEntries.replace( itr, new ScColorScale3FrmtEntry( this, mpDoc, maPos ) ); break; case 2: - if(itr->GetType() != condformat::entry::DATABAR) - { - maEntries.replace( itr, new ScDataBarFrmtEntry( this, mpDoc, maPos ) ); - static_cast(GetParent())->InvalidateRefData(); - } + if(itr->GetType() == condformat::entry::DATABAR) + return 0; + + maEntries.replace( itr, new ScDataBarFrmtEntry( this, mpDoc, maPos ) ); break; default: break; } + static_cast(GetParent())->InvalidateRefData(); itr->SetActive(); RecalcAll(); return 0; From c20486fbffaa2d5ff20dad668c0f28b2c5f20e39 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Wed, 10 Oct 2012 03:39:39 +0200 Subject: [PATCH 655/863] prevent flickering when clicking at an entry Change-Id: I87786c70348d40d4e0a3012425f5ead2a82920c6 --- sc/source/ui/condformat/condformatdlg.cxx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index 041faec0b1b9..f23bf21890a0 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -301,6 +301,9 @@ IMPL_LINK_NOARG( ScCondFormatList, RemoveBtnHdl ) IMPL_LINK( ScCondFormatList, EntrySelectHdl, ScCondFrmtEntry*, pEntry ) { + if(pEntry->IsSelected()) + return 0; + for(EntryContainer::iterator itr = maEntries.begin(); itr != maEntries.end(); ++itr) { itr->SetInactive(); From e7ff934f128b34ce2cdf636f9117615ae5a26fb0 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Wed, 10 Oct 2012 05:36:22 +0200 Subject: [PATCH 656/863] rename autoMin and autoMax to Automatic, disable it for color scales Change-Id: I1f92acfc5603d965b1bc84e7968da56901385eac --- sc/inc/colorscale.hxx | 3 +- sc/source/core/data/colorscale.cxx | 13 +-- sc/source/filter/excel/xecontent.cxx | 22 ++--- sc/source/filter/excel/xeextlst.cxx | 22 ++--- sc/source/filter/inc/xecontent.hxx | 3 +- sc/source/filter/inc/xeextlst.hxx | 3 +- sc/source/filter/oox/extlstcontext.cxx | 4 +- sc/source/filter/xml/xmlcondformat.cxx | 6 +- sc/source/filter/xml/xmlexprt.cxx | 16 ++-- sc/source/ui/condformat/colorformat.cxx | 40 ++++----- .../ui/condformat/condformatdlgentry.cxx | 88 ++++++++++--------- sc/source/ui/src/colorformat.src | 3 +- sc/source/ui/src/condformatdlg.src | 9 +- 13 files changed, 113 insertions(+), 119 deletions(-) diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx index 146c10b7c28e..7ee92ce09c6e 100644 --- a/sc/inc/colorscale.hxx +++ b/sc/inc/colorscale.hxx @@ -53,8 +53,7 @@ enum ScColorScaleEntryType COLORSCALE_PERCENT, COLORSCALE_PERCENTILE, COLORSCALE_FORMULA, - COLORSCALE_AUTOMIN, - COLORSCALE_AUTOMAX + COLORSCALE_AUTO, }; class SC_DLLPUBLIC ScColorScaleEntry diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx index 6951e8b1af1e..1f6779f7b0ea 100644 --- a/sc/source/core/data/colorscale.cxx +++ b/sc/source/core/data/colorscale.cxx @@ -397,12 +397,8 @@ double ScColorScaleFormat::CalcValue(double nMin, double nMax, ScColorScaleForma return nMin + (nMax-nMin)*(itr->GetValue()/100); case COLORSCALE_MIN: return nMin; - case COLORSCALE_AUTOMIN: - return std::min(0, nMin); case COLORSCALE_MAX: return nMax; - case COLORSCALE_AUTOMAX: - return std::max(0, nMax); case COLORSCALE_PERCENTILE: { std::vector& rValues = getValues(); @@ -526,8 +522,6 @@ bool ScColorScaleFormat::CheckEntriesForRel(const ScRange& rRange) const { case COLORSCALE_MIN: case COLORSCALE_MAX: - case COLORSCALE_AUTOMIN: - case COLORSCALE_AUTOMAX: bNeedUpdate = true; break; case COLORSCALE_FORMULA: @@ -634,8 +628,7 @@ bool NeedUpdate(ScColorScaleEntry* pEntry) case COLORSCALE_MIN: case COLORSCALE_MAX: case COLORSCALE_FORMULA: - case COLORSCALE_AUTOMIN: - case COLORSCALE_AUTOMAX: + case COLORSCALE_AUTO: return true; default: return false; @@ -678,7 +671,7 @@ double ScDataBarFormat::getMin(double nMin, double nMax) const case COLORSCALE_MIN: return nMin; - case COLORSCALE_AUTOMIN: + case COLORSCALE_AUTO: return std::min(0, nMin); case COLORSCALE_PERCENT: @@ -704,7 +697,7 @@ double ScDataBarFormat::getMax(double nMin, double nMax) const { case COLORSCALE_MAX: return nMax; - case COLORSCALE_AUTOMAX: + case COLORSCALE_AUTO: return std::max(0, nMax); case COLORSCALE_PERCENT: return nMin + (nMax-nMin)/100*mpFormatData->mpUpperLimit->GetValue(); diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index c6bffc3b8f42..c73155be6518 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -885,17 +885,18 @@ void XclExpCF::SaveXml( XclExpXmlStream& rStrm ) mxImpl->SaveXml( rStrm ); } -XclExpCfvo::XclExpCfvo(const XclExpRoot& rRoot, const ScColorScaleEntry& rEntry, const ScAddress& rAddr): +XclExpCfvo::XclExpCfvo(const XclExpRoot& rRoot, const ScColorScaleEntry& rEntry, const ScAddress& rAddr, bool bFirst): XclExpRecord(), XclExpRoot( rRoot ), mrEntry(rEntry), - maSrcPos(rAddr) + maSrcPos(rAddr), + mbFirst(bFirst) { } namespace { -rtl::OString getColorScaleType( const ScColorScaleEntry& rEntry ) +rtl::OString getColorScaleType( const ScColorScaleEntry& rEntry, bool bFirst ) { switch(rEntry.GetType()) { @@ -907,10 +908,11 @@ rtl::OString getColorScaleType( const ScColorScaleEntry& rEntry ) return "percent"; case COLORSCALE_FORMULA: return "formula"; - case COLORSCALE_AUTOMIN: - return "min"; - case COLORSCALE_AUTOMAX: - return "max"; + case COLORSCALE_AUTO: + if(bFirst) + return "min"; + else + return "max"; case COLORSCALE_PERCENTILE: return "percentile"; default: @@ -938,7 +940,7 @@ void XclExpCfvo::SaveXml( XclExpXmlStream& rStrm ) } rWorksheet->startElement( XML_cfvo, - XML_type, getColorScaleType(mrEntry).getStr(), + XML_type, getColorScaleType(mrEntry, mbFirst).getStr(), XML_val, aValue.getStr(), FSEND ); @@ -1115,8 +1117,8 @@ XclExpDataBar::XclExpDataBar( const XclExpRoot& rRoot, const ScDataBarFormat& rF const ScRange* pRange = rFormat.GetRange().front(); ScAddress aAddr = pRange->aStart; // exact position is not important, we allow only absolute refs - mpCfvoLowerLimit.reset( new XclExpCfvo( GetRoot(), *mrFormat.GetDataBarData()->mpLowerLimit.get(), aAddr ) ); - mpCfvoUpperLimit.reset( new XclExpCfvo( GetRoot(), *mrFormat.GetDataBarData()->mpUpperLimit.get(), aAddr ) ); + mpCfvoLowerLimit.reset( new XclExpCfvo( GetRoot(), *mrFormat.GetDataBarData()->mpLowerLimit.get(), aAddr, true ) ); + mpCfvoUpperLimit.reset( new XclExpCfvo( GetRoot(), *mrFormat.GetDataBarData()->mpUpperLimit.get(), aAddr, false ) ); mpCol.reset( new XclExpColScaleCol( GetRoot(), mrFormat.GetDataBarData()->maPositiveColor ) ); if(xExtLst.get()) diff --git a/sc/source/filter/excel/xeextlst.cxx b/sc/source/filter/excel/xeextlst.cxx index 32041c52b000..53ab66ba2ec5 100644 --- a/sc/source/filter/excel/xeextlst.cxx +++ b/sc/source/filter/excel/xeextlst.cxx @@ -51,9 +51,10 @@ void XclExpExtAxisColor::SaveXml( XclExpXmlStream& rStrm ) FSEND ); } -XclExpExtCfvo::XclExpExtCfvo( const XclExpRoot& rRoot, const ScColorScaleEntry& rEntry, const ScAddress& rSrcPos ): +XclExpExtCfvo::XclExpExtCfvo( const XclExpRoot& rRoot, const ScColorScaleEntry& rEntry, const ScAddress& rSrcPos, bool bFirst ): XclExpRoot(rRoot), - meType(rEntry.GetType()) + meType(rEntry.GetType()), + mbFirst(bFirst) { if( rEntry.GetType() == COLORSCALE_FORMULA ) { @@ -66,7 +67,7 @@ XclExpExtCfvo::XclExpExtCfvo( const XclExpRoot& rRoot, const ScColorScaleEntry& namespace { -const char* getColorScaleType( ScColorScaleEntryType eType ) +const char* getColorScaleType( ScColorScaleEntryType eType, bool bFirst ) { switch(eType) { @@ -78,10 +79,11 @@ const char* getColorScaleType( ScColorScaleEntryType eType ) return "percent"; case COLORSCALE_FORMULA: return "formula"; - case COLORSCALE_AUTOMIN: - return "autoMin"; - case COLORSCALE_AUTOMAX: - return "autoMax"; + case COLORSCALE_AUTO: + if(bFirst) + return "autoMin"; + else + return "autoMax"; case COLORSCALE_PERCENTILE: return "percentile"; default: @@ -96,7 +98,7 @@ void XclExpExtCfvo::SaveXml( XclExpXmlStream& rStrm ) { sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream(); rWorksheet->singleElementNS( XML_x14, XML_cfvo, - XML_type, getColorScaleType(meType), + XML_type, getColorScaleType(meType, mbFirst), XML_value, maValue.getStr(), FSEND ); } @@ -105,8 +107,8 @@ XclExpExtDataBar::XclExpExtDataBar( const XclExpRoot& rRoot, const ScDataBarForm XclExpRoot(rRoot) { const ScDataBarFormatData& rFormatData = *rFormat.GetDataBarData(); - mpLowerLimit.reset( new XclExpExtCfvo( *this, *rFormatData.mpLowerLimit.get(), rPos ) ); - mpUpperLimit.reset( new XclExpExtCfvo( *this, *rFormatData.mpUpperLimit.get(), rPos ) ); + mpLowerLimit.reset( new XclExpExtCfvo( *this, *rFormatData.mpLowerLimit.get(), rPos, true ) ); + mpUpperLimit.reset( new XclExpExtCfvo( *this, *rFormatData.mpUpperLimit.get(), rPos, false ) ); if(rFormatData.mpNegativeColor.get()) mpNegativeColor.reset( new XclExpExtNegativeColor( *rFormatData.mpNegativeColor.get() ) ); else diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx index 23ca6e40750b..9417ab28b66b 100644 --- a/sc/source/filter/inc/xecontent.hxx +++ b/sc/source/filter/inc/xecontent.hxx @@ -194,13 +194,14 @@ private: class XclExpCfvo : public XclExpRecord, protected XclExpRoot { public: - explicit XclExpCfvo( const XclExpRoot& rRoot, const ScColorScaleEntry& rFormatEntry, const ScAddress& rPos); + explicit XclExpCfvo( const XclExpRoot& rRoot, const ScColorScaleEntry& rFormatEntry, const ScAddress& rPos, bool bFirst = true); virtual ~XclExpCfvo() {} virtual void SaveXml( XclExpXmlStream& rStrm ); private: const ScColorScaleEntry& mrEntry; ScAddress maSrcPos; + bool mbFirst; }; class XclExpColScaleCol : public XclExpRecord, protected XclExpRoot diff --git a/sc/source/filter/inc/xeextlst.hxx b/sc/source/filter/inc/xeextlst.hxx index 6ce7b703187e..466811174c51 100644 --- a/sc/source/filter/inc/xeextlst.hxx +++ b/sc/source/filter/inc/xeextlst.hxx @@ -40,12 +40,13 @@ protected: class XclExpExtCfvo : public XclExpRecordBase, protected XclExpRoot { public: - XclExpExtCfvo( const XclExpRoot& rRoot, const ScColorScaleEntry& rEntry, const ScAddress& rPos ); + XclExpExtCfvo( const XclExpRoot& rRoot, const ScColorScaleEntry& rEntry, const ScAddress& rPos, bool bFirst ); virtual void SaveXml( XclExpXmlStream& rStrm ); private: ScColorScaleEntryType meType; rtl::OString maValue; + bool mbFirst; }; class XclExpExtNegativeColor diff --git a/sc/source/filter/oox/extlstcontext.cxx b/sc/source/filter/oox/extlstcontext.cxx index 78fd832fc540..43a3859ddaa8 100644 --- a/sc/source/filter/oox/extlstcontext.cxx +++ b/sc/source/filter/oox/extlstcontext.cxx @@ -131,9 +131,9 @@ void ExtCfRuleContext::importCfvo( const AttributeList& rAttribs ) else if (aColorScaleType == "max") pEntry->SetType(COLORSCALE_MAX); else if (aColorScaleType == "autoMin") - pEntry->SetType(COLORSCALE_AUTOMIN); + pEntry->SetType(COLORSCALE_AUTO); else if (aColorScaleType == "autoMax") - pEntry->SetType(COLORSCALE_AUTOMAX); + pEntry->SetType(COLORSCALE_AUTO); else if (aColorScaleType == "percentile") pEntry->SetType(COLORSCALE_PERCENTILE); else if (aColorScaleType == "percent") diff --git a/sc/source/filter/xml/xmlcondformat.cxx b/sc/source/filter/xml/xmlcondformat.cxx index 32e075149752..9733bd28e9a1 100644 --- a/sc/source/filter/xml/xmlcondformat.cxx +++ b/sc/source/filter/xml/xmlcondformat.cxx @@ -436,11 +436,9 @@ void setColorEntryType(const rtl::OUString& rType, ScColorScaleEntry* pEntry, co pEntry->SetFormula(rFormula, rImport.GetDocument(), ScAddress(0,0,rImport.GetTables().GetCurrentSheet()), formula::FormulaGrammar::GRAM_ODFF); } else if(rType == "auto-minimum") - pEntry->SetType(COLORSCALE_AUTOMIN); + pEntry->SetType(COLORSCALE_AUTO); else if(rType == "auto-maximum") - pEntry->SetType(COLORSCALE_AUTOMAX); - - //TODO: add formulas + pEntry->SetType(COLORSCALE_AUTO); } } diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index a9eaf1b30960..98e15c65119e 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -3784,7 +3784,7 @@ void ScXMLExport::WriteNamedRange(ScRangeName* pRangeName) namespace { -rtl::OUString getCondFormatEntryType(const ScColorScaleEntry& rEntry) +rtl::OUString getCondFormatEntryType(const ScColorScaleEntry& rEntry, bool bFirst = true) { switch(rEntry.GetType()) { @@ -3800,10 +3800,12 @@ rtl::OUString getCondFormatEntryType(const ScColorScaleEntry& rEntry) return rtl::OUString("formula"); case COLORSCALE_VALUE: return rtl::OUString("number"); - case COLORSCALE_AUTOMIN: - return rtl::OUString("auto-minimum"); - case COLORSCALE_AUTOMAX: - return rtl::OUString("auto-maximum"); + case COLORSCALE_AUTO: + // only important for data bars + if(bFirst) + return rtl::OUString("auto-minimum"); + else + return rtl::OUString("auto-maximum"); } return rtl::OUString(); } @@ -3977,7 +3979,7 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) } else AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, rtl::OUString::valueOf(pFormatData->mpLowerLimit->GetValue())); - AddAttribute(XML_NAMESPACE_CALC_EXT, XML_TYPE, getCondFormatEntryType(*pFormatData->mpLowerLimit)); + AddAttribute(XML_NAMESPACE_CALC_EXT, XML_TYPE, getCondFormatEntryType(*pFormatData->mpLowerLimit, true)); SvXMLElementExport aElementDataBarEntryLower(*this, XML_NAMESPACE_CALC_EXT, XML_DATA_BAR_ENTRY, true, true); } @@ -3989,7 +3991,7 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) } else AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, rtl::OUString::valueOf(pFormatData->mpUpperLimit->GetValue())); - AddAttribute(XML_NAMESPACE_CALC_EXT, XML_TYPE, getCondFormatEntryType(*pFormatData->mpUpperLimit)); + AddAttribute(XML_NAMESPACE_CALC_EXT, XML_TYPE, getCondFormatEntryType(*pFormatData->mpUpperLimit, false)); SvXMLElementExport aElementDataBarEntryUpper(*this, XML_NAMESPACE_CALC_EXT, XML_DATA_BAR_ENTRY, true, true); } } diff --git a/sc/source/ui/condformat/colorformat.cxx b/sc/source/ui/condformat/colorformat.cxx index 77acc7df5d56..7dfa918d6e3b 100644 --- a/sc/source/ui/condformat/colorformat.cxx +++ b/sc/source/ui/condformat/colorformat.cxx @@ -63,7 +63,7 @@ ScDataBarSettingsDlg::ScDataBarSettingsDlg(Window* pWindow, ScDocument* pDoc): FreeResource(); maLbTypeMin.SelectEntryPos(0); - maLbTypeMax.SelectEntryPos(1); + maLbTypeMax.SelectEntryPos(0); maLbAxisPos.SelectEntryPos(0); } @@ -73,29 +73,26 @@ void SetType(const ScColorScaleEntry* pEntry, ListBox& aLstBox) { switch(pEntry->GetType()) { - case COLORSCALE_MIN: + case COLORSCALE_AUTO: aLstBox.SelectEntryPos(0); break; - case COLORSCALE_MAX: + case COLORSCALE_MIN: aLstBox.SelectEntryPos(1); break; - case COLORSCALE_PERCENTILE: + case COLORSCALE_MAX: aLstBox.SelectEntryPos(2); break; - case COLORSCALE_PERCENT: + case COLORSCALE_PERCENTILE: aLstBox.SelectEntryPos(3); break; - case COLORSCALE_FORMULA: - aLstBox.SelectEntryPos(5); - break; - case COLORSCALE_VALUE: + case COLORSCALE_PERCENT: aLstBox.SelectEntryPos(4); break; - case COLORSCALE_AUTOMIN: + case COLORSCALE_FORMULA: aLstBox.SelectEntryPos(6); break; - case COLORSCALE_AUTOMAX: - aLstBox.SelectEntryPos(7); + case COLORSCALE_VALUE: + aLstBox.SelectEntryPos(5); break; } } @@ -107,34 +104,31 @@ void GetType(const ListBox& rLstBox, const Edit& rEd, ScColorScaleEntry* pEntry, switch(rLstBox.GetSelectEntryPos()) { case 0: - pEntry->SetType(COLORSCALE_MIN); + pEntry->SetType(COLORSCALE_AUTO); break; case 1: - pEntry->SetType(COLORSCALE_MAX); + pEntry->SetType(COLORSCALE_MIN); break; case 2: + pEntry->SetType(COLORSCALE_MAX); + break; + case 3: pEntry->SetType(COLORSCALE_PERCENTILE); pNumberFormatter->IsNumberFormat( rEd.GetText(), nIndex, nVal ); pEntry->SetValue(nVal); break; - case 3: + case 4: pEntry->SetType(COLORSCALE_PERCENT); pNumberFormatter->IsNumberFormat( rEd.GetText(), nIndex, nVal ); pEntry->SetValue(nVal); break; - case 4: + case 5: pNumberFormatter->IsNumberFormat( rEd.GetText(), nIndex, nVal ); pEntry->SetType(COLORSCALE_VALUE); pEntry->SetValue(nVal); break; - case 5: - //TODO: moggi - break; case 6: - pEntry->SetType(COLORSCALE_AUTOMIN); - break; - case 7: - pEntry->SetType(COLORSCALE_AUTOMAX); + //TODO: moggi break; } } diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 707462f3c879..ef022c0aa1b5 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -518,72 +518,72 @@ void SetColorScaleEntryTypes( const ScColorScaleEntry& rEntry, ListBox& rLbType, switch(rEntry.GetType()) { case COLORSCALE_MIN: - rLbType.SelectEntryPos(0); + rLbType.SelectEntryPos(1); break; case COLORSCALE_MAX: - rLbType.SelectEntryPos(1); + rLbType.SelectEntryPos(2); break; case COLORSCALE_PERCENTILE: rEdit.SetText(rtl::OUString::valueOf(rEntry.GetValue())); - rLbType.SelectEntryPos(2); + rLbType.SelectEntryPos(3); break; case COLORSCALE_PERCENT: rEdit.SetText(rtl::OUString::valueOf(rEntry.GetValue())); - rLbType.SelectEntryPos(4); + rLbType.SelectEntryPos(5); break; case COLORSCALE_FORMULA: rEdit.SetText(rEntry.GetFormula(formula::FormulaGrammar::GRAM_DEFAULT)); - rLbType.SelectEntryPos(5); + rLbType.SelectEntryPos(6); break; case COLORSCALE_VALUE: rEdit.SetText(rtl::OUString::valueOf(rEntry.GetValue())); - rLbType.SelectEntryPos(3); + rLbType.SelectEntryPos(4); break; - case COLORSCALE_AUTOMIN: - rLbType.SelectEntryPos(6); - break; - case COLORSCALE_AUTOMAX: - rLbType.SelectEntryPos(7); + case COLORSCALE_AUTO: + abort(); break; } rLbCol.SelectEntry(rEntry.GetColor()); } -void SetColorScaleEntry( ScColorScaleEntry* pEntry, const ListBox& rType, const Edit& rValue, ScDocument* pDoc, const ScAddress& rPos ) +void SetColorScaleEntry( ScColorScaleEntry* pEntry, const ListBox& rType, const Edit& rValue, ScDocument* pDoc, const ScAddress& rPos, bool bDataBar ) { sal_uInt32 nIndex = 0; double nVal = 0; SvNumberFormatter* pNumberFormatter = pDoc->GetFormatTable(); pNumberFormatter->IsNumberFormat(rValue.GetText(), nIndex, nVal); - switch(rType.GetSelectEntryPos()) + + // color scale does not have the automatic entry + sal_Int32 nPos = rType.GetSelectEntryPos(); + if(!bDataBar) + ++nPos; + + switch(nPos) { - case 0: + case 1: pEntry->SetType(COLORSCALE_MIN); break; - case 1: + case 2: pEntry->SetType(COLORSCALE_MAX); break; - case 2: + case 3: pEntry->SetType(COLORSCALE_PERCENTILE); pEntry->SetValue(nVal); break; - case 3: + case 4: pEntry->SetType(COLORSCALE_VALUE); pEntry->SetValue(nVal); break; - case 4: + case 5: pEntry->SetType(COLORSCALE_PERCENT); pEntry->SetValue(nVal); break; - case 5: + case 6: pEntry->SetType(COLORSCALE_FORMULA); pEntry->SetFormula(rValue.GetText(), pDoc, rPos); break; - case 6: - pEntry->SetType(COLORSCALE_AUTOMIN); - break; - case 7: - pEntry->SetType(COLORSCALE_AUTOMAX); + case 0: + pEntry->SetType(COLORSCALE_AUTO); break; default: break; @@ -594,7 +594,7 @@ ScColorScaleEntry* createColorScaleEntry( const ListBox& rType, const ColorListB { ScColorScaleEntry* pEntry = new ScColorScaleEntry(); - SetColorScaleEntry( pEntry, rType, rValue, pDoc, rPos ); + SetColorScaleEntry( pEntry, rType, rValue, pDoc, rPos, false ); Color aColor = rColor.GetSelectEntryColor(); pEntry->SetColor(aColor); return pEntry; @@ -612,6 +612,10 @@ ScColorScale2FrmtEntry::ScColorScale2FrmtEntry( Window* pParent, ScDocument* pDo maLbColMin( this, ScResId( LB_COL_MIN ) ), maLbColMax( this, ScResId( LB_COL_MAX ) ) { + // remove the automatic entry from color scales + maLbEntryTypeMin.RemoveEntry(0); + maLbEntryTypeMax.RemoveEntry(0); + maLbType.SelectEntryPos(0); maLbColorFormat.SelectEntryPos(0); if(pFormat) @@ -771,6 +775,11 @@ ScColorScale3FrmtEntry::ScColorScale3FrmtEntry( Window* pParent, ScDocument* pDo maLbColMiddle( this, ScResId( LB_COL_MIDDLE ) ), maLbColMax( this, ScResId( LB_COL_MAX ) ) { + // remove the automatic entry from color scales + maLbEntryTypeMin.RemoveEntry(0); + maLbEntryTypeMiddle.RemoveEntry(0); + maLbEntryTypeMax.RemoveEntry(0); + maLbType.SelectEntryPos(0); if(pFormat) { @@ -949,32 +958,29 @@ void SetDataBarEntryTypes( const ScColorScaleEntry& rEntry, ListBox& rLbType, Ed switch(rEntry.GetType()) { case COLORSCALE_MIN: - rLbType.SelectEntryPos(0); + rLbType.SelectEntryPos(1); break; case COLORSCALE_MAX: - rLbType.SelectEntryPos(1); + rLbType.SelectEntryPos(2); break; case COLORSCALE_PERCENTILE: rEdit.SetText(rtl::OUString::valueOf(rEntry.GetValue())); - rLbType.SelectEntryPos(2); + rLbType.SelectEntryPos(3); break; case COLORSCALE_PERCENT: rEdit.SetText(rtl::OUString::valueOf(rEntry.GetValue())); - rLbType.SelectEntryPos(4); + rLbType.SelectEntryPos(5); break; case COLORSCALE_FORMULA: rEdit.SetText(rEntry.GetFormula(formula::FormulaGrammar::GRAM_DEFAULT)); - rLbType.SelectEntryPos(5); + rLbType.SelectEntryPos(6); break; case COLORSCALE_VALUE: rEdit.SetText(rtl::OUString::valueOf(rEntry.GetValue())); - rLbType.SelectEntryPos(3); + rLbType.SelectEntryPos(4); break; - case COLORSCALE_AUTOMIN: - rLbType.SelectEntryPos(6); - break; - case COLORSCALE_AUTOMAX: - rLbType.SelectEntryPos(7); + case COLORSCALE_AUTO: + rLbType.SelectEntryPos(0); break; } } @@ -1002,7 +1008,7 @@ ScDataBarFrmtEntry::ScDataBarFrmtEntry( Window* pParent, ScDocument* pDoc, const else { maLbDataBarMinType.SelectEntryPos(0); - maLbDataBarMaxType.SelectEntryPos(1); + maLbDataBarMaxType.SelectEntryPos(0); } Init(); @@ -1033,8 +1039,8 @@ void ScDataBarFrmtEntry::Init() ScFormatEntry* ScDataBarFrmtEntry::createDatabarEntry() const { - SetColorScaleEntry(mpDataBarData->mpLowerLimit.get(), maLbDataBarMinType, maEdDataBarMin, mpDoc, maPos); - SetColorScaleEntry(mpDataBarData->mpUpperLimit.get(), maLbDataBarMaxType, maEdDataBarMax, mpDoc, maPos); + SetColorScaleEntry(mpDataBarData->mpLowerLimit.get(), maLbDataBarMinType, maEdDataBarMin, mpDoc, maPos, true); + SetColorScaleEntry(mpDataBarData->mpUpperLimit.get(), maLbDataBarMaxType, maEdDataBarMax, mpDoc, maPos, true); ScDataBarFormat* pDataBar = new ScDataBarFormat(mpDoc); pDataBar->SetDataBarData(new ScDataBarFormatData(*mpDataBarData.get())); return pDataBar; @@ -1081,8 +1087,8 @@ IMPL_LINK_NOARG( ScDataBarFrmtEntry, DataBarTypeSelectHdl ) IMPL_LINK_NOARG( ScDataBarFrmtEntry, OptionBtnHdl ) { - SetColorScaleEntry(mpDataBarData->mpLowerLimit.get(), maLbDataBarMinType, maEdDataBarMin, mpDoc, maPos); - SetColorScaleEntry(mpDataBarData->mpUpperLimit.get(), maLbDataBarMaxType, maEdDataBarMax, mpDoc, maPos); + SetColorScaleEntry(mpDataBarData->mpLowerLimit.get(), maLbDataBarMinType, maEdDataBarMin, mpDoc, maPos, true); + SetColorScaleEntry(mpDataBarData->mpUpperLimit.get(), maLbDataBarMaxType, maEdDataBarMax, mpDoc, maPos, true); ScDataBarSettingsDlg* pDlg = new ScDataBarSettingsDlg(this, *mpDataBarData, mpDoc); if( pDlg->Execute() == RET_OK) { diff --git a/sc/source/ui/src/colorformat.src b/sc/source/ui/src/colorformat.src index ce07fcb8e85e..dd702e100b95 100644 --- a/sc/source/ui/src/colorformat.src +++ b/sc/source/ui/src/colorformat.src @@ -134,14 +134,13 @@ ModalDialog RID_SCDLG_DATABAR DropDown = TRUE; StringList [ en-US ] = { + "Automatic"; "Minimum"; "Maximum"; "Percentile"; "Percent"; "Value"; "Formula"; - "AutoMin"; - "AutoMax"; }; }; ListBox LB_AXIS_POSITION diff --git a/sc/source/ui/src/condformatdlg.src b/sc/source/ui/src/condformatdlg.src index 4adff8f62fc4..5bd45a05d6ef 100644 --- a/sc/source/ui/src/condformatdlg.src +++ b/sc/source/ui/src/condformatdlg.src @@ -199,14 +199,13 @@ Control RID_COND_ENTRY DropDown = TRUE; StringList [ en-US ] = { + "Automatic"; "Min"; "Max"; "Percentile"; "Value"; "Percent"; "Formula"; - "AutoMin"; - "AutoMax"; }; }; ListBox LB_TYPE_COL_SCALE_MIDDLE @@ -217,14 +216,13 @@ Control RID_COND_ENTRY DropDown = TRUE; StringList [ en-US ] = { + "Automatic"; "Min"; "Max"; "Percentile"; "Value"; "Percent"; "Formula"; - "AutoMin"; - "AutoMax"; }; }; ListBox LB_TYPE_COL_SCALE_MAX @@ -235,14 +233,13 @@ Control RID_COND_ENTRY DropDown = TRUE; StringList [ en-US ] = { + "Automatic"; "Min"; "Max"; "Percentile"; "Value"; "Percent"; "Formula"; - "AutoMin"; - "AutoMax"; }; }; Window WD_PREVIEW From 8816aa1b8301bce189ee4582fa1b8f04864726a4 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Wed, 10 Oct 2012 05:37:27 +0200 Subject: [PATCH 657/863] remove commented out code Change-Id: I393ae93fa59530cccd9550f11957e03cb8fa6038 --- .../ui/condformat/condformatdlgentry.cxx | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index ef022c0aa1b5..c25223879696 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -648,25 +648,6 @@ void ScColorScale2FrmtEntry::Init() DBG_ASSERT( pDocSh, "DocShell not found!" ); - /* - Point aPointLb = maLbEntryTypeMiddle.GetPosPixel(); - Point aPointEd = maEdMiddle.GetPosPixel(); - Point aPointCol = maLbColMiddle.GetPosPixel(); - const long nMovePos = maLbEntryTypeMiddle.GetSizePixel().Width() * 1.2; - aPointLb.X() += nMovePos; - aPointEd.X() += nMovePos; - aPointCol.X() += nMovePos; - maLbEntryTypeMiddle.SetPosPixel(aPointLb); - maEdMiddle.SetPosPixel(aPointEd); - maLbColMiddle.SetPosPixel(aPointCol); - aPointLb.X() += nMovePos; - aPointEd.X() += nMovePos; - aPointCol.X() += nMovePos; - maLbEntryTypeMax.SetPosPixel(aPointLb); - maEdMax.SetPosPixel(aPointEd); - maLbColMax.SetPosPixel(aPointCol); - */ - if ( pDocSh ) { pItem = pDocSh->GetItem( SID_COLOR_TABLE ); From 2757c7450de3369872a247cf4876bb1723cc48fa Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Wed, 10 Oct 2012 06:06:23 +0200 Subject: [PATCH 658/863] unify the list box entry handling a bit Change-Id: Ia42e56dd21567ac65ca952dc66471cfb326a9e1c --- sc/inc/colorscale.hxx | 9 ++- sc/source/ui/condformat/colorformat.cxx | 66 +++++-------------- .../ui/condformat/condformatdlgentry.cxx | 63 +++++------------- sc/source/ui/src/colorformat.src | 2 +- 4 files changed, 40 insertions(+), 100 deletions(-) diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx index 7ee92ce09c6e..92f88f3359b4 100644 --- a/sc/inc/colorscale.hxx +++ b/sc/inc/colorscale.hxx @@ -45,15 +45,18 @@ class ScFormulaCell; class ScTokenArray; struct ScDataBarInfo; +// don't change the order +// they are also used in the dialog to determine the position +// in the list box enum ScColorScaleEntryType { - COLORSCALE_VALUE, + COLORSCALE_AUTO, COLORSCALE_MIN, COLORSCALE_MAX, - COLORSCALE_PERCENT, COLORSCALE_PERCENTILE, + COLORSCALE_VALUE, + COLORSCALE_PERCENT, COLORSCALE_FORMULA, - COLORSCALE_AUTO, }; class SC_DLLPUBLIC ScColorScaleEntry diff --git a/sc/source/ui/condformat/colorformat.cxx b/sc/source/ui/condformat/colorformat.cxx index 7dfa918d6e3b..963137d1e28a 100644 --- a/sc/source/ui/condformat/colorformat.cxx +++ b/sc/source/ui/condformat/colorformat.cxx @@ -69,64 +69,28 @@ ScDataBarSettingsDlg::ScDataBarSettingsDlg(Window* pWindow, ScDocument* pDoc): namespace { -void SetType(const ScColorScaleEntry* pEntry, ListBox& aLstBox) +void SetType(const ScColorScaleEntry* pEntry, ListBox& rLstBox) { - switch(pEntry->GetType()) - { - case COLORSCALE_AUTO: - aLstBox.SelectEntryPos(0); - break; - case COLORSCALE_MIN: - aLstBox.SelectEntryPos(1); - break; - case COLORSCALE_MAX: - aLstBox.SelectEntryPos(2); - break; - case COLORSCALE_PERCENTILE: - aLstBox.SelectEntryPos(3); - break; - case COLORSCALE_PERCENT: - aLstBox.SelectEntryPos(4); - break; - case COLORSCALE_FORMULA: - aLstBox.SelectEntryPos(6); - break; - case COLORSCALE_VALUE: - aLstBox.SelectEntryPos(5); - break; - } + rLstBox.SelectEntryPos(pEntry->GetType()); } void GetType(const ListBox& rLstBox, const Edit& rEd, ScColorScaleEntry* pEntry, SvNumberFormatter* pNumberFormatter ) { double nVal = 0; sal_uInt32 nIndex = 0; + pEntry->SetType(static_cast(rLstBox.GetSelectEntryPos())); switch(rLstBox.GetSelectEntryPos()) { - case 0: - pEntry->SetType(COLORSCALE_AUTO); + case COLORSCALE_AUTO: + case COLORSCALE_MIN: + case COLORSCALE_MAX: break; - case 1: - pEntry->SetType(COLORSCALE_MIN); - break; - case 2: - pEntry->SetType(COLORSCALE_MAX); - break; - case 3: - pEntry->SetType(COLORSCALE_PERCENTILE); + case COLORSCALE_PERCENTILE: + case COLORSCALE_VALUE: + case COLORSCALE_PERCENT: pNumberFormatter->IsNumberFormat( rEd.GetText(), nIndex, nVal ); pEntry->SetValue(nVal); break; - case 4: - pEntry->SetType(COLORSCALE_PERCENT); - pNumberFormatter->IsNumberFormat( rEd.GetText(), nIndex, nVal ); - pEntry->SetValue(nVal); - break; - case 5: - pNumberFormatter->IsNumberFormat( rEd.GetText(), nIndex, nVal ); - pEntry->SetType(COLORSCALE_VALUE); - pEntry->SetValue(nVal); - break; case 6: //TODO: moggi break; @@ -288,10 +252,10 @@ IMPL_LINK_NOARG( ScDataBarSettingsDlg, OkBtnHdl ) //check that min < max bool bWarn = false; sal_Int32 nSelectMin = maLbTypeMin.GetSelectEntryPos(); - if( nSelectMin == 1 || nSelectMin == 7) + if( nSelectMin == COLORSCALE_MIN ) bWarn = true; sal_Int32 nSelectMax = maLbTypeMax.GetSelectEntryPos(); - if( nSelectMax == 0 || nSelectMax == 6 ) + if( nSelectMax == COLORSCALE_MAX ) bWarn = true; if(!bWarn && maLbTypeMin.GetSelectEntryPos() == maLbTypeMax.GetSelectEntryPos()) @@ -327,14 +291,14 @@ IMPL_LINK_NOARG( ScDataBarSettingsDlg, OkBtnHdl ) IMPL_LINK_NOARG( ScDataBarSettingsDlg, TypeSelectHdl ) { sal_Int32 nSelectMin = maLbTypeMin.GetSelectEntryPos(); - if( nSelectMin == 0 || nSelectMin == 1 || nSelectMin == 6 || nSelectMin == 7) + if( nSelectMin <= COLORSCALE_MAX) maEdMin.Disable(); else { maEdMin.Enable(); if(!maEdMin.GetText().Len()) { - if(nSelectMin == 2 || nSelectMin == 3) + if(nSelectMin == COLORSCALE_PERCENTILE || nSelectMin == COLORSCALE_PERCENT) maEdMin.SetText(rtl::OUString::valueOf(static_cast(50))); else maEdMin.SetText(rtl::OUString::valueOf(static_cast(0))); @@ -342,14 +306,14 @@ IMPL_LINK_NOARG( ScDataBarSettingsDlg, TypeSelectHdl ) } sal_Int32 nSelectMax = maLbTypeMax.GetSelectEntryPos(); - if(nSelectMax == 0 || nSelectMax == 1 || nSelectMax == 6 || nSelectMax == 7) + if(nSelectMax <= COLORSCALE_MAX) maEdMax.Disable(); else { maEdMax.Enable(); if(!maEdMax.GetText().Len()) { - if(nSelectMax == 2 || nSelectMax == 3) + if(nSelectMax == COLORSCALE_PERCENTILE || nSelectMax == COLORSCALE_PERCENT) maEdMax.SetText(rtl::OUString::valueOf(static_cast(50))); else maEdMax.SetText(rtl::OUString::valueOf(static_cast(0))); diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index c25223879696..14b7bd430a6b 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -515,29 +515,19 @@ namespace { void SetColorScaleEntryTypes( const ScColorScaleEntry& rEntry, ListBox& rLbType, Edit& rEdit, ColorListBox& rLbCol ) { + rLbType.SelectEntryPos(rEntry.GetType()); switch(rEntry.GetType()) { case COLORSCALE_MIN: - rLbType.SelectEntryPos(1); - break; case COLORSCALE_MAX: - rLbType.SelectEntryPos(2); break; case COLORSCALE_PERCENTILE: - rEdit.SetText(rtl::OUString::valueOf(rEntry.GetValue())); - rLbType.SelectEntryPos(3); - break; + case COLORSCALE_VALUE: case COLORSCALE_PERCENT: rEdit.SetText(rtl::OUString::valueOf(rEntry.GetValue())); - rLbType.SelectEntryPos(5); break; case COLORSCALE_FORMULA: rEdit.SetText(rEntry.GetFormula(formula::FormulaGrammar::GRAM_DEFAULT)); - rLbType.SelectEntryPos(6); - break; - case COLORSCALE_VALUE: - rEdit.SetText(rtl::OUString::valueOf(rEntry.GetValue())); - rLbType.SelectEntryPos(4); break; case COLORSCALE_AUTO: abort(); @@ -558,33 +548,23 @@ void SetColorScaleEntry( ScColorScaleEntry* pEntry, const ListBox& rType, const if(!bDataBar) ++nPos; + pEntry->SetType(static_cast(nPos)); switch(nPos) { - case 1: - pEntry->SetType(COLORSCALE_MIN); + case COLORSCALE_AUTO: + case COLORSCALE_MIN: + case COLORSCALE_MAX: break; - case 2: - pEntry->SetType(COLORSCALE_MAX); break; - case 3: - pEntry->SetType(COLORSCALE_PERCENTILE); + break; + case COLORSCALE_PERCENTILE: + case COLORSCALE_VALUE: + case COLORSCALE_PERCENT: pEntry->SetValue(nVal); break; - case 4: - pEntry->SetType(COLORSCALE_VALUE); - pEntry->SetValue(nVal); - break; - case 5: - pEntry->SetType(COLORSCALE_PERCENT); - pEntry->SetValue(nVal); - break; - case 6: - pEntry->SetType(COLORSCALE_FORMULA); + case COLORSCALE_FORMULA: pEntry->SetFormula(rValue.GetText(), pDoc, rPos); break; - case 0: - pEntry->SetType(COLORSCALE_AUTO); - break; default: break; } @@ -724,7 +704,7 @@ IMPL_LINK( ScColorScale2FrmtEntry, EntryTypeHdl, ListBox*, pBox ) { bool bEnableEdit = true; sal_Int32 nPos = pBox->GetSelectEntryPos(); - if(nPos == 0 || nPos == 1) + if(nPos < 2) { bEnableEdit = false; } @@ -895,7 +875,7 @@ IMPL_LINK( ScColorScale3FrmtEntry, EntryTypeHdl, ListBox*, pBox ) { bool bEnableEdit = true; sal_Int32 nPos = pBox->GetSelectEntryPos(); - if(nPos == 0 || nPos == 1) + if(nPos < 2) { bEnableEdit = false; } @@ -936,32 +916,24 @@ namespace { void SetDataBarEntryTypes( const ScColorScaleEntry& rEntry, ListBox& rLbType, Edit& rEdit ) { + rLbType.SelectEntryPos(rEntry.GetType()); switch(rEntry.GetType()) { + case COLORSCALE_AUTO: case COLORSCALE_MIN: - rLbType.SelectEntryPos(1); - break; case COLORSCALE_MAX: - rLbType.SelectEntryPos(2); break; case COLORSCALE_PERCENTILE: rEdit.SetText(rtl::OUString::valueOf(rEntry.GetValue())); - rLbType.SelectEntryPos(3); break; case COLORSCALE_PERCENT: rEdit.SetText(rtl::OUString::valueOf(rEntry.GetValue())); - rLbType.SelectEntryPos(5); break; case COLORSCALE_FORMULA: rEdit.SetText(rEntry.GetFormula(formula::FormulaGrammar::GRAM_DEFAULT)); - rLbType.SelectEntryPos(6); break; case COLORSCALE_VALUE: rEdit.SetText(rtl::OUString::valueOf(rEntry.GetValue())); - rLbType.SelectEntryPos(4); - break; - case COLORSCALE_AUTO: - rLbType.SelectEntryPos(0); break; } } @@ -990,6 +962,7 @@ ScDataBarFrmtEntry::ScDataBarFrmtEntry( Window* pParent, ScDocument* pDoc, const { maLbDataBarMinType.SelectEntryPos(0); maLbDataBarMaxType.SelectEntryPos(0); + DataBarTypeSelectHdl(NULL); } Init(); @@ -1052,13 +1025,13 @@ void ScDataBarFrmtEntry::SetInactive() IMPL_LINK_NOARG( ScDataBarFrmtEntry, DataBarTypeSelectHdl ) { sal_Int32 nSelectPos = maLbDataBarMinType.GetSelectEntryPos(); - if(nSelectPos == 0 || nSelectPos == 1) + if(nSelectPos <= COLORSCALE_MAX) maEdDataBarMin.Disable(); else maEdDataBarMin.Enable(); nSelectPos = maLbDataBarMaxType.GetSelectEntryPos(); - if(nSelectPos == 0 || nSelectPos == 1) + if(nSelectPos <= COLORSCALE_MAX) maEdDataBarMax.Disable(); else maEdDataBarMax.Enable(); diff --git a/sc/source/ui/src/colorformat.src b/sc/source/ui/src/colorformat.src index dd702e100b95..2cc585283e62 100644 --- a/sc/source/ui/src/colorformat.src +++ b/sc/source/ui/src/colorformat.src @@ -138,8 +138,8 @@ ModalDialog RID_SCDLG_DATABAR "Minimum"; "Maximum"; "Percentile"; - "Percent"; "Value"; + "Percent"; "Formula"; }; }; From 616662f48df7a13dd957918f43202ccb2d1899b3 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Wed, 10 Oct 2012 06:08:42 +0200 Subject: [PATCH 659/863] forgot to hide this list box when deactivating an entry Change-Id: I9313a5ac542ca83be418b9c9aeca46e500c3ddaa --- sc/source/ui/condformat/condformatdlgentry.cxx | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 14b7bd430a6b..97706f851ad1 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -674,6 +674,8 @@ ScFormatEntry* ScColorScale2FrmtEntry::GetEntry() const void ScColorScale2FrmtEntry::SetActive() { + maLbColorFormat.Show(); + maLbEntryTypeMin.Show(); maLbEntryTypeMax.Show(); @@ -688,6 +690,8 @@ void ScColorScale2FrmtEntry::SetActive() void ScColorScale2FrmtEntry::SetInactive() { + maLbColorFormat.Hide(); + maLbEntryTypeMin.Hide(); maLbEntryTypeMax.Hide(); @@ -839,6 +843,7 @@ ScFormatEntry* ScColorScale3FrmtEntry::GetEntry() const void ScColorScale3FrmtEntry::SetActive() { + maLbColorFormat.Show(); maLbEntryTypeMin.Show(); maLbEntryTypeMiddle.Show(); maLbEntryTypeMax.Show(); @@ -856,6 +861,8 @@ void ScColorScale3FrmtEntry::SetActive() void ScColorScale3FrmtEntry::SetInactive() { + maLbColorFormat.Hide(); + maLbEntryTypeMin.Hide(); maLbEntryTypeMiddle.Hide(); maLbEntryTypeMax.Hide(); @@ -1002,6 +1009,8 @@ ScFormatEntry* ScDataBarFrmtEntry::createDatabarEntry() const void ScDataBarFrmtEntry::SetActive() { + maLbColorFormat.Show(); + maLbDataBarMinType.Show(); maLbDataBarMaxType.Show(); maEdDataBarMin.Show(); @@ -1013,6 +1022,8 @@ void ScDataBarFrmtEntry::SetActive() void ScDataBarFrmtEntry::SetInactive() { + maLbColorFormat.Hide(); + maLbDataBarMinType.Hide(); maLbDataBarMaxType.Hide(); maEdDataBarMin.Hide(); From 1818256fb39d292cc7ed7d24f1db4b4b03e74c58 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Wed, 10 Oct 2012 06:33:55 +0200 Subject: [PATCH 660/863] adapt indexes in databar dlg Change-Id: I381a34b5b7422c5f3a7b6f8f4a8d37859cfb12be --- sc/source/ui/condformat/colorformat.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sc/source/ui/condformat/colorformat.cxx b/sc/source/ui/condformat/colorformat.cxx index 963137d1e28a..532c692f0a8a 100644 --- a/sc/source/ui/condformat/colorformat.cxx +++ b/sc/source/ui/condformat/colorformat.cxx @@ -252,15 +252,15 @@ IMPL_LINK_NOARG( ScDataBarSettingsDlg, OkBtnHdl ) //check that min < max bool bWarn = false; sal_Int32 nSelectMin = maLbTypeMin.GetSelectEntryPos(); - if( nSelectMin == COLORSCALE_MIN ) + if( nSelectMin == COLORSCALE_MAX ) bWarn = true; sal_Int32 nSelectMax = maLbTypeMax.GetSelectEntryPos(); - if( nSelectMax == COLORSCALE_MAX ) + if( nSelectMax == COLORSCALE_MIN ) bWarn = true; if(!bWarn && maLbTypeMin.GetSelectEntryPos() == maLbTypeMax.GetSelectEntryPos()) { - if(maLbTypeMax.GetSelectEntryPos() != 5) + if(maLbTypeMax.GetSelectEntryPos() != COLORSCALE_FORMULA) { rtl::OUString aMinString = maEdMin.GetText(); rtl::OUString aMaxString = maEdMax.GetText(); From f6739073edc1b593035f25becbd0e9d6d536ef0c Mon Sep 17 00:00:00 2001 From: Jose Guilherme Vanz Date: Mon, 8 Oct 2012 21:22:03 -0300 Subject: [PATCH 661/863] Remove commented code and empty methods MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch removes commented code and some empty private methods Change-Id: I4a79e521399a07873030f021a97c01cf8d2e81d7 Signed-off-by: José Guilherme Vanz Reviewed-on: https://gerrit.libreoffice.org/844 Reviewed-by: Thomas Arnhold Tested-by: Thomas Arnhold --- .../com/sun/star/report/SDBCReportData.java | 11 -- .../com/sun/star/report/SOImageService.java | 1 - .../star/report/pentaho/SOFormulaParser.java | 5 - .../layoutprocessor/FormatValueUtility.java | 1 - .../FormattedTextLayoutController.java | 1 - .../ImageElementLayoutController.java | 5 - .../star/wizards/agenda/AgendaTemplate.java | 4 - .../agenda/AgendaWizardDialogImpl.java | 10 -- .../star/wizards/agenda/TopicsControl.java | 16 --- .../sun/star/wizards/common/ConfigGroup.java | 1 - .../star/wizards/common/NumberFormatter.java | 2 +- .../star/wizards/common/NumericalHelper.java | 114 +----------------- 12 files changed, 2 insertions(+), 169 deletions(-) diff --git a/reportbuilder/java/com/sun/star/report/SDBCReportData.java b/reportbuilder/java/com/sun/star/report/SDBCReportData.java index 0faf94c69e2f..7f8fae13a16f 100644 --- a/reportbuilder/java/com/sun/star/report/SDBCReportData.java +++ b/reportbuilder/java/com/sun/star/report/SDBCReportData.java @@ -179,17 +179,6 @@ public class SDBCReportData implements DataSource { } -// public int getCurrentRow() throws DataSourceException -// { -// try -// { -// return rowSet.getRow(); -// } -// catch (SQLException e) -// { -// throw new DataSourceException(e.getMessage(), e); -// } -// } static private java.sql.Date getDate(final Object obj) { final java.sql.Date date; diff --git a/reportbuilder/java/com/sun/star/report/SOImageService.java b/reportbuilder/java/com/sun/star/report/SOImageService.java index e9c073984ba1..78f4e45e5ebe 100644 --- a/reportbuilder/java/com/sun/star/report/SOImageService.java +++ b/reportbuilder/java/com/sun/star/report/SOImageService.java @@ -81,7 +81,6 @@ public class SOImageService implements ImageService { new PropertyValue() }; - // value[0] = new PropertyValue(); value[0].Name = "InputStream"; value[0].Value = image; diff --git a/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java b/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java index de35978d8573..a9b236d6fe10 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java @@ -309,11 +309,6 @@ public final class SOFormulaParser extends ComponentBase public void setOpCodeMap(com.sun.star.sheet.FormulaOpCodeMapEntry[] the_value) { -// m_prophlp.prepareSet("OpCodeMap", null); -// synchronized (this) -// { -// m_OpCodeMap.clear(); -// } } public String getImplementationName() diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java index 3936079c32a6..ad653a70ead0 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java @@ -179,7 +179,6 @@ public class FormatValueUtility if (!"string".equals(valueType)) { variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, VALUE_TYPE, "string"); - //variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, VALUE, String.valueOf(value)); } variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, STRING_VALUE, String.valueOf(value)); } diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java index 1607b696aad9..3362b266b410 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java @@ -111,7 +111,6 @@ public class FormattedTextLayoutController variablesGet.setAttribute(JFreeReportInfo.REPORT_NAMESPACE, Element.NAMESPACE_ATTRIBUTE, OfficeNamespaces.TEXT_NS); variablesGet.setAttribute(OfficeNamespaces.TEXT_NS, "name", name); - //variablesGet.setAttribute(OfficeNamespaces.TEXT_NS, "display", "value"); final String dataStyleName = computeValueStyle(); if (dataStyleName != null) diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java index 1b6f8e4b8f18..0b4ffb3b33ae 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java @@ -198,11 +198,6 @@ public class ImageElementLayoutController continue; } final Element child = (Element) node; - /* - if (! OfficeToken.COVERED_TABLE_CELL.equals(child.getType()) && - (ObjectUtilities.equal(child.getNamespace(), namespace) == false || - ObjectUtilities.equal(child.getType(), type) == false)) - */ if (!ObjectUtilities.equal(child.getNamespace(), namespace) || (!ObjectUtilities.equal(child.getType(), type) && (secondType == null || !ObjectUtilities.equal(child.getType(), secondType)))) { continue; diff --git a/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java b/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java index 6be8215f8498..69659f529681 100644 --- a/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java +++ b/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java @@ -1757,10 +1757,6 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data } XTableRows tableRows = table.getRows(); int targetNumOfRows = topics * rowsPerTopic + 1; - if (tableRows.getCount() > targetNumOfRows) - { - //tableRows.removeByIndex(targetNumOfRows, tableRows.getCount() - targetNumOfRows); - } formatLastRow(); while (writtenTopics.size() > topics) { diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java index adab22a168a9..8d7804610144 100644 --- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java +++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java @@ -490,16 +490,6 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog //document, but it is already stored, written down by a code above. The //reason this piece is malfunctioning, because the agendaTemplate.document //is read-only (At least as my tests indicated.). - /* - * try { - * XStorable xStoreable = UnoRuntime.queryInterface(XStorable.class, agendaTemplate.document); - * xStoreable.store(); - * } - * catch (Exception ex) { - * SystemDialog.showMessageBox(xMSF, "ErrorBox", VclWindowPeerAttribute.OK, resources.resErrSaveTemplate); - * ex.printStackTrace(); - * } - */ agendaTemplate.xTextDocument.unlockControllers(); diff --git a/wizards/com/sun/star/wizards/agenda/TopicsControl.java b/wizards/com/sun/star/wizards/agenda/TopicsControl.java index 4a72e26d89c9..551c8da86b0d 100644 --- a/wizards/com/sun/star/wizards/agenda/TopicsControl.java +++ b/wizards/com/sun/star/wizards/agenda/TopicsControl.java @@ -404,16 +404,6 @@ public class TopicsControl extends ControlScroller implements XFocusListener ((AgendaWizardDialogImpl)CurUnoDialog).agendaTemplate.refreshTopicConstants(); } - private void lockDoc() - { - //((AgendaWizardDialogImpl)CurUnoDialog).agendaTemplate.xTextDocument.lockControllers(); - } - - private void unlockDoc() - { - //((AgendaWizardDialogImpl)CurUnoDialog).agendaTemplate.xTextDocument.unlockControllers(); - } - /** * Removes the current row. * See general class documentation explanation about the @@ -421,7 +411,6 @@ public class TopicsControl extends ControlScroller implements XFocusListener */ public void removeRow() { - lockDoc(); for (int i = lastFocusRow; i < scrollfields.size() - 1; i++) { PropertyValue[] pv1 = scrollfields.get(i); @@ -445,8 +434,6 @@ public class TopicsControl extends ControlScroller implements XFocusListener // the focus should return to the edit control focus(lastFocusControl); - - unlockDoc(); } /** @@ -456,7 +443,6 @@ public class TopicsControl extends ControlScroller implements XFocusListener */ public void insertRow() { - lockDoc(); insertRowAtEnd(); for (int i = scrollfields.size() - 2; i > lastFocusRow; i--) { @@ -487,8 +473,6 @@ public class TopicsControl extends ControlScroller implements XFocusListener fillupControls(lastFocusRow - nscrollvalue); focus(lastFocusControl); - - unlockDoc(); } /** diff --git a/wizards/com/sun/star/wizards/common/ConfigGroup.java b/wizards/com/sun/star/wizards/common/ConfigGroup.java index 4a48caa464d2..0f9970d5ecec 100644 --- a/wizards/com/sun/star/wizards/common/ConfigGroup.java +++ b/wizards/com/sun/star/wizards/common/ConfigGroup.java @@ -51,7 +51,6 @@ public class ConfigGroup implements ConfigNode private void writeField(Field field, Object configView, String prefix) throws Exception { String propertyName = field.getName().substring(prefix.length()); - //System.out.println("Going to save:" + propertyName); Class fieldType = field.getType(); if (ConfigNode.class.isAssignableFrom(fieldType)) { diff --git a/wizards/com/sun/star/wizards/common/NumberFormatter.java b/wizards/com/sun/star/wizards/common/NumberFormatter.java index c90ce2f2546d..b5920de3c885 100644 --- a/wizards/com/sun/star/wizards/common/NumberFormatter.java +++ b/wizards/com/sun/star/wizards/common/NumberFormatter.java @@ -187,7 +187,7 @@ public class NumberFormatter { try { - XPropertySet xNumberFormat = _oNumberFormatter.xNumberFormats.getByKey(_FormatKey); //CurDBField.DBFormatKey); + XPropertySet xNumberFormat = _oNumberFormatter.xNumberFormats.getByKey(_FormatKey); String FormatString = AnyConverter.toString(Helper.getUnoPropertyValue(xNumberFormat, "FormatString")); Locale oLocale = (Locale) Helper.getUnoPropertyValue(xNumberFormat, "Locale"); int NewFormatKey = defineNumberFormat(FormatString, oLocale); diff --git a/wizards/com/sun/star/wizards/common/NumericalHelper.java b/wizards/com/sun/star/wizards/common/NumericalHelper.java index d5a198f65693..22eb3b1c7a03 100644 --- a/wizards/com/sun/star/wizards/common/NumericalHelper.java +++ b/wizards/com/sun/star/wizards/common/NumericalHelper.java @@ -17,7 +17,6 @@ */ package com.sun.star.wizards.common; -// import com.sun.star.beans.XPropertySet; import com.sun.star.uno.AnyConverter; import com.sun.star.uno.TypeClass; @@ -92,7 +91,6 @@ public class NumericalHelper { byte retValue = 0; - // boolean hasConversionWarning = false; TypeObject aTypeObject = getTypeObject(aValue); switch (aTypeObject.iType) { @@ -396,97 +394,7 @@ public class NumericalHelper } return false; } -// public static int toIntWithErrorMessage(Object _aValue) throws com.sun.star.script.BasicErrorException{ -// try { -// return toInt(_aValue); -// } -// catch(com.sun.star.lang.IllegalArgumentException e) { -// DebugHelper.exception(BasicErrorCode.SbERR_CONVERSION, PropertyNames.EMPTY_STRING); -// return 0; -// }} -// -// -// public static String toStringWithErrorMessage(Object _aValue) throws com.sun.star.script.BasicErrorException{ -// try { -// return toString(_aValue); -// } -// catch(com.sun.star.lang.IllegalArgumentException e) { -// DebugHelper.exception(BasicErrorCode.SbERR_CONVERSION, PropertyNames.EMPTY_STRING); -// return PropertyNames.EMPTY_STRING; -// }} -// -// -// public static int toIntWithErrorMessage(Object _aValue, int _ndefaultValue) throws com.sun.star.script.BasicErrorException{ -// try { -// return toInt(_aValue, _ndefaultValue); -// } -// catch(com.sun.star.uno.Exception e) { -// DebugHelper.exception(BasicErrorCode.SbERR_CONVERSION, PropertyNames.EMPTY_STRING); -// return 0; -// }} -// -// public static boolean toBooleanWithErrorMessage(Object _oObject, int _nTrueField, int _nFalseField) throws com.sun.star.script.BasicErrorException{ -// return toBooleanWithErrorMessage(_oObject, new int[]{_nTrueField}, new int[]{_nFalseField}); -// } -// -// -// public static boolean toBooleanWithErrorMessage(Object _oObject) throws com.sun.star.script.BasicErrorException{ -// try{ -// return toBoolean(_oObject); -// } -// catch (java.lang.Exception e){ -// DebugHelper.exception(BasicErrorCode.SbERR_BAD_ARGUMENT, PropertyNames.EMPTY_STRING); -// return false; -// } -// } -// -// -// public static boolean toBooleanWithErrorMessage(Object _oObject, int[] _nTrueFields, int[] _nFalseFields) throws com.sun.star.script.BasicErrorException{ -// try{ -// int nValue = NumericalHelper.toIntWithErrorMessage(_oObject); -// if (ContainerUtilities.FieldInIntTable(_nTrueFields, nValue) > -1){ -// return true; -// } -// else if (ContainerUtilities.FieldInIntTable(_nFalseFields, nValue) > -1){ -// return false; -// } -// else{ -// DebugHelper.exception(BasicErrorCode.SbERR_OUT_OF_RANGE, PropertyNames.EMPTY_STRING); -// return false; -// } -// }catch (java.lang.Exception e){ -// DebugHelper.exception(BasicErrorCode.SbERR_OUT_OF_RANGE, PropertyNames.EMPTY_STRING); -// return false; -// }} -// -// -// public static boolean toBooleanWithErrorMessage(Object _oObject, int _nTrueField, int _nFalseField, boolean _bdefaultValue) throws com.sun.star.script.BasicErrorException{ -// return toBooleanWithErrorMessage(_oObject, new int[]{_nTrueField}, new int[]{_nFalseField}, _bdefaultValue); -// } -// -// -// public static boolean toBooleanWithErrorMessage(Object _oObject, int[] _nTrueFields, int[] _nFalseFields, boolean _bdefaultValue) throws com.sun.star.script.BasicErrorException{ -// try{ -// if ((_oObject == null) || (AnyConverter.isVoid(_oObject))){ -// return _bdefaultValue; -// } -// else{ -// int nValue = NumericalHelper.toIntWithErrorMessage(_oObject); -// if (ContainerUtilities.FieldInIntTable(_nTrueFields, nValue) > -1){ -// return true; -// } -// else if (ContainerUtilities.FieldInIntTable(_nFalseFields, nValue) > -1){ -// return false; -// } -// else{ -// DebugHelper.exception(BasicErrorCode.SbERR_OUT_OF_RANGE, PropertyNames.EMPTY_STRING); -// return false; -// } -// } -// }catch (java.lang.Exception e){ -// DebugHelper.exception(BasicErrorCode.SbERR_OUT_OF_RANGE, PropertyNames.EMPTY_STRING); -// return false; -// }} + /** * get an int value from the object * @param aValue @@ -1484,26 +1392,6 @@ public class NumericalHelper return destObject; } -// public static boolean isObjectNumericRepresentation(Object _oValue, NumberFormatter _oNumberFormatter, XPropertySet _xPropertySet) throws com.sun.star.script.BasicErrorException{ -// try{ -// int nNumberFormat = AnyConverter.toInt(_xPropertySet.getPropertyValue("NumberFormat")); -// if (AnyConverter.isString(_oValue)){ -// String sCellContent = AnyConverter.toString(_oValue); -// try{ -// _oNumberFormatter.convertStringToNumber(nNumberFormat, sCellContent); -// return true; -// }catch (Exception e){ -// return false; -// } -// } -// else{ -// return true; -// } -// } -// catch (com.sun.star.uno.Exception e){ -// DebugHelper.exception(1 /*BasicErrorCode.SbERR_METHOD_FAILED*/, PropertyNames.EMPTY_STRING); -// return false; -// }} /** * Helper class for roman numbering */ From 36026a6ae5d2f42db5fa262a358a3bc8e33e036c Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Sun, 30 Sep 2012 19:53:40 +0200 Subject: [PATCH 662/863] mork driver: add list tables and unit test Change-Id: I594b24341eb38c05523f578c1dc2e43d90544f30 --- connectivity/CppunitTest_connectivity_mork.mk | 57 ++++++ connectivity/Module_connectivity.mk | 6 +- .../qa/connectivity/mork/DriverTest.cxx | 173 ++++++++++++++++++ .../connectivity/mork/abook_10_john_does.mab | 159 ++++++++++++++++ .../source/drivers/mork/MColumnAlias.cxx | 4 + .../source/drivers/mork/MColumnAlias.hxx | 3 +- .../source/drivers/mork/MConnection.cxx | 28 ++- .../drivers/mork/MDatabaseMetaDataHelper.cxx | 31 +++- .../source/drivers/mork/MQueryHelper.cxx | 46 ++++- .../source/drivers/mork/MQueryHelper.hxx | 3 + .../source/drivers/mork/MResultSet.cxx | 4 +- .../source/drivers/mork/MorkParser.cxx | 133 ++++++++++++++ .../source/drivers/mork/MorkParser.hxx | 6 + 13 files changed, 621 insertions(+), 32 deletions(-) create mode 100644 connectivity/CppunitTest_connectivity_mork.mk create mode 100644 connectivity/qa/connectivity/mork/DriverTest.cxx create mode 100644 connectivity/qa/connectivity/mork/abook_10_john_does.mab diff --git a/connectivity/CppunitTest_connectivity_mork.mk b/connectivity/CppunitTest_connectivity_mork.mk new file mode 100644 index 000000000000..987dd5773fa6 --- /dev/null +++ b/connectivity/CppunitTest_connectivity_mork.mk @@ -0,0 +1,57 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_CppunitTest_CppunitTest,connectivity_mork)) + +$(eval $(call gb_CppunitTest_set_include,connectivity_mork,\ + -I$(SRCDIR)/connectivity/source/inc \ + -I$(SRCDIR)/connectivity/source/drivers/mork \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_use_api,connectivity_mork,\ + udkapi \ + offapi \ +)) + +$(eval $(call gb_CppunitTest_use_ure,connectivity_mork)) + +$(eval $(call gb_CppunitTest_use_sdk_api,connectivity_mork)) + +$(eval $(call gb_CppunitTest_add_exception_objects,connectivity_mork, \ + connectivity/qa/connectivity/mork/DriverTest \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,connectivity_mork, \ + comphelper \ + cppu \ + cppuhelper \ + i18nisolang1 \ + mork \ + sal \ + salhelper \ + sb \ + test \ + unotest \ + ucbhelper \ + utl \ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_CppunitTest_use_components,connectivity_mork,\ + configmgr/source/configmgr \ + i18npool/util/i18npool \ + connectivity/source/drivers/mork/mork \ + ucb/source/core/ucb1 \ + ucb/source/ucp/file/ucpfile1 \ +)) + +$(eval $(call gb_CppunitTest_use_configuration,connectivity_mork)) + +# vim: set noet sw=4 ts=4: diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index 3cd7daa38b48..ae5932d3a873 100644 --- a/connectivity/Module_connectivity.mk +++ b/connectivity/Module_connectivity.mk @@ -145,10 +145,14 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,connectivity,\ Jar_ConnectivityTools \ )) # FIXME: Does not work. Convert to JUnit. - # JunitTest_complex \ +# JunitTest_complex \ endif +$(eval $(call gb_Module_add_check_targets,connectivity,\ + CppunitTest_connectivity_mork \ +)) + endif # vim: set noet sw=4 ts=4: diff --git a/connectivity/qa/connectivity/mork/DriverTest.cxx b/connectivity/qa/connectivity/mork/DriverTest.cxx new file mode 100644 index 000000000000..1db1d9f7c1e0 --- /dev/null +++ b/connectivity/qa/connectivity/mork/DriverTest.cxx @@ -0,0 +1,173 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include + +#include "MColumnAlias.hxx" +#include "MQueryHelper.hxx" +#include "MConnection.hxx" + +#include + +using namespace ::com::sun::star::beans; +using namespace ::com::sun::star::sdbc; +using namespace ::com::sun::star::uno; + +namespace connectivity { namespace mork { + + +class MorkDriverTest: public test::BootstrapFixture +{ +public: + MorkDriverTest() : test::BootstrapFixture(false, false) {}; + + void test_metadata(); + void test_select_default_all(); + void test_select_list_table_joe_doe_5(); + + virtual void setUp(); + virtual void tearDown(); + + CPPUNIT_TEST_SUITE(MorkDriverTest); + + CPPUNIT_TEST(test_metadata); + CPPUNIT_TEST(test_select_default_all); + CPPUNIT_TEST(test_select_list_table_joe_doe_5); + CPPUNIT_TEST_SUITE_END(); + +private: + Reference m_xMorkComponent; + Reference m_xConnection; +}; + +void MorkDriverTest::setUp() +{ + test::BootstrapFixture::setUp(); + m_xMorkComponent = getMultiServiceFactory()->createInstance("com.sun.star.comp.sdbc.MorkDriver"); + CPPUNIT_ASSERT_MESSAGE("no mork component!", m_xMorkComponent.is()); + + // is this the best way to pass test file through URL? + // may be take a custom Sequence< PropertyValue > route? + OUString url = OUString("sdbc:address:thunderbird:unittest:") + + getPathFromSrc("/connectivity/qa/connectivity/mork/abook_10_john_does.mab"); + + Sequence< PropertyValue > info; + Reference< XDriver> xDriver(m_xMorkComponent, UNO_QUERY); + if (!xDriver.is()) + { + CPPUNIT_ASSERT_MESSAGE("cannot connect to mork driver!", xDriver.is()); + } + + m_xConnection = xDriver->connect(url, info); + if (!m_xConnection.is()) + { + CPPUNIT_ASSERT_MESSAGE("cannot connect to address book data soure!", m_xConnection.is()); + } +} + +void MorkDriverTest::tearDown() +{ +// how to make dispose() work? +// Reference< com::sun::star::lang::XComponent >( m_xMorkComponent, UNO_QUERY_THROW )->dispose(); + test::BootstrapFixture::tearDown(); +} + +void MorkDriverTest::test_metadata() +{ + Reference< XDatabaseMetaData > xDatabaseMetaData = m_xConnection->getMetaData(); + if (!xDatabaseMetaData.is()) + { + CPPUNIT_ASSERT_MESSAGE("cannot retrieve meta data!", xDatabaseMetaData.is()); + } + + const Any catalog; + const OUString schemaPattern = "%"; + const OUString tableNamePattern = "%"; + const Sequence< OUString > types; + + Reference< XResultSet > xResultSet = + xDatabaseMetaData->getTables(catalog, schemaPattern, tableNamePattern, types); + if (!xResultSet.is()) + { + CPPUNIT_ASSERT_MESSAGE("cannot retrieve tables!", xResultSet.is()); + } + + // TODO: how to access that result set and check the tables? + // it should be 3 tables inside: AddressBook, does_5 and does_10 +} + +void MorkDriverTest::test_select_default_all() +{ + const OUString sql = "select \"E-mail\" from \"AddressBook\" ORDER BY \"E-mail\""; + Reference< XPreparedStatement > xStatement = m_xConnection->prepareStatement(sql); + if (!xStatement.is()) + { + CPPUNIT_ASSERT_MESSAGE("cannot create prepared statement!", xStatement.is()); + } + + Reference< XResultSet > xResultSet = xStatement->executeQuery(); + if (!xResultSet.is()) + { + CPPUNIT_ASSERT_MESSAGE("cannot execure sql statement!", xResultSet.is()); + } + + Reference< XRow > xDelegatorRow(xResultSet, UNO_QUERY); + if (!xDelegatorRow.is()) + { + CPPUNIT_ASSERT_MESSAGE("cannot extract row from result set!", xDelegatorRow.is()); + } + + sal_Bool result = xResultSet->first(); + CPPUNIT_ASSERT_MESSAGE("fetch first row failed!", result); + OUString mail = xDelegatorRow->getString(1); + CPPUNIT_ASSERT_MESSAGE("first row is not john@doe.org!", mail.equalsAscii("john@doe.org")); + + result = xResultSet->next(); + CPPUNIT_ASSERT_MESSAGE("fetch second row failed!", result); + mail = xDelegatorRow->getString(1); + CPPUNIT_ASSERT_MESSAGE("second row is not john@doe10.org!", mail.equalsAscii("john@doe10.org")); + + result = xResultSet->last(); + CPPUNIT_ASSERT_MESSAGE("fetch last row failed!", result); + mail = xDelegatorRow->getString(1); + CPPUNIT_ASSERT_MESSAGE("last row is not john@doe9.org!", mail.equalsAscii("john@doe9.org")); +} + +void MorkDriverTest::test_select_list_table_joe_doe_5() +{ + const OUString sql = "select \"E-mail\" from \"does_5\" where \"E-mail\" LIKE '%doe5.org' "; + Reference< XPreparedStatement > xStatement = m_xConnection->prepareStatement(sql); + if (!xStatement.is()) + { + CPPUNIT_ASSERT_MESSAGE("cannot create prepared statement!", xStatement.is()); + } + + Reference< XResultSet > xResultSet = xStatement->executeQuery(); + if (!xResultSet.is()) + { + CPPUNIT_ASSERT_MESSAGE("cannot execure sql statement!", xResultSet.is()); + } + + Reference< XRow > xDelegatorRow(xResultSet, UNO_QUERY); + if (!xDelegatorRow.is()) + { + CPPUNIT_ASSERT_MESSAGE("cannot extract row from result set!", xDelegatorRow.is()); + } + + sal_Bool result = xResultSet->first(); + CPPUNIT_ASSERT_MESSAGE("fetch first row failed!", result); + OUString mail = xDelegatorRow->getString(1); + CPPUNIT_ASSERT_MESSAGE("last row is not john@doe5.org!", mail.equalsAscii("john@doe5.org")); +} + +CPPUNIT_TEST_SUITE_REGISTRATION(MorkDriverTest); + +}} + +CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/connectivity/qa/connectivity/mork/abook_10_john_does.mab b/connectivity/qa/connectivity/mork/abook_10_john_does.mab new file mode 100644 index 000000000000..41aac4c3e42c --- /dev/null +++ b/connectivity/qa/connectivity/mork/abook_10_john_does.mab @@ -0,0 +1,159 @@ +// +< <(a=c)> // (f=iso-8859-1) + (B8=LastModifiedDate)(B9=RecordKey)(BA=AddrCharSet)(BB=LastRecordKey) + (BC=ns:addrbk:db:table:kind:pab)(BD=ListName)(BE=ListNickName) + (BF=ListDescription)(C0=ListTotalAddresses)(C1=LowercaseListName) + (C2=ns:addrbk:db:table:kind:deleted)(C3=_Yahoo)(C4=_MSN) + (C5=_GoogleTalk)(C6=_Skype)(C7=_JabberId)(C8=PreferDisplayName) + (C9=PhotoURI)(CA=PhotoType)(CB=PhotoName)(CC=DbRowID)(CD=_QQ)(CE=_ICQ) + (80=ns:addrbk:db:row:scope:card:all) + (81=ns:addrbk:db:row:scope:list:all) + (82=ns:addrbk:db:row:scope:data:all)(83=FirstName)(84=LastName) + (85=PhoneticFirstName)(86=PhoneticLastName)(87=DisplayName) + (88=NickName)(89=PrimaryEmail)(8A=LowercasePrimaryEmail) + (8B=SecondEmail)(8C=PreferMailFormat)(8D=PopularityIndex) + (8E=AllowRemoteContent)(8F=WorkPhone)(90=HomePhone)(91=FaxNumber) + (92=PagerNumber)(93=CellularNumber)(94=WorkPhoneType)(95=HomePhoneType) + (96=FaxNumberType)(97=PagerNumberType)(98=CellularNumberType) + (99=HomeAddress)(9A=HomeAddress2)(9B=HomeCity)(9C=HomeState) + (9D=HomeZipCode)(9E=HomeCountry)(9F=WorkAddress)(A0=WorkAddress2) + (A1=WorkCity)(A2=WorkState)(A3=WorkZipCode)(A4=WorkCountry) + (A5=JobTitle)(A6=Department)(A7=Company)(A8=_AimScreenName) + (A9=AnniversaryYear)(AA=AnniversaryMonth)(AB=AnniversaryDay) + (AC=SpouseName)(AD=FamilyName)(AE=WebPage1)(AF=WebPage2)(B0=BirthYear) + (B1=BirthMonth)(B2=BirthDay)(B3=Custom1)(B4=Custom2)(B5=Custom3) + (B6=Custom4)(B7=Notes)> + +<(AF=b)(81=John Doe)(82=)(80=0)(83=John)(84=1)(85=Doe)(86=john@doe.org) + (87=generic)(88=John Doe2)(89=Doe2)(8A=john@doe2.org)(8B=2)(8C=John Doe3) + (8D=Doe3)(8E=john@doe3.org)(8F=3)(90=John Doe4)(91=Doe4)(92 + =john@doe4.org)(93=4)(94=John Doe5)(95=Doe5)(96=john@doe5.org)(97=5) + (98=John Doe6)(99=Doe6)(9A=john@doe6.org)(9B=6)(9C=John Doe7)(9D=Doe7) + (9E=john@doe7.org)(9F=7)(A0=John Doe8)(A1=Doe8)(A2=john@doe8.org) + (A3=8)(A4=John Doe9)(A5=Doe9)(A6=john@doe9.org)(A7=9)(A8=John Doe10) + (A9=Doe10)(AA=john@doe10.org)(AB=10)(AC=a)(AD=Does_5)(AE=does_5)> +{1:^80 {(k^BC:c)(s=9)} + [1:^82(^BB=b)] + [1(^87^81)(^86=)(^C3=)(^A1=)(^AE=)(^C4=)(^C5=)(^B2=)(^A7=)(^9A=)(^B3=) + (^C6=)(^A6=)(^A4=)(^A5=)(^A3=)(^9E=)(^85=)(^B0=)(^8D=0)(^C7=)(^A0=) + (^A2=)(^B7=)(^8C=0)(^B8=0)(^83^83)(^A8=)(^C8=1)(^84^85)(^92=)(^C9=) + (^B6=)(^9D=)(^89^86)(^8E=0)(^AF=)(^CA^87)(^8F=)(^CB=)(^8B=)(^93=) + (^90=)(^CC=1)(^B1=)(^CD=)(^9B=)(^9C=)(^91=)(^B4=)(^9F=)(^99=)(^88=) + (^CE=)(^B5=)(^8A^86)(^B9=1)] + [2(^87^88)(^86=)(^C3=)(^A1=)(^AE=)(^C4=)(^C5=)(^B2=)(^A7=)(^9A=)(^B3=) + (^C6=)(^A6=)(^A4=)(^A5=)(^A3=)(^9E=)(^85=)(^B0=)(^8D=0)(^C7=)(^A0=) + (^A2=)(^B7=)(^8C=0)(^B8=0)(^83^83)(^A8=)(^C8=1)(^84^89)(^92=)(^C9=) + (^B6=)(^9D=)(^89^8A)(^8E=0)(^AF=)(^CA^87)(^8F=)(^CB=)(^8B=)(^93=) + (^90=)(^CC=2)(^B1=)(^CD=)(^9B=)(^9C=)(^91=)(^B4=)(^9F=)(^99=)(^88=) + (^CE=)(^B5=)(^8A^8A)(^B9=2)] + [3(^87^8C)(^86=)(^C3=)(^A1=)(^AE=)(^C4=)(^C5=)(^B2=)(^A7=)(^9A=)(^B3=) + (^C6=)(^A6=)(^A4=)(^A5=)(^A3=)(^9E=)(^85=)(^B0=)(^8D=0)(^C7=)(^A0=) + (^A2=)(^B7=)(^8C=0)(^B8=0)(^83^83)(^A8=)(^C8=1)(^84^8D)(^92=)(^C9=) + (^B6=)(^9D=)(^89^8E)(^8E=0)(^AF=)(^CA^87)(^8F=)(^CB=)(^8B=)(^93=) + (^90=)(^CC=3)(^B1=)(^CD=)(^9B=)(^9C=)(^91=)(^B4=)(^9F=)(^99=)(^88=) + (^CE=)(^B5=)(^8A^8E)(^B9=3)] + [4(^87^90)(^86=)(^C3=)(^A1=)(^AE=)(^C4=)(^C5=)(^B2=)(^A7=)(^9A=)(^B3=) + (^C6=)(^A6=)(^A4=)(^A5=)(^A3=)(^9E=)(^85=)(^B0=)(^8D=0)(^C7=)(^A0=) + (^A2=)(^B7=)(^8C=0)(^B8=0)(^83^83)(^A8=)(^C8=1)(^84^91)(^92=)(^C9=) + (^B6=)(^9D=)(^89^92)(^8E=0)(^AF=)(^CA^87)(^8F=)(^CB=)(^8B=)(^93=) + (^90=)(^CC=4)(^B1=)(^CD=)(^9B=)(^9C=)(^91=)(^B4=)(^9F=)(^99=)(^88=) + (^CE=)(^B5=)(^8A^92)(^B9=4)] + [5(^87^94)(^86=)(^C3=)(^A1=)(^AE=)(^C4=)(^C5=)(^B2=)(^A7=)(^9A=)(^B3=) + (^C6=)(^A6=)(^A4=)(^A5=)(^A3=)(^9E=)(^85=)(^B0=)(^8D=0)(^C7=)(^A0=) + (^A2=)(^B7=)(^8C=0)(^B8=0)(^83^83)(^A8=)(^C8=1)(^84^95)(^92=)(^C9=) + (^B6=)(^9D=)(^89^96)(^8E=0)(^AF=)(^CA^87)(^8F=)(^CB=)(^8B=)(^93=) + (^90=)(^CC=5)(^B1=)(^CD=)(^9B=)(^9C=)(^91=)(^B4=)(^9F=)(^99=)(^88=) + (^CE=)(^B5=)(^8A^96)(^B9=5)] + [6(^87^98)(^86=)(^C3=)(^A1=)(^AE=)(^C4=)(^C5=)(^B2=)(^A7=)(^9A=)(^B3=) + (^C6=)(^A6=)(^A4=)(^A5=)(^A3=)(^9E=)(^85=)(^B0=)(^8D=0)(^C7=)(^A0=) + (^A2=)(^B7=)(^8C=0)(^B8=0)(^83^83)(^A8=)(^C8=1)(^84^99)(^92=)(^C9=) + (^B6=)(^9D=)(^89^9A)(^8E=0)(^AF=)(^CA^87)(^8F=)(^CB=)(^8B=)(^93=) + (^90=)(^CC=6)(^B1=)(^CD=)(^9B=)(^9C=)(^91=)(^B4=)(^9F=)(^99=)(^88=) + (^CE=)(^B5=)(^8A^9A)(^B9=6)] + [7(^87^9C)(^86=)(^C3=)(^A1=)(^AE=)(^C4=)(^C5=)(^B2=)(^A7=)(^9A=)(^B3=) + (^C6=)(^A6=)(^A4=)(^A5=)(^A3=)(^9E=)(^85=)(^B0=)(^8D=0)(^C7=)(^A0=) + (^A2=)(^B7=)(^8C=0)(^B8=0)(^83^83)(^A8=)(^C8=1)(^84^9D)(^92=)(^C9=) + (^B6=)(^9D=)(^89^9E)(^8E=0)(^AF=)(^CA^87)(^8F=)(^CB=)(^8B=)(^93=) + (^90=)(^CC=7)(^B1=)(^CD=)(^9B=)(^9C=)(^91=)(^B4=)(^9F=)(^99=)(^88=) + (^CE=)(^B5=)(^8A^9E)(^B9=7)] + [8(^87^A0)(^86=)(^C3=)(^A1=)(^AE=)(^C4=)(^C5=)(^B2=)(^A7=)(^9A=)(^B3=) + (^C6=)(^A6=)(^A4=)(^A5=)(^A3=)(^9E=)(^85=)(^B0=)(^8D=0)(^C7=)(^A0=) + (^A2=)(^B7=)(^8C=0)(^B8=0)(^83^83)(^A8=)(^C8=1)(^84^A1)(^92=)(^C9=) + (^B6=)(^9D=)(^89^A2)(^8E=0)(^AF=)(^CA^87)(^8F=)(^CB=)(^8B=)(^93=) + (^90=)(^CC=8)(^B1=)(^CD=)(^9B=)(^9C=)(^91=)(^B4=)(^9F=)(^99=)(^88=) + (^CE=)(^B5=)(^8A^A2)(^B9=8)] + [9(^87^A4)(^86=)(^C3=)(^A1=)(^AE=)(^C4=)(^C5=)(^B2=)(^A7=)(^9A=)(^B3=) + (^C6=)(^A6=)(^A4=)(^A5=)(^A3=)(^9E=)(^85=)(^B0=)(^8D=0)(^C7=)(^A0=) + (^A2=)(^B7=)(^8C=0)(^B8=0)(^83^83)(^A8=)(^C8=1)(^84^A5)(^92=)(^C9=) + (^B6=)(^9D=)(^89^A6)(^8E=0)(^AF=)(^CA^87)(^8F=)(^CB=)(^8B=)(^93=) + (^90=)(^CC=9)(^B1=)(^CD=)(^9B=)(^9C=)(^91=)(^B4=)(^9F=)(^99=)(^88=) + (^CE=)(^B5=)(^8A^A6)(^B9=9)] + [A(^87^A8)(^86=)(^C3=)(^A1=)(^AE=)(^C4=)(^C5=)(^B2=)(^A7=)(^9A=)(^B3=) + (^C6=)(^A6=)(^A4=)(^A5=)(^A3=)(^9E=)(^85=)(^B0=)(^8D=0)(^C7=)(^A0=) + (^A2=)(^B7=)(^8C=0)(^B8=0)(^83^83)(^A8=)(^C8=1)(^84^A9)(^92=)(^C9=) + (^B6=)(^9D=)(^89^AA)(^8E=0)(^AF=)(^CA^87)(^8F=)(^CB=)(^8B=)(^93=) + (^90=)(^CC=10)(^B1=)(^CD=)(^9B=)(^9C=)(^91=)(^B4=)(^9F=)(^99=)(^88=) + (^CE=)(^B5=)(^8A^AA)(^B9=a)] + [1:^81(^BD^AD)(^C1^AE)(^BE=)(^BF=)(^C0=0)(^B9=b)]} + +@$${9{@ + +<(B2=c)(B0=Does_10)(B1=does_10)> +{1:^80 {(k^BC:c)(s=9)} + [-2:^81(^BD^B0)(^C1^B1)(^BE=)(^BF=)(^C0=0)(^B9=c)]} +[1:^82(^BB=c)] +@$$}9}@ + +@$${A{@ +< <(a=c)> // (f=iso-8859-1) + (CF=Address1)> +[-1:^81(^BD^AD)(^C1^AE)(^BE=)(^BF=)(^C0=1)(^B9=b)(^CF=1)] +@$$}A}@ + +@$${B{@ +< <(a=c)> // (f=iso-8859-1) + (D0=Address2)> +[-1:^81(^BD^AD)(^C1^AE)(^BE=)(^BF=)(^C0=2)(^B9=b)(^CF=1)(^D0=2)] +@$$}B}@ + +@$${C{@ +< <(a=c)> // (f=iso-8859-1) + (D1=Address3)> +[-1:^81(^BD^AD)(^C1^AE)(^BE=)(^BF=)(^C0=3)(^B9=b)(^CF=1)(^D0=2)(^D1=3)] +@$$}C}@ + +@$${D{@ +< <(a=c)> // (f=iso-8859-1) + (D2=Address4)> +[-1:^81(^BD^AD)(^C1^AE)(^BE=)(^BF=)(^C0=4)(^B9=b)(^CF=1)(^D0=2)(^D1=3) + (^D2=4)] +@$$}D}@ + +@$${E{@ +< <(a=c)> // (f=iso-8859-1) + (D3=Address5)> +[-1:^81(^BD^AD)(^C1^AE)(^BE=)(^BF=)(^C0=5)(^B9=b)(^CF=1)(^D0=2)(^D1=3) + (^D2=4)(^D3=5)] +@$$}E}@ + +@$${F{@ +[-2:^81(^BD^B0)(^C1^B1)(^BE=)(^BF=)(^C0=1)(^B9=c)(^CF=a)] +@$$}F}@ + +@$${10{@ +[-2:^81(^BD^B0)(^C1^B1)(^BE=)(^BF=)(^C0=2)(^B9=c)(^CF=a)(^D0=6)] +@$$}10}@ + +@$${11{@ +[-2:^81(^BD^B0)(^C1^B1)(^BE=)(^BF=)(^C0=3)(^B9=c)(^CF=a)(^D0=6)(^D1=7)] +@$$}11}@ + +@$${12{@ +[-2:^81(^BD^B0)(^C1^B1)(^BE=)(^BF=)(^C0=4)(^B9=c)(^CF=a)(^D0=6)(^D1=7) + (^D2=8)] +@$$}12}@ + +@$${13{@ +[-2:^81(^BD^B0)(^C1^B1)(^BE=)(^BF=)(^C0=5)(^B9=c)(^CF=a)(^D0=6)(^D1=7) + (^D2=8)(^D3=9)] +@$$}13}@ diff --git a/connectivity/source/drivers/mork/MColumnAlias.cxx b/connectivity/source/drivers/mork/MColumnAlias.cxx index 624b5ab88e43..ba653c3e9009 100644 --- a/connectivity/source/drivers/mork/MColumnAlias.cxx +++ b/connectivity/source/drivers/mork/MColumnAlias.cxx @@ -87,6 +87,10 @@ OColumnAlias::OColumnAlias( const ::com::sun::star::uno::Reference< ::com::sun:: initialize( _rxORB ); } +OColumnAlias::OColumnAlias() +{ +} + //------------------------------------------------------------------------------ void OColumnAlias::initialize( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB ) { diff --git a/connectivity/source/drivers/mork/MColumnAlias.hxx b/connectivity/source/drivers/mork/MColumnAlias.hxx index 45f6f780c966..21f21963fc81 100644 --- a/connectivity/source/drivers/mork/MColumnAlias.hxx +++ b/connectivity/source/drivers/mork/MColumnAlias.hxx @@ -31,7 +31,7 @@ namespace connectivity { namespace mork { - class OColumnAlias + class SAL_DLLPUBLIC_EXPORT OColumnAlias { public: struct AliasEntry @@ -57,6 +57,7 @@ namespace connectivity public: OColumnAlias( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & ); + OColumnAlias(); inline bool hasAlias( const ::rtl::OUString& _rAlias ) const { diff --git a/connectivity/source/drivers/mork/MConnection.cxx b/connectivity/source/drivers/mork/MConnection.cxx index a35badddc2c8..47525d2f946b 100644 --- a/connectivity/source/drivers/mork/MConnection.cxx +++ b/connectivity/source/drivers/mork/MConnection.cxx @@ -85,11 +85,11 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV nLen = url.indexOf(':',nLen+1); OSL_ENSURE( url.copy( 0, nLen ) == "sdbc:address", "OConnection::construct: invalid start of the URI - should never have survived XDriver::acceptsURL!" ); - ::rtl::OUString aAddrbookURI(url.copy(nLen+1)); + OUString aAddrbookURI(url.copy(nLen+1)); // Get Scheme nLen = aAddrbookURI.indexOf(':'); - ::rtl::OUString aAddrbookScheme; - ::rtl::OUString sAdditionalInfo; + OUString aAddrbookScheme; + OUString sAdditionalInfo; if ( nLen == -1 ) { // There isn't any subschema: - but could be just subschema @@ -112,13 +112,23 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV SAL_INFO("connectivity.mork", "URI = " << aAddrbookURI ); SAL_INFO("connectivity.mork", "Scheme = " << aAddrbookScheme ); - ::rtl::OUString defaultProfile = m_pProfileAccess->getDefaultProfile(::com::sun::star::mozilla::MozillaProductType_Thunderbird); - SAL_INFO("connectivity.mork", "DefaultProfile: " << defaultProfile); + OUString path; + const OUString UNITTEST_URL = "thunderbird:unittest:"; + sal_Int32 unittestIndex = url.indexOf(UNITTEST_URL); - ::rtl::OUString path = m_pProfileAccess->getProfilePath(::com::sun::star::mozilla::MozillaProductType_Thunderbird, defaultProfile); - SAL_INFO("connectivity.mork", "ProfilePath: " << path); - - path += rtl::OUString( "/abook.mab" ); + // production? + if (unittestIndex == -1) + { + OUString defaultProfile = m_pProfileAccess->getDefaultProfile(::com::sun::star::mozilla::MozillaProductType_Thunderbird); + path = m_pProfileAccess->getProfilePath(::com::sun::star::mozilla::MozillaProductType_Thunderbird, defaultProfile); + SAL_INFO("connectivity.mork", "DefaultProfile: " << defaultProfile); + SAL_INFO("connectivity.mork", "ProfilePath: " << path); + path += rtl::OUString( "/abook.mab" ); + } + else + { + path = aAddrbookURI.replaceFirst(UNITTEST_URL, ""); + } SAL_INFO("connectivity.mork", "AdressbookPath: " << path); diff --git a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx index a22b660650a8..1507b8b6ec2e 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx @@ -31,6 +31,8 @@ static ::osl::Mutex m_aMetaMutex; #include #include +#include "MorkParser.hxx" + using namespace connectivity; using namespace connectivity::mork; @@ -52,11 +54,21 @@ sal_Bool MDatabaseMetaDataHelper::getTableStrings( OConnection* ::rtl::OString sAbURIString; SAL_INFO("connectivity.mork", "=> MDatabaseMetaDataHelper::getTableStrings()"); - _pCon->getMorkParser(); - // TODO: retrieve Tables from MorkParser - // only put for now the private adress book - rtl::OUString table = rtl::OUString::createFromAscii( "AddressBook"); + + /* add default table */ + OUString table = "AddressBook"; _rStrings.push_back(table); + + /* retrieve list table names */ + std::set lists; + _pCon->getMorkParser()->retrieveLists(lists); + for (::std::set::iterator iter = lists.begin(); iter != lists.end(); ++iter) { + OUString groupTableName = OStringToOUString((*iter).c_str(), RTL_TEXTENCODING_UTF8); + SAL_INFO("connectivity.mork", "add Table " << groupTableName); + + _rStrings.push_back(groupTableName); + } + return( sal_True ); } @@ -70,14 +82,14 @@ sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon, static ODatabaseMetaDataResultSet::ORows aRows; SAL_INFO("connectivity.mork", "=> MDatabaseMetaDataHelper::getTables()" ); + SAL_INFO("connectivity.mork", "tableNamePattern : " << tableNamePattern); ::osl::MutexGuard aGuard( m_aMetaMutex ); ODatabaseMetaDataResultSet::ORows().swap(aRows); // this makes real clear where memory is freed as well aRows.clear(); ::std::vector< ::rtl::OUString > tables; -// ::std::vector< ::rtl::OUString > tabletypes; - ::rtl::OUString matchAny = rtl::OUString::createFromAscii("%"); + OUString matchAny = "%"; if ( !getTableStrings( _pCon, tables ) ) return sal_False; @@ -86,21 +98,20 @@ sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon, ODatabaseMetaDataResultSet::ORow aRow(3); ::rtl::OUString aTableName = tables[i]; - //::rtl::OUString aTableType = tabletypes[i]; SAL_INFO("connectivity.mork", "TableName: " << aTableName ); // return tables to caller if (match( tableNamePattern, aTableName, '\0' )) - { + { if ( aTableName.isEmpty() ) { - aTableName = rtl::OUString::createFromAscii("AddressBook"); + aTableName = "AddressBook"; } SAL_INFO("connectivity.mork", "TableName: " << aTableName); aRow.push_back( new ORowSetValueDecorator( aTableName ) ); // Table name - aRow.push_back( new ORowSetValueDecorator( rtl::OUString::createFromAscii("TABLE") ) ); // Table type + aRow.push_back( new ORowSetValueDecorator( OUString::createFromAscii("TABLE") ) ); // Table type aRow.push_back( ODatabaseMetaDataResultSet::getEmptyValue() ); // Remarks aRows.push_back(aRow); } diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx b/connectivity/source/drivers/mork/MQueryHelper.cxx index 9091d108e0ae..efd56f42b49a 100644 --- a/connectivity/source/drivers/mork/MQueryHelper.cxx +++ b/connectivity/source/drivers/mork/MQueryHelper.cxx @@ -26,6 +26,8 @@ #include #include #include +#include +#include #include #include "resource/mork_res.hrc" @@ -239,7 +241,18 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection) SAL_INFO("connectivity.mork", "MQueryHelper::executeQuery()" ); reset(); - //dumpExpression(this, &m_aExpr); + rtl::OString oStringTable = OUStringToOString( m_aAddressbook, RTL_TEXTENCODING_UTF8 ); + std::set listRecords; + bool handleListTable = false; + + // check if we are retrieving the default table + if (oStringTable != "AddressBook") + { + handleListTable = true; + // retrieve row ids for that list table + std::string listTable = oStringTable.getStr(); + xConnection->getMorkParser()->getRecordKeysForListTable(listTable, listRecords); + } MorkTableMap::iterator tableIter; MorkTableMap *Tables = xConnection->getMorkParser()->getTables( 0x80 ); MorkRowMap *Rows = 0; @@ -249,38 +262,53 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection) for ( tableIter = Tables->begin(); tableIter != Tables->end(); ++tableIter ) { if (tableIter->first != 1) break; - Rows = xConnection->getMorkParser()->getRows( 0x80, &tableIter->second ); + Rows = xConnection->getMorkParser()->getRows( 0x80, &tableIter->second ); if ( Rows ) { // Iterate all rows for ( rowIter = Rows->begin(); rowIter != Rows->end(); ++rowIter ) { + // list specific table + // only retrieve rowIds that belong to that list table. + if (handleListTable) + { + int rowId = rowIter->first; + // belongs this row id to the list table? + if (listRecords.end() == std::find(listRecords.begin(), listRecords.end(), rowId)) + { + // no, skip it + continue; + } + } + MQueryHelperResultEntry* entry = new MQueryHelperResultEntry(); for (MorkCells::iterator CellsIter = rowIter->second.begin(); CellsIter != rowIter->second.end(); ++CellsIter ) { std::string column = xConnection->getMorkParser()->getColumn(CellsIter->first); std::string value = xConnection->getMorkParser()->getValue(CellsIter->second); - - //SAL_INFO("connectivity.mork", "key: " << column << " value: " << value); - OString key(column.c_str(), static_cast(column.size())); OString valueOString(value.c_str(), static_cast(value.size())); - rtl::OUString valueOUString = ::rtl::OStringToOUString( valueOString, RTL_TEXTENCODING_UTF8 ); + rtl::OUString valueOUString = OStringToOUString( valueOString, RTL_TEXTENCODING_UTF8 ); entry->setValue(key, valueOUString); } ::std::vector< sal_Bool > vector = entryMatchedByExpression(this, &m_aExpr, entry); sal_Bool result = sal_True; - for (::std::vector::iterator iter = vector.begin(); iter != vector.end(); ++iter) { + for (::std::vector::iterator iter = vector.begin(); iter != vector.end(); ++iter) + { result = result && *iter; } - if (result) { + if (result) + { append(entry); } + else + { + delete entry; + } } } } - return 0; } diff --git a/connectivity/source/drivers/mork/MQueryHelper.hxx b/connectivity/source/drivers/mork/MQueryHelper.hxx index 28b1e0739e9e..de1fff09d8cf 100644 --- a/connectivity/source/drivers/mork/MQueryHelper.hxx +++ b/connectivity/source/drivers/mork/MQueryHelper.hxx @@ -185,6 +185,9 @@ namespace connectivity void getCardValues(nsIAbCard *card,sal_uInt32 rowIndex=0); */ + sal_Int32 doQueryDefaultTable(OConnection* xConnection); + sal_Int32 doQueryListTable(OConnection* xConnection, rtl::OString& ouStringTable); + public: MQueryHelper(const OColumnAlias& _ca); virtual ~MQueryHelper(); diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx index 49ee90a0f387..03f1c1bfba49 100644 --- a/connectivity/source/drivers/mork/MResultSet.cxx +++ b/connectivity/source/drivers/mork/MResultSet.cxx @@ -70,8 +70,8 @@ using namespace com::sun::star::util; Sequence< ::rtl::OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw( RuntimeException) { ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(2); - aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.ResultSet")); - aSupported[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.ResultSet")); + aSupported[0] = OUString("com.sun.star.sdbc.ResultSet"); + aSupported[1] = OUString("com.sun.star.sdbcx.ResultSet"); return aSupported; } // ------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/mork/MorkParser.cxx b/connectivity/source/drivers/mork/MorkParser.cxx index da772a101f49..06373310e3d5 100644 --- a/connectivity/source/drivers/mork/MorkParser.cxx +++ b/connectivity/source/drivers/mork/MorkParser.cxx @@ -39,6 +39,7 @@ #include #include #include +#include std::string g_Empty = ""; @@ -598,6 +599,138 @@ std::string &MorkParser::getColumn( int oid ) return foundIter->second; } +void MorkParser::retrieveLists(std::set& lists) +{ + MorkTableMap* tables = getTables(defaultScope_); + if (!tables) return; + for (MorkTableMap::iterator TableIter = tables->begin(); + TableIter != tables->end(); TableIter++ ) + { +#ifdef VERBOSE + std::cout << "\t Table:" + << ( ( int ) TableIter->first < 0 ? "-" : " " ) + << std::hex << std::uppercase << TableIter->first << std::endl; +#endif + MorkRowMap* rows = getRows( defaultListScope_, &TableIter->second ); + if (!rows) return; + for ( MorkRowMap::iterator RowIter = rows->begin(); + RowIter != rows->end(); RowIter++ ) + { +#ifdef VERBOSE + std::cout << "\t\t\t Row Id:" + << ( ( int ) RowIter->first < 0 ? "-" : " ") + << std::hex << std::uppercase << RowIter->first << std::endl; + std::cout << "\t\t\t\t Cells:\r\n"; +#endif + // Get cells + for ( MorkCells::iterator cellsIter = RowIter->second.begin(); + cellsIter != RowIter->second.end(); cellsIter++ ) + { + if (cellsIter->first == 0xC1) + { + lists.insert(getValue( cellsIter->second )); + break; + } + } + } + } +} + +void MorkParser::getRecordKeys4List(std::string& listName, std::vector& records) +{ + MorkTableMap* tables = getTables(defaultScope_); + if (!tables) return; + for (MorkTableMap::iterator TableIter = tables->begin(); + TableIter != tables->end(); TableIter++ ) + { +#ifdef VERBOSE + std::cout << "\t Table:" + << ( ( int ) TableIter->first < 0 ? "-" : " " ) + << std::hex << std::uppercase << TableIter->first << std::endl; +#endif + MorkRowMap* rows = getRows( 0x81, &TableIter->second ); + if (!rows) return; + for ( MorkRowMap::iterator RowIter = rows->begin(); + RowIter != rows->end(); RowIter++ ) + { +#ifdef VERBOSE + std::cout << "\t\t\t Row Id:" + << ( ( int ) RowIter->first < 0 ? "-" : " ") + << std::hex << std::uppercase << RowIter->first << std::endl; + std::cout << "\t\t\t\t Cells:\r\n"; +#endif + // Get cells + bool listFound = false; + for ( MorkCells::iterator cellsIter = RowIter->second.begin(); + cellsIter != RowIter->second.end(); cellsIter++ ) + { + if (listFound) + { + if (cellsIter->first >= 0xC7) + { + std::string value = getValue(cellsIter->second); + records.push_back(value); + } + } + else if ((cellsIter->first == 0xC1) && + listName == getValue( cellsIter->second )) + { + listFound = true; + } + } + + } + } +} + +void MorkParser::getRecordKeysForListTable(std::string& listName, std::set& records) +{ + MorkTableMap* tables = getTables(defaultScope_); + if (!tables) return; + for (MorkTableMap::iterator TableIter = tables->begin(); + TableIter != tables->end(); TableIter++ ) + { +#ifdef VERBOSE + std::cout << "\t Table:" + << ( ( int ) TableIter->first < 0 ? "-" : " " ) + << std::hex << std::uppercase << TableIter->first << std::endl; +#endif + MorkRowMap* rows = getRows( 0x81, &TableIter->second ); + if (!rows) return; + for ( MorkRowMap::iterator RowIter = rows->begin(); + RowIter != rows->end(); RowIter++ ) + { +#ifdef VERBOSE + std::cout << "\t\t\t Row Id:" + << ( ( int ) RowIter->first < 0 ? "-" : " ") + << std::hex << std::uppercase << RowIter->first << std::endl; + std::cout << "\t\t\t\t Cells:\r\n"; +#endif + // Get cells + bool listFound = false; + for ( MorkCells::iterator cellsIter = RowIter->second.begin(); + cellsIter != RowIter->second.end(); cellsIter++ ) + { + if (listFound) + { + if (cellsIter->first >= 0xC7) + { + std::string value = getValue(cellsIter->second); + int id = strtoul(value.c_str(), 0, 16); + records.insert(id); + } + } + else if ((cellsIter->first == 0xC1) && + listName == getValue( cellsIter->second )) + { + listFound = true; + } + } + + } + } +} + void MorkParser::dump() { std::cout << "Column Dict:\r\n"; diff --git a/connectivity/source/drivers/mork/MorkParser.hxx b/connectivity/source/drivers/mork/MorkParser.hxx index 76544411264a..8ac7584a3d66 100644 --- a/connectivity/source/drivers/mork/MorkParser.hxx +++ b/connectivity/source/drivers/mork/MorkParser.hxx @@ -38,6 +38,8 @@ #include #include +#include +#include #include "dllapi.h" @@ -111,6 +113,10 @@ public: std::string &getColumn( int oid ); + void retrieveLists(std::set& lists); + void getRecordKeys4List(std::string& listName, std::vector& records); + void getRecordKeysForListTable(std::string& listName, std::set& records); + void dump(); protected: // Members From 0ea421781b16b449045e66c38007374ab2f2c509 Mon Sep 17 00:00:00 2001 From: Radu Ioan Date: Mon, 8 Oct 2012 22:07:39 +0300 Subject: [PATCH 663/863] fdo#39625 Make existing cppunittests work MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Make salhelper testapi cppunit work - removed call to simpleheader.hxx - added call in Module_sal.mk for sal_testapi - created mk for cppunittest for sal_testapi - fixed some compile warning for auto_ptr Change-Id: I07a58dbd5282f92604f58eb450e0bf549c54c6b3 Reviewed-on: https://gerrit.libreoffice.org/839 Reviewed-by: Muthu Subramanian K Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara --- salhelper/CppunitTest_salhelper_testapi.mk | 33 ++++++++++++++++++++++ salhelper/Module_salhelper.mk | 1 + salhelper/qa/test_api.cxx | 13 +++++---- 3 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 salhelper/CppunitTest_salhelper_testapi.mk diff --git a/salhelper/CppunitTest_salhelper_testapi.mk b/salhelper/CppunitTest_salhelper_testapi.mk new file mode 100644 index 000000000000..ae8004264285 --- /dev/null +++ b/salhelper/CppunitTest_salhelper_testapi.mk @@ -0,0 +1,33 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# Major Contributor(s): +# Copyright (C) 2012 Radu Ioan (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. + +$(eval $(call gb_CppunitTest_CppunitTest,salhelper_testapi)) + +$(eval $(call gb_CppunitTest_add_exception_objects,salhelper_testapi,\ + salhelper/qa/test_api \ +)) + +$(eval $(call gb_CppunitTest_set_include,salhelper_testapi,\ + $$(INCLUDE) \ + -I$(SRCDIR)/salhelper/inc \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,salhelper_testapi,\ + salhelper \ + sal \ + $(gb_STDLIBS) \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/salhelper/Module_salhelper.mk b/salhelper/Module_salhelper.mk index 7f111d899da3..699fbed11eec 100644 --- a/salhelper/Module_salhelper.mk +++ b/salhelper/Module_salhelper.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Module_add_targets,salhelper,\ $(eval $(call gb_Module_add_check_targets,salhelper,\ CppunitTest_salhelper_checkapi \ + CppunitTest_salhelper_testapi \ )) # vim: set noet sw=4 ts=4: diff --git a/salhelper/qa/test_api.cxx b/salhelper/qa/test_api.cxx index 2566b9a912e3..afddab10c204 100644 --- a/salhelper/qa/test_api.cxx +++ b/salhelper/qa/test_api.cxx @@ -48,11 +48,14 @@ std::type_info const & getSimpleReferenceObjectTypeInfo() } -#include "testshl/simpleheader.hxx" #include "osl/mutex.hxx" #include "salhelper/condition.hxx" #include "salhelper/dynload.hxx" #include "salhelper/simplereferenceobject.hxx" +#include +#include +#include +#include #include @@ -208,12 +211,12 @@ void Test::testSimpleReferenceObject() { void Test::testDerivedCondition() { osl::Mutex mutex; - std::auto_ptr< salhelper::Condition > p(new DerivedCondition(mutex)); + boost::scoped_ptr< salhelper::Condition > p(new DerivedCondition(mutex)); CPPUNIT_ASSERT(dynamic_cast< DerivedCondition * >(p.get()) != 0); } void Test::testDerivedConditionWaiterTimedout() { - std::auto_ptr< salhelper::ConditionWaiter::timedout > p( + boost::scoped_ptr< salhelper::ConditionWaiter::timedout > p( new DerivedConditionWaiterTimedout); CPPUNIT_ASSERT( dynamic_cast< DerivedConditionWaiterTimedout * >(p.get()) != 0); @@ -235,10 +238,10 @@ void Test::testDerivedSimpleReferenceObject() { } } -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests"); +CPPUNIT_TEST_SUITE_REGISTRATION(Test); } -NOADDITIONAL; +CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ From c14bd74f268d4883a73f46a7ceac2d2e98ac96a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Wed, 10 Oct 2012 00:06:09 +0100 Subject: [PATCH 664/863] don't do things differently on higher debug levels Change-Id: Ib1fd8c4a5ab4db8d5889ea489b74569639994714 --- vcl/inc/vcl/builder.hxx | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/vcl/inc/vcl/builder.hxx b/vcl/inc/vcl/builder.hxx index aae959a3fe31..83b1139b9eee 100644 --- a/vcl/inc/vcl/builder.hxx +++ b/vcl/inc/vcl/builder.hxx @@ -144,36 +144,17 @@ public: template T* get(T*& ret, OString sID) { Window *w = get_by_name(sID); - assert(w); + assert(w && dynamic_cast(w)); ret = static_cast(w); - -#if OSL_DEBUG_LEVEL > 0 - if (w) - { - ret = dynamic_cast(w); - assert(ret); - } -#endif - return ret; } //sID may not exist, but must be of type T if it does template T* get(OString sID) { Window *w = get_by_name(sID); - T* ret = static_cast(w); - -#if OSL_DEBUG_LEVEL > 0 - if (w) - { - ret = dynamic_cast(w); - assert(ret); - } -#endif - - return ret; + assert(!w || dynamic_cast(w)); + return static_cast(w); } - OString get_by_window(const Window *pWindow) const; //for the purposes of retrofitting this to the existing code //look up sID, clone its properties into replacement and From 19d37e5c4bd43d2477d21fbaeccef923a60eb9ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Wed, 10 Oct 2012 09:28:34 +0100 Subject: [PATCH 665/863] loplugin: unused O[U]Strings Change-Id: I020149a3073d8479887d108465cf5d3b727588d7 --- framework/source/services/substitutepathvars.cxx | 12 +++++------- sal/qa/osl/file/osl_old_test_file.cxx | 3 --- sal/qa/osl/module/osl_Module_Const.h | 9 --------- sal/qa/rtl/cipher/rtl_cipher.cxx | 2 -- 4 files changed, 5 insertions(+), 21 deletions(-) diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index 9ac3c21cf87f..fbab8a466532 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -375,11 +375,9 @@ const rtl::OUString& SubstitutePathVariables_Impl::GetNTDomainName() const rtl::OUString& SubstitutePathVariables_Impl::GetHostName() { - if ( !m_bHostRetrieved ) + if (!m_bHostRetrieved) { - rtl::OUString aHostName; oslSocketResult aSocketResult; - m_aHost = osl::SocketAddr::getLocalHostname( &aSocketResult ).toAsciiLowerCase(); } @@ -1133,8 +1131,8 @@ throw ( NoSuchElementException, RuntimeException ) aVariable = rVariable.copy( 2, rVariable.getLength() - 3 ); else { - rtl::OUString aExceptionText( RTL_CONSTASCII_USTRINGPARAM( "Unknown variable!" )); - throw NoSuchElementException(); + OUString aExceptionText("Unknown variable!"); + throw NoSuchElementException(aExceptionText, (cppu::OWeakObject *)this); } } else @@ -1148,8 +1146,8 @@ throw ( NoSuchElementException, RuntimeException ) return pIter->second.aSubstValue; } - rtl::OUString aExceptionText( RTL_CONSTASCII_USTRINGPARAM( "Unknown variable!" )); - throw NoSuchElementException( aExceptionText, (cppu::OWeakObject *)this ); + OUString aExceptionText("Unknown variable!"); + throw NoSuchElementException(aExceptionText, (cppu::OWeakObject *)this); } } diff --git a/sal/qa/osl/file/osl_old_test_file.cxx b/sal/qa/osl/file/osl_old_test_file.cxx index 1cdb283d7a80..0d2379e0fa75 100644 --- a/sal/qa/osl/file/osl_old_test_file.cxx +++ b/sal/qa/osl/file/osl_old_test_file.cxx @@ -173,9 +173,6 @@ void oldtestfile::test_file_004() { CPPUNIT_ASSERT_MESSAGE("failure #10.1", target.equalsAscii( aSource1[i+1] ) ); } - OString o = OUStringToOString( target , RTL_TEXTENCODING_ASCII_US ); - OString obase = OUStringToOString( base4 , RTL_TEXTENCODING_ASCII_US ); - //fprintf( stderr, "%d %s + %s = %s\n" ,e, obase.getStr(), aSource1[i], o.pData->buffer ); } #endif } diff --git a/sal/qa/osl/module/osl_Module_Const.h b/sal/qa/osl/module/osl_Module_Const.h index 00de78d9d838..544c525c0252 100644 --- a/sal/qa/osl/module/osl_Module_Const.h +++ b/sal/qa/osl/module/osl_Module_Const.h @@ -47,15 +47,6 @@ # define FILE_PREFIX "file:///" -//Korea charactors -::rtl::OUString aKname( - RTL_CONSTASCII_STRINGPARAM( - "/\xEC\x95\x88\xEB\x85\x95\xED\x95\x98\xEC\x84\xB8\xEC\x9A\x94"), - RTL_TEXTENCODING_ISO_8859_1); - // zero-extend the individual byte-sized characters one-to-one to individual - // sal_Unicode-sized characters; not sure whether this is what was - // intended... - //------------------------------------------------------------------------ // function pointer type. //------------------------------------------------------------------------ diff --git a/sal/qa/rtl/cipher/rtl_cipher.cxx b/sal/qa/rtl/cipher/rtl_cipher.cxx index 2b982e51e7f1..9514bd5ff27c 100644 --- a/sal/qa/rtl/cipher/rtl_cipher.cxx +++ b/sal/qa/rtl/cipher/rtl_cipher.cxx @@ -258,8 +258,6 @@ public: /* rtlCipherError */ aError = rtl_cipher_decode(aCipher, pCipherBuffer, nCipherLen, pPlainText2Buffer, nPlainText2Len); CPPUNIT_ASSERT_MESSAGE("wrong decode", aError == rtl_Cipher_E_None); - rtl::OString sPlainText2Str((char*)pPlainText2Buffer, nPlainText2Len); - sal_Int32 nCompare = memcmp(pPlainTextBuffer, pPlainText2Buffer, 16); CPPUNIT_ASSERT_MESSAGE("compare between plain and decoded plain failed", nCompare == 0); From 0770b6cc2034851cf46dff66bc446f47e7d57846 Mon Sep 17 00:00:00 2001 From: Manal Alhassoun Date: Wed, 10 Oct 2012 10:08:52 +0300 Subject: [PATCH 666/863] add a README files Change-Id: I2e779831e47cb1243ae7319b73b9fa553cf97034 Reviewed-on: https://gerrit.libreoffice.org/852 Reviewed-by: Michael Meeks Tested-by: Michael Meeks --- binaryurp/README | 9 +++++++++ ct2n/README | 4 ++++ drawinglayer/README | 3 +++ fontconfig/README | 4 ++++ freetype/README | 6 ++++++ gdk-pixbuf/README | 10 ++++++++++ gettext/README | 5 +++++ git-hooks/README | 9 +++++++++ glib/README | 4 ++++ i18npool/README | 3 +++ 10 files changed, 57 insertions(+) create mode 100644 binaryurp/README create mode 100644 ct2n/README create mode 100644 drawinglayer/README create mode 100644 fontconfig/README create mode 100644 freetype/README create mode 100644 gdk-pixbuf/README create mode 100644 gettext/README create mode 100644 git-hooks/README create mode 100644 glib/README create mode 100644 i18npool/README diff --git a/binaryurp/README b/binaryurp/README new file mode 100644 index 000000000000..05dfc3391450 --- /dev/null +++ b/binaryurp/README @@ -0,0 +1,9 @@ +UNO Remote Protocol (URP). A binary protocol. + +UNO provides a protocol called the UNO Remote Protocol (URP) that provides +a bridge between UNO environments. This bridge allows processes and objects +to send method calls and to receive return values. UNO objects in different +environments are connected by way of this interprocess bridge. The underlying +connection is made through a socket or pipe. Remote UNO objects are connected +by means of TCP/IP using the high-level protocol of the URP. + diff --git a/ct2n/README b/ct2n/README new file mode 100644 index 000000000000..25d4d57a406f --- /dev/null +++ b/ct2n/README @@ -0,0 +1,4 @@ +From [http://extensions.libreoffice.org/extension-center/ct2n-convert-text-to-number-and-dates]. + +ConvertTextToNumber replaces numbers and dates, formatted + as text, with real numbers. \ No newline at end of file diff --git a/drawinglayer/README b/drawinglayer/README new file mode 100644 index 000000000000..70dda944b88f --- /dev/null +++ b/drawinglayer/README @@ -0,0 +1,3 @@ +*Somewhat of a middle layer between rendering subsystems and application cores. + +*It offers a nice and easy API to render complex shapes. \ No newline at end of file diff --git a/fontconfig/README b/fontconfig/README new file mode 100644 index 000000000000..068f680bedb2 --- /dev/null +++ b/fontconfig/README @@ -0,0 +1,4 @@ +Fontconfig is a font configuration and customization library. It is designed to locate fonts +within the system and select them according to requirements specified by applications. + +From [ http://packages.debian.org/squeeze/fontconfig ] \ No newline at end of file diff --git a/freetype/README b/freetype/README new file mode 100644 index 000000000000..5d4ffe8adddb --- /dev/null +++ b/freetype/README @@ -0,0 +1,6 @@ +FreeType 2 is a software font engine that is designed to be small, efficient, highly customizable, +and portable while capable of producing high-quality output (glyph images). It can be +used in graphics libraries, display servers, font conversion tools, text image generation +tools, and many other products as well. + +From [http://freetype.sourceforge.net/freetype2/index.html] \ No newline at end of file diff --git a/gdk-pixbuf/README b/gdk-pixbuf/README new file mode 100644 index 000000000000..325bd2d32c54 --- /dev/null +++ b/gdk-pixbuf/README @@ -0,0 +1,10 @@ +GdkPixbuf is a library for image loading and pixel buffer manipulation. +And it's provides a number of features: + + - Image loading saving facilities. + - Rendering of a GdkPixBuf into various formats: + drawables (windows, pixmaps), GdkRGB buffers. + - Fast scaling and compositing of pixbufs. + - Simple animation loading (ie. animated GIFs) + +See Also [ http://developer.gnome.org/gdk-pixbuf/stable/ ] \ No newline at end of file diff --git a/gettext/README b/gettext/README new file mode 100644 index 000000000000..94ff1002672b --- /dev/null +++ b/gettext/README @@ -0,0 +1,5 @@ + +GNU `gettext' utilities are a set of tools that provides a framework to help other GNU packages produce multi-lingual messages. + +Seel Also [ http://www.gnu.org/software/gettext/manual/gettext.html ] + diff --git a/git-hooks/README b/git-hooks/README new file mode 100644 index 000000000000..3ddd71a663ef --- /dev/null +++ b/git-hooks/README @@ -0,0 +1,9 @@ +Git hooks are executable scripts you can place in $GIT_DIR/hooks directory to trigger action at certain points. + +There are two groups of these hooks: client side and server side. +The client-side hooks: +are for client operations such as committing and merging. +The server-side hooks: +are for Git server operations such as receiving pushed commits. + +See Also [ http://git-scm.com/book/en/Customizing-Git-Git-Hooks ] \ No newline at end of file diff --git a/glib/README b/glib/README new file mode 100644 index 000000000000..80272cbc9193 --- /dev/null +++ b/glib/README @@ -0,0 +1,4 @@ +GLib is a general-purpose utility library, which provides many useful data types, macros, +type conversions, string utilities, file utilities, a main loop abstraction, and so on. + +From [ http://www.gtk.org/api/2.6/glib/glib.html ] \ No newline at end of file diff --git a/i18npool/README b/i18npool/README new file mode 100644 index 000000000000..237e17ff68b7 --- /dev/null +++ b/i18npool/README @@ -0,0 +1,3 @@ +Internationalisation (i18npool) framework ensures that the suite is adaptable to the requirements of different +native languages, their local settings and customs, etc without source code modification +or recompilation. \ No newline at end of file From a999422d4c83fa32abf0adee7286b9f6fdffa3e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Wed, 10 Oct 2012 09:35:55 +0100 Subject: [PATCH 667/863] loplugin: unused O[U]Strings and misleading else placement Change-Id: Ifa11ada39c8d4ca29e3c90db18e5bbe618634131 --- framework/inc/queries.h | 42 +++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/framework/inc/queries.h b/framework/inc/queries.h index bba7c18c31f5..97d12fa656cb 100644 --- a/framework/inc/queries.h +++ b/framework/inc/queries.h @@ -249,20 +249,30 @@ class QueryAnalyzer // Analyze query ... // Try to find base of it and safe it for faster access as enum value! - sal_Int32 nToken = 0; - ::rtl::OUString sParam ; - ::rtl::OUString sBase = sNewQuery.getToken( 0, SEPERATOR_QUERYPARAM, nToken ); + sal_Int32 nToken = 0; + OUString sParam; + OUString sBase = sNewQuery.getToken( 0, SEPERATOR_QUERYPARAM, nToken ); - if( sBase.equalsIgnoreAsciiCase( BASE_QUERY_ALL ) == sal_True ) m_eQuery = E_ALL ; else - if( sBase.equalsIgnoreAsciiCase( BASE_QUERY_WRITER ) == sal_True ) m_eQuery = E_WRITER ; else - if( sBase.equalsIgnoreAsciiCase( BASE_QUERY_WEB ) == sal_True ) m_eQuery = E_WEB ; else - if( sBase.equalsIgnoreAsciiCase( BASE_QUERY_GLOBAL ) == sal_True ) m_eQuery = E_GLOBAL ; else - if( sBase.equalsIgnoreAsciiCase( BASE_QUERY_CHART ) == sal_True ) m_eQuery = E_CHART ; else - if( sBase.equalsIgnoreAsciiCase( BASE_QUERY_CALC ) == sal_True ) m_eQuery = E_CALC ; else - if( sBase.equalsIgnoreAsciiCase( BASE_QUERY_IMPRESS ) == sal_True ) m_eQuery = E_IMPRESS ; else - if( sBase.equalsIgnoreAsciiCase( BASE_QUERY_DRAW ) == sal_True ) m_eQuery = E_DRAW ; else - if( sBase.equalsIgnoreAsciiCase( BASE_QUERY_MATH ) == sal_True ) m_eQuery = E_MATH ; else - if( sBase.equalsIgnoreAsciiCase( BASE_QUERY_GRAPHICS ) == sal_True ) m_eQuery = E_GRAPHICS ; + if (sBase.equalsIgnoreAsciiCase(BASE_QUERY_ALL)) + m_eQuery = E_ALL; + else if( sBase.equalsIgnoreAsciiCase(BASE_QUERY_WRITER)) + m_eQuery = E_WRITER; + else if( sBase.equalsIgnoreAsciiCase(BASE_QUERY_WEB)) + m_eQuery = E_WEB; + else if( sBase.equalsIgnoreAsciiCase(BASE_QUERY_GLOBAL)) + m_eQuery = E_GLOBAL; + else if( sBase.equalsIgnoreAsciiCase(BASE_QUERY_CHART)) + m_eQuery = E_CHART; + else if( sBase.equalsIgnoreAsciiCase(BASE_QUERY_CALC)) + m_eQuery = E_CALC; + else if( sBase.equalsIgnoreAsciiCase(BASE_QUERY_IMPRESS)) + m_eQuery = E_IMPRESS; + else if( sBase.equalsIgnoreAsciiCase(BASE_QUERY_DRAW)) + m_eQuery = E_DRAW; + else if( sBase.equalsIgnoreAsciiCase(BASE_QUERY_MATH)) + m_eQuery = E_MATH; + else if( sBase.equalsIgnoreAsciiCase(BASE_QUERY_GRAPHICS)) + m_eQuery = E_GRAPHICS; // Try to get additional parameters ... while( nToken >= 0 ) @@ -296,7 +306,7 @@ class QueryAnalyzer if( sParam.compareTo( QUERYPARAM_IFLAGS, QUERYPARAM_IFLAGS.getLength() ) == 0 ) { sal_Int32 nSubToken = 0; - ::rtl::OUString sParamName = sParam.getToken( 0, SEPERATOR_QUERYPARAMVALUE, nSubToken ); + sParam.getToken( 0, SEPERATOR_QUERYPARAMVALUE, nSubToken ); if( nSubToken > 0 ) { m_nIFlags = sParam.getToken( 0, SEPERATOR_QUERYPARAMVALUE, nSubToken ).toInt32(); @@ -307,7 +317,7 @@ class QueryAnalyzer if( sParam.compareTo( QUERYPARAM_EFLAGS, QUERYPARAM_EFLAGS.getLength() ) == 0 ) { sal_Int32 nSubToken = 0; - ::rtl::OUString sParamName = sParam.getToken( 0, SEPERATOR_QUERYPARAMVALUE, nSubToken ); + sParam.getToken( 0, SEPERATOR_QUERYPARAMVALUE, nSubToken ); if( nSubToken > 0 ) { m_nEFlags = sParam.getToken( 0, SEPERATOR_QUERYPARAMVALUE, nSubToken ).toInt32(); @@ -318,7 +328,7 @@ class QueryAnalyzer if( sParam.compareTo( QUERYPARAM_SORT_PROP, QUERYPARAM_SORT_PROP.getLength() ) == 0 ) { sal_Int32 nSubToken = 0; - ::rtl::OUString sParamName = sParam.getToken( 0, SEPERATOR_QUERYPARAMVALUE, nSubToken ); + sParam.getToken( 0, SEPERATOR_QUERYPARAMVALUE, nSubToken ); if( nSubToken > 0 ) { ::rtl::OUString sParamValue = sParam.getToken( 0, SEPERATOR_QUERYPARAMVALUE, nSubToken ); From 77cb1ca382520f52b9a87d13f8a1a511e5554946 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Wed, 10 Oct 2012 09:48:42 +0100 Subject: [PATCH 668/863] Fix "Content is not allowed in prolog" warning One of the javascript examples parcel-descriptor.xml ended up with a c++ comment instead of a xml comment Change-Id: Ie63a30e19de2caae08e9a489b6592e1046037416 --- scripting/examples/javascript/Highlight/parcel-descriptor.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripting/examples/javascript/Highlight/parcel-descriptor.xml b/scripting/examples/javascript/Highlight/parcel-descriptor.xml index 9c42a72b48e7..e6d6bb7b1267 100644 --- a/scripting/examples/javascript/Highlight/parcel-descriptor.xml +++ b/scripting/examples/javascript/Highlight/parcel-descriptor.xml @@ -1,5 +1,5 @@ -/* +